reciple 4.0.0-pre.3 → 4.0.0-pre.4

package/bin/bin.js

@@ -12,7 +12,7 @@ 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");
@@ -22,19 +22,15 @@ const chalk_1 = __importDefault(require("chalk"));
 const fallout_utility_1 = require("fallout-utility");
 const fs_1 = require("fs");
 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/reciple/classes/RecipleClient.js

@@ -40,7 +40,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 : {}));

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/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.0.0-pre.4",
   "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",