reciple 5.4.0-pre.1 → 5.4.0-pre.2

package/bin/reciple/classes/RecipleClient.js

@@ -29,7 +29,6 @@ const version_1 = require("../version");
 const discord_js_1 = require("discord.js");
 const path_1 = __importDefault(require("path"));
 const flags_1 = require("../flags");
-const util_1 = require("../util");
 class RecipleClient extends discord_js_1.Client {
     /**
      * @param options Client options
@@ -148,10 +147,10 @@ class RecipleClient extends discord_js_1.Client {
     addCommand(command) {
         var _a;
         if (command.type === builders_1.CommandBuilderType.SlashCommand) {
-            this.commands.slashCommands[command.name] = (0, util_1.isClass)(command) ? command : new SlashCommandBuilder_1.SlashCommandBuilder(command);
+            this.commands.slashCommands[command.name] = SlashCommandBuilder_1.SlashCommandBuilder.resolveSlashCommand(command);
         }
         else if (command.type === builders_1.CommandBuilderType.MessageCommand) {
-            this.commands.messageCommands[command.name] = (0, util_1.isClass)(command) ? command : new MessageCommandBuilder_1.MessageCommandBuilder(command);
+            this.commands.messageCommands[command.name] = MessageCommandBuilder_1.MessageCommandBuilder.resolveMessageCommand(command);
         }
         else if (this.isClientLogsEnabled()) {
             this.logger.error(`Unknow command "${(_a = typeof command) !== null && _a !== void 0 ? _a : 'unknown'}".`);

package/bin/reciple/classes/builders/MessageCommandBuilder.d.ts

@@ -97,6 +97,7 @@ export declare class MessageCommandBuilder implements SharedCommandBuilderProper
      * Returns JSON object of this builder
      */
     toJSON(): MessageCommandData;
+    static resolveMessageCommand(commandData: MessageCommandData | MessageCommandBuilder): MessageCommandBuilder;
     /**
      * Is a message command builder
      */

package/bin/reciple/classes/builders/MessageCommandBuilder.js

@@ -179,6 +179,9 @@ class MessageCommandBuilder {
             options: this.options.map(o => o.toJSON()),
         };
     }
+    static resolveMessageCommand(commandData) {
+        return this.isMessageCommandBuilder(commandData) ? commandData : new MessageCommandBuilder(commandData);
+    }
     /**
      * Is a message command builder
      */

package/bin/reciple/classes/builders/SlashCommandBuilder.d.ts

@@ -59,10 +59,11 @@ export declare class SlashCommandBuilder extends DiscordJsSlashCommandBuilder im
      * Resolve option data
      */
     static resolveOption<T extends AnySlashCommandOptionBuilder>(option: AnySlashCommandOptionData): T;
+    static resolveSlashCommand(commandData: SlashCommandData | AnySlashCommandBuilder): AnySlashCommandBuilder;
     /**
      * Is a slash command builder
      */
-    static isSlashCommandBuilder(builder: unknown): builder is SlashCommandBuilder;
+    static isSlashCommandBuilder(builder: unknown): builder is AnySlashCommandBuilder;
     /**
      * Is a slash command execute data
      */

package/bin/reciple/classes/builders/SlashCommandBuilder.js

@@ -190,6 +190,9 @@ class SlashCommandBuilder extends discord_js_1.SlashCommandBuilder {
             .setNameLocalizations((_f = option.nameLocalizations) !== null && _f !== void 0 ? _f : null)
             .setDescriptionLocalizations((_g = option.descriptionLocalizations) !== null && _g !== void 0 ? _g : null);
     }
+    static resolveSlashCommand(commandData) {
+        return this.isSlashCommandBuilder(commandData) ? commandData : new SlashCommandBuilder(commandData);
+    }
     /**
      * Is a slash command builder
      */

package/bin/reciple/modules.js

@@ -55,10 +55,10 @@ function getModules(client, folder) {
                 if (module_.commands) {
                     for (const command of module_.commands) {
                         if (command.type === builders_1.CommandBuilderType.MessageCommand) {
-                            commands.push(MessageCommandBuilder_1.MessageCommandBuilder.isMessageCommandBuilder(command) ? command : new MessageCommandBuilder_1.MessageCommandBuilder(command));
+                            commands.push(MessageCommandBuilder_1.MessageCommandBuilder.resolveMessageCommand(command));
                         }
                         else if (command.type === builders_1.CommandBuilderType.SlashCommand) {
-                            commands.push(SlashCommandBuilder_1.SlashCommandBuilder.isSlashCommandBuilder(command) ? command : new SlashCommandBuilder_1.SlashCommandBuilder(command));
+                            commands.push(SlashCommandBuilder_1.SlashCommandBuilder.resolveSlashCommand(command));
                         }
                     }
                 }

package/bin/reciple/types/builders.d.ts

@@ -104,7 +104,7 @@ export interface SharedCommandDataProperties {
 /**
  * Slash command object data interface
  */
-export interface SlashCommandData extends SharedCommandDataProperties, Omit<SharedCommandBuilderProperties, "setCooldown" | "setRequiredBotPermissions" | "setRequiredMemberPermissions" | "setHalt" | "setExecute" | "halt" | "execute"> {
+export interface SlashCommandData extends SharedCommandDataProperties, Partial<Omit<SharedCommandBuilderProperties, "setCooldown" | "setRequiredBotPermissions" | "setRequiredMemberPermissions" | "setHalt" | "setExecute" | "halt" | "execute">> {
     type: CommandBuilderType.SlashCommand;
     nameLocalizations?: LocalizationMap;
     descriptionLocalizations?: LocalizationMap;
@@ -179,12 +179,12 @@ export interface SlashCommandSubCommandData extends SharedCommandDataProperties,
     type: ApplicationCommandOptionType.Subcommand;
     options: (AnySlashCommandOptionsOnlyOptionData | AnySlashCommandOptionsOnlyOptionBuilder)[];
 }
-export interface MessageCommandData extends SharedCommandDataProperties, Omit<SharedCommandBuilderProperties, "setCooldown" | "setRequiredBotPermissions" | "setRequiredMemberPermissions" | "setHalt" | "setExecute" | "halt" | "execute"> {
+export interface MessageCommandData extends SharedCommandDataProperties, Partial<Omit<SharedCommandBuilderProperties, "setCooldown" | "setRequiredBotPermissions" | "setRequiredMemberPermissions" | "setHalt" | "setExecute" | "halt" | "execute">> {
     type: CommandBuilderType.MessageCommand;
-    aliases: string[];
-    validateOptions: boolean;
-    allowExecuteInDM: boolean;
-    allowExecuteByBots: boolean;
+    aliases?: string[];
+    validateOptions?: boolean;
+    allowExecuteInDM?: boolean;
+    allowExecuteByBots?: boolean;
     halt?: MessageCommandHaltFunction;
     execute: MessageCommandExecuteFunction;
     options: MessageCommandOptionResolvable[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reciple",
-  "version": "5.4.0-pre.1",
+  "version": "5.4.0-pre.2",
   "bin": "bin/bin.js",
   "license": "GPL-3.0",
   "main": "bin/index.js",