mirror of
https://github.com/stablyai/orca.git
synced 2026-09-23 00:02:29 +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.
159 lines
4.8 KiB
TypeScript
159 lines
4.8 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
|
import {
|
|
clearMissingProjectGroupMemberships,
|
|
createProjectGroup,
|
|
getEffectiveProjectGroupManualRank,
|
|
getNextProjectGroupOrder,
|
|
getProjectGroupSubtreeIds,
|
|
normalizeProjectGroupName,
|
|
normalizeProjectGroups
|
|
} from './project-groups'
|
|
import type { Repo } from './repo-types'
|
|
|
|
function repo(overrides: Partial<Repo>): Repo {
|
|
return {
|
|
id: overrides.id ?? 'repo-1',
|
|
path: overrides.path ?? '/repo',
|
|
displayName: overrides.displayName ?? 'repo',
|
|
badgeColor: '#999',
|
|
addedAt: 1,
|
|
kind: 'git',
|
|
...overrides
|
|
}
|
|
}
|
|
|
|
describe('project-groups', () => {
|
|
it('creates a durable project group with normalized defaults', () => {
|
|
const group = createProjectGroup({
|
|
name: ' Platform ',
|
|
parentPath: '/srv/platform',
|
|
createdFrom: 'folder-scan',
|
|
tabOrder: 3,
|
|
now: 100
|
|
})
|
|
|
|
expect(group).toMatchObject({
|
|
name: 'Platform',
|
|
parentPath: '/srv/platform',
|
|
parentGroupId: null,
|
|
createdFrom: 'folder-scan',
|
|
tabOrder: 3,
|
|
isCollapsed: false,
|
|
color: null,
|
|
createdAt: 100,
|
|
updatedAt: 100
|
|
})
|
|
})
|
|
|
|
it('trims empty group names to a fallback', () => {
|
|
expect(normalizeProjectGroupName(' ', 'Existing')).toBe('Existing')
|
|
})
|
|
|
|
it('normalizes persisted groups and drops malformed entries', () => {
|
|
const groups = normalizeProjectGroups([
|
|
{ id: 'b', name: 'B', tabOrder: 2 },
|
|
{
|
|
id: 'a',
|
|
name: 'A',
|
|
tabOrder: 1,
|
|
parentGroupId: 'missing',
|
|
createdFrom: 'folder-scan',
|
|
isCollapsed: true
|
|
},
|
|
{ id: 'a', name: 'duplicate' },
|
|
{ name: 'missing id' }
|
|
])
|
|
|
|
expect(groups.map((group) => group.id)).toEqual(['a', 'b'])
|
|
expect(groups[0]).toMatchObject({
|
|
createdFrom: 'folder-scan',
|
|
isCollapsed: true,
|
|
parentGroupId: null
|
|
})
|
|
})
|
|
|
|
it('preserves normalized execution ownership for persisted groups', () => {
|
|
const groups = normalizeProjectGroups([
|
|
{ id: 'runtime', name: 'Runtime', tabOrder: 1, executionHostId: 'runtime:env-1' },
|
|
{ id: 'local', name: 'Local', tabOrder: 2, executionHostId: 'local' },
|
|
{ id: 'invalid', name: 'Invalid', tabOrder: 3, executionHostId: 'runtime:' }
|
|
])
|
|
|
|
expect(groups.find((group) => group.id === 'runtime')?.executionHostId).toBe('runtime:env-1')
|
|
expect(groups.find((group) => group.id === 'local')?.executionHostId).toBe('local')
|
|
expect(groups.find((group) => group.id === 'invalid')?.executionHostId).toBeUndefined()
|
|
})
|
|
|
|
it('clears repo memberships whose group no longer exists', () => {
|
|
const groups = [createProjectGroup({ name: 'Known', createdFrom: 'manual', tabOrder: 0 })]
|
|
const repos = clearMissingProjectGroupMemberships(
|
|
[
|
|
repo({ id: 'known', projectGroupId: groups[0].id }),
|
|
repo({ id: 'missing', projectGroupId: 'x' })
|
|
],
|
|
groups
|
|
)
|
|
|
|
expect(repos.find((entry) => entry.id === 'known')?.projectGroupId).toBe(groups[0].id)
|
|
expect(repos.find((entry) => entry.id === 'missing')?.projectGroupId).toBeNull()
|
|
})
|
|
|
|
it('falls back to global repo order when projectGroupOrder is unset', () => {
|
|
const repoOrder = new Map([
|
|
['a', 0],
|
|
['b', 2]
|
|
])
|
|
|
|
expect(
|
|
getEffectiveProjectGroupManualRank(repo({ id: 'a', projectGroupOrder: 5 }), repoOrder)
|
|
).toBe(5)
|
|
expect(getEffectiveProjectGroupManualRank(repo({ id: 'a' }), repoOrder)).toBe(0)
|
|
expect(getEffectiveProjectGroupManualRank(repo({ id: 'b' }), repoOrder)).toBe(2000)
|
|
expect(getEffectiveProjectGroupManualRank(repo({ id: 'c' }), repoOrder, 1)).toBe(1000)
|
|
})
|
|
|
|
it('computes the next order inside a group independently from ungrouped repos', () => {
|
|
expect(
|
|
getNextProjectGroupOrder(
|
|
[
|
|
repo({ id: 'a', projectGroupId: 'g', projectGroupOrder: 2 }),
|
|
repo({ id: 'b', projectGroupId: null, projectGroupOrder: 9 })
|
|
],
|
|
'g'
|
|
)
|
|
).toBe(3)
|
|
})
|
|
|
|
it('collects descendant group ids for subtree deletion', () => {
|
|
expect(
|
|
[
|
|
...getProjectGroupSubtreeIds(
|
|
[
|
|
{ id: 'root', parentGroupId: null },
|
|
{ id: 'child', parentGroupId: 'root' },
|
|
{ id: 'grandchild', parentGroupId: 'child' },
|
|
{ id: 'sibling', parentGroupId: null }
|
|
],
|
|
'root'
|
|
)
|
|
].sort()
|
|
).toEqual(['child', 'grandchild', 'root'])
|
|
})
|
|
|
|
it('collects wide descendant groups without overflowing argument limits', () => {
|
|
const groups = [
|
|
{ id: 'root', parentGroupId: null },
|
|
...Array.from({ length: 130_000 }, (_, index) => ({
|
|
id: `child-${index}`,
|
|
parentGroupId: 'root'
|
|
}))
|
|
]
|
|
|
|
const subtreeIds = getProjectGroupSubtreeIds(groups, 'root')
|
|
|
|
expect(subtreeIds.size).toBe(130_001)
|
|
expect(subtreeIds.has('root')).toBe(true)
|
|
expect(subtreeIds.has('child-129999')).toBe(true)
|
|
})
|
|
})
|