@guardbot/framework 1.1.1 → 1.1.3

package/build/index.d.mts

@@ -1,5 +1,5 @@
 import * as discord_js from 'discord.js';
-import { Client, PermissionResolvable, InteractionContextType, ApplicationIntegrationType, LocalizationMap, ApplicationCommandOptionData, ChatInputCommandInteraction, AutocompleteInteraction, Message, ContextMenuCommandInteraction, CommandInteraction, PermissionsString, Interaction, Collection, ClientEvents, ModalSubmitInteraction, ClientOptions, MessageCollectorOptions, InteractionCollectorOptions } from 'discord.js';
+import { Client, PermissionResolvable, InteractionContextType, ApplicationIntegrationType, LocalizationMap, ApplicationCommandOptionData, ToAPIApplicationCommandOptions, ChatInputCommandInteraction, AutocompleteInteraction, Message, ContextMenuCommandInteraction, CommandInteraction, PermissionsString, Interaction, Collection, ClientEvents, ModalSubmitInteraction, ClientOptions, MessageCollectorOptions, InteractionCollectorOptions } from 'discord.js';
 export { SlashCommandAttachmentOption as AttachmentOption, SlashCommandBooleanOption as BooleanOption, SlashCommandChannelOption as ChannelOption, SlashCommandIntegerOption as IntegerOption, SlashCommandMentionableOption as MentionableOption, SlashCommandNumberOption as NumberOption, SlashCommandRoleOption as RoleOption, SlashCommandStringOption as StringOption, SlashCommandSubcommandBuilder as SubcommandBuilder, SlashCommandSubcommandGroupBuilder as SubcommandGroupBuilder, SlashCommandUserOption as UserOption } from 'discord.js';
 import EventEmitter from 'events';
 
@@ -72,7 +72,7 @@ interface MessageCommandOptions$1 extends BaseCommandOptions {
 interface SlashCommandOptions$1 extends BaseAppCommandOptions {
     commandType: 'Slash';
     /** The Application Command Options of this Command */
-    options?: ApplicationCommandOptionData[];
+    options?: (ApplicationCommandOptionData | ToAPIApplicationCommandOptions)[];
     execute: (client: FrameworkClient<true>, interaction: ChatInputCommandInteraction) => Promise<unknown>;
     autocomplete?: (client: FrameworkClient<true>, interaction: AutocompleteInteraction) => Promise<unknown>;
 }
@@ -113,7 +113,7 @@ declare class AutocompleteModule extends EventEmitter {
     constructor(client: FrameworkClient);
     load(filepath: string, reload?: boolean): Promise<boolean>;
     loadAll(): Promise<void>;
-    reload(id: string): void;
+    reload(id: string): Promise<void>;
     private unload;
     private _handleInteraction;
 }
@@ -123,7 +123,7 @@ declare class ListenerModule {
     constructor(client: FrameworkClient);
     load(filepath: string, reload?: boolean): Promise<boolean>;
     loadAll(): Promise<void>;
-    reload(id: string): void;
+    reload(id: string): Promise<void>;
     private unload;
 }
 
@@ -143,7 +143,7 @@ declare class CommandsModule extends EventEmitter {
     setInteractionInterceptor(callback: (interaction: Interaction) => Promise<boolean>): (interaction: Interaction) => Promise<boolean>;
     load(filepath: string, reload?: boolean): Promise<boolean>;
     loadAll(): Promise<void>;
-    reload(id: string): void;
+    reload(id: string): Promise<void>;
     private unload;
     registerOnStart(guildIds: string[], commands?: Collection<string, FrameworkCommand>): Promise<void>;
     publishGlobal(commands?: Collection<string, FrameworkCommand>): Promise<false | Collection<string, discord_js.ApplicationCommand<{

package/build/index.d.ts

@@ -1,5 +1,5 @@
 import * as discord_js from 'discord.js';
-import { Client, PermissionResolvable, InteractionContextType, ApplicationIntegrationType, LocalizationMap, ApplicationCommandOptionData, ChatInputCommandInteraction, AutocompleteInteraction, Message, ContextMenuCommandInteraction, CommandInteraction, PermissionsString, Interaction, Collection, ClientEvents, ModalSubmitInteraction, ClientOptions, MessageCollectorOptions, InteractionCollectorOptions } from 'discord.js';
+import { Client, PermissionResolvable, InteractionContextType, ApplicationIntegrationType, LocalizationMap, ApplicationCommandOptionData, ToAPIApplicationCommandOptions, ChatInputCommandInteraction, AutocompleteInteraction, Message, ContextMenuCommandInteraction, CommandInteraction, PermissionsString, Interaction, Collection, ClientEvents, ModalSubmitInteraction, ClientOptions, MessageCollectorOptions, InteractionCollectorOptions } from 'discord.js';
 export { SlashCommandAttachmentOption as AttachmentOption, SlashCommandBooleanOption as BooleanOption, SlashCommandChannelOption as ChannelOption, SlashCommandIntegerOption as IntegerOption, SlashCommandMentionableOption as MentionableOption, SlashCommandNumberOption as NumberOption, SlashCommandRoleOption as RoleOption, SlashCommandStringOption as StringOption, SlashCommandSubcommandBuilder as SubcommandBuilder, SlashCommandSubcommandGroupBuilder as SubcommandGroupBuilder, SlashCommandUserOption as UserOption } from 'discord.js';
 import EventEmitter from 'events';
 
@@ -72,7 +72,7 @@ interface MessageCommandOptions$1 extends BaseCommandOptions {
 interface SlashCommandOptions$1 extends BaseAppCommandOptions {
     commandType: 'Slash';
     /** The Application Command Options of this Command */
-    options?: ApplicationCommandOptionData[];
+    options?: (ApplicationCommandOptionData | ToAPIApplicationCommandOptions)[];
     execute: (client: FrameworkClient<true>, interaction: ChatInputCommandInteraction) => Promise<unknown>;
     autocomplete?: (client: FrameworkClient<true>, interaction: AutocompleteInteraction) => Promise<unknown>;
 }
@@ -113,7 +113,7 @@ declare class AutocompleteModule extends EventEmitter {
     constructor(client: FrameworkClient);
     load(filepath: string, reload?: boolean): Promise<boolean>;
     loadAll(): Promise<void>;
-    reload(id: string): void;
+    reload(id: string): Promise<void>;
     private unload;
     private _handleInteraction;
 }
@@ -123,7 +123,7 @@ declare class ListenerModule {
     constructor(client: FrameworkClient);
     load(filepath: string, reload?: boolean): Promise<boolean>;
     loadAll(): Promise<void>;
-    reload(id: string): void;
+    reload(id: string): Promise<void>;
     private unload;
 }
 
@@ -143,7 +143,7 @@ declare class CommandsModule extends EventEmitter {
     setInteractionInterceptor(callback: (interaction: Interaction) => Promise<boolean>): (interaction: Interaction) => Promise<boolean>;
     load(filepath: string, reload?: boolean): Promise<boolean>;
     loadAll(): Promise<void>;
-    reload(id: string): void;
+    reload(id: string): Promise<void>;
     private unload;
     registerOnStart(guildIds: string[], commands?: Collection<string, FrameworkCommand>): Promise<void>;
     publishGlobal(commands?: Collection<string, FrameworkCommand>): Promise<false | Collection<string, discord_js.ApplicationCommand<{

package/build/index.js

@@ -262,7 +262,7 @@ var AutocompleteModule = class extends import_events.default {
     this.client.on("interactionCreate", (interaction) => this._handleInteraction(interaction));
   }
   async load(filepath, reload = false) {
-    const completerModule = await import((0, import_node_url.pathToFileURL)(filepath).href);
+    const completerModule = reload ? require(filepath) : await import((0, import_node_url.pathToFileURL)(filepath).href);
     const completer = completerModule.autocomplete ?? completerModule.default?.default ?? completerModule.default ?? completerModule;
     if (typeof completer !== "object" || !completer.name || completer.disabled) return false;
     if (!reload && this.client.autocomplete.has(completer.id)) throw new FrameworkError("ComponentAlreadyLoaded", "autocomplete", completer.id);
@@ -281,16 +281,16 @@ var AutocompleteModule = class extends import_events.default {
       }
     }
   }
-  reload(id) {
+  async reload(id) {
     const completer = this.client.autocomplete.get(id);
     if (!completer) throw new FrameworkError("UnknownComponent", "autocomplete", id);
     this.unload(id, true);
-    this.load(completer.filepath, true);
+    await this.load(completer.filepath, true);
   }
   unload(id, reload = false) {
     if (!this.client.autocomplete.has(id)) throw new FrameworkError("UnknownComponent", "autocomplete", id);
     const completer = this.client.autocomplete.get(id);
-    delete require.cache[completer.filepath];
+    delete require.cache[require.resolve(completer.filepath)];
     if (!reload) this.client.autocomplete.delete(id);
   }
   async _handleInteraction(interaction) {
@@ -333,7 +333,7 @@ var ListenerModule = class {
     this.client = client;
   }
   async load(filepath, reload = false) {
-    const listenerModule = await import((0, import_node_url2.pathToFileURL)(filepath).href);
+    const listenerModule = reload ? require(filepath) : await import((0, import_node_url2.pathToFileURL)(filepath).href);
     const listener = listenerModule.listener ?? listenerModule.default?.default ?? listenerModule.default ?? listenerModule;
     if (typeof listener !== "object" || !listener.name || listener.disabled) return false;
     if (!reload && this.client.events.has(listener.id)) throw new FrameworkError("ComponentAlreadyLoaded", "listener", listener.id);
@@ -354,17 +354,17 @@ var ListenerModule = class {
       }
     }
   }
-  reload(id) {
+  async reload(id) {
     if (!this.client.events.has(id)) throw new FrameworkError("UnknownComponent", "listener", id);
     const listener = this.client.events.get(id);
     this.unload(id, true);
-    this.load(listener.filepath, true);
+    await this.load(listener.filepath, true);
   }
   unload(id, reload = false) {
     if (!this.client.events.has(id)) throw new FrameworkError("UnknownComponent", "listener", id);
     const listener = this.client.events.get(id);
     if (listener._execute) this.client.off(listener.name, listener._execute);
-    delete require.cache[listener.filepath];
+    delete require.cache[require.resolve(listener.filepath)];
     if (!reload) this.client.events.delete(id);
   }
 };
@@ -393,7 +393,7 @@ var CommandsModule = class extends import_events2.default {
     return this.handler.InteractionCommandInterceptor = callback;
   }
   async load(filepath, reload = false) {
-    const commandModule = await import((0, import_node_url3.pathToFileURL)(filepath).href);
+    const commandModule = reload ? require(filepath) : await import((0, import_node_url3.pathToFileURL)(filepath).href);
     const command = commandModule?.command ?? commandModule?.default?.default ?? commandModule?.default ?? commandModule;
     if (typeof command !== "object" || !command.name || command.disabled) return false;
     if (!reload && this.client.commands.has(command.id)) throw new FrameworkError("ComponentAlreadyLoaded", "command", command.id);
@@ -415,16 +415,16 @@ var CommandsModule = class extends import_events2.default {
       }
     }
   }
-  reload(id) {
+  async reload(id) {
     if (!this.client.commands.has(id)) throw new FrameworkError("UnknownComponent", "commands", id);
     const command = this.client.commands.get(id);
     this.unload(id, true);
-    this.load(command.filepath, true);
+    await this.load(command.filepath, true);
   }
   unload(id, reload = false) {
     if (!this.client.commands.has(id)) throw new FrameworkError("UnknownComponent", "commands", id);
     const command = this.client.commands.get(id);
-    delete require.cache[command.filepath];
+    delete require.cache[require.resolve(command.filepath)];
     if (!reload) this.client.commands.delete(id);
   }
   async registerOnStart(guildIds, commands) {
@@ -460,7 +460,7 @@ var CommandsModule = class extends import_events2.default {
     const commandName = args.shift()?.toLowerCase();
     if (!commandName) return;
     const commandId = `Message:${commandName}`;
-    const command = this.client.commands.get(commandId) || this.client.commands.get(this.client.aliases.get(commandId) || "");
+    const command = this.client.commands.get(commandId) || this.client.commands.get(this.client.aliases.get(commandName) || "");
     if (!command || command.commandType !== "Message" || command.disabled || command.devOnly && !this.client.developers.includes(message.author.id)) return;
     if (!message.inGuild() && !command.contexts.includes("BotDM") || message.inGuild() && !command.contexts.includes("Guild")) return;
     if (message.inGuild() && command.memberPermissions) {
@@ -570,7 +570,9 @@ var CommandsModule = class extends import_events2.default {
       integrationTypes: resolveIntegrationTypes(command.integrationTypes),
       nameLocalizations: command.nameLocalizations,
       descriptionLocalizations: command.descriptionLocalizations,
-      ...command.commandType === "Slash" ? { options: command.options ?? [] } : {}
+      ...command.commandType === "Slash" ? {
+        options: command.options ? command.options.map((op) => typeof op.toJSON === "function" ? op.toJSON() : op) : []
+      } : {}
     };
   }
 };

package/build/index.mjs

@@ -217,7 +217,7 @@ var AutocompleteModule = class extends EventEmitter {
     this.client.on("interactionCreate", (interaction) => this._handleInteraction(interaction));
   }
   async load(filepath, reload = false) {
-    const completerModule = await import(pathToFileURL(filepath).href);
+    const completerModule = reload ? __require(filepath) : await import(pathToFileURL(filepath).href);
     const completer = completerModule.autocomplete ?? completerModule.default?.default ?? completerModule.default ?? completerModule;
     if (typeof completer !== "object" || !completer.name || completer.disabled) return false;
     if (!reload && this.client.autocomplete.has(completer.id)) throw new FrameworkError("ComponentAlreadyLoaded", "autocomplete", completer.id);
@@ -236,16 +236,16 @@ var AutocompleteModule = class extends EventEmitter {
       }
     }
   }
-  reload(id) {
+  async reload(id) {
     const completer = this.client.autocomplete.get(id);
     if (!completer) throw new FrameworkError("UnknownComponent", "autocomplete", id);
     this.unload(id, true);
-    this.load(completer.filepath, true);
+    await this.load(completer.filepath, true);
   }
   unload(id, reload = false) {
     if (!this.client.autocomplete.has(id)) throw new FrameworkError("UnknownComponent", "autocomplete", id);
     const completer = this.client.autocomplete.get(id);
-    delete __require.cache[completer.filepath];
+    delete __require.cache[__require.resolve(completer.filepath)];
     if (!reload) this.client.autocomplete.delete(id);
   }
   async _handleInteraction(interaction) {
@@ -288,7 +288,7 @@ var ListenerModule = class {
     this.client = client;
   }
   async load(filepath, reload = false) {
-    const listenerModule = await import(pathToFileURL2(filepath).href);
+    const listenerModule = reload ? __require(filepath) : await import(pathToFileURL2(filepath).href);
     const listener = listenerModule.listener ?? listenerModule.default?.default ?? listenerModule.default ?? listenerModule;
     if (typeof listener !== "object" || !listener.name || listener.disabled) return false;
     if (!reload && this.client.events.has(listener.id)) throw new FrameworkError("ComponentAlreadyLoaded", "listener", listener.id);
@@ -309,17 +309,17 @@ var ListenerModule = class {
       }
     }
   }
-  reload(id) {
+  async reload(id) {
     if (!this.client.events.has(id)) throw new FrameworkError("UnknownComponent", "listener", id);
     const listener = this.client.events.get(id);
     this.unload(id, true);
-    this.load(listener.filepath, true);
+    await this.load(listener.filepath, true);
   }
   unload(id, reload = false) {
     if (!this.client.events.has(id)) throw new FrameworkError("UnknownComponent", "listener", id);
     const listener = this.client.events.get(id);
     if (listener._execute) this.client.off(listener.name, listener._execute);
-    delete __require.cache[listener.filepath];
+    delete __require.cache[__require.resolve(listener.filepath)];
     if (!reload) this.client.events.delete(id);
   }
 };
@@ -348,7 +348,7 @@ var CommandsModule = class extends EventEmitter2 {
     return this.handler.InteractionCommandInterceptor = callback;
   }
   async load(filepath, reload = false) {
-    const commandModule = await import(pathToFileURL3(filepath).href);
+    const commandModule = reload ? __require(filepath) : await import(pathToFileURL3(filepath).href);
     const command = commandModule?.command ?? commandModule?.default?.default ?? commandModule?.default ?? commandModule;
     if (typeof command !== "object" || !command.name || command.disabled) return false;
     if (!reload && this.client.commands.has(command.id)) throw new FrameworkError("ComponentAlreadyLoaded", "command", command.id);
@@ -370,16 +370,16 @@ var CommandsModule = class extends EventEmitter2 {
       }
     }
   }
-  reload(id) {
+  async reload(id) {
     if (!this.client.commands.has(id)) throw new FrameworkError("UnknownComponent", "commands", id);
     const command = this.client.commands.get(id);
     this.unload(id, true);
-    this.load(command.filepath, true);
+    await this.load(command.filepath, true);
   }
   unload(id, reload = false) {
     if (!this.client.commands.has(id)) throw new FrameworkError("UnknownComponent", "commands", id);
     const command = this.client.commands.get(id);
-    delete __require.cache[command.filepath];
+    delete __require.cache[__require.resolve(command.filepath)];
     if (!reload) this.client.commands.delete(id);
   }
   async registerOnStart(guildIds, commands) {
@@ -415,7 +415,7 @@ var CommandsModule = class extends EventEmitter2 {
     const commandName = args.shift()?.toLowerCase();
     if (!commandName) return;
     const commandId = `Message:${commandName}`;
-    const command = this.client.commands.get(commandId) || this.client.commands.get(this.client.aliases.get(commandId) || "");
+    const command = this.client.commands.get(commandId) || this.client.commands.get(this.client.aliases.get(commandName) || "");
     if (!command || command.commandType !== "Message" || command.disabled || command.devOnly && !this.client.developers.includes(message.author.id)) return;
     if (!message.inGuild() && !command.contexts.includes("BotDM") || message.inGuild() && !command.contexts.includes("Guild")) return;
     if (message.inGuild() && command.memberPermissions) {
@@ -525,7 +525,9 @@ var CommandsModule = class extends EventEmitter2 {
       integrationTypes: resolveIntegrationTypes(command.integrationTypes),
       nameLocalizations: command.nameLocalizations,
       descriptionLocalizations: command.descriptionLocalizations,
-      ...command.commandType === "Slash" ? { options: command.options ?? [] } : {}
+      ...command.commandType === "Slash" ? {
+        options: command.options ? command.options.map((op) => typeof op.toJSON === "function" ? op.toJSON() : op) : []
+      } : {}
     };
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@guardbot/framework",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "A simple framework made for building discord bots with discord.js.",
   "main": "./build/index.js",
   "module": "./build/index.mjs",