Merge pull request #75 from StelliaJS/develop

release: V1.5.4

Author: Tweentyy

README.md

@@ -11,7 +11,6 @@ Recommended architecture for StelliaJS project.
 
 ```
 .
-├── dist // Build folder
 ├── src/
 │   ├── commands/
 │   │   ├── contextMenus/
@@ -41,7 +40,7 @@ Recommended architecture for StelliaJS project.
 │   └── index.ts
 ├── .env
 ├── package.json
-├── package-lock.json
+├── pnpm-lock.yaml
 ├── stellia.json
 └── tsconfig.json
 ```

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@stelliajs/framework",
-	"version": "1.5.3",
+	"version": "1.5.4",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
 	"scripts": {

src/client/StelliaClient.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs";
-import path from "path";
-import { pathToFileURL } from "url";
+import path from "node:path";
+import { pathToFileURL } from "node:url";
 import { Client, type ClientOptions, type Interaction } from "discord.js";
 import { StelliaUtils } from "@client/index.js";
 import {
@@ -14,8 +14,8 @@ import {
 	SelectMenuManager
 } from "@managers/index.js";
 import {
-    type ClientEnvironment, type GuildConfiguration,
-    type GuildConfigurationType,
+    type ClientEnvironment,
+    type GuildConfiguration,
     type GuildsConfiguration,
     type Manager,
     type Managers
@@ -102,26 +102,24 @@ export class StelliaClient<Ready extends boolean = boolean> extends Client<Ready
 		return new Promise((resolve, reject) => {
 			fs.readFile(filePath, async (err, data) => {
 				if (err) {
-					return reject(err);
+                    return reject(new Error("stellia.json file not found"));
 				}
 
-				try {
-					const environments = JSON.parse(data.toString()).environments;
-					if (!Object.keys(environments).includes(chosenEnvironment)) {
-						return reject(new Error("Invalid environment"));
-					}
-
-					const environmentData = environments[chosenEnvironment];
-					const environmentPath = environmentData.production
-						? StelliaClient.convertFilePathToProduction(environmentData.file)
-						: environmentData.file;
-					const environmentAbsolutePath = pathToFileURL(path.join(srcPath, "..", environmentPath)).href;
-					const environmentFile = await import(environmentAbsolutePath);
-					resolve(environmentFile.environment);
-				} catch (error) {
-					reject(error);
-				}
-			});
+                const environments = JSON.parse(data.toString()).environments;
+                if (!Object.keys(environments).includes(chosenEnvironment)) {
+                    return reject(new Error("Invalid environment"));
+                }
+
+                const environmentData = environments[chosenEnvironment];
+                const environmentPath = environmentData.production
+                    ? StelliaClient.convertFilePathToProduction(environmentData.file)
+                    : environmentData.file;
+
+                const environmentAbsolutePath = pathToFileURL(path.join(srcPath, "..", environmentPath)).href;
+                import(environmentAbsolutePath)
+                    .then((environmentFile) => resolve(environmentFile.environment))
+                    .catch(() => reject(new Error("Error parsing stellia.json file")));
+            });
 		});
 	};
 
@@ -133,14 +131,14 @@ export class StelliaClient<Ready extends boolean = boolean> extends Client<Ready
 		await this.utils.handleInteraction(interaction);
 	};
 
-	private areManagersLoaded = (): boolean => {
+	private readonly areManagersLoaded = (): boolean => {
 		const managers = Object.values(this.managers);
 		return managers.length === 0
 			? true
 			: managers.every((manager: Manager) => manager.isManagerLoaded());
 	};
 
-	private static convertFilePathToProduction = (filePath: string): string => {
+	private static readonly convertFilePathToProduction = (filePath: string): string => {
 		return filePath.replace("src", "dist").replace(".ts", ".js");
 	};
 }

src/client/StelliaUtils.ts

@@ -110,7 +110,7 @@ export class StelliaUtils {
         }
     };
 
-    private handleAutoCompleteInteraction = async (interaction: Interaction<"cached">): Promise<void> => {
+    private readonly handleAutoCompleteInteraction = async (interaction: Interaction<"cached">): Promise<void> => {
         try {
             const autoCompleteInteraction = interaction as AutocompleteInteraction<"cached">;
             const autoCompleteManager = this.client.managers.autoCompletes;
@@ -132,7 +132,7 @@ export class StelliaUtils {
         }
     };
 
-    private handleButtonInteraction = async (interaction: Interaction<"cached">): Promise<void> => {
+    private readonly handleButtonInteraction = async (interaction: Interaction<"cached">): Promise<void> => {
         try {
             const buttonInteraction = interaction as ButtonInteraction<"cached">;
             const buttonManager = this.client.managers.buttons;
@@ -160,7 +160,7 @@ export class StelliaUtils {
         }
     };
 
-    private handleCommandInteraction = async (interaction: Interaction<"cached">): Promise<void> => {
+    private readonly handleCommandInteraction = async (interaction: Interaction<"cached">): Promise<void> => {
         try {
             const commandInteraction = interaction as ChatInputCommandInteraction<"cached">;
             const commandManager = this.client.managers.commands;
@@ -186,7 +186,7 @@ export class StelliaUtils {
         }
     };
 
-    private handleContextMenuInteraction = async (interaction: Interaction<"cached">): Promise<void> => {
+    private readonly handleContextMenuInteraction = async (interaction: Interaction<"cached">): Promise<void> => {
         try {
             const interactionContextMenu = interaction as ContextMenuCommandInteraction<"cached">;
             if (interactionContextMenu.commandType === ApplicationCommandType.Message) {
@@ -201,7 +201,7 @@ export class StelliaUtils {
         }
     };
 
-    private handleModalInteraction = async (interaction: Interaction<"cached">): Promise<void> => {
+    private readonly handleModalInteraction = async (interaction: Interaction<"cached">): Promise<void> => {
         try {
             const modalInteraction = interaction as ModalSubmitInteraction<"cached">;
             const modalManager = this.client.managers.modals;
@@ -229,7 +229,7 @@ export class StelliaUtils {
         }
     };
 
-    private handleSelectMenuInteraction = async (interaction: Interaction<"cached">): Promise<void> => {
+    private readonly handleSelectMenuInteraction = async (interaction: Interaction<"cached">): Promise<void> => {
         try {
             const selectMenuInteraction = interaction as AnySelectMenuInteraction<"cached">;
             const selectMenuManager = this.client.managers.selectMenus;
@@ -257,7 +257,7 @@ export class StelliaUtils {
         }
     };
 
-    private handleMessageContextMenuInteraction = async (interaction: MessageContextMenuCommandInteraction<"cached">): Promise<void> => {
+    private readonly handleMessageContextMenuInteraction = async (interaction: MessageContextMenuCommandInteraction<"cached">): Promise<void> => {
         try {
             const contextMenuManager = this.client.managers.contextMenus;
             if (!contextMenuManager) return;
@@ -282,7 +282,7 @@ export class StelliaUtils {
         }
     };
 
-    private handleUserContextMenuInteraction = async (interaction: UserContextMenuCommandInteraction<"cached">): Promise<void> => {
+    private readonly handleUserContextMenuInteraction = async (interaction: UserContextMenuCommandInteraction<"cached">): Promise<void> => {
         try {
             const contextMenuManager = this.client.managers.contextMenus;
             if (!contextMenuManager) return;

src/managers/AutoCompleteManager.ts

@@ -18,13 +18,21 @@ export class AutoCompleteManager extends BaseManager {
 		this.setManagerLoaded();
 	}
 
-	public getByCustomId<AutoCompleteStructure>(id: InteractionCustomId): AutoCompleteStructure | undefined {
-		const autoComplete = (this.interactions.get(id) as AutoCompleteStructure) ?? undefined;
+	public getByCustomId<AutoCompleteStructure>(id: InteractionCustomId): AutoCompleteStructure | null {
+		const autoComplete = (this.interactions.get(id) as AutoCompleteStructure) ?? null;
 		return autoComplete;
 	}
 
-	public getByRegex<AutoCompleteStructure>(id: InteractionCustomId): AutoCompleteStructure | undefined {
-		return undefined;
+	public getByRegex<AutoCompleteStructure>(id: InteractionCustomId): AutoCompleteStructure | null {
+        let autoComplete = null;
+        for (const [customId, action] of this.interactions.entries()) {
+            if (customId instanceof RegExp && customId.test(id)) {
+                autoComplete = action as AutoCompleteStructure;
+                break;
+            }
+        }
+
+        return autoComplete;
 	}
 
 	public getAll<AutoCompleteStructure>(): Collection<StructureCustomId, AutoCompleteStructure> {

src/managers/BaseManager.ts

@@ -26,8 +26,8 @@ export abstract class BaseManager {
 		this.isLoaded = true;
 	}
 
-	public abstract loadData(): void;
-	public abstract getByCustomId<InteractionStructure extends AnyInteractionStructure>(id: InteractionCustomId): InteractionStructure | undefined;
-	public abstract getByRegex<InteractionStructure extends AnyInteractionStructure>(id: InteractionCustomId): InteractionStructure | undefined;
+	public abstract loadData(): Promise<void>;
+	public abstract getByCustomId<InteractionStructure extends AnyInteractionStructure>(id: InteractionCustomId): InteractionStructure | null;
+	public abstract getByRegex<InteractionStructure extends AnyInteractionStructure>(id: InteractionCustomId): InteractionStructure | null;
 	public abstract getAll<InteractionStructure extends AnyInteractionStructure>(): Collection<StructureCustomId, InteractionStructure>;
 }

src/managers/ButtonManager.ts

@@ -18,13 +18,13 @@ export class ButtonManager extends BaseManager {
 		this.setManagerLoaded();
 	}
 
-	public getByCustomId<ButtonStructure>(id: InteractionCustomId): ButtonStructure | undefined {
-		const button = (this.interactions.get(id) as ButtonStructure) ?? undefined;
+	public getByCustomId<ButtonStructure>(id: InteractionCustomId): ButtonStructure | null {
+		const button = (this.interactions.get(id) as ButtonStructure) ?? null;
 		return button;
 	}
 
-	public getByRegex<ButtonStructure>(id: InteractionCustomId): ButtonStructure | undefined {
-		let button;
+	public getByRegex<ButtonStructure>(id: InteractionCustomId): ButtonStructure | null {
+		let button = null;
 		for (const [customId, action] of this.interactions.entries()) {
 			if (customId instanceof RegExp && customId.test(id)) {
 				button = action as ButtonStructure;

src/managers/CommandManager.ts

@@ -18,13 +18,21 @@ export class CommandManager extends BaseManager {
 		this.setManagerLoaded();
 	}
 
-	public getByCustomId<CommandStructure>(id: InteractionCustomId): CommandStructure | undefined {
-		const command = (this.interactions.get(id) as CommandStructure) ?? undefined;
+	public getByCustomId<CommandStructure>(id: InteractionCustomId): CommandStructure | null {
+		const command = (this.interactions.get(id) as CommandStructure) ?? null;
 		return command;
 	}
 
-	public getByRegex<CommandStructure>(id: InteractionCustomId): CommandStructure | undefined {
-		return undefined;
+	public getByRegex<CommandStructure>(id: InteractionCustomId): CommandStructure | null {
+        let command = null;
+        for (const [customId, action] of this.interactions.entries()) {
+            if (customId instanceof RegExp && customId.test(id)) {
+                command = action as CommandStructure;
+                break;
+            }
+        }
+
+        return command;
 	}
 
 	public getAll<CommandStructure>(): Collection<StructureCustomId, CommandStructure> {

src/managers/ContextMenuManager.ts

@@ -18,13 +18,21 @@ export class ContextMenuManager extends BaseManager {
 		this.setManagerLoaded();
 	}
 
-	public getByCustomId<ContextMenuStructure>(id: InteractionCustomId): ContextMenuStructure | undefined {
-		const contextMenu = (this.interactions.get(id) as ContextMenuStructure) ?? undefined;
+	public getByCustomId<ContextMenuStructure>(id: InteractionCustomId): ContextMenuStructure | null {
+		const contextMenu = (this.interactions.get(id) as ContextMenuStructure) ?? null;
 		return contextMenu;
 	}
 
-	public getByRegex<ContextMenuStructure>(id: InteractionCustomId): ContextMenuStructure | undefined {
-		return undefined;
+	public getByRegex<ContextMenuStructure>(id: InteractionCustomId): ContextMenuStructure | null {
+        let contextMenu = null;
+        for (const [customId, action] of this.interactions.entries()) {
+            if (customId instanceof RegExp && customId.test(id)) {
+                contextMenu = action as ContextMenuStructure;
+                break;
+            }
+        }
+
+        return contextMenu;
 	}
 
 	public getAll<ContextMenuStructure>(): Collection<StructureCustomId, ContextMenuStructure> {

src/managers/EventManager.ts

@@ -51,13 +51,21 @@ export class EventManager extends BaseManager {
 		this.setManagerLoaded();
 	}
 
-	public getByCustomId<EventStructure>(id: InteractionCustomId): EventStructure | undefined {
-		const event = (this.interactions.get(id) as EventStructure) ?? undefined;
+	public getByCustomId<EventStructure>(id: InteractionCustomId): EventStructure | null {
+		const event = (this.interactions.get(id) as EventStructure) ?? null;
 		return event;
 	}
 
-	public getByRegex<EventStructure>(id: InteractionCustomId): EventStructure | undefined {
-		return undefined;
+	public getByRegex<EventStructure>(id: InteractionCustomId): EventStructure | null {
+        let event = null;
+        for (const [customId, action] of this.interactions.entries()) {
+            if (customId instanceof RegExp && customId.test(id)) {
+                event = action as EventStructure;
+                break;
+            }
+        }
+
+        return event;
 	}
 
 	public getAll<EventStructure>(): Collection<StructureCustomId, EventStructure> {
@@ -76,7 +84,7 @@ export class EventManager extends BaseManager {
 		}
 	}
 
-	private eventHandler = (event: EventStructureWithConfiguration, ...args: ClientEventsArgs) => {
+	private readonly eventHandler = (event: EventStructureWithConfiguration, ...args: ClientEventsArgs) => {
 		const mainArgument = args[0];
 		const guildConfiguration = this.getGuildConfiguration(mainArgument);
 		if (guildConfiguration) {