@mnci/cli 4.47.0 → 4.48.0

package/README.md

@@ -36,7 +36,9 @@ plays (`.use-case`, `.client`, `.repository`, `.algorithm`, `.validator`,
 src/
   main.ts                     the CLI transport — decodes argv, calls one use case
   workspace-overlay/          the config files mnci owns and rewrites
-  workspace-creation/         mnci new, and the interactive wizard
+  workspace-creation/         mnci new
+  interactive-wizard/         bare mnci: every command and option, asked from the command's own description
+  repository-adoption/        mnci adopt — bringing an existing repository under mnci, step by step
   workspace-upgrade/          mnci upgrade
   workspace-diagnostics/      mnci doctor
   project-scaffolding/        mnci add — one use case per kind, plus post-generation repairs
@@ -505,6 +507,18 @@ from File`), and the curated root scripts.
 4. Installs the chosen **stack** (see below), `husky` + `@commitlint/*` for
    real, so versions resolve at generation time.
 
+## The interactive wizard (`mnci` with no arguments)
+
+Bare `mnci` lists **every command** (inside a workspace the Projects and Dependencies sections come first, outside
+one the Workspace section does), asks the command's arguments and then the options that apply, prints the command
+line it is about to run, and runs it through the same program the flags go through. It reads the commands from the
+program itself, so a command or option added to `main.ts` is offered without a wizard change. Two groupings are
+kept by hand and checked by a spec: `add` offers the flags of the kind just chosen, and `adopt` asks which step
+first (report, baseline tags, toolchain, project kinds, dependencies, overlay) and offers that step's own flags.
+`wizard-coverage.integration.spec.ts` fails when a command is missing from the menu, an `adopt` flag belongs to no
+step, an `add` flag is reachable for no kind, or the line the wizard builds for an option is not one the program
+accepts.
+
 ## `mnci adopt`: reading an existing repository before changing it
 
 `mnci adopt` is the start of bringing a repository that already has history, tooling and published

package/dist/cli.js

@@ -9657,9 +9657,203 @@ function runInfo(workspaceRoot, cliVersion, options) {
   logger.info(info.workspace ? `workspace: ${info.workspace.root}` : "not inside a workspace");
 }
 
+// src/interactive-wizard/interactive-wizard.use-case.ts
+var import_node_path46 = require("path");
+
+// src/interactive-wizard/adopt-steps.config.ts
+var ADOPT_GLOBAL_OPTIONS = ["json"];
+var ADOPT_STEPS = [
+  { id: "report", label: "Report", summary: "read the repository and say what adopting it involves (changes nothing)", options: [] },
+  { id: "tags", label: "Baseline release tags", summary: "create the tag each renamed project needs so a release continues from its last version", switch: "tags", options: [] },
+  { id: "toolchain", label: "Toolchain", summary: "retire old tooling, align Nx to one version, make the audit pass", switch: "toolchain", options: ["nx"] },
+  { id: "kinds", label: "Project kinds", summary: "record each project's kind as a type tag", switch: "kinds", options: ["kind"] },
+  { id: "dependencies", label: "Dependencies", summary: "move root runtime dependencies into the projects that import them", switch: "dependencies", options: [] },
+  {
+    id: "overlay",
+    label: "Overlay and pipeline",
+    summary: "apply the release config, .npmrc, commitlint and the CI pipeline",
+    switch: "overlay",
+    options: ["scope", "registry", "organization", "project", "artifacts-feed", "agent", "variable-group", "npm-auth", "ci", "test-runner"]
+  }
+];
+
+// src/interactive-wizard/applicable-options.policy.ts
+function optionsOfAdd(command, kind) {
+  const claimed = new Set(PROJECT_KIND_CATALOG.flatMap((entry) => entry.flags));
+  const own = new Set(PROJECT_KIND_CATALOG.find((entry) => entry.kind === kind)?.flags);
+  return command.options.filter((option) => !claimed.has(option.name) || own.has(option.name));
+}
+function applicableOptions(command, context = {}) {
+  if (command.name === "add") {
+    return optionsOfAdd(command, context.kind);
+  }
+  if (command.name === "adopt") {
+    const step = context.adoptStep;
+    const wanted = /* @__PURE__ */ new Set([...step?.options ?? [], ...ADOPT_GLOBAL_OPTIONS]);
+    return command.options.filter((option) => wanted.has(option.name));
+  }
+  return [...command.options];
+}
+
+// src/interactive-wizard/ask-command.use-case.ts
+var NOT_ASKED = /* @__PURE__ */ new Set(["help", "version"]);
+var SKIP = "";
+async function askArgument(argument, prompter) {
+  const message = `${argument.name}${argument.required ? "" : " (optional)"}: ${argument.description}`;
+  if (argument.choices !== void 0) {
+    const choices = argument.choices.map((choice) => ({ name: choice, value: choice }));
+    const value = await prompter.select(message, argument.required ? choices : [{ name: "(skip)", value: SKIP }, ...choices]);
+    return value === SKIP ? [] : [value];
+  }
+  const typed = await prompter.input(message, argument.required);
+  const answer = typed.trim();
+  if (answer === "") {
+    return [];
+  }
+  return argument.variadic ? answer.split(/\s+/) : [answer];
+}
+async function askOptionValue(option, prompter) {
+  if (option.takesValue === "none") {
+    return true;
+  }
+  const message = `${option.flags}: ${option.description}`;
+  if (option.choices !== void 0) {
+    return await prompter.select(message, option.choices.map((choice) => ({ name: choice, value: choice })));
+  }
+  if (option.repeatable) {
+    const values = [];
+    let typed2 = await prompter.input(`${message} (an empty answer ends the list)`, false);
+    while (typed2.trim() !== "") {
+      values.push(typed2.trim());
+      typed2 = await prompter.input(`${option.flags} (another, or empty to finish)`, false);
+    }
+    return values;
+  }
+  const typed = await prompter.input(message, option.takesValue === "required");
+  const answer = typed.trim();
+  return answer === "" ? true : answer;
+}
+async function askAdoptStep(prompter) {
+  const id = await prompter.select("Which adoption step?", ADOPT_STEPS.map((step) => ({ name: step.label, value: step.id, description: step.summary })));
+  return ADOPT_STEPS.find((step) => step.id === id);
+}
+async function askCommand(command, prompter) {
+  const answers = { arguments: [], options: {} };
+  for (const argument of command.arguments) {
+    answers.arguments.push(...await askArgument(argument, prompter));
+  }
+  let adoptStep;
+  if (command.name === "adopt") {
+    adoptStep = await askAdoptStep(prompter);
+    if (adoptStep.switch !== void 0) {
+      answers.options[adoptStep.switch] = true;
+    }
+  }
+  const offered = applicableOptions(command, { kind: command.name === "add" ? answers.arguments[0] : void 0, adoptStep }).filter((option) => !NOT_ASKED.has(option.name) && answers.options[option.name] === void 0);
+  if (offered.length === 0) {
+    return answers;
+  }
+  const chosen = await prompter.checkbox("Options (space to select, enter to continue)", offered.map((option) => ({ name: option.flags, value: option.name, description: option.description })));
+  for (const name of chosen) {
+    const option = offered.find((candidate) => candidate.name === name);
+    const value = await askOptionValue(option, prompter);
+    if (!(Array.isArray(value) && value.length === 0)) {
+      answers.options[name] = value;
+    }
+  }
+  return answers;
+}
+
+// src/interactive-wizard/build-argv.algorithm.ts
+function longFlag(option) {
+  return `--${option.name}`;
+}
+function buildArgv(command, answers) {
+  const argv = [command.name, ...answers.arguments];
+  for (const [name, answer] of Object.entries(answers.options)) {
+    const option = command.options.find((candidate) => candidate.name === name);
+    if (option === void 0) {
+      throw new Error(`mnci ${command.name} has no option --${name}`);
+    }
+    if (answer === false) {
+      continue;
+    }
+    if (typeof answer === "boolean") {
+      argv.push(longFlag(option));
+    } else {
+      const values = Array.isArray(answer) ? answer : [answer];
+      for (const value of values) {
+        argv.push(longFlag(option), value);
+      }
+    }
+  }
+  return argv;
+}
+function formatCommandLine(argv) {
+  return ["mnci", ...argv.map((argument) => /\s/.test(argument) ? JSON.stringify(argument) : argument)].join(" ");
+}
+
+// src/interactive-wizard/inquirer-prompter.client.ts
+var import_prompts4 = require("@inquirer/prompts");
+function toRows(choices) {
+  const rows = [];
+  let current;
+  for (const choice of choices) {
+    if (choice.group !== void 0 && choice.group !== current) {
+      current = choice.group;
+      rows.push(new import_prompts4.Separator(`-- ${choice.group} --`));
+    }
+    rows.push({ name: choice.name, value: choice.value, description: choice.description });
+  }
+  return rows;
+}
+function createInquirerPrompter() {
+  return {
+    select: async (message, choices) => await (0, import_prompts4.select)({ message, choices: toRows(choices), pageSize: 18 }),
+    checkbox: async (message, choices) => await (0, import_prompts4.checkbox)({ message, choices: toRows(choices), pageSize: 18 }),
+    input: async (message, required) => await (0, import_prompts4.input)({ message, validate: (value) => !required || value.trim().length > 0 || "A value is required" }),
+    confirm: async (message, fallback) => await (0, import_prompts4.confirm)({ message, default: fallback })
+  };
+}
+
+// src/interactive-wizard/interactive-wizard.use-case.ts
+var GROUP_LABELS = {
+  workspace: "Workspace",
+  projects: "Projects",
+  dependencies: "Dependencies",
+  pipeline: "Pipeline",
+  inspect: "Inspect"
+};
+var WIZARD_GROUP_OVERRIDES = { adopt: "workspace" };
+var ORDER_IN_WORKSPACE = ["projects", "dependencies", "workspace", "pipeline", "inspect"];
+var ORDER_OUTSIDE = ["workspace", "projects", "dependencies", "pipeline", "inspect"];
+var SUMMARY_LENGTH = 110;
+function summarise(description) {
+  const first = description.split(/\.\s| — /, 1)[0];
+  return first.length > SUMMARY_LENGTH ? `${first.slice(0, SUMMARY_LENGTH - 1)}\u2026` : first;
+}
+function wizardMenu(commands, inWorkspace) {
+  const groupOf = (command) => WIZARD_GROUP_OVERRIDES[command.name] ?? command.group;
+  const order = inWorkspace ? ORDER_IN_WORKSPACE : ORDER_OUTSIDE;
+  return order.flatMap((group) => commands.filter((command) => groupOf(command) === group).map((command) => ({ name: `${command.name.padEnd(9)} ${summarise(command.description)}`, value: command.name, group: GROUP_LABELS[group] })));
+}
+async function runInteractive(program, prompter = createInquirerPrompter(), workingDirectory = process.cwd()) {
+  const commands = describeCommands(program);
+  const inWorkspace = fileExists((0, import_node_path46.join)(workingDirectory, "nx.json"));
+  const name = await prompter.select("What would you like to do?", wizardMenu(commands, inWorkspace));
+  const command = commands.find((candidate) => candidate.name === name);
+  const argv = buildArgv(command, await askCommand(command, prompter));
+  logger.info(`Running: ${formatCommandLine(argv)}`);
+  if (await prompter.confirm("Run it?", true)) {
+    await program.parseAsync(argv, { from: "user" });
+  } else {
+    logger.info("Nothing was run.");
+  }
+}
+
 // src/workspace-creation/adopt-directory.use-case.ts
 var import_node_fs38 = require("fs");
-var import_node_path46 = require("path");
+var import_node_path47 = require("path");
 var NEVER_COPIED = /* @__PURE__ */ new Set([".git", "node_modules"]);
 var AGENT_AND_CI_ENTRIES = [
   "AGENTS.md",
@@ -9696,7 +9890,7 @@ function assertAdoptableDirectory(target) {
   if (!(0, import_node_fs38.statSync)(target).isDirectory()) {
     throw new Error(`--into '${target}' is not a directory.`);
   }
-  const blockers = PREFLIGHT_BLOCKERS.filter((entry) => (0, import_node_fs38.existsSync)((0, import_node_path46.join)(target, entry)));
+  const blockers = PREFLIGHT_BLOCKERS.filter((entry) => (0, import_node_fs38.existsSync)((0, import_node_path47.join)(target, entry)));
   if (blockers.length > 0) {
     throw new Error(
       `--into '${target}' already holds ${blockers.join(", ")}, so it is a project already. Use \`mnci upgrade\` to re-apply the overlay to an existing workspace, or point --into at an empty checkout.`
@@ -9724,7 +9918,7 @@ ${additions.join("\n")}
 function adoptGeneratedWorkspace(generatedRoot, target) {
   const entries = (0, import_node_fs38.readdirSync)(generatedRoot).filter((entry) => !NEVER_COPIED.has(entry));
   const collisions = entries.filter(
-    (entry) => (0, import_node_fs38.existsSync)((0, import_node_path46.join)(target, entry)) && !EXISTING_WINS.has(entry) && entry !== ".gitignore"
+    (entry) => (0, import_node_fs38.existsSync)((0, import_node_path47.join)(target, entry)) && !EXISTING_WINS.has(entry) && entry !== ".gitignore"
   );
   if (collisions.length > 0) {
     throw new Error(
@@ -9733,8 +9927,8 @@ function adoptGeneratedWorkspace(generatedRoot, target) {
   }
   const result = { copied: [], kept: [], mergedGitignore: false };
   for (const entry of entries) {
-    const from = (0, import_node_path46.join)(generatedRoot, entry);
-    const to = (0, import_node_path46.join)(target, entry);
+    const from = (0, import_node_path47.join)(generatedRoot, entry);
+    const to = (0, import_node_path47.join)(target, entry);
     if (entry === ".gitignore" && (0, import_node_fs38.existsSync)(to)) {
       result.mergedGitignore = mergeGitignore(from, to);
       result.kept.push(entry);
@@ -9754,7 +9948,7 @@ function adoptGeneratedWorkspace(generatedRoot, target) {
 // src/workspace-creation/create-workspace.use-case.ts
 var import_node_fs39 = require("fs");
 var import_node_os2 = require("os");
-var import_node_path47 = require("path");
+var import_node_path48 = require("path");
 function nxCloudProviderValue(ci) {
   return ci === "azure" ? "azure" : "github";
 }
@@ -9797,9 +9991,9 @@ async function resolveRegistry2(options) {
   return await promptRegistry();
 }
 async function runNew(name, options) {
-  const adoptTarget = options.into === void 0 ? void 0 : (0, import_node_path47.resolve)(process.cwd(), options.into);
+  const adoptTarget = options.into === void 0 ? void 0 : (0, import_node_path48.resolve)(process.cwd(), options.into);
   if (adoptTarget !== void 0) assertAdoptableDirectory(adoptTarget);
-  const workspaceName = name ?? (adoptTarget === void 0 ? await promptText("Workspace name") : (0, import_node_path47.basename)(adoptTarget));
+  const workspaceName = name ?? (adoptTarget === void 0 ? await promptText("Workspace name") : (0, import_node_path48.basename)(adoptTarget));
   assertValidProjectName(workspaceName, "Workspace name");
   const scope = options.scope ?? (options.yes ? `@${workspaceName}` : await promptText("npm scope for publishable packages", `@${workspaceName}`));
   const registry = await resolveRegistry2(options);
@@ -9812,8 +10006,8 @@ async function runNew(name, options) {
   const npmAuth = resolveNpmAuth(options.npmAuth, registry, ci);
   const stack = await resolveStack(options);
   const nxCloud = options.nxCloud ?? (options.yes ? false : await promptNxCloud());
-  const stagingParent = adoptTarget === void 0 ? process.cwd() : (0, import_node_fs39.mkdtempSync)((0, import_node_path47.join)((0, import_node_os2.tmpdir)(), "mnci-new-"));
-  let workspaceRoot = (0, import_node_path47.join)(stagingParent, workspaceName);
+  const stagingParent = adoptTarget === void 0 ? process.cwd() : (0, import_node_fs39.mkdtempSync)((0, import_node_path48.join)((0, import_node_os2.tmpdir)(), "mnci-new-"));
+  let workspaceRoot = (0, import_node_path48.join)(stagingParent, workspaceName);
   try {
     logger.step(`Creating Nx workspace '${workspaceName}' (preset: ts)`);
     runNpx(
@@ -9846,8 +10040,8 @@ async function runNew(name, options) {
     { workspaceName, scope, registry, agent, variableGroup, ci, stack, ...npmAuth && { npmAuth } },
     logger.detail
   );
-  (0, import_node_fs39.rmSync)((0, import_node_path47.join)(workspaceRoot, "node_modules"), { recursive: true, force: true });
-  (0, import_node_fs39.rmSync)((0, import_node_path47.join)(workspaceRoot, "package-lock.json"), { force: true });
+  (0, import_node_fs39.rmSync)((0, import_node_path48.join)(workspaceRoot, "node_modules"), { recursive: true, force: true });
+  (0, import_node_fs39.rmSync)((0, import_node_path48.join)(workspaceRoot, "package-lock.json"), { force: true });
   logger.step("Installing the toolchain (commitlint + husky + linting/formatting)");
   const installStatus = runShell(
     "npm",
@@ -9884,30 +10078,6 @@ function projectKindHintLines(kinds = PROJECT_KINDS) {
   return lines;
 }
 
-// src/workspace-creation/interactive-wizard.use-case.ts
-var import_node_path48 = require("path");
-var import_prompts4 = require("@inquirer/prompts");
-async function runInteractive() {
-  const inWorkspace = fileExists((0, import_node_path48.join)(process.cwd(), "nx.json"));
-  const choiceNew = { name: "Create a new monorepo", value: "new" };
-  const choiceAdd = { name: "Add a project to this workspace", value: "add" };
-  const choiceUpgrade = {
-    name: "Upgrade this workspace (re-apply the latest overlay)",
-    value: "upgrade"
-  };
-  const action = await (0, import_prompts4.select)({
-    message: "What would you like to do?",
-    choices: inWorkspace ? [choiceAdd, choiceUpgrade, choiceNew] : [choiceNew, choiceAdd, choiceUpgrade]
-  });
-  if (action === "new") {
-    await runNew(void 0, {});
-  } else if (action === "upgrade") {
-    runUpgrade(process.cwd(), {});
-  } else {
-    await runAdd(void 0, void 0, {});
-  }
-}
-
 // src/main.ts
 function buildProgram(cliVersion) {
   const program = new import_commander.Command();
@@ -10009,7 +10179,7 @@ function buildProgram(cliVersion) {
     runInfo(process.cwd(), cliVersion, options);
   });
   program.action(async () => {
-    await runInteractive();
+    await runInteractive(program);
   });
   return program;
 }