update

Author: AmirSa12

src/cac.ts

@@ -4,7 +4,7 @@ import * as fish from './fish';
 import * as powershell from './powershell';
 import type { CAC } from 'cac';
 import { Completion } from './index';
-import { CompletionConfig, noopHandler } from './shared';
+import { CompletionConfig, noopHandler, requireDashDashSeparator } from './shared';
 
 const execPath = process.execPath;
 const processArgs = process.argv.slice(1);
@@ -24,10 +24,6 @@ export default async function tab(
 ) {
   const completion = new Completion();
 
-  // a hidden flag to track if -- is there in the raw arguments? we might need a better way to do this?
-  const dashDashIndex = process.argv.indexOf('--');
-  const wasDashDashProvided = dashDashIndex !== -1;
-
   // Add all commands and their options
   for (const cmd of [instance.globalCommand, ...instance.commands]) {
     if (cmd.name === 'complete') continue; // Skip completion command
@@ -89,12 +85,10 @@ export default async function tab(
         break;
       }
       default: {
-        if (!wasDashDashProvided) {
-          console.error(
-            'Error: You need to use -- to separate completion arguments'
-          );
+        if (!requireDashDashSeparator(instance.name)) {
           return;
         }
+
         const args: string[] = extra['--'] || [];
         instance.showHelpOnExit = false;
 

src/citty.ts

@@ -11,7 +11,7 @@ import type {
   SubCommandsDef,
 } from 'citty';
 import { generateFigSpec } from './fig';
-import { CompletionConfig, noopHandler } from './shared';
+import { CompletionConfig, noopHandler, requireDashDashSeparator } from './shared';
 
 function quoteIfNeeded(path: string) {
   return path.includes(' ') ? `'${path}'` : path;
@@ -98,10 +98,6 @@ export default async function tab<TArgs extends ArgsDef>(
 ) {
   const completion = new Completion();
 
-  // a hidden flag to track if -- is there in the raw arguments? we might need a better way to do this?
-  const dashDashIndex = process.argv.indexOf('--');
-  const wasDashDashProvided = dashDashIndex !== -1;
-
   const meta = await resolve(instance.meta);
 
   if (!meta) {
@@ -191,11 +187,7 @@ export default async function tab<TArgs extends ArgsDef>(
           break;
         }
         default: {
-          // check if -- separator was provided
-          if (!wasDashDashProvided) {
-            console.error(
-              'Error: You need to use -- to separate completion arguments'
-            );
+          if (!requireDashDashSeparator(name)) {
             return;
           }
 

src/commander.ts

@@ -4,6 +4,7 @@ import * as fish from './fish';
 import * as powershell from './powershell';
 import type { Command as CommanderCommand } from 'commander';
 import { Completion } from './';
+import { requireDashDashSeparator } from './shared';
 
 const execPath = process.execPath;
 const processArgs = process.argv.slice(1);
@@ -21,10 +22,6 @@ export default function tab(instance: CommanderCommand): Completion {
   const completion = new Completion();
   const programName = instance.name();
 
-  // a hidden flag to track if -- is there in the raw arguments? we might need a better way to do this?
-  const dashDashIndex = process.argv.indexOf('--');
-  const wasDashDashProvided = dashDashIndex !== -1;
-
   // Process the root command
   processRootCommand(completion, instance, programName);
 
@@ -83,11 +80,7 @@ export default function tab(instance: CommanderCommand): Completion {
           break;
         }
         default: {
-          // check if -- separator is provided
-          if (!wasDashDashProvided) {
-            console.error(
-              'Error: You need to use -- to separate completion arguments'
-            );
+          if (!requireDashDashSeparator(programName)) {
             return;
           }
 

src/shared.ts

@@ -16,3 +16,14 @@ export interface CompletionConfig {
     }
   >;
 }
+
+export function requireDashDashSeparator(programName: string): boolean {
+  const dashDashIndex = process.argv.indexOf('--');
+  const wasDashDashProvided = dashDashIndex !== -1;
+
+  if (!wasDashDashProvided) {
+    console.error('Error: You need to use -- to separate completion arguments');
+  }
+
+  return wasDashDashProvided;
+}