patch fix type missing from command options

Author: notunderctrl

packages/commandkit/package.json

@@ -1,7 +1,7 @@
 {
     "name": "commandkit",
     "description": "Beginner friendly command & event handler for Discord.js",
-    "version": "0.1.4",
+    "version": "0.1.5",
     "license": "MIT",
     "main": "./dist/index.js",
     "module": "./dist/index.mjs",

packages/commandkit/src/handlers/command-handler/CommandHandler.ts

@@ -9,6 +9,7 @@ import registerCommands from './functions/registerCommands';
 import builtInValidations from './validations';
 import colors from '../../utils/colors';
 import rdfc from 'rfdc';
+import { SlashCommandBuilder } from 'discord.js';
 
 const clone = rdfc();
 
@@ -80,6 +81,17 @@ export class CommandHandler {
             let importedObj = await import(`${modulePath}?t=${Date.now()}`);
             let commandObj: CommandFileObject = clone(importedObj); // Make commandObj extensible
 
+            // Ensure builder properties
+            if (importedObj.default) {
+                commandObj.data = importedObj.default.data;
+            } else {
+                commandObj.data = importedObj.data;
+            }
+
+            try {
+                commandObj.data = (commandObj.data as any).toJSON();
+            } catch (error) {}
+
             // If it's CommonJS, invalidate the import cache
             if (typeof module !== 'undefined' && typeof require !== 'undefined') {
                 delete require.cache[require.resolve(commandFilePath)];

packages/commandkit/src/handlers/command-handler/functions/loadCommandsWithRest.ts

@@ -36,6 +36,7 @@ async function handleLoading(
     reloading?: boolean,
     type?: ReloadOptions,
 ) {
+    commands = commands.filter((cmd) => !cmd.options?.deleted);
     const devOnlyCommands = commands.filter((cmd) => cmd.options?.devOnly);
     const globalCommands = commands.filter((cmd) => !cmd.options?.devOnly);
 

packages/commandkit/tests/commands/misc/giveaway.ts

@@ -0,0 +1,42 @@
+import { ChannelType, SlashCommandBuilder } from 'discord.js';
+
+export const data = new SlashCommandBuilder()
+    .setName('giveaway')
+    .setDescription('Giveaway related commands')
+    .addSubcommand((cmd) =>
+        cmd
+            .setName('create')
+            .setDescription('Create a giveaway with a modal')
+            .addChannelOption((option) =>
+                option
+                    .setName('channel')
+                    .setDescription('The channel you would like to send the giveaway to')
+                    .addChannelTypes(ChannelType.GuildText),
+            )
+            .addRoleOption((option) =>
+                option
+                    .setName('ping-role')
+                    .setDescription('The role you would like to ping for this giveaway'),
+            ),
+    )
+    .addSubcommand((cmd) =>
+        cmd
+            .setName('end')
+            .setDescription('End a giveaway early')
+            .addStringOption((option) =>
+                option
+                    .setName('giveaway-id')
+                    .setDescription('The Message ID for the giveaway')
+                    .setRequired(true),
+            ),
+    )
+    .addSubcommand((cmd) =>
+        cmd.setName('list').setDescription('List all active giveaways for this server'),
+    );
+
+export function run() {}
+
+export const options = {
+    devOnly: true,
+    // deleted: true,
+};