mirror of
https://github.com/stablyai/orca.git
synced 2026-10-03 00:02:19 +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.
153 lines
4.6 KiB
TypeScript
153 lines
4.6 KiB
TypeScript
import { afterEach, describe, expect, it } from 'vitest'
|
|
import type { Store } from './persistence'
|
|
import type { Project } from '../shared/project-types'
|
|
import type { Repo } from '../shared/repo-types'
|
|
import {
|
|
getLocalProjectGitExecOptions,
|
|
resolveLocalProjectRuntimeForRepo
|
|
} from './project-runtime-git-options'
|
|
import { _resetWslCachesForTests, _setWslCachesForTests } from './wsl'
|
|
|
|
function withPlatform<T>(platform: NodeJS.Platform, run: () => T): T {
|
|
const originalPlatform = process.platform
|
|
Object.defineProperty(process, 'platform', {
|
|
configurable: true,
|
|
value: platform
|
|
})
|
|
try {
|
|
return run()
|
|
} finally {
|
|
Object.defineProperty(process, 'platform', {
|
|
configurable: true,
|
|
value: originalPlatform
|
|
})
|
|
}
|
|
}
|
|
|
|
function makeRepo(overrides: Partial<Repo> = {}): Repo {
|
|
return {
|
|
id: 'repo-1',
|
|
displayName: 'Repo',
|
|
path: String.raw`C:\repo`,
|
|
badgeColor: '#000000',
|
|
addedAt: 0,
|
|
...overrides
|
|
}
|
|
}
|
|
|
|
function makeProject(overrides: Partial<Project> = {}): Project {
|
|
return {
|
|
id: 'project-1',
|
|
displayName: 'Project',
|
|
badgeColor: '#000000',
|
|
sourceRepoIds: ['repo-1'],
|
|
createdAt: 0,
|
|
updatedAt: 0,
|
|
...overrides
|
|
}
|
|
}
|
|
|
|
function makeStore(project: Project): Store {
|
|
return {
|
|
getProjects: () => [project],
|
|
getSettings: () => ({ localWindowsRuntimeDefault: { kind: 'windows-host' } })
|
|
} as unknown as Store
|
|
}
|
|
|
|
describe('project runtime git options', () => {
|
|
afterEach(() => {
|
|
_resetWslCachesForTests()
|
|
})
|
|
|
|
it('does not probe or repair WSL git routing before capability caches exist', () => {
|
|
const project = makeProject({
|
|
localWindowsRuntimePreference: { kind: 'wsl', distro: 'Ubuntu' }
|
|
})
|
|
|
|
const options = withPlatform('win32', () =>
|
|
getLocalProjectGitExecOptions(makeStore(project), makeRepo())
|
|
)
|
|
|
|
expect(options).toEqual({ cwd: String.raw`C:\repo`, wslDistro: 'Ubuntu' })
|
|
})
|
|
|
|
it('returns repair state for missing cached WSL distro before local git execution', () => {
|
|
_setWslCachesForTests({ available: true, distros: ['Debian'] })
|
|
const project = makeProject({
|
|
localWindowsRuntimePreference: { kind: 'wsl', distro: 'Ubuntu' }
|
|
})
|
|
|
|
const runtime = withPlatform('win32', () =>
|
|
resolveLocalProjectRuntimeForRepo(makeStore(project), makeRepo())
|
|
)
|
|
|
|
expect(runtime).toEqual({
|
|
status: 'repair-required',
|
|
repair: {
|
|
projectId: 'project-1',
|
|
preferredRuntime: { kind: 'wsl', distro: 'Ubuntu' },
|
|
reason: 'wsl-distro-missing',
|
|
source: 'project-override',
|
|
cacheKey: 'project-1:repair:wsl-distro-missing:Ubuntu'
|
|
}
|
|
})
|
|
expect(() =>
|
|
withPlatform('win32', () => getLocalProjectGitExecOptions(makeStore(project), makeRepo()))
|
|
).toThrow('Project runtime requires repair before git execution: wsl-distro-missing')
|
|
})
|
|
|
|
it('returns repair state for cached WSL unavailable before local git execution', () => {
|
|
_setWslCachesForTests({ available: false, distros: [] })
|
|
const project = makeProject({
|
|
localWindowsRuntimePreference: { kind: 'wsl', distro: 'Ubuntu' }
|
|
})
|
|
|
|
expect(() =>
|
|
withPlatform('win32', () => getLocalProjectGitExecOptions(makeStore(project), makeRepo()))
|
|
).toThrow('Project runtime requires repair before git execution: wsl-unavailable')
|
|
})
|
|
|
|
it('keeps project host override on host even when cached WSL is unavailable', () => {
|
|
_setWslCachesForTests({ available: false, distros: [] })
|
|
const project = makeProject({
|
|
localWindowsRuntimePreference: { kind: 'windows-host' }
|
|
})
|
|
|
|
const options = withPlatform('win32', () =>
|
|
getLocalProjectGitExecOptions(makeStore(project), makeRepo())
|
|
)
|
|
|
|
expect(options).toEqual({ cwd: String.raw`C:\repo` })
|
|
})
|
|
|
|
it('does not apply local Windows runtime routing to SSH-owned repos', () => {
|
|
const project = makeProject({
|
|
localWindowsRuntimePreference: { kind: 'wsl', distro: 'Ubuntu' }
|
|
})
|
|
|
|
const runtime = withPlatform('win32', () =>
|
|
resolveLocalProjectRuntimeForRepo(
|
|
makeStore(project),
|
|
makeRepo({ connectionId: null, executionHostId: 'ssh:target-1' })
|
|
)
|
|
)
|
|
|
|
expect(runtime).toBeUndefined()
|
|
})
|
|
|
|
it('does not apply local Windows runtime routing to runtime-owned repos', () => {
|
|
const project = makeProject({
|
|
localWindowsRuntimePreference: { kind: 'wsl', distro: 'Ubuntu' }
|
|
})
|
|
|
|
const runtime = withPlatform('win32', () =>
|
|
resolveLocalProjectRuntimeForRepo(
|
|
makeStore(project),
|
|
makeRepo({ connectionId: null, executionHostId: 'runtime:env-1' })
|
|
)
|
|
)
|
|
|
|
expect(runtime).toBeUndefined()
|
|
})
|
|
})
|