@biffo/cli 0.61.1 → 0.62.0

package/dist/index.js

@@ -1538,7 +1538,16 @@ function applyMigrationCarry(instanceDir, plan) {
 }
 
 // src/lib/core-upgrade.ts
-import { existsSync as existsSync6, mkdirSync as mkdirSync2, mkdtempSync as mkdtempSync2, readFileSync as readFileSync4, rmSync as rmSync2, writeFileSync as writeFileSync3 } from "fs";
+import {
+  chmodSync,
+  existsSync as existsSync6,
+  mkdirSync as mkdirSync2,
+  mkdtempSync as mkdtempSync2,
+  readFileSync as readFileSync4,
+  rmSync as rmSync2,
+  statSync,
+  writeFileSync as writeFileSync3
+} from "fs";
 import { tmpdir as tmpdir2 } from "os";
 import { dirname as dirname4, join as join6 } from "path";
 import { execa as execa2 } from "execa";
@@ -1635,7 +1644,7 @@ async function classify(path, base, ours, theirs, opts, mergeFile) {
   const { conflicted, content } = await mergeFile(baseContent, oursContent, theirsContent);
   return { path, status: conflicted ? "conflict" : "merged", conflicted, content };
 }
-function applyUpgradePlan(instanceDir, plan) {
+function applyUpgradePlan(instanceDir, plan, theirsDir) {
   const written = [];
   const deleted = [];
   for (const e of plan.entries) {
@@ -1650,6 +1659,12 @@ function applyUpgradePlan(instanceDir, plan) {
     if (e.content !== void 0) {
       mkdirSync2(dirname4(abs), { recursive: true });
       writeFileSync3(abs, e.content);
+      if (theirsDir !== void 0) {
+        const source = join6(theirsDir, e.path);
+        if (existsSync6(source) && (statSync(source).mode & 73) !== 0) {
+          chmodSync(abs, 493);
+        }
+      }
       written.push(e.path);
     }
   }
@@ -2148,9 +2163,9 @@ async function runCoreUpgradeResolved(options, deps, cleanups) {
     );
     return;
   }
-  await applyAndOpenPr(options, deps, plan, migrations, fromVersion, toVersion, breaking);
+  await applyAndOpenPr(options, deps, plan, migrations, fromVersion, toVersion, breaking, theirsDir);
 }
-async function applyAndOpenPr(options, deps, plan, migrations, fromVersion, toVersion, breaking) {
+async function applyAndOpenPr(options, deps, plan, migrations, fromVersion, toVersion, breaking, theirsDir) {
   if (breaking.length > 0 && !options.acknowledgeBreaking) {
     throw new Error(
       `This upgrade crosses ${breaking.length} documented breaking change(s): ${breaking.map((b) => b.version).join(", ")}. They are printed above and in ${UPGRADE_GUIDE_PATH}. Read what each one requires \u2014 some destroy data or need manual work after the deploy \u2014 then re-run with --acknowledge-breaking.`
@@ -2172,7 +2187,7 @@ async function applyAndOpenPr(options, deps, plan, migrations, fromVersion, toVe
   const branch = upgradeBranchName(fromVersion, toVersion);
   log.step(1, 4, `Creating branch ${branch}`);
   await git.createBranch(options.cwd, branch);
-  const applied = applyUpgradePlan(options.cwd, plan);
+  const applied = applyUpgradePlan(options.cwd, plan, theirsDir);
   const carried = applyMigrationCarry(options.cwd, migrations);
   writeInstanceCoreVersion(options.cwd, toVersion);
   log.step(
@@ -2863,7 +2878,7 @@ import {
   readdirSync as readdirSync4,
   readFileSync as readFileSync7,
   rmSync as rmSync5,
-  statSync,
+  statSync as statSync2,
   writeFileSync as writeFileSync5
 } from "fs";
 import { homedir } from "os";
@@ -2897,7 +2912,7 @@ function findLatestSession() {
   if (files.length === 0) return null;
   const sorted = files.map((f) => {
     const fullPath = join12(dir, f);
-    const mtime = existsSync11(fullPath) ? statSync(fullPath).mtimeMs : -1;
+    const mtime = existsSync11(fullPath) ? statSync2(fullPath).mtimeMs : -1;
     return { f, mtime };
   }).sort((a, b) => b.mtime - a.mtime);
   try {
@@ -3095,7 +3110,7 @@ async function resolveConfig(options) {
 
 // src/commands/data-import.ts
 import { execSync as execSync3 } from "child_process";
-import { cpSync, existsSync as existsSync13, mkdirSync as mkdirSync5, readdirSync as readdirSync5, statSync as statSync2 } from "fs";
+import { cpSync, existsSync as existsSync13, mkdirSync as mkdirSync5, readdirSync as readdirSync5, statSync as statSync3 } from "fs";
 import { join as join13, resolve as resolve5 } from "path";
 import chalk6 from "chalk";
 import { Command as Command6 } from "commander";
@@ -3148,7 +3163,7 @@ async function runDataImport(name, options, deps) {
       `DDL import '${name}' is already present at db/imports/${name}/. Remove it first to re-import.`
     );
   }
-  const isLocalDir = existsSync13(options.source) && statSync2(options.source).isDirectory();
+  const isLocalDir = existsSync13(options.source) && statSync3(options.source).isDirectory();
   let sourceDir;
   let cleanupClone = null;
   if (isLocalDir) {
@@ -4218,7 +4233,7 @@ import { Command as Command12 } from "commander";
 import inquirer5 from "inquirer";
 
 // src/lib/build-freshness.ts
-import { existsSync as existsSync16, readdirSync as readdirSync7, statSync as statSync3 } from "fs";
+import { existsSync as existsSync16, readdirSync as readdirSync7, statSync as statSync4 } from "fs";
 import { dirname as dirname5, join as join15, relative as relative2, sep as sep2 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 var SKIP_ENV_VAR = "BIFFO_SKIP_BUILD_FRESHNESS_CHECK";
@@ -4253,8 +4268,8 @@ function checkBuildFreshness(options = {}) {
   if (!existsSync16(entry)) {
     return { status: "skipped", reason: `${entry} not found`, newerSources: [] };
   }
-  const builtAt = statSync3(entry).mtimeMs;
-  const newer = collectSourceFiles(srcDir).map((file) => ({ file, mtimeMs: statSync3(file).mtimeMs })).filter((f) => f.mtimeMs > builtAt).sort((a, b) => b.mtimeMs - a.mtimeMs).map((f) => relative2(packageRoot, f.file));
+  const builtAt = statSync4(entry).mtimeMs;
+  const newer = collectSourceFiles(srcDir).map((file) => ({ file, mtimeMs: statSync4(file).mtimeMs })).filter((f) => f.mtimeMs > builtAt).sort((a, b) => b.mtimeMs - a.mtimeMs).map((f) => relative2(packageRoot, f.file));
   if (newer.length === 0) {
     return { status: "fresh", reason: "dist is newer than src", newerSources: [] };
   }
@@ -4607,7 +4622,7 @@ import {
   readdirSync as readdirSync8,
   readFileSync as readFileSync12,
   rmSync as rmSync6,
-  statSync as statSync4,
+  statSync as statSync5,
   writeFileSync as writeFileSync6
 } from "fs";
 import { homedir as homedir3 } from "os";
@@ -6225,7 +6240,7 @@ function printEntry(entry) {
 }
 
 // src/commands/plugin-install.ts
-import { cpSync as cpSync3, existsSync as existsSync23, mkdirSync as mkdirSync9, readFileSync as readFileSync17, statSync as statSync5 } from "fs";
+import { cpSync as cpSync3, existsSync as existsSync23, mkdirSync as mkdirSync9, readFileSync as readFileSync17, statSync as statSync6 } from "fs";
 import { basename, join as join24, relative as relative3, resolve as resolve12 } from "path";
 import chalk15 from "chalk";
 import { Command as Command15 } from "commander";
@@ -6317,7 +6332,7 @@ function resolveLocalPlugin(localPath) {
   if (!existsSync23(localPath)) {
     throw new Error(`--local path does not exist: ${localPath}`);
   }
-  if (!statSync5(localPath).isDirectory()) {
+  if (!statSync6(localPath).isDirectory()) {
     throw new Error(`--local path is not a directory: ${localPath}`);
   }
   const manifestPath = join24(localPath, "biffo.plugin.json");

package/package.json

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