@cmssy/cli 16.11.1 → 17.0.0

package/dist/index.js

@@ -2247,35 +2247,19 @@ function objectType(fields, depth) {
   if (!body.length) return "Record<string, unknown>";
   return ["{", ...body, `${INDENT.repeat(depth)}}`].join("\n");
 }
-var PREAMBLE = `/** A translatable field: one string, or one per enabled language. */
-export type CmssyLocalized = string | Record<string, string>;
+var PREAMBLE = `import type {
+  CmssyLocalizedValue as CmssyLocalized,
+  ResolvedMedia as CmssyMedia,
+  FileFieldValue as CmssyFile,
+  CmssyModelRecord as CmssyRecordOf,
+} from "@cmssy/core";
 
-/**
- * What a media field reads back. Mirrors \`ResolvedMedia\` in @cmssy/types.
- * A single media field is \`CmssyMedia | null\`: a reference whose asset was
- * deleted resolves to nothing. A gallery drops such entries instead.
- */
-export interface CmssyMedia {
-  id: string;
-  url: string | null;
-  visibility: "public" | "private";
-  alt?: string;
-  width?: number;
-  height?: number;
+export type { CmssyLocalized, CmssyMedia, CmssyFile, CmssyRecordOf };`;
+function preambleImports() {
+  const clause = /import type \{([^}]*)\} from "@cmssy\/core";/.exec(PREAMBLE);
+  if (!clause?.[1]) return [];
+  return clause[1].split(",").map((entry) => entry.trim().split(/\s+as\s+/)[0]?.trim() ?? "").filter((name) => name.length > 0);
 }
-
-/** What a file field holds. Mirrors \`FileFieldValue\` in @cmssy/types. */
-export type CmssyFile = string;
-
-/** A record as \`public.model.records\` returns it, with \`data\` typed. */
-export interface CmssyRecordOf<Data> {
-  id: string;
-  modelId: string;
-  status: string;
-  createdAt: string;
-  updatedAt: string;
-  data: Data;
-}`;
 function generateModelTypes(models, options) {
   const command = options.command ?? "npx @cmssy/cli types";
   const sorted = [...models].sort((a, b) => a.slug.localeCompare(b.slug));
@@ -2434,11 +2418,72 @@ async function request(deps, endpoint, query, variables) {
   if (!body.data) throw new CliError("the delivery API returned no data");
   return body.data;
 }
+function ancestors(from) {
+  const chain = [];
+  let dir = resolvePath(from);
+  for (let steps = dir.split(/[\\/]/).length + 1; steps > 0; steps -= 1) {
+    chain.push(dir);
+    const parent = dirname4(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return chain;
+}
+function exportedNames(declarations) {
+  const source = declarations.replace(/\/\*[\s\S]*?\*\//g, " ").replace(/^\s*\/\/.*$/gm, " ");
+  const found = /* @__PURE__ */ new Set();
+  for (const [, clause] of source.matchAll(/export\s+(?:type\s+)?\{([^}]*)\}/g)) {
+    for (const entry of (clause ?? "").split(",")) {
+      const parts = entry.trim().split(/\s+as\s+/);
+      const name = (parts[1] ?? parts[0] ?? "").trim();
+      if (name.length > 0) found.add(name);
+    }
+  }
+  const declared = /export\s+(?:declare\s+)?(?:abstract\s+)?(?:type|interface|class|const|let|var|function|enum|namespace)\s+(\w+)/g;
+  for (const [, name] of source.matchAll(declared)) {
+    if (name !== void 0) found.add(name);
+  }
+  return found;
+}
+function coreShapeGap(cwd) {
+  const names = preambleImports();
+  if (names.length === 0) return null;
+  let manifest = null;
+  let manifestPath = "";
+  for (const dir of ancestors(cwd)) {
+    const candidate = resolvePath(dir, "node_modules/@cmssy/core/package.json");
+    try {
+      manifest = JSON.parse(readFileSync8(candidate, "utf8"));
+      manifestPath = candidate;
+      break;
+    } catch {
+      manifest = null;
+    }
+  }
+  if (!manifest) return null;
+  let declarations;
+  try {
+    declarations = readFileSync8(
+      resolvePath(dirname4(manifestPath), manifest.types ?? "dist/index.d.ts"),
+      "utf8"
+    );
+  } catch {
+    return null;
+  }
+  const exported = exportedNames(declarations);
+  const missing = names.filter((name) => !exported.has(name));
+  return missing.length > 0 ? { version: manifest.version ?? "unknown", missing } : null;
+}
 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 body = (source) => {
+    const head = source.search(/export interface \w+Data\b/);
+    if (head === -1) return "";
+    const scoped = source.slice(head);
+    return scoped.split("/** Every model in the")[0] ?? scoped;
+  };
   const lines = [];
   const report = (label, before, after) => {
     const added = [...after].filter((name) => !before.has(name));
@@ -2446,7 +2491,7 @@ function describeDrift(previous, next) {
     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("models", declared(body(previous), models), declared(body(next), models));
   report("fields", declared(body(previous), fields), declared(body(next), fields));
   return lines.length ? lines : ["the generated output differs"];
 }
@@ -2578,6 +2623,15 @@ async function runTypes(options, deps) {
     const inside = relative(deps.cwd, outPath);
     const shown = inside && !inside.startsWith("..") ? inside : outPath;
     const source = generateModelTypes(models, { workspace });
+    const gap = coreShapeGap(deps.cwd);
+    if (gap) {
+      deps.log(
+        `cmssy: the installed @cmssy/core ${gap.version} does not export ${gap.missing.join(", ")}`
+      );
+      deps.log(
+        `  ${shown} imports those shapes - upgrade @cmssy/core to ${cliVersion()} or newer`
+      );
+    }
     let previous = null;
     try {
       previous = readFileSync8(outPath, "utf8");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/cli",
-  "version": "16.11.1",
+  "version": "17.0.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",
@@ -28,7 +28,7 @@
   ],
   "dependencies": {
     "esbuild": "^0.27.7",
-    "@cmssy/core": "16.11.1"
+    "@cmssy/core": "17.0.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",