@guardbot/framework 1.0.0 → 1.1.1

package/build/index.d.mts

@@ -1,6 +1,6 @@
 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';
-export { SlashCommandAttachmentOption as AttachmentOption, SlashCommandBooleanOption as BooleanOption, SlashCommandChannelOption as ChannelOption, SlashCommandIntegerOption as IntegerOption, SlashCommandMentionableOption as MentionableOption, SlashCommandNumberOption as NumberOption, SlashCommandRoleOption as RoleOption, SlashCommandOptionsOnlyBuilder as SlashCommandOptionsBuilder, SlashCommandStringOption as StringOption, SlashCommandSubcommandBuilder as SubcommandBuilder, SlashCommandSubcommandGroupBuilder as SubcommandGroupBuilder } 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';
 
 declare class FrameworkClient<Ready extends boolean = boolean> extends Client<Ready> {

package/build/index.d.ts

@@ -1,6 +1,6 @@
 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';
-export { SlashCommandAttachmentOption as AttachmentOption, SlashCommandBooleanOption as BooleanOption, SlashCommandChannelOption as ChannelOption, SlashCommandIntegerOption as IntegerOption, SlashCommandMentionableOption as MentionableOption, SlashCommandNumberOption as NumberOption, SlashCommandRoleOption as RoleOption, SlashCommandOptionsOnlyBuilder as SlashCommandOptionsBuilder, SlashCommandStringOption as StringOption, SlashCommandSubcommandBuilder as SubcommandBuilder, SlashCommandSubcommandGroupBuilder as SubcommandGroupBuilder } 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';
 
 declare class FrameworkClient<Ready extends boolean = boolean> extends Client<Ready> {

package/build/index.js

@@ -43,10 +43,10 @@ __export(index_exports, {
   NumberOption: () => import_discord7.SlashCommandNumberOption,
   RoleOption: () => import_discord7.SlashCommandRoleOption,
   SlashCommand: () => SlashCommand,
-  SlashCommandOptionsBuilder: () => import_discord7.SlashCommandOptionsOnlyBuilder,
   StringOption: () => import_discord7.SlashCommandStringOption,
   SubcommandBuilder: () => import_discord7.SlashCommandSubcommandBuilder,
-  SubcommandGroupBuilder: () => import_discord7.SlashCommandSubcommandGroupBuilder
+  SubcommandGroupBuilder: () => import_discord7.SlashCommandSubcommandGroupBuilder,
+  UserOption: () => import_discord7.SlashCommandUserOption
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -263,7 +263,7 @@ var AutocompleteModule = class extends import_events.default {
   }
   async load(filepath, reload = false) {
     const completerModule = await import((0, import_node_url.pathToFileURL)(filepath).href);
-    const completer = completerModule.autocomplete ?? completerModule.default ?? completerModule;
+    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);
     completer.filepath = filepath;
@@ -334,7 +334,7 @@ var ListenerModule = class {
   }
   async load(filepath, reload = false) {
     const listenerModule = await import((0, import_node_url2.pathToFileURL)(filepath).href);
-    const listener = listenerModule.listener ?? listenerModule.default ?? listenerModule;
+    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);
     listener.filepath = filepath;
@@ -606,9 +606,9 @@ var FrameworkClient = class extends import_discord5.Client {
     });
   }
   async start(token) {
+    await this.listenerModule.loadAll();
     await this.autocompleteModule.loadAll();
     await this.commandsModule.loadAll();
-    await this.listenerModule.loadAll();
     await this.login(token);
   }
 };
@@ -692,8 +692,8 @@ var import_discord7 = require("discord.js");
   NumberOption,
   RoleOption,
   SlashCommand,
-  SlashCommandOptionsBuilder,
   StringOption,
   SubcommandBuilder,
-  SubcommandGroupBuilder
+  SubcommandGroupBuilder,
+  UserOption
 });

package/build/index.mjs

@@ -218,7 +218,7 @@ var AutocompleteModule = class extends EventEmitter {
   }
   async load(filepath, reload = false) {
     const completerModule = await import(pathToFileURL(filepath).href);
-    const completer = completerModule.autocomplete ?? completerModule.default ?? completerModule;
+    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);
     completer.filepath = filepath;
@@ -289,7 +289,7 @@ var ListenerModule = class {
   }
   async load(filepath, reload = false) {
     const listenerModule = await import(pathToFileURL2(filepath).href);
-    const listener = listenerModule.listener ?? listenerModule.default ?? listenerModule;
+    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);
     listener.filepath = filepath;
@@ -561,9 +561,9 @@ var FrameworkClient = class extends DiscordClient {
     });
   }
   async start(token) {
+    await this.listenerModule.loadAll();
     await this.autocompleteModule.loadAll();
     await this.commandsModule.loadAll();
-    await this.listenerModule.loadAll();
     await this.login(token);
   }
 };
@@ -640,9 +640,9 @@ import {
   SlashCommandNumberOption,
   SlashCommandRoleOption,
   SlashCommandStringOption,
+  SlashCommandUserOption,
   SlashCommandSubcommandBuilder,
-  SlashCommandSubcommandGroupBuilder,
-  SlashCommandOptionsOnlyBuilder
+  SlashCommandSubcommandGroupBuilder
 } from "discord.js";
 export {
   SlashCommandAttachmentOption as AttachmentOption,
@@ -658,8 +658,8 @@ export {
   SlashCommandNumberOption as NumberOption,
   SlashCommandRoleOption as RoleOption,
   SlashCommand,
-  SlashCommandOptionsOnlyBuilder as SlashCommandOptionsBuilder,
   SlashCommandStringOption as StringOption,
   SlashCommandSubcommandBuilder as SubcommandBuilder,
-  SlashCommandSubcommandGroupBuilder as SubcommandGroupBuilder
+  SlashCommandSubcommandGroupBuilder as SubcommandGroupBuilder,
+  SlashCommandUserOption as UserOption
 };

package/package.json

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