fix: cli generators

Author: twlite

apps/test-bot/package.json

@@ -3,6 +3,7 @@
   "version": "1.0.0",
   "type": "module",
   "scripts": {
+    "commandkit": "commandkit",
     "dev": "commandkit dev",
     "build": "commandkit build",
     "start": "commandkit start"

apps/test-bot/src/app/commands/cat/command.ts

@@ -0,0 +1,14 @@
+import type { CommandData, SlashCommand, MessageCommand } from 'commandkit';
+
+export const data: CommandData = {
+  name: 'cat',
+  description: 'cat command',
+};
+
+export const chatInput: SlashCommand = async (ctx) => {
+  await ctx.interaction.reply('Hello from cat!');
+};
+
+export const message: MessageCommand = async (ctx) => {
+  await ctx.message.reply('Hello from cat!');
+};

apps/test-bot/src/app/commands/dog/command.ts

@@ -0,0 +1,14 @@
+import type { CommandData, SlashCommand, MessageCommand } from 'commandkit';
+
+export const data: CommandData = {
+  name: 'dog',
+  description: 'dog command',
+};
+
+export const chatInput: SlashCommand = async (ctx) => {
+  await ctx.interaction.reply('Hello from dog!');
+};
+
+export const message: MessageCommand = async (ctx) => {
+  await ctx.message.reply('Hello from dog!');
+};

apps/test-bot/src/app/events/messageCreate/event.ts

@@ -0,0 +1,3 @@
+export default async function onMessageCreate() {
+  console.log('messageCreate event fired!');
+}

apps/test-bot/src/app/locales/en-US/cat.json

@@ -0,0 +1,7 @@
+{
+  "command": {
+    "name": "cat",
+    "description": "cat command"
+  },
+  "translations": {}
+}

packages/commandkit/src/cli/generators.ts

@@ -10,6 +10,9 @@ const COMMANDS_DIR = join(BASE_PATH, 'src/app/commands');
 const EVENTS_DIR = join(BASE_PATH, 'src/app/events');
 const LOCALES_DIR = join(BASE_PATH, 'src/app/locales');
 
+const formatPath = (path: string) =>
+  path.replace(process.cwd(), '.').replace(/\\/g, '/');
+
 export async function generateCommand(name: string, customPath?: string) {
   const cmdPath = join(customPath || COMMANDS_DIR, name);
   if (!existsSync(cmdPath)) await mkdir(cmdPath, { recursive: true });
@@ -39,19 +42,19 @@ export const message: MessageCommand = async (ctx) => {
 
   console.log(
     colors.green(
-      `Command ${colors.magenta(name)} created at ${colors.blue(cmdPath)}/command.ts`,
+      `Command ${colors.magenta(name)} created at ${colors.blue(formatPath(cmdPath))}/command.ts`,
     ),
   );
 }
 
 export async function generateEvent(name: string, customPath?: string) {
   const eventPath = join(customPath || EVENTS_DIR, name);
-  if (!existsSync) await mkdir(eventPath, { recursive: true });
+  if (!existsSync(eventPath)) await mkdir(eventPath, { recursive: true });
 
   let filename = 'event.ts';
   if (existsSync(join(eventPath, filename))) {
     const count = (await readdir(eventPath)).length;
-    filename = `${String(count).padStart(2, '0')}_${filename}.ts`;
+    filename = `${String(count).padStart(2, '0')}_${filename}`;
   }
 
   const eventFile = `
@@ -64,7 +67,7 @@ export default async function on${name[0].toUpperCase() + name.slice(1)}() {
 
   console.log(
     colors.green(
-      `Event ${colors.magenta(name)} created at ${colors.blue(eventPath)}/${colors.magenta(filename)}`,
+      `Event ${colors.magenta(name)} created at ${colors.blue(formatPath(eventPath))}/${colors.magenta(filename)}`,
     ),
   );
 }
@@ -74,7 +77,11 @@ export async function generateLocale(
   commandName: string,
   customPath?: string,
 ) {
-  if (!Locale[locale] || /^\d+$/.test(locale)) {
+  const localeNames = Object.fromEntries(
+    Object.entries(Locale).map(([k, v]) => [v, k]),
+  );
+
+  if (!localeNames[locale]) {
     panic(`Invalid locale: ${locale}`);
   }
 
@@ -106,7 +113,7 @@ export async function generateLocale(
   console.log(
     colors.green(
       `Locale file for ${colors.magenta(commandName)} created at ${colors.blue(
-        localePath,
+        formatPath(localePath),
       )}/${colors.magenta(`${commandName}.json`)}`,
     ),
   );

packages/commandkit/src/cli/init.ts

@@ -61,20 +61,24 @@ export async function bootstrapCommandkitCLI(
   program
     .command('create')
     .description('Create new commands, events, or locale files')
-    .option('-c, --command <name>', 'Create a new command')
-    .option('-e, --event <name>', 'Create a new event')
+    .option('-c, --command', 'Create a new command')
+    .option('-e, --event', 'Create a new event')
     .option(
-      '-l, --locale <locale> <command>',
-      'Create a new locale file for the given command',
+      '-l, --locale <locale>',
+      'Specify the locale code (e.g. nl, es, fr)',
     )
-    .action(async (options) => {
+    .argument('<name>', 'The name of the command or event')
+    .action(async (name, options) => {
       if (options.command) {
-        await generateCommand(options.command);
+        await generateCommand(name);
       } else if (options.event) {
-        await generateEvent(options.event);
+        await generateEvent(name);
       } else if (options.locale) {
-        const [locale, command] = options.locale;
-        await generateLocale(locale, command);
+        if (!name) {
+          console.error('Please specify a command name for the locale file');
+          return;
+        }
+        await generateLocale(options.locale, name);
       } else {
         console.error(
           'Please specify what to create: --command, --event, or --locale',