@cmssy/cli 10.6.0 → 10.7.0

package/dist/index.js

@@ -1007,7 +1007,7 @@ async function runLink(options, deps) {
 
 // src/types-command.ts
 import { mkdirSync as mkdirSync3, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "fs";
-import { dirname as dirname3, join as join6 } from "path";
+import { dirname as dirname3, relative, resolve as resolvePath } from "path";
 import { DEFAULT_CMSSY_API_URL } from "@cmssy/core";
 
 // src/model-types.ts
@@ -1244,6 +1244,22 @@ async function request(deps, endpoint, query, variables) {
   if (!body.data) throw new CliError("the delivery API returned no data");
   return body.data;
 }
+function describeDrift(previous, next) {
+  const declared = (source, pattern) => new Set([...source.matchAll(pattern)].map((match) => match[1] ?? ""));
+  const body = (source) => source.split("/** Every model in the")[0] ?? source;
+  const models = /export interface (\w+)Data/g;
+  const fields = /^\s{2}(\w+)\??:/gm;
+  const lines = [];
+  const report = (label, before, after) => {
+    const added = [...after].filter((name) => !before.has(name));
+    const removed = [...before].filter((name) => !after.has(name));
+    if (added.length) lines.push(`+ ${label}: ${added.join(", ")}`);
+    if (removed.length) lines.push(`- ${label}: ${removed.join(", ")}`);
+  };
+  report("models", declared(previous, models), declared(next, models));
+  report("fields", declared(body(previous), fields), declared(body(next), fields));
+  return lines.length ? lines : ["the generated output differs"];
+}
 function resolve3(value, fromEnv, variable) {
   const resolved = value?.trim() || fromEnv?.trim();
   if (!resolved) {
@@ -1280,7 +1296,10 @@ async function runTypes(options, deps) {
       );
       return 0;
     }
-    const outPath = join6(deps.cwd, options.out?.trim() || DEFAULT_OUT);
+    const requested = options.out?.trim() || DEFAULT_OUT;
+    const outPath = resolvePath(deps.cwd, requested);
+    const inside = relative(deps.cwd, outPath);
+    const shown = inside && !inside.startsWith("..") ? inside : outPath;
     const source = generateModelTypes(models, { workspace });
     let previous = null;
     try {
@@ -1289,9 +1308,19 @@ async function runTypes(options, deps) {
       previous = null;
     }
     if (previous === source) {
-      deps.log(`cmssy: ${options.out ?? DEFAULT_OUT} is up to date`);
+      deps.log(`cmssy: ${shown} is up to date`);
       return 0;
     }
+    if (options.check) {
+      deps.log(
+        previous === null ? `cmssy: ${shown} is missing - run \`cmssy types\` and commit it` : `cmssy: ${shown} is out of date with the "${workspace}" workspace`
+      );
+      if (previous !== null) {
+        for (const line of describeDrift(previous, source)) deps.log(`  ${line}`);
+      }
+      deps.log("  run `cmssy types` and commit the result");
+      return 1;
+    }
     mkdirSync3(dirname3(outPath), { recursive: true });
     writeFileSync4(outPath, source);
     const fieldCount = models.reduce(
@@ -1299,7 +1328,7 @@ async function runTypes(options, deps) {
       0
     );
     deps.log(
-      `cmssy: wrote ${options.out ?? DEFAULT_OUT} - ${models.length} model${models.length === 1 ? "" : "s"}, ${fieldCount} field${fieldCount === 1 ? "" : "s"}`
+      `cmssy: wrote ${shown} - ${models.length} model${models.length === 1 ? "" : "s"}, ${fieldCount} field${fieldCount === 1 ? "" : "s"}`
     );
     deps.log(
       `  ${models.map((model) => model.slug).join(", ")}`
@@ -1321,7 +1350,7 @@ var USAGE = [
   "  cmssy init [--dir <path>] [--force]",
   "  cmssy add block <name> [--dir <path>]",
   "  cmssy link [--token <cs_...>] [--workspace <slug>] [--preview-url <url>]",
-  "  cmssy types [--out <path>] [--org <slug>] [--workspace <slug>]"
+  "  cmssy types [--out <path>] [--check] [--org <slug>] [--workspace <slug>]"
 ].join("\n");
 function flagValue(args, name) {
   const index = args.findIndex((arg) => arg === name);
@@ -1384,7 +1413,8 @@ async function main() {
       {
         out: flagValue(args, "--out"),
         org: flagValue(args, "--org"),
-        workspace: flagValue(args, "--workspace")
+        workspace: flagValue(args, "--workspace"),
+        check: hasFlag(args, "--check")
       },
       {
         cwd: process.cwd(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/cli",
-  "version": "10.6.0",
+  "version": "10.7.0",
   "description": "The cmssy CLI: `cmssy init` wires cmssy into an existing Next.js, Astro or React Router app; `cmssy link` connects it to a workspace and verifies the editor wiring.",
   "keywords": [
     "cmssy",
@@ -27,7 +27,7 @@
     "assets"
   ],
   "dependencies": {
-    "@cmssy/core": "10.6.0"
+    "@cmssy/core": "10.7.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",