mirror of
https://github.com/stablyai/orca.git
synced 2026-09-30 16:02:56 +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.
86 lines
2.7 KiB
TypeScript
86 lines
2.7 KiB
TypeScript
import { resolve } from 'node:path'
|
|
import type { Store } from '../persistence'
|
|
import {
|
|
getLocalProjectWorktreeGitOptions,
|
|
type LocalProjectWorktreeGitOptions
|
|
} from '../project-runtime-git-options'
|
|
import { splitWorktreeId } from '../../shared/worktree/id'
|
|
import type { Repo } from '../../shared/repo-types'
|
|
|
|
function comparableLocalPath(value: string): string {
|
|
const normalized = resolve(value)
|
|
return process.platform === 'win32' ? normalized.toLowerCase() : normalized
|
|
}
|
|
|
|
function getCandidateLocalWorktreePaths(
|
|
worktreePath: string,
|
|
resolvedWorktreePath: string
|
|
): Set<string> {
|
|
return new Set([worktreePath, resolvedWorktreePath].map(comparableLocalPath))
|
|
}
|
|
|
|
function hasRegisteredWorktreeMetaForRepo(
|
|
store: Store,
|
|
repoId: string,
|
|
candidatePaths: Set<string>
|
|
): boolean {
|
|
const worktreeMeta =
|
|
typeof store.getAllWorktreeMeta === 'function' ? store.getAllWorktreeMeta() : {}
|
|
for (const worktreeId of Object.keys(worktreeMeta)) {
|
|
const parsed = splitWorktreeId(worktreeId)
|
|
if (parsed?.repoId === repoId && candidatePaths.has(comparableLocalPath(parsed.worktreePath))) {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
export function getLocalRepoForRegisteredWorktree(
|
|
store: Store,
|
|
worktreePath: string,
|
|
resolvedWorktreePath: string
|
|
): Repo | undefined {
|
|
if (typeof store.getRepos !== 'function') {
|
|
return undefined
|
|
}
|
|
|
|
const candidatePaths = getCandidateLocalWorktreePaths(worktreePath, resolvedWorktreePath)
|
|
return store
|
|
.getRepos()
|
|
.find(
|
|
(repo) =>
|
|
!repo.connectionId &&
|
|
(candidatePaths.has(comparableLocalPath(repo.path)) ||
|
|
hasRegisteredWorktreeMetaForRepo(store, repo.id, candidatePaths))
|
|
)
|
|
}
|
|
|
|
/** Git options for a repo already resolved by `getLocalRepoForRegisteredWorktree`,
|
|
* so a caller needing both does not walk every repo's worktree meta twice. */
|
|
export function getLocalGitOptionsForRepo(
|
|
store: Store,
|
|
repo: Repo | undefined
|
|
): LocalProjectWorktreeGitOptions {
|
|
if (!repo || typeof store.getProjects !== 'function' || typeof store.getSettings !== 'function') {
|
|
return {}
|
|
}
|
|
// Why: file discovery must use the same resolved runtime as project git,
|
|
// terminals, and agents even when the worktree path is a Windows path.
|
|
return getLocalProjectWorktreeGitOptions(store, repo)
|
|
}
|
|
|
|
export function getLocalGitOptionsForRegisteredWorktree(
|
|
store: Store,
|
|
worktreePath: string,
|
|
resolvedWorktreePath: string
|
|
): LocalProjectWorktreeGitOptions {
|
|
if (typeof store.getProjects !== 'function' || typeof store.getSettings !== 'function') {
|
|
return {}
|
|
}
|
|
|
|
return getLocalGitOptionsForRepo(
|
|
store,
|
|
getLocalRepoForRegisteredWorktree(store, worktreePath, resolvedWorktreePath)
|
|
)
|
|
}
|