zumito-framework 1.8.4 → 1.9.0

package/dist/ZumitoFramework.d.ts

@@ -1,5 +1,4 @@
 import { Client, GuildMember, TextChannel } from 'discord.js';
-import { DatabaseModel } from './definitions/DatabaseModel.js';
 import { EventEmitter } from "tseep";
 import { FrameworkEvent } from './definitions/FrameworkEvent.js';
 import { FrameworkSettings } from './definitions/settings/FrameworkSettings.js';
@@ -9,6 +8,8 @@ import { EventManager } from './services/managers/EventManager.js';
 import { CommandManager } from './services/managers/CommandManager.js';
 import { ModuleManager } from './services/managers/ModuleManager.js';
 import { Route } from './definitions/Route.js';
+import { Db } from 'mongodb';
+import { MongoService } from './services/MongoService.js';
 /**
  * @class ZumitoFramework
  * @description The main class of the framework.
@@ -67,18 +68,17 @@ export declare class ZumitoFramework {
     translations: TranslationManager;
     routes: Route[];
     /**
-     * The database models loaded in the framework.
-     * @type {Array<DatabaseModel>}
+     * The MongoDB service instance.
+     * @type {MongoService}
      * @private
      */
-    models: Array<DatabaseModel>;
+    mongoService: MongoService;
     /**
-     * The zumito-db database schema instance.
-     * @type {zumitoDb.Schema}
+     * The MongoDB database instance (shortcut).
+     * @type {Db}
      * @private
-     * @see {@link https://www.npmjs.com/package/zumito-db}
      */
-    database: any;
+    database: Db;
     /**
      * The ExpressJS app instance.
      * @type {express.Application}
@@ -162,7 +162,7 @@ export declare class ZumitoFramework {
      *
      * @deprecated
      */
-    getGuildSettings(guildId: string): Promise<unknown>;
+    getGuildSettings(guildId: string): Promise<import("mongodb").WithId<import("bson").Document>>;
     /**
      * @deprecated
      */

package/dist/ZumitoFramework.js

@@ -6,7 +6,6 @@ import { EventEmitter } from "tseep";
 import { StatusManager } from './services/managers/StatusManager.js';
 import { TranslationManager } from './services/managers/TranslationManager.js';
 import { betterLogging } from 'better-logging';
-import zumitoDb from 'zumito-db';
 import cookieParser from 'cookie-parser';
 import cors from 'cors';
 import express from 'express';
@@ -17,12 +16,12 @@ import { CommandManager } from './services/managers/CommandManager.js';
 import { ModuleManager } from './services/managers/ModuleManager.js';
 import { ServiceContainer } from './services/ServiceContainer.js';
 import { GuildDataGetter } from './services/utilities/GuildDataGetter.js';
-import { RecursiveObjectMerger } from './services/utilities/RecursiveObjectMerger.js';
 import { MemberPermissionChecker } from './services/utilities/MemberPermissionChecker.js';
 import { CommandParser } from './services/CommandParser.js';
 import { SlashCommandRefresher } from './services/SlashCommandRefresher.js';
 import { ErrorHandler } from './services/handlers/ErrorHandler.js';
 import { ErrorType } from './definitions/ErrorType.js';
+import { MongoService } from './services/MongoService.js';
 // import better-logging
 betterLogging(console);
 /**
@@ -83,16 +82,15 @@ export class ZumitoFramework {
     translations;
     routes = [];
     /**
-     * The database models loaded in the framework.
-     * @type {Array<DatabaseModel>}
+     * The MongoDB service instance.
+     * @type {MongoService}
      * @private
      */
-    models;
+    mongoService;
     /**
-     * The zumito-db database schema instance.
-     * @type {zumitoDb.Schema}
+     * The MongoDB database instance (shortcut).
+     * @type {Db}
      * @private
-     * @see {@link https://www.npmjs.com/package/zumito-db}
      */
     database;
     /**
@@ -137,7 +135,6 @@ export class ZumitoFramework {
         this.commands = new CommandManager(this);
         this.events = new Map();
         this.translations = new TranslationManager();
-        this.models = [];
         this.eventManager = new EventManager();
         ServiceContainer.addService(TranslationManager, [], true, this.translations);
         ServiceContainer.addService(CommandManager, [], true, this.commands);
@@ -175,24 +172,24 @@ export class ZumitoFramework {
         }
     }
     async initializeDatabase() {
-        const folders = ['db', 'db/tingodb'];
-        for (const folder of folders) {
-            if (!fs.existsSync(folder)) {
-                fs.mkdirSync(folder);
-            }
+        const mongoUri = this.settings?.mongoQueryString || process.env.MONGO_URI;
+        if (!mongoUri) {
+            console.error('[🗄️🔴] MongoDB connection string not provided.');
+            process.exit(1);
         }
-        this.database = new zumitoDb.Schema(this.settings?.database?.type || 'tingodb', this.settings?.database || {});
-        await new Promise((resolve, reject) => {
-            this.database.on('connected', resolve);
-            this.database.on('error', reject);
-        })
-            .then(() => {
-            console.log('[🗄️🟢] Database connection successful!');
-        })
-            .catch((err) => {
-            console.error('[🗄️🔴] Database connection error:', err.message);
+        // Extract dbName from URI or fallback
+        const match = mongoUri.match(/\/([^/?]+)(\?|$)/);
+        const dbName = match ? match[1] : 'zumito';
+        this.mongoService = new MongoService(mongoUri, dbName);
+        try {
+            await this.mongoService.connect();
+            this.database = this.mongoService.db;
+            console.log('[🗄️🟢] MongoDB connection successful!');
+        }
+        catch (err) {
+            console.error('[🗄️🔴] MongoDB connection error:', err.message);
             process.exit(1);
-        });
+        }
     }
     /**
      * Initializes and starts the API server using ExpressJS.
@@ -292,22 +289,6 @@ export class ZumitoFramework {
         else if (this.settings.srcMode == 'monoBundle') {
             await this.registerModule(process.cwd(), 'src');
         }
-        // Define models
-        const schemas = {};
-        this.models.forEach((model) => {
-            if (!schemas[model.name]) {
-                schemas[model.name] = model.getModel(this.database);
-            }
-            else {
-                schemas[model.name] = RecursiveObjectMerger.merge(schemas[model.name], model.getModel(this.database));
-            }
-        });
-        Object.keys(schemas).forEach((schemaName) => {
-            this.database.define(schemaName, schemas[schemaName]);
-        });
-        this.models.forEach((model) => {
-            model.define(this.database.models[model.name], this.database.models);
-        });
     }
     async registerModule(modulesFolder, moduleName, module) {
         if (!module) {

package/dist/definitions/CommandLoadOptions.d.ts

@@ -1,4 +1,4 @@
-export declare type CommandLoadOptions = {
+export type CommandLoadOptions = {
     whitelist?: string[];
     blacklist?: string[];
     renames?: {

package/dist/definitions/Module.d.ts

@@ -1,10 +1,9 @@
 import { ZumitoFramework } from '../ZumitoFramework.js';
 import { Command } from './commands/Command.js';
 import { FrameworkEvent } from './FrameworkEvent.js';
-import { DatabaseModel } from './DatabaseModel.js';
 import { CommandManager } from '../services/managers/CommandManager.js';
 import { ModuleParameters } from './parameters/ModuleParameters.js';
-export declare type ModuleRequeriments = {
+export type ModuleRequeriments = {
     modules: Array<string>;
     services: Array<string>;
     custom: Array<() => Promise<boolean>>;
@@ -15,7 +14,6 @@ export declare abstract class Module {
     protected framework: ZumitoFramework;
     protected commands: CommandManager;
     protected events: Map<string, FrameworkEvent>;
-    protected models: Array<DatabaseModel>;
     static requeriments: ModuleRequeriments;
     protected commandManager: CommandManager;
     constructor(path: any, parameters?: ModuleParameters);
@@ -28,8 +26,6 @@ export declare abstract class Module {
     parseEventArgs(args: any[]): any;
     getEvents(): Map<string, FrameworkEvent>;
     registerTranslations(subpath?: string): Promise<void>;
-    registerModels(): Promise<void>;
-    getModels(): Array<DatabaseModel>;
     registerRoutes(): Promise<void>;
     registerRoutesFolder(folder: string): Promise<void>;
 }

package/dist/definitions/Module.js

@@ -10,7 +10,6 @@ export class Module {
     framework;
     commands;
     events = new Map();
-    models = [];
     static requeriments;
     commandManager;
     constructor(path, parameters) {
@@ -23,7 +22,6 @@ export class Module {
         await this.registerCommands();
         await this.registerEvents();
         await this.registerTranslations();
-        await this.registerModels();
         await this.registerRoutes();
     }
     async registerCommands() {
@@ -111,27 +109,6 @@ export class Module {
             return;
         this.framework.translations.registerTranslationsFromFolder(path.join(this.path, 'translations', subpath), '', process.env.DEBUG ? true : false);
     }
-    async registerModels() {
-        if (!fs.existsSync(path.join(this.path, 'models')))
-            return;
-        const files = fs.readdirSync(path.join(this.path, 'models'));
-        for (const file of files) {
-            if (file.endsWith('.d.ts'))
-                continue;
-            if (file.endsWith('.ts') || file.endsWith('.js')) {
-                let model = await import('file://' + `${this.path}/models/${file}`).catch((e) => {
-                    console.error(`[🔄🔴 ] Error loading ${file.slice(0, -3)} model on module ${this.constructor.name}`);
-                    console.error(e + '\n' + e.name + '\n' + e.stack);
-                });
-                model = Object.values(model)[0];
-                model = new model();
-                this.models.push(model);
-            }
-        }
-    }
-    getModels() {
-        return this.models;
-    }
     async registerRoutes() {
         const folderPath = path.join(this.path, 'routes');
         if (fs.existsSync(folderPath)) {

package/dist/definitions/commands/CommandArguments.d.ts

@@ -1,8 +1,8 @@
-import { CommandInteraction } from 'discord.js';
+import { Interaction } from 'discord.js';
 export declare class CommandArguments {
     args: any;
     constructor(args?: {});
     get(key: any): any;
     add(key: any, value: any): void;
-    static parseFromInteraction(interaction: CommandInteraction): CommandArguments;
+    static parseFromInteraction(interaction: Interaction): CommandArguments;
 }

package/dist/definitions/commands/CommandArguments.js

@@ -10,6 +10,9 @@ export class CommandArguments {
         this.args[key] = value;
     }
     static parseFromInteraction(interaction) {
-        return new CommandArguments(interaction.options);
+        if ('options' in interaction) {
+            return new CommandArguments(interaction.options);
+        }
+        return new CommandArguments();
     }
 }

package/dist/definitions/commands/CommandBinds.d.ts

@@ -1,6 +1,6 @@
 import { ModalSubmitParameters } from '../../definitions/parameters/ModalSubmitParameters.js';
 import { SelectMenuParameters } from '../parameters/SelectMenuParameters.js';
-export declare type CommandBinds = {
+export type CommandBinds = {
     selectMenu?: (params: SelectMenuParameters) => Promise<void>;
     modalSubmit?: (params: ModalSubmitParameters) => Promise<void>;
 };

package/dist/definitions/commands/CommandParameters.d.ts

@@ -27,12 +27,12 @@ export interface BaseCommandParameters {
     guildSettings?: any;
     trans: (key: string, params?: any) => string;
 }
-export declare type SlashCommandParameters = BaseCommandParameters & {
+export type SlashCommandParameters = BaseCommandParameters & {
     interaction: CommandInteraction;
     message?: null;
 };
-export declare type PrefixCommandParameters = BaseCommandParameters & {
+export type PrefixCommandParameters = BaseCommandParameters & {
     message: Message;
     interaction?: null;
 };
-export declare type CommandParameters = PrefixCommandParameters | SlashCommandParameters;
+export type CommandParameters = PrefixCommandParameters | SlashCommandParameters;

package/dist/definitions/parameters/ModuleParameters.d.ts

@@ -1,4 +1,4 @@
-export declare type ModuleParameters = {
+export type ModuleParameters = {
     commandWhitelist?: string[];
     commandBlacklist?: string[];
     commandRenames?: {

package/dist/definitions/settings/FrameworkSettings.d.ts

@@ -1,7 +1,7 @@
 import { ModuleParameters } from "../parameters/ModuleParameters";
 import { StatusManagerOptions } from "../StatusManagerOptions";
 export interface FrameworkSettings {
-    database: any;
+    mongoQueryString: string;
     logLevel?: number;
     debug?: boolean;
     discordClientOptions: {

package/dist/definitions/settings/InteractionHandlerSettings.d.ts

@@ -1,3 +1,3 @@
-export declare type InteractionHandlerSettings = {
+export type InteractionHandlerSettings = {
     disabledHandlers?: ('command' | 'selectMenu' | 'button' | 'modal')[];
 };

package/dist/index.d.ts

@@ -9,7 +9,6 @@ import { CommandChoiceDefinition } from './definitions/commands/CommandChoiceDef
 import { CommandParameters } from './definitions/commands/CommandParameters.js';
 import { CommandType } from './definitions/commands/CommandType.js';
 import { DatabaseConfigLoader } from './services/utilities/DatabaseConfigLoader.js';
-import { DatabaseModel } from './definitions/DatabaseModel.js';
 import { EmojiFallback } from './services/EmojiFallback.js';
 import { FrameworkEvent } from './definitions/FrameworkEvent.js';
 import { FrameworkSettings } from './definitions/FrameworkSettings.js';
@@ -31,7 +30,8 @@ import { InteractionHandler } from './services/handlers/InteractionHandler.js';
 import { CommandManager } from './services/managers/CommandManager.js';
 import { ErrorType } from './definitions/ErrorType.js';
 import { InviteUrlGenerator } from './services/utilities/InviteUrlGenerator.js';
+import { PrefixResolver } from './services/utilities/PrefixResolver.js';
 export { ModalSubmitParameters } from './definitions/parameters/ModalSubmitParameters.js';
 export { CommandBinds } from './definitions/commands/CommandBinds.js';
 export { Injectable } from './definitions/decorators/Injectable.decorator.js';
-export { ZumitoFramework, FrameworkSettings, Command, Module, CommandParameters, CommandArguments, FrameworkEvent, Translation, TranslationManager, ApiResponse, SelectMenuParameters, CommandType, CommandArgDefinition, CommandChoiceDefinition, ButtonPressed, ButtonPressedParams, TextFormatter, EmojiFallback, DatabaseConfigLoader, DatabaseModel, PresenceDataRule, RuledPresenceData, StatusManagerOptions, discord, EventParameters, ServiceContainer, GuildDataGetter, SlashCommandRefresher, CommandParser, ErrorHandler, ErrorType, Route, RouteMethod, InteractionHandler, CommandManager, InviteUrlGenerator };
+export { ZumitoFramework, FrameworkSettings, Command, Module, CommandParameters, CommandArguments, FrameworkEvent, Translation, TranslationManager, ApiResponse, SelectMenuParameters, CommandType, CommandArgDefinition, CommandChoiceDefinition, ButtonPressed, ButtonPressedParams, TextFormatter, EmojiFallback, DatabaseConfigLoader, PresenceDataRule, RuledPresenceData, StatusManagerOptions, discord, EventParameters, ServiceContainer, GuildDataGetter, SlashCommandRefresher, CommandParser, ErrorHandler, ErrorType, Route, RouteMethod, InteractionHandler, CommandManager, InviteUrlGenerator, PrefixResolver, };

package/dist/index.js

@@ -4,7 +4,6 @@ import { Command } from './definitions/commands/Command.js';
 import { CommandArguments } from './definitions/commands/CommandArguments.js';
 import { CommandType } from './definitions/commands/CommandType.js';
 import { DatabaseConfigLoader } from './services/utilities/DatabaseConfigLoader.js';
-import { DatabaseModel } from './definitions/DatabaseModel.js';
 import { EmojiFallback } from './services/EmojiFallback.js';
 import { FrameworkEvent } from './definitions/FrameworkEvent.js';
 import { Module } from './definitions/Module.js';
@@ -24,6 +23,7 @@ import { InteractionHandler } from './services/handlers/InteractionHandler.js';
 import { CommandManager } from './services/managers/CommandManager.js';
 import { ErrorType } from './definitions/ErrorType.js';
 import { InviteUrlGenerator } from './services/utilities/InviteUrlGenerator.js';
+import { PrefixResolver } from './services/utilities/PrefixResolver.js';
 export { Injectable } from './definitions/decorators/Injectable.decorator.js';
 ServiceContainer.addService(TextFormatter, []);
 ServiceContainer.addService(EmojiFallback, [discord.Client.name, TranslationManager.name]);
@@ -33,5 +33,6 @@ ServiceContainer.addService(CommandParser, []);
 ServiceContainer.addService(SlashCommandRefresher, [ZumitoFramework.name]);
 ServiceContainer.addService(InteractionHandler, []);
 ServiceContainer.addService(InviteUrlGenerator, []);
+ServiceContainer.addService(PrefixResolver, []);
 ServiceContainer.addService(ErrorHandler, ['ZumitoFramework']);
-export { ZumitoFramework, Command, Module, CommandArguments, FrameworkEvent, Translation, TranslationManager, ApiResponse, CommandType, ButtonPressed, TextFormatter, EmojiFallback, DatabaseConfigLoader, DatabaseModel, discord, ServiceContainer, GuildDataGetter, SlashCommandRefresher, CommandParser, ErrorHandler, ErrorType, Route, RouteMethod, InteractionHandler, CommandManager, InviteUrlGenerator };
+export { ZumitoFramework, Command, Module, CommandArguments, FrameworkEvent, Translation, TranslationManager, ApiResponse, CommandType, ButtonPressed, TextFormatter, EmojiFallback, DatabaseConfigLoader, discord, ServiceContainer, GuildDataGetter, SlashCommandRefresher, CommandParser, ErrorHandler, ErrorType, Route, RouteMethod, InteractionHandler, CommandManager, InviteUrlGenerator, PrefixResolver, };

package/dist/modules/core/baseModule/events/discord/MessageCreate.d.ts

@@ -10,6 +10,6 @@ export declare class MessageCreate extends FrameworkEvent {
     framework: ZumitoFramework;
     guildDataGetter: GuildDataGetter;
     constructor();
-    execute({ message, framework }: EventParameters): Promise<import("discord.js").Message<boolean>>;
+    execute({ message }: EventParameters): Promise<import("discord.js").OmitPartialGroupDMChannel<import("discord.js").Message<boolean>>>;
     autocorrect(str: string, words: string[]): any;
 }

package/dist/modules/core/baseModule/events/discord/MessageCreate.js

@@ -20,26 +20,25 @@ export class MessageCreate extends FrameworkEvent {
         this.framework = ServiceContainer.getService(ZumitoFramework);
         this.guildDataGetter = ServiceContainer.getService(GuildDataGetter);
     }
-    async execute({ message, framework }) {
+    async execute({ message }) {
         const channel = message.channel;
-        const prefix = framework.settings.defaultPrefix;
+        const prefix = this.framework.settings.defaultPrefix;
         const args = CommandParser.splitCommandLine(message.content.slice(prefix.length));
         const command = args.shift().toLowerCase();
         let commandInstance;
         if (message.content.startsWith(prefix)) {
-            debugger;
-            if (!framework.commands.getAll().has(command)) {
-                const commandNames = Array.from(framework.commands.getAll().keys());
+            if (!this.framework.commands.getAll().has(command)) {
+                const commandNames = Array.from(this.framework.commands.getAll().keys());
                 const correctedCommand = this.autocorrect(command, commandNames);
-                if (framework.commands.getAll().has(correctedCommand)) {
-                    commandInstance = framework.commands.get(correctedCommand);
+                if (this.framework.commands.getAll().has(correctedCommand)) {
+                    commandInstance = this.framework.commands.get(correctedCommand);
                 }
                 else {
                     return; // Command not found
                 }
             }
             else {
-                const tmpCmd = framework.commands.get(command);
+                const tmpCmd = this.framework.commands.get(command);
                 if (tmpCmd && !tmpCmd.parent) {
                     commandInstance = tmpCmd;
                 }
@@ -103,15 +102,15 @@ export class MessageCreate extends FrameworkEvent {
                 await commandInstance.execute({
                     message,
                     args: parsedArgs,
-                    client: framework.client,
-                    framework: framework,
+                    client: this.framework.client,
+                    framework: this.framework,
                     guildSettings: guildSettings,
                     trans: (key, params) => {
                         if (key.startsWith('$')) {
-                            return framework.translations.get(key.replace('$', ''), guildSettings.lang, params);
+                            return this.framework.translations.get(key.replace('$', ''), guildSettings.lang, params);
                         }
                         else {
-                            return framework.translations.get('command.' + commandInstance.name + '.' + key, guildSettings.lang, params);
+                            return this.framework.translations.get('command.' + commandInstance.name + '.' + key, guildSettings.lang, params);
                         }
                     },
                 }).catch((error) => {

package/dist/services/MongoService.d.ts

@@ -0,0 +1,10 @@
+import { MongoClient, Db } from 'mongodb';
+export declare class MongoService {
+    private uri;
+    private dbName;
+    client: MongoClient;
+    db: Db;
+    constructor(uri: string, dbName: string);
+    connect(): Promise<Db>;
+    disconnect(): Promise<void>;
+}

package/dist/services/MongoService.js

@@ -0,0 +1,25 @@
+import { MongoClient } from 'mongodb';
+export class MongoService {
+    uri;
+    dbName;
+    client;
+    db;
+    constructor(uri, dbName) {
+        this.uri = uri;
+        this.dbName = dbName;
+    }
+    async connect() {
+        if (!this.uri) {
+            throw new Error('MongoDB connection string not provided.');
+        }
+        this.client = new MongoClient(this.uri);
+        await this.client.connect();
+        this.db = this.client.db(this.dbName);
+        return this.db;
+    }
+    async disconnect() {
+        if (this.client) {
+            await this.client.close();
+        }
+    }
+}

package/dist/services/handlers/ErrorHandler.d.ts

@@ -1,23 +1,23 @@
 import { ErrorType } from "../../definitions/ErrorType";
 import { Command } from "../../definitions/commands/Command";
 import { ZumitoFramework } from "../../ZumitoFramework";
-declare type BaseErrorOptions = {
+type BaseErrorOptions = {
     exit?: boolean;
     type: ErrorType;
 };
-declare type CommandErrorOptions = BaseErrorOptions & {
+type CommandErrorOptions = BaseErrorOptions & {
     type: ErrorType.CommandInstance | ErrorType.CommandLoad | ErrorType.CommandRun;
     command: Command;
 };
-declare type ApiErrorOptions = BaseErrorOptions & {
+type ApiErrorOptions = BaseErrorOptions & {
     type: ErrorType.Api;
     endpoint: string;
     method: string;
 };
-declare type OtherErrorOptions = BaseErrorOptions & {
+type OtherErrorOptions = BaseErrorOptions & {
     type: ErrorType.Other;
 };
-declare type ErrorOptions = CommandErrorOptions | ApiErrorOptions | OtherErrorOptions;
+type ErrorOptions = CommandErrorOptions | ApiErrorOptions | OtherErrorOptions;
 export declare class ErrorHandler {
     framework: ZumitoFramework;
     constructor(framework: ZumitoFramework);

package/dist/services/handlers/InteractionHandler.js

@@ -47,7 +47,8 @@ export class InteractionHandler {
         }
     }
     async handleCommandInteraction(interaction, guildSettings) {
-        const subcommandName = interaction.options.getSubcommand(false);
+        const options = interaction.options;
+        const subcommandName = options.getSubcommand(false);
         const commandName = interaction.commandName;
         let commandInstance;
         if (subcommandName) {
@@ -61,7 +62,7 @@ export class InteractionHandler {
         const framework = ServiceContainer.getService(ZumitoFramework);
         const args = new Map();
         commandInstance.args.forEach((arg) => {
-            const option = (interaction).options.get(arg.name);
+            const option = options.get(arg.name);
             if (option) {
                 switch (arg.type) {
                     case 'user':

package/dist/services/managers/ModuleManager.js

@@ -48,10 +48,7 @@ export class ModuleManager {
         }
         // Register module events
         this.framework.events = new Map([...this.framework.events, ...module.getEvents()]);
-        // Register models
-        module.getModels().forEach((model) => {
-            this.framework.models.push(model);
-        });
+        // Register models (eliminado, migración a MongoDB)
         /*
 
         // Register module routes

package/dist/services/utilities/GuildDataGetter.d.ts

@@ -25,5 +25,5 @@ export declare class GuildDataGetter {
      * // returns the guild settings
      * getGuildSettings(interaction.guildId);
      */
-    getGuildSettings(guildId: string): Promise<unknown>;
+    getGuildSettings(guildId: string): Promise<import("mongodb").WithId<import("bson").Document>>;
 }

package/dist/services/utilities/GuildDataGetter.js

@@ -1,3 +1,4 @@
+import { ObjectId } from "mongodb";
 export class GuildDataGetter {
     framework;
     constructor(framework) {
@@ -27,25 +28,20 @@ export class GuildDataGetter {
      * getGuildSettings(interaction.guildId);
      */
     async getGuildSettings(guildId) {
-        const Guild = this.framework.database.models.Guild;
-        return await new Promise((resolve, reject) => {
-            Guild.findOne({ where: { guild_id: guildId } }, (err, guild) => {
-                if (err)
-                    reject(err);
-                if (guild == null) {
-                    guild = new Guild({
-                        guild_id: guildId,
-                    });
-                    guild.save((err) => {
-                        if (err)
-                            reject(err);
-                        resolve(guild);
-                    });
-                }
-                else {
-                    resolve(guild);
-                }
-            });
-        });
+        const collection = this.framework.database.collection('guilds');
+        let guild = await collection.findOne({ guild_id: guildId });
+        console.log(guild);
+        if (!guild) {
+            guild = {
+                _id: new ObjectId(),
+                guild_id: guildId,
+                lang: 'en',
+                prefix: null,
+                public: false,
+                deleteCommands: false
+            };
+            await collection.insertOne(guild);
+        }
+        return guild;
     }
 }

package/dist/services/utilities/PrefixResolver.d.ts

@@ -0,0 +1,20 @@
+import { ZumitoFramework } from "../../ZumitoFramework";
+import { GuildDataGetter } from "./GuildDataGetter";
+export declare class PrefixResolver {
+    private framework;
+    private guildDataGetter;
+    constructor(framework?: ZumitoFramework, guildDataGetter?: GuildDataGetter);
+    /**
+     * Resolve the prefix for a given context (guildId or DM).
+     * Priority:
+     *   1. Guild DB prefix (if exists and not null)
+     *   2. process.env.BOTPREFIX
+     *   3. framework.settings.defaultPrefix
+     *   4. 'z-'
+     * @param context { guildId?: string, userId?: string }
+     */
+    resolvePrefix(context: {
+        guildId?: string;
+        userId?: string;
+    }): Promise<string>;
+}

package/dist/services/utilities/PrefixResolver.js

@@ -0,0 +1,39 @@
+import { ZumitoFramework } from "../../ZumitoFramework";
+import { ServiceContainer } from "../ServiceContainer";
+import { GuildDataGetter } from "./GuildDataGetter";
+export class PrefixResolver {
+    framework;
+    guildDataGetter;
+    constructor(framework = ServiceContainer.getService(ZumitoFramework), guildDataGetter = ServiceContainer.getService(GuildDataGetter)) {
+        this.framework = framework;
+        this.guildDataGetter = guildDataGetter;
+    }
+    /**
+     * Resolve the prefix for a given context (guildId or DM).
+     * Priority:
+     *   1. Guild DB prefix (if exists and not null)
+     *   2. process.env.BOTPREFIX
+     *   3. framework.settings.defaultPrefix
+     *   4. 'z-'
+     * @param context { guildId?: string, userId?: string }
+     */
+    async resolvePrefix(context) {
+        // 1. Guild DB prefix
+        if (context.guildId) {
+            const guild = await this.guildDataGetter.getGuildSettings(context.guildId);
+            if (guild && guild.prefix) {
+                return guild.prefix;
+            }
+        }
+        // 2. Env var
+        if (process.env.DEFAULT_PREFIX) {
+            return process.env.DEFAULT_PREFIX;
+        }
+        // 3. Framework config
+        if (this.framework.settings?.defaultPrefix) {
+            return this.framework.settings.defaultPrefix;
+        }
+        // 4. Hardcoded fallback
+        return "z-";
+    }
+}

package/dist/services/utilities/TextFormatter.d.ts

@@ -1,4 +1,4 @@
-declare type TimestampFormat = 'T' | 't' | 'd' | 'D' | 'f' | 'F' | 'R';
+type TimestampFormat = 'T' | 't' | 'd' | 'D' | 'f' | 'F' | 'R';
 export declare class TextFormatter {
     static getUser(userId: string): string;
     static getChannel(channelId: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zumito-framework",
-  "version": "1.8.4",
+  "version": "1.9.0",
   "description": "Discord.js bot framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,7 +14,7 @@
     "build-watch": "tsc -w",
     "lint": "eslint .",
     "publish-npm": "npm publish",
-    "docs": "typedoc --out docs src"
+    "docs": "npx typedoc --out docs src"
   },
   "author": "ZumitoTeam",
   "license": "ISC",
@@ -28,7 +28,7 @@
     "chokidar": "^3.5.3",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
-    "discord.js": "^14.9.0",
+    "discord.js": "^14.21.0",
     "error-stack-parser": "^2.1.4",
     "express": "^4.18.1",
     "leven": "^4.0.0",
@@ -48,8 +48,7 @@
     "eslint-plugin-check-file": "^2.2.0",
     "eslint-plugin-prettier": "^4.2.1",
     "prettier": "^2.8.3",
-    "typedoc": "^0.23.14",
-    "typescript": "^4.8.3"
+    "typescript": "^5.8.3"
   },
   "type": "module",
   "exports": {

package/dist/definitions/DatabaseModel.d.ts

@@ -1,70 +0,0 @@
-import { ZumitoFramework } from '../ZumitoFramework.js';
-/**
- * @name DatabaseModel
- * @description Base class for all database models.
- * @see {@link https://docs.zumito.ga/docs/custom/create-database-model}
- */
-export declare abstract class DatabaseModel {
-    readonly name: string;
-    framework: ZumitoFramework;
-    constructor(framework: ZumitoFramework);
-    /**
-     * @name getModel
-     * @description This method should return the model that will be used by the framework.
-     * @returns {any}
-     * @example
-     * ```ts
-     * getModel(schema) {
-     *  return {
-     *      name:   { type: schema.String, required: true },
-     *      age:    { type: schema.Number, required: true },
-     *      email:  { type: schema.String,  limit: 155, unique: true },
-     *      approved:   { type: schema.Boolean, default: false, index: true }
-     *      joinedAt:   { type: schema.Date,    default: Date.now },
-     * };
-     * ```
-     * @see {@link https://docs.zumito.ga/docs/custom/create-database-model#model}
-     */
-    abstract getModel(schema: any): any;
-    /**
-     * @name define
-     * @description This method is called after all models are loaded. Here you can define relationships, validations, hooks, methods, etc.
-     * @param {any} model The model that was returned by the {@link DatabaseModel.getModel} method.
-     * @param {any} schema The schema of the database.
-     * @example
-     * Example of defining a relationship:
-     * ```ts
-     * define(model, models) {
-     *  model.hasMany(models.SocialMediaUrl, {as: 'socialMediaUrl', foreignKey: 'userId'});
-     * }
-     * ```
-     * @example
-     * Example of defining a validation:
-     * ```ts
-     * define(model) {
-     *  model.validatesPresenceOf('name', 'email')
-     *  model.validatesUniquenessOf('email', {message: 'email is not unique'});
-     *  model.validatesInclusionOf('gender', {in: ['male', 'female']});
-     *  model.validatesNumericalityOf('age', {int: true});
-     * ```
-     * @example
-     * Example of defining a hook:
-     * ```ts
-     * define(model) {
-     *  model.afterUpdate = function (next) {
-     *      this.updated = new Date();
-     *      this.save();
-     *      next();
-     *  };
-     * ```
-     * @example
-     * Example of defining a method:
-     * ```ts
-     * define(model) {
-     * model.prototype.getNameAndAge = function () {
-     *     return this.name + ', ' + this.age;
-     * };
-     * ```
-     */
-    abstract define(model: any, models: any): void;
-}

package/dist/definitions/DatabaseModel.js

@@ -1,14 +0,0 @@
-/**
- * @name DatabaseModel
- * @description Base class for all database models.
- * @see {@link https://docs.zumito.ga/docs/custom/create-database-model}
- */
-export class DatabaseModel {
-    // set name to the name of the class capitalized first letter
-    name = this.constructor.name.charAt(0).toUpperCase() +
-        this.constructor.name.slice(1);
-    framework;
-    constructor(framework) {
-        this.framework = framework;
-    }
-}

package/dist/modules/core/baseModule/models/Guild.d.ts

@@ -1,27 +0,0 @@
-import { DatabaseModel } from '../../../../definitions/DatabaseModel.js';
-export declare class Guild extends DatabaseModel {
-    getModel(schema: any): {
-        guild_id: {
-            type: any;
-            required: boolean;
-            unique: boolean;
-        };
-        lang: {
-            type: any;
-            default: string;
-        };
-        prefix: {
-            type: any;
-            default: string;
-        };
-        public: {
-            type: any;
-            default: boolean;
-        };
-        deleteCommands: {
-            type: any;
-            default: boolean;
-        };
-    };
-    define(model: any, models: any): void;
-}

package/dist/modules/core/baseModule/models/Guild.js

@@ -1,32 +0,0 @@
-import { DatabaseModel } from '../../../../definitions/DatabaseModel.js';
-export class Guild extends DatabaseModel {
-    getModel(schema) {
-        return {
-            guild_id: {
-                type: schema.String,
-                required: true,
-                unique: true,
-            },
-            lang: {
-                type: schema.String,
-                default: 'en',
-            },
-            prefix: {
-                type: schema.String,
-                default: 'z-',
-            },
-            public: {
-                type: schema.Boolean,
-                default: false,
-            },
-            deleteCommands: {
-                type: schema.Boolean,
-                default: false,
-            },
-        };
-    }
-    define(model, models) {
-        model.validatesUniquenessOf('guild_id');
-        model.validatesInclusionOf('lang', { in: ['en', 'es'] });
-    }
-}