mirror of
https://github.com/stablyai/orca.git
synced 2026-09-22 08:02:28 +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.
56 lines
1.6 KiB
TypeScript
56 lines
1.6 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
|
import type { DiffComment } from '../../../src/shared/diff-comment-types'
|
|
import {
|
|
clearSentMobileDiffComments,
|
|
countUnsentMobileDiffComments,
|
|
getUnsentMobileDiffComments,
|
|
markMobileDiffCommentsSent,
|
|
updateMobileDiffComment
|
|
} from './mobile-diff-comment-edit'
|
|
|
|
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: 4,
|
|
body: 'check this',
|
|
createdAt: 100,
|
|
side: 'modified',
|
|
...rest
|
|
}
|
|
}
|
|
|
|
describe('mobile diff comment editing', () => {
|
|
it('edits notes and clears sent state', () => {
|
|
const result = updateMobileDiffComment([comment({ id: 'a', sentAt: 150 })], {
|
|
id: 'a',
|
|
body: ' updated ',
|
|
updatedAt: 200
|
|
})
|
|
|
|
expect(result.comment).toMatchObject({ id: 'a', body: 'updated', updatedAt: 200 })
|
|
expect(result.comment?.sentAt).toBeUndefined()
|
|
})
|
|
|
|
it('marks notes sent and excludes them from unsent counts', () => {
|
|
const comments = markMobileDiffCommentsSent(
|
|
[comment({ id: 'a' }), comment({ id: 'b' })],
|
|
new Set(['a']),
|
|
250
|
|
)
|
|
|
|
expect(comments[0]?.sentAt).toBe(250)
|
|
expect(countUnsentMobileDiffComments(comments)).toBe(1)
|
|
expect(getUnsentMobileDiffComments(comments)).toEqual([comment({ id: 'b' })])
|
|
})
|
|
|
|
it('clears sent notes without removing unsent edits', () => {
|
|
expect(
|
|
clearSentMobileDiffComments([comment({ id: 'a', sentAt: 1 }), comment({ id: 'b' })])
|
|
).toEqual([comment({ id: 'b' })])
|
|
})
|
|
})
|