@hominis/fireforge 0.16.1 → 0.16.3

package/dist/src/core/patch-parse.js

@@ -104,14 +104,36 @@ export function parseHunksForFile(patchContent, targetFile) {
                 newStart: parseInt(hunkMatch[3] ?? '0', 10),
                 newCount: parseInt(hunkMatch[4] ?? '1', 10),
                 lines: [],
-                noNewlineAtEnd: false,
+                noNewlineAtEndOld: false,
+                noNewlineAtEndNew: false,
             };
             continue;
         }
         // Collect hunk lines
         if (currentHunk) {
             if (line === '\') {
-                currentHunk.noNewlineAtEnd = true;
+                // The marker is an annotation on the immediately preceding body
+                // line. Peek the last collected line to decide which side(s) the
+                // annotation applies to — a single boolean cannot represent the
+                // asymmetric case where only one side lacks the trailing newline.
+                const previous = currentHunk.lines[currentHunk.lines.length - 1] ?? '';
+                if (previous.startsWith('-')) {
+                    currentHunk.noNewlineAtEndOld = true;
+                }
+                else if (previous.startsWith('+')) {
+                    currentHunk.noNewlineAtEndNew = true;
+                }
+                else if (previous.startsWith(' ')) {
+                    // Context line: present in both sides, so the trailing-newline
+                    // absence applies to both. This is rare (it only happens when
+                    // the hunk ends on an unchanged line that itself is the last
+                    // line of the file) but real — git emits it.
+                    currentHunk.noNewlineAtEndOld = true;
+                    currentHunk.noNewlineAtEndNew = true;
+                }
+                // If the marker appears with no preceding body line (malformed
+                // diff), leave both flags false — the downstream apply logic
+                // will still produce a defined result.
             }
             else if (line.startsWith('+') || line.startsWith('-') || line.startsWith(' ')) {
                 currentHunk.lines.push(line);

package/dist/src/core/patch-transform.js

@@ -105,7 +105,10 @@ export async function applyPatchToContent(content, patchPath, targetFile) {
     const sortedHunks = [...hunks].sort((a, b) => b.oldStart - a.oldStart);
     // The "no newline at end" marker applies to the last hunk in file order
     // (highest oldStart), which is the *first* hunk in our reverse-sorted array.
-    const lastHunkNoNewline = sortedHunks[0]?.noNewlineAtEnd ?? false;
+    // We read the new-side flag because the output we produce corresponds to
+    // the new side; asymmetric diffs (old lacks newline, new has one — or
+    // vice versa) would otherwise disagree with `git apply`.
+    const lastHunkNoNewline = sortedHunks[0]?.noNewlineAtEndNew ?? false;
     for (const hunk of sortedHunks) {
         const newLines = [];
         // Compute actual old-line count from hunk body for cross-check

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hominis/fireforge",
-  "version": "0.16.1",
+  "version": "0.16.3",
   "description": "FireForge — a build tool for customizing Firefox",
   "type": "module",
   "main": "./dist/src/index.js",