@contentful/experience-design-system-cli 2.41.1-dev-build-36ec74af.0 → 2.41.1-dev-build-699ca2d9.0

package/dist/app.js

@@ -1676,9 +1676,12 @@ var init_schema = __esm({
             $required: { type: "boolean" },
             $default: {},
             $values: { type: "array", items: { type: "string" } },
-            "$token.kind": { type: "string" },
+            "$token.kind": { type: "string", minLength: 1 },
             "$token.allowed": { type: "array", items: { type: "string" } }
           },
+          // The API rejects a token property that does not say which kind of token it takes.
+          if: { type: "object", properties: { $type: { const: "token" } }, required: ["$type"] },
+          then: { type: "object", required: ["$token.kind"] },
           additionalProperties: false
         },
         slot: {
@@ -22215,9 +22218,12 @@ var cdfJsonSchema2 = {
         $required: { type: "boolean" },
         $default: {},
         $values: { type: "array", items: { type: "string" } },
-        "$token.kind": { type: "string" },
+        "$token.kind": { type: "string", minLength: 1 },
         "$token.allowed": { type: "array", items: { type: "string" } }
       },
+      // The API rejects a token property that does not say which kind of token it takes.
+      if: { type: "object", properties: { $type: { const: "token" } }, required: ["$type"] },
+      then: { type: "object", required: ["$token.kind"] },
       additionalProperties: false
     },
     slot: {
@@ -22276,14 +22282,42 @@ function parseCDFComponents(obj, prefix = "") {
   }
   return { components, tokens };
 }
+function entryValidator(name) {
+  const check = ajv2.getSchema(`${CDF_SCHEMA_URL2}#/definitions/${name}`);
+  if (!check)
+    throw new Error(`the CDF schema has no "${name}" definition`);
+  return check;
+}
+var validateComponentEntry = entryValidator("component");
+var validateTokenEntry = entryValidator("token");
+function toValidationErrors(errors, prefix = "") {
+  return (errors ?? []).filter((err) => err.keyword !== "if").map((err) => ({
+    path: `${prefix}${err.instancePath}` || "/",
+    message: err.message ?? "Unknown validation error",
+    expected: err.params ? JSON.stringify(err.params) : void 0
+  }));
+}
+function entryErrors(node, prefix) {
+  const errors = [];
+  for (const [key, value] of Object.entries(node)) {
+    if (key.startsWith("$") || typeof value !== "object" || value === null)
+      continue;
+    const path5 = `${prefix}/${key}`;
+    const type = value["$type"];
+    const check = type === "component" ? validateComponentEntry : TOKEN_TYPE_SET3.has(type) ? validateTokenEntry : void 0;
+    if (!check) {
+      errors.push(...entryErrors(value, path5));
+    } else if (!check(value)) {
+      errors.push(...toValidationErrors(check.errors, path5));
+    }
+  }
+  return errors;
+}
 function validateCDF2(input) {
   const valid = validate2(input);
   if (!valid) {
-    const errors = (validate2.errors ?? []).map((err) => ({
-      path: err.instancePath || "/",
-      message: err.message ?? "Unknown validation error",
-      expected: err.params ? JSON.stringify(err.params) : void 0
-    }));
+    const focused = typeof input === "object" && input !== null ? entryErrors(input, "") : [];
+    const errors = focused.length > 0 ? focused : toValidationErrors(validate2.errors);
     return { valid: false, errors, components: [], tokens: [] };
   }
   const file = input;
@@ -22335,6 +22369,45 @@ var CDFTokenSchema2 = z3.strictObject({
   $description: z3.optional(z3.string())
 });
 
+// packages/experience-design-system-types/dist/src/cdf/repair-token-kinds.js
+var UNRESOLVED_WARNING = /\s*WARNING: token_kind unknown[^\n]*/;
+function inferTokenKind(propName, prop, tokens) {
+  const bound = typeof prop.$default === "string" ? tokens.find(({ path: path5 }) => path5 === prop.$default) : void 0;
+  if (bound)
+    return bound.entry.$type;
+  const name = propName.toLowerCase();
+  const kinds = new Set(tokens.filter(({ path: path5 }) => path5.toLowerCase().split(".").includes(name)).map(({ entry }) => entry.$type));
+  return kinds.size === 1 ? [...kinds][0] : void 0;
+}
+function withoutWarning(prop) {
+  if (prop.$description === void 0)
+    return prop;
+  const description = prop.$description.replace(UNRESOLVED_WARNING, "").trim();
+  const { $description: _stale, ...rest } = prop;
+  return description ? { ...rest, $description: description } : rest;
+}
+function repairTokenKinds(entry, componentKey, tokens, note) {
+  const properties = { ...entry.$properties };
+  let repaired = false;
+  for (const [name, prop] of Object.entries(entry.$properties)) {
+    if (prop.$type !== "token" || prop["$token.kind"])
+      continue;
+    repaired = true;
+    const kind = inferTokenKind(name, prop, tokens);
+    if (kind) {
+      properties[name] = { ...withoutWarning(prop), "$token.kind": kind };
+      note?.(`${componentKey}.${name} had no token kind, so "${kind}" was taken from the token file`);
+    } else {
+      const plain = { ...withoutWarning(prop), $type: "string" };
+      delete plain["$token.allowed"];
+      delete plain.$default;
+      properties[name] = plain;
+      note?.(`${componentKey}.${name} had no token kind and none could be told, so it was saved as a string property`);
+    }
+  }
+  return repaired ? { ...entry, $properties: properties } : entry;
+}
+
 // packages/experience-design-system-types/dist/src/cdf/build.js
 function stripUnsupportedSlotFields(entry) {
   if (!entry.$slots)
@@ -22371,7 +22444,7 @@ function buildCDF2(components, tokens, opts = {}) {
     return void 0;
   const doc = { $schema: CDF_SCHEMA_URL2 };
   for (const { key, entry } of components) {
-    setAtPath(doc, key, stripUnsupportedSlotFields(entry));
+    setAtPath(doc, key, stripUnsupportedSlotFields(repairTokenKinds(entry, key, tokens, opts.onRepair)));
   }
   for (const { path: path5, entry } of resolveTokenPathCollisions(tokens)) {
     setAtPath(doc, path5, entry);
@@ -29195,12 +29268,13 @@ function nextStateAfterPrint(opts) {
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/flow/save.ts
 var SAVE_CONFIRMATION_DELAY_MS = 1e3;
+var describeCdfError = (error) => `${error.path.replace(/^\//, "").replace("/$properties/", ".").replaceAll("/", ".")}: ${error.message}`;
 function buildSavedCDF(components, tokens, opts = {}) {
   const cdf = buildCDF2(components, toCdfTokens(tokens), opts);
   if (!cdf) throw new Error("nothing to save \u2014 no components or tokens resolved");
   const validation = validateCDF2(cdf);
   if (!validation.valid) {
-    throw new Error(`generated CDF failed validation: ${validation.errors.map((error) => error.message).join(", ")}`);
+    throw new Error(`generated CDF failed validation: ${validation.errors.map(describeCdfError).join("; ")}`);
   }
   return cdf;
 }
@@ -29227,7 +29301,11 @@ async function runPrintFiles(input, deps, onPatch) {
       db.close();
     }
     if (!input.tokenSessionId && input.tokensPath) tokens = await deps.readTokens(input.tokensPath);
-    const cdf = buildSavedCDF(components, tokens, { deleteAll: input.allowEmpty });
+    const cdf = buildSavedCDF(components, tokens, {
+      deleteAll: input.allowEmpty,
+      onRepair: (message) => deps.warn(`${message}
+`)
+    });
     await deps.writeFile(componentsPath, `${JSON.stringify(cdf, null, 2)}
 `);
     deps.warn(

package/dist/index.js

@@ -1986,9 +1986,12 @@ var init_schema = __esm({
             $required: { type: "boolean" },
             $default: {},
             $values: { type: "array", items: { type: "string" } },
-            "$token.kind": { type: "string" },
+            "$token.kind": { type: "string", minLength: 1 },
             "$token.allowed": { type: "array", items: { type: "string" } }
           },
+          // The API rejects a token property that does not say which kind of token it takes.
+          if: { type: "object", properties: { $type: { const: "token" } }, required: ["$type"] },
+          then: { type: "object", required: ["$token.kind"] },
           additionalProperties: false
         },
         slot: {
@@ -25393,9 +25396,12 @@ var init_schema2 = __esm({
             $required: { type: "boolean" },
             $default: {},
             $values: { type: "array", items: { type: "string" } },
-            "$token.kind": { type: "string" },
+            "$token.kind": { type: "string", minLength: 1 },
             "$token.allowed": { type: "array", items: { type: "string" } }
           },
+          // The API rejects a token property that does not say which kind of token it takes.
+          if: { type: "object", properties: { $type: { const: "token" } }, required: ["$type"] },
+          then: { type: "object", required: ["$token.kind"] },
           additionalProperties: false
         },
         slot: {
@@ -25454,14 +25460,40 @@ function parseCDFComponents(obj, prefix = "") {
   }
   return { components, tokens };
 }
+function entryValidator(name) {
+  const check = ajv2.getSchema(`${CDF_SCHEMA_URL2}#/definitions/${name}`);
+  if (!check)
+    throw new Error(`the CDF schema has no "${name}" definition`);
+  return check;
+}
+function toValidationErrors(errors, prefix = "") {
+  return (errors ?? []).filter((err) => err.keyword !== "if").map((err) => ({
+    path: `${prefix}${err.instancePath}` || "/",
+    message: err.message ?? "Unknown validation error",
+    expected: err.params ? JSON.stringify(err.params) : void 0
+  }));
+}
+function entryErrors(node, prefix) {
+  const errors = [];
+  for (const [key, value] of Object.entries(node)) {
+    if (key.startsWith("$") || typeof value !== "object" || value === null)
+      continue;
+    const path5 = `${prefix}/${key}`;
+    const type = value["$type"];
+    const check = type === "component" ? validateComponentEntry : TOKEN_TYPE_SET3.has(type) ? validateTokenEntry : void 0;
+    if (!check) {
+      errors.push(...entryErrors(value, path5));
+    } else if (!check(value)) {
+      errors.push(...toValidationErrors(check.errors, path5));
+    }
+  }
+  return errors;
+}
 function validateCDF2(input) {
   const valid = validate2(input);
   if (!valid) {
-    const errors = (validate2.errors ?? []).map((err) => ({
-      path: err.instancePath || "/",
-      message: err.message ?? "Unknown validation error",
-      expected: err.params ? JSON.stringify(err.params) : void 0
-    }));
+    const focused = typeof input === "object" && input !== null ? entryErrors(input, "") : [];
+    const errors = focused.length > 0 ? focused : toValidationErrors(validate2.errors);
     return { valid: false, errors, components: [], tokens: [] };
   }
   const file = input;
@@ -25483,7 +25515,7 @@ function validateCDF2(input) {
   const { components, tokens } = parseCDFComponents(file);
   return { valid: true, errors: [], components, tokens };
 }
-var ajv2, validate2, TOKEN_TYPE_SET3;
+var ajv2, validate2, TOKEN_TYPE_SET3, validateComponentEntry, validateTokenEntry;
 var init_validate5 = __esm({
   "packages/experience-design-system-types/dist/src/cdf/validate.js"() {
     "use strict";
@@ -25492,6 +25524,8 @@ var init_validate5 = __esm({
     ajv2 = new Ajv2({ allErrors: true });
     validate2 = ajv2.compile(cdfJsonSchema2);
     TOKEN_TYPE_SET3 = new Set(DESIGN_TOKEN_TYPES2);
+    validateComponentEntry = entryValidator("component");
+    validateTokenEntry = entryValidator("token");
   }
 });
 
@@ -25532,6 +25566,51 @@ var init_types7 = __esm({
   }
 });
 
+// packages/experience-design-system-types/dist/src/cdf/repair-token-kinds.js
+function inferTokenKind(propName, prop, tokens) {
+  const bound = typeof prop.$default === "string" ? tokens.find(({ path: path5 }) => path5 === prop.$default) : void 0;
+  if (bound)
+    return bound.entry.$type;
+  const name = propName.toLowerCase();
+  const kinds = new Set(tokens.filter(({ path: path5 }) => path5.toLowerCase().split(".").includes(name)).map(({ entry }) => entry.$type));
+  return kinds.size === 1 ? [...kinds][0] : void 0;
+}
+function withoutWarning(prop) {
+  if (prop.$description === void 0)
+    return prop;
+  const description = prop.$description.replace(UNRESOLVED_WARNING, "").trim();
+  const { $description: _stale, ...rest } = prop;
+  return description ? { ...rest, $description: description } : rest;
+}
+function repairTokenKinds(entry, componentKey, tokens, note) {
+  const properties = { ...entry.$properties };
+  let repaired = false;
+  for (const [name, prop] of Object.entries(entry.$properties)) {
+    if (prop.$type !== "token" || prop["$token.kind"])
+      continue;
+    repaired = true;
+    const kind = inferTokenKind(name, prop, tokens);
+    if (kind) {
+      properties[name] = { ...withoutWarning(prop), "$token.kind": kind };
+      note?.(`${componentKey}.${name} had no token kind, so "${kind}" was taken from the token file`);
+    } else {
+      const plain = { ...withoutWarning(prop), $type: "string" };
+      delete plain["$token.allowed"];
+      delete plain.$default;
+      properties[name] = plain;
+      note?.(`${componentKey}.${name} had no token kind and none could be told, so it was saved as a string property`);
+    }
+  }
+  return repaired ? { ...entry, $properties: properties } : entry;
+}
+var UNRESOLVED_WARNING;
+var init_repair_token_kinds = __esm({
+  "packages/experience-design-system-types/dist/src/cdf/repair-token-kinds.js"() {
+    "use strict";
+    UNRESOLVED_WARNING = /\s*WARNING: token_kind unknown[^\n]*/;
+  }
+});
+
 // packages/experience-design-system-types/dist/src/cdf/build.js
 function stripUnsupportedSlotFields(entry) {
   if (!entry.$slots)
@@ -25567,7 +25646,7 @@ function buildCDF2(components, tokens, opts = {}) {
     return void 0;
   const doc = { $schema: CDF_SCHEMA_URL2 };
   for (const { key, entry } of components) {
-    setAtPath(doc, key, stripUnsupportedSlotFields(entry));
+    setAtPath(doc, key, stripUnsupportedSlotFields(repairTokenKinds(entry, key, tokens, opts.onRepair)));
   }
   for (const { path: path5, entry } of resolveTokenPathCollisions(tokens)) {
     setAtPath(doc, path5, entry);
@@ -25609,6 +25688,7 @@ var COLLISION_LEAF_KEY;
 var init_build2 = __esm({
   "packages/experience-design-system-types/dist/src/cdf/build.js"() {
     "use strict";
+    init_repair_token_kinds();
     init_schema2();
     COLLISION_LEAF_KEY = "default";
   }
@@ -32951,7 +33031,7 @@ function buildSavedCDF(components, tokens, opts = {}) {
   if (!cdf) throw new Error("nothing to save \u2014 no components or tokens resolved");
   const validation = validateCDF2(cdf);
   if (!validation.valid) {
-    throw new Error(`generated CDF failed validation: ${validation.errors.map((error) => error.message).join(", ")}`);
+    throw new Error(`generated CDF failed validation: ${validation.errors.map(describeCdfError).join("; ")}`);
   }
   return cdf;
 }
@@ -32969,7 +33049,11 @@ async function runPrintFiles(input, deps, onPatch) {
       db.close();
     }
     if (!input.tokenSessionId && input.tokensPath) tokens = await deps.readTokens(input.tokensPath);
-    const cdf = buildSavedCDF(components, tokens, { deleteAll: input.allowEmpty });
+    const cdf = buildSavedCDF(components, tokens, {
+      deleteAll: input.allowEmpty,
+      onRepair: (message) => deps.warn(`${message}
+`)
+    });
     await deps.writeFile(componentsPath, `${JSON.stringify(cdf, null, 2)}
 `);
     deps.warn(
@@ -33030,7 +33114,7 @@ async function recordRun(input, deps) {
     return null;
   }
 }
-var SAVE_CONFIRMATION_DELAY_MS, realSaveDeps;
+var SAVE_CONFIRMATION_DELAY_MS, describeCdfError, realSaveDeps;
 var init_save = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/10-flow/flow/save.ts"() {
     "use strict";
@@ -33038,6 +33122,7 @@ var init_save = __esm({
     init_src4();
     init_run_print_files_helpers();
     SAVE_CONFIRMATION_DELAY_MS = 1e3;
+    describeCdfError = (error) => `${error.path.replace(/^\//, "").replace("/$properties/", ".").replaceAll("/", ".")}: ${error.message}`;
     realSaveDeps = () => ({
       openDb: openPipelineDb,
       readTokens: (path5) => readTokensFromPath2({ flag: "tokens", path: path5 }),

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.41.1-dev-build-36ec74af.0",
+  "version": "2.41.1-dev-build-699ca2d9.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.41.1-dev-build-36ec74af.0",
+  "version": "2.41.1-dev-build-699ca2d9.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -45,7 +45,7 @@
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
     "zod": "^4.6.5",
-    "@contentful/experience-design-system-types": "2.41.1-dev-build-36ec74af.0"
+    "@contentful/experience-design-system-types": "2.41.1-dev-build-699ca2d9.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",
@@ -59,7 +59,7 @@
     "ink-testing-library": "^4.0.0",
     "typescript-eslint": "^8.67.0",
     "vitest": "^4.0.16",
-    "@contentful/experience-design-system-backend-pipeline": "2.41.1-dev-build-36ec74af.0"
+    "@contentful/experience-design-system-backend-pipeline": "2.41.1-dev-build-699ca2d9.0"
   },
   "repository": {
     "type": "git",