mirror of
https://github.com/stablyai/orca.git
synced 2026-10-23 08:03:39 +00:00
#14397 split `shared/types.ts` into 46 per-domain modules but kept the path as a re-export barrel so the import sites did not have to change. This removes the barrel: every consumer now imports from the module that actually declares the type, and `src/shared/types.ts` is deleted. Barrels hide where a type lives, make every consumer look like it depends on the whole domain, and let an unrelated edit invalidate a module that ~2,000 files transitively import. 2,323 import declarations across 2,321 files. Rewritten mechanically: each specifier was resolved to an absolute path via the TypeScript AST and recomputed, rather than string-substituted, so alias forms (`@/../../shared/ types`) and per-specifier `type` modifiers survive. Four cases the mechanical pass had to handle, each found by a gate rather than by reading the diff: - Modules inside `src/shared` import the barrel as `./types`, not `shared/types`. A pre-filter on the latter string skipped 176 of them and left imports dangling at a deleted file, which surfaced as confusing `Property 'x' is optional in type 'Repo' but required in Pick<Repo, ...>` errors rather than "module not found". - The barrel RENAMED one type on the way through (`WorkspaceSource as WorkspaceCreateTelemetrySource`), so the original name in the owning module has to be re-aliased at each consumer. - Three test files put `;(globalThis as ...)` on the line after the import. TypeScript parses that `;` as the import statement's terminator, so replacing through `statement.getEnd()` deletes it and breaks ASI. The rewrite now stops at the module specifier. - A file that already imported directly from a module got a SECOND import from it, because the barrel re-exported those same names — which trips `import/no-duplicates` under `--deny-warnings`. A post-pass merges declarations sharing a specifier and type-only-ness; the `import type` plus `import` pair from one module is left alone, since that form is allowed. Splitting one barrel import into several genuinely adds lines, which pushed `terminal-layout-pty-ownership.ts` to 301 counted lines: its 107-character import must wrap, and neither local type collapses onto one line (101 and 116 characters). Rather than contort a type declaration to fit a line budget, `collectLeafIds` and `pruneLeaves` move to `terminal-pane-layout-tree.ts` — they are pure structural operations on the layout tree and independent of PTY ownership. `visible-worktrees.ts` similarly loses its own mini-barrel re-export of `isDefaultBranchWorkspace`, with the four real consumers repointed at the declaring module. No `max-lines` bypass added. Verified: cold `tsc --noEmit` green on node, cli, and web (buildinfo deleted first — these projects are `composite: true` and reuse stale caches); the full `pnpm lint` green, not just bare oxlint — the narrower local check is what let the duplicate imports reach CI; max-lines ratchet OK at 344.
108 lines
3.6 KiB
TypeScript
108 lines
3.6 KiB
TypeScript
import type { Store } from './persistence'
|
|
import type { Project } from '../shared/project-types'
|
|
import type { Repo } from '../shared/repo-types'
|
|
import {
|
|
resolveProjectExecutionRuntime,
|
|
type ProjectExecutionRuntimeResolution
|
|
} from '../shared/project-execution-runtime'
|
|
import {
|
|
getCachedWslAvailability,
|
|
getCachedWslDistros,
|
|
hasCachedWslAvailability,
|
|
hasCachedWslDistros
|
|
} from './wsl'
|
|
import { getRepoIdFromWorktreeId } from '../shared/worktree/id'
|
|
import { getRepoExecutionHostId, LOCAL_EXECUTION_HOST_ID } from '../shared/execution-host'
|
|
|
|
function canResolveProjectRuntimeForRepo(store: Store): boolean {
|
|
return typeof store.getProjects === 'function' && typeof store.getSettings === 'function'
|
|
}
|
|
|
|
function canResolveProjectRuntimeForWorktreeId(store: Store): boolean {
|
|
return canResolveProjectRuntimeForRepo(store) && typeof store.getRepo === 'function'
|
|
}
|
|
|
|
function resolveLocalProjectRuntime(
|
|
store: Store,
|
|
project: Project,
|
|
settings: ReturnType<Store['getSettings']> = store.getSettings()
|
|
): ProjectExecutionRuntimeResolution {
|
|
const wslAvailable = hasCachedWslAvailability()
|
|
? (getCachedWslAvailability() ?? undefined)
|
|
: undefined
|
|
const availableWslDistros = hasCachedWslDistros() ? getCachedWslDistros() : null
|
|
return resolveProjectExecutionRuntime({
|
|
appPlatform: process.platform,
|
|
projectId: project.id,
|
|
projectRuntimePreference: project.localWindowsRuntimePreference,
|
|
globalWindowsRuntimeDefault: settings.localWindowsRuntimeDefault,
|
|
wslAvailable,
|
|
availableWslDistros
|
|
})
|
|
}
|
|
|
|
export function resolveLocalProjectRuntimeForRepo(
|
|
store: Store,
|
|
repo: Repo
|
|
): ProjectExecutionRuntimeResolution | undefined {
|
|
if (
|
|
getRepoExecutionHostId(repo) !== LOCAL_EXECUTION_HOST_ID ||
|
|
!canResolveProjectRuntimeForRepo(store)
|
|
) {
|
|
return undefined
|
|
}
|
|
const project = store.getProjects().find((entry) => entry.sourceRepoIds.includes(repo.id))
|
|
if (!project) {
|
|
return undefined
|
|
}
|
|
return resolveLocalProjectRuntime(store, project)
|
|
}
|
|
|
|
export function resolveLocalProjectRuntimesForRepos(
|
|
store: Store,
|
|
repos: readonly Repo[]
|
|
): ReadonlyMap<string, ProjectExecutionRuntimeResolution> {
|
|
const runtimeByRepoId = new Map<string, ProjectExecutionRuntimeResolution>()
|
|
if (!canResolveProjectRuntimeForRepo(store)) {
|
|
return runtimeByRepoId
|
|
}
|
|
const requestedRepoIds = new Set(
|
|
repos
|
|
.filter((repo) => getRepoExecutionHostId(repo) === LOCAL_EXECUTION_HOST_ID)
|
|
.map((repo) => repo.id)
|
|
)
|
|
if (requestedRepoIds.size === 0) {
|
|
return runtimeByRepoId
|
|
}
|
|
const settings = store.getSettings()
|
|
for (const project of store.getProjects()) {
|
|
const matchingRepoIds = project.sourceRepoIds.filter(
|
|
(repoId) => requestedRepoIds.has(repoId) && !runtimeByRepoId.has(repoId)
|
|
)
|
|
if (matchingRepoIds.length === 0) {
|
|
continue
|
|
}
|
|
// Why: one project runtime applies to every source repo in that project;
|
|
// resolving it once prevents mobile polls from rescanning project settings.
|
|
const runtime = resolveLocalProjectRuntime(store, project, settings)
|
|
for (const repoId of matchingRepoIds) {
|
|
runtimeByRepoId.set(repoId, runtime)
|
|
}
|
|
}
|
|
return runtimeByRepoId
|
|
}
|
|
|
|
export function resolveLocalProjectRuntimeForWorktreeId(
|
|
store: Store | undefined,
|
|
worktreeId: string | undefined
|
|
): ProjectExecutionRuntimeResolution | undefined {
|
|
if (!store || !worktreeId) {
|
|
return undefined
|
|
}
|
|
if (!canResolveProjectRuntimeForWorktreeId(store)) {
|
|
return undefined
|
|
}
|
|
const repo = store.getRepo(getRepoIdFromWorktreeId(worktreeId))
|
|
return repo ? resolveLocalProjectRuntimeForRepo(store, repo) : undefined
|
|
}
|