Files
orca/src/shared/renderer-restart-preparation.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

145 lines
5.1 KiB
TypeScript

import { describe, expect, it, vi } from 'vitest'
import type { UpdateStatus } from './update-status-types'
import { ORCA_RENDERER_SHUTDOWN_CHECKPOINT_FAILED_EVENT } from './renderer-shutdown-events'
import {
createUpdaterQuitAbortRelay,
prepareRendererForAppRestart
} from './renderer-restart-preparation'
describe('prepareRendererForAppRestart', () => {
it('aborts when the dispatched shutdown checkpoint reports failure', async () => {
const eventTarget = new EventTarget()
const started = vi.fn()
const aborted = vi.fn()
const checkpoint = vi.fn((event: Event) => {
event.currentTarget?.dispatchEvent(new Event(ORCA_RENDERER_SHUTDOWN_CHECKPOINT_FAILED_EVENT))
event.preventDefault()
})
eventTarget.addEventListener('restart-started', started)
eventTarget.addEventListener('restart-aborted', aborted)
eventTarget.addEventListener('beforeunload', checkpoint)
await expect(
prepareRendererForAppRestart(eventTarget, {
startedEventName: 'restart-started',
abortedEventName: 'restart-aborted',
awaitCheckpoint: () => Promise.resolve()
})
).rejects.toThrow('Renderer shutdown checkpoint was not completed.')
expect(started).toHaveBeenCalledTimes(1)
expect(checkpoint).toHaveBeenCalledTimes(1)
expect(aborted).toHaveBeenCalledTimes(1)
})
it('does not mistake an unrelated unload veto for checkpoint failure', async () => {
const eventTarget = new EventTarget()
const veto = vi.fn((event: Event) => event.preventDefault())
const awaitCheckpoint = vi.fn(() => Promise.resolve())
eventTarget.addEventListener('beforeunload', veto)
await prepareRendererForAppRestart(eventTarget, {
startedEventName: 'restart-started',
abortedEventName: 'restart-aborted',
awaitCheckpoint
})
expect(veto).toHaveBeenCalledTimes(1)
expect(awaitCheckpoint).toHaveBeenCalledTimes(1)
})
it('waits for the durable checkpoint write before the restart proceeds', async () => {
const eventTarget = new EventTarget()
const order: string[] = []
let releaseCheckpoint!: () => void
eventTarget.addEventListener('beforeunload', () => order.push('staged'))
const prepared = prepareRendererForAppRestart(eventTarget, {
startedEventName: 'restart-started',
abortedEventName: 'restart-aborted',
awaitCheckpoint: () =>
new Promise<void>((resolve) => {
order.push('awaiting-flush')
releaseCheckpoint = () => {
order.push('flushed')
resolve()
}
})
})
let settled = false
void prepared.then(() => {
settled = true
})
await Promise.resolve()
expect(settled).toBe(false)
releaseCheckpoint()
await prepared
expect(order).toEqual(['staged', 'awaiting-flush', 'flushed'])
})
it('aborts the restart when the staged state cannot be persisted', async () => {
const eventTarget = new EventTarget()
const aborted = vi.fn()
eventTarget.addEventListener('restart-aborted', aborted)
await expect(
prepareRendererForAppRestart(eventTarget, {
startedEventName: 'restart-started',
abortedEventName: 'restart-aborted',
awaitCheckpoint: () => Promise.reject(new Error('Failed to persist renderer state.'))
})
).rejects.toThrow('Failed to persist renderer state.')
expect(aborted).toHaveBeenCalledTimes(1)
})
})
describe('createUpdaterQuitAbortRelay', () => {
it('resets a prepared update restart when async updater status reports failure', () => {
const eventTarget = new EventTarget()
const aborted = vi.fn()
eventTarget.addEventListener('update-restart-aborted', aborted)
const relay = createUpdaterQuitAbortRelay(eventTarget, 'update-restart-aborted')
relay.markPrepared()
relay.handleStatus({ state: 'error', message: 'install failed' } satisfies UpdateStatus)
relay.handleStatus({ state: 'error', message: 'duplicate failure' } satisfies UpdateStatus)
expect(aborted).toHaveBeenCalledTimes(1)
})
it('resets a prepared restart on a linux package-install recovery status', () => {
const eventTarget = new EventTarget()
const aborted = vi.fn()
eventTarget.addEventListener('update-restart-aborted', aborted)
const relay = createUpdaterQuitAbortRelay(eventTarget, 'update-restart-aborted')
relay.markPrepared()
relay.handleStatus({
state: 'error',
message: 'No authentication agent found.',
recovery: {
kind: 'linux-package-install',
packageType: 'deb',
reason: 'authentication-agent-unavailable',
version: '1.0.61'
}
} satisfies UpdateStatus)
expect(aborted).toHaveBeenCalledTimes(1)
})
it('ignores updater errors when no update restart was prepared', () => {
const eventTarget = new EventTarget()
const aborted = vi.fn()
eventTarget.addEventListener('update-restart-aborted', aborted)
const relay = createUpdaterQuitAbortRelay(eventTarget, 'update-restart-aborted')
relay.handleStatus({ state: 'error', message: 'check failed' } satisfies UpdateStatus)
expect(aborted).not.toHaveBeenCalled()
})
})