@opencode-ai/util 0.0.0-next-16027 → 0.0.0-next-16040

package/dist/patch.d.ts

@@ -9,6 +9,7 @@ export declare class BoundaryError extends BoundaryError_base {
 declare const InvalidHunkError_base: Schema.Class<InvalidHunkError, Schema.TaggedStruct<"Patch.InvalidHunkError", {
     readonly line: Schema.String;
     readonly lineNumber: Schema.Number;
+    readonly reason: Schema.optional<Schema.String>;
 }>, import("effect/Cause").YieldableError>;
 export declare class InvalidHunkError extends InvalidHunkError_base {
     get message(): string;

package/dist/patch.js

@@ -10,8 +10,11 @@ export class BoundaryError extends Schema.TaggedErrorClass()("Patch.BoundaryErro
 export class InvalidHunkError extends Schema.TaggedErrorClass()("Patch.InvalidHunkError", {
     line: Schema.String,
     lineNumber: Schema.Number,
+    reason: Schema.optional(Schema.String),
 }) {
     get message() {
+        if (this.reason)
+            return `Invalid hunk at line ${this.lineNumber}: ${this.reason}`;
         return `Invalid hunk at line ${this.lineNumber}: '${this.line}' is not a valid hunk header. Valid hunk headers: '*** Add File: {path}', '*** Delete File: {path}', '*** Update File: {path}'`;
     }
 }
@@ -30,51 +33,49 @@ export function parse(patchText) {
     while (index < end) {
         const line = lines[index];
         const header = line.trim();
-        if (header.startsWith("*** Add File:")) {
-            const path = header.slice("*** Add File:".length).trim();
-            if (!path) {
-                index++;
-                continue;
-            }
+        if (index === begin + 1 &&
+            header.startsWith("*** Environment ID:") &&
+            header.slice("*** Environment ID:".length).trim()) {
+            index++;
+            continue;
+        }
+        if (header.startsWith("*** Add File: ")) {
+            const path = header.slice("*** Add File: ".length).trim();
             const parsed = parseAdd(lines, index + 1, end);
+            if ("error" in parsed)
+                return Result.fail(parsed.error);
             hunks.push({ type: "add", path, contents: parsed.content });
             index = parsed.next;
             continue;
         }
-        if (header.startsWith("*** Delete File:")) {
-            const path = header.slice("*** Delete File:".length).trim();
-            if (!path) {
-                index++;
-                continue;
-            }
+        if (header.startsWith("*** Delete File: ")) {
+            const path = header.slice("*** Delete File: ".length).trim();
             hunks.push({ type: "delete", path });
             index++;
             continue;
         }
-        if (header.startsWith("*** Update File:")) {
-            const path = header.slice("*** Update File:".length).trim();
-            if (!path) {
-                index++;
-                continue;
-            }
+        if (header.startsWith("*** Update File: ")) {
+            const path = header.slice("*** Update File: ".length).trim();
             let next = index + 1;
             let movePath;
-            if (lines[next]?.startsWith("*** Move to:")) {
-                movePath = lines[next].slice("*** Move to:".length).trim();
+            while (lines[next]?.trimEnd() === "*** End of File")
+                next++;
+            const move = lines[next]?.trimEnd();
+            if (move === "*** Move to:" || move?.startsWith("*** Move to: ")) {
+                movePath = move.slice("*** Move to: ".length).trim();
+                if (!movePath) {
+                    return Result.fail(new InvalidHunkError({ line: lines[next].trim(), lineNumber: next + 1 }));
+                }
                 next++;
             }
-            const parsed = parseUpdate(lines, next, end);
+            const parsed = parseUpdate(lines, next, end, path, index);
+            if ("error" in parsed)
+                return Result.fail(parsed.error);
             hunks.push({ type: "update", path, movePath, chunks: parsed.chunks });
             index = parsed.next;
             continue;
         }
-        index++;
-    }
-    if (hunks.length === 0) {
-        const invalid = lines.findIndex((line, index) => index > begin && index < end && line.trim() !== "");
-        if (invalid !== -1) {
-            return Result.fail(new InvalidHunkError({ line: lines[invalid].trim(), lineNumber: invalid + 1 }));
-        }
+        return Result.fail(new InvalidHunkError({ line: header, lineNumber: index + 1 }));
     }
     return Result.succeed(hunks);
 }
@@ -99,46 +100,146 @@ export function joinBom(text, bom) {
 function parseAdd(lines, start, end) {
     const content = [];
     let index = start;
-    while (index < end && !lines[index].startsWith("***")) {
-        if (lines[index].startsWith("+"))
-            content.push(lines[index].slice(1));
+    while (index < end && !isBoundary(lines[index].trim())) {
+        if (!lines[index].startsWith("+")) {
+            return { error: new InvalidHunkError({ line: lines[index].trim(), lineNumber: index + 1 }) };
+        }
+        content.push(lines[index].slice(1));
         index++;
     }
     return { content: content.join("\n"), next: index };
 }
-function parseUpdate(lines, start, end) {
+function parseUpdate(lines, start, end, path, hunk) {
     const chunks = [];
     let index = start;
-    while (index < end && !lines[index].startsWith("***")) {
-        if (!lines[index].startsWith("@@")) {
+    let afterEndOfFile = false;
+    while (index < end) {
+        const line = lines[index];
+        const updateLine = line.trimEnd();
+        if (afterEndOfFile) {
+            if (updateLine === "") {
+                index++;
+                continue;
+            }
+            if (updateLine === "@@" || updateLine.startsWith("@@ "))
+                afterEndOfFile = false;
+            else if (isBoundary(updateLine))
+                break;
+            else {
+                return {
+                    error: new InvalidHunkError({
+                        line,
+                        lineNumber: index + 1,
+                        reason: `Expected update hunk to start with a @@ context marker, got: '${line}'`,
+                    }),
+                };
+            }
+        }
+        if (updateLine === "*** End of File") {
+            const chunk = chunks.at(-1);
+            if (chunk && chunk.oldLines.length === 0 && chunk.newLines.length === 0) {
+                return {
+                    error: new InvalidHunkError({
+                        line: updateLine,
+                        lineNumber: index + 1,
+                        reason: "Update hunk does not contain any lines",
+                    }),
+                };
+            }
+            if (chunk) {
+                chunk.endOfFile = true;
+                afterEndOfFile = true;
+            }
             index++;
             continue;
         }
-        const changeContext = lines[index].slice(2).trim() || undefined;
-        const oldLines = [];
-        const newLines = [];
-        let endOfFile = false;
-        index++;
-        while (index < end && !lines[index].startsWith("@@") && !lines[index].startsWith("***")) {
-            const line = lines[index];
-            if (line.startsWith(" ")) {
-                oldLines.push(line.slice(1));
-                newLines.push(line.slice(1));
+        if (isBoundary(updateLine))
+            break;
+        if (updateLine === "@@" || updateLine.startsWith("@@ ")) {
+            const previous = chunks.at(-1);
+            if (previous && previous.oldLines.length === 0 && previous.newLines.length === 0) {
+                return {
+                    error: new InvalidHunkError({
+                        line,
+                        lineNumber: index + 1,
+                        reason: `Unexpected line found in update hunk: '${line}'. Every line should start with ' ' (context line), '+' (added line), or '-' (removed line)`,
+                    }),
+                };
             }
-            else if (line.startsWith("-"))
-                oldLines.push(line.slice(1));
-            else if (line.startsWith("+"))
-                newLines.push(line.slice(1));
+            chunks.push({
+                oldLines: [],
+                newLines: [],
+                changeContext: updateLine === "@@" ? undefined : updateLine.slice("@@ ".length),
+            });
+            index++;
+            continue;
+        }
+        if (chunks.length === 0)
+            chunks.push({ oldLines: [], newLines: [] });
+        const chunk = chunks.at(-1);
+        if (line === "") {
+            chunk.oldLines.push("");
+            chunk.newLines.push("");
+            index++;
+            continue;
+        }
+        if (line.startsWith(" ")) {
+            chunk.oldLines.push(line.slice(1));
+            chunk.newLines.push(line.slice(1));
+            index++;
+            continue;
+        }
+        if (line.startsWith("-")) {
+            chunk.oldLines.push(line.slice(1));
             index++;
+            continue;
         }
-        if (lines[index]?.trim() === "*** End of File") {
-            endOfFile = true;
+        if (line.startsWith("+")) {
+            chunk.newLines.push(line.slice(1));
             index++;
+            continue;
         }
-        chunks.push({ oldLines, newLines, changeContext, endOfFile: endOfFile || undefined });
+        const populated = chunk.oldLines.length > 0 || chunk.newLines.length > 0;
+        return {
+            error: new InvalidHunkError({
+                line,
+                lineNumber: index + 1,
+                reason: populated
+                    ? `Expected update hunk to start with a @@ context marker, got: '${line}'`
+                    : `Unexpected line found in update hunk: '${line}'. Every line should start with ' ' (context line), '+' (added line), or '-' (removed line)`,
+            }),
+        };
+    }
+    if (chunks.length === 0) {
+        return {
+            error: new InvalidHunkError({
+                line: lines[hunk].trim(),
+                lineNumber: hunk + 1,
+                reason: `Update file hunk for path '${path}' is empty`,
+            }),
+        };
+    }
+    const last = chunks.at(-1);
+    if (last.oldLines.length === 0 && last.newLines.length === 0) {
+        const line = lines[index].trim();
+        return {
+            error: new InvalidHunkError({
+                line,
+                lineNumber: index + 1,
+                reason: line === "*** End Patch"
+                    ? "Update hunk does not contain any lines"
+                    : `Unexpected line found in update hunk: '${line}'. Every line should start with ' ' (context line), '+' (added line), or '-' (removed line)`,
+            }),
+        };
     }
     return { chunks, next: index };
 }
+function isBoundary(line) {
+    return (line === "*** End Patch" ||
+        line.startsWith("*** Add File: ") ||
+        line.startsWith("*** Delete File: ") ||
+        line.startsWith("*** Update File: "));
+}
 function computeReplacements(lines, path, chunks) {
     const replacements = [];
     let lineIndex = 0;
@@ -203,4 +304,4 @@ const normalize = (value) => value
     .replace(/[‐‑‒–—―−]/g, "-")
     .replace(/[\u00A0\u2002-\u200A\u202F\u205F\u3000]/g, " ");
 const splitBom = (text) => text.startsWith("\uFEFF") ? { bom: true, text: text.slice(1) } : { bom: false, text };
-const stripHeredoc = (input) => input.match(/^(?:cat\s+)?<<['"]?(\w+)['"]?\s*\n([\s\S]*?)\n\1\s*$/)?.[2] ?? input;
+const stripHeredoc = (input) => input.match(/^(?:cat\s+)?<<(['"]?)(\w+)\1\s*\n([\s\S]*?)\n\2\s*$/)?.[3] ?? input;

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/util",
-  "version": "0.0.0-next-16027",
+  "version": "0.0.0-next-16040",
   "type": "module",
   "license": "MIT",
   "repository": {