Files
orca/mobile/src/session/mobile-diff-review-screen-model.ts
T
Neil 77f23b013f refactor(shared): drop the shared/types barrel and import from the real modules (#14447)
#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.
2026-08-13 22:48:24 -07:00

120 lines
3.8 KiB
TypeScript

import type { DiffComment, MobileDiffReviewState } from '../../../src/shared/diff-comment-types'
import type { MobileGitBranchCompareResult } from '../source-control/mobile-branch-compare'
import type { MobileGitStatusResult } from '../source-control/mobile-git-status'
import type { MobileDiffLine } from './mobile-diff-lines'
import type { MobileDiffHunk } from './mobile-diff-hunks'
import type {
MobileDiffReviewQueueFilter,
MobileDiffReviewQueueItem
} from './mobile-diff-review-queue'
import type { MobileDiffReviewFileDescriptor } from './mobile-diff-review-state'
import type { MobileHighlightedDiffLine } from './mobile-file-syntax'
import type { MobileReviewTerminalTab } from './mobile-diff-review-rpc'
export type ReviewScreenState =
| { kind: 'loading' }
| {
kind: 'ready'
status: MobileGitStatusResult
branchCompare: MobileGitBranchCompareResult | null
branchError?: string
comments: DiffComment[]
reviewState: MobileDiffReviewState
}
| { kind: 'unavailable'; message: string }
| { kind: 'error'; message: string }
export type ReviewDiffLine = MobileHighlightedDiffLine<MobileDiffLine>
export type ReviewDiffState =
| { kind: 'idle' }
| { kind: 'loading'; itemKey: string }
| {
kind: 'ready'
itemKey: string
lines: ReviewDiffLine[]
hunks: MobileDiffHunk[]
truncated: boolean
}
| { kind: 'binary'; itemKey: string }
| { kind: 'too-large'; itemKey: string; byteLength?: number }
| { kind: 'deleted'; itemKey: string }
| { kind: 'error'; itemKey: string; message: string }
export type ComposerState =
| { mode: 'create'; lineNumber: number }
| { mode: 'edit'; comment: DiffComment }
export type SendSheetState =
| { kind: 'loading' }
| { kind: 'ready'; terminals: MobileReviewTerminalTab[] }
| { kind: 'error'; message: string; terminals: MobileReviewTerminalTab[] }
export type GitMutationMethod = 'git.stage' | 'git.unstage' | 'git.discard'
export const REVIEW_FILTERS: MobileDiffReviewQueueFilter[] = [
'all',
'unreviewed',
'notes',
'unstaged',
'staged',
'branch'
]
export function firstReviewParam(value: string | string[] | undefined): string {
return Array.isArray(value) ? (value[0] ?? '') : (value ?? '')
}
export function normalizeReviewFilterParam(value: string): MobileDiffReviewQueueFilter {
return REVIEW_FILTERS.includes(value as MobileDiffReviewQueueFilter)
? (value as MobileDiffReviewQueueFilter)
: 'all'
}
export function reviewDescriptorFromItem(
item: MobileDiffReviewQueueItem
): MobileDiffReviewFileDescriptor {
return {
key: item.key,
filePath: item.filePath,
oldPath: item.oldPath,
scope: item.scope,
diffIdentity: item.diffIdentity
}
}
export function nextReviewIndexAfterMarkReviewed({
currentIndex,
currentItemKey,
filter,
filteredQueue
}: {
currentIndex: number
currentItemKey: string
filter: MobileDiffReviewQueueFilter
filteredQueue: readonly MobileDiffReviewQueueItem[]
}): number | null {
const nextIndex = filteredQueue.findIndex(
(item, index) => index > currentIndex && item.key !== currentItemKey && !item.isReviewed
)
const wrappedIndex = filteredQueue.findIndex(
(item) => item.key !== currentItemKey && !item.isReviewed
)
const targetIndex = nextIndex !== -1 ? nextIndex : wrappedIndex !== -1 ? wrappedIndex : null
if (targetIndex === null) {
return null
}
return filter === 'unreviewed' && targetIndex > currentIndex ? targetIndex - 1 : targetIndex
}
export function mobileReviewScopeLabel(item: MobileDiffReviewQueueItem): string {
if (item.scope === 'branch') {
return 'Branch'
}
return item.scope === 'staged' ? 'Staged' : 'Unstaged'
}
export function mobileReviewCountLabel(count: number, singular: string, plural: string): string {
return `${count} ${count === 1 ? singular : plural}`
}