@stelliajs/framework 1.0.6 → 1.1.0-dev-2

package/dist/client/StelliaUtils.js

@@ -44,7 +44,10 @@ export class StelliaUtils {
     handleAutoCompleteInteraction = async (interaction) => {
         try {
             const interactionAutoComplete = interaction;
-            const autoComplete = this.client.managers.autoCompletes?.get(interactionAutoComplete.commandName);
+            const autoCompleteManager = this.client.managers.autoCompletes;
+            if (!autoCompleteManager)
+                return;
+            const autoComplete = autoCompleteManager.getByCustomId(interactionAutoComplete.commandName);
             if (!autoComplete)
                 return;
             await autoComplete.execute(this.client, interactionAutoComplete);
@@ -56,7 +59,10 @@ export class StelliaUtils {
     handleButtonInteraction = async (interaction) => {
         try {
             const buttonInteraction = interaction;
-            const button = this.client.managers.buttons?.get(buttonInteraction.customId);
+            const buttonManager = this.client.managers.buttons;
+            if (!buttonManager)
+                return;
+            const button = buttonManager.getByCustomId(buttonInteraction.customId) || buttonManager.getByRegex(buttonInteraction.customId);
             if (!button)
                 return;
             await button.execute(this.client, buttonInteraction);
@@ -68,7 +74,10 @@ export class StelliaUtils {
     handleCommandInteraction = async (interaction) => {
         try {
             const interactionCommand = interaction;
-            const command = this.client.managers.commands?.get(interactionCommand.commandName);
+            const commandManager = this.client.managers.commands;
+            if (!commandManager)
+                return;
+            const command = commandManager.getByCustomId(interactionCommand.commandName);
             if (!command)
                 return;
             await command.execute(this.client, interactionCommand);
@@ -96,7 +105,10 @@ export class StelliaUtils {
     handleModalInteraction = async (interaction) => {
         try {
             const interactionModal = interaction;
-            const modal = this.client.managers.modals?.get(interactionModal.customId);
+            const modalManager = this.client.managers.modals;
+            if (!modalManager)
+                return;
+            const modal = modalManager.getByCustomId(interactionModal.customId) || modalManager.getByRegex(interactionModal.customId);
             if (!modal)
                 return;
             await modal.execute(this.client, interactionModal);
@@ -108,7 +120,10 @@ export class StelliaUtils {
     handleSelectMenuInteraction = async (interaction) => {
         try {
             const interactionSelectMenu = interaction;
-            const selectMenu = this.client.managers.selectMenus?.get(interactionSelectMenu.customId);
+            const selectMenuManager = this.client.managers.selectMenus;
+            if (!selectMenuManager)
+                return;
+            const selectMenu = selectMenuManager.getByCustomId(interactionSelectMenu.customId) || selectMenuManager.getByRegex(interactionSelectMenu.customId);
             if (!selectMenu)
                 return;
             await selectMenu.execute(this.client, interactionSelectMenu);
@@ -119,7 +134,10 @@ export class StelliaUtils {
     };
     handleMessageContextMenuInteraction = async (interaction) => {
         try {
-            const messageContextMenu = this.client.managers.contextMenus?.get(interaction.commandName);
+            const contextMenuManager = this.client.managers.contextMenus;
+            if (!contextMenuManager)
+                return;
+            const messageContextMenu = contextMenuManager.getByCustomId(interaction.commandName);
             if (!messageContextMenu)
                 return;
             await messageContextMenu.execute(this.client, interaction);
@@ -130,7 +148,10 @@ export class StelliaUtils {
     };
     handleUserContextMenuInteraction = async (interaction) => {
         try {
-            const userContextMenu = this.client.managers.contextMenus?.get(interaction.commandName);
+            const contextMenuManager = this.client.managers.contextMenus;
+            if (!contextMenuManager)
+                return;
+            const userContextMenu = contextMenuManager.getByCustomId(interaction.commandName);
             if (!userContextMenu)
                 return;
             await userContextMenu.execute(this.client, interaction);

package/dist/managers/AutoCompleteManager.d.ts

@@ -1,11 +1,12 @@
 import { Collection } from "discord.js";
 import { type StelliaClient } from "../client/index.js";
 import { BaseManager } from "./index.js";
-import { type CustomId } from "../typescript/index.js";
+import { type StructureCustomId, type InteractionCustomId } from "../typescript/index.js";
 export declare class AutoCompleteManager extends BaseManager {
-    private autoCompletes;
+    private interactions;
     constructor(client: StelliaClient, directory: string);
     loadData(): Promise<void>;
-    get<AutoCompleteStructure>(id: CustomId): AutoCompleteStructure | undefined;
-    getAll<AutoCompleteStructure>(): Collection<CustomId, AutoCompleteStructure>;
+    getByCustomId<AutoCompleteStructure>(id: InteractionCustomId): AutoCompleteStructure | undefined;
+    getByRegex<AutoCompleteStructure>(id: InteractionCustomId): AutoCompleteStructure | undefined;
+    getAll<AutoCompleteStructure>(): Collection<StructureCustomId, AutoCompleteStructure>;
 }

package/dist/managers/AutoCompleteManager.js

@@ -2,20 +2,23 @@ import { Collection } from "discord.js";
 import { BaseManager } from "./index.js";
 import { requiredFiles } from "../utils/index.js";
 export class AutoCompleteManager extends BaseManager {
-    autoCompletes = new Collection();
+    interactions = new Collection();
     constructor(client, directory) {
         super(client, directory);
     }
     async loadData() {
         const autoCompletes = await requiredFiles(this.directoryPath);
-        this.autoCompletes = autoCompletes;
+        this.interactions = autoCompletes;
     }
-    get(id) {
-        const autoComplete = this.autoCompletes.get(id) ?? undefined;
+    getByCustomId(id) {
+        const autoComplete = this.interactions.get(id) ?? undefined;
         return autoComplete;
     }
+    getByRegex(id) {
+        return undefined;
+    }
     getAll() {
-        const autoCompletes = this.autoCompletes;
+        const autoCompletes = this.interactions;
         return autoCompletes;
     }
 }

package/dist/managers/BaseManager.d.ts

@@ -1,6 +1,6 @@
 import { Collection } from "discord.js";
 import { type StelliaClient } from "../client/index.js";
-import { type CustomId } from "../typescript/index.js";
+import { type StructureCustomId, type InteractionCustomId } from "../typescript/index.js";
 import { type AnyInteractionStructure } from "../structures/index.js";
 export interface ManagerOptions {
     directoryPath: string;
@@ -10,6 +10,7 @@ export declare abstract class BaseManager {
     readonly directoryPath: string;
     constructor(client: StelliaClient, directory: string);
     abstract loadData(): void;
-    abstract get<InteractionStructure extends AnyInteractionStructure>(id: CustomId): InteractionStructure | undefined;
-    abstract getAll<InteractionStructure extends AnyInteractionStructure>(): Collection<CustomId, InteractionStructure>;
+    abstract getByCustomId<InteractionStructure extends AnyInteractionStructure>(id: InteractionCustomId): InteractionStructure | undefined;
+    abstract getByRegex<InteractionStructure extends AnyInteractionStructure>(id: InteractionCustomId): InteractionStructure | undefined;
+    abstract getAll<InteractionStructure extends AnyInteractionStructure>(): Collection<StructureCustomId, InteractionStructure>;
 }

package/dist/managers/ButtonManager.d.ts

@@ -2,11 +2,12 @@ import { Collection } from "discord.js";
 import { type StelliaClient } from "../client/index.js";
 import { BaseManager } from "./index.js";
 import { type ButtonStructure } from "../structures/index.js";
-import { type CustomId } from "../typescript/index.js";
+import { type StructureCustomId, type InteractionCustomId } from "../typescript/index.js";
 export declare class ButtonManager extends BaseManager {
-    buttons: Collection<CustomId, ButtonStructure>;
+    interactions: Collection<StructureCustomId, ButtonStructure>;
     constructor(client: StelliaClient, directory: string);
     loadData(): Promise<void>;
-    get<ButtonStructure>(id: CustomId): ButtonStructure | undefined;
-    getAll<ButtonStructure>(): Collection<CustomId, ButtonStructure>;
+    getByCustomId<ButtonStructure>(id: InteractionCustomId): ButtonStructure | undefined;
+    getByRegex<ButtonStructure>(id: InteractionCustomId): ButtonStructure | undefined;
+    getAll<ButtonStructure>(): Collection<StructureCustomId, ButtonStructure>;
 }

package/dist/managers/ButtonManager.js

@@ -2,20 +2,30 @@ import { Collection } from "discord.js";
 import { BaseManager } from "./index.js";
 import { requiredFiles } from "../utils/index.js";
 export class ButtonManager extends BaseManager {
-    buttons = new Collection();
+    interactions = new Collection();
     constructor(client, directory) {
         super(client, directory);
     }
     async loadData() {
         const buttons = await requiredFiles(this.directoryPath);
-        this.buttons = buttons;
+        this.interactions = buttons;
     }
-    get(id) {
-        const button = this.buttons.get(id) ?? undefined;
+    getByCustomId(id) {
+        const button = this.interactions.get(id) ?? undefined;
+        return button;
+    }
+    getByRegex(id) {
+        let button;
+        for (const [customId, action] of this.interactions.entries()) {
+            if (customId instanceof RegExp && customId.test(id)) {
+                button = action;
+                break;
+            }
+        }
         return button;
     }
     getAll() {
-        const buttons = this.buttons;
+        const buttons = this.interactions;
         return buttons;
     }
 }

package/dist/managers/CommandManager.d.ts

@@ -2,11 +2,12 @@ import { Collection } from "discord.js";
 import { type StelliaClient } from "../client/index.js";
 import { BaseManager } from "./index.js";
 import { type CommandStructure } from "../structures/index.js";
-import { type CustomId } from "../typescript/index.js";
+import { type StructureCustomId, type InteractionCustomId } from "../typescript/index.js";
 export declare class CommandManager extends BaseManager {
-    commands: Collection<CustomId, CommandStructure>;
+    interactions: Collection<StructureCustomId, CommandStructure>;
     constructor(client: StelliaClient, directory: string);
     loadData(): Promise<void>;
-    get<CommandStructure>(id: CustomId): CommandStructure | undefined;
-    getAll<CommandStructure>(): Collection<CustomId, CommandStructure>;
+    getByCustomId<CommandStructure>(id: InteractionCustomId): CommandStructure | undefined;
+    getByRegex<CommandStructure>(id: InteractionCustomId): CommandStructure | undefined;
+    getAll<CommandStructure>(): Collection<StructureCustomId, CommandStructure>;
 }

package/dist/managers/CommandManager.js

@@ -2,20 +2,23 @@ import { Collection } from "discord.js";
 import { BaseManager } from "./index.js";
 import { requiredFiles } from "../utils/index.js";
 export class CommandManager extends BaseManager {
-    commands = new Collection();
+    interactions = new Collection();
     constructor(client, directory) {
         super(client, directory);
     }
     async loadData() {
         const commands = await requiredFiles(this.directoryPath);
-        this.commands = commands;
+        this.interactions = commands;
     }
-    get(id) {
-        const command = this.commands.get(id) ?? undefined;
+    getByCustomId(id) {
+        const command = this.interactions.get(id) ?? undefined;
         return command;
     }
+    getByRegex(id) {
+        return undefined;
+    }
     getAll() {
-        const commands = this.commands;
+        const commands = this.interactions;
         return commands;
     }
 }

package/dist/managers/ContextMenuManager.d.ts

@@ -2,11 +2,12 @@ import { Collection } from "discord.js";
 import { type StelliaClient } from "../client/index.js";
 import { BaseManager } from "./index.js";
 import { type ContextMenuStructure } from "../structures/index.js";
-import { type CustomId } from "../typescript/index.js";
+import { type StructureCustomId, type InteractionCustomId } from "../typescript/index.js";
 export declare class ContextMenuManager extends BaseManager {
-    contextMenus: Collection<CustomId, ContextMenuStructure>;
+    interactions: Collection<StructureCustomId, ContextMenuStructure>;
     constructor(client: StelliaClient, directory: string);
     loadData(): Promise<void>;
-    get<ContextMenuStructure>(id: CustomId): ContextMenuStructure | undefined;
-    getAll<ContextMenuStructure>(): Collection<CustomId, ContextMenuStructure>;
+    getByCustomId<ContextMenuStructure>(id: InteractionCustomId): ContextMenuStructure | undefined;
+    getByRegex<ContextMenuStructure>(id: InteractionCustomId): ContextMenuStructure | undefined;
+    getAll<ContextMenuStructure>(): Collection<StructureCustomId, ContextMenuStructure>;
 }

package/dist/managers/ContextMenuManager.js

@@ -2,20 +2,23 @@ import { Collection } from "discord.js";
 import { BaseManager } from "./index.js";
 import { requiredFiles } from "../utils/index.js";
 export class ContextMenuManager extends BaseManager {
-    contextMenus = new Collection();
+    interactions = new Collection();
     constructor(client, directory) {
         super(client, directory);
     }
     async loadData() {
         const contextMenus = await requiredFiles(this.directoryPath);
-        this.contextMenus = contextMenus;
+        this.interactions = contextMenus;
     }
-    get(id) {
-        const contextMenu = this.contextMenus.get(id) ?? undefined;
+    getByCustomId(id) {
+        const contextMenu = this.interactions.get(id) ?? undefined;
         return contextMenu;
     }
+    getByRegex(id) {
+        return undefined;
+    }
     getAll() {
-        const contextMenus = this.contextMenus;
+        const contextMenus = this.interactions;
         return contextMenus;
     }
 }

package/dist/managers/EventManager.d.ts

@@ -2,11 +2,12 @@ import { Collection } from "discord.js";
 import { type StelliaClient } from "../client/index.js";
 import { BaseManager } from "./index.js";
 import { type EventStructure } from "../structures/index.js";
-import { type CustomId } from "../typescript/index.js";
+import { type StructureCustomId, type InteractionCustomId } from "../typescript/index.js";
 export declare class EventManager extends BaseManager {
-    events: Collection<CustomId, EventStructure>;
+    interactions: Collection<StructureCustomId, EventStructure>;
     constructor(client: StelliaClient, directoryPath: string);
     loadData(): Promise<void>;
-    get<EventStructure>(id: CustomId): EventStructure | undefined;
-    getAll<EventStructure>(): Collection<CustomId, EventStructure>;
+    getByCustomId<EventStructure>(id: InteractionCustomId): EventStructure | undefined;
+    getByRegex<EventStructure>(id: InteractionCustomId): EventStructure | undefined;
+    getAll<EventStructure>(): Collection<StructureCustomId, EventStructure>;
 }

package/dist/managers/EventManager.js

@@ -2,14 +2,14 @@ import { Collection } from "discord.js";
 import { BaseManager } from "./index.js";
 import { requiredFiles } from "../utils/index.js";
 export class EventManager extends BaseManager {
-    events = new Collection();
+    interactions = new Collection();
     constructor(client, directoryPath) {
         super(client, directoryPath);
     }
     async loadData() {
         const events = await requiredFiles(this.directoryPath);
-        this.events = events;
-        for (const event of this.events.values()) {
+        this.interactions = events;
+        for (const event of this.interactions.values()) {
             const { name, once } = event.data;
             if (once) {
                 this.client.once(name, (...args) => event.execute(this.client, ...args));
@@ -19,12 +19,15 @@ export class EventManager extends BaseManager {
             }
         }
     }
-    get(id) {
-        const event = this.events.get(id) ?? undefined;
+    getByCustomId(id) {
+        const event = this.interactions.get(id) ?? undefined;
         return event;
     }
+    getByRegex(id) {
+        return undefined;
+    }
     getAll() {
-        const events = this.events;
+        const events = this.interactions;
         return events;
     }
 }

package/dist/managers/ModalManager.d.ts

@@ -2,11 +2,12 @@ import { Collection } from "discord.js";
 import { type StelliaClient } from "../client/index.js";
 import { BaseManager } from "./index.js";
 import { type ModalStructure } from "../structures/index.js";
-import { type CustomId } from "../typescript/index.js";
+import { type StructureCustomId, type InteractionCustomId } from "../typescript/index.js";
 export declare class ModalManager extends BaseManager {
-    modals: Collection<CustomId, ModalStructure>;
+    interactions: Collection<StructureCustomId, ModalStructure>;
     constructor(client: StelliaClient, directory: string);
     loadData(): Promise<void>;
-    get<ModalStructure>(id: CustomId): ModalStructure | undefined;
-    getAll<ModalStructure>(): Collection<CustomId, ModalStructure>;
+    getByCustomId<ModalStructure>(id: InteractionCustomId): ModalStructure | undefined;
+    getByRegex<ModalStructure>(id: InteractionCustomId): ModalStructure | undefined;
+    getAll<ModalStructure>(): Collection<StructureCustomId, ModalStructure>;
 }

package/dist/managers/ModalManager.js

@@ -2,20 +2,30 @@ import { Collection } from "discord.js";
 import { BaseManager } from "./index.js";
 import { requiredFiles } from "../utils/index.js";
 export class ModalManager extends BaseManager {
-    modals = new Collection();
+    interactions = new Collection();
     constructor(client, directory) {
         super(client, directory);
     }
     async loadData() {
         const modals = await requiredFiles(this.directoryPath);
-        this.modals = modals;
+        this.interactions = modals;
     }
-    get(id) {
-        const modal = this.modals.get(id) ?? undefined;
+    getByCustomId(id) {
+        const modal = this.interactions.get(id) ?? undefined;
+        return modal;
+    }
+    getByRegex(id) {
+        let modal;
+        for (const [customId, action] of this.interactions.entries()) {
+            if (customId instanceof RegExp && customId.test(id)) {
+                modal = action;
+                break;
+            }
+        }
         return modal;
     }
     getAll() {
-        const modals = this.modals;
+        const modals = this.interactions;
         return modals;
     }
 }

package/dist/managers/SelectMenuManager.d.ts

@@ -2,11 +2,12 @@ import { Collection } from "discord.js";
 import { type StelliaClient } from "../client/index.js";
 import { BaseManager } from "./index.js";
 import { type SelectMenuStructure } from "../structures/index.js";
-import { type CustomId } from "../typescript/index.js";
+import { type StructureCustomId, type InteractionCustomId } from "../typescript/index.js";
 export declare class SelectMenuManager extends BaseManager {
-    selectMenus: Collection<CustomId, SelectMenuStructure>;
+    interactions: Collection<StructureCustomId, SelectMenuStructure>;
     constructor(client: StelliaClient, directory: string);
     loadData(): Promise<void>;
-    get<SelectMenuStructure>(id: CustomId): SelectMenuStructure | undefined;
-    getAll<SelectMenuStructure>(): Collection<CustomId, SelectMenuStructure>;
+    getByCustomId<SelectMenuStructure>(id: InteractionCustomId): SelectMenuStructure | undefined;
+    getByRegex<SelectMenuStructure>(id: InteractionCustomId): SelectMenuStructure | undefined;
+    getAll<SelectMenuStructure>(): Collection<StructureCustomId, SelectMenuStructure>;
 }

package/dist/managers/SelectMenuManager.js

@@ -2,20 +2,30 @@ import { Collection } from "discord.js";
 import { BaseManager } from "./index.js";
 import { requiredFiles } from "../utils/index.js";
 export class SelectMenuManager extends BaseManager {
-    selectMenus = new Collection();
+    interactions = new Collection();
     constructor(client, directory) {
         super(client, directory);
     }
     async loadData() {
         const selectMenus = await requiredFiles(this.directoryPath);
-        this.selectMenus = selectMenus;
+        this.interactions = selectMenus;
     }
-    get(id) {
-        const selectMenu = this.selectMenus.get(id) ?? undefined;
+    getByCustomId(id) {
+        const selectMenu = this.interactions.get(id) ?? undefined;
         return selectMenu;
     }
+    getByRegex(id) {
+        let button;
+        for (const [customId, action] of this.interactions.entries()) {
+            if (customId instanceof RegExp && customId.test(id)) {
+                button = action;
+                break;
+            }
+        }
+        return button;
+    }
     getAll() {
-        const selectMenus = this.selectMenus;
+        const selectMenus = this.interactions;
         return selectMenus;
     }
 }

package/dist/structures/Event.d.ts

@@ -1,11 +1,9 @@
 import { type Awaitable, type ClientEvents } from "discord.js";
 import { type StelliaClient } from "../client/index.js";
-type EventArguments<Event extends keyof ClientEvents> = ClientEvents[Event];
 export interface EventStructure<Event extends keyof ClientEvents = keyof ClientEvents> {
     data: {
-        name: keyof ClientEvents;
+        name: Event;
         once: boolean;
     };
-    execute(client: StelliaClient, ...args: EventArguments<Event>): Awaitable<unknown>;
+    execute(client: StelliaClient, ...args: ClientEvents[Event]): Awaitable<unknown>;
 }
-export {};

package/dist/structures/Interaction.d.ts

@@ -26,7 +26,7 @@ export interface SelectMenuStructure {
 }
 export type AnyInteractionStructure = AutoCompleteStructure | ButtonStructure | CommandStructure | ContextMenuStructure | ModalStructure | SelectMenuStructure;
 interface DefaultDataStructure {
-    name: string;
+    name: string | RegExp;
     once: boolean;
 }
 export {};

package/dist/typescript/types.d.ts

@@ -1,6 +1,7 @@
 import { type AnySelectMenuInteraction, type AutocompleteInteraction, type ButtonInteraction, type ChatInputCommandInteraction, type ContextMenuCommandInteraction, type ModalSubmitInteraction, type UserContextMenuCommandInteraction } from "discord.js";
 import { type AutoCompleteManager, type ButtonManager, type CommandManager, type ContextMenuManager, type EventManager, type ModalManager, type SelectMenuManager } from "../managers/index.js";
-export type CustomId = string;
+export type StructureCustomId = string | RegExp;
+export type InteractionCustomId = string;
 export type AnyInteraction = AutocompleteInteraction<"cached"> | ButtonInteraction<"cached"> | ChatInputCommandInteraction<"cached"> | ContextMenuCommandInteraction<"cached"> | ModalSubmitInteraction<"cached"> | AnySelectMenuInteraction<"cached"> | UserContextMenuCommandInteraction<"cached">;
 export declare enum InteractionType {
     Autocomplete = "Autocomplete",

package/dist/utils/files.d.ts

@@ -1,4 +1,4 @@
 import { Collection } from "discord.js";
 import { type AnyInteractionStructure } from "../structures/index.js";
-import { type CustomId } from "../typescript/index.js";
-export declare const requiredFiles: <InteractionStructure extends AnyInteractionStructure>(directoryPath: string) => Promise<Collection<CustomId, InteractionStructure>>;
+import { type StructureCustomId } from "../typescript/index.js";
+export declare const requiredFiles: <InteractionStructure extends AnyInteractionStructure>(directoryPath: string) => Promise<Collection<StructureCustomId, InteractionStructure>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stelliajs/framework",
-  "version": "1.0.6",
+  "version": "1.1.0-dev-2",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "scripts": {