@getmonoceros/workbench 1.9.0 → 1.9.2

package/dist/bin.js

@@ -4428,7 +4428,7 @@ async function persistPromptedIdentity(prompted, ymlPath, home, logger) {
 }
 
 // src/version.ts
-var CLI_VERSION = true ? "1.9.0" : "dev";
+var CLI_VERSION = true ? "1.9.2" : "dev";
 
 // src/commands/_dispatch.ts
 import { consola as consola12 } from "consola";
@@ -4487,6 +4487,13 @@ function renderCompletionScript(shell) {
       '  candidates=$(monoceros __complete --line "$COMP_LINE" --point "$COMP_POINT" 2>/dev/null)',
       '  local cur="${COMP_WORDS[COMP_CWORD]}"',
       '  COMPREPLY=( $(compgen -W "$candidates" -- "$cur") )',
+      "  # Suppress the trailing space when bash narrowed the candidate",
+      "  # set to a single token that ends with `=` \u2014 those are value-",
+      "  # flags (`--with=`, `--with-ports=`, \u2026) where the user types the",
+      "  # value immediately after.",
+      '  if [[ ${#COMPREPLY[@]} -eq 1 && "${COMPREPLY[0]}" == *= ]]; then',
+      "    compopt -o nospace",
+      "  fi",
       "}",
       "complete -F _monoceros monoceros",
       ""
@@ -4529,10 +4536,22 @@ function renderCompletionScript(shell) {
     "_monoceros() {",
     '  local line="$BUFFER"',
     '  local point="$CURSOR"',
-    "  local -a candidates",
+    "  local -a candidates with_eq without_eq",
     '  candidates=("${(@f)$(monoceros __complete --line "$line" --point "$point" 2>/dev/null)}")',
     '  candidates=("${(@)candidates:#}")',
-    "  _describe 'completion' candidates",
+    '  # Split candidates into "ends with `=`" (value-flags \u2014 no suffix',
+    "  # space wanted because the user types the value immediately) and",
+    '  # "everything else" (positional values, boolean flags \u2014 default',
+    "  # space behaviour).",
+    '  for cand in "${candidates[@]}"; do',
+    '    if [[ "$cand" == *= ]]; then',
+    '      with_eq+=("$cand")',
+    "    else",
+    '      without_eq+=("$cand")',
+    "    fi",
+    "  done",
+    "  (( ${#with_eq[@]} ))    && compadd -S '' -- \"${with_eq[@]}\"",
+    '  (( ${#without_eq[@]} )) && compadd      -- "${without_eq[@]}"',
     "}",
     "",
     '_monoceros "$@"',
@@ -4709,7 +4728,6 @@ function isShellWhitespace(ch) {
 function dispatchCommand(spec, argTokens, ctx) {
   const dashDashIdx = argTokens.indexOf("--");
   const preDash = dashDashIdx < 0 ? argTokens : argTokens.slice(0, dashDashIdx);
-  const postDash = dashDashIdx < 0 ? [] : argTokens.slice(dashDashIdx + 1);
   const inPostDash = dashDashIdx >= 0;
   if (inPostDash && spec.innerArgs) {
     return resolveValues(spec.innerArgs, ctx, ctx.current);
@@ -4728,14 +4746,7 @@ async function resolvePreDash(spec, preDash, ctx) {
     return completions.map((v) => `${flagName}=${v}`);
   }
   if (current.startsWith("-")) {
-    const flags = spec.flags ?? {};
-    const names = Object.keys(flags);
-    const all = [];
-    for (const n of names) {
-      all.push(n);
-      for (const a of flags[n].aliases ?? []) all.push(a);
-    }
-    return filterPrefix(all, current);
+    return listFlagNames(spec.flags ?? {}, current);
   }
   const lastPrev = preDash[preDash.length - 1];
   if (lastPrev && lastPrev.startsWith("--") && !lastPrev.includes("=")) {
@@ -4745,12 +4756,25 @@ async function resolvePreDash(spec, preDash, ctx) {
     }
   }
   const positionalIdx = countCompletedPositionals(preDash, spec.flags ?? {});
-  const positional = spec.positionals?.[positionalIdx];
-  if (positional) {
-    return resolveValues(positional, ctx, current);
+  const positionals = spec.positionals ?? [];
+  const expectedPositionalCount = spec.positionalCount ?? positionals.length;
+  if (positionalIdx < positionals.length) {
+    const positional = positionals[positionalIdx];
+    if (positional) return resolveValues(positional, ctx, current);
+  }
+  if (positionalIdx >= expectedPositionalCount) {
+    return listFlagNames(spec.flags ?? {}, current);
   }
   return [];
 }
+function listFlagNames(flags, fragment) {
+  const names = [];
+  for (const [name, spec] of Object.entries(flags)) {
+    names.push(spec.type === "value" ? `${name}=` : name);
+    for (const alias of spec.aliases ?? []) names.push(alias);
+  }
+  return filterPrefix(names, fragment);
+}
 function countCompletedPositionals(preDash, flags) {
   let count = 0;
   for (let i = 0; i < preDash.length; i++) {
@@ -4892,8 +4916,11 @@ var ALL_COMMANDS = [
 var containerName = (ctx) => listContainerNames(ctx);
 var COMMAND_SPECS = {
   init: {
-    // First positional is a FRESH name → no suggestions from existing
-    // container-configs (would invite collisions).
+    // First positional is a FRESH name → no suggestion source, but
+    // the slot exists. Once the cursor is past it (after the name +
+    // space), `--with` / `--with-repo` / `--with-ports` surface as
+    // flag suggestions.
+    positionalCount: 1,
     flags: {
       "--with": { type: "value", values: () => listAllCatalogComponents() },
       "--with-repo": { type: "value" },
@@ -4984,7 +5011,9 @@ var COMMAND_SPECS = {
   "list-components": {},
   restore: {
     // First positional is a backup-path; no value suggestions today
-    // (could plug filesystem completion later).
+    // (could plug filesystem completion later). Slot still exists so
+    // Tab is silent inside it rather than offering flags prematurely.
+    positionalCount: 1
   }
 };
 var COMPLETION_COMMAND_SPEC_KEYS = Object.keys(COMMAND_SPECS);