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.
163 lines
4.9 KiB
TypeScript
163 lines
4.9 KiB
TypeScript
import { ActivityIndicator, FlatList, Pressable, Text, View } from 'react-native'
|
|
import { RefreshCw } from 'lucide-react-native'
|
|
import type { RefObject } from 'react'
|
|
import type { DiffComment } from '../../../src/shared/diff-comment-types'
|
|
import { colors } from '../theme/mobile-theme'
|
|
import { MobileDiffReviewLine } from './MobileDiffReviewLine'
|
|
import type {
|
|
ReviewDiffLine,
|
|
ReviewDiffState,
|
|
ReviewScreenState
|
|
} from '../session/mobile-diff-review-screen-model'
|
|
import type { MobileDiffReviewQueueItem } from '../session/mobile-diff-review-queue'
|
|
import { mobileDiffReviewStyles as styles } from './mobile-diff-review-screen-styles'
|
|
|
|
type Props = {
|
|
activeHunkIndex: number | null
|
|
commentsByLine: ReadonlyMap<number, DiffComment[]>
|
|
currentItem: MobileDiffReviewQueueItem | null
|
|
diffState: ReviewDiffState
|
|
filteredCount: number
|
|
listRef: RefObject<FlatList<ReviewDiffLine> | null>
|
|
screenState: ReviewScreenState
|
|
staleCommentIds: ReadonlySet<string>
|
|
onAddNote: (lineNumber: number) => void
|
|
onEditNote: (comment: DiffComment) => void
|
|
onRetry: () => void
|
|
}
|
|
|
|
export function MobileDiffReviewBody({
|
|
activeHunkIndex,
|
|
commentsByLine,
|
|
currentItem,
|
|
diffState,
|
|
filteredCount,
|
|
listRef,
|
|
screenState,
|
|
staleCommentIds,
|
|
onAddNote,
|
|
onEditNote,
|
|
onRetry
|
|
}: Props) {
|
|
if (screenState.kind === 'loading') {
|
|
return <CenteredState text="Loading review..." busy />
|
|
}
|
|
if (screenState.kind === 'error' || screenState.kind === 'unavailable') {
|
|
return (
|
|
<CenteredState
|
|
title={screenState.kind === 'unavailable' ? 'Review Unavailable' : 'Unable to Load Review'}
|
|
text={screenState.message}
|
|
onRetry={onRetry}
|
|
/>
|
|
)
|
|
}
|
|
if (filteredCount === 0) {
|
|
return <CenteredState title="No Reviewable Changes" text="Try a different review filter." />
|
|
}
|
|
if (diffState.kind === 'loading') {
|
|
return <CenteredState text="Loading diff..." busy muted />
|
|
}
|
|
if (diffState.kind !== 'ready') {
|
|
return <DiffUnavailableState diffState={diffState} onRetry={onRetry} />
|
|
}
|
|
return (
|
|
<FlatList
|
|
ref={listRef}
|
|
data={diffState.lines}
|
|
keyExtractor={(_, index) => `${currentItem?.key ?? 'diff'}:${index}`}
|
|
renderItem={({ item, index }) => {
|
|
const lineNumber = item.newLineNumber ?? -1
|
|
const active =
|
|
activeHunkIndex !== null &&
|
|
index >= (diffState.hunks[activeHunkIndex]?.startIndex ?? -1) &&
|
|
index <= (diffState.hunks[activeHunkIndex]?.endIndex ?? -1)
|
|
return (
|
|
<MobileDiffReviewLine
|
|
line={item}
|
|
comments={commentsByLine.get(lineNumber) ?? []}
|
|
staleCommentIds={staleCommentIds}
|
|
active={active}
|
|
onAddNote={onAddNote}
|
|
onEditNote={onEditNote}
|
|
/>
|
|
)
|
|
}}
|
|
contentContainerStyle={styles.diffList}
|
|
onScrollToIndexFailed={(info) => {
|
|
listRef.current?.scrollToOffset({
|
|
offset: Math.max(0, info.averageItemLength * info.index),
|
|
animated: true
|
|
})
|
|
}}
|
|
ListFooterComponent={
|
|
diffState.truncated ? (
|
|
<Text style={styles.truncatedText}>Diff truncated for mobile preview.</Text>
|
|
) : null
|
|
}
|
|
/>
|
|
)
|
|
}
|
|
|
|
function DiffUnavailableState({
|
|
diffState,
|
|
onRetry
|
|
}: {
|
|
diffState: ReviewDiffState
|
|
onRetry: () => void
|
|
}) {
|
|
const title =
|
|
diffState.kind === 'binary'
|
|
? 'Binary Diff'
|
|
: diffState.kind === 'too-large'
|
|
? 'Diff Too Large'
|
|
: diffState.kind === 'deleted'
|
|
? 'Deleted File'
|
|
: 'Diff Unavailable'
|
|
const text =
|
|
diffState.kind === 'binary'
|
|
? 'This file cannot be rendered as text on mobile.'
|
|
: diffState.kind === 'too-large'
|
|
? 'This diff is too large for the mobile preview.'
|
|
: diffState.kind === 'deleted'
|
|
? 'This file was deleted. Add a file note or mark it reviewed.'
|
|
: diffState.kind === 'error'
|
|
? diffState.message
|
|
: 'Select a file to review.'
|
|
return <CenteredState title={title} text={text} onRetry={onRetry} />
|
|
}
|
|
|
|
function CenteredState({
|
|
busy,
|
|
muted,
|
|
title,
|
|
text,
|
|
onRetry
|
|
}: {
|
|
busy?: boolean
|
|
muted?: boolean
|
|
title?: string
|
|
text: string
|
|
onRetry?: () => void
|
|
}) {
|
|
return (
|
|
<View style={styles.state}>
|
|
{busy ? (
|
|
<ActivityIndicator color={muted ? colors.textSecondary : colors.textPrimary} />
|
|
) : null}
|
|
{title ? <Text style={styles.stateTitle}>{title}</Text> : null}
|
|
<Text style={styles.stateText}>{text}</Text>
|
|
{onRetry ? (
|
|
<Pressable
|
|
style={({ pressed }) => [styles.retryButton, pressed && styles.buttonPressed]}
|
|
onPress={onRetry}
|
|
accessibilityRole="button"
|
|
accessibilityLabel="Retry loading review"
|
|
>
|
|
<RefreshCw size={14} color={colors.textPrimary} strokeWidth={2.2} />
|
|
<Text style={styles.retryText}>Retry</Text>
|
|
</Pressable>
|
|
) : null}
|
|
</View>
|
|
)
|
|
}
|