@contentful/experience-design-system-cli 2.34.5-dev-build-ab8465d2.0 → 2.34.5-dev-build-ec126bf0.0

package/dist/package.json

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

package/dist/src/import/tui/components/CompactControlBar.d.ts

@@ -1,6 +1,4 @@
-export declare function CompactControlBar({ hasGroupRoots, searchActive, showJson, tokenReviewAvailable, }: {
+export declare function CompactControlBar({ hasGroupRoots, searchActive }: {
     hasGroupRoots: boolean;
     searchActive: boolean;
-    showJson?: boolean;
-    tokenReviewAvailable?: boolean;
 }): import("react/jsx-runtime").JSX.Element;

package/dist/src/index.js

@@ -142,18 +142,13 @@ function GoodbyeBoundary({ children }) {
   return isExiting ? /* @__PURE__ */ jsx(Text, { children: "Goodbye!" }) : /* @__PURE__ */ jsx(Fragment, { children });
 }
 function renderWithGoodbye(element, options) {
-  const instanceRef = {};
-  const clearScreen = () => {
-    instanceRef.current?.clear();
-  };
   const instance = render(
-    /* @__PURE__ */ jsx(ScreenTransitionClearContext.Provider, { value: clearScreen, children: /* @__PURE__ */ jsx(GoodbyeBoundary, { children: element }) }),
+    /* @__PURE__ */ jsx(ScreenTransitionClearContext.Provider, { value: () => instance.clear(), children: /* @__PURE__ */ jsx(GoodbyeBoundary, { children: element }) }),
     {
       ...options,
       exitOnCtrlC: false
     }
   );
-  instanceRef.current = instance;
   return instance;
 }
 var GOODBYE_RENDER_DELAY_MS, ScreenTransitionClearContext;
@@ -1250,6 +1245,17 @@ function initDebugLogger(opts) {
 function getDebugLogger() {
   return singleton ?? new NoopDebugLogger();
 }
+function resolveDebugMode(opts, configDebug) {
+  if (opts.debug !== void 0) return opts.debug;
+  const env = process.env["EDSI_DEBUG"];
+  if (env !== void 0 && env !== "") {
+    const value = env.toLowerCase();
+    if (value === "1" || value === "true" || value === "yes" || value === "on") return true;
+    if (value === "0" || value === "false" || value === "no" || value === "off") return false;
+  }
+  if (configDebug !== void 0) return configDebug;
+  return false;
+}
 function printDebugBanner(logger, phase) {
   if (!logger.enabled || !logger.path) return;
   const prefix = phase === "start" ? "\x1B[92m[debug]\x1B[0m " : "\x1B[92m[debug]\x1B[0m ";
@@ -4934,6 +4940,11 @@ function createCachedComponentResult(componentName, warnings = []) {
     renamedSlotsCount: 0
   };
 }
+function writeCachedComponentStatus(position, componentName, pinned) {
+  const status = pinned ? c.cyan("pinned (human-edited)") : c.green("cached");
+  process.stderr.write(`  ${position}  ${c.bold(componentName)}  ${status}
+`);
+}
 async function showGenerateView(result) {
   if (process.stdout.isTTY) {
     const { waitUntilExit } = renderWithGoodbye(
@@ -4954,11 +4965,6 @@ session=${result.sessionId}
   );
   await exitWithAnalytics(0);
 }
-function writeCachedComponentStatus(position, componentName, pinned) {
-  const status = pinned ? c.cyan("pinned (human-edited)") : c.green("cached");
-  process.stderr.write(`  ${position}  ${c.bold(componentName)}  ${status}
-`);
-}
 function normalizeComponentForCache(component) {
   const slots = component.slots.map((slot, index, allSlots) => ({
     ...slot,
@@ -5051,7 +5057,7 @@ async function runOneComponent(options, component, index, total) {
         allowedComponentNames: allowedComponentNames2
       });
       writeCachedComponentStatus(pos, component.name, true);
-      return createCachedComponentResult(component.name, [
+      return createCachedComponentResult(`${component.name}`, [
         `${component.name}: source changed but human edits preserved`
       ]);
     }
@@ -11334,30 +11340,26 @@ function getTsxExtractionContext(filePaths, componentFilePattern) {
     project: createTsxProject(getTsxProjectFiles(filePaths))
   };
 }
-function extractTsxComponents(filePaths, componentFilePattern, extractSourceFile) {
+function extractTsxComponents(filePaths, componentFilePattern, extract) {
   const extractionContext = getTsxExtractionContext(filePaths, componentFilePattern);
-  if (!extractionContext)
-    return void 0;
-  const warnings = [];
+  if (!extractionContext) {
+    return { components: [], warnings: [], exclusions: [] };
+  }
+  const { componentFiles, project } = extractionContext;
   const components = [];
-  for (const filePath of extractionContext.componentFiles) {
+  const warnings = [];
+  const exclusions = [];
+  for (const filePath of componentFiles) {
     try {
-      const sourceFile = extractionContext.project.getSourceFile(filePath);
+      const sourceFile = project.getSourceFile(filePath);
       if (!sourceFile)
         continue;
-      components.push(...extractSourceFile(sourceFile));
+      components.push(...extract(sourceFile, exclusions));
     } catch (e) {
       warnings.push(`Failed to extract from ${filePath}: ${e instanceof Error ? e.message : String(e)}`);
     }
   }
-  return { ...extractionContext, components, warnings };
-}
-function resolveComponentExportName(exportKey, declarations, exported, allowVariableDeclaration = false) {
-  const name = exportKey === "default" ? resolveDefaultExportName(declarations, exported, allowVariableDeclaration) : exportKey;
-  return name && /^[A-Z]/.test(name) ? name : void 0;
-}
-function isCompositionHookName(name) {
-  return name.startsWith("use");
+  return { components, warnings, exclusions, project };
 }
 function resolveDefaultExportName(declarations, exported, allowVariableDeclaration = false) {
   const declaration = declarations[0];
@@ -11366,6 +11368,27 @@ function resolveDefaultExportName(declarations, exported, allowVariableDeclarati
     return void 0;
   return name;
 }
+function getRenderableExports(sourceFile, exclusions, options) {
+  const renderable = [];
+  const exported = sourceFile.getExportedDeclarations();
+  for (const [exportKey, declarations] of exported) {
+    const name = exportKey === "default" ? resolveDefaultExportName(declarations, exported, options.allowVariableDeclaration) : exportKey;
+    if (!name || !/^[A-Z]/.test(name))
+      continue;
+    if (name.startsWith("use")) {
+      exclusions.push({
+        itemType: "component",
+        name,
+        source: sourceFile.getFilePath(),
+        reason: options.hookReason,
+        stage: "component-filter"
+      });
+      continue;
+    }
+    renderable.push({ name, declarations });
+  }
+  return renderable;
+}
 function kebabToPascal(input) {
   return input.split("-").filter(Boolean).map((s) => s.charAt(0).toUpperCase() + s.slice(1)).join("");
 }
@@ -13649,18 +13672,13 @@ function hasImplementationChildrenHint(funcNode, param) {
   return body.getDescendantsOfKind(SyntaxKind4.JsxSpreadAttribute).some((attr) => isComponentSpreadAttribute(attr, /* @__PURE__ */ new Set([paramName])));
 }
 async function extractReactComponents(filePaths) {
-  const exclusions = [];
-  const extractionContext = extractTsxComponents(filePaths, /\.[jt]sx$/, (sourceFile) => {
+  const { components, warnings, exclusions, project } = extractTsxComponents(filePaths, /\.[jt]sx$/, (sourceFile, exclusions2) => {
     if (isStencilFile2(sourceFile))
       return [];
     const fileExports = [...sourceFile.getExportedDeclarations().keys()];
     const isNext = isNextJsComponent(sourceFile.getFilePath(), fileExports);
-    return extractFromSourceFile2(sourceFile, isNext, exclusions);
+    return extractFromSourceFile2(sourceFile, isNext, exclusions2);
   });
-  if (!extractionContext) {
-    return { components: [], warnings: [] };
-  }
-  const { project, components, warnings } = extractionContext;
   const propsToComponent = /* @__PURE__ */ new Map();
   const componentNames = /* @__PURE__ */ new Set();
   for (const c2 of components) {
@@ -13696,7 +13714,7 @@ async function extractReactComponents(filePaths) {
     const cached = structuralByFile.get(filePath);
     if (cached)
       return cached;
-    const sourceFile = project.getSourceFile(filePath);
+    const sourceFile = project?.getSourceFile(filePath);
     if (!sourceFile)
       return [];
     const ctx = { propsToComponent, componentNames };
@@ -13758,22 +13776,11 @@ async function extractReactComponents(filePaths) {
 }
 function extractFromSourceFile2(sourceFile, isNext, exclusions) {
   const components = [];
-  const exported = sourceFile.getExportedDeclarations();
   const usesCreateContext = sourceFileUsesCreateContext(sourceFile);
-  for (const [exportKey, declarations] of exported) {
-    const name = resolveComponentExportName(exportKey, declarations, exported, true);
-    if (!name)
-      continue;
-    if (isCompositionHookName(name)) {
-      exclusions.push({
-        itemType: "component",
-        name,
-        source: sourceFile.getFilePath(),
-        reason: "React hook names are not renderable components",
-        stage: "component-filter"
-      });
-      continue;
-    }
+  for (const { name, declarations } of getRenderableExports(sourceFile, exclusions, {
+    allowVariableDeclaration: true,
+    hookReason: "React hook names are not renderable components"
+  })) {
     const funcNode = resolveBestFunctionNode(declarations);
     if (!funcNode)
       continue;
@@ -14251,12 +14258,7 @@ var init_react = __esm({
 // packages/experience-design-system-extraction/dist/src/extract/vue-tsx.js
 import { Node as Node5, SyntaxKind as SyntaxKind5 } from "ts-morph";
 async function extractVueTsxComponents(filePaths) {
-  const exclusions = [];
-  const extractionContext = extractTsxComponents(filePaths, /\.tsx$/, (sourceFile) => extractFromSourceFile3(sourceFile, exclusions));
-  if (!extractionContext) {
-    return { components: [], warnings: [] };
-  }
-  const { components, warnings } = extractionContext;
+  const { components, warnings, exclusions } = extractTsxComponents(filePaths, /\.tsx$/, extractFromSourceFile3);
   return {
     components: components.sort((a, b) => a.name.localeCompare(b.name)),
     warnings,
@@ -14265,21 +14267,9 @@ async function extractVueTsxComponents(filePaths) {
 }
 function extractFromSourceFile3(sourceFile, exclusions) {
   const components = [];
-  const exported = sourceFile.getExportedDeclarations();
-  for (const [exportKey, declarations] of exported) {
-    const name = resolveComponentExportName(exportKey, declarations, exported);
-    if (!name)
-      continue;
-    if (isCompositionHookName(name)) {
-      exclusions.push({
-        itemType: "component",
-        name,
-        source: sourceFile.getFilePath(),
-        reason: "Vue composition hook names are not renderable components",
-        stage: "component-filter"
-      });
-      continue;
-    }
+  for (const { name, declarations } of getRenderableExports(sourceFile, exclusions, {
+    hookReason: "Vue composition hook names are not renderable components"
+  })) {
     const component = extractVueTsxComponent(declarations, name, sourceFile);
     if (component) {
       components.push(component);
@@ -19985,29 +19975,14 @@ var init_LegendEntry = __esm({
 // packages/experience-design-system-cli/src/import/tui/components/CompactControlBar.tsx
 import { Box as Box26 } from "ink";
 import { jsxs as jsxs27 } from "react/jsx-runtime";
-function CompactControlBar({
-  hasGroupRoots,
-  searchActive,
-  showJson = false,
-  tokenReviewAvailable = false
-}) {
+function CompactControlBar({ hasGroupRoots, searchActive }) {
   return /* @__PURE__ */ jsxs27(Box26, { borderStyle: "single", borderColor: PALETTE.border, paddingX: 1, marginTop: 1, flexWrap: "wrap", columnGap: 2, children: [
     legendEntry("[\u2191/\u2193]", "move"),
     legendEntry("[a/r]", "accept/reject"),
-    legendEntry("[A]", "accept all"),
     hasGroupRoots && legendEntry("[space/E/C]", "expand/collapse"),
-    legendEntry("[L]", "flat"),
-    legendEntry("[i]", "focus lineage"),
-    legendEntry("[w]", "only breaking"),
-    legendEntry("[o]", "only cycles"),
-    legendEntry("[c]", "cycle list"),
-    legendEntry("[b]", "breaking changes"),
     legendEntry("[/]", "search", searchActive),
     legendEntry("[f]", "continue/finalize"),
     legendEntry("[h]", "help"),
-    legendEntry("[J]", showJson ? "hide JSON" : "show JSON"),
-    tokenReviewAvailable && legendEntry("[t]", "token review"),
-    legendEntry("[Ctrl+Z/Y/R]", "undo/redo/reload"),
     legendEntry("[q]", "quit")
   ] });
 }
@@ -26689,15 +26664,7 @@ function GenerateReviewStepView({
         hidden: dialogOpen
       }
     ),
-    !dialogOpen && sidebarFocused && /* @__PURE__ */ jsx49(
-      CompactControlBar,
-      {
-        hasGroupRoots,
-        searchActive: searchOpen || searchQuery.length > 0,
-        showJson: reviewEditor.showJson,
-        tokenReviewAvailable: reviewEditor.currentTokenSuggestions().length > 0
-      }
-    )
+    !dialogOpen && sidebarFocused && /* @__PURE__ */ jsx49(CompactControlBar, { hasGroupRoots, searchActive: searchOpen || searchQuery.length > 0 })
   ] });
 }
 var HELP_SECTIONS2;
@@ -31517,7 +31484,7 @@ function registerInternalExtractCommand(program) {
       if (allFilesCached) {
         const cachedComponents = sourceFiles.flatMap((filePath) => cachedByPath.get(filePath).components);
         extractionCacheHits = sourceFiles.length;
-        extraction = { components: cachedComponents, warnings: [] };
+        extraction = { components: cachedComponents, warnings: [], exclusions: [] };
         if (!process.stdout.isTTY) {
           process.stderr.write(
             `progress=extract:${sourceFiles.length}/${sourceFiles.length}:${cachedComponents.length}
@@ -31737,7 +31704,7 @@ function registerInternalExtractCommand(program) {
         validatedComponents = result.components;
       }
     }
-    await retryDatabaseWrite(() => storeRawComponents(db, sessionId2, validatedComponents));
+    await retryDatabaseWrite(() => storeRawComponents(db, sessionId2, validatedComponents, { preserveStatus: true }));
     const cycleInput = validatedComponents.map((c2) => ({
       name: c2.name,
       slots: c2.slots.map((s) => ({ name: s.name, allowedComponents: s.allowedComponents }))
@@ -31844,14 +31811,14 @@ var init_extract_command = __esm({
 });
 
 // packages/experience-design-system-cli/src/lib/debug-preamble.ts
-async function beginCommand(command) {
+async function beginCommand(command, opts) {
   let configDebug;
   try {
     const creds = await readExperiencesCredentials();
     configDebug = creds.debug;
   } catch {
   }
-  const enabled = configDebug ?? false;
+  const enabled = resolveDebugMode(opts, configDebug);
   const logger = initDebugLogger({ enabled, command });
   if (logger.enabled) {
     printDebugBanner(logger, "start");
@@ -31967,7 +31934,7 @@ function createProgram() {
     const { analyticsDisabled } = await readExperiencesCredentials();
     setPersistedAnalyticsDisabled(analyticsDisabled ?? false);
     noteCommandStart(commandChain);
-    await beginCommand(commandChain);
+    await beginCommand(commandChain, {});
   });
   program.hook("postAction", async () => {
     await completeActiveCommand();

package/dist/src/lib/debug-logger.d.ts

@@ -25,6 +25,10 @@ export declare function initDebugLogger(opts: InitDebugLoggerOptions): DebugLogg
 export declare function getDebugLogger(): DebugLogger;
 /** Test-only: reset the singleton. */
 export declare function __resetDebugLoggerForTest(): void;
+/** Resolve debug mode from an explicit option, environment, or saved settings. */
+export declare function resolveDebugMode(opts: {
+    debug?: boolean;
+}, configDebug?: boolean): boolean;
 /**
  * Emit the bright-green "debug logs at <path>" banner to stderr.
  * No-op when debug is disabled or stderr is not a TTY-friendly stream.

package/dist/src/lib/debug-preamble.d.ts

@@ -1,6 +1,7 @@
 import { type DebugLogger } from './debug-logger.js';
 /**
- * Initialize the debug logger from persisted credentials.
- * Debug mode can only be configured via setup preferences;
+ * Resolve and initialize the debug logger before a top-level command runs.
  */
-export declare function beginCommand(command: string): Promise<DebugLogger>;
+export declare function beginCommand(command: string, opts: {
+    debug?: boolean;
+}): Promise<DebugLogger>;

package/package.json

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