yield patches one at a time

Author: jpenilla

web/src/lib/diff-viewer-multi-file.svelte.ts

@@ -6,7 +6,7 @@ import {
     getGithubToken,
     type GithubDiff,
     type GithubDiffResult,
-    splitMultiFilePatchGithub,
+    parseMultiFilePatchGithub,
 } from "./github.svelte";
 import { type StructuredPatch } from "diff";
 import {
@@ -498,6 +498,9 @@ export class MultiFileDiffViewerState {
                 // Pushing directly to the main array causes too many signals to update (lag)
                 tempDetails.push(details);
             }
+            if (tempDetails.length === 0) {
+                throw new Error("No valid patches found in the provided data.");
+            }
             tempDetails.sort(compareFileDetails);
             this.fileDetails.push(...tempDetails);
             return true;
@@ -520,13 +523,7 @@ export class MultiFileDiffViewerState {
             },
             async () => {
                 const result = await resultPromise;
-                const split = splitMultiFilePatchGithub(result.info, result.response);
-                async function* generatePatches() {
-                    for (const patch of split) {
-                        yield patch;
-                    }
-                }
-                return generatePatches();
+                return parseMultiFilePatchGithub(result.info, result.response);
             },
         );
     }

web/src/lib/github.svelte.ts

@@ -1,6 +1,6 @@
 import { browser } from "$app/environment";
 import type { components } from "@octokit/openapi-types";
-import { splitMultiFilePatch, trimCommitHash } from "$lib/util";
+import { parseMultiFilePatch, trimCommitHash } from "$lib/util";
 import { makeImageDetails } from "$lib/diff-viewer-multi-file.svelte";
 import { PUBLIC_GITHUB_APP_NAME, PUBLIC_GITHUB_CLIENT_ID } from "$env/static/public";
 
@@ -139,8 +139,8 @@ export async function fetchGithubPRInfo(token: string | null, owner: string, rep
     }
 }
 
-export function splitMultiFilePatchGithub(details: GithubDiff, patch: string) {
-    return splitMultiFilePatch(patch, (from, to, status) => {
+export function parseMultiFilePatchGithub(details: GithubDiff, patch: string) {
+    return parseMultiFilePatch(patch, (from, to, status) => {
         const token = getGithubToken();
         return makeImageDetails(
             from,

web/src/lib/util.ts

@@ -98,14 +98,14 @@ export function binaryFileDummyDetails(fromFile: string, toFile: string, status:
 
 const fileRegex = /diff --git a\/(\S+) b\/(\S+)\r?\n(?:.+\r?\n)*?(?=-- \r?\n|diff --git|$)/g;
 
-function parseHeader(
-    patch: string,
-    fromFile: string,
-    toFile: string,
-): {
+type BasicHeader = {
+    fromFile: string;
+    toFile: string;
     status: FileStatus;
     binary: boolean;
-} {
+};
+
+function parseHeader(patch: string, fromFile: string, toFile: string): BasicHeader {
     let status: FileStatus = "modified";
     if (fromFile !== toFile) {
         status = "renamed_modified";
@@ -141,34 +141,42 @@ function parseHeader(
         lineStart = lineEnd + 1;
     }
 
-    return { status, binary };
+    return { fromFile, toFile, status, binary };
 }
 
-export function splitMultiFilePatch(
+export function parseMultiFilePatch(
     patchContent: string,
     imageFactory?: (fromFile: string, toFile: string, status: FileStatus) => ImageFileDetails | null,
-): FileDetails[] {
-    const patches: FileDetails[] = [];
-    // Process each file in the diff
-    let fileMatch;
-    while ((fileMatch = fileRegex.exec(patchContent)) !== null) {
-        const [fullFileMatch, fromFile, toFile] = fileMatch;
-        const { status, binary } = parseHeader(fullFileMatch, fromFile, toFile);
-
-        if (binary) {
-            if (imageFactory !== undefined && isImageFile(fromFile) && isImageFile(toFile)) {
-                const imageDetails = imageFactory(fromFile, toFile, status);
-                if (imageDetails != null) {
-                    patches.push(imageDetails);
+): AsyncGenerator<FileDetails> {
+    const split = splitMultiFilePatch(patchContent);
+    async function* detailsGenerator() {
+        for (const [header, content] of split) {
+            if (header.binary) {
+                if (imageFactory !== undefined && isImageFile(header.fromFile) && isImageFile(header.toFile)) {
+                    const imageDetails = imageFactory(header.fromFile, header.toFile, header.status);
+                    if (imageDetails != null) {
+                        yield imageDetails;
+                        continue;
+                    }
+                } else {
+                    yield binaryFileDummyDetails(header.fromFile, header.toFile, header.status);
                     continue;
                 }
-            } else {
-                patches.push(binaryFileDummyDetails(fromFile, toFile, status));
-                continue;
             }
+
+            yield makeTextDetails(header.fromFile, header.toFile, header.status, content);
         }
+    }
+    return detailsGenerator();
+}
 
-        patches.push(makeTextDetails(fromFile, toFile, status, fullFileMatch));
+export function splitMultiFilePatch(patchContent: string): [BasicHeader, string][] {
+    const patches: [BasicHeader, string][] = [];
+    let fileMatch;
+    while ((fileMatch = fileRegex.exec(patchContent)) !== null) {
+        const [fullFileMatch, fromFile, toFile] = fileMatch;
+        const header = parseHeader(fullFileMatch, fromFile, toFile);
+        patches.push([header, fullFileMatch]);
     }
     return patches;
 }

web/src/routes/OpenDiffDialog.svelte

@@ -5,7 +5,7 @@
     import { page } from "$app/state";
     import { goto } from "$app/navigation";
     import { makeImageDetails, makeTextDetails, MultiFileDiffViewerState } from "$lib/diff-viewer-multi-file.svelte";
-    import { binaryFileDummyDetails, bytesEqual, isBinaryFile, isImageFile, splitMultiFilePatch } from "$lib/util";
+    import { binaryFileDummyDetails, bytesEqual, isBinaryFile, isImageFile, parseMultiFilePatch } from "$lib/util";
     import { onMount } from "svelte";
     import { createTwoFilesPatch } from "diff";
     import DirectorySelect from "$lib/components/files/DirectorySelect.svelte";
@@ -279,24 +279,12 @@
             return;
         }
         modalOpen = false;
-        const files = splitMultiFilePatch(text);
-        if (files.length === 0) {
-            modalOpen = true;
-            viewer.progressBar.setProgress(100, 100);
-            alert("No valid patches found in the file.");
-            return;
-        }
         const success = await viewer.loadPatches(
             async () => {
                 return { type: "file", fileName: meta.name };
             },
             async () => {
-                async function* generatePatches() {
-                    for (const file of files) {
-                        yield file;
-                    }
-                }
-                return generatePatches();
+                return parseMultiFilePatch(text);
             },
         );
         if (!success) {