@contentful/experience-design-system-cli 2.34.5-dev-build-5cdf5961.0 → 2.34.5-dev-build-131193c7.0

package/dist/package.json

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

package/dist/src/import/tui/steps/WizardPreviewStep.d.ts

@@ -15,8 +15,7 @@ type WizardPreviewStepProps = {
     totalSteps: number;
     onConfirm: (acknowledge: boolean) => void;
     onEdit?: () => void;
-    onSaveFiles?: () => void;
     onQuit: () => void;
 };
-export declare function WizardPreviewStep({ preview, spaceId, environmentId, stepNumber, totalSteps, onConfirm, onEdit, onSaveFiles, onQuit, }: WizardPreviewStepProps): React.ReactElement;
+export declare function WizardPreviewStep({ preview, spaceId, environmentId, stepNumber, totalSteps, onConfirm, onEdit, onQuit, }: WizardPreviewStepProps): React.ReactElement;
 export {};

package/dist/src/index.js

@@ -112,26 +112,29 @@ __export(render_with_goodbye_exports, {
   GoodbyeBoundary: () => GoodbyeBoundary,
   renderWithGoodbye: () => renderWithGoodbye
 });
-import { useEffect, useRef, useState } from "react";
-import { render, Text } from "ink";
+import { useCallback, useEffect, useRef, useState } from "react";
+import { render, Text, useInput } from "ink";
 import { Fragment, jsx } from "react/jsx-runtime";
 function GoodbyeBoundary({ children }) {
   const [isExiting, setIsExiting] = useState(false);
   const isExitingRef = useRef(false);
+  const exitTimerRef = useRef(void 0);
+  const requestExit = useCallback(() => {
+    if (isExitingRef.current) return;
+    isExitingRef.current = true;
+    setIsExiting(true);
+    exitTimerRef.current = setTimeout(() => process.exit(0), GOODBYE_RENDER_DELAY_MS);
+  }, []);
+  useInput((input, key) => {
+    if (key.ctrl && input === "c") requestExit();
+  });
   useEffect(() => {
-    let exitTimer;
-    const handleSigint = () => {
-      if (isExitingRef.current) return;
-      isExitingRef.current = true;
-      setIsExiting(true);
-      exitTimer = setTimeout(() => process.exit(0), GOODBYE_RENDER_DELAY_MS);
-    };
-    process.on("SIGINT", handleSigint);
+    process.on("SIGINT", requestExit);
     return () => {
-      process.off("SIGINT", handleSigint);
-      if (exitTimer) clearTimeout(exitTimer);
+      process.off("SIGINT", requestExit);
+      if (exitTimerRef.current) clearTimeout(exitTimerRef.current);
     };
-  }, []);
+  }, [requestExit]);
   return isExiting ? /* @__PURE__ */ jsx(Text, { children: "Goodbye!" }) : /* @__PURE__ */ jsx(Fragment, { children });
 }
 function renderWithGoodbye(element, options) {
@@ -7145,7 +7148,7 @@ var init_contentful_urls = __esm({
 });
 
 // packages/experience-design-system-cli/src/apply/tui/ServerApplyView.tsx
-import { Box as Box3, Text as Text4, useInput } from "ink";
+import { Box as Box3, Text as Text4, useInput as useInput2 } from "ink";
 import { jsx as jsx5, jsxs as jsxs3 } from "react/jsx-runtime";
 function ServerPreviewConfirm({
   preview,
@@ -7155,7 +7158,7 @@ function ServerPreviewConfirm({
   onConfirm,
   onCancel
 }) {
-  useInput((input, key) => {
+  useInput2((input, key) => {
     if (key.return) onConfirm(breakingWithImpact);
     else if (key.escape || input === "q") onCancel();
   });
@@ -7184,7 +7187,7 @@ function ServerApplyProgress({
   operationId,
   error
 }) {
-  useInput((_input, key) => {
+  useInput2((_input, key) => {
     if (status === "error" && (key.escape || _input === "q")) process.exit(1);
   });
   return /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
@@ -7212,7 +7215,7 @@ function ServerApplyProgress({
   ] });
 }
 function ServerApplyDone({ operation, spaceId, environmentId, host }) {
-  useInput((input, key) => {
+  useInput2((input, key) => {
     if (key.escape || input === "q") {
       process.exit(operation.sys.status === "succeeded" ? 0 : 1);
     }
@@ -7326,7 +7329,6 @@ var init_terminal_capabilities = __esm({
 
 // packages/experience-design-system-cli/src/apply/command.ts
 import { createElement as createElement2 } from "react";
-import { render as render2 } from "ink";
 import { readFile as readFile9, readdir as readdir2, stat as stat2 } from "node:fs/promises";
 import { join as join8 } from "node:path";
 import {
@@ -7730,11 +7732,11 @@ function registerApplyCommand(program) {
           environmentId,
           host,
           acknowledgeBreakingChanges: acknowledge,
-          rerender: (element) => instance.rerender(element),
+          rerender: (element) => instance.rerender(createElement2(GoodbyeBoundary, null, element)),
           onDone: resolvePromise
         });
       };
-      const instance = render2(
+      const instance = renderWithGoodbye(
         createElement2(ServerPreviewConfirm, {
           preview,
           spaceId,
@@ -7756,6 +7758,7 @@ var IGNORE_TOKEN_DIRS;
 var init_command2 = __esm({
   "packages/experience-design-system-cli/src/apply/command.ts"() {
     "use strict";
+    init_render_with_goodbye();
     init_api_client();
     init_error_parser();
     init_cycle_detection();
@@ -9964,6 +9967,34 @@ var init_CredentialsStep = __esm({
   }
 });
 
+// packages/experience-design-system-cli/src/tui/use-terminal-size.ts
+import { useStdout } from "ink";
+import { useEffect as useEffect5, useState as useState9 } from "react";
+function readTerminalSize(stdout) {
+  return {
+    columns: stdout?.columns ?? 80,
+    rows: stdout?.rows ?? process.stdout.rows ?? 40
+  };
+}
+function useTerminalSize() {
+  const { stdout } = useStdout();
+  const [size, setSize] = useState9(() => readTerminalSize(stdout));
+  useEffect5(() => {
+    const updateSize = () => setSize(readTerminalSize(stdout));
+    stdout?.on("resize", updateSize);
+    updateSize();
+    return () => {
+      stdout?.off("resize", updateSize);
+    };
+  }, [stdout]);
+  return size;
+}
+var init_use_terminal_size = __esm({
+  "packages/experience-design-system-cli/src/tui/use-terminal-size.ts"() {
+    "use strict";
+  }
+});
+
 // packages/experience-design-system-cli/src/apply/tokens.ts
 var init_tokens = __esm({
   "packages/experience-design-system-cli/src/apply/tokens.ts"() {
@@ -10148,7 +10179,7 @@ var init_SpaceEnvironment = __esm({
 });
 
 // packages/experience-design-system-cli/src/import/tui/preview-confirmation-input.ts
-import { useCallback } from "react";
+import { useCallback as useCallback2 } from "react";
 function handlePreviewConfirmationInput(_input, key, options) {
   if (key.return) {
     options.onConfirm(options.breakingWithImpact);
@@ -10157,7 +10188,7 @@ function handlePreviewConfirmationInput(_input, key, options) {
   return false;
 }
 function usePreviewConfirmationInput(breakingWithImpact, onConfirm) {
-  return useCallback(
+  return useCallback2(
     (input, key) => handlePreviewConfirmationInput(input, key, {
       breakingWithImpact,
       onConfirm
@@ -10171,34 +10202,6 @@ var init_preview_confirmation_input = __esm({
   }
 });
 
-// packages/experience-design-system-cli/src/tui/use-terminal-size.ts
-import { useStdout } from "ink";
-import { useEffect as useEffect5, useState as useState9 } from "react";
-function readTerminalSize(stdout) {
-  return {
-    columns: stdout?.columns ?? 80,
-    rows: stdout?.rows ?? process.stdout.rows ?? 40
-  };
-}
-function useTerminalSize() {
-  const { stdout } = useStdout();
-  const [size, setSize] = useState9(() => readTerminalSize(stdout));
-  useEffect5(() => {
-    const updateSize = () => setSize(readTerminalSize(stdout));
-    stdout?.on("resize", updateSize);
-    updateSize();
-    return () => {
-      stdout?.off("resize", updateSize);
-    };
-  }, [stdout]);
-  return size;
-}
-var init_use_terminal_size = __esm({
-  "packages/experience-design-system-cli/src/tui/use-terminal-size.ts"() {
-    "use strict";
-  }
-});
-
 // packages/experience-design-system-cli/src/tui/windowed-panel.tsx
 import { Box as Box15, Text as Text16 } from "ink";
 import { jsx as jsx18, jsxs as jsxs15 } from "react/jsx-runtime";
@@ -10468,7 +10471,6 @@ function WizardPreviewStep({
   totalSteps,
   onConfirm,
   onEdit,
-  onSaveFiles,
   onQuit
 }) {
   const breakingWithImpact = hasBreakingChangesWithImpact(preview);
@@ -10527,10 +10529,6 @@ function WizardPreviewStep({
       onEdit();
       return;
     }
-    if (input === "s" && onSaveFiles) {
-      onSaveFiles();
-      return;
-    }
     if (input === "q" || key.escape) {
       onQuit();
       return;
@@ -10572,9 +10570,8 @@ function WizardPreviewStep({
         diffExpanded ? "Hide" : "Show",
         " diff"
       ] }),
-      maxScroll > 0 && /* @__PURE__ */ jsx19(Text17, { dimColor: true, children: "[\u2191\u2193] Scroll [f/b] Page" }),
+      diffExpanded && /* @__PURE__ */ jsx19(Text17, { dimColor: true, children: "[\u2191\u2193] Scroll [f/b] Page" }),
       onEdit && /* @__PURE__ */ jsx19(Text17, { dimColor: true, children: "[e] Edit definitions" }),
-      onSaveFiles && /* @__PURE__ */ jsx19(Text17, { dimColor: true, children: "[s] Save files instead" }),
       /* @__PURE__ */ jsx19(Text17, { dimColor: true, children: "[q] Cancel" })
     ] })
   ] });
@@ -10584,12 +10581,12 @@ var init_WizardPreviewStep = __esm({
     "use strict";
     init_theme();
     init_useImmediateInput();
+    init_use_terminal_size();
     init_tokens();
     init_preview_diff();
     init_StepHeader();
     init_SpaceEnvironment();
     init_preview_confirmation_input();
-    init_use_terminal_size();
     init_windowed_panel();
   }
 });
@@ -19523,20 +19520,20 @@ var init_SearchMatchSummary = __esm({
 });
 
 // packages/experience-design-system-cli/src/import/tui/hooks/useOverlayPanel.ts
-import { useCallback as useCallback2, useState as useState13 } from "react";
+import { useCallback as useCallback3, useState as useState13 } from "react";
 function useOverlayPanel(opts) {
   const { toggleKey, onClose } = opts;
   const [isOpen, setIsOpen] = useState13(false);
-  const open = useCallback2(() => {
+  const open = useCallback3(() => {
     setIsOpen(true);
   }, []);
-  const close = useCallback2(() => {
+  const close = useCallback3(() => {
     setIsOpen((prev) => {
       if (prev && onClose) onClose();
       return false;
     });
   }, [onClose]);
-  const handleInput = useCallback2(
+  const handleInput = useCallback3(
     (input, key) => {
       if (!isOpen) return false;
       if (input === toggleKey || key.escape === true) {
@@ -24260,7 +24257,7 @@ var init_useFinalizePreview = __esm({
 });
 
 // packages/experience-design-system-cli/src/import/tui/hooks/useReviewSession.ts
-import { useCallback as useCallback3, useEffect as useEffect10, useRef as useRef6, useState as useState17 } from "react";
+import { useCallback as useCallback4, useEffect as useEffect10, useRef as useRef6, useState as useState17 } from "react";
 function loadReviewSessionState({
   extractSessionId,
   tokenSessionId,
@@ -24310,7 +24307,7 @@ function useReviewSession({
   const [loading, setLoading] = useState17(true);
   const [loadError, setLoadError] = useState17(null);
   const [availableTokens, setAvailableTokens] = useState17([]);
-  const loadInitialState = useCallback3(async () => {
+  const loadInitialState = useCallback4(async () => {
     const result = loadSession();
     if (result.error || !tokensPath) return { result, catalog: result.tokens };
     const catalog = (await readTokensFromPath("tokens", tokensPath)).map((token) => ({
@@ -25011,7 +25008,7 @@ var init_preview_annotations = __esm({
 });
 
 // packages/experience-design-system-cli/src/import/tui/useLivePreview.ts
-import { useCallback as useCallback4, useEffect as useEffect12, useRef as useRef8, useState as useState20 } from "react";
+import { useCallback as useCallback5, useEffect as useEffect12, useRef as useRef8, useState as useState20 } from "react";
 function useLivePreview(opts) {
   const debounceMs = opts.debounceMs ?? DEFAULT_DEBOUNCE_MS;
   const [status, setStatus] = useState20("idle");
@@ -25036,7 +25033,7 @@ function useLivePreview(opts) {
       }
     };
   }, []);
-  const trigger = useCallback4(() => {
+  const trigger = useCallback5(() => {
     const current = optsRef.current;
     if (!current.enabled) return;
     if (disabledRef.current) return;
@@ -25109,7 +25106,7 @@ var init_useLivePreview = __esm({
 });
 
 // packages/experience-design-system-cli/src/import/tui/hooks/useReviewPreview.ts
-import { useCallback as useCallback5, useEffect as useEffect13, useState as useState21 } from "react";
+import { useCallback as useCallback6, useEffect as useEffect13, useState as useState21 } from "react";
 function useReviewPreview({
   components,
   loading,
@@ -25125,7 +25122,7 @@ function useReviewPreview({
 }) {
   const [previewAnnotations, setPreviewAnnotations] = useState21(/* @__PURE__ */ new Map());
   const [removedComponents, setRemovedComponents] = useState21([]);
-  const handleResult = useCallback5(
+  const handleResult = useCallback6(
     (response) => {
       if (!response) return;
       setPreviewAnnotations(
@@ -25214,7 +25211,7 @@ var init_LivePreviewSummary = __esm({
 });
 
 // packages/experience-design-system-cli/src/import/tui/steps/GenerateReviewStep.tsx
-import { useCallback as useCallback6, useEffect as useEffect14, useMemo as useMemo3, useRef as useRef9, useState as useState22 } from "react";
+import { useCallback as useCallback7, useEffect as useEffect14, useMemo as useMemo3, useRef as useRef9, useState as useState22 } from "react";
 import figures6 from "figures";
 import { Box as Box41, Text as Text45 } from "ink";
 import { Fragment as Fragment18, jsx as jsx49, jsxs as jsxs42 } from "react/jsx-runtime";
@@ -25380,10 +25377,10 @@ function GenerateReviewStepView({
 }) {
   const { columns: terminalWidth, rows: terminalRows } = useTerminalSize();
   const [slotCycles, setSlotCycles] = useState22([]);
-  const setLoadedSlotCycles = useCallback6((cycles) => {
+  const setLoadedSlotCycles = useCallback7((cycles) => {
     setSlotCycles(cycles ?? []);
   }, []);
-  const loadSessionState = useCallback6(
+  const loadSessionState = useCallback7(
     () => loadReviewSessionState({
       extractSessionId,
       tokenSessionId,
@@ -26005,7 +26002,7 @@ function GenerateReviewStepView({
       }
       return;
     }
-    if (input === "c" && cycleRows.length > 0) {
+    if (input === "c" && !key.ctrl && !key.meta && cycleRows.length > 0) {
       cyclePanel.open();
       setCyclePanelScroll(0);
       setCyclesCursor(0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.34.5-dev-build-5cdf5961.0",
+  "version": "2.34.5-dev-build-131193c7.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-5cdf5961.0",
-    "@contentful/experience-design-system-cli-v2": "2.34.5-dev-build-5cdf5961.0"
+    "@contentful/experience-design-system-cli-v2": "2.34.5-dev-build-131193c7.0",
+    "@contentful/experience-design-system-types": "2.34.5-dev-build-131193c7.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-5cdf5961.0",
-    "@contentful/experience-design-system-extraction": "2.34.5-dev-build-5cdf5961.0",
-    "@contentful/experience-design-system-generation": "2.34.5-dev-build-5cdf5961.0"
+    "@contentful/experience-design-system-extraction": "2.34.5-dev-build-131193c7.0",
+    "@contentful/experience-design-system-generation": "2.34.5-dev-build-131193c7.0",
+    "@contentful/experience-design-system-client": "2.34.5-dev-build-131193c7.0"
   },
   "repository": {
     "type": "git",