@biffo/cli 0.276.2 → 0.276.4

package/dist/index.js

@@ -584,6 +584,7 @@ import { join as join6 } from "path";
 import { execa as execa2 } from "execa";
 
 // src/lib/core-upgrade.ts
+import { isUtf8 } from "buffer";
 import {
   chmodSync,
   existsSync as existsSync5,
@@ -737,8 +738,12 @@ var gitMergeFile = async (base, ours, theirs) => {
     rmSync(dir, { recursive: true, force: true });
   }
 };
-function read(root, rel) {
-  return readFileSync4(join5(root, rel), "utf8");
+function readFile(root, rel) {
+  const buffer = readFileSync4(join5(root, rel));
+  return { buffer, text: isUtf8(buffer) ? buffer.toString("utf8") : null };
+}
+function contentOf(file) {
+  return file.text ?? file.buffer;
 }
 var EMPTY_SUMMARY = () => ({
   unchanged: 0,
@@ -795,41 +800,46 @@ async function classify(path, base, ours, theirs, opts, mergeFile, isDeclaredDiv
     return { path, status: "keep-ours", conflicted: false, orphaned: true };
   }
   if (!inBase && inTheirs) {
-    const theirsContent2 = read(opts.theirsDir, path);
-    if (!inOurs) return { path, status: "added", conflicted: false, content: theirsContent2 };
-    const oursContent2 = read(opts.oursDir, path);
-    if (oursContent2 === theirsContent2) return { path, status: "unchanged", conflicted: false };
-    return { path, status: "add-conflict", conflicted: true, content: theirsContent2 };
+    const theirsFile2 = readFile(opts.theirsDir, path);
+    if (!inOurs) return { path, status: "added", conflicted: false, content: contentOf(theirsFile2) };
+    const oursFile2 = readFile(opts.oursDir, path);
+    if (oursFile2.buffer.equals(theirsFile2.buffer))
+      return { path, status: "unchanged", conflicted: false };
+    return { path, status: "add-conflict", conflicted: true, content: contentOf(theirsFile2) };
   }
   if (inBase && !inTheirs) {
     if (!inOurs) return { path, status: "removed", conflicted: false };
-    const baseContent2 = read(opts.baseDir, path);
-    const oursContent2 = read(opts.oursDir, path);
-    if (oursContent2 === baseContent2) return { path, status: "removed", conflicted: false };
+    const baseFile2 = readFile(opts.baseDir, path);
+    const oursFile2 = readFile(opts.oursDir, path);
+    if (oursFile2.buffer.equals(baseFile2.buffer))
+      return { path, status: "removed", conflicted: false };
     return { path, status: "remove-conflict", conflicted: true };
   }
-  const baseContent = read(opts.baseDir, path);
-  const theirsContent = read(opts.theirsDir, path);
+  const baseFile = readFile(opts.baseDir, path);
+  const theirsFile = readFile(opts.theirsDir, path);
   if (!inOurs) {
     if (isDeclaredDivergent(path)) {
       noteDivergenceSkip(path);
       return { path, status: "removed", conflicted: false };
     }
-    return { path, status: "restored", conflicted: false, content: theirsContent };
+    return { path, status: "restored", conflicted: false, content: contentOf(theirsFile) };
   }
-  const oursContent = read(opts.oursDir, path);
-  const oursChanged = oursContent !== baseContent;
-  const theirsChanged = theirsContent !== baseContent;
+  const oursFile = readFile(opts.oursDir, path);
+  const oursChanged = !oursFile.buffer.equals(baseFile.buffer);
+  const theirsChanged = !theirsFile.buffer.equals(baseFile.buffer);
   if (!theirsChanged) {
     return { path, status: oursChanged ? "keep-ours" : "unchanged", conflicted: false };
   }
   if (!oursChanged) {
-    return { path, status: "take-theirs", conflicted: false, content: theirsContent };
+    return { path, status: "take-theirs", conflicted: false, content: contentOf(theirsFile) };
   }
-  if (oursContent === theirsContent) {
+  if (oursFile.buffer.equals(theirsFile.buffer)) {
     return { path, status: "unchanged", conflicted: false };
   }
-  const { conflicted, content } = await mergeFile(baseContent, oursContent, theirsContent);
+  if (baseFile.text === null || oursFile.text === null || theirsFile.text === null) {
+    return { path, status: "conflict", conflicted: true, content: contentOf(theirsFile) };
+  }
+  const { conflicted, content } = await mergeFile(baseFile.text, oursFile.text, theirsFile.text);
   return { path, status: conflicted ? "conflict" : "merged", conflicted, content };
 }
 function applyUpgradePlan(instanceDir, plan, theirsDir) {
@@ -941,7 +951,7 @@ var GitAdapter = class {
    * scaffold's throwaway temp dir inherits.
    */
   async configuredIdentity(cwd) {
-    const read2 = async (key) => {
+    const read = async (key) => {
       try {
         const { stdout } = await execa2("git", ["config", "--get", key], cwd ? { cwd } : {});
         return stdout.trim() || null;
@@ -949,7 +959,7 @@ var GitAdapter = class {
         return null;
       }
     };
-    return { name: await read2("user.name"), email: await read2("user.email") };
+    return { name: await read("user.name"), email: await read("user.email") };
   }
   async isGitRepo(cwd) {
     try {
@@ -2651,7 +2661,7 @@ function findMigrationTestPairings(changes, divergedBodies) {
   for (const change of changes) {
     if (!TEST_PATH_RE.test(change.path)) continue;
     const content = change.content;
-    if (content === void 0) continue;
+    if (typeof content !== "string") continue;
     for (const d of divergedBodies) {
       if (content.includes(d.file)) {
         pairings.push({ testPath: change.path, migration: d.file, instanceFile: d.instanceFile });
@@ -2792,7 +2802,7 @@ var VERBATIM_STATUSES = /* @__PURE__ */ new Set(["take-theirs", "added", "add-co
 var DERIVED_STATUSES = /* @__PURE__ */ new Set(["merged", "conflict"]);
 var defaultGit3 = (args) => execFileSync4("git", args, { encoding: "utf8" });
 function blobId(content) {
-  const bytes = Buffer.from(content, "utf8");
+  const bytes = Buffer.isBuffer(content) ? content : Buffer.from(content, "utf8");
   return createHash2("sha1").update(`blob ${String(bytes.length)}\0`).update(bytes).digest("hex");
 }
 function tagBlobIds(repo, tag, git) {
@@ -2839,7 +2849,7 @@ function assertTargetFidelity(options) {
       source = "output";
     } else if (DERIVED_STATUSES.has(entry.status)) {
       const abs = join9(options.theirsDir, entry.path);
-      content = existsSync8(abs) ? readFileSync6(abs, "utf8") : void 0;
+      content = existsSync8(abs) ? readFileSync6(abs) : void 0;
       source = "merge-input";
     } else {
       continue;
@@ -2851,15 +2861,7 @@ function assertTargetFidelity(options) {
       findings.push({ path: entry.path, reason: "absent-from-tag", source });
       continue;
     }
-    if (blobId(content) === expected) continue;
-    let tagText;
-    try {
-      tagText = git(["-C", options.templateRepo, "show", `${tag}:${entry.path}`]);
-    } catch {
-      findings.push({ path: entry.path, reason: "content-differs", source });
-      continue;
-    }
-    if (tagText !== content) {
+    if (blobId(content) !== expected) {
       findings.push({ path: entry.path, reason: "content-differs", source });
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@biffo/cli",
-  "version": "0.276.2",
+  "version": "0.276.4",
   "description": "Biffo project scaffolding CLI",
   "license": "MIT",
   "type": "module",