@contentful/experience-design-system-cli 2.37.1-dev-build-3a98127f.0 → 2.37.1-dev-build-758ea601.0

package/dist/app.js

@@ -2636,9 +2636,10 @@ var STEPS = {
     "review",
     "save-push"
   ],
-  // The component stages are skipped, and with them token mapping, which needs components to map to. The credentials
-  // screen stays until it is known whether pushing tokens needs them.
-  tokens: ["project", "token-file", "credentials", "token-generation", "save-push"],
+  // The component stages are skipped, and with them token mapping, which needs components to map to. There is no project
+  // to ask for: the token file is the only input. The credentials screen stays until it is known whether pushing tokens
+  // needs them.
+  tokens: ["token-file", "credentials", "token-generation", "save-push"],
   // No token file, so no token generation and no token mapping.
   components: [
     "project",
@@ -2651,14 +2652,39 @@ var STEPS = {
     "save-push"
   ]
 };
-function stepsFor(target) {
-  return STEPS[target];
-}
 function previousStep(target, current) {
   const steps = STEPS[target];
   const index = steps.indexOf(current);
   return index > 0 ? steps[index - 1] : "preflight";
 }
+var ANSWER_OF = {
+  project: "projectPath",
+  "token-file": "tokensPath",
+  "path-validation": "scannedFiles"
+};
+function currentInputStep(target, answers) {
+  for (const step of STEPS[target]) {
+    const answer = ANSWER_OF[step];
+    if (answer === void 0) return "credentials";
+    if (answers[answer] === void 0) return step;
+  }
+  return "credentials";
+}
+function goBack(target, current, answers) {
+  const previous = previousStep(target, current);
+  if (previous === "preflight") return { to: "preflight" };
+  const answer = ANSWER_OF[previous];
+  if (answer === void 0) return { to: "step", answers };
+  const { [answer]: _cleared, ...rest } = answers;
+  return { to: "step", answers: rest };
+}
+function runBaseDir(input) {
+  if (input.projectPath) return input.projectPath;
+  if (input.configuredBaseDir) return input.configuredBaseDir;
+  const tokensPath = input.tokensPath ?? "";
+  const slash = tokensPath.lastIndexOf("/");
+  return slash > 0 ? tokensPath.slice(0, slash) : ".";
+}
 function moveFocus(focus, key, count) {
   if (key.upArrow) return (focus - 1 + count) % count;
   if (key.downArrow) return (focus + 1) % count;
@@ -29550,9 +29576,8 @@ function App({ importOptions, inkClear }) {
   const [importExitCode, setImportExitCode] = useState38();
   const showImportResult = importExitCode !== void 0;
   const [target, setTarget] = useState38();
-  const [projectPath, setProjectPath] = useState38();
-  const [tokensPath, setTokensPath] = useState38();
-  const [scannedFiles, setScannedFiles] = useState38();
+  const [answers, setAnswers] = useState38({});
+  const answer = (patch) => setAnswers((current) => ({ ...current, ...patch }));
   const [extractionRun, setExtractionRun] = useState38();
   const extraction = useExtraction(extractionRun?.input);
   const [tokensOnlyRun, setTokensOnlyRun] = useState38();
@@ -29590,9 +29615,15 @@ function App({ importOptions, inkClear }) {
       })
     );
   }, [screen]);
-  const finishCredentials = async (result, projectPath2, tokens, filePaths) => {
+  const finishCredentials = async (result, collected) => {
     if (!result.skipped) await writeCredentials({ ...result.credentials });
-    const launch = { projectPath: projectPath2, tokens, filePaths, ...importOptions };
+    const launch = {
+      // a tokens-only import has no project, so its files go where runBaseDir says
+      projectPath: runBaseDir({ ...collected, configuredBaseDir: importDefaults?.credentials.contentfulBaseDir }),
+      tokens: collected.tokensPath ?? "",
+      filePaths: collected.scannedFiles ?? [],
+      ...importOptions
+    };
     if (target === "tokens") await startTokensOnly(launch, result);
     else await startExtraction(launch, "generate", result);
   };
@@ -29648,7 +29679,7 @@ function App({ importOptions, inkClear }) {
   useEffect28(() => {
     if (!tokensOnlyRun || tokensOnly?.status !== "done" || !tokensOnly.result.ok) return;
     const { credentialsSkipped, input, tokens } = tokensOnlyRun;
-    const { tokensPath: tokensPath2, tokenSessionId, tokenCount } = tokensOnly.result;
+    const { tokensPath, tokenSessionId, tokenCount } = tokensOnly.result;
     inkClear();
     setTokensOnlyRun(void 0);
     setFlowStart(
@@ -29656,7 +29687,7 @@ function App({ importOptions, inkClear }) {
         extraction: input,
         saved: importDefaults?.credentials,
         handoff: { credentialsSkipped, tokens: { strategy: "generate" } },
-        tokensOnly: { tokensPath: tokensPath2, tokenSessionId, tokenCount, outDir: tokens.outDir }
+        tokensOnly: { tokensPath, tokenSessionId, tokenCount, outDir: tokens.outDir }
       })
     );
   }, [tokensOnly, tokensOnlyRun]);
@@ -29707,9 +29738,7 @@ function App({ importOptions, inkClear }) {
   const goToSettings = () => setScreen("settings");
   const resetImport = (keepTarget = false) => {
     if (!keepTarget) setTarget(void 0);
-    setProjectPath(void 0);
-    setTokensPath(void 0);
-    setScannedFiles(void 0);
+    setAnswers({});
     setExtractionRun(void 0);
     setTokensOnlyRun(void 0);
     setScopeRun(void 0);
@@ -29727,11 +29756,9 @@ function App({ importOptions, inkClear }) {
   };
   const goBackFrom = (current) => {
     if (!target) return;
-    const previous = previousStep(target, current);
-    if (previous === "preflight") setTarget(void 0);
-    else if (previous === "project") setProjectPath(void 0);
-    else if (previous === "token-file") setTokensPath(void 0);
-    else if (previous === "path-validation") setScannedFiles(void 0);
+    const back = goBack(target, current, answers);
+    if (back.to === "preflight") setTarget(void 0);
+    else setAnswers(back.answers);
   };
   switch (screen) {
     case "import":
@@ -29751,38 +29778,39 @@ function App({ importOptions, inkClear }) {
       if (target === void 0) {
         return /* @__PURE__ */ jsx64(PreflightScreen, { onChoose: setTarget, onQuit: leaveImport });
       }
-      const steps = stepsFor(target);
-      if (projectPath === void 0) {
-        return /* @__PURE__ */ jsx64(
-          WelcomeScreen,
-          {
-            target,
-            onContinue: setProjectPath,
-            onQuit: () => goBackFrom("project"),
-            initialPath: importDefaults.componentDir
-          }
-        );
-      }
-      if (steps.includes("token-file") && tokensPath === void 0) {
-        return /* @__PURE__ */ jsx64(
-          TokenInputScreen,
-          {
-            initialPath: importDefaults.tokenFile,
-            onConfirm: setTokensPath,
-            onBack: () => goBackFrom("token-file")
-          }
-        );
-      }
-      if (steps.includes("path-validation") && scannedFiles === void 0) {
-        return /* @__PURE__ */ jsx64(
-          PathValidationScreen,
-          {
-            projectPath,
-            onConfirm: ({ filePaths }) => setScannedFiles(filePaths),
-            onChangePath: () => resetImport(true),
-            onBack: () => goBackFrom("path-validation")
-          }
-        );
+      const inputStep = currentInputStep(target, answers);
+      if (!extractionRun && !tokensOnlyRun && inputStep !== "credentials") {
+        switch (inputStep) {
+          case "project":
+            return /* @__PURE__ */ jsx64(
+              WelcomeScreen,
+              {
+                target,
+                onContinue: (projectPath) => answer({ projectPath }),
+                onQuit: () => goBackFrom("project"),
+                initialPath: importDefaults.componentDir
+              }
+            );
+          case "token-file":
+            return /* @__PURE__ */ jsx64(
+              TokenInputScreen,
+              {
+                initialPath: importDefaults.tokenFile,
+                onConfirm: (tokensPath) => answer({ tokensPath }),
+                onBack: () => goBackFrom("token-file")
+              }
+            );
+          case "path-validation":
+            return /* @__PURE__ */ jsx64(
+              PathValidationScreen,
+              {
+                projectPath: answers.projectPath ?? "",
+                onConfirm: ({ filePaths }) => answer({ scannedFiles: filePaths }),
+                onChangePath: () => resetImport(true),
+                onBack: () => goBackFrom("path-validation")
+              }
+            );
+        }
       }
       if (tokensOnlyRun) {
         if (tokensOnly?.status === "done" && !tokensOnly.result.ok) {
@@ -29857,7 +29885,7 @@ function App({ importOptions, inkClear }) {
         {
           initial: importDefaults.credentials,
           onBack: () => goBackFrom("credentials"),
-          onDone: (result) => void finishCredentials(result, projectPath, tokensPath ?? "", scannedFiles ?? [])
+          onDone: (result) => void finishCredentials(result, answers)
         }
       );
     case "help":

package/dist/index.js

@@ -18516,20 +18516,40 @@ var init_PageContainer = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/import/steps/00-preflight/logic.ts
-function stepsFor(target) {
-  return STEPS[target];
-}
 function previousStep(target, current) {
   const steps = STEPS[target];
   const index = steps.indexOf(current);
   return index > 0 ? steps[index - 1] : "preflight";
 }
+function currentInputStep(target, answers) {
+  for (const step of STEPS[target]) {
+    const answer = ANSWER_OF[step];
+    if (answer === void 0) return "credentials";
+    if (answers[answer] === void 0) return step;
+  }
+  return "credentials";
+}
+function goBack(target, current, answers) {
+  const previous = previousStep(target, current);
+  if (previous === "preflight") return { to: "preflight" };
+  const answer = ANSWER_OF[previous];
+  if (answer === void 0) return { to: "step", answers };
+  const { [answer]: _cleared, ...rest } = answers;
+  return { to: "step", answers: rest };
+}
+function runBaseDir(input) {
+  if (input.projectPath) return input.projectPath;
+  if (input.configuredBaseDir) return input.configuredBaseDir;
+  const tokensPath = input.tokensPath ?? "";
+  const slash = tokensPath.lastIndexOf("/");
+  return slash > 0 ? tokensPath.slice(0, slash) : ".";
+}
 function moveFocus(focus, key, count) {
   if (key.upArrow) return (focus - 1 + count) % count;
   if (key.downArrow) return (focus + 1) % count;
   return focus;
 }
-var IMPORT_TARGET_OPTIONS, STEPS;
+var IMPORT_TARGET_OPTIONS, STEPS, ANSWER_OF;
 var init_logic = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/00-preflight/logic.ts"() {
     "use strict";
@@ -18551,9 +18571,10 @@ var init_logic = __esm({
         "review",
         "save-push"
       ],
-      // The component stages are skipped, and with them token mapping, which needs components to map to. The credentials
-      // screen stays until it is known whether pushing tokens needs them.
-      tokens: ["project", "token-file", "credentials", "token-generation", "save-push"],
+      // The component stages are skipped, and with them token mapping, which needs components to map to. There is no project
+      // to ask for: the token file is the only input. The credentials screen stays until it is known whether pushing tokens
+      // needs them.
+      tokens: ["token-file", "credentials", "token-generation", "save-push"],
       // No token file, so no token generation and no token mapping.
       components: [
         "project",
@@ -18566,6 +18587,11 @@ var init_logic = __esm({
         "save-push"
       ]
     };
+    ANSWER_OF = {
+      project: "projectPath",
+      "token-file": "tokensPath",
+      "path-validation": "scannedFiles"
+    };
   }
 });
 
@@ -33171,9 +33197,8 @@ function App({ importOptions, inkClear }) {
   const [importExitCode, setImportExitCode] = useState38();
   const showImportResult = importExitCode !== void 0;
   const [target, setTarget] = useState38();
-  const [projectPath, setProjectPath] = useState38();
-  const [tokensPath, setTokensPath] = useState38();
-  const [scannedFiles, setScannedFiles] = useState38();
+  const [answers, setAnswers] = useState38({});
+  const answer = (patch) => setAnswers((current) => ({ ...current, ...patch }));
   const [extractionRun, setExtractionRun] = useState38();
   const extraction = useExtraction(extractionRun?.input);
   const [tokensOnlyRun, setTokensOnlyRun] = useState38();
@@ -33211,9 +33236,15 @@ function App({ importOptions, inkClear }) {
       })
     );
   }, [screen]);
-  const finishCredentials = async (result, projectPath2, tokens, filePaths) => {
+  const finishCredentials = async (result, collected) => {
     if (!result.skipped) await writeCredentials({ ...result.credentials });
-    const launch = { projectPath: projectPath2, tokens, filePaths, ...importOptions };
+    const launch = {
+      // a tokens-only import has no project, so its files go where runBaseDir says
+      projectPath: runBaseDir({ ...collected, configuredBaseDir: importDefaults?.credentials.contentfulBaseDir }),
+      tokens: collected.tokensPath ?? "",
+      filePaths: collected.scannedFiles ?? [],
+      ...importOptions
+    };
     if (target === "tokens") await startTokensOnly(launch, result);
     else await startExtraction(launch, "generate", result);
   };
@@ -33269,7 +33300,7 @@ function App({ importOptions, inkClear }) {
   useEffect28(() => {
     if (!tokensOnlyRun || tokensOnly?.status !== "done" || !tokensOnly.result.ok) return;
     const { credentialsSkipped, input, tokens } = tokensOnlyRun;
-    const { tokensPath: tokensPath2, tokenSessionId, tokenCount } = tokensOnly.result;
+    const { tokensPath, tokenSessionId, tokenCount } = tokensOnly.result;
     inkClear();
     setTokensOnlyRun(void 0);
     setFlowStart(
@@ -33277,7 +33308,7 @@ function App({ importOptions, inkClear }) {
         extraction: input,
         saved: importDefaults?.credentials,
         handoff: { credentialsSkipped, tokens: { strategy: "generate" } },
-        tokensOnly: { tokensPath: tokensPath2, tokenSessionId, tokenCount, outDir: tokens.outDir }
+        tokensOnly: { tokensPath, tokenSessionId, tokenCount, outDir: tokens.outDir }
       })
     );
   }, [tokensOnly, tokensOnlyRun]);
@@ -33328,9 +33359,7 @@ function App({ importOptions, inkClear }) {
   const goToSettings = () => setScreen("settings");
   const resetImport = (keepTarget = false) => {
     if (!keepTarget) setTarget(void 0);
-    setProjectPath(void 0);
-    setTokensPath(void 0);
-    setScannedFiles(void 0);
+    setAnswers({});
     setExtractionRun(void 0);
     setTokensOnlyRun(void 0);
     setScopeRun(void 0);
@@ -33348,11 +33377,9 @@ function App({ importOptions, inkClear }) {
   };
   const goBackFrom = (current) => {
     if (!target) return;
-    const previous = previousStep(target, current);
-    if (previous === "preflight") setTarget(void 0);
-    else if (previous === "project") setProjectPath(void 0);
-    else if (previous === "token-file") setTokensPath(void 0);
-    else if (previous === "path-validation") setScannedFiles(void 0);
+    const back = goBack(target, current, answers);
+    if (back.to === "preflight") setTarget(void 0);
+    else setAnswers(back.answers);
   };
   switch (screen) {
     case "import":
@@ -33372,38 +33399,39 @@ function App({ importOptions, inkClear }) {
       if (target === void 0) {
         return /* @__PURE__ */ jsx64(PreflightScreen, { onChoose: setTarget, onQuit: leaveImport });
       }
-      const steps = stepsFor(target);
-      if (projectPath === void 0) {
-        return /* @__PURE__ */ jsx64(
-          WelcomeScreen,
-          {
-            target,
-            onContinue: setProjectPath,
-            onQuit: () => goBackFrom("project"),
-            initialPath: importDefaults.componentDir
-          }
-        );
-      }
-      if (steps.includes("token-file") && tokensPath === void 0) {
-        return /* @__PURE__ */ jsx64(
-          TokenInputScreen,
-          {
-            initialPath: importDefaults.tokenFile,
-            onConfirm: setTokensPath,
-            onBack: () => goBackFrom("token-file")
-          }
-        );
-      }
-      if (steps.includes("path-validation") && scannedFiles === void 0) {
-        return /* @__PURE__ */ jsx64(
-          PathValidationScreen,
-          {
-            projectPath,
-            onConfirm: ({ filePaths }) => setScannedFiles(filePaths),
-            onChangePath: () => resetImport(true),
-            onBack: () => goBackFrom("path-validation")
-          }
-        );
+      const inputStep = currentInputStep(target, answers);
+      if (!extractionRun && !tokensOnlyRun && inputStep !== "credentials") {
+        switch (inputStep) {
+          case "project":
+            return /* @__PURE__ */ jsx64(
+              WelcomeScreen,
+              {
+                target,
+                onContinue: (projectPath) => answer({ projectPath }),
+                onQuit: () => goBackFrom("project"),
+                initialPath: importDefaults.componentDir
+              }
+            );
+          case "token-file":
+            return /* @__PURE__ */ jsx64(
+              TokenInputScreen,
+              {
+                initialPath: importDefaults.tokenFile,
+                onConfirm: (tokensPath) => answer({ tokensPath }),
+                onBack: () => goBackFrom("token-file")
+              }
+            );
+          case "path-validation":
+            return /* @__PURE__ */ jsx64(
+              PathValidationScreen,
+              {
+                projectPath: answers.projectPath ?? "",
+                onConfirm: ({ filePaths }) => answer({ scannedFiles: filePaths }),
+                onChangePath: () => resetImport(true),
+                onBack: () => goBackFrom("path-validation")
+              }
+            );
+        }
       }
       if (tokensOnlyRun) {
         if (tokensOnly?.status === "done" && !tokensOnly.result.ok) {
@@ -33478,7 +33506,7 @@ function App({ importOptions, inkClear }) {
         {
           initial: importDefaults.credentials,
           onBack: () => goBackFrom("credentials"),
-          onDone: (result) => void finishCredentials(result, projectPath, tokensPath ?? "", scannedFiles ?? [])
+          onDone: (result) => void finishCredentials(result, answers)
         }
       );
     case "help":

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.37.1-dev-build-3a98127f.0",
+  "version": "2.37.1-dev-build-758ea601.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",

package/dist/src/tui/import/steps/00-preflight/logic.d.ts

@@ -5,8 +5,35 @@ export declare const IMPORT_TARGET_OPTIONS: ReadonlyArray<{
 }>;
 export type ImportStepId = 'project' | 'token-file' | 'path-validation' | 'credentials' | 'component-extraction' | 'token-generation' | 'scope-gate' | 'generation' | 'review' | 'save-push';
 export declare function stepsFor(target: ImportTarget): readonly ImportStepId[];
-/** The screen Back goes to from `current`: the one before it in this mode, or the preflight from the first step. */
-export declare function previousStep(target: ImportTarget, current: ImportStepId): ImportStepId | 'preflight';
+export interface InputAnswers {
+    projectPath?: string;
+    tokensPath?: string;
+    scannedFiles?: string[];
+}
+/**
+ * The input screen to show: the first step of this mode whose answer is still missing, or 'credentials' once every
+ * earlier one is answered. A mode never shows a screen it does not list, so skipping one needs no special case.
+ */
+export declare function currentInputStep(target: ImportTarget, answers: InputAnswers): Extract<ImportStepId, 'project' | 'token-file' | 'path-validation' | 'credentials'>;
+/**
+ * What Back from `current` does: leave for the preflight when it is the first screen of the mode, otherwise clear the
+ * previous step's answer so that screen shows again.
+ */
+export declare function goBack(target: ImportTarget, current: ImportStepId, answers: InputAnswers): {
+    to: 'preflight';
+} | {
+    to: 'step';
+    answers: InputAnswers;
+};
+/**
+ * Where a run writes its files when it has no project to put them in: the Root Project Directory setting if there is
+ * one, otherwise the folder the token file is in. Components runs always have a project and use it.
+ */
+export declare function runBaseDir(input: {
+    projectPath?: string;
+    tokensPath?: string;
+    configuredBaseDir?: string;
+}): string;
 interface FocusKey {
     upArrow: boolean;
     downArrow: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.37.1-dev-build-3a98127f.0",
+  "version": "2.37.1-dev-build-758ea601.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -45,8 +45,8 @@
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
     "zod": "^4.6.5",
-    "@contentful/experience-design-system-backend-pipeline": "2.37.1-dev-build-3a98127f.0",
-    "@contentful/experience-design-system-types": "2.37.1-dev-build-3a98127f.0"
+    "@contentful/experience-design-system-backend-pipeline": "2.37.1-dev-build-758ea601.0",
+    "@contentful/experience-design-system-types": "2.37.1-dev-build-758ea601.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",