spacecommands 3.4.1 → 3.4.5

package/dist/CommandHandler.js

@@ -44,7 +44,14 @@ class CommandHandler {
     _commandChecks = new Map();
     constructor(instance, client, dir, disabledDefaultCommands, typeScript = false) {
         this._client = client;
-        this.setUp(instance, client, dir, disabledDefaultCommands, typeScript);
+        if (client.isReady()) {
+            this.setUp(instance, client, dir, disabledDefaultCommands, typeScript);
+        }
+        else {
+            client.once('ready', () => {
+                this.setUp(instance, client, dir, disabledDefaultCommands, typeScript);
+            });
+        }
     }
     async setUp(instance, client, dir, disabledDefaultCommands, typeScript = false) {
         // Do not pass in TS here because this should always compiled to JS
@@ -160,6 +167,24 @@ class CommandHandler {
         }
         const { name = fileName, category, commands, aliases, init, callback, run, execute, error, description, requiredPermissions, permissions, slash, expectedArgs, expectedArgsTypes, minArgs, options = [], autocomplete, } = configuration;
         const { testOnly } = configuration;
+        // Extract options from SlashCommandBuilder if using data property
+        // This allows commands to use SlashCommandBuilder pattern while still working with SpaceCommands
+        let finalOptions = options;
+        if (configuration.data && typeof configuration.data.toJSON === 'function') {
+            const jsonData = configuration.data.toJSON();
+            if (jsonData.options) {
+                finalOptions = jsonData.options;
+            }
+            if (instance.debug && finalOptions && finalOptions.length) {
+                console.log(`SpaceCommands > Command "${name || fileName}" using SlashCommandBuilder with ${finalOptions.length} options`);
+            }
+        }
+        else if (configuration.data && configuration.data.options) {
+            finalOptions = configuration.data.options;
+            if (instance.debug) {
+                console.log(`SpaceCommands > Command "${name || fileName}" using SlashCommandBuilder with ${finalOptions.length} options`);
+            }
+        }
         if (run || execute) {
             throw new Error(`Command located at "${file}" has either a "run" or "execute" function. Please rename that function to "callback".`);
         }
@@ -201,7 +226,7 @@ class CommandHandler {
         if (slash !== undefined && typeof slash !== 'boolean' && slash !== 'both') {
             throw new Error(`SpaceCommands > Command "${names[0]}" has a "slash" property that is not boolean "true" or string "both".`);
         }
-        if (!slash && options.length) {
+        if (!slash && finalOptions.length) {
             throw new Error(`SpaceCommands > Command "${names[0]}" has an "options" property but is not a slash command.`);
         }
         if (slash && !(builtIn && !instance.isDBConnected())) {
@@ -211,9 +236,9 @@ class CommandHandler {
             if (minArgs !== undefined && !expectedArgs) {
                 throw new Error(`SpaceCommands > Command "${names[0]}" has "minArgs" property defined without "expectedArgs" property as a slash command.`);
             }
-            if (options.length) {
-                for (const key in options) {
-                    const name = options[key].name;
+            if (finalOptions.length) {
+                for (const key in finalOptions) {
+                    const name = finalOptions[key].name;
                     let lowerCase = name.toLowerCase();
                     if (name !== lowerCase && instance.showWarns) {
                         console.log(`SpaceCommands > Command "${names[0]}" has an option of "${name}". All option names must be lower case for slash commands. SpaceCommands will modify this for you.`);
@@ -222,7 +247,7 @@ class CommandHandler {
                         lowerCase = lowerCase.replace(/\s/g, '_');
                         console.log(`SpaceCommands > Command "${names[0]}" has an option of "${name}" with a white space in it. It is a best practice for option names to only be one word. SpaceCommands will modify this for you.`);
                     }
-                    options[key].name = lowerCase;
+                    finalOptions[key].name = lowerCase;
                 }
             }
             else if (expectedArgs) {
@@ -231,7 +256,7 @@ class CommandHandler {
                     .split(/[>\]] [<\[]/);
                 for (let a = 0; a < split.length; ++a) {
                     const item = split[a];
-                    options.push({
+                    finalOptions.push({
                         name: item.replace(/ /g, '-').toLowerCase(),
                         description: item,
                         type: expectedArgsTypes && expectedArgsTypes.length >= a
@@ -244,11 +269,11 @@ class CommandHandler {
             const slashCommands = instance.slashCommands;
             if (testOnly) {
                 for (const id of instance.testServers) {
-                    await slashCommands.create(names[0], description, options, id);
+                    await slashCommands.create(names[0], description, finalOptions, id);
                 }
             }
             else {
-                await slashCommands.create(names[0], description, options);
+                await slashCommands.create(names[0], description, finalOptions);
             }
             if (autocomplete) {
                 const slashCommands = instance.slashCommands;

package/dist/SlashCommands.js

@@ -109,9 +109,9 @@ class SlashCommands {
     }
     didOptionsChange(command, options) {
         return (command.options?.filter((opt, index) => {
-            return (opt?.required !== options[index]?.required &&
-                opt?.name !== options[index]?.name &&
-                opt?.options?.length !== options.length);
+            return (opt?.required !== options[index]?.required ||
+                opt?.name !== options[index]?.name ||
+                (opt?.options && opt.options.length !== options[index]?.options?.length));
         }).length !== 0);
     }
     async create(name, description, options, guildId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spacecommands",
-  "version": "3.4.1",
+  "version": "3.4.5",
   "main": "dist/index.js",
   "types": "./typings.d.ts",
   "typings": "./typings.d.ts",