mirror of
https://github.com/stablyai/orca.git
synced 2026-09-22 16:02:32 +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.
176 lines
5.2 KiB
TypeScript
176 lines
5.2 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
|
import type { FolderWorkspace } from './folder-workspace-types'
|
|
import { folderWorkspaceToWorktree } from './folder-workspace-worktree'
|
|
|
|
function makeFolderWorkspace(overrides: Partial<FolderWorkspace> = {}): FolderWorkspace {
|
|
return {
|
|
...overrides,
|
|
id: overrides.id ?? 'folder-workspace-1',
|
|
projectGroupId: overrides.projectGroupId ?? 'group-1',
|
|
name: overrides.name ?? 'Refund fix',
|
|
folderPath: overrides.folderPath ?? '/workspace/platform',
|
|
linkedTask: overrides.linkedTask ?? null,
|
|
comment: overrides.comment ?? '',
|
|
isArchived: overrides.isArchived ?? false,
|
|
isUnread: overrides.isUnread ?? false,
|
|
isPinned: overrides.isPinned ?? false,
|
|
sortOrder: overrides.sortOrder ?? 1,
|
|
manualOrder: overrides.manualOrder,
|
|
workspaceStatus: overrides.workspaceStatus,
|
|
lastActivityAt: overrides.lastActivityAt ?? 2,
|
|
createdAt: overrides.createdAt ?? 3,
|
|
updatedAt: overrides.updatedAt ?? 4
|
|
}
|
|
}
|
|
|
|
describe('folderWorkspaceToWorktree', () => {
|
|
it('projects attached issue tasks without creating linked PR metadata', () => {
|
|
const githubIssue = folderWorkspaceToWorktree(
|
|
makeFolderWorkspace({
|
|
linkedTask: {
|
|
provider: 'github',
|
|
type: 'issue',
|
|
number: 42,
|
|
title: 'Refund flow fails',
|
|
url: 'https://github.com/acme/app/issues/42'
|
|
}
|
|
})
|
|
)
|
|
const gitlabIssue = folderWorkspaceToWorktree(
|
|
makeFolderWorkspace({
|
|
linkedTask: {
|
|
provider: 'gitlab',
|
|
type: 'issue',
|
|
number: 7,
|
|
title: 'Import fails',
|
|
url: 'https://gitlab.com/acme/app/-/issues/7'
|
|
}
|
|
})
|
|
)
|
|
|
|
expect(githubIssue).toMatchObject({
|
|
linkedIssue: 42,
|
|
linkedPR: null,
|
|
linkedGitLabMR: null,
|
|
linkedGitLabIssue: null
|
|
})
|
|
expect(gitlabIssue).toMatchObject({
|
|
linkedIssue: null,
|
|
linkedPR: null,
|
|
linkedGitLabMR: null,
|
|
linkedGitLabIssue: 7
|
|
})
|
|
})
|
|
|
|
it('projects Linear tasks by identifier', () => {
|
|
const worktree = folderWorkspaceToWorktree(
|
|
makeFolderWorkspace({
|
|
linkedTask: {
|
|
provider: 'linear',
|
|
type: 'issue',
|
|
number: 0,
|
|
title: 'Polish folder workspaces',
|
|
url: 'https://linear.app/acme/issue/ENG-123',
|
|
linearIdentifier: 'ENG-123'
|
|
}
|
|
})
|
|
)
|
|
|
|
expect(worktree.linkedLinearIssue).toBe('ENG-123')
|
|
expect(worktree.linkedPR).toBeNull()
|
|
expect(worktree.linkedGitLabMR).toBeNull()
|
|
})
|
|
|
|
it('projects durable Jira item and source context without legacy issue zero', () => {
|
|
const linkedTaskSourceContext = {
|
|
kind: 'task-source' as const,
|
|
provider: 'jira' as const,
|
|
projectId: 'group-1',
|
|
hostId: 'local' as const,
|
|
providerIdentity: {
|
|
provider: 'jira' as const,
|
|
siteId: 'site-1',
|
|
siteUrl: 'https://company.atlassian.net',
|
|
projectKey: 'ORCA'
|
|
}
|
|
}
|
|
const worktree = folderWorkspaceToWorktree(
|
|
makeFolderWorkspace({
|
|
linkedTask: {
|
|
provider: 'jira',
|
|
type: 'issue',
|
|
number: 0,
|
|
title: 'ORCA-123 Link Jira',
|
|
url: 'https://company.atlassian.net/browse/ORCA-123',
|
|
jiraIdentifier: 'ORCA-123'
|
|
},
|
|
linkedTaskSourceContext
|
|
})
|
|
)
|
|
|
|
expect(worktree.linkedIssue).toBeNull()
|
|
expect(worktree.linkedWorkItem).toMatchObject({
|
|
provider: 'jira',
|
|
jiraIdentifier: 'ORCA-123'
|
|
})
|
|
expect(worktree.linkedTaskSourceContext).toEqual(linkedTaskSourceContext)
|
|
})
|
|
|
|
it('projects first-message rename state for folder workspace cards', () => {
|
|
const worktree = folderWorkspaceToWorktree(
|
|
makeFolderWorkspace({
|
|
createdWithAgent: 'codex',
|
|
pendingFirstAgentMessageRename: true,
|
|
firstAgentMessageRenameError: 'No model configured'
|
|
})
|
|
)
|
|
|
|
expect(worktree).toMatchObject({
|
|
createdWithAgent: 'codex',
|
|
pendingFirstAgentMessageRename: true,
|
|
firstAgentMessageRenameError: 'No model configured'
|
|
})
|
|
})
|
|
|
|
it('projects runtime ownership from the folder execution host', () => {
|
|
const worktree = folderWorkspaceToWorktree(
|
|
makeFolderWorkspace({ executionHostId: 'runtime:shared%20server' })
|
|
)
|
|
|
|
expect(worktree).toMatchObject({
|
|
hostId: 'runtime:shared%20server',
|
|
runtimeOwnerEnvironmentId: 'shared server'
|
|
})
|
|
})
|
|
|
|
it('keeps review-style tasks attached only to the folder workspace record', () => {
|
|
const githubPr = folderWorkspaceToWorktree(
|
|
makeFolderWorkspace({
|
|
linkedTask: {
|
|
provider: 'github',
|
|
type: 'pr',
|
|
number: 99,
|
|
title: 'Feature branch',
|
|
url: 'https://github.com/acme/app/pull/99'
|
|
}
|
|
})
|
|
)
|
|
const gitlabMr = folderWorkspaceToWorktree(
|
|
makeFolderWorkspace({
|
|
linkedTask: {
|
|
provider: 'gitlab',
|
|
type: 'mr',
|
|
number: 12,
|
|
title: 'Feature branch',
|
|
url: 'https://gitlab.com/acme/app/-/merge_requests/12'
|
|
}
|
|
})
|
|
)
|
|
|
|
expect(githubPr.linkedPR).toBeNull()
|
|
expect(githubPr.linkedIssue).toBeNull()
|
|
expect(gitlabMr.linkedGitLabMR).toBeNull()
|
|
expect(gitlabMr.linkedGitLabIssue).toBeNull()
|
|
})
|
|
})
|