mirror of
https://github.com/stablyai/orca.git
synced 2026-10-24 08:03:58 +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.
113 lines
3.9 KiB
TypeScript
113 lines
3.9 KiB
TypeScript
import { isFolderRepo } from '../shared/repo-kind'
|
|
import type { Repo } from '../shared/repo-types'
|
|
import { hasLocalCommitObject, isFullGitObjectId } from './git/commit-object-ref'
|
|
import { hasWorktreeBaseCommitRef } from './git/worktree-base-ref-probe'
|
|
import { getBaseRefDefault } from './git/repo'
|
|
import { getSshGitProvider } from './providers/ssh-git-dispatch'
|
|
import { prefetchRemoteWorktreeCreateBase } from './ipc/worktree-remote'
|
|
import { resolveWorktreeCreateBase } from './worktree-create-base'
|
|
import { resolveWorktreeAddBaseRef } from '../shared/worktree/base-ref'
|
|
|
|
type RemoteTrackingBaseForPrefetch = {
|
|
remote: string
|
|
branch: string
|
|
ref: string
|
|
base: string
|
|
}
|
|
|
|
type WorktreeCreateBasePrefetchRuntime = {
|
|
resolveRemoteTrackingBase: (
|
|
repoPath: string,
|
|
baseBranch: string
|
|
) => Promise<RemoteTrackingBaseForPrefetch | null>
|
|
hasRemoteTrackingRef: (repoPath: string, base: RemoteTrackingBaseForPrefetch) => Promise<boolean>
|
|
getOrStartRemoteTrackingBaseRefresh: (
|
|
repoPath: string,
|
|
base: RemoteTrackingBaseForPrefetch
|
|
) => Promise<unknown>
|
|
fetchRemoteWithCache: (repoPath: string, remote: string) => Promise<void>
|
|
}
|
|
|
|
async function hasLocalWorktreeBaseRef(repoPath: string, baseRef: string): Promise<boolean> {
|
|
const refExists = (qualifiedRef: string) => hasWorktreeBaseCommitRef(repoPath, qualifiedRef)
|
|
const resolvedBaseRef = await resolveWorktreeAddBaseRef(baseRef, refExists)
|
|
if (resolvedBaseRef !== baseRef) {
|
|
return true
|
|
}
|
|
if (baseRef.startsWith('refs/')) {
|
|
return refExists(baseRef)
|
|
}
|
|
return hasLocalCommitObject(repoPath, baseRef)
|
|
}
|
|
|
|
async function prefetchLocalWorktreeCreateBase(
|
|
repo: Repo,
|
|
baseBranch: string | undefined,
|
|
runtime: WorktreeCreateBasePrefetchRuntime
|
|
): Promise<void> {
|
|
const resolvedBaseBranch = await resolveWorktreeCreateBase({
|
|
requestedBaseBranch: baseBranch,
|
|
repoWorktreeBaseRef: repo.worktreeBaseRef,
|
|
resolveDefaultBaseRef: () => getBaseRefDefault(repo.path),
|
|
isBaseUsable: async (baseBranchCandidate) => {
|
|
const remoteTrackingBase = await runtime.resolveRemoteTrackingBase(
|
|
repo.path,
|
|
baseBranchCandidate
|
|
)
|
|
if (remoteTrackingBase) {
|
|
if (await runtime.hasRemoteTrackingRef(repo.path, remoteTrackingBase)) {
|
|
return true
|
|
}
|
|
return hasLocalWorktreeBaseRef(repo.path, baseBranchCandidate)
|
|
}
|
|
return hasLocalWorktreeBaseRef(repo.path, baseBranchCandidate)
|
|
}
|
|
})
|
|
if (!resolvedBaseBranch) {
|
|
return
|
|
}
|
|
if (
|
|
isFullGitObjectId(resolvedBaseBranch) &&
|
|
(await hasLocalWorktreeBaseRef(repo.path, resolvedBaseBranch))
|
|
) {
|
|
return
|
|
}
|
|
const remoteTrackingBase = await runtime.resolveRemoteTrackingBase(repo.path, resolvedBaseBranch)
|
|
if (remoteTrackingBase) {
|
|
if (
|
|
(await runtime.hasRemoteTrackingRef(repo.path, remoteTrackingBase)) ||
|
|
!(await hasLocalWorktreeBaseRef(repo.path, resolvedBaseBranch))
|
|
) {
|
|
await runtime.getOrStartRemoteTrackingBaseRefresh(repo.path, remoteTrackingBase)
|
|
return
|
|
}
|
|
}
|
|
if (await hasLocalWorktreeBaseRef(repo.path, resolvedBaseBranch)) {
|
|
// Why: hosted-review start points and local branch bases are already local; a broad remote fetch cannot make them fresher.
|
|
return
|
|
}
|
|
|
|
// Why: keep optimistic prefetch on the same best-effort fallback path as
|
|
// create so the real create can reuse the runtime's remote fetch cache.
|
|
await runtime.fetchRemoteWithCache(repo.path, 'origin')
|
|
}
|
|
|
|
export async function prefetchWorktreeCreateBase(args: {
|
|
repo: Repo
|
|
baseBranch?: string
|
|
runtime: WorktreeCreateBasePrefetchRuntime
|
|
}): Promise<void> {
|
|
if (isFolderRepo(args.repo)) {
|
|
return
|
|
}
|
|
if (args.repo.connectionId) {
|
|
const provider = getSshGitProvider(args.repo.connectionId)
|
|
if (!provider) {
|
|
return
|
|
}
|
|
await prefetchRemoteWorktreeCreateBase(provider, args.repo, { baseBranch: args.baseBranch })
|
|
return
|
|
}
|
|
await prefetchLocalWorktreeCreateBase(args.repo, args.baseBranch, args.runtime)
|
|
}
|