@jskit-ai/jskit-cli 0.2.41 → 0.2.43

package/src/server/core/commandCatalog.js

@@ -30,9 +30,8 @@ function canDelegateAddInlineOptions(positional = []) {
 function canDelegateGenerateInlineOptions(positional = []) {
   const normalizedPositionals = Array.isArray(positional) ? positional : [];
   const first = String(normalizedPositionals[0] || "").trim();
-  const second = String(normalizedPositionals[1] || "").trim();
   const last = String(normalizedPositionals[normalizedPositionals.length - 1] || "").trim();
-  if (!first || !second || isHelpToken(first) || isHelpToken(second) || isHelpToken(last)) {
+  if (!first || isHelpToken(first) || isHelpToken(last)) {
     return false;
   }
   return true;
@@ -77,6 +76,31 @@ const COMMAND_DESCRIPTORS = Object.freeze({
     inlineOptionMode: "none",
     allowedValueOptionNames: Object.freeze([])
   }),
+  completion: Object.freeze({
+    command: "completion",
+    aliases: Object.freeze([]),
+    showInOverview: true,
+    summary: "Print shell completion script support.",
+    minimalUse: "jskit completion bash",
+    parameters: Object.freeze([
+      Object.freeze({
+        name: "<shell>",
+        description: "Shell name. Currently only bash is supported."
+      })
+    ]),
+    defaults: Object.freeze([
+      "Prints a shell completion script to stdout.",
+      "Use --install to write a small Bash loader file and wire ~/.bashrc automatically.",
+      "Use source <(npx jskit completion bash) to enable completion in the current shell.",
+      "The internal __complete__ mode is reserved for the generated shell function."
+    ]),
+    fullUse: "jskit completion bash [--install]",
+    showHelpOnBareInvocation: true,
+    handlerName: "commandCompletion",
+    allowedFlagKeys: Object.freeze([]),
+    inlineOptionMode: "enumerated",
+    allowedValueOptionNames: Object.freeze(["install"])
+  }),
   create: Object.freeze({
     command: "create",
     aliases: Object.freeze([]),
@@ -135,7 +159,7 @@ const COMMAND_DESCRIPTORS = Object.freeze({
   }),
   generate: Object.freeze({
     command: "generate",
-    aliases: Object.freeze(["gen"]),
+    aliases: Object.freeze([]),
     showInOverview: true,
     summary: "Run a generator package (or generator subcommand).",
     minimalUse: "jskit generate <generatorId>",
@@ -188,7 +212,7 @@ const COMMAND_DESCRIPTORS = Object.freeze({
   }),
   list: Object.freeze({
     command: "list",
-    aliases: Object.freeze(["ls"]),
+    aliases: Object.freeze([]),
     showInOverview: true,
     summary: "List bundles, runtime packages, or generator packages.",
     minimalUse: "jskit list",
@@ -212,7 +236,7 @@ const COMMAND_DESCRIPTORS = Object.freeze({
   }),
   "list-placements": Object.freeze({
     command: "list-placements",
-    aliases: Object.freeze(["lp"]),
+    aliases: Object.freeze([]),
     showInOverview: true,
     summary: "List discovered UI placement targets.",
     minimalUse: "jskit list-placements",
@@ -229,12 +253,12 @@ const COMMAND_DESCRIPTORS = Object.freeze({
     inlineOptionMode: "none",
     allowedValueOptionNames: Object.freeze([])
   }),
-  "list-link-items": Object.freeze({
-    command: "list-link-items",
-    aliases: Object.freeze(["lpct", "list-placement-component-tokens"]),
+  "list-component-tokens": Object.freeze({
+    command: "list-component-tokens",
+    aliases: Object.freeze([]),
     showInOverview: true,
-    summary: "List available placement link-item component tokens.",
-    minimalUse: "jskit list-link-items",
+    summary: "List available placement component tokens.",
+    minimalUse: "jskit list-component-tokens",
     parameters: Object.freeze([
       Object.freeze({
         name: "[--prefix <value>]",
@@ -252,7 +276,7 @@ const COMMAND_DESCRIPTORS = Object.freeze({
       "Use --all when you want the full discovered token set.",
       "Shows plain text by default; use --json for structured output."
     ]),
-    fullUse: "jskit list-link-items [--prefix <value>] [--all] [--json]",
+    fullUse: "jskit list-component-tokens [--prefix <value>] [--all] [--json]",
     showHelpOnBareInvocation: false,
     handlerName: "commandListLinkItems",
     allowedFlagKeys: Object.freeze(["json", "all"]),
@@ -261,7 +285,7 @@ const COMMAND_DESCRIPTORS = Object.freeze({
   }),
   show: Object.freeze({
     command: "show",
-    aliases: Object.freeze(["view"]),
+    aliases: Object.freeze([]),
     showInOverview: true,
     summary: "Show detailed metadata for a bundle or package.",
     minimalUse: "jskit show <id>",
@@ -272,7 +296,6 @@ const COMMAND_DESCRIPTORS = Object.freeze({
       })
     ]),
     defaults: Object.freeze([
-      "view is an alias of show.",
       "Basic output is compact; --details expands capability and runtime sections.",
       "--debug-exports implies --details."
     ]),

package/src/server/core/createCommandHandlers.js

@@ -3,6 +3,7 @@ import { createListCommands } from "../commandHandlers/list.js";
 import { createShowCommand } from "../commandHandlers/show.js";
 import { createPackageCommands } from "../commandHandlers/package.js";
 import { createHealthCommands } from "../commandHandlers/health.js";
+import { createCompletionCommands } from "../commandHandlers/completion.js";
 
 function createCommandHandlers(deps = {}) {
   const shared = createCommandHandlerShared(deps);
@@ -23,11 +24,13 @@ function createCommandHandlers(deps = {}) {
     commandRemove
   } = createPackageCommands(commandContext);
   const { commandDoctor, commandLintDescriptors } = createHealthCommands(commandContext);
+  const { commandCompletion } = createCompletionCommands(commandContext);
 
   return {
     commandList,
     commandListPlacements,
     commandListLinkItems,
+    commandCompletion,
     commandShow,
     commandCreate,
     commandAdd,

package/src/server/shared/optionInterpolation.js

@@ -209,6 +209,80 @@ function normalizePathValue(value) {
     .join("/");
 }
 
+function normalizePromptChoices(rawChoices = []) {
+  return ensureArray(rawChoices)
+    .map((entry) => {
+      if (!entry || typeof entry !== "object") {
+        return null;
+      }
+      const value = String(entry.value || "").trim();
+      const label = String(entry.label || value).trim();
+      if (!value || !label) {
+        return null;
+      }
+      return Object.freeze({ value, label });
+    })
+    .filter(Boolean);
+}
+
+function findPromptChoice(promptChoices = [], answer = "") {
+  const normalizedAnswer = String(answer || "").trim();
+  if (!normalizedAnswer) {
+    return null;
+  }
+
+  if (/^\d+$/.test(normalizedAnswer)) {
+    const index = Number.parseInt(normalizedAnswer, 10) - 1;
+    if (index >= 0 && index < promptChoices.length) {
+      return promptChoices[index];
+    }
+  }
+
+  return promptChoices.find((entry) => {
+    return entry.value === normalizedAnswer || entry.label === normalizedAnswer;
+  }) || null;
+}
+
+async function promptForChoice({
+  promptText = "",
+  promptChoices = [],
+  stdin,
+  stdout,
+  required = false,
+  defaultValue = ""
+}) {
+  const rl = createInterface({
+    input: stdin,
+    output: stdout
+  });
+
+  try {
+    while (true) {
+      const answer = String(await rl.question(promptText)).trim();
+      if (!answer && defaultValue) {
+        return defaultValue;
+      }
+      if (!answer && !required) {
+        return "";
+      }
+      if (!answer && required) {
+        throw createCliError("A selection is required.");
+      }
+
+      const matchedChoice = findPromptChoice(promptChoices, answer);
+      if (matchedChoice) {
+        return matchedChoice.value;
+      }
+
+      const values = promptChoices.map((entry) => entry.value).join(", ");
+      stdout.write(`Invalid selection. Enter a number or one of: ${values}.
+`);
+    }
+  } finally {
+    rl.close();
+  }
+}
+
 function parseTransformSpec(transform) {
   const normalized = String(transform || "").trim();
   if (!normalized) {
@@ -359,6 +433,7 @@ async function promptForRequiredOption({
   ownerId,
   optionName,
   optionSchema,
+  promptChoices = [],
   stdin = process.stdin,
   stdout = process.stdout
 }) {
@@ -387,6 +462,24 @@ async function promptForRequiredOption({
   const defaultHint = defaultValue ? ` [default: ${defaultValue}]` : "";
   const hintSuffix = promptHint ? ` ${promptHint}` : "";
   const promptText = `${label}${defaultHint}${hintSuffix}: `;
+  const normalizedPromptChoices = normalizePromptChoices(promptChoices);
+
+  if (normalizedPromptChoices.length > 0) {
+    stdout.write(`${label}${defaultHint}${hintSuffix}
+`);
+    normalizedPromptChoices.forEach((entry, index) => {
+      stdout.write(`  ${index + 1}) ${entry.label}
+`);
+    });
+    return promptForChoice({
+      promptText: "Select a surface by number or id: ",
+      promptChoices: normalizedPromptChoices,
+      stdin,
+      stdout,
+      required,
+      defaultValue
+    });
+  }
 
   let answer = "";