Merge pull request #248 from underctrl-io/update-command-loader

Update command loader

Author: twlite

apps/test-bot/src/app/commands/(general)/(animal)/cat.ts

@@ -1,6 +1,6 @@
 import type {
-  CommandData,
   ChatInputCommand,
+  CommandData,
   MessageCommand,
   MessageContextMenuCommand,
 } from 'commandkit';
@@ -12,7 +12,7 @@ import {
 
 export const command: CommandData = {
   name: 'cat',
-  description: 'cat command',
+  // description: 'cat command',
   integration_types: [
     ApplicationIntegrationType.GuildInstall,
     ApplicationIntegrationType.UserInstall,

packages/commandkit/src/app/handlers/AppCommandHandler.ts

@@ -1,5 +1,5 @@
-import type { CommandKit } from '../../CommandKit';
 import {
+  ApplicationCommandType,
   AutocompleteInteraction,
   Awaitable,
   Collection,
@@ -10,18 +10,20 @@ import {
   Message,
   SlashCommandBuilder,
 } from 'discord.js';
-import { Context } from '../commands/Context';
-import { toFileURL } from '../../utils/resolve-file-url';
-import { MessageCommandParser } from '../commands/MessageCommandParser';
-import { CommandKitErrorCodes, isErrorType } from '../../utils/error-codes';
-import { CommandRegistrar } from '../register/CommandRegistrar';
+import type { CommandKit } from '../../CommandKit';
 import { AsyncFunction, GenericFunction } from '../../context/async-context';
 import { Logger } from '../../logger/Logger';
-import { Command, Middleware } from '../router';
-import { AppCommandRunner } from '../commands/AppCommandRunner';
+import type { CommandData } from '../../types';
+import colors from '../../utils/colors';
 import { COMMANDKIT_IS_DEV } from '../../utils/constants';
+import { CommandKitErrorCodes, isErrorType } from '../../utils/error-codes';
+import { toFileURL } from '../../utils/resolve-file-url';
 import { rewriteCommandDeclaration } from '../../utils/types-package';
-import colors from '../../utils/colors';
+import { AppCommandRunner } from '../commands/AppCommandRunner';
+import { Context } from '../commands/Context';
+import { MessageCommandParser } from '../commands/MessageCommandParser';
+import { CommandRegistrar } from '../register/CommandRegistrar';
+import { Command, Middleware } from '../router';
 
 /**
  * Function type for wrapping command execution with custom logic.
@@ -34,7 +36,7 @@ export type RunCommand = <T extends AsyncFunction>(fn: T) => T;
  * It can be used to define slash commands, context menu commands, and message commands.
  */
 export interface AppCommandNative {
-  command: SlashCommandBuilder | Record<string, any>;
+  command: CommandData | Record<string, any>;
   chatInput?: (ctx: Context) => Awaitable<unknown>;
   autocomplete?: (ctx: Context) => Awaitable<unknown>;
   message?: (ctx: Context) => Awaitable<unknown>;
@@ -127,6 +129,10 @@ const commandDataSchema = {
   userContextMenu: (c: unknown) => typeof c === 'function',
 };
 
+export type CommandDataSchema = typeof commandDataSchema;
+export type CommandDataSchemaKey = keyof CommandDataSchema;
+export type CommandDataSchemaValue = CommandDataSchema[CommandDataSchemaKey];
+
 /**
  * @private
  * @internal
@@ -674,29 +680,51 @@ export class AppCommandHandler {
           data: {
             command: {
               name: command.name,
-              description: `${command.name} commands`,
+              description: `${command.name} command`,
               type: 1,
             },
           },
         });
         return;
       }
 
-      const data = await import(`${toFileURL(command.path)}?t=${Date.now()}`);
+      const commandFileData = (await import(
+        `${toFileURL(command.path)}?t=${Date.now()}`
+      )) as AppCommandNative;
 
-      if (!data.command) {
+      if (!commandFileData.command) {
         throw new Error(
           `Invalid export for command ${command.name}: no command definition found`,
         );
       }
 
+      if (
+        (!commandFileData.command.type ||
+          commandFileData.command.type === ApplicationCommandType.ChatInput) &&
+        !commandFileData.command.description
+      ) {
+        commandFileData.command.description = `${command.name} command`;
+      }
+
       let handlerCount = 0;
-      for (const [key, validator] of Object.entries(commandDataSchema)) {
-        if (key !== 'command' && data[key]) handlerCount++;
-        if (data[key] && !(await validator(data[key]))) {
-          throw new Error(
-            `Invalid export for command ${command.name}: ${key} does not match expected value`,
-          );
+
+      for (const [key, propValidator] of Object.entries(commandDataSchema) as [
+        CommandDataSchemaKey,
+        CommandDataSchemaValue,
+      ][]) {
+        const exportedProp = commandFileData[key];
+
+        if (exportedProp) {
+          if (!(await propValidator(exportedProp))) {
+            throw new Error(
+              `Invalid export for command ${command.name}: ${key} does not match expected value`,
+            );
+          }
+
+          if (key !== 'command') {
+            // command file includes a handler function (chatInput, message, etc)
+            handlerCount++;
+          }
         }
       }
 
@@ -706,7 +734,7 @@ export class AppCommandHandler {
         );
       }
 
-      let lastUpdated = data.command;
+      let lastUpdated = commandFileData.command;
 
       await this.commandkit.plugins.execute(async (ctx, plugin) => {
         const res = await plugin.prepareCommand(ctx, lastUpdated);
@@ -718,9 +746,9 @@ export class AppCommandHandler {
 
       this.loadedCommands.set(id, {
         command,
-        guilds: data.guilds,
+        guilds: commandFileData.command.guilds,
         data: {
-          ...data,
+          ...commandFileData,
           command: 'toJSON' in lastUpdated ? lastUpdated.toJSON() : lastUpdated,
         },
       });

packages/commandkit/src/types.ts

@@ -6,6 +6,10 @@ import {
 } from 'discord.js';
 import type { CommandKit } from './CommandKit';
 
+type Prettify<T> = {
+  [K in keyof T]: T[K];
+} & {};
+
 /**
  * Options for instantiating a CommandKit handler.
  */
@@ -40,6 +44,9 @@ export interface CommandContext<
 /**
  * Represents a command that can be executed by CommandKit.
  */
-export type CommandData = RESTPostAPIApplicationCommandsJSONBody & {
-  guilds?: string[];
-};
+export type CommandData = Prettify<
+  Omit<RESTPostAPIApplicationCommandsJSONBody, 'description'> & {
+    description?: string;
+    guilds?: string[];
+  }
+>;