@fern-api/replay 0.10.1 → 0.10.3

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(() => {
+            });
           }
         }
       }