@plexus-ms/cli 0.6.0 → 0.8.0

package/dist/plx.js

@@ -7731,7 +7731,7 @@ async function exists(ctx, path3) {
 
 // ../lib/dist/changeset.js
 var import_yaml2 = __toESM(require_dist(), 1);
-import { join as join3 } from "node:path";
+import { dirname, join as join3 } from "node:path";
 
 // ../lib/dist/io.js
 import { spawn } from "node:child_process";
@@ -7824,6 +7824,7 @@ function body(step) {
 // ../lib/dist/changeset.js
 var CHANGESET_DIR = ".changeset";
 var FIELDS = ["dependencies", "optionalDependencies", "peerDependencies"];
+var TEST_FILE = /\.test\.[cm]?[jt]sx?$|\/testing\//;
 function changesetPath(branch) {
   const slug = branch.replace(/^(renovate|dependabot)\//, "").replace(/[^a-z0-9]+/gi, "-").replace(/^-|-$/g, "").toLowerCase();
   return `${CHANGESET_DIR}/bot-${slug || "branch"}.md`;
@@ -7831,11 +7832,19 @@ function changesetPath(branch) {
 function planChangeset(input) {
   const path3 = changesetPath(input.branch);
   const changes = [];
+  const sources = [];
   const releases = {};
   for (const diff of input.packages) {
     const { before, after } = diff;
     if (!before || !after?.name || after.private || input.ignore.includes(after.name))
       continue;
+    const src = `${dirname(diff.path)}/src/`;
+    for (const file of input.files ?? []) {
+      if (!file.startsWith(src) || TEST_FILE.test(file))
+        continue;
+      sources.push({ package: after.name, file });
+      releases[after.name] ??= "patch";
+    }
     for (const field of FIELDS) {
       const names = /* @__PURE__ */ new Set([...Object.keys(before[field] ?? {}), ...Object.keys(after[field] ?? {})]);
       for (const dependency of [...names].sort()) {
@@ -7851,19 +7860,23 @@ function planChangeset(input) {
     }
   }
   const root = input.root;
-  if (changes.length === 0) {
+  if (changes.length === 0 && sources.length === 0) {
     const remove = run("rm", ["-f", path3], root ? { cwd: root } : {});
-    return { path: path3, releases, changes, plan: input.exists ? [remove] : [] };
+    return { path: path3, releases, changes, sources, plan: input.exists ? [remove] : [] };
   }
   const header = Object.entries(releases).sort(([a], [b]) => a.localeCompare(b)).map(([name, bump]) => `'${name}': ${bump}`);
-  const lines = [...new Set(changes.map(describeChange))].sort((a, b) => a.localeCompare(b));
+  const described = [
+    ...changes.map(describeChange),
+    ...sources.map((s) => `Update the version pinned in \`${s.file}\``)
+  ];
+  const lines = [...new Set(described)].sort((a, b) => a.localeCompare(b));
   const content = `---
 ${header.join("\n")}
 ---
 
 ${lines.join("\n")}
 `;
-  return { path: path3, releases, changes, content, plan: [write(root ? join3(root, path3) : path3, content)] };
+  return { path: path3, releases, changes, sources, content, plan: [write(root ? join3(root, path3) : path3, content)] };
 }
 function describeChange(c) {
   const peer = c.field === "peerDependencies" ? " (peer)" : "";
@@ -7936,6 +7949,7 @@ async function readChangeset(ctx, dir, base, branch) {
     catalogsBefore: parseCatalogs(await show("pnpm-workspace.yaml")),
     catalogsAfter: parseCatalogs(workspaceAfter),
     ignore,
+    files: (await git2(["diff", "--name-only", mergeBase, "HEAD"])).split("\n").filter(Boolean),
     exists: entries.some((e) => !e.directory && `${CHANGESET_DIR}/${e.name}` === path3),
     root: dir
   });
@@ -8126,6 +8140,8 @@ function indent(text) {
 var import_yaml3 = __toESM(require_dist(), 1);
 var ANSWERS_FILE = ".copier-answers.yml";
 var TEMPLATE_FILES = ["copier.yml", "copier.yaml"];
+var COPIER_VERSION = "9.19.1";
+var copierVia = (args) => ["exec", `copier@${COPIER_VERSION}`, "--", "copier", ...args];
 function parseAnswers(text) {
   const data = (0, import_yaml3.parse)(text);
   if (data === null || typeof data !== "object" || Array.isArray(data))
@@ -8682,13 +8698,11 @@ async function updateSite(ctx, consumer, site, localPreset, summary, cloneOf, pr
       const answers = await ctx.readFile(join8(site.path, ANSWERS_FILE));
       await ctx.stage(write(join8(target, ANSWERS_FILE), answers.replace(/^_src_path: .*$/m, `_src_path: ${localPreset}`)));
       await previewCommit(repo, `plx preview: ${site.rel} reads ${localPreset} from the local checkout`);
-      await ctx.stage(run("copier", ["update", "--skip-answered", "--trust", "--defaults", "--skip-tasks", "--vcs-ref", "main"], {
-        cwd: target
-      }));
+      await ctx.stage(run("mise", copierVia(["update", "--skip-answered", "--trust", "--defaults", "--skip-tasks", "--vcs-ref", "main"]), { cwd: target }));
     } else {
       ctx.say(`\u2192 ${site.rel}: copier update`);
       const args = ["update", "--skip-answered", "--trust", ...ctx.yes ? ["--defaults"] : []];
-      await ctx.apply([run("copier", args, { cwd: target, interactive: true })]);
+      await ctx.apply([run("mise", copierVia(args), { cwd: target, interactive: true })]);
     }
   } catch (error) {
     ctx.say(`  \u2717 FAILED \u2014 copier update exited nonzero${detail(error)}`);
@@ -8935,11 +8949,25 @@ async function checkCompendium(ctx, compendium) {
   };
 }
 
+// ../lib/dist/self.js
+var SELF_PACKAGE = "@plexus-ms/cli";
+async function preflightSelf(ctx, running) {
+  const latest = (await ctx.read("npm", ["view", SELF_PACKAGE, "version"]).catch(() => "")).trim();
+  if (!latest) {
+    ctx.say(`\u26A0 could not ask the registry for the newest ${SELF_PACKAGE}; going on with plx ${running}`);
+    return;
+  }
+  if (compareTrains(running, latest) < 0)
+    throw new Error(`plx ${running} is behind ${latest}, the newest release; update it first: mise up npm:${SELF_PACKAGE}`);
+}
+
 // ../lib/dist/ship.js
 import { join as join10 } from "node:path";
 async function ship(ctx, options) {
   const upstream = join10(options.workspace, UPSTREAM);
   const propagateOnly = options.propagateOnly ?? false;
+  if (options.plx)
+    await preflightSelf(ctx, options.plx);
   const train = await readTrain(ctx, upstream);
   if (!propagateOnly)
     await preflightRelease(ctx, train);
@@ -13901,7 +13929,9 @@ function register(program2) {
 // src/commands/changeset.ts
 import { resolve as resolve2 } from "node:path";
 function register2(program2) {
-  program2.command("changeset").description("write the changeset a dependency bump owes: a patch per package whose runtime dependencies moved").argument("[dir]", "a checkout of the package repo, on the bump branch", ".").option("--base <ref>", "the trunk the branch is diffed against, at the merge base", "origin/main").option("--branch <name>", "the branch name that names the file (default: the checked-out branch)").action(async (dir, opts, command) => {
+  program2.command("changeset").description(
+    "write the changeset a dependency bump owes: a patch per package whose runtime dependencies or shipped source moved"
+  ).argument("[dir]", "a checkout of the package repo, on the bump branch", ".").option("--base <ref>", "the trunk the branch is diffed against, at the merge base", "origin/main").option("--branch <name>", "the branch name that names the file (default: the checked-out branch)").action(async (dir, opts, command) => {
     const ctx = contextOf2(command);
     const changeset = await readChangeset(ctx, resolve2(dir), opts.base, opts.branch);
     await ctx.apply(changeset.plan);
@@ -14057,7 +14087,7 @@ import { resolve as resolve7 } from "node:path";
 function register7(program2) {
   program2.command("ship").description("release the train: tag every train repo identically, then copier-update every consumer").argument("[dir]", "the workspace: plexus-ms/ and the consumers sit under it", ".").option("--train <version>", "the train version, plain semver (default: minor+1 over the latest train)").action(async (dir, opts, command) => {
     const ctx = contextOf2(command);
-    const result = await ship(ctx, { workspace: resolve7(dir), train: opts.train });
+    const result = await ship(ctx, { workspace: resolve7(dir), train: opts.train, plx: version });
     ctx.result(result, (r) => renderSummary(r, `plx -y ship --train ${r.train} ${dir}`));
     if (!isClean(result)) process.exitCode = 1;
   });
@@ -14083,7 +14113,7 @@ function renderSummary(s, realCommand) {
 function register8(program2) {
   program2.command("propagate").description("copier-update every consumer of the presets to the current train, and pin their ci-cd workflow refs").argument("[dir]", "the workspace: plexus-ms/ and the consumers sit under it", ".").option("--train <version>", "the train to propagate (default: the current one)").action(async (dir, opts, command) => {
     const ctx = contextOf2(command);
-    const result = await ship(ctx, { workspace: resolve8(dir), train: opts.train, propagateOnly: true });
+    const result = await ship(ctx, { workspace: resolve8(dir), train: opts.train, propagateOnly: true, plx: version });
     ctx.result(result, (r) => renderSummary(r, `plx -y propagate --train ${r.train} ${dir}`));
     if (!isClean(result)) process.exitCode = 1;
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plexus-ms/cli",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "description": "plx, the Plexus command-line tool: a single-script adapter over @plexus-ms/lib",
   "license": "GPL-3.0-or-later",
   "type": "module",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@inquirer/prompts": "^8.7.4",
-    "@plexus-ms/lib": "0.6.0",
+    "@plexus-ms/lib": "0.8.0",
     "commander": "^15.0.0"
   },
   "devDependencies": {