@fern-api/replay 0.10.0 → 0.10.2

package/dist/index.js

@@ -984,7 +984,7 @@ function applyBothPatches(baseLines, oursPatches, theirsPatches) {
 }
 
 // src/ReplayApplicator.ts
-import { mkdir, mkdtemp, readFile, rm, writeFile } from "fs/promises";
+import { mkdir, mkdtemp, readFile, rm, unlink, writeFile } from "fs/promises";
 import { tmpdir } from "os";
 import { dirname as dirname2, extname, join as join2 } from "path";
 import { minimatch } from "minimatch";
@@ -1213,9 +1213,10 @@ var ReplayApplicator = class {
         const resolvedPath = await this.resolveFilePath(filePath, baseGen.tree_hash, currentTreeHash);
         const base = await this.git.showFile(baseGen.tree_hash, filePath);
         const theirs = await this.applyPatchToContent(base, patch.patch_content, filePath, tempGit, tempDir);
-        if (theirs) {
+        const effectiveTheirs = theirs ?? await readFile(join2(this.outputDir, resolvedPath), "utf-8").catch(() => null);
+        if (effectiveTheirs) {
           this.fileTheirsAccumulator.set(resolvedPath, {
-            content: theirs,
+            content: effectiveTheirs,
             baseGeneration: patch.base_generation
           });
         }
@@ -1259,8 +1260,12 @@ var ReplayApplicator = class {
         };
       } catch {
         for (const [resolvedPath, content] of snapshots) {
+          const fullPath = join2(this.outputDir, resolvedPath);
           if (content != null) {
-            await writeFile(join2(this.outputDir, resolvedPath), content);
+            await writeFile(fullPath, content);
+          } else {
+            await unlink(fullPath).catch(() => {
+            });
           }
         }
       }
@@ -1375,7 +1380,7 @@ var ReplayApplicator = class {
       }
       let useAccumulatorAsMergeBase = false;
       const accumulatorEntry = this.fileTheirsAccumulator.get(resolvedPath);
-      if (!theirs && accumulatorEntry) {
+      if (accumulatorEntry && (!theirs || base == null)) {
         theirs = await this.applyPatchToContent(
           accumulatorEntry.content,
           patch.patch_content,
@@ -1417,12 +1422,16 @@ var ReplayApplicator = class {
         }
       }
       if (base == null && !ours && effective_theirs) {
+        this.fileTheirsAccumulator.set(resolvedPath, {
+          content: effective_theirs,
+          baseGeneration: patch.base_generation
+        });
         const outDir2 = dirname2(oursPath);
         await mkdir(outDir2, { recursive: true });
         await writeFile(oursPath, effective_theirs);
         return { file: resolvedPath, status: "merged", reason: "new-file" };
       }
-      if (base == null && ours && effective_theirs) {
+      if (base == null && ours && effective_theirs && !useAccumulatorAsMergeBase) {
         const merged2 = threeWayMerge("", ours, effective_theirs);
         const outDir2 = dirname2(oursPath);
         await mkdir(outDir2, { recursive: true });
@@ -1605,16 +1614,24 @@ var ReplayApplicator = class {
     const addedLines = [];
     let inTargetFile = false;
     let inHunk = false;
+    let isNewFile = false;
     let noTrailingNewline = false;
     for (const line of lines) {
       if (line.startsWith("diff --git")) {
         if (inTargetFile) break;
         inTargetFile = isDiffLineForFile(line, filePath);
         inHunk = false;
+        isNewFile = false;
         continue;
       }
       if (!inTargetFile) continue;
+      if (!inHunk) {
+        if (line === "--- /dev/null" || line.startsWith("new file mode")) {
+          isNewFile = true;
+        }
+      }
       if (line.startsWith("@@")) {
+        if (!isNewFile) return null;
         inHunk = true;
         continue;
       }