Files
orca/src/shared/resolved-worktree-lineage.ts
Neil 77f23b013f refactor(shared): drop the shared/types barrel and import from the real modules (#14447)
#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.
2026-08-13 22:48:24 -07:00

110 lines
3.5 KiB
TypeScript

import type { WorktreeLineage } from './worktree/lineage-types'
import type { Worktree } from './worktree/types'
export type WorktreeWithResolvedLineage<T extends Worktree = Worktree> = T & {
parentWorktreeId: string | null
childWorktreeIds: string[]
lineage: WorktreeLineage | null
}
export function sharesResolvedWorktreeLineageBoundary(child: Worktree, parent: Worktree): boolean {
return (
child.repoId === parent.repoId &&
(child.hostId === undefined || parent.hostId === undefined || child.hostId === parent.hostId) &&
(child.projectId === undefined ||
parent.projectId === undefined ||
child.projectId === parent.projectId)
)
}
export function isValidResolvedWorktreeLineageEdge(
child: Worktree,
parent: Worktree,
lineage: WorktreeLineage
): boolean {
return (
child.id !== parent.id &&
lineage.worktreeId === child.id &&
lineage.parentWorktreeId === parent.id &&
sharesResolvedWorktreeLineageBoundary(child, parent) &&
child.instanceId === lineage.worktreeInstanceId &&
parent.instanceId === lineage.parentWorktreeInstanceId
)
}
export function getCyclicWorktreeLineageChildIds(
lineageByChildId: ReadonlyMap<string, WorktreeLineage>
): Set<string> {
const processed = new Set<string>()
const cyclic = new Set<string>()
for (const childId of lineageByChildId.keys()) {
if (processed.has(childId)) {
continue
}
const path: string[] = []
const pathIndexById = new Map<string, number>()
let currentId: string | undefined = childId
while (currentId && lineageByChildId.has(currentId) && !processed.has(currentId)) {
const cycleStart = pathIndexById.get(currentId)
if (cycleStart !== undefined) {
for (let index = cycleStart; index < path.length; index += 1) {
cyclic.add(path[index])
}
break
}
pathIndexById.set(currentId, path.length)
path.push(currentId)
currentId = lineageByChildId.get(currentId)?.parentWorktreeId
}
for (const id of path) {
processed.add(id)
}
}
return cyclic
}
export function projectResolvedWorktreeLineage<T extends Worktree>(
worktrees: readonly T[],
lineageById: Readonly<Record<string, WorktreeLineage>>
): WorktreeWithResolvedLineage<T>[] {
const worktreeById = new Map(worktrees.map((worktree) => [worktree.id, worktree]))
const validLineageByChildId = new Map<string, WorktreeLineage>()
const childIdsByParentId = new Map<string, string[]>()
for (const child of worktrees) {
const childId = child.id
const lineage = lineageById[childId]
if (!lineage) {
continue
}
const parent = worktreeById.get(lineage.parentWorktreeId)
if (!parent || !isValidResolvedWorktreeLineageEdge(child, parent, lineage)) {
continue
}
validLineageByChildId.set(childId, lineage)
}
const cyclicChildIds = getCyclicWorktreeLineageChildIds(validLineageByChildId)
for (const childId of cyclicChildIds) {
validLineageByChildId.delete(childId)
}
for (const [childId, lineage] of validLineageByChildId) {
const children = childIdsByParentId.get(lineage.parentWorktreeId) ?? []
children.push(childId)
childIdsByParentId.set(lineage.parentWorktreeId, children)
}
return worktrees.map((worktree) => {
const lineage = validLineageByChildId.get(worktree.id) ?? null
return {
...worktree,
parentWorktreeId: lineage?.parentWorktreeId ?? null,
childWorktreeIds: childIdsByParentId.get(worktree.id) ?? [],
lineage
}
})
}