@topogram/cli 0.3.36 → 0.3.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@topogram/cli",
-  "version": "0.3.36",
+  "version": "0.3.38",
   "description": "Topogram CLI for checking Topogram workspaces and generating app bundles.",
   "license": "Apache-2.0",
   "repository": {

package/src/cli.js

@@ -108,7 +108,34 @@ const CLI_PACKAGE_NAME = "@topogram/cli";
 const NPMJS_REGISTRY = "https://registry.npmjs.org";
 const TEMPLATE_FILES_MANIFEST = ".topogram-template-files.json";
 const TEMPLATE_POLICY_FILE = "topogram.template-policy.json";
-const KNOWN_CLI_CONSUMER_REPOS = ["topogram-starters", "topogram-template-todo", "topogram-demo-todo"];
+const FIRST_PARTY_GENERATOR_REPOS = [
+  "topogram-generator-express-api",
+  "topogram-generator-hono-api",
+  "topogram-generator-postgres-db",
+  "topogram-generator-react-web",
+  "topogram-generator-sqlite-db",
+  "topogram-generator-sveltekit-web",
+  "topogram-generator-swiftui-native",
+  "topogram-generator-vanilla-web"
+];
+const KNOWN_CLI_CONSUMER_REPOS = [
+  ...FIRST_PARTY_GENERATOR_REPOS,
+  "topogram-starters",
+  "topogram-template-todo",
+  "topogram-demo-todo",
+  "topogram-hello"
+];
+const PACKAGE_UPDATE_CLI_CHECK_SCRIPTS = [
+  "cli:surface",
+  "doctor",
+  "catalog:show",
+  "catalog:template-show",
+  "check",
+  "pack:check",
+  "verify"
+];
+const PACKAGE_UPDATE_CLI_INFO_SCRIPTS = ["cli:surface", "doctor", "catalog:show", "catalog:template-show"];
+const PACKAGE_UPDATE_CLI_VERIFICATION_SCRIPTS = ["verify", "pack:check", "check"];
 const REPO_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..", "..");
 const ENGINE_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
 const TEMPLATES_ROOT = path.join(ENGINE_ROOT, "templates");
@@ -654,6 +681,8 @@ function printPackageHelp() {
   console.log("  - npmjs package inspection confirms the requested public CLI version.");
   console.log("  - npm install updates package.json and package-lock.json.");
   console.log("  - Available consumer verification scripts run after install.");
+  console.log(`  - Recognized scripts: ${PACKAGE_UPDATE_CLI_CHECK_SCRIPTS.join(", ")}.`);
+  console.log("  - Verification scripts are selected by strength: verify, then pack:check, then check.");
   console.log("");
   console.log("Examples:");
   console.log("  topogram package update-cli 0.3.5");
@@ -667,7 +696,7 @@ function printPackageHelp() {
 function printReleaseHelp() {
   console.log("Usage: topogram release status [--json] [--strict]");
   console.log("");
-  console.log("Checks the local CLI version, latest published package version, release tag, and known consumer pins.");
+  console.log("Checks the local CLI version, latest published package version, release tag, and first-party consumer pins.");
   console.log("");
   console.log("Examples:");
   console.log("  topogram release status");
@@ -1625,11 +1654,10 @@ function buildPackageUpdateCliPayload(requested, options = {}) {
   const versionConvention = writeTopogramCliVersionConventionIfPresent(cwd, version);
   const packageJson = readPackageJsonForUpdate(cwd);
   const scripts = packageJson.scripts && typeof packageJson.scripts === "object" ? packageJson.scripts : {};
-  const candidateScripts = ["cli:surface", "doctor", "catalog:show", "catalog:template-show", "check"];
   const scriptsRun = [];
   const skippedScripts = [];
   if (dependencyUpdatedBy !== "npm-install") {
-    skippedScripts.push(...candidateScripts);
+    skippedScripts.push(...PACKAGE_UPDATE_CLI_CHECK_SCRIPTS);
     diagnostics.push({
       code: "package_update_cli_checks_skipped_after_file_update",
       severity: "warning",
@@ -1638,11 +1666,23 @@ function buildPackageUpdateCliPayload(requested, options = {}) {
       suggestedFix: "Run npm install or npm ci, then rerun consumer verification."
     });
   } else {
-    for (const scriptName of candidateScripts) {
+    const scriptsToRun = packageUpdateCliScriptsToRun(scripts);
+    for (const scriptName of PACKAGE_UPDATE_CLI_INFO_SCRIPTS) {
       if (!Object.prototype.hasOwnProperty.call(scripts, scriptName)) {
         skippedScripts.push(scriptName);
-        continue;
       }
+    }
+    for (const scriptName of PACKAGE_UPDATE_CLI_VERIFICATION_SCRIPTS) {
+      if (!Object.prototype.hasOwnProperty.call(scripts, scriptName)) {
+        skippedScripts.push(scriptName);
+      } else if (!scriptsToRun.includes(scriptName)) {
+        const coveringScript = scriptsToRun.find((candidate) =>
+          PACKAGE_UPDATE_CLI_VERIFICATION_SCRIPTS.includes(candidate)
+        );
+        skippedScripts.push(`${scriptName} (covered by ${coveringScript})`);
+      }
+    }
+    for (const scriptName of scriptsToRun) {
       const result = runNpmForPackageUpdate(["run", scriptName], cwd);
       if (result.status !== 0) {
         throw new Error(formatPackageUpdateNpmError(`npm run ${scriptName}`, "check", result));
@@ -1669,6 +1709,26 @@ function buildPackageUpdateCliPayload(requested, options = {}) {
   };
 }
 
+/**
+ * @param {Record<string, any>} scripts
+ * @returns {string[]}
+ */
+function packageUpdateCliScriptsToRun(scripts) {
+  const selected = [];
+  for (const scriptName of PACKAGE_UPDATE_CLI_INFO_SCRIPTS) {
+    if (Object.prototype.hasOwnProperty.call(scripts, scriptName)) {
+      selected.push(scriptName);
+    }
+  }
+  const verificationScript = PACKAGE_UPDATE_CLI_VERIFICATION_SCRIPTS.find((scriptName) =>
+    Object.prototype.hasOwnProperty.call(scripts, scriptName)
+  );
+  if (verificationScript) {
+    selected.push(verificationScript);
+  }
+  return selected;
+}
+
 /**
  * @param {ReturnType<typeof buildPackageUpdateCliPayload>} payload
  * @returns {void}
@@ -1700,7 +1760,7 @@ function printPackageUpdateCli(payload) {
   console.log("  git diff package.json package-lock.json");
   console.log(`  git commit -am "Update Topogram CLI to ${payload.requestedVersion}"`);
   console.log("  git push");
-  console.log("  confirm Demo Verification passes");
+  console.log("  confirm the repo verification workflow passes");
 }
 
 /**
@@ -1804,9 +1864,9 @@ function releaseStatusStrictDiagnostics(release) {
     diagnostics.push({
       code: "release_consumer_pins_not_current",
       severity: "error",
-      message: `Known consumers are not all pinned to ${CLI_PACKAGE_NAME}@${release.localVersion}.`,
+      message: `First-party consumers are not all pinned to ${CLI_PACKAGE_NAME}@${release.localVersion}.`,
       path: "topogram-cli.version",
-      suggestedFix: "Roll known consumer repositories to the current CLI version before treating this release as complete."
+      suggestedFix: "Roll first-party consumer repositories to the current CLI version before treating this release as complete."
     });
   }
   return diagnostics;