reciple 6.0.0-dev.23 → 6.0.0-dev.26

package/dist/lib/bin.mjs

@@ -1,20 +1,22 @@
 #!/usr/bin/env node
 import { RecipleClient } from './reciple/classes/RecipleClient.js';
 import { RecipleConfig } from './reciple/classes/RecipleConfig.js';
-import { rawVersion } from './reciple/version.js';
 import { existsSync, mkdirSync, readdirSync } from 'fs';
+import { rawVersion } from './reciple/version.js';
 import { cwd, flags } from './reciple/flags.js';
-import { input } from 'fallout-utility';
 import { path } from './reciple/util.js';
+import { input } from 'fallout-utility';
+import match from 'micromatch';
+import { inspect } from 'util';
 import chalk from 'chalk';
 import 'dotenv/config';
-import { inspect } from 'util';
-const allowedFiles = ['node_modules', 'reciple.yml', 'package.json'];
+import { Events } from 'discord.js';
+const allowedFiles = ['node_modules', 'reciple.yml', 'package.json', '.*'];
 const configPath = path.join(cwd, 'reciple.yml');
 if (!existsSync(cwd))
     mkdirSync(cwd, { recursive: true });
-if (readdirSync(cwd).filter(f => !f.startsWith('.') && allowedFiles.indexOf(f)).length > 0 && !existsSync(flags.config ?? configPath)) {
-    const ask = (flags.yes ? 'y' : null) ?? input('This directory does not contain reciple.yml. Would you like to init axis here? [y/n] ') ?? '';
+if (readdirSync(cwd).some(f => match.isMatch(f, allowedFiles)) && !existsSync(flags.config ?? configPath)) {
+    const ask = (flags.yes ? 'y' : null) ?? input('Would you like to create Reciple config here? [y/n] ') ?? '';
     if (ask.toString().toLowerCase() !== 'y')
         process.exit(0);
 }
@@ -41,7 +43,7 @@ await client.modules.startModules({
         }),
     }),
 });
-client.on('ready', async () => {
+client.on(Events.ClientReady, async () => {
     await client.modules.loadModules();
     const unloadModulesAndStopProcess = async (signal) => {
         await client.modules.unloadModules({ reason: 'ProcessExit' });
@@ -57,7 +59,7 @@ client.on('ready', async () => {
     }
     if (!client.isClientLogsSilent)
         client.logger.warn(`Logged in as ${client.user?.tag || 'Unknown'}!`);
-    client.on('cacheSweep', () => client.cooldowns.clean());
+    client.on(Events.CacheSweep, () => client.cooldowns.clean());
 });
 client.login(config.token).catch(err => {
     if (!client.isClientLogsSilent)

package/dist/lib/index.js

@@ -18,17 +18,15 @@ __exportStar(require("./reciple/classes/builders/MessageCommandBuilder.js"), exp
 __exportStar(require("./reciple/classes/builders/MessageCommandOptionBuilder.js"), exports);
 __exportStar(require("./reciple/classes/builders/SlashCommandBuilder.js"), exports);
 __exportStar(require("./reciple/classes/managers/ApplicationCommandManager.js"), exports);
-__exportStar(require("./reciple/classes/managers/CommandManager.js"), exports);
-__exportStar(require("./reciple/classes/managers/ModuleManager.js"), exports);
 __exportStar(require("./reciple/classes/managers/CommandCooldownManager.js"), exports);
+__exportStar(require("./reciple/classes/managers/CommandManager.js"), exports);
 __exportStar(require("./reciple/classes/managers/MessageCommandOptionManager.js"), exports);
+__exportStar(require("./reciple/classes/managers/ModuleManager.js"), exports);
 __exportStar(require("./reciple/classes/RecipleClient.js"), exports);
 __exportStar(require("./reciple/classes/RecipleConfig.js"), exports);
 __exportStar(require("./reciple/classes/RecipleModule.js"), exports);
 __exportStar(require("./reciple/types/builders.js"), exports);
 __exportStar(require("./reciple/types/commands.js"), exports);
-__exportStar(require("./reciple/types/builders.js"), exports);
-__exportStar(require("./reciple/types/builders.js"), exports);
 __exportStar(require("./reciple/flags"), exports);
 __exportStar(require("./reciple/permissions.js"), exports);
 __exportStar(require("./reciple/util.js"), exports);

package/dist/lib/reciple/classes/RecipleClient.js

@@ -1,22 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RecipleClient = void 0;
+exports.RecipleClient = exports.RecipleEvents = void 0;
 const discord_js_1 = require("discord.js");
 const MessageCommandBuilder_1 = require("./builders/MessageCommandBuilder");
 const SlashCommandBuilder_1 = require("./builders/SlashCommandBuilder");
 const commands_1 = require("../types/commands");
 const CommandCooldownManager_1 = require("./managers/CommandCooldownManager");
+const builders_1 = require("../types/builders");
 const permissions_1 = require("../permissions");
 const MessageCommandOptionManager_1 = require("./managers/MessageCommandOptionManager");
 const ApplicationCommandManager_1 = require("./managers/ApplicationCommandManager");
 const CommandManager_1 = require("./managers/CommandManager");
-const builders_1 = require("../types/builders");
 const ModuleManager_1 = require("./managers/ModuleManager");
 const RecipleConfig_1 = require("./RecipleConfig");
 const fallout_utility_1 = require("fallout-utility");
 const util_1 = require("../util");
 const version_js_1 = require("../version.js");
 const flags_1 = require("../flags");
+var RecipleEvents;
+(function (RecipleEvents) {
+    RecipleEvents["RecipleCommandExecute"] = "recipleCommandExecute";
+    RecipleEvents["RecipleCommandHalt"] = "recipleCommandHalt";
+    RecipleEvents["RecipleRegisterApplicationCommands"] = "recipleRegisterApplicationCommands";
+    RecipleEvents["RecipleReplyError"] = "recipleReplyError";
+    RecipleEvents["CommandExecute"] = "recipleCommandExecute";
+    RecipleEvents["CommandHalt"] = "recipleCommandHalt";
+    RecipleEvents["RegisterApplicationCommands"] = "recipleRegisterApplicationCommands";
+    RecipleEvents["ReplyError"] = "recipleReplyError";
+})(RecipleEvents = exports.RecipleEvents || (exports.RecipleEvents = {}));
 class RecipleClient extends discord_js_1.Client {
     /**
      * @param options Client options
@@ -46,11 +57,11 @@ class RecipleClient extends discord_js_1.Client {
      * Listed to command executions
      */
     addCommandListeners() {
-        this.on('messageCreate', message => {
+        this.on(discord_js_1.Events.MessageCreate, message => {
             if (this.config.commands.messageCommand.enabled)
                 this.messageCommandExecute(message);
         });
-        this.on('interactionCreate', interaction => {
+        this.on(discord_js_1.Events.InteractionCreate, interaction => {
             if (this.config.commands.slashCommand.enabled)
                 this.slashCommandExecute(interaction);
         });
@@ -226,7 +237,7 @@ class RecipleClient extends discord_js_1.Client {
      * @param error Received Error
      */
     _replyError(error) {
-        this.emit('recipleReplyError', error);
+        this.emit(RecipleEvents.ReplyError, error);
     }
     async _haltCommand(command, haltData) {
         try {
@@ -235,7 +246,7 @@ class RecipleClient extends discord_js_1.Client {
                     console.log(err);
                 })
                 : false) || false;
-            this.emit('recipleCommandHalt', haltData);
+            this.emit(RecipleEvents.CommandHalt, haltData);
             return haltResolved;
         }
         catch (err) {
@@ -249,7 +260,7 @@ class RecipleClient extends discord_js_1.Client {
     async _executeCommand(command, executeData) {
         try {
             await Promise.resolve(command.type === builders_1.CommandType.SlashCommand ? command.execute(executeData) : command.execute(executeData))
-                .then(() => this.emit('recipleCommandExecute', executeData))
+                .then(() => this.emit(RecipleEvents.CommandExecute, executeData))
                 .catch(async (err) => !(await this._haltCommand(command, {
                 executeData: executeData,
                 reason: commands_1.CommandHaltReason.Error,

package/dist/lib/reciple/classes/RecipleModule.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RecipleModule = void 0;
-const crypto_1 = require("crypto");
-const discord_js_1 = require("discord.js");
 const builders_1 = require("../types/builders");
-const util_1 = require("../util");
+const discord_js_1 = require("discord.js");
 const MessageCommandBuilder_1 = require("./builders/MessageCommandBuilder");
 const SlashCommandBuilder_1 = require("./builders/SlashCommandBuilder");
+const util_1 = require("../util");
+const crypto_1 = require("crypto");
 class RecipleModule {
     constructor(options) {
         this.commands = [];

package/dist/lib/reciple/classes/builders/MessageCommandBuilder.js

@@ -183,7 +183,7 @@ class MessageCommandBuilder {
         return this;
     }
     /**
-     * Add options to command
+     * Add new command options
      * @param options Message options
      */
     addOptions(...options) {
@@ -200,7 +200,14 @@ class MessageCommandBuilder {
         return this;
     }
     /**
-     * Replace options from command
+     * Add new command option
+     * @param option Message option
+     */
+    addOption(option) {
+        return this.addOptions(option);
+    }
+    /**
+     * Set options from command
      * @params options Message options
      */
     setOptions(...options) {
@@ -288,36 +295,13 @@ class MessageCommandBuilder {
      * @param builder Command builder
      * @param options Parsed command args
      */
-    static async validateOptions(builder, options) {
-        const args = options.args || [];
-        const required = builder.options.filter(o => o.required);
-        const optional = builder.options.filter(o => !o.required);
-        const allOptions = [...required, ...optional];
+    static async validateOptions(builder, commandArgs) {
+        const args = Array.isArray(commandArgs) ? commandArgs : commandArgs.args || [];
+        const allOptions = [...(builder.options ?? []).filter(o => o.required), ...(builder.options ?? []).filter(o => !o.required)];
         const result = [];
-        let i = 0;
-        for (const option of allOptions) {
+        for (let i = 0; i < allOptions.length; i++) {
             const arg = args[i];
-            const value = {
-                name: option.name,
-                value: arg ?? undefined,
-                required: !!option.required,
-                invalid: false,
-                missing: false,
-            };
-            if (arg == undefined && option.required) {
-                value.missing = true;
-                result.push(value);
-                continue;
-            }
-            if (arg == undefined && !option.required) {
-                result.push(value);
-                continue;
-            }
-            const validate = option.validator ? await Promise.resolve(option.validator(arg)) : true;
-            if (!validate)
-                value.invalid = true;
-            result.push(value);
-            i++;
+            result.push(await MessageCommandOptionBuilder_1.MessageCommandOptionBuilder.validateOption(allOptions[i], arg));
         }
         return new MessageCommandOptionManager_1.MessageCommandOptionManager(...result);
     }

package/dist/lib/reciple/classes/builders/MessageCommandOptionBuilder.js

@@ -103,5 +103,24 @@ class MessageCommandOptionBuilder {
     static isMessageCommandOption(builder) {
         return builder instanceof MessageCommandOptionBuilder;
     }
+    static async validateOption(option, value) {
+        const validatedOption = {
+            name: option.name,
+            value,
+            required: !!option.required,
+            invalid: false,
+            missing: false,
+        };
+        if (value == undefined && option.required) {
+            validatedOption.missing = true;
+            return validatedOption;
+        }
+        if (value == undefined && !option.required)
+            return validatedOption;
+        const validate = option.validator !== undefined ? await Promise.resolve(option.validator(value ?? '')) : true;
+        if (!validate)
+            validatedOption.invalid = true;
+        return validatedOption;
+    }
 }
 exports.MessageCommandOptionBuilder = MessageCommandOptionBuilder;

package/dist/lib/reciple/classes/managers/CommandCooldownManager.js

@@ -26,7 +26,6 @@ class CommandCooldownManager extends Array {
         if (!Object.keys(options).length)
             throw new TypeError('Provide atleast one option to remove cooldown data.');
         const removed = [];
-        let i = 0;
         for (let i = 0; i < this.length; i++) {
             if (!CommandCooldownManager.checkOptions(options, this[i]))
                 continue;

package/dist/lib/reciple/classes/managers/CommandManager.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandManager = void 0;
-const discord_js_1 = require("discord.js");
 const builders_1 = require("../../types/builders");
+const discord_js_1 = require("discord.js");
 const MessageCommandBuilder_1 = require("../builders/MessageCommandBuilder");
 const SlashCommandBuilder_1 = require("../builders/SlashCommandBuilder");
+const RecipleClient_1 = require("../RecipleClient");
 class CommandManager {
     constructor(options) {
         this.slashCommands = new discord_js_1.Collection();
@@ -37,7 +38,7 @@ class CommandManager {
             case builders_1.CommandType.SlashCommand:
                 return this.slashCommands.get(command);
             case builders_1.CommandType.MessageCommand:
-                return this.messageCommands.get(command.toLowerCase()) ?? (this.client.config.commands.messageCommand.allowCommandAlias ? this.messageCommands.find(c => c.aliases.some(a => a == command?.toLowerCase())) : undefined);
+                return (this.messageCommands.get(command.toLowerCase()) ?? (this.client.config.commands.messageCommand.allowCommandAlias ? this.messageCommands.find(c => c.aliases.some(a => a == command?.toLowerCase())) : undefined));
             default:
                 throw new TypeError('Unknown command type');
         }
@@ -52,7 +53,7 @@ class CommandManager {
         if (!this.client.isClientLogsSilent)
             this.client.logger.log(`Regestering ${this.client.applicationCommands.size} application command(s) ${!guilds.length ? 'globaly' : 'to ' + guilds.length + ' guilds'}...`);
         await this.client.applicationCommands.set([...this.client.applicationCommands.commands], guilds);
-        this.client.emit('recipleRegisterApplicationCommands');
+        this.client.emit(RecipleClient_1.RecipleEvents.RegisterApplicationCommands);
         return this;
     }
 }

package/dist/lib/reciple/classes/managers/ModuleManager.js

@@ -1,15 +1,12 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModuleManager = void 0;
 const discord_js_1 = require("discord.js");
 const fs_1 = require("fs");
-const util_1 = require("util");
-const wildcard_match_1 = __importDefault(require("wildcard-match"));
 const RecipleModule_1 = require("../RecipleModule");
-const util_2 = require("../../util");
+const util_1 = require("../../util");
+const util_2 = require("util");
+const micromatch_1 = require("micromatch");
 class ModuleManager {
     constructor(options) {
         this.modules = new discord_js_1.Collection();
@@ -33,7 +30,7 @@ class ModuleManager {
                     return false;
                 });
                 if (error)
-                    throw new Error(`An error occured while loading module '${module_}': \n${(0, util_1.inspect)(error)}`);
+                    throw new Error(`An error occured while loading module '${module_}': \n${(0, util_2.inspect)(error)}`);
                 if (!start) {
                     if (!this.client.isClientLogsSilent)
                         this.client.logger.error(`Module '${module_}' returned false onStart`);
@@ -115,8 +112,8 @@ class ModuleManager {
         const modules = [];
         for (const file of options.files) {
             try {
-                const resolveFile = await import((util_2.path.isAbsolute(file) ? 'file://' : '') + file);
-                let script = resolveFile instanceof RecipleModule_1.RecipleModule || ModuleManager.validateScript(resolveFile) ? resolveFile : resolveFile?.default?.default instanceof RecipleModule_1.RecipleModule || ModuleManager.validateScript(resolveFile?.default?.default) ? resolveFile.default.default : resolveFile?.default;
+                const resolveFile = await import((util_1.path.isAbsolute(file) ? 'file://' : '') + file);
+                const script = resolveFile instanceof RecipleModule_1.RecipleModule || ModuleManager.validateScript(resolveFile) ? resolveFile : resolveFile?.default?.default instanceof RecipleModule_1.RecipleModule || ModuleManager.validateScript(resolveFile?.default?.default) ? resolveFile.default.default : resolveFile?.default;
                 if (script instanceof RecipleModule_1.RecipleModule) {
                     modules.push(script);
                     continue;
@@ -170,10 +167,10 @@ class ModuleManager {
             if (!(0, fs_1.lstatSync)(dir).isDirectory())
                 continue;
             modules.push(...(0, fs_1.readdirSync)(dir)
-                .map(file => util_2.path.join(!dir.startsWith('/') ? this.client.cwd : '', dir, file))
+                .map(file => util_1.path.join(!dir.startsWith('/') ? this.client.cwd : '', dir, file))
                 .filter(file => (options?.filter ? options.filter(file) : file.endsWith('.js'))));
         }
-        return modules.filter(file => !(options?.ignoredFiles ?? this.client.config.ignoredFiles).some(ignored => (0, wildcard_match_1.default)(ignored)(util_2.path.basename(file))));
+        return modules.filter(file => !(0, micromatch_1.isMatch)(util_1.path.basename(file), options?.ignoredFiles ?? this.client.config.ignoredFiles));
     }
 }
 exports.ModuleManager = ModuleManager;

package/dist/lib/reciple/flags.js

@@ -18,7 +18,7 @@ exports.commander = new commander_1.Command()
     .option('-v, --version', 'Display version')
     .parse();
 /**
- * Used flags
+ * Used commander flags
  */
 exports.flags = exports.commander.opts();
 /**

package/dist/lib/reciple/util.js

@@ -4,11 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.path = exports.createLogger = exports.validateCommandBuilder = exports.deprecationWarning = exports.isClass = void 0;
-const chalk_1 = __importDefault(require("chalk"));
 const fallout_utility_1 = require("fallout-utility");
-const path_1 = __importDefault(require("path"));
-const flags_1 = require("./flags");
 const builders_1 = require("./types/builders");
+const flags_1 = require("./flags");
+const chalk_1 = __importDefault(require("chalk"));
+const path_1 = __importDefault(require("path"));
 /**
  * Check if an object is a class
  * @param object Object to identify
@@ -49,9 +49,7 @@ function createLogger(stringifyJSON, debugmode = false, colorizeMessage = true)
         enableDebugMode: flags_1.flags.debugmode ?? debugmode,
         loggerName: 'Main',
         prefixes: {
-            [fallout_utility_1.LogLevels.INFO]: (name) => `[${new Date().toLocaleTimeString(undefined, {
-                hour12: false,
-            })}][${(name ? name + '/' : '') + 'INFO'}]`,
+            [fallout_utility_1.LogLevels.INFO]: (name) => `[${new Date().toLocaleTimeString(undefined, { hour12: false })}][${(name ? name + '/' : '') + 'INFO'}]`,
             [fallout_utility_1.LogLevels.WARN]: (name) => `[${chalk_1.default.yellow(new Date().toLocaleTimeString(undefined, { hour12: false }))}][${chalk_1.default.yellow((name ? name + '/' : '') + 'WARN')}]`,
             [fallout_utility_1.LogLevels.ERROR]: (name) => `[${chalk_1.default.red(new Date().toLocaleTimeString(undefined, { hour12: false }))}][${chalk_1.default.red((name ? name + '/' : '') + 'ERROR')}]`,
             [fallout_utility_1.LogLevels.DEBUG]: (name) => `[${chalk_1.default.blue(new Date().toLocaleTimeString(undefined, { hour12: false }))}][${chalk_1.default.blue((name ? name + '/' : '') + 'DEBUG')}]`,
@@ -62,7 +60,12 @@ function createLogger(stringifyJSON, debugmode = false, colorizeMessage = true)
             [fallout_utility_1.LogLevels.ERROR]: (message) => (!colorizeMessage ? message : chalk_1.default.red(message)),
             [fallout_utility_1.LogLevels.DEBUG]: (message) => (!colorizeMessage ? message : chalk_1.default.blue(message)),
         },
+        ObjectInspectDepth: 3,
+        ObjectInspectColorized: colorizeMessage,
     });
 }
 exports.createLogger = createLogger;
+/**
+ * Path module that depending on os
+ */
 exports.path = (0, fallout_utility_1.getOperatingSystem)() === fallout_utility_1.OS.WINDOWS ? path_1.default.win32 : path_1.default.posix;

package/dist/types/index.d.ts

@@ -2,17 +2,15 @@ export * from './reciple/classes/builders/MessageCommandBuilder.js';
 export * from './reciple/classes/builders/MessageCommandOptionBuilder.js';
 export * from './reciple/classes/builders/SlashCommandBuilder.js';
 export * from './reciple/classes/managers/ApplicationCommandManager.js';
-export * from './reciple/classes/managers/CommandManager.js';
-export * from './reciple/classes/managers/ModuleManager.js';
 export * from './reciple/classes/managers/CommandCooldownManager.js';
+export * from './reciple/classes/managers/CommandManager.js';
 export * from './reciple/classes/managers/MessageCommandOptionManager.js';
+export * from './reciple/classes/managers/ModuleManager.js';
 export * from './reciple/classes/RecipleClient.js';
 export * from './reciple/classes/RecipleConfig.js';
 export * from './reciple/classes/RecipleModule.js';
 export * from './reciple/types/builders.js';
 export * from './reciple/types/commands.js';
-export * from './reciple/types/builders.js';
-export * from './reciple/types/builders.js';
 export * from './reciple/flags';
 export * from './reciple/permissions.js';
 export * from './reciple/util.js';

package/dist/types/reciple/classes/RecipleClient.d.ts

@@ -1,8 +1,9 @@
 import { Awaitable, ChatInputCommandInteraction, Client, ClientEvents, ClientOptions, Interaction, Message } from 'discord.js';
 import { MessageCommandBuilder, MessageCommandExecuteData, MessageCommandHaltData } from './builders/MessageCommandBuilder';
-import { SlashCommandBuilder, SlashCommandExecuteData, SlashCommandHaltData } from './builders/SlashCommandBuilder';
+import { SlashCommandExecuteData, SlashCommandHaltData } from './builders/SlashCommandBuilder';
 import { AnyCommandExecuteData, AnyCommandHaltData } from '../types/commands';
 import { CommandCooldownManager } from './managers/CommandCooldownManager';
+import { AnySlashCommandBuilder } from '../types/builders';
 import { ApplicationCommandManager } from './managers/ApplicationCommandManager';
 import { CommandManager } from './managers/CommandManager';
 import { ModuleManager } from './managers/ModuleManager';
@@ -24,6 +25,16 @@ export interface RecipleClientEvents extends ClientEvents {
     recipleRegisterApplicationCommands: [];
     recipleReplyError: [error: unknown];
 }
+export declare enum RecipleEvents {
+    RecipleCommandExecute = "recipleCommandExecute",
+    RecipleCommandHalt = "recipleCommandHalt",
+    RecipleRegisterApplicationCommands = "recipleRegisterApplicationCommands",
+    RecipleReplyError = "recipleReplyError",
+    CommandExecute = "recipleCommandExecute",
+    CommandHalt = "recipleCommandHalt",
+    RegisterApplicationCommands = "recipleRegisterApplicationCommands",
+    ReplyError = "recipleReplyError"
+}
 /**
  * Reciple client
  */
@@ -85,14 +96,14 @@ export declare class RecipleClient<Ready extends boolean = boolean> extends Clie
      * @param command Halted command's builder
      * @param haltData Halted command's data
      */
-    protected _haltCommand(command: SlashCommandBuilder, haltData: SlashCommandHaltData): Promise<boolean>;
+    protected _haltCommand(command: AnySlashCommandBuilder, haltData: SlashCommandHaltData): Promise<boolean>;
     protected _haltCommand(command: MessageCommandBuilder, haltData: MessageCommandHaltData): Promise<boolean>;
     /**
      * Executes a command's {@link SharedCommandBuilderProperties["execute"]} method
      * @param command Command builder
      * @param executeData Command execute data
      */
-    protected _executeCommand(command: SlashCommandBuilder, executeData: SlashCommandExecuteData): Promise<SlashCommandExecuteData | undefined>;
+    protected _executeCommand(command: AnySlashCommandBuilder, executeData: SlashCommandExecuteData): Promise<SlashCommandExecuteData | undefined>;
     protected _executeCommand(command: MessageCommandBuilder, executeData: MessageCommandExecuteData): Promise<MessageCommandExecuteData | undefined>;
     /**
      * Error message when a command fails to execute

package/dist/types/reciple/classes/RecipleModule.d.ts

@@ -1,5 +1,5 @@
-import { GuildResolvable, RestOrArray } from 'discord.js';
 import { AnyCommandBuilder, AnyCommandData } from '../types/builders';
+import { GuildResolvable, RestOrArray } from 'discord.js';
 import { RecipleClient } from './RecipleClient';
 /**
  * Reciple script object

package/dist/types/reciple/classes/builders/MessageCommandBuilder.d.ts

@@ -1,7 +1,7 @@
-import { CommandType, CommandHaltFunction, CommandExecuteFunction, SharedCommandBuilderProperties, MessageCommandData, MessageCommandOptionResolvable } from '../../types/builders';
+import { CommandType, CommandHaltFunction, CommandExecuteFunction, SharedCommandBuilderProperties, MessageCommandData, MessageCommandOptionResolvable, MessageCommandResolvable } from '../../types/builders';
 import { Message, PermissionResolvable, RestOrArray } from 'discord.js';
-import { BaseCommandExecuteData, CommandHaltData } from '../../types/commands';
 import { MessageCommandOptionManager } from '../managers/MessageCommandOptionManager';
+import { BaseCommandExecuteData, CommandHaltData } from '../../types/commands';
 import { MessageCommandOptionBuilder } from './MessageCommandOptionBuilder';
 import { Command } from 'fallout-utility';
 /**
@@ -136,12 +136,17 @@ export declare class MessageCommandBuilder<T = unknown> implements SharedCommand
      */
     setAllowExecuteByBots(allowExecuteByBots: boolean): this;
     /**
-     * Add options to command
+     * Add new command options
      * @param options Message options
      */
     addOptions(...options: RestOrArray<MessageCommandOptionResolvable | ((builder: MessageCommandOptionBuilder) => MessageCommandOptionBuilder)>): this;
     /**
-     * Replace options from command
+     * Add new command option
+     * @param option Message option
+     */
+    addOption(option: MessageCommandOptionResolvable | ((builder: MessageCommandOptionBuilder) => MessageCommandOptionBuilder)): this;
+    /**
+     * Set options from command
      * @params options Message options
      */
     setOptions(...options: RestOrArray<MessageCommandOptionResolvable | ((builder: MessageCommandOptionBuilder) => MessageCommandOptionBuilder)>): this;
@@ -180,5 +185,5 @@ export declare class MessageCommandBuilder<T = unknown> implements SharedCommand
      * @param builder Command builder
      * @param options Parsed command args
      */
-    static validateOptions(builder: MessageCommandBuilder, options: Command): Promise<MessageCommandOptionManager>;
+    static validateOptions(builder: MessageCommandResolvable, commandArgs: Command | string[]): Promise<MessageCommandOptionManager>;
 }

package/dist/types/reciple/classes/builders/MessageCommandOptionBuilder.d.ts

@@ -1,5 +1,6 @@
 import { MessageCommandOptionData, MessageCommandOptionResolvable } from '../../types/builders';
 import { Awaitable } from 'discord.js';
+import { MessageCommandValidatedOption } from './MessageCommandBuilder';
 /**
  * Option builder for MessageCommandBuilder
  */
@@ -48,4 +49,5 @@ export declare class MessageCommandOptionBuilder {
      * @param builder data to check
      */
     static isMessageCommandOption(builder: unknown): builder is MessageCommandOptionBuilder;
+    static validateOption(option: MessageCommandOptionResolvable, value?: string): Promise<MessageCommandValidatedOption>;
 }

package/dist/types/reciple/classes/managers/CommandManager.d.ts

@@ -1,13 +1,12 @@
+import { AnyCommandBuilder, AnyCommandData, AnySlashCommandBuilder, CommandType, MessageCommandResolvable, SlashCommandResolvable } from '../../types/builders';
 import { ApplicationCommandData, Collection, GuildResolvable, RestOrArray } from 'discord.js';
-import { AnyCommandBuilder, AnyCommandData, AnySlashCommandBuilder, CommandType, MessageCommandData, SlashCommandData } from '../../types/builders';
 import { MessageCommandBuilder } from '../builders/MessageCommandBuilder';
-import { SlashCommandBuilder } from '../builders/SlashCommandBuilder';
-import { RecipleClient } from '../RecipleClient';
 import { ApplicationCommandBuilder } from './ApplicationCommandManager';
+import { RecipleClient } from '../RecipleClient';
 export interface CommandManagerOptions {
     client: RecipleClient;
-    messageCommands?: (MessageCommandBuilder | MessageCommandData)[];
-    slashCommands?: (AnySlashCommandBuilder | SlashCommandData)[];
+    messageCommands?: MessageCommandResolvable[];
+    slashCommands?: SlashCommandResolvable[];
 }
 export declare class CommandManager {
     readonly client: RecipleClient;
@@ -25,9 +24,8 @@ export declare class CommandManager {
      * @param command Command name
      * @param type Command type
      */
-    get(command: string, type?: undefined): AnyCommandBuilder | undefined;
-    get(command: string, type?: CommandType.MessageCommand): MessageCommandBuilder | undefined;
-    get(command: string, type?: CommandType.SlashCommand): SlashCommandBuilder | undefined;
+    get<T = unknown>(command: string, type: CommandType.SlashCommand): AnySlashCommandBuilder<T> | undefined;
+    get<T = unknown>(command: string, type: CommandType.MessageCommand): MessageCommandBuilder<T> | undefined;
     /**
      * Register application commands
      * @param guilds Register application commands to guilds

package/dist/types/reciple/classes/managers/MessageCommandOptionManager.d.ts

@@ -10,8 +10,8 @@ export declare class MessageCommandOptionManager extends Array<MessageCommandVal
      * @param name Option name
      * @param requied Is the option required
      */
-    get(name: string, requied: true): MessageCommandValidatedOption;
     get(name: string, requied?: boolean): MessageCommandValidatedOption | null;
+    get(name: string, requied: true): MessageCommandValidatedOption;
     /**
      * Get the option value
      * @param name Option name

package/dist/types/reciple/classes/managers/ModuleManager.d.ts

@@ -1,7 +1,7 @@
-import { Collection } from 'discord.js';
 import { ModuleManagerGetModulePathsOptions, ModuleManagerLoadModulesOptions, ModuleManagerResolveModuleFilesOptions, ModuleManagerStartModulesOptions, ModuleManagerUnloadModulesOptions } from '../../types/paramOptions';
-import { RecipleClient } from '../RecipleClient';
+import { Collection } from 'discord.js';
 import { RecipleModule, RecipleScript } from '../RecipleModule';
+import { RecipleClient } from '../RecipleClient';
 export interface ModuleManagerOptions {
     client: RecipleClient;
     modules?: (RecipleModule | RecipleScript)[];

package/dist/types/reciple/flags.d.ts

@@ -4,7 +4,7 @@ import { Command } from 'commander';
  */
 export declare const commander: Command;
 /**
- * Used flags
+ * Used commander flags
  */
 export declare const flags: import("commander").OptionValues;
 /**

package/dist/types/reciple/permissions.d.ts

@@ -7,13 +7,9 @@ import { UserHasCommandPermissionsOptions } from './types/paramOptions';
 export declare function userHasCommandPermissions(options: UserHasCommandPermissionsOptions): boolean;
 /**
  * Check if the bot has the required permissions in a guild
- * @param guild Check if the bot has the required permissions in this guild
+ * @param guildOrChannel Check if the bot has the required permissions in this guild or channel
  * @param requiredPermissions Required guild bot permissions
  */
+export declare function botHasExecutePermissions(guildOrChannel?: Guild | GuildTextBasedChannel, requiredPermissions?: PermissionResolvable[]): boolean;
 export declare function botHasExecutePermissions(guild?: Guild, requiredPermissions?: PermissionResolvable[]): boolean;
-/**
- * Check if the bot has the required permissions in a channel
- * @param channel Check if the bot has the required permissions in this channel
- * @param requiredPermissions Required guild bot permissions
- */
 export declare function botHasExecutePermissions(channel?: GuildTextBasedChannel, requiredPermissions?: PermissionResolvable[]): boolean;

package/dist/types/reciple/types/builders.d.ts

@@ -1,7 +1,7 @@
-import { ApplicationCommandOptionAllowedChannelTypes, ApplicationCommandOptionType, Awaitable, LocalizationMap, PermissionResolvable, RestOrArray, SlashCommandAttachmentOption, SlashCommandBooleanOption, SlashCommandChannelOption, SlashCommandIntegerOption, SlashCommandMentionableOption, SlashCommandNumberOption, SlashCommandRoleOption, SlashCommandStringOption, SlashCommandSubcommandBuilder, SlashCommandSubcommandGroupBuilder, SlashCommandUserOption } from 'discord.js';
 import { SlashCommandBuilder, SlashCommandExecuteData, SlashCommandExecuteFunction, SlashCommandHaltData, SlashCommandHaltFunction, SlashCommandOptionsOnlyBuilder, SlashCommandSubcommandsOnlyBuilder } from '../classes/builders/SlashCommandBuilder';
 import { MessageCommandBuilder, MessageCommandExecuteData, MessageCommandExecuteFunction, MessageCommandHaltData, MessageCommandHaltFunction } from '../classes/builders/MessageCommandBuilder';
 import { MessageCommandOptionBuilder } from '../classes/builders/MessageCommandOptionBuilder';
+import { ApplicationCommandOptionAllowedChannelTypes, ApplicationCommandOptionType, Awaitable, LocalizationMap, PermissionResolvable, RestOrArray, SlashCommandAttachmentOption, SlashCommandBooleanOption, SlashCommandChannelOption, SlashCommandIntegerOption, SlashCommandMentionableOption, SlashCommandNumberOption, SlashCommandRoleOption, SlashCommandStringOption, SlashCommandSubcommandBuilder, SlashCommandSubcommandGroupBuilder, SlashCommandUserOption } from 'discord.js';
 /**
  * Any command builders
  */
@@ -31,7 +31,15 @@ export declare type CommandHaltFunction<T extends CommandType, M = unknown> = (h
  */
 export declare type CommandExecuteFunction<T extends CommandType, M = unknown> = (executeData: T extends CommandType.SlashCommand ? SlashCommandExecuteData<M> : T extends CommandType.MessageCommand ? MessageCommandExecuteData<M> : SlashCommandExecuteData<M> | MessageCommandExecuteData<M>) => Awaitable<void>;
 /**
- * Message command options resolvable
+ *  Slash command options resolvable
+ */
+export declare type SlashCommandResolvable<T = unknown, OptionsOnly = unknown> = OptionsOnly extends true ? SlashCommandOptionsOnlyBuilder<T> : OptionsOnly extends false ? SlashCommandSubcommandsOnlyBuilder<T> : AnySlashCommandBuilder<T> | SlashCommandData<T>;
+/**
+ *  Message command resolvable
+ */
+export declare type MessageCommandResolvable<T = unknown> = MessageCommandBuilder<T> | MessageCommandData<T>;
+/**
+ * Message command option resolvable
  */
 export declare type MessageCommandOptionResolvable = MessageCommandOptionBuilder | MessageCommandOptionData;
 /**

package/dist/types/reciple/types/paramOptions.d.ts

@@ -1,7 +1,7 @@
 import { ConfigCommandPermissions } from '../classes/RecipleConfig';
 import { Awaitable, PermissionsBitField } from 'discord.js';
-import { AnyCommandBuilder } from './builders';
 import { RecipleModule } from '../classes/RecipleModule';
+import { AnyCommandBuilder } from './builders';
 export interface UserHasCommandPermissionsOptions {
     /**
      * Command builder

package/dist/types/reciple/util.d.ts

@@ -1,18 +1,18 @@
 /// <reference types="node" />
 import { Logger } from 'fallout-utility';
-import { default as _path } from 'path';
 import { AnyCommandBuilder } from './types/builders';
+import _path from 'path';
 /**
  * Check if an object is a class
  * @param object Object to identify
  */
-export declare function isClass<T = any>(object: any): object is T;
+export declare function isClass<T>(object: any): object is T;
 /**
  * Emit process warning about deprecated method/function
  * @param content Warning content
  */
 export declare function deprecationWarning(content: string | Error): void;
-export declare function validateCommandBuilder(command: AnyCommandBuilder): boolean;
+export declare function validateCommandBuilder(command: AnyCommandBuilder): command is AnyCommandBuilder;
 /**
  * Create new logger
  * @param stringifyJSON stringify json objects in console
@@ -20,4 +20,7 @@ export declare function validateCommandBuilder(command: AnyCommandBuilder): bool
  * @param colorizeMessage add logger colours to messages
  */
 export declare function createLogger(stringifyJSON: boolean, debugmode?: boolean, colorizeMessage?: boolean): Logger;
+/**
+ * Path module that depending on os
+ */
 export declare const path: _path.PlatformPath;

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "reciple",
-  "version": "6.0.0-dev.23",
-  "bin": "./dist/lib/bin.mjs",
   "license": "GPL-3.0",
-  "type": "commonjs",
+  "version": "6.0.0-dev.26",
+  "bin": "./dist/lib/bin.mjs",
+  "author": "FalloutStudios",
   "main": "./dist/lib/index.js",
-  "types": "./dist/types/index.d.ts",
   "module": "./dist/lib/esm.mjs",
-  "author": "FalloutStudios",
+  "types": "./dist/types/index.d.ts",
   "description": "Handler for Discord.js",
   "homepage": "https://reciple.js.org",
+  "engineStrict": true,
+  "type": "commonjs",
   "exports": {
     ".": {
       "import": {
@@ -33,6 +34,18 @@
   "bugs": {
     "url": "https://github.com/FalloutStudios/reciple/issues"
   },
+  "engines": {
+    "node": ">=16.9.0"
+  },
+  "workspaces": [
+    "test"
+  ],
+  "files": [
+    "dist",
+    "resource",
+    "LICENSE",
+    "README.md"
+  ],
   "scripts": {
     "format": "npx prettier --write src",
     "clean": "npx rimraf dist",
@@ -47,27 +60,18 @@
     "type": "git",
     "url": "git+https://github.com/FalloutStudios/reciple.git"
   },
-  "engineStrict": true,
-  "engines": {
-    "node": ">=16.9.0"
-  },
-  "files": [
-    "dist",
-    "resource",
-    "LICENSE",
-    "README.md"
-  ],
   "dependencies": {
     "chalk": "4.1.2",
     "commander": "^9.4.1",
     "dotenv": "^16.0.3",
-    "fallout-utility": "^1.5.13",
+    "fallout-utility": "^1.5.15",
+    "micromatch": "^4.0.5",
     "semver": "^7.3.7",
-    "wildcard-match": "^5.1.2",
     "yaml": "^2.1.1"
   },
   "devDependencies": {
     "@discordjs/docgen": "^0.12.1",
+    "@types/micromatch": "^4.0.2",
     "@types/node": "^18.11.7",
     "@types/semver": "^7.3.13",
     "discord.js": "^14.6.0",
@@ -77,8 +81,5 @@
   },
   "peerDependencies": {
     "discord.js": "^14.5.0"
-  },
-  "workspaces": [
-    "test"
-  ]
+  }
 }