mirror of
https://github.com/stablyai/orca.git
synced 2026-10-25 16:03:53 +00:00
Neil
77f23b013f
#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.
109 lines
3.1 KiB
TypeScript
109 lines
3.1 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
|
import type { GlobalSettings } from '../../shared/global-settings-types'
|
|
import type { CodexManagedAccount } from '../../shared/managed-account-types'
|
|
import {
|
|
getSelectedCodexAccountIdForTarget,
|
|
pruneInvalidCodexRuntimeSelection,
|
|
setSelectedCodexAccountIdForTarget
|
|
} from './runtime-selection'
|
|
|
|
function createSettings(
|
|
overrides: Partial<
|
|
Pick<GlobalSettings, 'activeCodexManagedAccountId' | 'activeCodexManagedAccountIdsByRuntime'>
|
|
> = {}
|
|
): Pick<GlobalSettings, 'activeCodexManagedAccountId' | 'activeCodexManagedAccountIdsByRuntime'> {
|
|
return {
|
|
activeCodexManagedAccountId: null,
|
|
activeCodexManagedAccountIdsByRuntime: { host: null, wsl: {} },
|
|
...overrides
|
|
}
|
|
}
|
|
|
|
function createAccount(
|
|
overrides: Partial<CodexManagedAccount> & Pick<CodexManagedAccount, 'id'>
|
|
): CodexManagedAccount {
|
|
const { id, ...rest } = overrides
|
|
return {
|
|
id,
|
|
email: `${id}@example.com`,
|
|
managedHomePath: `/tmp/${id}`,
|
|
managedHomeRuntime: 'host',
|
|
wslDistro: null,
|
|
wslLinuxHomePath: null,
|
|
providerAccountId: null,
|
|
workspaceLabel: null,
|
|
workspaceAccountId: null,
|
|
createdAt: 1,
|
|
updatedAt: 1,
|
|
lastAuthenticatedAt: 1,
|
|
...rest
|
|
}
|
|
}
|
|
|
|
describe('Codex runtime account selection', () => {
|
|
it('selects host and WSL accounts independently', () => {
|
|
const first = setSelectedCodexAccountIdForTarget({ host: null, wsl: {} }, 'host-account', {
|
|
runtime: 'host'
|
|
})
|
|
const next = setSelectedCodexAccountIdForTarget(first, 'wsl-account', {
|
|
runtime: 'wsl',
|
|
wslDistro: 'Ubuntu'
|
|
})
|
|
|
|
expect(next).toEqual({
|
|
host: 'host-account',
|
|
wsl: { Ubuntu: 'wsl-account' }
|
|
})
|
|
})
|
|
|
|
it('resolves a WSL default target when exactly one WSL distro has a selection', () => {
|
|
const settings = createSettings({
|
|
activeCodexManagedAccountIdsByRuntime: {
|
|
host: 'host-account',
|
|
wsl: { Ubuntu: 'wsl-account' }
|
|
}
|
|
})
|
|
|
|
expect(getSelectedCodexAccountIdForTarget(settings, { runtime: 'wsl' })).toBe('wsl-account')
|
|
expect(getSelectedCodexAccountIdForTarget(settings, { runtime: 'host' })).toBe('host-account')
|
|
})
|
|
|
|
it('clears WSL selections without clearing the host selection for a WSL default target', () => {
|
|
const next = setSelectedCodexAccountIdForTarget(
|
|
{
|
|
host: 'host-account',
|
|
wsl: { Ubuntu: 'wsl-account', Debian: 'other-wsl-account' }
|
|
},
|
|
null,
|
|
{ runtime: 'wsl' }
|
|
)
|
|
|
|
expect(next).toEqual({
|
|
host: 'host-account',
|
|
wsl: { Ubuntu: null, Debian: null }
|
|
})
|
|
})
|
|
|
|
it('drops selections whose account belongs to another runtime', () => {
|
|
const selection = pruneInvalidCodexRuntimeSelection(
|
|
{
|
|
host: 'wsl-account',
|
|
wsl: { Ubuntu: 'host-account', Debian: 'missing-account' }
|
|
},
|
|
[
|
|
createAccount({ id: 'host-account' }),
|
|
createAccount({
|
|
id: 'wsl-account',
|
|
managedHomeRuntime: 'wsl',
|
|
wslDistro: 'Ubuntu'
|
|
})
|
|
]
|
|
)
|
|
|
|
expect(selection).toEqual({
|
|
host: null,
|
|
wsl: { Ubuntu: null, Debian: null }
|
|
})
|
|
})
|
|
})
|