reciple 4.0.0-pre.3 → 4.1.0

package/bin/bin.js

@@ -12,29 +12,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a, _b, _c;
+var _a, _b, _c, _d;
 Object.defineProperty(exports, "__esModule", { value: true });
 const RecipleClient_1 = require("./reciple/classes/RecipleClient");
 const RecipleConfig_1 = require("./reciple/classes/RecipleConfig");
-const flags_1 = require("./reciple/flags");
 const version_1 = require("./reciple/version");
-const chalk_1 = __importDefault(require("chalk"));
-const fallout_utility_1 = require("fallout-utility");
 const fs_1 = require("fs");
+const flags_1 = require("./reciple/flags");
+const fallout_utility_1 = require("fallout-utility");
+const chalk_1 = __importDefault(require("chalk"));
 require("dotenv/config");
-if (flags_1.flags.version) {
-    console.log(`v${version_1.version}`);
-    process.exit(0);
-}
 const allowedFiles = ['node_modules', 'reciple.yml', 'package.json'];
 if ((0, fs_1.readdirSync)('./').filter(f => !f.startsWith('.') && allowedFiles.indexOf(f)).length > 0 && !(0, fs_1.existsSync)((_a = flags_1.flags.config) !== null && _a !== void 0 ? _a : './reciple.yml')) {
-    const ask = (_b = (0, fallout_utility_1.input)('This directory does not contain reciple.yml. Would you like to init axis here? [y/n] ')) !== null && _b !== void 0 ? _b : '';
+    const ask = (_c = (_b = (flags_1.flags.yes ? 'y' : null)) !== null && _b !== void 0 ? _b : (0, fallout_utility_1.input)('This directory does not contain reciple.yml. Would you like to init axis here? [y/n] ')) !== null && _c !== void 0 ? _c : '';
     if (ask.toString().toLowerCase() !== 'y')
         process.exit(0);
 }
 let configParser;
 try {
-    configParser = new RecipleConfig_1.RecipleConfig((_c = flags_1.flags.config) !== null && _c !== void 0 ? _c : './reciple.yml').parseConfig();
+    configParser = new RecipleConfig_1.RecipleConfig((_d = flags_1.flags.config) !== null && _d !== void 0 ? _d : './reciple.yml').parseConfig();
 }
 catch (err) {
     console.error(`${chalk_1.default.bold.red('Config Error')}: ${chalk_1.default.white(err.message)}`);
@@ -43,15 +39,18 @@ catch (err) {
 const config = configParser.getConfig();
 const client = new RecipleClient_1.RecipleClient(Object.assign({ config: config }, config.client));
 if (config.fileLogging.clientLogs)
-    client.logger.info('Reciple Client v' + version_1.version + ' is starting...');
+    client.logger.info('Reciple Client v' + version_1.rawVersion + ' is starting...');
 (() => __awaiter(void 0, void 0, void 0, function* () {
     yield client.startModules();
     client.on('ready', () => __awaiter(void 0, void 0, void 0, function* () {
-        var _d;
+        var _e;
         if (client.isClientLogsEnabled())
-            client.logger.warn(`Logged in as ${((_d = client.user) === null || _d === void 0 ? void 0 : _d.tag) || 'Unknown'}!`);
+            client.logger.warn(`Logged in as ${((_e = client.user) === null || _e === void 0 ? void 0 : _e.tag) || 'Unknown'}!`);
         yield client.loadModules();
         client.addCommandListeners();
     }));
-    client.login(config.token);
+    client.login(config.token).catch(err => {
+        if (client.isClientLogsEnabled())
+            client.logger.error(err);
+    });
 }))();

package/bin/index.d.ts

@@ -12,5 +12,5 @@ export * from './reciple/flags';
 export * from './reciple/logger';
 export * from './reciple/modules';
 export * from './reciple/permissions';
-export * from './reciple/registerInteractionCommands';
+export * from './reciple/registerApplicationCommands';
 export * from './reciple/version';

package/bin/index.js

@@ -28,5 +28,5 @@ __exportStar(require("./reciple/flags"), exports);
 __exportStar(require("./reciple/logger"), exports);
 __exportStar(require("./reciple/modules"), exports);
 __exportStar(require("./reciple/permissions"), exports);
-__exportStar(require("./reciple/registerInteractionCommands"), exports);
+__exportStar(require("./reciple/registerApplicationCommands"), exports);
 __exportStar(require("./reciple/version"), exports);

package/bin/reciple/classes/CommandCooldownManager.d.ts

@@ -1,5 +1,5 @@
-import { CommandBuilderType } from '../types/builders';
 import { Guild, TextBasedChannel, User } from 'discord.js';
+import { CommandBuilderType } from '../types/builders';
 /**
  * Object interface for cooled-down user
  */

package/bin/reciple/classes/RecipleClient.d.ts

@@ -1,13 +1,13 @@
-import { RecipleModule } from '../modules';
-import { ApplicationCommandBuilder } from '../registerInteractionCommands';
-import { CommandBuilder, CommandBuilderType } from '../types/builders';
-import { RecipleClientAddModuleOptions } from '../types/paramOptions';
 import { MessageCommandBuilder, MessageCommandExecuteData } from './builders/MessageCommandBuilder';
+import { ApplicationCommandBuilder } from '../registerApplicationCommands';
+import { CommandBuilder, CommandBuilderType } from '../types/builders';
 import { SlashCommandBuilder, SlashCommandExecuteData } from './builders/SlashCommandBuilder';
 import { CommandCooldownManager } from './CommandCooldownManager';
+import { RecipleClientAddModuleOptions } from '../types/paramOptions';
+import { Logger as ILogger } from 'fallout-utility';
 import { Config } from './RecipleConfig';
+import { RecipleModule } from '../modules';
 import { ApplicationCommandData, Awaitable, ChatInputCommandInteraction, Client, ClientEvents, ClientOptions, Interaction, Message } from 'discord.js';
-import { Logger as ILogger } from 'fallout-utility';
 /**
  * options for Reciple client
  */
@@ -49,9 +49,6 @@ export interface RecipleClient<Ready extends boolean = boolean> extends Client<R
     removeAllListeners(event?: string | symbol): this;
     isReady(): this is RecipleClient<true>;
 }
-/**
- * The reciple client
- */
 export declare class RecipleClient<Ready extends boolean = boolean> extends Client<Ready> {
     config: Config;
     commands: RecipleClientCommands;

package/bin/reciple/classes/RecipleClient.js

@@ -10,23 +10,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RecipleClient = void 0;
-// Not cool code
-const logger_1 = require("../logger");
-const modules_1 = require("../modules");
+const MessageCommandBuilder_1 = require("./builders/MessageCommandBuilder");
 const permissions_1 = require("../permissions");
-const registerInteractionCommands_1 = require("../registerInteractionCommands");
+const registerApplicationCommands_1 = require("../registerApplicationCommands");
 const builders_1 = require("../types/builders");
-const commands_1 = require("../types/commands");
-const version_1 = require("../version");
-const MessageCommandBuilder_1 = require("./builders/MessageCommandBuilder");
 const CommandCooldownManager_1 = require("./CommandCooldownManager");
 const MessageCommandOptionManager_1 = require("./MessageCommandOptionManager");
+const commands_1 = require("../types/commands");
+const fallout_utility_1 = require("fallout-utility");
 const RecipleConfig_1 = require("./RecipleConfig");
+const modules_1 = require("../modules");
+const logger_1 = require("../logger");
+const version_1 = require("../version");
 const discord_js_1 = require("discord.js");
-const fallout_utility_1 = require("fallout-utility");
-/**
- * The reciple client
- */
 class RecipleClient extends discord_js_1.Client {
     /**
      * @param options Client options
@@ -40,7 +36,7 @@ class RecipleClient extends discord_js_1.Client {
         this.commandCooldowns = new CommandCooldownManager_1.CommandCooldownManager();
         this.modules = [];
         this.version = version_1.version;
-        this.logger = (0, logger_1.createLogger)(!!((_a = options.config) === null || _a === void 0 ? void 0 : _a.fileLogging.stringifyLoggedJSON), !!((_b = options.config) === null || _b === void 0 ? void 0 : _b.fileLogging.debugmode));
+        this.logger = (0, logger_1.createLogger)(!!((_a = options.config) === null || _a === void 0 ? void 0 : _a.fileLogging.stringifyLoggedJSON), (_b = options.config) === null || _b === void 0 ? void 0 : _b.fileLogging.debugmode);
         if (!options.config)
             throw new Error('Config is not defined.');
         this.config = Object.assign(Object.assign({}, this.config), ((_c = options.config) !== null && _c !== void 0 ? _c : {}));
@@ -92,7 +88,7 @@ class RecipleClient extends discord_js_1.Client {
                 this.logger.info(`${Object.keys(this.commands.slashCommands).length} slash commands loaded.`);
             }
             if (this.config.commands.slashCommand.registerCommands) {
-                yield (0, registerInteractionCommands_1.registerApplicationCommands)({
+                yield (0, registerApplicationCommands_1.registerApplicationCommands)({
                     client: this,
                     commands: [...Object.values(this.commands.slashCommands), ...this.otherApplicationCommandData],
                     guilds: this.config.commands.slashCommand.guilds
@@ -125,7 +121,7 @@ class RecipleClient extends discord_js_1.Client {
                 this.addCommand(command);
             }
             if (registerCommands)
-                yield (0, registerInteractionCommands_1.registerApplicationCommands)({
+                yield (0, registerApplicationCommands_1.registerApplicationCommands)({
                     client: this,
                     commands: [...Object.values(this.commands.slashCommands), ...this.otherApplicationCommandData],
                     guilds: this.config.commands.slashCommand.guilds
@@ -175,7 +171,7 @@ class RecipleClient extends discord_js_1.Client {
             const command = this.findCommand(parseCommand.command, builders_1.CommandBuilderType.MessageCommand);
             if (!command)
                 return;
-            const commandOptions = (0, MessageCommandBuilder_1.validateMessageCommandOptions)(command, parseCommand);
+            const commandOptions = yield (0, MessageCommandBuilder_1.validateMessageCommandOptions)(command, parseCommand);
             const executeData = {
                 message: message,
                 options: commandOptions,

package/bin/reciple/classes/RecipleConfig.d.ts

@@ -72,7 +72,7 @@ export declare class RecipleConfig {
     /**
      * Parse the config file
      */
-    parseConfig(): RecipleConfig;
+    parseConfig(): this;
     /**
      * Returns the parsed config file
      */

package/bin/reciple/classes/RecipleConfig.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RecipleConfig = void 0;
-const flags_1 = require("../flags");
+const fs_1 = require("fs");
 const version_1 = require("../version");
 const fallout_utility_1 = require("fallout-utility");
-const fs_1 = require("fs");
+const flags_1 = require("../flags");
 const path_1 = __importDefault(require("path"));
 const yaml_1 = __importDefault(require("yaml"));
 /**

package/bin/reciple/classes/builders/MessageCommandBuilder.d.ts

@@ -1,10 +1,9 @@
-import { CommandBuilderType } from '../../types/builders';
-import { HaltedCommandData } from '../../types/commands';
+import { CommandBuilderType, CommandExecuteFunction, CommandHaltFunction } from '../../types/builders';
 import { MessageCommandOptionManager } from '../MessageCommandOptionManager';
-import { RecipleClient } from '../RecipleClient';
 import { MessageCommandOptionBuilder } from './MessageCommandOptionBuilder';
-import { Awaitable, Message, PermissionResolvable } from 'discord.js';
 import { Command as CommandMessage } from 'fallout-utility';
+import { Message, PermissionResolvable } from 'discord.js';
+import { RecipleClient } from '../RecipleClient';
 /**
  * Execute data for message command
  */
@@ -40,68 +39,68 @@ export declare class MessageCommandBuilder {
     requiredMemberPermissions: PermissionResolvable[];
     allowExecuteInDM: boolean;
     allowExecuteByBots: boolean;
-    halt?: (haltData: HaltedCommandData<MessageCommandBuilder>) => Awaitable<boolean | void>;
-    execute: (executeData: MessageCommandExecuteData) => void;
+    halt?: CommandHaltFunction<this>;
+    execute: CommandExecuteFunction<this>;
     /**
      * Sets the command name
      * @param name Command name
      */
-    setName(name: string): MessageCommandBuilder;
+    setName(name: string): this;
     /**
      * Sets the command description
      * @param description Command description
      */
-    setDescription(description: string): MessageCommandBuilder;
+    setDescription(description: string): this;
     /**
      * Sets the execute cooldown for this command.
      * - `0` means no cooldown
      * @param cooldown Command cooldown in milliseconds
      */
-    setCooldown(cooldown: number): MessageCommandBuilder;
+    setCooldown(cooldown: number): this;
     /**
      * Add aliases to the command
      * @param aliases Command aliases
      */
-    addAliases(...aliases: string[]): MessageCommandBuilder;
+    addAliases(...aliases: string[]): this;
     /**
      * Set required bot permissions to execute the command
      * @param permissions Bot's required permissions
      */
-    setRequiredBotPermissions(...permissions: PermissionResolvable[]): MessageCommandBuilder;
+    setRequiredBotPermissions(...permissions: PermissionResolvable[]): this;
     /**
      * Set required permissions to execute the command
      * @param permissions User's return permissions
      */
-    setRequiredMemberPermissions(...permissions: PermissionResolvable[]): MessageCommandBuilder;
+    setRequiredMemberPermissions(...permissions: PermissionResolvable[]): this;
     /**
      * Set if command can be executed in dms
      * @param allowExecuteInDM `true` if the command can execute in DMs
      */
-    setAllowExecuteInDM(allowExecuteInDM: boolean): MessageCommandBuilder;
+    setAllowExecuteInDM(allowExecuteInDM: boolean): this;
     /**
      * Allow command to be executed by bots
      * @param allowExecuteByBots `true` if the command can be executed by bots
      */
-    setAllowExecuteByBots(allowExecuteByBots: boolean): MessageCommandBuilder;
+    setAllowExecuteByBots(allowExecuteByBots: boolean): this;
     /**
      * Function when the command is interupted
      * @param halt Function to execute when command is halted
      */
-    setHalt(halt?: (haltData: HaltedCommandData<MessageCommandBuilder>) => Awaitable<boolean | void>): MessageCommandBuilder;
+    setHalt(halt?: CommandHaltFunction<this>): this;
     /**
      * Function when the command is executed
      * @param execute Function to execute when the command is called
      */
-    setExecute(execute: (executeData: MessageCommandExecuteData) => void): MessageCommandBuilder;
+    setExecute(execute: CommandExecuteFunction<this>): this;
     /**
      * Add option to the command
      * @param option Message option builder
      */
-    addOption(option: MessageCommandOptionBuilder | ((constructor: MessageCommandOptionBuilder) => MessageCommandOptionBuilder)): MessageCommandBuilder;
+    addOption(option: MessageCommandOptionBuilder | ((constructor: MessageCommandOptionBuilder) => MessageCommandOptionBuilder)): this;
     /**
      * Validate options before executing
      * @param validateOptions `true` if the command options needs to be validated before executing
      */
-    setValidateOptions(validateOptions: boolean): MessageCommandBuilder;
+    setValidateOptions(validateOptions: boolean): this;
 }
-export declare function validateMessageCommandOptions(builder: MessageCommandBuilder, options: CommandMessage): MessageCommandOptionManager;
+export declare function validateMessageCommandOptions(builder: MessageCommandBuilder, options: CommandMessage): Promise<MessageCommandOptionManager>;

package/bin/reciple/classes/builders/MessageCommandBuilder.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateMessageCommandOptions = exports.MessageCommandBuilder = void 0;
 const builders_1 = require("../../types/builders");
@@ -147,36 +156,38 @@ class MessageCommandBuilder {
 }
 exports.MessageCommandBuilder = MessageCommandBuilder;
 function validateMessageCommandOptions(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];
-    const result = [];
-    let i = 0;
-    for (const option of allOptions) {
-        const arg = args[i];
-        const value = {
-            name: option.name,
-            value: arg !== null && arg !== void 0 ? arg : undefined,
-            required: option.required,
-            invalid: false,
-            missing: false
-        };
-        if (arg == undefined && option.required) {
-            value.missing = true;
+    return __awaiter(this, void 0, void 0, function* () {
+        const args = options.args || [];
+        const required = builder.options.filter(o => o.required);
+        const optional = builder.options.filter(o => !o.required);
+        const allOptions = [...required, ...optional];
+        const result = [];
+        let i = 0;
+        for (const option of allOptions) {
+            const arg = args[i];
+            const value = {
+                name: option.name,
+                value: arg !== null && arg !== void 0 ? 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 ? yield Promise.resolve(option.validator(arg)) : true;
+            if (!validate)
+                value.invalid = true;
             result.push(value);
-            continue;
+            i++;
         }
-        if (arg == undefined && !option.required) {
-            result.push(value);
-            continue;
-        }
-        const validate = option.validator ? option.validator(arg) : true;
-        if (!validate)
-            value.invalid = true;
-        result.push(value);
-        i++;
-    }
-    return new MessageCommandOptionManager_1.MessageCommandOptionManager(...result);
+        return new MessageCommandOptionManager_1.MessageCommandOptionManager(...result);
+    });
 }
 exports.validateMessageCommandOptions = validateMessageCommandOptions;

package/bin/reciple/classes/builders/MessageCommandOptionBuilder.d.ts

@@ -1,3 +1,4 @@
+import { Awaitable } from 'discord.js';
 /**
  * Option builder for MessageCommandBuilder
  */
@@ -5,25 +6,25 @@ export declare class MessageCommandOptionBuilder {
     name: string;
     description: string;
     required: boolean;
-    validator: (value: string) => boolean;
+    validator: (value: string) => Awaitable<boolean>;
     /**
      * Set command option name
      * @param name Option name
      */
-    setName(name: string): MessageCommandOptionBuilder;
+    setName(name: string): this;
     /**
      * Set command option description
      * @param description Option description
      */
-    setDescription(description: string): MessageCommandOptionBuilder;
+    setDescription(description: string): this;
     /**
      * Set if this option is required
      * @param required `true` if this option is required
      */
-    setRequired(required: boolean): MessageCommandOptionBuilder;
+    setRequired(required: boolean): this;
     /**
      * Set your custom function to validate given value for this option
      * @param validator Custom function to validate value given for this option
      */
-    setValidator(validator: (value: string) => boolean): MessageCommandOptionBuilder;
+    setValidator(validator: (value: string) => Awaitable<boolean>): this;
 }

package/bin/reciple/classes/builders/SlashCommandBuilder.d.ts

@@ -1,7 +1,6 @@
-import { CommandBuilderType } from '../../types/builders';
-import { HaltedCommandData } from '../../types/commands';
+import { CommandBuilderType, CommandExecuteFunction, CommandHaltFunction } from '../../types/builders';
 import { RecipleClient } from '../RecipleClient';
-import { Awaitable, ChatInputCommandInteraction, PermissionResolvable, SlashCommandBuilder as DiscordJsSlashCommandBuilder, SlashCommandSubcommandBuilder, SlashCommandSubcommandGroupBuilder, SlashCommandSubcommandsOnlyBuilder as DiscordJsSlashCommandSubcommandsOnlyBuilder } from 'discord.js';
+import { ChatInputCommandInteraction, PermissionResolvable, SlashCommandBuilder as DiscordJsSlashCommandBuilder, SlashCommandSubcommandBuilder, SlashCommandSubcommandGroupBuilder, SlashCommandSubcommandsOnlyBuilder as DiscordJsSlashCommandSubcommandsOnlyBuilder } from 'discord.js';
 /**
  * Execute data for interaction command
  */
@@ -25,32 +24,32 @@ export declare class SlashCommandBuilder extends DiscordJsSlashCommandBuilder {
     requiredBotPermissions: PermissionResolvable[];
     requiredMemberPermissions: PermissionResolvable[];
     allowExecuteInDM: boolean;
-    halt?: (haltData: HaltedCommandData<SlashCommandBuilder>) => Awaitable<boolean | void>;
-    execute: (executeData: SlashCommandExecuteData) => Awaitable<void>;
+    halt?: CommandHaltFunction<this>;
+    execute: CommandExecuteFunction<this>;
     /**
      * Sets the execute cooldown for this command.
      * - `0` means no cooldown
      * @param cooldown Command cooldown in milliseconds
      */
-    setCooldown(cooldown: number): SlashCommandBuilder;
+    setCooldown(cooldown: number): this;
     /**
      * Set required bot permissions to execute the command
      * @param permissions Bot's required permissions
      */
-    setRequiredBotPermissions(...permissions: PermissionResolvable[]): SlashCommandBuilder;
+    setRequiredBotPermissions(...permissions: PermissionResolvable[]): this;
     /**
      * Set required permissions to execute the command
      * @param permissions User's return permissions
      */
-    setRequiredMemberPermissions(...permissions: PermissionResolvable[]): SlashCommandBuilder;
+    setRequiredMemberPermissions(...permissions: PermissionResolvable[]): this;
     /**
      * Function when the command is interupted
      * @param halt Function to execute when command is halted
      */
-    setHalt(halt?: (haltData: HaltedCommandData<SlashCommandBuilder>) => Awaitable<boolean | void>): SlashCommandBuilder;
+    setHalt(halt?: CommandHaltFunction<this>): this;
     /**
      * Function when the command is executed
      * @param execute Function to execute when the command is called
      */
-    setExecute(execute: (executeData: SlashCommandExecuteData) => void): SlashCommandBuilder;
+    setExecute(execute: CommandExecuteFunction<this>): this;
 }

package/bin/reciple/flags.js

@@ -5,10 +5,14 @@ const commander_1 = require("commander");
 /**
  * Used flags
  */
-exports.flags = commander_1.program
+exports.flags = new commander_1.Command()
+    .name('reciple')
+    .description('Reciple.js - Discord.js handler cli')
+    .version(`v${require('../../package.json').version}`, '-v, --version')
     .option('-t, --token <token>', 'Replace used bot token')
     .option('-c, --config <config>', 'Change path to config file')
     .option('-D, --debugmode', 'Enabled debug mode')
+    .option('-y, --yes', 'Automatically agree to Reciple confirmation prompts')
     .option('-v, --version', 'Display version')
     .parse().opts();
 /**

package/bin/reciple/logger.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLogger = void 0;
+const fallout_utility_1 = require("fallout-utility");
 const flags_1 = require("./flags");
 const chalk_1 = __importDefault(require("chalk"));
-const fallout_utility_1 = require("fallout-utility");
 /**
  * Create new logger
  * @param stringifyJSON stringify json objects in console

package/bin/reciple/modules.d.ts

@@ -1,5 +1,5 @@
-import { RecipleClient } from './classes/RecipleClient';
 import { CommandBuilder } from './types/builders';
+import { RecipleClient } from './classes/RecipleClient';
 export declare type LoadedModules = {
     commands: CommandBuilder[];
     modules: RecipleModule[];

package/bin/reciple/modules.js

@@ -16,8 +16,8 @@ exports.loadModules = void 0;
 const builders_1 = require("./types/builders");
 const version_1 = require("./version");
 const fs_1 = require("fs");
-const path_1 = __importDefault(require("path"));
 const wildcard_match_1 = __importDefault(require("wildcard-match"));
+const path_1 = __importDefault(require("path"));
 /**
  * Load modules from folder
  * @param client Reciple client

package/bin/reciple/permissions.d.ts

@@ -1,6 +1,6 @@
-import { Config } from './classes/RecipleConfig';
 import { UserHasCommandPermissionsOptions } from './types/paramOptions';
 import { Guild, PermissionResolvable } from 'discord.js';
+import { Config } from './classes/RecipleConfig';
 /**
  * Check if the user has permissions to execute the given command name
  * @param options options

package/bin/reciple/{registerInteractionCommands.d.ts → registerApplicationCommands.d.ts}

@@ -1,6 +1,6 @@
+import { ContextMenuCommandBuilder, SlashCommandBuilder as DiscordJsSlashCommandBuilder } from 'discord.js';
 import { SlashCommandBuilder } from './classes/builders/SlashCommandBuilder';
 import { RegisterApplicationCommandsOptions } from './types/paramOptions';
-import { ContextMenuCommandBuilder, SlashCommandBuilder as DiscordJsSlashCommandBuilder } from 'discord.js';
 export declare type ApplicationCommandBuilder = SlashCommandBuilder | ContextMenuCommandBuilder | DiscordJsSlashCommandBuilder;
 /**
  * Register application commands

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

@@ -1,5 +1,7 @@
+import { Awaitable } from 'discord.js';
 import { MessageCommandBuilder, MessageCommandExecuteData } from '../classes/builders/MessageCommandBuilder';
 import { SlashCommandBuilder, SlashCommandExecuteData } from '../classes/builders/SlashCommandBuilder';
+import { HaltedCommandData } from './commands';
 /**
  * Reciple command builders
  */
@@ -8,6 +10,14 @@ export declare type CommandBuilder = MessageCommandBuilder | SlashCommandBuilder
  * Reciple command builders execute data
  */
 export declare type CommandBuilderExecuteData = SlashCommandExecuteData | MessageCommandExecuteData;
+/**
+ * Reciple command halt function
+ */
+export declare type CommandHaltFunction<Builder extends CommandBuilder> = (haltData: HaltedCommandData<Builder>) => Awaitable<boolean | null | undefined | void>;
+/**
+ * Reciple command execute function
+ */
+export declare type CommandExecuteFunction<Builder extends CommandBuilder> = (executeData: Builder extends MessageCommandBuilder ? MessageCommandExecuteData : SlashCommandExecuteData) => Awaitable<void>;
 /**
  * Types of Reciple command builders
  */

package/bin/reciple/types/commands.d.ts

@@ -1,7 +1,7 @@
 import { MessageCommandExecuteData } from '../classes/builders/MessageCommandBuilder';
 import { SlashCommandBuilder, SlashCommandExecuteData } from '../classes/builders/SlashCommandBuilder';
-import { CooledDownUser } from '../classes/CommandCooldownManager';
 import { MessageCommandOptionManager } from '../classes/MessageCommandOptionManager';
+import { CooledDownUser } from '../classes/CommandCooldownManager';
 import { CommandBuilder } from '../types/builders';
 /**
  * Halted command's data

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

@@ -1,9 +1,9 @@
+import { ApplicationCommandBuilder } from '../registerApplicationCommands';
+import { ApplicationCommandData, PermissionsBitField } from 'discord.js';
+import { RecipleModule, RecipleScript } from '../modules';
 import { RecipleClient } from '../classes/RecipleClient';
 import { Config } from '../classes/RecipleConfig';
-import { RecipleModule, RecipleScript } from '../modules';
-import { ApplicationCommandBuilder } from '../registerInteractionCommands';
 import { CommandBuilder } from './builders';
-import { ApplicationCommandData, PermissionsBitField } from 'discord.js';
 export interface RecipleClientAddModuleOptions {
     /**
      * The Module script

package/bin/reciple/version.d.ts

@@ -3,6 +3,10 @@ import semver from 'semver';
  * Current reciple version
  */
 export declare const version: string;
+/**
+ * Current reciple version from package.json
+ */
+export declare const rawVersion: any;
 /**
  * Check if the version is valid
  * @param ver Version string to validated

package/bin/reciple/version.js

@@ -3,12 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSupportedVersion = exports.parseVersion = exports.isValidVersion = exports.version = void 0;
+exports.isSupportedVersion = exports.parseVersion = exports.isValidVersion = exports.rawVersion = exports.version = void 0;
 const semver_1 = __importDefault(require("semver"));
 /**
  * Current reciple version
  */
 exports.version = `${semver_1.default.coerce(require('../../package.json').version)}`;
+/**
+ * Current reciple version from package.json
+ */
+exports.rawVersion = require('../../package.json').version;
 /**
  * Check if the version is valid
  * @param ver Version string to validated

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reciple",
-  "version": "4.0.0-pre.3",
+  "version": "4.1.0",
   "bin": "bin/bin.js",
   "license": "GPL-3.0",
   "main": "bin/index.js",
@@ -22,7 +22,7 @@
     "clean": "yarn exec rimraf bin",
     "build": "yarn clean && yarn exec tsc",
     "build:publish": "yarn build && yarn npm publish && yarn build:docs && yarn publish:docs",
-    "build:pub-prerelease": "yarn build && yarn npm publish --tag pre",
+    "build:publish-prerelease": "yarn build && yarn npm publish --tag pre",
     "build:docs": "yarn exec typedoc --tsconfig ./docs/typedoc.json",
     "update:docs": "yarn workspace docs update",
     "test": "yarn build && yarn test:start",