@kaynooo/cli-doctor 0.11.0 → 0.12.0

package/dist/cli-bin.js

@@ -1479,6 +1479,28 @@ var BASH_FUNCTION = `__kaynooo_cli_complete() {
     done
     COMPREPLY+=($(compgen -W "$words" -- "$cur"))
 }`;
+var ZSH_FUNCTION = `__kaynooo_cli_complete() {
+    local line
+    local -a described plain
+    for line in \${(f)"$("\${words[1]}" __complete "\${(@)words[2,CURRENT]}" 2>/dev/null)"}; do
+        if [[ $line == __files__ ]]; then
+            _files
+        elif [[ $line == *$'\\t'* ]]; then
+            described+=("\${\${line%%$'\\t'*}//:/\\\\:}:\${line#*$'\\t'}")
+        else
+            plain+=("$line")
+        fi
+    done
+    (( \${#described} )) && _describe -V value described
+    (( \${#plain} )) && compadd -- "\${plain[@]}"
+    return 0
+}`;
+function zshScript(bins) {
+  return `# Generated by \`cli completions zsh\`
+${ZSH_FUNCTION}
+compdef __kaynooo_cli_complete ${bins.join(" ")}
+`;
+}
 function bashScript(bins) {
   return `# Generated by \`cli completions bash\`
 ${BASH_FUNCTION}
@@ -1577,15 +1599,49 @@ import process16 from "process";
 
 // ../kit/src/prompt.ts
 import process15 from "process";
-var KEY_SEQUENCES = /\x1B\[[0-9;]*[A-Z~]|\x1BO[A-Z]|[\s\S]/giu;
-var CONTROL = /^[\x00-\x1F\x7F]/;
-var WORDS = /\s+/;
-var MAX_ROWS = 10;
+
+// ../kit/src/picker/score.ts
+var BOUNDARY_AFTER = new Set([" ", "/", "-", "_", ".", ":", "\\", "(", "[", ",", "\t"]);
+var NONE = Number.NEGATIVE_INFINITY;
+
+// ../kit/src/picker/state.ts
+var IS_CONTROL = /[\x00-\x1F\x7F-\x9F]/;
 var PASTE_START = "\x1B[200~";
 var PASTE_END = "\x1B[201~";
-var KEYS = { "\x1B[A": "up", "\x1BOA": "up", "\x1B[B": "down", "\x1BOB": "down", "\x1B[5~": "pageup", "\x1B[6~": "pagedown", "\x1B[H": "home", "\x1B[1~": "home", "\x1BOH": "home", "\x1B[F": "end", "\x1B[4~": "end", "\x1BOF": "end", "\r": "enter", "\n": "enter", "\x03": "cancel", "\x1B": "cancel", "\x7F": "erase", "\b": "erase" };
-function readKeys(input, paste = { active: false }) {
+var KEY_SEQUENCES = /\x1B\[[0-9;]*[A-Z~]|\x1BO[A-Z]|\x1B[\s\S]|[\s\S]/gu;
+var KEYS = {
+  "\x1B[A": "up",
+  "\x1BOA": "up",
+  "\x10": "up",
+  "\x1B[B": "down",
+  "\x1BOB": "down",
+  "\x0E": "down",
+  "\x1B[5~": "pageup",
+  "\x1B[6~": "pagedown",
+  "\x1B[H": "home",
+  "\x1B[1~": "home",
+  "\x1BOH": "home",
+  "\x1B[F": "end",
+  "\x1B[4~": "end",
+  "\x1BOF": "end",
+  "\r": "enter",
+  "\n": "enter",
+  "\x03": "cancel",
+  "\x1B": "cancel",
+  "\x7F": "erase",
+  "\b": "erase",
+  "\x15": "clear",
+  "\x17": "word",
+  "\t": "tab",
+  "\x1F": "help",
+  "\x1BOP": "help",
+  "\x1B[11~": "help"
+};
+function parseKeys(input, paste = { active: false }, ctrls = []) {
+  const codes = new Map(ctrls.map((name) => [String.fromCharCode(name.codePointAt(name.length - 1) - 96), name]));
   return (input.match(KEY_SEQUENCES) ?? []).flatMap((sequence) => {
+    const named = codes.get(sequence);
+    const key = named === undefined ? KEYS[sequence] : { ctrl: named };
     if (sequence === PASTE_START || sequence === PASTE_END) {
       paste.active = sequence === PASTE_START;
       return [];
@@ -1593,9 +1649,19 @@ function readKeys(input, paste = { active: false }) {
     if (paste.active && (sequence === "\r" || sequence === `
 `))
       return [];
-    return KEYS[sequence] ?? (CONTROL.test(sequence) ? [] : [{ text: sequence }]);
+    if (key !== undefined)
+      return [key];
+    return IS_CONTROL.test(sequence) || sequence.startsWith("\x1B") ? [] : [{ text: sequence }];
   });
 }
+
+// ../kit/src/prompt.ts
+var WORDS = /\s+/;
+var MAX_ROWS = 10;
+var PROMPT_KEYS = new Set(["up", "down", "pageup", "pagedown", "home", "end", "enter", "cancel", "erase"]);
+function readKeys(input, paste = { active: false }) {
+  return parseKeys(input, paste).filter((key) => typeof key === "object" ? "text" in key : PROMPT_KEYS.has(key));
+}
 function flip(checked, value) {
   const next = new Set(checked);
   if (!next.delete(value))
@@ -2073,26 +2139,24 @@ async function list(args, host = hostHere()) {
     print2(listed);
   return 0;
 }
-var COMPLETIONS_USAGE = `cli completions <fish|bash> [--install] [--dir <folder>]: shell completions for every installed bin of the @kaynooo/cli-* packages
+var COMPLETIONS_USAGE = `cli completions <fish|bash|zsh> [--install] [--dir <folder>]: shell completions for every installed bin of the @kaynooo/cli-* packages
 
 Each bin completes itself through \`<bin> __complete\`; this writes the glue a shell needs per bin.
 fish: without --install the files print on stdout, with it they go to ~/.cache/fish/kaynooo-cli (or $XDG_CACHE_HOME), one <bin>.fish each, the stale ones this command wrote taken out. That folder has to be in fish_complete_path, first so a completion fish ships for the same name does not win: \`set -p fish_complete_path ~/.cache/fish/kaynooo-cli\`.
 bash: one script on stdout, sourced from ~/.bashrc with \`source <(cli completions bash)\`; --install and --dir are fish's.
-zsh: has no script of its own, it reads the bash one through bashcompinit: \`autoload -U +X compinit && compinit\`, \`autoload -U +X bashcompinit && bashcompinit\`, then the bash line above in ~/.zshrc (untested, zsh is not installed on the machine this was written on).`;
+zsh: one script on stdout like bash's, after compinit in ~/.zshrc: \`autoload -U +X compinit && compinit\`, then \`source <(cli completions zsh)\` (written without zsh at hand to run it, so untested).`;
 var COMPLETIONS_OPTIONS = {
   install: { type: "boolean", description: "write the files to the folder instead of printing them" },
   dir: { type: "string", short: "d", description: "the folder to write to, instead of ~/.cache/fish/kaynooo-cli" }
 };
 async function completions(args, host = hostHere()) {
-  const { values, positionals } = parse(args, COMPLETIONS_USAGE, COMPLETIONS_OPTIONS, { positionals: ["<shell>"], exits: [[0, "it printed or wrote them"], [2, "a usage error or a shell without a script"]], candidates: { "<shell>": () => ["fish", "bash"] }, examples: ["cli completions fish", ["cli completions fish --install", "write one file per bin"], ["source <(cli completions bash)", "in ~/.bashrc"]] });
-  if (positionals[0] === "zsh")
-    badUsage("zsh has no script of its own: it reads the bash one through bashcompinit, see cli completions --help");
-  if (positionals[0] !== "fish" && positionals[0] !== "bash")
-    badUsage("completions exist for fish and bash: cli completions fish");
-  if (positionals[0] === "bash") {
+  const { values, positionals } = parse(args, COMPLETIONS_USAGE, COMPLETIONS_OPTIONS, { positionals: ["<shell>"], exits: [[0, "it printed or wrote them"], [2, "a usage error or a shell without a script"]], candidates: { "<shell>": () => ["fish", "bash", "zsh"] }, examples: ["cli completions fish", ["cli completions fish --install", "write one file per bin"], ["source <(cli completions bash)", "in ~/.bashrc"], ["source <(cli completions zsh)", "in ~/.zshrc after compinit"]] });
+  if (positionals[0] !== "fish" && positionals[0] !== "bash" && positionals[0] !== "zsh")
+    badUsage("completions exist for fish, bash and zsh: cli completions fish");
+  if (positionals[0] === "bash" || positionals[0] === "zsh") {
     if (values.install === true || values.dir !== undefined)
-      badUsage("--install and --dir are for fish: source the bash script instead");
-    console.log(bashScript(installedBins(host)).trimEnd());
+      badUsage(`--install and --dir are for fish: source the ${positionals[0]} script instead`);
+    console.log((positionals[0] === "zsh" ? zshScript : bashScript)(installedBins(host)).trimEnd());
     return 0;
   }
   if (values.install !== true) {

package/dist/cli.js

@@ -1317,6 +1317,28 @@ var BASH_FUNCTION = `__kaynooo_cli_complete() {
     done
     COMPREPLY+=($(compgen -W "$words" -- "$cur"))
 }`;
+var ZSH_FUNCTION = `__kaynooo_cli_complete() {
+    local line
+    local -a described plain
+    for line in \${(f)"$("\${words[1]}" __complete "\${(@)words[2,CURRENT]}" 2>/dev/null)"}; do
+        if [[ $line == __files__ ]]; then
+            _files
+        elif [[ $line == *$'\\t'* ]]; then
+            described+=("\${\${line%%$'\\t'*}//:/\\\\:}:\${line#*$'\\t'}")
+        else
+            plain+=("$line")
+        fi
+    done
+    (( \${#described} )) && _describe -V value described
+    (( \${#plain} )) && compadd -- "\${plain[@]}"
+    return 0
+}`;
+function zshScript(bins) {
+  return `# Generated by \`cli completions zsh\`
+${ZSH_FUNCTION}
+compdef __kaynooo_cli_complete ${bins.join(" ")}
+`;
+}
 function bashScript(bins) {
   return `# Generated by \`cli completions bash\`
 ${BASH_FUNCTION}
@@ -1575,15 +1597,49 @@ import process16 from "process";
 
 // ../kit/src/prompt.ts
 import process15 from "process";
-var KEY_SEQUENCES = /\x1B\[[0-9;]*[A-Z~]|\x1BO[A-Z]|[\s\S]/giu;
-var CONTROL = /^[\x00-\x1F\x7F]/;
-var WORDS = /\s+/;
-var MAX_ROWS = 10;
+
+// ../kit/src/picker/score.ts
+var BOUNDARY_AFTER = new Set([" ", "/", "-", "_", ".", ":", "\\", "(", "[", ",", "\t"]);
+var NONE = Number.NEGATIVE_INFINITY;
+
+// ../kit/src/picker/state.ts
+var IS_CONTROL = /[\x00-\x1F\x7F-\x9F]/;
 var PASTE_START = "\x1B[200~";
 var PASTE_END = "\x1B[201~";
-var KEYS = { "\x1B[A": "up", "\x1BOA": "up", "\x1B[B": "down", "\x1BOB": "down", "\x1B[5~": "pageup", "\x1B[6~": "pagedown", "\x1B[H": "home", "\x1B[1~": "home", "\x1BOH": "home", "\x1B[F": "end", "\x1B[4~": "end", "\x1BOF": "end", "\r": "enter", "\n": "enter", "\x03": "cancel", "\x1B": "cancel", "\x7F": "erase", "\b": "erase" };
-function readKeys(input, paste = { active: false }) {
+var KEY_SEQUENCES = /\x1B\[[0-9;]*[A-Z~]|\x1BO[A-Z]|\x1B[\s\S]|[\s\S]/gu;
+var KEYS = {
+  "\x1B[A": "up",
+  "\x1BOA": "up",
+  "\x10": "up",
+  "\x1B[B": "down",
+  "\x1BOB": "down",
+  "\x0E": "down",
+  "\x1B[5~": "pageup",
+  "\x1B[6~": "pagedown",
+  "\x1B[H": "home",
+  "\x1B[1~": "home",
+  "\x1BOH": "home",
+  "\x1B[F": "end",
+  "\x1B[4~": "end",
+  "\x1BOF": "end",
+  "\r": "enter",
+  "\n": "enter",
+  "\x03": "cancel",
+  "\x1B": "cancel",
+  "\x7F": "erase",
+  "\b": "erase",
+  "\x15": "clear",
+  "\x17": "word",
+  "\t": "tab",
+  "\x1F": "help",
+  "\x1BOP": "help",
+  "\x1B[11~": "help"
+};
+function parseKeys(input, paste = { active: false }, ctrls = []) {
+  const codes = new Map(ctrls.map((name) => [String.fromCharCode(name.codePointAt(name.length - 1) - 96), name]));
   return (input.match(KEY_SEQUENCES) ?? []).flatMap((sequence) => {
+    const named = codes.get(sequence);
+    const key = named === undefined ? KEYS[sequence] : { ctrl: named };
     if (sequence === PASTE_START || sequence === PASTE_END) {
       paste.active = sequence === PASTE_START;
       return [];
@@ -1591,9 +1647,19 @@ function readKeys(input, paste = { active: false }) {
     if (paste.active && (sequence === "\r" || sequence === `
 `))
       return [];
-    return KEYS[sequence] ?? (CONTROL.test(sequence) ? [] : [{ text: sequence }]);
+    if (key !== undefined)
+      return [key];
+    return IS_CONTROL.test(sequence) || sequence.startsWith("\x1B") ? [] : [{ text: sequence }];
   });
 }
+
+// ../kit/src/prompt.ts
+var WORDS = /\s+/;
+var MAX_ROWS = 10;
+var PROMPT_KEYS = new Set(["up", "down", "pageup", "pagedown", "home", "end", "enter", "cancel", "erase"]);
+function readKeys(input, paste = { active: false }) {
+  return parseKeys(input, paste).filter((key) => typeof key === "object" ? "text" in key : PROMPT_KEYS.has(key));
+}
 function flip(checked, value) {
   const next = new Set(checked);
   if (!next.delete(value))

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kaynooo/cli-doctor",
   "type": "module",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "doctor: checks the @kaynooo/cli-* install of a host: each bin's version against the registry, tea's login to Forgejo, the Claude Code hooks and the Bun floor; cli list: every bin in one line, read from its own help.",
   "author": "Kaynooo <contact@kaynooo.fr>",
   "license": "MIT",
@@ -37,6 +37,6 @@
     "doctor": "$npm_execpath src/cli.ts"
   },
   "devDependencies": {
-    "@kaynooo/cli-kit": "0.24.0"
+    "@kaynooo/cli-kit": "0.25.0"
   }
 }