mirror of
https://github.com/stablyai/orca.git
synced 2026-09-24 00:02:24 +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.
121 lines
3.6 KiB
TypeScript
121 lines
3.6 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
|
import type { DiffComment, MobileDiffReviewState } from '../../../src/shared/diff-comment-types'
|
|
import type { MobileGitBranchChangeEntry } from '../source-control/mobile-branch-compare'
|
|
import type { MobileGitStatusEntry } from '../source-control/mobile-git-status'
|
|
import {
|
|
buildMobileDiffReviewQueue,
|
|
createMobileDiffReviewFileKey,
|
|
filterMobileDiffReviewQueue
|
|
} from './mobile-diff-review-queue'
|
|
|
|
const emptyReviewState: MobileDiffReviewState = { version: 1, files: {} }
|
|
|
|
function statusEntry(overrides: Partial<MobileGitStatusEntry>): MobileGitStatusEntry {
|
|
return {
|
|
path: 'src/app.ts',
|
|
status: 'modified',
|
|
area: 'unstaged',
|
|
...overrides
|
|
}
|
|
}
|
|
|
|
function branchEntry(overrides: Partial<MobileGitBranchChangeEntry>): MobileGitBranchChangeEntry {
|
|
return {
|
|
path: 'src/branch.ts',
|
|
status: 'modified',
|
|
...overrides
|
|
}
|
|
}
|
|
|
|
function comment(overrides: Partial<DiffComment> & Pick<DiffComment, 'id'>): DiffComment {
|
|
const { id, ...rest } = overrides
|
|
return {
|
|
id,
|
|
worktreeId: 'wt-1',
|
|
filePath: 'src/app.ts',
|
|
source: 'diff',
|
|
lineNumber: 2,
|
|
body: 'note',
|
|
createdAt: 10,
|
|
side: 'modified',
|
|
...rest
|
|
}
|
|
}
|
|
|
|
describe('mobile diff review queue', () => {
|
|
it('builds unstaged, staged, and branch entries in review order', () => {
|
|
const queue = buildMobileDiffReviewQueue({
|
|
worktreeId: 'wt-1',
|
|
statusEntries: [
|
|
statusEntry({ path: 'z.ts', area: 'staged' }),
|
|
statusEntry({ path: 'a.ts', area: 'unstaged' })
|
|
],
|
|
branchEntries: [branchEntry({ path: 'b.ts' })],
|
|
branchHeadOid: 'head',
|
|
branchMergeBase: 'base',
|
|
comments: [],
|
|
reviewState: emptyReviewState
|
|
})
|
|
|
|
expect(queue.map((item) => `${item.scope}:${item.filePath}`)).toEqual([
|
|
'unstaged:a.ts',
|
|
'staged:z.ts',
|
|
'branch:b.ts'
|
|
])
|
|
})
|
|
|
|
it('uses stable keys for renamed files', () => {
|
|
expect(createMobileDiffReviewFileKey('branch', 'branch', 'new.ts', 'old.ts')).toBe(
|
|
'branch\0branch\0old.ts\0new.ts'
|
|
)
|
|
})
|
|
|
|
it('counts unsent and stale notes for matching review items', () => {
|
|
const queue = buildMobileDiffReviewQueue({
|
|
worktreeId: 'wt-1',
|
|
statusEntries: [statusEntry({ path: 'src/app.ts', area: 'unstaged' })],
|
|
branchEntries: [],
|
|
comments: [
|
|
comment({ id: 'a', scope: 'unstaged', diffIdentity: 'stale' }),
|
|
comment({ id: 'b', scope: 'unstaged', sentAt: 20 })
|
|
],
|
|
reviewState: emptyReviewState
|
|
})
|
|
|
|
expect(queue[0]).toMatchObject({ noteCount: 2, unsentNoteCount: 1, staleNoteCount: 1 })
|
|
})
|
|
|
|
it('filters unreviewed files and noted files', () => {
|
|
const reviewState: MobileDiffReviewState = {
|
|
version: 1,
|
|
files: {
|
|
[createMobileDiffReviewFileKey('unstaged', 'unstaged', 'a.ts')]: {
|
|
key: createMobileDiffReviewFileKey('unstaged', 'unstaged', 'a.ts'),
|
|
filePath: 'a.ts',
|
|
scope: 'unstaged',
|
|
reviewedAt: 11,
|
|
reviewDiffIdentity: 'wrong'
|
|
}
|
|
}
|
|
}
|
|
const queue = buildMobileDiffReviewQueue({
|
|
worktreeId: 'wt-1',
|
|
statusEntries: [
|
|
statusEntry({ path: 'a.ts', area: 'unstaged' }),
|
|
statusEntry({ path: 'b.ts', area: 'unstaged' })
|
|
],
|
|
branchEntries: [],
|
|
comments: [comment({ id: 'a', filePath: 'b.ts' })],
|
|
reviewState
|
|
})
|
|
|
|
expect(filterMobileDiffReviewQueue(queue, 'unreviewed').map((item) => item.filePath)).toEqual([
|
|
'a.ts',
|
|
'b.ts'
|
|
])
|
|
expect(filterMobileDiffReviewQueue(queue, 'notes').map((item) => item.filePath)).toEqual([
|
|
'b.ts'
|
|
])
|
|
})
|
|
})
|