Skip to content

Commit cffb6ec

Browse files
perf(web): review file patches compile without manual memoization
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent a702563 commit cffb6ec

1 file changed

Lines changed: 159 additions & 166 deletions

File tree

‎apps/web/src/components/diffs/useReviewFilePatches.ts‎

Lines changed: 159 additions & 166 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,16 @@ import type { FileDiffMetadata } from "@pierre/diffs";
33
import type { EnvironmentId, ReviewDiffPreviewSource } from "@t3tools/contracts";
44
import * as AsyncResult from "effect/reactivity/AsyncResult";
55
import * as Atom from "effect/reactivity/Atom";
6-
import {
7-
useCallback,
8-
useContext,
9-
useEffect,
10-
useLayoutEffect,
11-
useMemo,
12-
useRef,
13-
useState,
14-
} from "react";
6+
import { useContext, useEffect, useRef, useState } from "react";
7+
import { useStableCallback } from "~/hooks/useStableCallback";
158
import { getRenderablePatch, resolveFileDiffPath, type RenderablePatch } from "~/lib/diffRendering";
169
import { reviewEnvironment } from "~/state/review";
1710

1811
const filePathCollator = new Intl.Collator(undefined, {
1912
numeric: true,
2013
sensitivity: "base",
2114
});
15+
const DEFAULT_INDICES = [0, 1, 2, 3];
2216

2317
export function useReviewFilePatches({
2418
environmentId,
@@ -48,45 +42,16 @@ export function useReviewFilePatches({
4842
baseRef,
4943
ignoreWhitespace,
5044
]);
51-
const [requested, setRequested] = useState({ scope, indices: [0, 1, 2, 3] });
52-
const indices = useMemo(
53-
() => (requested.scope === scope ? requested.indices : [0, 1, 2, 3]),
54-
[requested, scope],
55-
);
56-
const files = useMemo(
57-
() => source?.files?.toSorted((a, b) => filePathCollator.compare(a.path, b.path)) ?? [],
58-
[source?.files],
59-
);
60-
const queries = useMemo(
61-
() =>
62-
!environmentId || !cwd || !source
63-
? []
64-
: indices
65-
.filter((index) => index < files.length)
66-
.map((index) => {
67-
const file = files[index]!;
68-
return {
69-
index,
70-
query: reviewEnvironment.diffFilePatch({
71-
environmentId,
72-
input: {
73-
cacheKey: scope,
74-
request: {
75-
cwd,
76-
...(baseRef ? { baseRef } : {}),
77-
ignoreWhitespace,
78-
file: {
79-
path: file.path,
80-
previousPath: file.previousPath,
81-
sourceKind: source.kind,
82-
},
83-
},
84-
},
85-
}),
86-
};
87-
}),
88-
[environmentId, cwd, source, files, indices, scope, baseRef, ignoreWhitespace],
89-
);
45+
const [requested, setRequested] = useState({ scope, indices: DEFAULT_INDICES });
46+
const { files, queries } = useReviewFileQueries({
47+
environmentId,
48+
cwd,
49+
source,
50+
baseRef,
51+
ignoreWhitespace,
52+
scope,
53+
requested,
54+
});
9055
const previousPreview = useRef({ scope, revision, queries: [] as typeof queries });
9156
useEffect(() => {
9257
const previous = previousPreview.current;
@@ -100,37 +65,7 @@ export function useReviewFilePatches({
10065
if (changed || cached) registry.refresh(query);
10166
}
10267
}, [scope, revision, queries, registry]);
103-
// Derived atoms parse each query result once, even when another file finishes loading.
104-
const parsedQuery = useMemo(
105-
() =>
106-
Atom.family((query: ReturnType<typeof reviewEnvironment.diffFilePatch>) =>
107-
Atom.map(query, (result) =>
108-
AsyncResult.map(result, (source) => {
109-
let patch = getRenderablePatch(source.diff, `diff-panel:${theme}`, {
110-
compactPartialHunkOffsets: true,
111-
});
112-
if (patch?.kind === "files" && patch.files.length === 1 && source.files?.length === 1) {
113-
const stat = source.files[0]!;
114-
const file = { ...patch.files[0]!, name: stat.path };
115-
if (stat.previousPath !== null) file.prevName = stat.previousPath;
116-
else delete file.prevName;
117-
patch = { ...patch, files: [file] };
118-
}
119-
return { source, patch };
120-
}),
121-
),
122-
),
123-
[theme],
124-
);
125-
const patches = useAtomValue(
126-
useMemo(
127-
() =>
128-
Atom.make(
129-
(get) => new Map(queries.map(({ index, query }) => [index, get(parsedQuery(query))])),
130-
),
131-
[queries, parsedQuery],
132-
),
133-
);
68+
const patches = useAtomValue(usePatchesAtom(queries, theme));
13469
const pendingIndex = files.findIndex((_, index) => {
13570
const patch = patches.get(index);
13671
return !patch || patch._tag === "Initial";
@@ -142,94 +77,69 @@ export function useReviewFilePatches({
14277
: preview?.kind === "files"
14378
? preview.files.length
14479
: 0;
145-
const requestFiles = useCallback(
146-
(indices: number[]) =>
147-
setRequested((current) => {
148-
const previous = current.scope === scope ? current.indices : [0, 1, 2, 3];
149-
const added = indices.filter((index) => !previous.includes(index));
150-
return added.length === 0 ? current : { scope, indices: [...previous, ...added] };
151-
}),
152-
[scope],
153-
);
154-
const loadNextFiles = useCallback(
155-
() => requestFiles(Array.from({ length: 4 }, (_, index) => settledFileCount + index)),
156-
[requestFiles, settledFileCount],
157-
);
158-
const requestFile = useCallback((index: number) => requestFiles([index]), [requestFiles]);
159-
const retryInputsRef = useRef({ queries, files });
160-
useLayoutEffect(() => {
161-
retryInputsRef.current = { queries, files };
162-
}, [queries, files]);
163-
const retry = useCallback(
164-
(path: string) => {
165-
const { queries, files } = retryInputsRef.current;
166-
const query = queries.find(({ index }) => files[index]?.path === path)?.query;
167-
if (query) registry.refresh(query);
168-
},
169-
[registry],
170-
);
171-
const renderableFiles = useMemo(
172-
() =>
173-
source
174-
? files.map((file, index): FileDiffMetadata => {
175-
const result = patches.get(index);
176-
if (result?._tag === "Success" && result.value.patch?.kind === "files") {
177-
const loaded = result.value.patch.files.find(
178-
(candidate) => resolveFileDiffPath(candidate) === file.path,
179-
);
180-
if (loaded) return loaded;
181-
}
182-
return {
183-
name: file.path,
184-
...(file.previousPath ? { prevName: file.previousPath } : {}),
185-
type: file.previousPath ? "rename-changed" : "change",
186-
hunks: [],
187-
additionLines: [],
188-
deletionLines: [],
189-
splitLineCount: 0,
190-
unifiedLineCount: 0,
191-
isPartial: true,
192-
cacheKey: `${scope}:${file.path}:pending`,
193-
};
194-
})
195-
: (preview?.kind === "files" ? preview.files : []).toSorted((a, b) =>
196-
filePathCollator.compare(resolveFileDiffPath(a), resolveFileDiffPath(b)),
197-
),
198-
[source, files, patches, scope, preview],
199-
);
200-
const fileStates = useMemo(
201-
() =>
202-
new Map(
203-
files.map((file, index) => {
204-
const patch = patches.get(index);
205-
return [
206-
file.path,
207-
{
208-
error:
209-
patch?._tag === "Failure" ||
210-
(patch?._tag === "Success" &&
211-
(patch.value.patch?.kind !== "files" ||
212-
!patch.value.patch.files.some(
213-
(candidate) => resolveFileDiffPath(candidate) === file.path,
214-
))),
215-
truncated: patch?._tag === "Success" && patch.value.source.truncated,
216-
},
217-
] as const;
218-
}),
219-
),
220-
[files, patches],
80+
const requestFiles = (indices: number[]) =>
81+
setRequested((current) => {
82+
const previous = current.scope === scope ? current.indices : [0, 1, 2, 3];
83+
const added = indices.filter((index) => !previous.includes(index));
84+
return added.length === 0 ? current : { scope, indices: [...previous, ...added] };
85+
});
86+
const loadNextFiles = () =>
87+
requestFiles(Array.from({ length: 4 }, (_, index) => settledFileCount + index));
88+
const requestFile = (index: number) => requestFiles([index]);
89+
const retry = useStableCallback((path: string) => {
90+
const query = queries.find(({ index }) => files[index]?.path === path)?.query;
91+
if (query) registry.refresh(query);
92+
});
93+
const renderableFiles = source
94+
? files.map((file, index): FileDiffMetadata => {
95+
const result = patches.get(index);
96+
if (result?._tag === "Success" && result.value.patch?.kind === "files") {
97+
const loaded = result.value.patch.files.find(
98+
(candidate) => resolveFileDiffPath(candidate) === file.path,
99+
);
100+
if (loaded) return loaded;
101+
}
102+
return {
103+
name: file.path,
104+
...(file.previousPath ? { prevName: file.previousPath } : {}),
105+
type: file.previousPath ? "rename-changed" : "change",
106+
hunks: [],
107+
additionLines: [],
108+
deletionLines: [],
109+
splitLineCount: 0,
110+
unifiedLineCount: 0,
111+
isPartial: true,
112+
cacheKey: `${scope}:${file.path}:pending`,
113+
};
114+
})
115+
: (preview?.kind === "files" ? preview.files : []).toSorted((a, b) =>
116+
filePathCollator.compare(resolveFileDiffPath(a), resolveFileDiffPath(b)),
117+
);
118+
const fileStates = new Map(
119+
files.map((file, index) => {
120+
const patch = patches.get(index);
121+
return [
122+
file.path,
123+
{
124+
error:
125+
patch?._tag === "Failure" ||
126+
(patch?._tag === "Success" &&
127+
(patch.value.patch?.kind !== "files" ||
128+
!patch.value.patch.files.some(
129+
(candidate) => resolveFileDiffPath(candidate) === file.path,
130+
))),
131+
truncated: patch?._tag === "Success" && patch.value.source.truncated,
132+
},
133+
] as const;
134+
}),
221135
);
222-
const readyFilePaths = useMemo(
223-
() =>
224-
new Set(
225-
files
226-
.filter((_, index) => {
227-
const patch = patches.get(index);
228-
return patch && patch._tag !== "Initial";
229-
})
230-
.map((file) => file.path),
231-
),
232-
[files, patches],
136+
const readyFilePaths = new Set(
137+
files
138+
.filter((_, index) => {
139+
const patch = patches.get(index);
140+
return patch && patch._tag !== "Initial";
141+
})
142+
.map((file) => file.path),
233143
);
234144
return {
235145
scope,
@@ -243,3 +153,86 @@ export function useReviewFilePatches({
243153
loadNextFiles,
244154
};
245155
}
156+
157+
// The caller runs more hooks after these values, so the compiler would rebuild them
158+
// every render there; the refresh effect and the patches atom key on their identity.
159+
function useReviewFileQueries({
160+
environmentId,
161+
cwd,
162+
source,
163+
baseRef,
164+
ignoreWhitespace,
165+
scope,
166+
requested,
167+
}: {
168+
environmentId: EnvironmentId | undefined;
169+
cwd: string | undefined;
170+
source: ReviewDiffPreviewSource | null;
171+
baseRef: string | null;
172+
ignoreWhitespace: boolean;
173+
scope: string;
174+
requested: { scope: string; indices: number[] };
175+
}) {
176+
"use memo";
177+
const indices = requested.scope === scope ? requested.indices : DEFAULT_INDICES;
178+
const files = source?.files?.toSorted((a, b) => filePathCollator.compare(a.path, b.path)) ?? [];
179+
const queries =
180+
!environmentId || !cwd || !source
181+
? []
182+
: indices
183+
.filter((index) => index < files.length)
184+
.map((index) => {
185+
const file = files[index]!;
186+
return {
187+
index,
188+
query: reviewEnvironment.diffFilePatch({
189+
environmentId,
190+
input: {
191+
cacheKey: scope,
192+
request: {
193+
cwd,
194+
...(baseRef ? { baseRef } : {}),
195+
ignoreWhitespace,
196+
file: {
197+
path: file.path,
198+
previousPath: file.previousPath,
199+
sourceKind: source.kind,
200+
},
201+
},
202+
},
203+
}),
204+
};
205+
});
206+
return { files, queries };
207+
}
208+
209+
function usePatchesAtom(
210+
queries: ReadonlyArray<{
211+
index: number;
212+
query: ReturnType<typeof reviewEnvironment.diffFilePatch>;
213+
}>,
214+
theme: "light" | "dark",
215+
) {
216+
"use memo";
217+
// Derived atoms parse each query result once, even when another file finishes loading.
218+
const parsedQuery = Atom.family((query: ReturnType<typeof reviewEnvironment.diffFilePatch>) =>
219+
Atom.map(query, (result) =>
220+
AsyncResult.map(result, (source) => {
221+
let patch = getRenderablePatch(source.diff, `diff-panel:${theme}`, {
222+
compactPartialHunkOffsets: true,
223+
});
224+
if (patch?.kind === "files" && patch.files.length === 1 && source.files?.length === 1) {
225+
const stat = source.files[0]!;
226+
const file = { ...patch.files[0]!, name: stat.path };
227+
if (stat.previousPath !== null) file.prevName = stat.previousPath;
228+
else delete file.prevName;
229+
patch = { ...patch, files: [file] };
230+
}
231+
return { source, patch };
232+
}),
233+
),
234+
);
235+
return Atom.make(
236+
(get) => new Map(queries.map(({ index, query }) => [index, get(parsedQuery(query))])),
237+
);
238+
}

0 commit comments

Comments
 (0)