effect 4.0.0-rc.111 → 4.0.0-rc.113

package/dist/unstable/cli/internal/completions/bash.js

@@ -13,41 +13,90 @@ const flagNamesForWordlist = flag => {
   }
   return names;
 };
-/**
- * Build an associative array mapping each flag form to a group index.
- * At completion time, if any form in a group appears in COMP_WORDS,
- * all forms in that group are removed from the candidate list.
- */
+/** Emit a Bash 3.2-compatible used-flag filter. */
 const buildFlagGroupDeclarations = (flags, lines) => {
   if (flags.length === 0) return;
-  lines.push(`  # Build used-flag filter`);
-  lines.push(`  local -A _flag_groups`);
-  let groupIdx = 0;
-  for (const flag of flags) {
-    const forms = flagNamesForWordlist(flag);
-    for (const form of forms) {
-      lines.push(`  _flag_groups[${form}]=${groupIdx}`);
-    }
-    groupIdx++;
-  }
-  lines.push(`  local -A _used_groups`);
+  const groups = flags.map(flagNamesForWordlist);
+  lines.push(`  local ${groups.map((_, index) => `_used_${index}=""`).join(" ")}`);
   lines.push(`  for ((i = 1; i < cword; i++)); do`);
-  lines.push(`    local _g="\${_flag_groups[\${words[i]}]:-}"`);
-  lines.push(`    [[ -n "$_g" ]] && _used_groups[$_g]=1`);
+  lines.push(`    case "\${words[i]%%=*}" in`);
+  groups.forEach((forms, index) => {
+    lines.push(`      ${forms.join("|")}) _used_${index}=1 ;;`);
+  });
+  lines.push(`    esac`);
   lines.push(`  done`);
   lines.push(`  local _filtered_flags=""`);
-  lines.push(`  for _f in ${flags.flatMap(flagNamesForWordlist).join(" ")}; do`);
-  lines.push(`    local _g="\${_flag_groups[$_f]:-}"`);
-  lines.push(`    [[ -z "$_g" || -z "\${_used_groups[$_g]:-}" ]] && _filtered_flags+=" $_f"`);
+  groups.forEach((forms, index) => {
+    lines.push(`  [[ -n "$_used_${index}" ]] || _filtered_flags+=" ${forms.join(" ")}"`);
+  });
+  lines.push(``);
+};
+/**
+ * Complete choices without `compgen -W`, which reparses quoted values. Escape
+ * only the portion readline replaces for the active quote context.
+ *
+ * `!` cannot be escaped inside a user-opened double quote without changing the
+ * resulting argument.
+ */
+const choicesHelper = (helperName, lines) => {
+  lines.push(`${helperName}()`);
+  lines.push(`{`);
+  lines.push(`  local _cur="$1" _word="$2"; shift 2`);
+  lines.push(``);
+  lines.push(`  local _head="\${_cur%"$_word"}"`);
+  lines.push(`  local _open=""`);
+  lines.push(`  case "$_head" in`);
+  lines.push(`    *\\') _open="'" ;;`);
+  lines.push(`    *\\") _open='"' ;;`);
+  lines.push(`  esac`);
+  lines.push(``);
+  lines.push(`  local _prefix="$_cur" _committed="$_head"`);
+  // Quoting these substitutions breaks quote matching on Bash 3.2.
+  lines.push(`  _prefix=\${_prefix//\\\\/}; _prefix=\${_prefix//\\"/}; _prefix=\${_prefix//\\'/}`);
+  lines.push(`  _committed=\${_committed//\\\\/}; _committed=\${_committed//\\"/}; _committed=\${_committed//\\'/}`);
+  lines.push(``);
+  lines.push(`  COMPREPLY=()`);
+  lines.push(`  local _choice _rest _match`);
+  lines.push(`  for _choice in "$@"; do`);
+  lines.push(`    [[ "$_choice" == "$_prefix"* ]] || continue`);
+  lines.push(`    _rest="\${_choice#"$_committed"}"`);
+  lines.push(`    case "$_open" in`);
+  lines.push(`      "'")`);
+  lines.push(`        if [[ "$_head" == "'" ]]; then`);
+  // Use a shell splice for a quote opened at the start of the word.
+  lines.push(`          _match=\${_rest//\\'/\\'\\\\\\'\\'}`);
+  lines.push(`        else`);
+  // A mid-word single-quote context cannot contain another single quote.
+  lines.push(`          [[ "$_rest" == *\\'* ]] && continue`);
+  lines.push(`          _match="$_rest"`);
+  lines.push(`        fi`);
+  lines.push(`        ;;`);
+  lines.push(`      '"')`);
+  lines.push(`        _match="\${_rest//\\\\/\\\\\\\\}"`);
+  lines.push(`        _match="\${_match//\\$/\\\\$}"`);
+  lines.push("        _match=\"${_match//\\`/\\\\\\`}\"");
+  lines.push(`        _match="\${_match//\\"/\\\\\\"}"`);
+  lines.push(`        ;;`);
+  lines.push(`      *)`);
+  lines.push(`        printf -v _match '%q' "$_rest"`);
+  // Bash 3.2 leaves a leading tilde unescaped.
+  lines.push(`        [[ -z "$_head" && "$_match" == '~'* ]] && _match="\\\\$_match"`);
+  lines.push(`        ;;`);
+  lines.push(`    esac`);
+  // Readline omits a closing quote already present in the match.
+  lines.push(`    [[ -n "$_open" && "$_match" == *"$_open" ]] && _match+="$_open"`);
+  lines.push(`    COMPREPLY+=("$_match")`);
   lines.push(`  done`);
+  lines.push(`}`);
   lines.push(``);
 };
-const flagValueCompletion = type => {
+const choiceCompletion = (helperName, values) => `${helperName} "$cur" "$_comp_word" ${values.map(value => `'${escapeForBash(value)}'`).join(" ")}`;
+const flagValueCompletion = (type, helperName) => {
   switch (type._tag) {
     case "Boolean":
       return undefined;
     case "Choice":
-      return `COMPREPLY=( $(compgen -W '${type.values.join(" ")}' -- "$cur") )`;
+      return choiceCompletion(helperName, type.values);
     case "Path":
       if (type.pathType === "directory") return `COMPREPLY=( $(compgen -d -- "$cur") )`;
       return `COMPREPLY=( $(compgen -f -- "$cur") )`;
@@ -55,10 +104,10 @@ const flagValueCompletion = type => {
       return undefined;
   }
 };
-const argCompletion = type => {
+const argCompletion = (type, helperName) => {
   switch (type._tag) {
     case "Choice":
-      return `COMPREPLY=( $(compgen -W '${type.values.join(" ")}' -- "$cur") )`;
+      return choiceCompletion(helperName, type.values);
     case "Path":
       if (type.pathType === "directory") return `COMPREPLY=( $(compgen -d -- "$cur") )`;
       return `COMPREPLY=( $(compgen -f -- "$cur") )`;
@@ -69,14 +118,19 @@ const argCompletion = type => {
 // ---------------------------------------------------------------------------
 // Generator
 // ---------------------------------------------------------------------------
-const generateFunction = (descriptor, parentPath, lines) => {
+const generateFunction = (descriptor, parentPath, lines, helperName) => {
   const currentPath = [...parentPath, descriptor.name];
   const funcName = `_${currentPath.map(sanitizeFunctionName).join("_")}`;
   lines.push(`${funcName}()`);
   lines.push(`{`);
   lines.push(`  local cur prev words cword i`);
   lines.push(parentPath.length === 0 ? `  local _command_index=0` : `  local _command_index="$1"`);
-  lines.push(`  _init_completion || return`);
+  // Keep values containing COMP_WORDBREAKS characters in one word.
+  lines.push(`  _init_completion -n "$COMP_WORDBREAKS" || return`);
+  if (parentPath.length === 0) {
+    // Subcommand functions inherit this through Bash's dynamic scope.
+    lines.push(`  local _comp_word="$2"`);
+  }
   lines.push(``);
   // Build flag-value dispatch
   const flagsWithValues = descriptor.flags.filter(f => f.type._tag !== "Boolean");
@@ -88,7 +142,7 @@ const generateFunction = (descriptor, parentPath, lines) => {
       for (const alias of flag.aliases) {
         longNames.push(alias.length === 1 ? `-${alias}` : `--${alias}`);
       }
-      const completion = flagValueCompletion(flag.type);
+      const completion = flagValueCompletion(flag.type, helperName);
       if (completion) {
         lines.push(`    ${longNames.join("|")})`);
         lines.push(`      ${completion}`);
@@ -140,7 +194,7 @@ const generateFunction = (descriptor, parentPath, lines) => {
   }
   // Positional argument completion
   const argsWithCompletions = descriptor.arguments.flatMap((argument, index) => {
-    const completion = argCompletion(argument.type);
+    const completion = argCompletion(argument.type, helperName);
     return completion === undefined ? [] : [{
       argument,
       completion,
@@ -204,13 +258,15 @@ const generateFunction = (descriptor, parentPath, lines) => {
   lines.push(``);
   // Recurse into subcommands
   for (const sub of descriptor.subcommands) {
-    generateFunction(sub, currentPath, lines);
+    generateFunction(sub, currentPath, lines, helperName);
   }
 };
 /** @internal */
 export const generate = (executableName, descriptor) => {
   const lines = [];
   const safeName = sanitizeFunctionName(executableName);
+  // Sanitized command names cannot contain `-`.
+  const helperName = `_${safeName}--choices`;
   lines.push(`###-begin-${escapeForBash(executableName)}-completions-###`);
   lines.push(`#`);
   lines.push(`# Static completion script for Bash`);
@@ -219,21 +275,36 @@ export const generate = (executableName, descriptor) => {
   lines.push(`#   ${escapeForBash(executableName)} --completions bash >> ~/.bashrc`);
   lines.push(`#`);
   lines.push(``);
-  // Inline minimal _init_completion fallback for environments without
-  // bash-completion installed. The real _init_completion handles edge cases
-  // (= in options, redirections, etc.) but this covers the common path.
+  // Fallback for environments without bash-completion. Preserve word-break
+  // characters inside values.
   lines.push(`if ! type _init_completion &>/dev/null; then`);
   lines.push(`  _init_completion()`);
   lines.push(`  {`);
   lines.push(`    COMPREPLY=()`);
-  lines.push(`    cur="\${COMP_WORDS[COMP_CWORD]}"`);
-  lines.push(`    prev="\${COMP_WORDS[COMP_CWORD-1]}"`);
-  lines.push(`    words=("\${COMP_WORDS[@]}")`);
-  lines.push(`    cword=$COMP_CWORD`);
+  lines.push(`    local _i _j=0 _piece _line="$COMP_LINE"`);
+  lines.push(`    words=("\${COMP_WORDS[0]}")`);
+  lines.push(`    cword=0`);
+  lines.push(`    _line="\${_line#*"\${COMP_WORDS[0]}"}"`);
+  lines.push(`    for ((_i = 1; _i < \${#COMP_WORDS[@]}; _i++)); do`);
+  lines.push(`      _piece="\${COMP_WORDS[_i]}"`);
+  lines.push(`      if [[ "$_line" == [[:blank:]]* ]]; then`);
+  lines.push(`        ((_j++))`);
+  lines.push(`        words[_j]="$_piece"`);
+  lines.push(`      else`);
+  lines.push(`        words[_j]="\${words[_j]}$_piece"`);
+  lines.push(`      fi`);
+  lines.push(`      ((_i == COMP_CWORD)) && cword=$_j`);
+  lines.push(`      _line="\${_line#*"$_piece"}"`);
+  lines.push(`    done`);
+  lines.push(`    cur="\${words[cword]}"`);
+  lines.push(`    prev=""`);
+  lines.push(`    ((cword > 0)) && prev="\${words[cword-1]}"`);
+  lines.push(`    return 0`);
   lines.push(`  }`);
   lines.push(`fi`);
   lines.push(``);
-  generateFunction(descriptor, [], lines);
+  choicesHelper(helperName, lines);
+  generateFunction(descriptor, [], lines, helperName);
   lines.push(`complete -F _${safeName} ${escapeForBash(executableName)}`);
   lines.push(`###-end-${escapeForBash(executableName)}-completions-###`);
   return lines.join("\n");

package/dist/unstable/cli/internal/completions/bash.js.map

@@ -1 +1 @@
-{"version":3,"file":"bash.js","names":[],"sources":["../../../../../src/unstable/cli/internal/completions/bash.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"bash.js","names":[],"sources":["../../../../../src/unstable/cli/internal/completions/bash.ts"],"sourcesContent":[null],"mappings":"AAUA;AACA;AACA;AAEA,MAAM,aAAa,GAAI,CAAS,IAAa,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;AAErE,MAAM,oBAAoB,GAAI,CAAS,IAAa,CAAC,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC;AAEpF,MAAM,oBAAoB,GAAI,IAAgC,IAAmB;EAC/E,MAAM,KAAK,GAAkB,CAAC,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;EAC/C,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,EAAE;IAChC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,KAAK,EAAE,GAAG,KAAK,KAAK,EAAE,CAAC;EAC7D;EACA,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;IAChC,KAAK,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;EACjC;EACA,OAAO,KAAK;AACd,CAAC;AAED;AACA,MAAM,0BAA0B,GAAG,CACjC,KAAgD,EAChD,KAAoB,KACZ;EACR,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;EACxB,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC;EAC9C,KAAK,CAAC,IAAI,CAAC,WAAW,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,SAAS,KAAK,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;EAChF,KAAK,CAAC,IAAI,CAAC,qCAAqC,CAAC;EACjD,KAAK,CAAC,IAAI,CAAC,gCAAgC,CAAC;EAC5C,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,KAAI;IAC9B,KAAK,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,KAAK,OAAO,CAAC;EAC7D,CAAC,CAAC;EACF,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC;EACtB,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;EACpB,KAAK,CAAC,IAAI,CAAC,4BAA4B,CAAC;EACxC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,KAAI;IAC9B,KAAK,CAAC,IAAI,CAAC,mBAAmB,KAAK,8BAA8B,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;EACtF,CAAC,CAAC;EACF,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC;AAED;;;;;;;AAOA,MAAM,aAAa,GAAG,CAAC,UAAkB,EAAE,KAAoB,KAAU;EACvE,KAAK,CAAC,IAAI,CAAC,GAAG,UAAU,IAAI,CAAC;EAC7B,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;EACf,KAAK,CAAC,IAAI,CAAC,uCAAuC,CAAC;EACnD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;EACd,KAAK,CAAC,IAAI,CAAC,mCAAmC,CAAC;EAC/C,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC;EAC9B,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC;EAChC,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC;EACpC,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC;EACpC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;EACpB,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;EACd,KAAK,CAAC,IAAI,CAAC,6CAA6C,CAAC;EACzD;EACA,KAAK,CAAC,IAAI,CAAC,oFAAoF,CAAC;EAChG,KAAK,CAAC,IAAI,CAAC,sGAAsG,CAAC;EAClH,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;EACd,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC;EAC5B,KAAK,CAAC,IAAI,CAAC,8BAA8B,CAAC;EAC1C,KAAK,CAAC,IAAI,CAAC,2BAA2B,CAAC;EACvC,KAAK,CAAC,IAAI,CAAC,iDAAiD,CAAC;EAC7D,KAAK,CAAC,IAAI,CAAC,uCAAuC,CAAC;EACnD,KAAK,CAAC,IAAI,CAAC,sBAAsB,CAAC;EAClC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC;EACxB,KAAK,CAAC,IAAI,CAAC,wCAAwC,CAAC;EACpD;EACA,KAAK,CAAC,IAAI,CAAC,+CAA+C,CAAC;EAC3D,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;EAC1B;EACA,KAAK,CAAC,IAAI,CAAC,+CAA+C,CAAC;EAC3D,KAAK,CAAC,IAAI,CAAC,2BAA2B,CAAC;EACvC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC;EACxB,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC;EACxB,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC;EACxB,KAAK,CAAC,IAAI,CAAC,2CAA2C,CAAC;EACvD,KAAK,CAAC,IAAI,CAAC,wCAAwC,CAAC;EACpD,KAAK,CAAC,IAAI,CAAC,2CAA2C,CAAC;EACvD,KAAK,CAAC,IAAI,CAAC,0CAA0C,CAAC;EACtD,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC;EACxB,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC;EACtB,KAAK,CAAC,IAAI,CAAC,wCAAwC,CAAC;EACpD;EACA,KAAK,CAAC,IAAI,CAAC,wEAAwE,CAAC;EACpF,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC;EACxB,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC;EACtB;EACA,KAAK,CAAC,IAAI,CAAC,qEAAqE,CAAC;EACjF,KAAK,CAAC,IAAI,CAAC,4BAA4B,CAAC;EACxC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;EACpB,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;EACf,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC;AAED,MAAM,gBAAgB,GAAG,CAAC,UAAkB,EAAE,MAA6B,KACzE,GAAG,UAAU,yBAAyB,MAAM,CAAC,GAAG,CAAE,KAAK,IAAK,IAAI,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;AAEtG,MAAM,mBAAmB,GAAG,CAAC,IAA0B,EAAE,UAAkB,KAAwB;EACjG,QAAQ,IAAI,CAAC,IAAI;IACf,KAAK,SAAS;MACZ,OAAO,SAAS;IAClB,KAAK,QAAQ;MACX,OAAO,gBAAgB,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC;IAClD,KAAK,MAAM;MACT,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW,EAAE,OAAO,uCAAuC;MACjF,OAAO,uCAAuC;IAChD;MACE,OAAO,SAAS;EACpB;AACF,CAAC;AAED,MAAM,aAAa,GAAG,CAAC,IAA8B,EAAE,UAAkB,KAAwB;EAC/F,QAAQ,IAAI,CAAC,IAAI;IACf,KAAK,QAAQ;MACX,OAAO,gBAAgB,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC;IAClD,KAAK,MAAM;MACT,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW,EAAE,OAAO,uCAAuC;MACjF,OAAO,uCAAuC;IAChD;MACE,OAAO,SAAS;EACpB;AACF,CAAC;AAED;AACA;AACA;AAEA,MAAM,gBAAgB,GAAG,CACvB,UAAyC,EACzC,UAAiC,EACjC,KAAoB,EACpB,UAAkB,KACV;EACR,MAAM,WAAW,GAAG,CAAC,GAAG,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC;EACpD,MAAM,QAAQ,GAAG,IAAI,WAAW,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;EAEtE,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,IAAI,CAAC;EAC3B,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;EACf,KAAK,CAAC,IAAI,CAAC,gCAAgC,CAAC;EAC5C,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,GAAG,0BAA0B,GAAG,6BAA6B,CAAC;EAChG;EACA,KAAK,CAAC,IAAI,CAAC,oDAAoD,CAAC;EAChE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;IAC3B;IACA,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC;EACvC;EACA,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;EAEd;EACA,MAAM,eAAe,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,CAAE,CAAC,IAAK,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;EACjF,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;IAC9B,KAAK,CAAC,IAAI,CAAC,4BAA4B,CAAC;IACxC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC;IAC/B,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE;MAClC,MAAM,SAAS,GAAG,CAAC,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;MACpC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,EAAE;QAChC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,KAAK,EAAE,GAAG,KAAK,KAAK,EAAE,CAAC;MACjE;MACA,MAAM,UAAU,GAAG,mBAAmB,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC;MAC7D,IAAI,UAAU,EAAE;QACd,KAAK,CAAC,IAAI,CAAC,OAAO,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;QACzC,KAAK,CAAC,IAAI,CAAC,SAAS,UAAU,EAAE,CAAC;QACjC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;QAC1B,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC;MACxB;IACF;IACA,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;IACpB,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;EAChB;EAEA;EACA,IAAI,UAAU,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;IACrC,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC;IACrC,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC;IACtC,KAAK,CAAC,IAAI,CAAC,sDAAsD,CAAC;IAClE,KAAK,CAAC,IAAI,CAAC,+BAA+B,CAAC;IAC3C,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC;IAChC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC;IAC5B,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;IACpB,KAAK,CAAC,IAAI,CAAC,4BAA4B,CAAC;IACxC,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,KAAK,EAAE;MACnC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;MAClC,MAAM,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC;MACxC,KAAK,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC;MACvD,KAAK,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,GAAG,CAAE,IAAI,IAAK,GAAG,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;IACvE;IACA,KAAK,MAAM,GAAG,IAAI,UAAU,CAAC,WAAW,EAAE;MACxC,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,WAAW,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;MACxF,KAAK,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,IAAI,GAAG,CAAC;MAChC,KAAK,CAAC,IAAI,CAAC,WAAW,WAAW,OAAO,CAAC;MACzC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC;MAC5B,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC;IAC1B;IACA,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC;IACtB,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;IACpB,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;EAChB;EAEA;EACA,0BAA0B,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC;EAEnD,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;IACpE,KAAK,CAAC,IAAI,CAAC,+CAA+C,CAAC;IAC3D,KAAK,CAAC,IAAI,CAAC,+BAA+B,CAAC;IAC3C,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;MAC/B,KAAK,CAAC,IAAI,CAAC,8DAA8D,CAAC;IAC5E;IACA,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC;IACxB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC;IAClB,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;EAChB;EAEA;EACA,MAAM,mBAAmB,GAAG,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,KAAK,KAAI;IAC3E,MAAM,UAAU,GAAG,aAAa,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC3D,OAAO,UAAU,KAAK,SAAS,GAAG,EAAE,GAAG,CAAC;MAAE,QAAQ;MAAE,UAAU;MAAE;IAAK,CAAE,CAAC;EAC1E,CAAC,CAAC;EACF,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE;IAClC,KAAK,CAAC,IAAI,CAAC,qCAAqC,CAAC;IACjD,KAAK,CAAC,IAAI,CAAC,oDAAoD,CAAC;IAChE,KAAK,CAAC,IAAI,CAAC,sDAAsD,CAAC;IAClE,KAAK,CAAC,IAAI,CAAC,+BAA+B,CAAC;IAC3C,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC;IAChC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC;IAC5B,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;IACpB,KAAK,CAAC,IAAI,CAAC,oCAAoC,CAAC;IAChD,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC;IACtC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC;IAC5B,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;IACpB,KAAK,CAAC,IAAI,CAAC,4BAA4B,CAAC;IACxC,KAAK,CAAC,IAAI,CAAC,gCAAgC,CAAC;IAC5C,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,KAAK,EAAE;MACnC,MAAM,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC;MACxC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;QAChC,KAAK,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;MAC5C,CAAC,MAAM;QACL,KAAK,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC;QACvD,KAAK,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,GAAG,CAAE,IAAI,IAAK,GAAG,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;MACvE;IACF;IACA,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;IAC1B,KAAK,CAAC,IAAI,CAAC,gCAAgC,CAAC;IAC5C,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC;IACtB,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;IACpB,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC;IACpC,KAAK,MAAM;MAAE,QAAQ;MAAE,UAAU;MAAE;IAAK,CAAE,IAAI,mBAAmB,EAAE;MACjE,IAAI,QAAQ,CAAC,QAAQ,EAAE;MACvB,KAAK,CAAC,IAAI,CAAC,OAAO,KAAK,GAAG,CAAC;MAC3B,KAAK,CAAC,IAAI,CAAC,SAAS,UAAU,EAAE,CAAC;MACjC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;MAC1B,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC;IACxB;IACA,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;IACpB,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;MAAE;IAAQ,CAAE,KAAK,QAAQ,CAAC,QAAQ,CAAC;IAC9E,IAAI,QAAQ,KAAK,SAAS,EAAE;MAC1B,KAAK,CAAC,IAAI,CAAC,wBAAwB,QAAQ,CAAC,KAAK,WAAW,CAAC;MAC7D,KAAK,CAAC,IAAI,CAAC,OAAO,QAAQ,CAAC,UAAU,EAAE,CAAC;MACxC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC;MACxB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC;IACpB;EACF,CAAC,MAAM,IAAI,UAAU,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;IAC5C,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,CAAE,CAAC,IAAK,CAAC,CAAC,IAAI,CAAC;IAC1D,KAAK,CAAC,IAAI,CAAC,+BAA+B,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC;EAC/E;EAEA,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;EACf,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;EAEd;EACA,KAAK,MAAM,GAAG,IAAI,UAAU,CAAC,WAAW,EAAE;IACxC,gBAAgB,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,CAAC;EACvD;AACF,CAAC;AAED;AACA,OAAO,MAAM,QAAQ,GAAG,CACtB,cAAsB,EACtB,UAAyC,KAC/B;EACV,MAAM,KAAK,GAAkB,EAAE;EAC/B,MAAM,QAAQ,GAAG,oBAAoB,CAAC,cAAc,CAAC;EACrD;EACA,MAAM,UAAU,GAAG,IAAI,QAAQ,WAAW;EAE1C,KAAK,CAAC,IAAI,CAAC,aAAa,aAAa,CAAC,cAAc,CAAC,kBAAkB,CAAC;EACxE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;EACf,KAAK,CAAC,IAAI,CAAC,qCAAqC,CAAC;EACjD,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;EACf,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC;EAC7B,KAAK,CAAC,IAAI,CAAC,OAAO,aAAa,CAAC,cAAc,CAAC,kCAAkC,CAAC;EAClF,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;EACf,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;EAEd;EACA;EACA,KAAK,CAAC,IAAI,CAAC,8CAA8C,CAAC;EAC1D,KAAK,CAAC,IAAI,CAAC,sBAAsB,CAAC;EAClC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;EACjB,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC;EAC9B,KAAK,CAAC,IAAI,CAAC,6CAA6C,CAAC;EACzD,KAAK,CAAC,IAAI,CAAC,iCAAiC,CAAC;EAC7C,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC;EACzB,KAAK,CAAC,IAAI,CAAC,4CAA4C,CAAC;EACxD,KAAK,CAAC,IAAI,CAAC,uDAAuD,CAAC;EACnE,KAAK,CAAC,IAAI,CAAC,mCAAmC,CAAC;EAC/C,KAAK,CAAC,IAAI,CAAC,+CAA+C,CAAC;EAC3D,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC;EAC9B,KAAK,CAAC,IAAI,CAAC,6BAA6B,CAAC;EACzC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC;EACxB,KAAK,CAAC,IAAI,CAAC,0CAA0C,CAAC;EACtD,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC;EACtB,KAAK,CAAC,IAAI,CAAC,yCAAyC,CAAC;EACrD,KAAK,CAAC,IAAI,CAAC,oCAAoC,CAAC;EAChD,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC;EACtB,KAAK,CAAC,IAAI,CAAC,4BAA4B,CAAC;EACxC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC;EACzB,KAAK,CAAC,IAAI,CAAC,gDAAgD,CAAC;EAC5D,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;EAC1B,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;EACjB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;EAChB,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;EAEd,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC;EAChC,gBAAgB,CAAC,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,UAAU,CAAC;EAEnD,KAAK,CAAC,IAAI,CAAC,gBAAgB,QAAQ,IAAI,aAAa,CAAC,cAAc,CAAC,EAAE,CAAC;EACvE,KAAK,CAAC,IAAI,CAAC,WAAW,aAAa,CAAC,cAAc,CAAC,kBAAkB,CAAC;EAEtE,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;AACzB,CAAC","ignoreList":[]}

package/dist/unstable/cli/internal/completions/descriptor.js

@@ -18,13 +18,13 @@ const toFlagType = single => {
       return {
         _tag: "Boolean"
       };
-    case "Integer":
+    case "Int":
       return {
-        _tag: "Integer"
+        _tag: "Int"
       };
-    case "Float":
+    case "Finite":
       return {
-        _tag: "Float"
+        _tag: "Finite"
       };
     case "Date":
       return {
@@ -59,13 +59,13 @@ const toFlagType = single => {
 const toArgumentType = single => {
   const tag = single.primitiveType._tag;
   switch (tag) {
-    case "Integer":
+    case "Int":
       return {
-        _tag: "Integer"
+        _tag: "Int"
       };
-    case "Float":
+    case "Finite":
       return {
-        _tag: "Float"
+        _tag: "Finite"
       };
     case "Date":
       return {
@@ -101,17 +101,21 @@ const toArgumentType = single => {
 // Extraction
 // ---------------------------------------------------------------------------
 /** @internal */
-export const fromCommand = cmd => {
+export const fromCommand = (cmd, inheritedFlags = []) => {
   const impl = toImpl(cmd);
   const config = impl.config;
   const flags = [];
-  for (const flag of config.flags) {
+  const seen = new Set();
+  // Match help's precedence: local flags first, then ancestors root to leaf.
+  for (const [index, flag] of [...config.flags, ...inheritedFlags].entries()) {
     const singles = Param.extractSingleParams(flag);
     for (const single of singles) {
       if (single.kind !== "flag") continue;
       // Omit hidden flags from completion scripts so tab-completion in the
       // shell does not advertise flags that are absent from --help.
       if (single.hidden) continue;
+      if (index >= config.flags.length && seen.has(single.name)) continue;
+      seen.add(single.name);
       flags.push({
         name: single.name,
         aliases: single.aliases,
@@ -136,12 +140,20 @@ export const fromCommand = cmd => {
     }
   }
   const subcommands = [];
+  const sharedFlags = [...inheritedFlags, ...impl.contextConfig.flags];
   for (const group of cmd.subcommands) {
     for (const subcommand of group.commands) {
       // Omit unlisted subcommands from completion scripts so tab-completion in
       // the shell does not advertise commands that are absent from --help.
       if (subcommand.unlisted) continue;
-      subcommands.push(fromCommand(subcommand));
+      const descriptor = fromCommand(subcommand, sharedFlags);
+      subcommands.push(descriptor);
+      if (subcommand.alias && subcommand.alias !== subcommand.name) {
+        subcommands.push({
+          ...descriptor,
+          name: subcommand.alias
+        });
+      }
     }
   }
   return {

package/dist/unstable/cli/internal/completions/descriptor.js.map

@@ -1 +1 @@
-{"version":3,"file":"descriptor.js","names":[],"sources":["../../../../../src/unstable/cli/internal/completions/descriptor.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"descriptor.js","names":[],"sources":["../../../../../src/unstable/cli/internal/completions/descriptor.ts"],"sourcesContent":[null],"mappings":"AAAA;;;;;;AAMA,OAAO,KAAK,MAAM,MAAM,uBAAuB;AAG/C,OAAO,KAAK,KAAK,MAAM,gBAAgB;AACvC,OAAO,KAAK,SAAS,MAAM,oBAAoB;AAC/C,SAAS,MAAM,QAAQ,eAAe;AAEtC;AACA;AACA;AAEA,MAAM,UAAU,GAAI,MAAqC,IAA0B;EACjF,MAAM,GAAG,GAAG,MAAM,CAAC,aAAa,CAAC,IAAI;EACrC,QAAQ,GAAG;IACT,KAAK,SAAS;MACZ,OAAO;QAAE,IAAI,EAAE;MAAS,CAAE;IAC5B,KAAK,KAAK;MACR,OAAO;QAAE,IAAI,EAAE;MAAK,CAAE;IACxB,KAAK,QAAQ;MACX,OAAO;QAAE,IAAI,EAAE;MAAQ,CAAE;IAC3B,KAAK,MAAM;MACT,OAAO;QAAE,IAAI,EAAE;MAAM,CAAE;IACzB,KAAK,QAAQ;MAAE;QACb,MAAM,IAAI,GAAG,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,aAAa,CAAC;QAC1D,OAAO;UAAE,IAAI,EAAE,QAAQ;UAAE,MAAM,EAAE,IAAI,IAAI;QAAE,CAAE;MAC/C;IACA,KAAK,MAAM;MACT,OAAO;QAAE,IAAI,EAAE,MAAM;QAAE,QAAQ,EAAE,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI;MAAQ,CAAE;IAC5F,KAAK,UAAU;IACf,KAAK,WAAW;IAChB,KAAK,YAAY;MACf,OAAO;QAAE,IAAI,EAAE,MAAM;QAAE,QAAQ,EAAE;MAAM,CAAE;IAC3C;MACE,OAAO;QAAE,IAAI,EAAE;MAAQ,CAAE;EAC7B;AACF,CAAC;AAED,MAAM,cAAc,GAAI,MAAyC,IAA8B;EAC7F,MAAM,GAAG,GAAG,MAAM,CAAC,aAAa,CAAC,IAAI;EACrC,QAAQ,GAAG;IACT,KAAK,KAAK;MACR,OAAO;QAAE,IAAI,EAAE;MAAK,CAAE;IACxB,KAAK,QAAQ;MACX,OAAO;QAAE,IAAI,EAAE;MAAQ,CAAE;IAC3B,KAAK,MAAM;MACT,OAAO;QAAE,IAAI,EAAE;MAAM,CAAE;IACzB,KAAK,QAAQ;MAAE;QACb,MAAM,IAAI,GAAG,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,aAAa,CAAC;QAC1D,OAAO;UAAE,IAAI,EAAE,QAAQ;UAAE,MAAM,EAAE,IAAI,IAAI;QAAE,CAAE;MAC/C;IACA,KAAK,MAAM;MACT,OAAO;QAAE,IAAI,EAAE,MAAM;QAAE,QAAQ,EAAE,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI;MAAQ,CAAE;IAC5F,KAAK,UAAU;IACf,KAAK,WAAW;IAChB,KAAK,YAAY;MACf,OAAO;QAAE,IAAI,EAAE,MAAM;QAAE,QAAQ,EAAE;MAAM,CAAE;IAC3C;MACE,OAAO;QAAE,IAAI,EAAE;MAAQ,CAAE;EAC7B;AACF,CAAC;AAED;AACA;AACA;AAEA;AACA,OAAO,MAAM,WAAW,GAAG,CACzB,GAAgB,EAChB,cAAc,GAAiC,EAAE,KAChB;EACjC,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC;EACxB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM;EAE1B,MAAM,KAAK,GAAsC,EAAE;EACnD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU;EAC9B;EACA,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,EAAE,GAAG,cAAc,CAAC,CAAC,OAAO,EAAE,EAAE;IAC1E,MAAM,OAAO,GAAG,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC;IAC/C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;MAC5B,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE;MAC5B;MACA;MACA,IAAI,MAAM,CAAC,MAAM,EAAE;MACnB,IAAI,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;MAC3D,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;MACrB,KAAK,CAAC,IAAI,CAAC;QACT,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,WAAW,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC;QACtD,IAAI,EAAE,UAAU,CAAC,MAAuC;OACzD,CAAC;IACJ;EACF;EAEA,MAAM,IAAI,GAA0C,EAAE;EACtD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,SAAS,EAAE;IAClC,MAAM,OAAO,GAAG,KAAK,CAAC,mBAAmB,CAAC,GAAG,CAAC;IAC9C,MAAM,QAAQ,GAAG,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC;IAC5C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;MAC5B,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE;MAChC,IAAI,CAAC,IAAI,CAAC;QACR,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,WAAW,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC;QACtD,QAAQ,EAAE,CAAC,QAAQ,CAAC,UAAU;QAC9B,QAAQ,EAAE,QAAQ,CAAC,UAAU;QAC7B,IAAI,EAAE,cAAc,CAAC,MAA2C;OACjE,CAAC;IACJ;EACF;EAEA,MAAM,WAAW,GAAyC,EAAE;EAC5D,MAAM,WAAW,GAAG,CAAC,GAAG,cAAc,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;EACpE,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,WAAW,EAAE;IACnC,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,QAAQ,EAAE;MACvC;MACA;MACA,IAAI,UAAU,CAAC,QAAQ,EAAE;MACzB,MAAM,UAAU,GAAG,WAAW,CAAC,UAAU,EAAE,WAAW,CAAC;MACvD,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC;MAC5B,IAAI,UAAU,CAAC,KAAK,IAAI,UAAU,CAAC,KAAK,KAAK,UAAU,CAAC,IAAI,EAAE;QAC5D,WAAW,CAAC,IAAI,CAAC;UAAE,GAAG,UAAU;UAAE,IAAI,EAAE,UAAU,CAAC;QAAK,CAAE,CAAC;MAC7D;IACF;EACF;EAEA,OAAO;IACL,IAAI,EAAE,GAAG,CAAC,IAAI;IACd,WAAW,EAAE,GAAG,CAAC,gBAAgB,IAAI,GAAG,CAAC,WAAW;IACpD,KAAK;IACL,SAAS,EAAE,IAAI;IACf;GACD;AACH,CAAC","ignoreList":[]}

package/dist/unstable/cli/internal/completions/fish.js

@@ -1,7 +1,9 @@
 // ---------------------------------------------------------------------------
 // Helpers
 // ---------------------------------------------------------------------------
-const escapeFishString = s => s.replace(/'/g, "\\'");
+const escapeFishString = s => s.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+/** Escape choices for Fish's second expansion of `complete -a`. */
+const escapeFishChoice = s => escapeFishString(s.replace(/[^A-Za-z0-9_.,/@%+-]/gu, "\\$&"));
 /**
  * Build a Fish condition that checks the current subcommand context.
  *
@@ -47,6 +49,14 @@ const flagContainsOptCondition = flag => {
   }
   return `not __fish_contains_opt ${optArgs.join(" ")}`;
 };
+/** Hide used value flags without suppressing their value completions. */
+const valueFlagDedupCondition = flag => {
+  const forms = [`--${flag.name}`];
+  for (const alias of flag.aliases) {
+    forms.push(alias.length === 1 ? `-${alias}` : `--${alias}`);
+  }
+  return `begin; ${flagContainsOptCondition(flag)}; or contains -- (commandline -poc)[-1] ${forms.join(" ")}; end`;
+};
 const flagCompletionArgs = flag => {
   const args = [`-l ${flag.name}`];
   for (const alias of flag.aliases) {
@@ -70,7 +80,7 @@ const flagValueArgs = type => {
     case "Boolean":
       return undefined;
     case "Choice":
-      return `-r -f -a '${type.values.join(" ")}'`;
+      return `-r -f -a '${type.values.map(escapeFishChoice).join(" ")}'`;
     case "Path":
       if (type.pathType === "directory") return `-r -F`;
       return `-r -F`;
@@ -82,7 +92,7 @@ const flagValueArgs = type => {
 const argValueArgs = type => {
   switch (type._tag) {
     case "Choice":
-      return `-r -f -a '${type.values.join(" ")}'`;
+      return `-r -f -a '${type.values.map(escapeFishChoice).join(" ")}'`;
     case "Path":
       return `-r -F`;
     default:
@@ -118,11 +128,9 @@ const generateCompletions = (executableName, descriptor, parentPath, lines) => {
   }
   // Flag completions
   for (const flag of descriptor.flags) {
-    // Only apply __fish_contains_opt dedup for boolean flags. For value-taking
-    // flags, the dedup condition would suppress the entry while fish is waiting
-    // for a value (e.g. typing `--env <TAB>` wouldn't show choices).
     const isBoolean = flag.type._tag === "Boolean";
-    const flagCondition = isBoolean ? condition ? `${condition}; and ${flagContainsOptCondition(flag)}` : flagContainsOptCondition(flag) : condition;
+    const dedup = isBoolean ? flagContainsOptCondition(flag) : valueFlagDedupCondition(flag);
+    const flagCondition = condition ? `${condition}; and ${dedup}` : dedup;
     const flagCondArg = flagCondition ? `-n '${flagCondition}'` : ``;
     const parts = [`complete -c ${executableName}`];
     if (flagCondArg) parts.push(flagCondArg);

package/dist/unstable/cli/internal/completions/fish.js.map

@@ -1 +1 @@
-{"version":3,"file":"fish.js","names":[],"sources":["../../../../../src/unstable/cli/internal/completions/fish.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"fish.js","names":[],"sources":["../../../../../src/unstable/cli/internal/completions/fish.ts"],"sourcesContent":[null],"mappings":"AAUA;AACA;AACA;AAEA,MAAM,gBAAgB,GAAI,CAAS,IAAa,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC;AAE7F;AACA,MAAM,gBAAgB,GAAI,CAAS,IAAa,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,wBAAwB,EAAE,MAAM,CAAC,CAAC;AAE7G;;;;;;;AAOA,MAAM,mBAAmB,GAAG,CAC1B,UAAiC,EACjC,oBAA2C,KACjC;EACV,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;IAC3B,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE;MACnC,OAAO,uBAAuB;IAChC;IACA,OAAO,EAAE;EACX;EACA,MAAM,eAAe,GAAG,UAAU,CAAC,GAAG,CAAE,MAAM,IAAK,+BAA+B,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;EAC1G,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE;IACnC;IACA,OAAO,GAAG,eAAe,yCAAyC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;EACpG;EACA,OAAO,eAAe;AACxB,CAAC;AAED;;;;;AAKA,MAAM,wBAAwB,GAAI,IAAgC,IAAY;EAC5E,MAAM,OAAO,GAAkB,EAAE;EACjC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,EAAE;IAChC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;MACtB,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,EAAE,CAAC;IAC7B;EACF;EACA;EACA,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;EACvB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,EAAE;IAChC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;MACpB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;IACrB;EACF;EACA,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;IAChC,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;EACjC;EACA,OAAO,2BAA2B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;AACvD,CAAC;AAED;AACA,MAAM,uBAAuB,GAAI,IAAgC,IAAY;EAC3E,MAAM,KAAK,GAAG,CAAC,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;EAChC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,EAAE;IAChC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,KAAK,EAAE,GAAG,KAAK,KAAK,EAAE,CAAC;EAC7D;EACA,OAAO,UAAU,wBAAwB,CAAC,IAAI,CAAC,2CAA2C,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO;AAClH,CAAC;AAED,MAAM,kBAAkB,GAAI,IAAgC,IAAmB;EAC7E,MAAM,IAAI,GAAkB,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;EAC/C,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,EAAE;IAChC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;MACtB,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,EAAE,CAAC;IAC1B,CAAC,MAAM;MACL,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,EAAE,CAAC;IAC1B;EACF;EACA,IAAI,IAAI,CAAC,WAAW,EAAE;IACpB,IAAI,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;EACzD;EACA,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;EAC1C,IAAI,SAAS,EAAE;IACb,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;EACtB;EACA,OAAO,IAAI;AACb,CAAC;AAED,MAAM,aAAa,GAAI,IAA0B,IAAwB;EACvE,QAAQ,IAAI,CAAC,IAAI;IACf,KAAK,SAAS;MACZ,OAAO,SAAS;IAClB,KAAK,QAAQ;MACX,OAAO,aAAa,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG;IACpE,KAAK,MAAM;MACT,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW,EAAE,OAAO,OAAO;MACjD,OAAO,OAAO;IAChB;MACE;MACA,OAAO,OAAO;EAClB;AACF,CAAC;AAED,MAAM,YAAY,GAAI,IAA8B,IAAwB;EAC1E,QAAQ,IAAI,CAAC,IAAI;IACf,KAAK,QAAQ;MACX,OAAO,aAAa,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG;IACpE,KAAK,MAAM;MACT,OAAO,OAAO;IAChB;MACE,OAAO,SAAS;EACpB;AACF,CAAC;AAED;AACA;AACA;AAEA,MAAM,mBAAmB,GAAG,CAC1B,cAAsB,EACtB,UAAyC,EACzC,UAAiC,EACjC,KAAoB,KACZ;EACR,MAAM,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,CAAE,CAAC,IAAK,CAAC,CAAC,IAAI,CAAC;EAC7D,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,EAAE,WAAW,CAAC;EAC9D,MAAM,YAAY,GAAG,SAAS,GAAG,OAAO,SAAS,GAAG,GAAG,EAAE;EAEzD;EACA;EACA;EACA,MAAM,WAAW,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,CAAE,CAAC,IAAK,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC;EAC5E,IAAI,CAAC,WAAW,EAAE;IAChB,MAAM,KAAK,GAAG,CAAC,eAAe,cAAc,EAAE,CAAC;IAC/C,IAAI,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC;IAC1C,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;IAChB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;EAC7B;EAEA;EACA,KAAK,MAAM,GAAG,IAAI,UAAU,CAAC,WAAW,EAAE;IACxC,MAAM,KAAK,GAAG,CAAC,eAAe,cAAc,EAAE,CAAC;IAC/C,IAAI,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC;IAC1C,KAAK,CAAC,IAAI,CAAC,UAAU,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC;IACnD,IAAI,GAAG,CAAC,WAAW,EAAE;MACnB,KAAK,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC;IACzD;IACA,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;EAC7B;EAEA;EACA,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,KAAK,EAAE;IACnC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS;IAC9C,MAAM,KAAK,GAAG,SAAS,GAAG,wBAAwB,CAAC,IAAI,CAAC,GAAG,uBAAuB,CAAC,IAAI,CAAC;IACxF,MAAM,aAAa,GAAG,SAAS,GAAG,GAAG,SAAS,SAAS,KAAK,EAAE,GAAG,KAAK;IACtE,MAAM,WAAW,GAAG,aAAa,GAAG,OAAO,aAAa,GAAG,GAAG,EAAE;IAEhE,MAAM,KAAK,GAAG,CAAC,eAAe,cAAc,EAAE,CAAC;IAC/C,IAAI,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC;IACxC,KAAK,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;IACvC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE3B;IACA,IAAI,SAAS,EAAE;MACb,MAAM,QAAQ,GAAG,CAAC,eAAe,cAAc,EAAE,CAAC;MAClD,IAAI,WAAW,EAAE,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC;MAC3C,QAAQ,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,EAAE,CAAC;MACnC,IAAI,IAAI,CAAC,WAAW,EAAE;QACpB,QAAQ,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,WAAW,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC;MACnE;MACA,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChC;EACF;EAEA;EACA;EACA;EACA;EACA;EACA,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;IAC/B,MAAM,OAAO,GAAG,+CAA+C;IAC/D,MAAM,QAAQ,GAAG,SAAS,GAAG,GAAG,SAAS,SAAS,OAAO,EAAE,GAAG,OAAO;IAErE,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,KAAK,EAAE;MACnC,MAAM,aAAa,GAAG,GAAG,QAAQ,SAAS,wBAAwB,CAAC,IAAI,CAAC,EAAE;MAC1E,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS;MAE9C,MAAM,KAAK,GAAG,CAAC,eAAe,cAAc,EAAE,CAAC;MAC/C,KAAK,CAAC,IAAI,CAAC,OAAO,aAAa,GAAG,CAAC;MACnC,KAAK,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,GAAG,CAAC;MACpC,IAAI,IAAI,CAAC,WAAW,EAAE;QACpB,KAAK,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;MAC1D;MACA,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;MAE3B,IAAI,SAAS,EAAE;QACb,MAAM,QAAQ,GAAG,CAAC,eAAe,cAAc,EAAE,CAAC;QAClD,QAAQ,CAAC,IAAI,CAAC,OAAO,aAAa,GAAG,CAAC;QACtC,QAAQ,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,GAAG,CAAC;QAC1C,IAAI,IAAI,CAAC,WAAW,EAAE;UACpB,QAAQ,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,WAAW,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC;QACnE;QACA,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;MAChC;IACF;EACF;EAEA;EACA,KAAK,MAAM,GAAG,IAAI,UAAU,CAAC,SAAS,EAAE;IACtC,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC;IACvC,IAAI,QAAQ,EAAE;MACZ,MAAM,KAAK,GAAG,CAAC,eAAe,cAAc,EAAE,CAAC;MAC/C,IAAI,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC;MAC1C,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;MACpB,IAAI,GAAG,CAAC,WAAW,EAAE;QACnB,KAAK,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC;MACzD;MACA,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7B;EACF;EAEA;EACA,KAAK,MAAM,GAAG,IAAI,UAAU,CAAC,WAAW,EAAE;IACxC,mBAAmB,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,GAAG,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC;EAC5E;AACF,CAAC;AAED;AACA,OAAO,MAAM,QAAQ,GAAG,CACtB,cAAsB,EACtB,UAAyC,KAC/B;EACV,MAAM,KAAK,GAAkB,EAAE;EAE/B,KAAK,CAAC,IAAI,CAAC,aAAa,cAAc,kBAAkB,CAAC;EACzD,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;EACf,KAAK,CAAC,IAAI,CAAC,qCAAqC,CAAC;EACjD,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;EACf,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC;EAC7B,KAAK,CAAC,IAAI,CAAC,OAAO,cAAc,oDAAoD,cAAc,OAAO,CAAC;EAC1G,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;EACf,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;EAEd,mBAAmB,CAAC,cAAc,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,CAAC;EAE1D,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;EACd,KAAK,CAAC,IAAI,CAAC,WAAW,cAAc,kBAAkB,CAAC;EAEvD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;AACzB,CAAC","ignoreList":[]}

package/dist/unstable/cli/internal/completions/zsh.js

@@ -2,6 +2,8 @@
 // Helpers
 // ---------------------------------------------------------------------------
 const escapeZsh = s => s.replace(/\\/g, "\\\\").replace(/'/g, "'\\''").replace(/:/g, "\\:");
+/** Escape choices for the second parse of a Zsh `_arguments` action. */
+const escapeZshChoice = s => s.replace(/[^A-Za-z0-9_.,/@%+-]/gu, "\\$&").replace(/'/g, "'\\''");
 const sanitize = s => s.replace(/[^a-zA-Z0-9_]/g, "_");
 /**
  * All forms of a flag (--name, -alias, --no-name) for the exclusion group.
@@ -21,12 +23,12 @@ const valueAction = type => {
     case "Boolean":
       return "";
     case "Choice":
-      return `:value:(${type.values.join(" ")})`;
+      return `:value:(${type.values.map(escapeZshChoice).join(" ")})`;
     case "Path":
       return type.pathType === "directory" ? `:directory:_directories` : `:file:_files`;
-    case "Integer":
+    case "Int":
       return `:integer:`;
-    case "Float":
+    case "Finite":
       return `:float:`;
     case "Date":
       return `:date:`;
@@ -37,7 +39,7 @@ const valueAction = type => {
 const argAction = type => {
   switch (type._tag) {
     case "Choice":
-      return `(${type.values.join(" ")})`;
+      return `(${type.values.map(escapeZshChoice).join(" ")})`;
     case "Path":
       return type.pathType === "directory" ? `_directories` : `_files`;
     default:

package/dist/unstable/cli/internal/completions/zsh.js.map

@@ -1 +1 @@
-{"version":3,"file":"zsh.js","names":[],"sources":["../../../../../src/unstable/cli/internal/completions/zsh.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"zsh.js","names":[],"sources":["../../../../../src/unstable/cli/internal/completions/zsh.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/unstable/cli/internal/config.js

@@ -15,12 +15,12 @@
  * ```ts
  * // User declares:
  * const config = {
- *   verbose: Flag.boolean("verbose").pipe(Flag.withDefault(false)),
+ *   verbose: Flag.Boolean("verbose").pipe(Flag.withDefault(false)),
  *   server: {
- *     host: Flag.string("host"),
- *     port: Flag.integer("port")
+ *     host: Flag.String("host"),
+ *     port: Flag.Int("port")
  *   },
- *   files: Argument.string("files").pipe(Argument.variadic)
+ *   files: Argument.String("files").pipe(Argument.variadic)
  * }
  *
  * // Becomes Config.Internal:

package/dist/unstable/cli/internal/parser.js

@@ -221,7 +221,7 @@ const missingFlagValue = spec => {
  * Checks whether a token is a boolean literal value.
  * Recognizes: true/false, yes/no, on/off, 1/0
  */
-const asBooleanLiteral = token => token?._tag === "Value" && (Primitive.isTrueValue(token.value) || Primitive.isFalseValue(token.value)) ? token.value : undefined;
+const asBooleanLiteral = token => token?._tag === "Value" && (Primitive.isTrueLiteral(token.value) || Primitive.isFalseLiteral(token.value)) ? token.value : undefined;
 /* ========================================================================== */
 /* Flag Value Consumption                                                     */
 /* ========================================================================== */