@biffo/cli 0.224.1 → 0.224.3

package/dist/index.js

@@ -3083,9 +3083,20 @@ function describeFailures(outcomes) {
 
 // src/commands/core-upgrade.ts
 var MISSING_TEMPLATE_ROOT_GUIDANCE2 = "Pass --template-repo <path> to a biffo-template git checkout, e.g. `biffo core upgrade --template-repo /path/to/biffo-template`.";
+function resolveTemplateRepoFlag(templateRepo, template) {
+  if (templateRepo !== void 0 && template !== void 0 && resolve3(templateRepo) !== resolve3(template)) {
+    throw new Error(
+      `Both --template-repo (${templateRepo}) and --template (${template}) were given, with different paths. They are the same argument \u2014 --template is an alias for --template-repo (#1138) \u2014 so pass only one.`
+    );
+  }
+  return templateRepo ?? template;
+}
 var coreUpgradeCommand = new Command3("upgrade").description("Three-way-merge template-owned files for a core upgrade; preview it or open a PR").option("--cwd <path>", "Instance repo root to upgrade (defaults to the current directory)").option(
   "--template-repo <path>",
   "Path to a biffo-template git checkout whose core-v* tags supply the base/target trees (defaults to the template this CLI ships with)"
+).option(
+  "--template <path>",
+  "Alias for --template-repo, so the flag that works on `core diff` also works here (#1138). Errors if both are given with different paths."
 ).option("--to <version>", "Target core version (defaults to the template\u2019s latest core.version)").option(
   "--from-template <path>",
   "Override: path to a template checkout at the instance\u2019s CURRENT version (the merge base). Normally auto-resolved from the core-v<version> tag."
@@ -3103,22 +3114,23 @@ var coreUpgradeCommand = new Command3("upgrade").description("Three-way-merge te
   "Delete local branches previous upgrade runs left behind, once their PR has merged (#758)"
 ).action(
   async (options) => {
-    const cwd = options.cwd ? resolve3(options.cwd) : process.cwd();
-    const runOptions = {
-      cwd,
-      apply: options.apply ?? false,
-      allowConflicts: options.allowConflicts ?? false,
-      acknowledgeBreaking: options.acknowledgeBreaking ?? false,
-      allowDirty: options.allowDirty ?? false
-    };
-    if (options.templateRepo) runOptions.templateRepo = resolve3(options.templateRepo);
-    if (options.to) runOptions.toVersion = options.to;
-    if (options.fromTemplate) runOptions.baseDir = resolve3(options.fromTemplate);
-    if (options.toTemplate) runOptions.theirsDir = resolve3(options.toTemplate);
-    if (options.base) runOptions.base = options.base;
-    if (options.remote) runOptions.remote = options.remote;
-    if (options.reap) runOptions.reap = true;
     try {
+      const cwd = options.cwd ? resolve3(options.cwd) : process.cwd();
+      const runOptions = {
+        cwd,
+        apply: options.apply ?? false,
+        allowConflicts: options.allowConflicts ?? false,
+        acknowledgeBreaking: options.acknowledgeBreaking ?? false,
+        allowDirty: options.allowDirty ?? false
+      };
+      const templateRepoFlag = resolveTemplateRepoFlag(options.templateRepo, options.template);
+      if (templateRepoFlag) runOptions.templateRepo = resolve3(templateRepoFlag);
+      if (options.to) runOptions.toVersion = options.to;
+      if (options.fromTemplate) runOptions.baseDir = resolve3(options.fromTemplate);
+      if (options.toTemplate) runOptions.theirsDir = resolve3(options.toTemplate);
+      if (options.base) runOptions.base = options.base;
+      if (options.remote) runOptions.remote = options.remote;
+      if (options.reap) runOptions.reap = true;
       await runCoreUpgrade(runOptions);
     } catch (err) {
       log.error(err.message);

package/package.json

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