zcatalyst-cli 1.7.1 → 1.9.1

package/lib/init/features/functions/index.js

@@ -13,12 +13,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
+const catalyst_details_1 = __importDefault(require("../../../endpoints/lib/catalyst-details"));
 const integ_1 = require("../../../fn-utils/lib/integ");
 const prompt_1 = __importDefault(require("../../../prompt"));
 const runtime_store_1 = __importDefault(require("../../../runtime-store"));
+const char_1 = require("../../../util_modules/char");
 const constants_1 = require("../../../util_modules/constants");
 const fs_1 = require("../../../util_modules/fs");
-const js_1 = require("../../../util_modules/js");
 const logger_1 = require("../../../util_modules/logger");
 const option_1 = require("../../../util_modules/option");
 const project_1 = require("../../../util_modules/project");
@@ -46,7 +47,9 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         }
         yield fs_1.ASYNC.deleteDir(functionsDirPath).catch();
     }
-    const fnTypeAns = yield prompt_1.default.ask(prompt_1.default.question('type', 'which type of function do you like to create?', {
+    const catalystDetailsAPI = new catalyst_details_1.default();
+    const runtimeDetailsPromise = catalystDetailsAPI.getDetails('runtime');
+    const fnTypeAns = yield prompt_1.default.ask(prompt_1.default.question('type', 'Which type of function do you like to create?', {
         type: 'list',
         choices: [
             prompt_1.default.choice('BasicIO', {
@@ -75,37 +78,46 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     if (fnTypeAns.type === constants_1.FN_TYPE.integration) {
         yield integ_1.integHelper();
     }
-    const choices = js_1.JS.map(languages_1.default, (value, key) => {
-        switch (key) {
-            case 'node':
-                key = constants_1.STACK.node10;
-                break;
-            case 'java':
-                key = constants_1.STACK.java8;
-                break;
-            default:
-                break;
+    const runtimeDetails = (yield runtimeDetailsPromise);
+    const runtimeChoices = runtimeDetails.runtimes.reduce((acc, value) => {
+        const langArr = value.match(/[a-zA-Z]+/g);
+        if (langArr === null || languages_1.default[langArr[0]] === undefined) {
+            logger_1.debug('Language cannot be identified hence skipping');
+            return acc;
         }
-        return prompt_1.default.choice(key, { value, short: key });
-    });
-    const stackAns = yield prompt_1.default.ask(prompt_1.default.question('stack', 'Which stack do you prefer to write your function?', {
-        type: 'list',
-        choices,
-        validate: (ansArr) => {
-            if (js_1.JS.isEmpty(ansArr)) {
-                return ('Must select at least one stack.\n' +
-                    '(Press ' +
-                    ansi_colors_1.cyan('<return>') +
-                    ' to select, ');
+        const lang = languages_1.default[langArr[0]];
+        let displayValue = value;
+        let disabled = false;
+        if (runtimeDetails.eol_runtimes && runtimeDetails.eol_runtimes[value]) {
+            switch (runtimeDetails.eol_runtimes[value]) {
+                case 1:
+                    displayValue += ` (${char_1.CHAR.info} This runtime has reached its EOL)`;
+                    break;
+                case 2:
+                    displayValue += ` (${char_1.CHAR.warning} Only updates are allowed in this runtime)`;
+                    disabled = true;
+                    break;
+                case 3:
+                    displayValue += ` (${char_1.CHAR.error} This runtime is no longer supported)`;
+                    disabled = true;
+                    break;
+                default:
+                    logger_1.debug('unknown eol_runtime value ' + runtimeDetails.eol_runtimes[value]);
+                    return acc;
             }
-            return true;
-        },
+        }
+        acc.push(prompt_1.default.choice(displayValue, { value: lang(value), short: value, disabled }));
+        return acc;
+    }, []);
+    const runtimeAns = yield prompt_1.default.ask(prompt_1.default.question('runtime', 'Which runtime do you prefer to write your function?', {
+        type: 'list',
+        choices: runtimeChoices,
         when: () => {
-            return choices.length > 1;
+            return runtimeChoices.length > 1;
         }
     }));
-    if (stackAns.stack === undefined) {
-        return languages_1.default.node();
+    if (runtimeAns === undefined || runtimeAns.runtime === undefined) {
+        return languages_1.default.node('node14')();
     }
-    return stackAns.stack();
+    return runtimeAns.runtime();
 });

package/lib/init/features/functions/languages/java.js

@@ -23,7 +23,8 @@ const logger_1 = require("../../../../util_modules/logger");
 const js_1 = require("../../../../util_modules/js");
 const integ_1 = require("../../../../fn-utils/lib/integ");
 const common_1 = require("../../../../fn-utils/lib/common");
-exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
+const runtime_1 = __importDefault(require("../../../../util_modules/constants/lib/runtime"));
+exports.default = (stack) => () => __awaiter(void 0, void 0, void 0, function* () {
     const fnType = runtime_store_1.default.get('context.functions.type');
     const fnDirPath = path_1.join(runtime_store_1.default.get('context.functions.dir_path'));
     yield fs_1.ASYNC.ensureDir(fnDirPath);
@@ -65,7 +66,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         ? js_1.JS.get(constants_1.TEMPLATE.functions.java[fnType], service)
         : constants_1.TEMPLATE.functions.java[fnType];
     if (fnType === constants_1.FN_TYPE.integration) {
-        yield integ_1.copyIntegHandlers(templatePath, targetPath, constants_1.STACK.java8);
+        yield integ_1.copyIntegHandlers(templatePath, targetPath, runtime_1.default.language.java);
     }
     else {
         yield fs_1.ASYNC.copyDir(templatePath, targetPath);
@@ -73,7 +74,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     yield fs_1.ASYNC.findAndReplace(targetPath)([constants_1.PLACEHOLDER.functions.java_class, constants_1.PLACEHOLDER.functions.java_name], [functionAns.class, functionAns.name]);
     const integ_config = runtime_store_1.default.get('context.functions.integration.config', '');
     yield fn_utils_1.fnUtils.common.findAndReplaceConfigProps(targetPath, {
-        stack: constants_1.STACK.java8,
+        stack,
         type: fnType,
         integ_config
     });
@@ -85,7 +86,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const userFnLibPath = path_1.join(fnDirPath, functionAns.name, constants_1.FOLDERNAME.java_fn_lib);
     yield fn_utils_1.fnUtils.java.rewriteClasspath(userFnClassPath, userFnLibPath);
     runtime_store_1.default.set('payload.functions.source', targetPath);
-    runtime_store_1.default.set('payload.functions.stack', constants_1.STACK.java8);
+    runtime_store_1.default.set('payload.functions.stack', stack);
     runtime_store_1.default.set('payload.functions.name', functionAns.name);
     runtime_store_1.default.set('payload.functions.class', functionAns.class);
     runtime_store_1.default.set('payload.functions.type', fnType);

package/lib/init/features/functions/languages/node.js

@@ -24,7 +24,8 @@ const fs_1 = require("../../../../util_modules/fs");
 const logger_1 = require("../../../../util_modules/logger");
 const js_1 = require("../../../../util_modules/js");
 const integ_1 = require("../../../../fn-utils/lib/integ");
-exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
+const runtime_1 = __importDefault(require("../../../../util_modules/constants/lib/runtime"));
+exports.default = (stack) => () => __awaiter(void 0, void 0, void 0, function* () {
     const fnType = runtime_store_1.default.get('context.functions.type');
     const service = runtime_store_1.default.get('context.functions.integration.service', '');
     const templatePath = fnType === constants_1.FN_TYPE.integration
@@ -49,7 +50,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     }
     yield fs_1.ASYNC.deleteDir(targetPath).catch();
     if (fnType === constants_1.FN_TYPE.integration) {
-        yield integ_1.copyIntegHandlers(templatePath, targetPath, constants_1.STACK.node10);
+        yield integ_1.copyIntegHandlers(templatePath, targetPath, runtime_1.default.language.nodejs);
     }
     else {
         yield fs_1.ASYNC.copyDir(templatePath, targetPath);
@@ -59,18 +60,18 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const replaceArr = [];
     Object.keys(constants_1.PLACEHOLDER.functions.node_package).forEach((key) => {
         placeholderArr.push(constants_1.PLACEHOLDER.functions.node_package[key]);
-        replaceArr.push(finalJson[key]);
+        replaceArr.push(key === 'name' ? finalJson[key].toLowerCase() : finalJson[key]);
     });
     yield fs_1.ASYNC.findAndReplace(targetPath)(placeholderArr, replaceArr);
     const integ_config = runtime_store_1.default.get('context.functions.integration.config', '');
     yield fn_utils_1.fnUtils.common.findAndReplaceConfigProps(targetPath, {
-        stack: constants_1.STACK.node10,
+        stack,
         type: fnType,
         integ_config
     });
     yield npm_install_1.default(targetPath);
     runtime_store_1.default.set('payload.functions.source', targetPath);
-    runtime_store_1.default.set('payload.functions.stack', constants_1.STACK.node10);
+    runtime_store_1.default.set('payload.functions.stack', stack);
     runtime_store_1.default.set('payload.functions.name', finalJson.name);
     runtime_store_1.default.set('payload.functions.main', finalJson.main);
     runtime_store_1.default.set('payload.functions.type', fnType);

package/lib/init/features/index.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -37,6 +37,7 @@ const path_1 = require("path");
 const error_1 = __importDefault(require("../../error"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
+const runtime_1 = __importDefault(require("../../util_modules/constants/lib/runtime"));
 const js_1 = require("../../util_modules/js");
 const logger_1 = require("../../util_modules/logger");
 const project_1 = require("../../util_modules/project");
@@ -67,24 +68,27 @@ function setFnConfig(featureName, add) {
         featureContextArr = [featureContext];
     }
     if (featureContextArr === null) {
-        throw new error_1.default('No context given to populate catalyst.json', { exit: 2 });
+        throw new error_1.default('No context given to populate catalyst.json', {
+            exit: 2
+        });
     }
     const config = runtime_store_1.default.get('config');
     featureContextArr.forEach((context) => {
+        var _a, _b;
         const targetSourceDir = featureName === 'functions' ? path_1.dirname(context.source) : path_1.basename(context.source);
         const targetSource = path_1.relative(project_1.getProjectRoot(), targetSourceDir);
         switch (featureName) {
             case 'functions':
                 if (!add) {
                     config.set(featureName + '.targets', [context.name]);
-                    config.set(featureName + '.ignore', context.stack === constants_1.STACK.java8 ? ['.output'] : []);
+                    config.set(featureName + '.ignore', ((_a = context.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java)) ? ['.output'] : []);
                     config.set(featureName + '.source', targetSource);
                     return;
                 }
                 const targetArr = config.get(featureName + '.targets', []);
                 config.set(featureName + '.targets', js_1.JS.uniq(targetArr.concat([context.name])));
                 const ignoreArr = config.get(featureName + '.ignore', []);
-                config.set(featureName + '.ignore', context.stack === constants_1.STACK.java8
+                config.set(featureName + '.ignore', ((_b = context.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java))
                     ? js_1.JS.uniq(ignoreArr.concat(['.output']))
                     : ignoreArr);
                 if (config.get(featureName + '.source') !== targetSource) {

package/lib/init/index.js

@@ -26,9 +26,16 @@ function init() {
         }
         const feature = featureList.shift();
         if (!Object.keys(features_1.default).includes(feature)) {
-            throw new error_1.default(ansi_colors_1.bold(feature) +
-                ' is not a valid feature. Must be one of ' +
-                js_1.JS.without(js_1.JS.keys(features_1.default), 'project').join(','), { exit: 1 });
+            throw new error_1.default('invalid feature for init', {
+                exit: 1,
+                errorId: 'INIT-IDX-1',
+                arg: [
+                    ansi_colors_1.bold.red(feature),
+                    ansi_colors_1.bold(Object.keys(features_1.default)
+                        .map((feat) => '* ' + feat)
+                        .join('\n'))
+                ]
+            });
         }
         const MODULE = features_1.default[feature];
         logger_1.info(ansi_colors_1.bold('\n' + ansi_colors_1.white('===> ') + js_1.JS.capitalize(feature) + ' Setup'));

package/lib/internal/api.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -39,7 +39,6 @@ const runtime_store_1 = __importDefault(require("../runtime-store"));
 const constants_1 = require("../util_modules/constants");
 const js_1 = require("../util_modules/js");
 const logger_1 = require("../util_modules/logger");
-const big_json_1 = require("../util_modules/big-json");
 class API {
     constructor({ authNeeded = true, resolveOnError = false, maxRetry = 3, env = constants_1.DEFAULT.env_name, log = {} } = {}) {
         this.requestOpts = {
@@ -47,6 +46,7 @@ class API {
             method: 'GET',
             json: true,
             headers: {
+                Accept: 'application/vnd.catalyst.v2+json',
                 'User-Agent': runtime_store_1.default.get('context.cli.package.name') +
                     '/' +
                     runtime_store_1.default.get('context.cli.package.version'),
@@ -62,14 +62,14 @@ class API {
     }
     _logReq() {
         let qs = this.requestOpts.qs
-            ? '\nQuery params: ' + big_json_1.bigJSON.stringify(this.requestOpts.qs)
+            ? '\nQuery params: ' + JSON.stringify(this.requestOpts.qs)
             : '';
         qs = this.logOpts.skipQuery === true ? '\n<request query omitted>' : qs;
         let body = this.requestOpts.body
-            ? '\nRequest Body: ' + big_json_1.bigJSON.stringify(this.requestOpts.body)
+            ? '\nRequest Body: ' + JSON.stringify(this.requestOpts.body)
             : '';
         body += this.requestOpts.form
-            ? '\nRequest Form: ' + big_json_1.bigJSON.stringify(this.requestOpts.form)
+            ? '\nRequest Form: ' + JSON.stringify(this.requestOpts.form)
             : '';
         body = this.logOpts.skipReqBody === true ? '\n<request body omitted>' : body;
         logger_1.debug('>>>> HTTP REQUEST : ' +
@@ -86,7 +86,7 @@ class API {
             resp.statusCode +
             '\n' +
             'Response Headers: ' +
-            big_json_1.bigJSON.stringify(resp.headers) +
+            JSON.stringify(resp.headers) +
             '\n');
         if (!js_1.JS.isUndefined(resp.timings)) {
             logger_1.debug('TOTAL TIME TAKEN : ' + Number(resp.timings.end.toFixed(3)) + ' ms\n');
@@ -113,14 +113,14 @@ class API {
         const rawResponseData = rawResponse.length > 0 ? Buffer.concat(rawResponse) : undefined;
         if (rawResponseData && js_1.JS.includes(resp.headers['content-type'], 'json')) {
             try {
-                body = big_json_1.bigJSON.parse(rawResponseData.toString());
+                body = JSON.parse(rawResponseData.toString());
             }
             catch (e) {
                 logger_1.debug('API Parsing Error: ' + e.message);
             }
         }
         if (resp.statusCode >= 400 && !this.logOpts.skipRespBody) {
-            logger_1.debug('Response Body : ' + big_json_1.bigJSON.stringify(resp.body) + '\n');
+            logger_1.debug('Response Body : ' + JSON.stringify(resp.body) + '\n');
             if (!this.resolveOnHTTPError) {
                 throw errorResponse_1.default(resp, body);
             }
@@ -129,7 +129,7 @@ class API {
             status: resp.statusCode,
             response: resp,
             body: js_1.JS.includes(resp.headers['content-type'], 'json') && typeof body === 'string'
-                ? big_json_1.bigJSON.parse(body)
+                ? JSON.parse(body)
                 : body
         };
     }

package/lib/internal/command.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -33,7 +33,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
 const strip_ansi_1 = __importDefault(require("strip-ansi"));
-const util_1 = require("util");
 const error_1 = __importDefault(require("../error"));
 const errorOut_1 = __importDefault(require("../errorOut"));
 const migration_1 = __importDefault(require("../migration"));
@@ -117,31 +116,36 @@ class Command {
             const runner = this.runner();
             const start = Date.now();
             const argCount = cmd._args.length;
-            if (programArgs.length - 1 > argCount && !this.allowUnknownOptions) {
-                return errorOut_1.default(new error_1.default('Too many arguments. Run ' +
-                    ansi_colors_1.bold('catalyst help ' + cmd._name) +
-                    ' for usage instructions', { exit: 1 }));
+            if (programArgs.slice(-1)[0].args.length > argCount &&
+                !this.allowUnknownOptions) {
+                return errorOut_1.default(new error_1.default('Too many arguments', {
+                    exit: 1,
+                    errorId: 'CMD-1',
+                    arg: [ansi_colors_1.bold(cmd.name()), ansi_colors_1.bold('catalyst help ' + cmd.name())]
+                }));
             }
             try {
                 yield runner.apply(this, programArgs);
                 const duration = Date.now() - start;
                 yield track_1.default(this.cmdName, 'success', duration);
-                process.nextTick(() => process.exit(0));
+                process.exitCode = 0;
             }
             catch (err) {
                 const duration = Date.now() - start;
                 const errorEvent = err.exit === 1 ? 'Error (User)' : 'Error (Unexpected)';
                 const preppedMessage = strip_ansi_1.default(err.message || '');
                 yield track_1.default(errorEvent, preppedMessage, duration);
-                errorOut_1.default(err);
+                return errorOut_1.default(err);
             }
         }));
         return cmd;
     }
-    _prepare() {
+    _prepare(cmd) {
+        var _a;
+        const globalopts = ((_a = cmd.parent) === null || _a === void 0 ? void 0 : _a.opts()) || {};
         Command.globalOpts.forEach((opts) => {
-            const optsValue = option_1.getInheritedOption(opts, null);
-            if (optsValue === null) {
+            const optsValue = globalopts[opts];
+            if (optsValue === undefined) {
                 return;
             }
             if (js_1.JS.indexOf(this.optIgnores, opts) > -1) {
@@ -162,13 +166,14 @@ class Command {
             if (args.length === 0) {
                 args.push({});
             }
-            runtime_store_1.default.set('opts', js_1.JS.last(args));
-            this._prepare();
+            const [opts, command] = args.slice(-2);
+            runtime_store_1.default.set('opts', Object.assign({ _name: command.name() }, opts));
+            this._prepare(command);
             try {
                 yield migration_1.default(runtime_store_1.default.get('context.cli.package.version'));
             }
             catch (e) {
-                logger_1.debug(util_1.inspect(e));
+                logger_1.debug(e);
             }
             yield Promise.all(js_1.JS.map(this.beforeRunners, (before) => __awaiter(this, void 0, void 0, function* () {
                 const beforeModule = (yield Promise.resolve().then(() => __importStar(require('../command_needs/' + before.fn)))).default;

package/lib/internal/config.js

@@ -12,8 +12,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
-const cjson_1 = __importDefault(require("../cjson"));
 const error_1 = __importDefault(require("../error"));
 const constants_1 = require("../util_modules/constants");
 const fs_1 = require("../util_modules/fs");
@@ -55,32 +55,32 @@ class Config {
     set loaded(load) {
         this.isLoaded = load;
     }
-    static loadConfigFile(configPath) {
-        const data = cjson_1.default(configPath);
-        const config = new Config(configPath, data);
-        config.loaded = true;
-        return config;
-    }
     static load(canIgnore) {
         return __awaiter(this, void 0, void 0, function* () {
             const pd = project_1.getProjectRoot();
             try {
-                if (yield fs_1.ASYNC.fileExists(path_1.join(pd, constants_1.FILENAME.config))) {
-                    return this.loadConfigFile(path_1.join(pd, constants_1.FILENAME.config));
+                const configPath = path_1.join(pd, constants_1.FILENAME.config);
+                const data = yield fs_1.ASYNC.readJSONFile(configPath, { checkpath: true });
+                if (data !== undefined) {
+                    const config = new Config(configPath, data);
+                    config.loaded = true;
+                    return config;
                 }
             }
             catch (e) {
-                throw new error_1.default('There was an error loading ' + constants_1.FILENAME.config + ' :\n\n' + e.message, {
-                    exit: 1
+                throw new error_1.default('There was an error loading a file', {
+                    exit: 1,
+                    errorId: 'CONFIG-1',
+                    arg: [ansi_colors_1.bold(constants_1.FILENAME.config), e.message]
                 });
             }
             if (canIgnore) {
                 return new Config(path_1.join(pd, constants_1.FILENAME.config));
             }
-            throw new error_1.default('Not in a Catalyst app directory (could not locate ' +
-                constants_1.FILENAME.config +
-                ') run catalyst init', {
-                exit: 1
+            throw new error_1.default('Not in a Catalyst app directory', {
+                exit: 1,
+                errorId: 'CONFIG-2',
+                arg: [ansi_colors_1.bold(constants_1.FILENAME.config), ansi_colors_1.bold('catalyst init'), pd]
             });
         });
     }

package/lib/internal/credential.js

@@ -22,13 +22,25 @@ const api_1 = __importDefault(require("./api"));
 const crypt_1 = __importDefault(require("./crypt"));
 const util_1 = require("util");
 const dc_1 = require("../dc");
+const option_1 = require("../util_modules/option");
 class Credential {
     constructor(tokenObj) {
         if (tokenObj.token === undefined ||
             js_1.JS.isEmpty(tokenObj.token) ||
             tokenObj.token.slice(1, 2) !== '_') {
-            throw new error_1.default('Invalid token passed for authentication. If you havent used --token option. kindly relogin with ' +
-                ansi_colors_1.bold('catalyst login --force'));
+            const tokenOption = option_1.getGlobalOptionValue('token');
+            if (tokenOption) {
+                throw new error_1.default('Invalid token passed for authentication.', {
+                    exit: 1,
+                    errorId: 'CRED-1',
+                    arg: [tokenOption, ansi_colors_1.bold('--token')]
+                });
+            }
+            throw new error_1.default('Invalid token for authentication', {
+                exit: 0,
+                errorId: 'CRED-2',
+                arg: [ansi_colors_1.bold('catalyst login --force')]
+            });
         }
         this.cToken = tokenObj.token;
         this.cTime = tokenObj.created_time;
@@ -110,7 +122,8 @@ class Credential {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             logger_1.debug('> refreshing access token <');
-            const res = yield new api_1.default({ authNeeded: false }).post('/oauth/v2/token', {
+            const res = yield new api_1.default({ authNeeded: false })
+                .post('/oauth/v2/token', {
                 origin: constants_1.ORIGIN.auth,
                 form: {
                     refresh_token: this.rToken,
@@ -121,11 +134,20 @@ class Credential {
                 log: {
                     skipReqBody: true
                 }
+            })
+                .catch((err) => {
+                throw new error_1.default('Error when refreshing the access token', {
+                    exit: 2,
+                    original: err
+                });
             });
             if (!js_1.JS.isString(res.body.access_token)) {
-                throw new error_1.default('unable to refresh access token. Kindly use ' +
-                    ansi_colors_1.bold('catalyst login --force') +
-                    ' to re-authenticate.', { original: util_1.inspect(res.body), exit: 2 });
+                throw new error_1.default('unable to refresh access token.', {
+                    original: util_1.inspect(res.body),
+                    exit: 0,
+                    errorId: 'CRED-2',
+                    arg: [ansi_colors_1.bold('catalyst login --force')]
+                });
             }
             this._rebuildTokenCache(res);
             return Credential.credentialObject;
@@ -191,7 +213,11 @@ class Credential {
         return __awaiter(this, void 0, void 0, function* () {
             if (Credential.globalSelf === null) {
                 if (Credential.oneTimeToken === null) {
-                    throw new error_1.default('Authentication required, kindly login with ' + ansi_colors_1.bold('catalyst login'));
+                    throw new error_1.default('Authentication required', {
+                        exit: 0,
+                        errorId: 'CRED-3',
+                        arg: [ansi_colors_1.bold('catalyst login')]
+                    });
                 }
                 return Credential.oneTimeToken;
             }

package/lib/internal/rc.js

@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
-const cjson_1 = __importDefault(require("../cjson"));
 const error_1 = __importDefault(require("../error"));
 const constants_1 = require("../util_modules/constants");
 const fs_1 = require("../util_modules/fs");
@@ -47,7 +46,9 @@ class RC {
     associateEnv(projectId, env, { base = false, active = false }) {
         const projectObj = this.getProjectById(projectId);
         if (projectObj === undefined) {
-            throw new error_1.default('Unable to find project in RC file with project ID : ' + projectId);
+            throw new error_1.default('Unable to find project in RC file with project ID : ' + projectId, {
+                exit: 2
+            });
         }
         if (base && this.defaultProject !== undefined) {
             if (!js_1.JS.isEqual(this.defaultProject, projectObj)) {
@@ -68,7 +69,12 @@ class RC {
         let lastIdx = js_1.JS.size(envArr);
         let envIdx = -1;
         if (existingEnvArr.length !== 1) {
-            envArr.push({ idx: ++lastIdx, id: env.id + '', name: env.name, type: env.type });
+            envArr.push({
+                idx: ++lastIdx,
+                id: env.id + '',
+                name: env.name,
+                type: env.type
+            });
             envIdx = lastIdx;
         }
         else {
@@ -92,7 +98,9 @@ class RC {
     removeEnv(projectId, envId) {
         const projectObj = this.getProjectById(projectId);
         if (projectObj === undefined) {
-            throw new error_1.default('Unable to find project in RC file with project ID : ' + projectId, { exit: 2 });
+            throw new error_1.default('Unable to find project in RC file with project ID : ' + projectId, {
+                exit: 2
+            });
         }
         const envArr = js_1.JS.get(projectObj, 'env', []);
         const removedEnvArr = js_1.JS.remove(envArr, (obj) => obj.id + '' === envId + '');
@@ -254,13 +262,13 @@ class RC {
     }
     static loadFile(rcpath) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (yield fs_1.ASYNC.fileExists(rcpath)) {
-                const data = cjson_1.default(rcpath);
-                const rc = new RC(rcpath, data);
-                rc.loaded = true;
-                return rc;
+            const data = yield fs_1.ASYNC.readJSONFile(rcpath, { checkpath: true });
+            if (data === undefined) {
+                return new RC(rcpath);
             }
-            return new RC(rcpath);
+            const rc = new RC(rcpath, data);
+            rc.loaded = true;
+            return rc;
         });
     }
     static load() {

package/lib/migration/global/1.4.0.js

@@ -6,10 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrate = exports.isRequire = void 0;
 const config_store_1 = __importDefault(require("../../config-store"));
 const constants_1 = require("../../util_modules/constants");
-exports.isRequire = () => {
+const isRequire = () => {
     return config_store_1.default.has('credential');
 };
-exports.migrate = () => {
+exports.isRequire = isRequire;
+const migrate = () => {
     const backup = Object.assign({}, config_store_1.default.store);
     const dcObj = {
         [constants_1.DC_TYPE.us.value]: backup,
@@ -17,3 +18,4 @@ exports.migrate = () => {
     };
     config_store_1.default.store = dcObj;
 };
+exports.migrate = migrate;

package/lib/migration/global/1.6.2.js

@@ -8,10 +8,11 @@ const ansi_colors_1 = require("ansi-colors");
 const config_store_1 = __importDefault(require("../../config-store"));
 const constants_1 = require("../../util_modules/constants");
 const logger_1 = require("../../util_modules/logger");
-exports.isRequire = () => {
+const isRequire = () => {
     return config_store_1.default.has('active_dc') || config_store_1.default.has(constants_1.DEFAULT.dc);
 };
-exports.migrate = () => {
+exports.isRequire = isRequire;
+const migrate = () => {
     const activeDc = config_store_1.default.get('active_dc', constants_1.DEFAULT.dc);
     const usage = config_store_1.default.get(`${activeDc}.usage`, false);
     config_store_1.default.set('usage', usage);
@@ -26,3 +27,4 @@ exports.migrate = () => {
         'The usage statistics collection will be done based on the consent provided with the login.');
     logger_1.info();
 };
+exports.migrate = migrate;