project done ig

Author: Aslemammad

demo.cac.ts

@@ -1,143 +1,83 @@
-// import fs from "fs/promises";
-// import cac from "cac";
-// import {
-//   Callback,
-//   Completion,
-//   flagMap,
-//   Positional,
-//   positionalMap,
-// } from "./shared";
-// import path from "path";
-// import tab from "./cac";
+import cac from "cac";
+import tab from "./src/cac";
 
-// const cli = cac("vite"); // Using 'vite' as the CLI tool name
+const cli = cac("vite");
 
-// // Custom converters (placeholders)
-// function convertBase(value) {
-//   return value;
-// }
+cli
+  .option("-c, --config <file>", `Use specified config file`)
+  .option("-m, --mode <mode>", `Set env mode`)
+  .option("-l, --logLevel <level>", `info | warn | error | silent`);
 
-// function convertHost(value) {
-//   return value;
-// }
+cli
+  .command("dev", "Start dev server")
+  .option("--host [host]", `Specify hostname`)
+  .option("--port <port>", `Specify port`)
+  .action((options) => {});
 
-// // https://github.com/vitejs/vite/blob/main/packages/vite/src/node/cli.ts
-// // Global options
-// cli
-//   .option("-c, --config <file>", `[string] use specified config file`)
-//   .option("--base <path>", `[string] public base path (default: /)`, {
-//     type: [convertBase],
-//   })
-//   .option("-l, --logLevel <level>", `[string] info | warn | error | silent`)
-//   .option("--clearScreen", `[boolean] allow/disable clear screen when logging`)
-//   .option("-d, --debug [feat]", `[string | boolean] show debug logs`)
-//   .option("-f, --filter <filter>", `[string] filter debug logs`)
-//   .option("-m, --mode <mode>", `[string] set env mode`);
+cli
+  .command("dev build", "Build project")
+  .action((options) => {});
 
-// // Dev command
-// cli
-//   .command("[root]", "start dev server") // default command
-//   .alias("serve") // the command is called 'serve' in Vite's API
-//   .alias("dev") // alias to align with the script name
-//   .option("--host [host]", `[string] specify hostname`, { type: [convertHost] })
-//   .option("--port <port>", `[number] specify port`)
-//   .option("--open [path]", `[boolean | string] open browser on startup`)
-//   .option("--cors", `[boolean] enable CORS`)
-//   .option("--strictPort", `[boolean] exit if specified port is already in use`)
-//   .option(
-//     "--force",
-//     `[boolean] force the optimizer to ignore the cache and re-bundle`
-//   )
-//   .action((root, options) => {
-//     console.log(`Starting dev server at ${root || "."} with options:`, options);
-//   });
-// // Build positional completions for each command using command.args
-// for (const c of [cli.globalCommand, ...cli.commands]) {
-//   // Handle options
-//   for (const o of [...cli.globalCommand.options, ...c.options]) {
-//     const optionKey = `${c.name} ${o.name}`;
+cli
+  .command("lint [...files]", "Lint project")
+  .action((files, options) => {});
 
-//     if (o.rawName.includes("--logLevel <level>")) {
-//       // Completion for --logLevel
-//       flagMap.set(optionKey, async (previousArgs, toComplete) => {
-//         return [
-//           { action: "info", description: "Info level logging" },
-//           { action: "warn", description: "Warning level logging" },
-//           { action: "error", description: "Error level logging" },
-//           { action: "silent", description: "No logging" },
-//         ].filter((comp) => comp.action.startsWith(toComplete));
-//       });
-//     }
+const completion = await tab(cli);
 
-//     if (o.rawName.includes("--mode <mode>")) {
-//       // Completion for --mode
-//       flagMap.set(optionKey, async (previousArgs, toComplete) => {
-//         return [
-//           { action: "production", description: "Production mode" },
-//           { action: "development", description: "Development mode" },
-//           { action: "staging", description: "Staging mode" },
-//         ].filter((comp) => comp.action.startsWith(toComplete));
-//       });
-//     }
+for (const command of completion.commands.values()) {
+  if (command.name === 'lint') {
+    command.handler = () => {
+      return [
+        { value: 'main.ts', description: 'Main file' },
+        { value: 'index.ts', description: 'Index file' },
+      ];
+    };
+  }
 
-//     if (o.rawName.includes("--port <port>")) {
-//       // Completion for --port
-//       flagMap.set(optionKey, async (previousArgs, toComplete) => {
-//         return [
-//           { action: "3000", description: "Development server port" },
-//           { action: "8080", description: "Alternative port" },
-//           { action: "80", description: "HTTP port" },
-//           { action: "443", description: "HTTPS port" },
-//           { action: "5000", description: "Common backend port" },
-//         ].filter((comp) => comp.action.startsWith(toComplete));
-//       });
-//     }
+  for (const [o, config] of command.options.entries()) {
+    if (o === '--port') {
+      config.handler = () => {
+        return [
+          { value: '3000', description: 'Development server port' },
+          { value: '8080', description: 'Alternative port' },
+        ];
+      };
+    }
+    if (o === '--host') {
+      config.handler = () => {
+        return [
+          { value: 'localhost', description: 'Localhost' },
+          { value: '0.0.0.0', description: 'All interfaces' },
+        ];
+      };
+    }
+    if (o === '--config') {
+      config.handler = () => {
+        return [
+          { value: 'vite.config.ts', description: 'Vite config file' },
+          { value: 'vite.config.js', description: 'Vite config file' },
+        ];
+      };
+    }
+    if (o === '--mode') {
+      config.handler = () => {
+        return [
+          { value: 'development', description: 'Development mode' },
+          { value: 'production', description: 'Production mode' },
+        ];
+      };
+    }
+    if (o === '--logLevel') {
+      config.handler = () => {
+        return [
+          { value: 'info', description: 'Info level' },
+          { value: 'warn', description: 'Warn level' },
+          { value: 'error', description: 'Error level' },
+          { value: 'silent', description: 'Silent level' },
+        ];
+      };
+    }
+  }
+}
 
-//     if (o.rawName.includes("--host [host]")) {
-//       // Completion for --host
-//       flagMap.set(optionKey, async (previousArgs, toComplete) => {
-//         return [
-//           { action: "localhost", description: "Localhost" },
-//           { action: "0.0.0.0", description: "All interfaces" },
-//           { action: "127.0.0.1", description: "Loopback interface" },
-//         ].filter((comp) => comp.action.startsWith(toComplete));
-//       });
-//     }
-
-//     if (o.rawName.includes("--config <file>")) {
-//       // Completion for --config
-//       flagMap.set(optionKey, async (previousArgs, toComplete) => {
-//         const configFiles = ["vite.config.ts", "vite.config.js"].filter(
-//           (file) => file.startsWith(toComplete)
-//         );
-//         return configFiles.map((file) => ({ action: file }));
-//       });
-//     }
-
-//     // Add more option completions as needed
-//   }
-
-//   // Handle positional arguments
-//   if (c.args && c.args.length > 0) {
-//     const positionals = c.args.map((arg) => ({
-//       required: arg.required,
-//       variadic: arg.variadic,
-//       value: arg.value,
-//       completion: async (previousArgs, toComplete) => {
-//         if (arg.value === "root") {
-//           return [
-//             { action: "src/", description: "💣️.sh loves vite!" },
-//             { action: "./", description: "This one is better." },
-//           ];
-//         }
-//         return [];
-//       },
-//     }));
-
-//     positionalMap.set(c.name, positionals);
-//   }
-// }
-
-// tab(cli);
-
-// cli.parse();
+cli.parse();

demo.citty.ts

@@ -68,7 +68,6 @@ 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/cac.ts

@@ -1,32 +1,21 @@
-// // @bombsh/tab/cac
-// import { CAC } from "cac";
-// import * as zsh from "./zsh";
-// import * as bash from "./bash";
-// import * as fish from "./fish";
-// import * as powershell from "./powershell";
-// import {
-//   flagMap,
-//   Positional,
-//   positionalMap,
-//   ShellCompDirective,
-// } from "./shared";
-
-// function quoteIfNeeded(path: string): string {
-//   return path.includes(" ") ? `'${path}'` : path;
-// }
+import * as zsh from "./zsh";
+import * as bash from "./bash";
+import * as fish from "./fish";
+import * as powershell from "./powershell";
+import type { CAC } from "cac";
+import { Completion } from "./";
 
-// const execPath = process.execPath;
-// const processArgs = process.argv.slice(1);
+const execPath = process.execPath;
+const processArgs = process.argv.slice(1);
+const quotedExecPath = quoteIfNeeded(execPath);
+const quotedProcessArgs = processArgs.map(quoteIfNeeded);
+const quotedProcessExecArgs = process.execArgv.map(quoteIfNeeded);
 
-// // Apply the quoting function to each part of x
-// // This ensures that paths like "Program Files" are quoted for PowerShell execution.
-// const quotedExecPath = quoteIfNeeded(execPath);
-// const quotedProcessArgs = processArgs.map(quoteIfNeeded);
-// const quotedProcessExecArgs = process.execArgv.map(quoteIfNeeded);
+const x = `${quotedExecPath} ${quotedProcessExecArgs.join(" ")} ${quotedProcessArgs[0]}`;
 
-// const x = `${quotedExecPath} ${quotedProcessExecArgs.join(" ")} ${
-//   quotedProcessArgs[0]
-// }`;
+function quoteIfNeeded(path: string): string {
+  return path.includes(" ") ? `'${path}'` : path;
+}
 
 // export default function tab(instance: CAC): void {
 //   instance.command("complete [shell]").action(async (shell, extra) => {
@@ -302,3 +291,76 @@
 //     }
 //   });
 // }
+
+export default function tab(instance: CAC): Completion {
+  const completion = new Completion();
+
+  // Add all commands and their options
+  for (const cmd of [instance.globalCommand, ...instance.commands]) {
+    if (cmd.name === 'complete') continue; // Skip completion command
+
+    // Get positional args info from command usage
+    const args = (cmd.rawName.match(/\[.*?\]|\<.*?\>/g) || [])
+      .map(arg => arg.startsWith('['));  // true if optional (wrapped in [])
+
+    // Add command to completion
+    const commandName = completion.addCommand(
+      cmd.name === '@@global@@' ? '' : cmd.name,
+      cmd.description || '',
+      args,
+      async () => []
+    );
+
+    // Add command options
+    for (const option of [...instance.globalCommand.options, ...cmd.options]) {
+      completion.addOption(
+        commandName,
+        `--${option.name}`,
+        option.description || '',
+        async () => []
+      );
+    }
+  }
+
+  instance.command("complete [shell]").action(async (shell, extra) => {
+    switch (shell) {
+      case "zsh": {
+        const script = zsh.generate(instance.name, x);
+        console.log(script);
+        break;
+      }
+      case "bash": {
+        const script = bash.generate(instance.name, x);
+        console.log(script);
+        break;
+      }
+      case "fish": {
+        const script = fish.generate(instance.name, x);
+        console.log(script);
+        break;
+      }
+      case "powershell": {
+        const script = powershell.generate(instance.name, x);
+        console.log(script);
+        break;
+      }
+      default: {
+        const args: string[] = extra["--"];
+        instance.showHelpOnExit = false;
+
+        // Parse current command context
+        instance.unsetMatchedCommand();
+        instance.parse([execPath, processArgs[0], ...args], {
+          run: false,
+        });
+
+        // const matchedCommand = instance.matchedCommand?.name || '';
+        // const potentialCommand = args.join(' ')
+        // console.log(potentialCommand)
+        return completion.parse(args);
+      }
+    }
+  });
+
+  return completion;
+}

src/citty.ts

@@ -167,7 +167,6 @@ export default async function tab<T extends ArgsDef = ArgsDef>(
           // 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);
         }
       }