@catladder/cli 0.0.0-new-cli-51a5f8b1 → 0.0.0-new-cli-19442092

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "0.0.0-new-cli-51a5f8b1",
+  "version": "0.0.0-new-cli-19442092",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",

package/src/cli.ts

@@ -188,30 +188,22 @@ const completionCmd = program
 completionCmd
   .command("zsh")
   .description("output zsh completion script")
-  .option(
-    "--command <cmd>",
-    "command used to invoke the CLI (e.g. 'yarn catladder')",
-  )
-  .action((opts: { command?: string }) => {
-    const binaryName =
-      opts.command ?? process.argv[1].split("/").pop() ?? "catladder";
-    console.log(generateZshCompletionScript(binaryName));
+  .action(() => {
+    console.log(generateZshCompletionScript());
   });
 
 completionCmd
   .command("install")
   .description("install shell completions into your .zshrc")
   .action(async () => {
-    const binaryName = process.argv[1].split("/").pop() ?? "catladder";
-    await installCompletions(binaryName);
+    await installCompletions();
   });
 
 completionCmd
   .command("uninstall")
   .description("remove shell completions from your .zshrc")
   .action(async () => {
-    const binaryName = process.argv[1].split("/").pop() ?? "catladder";
-    await uninstallCompletions(binaryName);
+    await uninstallCompletions();
   });
 
 // Cleanup on exit

package/src/completion.ts

@@ -142,106 +142,113 @@ async function resolveChoicesForCompletion(
 
 /**
  * Generate the zsh completion script.
- * Supports both direct invocation (`catladder`) and prefixed (`yarn catladder`).
+ * The script discovers the local catladder binary at completion time,
+ * so it works without a global install.
  */
-export function generateZshCompletionScript(command: string): string {
-  const parts = command.split(" ");
-  const funcName = command.replace(/[- ]/g, "_");
-
-  if (parts.length === 1) {
-    // Direct binary: catladder
-    return `
-###-begin-${funcName}-completions-###
-_${funcName}_completions() {
+export function generateZshCompletionScript(): string {
+  return `
+###-begin-catladder-completions-###
+# Find catladder binary by walking up from cwd
+_catladder_find_binary() {
+  local dir="$PWD"
+  while [[ "$dir" != "/" ]]; do
+    if [[ -x "$dir/node_modules/.bin/catladder" ]]; then
+      echo "$dir/node_modules/.bin/catladder"
+      return
+    fi
+    dir="\${dir:h}"
+  done
+  # Fall back to global
+  if command -v catladder &>/dev/null; then
+    echo "catladder"
+  fi
+}
+
+# Completion for direct invocation: catladder <TAB>
+_catladder_completions() {
+  local catladder_bin=$(_catladder_find_binary)
+  [[ -z "$catladder_bin" ]] && return
+
   local -a completions
   local current_word="\${words[$CURRENT]}"
-
-  # Words after the binary name, excluding the current word being completed
   local -a cmd_words=(\${words:1:$((CURRENT-2))})
 
-  # Call the CLI's __complete command
-  completions=(\${(f)"$(${command} __complete -- "\${cmd_words[*]}" "$current_word" 2>/dev/null)"})
+  completions=(\${(f)"$($catladder_bin __complete -- "\${cmd_words[*]}" "$current_word" 2>/dev/null)"})
 
   if [[ \${#completions[@]} -gt 0 ]]; then
     compadd -a completions
   fi
 }
 
-compdef _${funcName}_completions ${command}
-###-end-${funcName}-completions-###
-`.trim();
-  }
-
-  // Multi-word command (e.g., "yarn catladder")
-  // Register on the first word (e.g., "yarn") but only activate
-  // when the subcommand matches (e.g., "catladder")
-  const prefix = parts[0];
-  const subcommand = parts.slice(1).join(" ");
-  const skipWords = parts.length; // how many words to skip before CLI args
-
-  return `
-###-begin-${funcName}-completions-###
-_${funcName}_completions() {
-  # Only activate when subcommand is "${subcommand}"
-  if [[ $CURRENT -le ${skipWords} ]] || [[ "\${words[2,${skipWords}]}" != "${subcommand}" ]]; then
+# Completion for yarn invocation: yarn catladder <TAB>
+_yarn_catladder_completions() {
+  # Only activate when second word is "catladder"
+  if [[ $CURRENT -le 2 ]] || [[ "\${words[2]}" != "catladder" ]]; then
     return
   fi
 
+  local catladder_bin=$(_catladder_find_binary)
+  [[ -z "$catladder_bin" ]] && return
+
   local -a completions
   local current_word="\${words[$CURRENT]}"
+  local -a cmd_words=(\${words:2:$((CURRENT-3))})
 
-  # Words after "${command}", excluding the current word being completed
-  local -a cmd_words=(\${words:${skipWords}:$((CURRENT-${skipWords}-1))})
-
-  completions=(\${(f)"$(${command} __complete -- "\${cmd_words[*]}" "$current_word" 2>/dev/null)"})
+  completions=(\${(f)"$($catladder_bin __complete -- "\${cmd_words[*]}" "$current_word" 2>/dev/null)"})
 
   if [[ \${#completions[@]} -gt 0 ]]; then
     compadd -a completions
   fi
 }
 
-compdef _${funcName}_completions ${prefix}
-###-end-${funcName}-completions-###
+compdef _catladder_completions catladder
+compdef _yarn_catladder_completions yarn
+###-end-catladder-completions-###
 `.trim();
 }
 
-const BEGIN_MARKER = (name: string) =>
-  `###-begin-${name.replace(/-/g, "_")}-completions-###`;
+const BEGIN_MARKER = "###-begin-catladder-completions-###";
+const END_MARKER = "###-end-catladder-completions-###";
 
 function getZshrcPath(): string {
   return join(homedir(), ".zshrc");
 }
 
 /**
- * Install completions by adding an eval line to .zshrc.
+ * Install completions by writing the script directly into .zshrc.
  */
-export async function installCompletions(binaryName: string): Promise<void> {
+export async function installCompletions(): Promise<void> {
   const zshrcPath = getZshrcPath();
-  const evalLine = `eval "$(${binaryName} completion zsh)"`;
-  const marker = BEGIN_MARKER(binaryName);
 
   let content = "";
   if (existsSync(zshrcPath)) {
     content = readFileSync(zshrcPath, "utf-8");
   }
 
-  if (content.includes(marker)) {
-    console.log(
-      `Completions for ${binaryName} are already installed in ${zshrcPath}`,
+  if (content.includes(BEGIN_MARKER)) {
+    // Replace existing
+    const startIdx = content.indexOf(BEGIN_MARKER);
+    const endIdx = content.indexOf(END_MARKER) + END_MARKER.length;
+    content =
+      content.slice(0, startIdx) +
+      generateZshCompletionScript() +
+      content.slice(endIdx);
+    writeFileSync(zshrcPath, content);
+    console.log(`Updated catladder completions in ${zshrcPath}`);
+  } else {
+    writeFileSync(
+      zshrcPath,
+      content + "\n" + generateZshCompletionScript() + "\n",
     );
-    return;
+    console.log(`Installed catladder completions in ${zshrcPath}`);
   }
-
-  const addition = `\n# ${binaryName} shell completions\n${evalLine}\n`;
-  writeFileSync(zshrcPath, content + addition);
-  console.log(`Installed completions for ${binaryName} in ${zshrcPath}`);
   console.log(`Restart your shell or run: source ${zshrcPath}`);
 }
 
 /**
  * Remove completions from .zshrc.
  */
-export async function uninstallCompletions(binaryName: string): Promise<void> {
+export async function uninstallCompletions(): Promise<void> {
   const zshrcPath = getZshrcPath();
   if (!existsSync(zshrcPath)) {
     console.log("No .zshrc found");
@@ -249,31 +256,20 @@ export async function uninstallCompletions(binaryName: string): Promise<void> {
   }
 
   const content = readFileSync(zshrcPath, "utf-8");
-  const evalLine = `eval "$(${binaryName} completion zsh)"`;
-  const commentLine = `# ${binaryName} shell completions`;
 
-  if (!content.includes(evalLine)) {
-    console.log(`No completions for ${binaryName} found in ${zshrcPath}`);
+  if (!content.includes(BEGIN_MARKER)) {
+    console.log("No catladder completions found in " + zshrcPath);
     return;
   }
 
-  const cleaned = content
-    .replace(
-      new RegExp(
-        `\\n?${commentLine.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\n?`,
-        "g",
-      ),
-      "\n",
-    )
-    .replace(
-      new RegExp(
-        `\\n?${evalLine.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\n?`,
-        "g",
-      ),
-      "\n",
-    );
+  const startIdx = content.indexOf(BEGIN_MARKER);
+  const endIdx = content.indexOf(END_MARKER) + END_MARKER.length;
+  const cleaned = (content.slice(0, startIdx) + content.slice(endIdx)).replace(
+    /\n{3,}/g,
+    "\n\n",
+  );
 
   writeFileSync(zshrcPath, cleaned);
-  console.log(`Removed completions for ${binaryName} from ${zshrcPath}`);
+  console.log(`Removed catladder completions from ${zshrcPath}`);
   console.log(`Restart your shell or run: source ${zshrcPath}`);
 }