mirror of
https://github.com/stablyai/orca.git
synced 2026-10-24 16:03:45 +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.
230 lines
7.3 KiB
TypeScript
230 lines
7.3 KiB
TypeScript
import { stat as statLocalPath } from 'node:fs/promises'
|
|
import { isPathInsideOrEqual } from '../../shared/cross-platform-path'
|
|
import type {
|
|
FolderWorkspacePathStatus,
|
|
FolderWorkspacePathStatusRequest
|
|
} from '../../shared/folder-workspace-path-status'
|
|
import { getProjectGroupSubtreeIds } from '../../shared/project-groups'
|
|
import type { FolderWorkspace } from '../../shared/folder-workspace-types'
|
|
import type { ProjectGroup } from '../../shared/project-group-types'
|
|
import type { Repo } from '../../shared/repo-types'
|
|
import type { IFilesystemProvider } from '../providers/types'
|
|
|
|
type FolderWorkspacePathStatusStore = {
|
|
getRepos: () => Repo[]
|
|
getProjectGroups?: () => ProjectGroup[]
|
|
getFolderWorkspaces?: () => FolderWorkspace[]
|
|
}
|
|
|
|
export type FolderWorkspacePathConnectionResolution =
|
|
| { kind: 'local' }
|
|
| { kind: 'ssh'; connectionId: string }
|
|
| { kind: 'ambiguous' }
|
|
|
|
type FolderWorkspacePathStatusDeps = {
|
|
getSshFilesystemProvider: (connectionId: string) => IFilesystemProvider | undefined
|
|
}
|
|
|
|
function getFolderScopeCandidateRepos(args: {
|
|
folderPath: string
|
|
projectGroupId?: string | null
|
|
connectionId?: string | null
|
|
projectGroups: readonly ProjectGroup[]
|
|
repos: readonly Repo[]
|
|
}): Repo[] {
|
|
const groupIds = args.projectGroupId
|
|
? getProjectGroupSubtreeIds(args.projectGroups, args.projectGroupId)
|
|
: null
|
|
const groupRepos = groupIds
|
|
? args.repos.filter(
|
|
(repo) => typeof repo.projectGroupId === 'string' && groupIds.has(repo.projectGroupId)
|
|
)
|
|
: []
|
|
const pathRepos = args.repos.filter(
|
|
(repo) =>
|
|
!(groupIds && typeof repo.projectGroupId === 'string' && groupIds.has(repo.projectGroupId)) &&
|
|
isPathInsideOrEqual(args.folderPath, repo.path)
|
|
)
|
|
if (args.connectionId) {
|
|
return [
|
|
...groupRepos,
|
|
...pathRepos.filter((repo) => (repo.connectionId ?? null) === args.connectionId)
|
|
]
|
|
}
|
|
if (groupRepos.length === 0) {
|
|
return pathRepos
|
|
}
|
|
const groupConnectionIds = new Set(groupRepos.map((repo) => repo.connectionId ?? null))
|
|
return [
|
|
...groupRepos,
|
|
...pathRepos.filter((repo) => groupConnectionIds.has(repo.connectionId ?? null))
|
|
]
|
|
}
|
|
|
|
export function inferFolderWorkspacePathConnection(args: {
|
|
folderPath: string
|
|
projectGroupId?: string | null
|
|
connectionId?: string | null
|
|
projectGroups: readonly ProjectGroup[]
|
|
repos: readonly Repo[]
|
|
}): FolderWorkspacePathConnectionResolution {
|
|
const candidateRepos = getFolderScopeCandidateRepos(args)
|
|
let hasLocalRepo = false
|
|
const connectionIds = new Set<string>()
|
|
for (const repo of candidateRepos) {
|
|
if (repo.connectionId) {
|
|
connectionIds.add(repo.connectionId)
|
|
} else {
|
|
hasLocalRepo = true
|
|
}
|
|
}
|
|
if (args.connectionId) {
|
|
const hasDifferentSshConnection = [...connectionIds].some(
|
|
(connectionId) => connectionId !== args.connectionId
|
|
)
|
|
if (hasLocalRepo || hasDifferentSshConnection) {
|
|
return { kind: 'ambiguous' }
|
|
}
|
|
return { kind: 'ssh', connectionId: args.connectionId }
|
|
}
|
|
if (hasLocalRepo && connectionIds.size > 0) {
|
|
return { kind: 'ambiguous' }
|
|
}
|
|
if (connectionIds.size === 0) {
|
|
return { kind: 'local' }
|
|
}
|
|
if (connectionIds.size === 1) {
|
|
return { kind: 'ssh', connectionId: [...connectionIds][0] }
|
|
}
|
|
return { kind: 'ambiguous' }
|
|
}
|
|
|
|
function pathStatErrorReason(error: unknown): 'missing' | 'unavailable' {
|
|
const code = (error as { code?: unknown } | null)?.code
|
|
return code === 'ENOENT' || code === 'ENOTDIR' ? 'missing' : 'unavailable'
|
|
}
|
|
|
|
async function statFolderPath(
|
|
path: string,
|
|
connection: FolderWorkspacePathConnectionResolution,
|
|
deps: FolderWorkspacePathStatusDeps
|
|
): Promise<FolderWorkspacePathStatus> {
|
|
if (connection.kind === 'ambiguous') {
|
|
return { path, exists: false, reason: 'ambiguous-connection' }
|
|
}
|
|
if (connection.kind === 'ssh') {
|
|
const provider = deps.getSshFilesystemProvider(connection.connectionId)
|
|
if (!provider) {
|
|
return { path, exists: false, reason: 'unavailable' }
|
|
}
|
|
try {
|
|
const stats = await provider.stat(path)
|
|
return stats.type === 'directory'
|
|
? { path, exists: true }
|
|
: { path, exists: false, reason: 'not-directory' }
|
|
} catch (error) {
|
|
return { path, exists: false, reason: pathStatErrorReason(error) }
|
|
}
|
|
}
|
|
|
|
try {
|
|
const stats = await statLocalPath(path)
|
|
return stats.isDirectory()
|
|
? { path, exists: true }
|
|
: { path, exists: false, reason: 'not-directory' }
|
|
} catch (error) {
|
|
return { path, exists: false, reason: pathStatErrorReason(error) }
|
|
}
|
|
}
|
|
|
|
export async function getFolderWorkspacePathStatusForPath(
|
|
args: {
|
|
folderPath: string
|
|
projectGroupId?: string | null
|
|
connectionId?: string | null
|
|
projectGroups: readonly ProjectGroup[]
|
|
repos: readonly Repo[]
|
|
},
|
|
deps: FolderWorkspacePathStatusDeps
|
|
): Promise<FolderWorkspacePathStatus> {
|
|
const connection = inferFolderWorkspacePathConnection(args)
|
|
return statFolderPath(args.folderPath, connection, deps)
|
|
}
|
|
|
|
export function resolveFolderWorkspaceStatusPath(args: {
|
|
store: FolderWorkspacePathStatusStore
|
|
request: FolderWorkspacePathStatusRequest
|
|
}): { folderPath: string; projectGroupId: string | null; connectionId?: string | null } {
|
|
const { request } = args
|
|
if (request.scope === 'project-group') {
|
|
const group = args.store
|
|
.getProjectGroups?.()
|
|
.find((entry) => entry.id === request.projectGroupId)
|
|
if (!group?.parentPath) {
|
|
throw new Error('folder_workspace_path_scope_not_found')
|
|
}
|
|
return {
|
|
folderPath: group.parentPath,
|
|
projectGroupId: group.id,
|
|
connectionId: group.connectionId ?? null
|
|
}
|
|
}
|
|
|
|
if (request.scope === 'path') {
|
|
return {
|
|
folderPath: request.path,
|
|
projectGroupId: null,
|
|
connectionId: request.connectionId ?? null
|
|
}
|
|
}
|
|
|
|
const workspace = args.store
|
|
.getFolderWorkspaces?.()
|
|
.find((entry) => entry.id === request.folderWorkspaceId)
|
|
if (!workspace) {
|
|
throw new Error('folder_workspace_path_scope_not_found')
|
|
}
|
|
const group = args.store
|
|
.getProjectGroups?.()
|
|
.find((entry) => entry.id === workspace.projectGroupId)
|
|
return {
|
|
folderPath: workspace.folderPath,
|
|
projectGroupId: workspace.projectGroupId,
|
|
connectionId: workspace.connectionId ?? group?.connectionId ?? null
|
|
}
|
|
}
|
|
|
|
export async function getFolderWorkspacePathStatus(
|
|
store: FolderWorkspacePathStatusStore,
|
|
request: FolderWorkspacePathStatusRequest,
|
|
deps: FolderWorkspacePathStatusDeps
|
|
): Promise<FolderWorkspacePathStatus> {
|
|
const scope = resolveFolderWorkspaceStatusPath({ store, request })
|
|
return getFolderWorkspacePathStatusForPath(
|
|
{
|
|
folderPath: scope.folderPath,
|
|
projectGroupId: scope.projectGroupId,
|
|
connectionId: scope.connectionId,
|
|
projectGroups: store.getProjectGroups?.() ?? [],
|
|
repos: store.getRepos()
|
|
},
|
|
deps
|
|
)
|
|
}
|
|
|
|
export function assertFolderWorkspacePathUsable(status: FolderWorkspacePathStatus): void {
|
|
if (status.exists) {
|
|
return
|
|
}
|
|
if (status.reason === 'missing') {
|
|
throw new Error(`folder_workspace_path_missing:${status.path}`)
|
|
}
|
|
if (status.reason === 'not-directory') {
|
|
throw new Error(`folder_workspace_path_not_directory:${status.path}`)
|
|
}
|
|
if (status.reason === 'ambiguous-connection') {
|
|
throw new Error(`folder_workspace_connection_ambiguous:${status.path}`)
|
|
}
|
|
throw new Error(`folder_workspace_path_unavailable:${status.path}`)
|
|
}
|