Files
orca/src/main/runtime/headless-terminal-split-layout.test.ts
T
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

178 lines
5.7 KiB
TypeScript

import { describe, expect, it } from 'vitest'
import type { TerminalLayoutSnapshot } from '../../shared/terminal-tab-types'
import {
buildHeadlessTerminalSplitLayout,
countTerminalLayoutLeaves,
terminalLayoutContainsLeaf
} from './headless-terminal-split-layout'
describe('terminalLayoutContainsLeaf', () => {
it('requires the leaf in the layout tree', () => {
expect(
terminalLayoutContainsLeaf(
{
type: 'split',
direction: 'vertical',
first: { type: 'leaf', leafId: 'leaf-a' },
second: { type: 'leaf', leafId: 'leaf-b' }
},
'leaf-b'
)
).toBe(true)
expect(terminalLayoutContainsLeaf({ type: 'leaf', leafId: 'leaf-a' }, 'leaf-b')).toBe(false)
})
})
describe('buildHeadlessTerminalSplitLayout (headless split persistence)', () => {
it('splits a single-leaf tab into a 2-leaf split tree', () => {
const existing: TerminalLayoutSnapshot = {
root: { type: 'leaf', leafId: 'leaf-a' },
activeLeafId: 'leaf-a',
expandedLeafId: null,
ptyIdsByLeafId: { 'leaf-a': 'pty-a' }
}
const next = buildHeadlessTerminalSplitLayout(existing, {
leafId: 'leaf-b',
ptyId: 'pty-b',
splitFromLeafId: 'leaf-a',
direction: 'vertical'
})
expect(countTerminalLayoutLeaves(next.root)).toBe(2)
expect(next.root).toEqual({
type: 'split',
direction: 'vertical',
first: { type: 'leaf', leafId: 'leaf-a' },
second: { type: 'leaf', leafId: 'leaf-b' }
})
expect(next.activeLeafId).toBe('leaf-b')
expect(next.ptyIdsByLeafId).toEqual({ 'leaf-a': 'pty-a', 'leaf-b': 'pty-b' })
})
it('splits a nested leaf inside an existing split (split-of-a-split)', () => {
const existing: TerminalLayoutSnapshot = {
root: {
type: 'split',
direction: 'vertical',
first: { type: 'leaf', leafId: 'leaf-a' },
second: { type: 'leaf', leafId: 'leaf-b' }
},
activeLeafId: 'leaf-b',
expandedLeafId: null,
ptyIdsByLeafId: { 'leaf-a': 'pty-a', 'leaf-b': 'pty-b' }
}
const next = buildHeadlessTerminalSplitLayout(existing, {
leafId: 'leaf-c',
ptyId: 'pty-c',
splitFromLeafId: 'leaf-b',
direction: 'horizontal'
})
// 3 leaves total; the split happened at leaf-b, leaf-a untouched.
expect(countTerminalLayoutLeaves(next.root)).toBe(3)
expect(next.root).toEqual({
type: 'split',
direction: 'vertical',
first: { type: 'leaf', leafId: 'leaf-a' },
second: {
type: 'split',
direction: 'horizontal',
first: { type: 'leaf', leafId: 'leaf-b' },
second: { type: 'leaf', leafId: 'leaf-c' }
}
})
expect(next.ptyIdsByLeafId).toEqual({
'leaf-a': 'pty-a',
'leaf-b': 'pty-b',
'leaf-c': 'pty-c'
})
})
it('synthesizes a split when there is no existing persisted layout', () => {
const next = buildHeadlessTerminalSplitLayout(undefined, {
leafId: 'leaf-b',
ptyId: 'pty-b',
splitFromLeafId: 'leaf-a',
direction: 'horizontal'
})
expect(countTerminalLayoutLeaves(next.root)).toBe(2)
expect(next.root).toEqual({
type: 'split',
direction: 'horizontal',
first: { type: 'leaf', leafId: 'leaf-a' },
second: { type: 'leaf', leafId: 'leaf-b' }
})
})
it('replaces the provisional admission leaf with the requested split direction', () => {
const next = buildHeadlessTerminalSplitLayout(
{
root: {
type: 'split',
direction: 'vertical',
first: { type: 'leaf', leafId: 'leaf-a' },
second: { type: 'leaf', leafId: 'leaf-c' }
},
activeLeafId: 'leaf-c',
expandedLeafId: null,
ptyIdsByLeafId: { 'leaf-a': 'pty-a', 'leaf-c': 'provisional-pty' }
},
{ leafId: 'leaf-c', ptyId: 'pty-c', splitFromLeafId: 'leaf-a', direction: 'horizontal' }
)
expect(next.root).toEqual({
type: 'split',
direction: 'horizontal',
first: { type: 'leaf', leafId: 'leaf-a' },
second: { type: 'leaf', leafId: 'leaf-c' }
})
expect(next.ptyIdsByLeafId).toEqual({ 'leaf-a': 'pty-a', 'leaf-c': 'pty-c' })
})
it('preserves a sibling committed by a concurrent split', () => {
const next = buildHeadlessTerminalSplitLayout(
{
root: {
type: 'split',
direction: 'vertical',
first: {
type: 'split',
direction: 'horizontal',
first: { type: 'leaf', leafId: 'leaf-a' },
second: { type: 'leaf', leafId: 'leaf-b' }
},
second: { type: 'leaf', leafId: 'leaf-c' }
},
activeLeafId: 'leaf-c',
expandedLeafId: null,
ptyIdsByLeafId: {
'leaf-a': 'pty-a',
'leaf-b': 'pty-b',
'leaf-c': 'provisional-pty'
}
},
{ leafId: 'leaf-c', ptyId: 'pty-c', splitFromLeafId: 'leaf-a', direction: 'vertical' }
)
expect(countTerminalLayoutLeaves(next.root)).toBe(3)
expect(next.ptyIdsByLeafId).toEqual({
'leaf-a': 'pty-a',
'leaf-b': 'pty-b',
'leaf-c': 'pty-c'
})
})
it('does not collapse — the persisted layout keeps both leaves (regression guard)', () => {
// Why: the reported bug was the split collapsing back to one pane. After a
// split, a rebuild reads this persisted layout, so it MUST stay multi-leaf.
const afterSplit = buildHeadlessTerminalSplitLayout(
{
root: { type: 'leaf', leafId: 'leaf-a' },
activeLeafId: 'leaf-a',
expandedLeafId: null,
ptyIdsByLeafId: { 'leaf-a': 'pty-a' }
},
{ leafId: 'leaf-b', ptyId: 'pty-b', splitFromLeafId: 'leaf-a', direction: 'vertical' }
)
expect(countTerminalLayoutLeaves(afterSplit.root)).toBeGreaterThan(1)
})
})