fix

Author: AmirSa12

src/citty.ts

@@ -130,7 +130,6 @@ export default async function tab<T extends ArgsDef = ArgsDef>(instance: Command
           break;
         }
         default: {
-          console.log(completion)
           const args = (await resolve(instance.args))!;
           const parsed = parseArgs(extra, args);
           // TODO: this is not ideal at all

src/index.ts

@@ -14,52 +14,52 @@ export const ShellCompNoDescRequestCmd: string = "__completeNoDesc";
 // ShellCompDirective is a bit map representing the different behaviors the shell
 // can be instructed to have once completions have been provided.
 export const ShellCompDirective = {
-  // ShellCompDirectiveError indicates an error occurred and completions should be ignored.
-  ShellCompDirectiveError: 1 << 0,
-
-  // ShellCompDirectiveNoSpace indicates that the shell should not add a space
-  // after the completion even if there is a single completion provided.
-  ShellCompDirectiveNoSpace: 1 << 1,
-
-  // ShellCompDirectiveNoFileComp indicates that the shell should not provide
-  // file completion even when no completion is provided.
-  ShellCompDirectiveNoFileComp: 1 << 2,
-
-  // ShellCompDirectiveFilterFileExt indicates that the provided completions
-  // should be used as file extension filters.
-  // For flags, using Command.MarkFlagFilename() and Command.MarkPersistentFlagFilename()
-  // is a shortcut to using this directive explicitly.  The BashCompFilenameExt
-  // annotation can also be used to obtain the same behavior for flags.
-  ShellCompDirectiveFilterFileExt: 1 << 3,
-
-  // ShellCompDirectiveFilterDirs indicates that only directory names should
-  // be provided in file completion.  To request directory names within another
-  // directory, the returned completions should specify the directory within
-  // which to search.  The BashCompSubdirsInDir annotation can be used to
-  // obtain the same behavior but only for flags.
-  ShellCompDirectiveFilterDirs: 1 << 4,
-
-  // ShellCompDirectiveKeepOrder indicates that the shell should preserve the order
-  // in which the completions are provided.
-  ShellCompDirectiveKeepOrder: 1 << 5,
-
-  // ===========================================================================
-
-  // All directives using iota (or equivalent in Go) should be above this one.
-  // For internal use.
-  shellCompDirectiveMaxValue: 1 << 6,
-
-  // ShellCompDirectiveDefault indicates to let the shell perform its default
-  // behavior after completions have been provided.
-  // This one must be last to avoid messing up the iota count.
-  ShellCompDirectiveDefault: 0,
+    // ShellCompDirectiveError indicates an error occurred and completions should be ignored.
+    ShellCompDirectiveError: 1 << 0,
+
+    // ShellCompDirectiveNoSpace indicates that the shell should not add a space
+    // after the completion even if there is a single completion provided.
+    ShellCompDirectiveNoSpace: 1 << 1,
+
+    // ShellCompDirectiveNoFileComp indicates that the shell should not provide
+    // file completion even when no completion is provided.
+    ShellCompDirectiveNoFileComp: 1 << 2,
+
+    // ShellCompDirectiveFilterFileExt indicates that the provided completions
+    // should be used as file extension filters.
+    // For flags, using Command.MarkFlagFilename() and Command.MarkPersistentFlagFilename()
+    // is a shortcut to using this directive explicitly.  The BashCompFilenameExt
+    // annotation can also be used to obtain the same behavior for flags.
+    ShellCompDirectiveFilterFileExt: 1 << 3,
+
+    // ShellCompDirectiveFilterDirs indicates that only directory names should
+    // be provided in file completion.  To request directory names within another
+    // directory, the returned completions should specify the directory within
+    // which to search.  The BashCompSubdirsInDir annotation can be used to
+    // obtain the same behavior but only for flags.
+    ShellCompDirectiveFilterDirs: 1 << 4,
+
+    // ShellCompDirectiveKeepOrder indicates that the shell should preserve the order
+    // in which the completions are provided.
+    ShellCompDirectiveKeepOrder: 1 << 5,
+
+    // ===========================================================================
+
+    // All directives using iota (or equivalent in Go) should be above this one.
+    // For internal use.
+    shellCompDirectiveMaxValue: 1 << 6,
+
+    // ShellCompDirectiveDefault indicates to let the shell perform its default
+    // behavior after completions have been provided.
+    // This one must be last to avoid messing up the iota count.
+    ShellCompDirectiveDefault: 0,
 };
 
 
 export type Positional = {
-  required: boolean;
-  variadic: boolean;
-  completion: Handler;
+    required: boolean;
+    variadic: boolean;
+    completion: Handler;
 };
 
 type Items = {
@@ -87,7 +87,7 @@ export class Completion {
     addCommand(name: string, description: string, handler: Handler, parent?: string) {
         const key = parent ? `${parent} ${name}` : name
         this.commands.set(key, { description, handler, options: new Map(), parent: parent ? this.commands.get(parent)! : this.commands.get('')! });
-        return key 
+        return key
     }
 
     addOption(command: string, option: string, description: string, handler: Handler) {
@@ -100,7 +100,6 @@ export class Completion {
     }
 
     async parse(args: string[], potentialCommand: string) {
-        console.log(potentialCommand)
         const matchedCommand = this.commands.get(potentialCommand) ?? this.commands.get('')!;
         let directive = ShellCompDirective.ShellCompDirectiveDefault;
         const completions: string[] = [];
@@ -113,12 +112,10 @@ export class Completion {
         let toComplete = args[args.length - 1] || "";
         const previousArgs = args.slice(0, -1);
 
-        console.log('here', previousArgs)
         if (previousArgs.length > 0) {
             const lastPrevArg = previousArgs[previousArgs.length - 1];
             if (lastPrevArg.startsWith("--") && endsWithSpace) {
-                console.log('here')
-                const {handler} = matchedCommand.options.get(lastPrevArg)!;
+                const { handler } = matchedCommand.options.get(lastPrevArg)!;
                 if (handler) {
                     const flagSuggestions = await handler(previousArgs, toComplete, endsWithSpace);
                     completions.push(
@@ -137,12 +134,12 @@ export class Completion {
         if (toComplete.startsWith("--")) {
             directive = ShellCompDirective.ShellCompDirectiveNoFileComp;
             const equalsIndex = toComplete.indexOf("=");
-            
+
             if (equalsIndex !== -1) {
                 const flagName = toComplete.slice(2, equalsIndex);
                 const valueToComplete = toComplete.slice(equalsIndex + 1);
-                const {handler} = matchedCommand.options.get(`--${flagName}`)!;
-                
+                const { handler } = matchedCommand.options.get(`--${flagName}`)!;
+
                 if (handler) {
                     const suggestions = await handler(previousArgs, valueToComplete, endsWithSpace);
                     completions.push(...suggestions.map(
@@ -151,7 +148,7 @@ export class Completion {
                 }
             } else if (!endsWithSpace) {
                 const options = new Map(matchedCommand.options);
-                
+
                 let currentCommand = matchedCommand;
                 while (currentCommand.parent) {
                     for (const [key, value] of currentCommand.parent.options) {
@@ -175,13 +172,10 @@ export class Completion {
                     )
                 );
             } else {
-                console.log('here3')
-                const {handler} = matchedCommand.options.get(toComplete)!;
-                console.log(handler, toComplete)
-                
+                const { handler } = matchedCommand.options.get(toComplete)!;
+
                 if (handler) {
                     const suggestions = await handler(previousArgs, toComplete, endsWithSpace);
-                    console.log(suggestions)
                     completions.push(...suggestions.map(
                         (comp) => `${comp.value}\t${comp.description ?? ""}`
                     ));
@@ -216,28 +210,28 @@ export class Completion {
 
 export function script(shell: "zsh" | "bash" | "fish" | "powershell", name: string, x: string) {
     switch (shell) {
-      case "zsh": {
-        const script = zsh.generate(name, x);
-        console.log(script);
-        break;
-      }
-      case "bash": {
-        const script = bash.generate(name, x);
-        console.log(script);
-        break;
-      }
-      case "fish": {
-        const script = fish.generate(name, x);
-        console.log(script);
-        break;
-      }
-      case "powershell": {
-        const script = powershell.generate(name, x);
-        console.log(script);
-        break;
-      }
-      default: {
-        throw new Error(`Unsupported shell: ${shell}`);
-      }
+        case "zsh": {
+            const script = zsh.generate(name, x);
+            console.log(script);
+            break;
+        }
+        case "bash": {
+            const script = bash.generate(name, x);
+            console.log(script);
+            break;
+        }
+        case "fish": {
+            const script = fish.generate(name, x);
+            console.log(script);
+            break;
+        }
+        case "powershell": {
+            const script = powershell.generate(name, x);
+            console.log(script);
+            break;
+        }
+        default: {
+            throw new Error(`Unsupported shell: ${shell}`);
+        }
     }
 }

tests/cli.test.ts

@@ -1,3 +1,4 @@
+// TODO: convert to inlineSnapShot
 import { exec } from "child_process";
 import { describe, it, expect, test } from "vitest";