mirror of
https://github.com/stablyai/orca.git
synced 2026-10-03 16:02:11 +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.
92 lines
3.0 KiB
TypeScript
92 lines
3.0 KiB
TypeScript
/**
|
|
* The same repo id is allowed on two execution hosts (persistence.ts `removeProjectForHost`).
|
|
* `repo.rm` resolves a *row*, so the deletion it performs must be scoped to that row's host:
|
|
* `Store.removeProject` is id-only and would take the sibling host's registration with it.
|
|
* A `path:`/`name:` selector resolves unambiguously even when the id is duplicated, so this
|
|
* is reachable — and since #11994 every paired device now learns about it immediately.
|
|
*/
|
|
import { describe, expect, it, vi } from 'vitest'
|
|
import type { Repo } from '../../shared/repo-types'
|
|
import { OrcaRuntimeService } from './orca-runtime'
|
|
|
|
function makeRepos(): Repo[] {
|
|
return [
|
|
{
|
|
id: 'dup',
|
|
path: '/laptop/dup',
|
|
displayName: 'Dup Local',
|
|
badgeColor: '#000',
|
|
addedAt: 1,
|
|
executionHostId: 'local'
|
|
} as Repo,
|
|
{
|
|
id: 'dup',
|
|
path: '/remote/dup',
|
|
displayName: 'Dup Remote',
|
|
badgeColor: '#000',
|
|
addedAt: 2,
|
|
connectionId: 'ssh-1'
|
|
} as Repo
|
|
]
|
|
}
|
|
|
|
function createRuntime() {
|
|
const repos = makeRepos()
|
|
const removeProject = vi.fn((id: string) => {
|
|
for (let index = repos.length - 1; index >= 0; index -= 1) {
|
|
if (repos[index].id === id) {
|
|
repos.splice(index, 1)
|
|
}
|
|
}
|
|
})
|
|
const removeProjectForHost = vi.fn((id: string, hostId: string) => {
|
|
for (let index = repos.length - 1; index >= 0; index -= 1) {
|
|
const repo = repos[index]
|
|
const repoHostId =
|
|
repo.executionHostId ?? (repo.connectionId ? `ssh:${repo.connectionId}` : 'local')
|
|
if (repo.id === id && repoHostId === hostId) {
|
|
repos.splice(index, 1)
|
|
}
|
|
}
|
|
})
|
|
const runtime = new OrcaRuntimeService({
|
|
getRepos: () => [...repos],
|
|
getRepo: (id: string) => repos.find((repo) => repo.id === id) ?? null,
|
|
getAllWorktreeMeta: () => ({}),
|
|
getWorktreeMeta: () => null,
|
|
setWorktreeMeta: vi.fn(),
|
|
removeWorktreeMeta: vi.fn(),
|
|
getGitHubCache: () => null,
|
|
removeProject,
|
|
removeProjectForHost
|
|
} as never)
|
|
return { runtime, repos, removeProject, removeProjectForHost }
|
|
}
|
|
|
|
describe('repo.rm with the same repo id on two execution hosts', () => {
|
|
it('removes only the resolved row when a path selector picks the SSH host copy', async () => {
|
|
const { runtime, repos } = createRuntime()
|
|
|
|
await runtime.removeProject('path:/remote/dup')
|
|
|
|
expect(repos.map((repo) => repo.path)).toEqual(['/laptop/dup'])
|
|
})
|
|
|
|
it('removes only the resolved row when a name selector picks the local copy', async () => {
|
|
const { runtime, repos } = createRuntime()
|
|
|
|
await runtime.removeProject('name:Dup Local')
|
|
|
|
expect(repos.map((repo) => repo.path)).toEqual(['/remote/dup'])
|
|
})
|
|
|
|
it('refuses a bare duplicated id rather than guessing a host', async () => {
|
|
const { runtime, repos, removeProject, removeProjectForHost } = createRuntime()
|
|
|
|
await expect(runtime.removeProject('dup')).rejects.toThrow('selector_ambiguous')
|
|
expect(removeProject).not.toHaveBeenCalled()
|
|
expect(removeProjectForHost).not.toHaveBeenCalled()
|
|
expect(repos).toHaveLength(2)
|
|
})
|
|
})
|