fix: boolean opts (#27)

* boolean opts

* noop func

* signitures

* boolean flags

* prettier

* update

Author: AmirSa12

examples/demo.cac.ts

@@ -13,6 +13,8 @@ cli
   .command('dev', 'Start dev server')
   .option('-H, --host [host]', `Specify hostname`)
   .option('-p, --port <port>', `Specify port`)
+  .option('-v, --verbose', `Enable verbose logging`)
+  .option('--quiet', `Suppress output`)
   .action((options) => {});
 
 cli
@@ -23,6 +25,8 @@ cli
 
 cli.command('dev build', 'Build project').action((options) => {});
 
+cli.command('dev start', 'Start development server').action((options) => {});
+
 cli
   .command('copy <source> <destination>', 'Copy files')
   .action((source, destination, options) => {});

examples/demo.citty.ts

@@ -53,6 +53,15 @@ const devCommand = defineCommand({
       description: 'Specify port',
       alias: 'p',
     },
+    verbose: {
+      type: 'boolean',
+      description: 'Enable verbose logging',
+      alias: 'v',
+    },
+    quiet: {
+      type: 'boolean',
+      description: 'Suppress output',
+    },
   },
   run: () => {},
 });
@@ -65,6 +74,14 @@ const buildCommand = defineCommand({
   run: () => {},
 });
 
+const startCommand = defineCommand({
+  meta: {
+    name: 'start',
+    description: 'Start development server',
+  },
+  run: () => {},
+});
+
 const copyCommand = defineCommand({
   meta: {
     name: 'copy',
@@ -100,9 +117,13 @@ const lintCommand = defineCommand({
   run: () => {},
 });
 
+devCommand.subCommands = {
+  build: buildCommand,
+  start: startCommand,
+};
+
 main.subCommands = {
   dev: devCommand,
-  build: buildCommand,
   copy: copyCommand,
   lint: lintCommand,
 } as Record<string, CommandDef<ArgsDef>>;

examples/demo.t.ts

@@ -62,6 +62,11 @@ devCmd.option(
   'p'
 );
 
+devCmd.option('verbose', 'Enable verbose logging', 'v');
+
+// Add a simple quiet option to test basic option API (no handler, no alias)
+devCmd.option('quiet', 'Suppress output');
+
 // Serve command
 const serveCmd = t.command('serve', 'Start the server');
 serveCmd.option(
@@ -87,6 +92,9 @@ serveCmd.option(
 // Build command
 t.command('dev build', 'Build project');
 
+// Start command
+t.command('dev start', 'Start development server');
+
 // Copy command with multiple arguments
 const copyCmd = t
   .command('copy', 'Copy files')

src/cac.ts

@@ -4,12 +4,9 @@ import * as fish from './fish';
 import * as powershell from './powershell';
 import type { CAC } from 'cac';
 import { assertDoubleDashes } from './shared';
-import { OptionHandler } 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);
@@ -73,19 +70,34 @@ export default async function tab(
 
     // Add command options
     for (const option of [...instance.globalCommand.options, ...cmd.options]) {
-      // Extract short flag from the name if it exists (e.g., "-c, --config" -> "c")
-      const shortFlag = option.name.match(/^-([a-zA-Z]), --/)?.[1];
-      const argName = option.name.replace(/^-[a-zA-Z], --/, '');
+      // Extract short flag from the rawName if it exists (e.g., "-c, --config" -> "c")
+      const shortFlag = option.rawName.match(/^-([a-zA-Z]), --/)?.[1];
+      const argName = option.name; // option.name is already clean (e.g., "config")
 
       // 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
-        );
+        const handler = commandCompletionConfig?.options?.[argName];
+        if (handler) {
+          // Has custom handler → value option
+          if (shortFlag) {
+            targetCommand.option(
+              argName,
+              option.description || '',
+              handler,
+              shortFlag
+            );
+          } else {
+            targetCommand.option(argName, option.description || '', handler);
+          }
+        } else {
+          // No custom handler → boolean flag
+          if (shortFlag) {
+            targetCommand.option(argName, option.description || '', shortFlag);
+          } else {
+            targetCommand.option(argName, option.description || '');
+          }
+        }
       }
     }
   }

src/citty.ts

@@ -85,8 +85,6 @@ function convertOptionHandler(handler: any): OptionHandler {
   };
 }
 
-const noopOptionHandler: OptionHandler = function () {};
-
 async function handleSubCommands(
   subCommands: SubCommandsDef,
   parentCmd?: string,
@@ -105,7 +103,7 @@ async function handleSubCommands(
 
     // Add command using t.ts API
     const commandName = parentCmd ? `${parentCmd} ${cmd}` : cmd;
-    const command = t.command(cmd, meta.description);
+    const command = t.command(commandName, meta.description);
 
     // Set args for the command if it has positional arguments
     if (isPositional && config.args) {
@@ -138,9 +136,6 @@ async function handleSubCommands(
     if (config.args) {
       for (const [argName, argConfig] of Object.entries(config.args)) {
         const conf = argConfig as ArgDef;
-        if (conf.type === 'positional') {
-          continue;
-        }
         // Extract alias from the config if it exists
         const shortFlag =
           typeof conf === 'object' && 'alias' in conf
@@ -150,12 +145,22 @@ async function handleSubCommands(
             : undefined;
 
         // Add option using t.ts API - store without -- prefix
-        command.option(
-          argName,
-          conf.description ?? '',
-          subCompletionConfig?.options?.[argName] ?? noopOptionHandler,
-          shortFlag
-        );
+        const handler = subCompletionConfig?.options?.[argName];
+        if (handler) {
+          // Has custom handler → value option
+          if (shortFlag) {
+            command.option(argName, conf.description ?? '', handler, shortFlag);
+          } else {
+            command.option(argName, conf.description ?? '', handler);
+          }
+        } else {
+          // No custom handler → boolean flag
+          if (shortFlag) {
+            command.option(argName, conf.description ?? '', shortFlag);
+          } else {
+            command.option(argName, conf.description ?? '');
+          }
+        }
       }
     }
   }
@@ -206,13 +211,33 @@ export default async function tab<TArgs extends ArgsDef>(
 
   if (instance.args) {
     for (const [argName, argConfig] of Object.entries(instance.args)) {
-      const conf = argConfig as PositionalArgDef;
+      const conf = argConfig as ArgDef;
+
+      // Extract alias (same logic as subcommands)
+      const shortFlag =
+        typeof conf === 'object' && 'alias' in conf
+          ? Array.isArray(conf.alias)
+            ? conf.alias[0]
+            : conf.alias
+          : undefined;
+
       // Add option using t.ts API - store without -- prefix
-      t.option(
-        argName,
-        conf.description ?? '',
-        completionConfig?.options?.[argName] ?? noopOptionHandler
-      );
+      const handler = completionConfig?.options?.[argName];
+      if (handler) {
+        // Has custom handler → value option
+        if (shortFlag) {
+          t.option(argName, conf.description ?? '', handler, shortFlag);
+        } else {
+          t.option(argName, conf.description ?? '', handler);
+        }
+      } else {
+        // No custom handler → boolean flag
+        if (shortFlag) {
+          t.option(argName, conf.description ?? '', shortFlag);
+        } else {
+          t.option(argName, conf.description ?? '');
+        }
+      }
     }
   }