mirror of
https://github.com/stablyai/orca.git
synced 2026-10-24 08:03:58 +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.
114 lines
3.0 KiB
TypeScript
114 lines
3.0 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
|
import type { TaskSourceContext } from './task-source-context'
|
|
import type { WorkspaceLinkedItem } from './worktree/types'
|
|
import { isWorkspaceLinkedItemSourceContextMatch } from './workspace-linked-item-source-context'
|
|
|
|
const JIRA_ITEM: WorkspaceLinkedItem = {
|
|
provider: 'jira',
|
|
type: 'issue',
|
|
number: 0,
|
|
title: 'ORCA-123 Link Jira',
|
|
url: 'https://company.atlassian.net/jira/browse/ORCA-123',
|
|
jiraIdentifier: 'ORCA-123'
|
|
}
|
|
|
|
const JIRA_CONTEXT: TaskSourceContext = {
|
|
kind: 'task-source',
|
|
provider: 'jira',
|
|
projectId: 'project-1',
|
|
hostId: 'local',
|
|
providerIdentity: {
|
|
provider: 'jira',
|
|
siteId: 'site-1',
|
|
siteUrl: 'https://company.atlassian.net/jira',
|
|
projectKey: 'ORCA'
|
|
}
|
|
}
|
|
|
|
describe('workspace linked-item source context', () => {
|
|
it('requires Jira key, site URL, site account, and project identity to agree', () => {
|
|
expect(isWorkspaceLinkedItemSourceContextMatch(JIRA_ITEM, JIRA_CONTEXT)).toBe(true)
|
|
expect(
|
|
isWorkspaceLinkedItemSourceContextMatch(JIRA_ITEM, {
|
|
...JIRA_CONTEXT,
|
|
providerIdentity: {
|
|
...JIRA_CONTEXT.providerIdentity!,
|
|
provider: 'jira',
|
|
siteUrl: 'https://other.atlassian.net'
|
|
}
|
|
})
|
|
).toBe(false)
|
|
expect(
|
|
isWorkspaceLinkedItemSourceContextMatch(JIRA_ITEM, {
|
|
...JIRA_CONTEXT,
|
|
providerIdentity: {
|
|
...JIRA_CONTEXT.providerIdentity!,
|
|
provider: 'jira',
|
|
projectKey: 'OTHER'
|
|
}
|
|
})
|
|
).toBe(false)
|
|
expect(
|
|
isWorkspaceLinkedItemSourceContextMatch(
|
|
{ ...JIRA_ITEM, jiraIdentifier: 'ORCA-999' },
|
|
JIRA_CONTEXT
|
|
)
|
|
).toBe(false)
|
|
})
|
|
|
|
it('keeps provider matching sufficient for non-Jira items', () => {
|
|
expect(
|
|
isWorkspaceLinkedItemSourceContextMatch(
|
|
{
|
|
provider: 'linear',
|
|
type: 'issue',
|
|
number: 0,
|
|
title: 'Linear item',
|
|
url: 'https://linear.app/acme/issue/ENG-1/item'
|
|
},
|
|
{
|
|
kind: 'task-source',
|
|
provider: 'linear',
|
|
projectId: 'project-1',
|
|
hostId: 'local'
|
|
}
|
|
)
|
|
).toBe(true)
|
|
})
|
|
|
|
it('infers GitHub/GitLab provider when TaskPage seeds omit provider', () => {
|
|
expect(
|
|
isWorkspaceLinkedItemSourceContextMatch(
|
|
{
|
|
type: 'issue',
|
|
number: 42,
|
|
title: 'GitHub issue',
|
|
url: 'https://github.com/acme/repo/issues/42'
|
|
},
|
|
{
|
|
kind: 'task-source',
|
|
provider: 'github',
|
|
projectId: 'project-1',
|
|
hostId: 'local'
|
|
}
|
|
)
|
|
).toBe(true)
|
|
expect(
|
|
isWorkspaceLinkedItemSourceContextMatch(
|
|
{
|
|
type: 'mr',
|
|
number: 7,
|
|
title: 'GitLab MR',
|
|
url: 'https://gitlab.com/acme/repo/-/merge_requests/7'
|
|
},
|
|
{
|
|
kind: 'task-source',
|
|
provider: 'gitlab',
|
|
projectId: 'project-1',
|
|
hostId: 'local'
|
|
}
|
|
)
|
|
).toBe(true)
|
|
})
|
|
})
|