mirror of
https://github.com/stablyai/orca.git
synced 2026-09-28 16:02:45 +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.
145 lines
4.8 KiB
TypeScript
145 lines
4.8 KiB
TypeScript
import type { DiffComment, DiffReviewScope } from '../../../src/shared/diff-comment-types'
|
|
import { formatDiffComment, formatDiffComments } from '../../../src/shared/diff-comments-format'
|
|
|
|
export { formatDiffComment, formatDiffComments }
|
|
|
|
export type CreateMobileDiffCommentInput = {
|
|
worktreeId: string
|
|
filePath: string
|
|
oldPath?: string
|
|
lineNumber: number
|
|
body: string
|
|
id: string
|
|
createdAt: number
|
|
scope?: DiffReviewScope
|
|
diffIdentity?: string
|
|
}
|
|
|
|
function isRecord(value: unknown): value is Record<string, unknown> {
|
|
return typeof value === 'object' && value !== null
|
|
}
|
|
|
|
function normalizeScope(value: unknown): DiffReviewScope | undefined {
|
|
return value === 'unstaged' || value === 'staged' || value === 'branch' ? value : undefined
|
|
}
|
|
|
|
export function formatMobileDiffReviewPrompt(comments: readonly DiffComment[]): string {
|
|
return [
|
|
'You are reviewing the current worktree. Address the following mobile review notes.',
|
|
'',
|
|
formatDiffComments(comments),
|
|
'',
|
|
'After applying fixes:',
|
|
'1. Summarize changed files.',
|
|
'2. Run relevant tests.',
|
|
'3. Tell me if anything remains risky.'
|
|
].join('\n')
|
|
}
|
|
|
|
export function normalizeMobileDiffComments(value: unknown, worktreeId: string): DiffComment[] {
|
|
if (!Array.isArray(value)) {
|
|
return []
|
|
}
|
|
return value.flatMap((candidate): DiffComment[] => {
|
|
if (!isRecord(candidate)) {
|
|
return []
|
|
}
|
|
const id = typeof candidate.id === 'string' ? candidate.id : ''
|
|
const filePath = typeof candidate.filePath === 'string' ? candidate.filePath : ''
|
|
const lineNumber = typeof candidate.lineNumber === 'number' ? candidate.lineNumber : Number.NaN
|
|
const body = typeof candidate.body === 'string' ? candidate.body.trim() : ''
|
|
const createdAt = typeof candidate.createdAt === 'number' ? candidate.createdAt : Date.now()
|
|
if (!id || !filePath || !Number.isFinite(lineNumber) || lineNumber < 0 || !body) {
|
|
return []
|
|
}
|
|
return [
|
|
{
|
|
id,
|
|
worktreeId: typeof candidate.worktreeId === 'string' ? candidate.worktreeId : worktreeId,
|
|
filePath,
|
|
source: candidate.source === 'markdown' ? 'markdown' : 'diff',
|
|
selectedText:
|
|
typeof candidate.selectedText === 'string' ? candidate.selectedText : undefined,
|
|
startLine: typeof candidate.startLine === 'number' ? candidate.startLine : undefined,
|
|
lineNumber,
|
|
body,
|
|
createdAt,
|
|
updatedAt: typeof candidate.updatedAt === 'number' ? candidate.updatedAt : undefined,
|
|
sentAt: typeof candidate.sentAt === 'number' ? candidate.sentAt : undefined,
|
|
scope: normalizeScope(candidate.scope),
|
|
oldPath: typeof candidate.oldPath === 'string' ? candidate.oldPath : undefined,
|
|
diffIdentity:
|
|
typeof candidate.diffIdentity === 'string' ? candidate.diffIdentity : undefined,
|
|
side: 'modified'
|
|
}
|
|
]
|
|
})
|
|
}
|
|
|
|
export function createMobileDiffComment(input: CreateMobileDiffCommentInput): DiffComment | null {
|
|
const body = input.body.trim()
|
|
if (!body || !Number.isFinite(input.lineNumber) || input.lineNumber < 0) {
|
|
return null
|
|
}
|
|
return {
|
|
id: input.id,
|
|
worktreeId: input.worktreeId,
|
|
filePath: input.filePath,
|
|
oldPath: input.oldPath,
|
|
source: 'diff',
|
|
lineNumber: input.lineNumber,
|
|
body,
|
|
createdAt: input.createdAt,
|
|
scope: input.scope,
|
|
diffIdentity: input.diffIdentity,
|
|
side: 'modified'
|
|
}
|
|
}
|
|
|
|
export function addMobileDiffComment(
|
|
comments: readonly DiffComment[],
|
|
input: CreateMobileDiffCommentInput
|
|
): { comments: DiffComment[]; comment: DiffComment | null } {
|
|
const comment = createMobileDiffComment(input)
|
|
if (!comment) {
|
|
return { comments: [...comments], comment: null }
|
|
}
|
|
return { comments: [...comments, comment], comment }
|
|
}
|
|
|
|
export function removeMobileDiffComments(
|
|
comments: readonly DiffComment[],
|
|
ids: ReadonlySet<string>
|
|
): DiffComment[] {
|
|
if (ids.size === 0) {
|
|
return [...comments]
|
|
}
|
|
return comments.filter((comment) => !ids.has(comment.id))
|
|
}
|
|
|
|
function deliveredCommentMatches(comment: DiffComment, delivered: DiffComment): boolean {
|
|
return (
|
|
comment.id === delivered.id &&
|
|
comment.body === delivered.body &&
|
|
comment.filePath === delivered.filePath &&
|
|
comment.lineNumber === delivered.lineNumber &&
|
|
comment.selectedText === delivered.selectedText &&
|
|
comment.source === delivered.source &&
|
|
comment.startLine === delivered.startLine
|
|
)
|
|
}
|
|
|
|
export function removeDeliveredMobileDiffComments(
|
|
comments: readonly DiffComment[],
|
|
delivered: readonly DiffComment[]
|
|
): DiffComment[] {
|
|
if (delivered.length === 0) {
|
|
return [...comments]
|
|
}
|
|
const deliveredById = new Map(delivered.map((comment) => [comment.id, comment]))
|
|
return comments.filter((comment) => {
|
|
const snapshot = deliveredById.get(comment.id)
|
|
return !snapshot || !deliveredCommentMatches(comment, snapshot)
|
|
})
|
|
}
|