positionals nearly there

Author: Aslemammad

demo.citty.ts

@@ -68,6 +68,7 @@ for (const command of completion.commands.values()) {
 
   if (command.name === 'lint') {
     command.handler = () => {
+      console.log('lint handler')
       return [
         { value: 'main.ts', description: 'Main file' },
         { value: 'index.ts', description: 'Index file' },

src/citty.ts

@@ -163,7 +163,11 @@ export default async function tab<T extends ArgsDef = ArgsDef>(
           const args = (await resolve(instance.args))!;
           const parsed = parseArgs(extra, args);
           // TODO: this is not ideal at all
-          const matchedCommand = parsed._.join(' ');
+          const matchedCommand = parsed._.join(' ').trim();
+          // TODO: `command lint i` does not work because `lint` and `i` are potential commands
+          // instead the potential command should only be `lint`
+          // and `i` is the to be completed part
+          console.log('extra', parsed, ctx)
           return completion.parse(extra, matchedCommand);
         }
       }

src/index.ts

@@ -80,6 +80,7 @@ type Option = {
 type Command = {
   name: string;
   description: string;
+  args: boolean[]
   handler: Handler;
   options: Map<string, Option>;
   parent?: Command;
@@ -101,6 +102,7 @@ export class Completion {
     this.commands.set(key, {
       name: key,
       description,
+      args,
       handler,
       options: new Map(),
       parent: parent ? this.commands.get(parent)! : undefined,
@@ -137,11 +139,10 @@ export class Completion {
     let toComplete = args[args.length - 1] || '';
     const previousArgs = args.slice(0, -1);
 
-    if (previousArgs.length > 0) {
-      const lastPrevArg = previousArgs[previousArgs.length - 1];
-      if (lastPrevArg.startsWith('--') && !endsWithSpace) {
-        const { handler } = matchedCommand.options.get(lastPrevArg)!;
-        if (handler) {
+    const lastPrevArg = previousArgs[previousArgs.length - 1];
+    if (lastPrevArg?.startsWith('--') && !endsWithSpace) {
+      const { handler } = matchedCommand.options.get(lastPrevArg)!;
+      if (handler) {
           const flagSuggestions = await handler(
             previousArgs,
             toComplete,
@@ -153,11 +154,7 @@ export class Completion {
             )
           );
           directive = ShellCompDirective.ShellCompDirectiveNoFileComp;
-          // completions.forEach((comp) => );
-          // console.log(`:${directive}`);
-          // return;
         }
-      }
     } else if (toComplete.startsWith('--')) {
       directive = ShellCompDirective.ShellCompDirectiveNoFileComp;
       const equalsIndex = toComplete.indexOf('=');
@@ -215,13 +212,15 @@ export class Completion {
       }
     } else {
       const potentialCommandParts = potentialCommand.split(' ');
+      console.log(potentialCommandParts)
       for (const [k, v] of this.commands) {
         // if the command is root, skip it
         if (k === '') {
           continue;
         }
 
-        const parts = k.split(' ');
+        const parts = [...k.split(' '), ...v.args];
+        console.log(parts)
         for (let i = 0; i < parts.length; i++) {
           const part = parts[i];
           const potentialPart = potentialCommandParts[i] || '';
@@ -233,13 +232,35 @@ export class Completion {
             break;
           }
 
+          async function callHandler() {
+            console.log(matchedCommand)
+            console.log('callHandler', previousArgs, toComplete, endsWithSpace)
+            completions.push(...await matchedCommand.handler?.(
+              previousArgs,
+              toComplete,
+              endsWithSpace
+            ))
+          }
+
           // If we're at the current word being completed
           if (i === potentialCommandParts.length - 1) {
-            // Only add if it matches the current partial input
-            if (part.startsWith(potentialPart)) {
-              completions.push({ value: part, description: v.description });
+            if (endsWithSpace) {
+              const nextPart = parts[i + 1]
+              if (typeof nextPart === 'boolean') {
+                await callHandler()
+              }
+            } else {
+              // Only add if it matches the current partial input
+              console.log('part', part, potentialPart)
+              if (typeof part === 'boolean') {
+                await callHandler()
+              } else if (part.startsWith(potentialPart)) {
+                completions.push({ value: part, description: v.description });
+              }
             }
             break;
+          } else if (i === parts.length - 1 && part === true) { // variadic
+            await callHandler()
           }
 
           // For previous parts, they must match exactly

tests/__snapshots__/cli.test.ts.snap

@@ -7,9 +7,7 @@ exports[`cli completion tests for citty > cli option completion tests > should c
 `;
 
 exports[`cli completion tests for citty > cli option exclusion tests > should not suggest already specified option '{ specified: '--config', shouldNotContain: '--config' }' 1`] = `
-"--mode	Set env mode
---logLevel	info | warn | error | silent
-:4
+":4
 "
 `;
 
@@ -63,8 +61,7 @@ exports[`cli completion tests for citty > positional argument completions > shou
 `;
 
 exports[`cli completion tests for citty > should complete cli options 1`] = `
-"here
-dev	Start dev server
+"dev	Start dev server
 lint	Lint project
 :4
 "

tests/cli.test.ts

@@ -123,13 +123,13 @@ describe.each(cliTools)('cli completion tests for %s', (cliTool) => {
 
   describe('positional argument completions', () => {
     it('should complete single positional argument when ending with space (vite src/)', async () => {
-      const command = `${commandPrefix} vite src/ ""`;
+      const command = `${commandPrefix} lint src/ ""`;
       const output = await runCommand(command);
       expect(output).toMatchSnapshot();
     });
 
     it('should complete multiple positional arguments when ending with space (vite src/ ./)', async () => {
-      const command = `${commandPrefix} vite ""`;
+      const command = `${commandPrefix} lint ""`;
       const output = await runCommand(command);
       expect(output).toMatchSnapshot();
     });