boolean flags

Author: AmirSa12

examples/demo.t.ts

@@ -62,7 +62,7 @@ devCmd.option(
   'p'
 );
 
-devCmd.option('verbose', 'Enable verbose logging', 'v', true);
+devCmd.option('verbose', 'Enable verbose logging', 'v');
 
 // Serve command
 const serveCmd = t.command('serve', 'Start the server');

src/cac.ts

@@ -4,12 +4,10 @@ import * as fish from './fish';
 import * as powershell from './powershell';
 import type { CAC } from 'cac';
 import { assertDoubleDashes } from './shared';
-import { OptionHandler } from './t';
+import { OptionHandler, noopHandler } from './t';
 import { CompletionConfig } from './shared';
 import t from './t';
 
-const noopOptionHandler: OptionHandler = function () {};
-
 const execPath = process.execPath;
 const processArgs = process.argv.slice(1);
 const quotedExecPath = quoteIfNeeded(execPath);
@@ -84,13 +82,28 @@ export default async function tab(
       // Add option using t.ts API
       const targetCommand = isRootCommand ? t : command;
       if (targetCommand) {
-        targetCommand.option(
-          argName, // Store just the option name without -- prefix
-          option.description || '',
-          commandCompletionConfig?.options?.[argName] ?? noopOptionHandler,
-          shortFlag,
-          isBoolean
-        );
+        // Auto-detection handles boolean vs value options based on handler presence
+        const customHandler = commandCompletionConfig?.options?.[argName];
+        const handler = isBoolean ? noopHandler : customHandler;
+
+        if (shortFlag) {
+          if (handler) {
+            targetCommand.option(
+              argName,
+              option.description || '',
+              handler,
+              shortFlag
+            );
+          } else {
+            targetCommand.option(argName, option.description || '', shortFlag);
+          }
+        } else {
+          if (handler) {
+            targetCommand.option(argName, option.description || '', handler);
+          } else {
+            targetCommand.option(argName, option.description || '');
+          }
+        }
       }
     }
   }

src/citty.ts

@@ -11,7 +11,7 @@ import type {
 } from 'citty';
 import { generateFigSpec } from './fig';
 import { CompletionConfig, assertDoubleDashes } from './shared';
-import { OptionHandler, Command, Option, OptionsMap } from './t';
+import { OptionHandler, Command, Option, OptionsMap, noopHandler } from './t';
 import t from './t';
 
 function quoteIfNeeded(path: string) {
@@ -85,8 +85,6 @@ function convertOptionHandler(handler: any): OptionHandler {
   };
 }
 
-const noopOptionHandler: OptionHandler = function () {};
-
 async function handleSubCommands(
   subCommands: SubCommandsDef,
   parentCmd?: string,
@@ -146,15 +144,25 @@ async function handleSubCommands(
               : conf.alias
             : undefined;
 
-        // Add option using t.ts API - store without -- prefix
+        // Detect boolean options and use appropriate handler
         const isBoolean = conf.type === 'boolean';
-        command.option(
-          argName,
-          conf.description ?? '',
-          subCompletionConfig?.options?.[argName] ?? noopOptionHandler,
-          shortFlag,
-          isBoolean
-        );
+        const customHandler = subCompletionConfig?.options?.[argName];
+        const handler = isBoolean ? noopHandler : customHandler;
+
+        // Add option using t.ts API - auto-detection handles boolean vs value options
+        if (shortFlag) {
+          if (handler) {
+            command.option(argName, conf.description ?? '', handler, shortFlag);
+          } else {
+            command.option(argName, conf.description ?? '', shortFlag);
+          }
+        } else {
+          if (handler) {
+            command.option(argName, conf.description ?? '', handler);
+          } else {
+            command.option(argName, conf.description ?? '');
+          }
+        }
       }
     }
   }
@@ -206,15 +214,18 @@ export default async function tab<TArgs extends ArgsDef>(
   if (instance.args) {
     for (const [argName, argConfig] of Object.entries(instance.args)) {
       const conf = argConfig as ArgDef;
-      // Add option using t.ts API - store without -- prefix
+
+      // Detect boolean options and use appropriate handler
       const isBoolean = conf.type === 'boolean';
-      t.option(
-        argName,
-        conf.description ?? '',
-        completionConfig?.options?.[argName] ?? noopOptionHandler,
-        undefined,
-        isBoolean
-      );
+      const customHandler = completionConfig?.options?.[argName];
+      const handler = isBoolean ? noopHandler : customHandler;
+
+      // Add option using t.ts API - auto-detection handles boolean vs value options
+      if (handler) {
+        t.option(argName, conf.description ?? '', handler);
+      } else {
+        t.option(argName, conf.description ?? '');
+      }
     }
   }
 

src/t.ts

@@ -20,8 +20,8 @@ export type OptionHandler = (
   options: OptionsMap
 ) => void;
 
-// Default no-op handler for options (internal)
-const noopHandler: OptionHandler = function () { };
+// Default no-op handler for options (exported for integrations)
+export const noopHandler: OptionHandler = function () { };
 
 // Completion result types
 export type Completion = {
@@ -94,61 +94,42 @@ export class Command {
   // Function overloads for better UX
   option(value: string, description: string): Command;
   option(value: string, description: string, alias: string): Command;
-  option(
-    value: string,
-    description: string,
-    alias: string,
-    isBoolean: boolean
-  ): Command;
   option(value: string, description: string, handler: OptionHandler): Command;
   option(
     value: string,
     description: string,
     handler: OptionHandler,
     alias: string
   ): Command;
-  option(
-    value: string,
-    description: string,
-    handler: OptionHandler,
-    alias: string,
-    isBoolean: boolean
-  ): Command;
   option(
     value: string,
     description: string,
     handlerOrAlias?: OptionHandler | string,
-    aliasOrIsBoolean?: string | boolean,
-    isBoolean?: boolean
+    alias?: string
   ): Command {
     let handler: OptionHandler = noopHandler;
-    let alias: string | undefined;
-    let isBooleanFlag: boolean | undefined;
+    let aliasValue: string | undefined;
 
     // Parse arguments based on types
     if (typeof handlerOrAlias === 'function') {
-      // handler provided
+      // handler provided, value option
       handler = handlerOrAlias;
-      alias = aliasOrIsBoolean as string;
-      isBooleanFlag = isBoolean;
+      aliasValue = alias;
     } else if (typeof handlerOrAlias === 'string') {
-      // alias provided (no handler)
-      alias = handlerOrAlias;
-      isBooleanFlag = aliasOrIsBoolean as boolean;
-    } else if (handlerOrAlias === undefined) {
-      // neither handler nor alias provided
-      if (typeof aliasOrIsBoolean === 'boolean') {
-        isBooleanFlag = aliasOrIsBoolean;
-      }
+      // alias provided, no handler, boolean flag
+      aliasValue = handlerOrAlias;
     }
 
+    // if no custom handler provided, it's a boolean flag
+    const isBoolean = handler === noopHandler;
+
     const option = new Option(
       this,
       value,
       description,
       handler,
-      alias,
-      isBooleanFlag
+      aliasValue,
+      isBoolean
     );
     this.options.set(value, option);
     return this;