reciple 5.0.0-pre.5 → 5.0.0-pre.6

package/bin/bin.js

@@ -22,15 +22,18 @@ const flags_1 = require("./reciple/flags");
 const fallout_utility_1 = require("fallout-utility");
 const chalk_1 = __importDefault(require("chalk"));
 require("dotenv/config");
+const discord_js_1 = require("discord.js");
+const path_1 = __importDefault(require("path"));
 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 configPath = path_1.default.join(flags_1.cwd, './reciple.yml');
+if ((0, fs_1.readdirSync)(flags_1.cwd).filter(f => !f.startsWith('.') && allowedFiles.indexOf(f)).length > 0 && !(0, fs_1.existsSync)((_a = flags_1.flags.config) !== null && _a !== void 0 ? _a : configPath)) {
     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((_d = flags_1.flags.config) !== null && _d !== void 0 ? _d : './reciple.yml').parseConfig();
+    configParser = new RecipleConfig_1.RecipleConfig((_d = flags_1.flags.config) !== null && _d !== void 0 ? _d : configPath).parseConfig();
 }
 catch (err) {
     console.error(`${chalk_1.default.bold.red('Config Error')}: ${chalk_1.default.white(err.message)}`);
@@ -41,7 +44,7 @@ const client = new RecipleClient_1.RecipleClient(Object.assign({ config: config
 if (config.fileLogging.clientLogs)
     client.logger.info('Reciple Client v' + version_1.rawVersion + ' is starting...');
 (() => __awaiter(void 0, void 0, void 0, function* () {
-    yield client.startModules();
+    yield client.startModules((0, discord_js_1.normalizeArray)(config.modulesFolder));
     client.on('ready', () => __awaiter(void 0, void 0, void 0, function* () {
         var _e;
         if (client.isClientLogsEnabled())

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

@@ -8,7 +8,7 @@ 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 { ApplicationCommandData, Awaitable, ChatInputCommandInteraction, Client, ClientEvents, ClientOptions, Interaction, Message, RestOrArray } from 'discord.js';
 /**
  * options for Reciple client
  */
@@ -64,9 +64,9 @@ export declare class RecipleClient<Ready extends boolean = boolean> extends Clie
     constructor(options: RecipleClientOptions);
     /**
      * Load modules from modules folder
-     * @param folder Modules folder
+     * @param folders List of folders that contains the modules you want to load
      */
-    startModules(folder?: string): Promise<RecipleClient<Ready>>;
+    startModules(...folders: RestOrArray<string>): Promise<RecipleClient<Ready>>;
     /**
      * Execute `onLoad()` from client modules and register application commands if enabled
      */

package/bin/reciple/classes/RecipleClient.js

@@ -8,6 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RecipleClient = void 0;
 const MessageCommandBuilder_1 = require("./builders/MessageCommandBuilder");
@@ -24,12 +27,14 @@ const modules_1 = require("../modules");
 const logger_1 = require("../logger");
 const version_1 = require("../version");
 const discord_js_1 = require("discord.js");
+const path_1 = __importDefault(require("path"));
+const flags_1 = require("../flags");
 class RecipleClient extends discord_js_1.Client {
     /**
      * @param options Client options
      */
     constructor(options) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         super(options);
         this.config = RecipleConfig_1.RecipleConfig.getDefaultConfig();
         this.commands = { slashCommands: {}, messageCommands: {} };
@@ -42,20 +47,26 @@ class RecipleClient extends discord_js_1.Client {
             throw new Error('Config is not defined.');
         this.config = Object.assign(Object.assign({}, this.config), ((_c = options.config) !== null && _c !== void 0 ? _c : {}));
         if (this.config.fileLogging.enabled)
-            this.logger.logFile(this.config.fileLogging.logFilePath, false);
+            this.logger.logFile((_d = this.config.fileLogging.logFilePath) !== null && _d !== void 0 ? _d : path_1.default.join(flags_1.cwd, 'logs/latest.log'), false);
     }
     /**
      * Load modules from modules folder
-     * @param folder Modules folder
+     * @param folders List of folders that contains the modules you want to load
      */
-    startModules(folder) {
+    startModules(...folders) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.isClientLogsEnabled())
-                this.logger.info(`Loading Modules from ${folder !== null && folder !== void 0 ? folder : this.config.modulesFolder}`);
-            const modules = yield (0, modules_1.loadModules)(this, folder);
-            if (!modules)
-                throw new Error('Failed to load modules.');
-            this.modules = modules.modules;
+            folders = (0, discord_js_1.normalizeArray)(folders).map(f => path_1.default.join(flags_1.cwd, f));
+            for (const folder of folders) {
+                if (this.isClientLogsEnabled())
+                    this.logger.info(`Loading Modules from ${folder}`);
+                const modules = yield (0, modules_1.getModules)(this, folder).catch(() => null);
+                if (!modules) {
+                    if (this.isClientLogsEnabled())
+                        this.logger.error(`Failed to load modules from ${folder}`);
+                    continue;
+                }
+                this.modules = modules.modules;
+            }
             return this;
         });
     }

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

@@ -49,7 +49,7 @@ export interface Config {
         [messageKey: string]: any;
     };
     ignoredFiles: string[];
-    modulesFolder: string;
+    modulesFolder: string | string[];
     disableVersionCheck: boolean;
     version: string;
 }

package/bin/reciple/classes/RecipleConfig.js

@@ -19,7 +19,7 @@ class RecipleConfig {
      */
     constructor(configPath) {
         this.config = RecipleConfig.getDefaultConfig();
-        this.configPath = './reciple.yml';
+        this.configPath = path_1.default.join(flags_1.cwd, 'reciple.yml');
         if (!configPath)
             throw new Error('Config path is not defined');
         this.configPath = configPath;
@@ -66,15 +66,10 @@ class RecipleConfig {
      * @param askIfNull Ask for token if the token is null/undefined
      */
     parseToken(askIfNull = true) {
-        var _a, _b;
-        let token = flags_1.token || null;
-        if (!this.config && !token)
-            return token;
-        if (this.config && !((_a = this.config) === null || _a === void 0 ? void 0 : _a.token) && !token)
-            return token || (askIfNull ? this.askToken() : null);
-        token = token || ((_b = this.config) === null || _b === void 0 ? void 0 : _b.token) || null;
+        var _a;
+        let token = flags_1.token || ((_a = this.config) === null || _a === void 0 ? void 0 : _a.token) || null;
         if (!token)
-            return token;
+            return token || (askIfNull ? this.askToken() : null);
         const envToken = token.toString().split(':');
         if (envToken.length === 2 && envToken[0].toLocaleLowerCase() === 'env' && envToken[1]) {
             token = process.env[envToken[1]] || null;
@@ -92,7 +87,7 @@ class RecipleConfig {
      * Ask for a token
      */
     askToken() {
-        return flags_1.token || (0, fallout_utility_1.input)({ 'text': 'Bot Token >>> ', echo: '*', repeatIfEmpty: true, exitStrings: ['exit', 'quit', ''], sigint: true }) || null;
+        return flags_1.token || (0, fallout_utility_1.input)({ text: 'Bot Token >>> ', echo: '*', repeatIfEmpty: true, sigint: true }) || null;
     }
     /**
      * Get default config

package/bin/reciple/flags.d.ts

@@ -1,3 +1,8 @@
+import { Command } from 'commander';
+/**
+ * Commander
+ */
+export declare const commander: Command;
 /**
  * Used flags
  */
@@ -6,3 +11,7 @@ export declare const flags: import("commander").OptionValues;
  * Temporary token flag
  */
 export declare const token: string | undefined;
+/**
+ * Current working directory
+ */
+export declare const cwd: string;

package/bin/reciple/flags.js

@@ -1,22 +1,35 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.token = exports.flags = void 0;
+exports.cwd = exports.token = exports.flags = exports.commander = void 0;
 const version_1 = require("./version");
 const commander_1 = require("commander");
+const path_1 = __importDefault(require("path"));
 /**
- * Used flags
+ * Commander
  */
-exports.flags = new commander_1.Command()
+exports.commander = new commander_1.Command()
     .name('reciple')
     .description('Reciple.js - Discord.js handler cli')
     .version(`v${version_1.rawVersion}`, '-v, --version')
+    .argument('[current-working-directory]', 'Change the current working directory')
     .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();
+    .parse();
+/**
+ * Used flags
+ */
+exports.flags = exports.commander.opts();
 /**
  * Temporary token flag
  */
 exports.token = exports.flags.token;
+/**
+ * Current working directory
+ */
+exports.cwd = path_1.default.join(process.cwd(), exports.commander.args[0] || '.');

package/bin/reciple/modules.d.ts

@@ -29,4 +29,4 @@ export interface RecipleModule {
  * @param client Reciple client
  * @param folder Modules folder
  */
-export declare function loadModules(client: RecipleClient, folder?: string): Promise<LoadedModules>;
+export declare function getModules(client: RecipleClient, folder?: string): Promise<LoadedModules>;

package/bin/reciple/modules.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadModules = void 0;
+exports.getModules = void 0;
 const builders_1 = require("./types/builders");
 const version_1 = require("./version");
 const fs_1 = require("fs");
@@ -24,11 +24,11 @@ const discord_js_1 = require("discord.js");
  * @param client Reciple client
  * @param folder Modules folder
  */
-function loadModules(client, folder) {
+function getModules(client, folder) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const response = { commands: [], modules: [] };
-        const modulesDir = client.config.modulesFolder || folder || './modules';
+        const modulesDir = folder || 'modules';
         if (!(0, fs_1.existsSync)(modulesDir))
             (0, fs_1.mkdirSync)(modulesDir, { recursive: true });
         const ignoredFiles = (client.config.ignoredFiles || []).map(file => file.endsWith('.js') ? file : `${file}.js`);
@@ -36,7 +36,7 @@ function loadModules(client, folder) {
             return file.endsWith('.js') && (!file.startsWith('_') && !file.startsWith('.')) && !ignoredFiles.some(f => (0, wildcard_match_1.default)(f)(file));
         });
         for (const script of scripts) {
-            const modulePath = path_1.default.join(process.cwd(), modulesDir, script);
+            const modulePath = path_1.default.join(modulesDir, script);
             const commands = [];
             let module_;
             try {
@@ -91,4 +91,4 @@ function loadModules(client, folder) {
         return response;
     });
 }
-exports.loadModules = loadModules;
+exports.getModules = getModules;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reciple",
-  "version": "5.0.0-pre.5",
+  "version": "5.0.0-pre.6",
   "bin": "bin/bin.js",
   "license": "GPL-3.0",
   "main": "bin/index.js",

package/resource/reciple.yml

@@ -60,7 +60,7 @@ fileLogging:
   # stringify logged JSONs
   stringifyLoggedJSON: false
   # log file path
-  logFilePath: './logs/latest.log'
+  logFilePath:
 
 # Client options
 # Learn more about client options at https://discord.js.org/#/docs/discord.js/main/typedef/ClientOptions