@contentful/experience-design-system-cli 2.34.5-dev-build-75bf00ac.0 → 2.34.5-dev-build-5e798cb1.0

package/README.md

@@ -89,7 +89,7 @@ export CONTENTFUL_ENVIRONMENT_ID=master                # required
 
 Or run `experiences setup` once and they get saved to `credentials.json` and pre-filled in the wizard.
 
-In the wizard's credentials step you can press `[s] Skip` to save-only without pushing — useful when you want a checked-in `components.json` without a live push.
+In the wizard's credentials step you can press `[s] Skip` to save-only without pushing — useful when you want a checked-in combined CDF file without a live push.
 
 ---
 
@@ -134,7 +134,7 @@ The auto-filter (`analyze select-agent` invoked before scope-gate) is on by defa
 
 ### Save-and-push default
 
-The push-decision-gate defaults to **save AND push**: it writes `components.json` and `tokens.json` to disk *and* pushes to Contentful in one step.
+The push-decision-gate defaults to **save AND push**: it writes one combined `components.json` CDF containing components and design tokens, then pushes it to Contentful in one step.
 
 ### Custom skill prompts
 

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.34.5-dev-build-75bf00ac.0",
+  "version": "2.34.5-dev-build-5e798cb1.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",

package/dist/src/import/tui/WizardApp.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import type { CDFDocument, CDFComponentEntry, DTCGTokenEntry } from '@contentful/experience-design-system-types';
 export declare function buildGenerateComponentsArgs(opts: {
     sessionId: string;
     tokensPath?: string;
@@ -29,6 +30,12 @@ export declare function shouldRunMapTokens(opts: {
     mappablePropCount: number;
     rawTokenCount: number;
 }): boolean;
+export declare function buildSavedCDF(components: Array<{
+    key: string;
+    entry: CDFComponentEntry;
+}>, tokens: DTCGTokenEntry[], opts?: {
+    deleteAll?: boolean;
+}): CDFDocument;
 export declare function formatAcceptanceSummary(opts: {
     accepted: number;
     autoRejected: number;

package/dist/src/index.js

@@ -24533,6 +24533,7 @@ __export(WizardApp_exports, {
   buildGenerateComponentsArgs: () => buildGenerateComponentsArgs,
   buildGenerateTokensArgs: () => buildGenerateTokensArgs,
   buildMapTokensArgs: () => buildMapTokensArgs,
+  buildSavedCDF: () => buildSavedCDF,
   formatAcceptanceSummary: () => formatAcceptanceSummary,
   parsePrintTokensCount: () => parsePrintTokensCount,
   shouldRunMapTokens: () => shouldRunMapTokens
@@ -24541,11 +24542,11 @@ import { useEffect as useEffect11, useRef as useRef9, useState as useState23 } f
 import { Box as Box46, Text as Text50, useStdout as useStdout4 } from "ink";
 import { join as join20, resolve as resolve17 } from "node:path";
 import { appendFileSync as appendFileSync2, writeFileSync } from "node:fs";
-import { access as access7, stat as stat5 } from "node:fs/promises";
+import { access as access7, stat as stat5, writeFile as writeFile6 } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { execFile as execFile2, spawn as spawn3 } from "node:child_process";
 import { mkdir as mkdir5 } from "node:fs/promises";
-import { buildCDF as buildCDF3, validateSlotReferences as validateSlotReferences2 } from "@contentful/experience-design-system-types";
+import { buildCDF as buildCDF3, validateCDF as validateCDF3, validateSlotReferences as validateSlotReferences2 } from "@contentful/experience-design-system-types";
 import { jsx as jsx54, jsxs as jsxs45 } from "react/jsx-runtime";
 function buildGenerateComponentsArgs(opts) {
   const args = ["__generate", "components", "--agent", opts.agent, "--session", opts.sessionId];
@@ -24576,6 +24577,15 @@ function buildMapTokensArgs(opts) {
 function shouldRunMapTokens(opts) {
   return opts.mappablePropCount > 0 && opts.rawTokenCount > 0;
 }
+function buildSavedCDF(components, tokens, opts = {}) {
+  const cdf = buildCDF3(components, toCDFTokens(tokens), opts);
+  if (!cdf) throw new Error("nothing to save \u2014 no components or tokens resolved");
+  const validation = validateCDF3(cdf);
+  if (!validation.valid) {
+    throw new Error(`generated CDF failed validation: ${validation.errors.map((error) => error.message).join(", ")}`);
+  }
+  return cdf;
+}
 function formatAcceptanceSummary(opts) {
   const acceptedClause = `${opts.accepted} component${opts.accepted === 1 ? "" : "s"} accepted`;
   if (opts.autoRejected === 0) return `${acceptedClause}.`;
@@ -25548,41 +25558,34 @@ If using a custom host configuration, make sure the space exists on that host.`
   const runPrintFiles = async (extractSessionId, outDir, opts = {}) => {
     update({ step: "printing" });
     const componentsPath = join20(outDir, "components.json");
-    const printArgs = ["print", "components", "--out", componentsPath];
-    if (extractSessionId) printArgs.push("--session", extractSessionId);
-    if (opts.allowEmpty) printArgs.push("--allow-empty");
-    const r = await runCli(printArgs);
-    if (r.exitCode !== 0) {
+    try {
+      const db = openPipelineDb();
+      let components = [];
+      let tokens = [];
+      try {
+        if (extractSessionId) components = loadCDFComponents(db, extractSessionId);
+        if (opts.tokenSessionId) tokens = getDtcgTokensForSession(db, opts.tokenSessionId).tokens;
+      } finally {
+        db.close();
+      }
+      if (!opts.tokenSessionId && opts.tokensPath) tokens = await readTokensFromPath("tokens", opts.tokensPath);
+      const cdf = buildSavedCDF(components, tokens, { deleteAll: opts.allowEmpty });
+      await writeFile6(componentsPath, `${JSON.stringify(cdf, null, 2)}
+`);
+      process.stderr.write(
+        `wrote ${componentsPath} (${components.length} component${components.length === 1 ? "" : "s"}, ${tokens.length} token${tokens.length === 1 ? "" : "s"})
+`
+      );
+    } catch (error) {
       update({
         step: "error",
-        errorStep: "print components",
-        errorMessage: r.stderr.trim() || "Unknown error"
+        errorStep: "save CDF",
+        errorMessage: error instanceof Error ? error.message : "Unknown error"
       });
       return { ok: false };
     }
-    let emittedTokensPath;
-    let emittedTokenCount;
-    if (opts.tokenSessionId) {
-      const tokensOut = join20(outDir, "tokens.json");
-      const tokenArgs = ["print", "tokens", "--out", tokensOut, "--session", opts.tokenSessionId];
-      const tr = await runCli(tokenArgs);
-      if (tr.exitCode !== 0) {
-        update({
-          step: "error",
-          errorStep: "print tokens",
-          errorMessage: tr.stderr.trim() || "Unknown error"
-        });
-        return { ok: false };
-      }
-      emittedTokensPath = tokensOut;
-      emittedTokenCount = parsePrintTokensCount(tr.stdout);
-    }
     update(nextStateAfterPrint({ skipGate: opts.skipGate, componentsPath }));
-    return {
-      ok: true,
-      ...emittedTokensPath ? { tokensPath: emittedTokensPath } : {},
-      ...typeof emittedTokenCount === "number" ? { tokenCount: emittedTokenCount } : {}
-    };
+    return { ok: true };
   };
   const runSaveAndPush = async () => {
     await startSaveFlow({ skipGate: true, andPush: true });
@@ -25599,11 +25602,12 @@ If using a custom host configuration, make sure the space exists on that host.`
     const result = await runPrintFiles(extractSessionId, path, {
       ...skipGate ? { skipGate: true } : {},
       ...state.tokenSessionId ? { tokenSessionId: state.tokenSessionId } : {},
+      ...tokensPath ? { tokensPath } : {},
       ...allowEmptyDeleteAllRef.current ? { allowEmpty: true } : {}
     });
     if (!result.ok) return;
-    const recordedTokensPath = result.tokensPath ?? (state.tokenSessionId ? tokensPath || null : null);
-    const recordedTokenCount = result.tokenCount ?? state.tokenCount;
+    const recordedTokensPath = state.tokenSessionId ? tokensPath || null : null;
+    const recordedTokenCount = state.tokenCount;
     if (result.ok) {
       try {
         let sourceFingerprint = null;
@@ -25938,9 +25942,7 @@ If using a custom host configuration, make sure the space exists on that host.`
         );
       }
       case "push-decision-gate": {
-        const tokenDesc = hasTokens ? "tokens.json" : null;
-        const compDesc = hasComponents ? "components.json" : null;
-        const files = [tokenDesc, compDesc].filter(Boolean).join(" and ");
+        const files = hasComponents || hasTokens ? "components.json" : null;
         const count = state.generatedAcceptedCount > 0 ? state.generatedAcceptedCount : state.generatedCount;
         const summary = hasComponents ? `${count} component definition${count !== 1 ? "s" : ""} ready${hasTokens ? ", design tokens ready" : ""}.` : hasTokens ? "Design tokens ready." : "Ready to continue.";
         return /* @__PURE__ */ jsx54(
@@ -26101,8 +26103,7 @@ If using a custom host configuration, make sure the space exists on that host.`
           {
             successMessage: "Files saved",
             summary: [
-              hasComponents && state.componentsPath ? `components.json \u2192 ${state.componentsPath}` : null,
-              hasTokens && state.tokensPath ? `tokens.json \u2192 ${state.tokensPath}` : null
+              (hasComponents || hasTokens) && state.componentsPath ? `components.json \u2192 ${state.componentsPath}` : null
             ].filter(Boolean).join("\n"),
             context: teaser ? `Your files are saved to disk. ${teaser}` : "Your files are saved to disk. Run `experiences import` again when you're ready to push to Contentful.",
             continueLabel: "Exit",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.34.5-dev-build-75bf00ac.0",
+  "version": "2.34.5-dev-build-5e798cb1.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -40,8 +40,8 @@
     "svelte": "^5.56.4",
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
-    "@contentful/experience-design-system-cli-v2": "2.34.5-dev-build-75bf00ac.0",
-    "@contentful/experience-design-system-types": "2.34.5-dev-build-75bf00ac.0"
+    "@contentful/experience-design-system-cli-v2": "2.34.5-dev-build-5e798cb1.0",
+    "@contentful/experience-design-system-types": "2.34.5-dev-build-5e798cb1.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",
@@ -53,9 +53,9 @@
     "ink-testing-library": "^4.0.0",
     "typescript-eslint": "^8.67.0",
     "vitest": "^4.0.16",
-    "@contentful/experience-design-system-generation": "2.34.5-dev-build-75bf00ac.0",
-    "@contentful/experience-design-system-extraction": "2.34.5-dev-build-75bf00ac.0",
-    "@contentful/experience-design-system-client": "2.34.5-dev-build-75bf00ac.0"
+    "@contentful/experience-design-system-client": "2.34.5-dev-build-5e798cb1.0",
+    "@contentful/experience-design-system-extraction": "2.34.5-dev-build-5e798cb1.0",
+    "@contentful/experience-design-system-generation": "2.34.5-dev-build-5e798cb1.0"
   },
   "repository": {
     "type": "git",