@cmssy/cli 19.4.0 → 19.6.0

package/dist/index.js

@@ -2215,7 +2215,7 @@ async function runLink(options, deps) {
 // src/types-command.ts
 import { mkdirSync as mkdirSync5, readFileSync as readFileSync8, readdirSync, writeFileSync as writeFileSync7 } from "fs";
 import { dirname as dirname4, relative, resolve as resolvePath } from "path";
-import { DEFAULT_CMSSY_API_URL } from "@cmssy/core";
+import { DEFAULT_CMSSY_API_URL, createRetryingFetch } from "@cmssy/core";
 
 // src/model-types.ts
 var TEXTUAL = /* @__PURE__ */ new Set([
@@ -2243,7 +2243,12 @@ function propertyKey(key) {
   return /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(key) ? key : JSON.stringify(key);
 }
 function stringUnion(options) {
-  return options.map((option) => JSON.stringify(option)).join(" | ");
+  return options.map((option) => JSON.stringify(option.value)).join(" | ");
+}
+function textIn(text, language) {
+  if (!text) return null;
+  if (language && text[language]?.trim()) return text[language];
+  return Object.values(text).find((entry) => entry.trim()) ?? null;
 }
 function scalarType(field) {
   if (TEXTUAL.has(field.type)) {
@@ -2273,13 +2278,13 @@ function scalarType(field) {
       return "unknown";
   }
 }
-function fieldType(field, depth) {
+function fieldType(field, depth, language) {
   if (field.type === "object") {
-    return field.fields?.length ? objectType(field.fields, depth) : "Record<string, unknown>";
+    return field.fields?.length ? objectType(field.fields, depth, language) : "Record<string, unknown>";
   }
   if (field.type === "repeater" || field.type === "list") {
     if (field.itemFields?.length) {
-      return `Array<${objectType(field.itemFields, depth)}>`;
+      return `Array<${objectType(field.itemFields, depth, language)}>`;
     }
     if (field.itemType) {
       const item = scalarType({ key: field.key, type: field.itemType });
@@ -2289,10 +2294,12 @@ function fieldType(field, depth) {
   }
   return scalarType(field);
 }
-function docComment(field, pad) {
+function docComment(field, pad, language) {
   const parts = [];
-  if (field.label && field.label !== field.key) parts.push(field.label);
-  if (field.description) parts.push(field.description);
+  const label = textIn(field.label, language);
+  const description = textIn(field.description, language);
+  if (label && label !== field.key) parts.push(label);
+  if (description) parts.push(description);
   if (field.type === "relation" && field.relationTo) {
     parts.push(
       `Record id(s) from \`${field.relationTo.replace(/^model:/, "")}\`.`
@@ -2301,21 +2308,21 @@ function docComment(field, pad) {
   if (!parts.length) return [];
   return [`${pad}/** ${parts.join(" - ")} */`];
 }
-function members(fields, depth) {
+function members(fields, depth, language) {
   const pad = INDENT.repeat(depth + 1);
   const lines = [];
   for (const field of fields) {
     if (field.hidden) continue;
-    lines.push(...docComment(field, pad));
+    lines.push(...docComment(field, pad, language));
     const optional = field.required ? "" : "?";
     lines.push(
-      `${pad}${propertyKey(field.key)}${optional}: ${fieldType(field, depth + 1)};`
+      `${pad}${propertyKey(field.key)}${optional}: ${fieldType(field, depth + 1, language)};`
     );
   }
   return lines;
 }
-function objectType(fields, depth) {
-  const body = members(fields, depth);
+function objectType(fields, depth, language) {
+  const body = members(fields, depth, language);
   if (!body.length) return "Record<string, unknown>";
   return ["{", ...body, `${INDENT.repeat(depth)}}`].join("\n");
 }
@@ -2330,7 +2337,9 @@ 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);
+  return clause[1].split(",").map(
+    (entry) => entry.trim().split(/\s+as\s+/)[0]?.trim() ?? ""
+  ).filter((name) => name.length > 0);
 }
 function generateModelTypes(models, options) {
   const command = options.command ?? "npx @cmssy/cli types";
@@ -2361,7 +2370,7 @@ function generateModelTypes(models, options) {
     blocks.push(
       "",
       doc.join("\n"),
-      `export interface ${name}Data ${objectType(model.fields, 0)}`,
+      `export interface ${name}Data ${objectType(model.fields, 0, options.language)}`,
       "",
       `export type ${name}Record = CmssyRecordOf<${name}Data>;`
     );
@@ -2425,12 +2434,13 @@ ${documents}
 // src/types-command.ts
 var DEFAULT_OUT = "cmssy/models.ts";
 var SITE_CONFIG_QUERY = `query CliSiteConfig($workspaceSlug: String!) {
-  public { siteConfig(workspaceSlug: $workspaceSlug) { workspaceId } }
+  public { siteConfig(workspaceSlug: $workspaceSlug) { workspaceId defaultLanguage } }
 }`;
-var DEFINITIONS_QUERY = `query CliModelDefinitions($workspaceId: String!) {
+var DEFINITIONS_PAGE = 4;
+var DEFINITIONS_QUERY = `query CliModelDefinitions($workspaceId: String!, $limit: Int!, $offset: Int!) {
   public {
     model {
-      definitions(workspaceId: $workspaceId) {
+      definitions(workspaceId: $workspaceId, limit: $limit, offset: $offset) {
         slug
         name
         description
@@ -2444,7 +2454,10 @@ var DEFINITIONS_QUERY = `query CliModelDefinitions($workspaceId: String!) {
           localized
           multiple
           hidden
-          options
+          options {
+            value
+            label
+          }
           relationTo
           relationType
           fields
@@ -2473,9 +2486,10 @@ async function refusalReason(response) {
   return said.length > 0 ? said.join("; ") : void 0;
 }
 async function request(deps, endpoint, query, variables) {
+  const doFetch = createRetryingFetch("build", deps.fetch, "cmssy types");
   let response;
   try {
-    response = await deps.fetch(endpoint, {
+    response = await doFetch(endpoint, {
       method: "POST",
       headers: { "content-type": "application/json" },
       body: JSON.stringify({ query, variables })
@@ -2516,7 +2530,9 @@ function ancestors(from) {
 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 [, 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();
@@ -2575,8 +2591,16 @@ function describeDrift(previous, next) {
     if (added.length) lines.push(`+ ${label}: ${added.join(", ")}`);
     if (removed.length) lines.push(`- ${label}: ${removed.join(", ")}`);
   };
-  report("models", declared(body(previous), models), declared(body(next), models));
-  report("fields", declared(body(previous), fields), declared(body(next), fields));
+  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"];
 }
 function resolve4(value, fromEnv, variable) {
@@ -2674,6 +2698,19 @@ function syncOperations(options, deps) {
   deps.log(`  ${names.join(", ")}`);
   return 0;
 }
+async function readDefinitions(deps, endpoint, workspaceId) {
+  const models = [];
+  for (let offset = 0; ; offset += DEFINITIONS_PAGE) {
+    const result = await request(deps, endpoint, DEFINITIONS_QUERY, {
+      workspaceId,
+      limit: DEFINITIONS_PAGE,
+      offset
+    });
+    const page = result.public.model.definitions;
+    models.push(...page);
+    if (page.length < DEFINITIONS_PAGE) return models;
+  }
+}
 async function runTypes(options, deps) {
   let operationsStatus = 0;
   try {
@@ -2694,8 +2731,7 @@ async function runTypes(options, deps) {
         "check the slugs under Settings \u2192 Headless"
       );
     }
-    const result = await request(deps, endpoint, DEFINITIONS_QUERY, { workspaceId });
-    const models = result.public.model.definitions;
+    const models = await readDefinitions(deps, endpoint, workspaceId);
     if (models.length === 0) {
       deps.log(
         `cmssy: the "${workspace}" workspace has no models yet - nothing to generate`
@@ -2706,7 +2742,10 @@ async function runTypes(options, deps) {
     const outPath = resolvePath(deps.cwd, requested);
     const inside = relative(deps.cwd, outPath);
     const shown = inside && !inside.startsWith("..") ? inside : outPath;
-    const source = generateModelTypes(models, { workspace });
+    const source = generateModelTypes(models, {
+      workspace,
+      language: site.public.siteConfig?.defaultLanguage
+    });
     const gap = coreShapeGap(deps.cwd);
     if (gap) {
       deps.log(
@@ -2731,7 +2770,8 @@ async function runTypes(options, deps) {
         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}`);
+        for (const line of describeDrift(previous, source))
+          deps.log(`  ${line}`);
       }
       deps.log("  run `cmssy types` and commit the result");
       return 1;
@@ -2745,9 +2785,7 @@ async function runTypes(options, deps) {
     deps.log(
       `cmssy: wrote ${shown} - ${models.length} model${models.length === 1 ? "" : "s"}, ${fieldCount} field${fieldCount === 1 ? "" : "s"}`
     );
-    deps.log(
-      `  ${models.map((model) => model.slug).join(", ")}`
-    );
+    deps.log(`  ${models.map((model) => model.slug).join(", ")}`);
     return operationsStatus;
   } catch (error) {
     if (error instanceof CliError) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/cli",
-  "version": "19.4.0",
+  "version": "19.6.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": "19.4.0"
+    "@cmssy/core": "19.6.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",