zcatalyst-cli 1.18.0-beta.1 → 1.18.0-beta.3

package/docs/command_needs/rc.toml

@@ -1,7 +1,7 @@
 [RC-1]
 context = '''The project(${arg[0]}) provided with the ${arg[1]} option is not available is not available in the ${arg[3]} org.'''
 aid = '''Please use one of the available projects with the ${arg[1]} option or specify the correct org \nThe available projects in the ${arg[3]} org are: \n${arg[2]}'''
-link = 'https://www.zoho.com/catalyst/help/cli-options.html#Project'
+link = 'https://docs.catalyst.zoho.com/en/cli/v1/initialize-resources/initialize-new-project/'
 
 [RC-2]
 context = '''Unable to load the ${arg[0]} file.'''
@@ -10,18 +10,18 @@ link = ''
 
 [RC-3]
 context = '''Oops!!! It looks like you're not inside a Catalyst app directory because we are unable to locate the ${arg[0]} file.'''
-aid = '''Please run the ${arg[1]} command to initialise or specify a valid project with the ${arg[2]} option.'''
-link = 'https://www.zoho.com/catalyst/help/cli-init.html#Initialize_All'
+aid = '''Please run the ${arg[1]} command to initialize or specify a valid project with the ${arg[2]} option.'''
+link = 'https://docs.catalyst.zoho.com/en/cli/v1/initialize-resources/introduction/#Initialize_Alll'
 
 [RC-4]
 context = '''The ${arg[0]} file is corrupted.'''
-aid = '''Please delete the ${arg[0]} file in the Catalyst app directory and initialise the project with the ${arg[1]} command or \nSpecify a valid project with the ${arg[2]} option.'''
-link = 'https://www.zoho.com/catalyst/help/cli-init.html#Options'
+aid = '''Please delete the ${arg[0]} file in the Catalyst app directory and initialize the project with the ${arg[1]} command or \nSpecify a valid project with the ${arg[2]} option.'''
+link = 'https://docs.catalyst.zoho.com/en/cli/v1/initialize-resources/initialize-options/#--force'
 
 [RC-5]
-context = '''The project which is currently active doesn't seems to be present in Catalyst remote console.'''
-aid = '''Use the ${arg[0]} command in order to change the existing active project.'''
-link = 'https://www.zoho.com/catalyst/help/cli-projects.html#Use'
+context = '''Oops!!! It looks like you don't have access to the currently initialized project ${arg[0]}.'''
+aid = '''Please contact the owner or an administrator of the project.\nIf you would like to initialize a new project for this directory, please use the below command\n${arg[1]}'''
+link = 'https://docs.catalyst.zoho.com/en/cli/v1/initialize-resources/initialize-options/#--force'
 
 [RC-6]
 context = '''The Catalyst portal initialized in the current project directory is not accessible with the currently logged in user.\n

package/docs/serve/server/lib/appsail/index.toml

@@ -1,4 +1,25 @@
 [SERVE-APPSAIL-1]
-context = '''The provided build path (${arg[0]}) for the AppSail ${arg[1]} does not exists.'''
+context = '''The provided build path ${arg[0]} for the AppSail ${arg[1]} does not exists.'''
 aid = '''Please provide a valid build path'''
 link = ''
+
+[SERVE-APPSAIL-2]
+context = '''The build path resolved from the provided relative path "${arg[0]}" does not exists.
+Source path   : ${arg[1]}
+Build path    : ${arg[2]}
+Resolved Path : ${arg[3]}'''
+aid = '''Please provide a valid relative path as build path'''
+link = ''
+
+[SERVE-APPSAIL-3]
+context = '''Unable to start the ${arg[0]} AppSail server with the below parameters.
+Command    : ${arg[1]}
+Build path : ${arg[2]}
+Runtime    : ${arg[3]}'''
+aid = '''Please fix the errors if any'''
+link = ''
+
+[SERVE-APPSAIL-4]
+context = '''Invalid AppSail Stack/Runtime for AppSail ${arg[0]}: ${arg[1]}'''
+aid = '''Please use a supported Stack/Runtime from the below list: \n${arg[2]}'''
+link = ''

package/lib/command_needs/rc.js

@@ -192,7 +192,7 @@ exports.default = ({ optional = false, resolveOnNotFound = false, skipOrgCheck =
         });
     }
     if (typeof finalEnvObj !== 'undefined') {
-        projectApi = yield (0, endpoints_1.projectAPI)({ auth: true, org: finalEnvObj.id });
+        projectApi = yield (0, endpoints_1.projectAPI)({ auth: true, org: finalEnvObj.id, printError: false });
         envApi = yield (0, endpoints_1.envAPI)({ auth: true, org: finalEnvObj.id });
     }
     const projectDetails = yield projectApi
@@ -200,19 +200,19 @@ exports.default = ({ optional = false, resolveOnNotFound = false, skipOrgCheck =
         .catch((err) => __awaiter(void 0, void 0, void 0, function* () {
         if (js_1.JS.hasIn(err, 'context.response.statusCode')) {
             switch (err.context.response.statusCode) {
+                case 401:
                 case 404: {
-                    (0, logger_1.message)('cleaning up ' +
-                        constants_1.FILENAME.rc +
-                        ' since the current active project for this folder is not found in remote');
-                    yield (0, project_2.removeProject)(finalProjectObj.id + '');
                     if (resolveOnNotFound) {
                         finalProjectObj = undefined;
                         return;
                     }
-                    throw new error_1.default('active project not found in remote', {
+                    throw new error_1.default('no access to project: ' + (finalProjectObj === null || finalProjectObj === void 0 ? void 0 : finalProjectObj.id), {
                         exit: 1,
                         errorId: 'RC-5',
-                        arg: [(0, ansi_colors_1.bold)('catalyst project:use')]
+                        arg: [
+                            (0, ansi_colors_1.bold)(`${finalProjectObj === null || finalProjectObj === void 0 ? void 0 : finalProjectObj.name}(${finalProjectObj === null || finalProjectObj === void 0 ? void 0 : finalProjectObj.id})`),
+                            (0, ansi_colors_1.bold)((0, ansi_colors_1.cyan)('command: ') + 'catalyst init --force')
+                        ]
                     });
                 }
                 case 403: {

package/lib/commands/appsail/add.js

@@ -43,7 +43,7 @@ const logger_1 = require("../../util_modules/logger");
 exports.default = new command_1.default('appsail:add')
     .description('Link an already existing AppSail service to Catalyst Project')
     .needs('auth', [constants_1.SCOPE.functions])
-    .needs('config')
+    .needs('config', { optional: true })
     .needs('rc')
     .ci(false)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {

package/lib/commands/client/setup.js

@@ -43,7 +43,7 @@ const logger_1 = require("../../util_modules/logger");
 exports.default = new command_1.default('client:setup')
     .description('Set up and configure the client directory in your project directory')
     .needs('auth', [constants_1.SCOPE.webapp])
-    .needs('config')
+    .needs('config', { optional: true })
     .needs('rc')
     .ci(false)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {

package/lib/commands/codelib/install.js

@@ -32,7 +32,7 @@ exports.default = new command_1.default('codelib:install [git-url]')
     .description('Install the code library functionalities into your project')
     .option('-c, --continue <install-id>', 'Continue CodeLib install')
     .needs('auth', [constants_1.SCOPE.project_import_create])
-    .needs('config')
+    .needs('config', { optional: true })
     .needs('rc')
     .action((gitUrl) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
@@ -72,7 +72,10 @@ exports.default = new command_1.default('codelib:install [git-url]')
         if (!gitUrl) {
             throw new error_1.default('Invalid code lib', { exit: 2 });
         }
-        return;
+        throw new error_1.default(`Error while downloading codelib.`, {
+            exit: 2,
+            original: `Occurred while processing ${gitUrl}`
+        });
     }
     const templateFile = yield (0, code_deck_1.getTemplateFile)(deckZip);
     const templateJson = JSON.parse(templateFile || '');

package/lib/commands/event/generate/index.js

@@ -54,7 +54,6 @@ exports.default = new command_1.default('event:generate <source> <action>')
     .needs('auth')
     .action(function generate(source, action) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
         const unknownArgs = (0, option_1.getUnknownOpts)([]);
         if (unknownArgs.length % 2 !== 0) {
             throw new error_1.default('Unknown options are not provided as key value pairs', {
@@ -176,7 +175,7 @@ exports.default = new command_1.default('event:generate <source> <action>')
                     break;
             }
         });
-        const sourceModule = (yield (_a = '../../../event_generate/' + source, Promise.resolve().then(() => __importStar(require(_a))))).default;
+        const sourceModule = (yield Promise.resolve().then(() => __importStar(require('../../../event_generate/' + source)))).default;
         eventJsonContent = yield sourceModule(eventJsonContent, optionMap, action);
         const jsonContent = JSON.parse(eventJsonContent);
         Object.keys(jsonContent).forEach((key) => {

package/lib/commands/event/generate/integ.js

@@ -46,7 +46,6 @@ exports.default = new command_1.default('event:generate:integ <service>')
     .needs('rc')
     .needs('auth')
     .action((service) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
     const availableServices = Object.keys(constants_1.INTEG.service_map);
     if (!availableServices.includes(service)) {
         throw new error_1.default('Unknown service requested', {
@@ -57,7 +56,7 @@ exports.default = new command_1.default('event:generate:integ <service>')
     }
     const inputs = (0, option_1.getOptionValue)('inputs', '');
     const serviceValue = constants_1.INTEG.service_map[service];
-    const serviceModule = (yield (_a = `../../../event_generate/integration/${serviceValue}`, Promise.resolve().then(() => __importStar(require(_a)))))
+    const serviceModule = (yield Promise.resolve().then(() => __importStar(require(`../../../event_generate/integration/${serviceValue}`))))
         .default;
     const payload = yield serviceModule(inputs);
     process.stdout.write(payload + '\n');

package/lib/commands/functions/add.js

@@ -43,7 +43,7 @@ const logger_1 = require("../../util_modules/logger");
 exports.default = new command_1.default('functions:add')
     .description('Add a function of the required stack to the function directory')
     .needs('auth', [constants_1.SCOPE.functions])
-    .needs('config')
+    .needs('config', { optional: true })
     .needs('rc')
     .ci(false)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {

package/lib/commands/functions/setup.js

@@ -43,7 +43,7 @@ const logger_1 = require("../../util_modules/logger");
 exports.default = new command_1.default('functions:setup')
     .description('Set up and configure the function directory in your project directory')
     .needs('auth', [constants_1.SCOPE.functions])
-    .needs('config')
+    .needs('config', { optional: true })
     .needs('rc')
     .ci(false)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {

package/lib/commands/index.js

@@ -36,8 +36,7 @@ exports.default = (client) => {
     function loadCommand(name) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => setTimeout(() => __awaiter(this, void 0, void 0, function* () {
-                var _a;
-                const cmd = (yield (_a = './' + name.split(':').join('/'), Promise.resolve().then(() => __importStar(require(_a))))).default;
+                const cmd = (yield Promise.resolve().then(() => __importStar(require('./' + name.split(':').join('/'))))).default;
                 try {
                     cmd.register(client);
                     resolve();

package/lib/commands/init.js

@@ -100,8 +100,15 @@ exports.default = new command_1.default('init [feature]')
         return;
     }
     if (feature !== 'project') {
-        yield (0, features_1.project)();
+        try {
+            yield (0, features_1.project)();
+        }
+        catch (er) {
+            (0, logger_1.debug)(er);
+            return;
+        }
     }
+    (0, logger_1.info)();
     const featureAns = yield prompt_1.default.ask(prompt_1.default.question('features', 'Which are the features you want to setup for this folder?\n This step is optional! Press ' +
         (0, ansi_colors_1.cyan)('<return> ') +
         'to proceed.\n', {

package/lib/deploy/features/appsail/index.js

@@ -31,6 +31,7 @@ const option_1 = require("../../../util_modules/option");
 const project_1 = require("../../../util_modules/project");
 const utils_1 = require("./utils");
 const throbber_1 = __importDefault(require("../../../throbber"));
+const minimatch_1 = __importDefault(require("minimatch"));
 function executeHook(script, name, moduleSource) {
     if ((0, option_1.getOptionValue)('ignoreScripts', false)) {
         (0, logger_1.debug)(`skipping ${name} hook`);
@@ -183,29 +184,42 @@ exports.default = (standAlone = false) => __awaiter(void 0, void 0, void 0, func
         var _a, _b;
         const targ = _targ.config;
         const prevRes = yield result;
+        const throbberName = `prepare_appsail_${_targ.name}`;
         try {
             if ((_a = targ.scripts) === null || _a === void 0 ? void 0 : _a.predeploy) {
                 executeHook(targ.scripts.predeploy, 'predeploy', _targ.source);
             }
-            const throbberName = `prepare_appsail_${_targ.name}`;
             throbber.add(throbberName, {
                 text: `Preparing AppSail[${_targ.name}]`
             });
-            const zip = new archiver_1.default();
-            const ignoreFile = yield fs_1.ASYNC.readFile((0, path_1.join)(_targ.source, constants_1.FILENAME.catalyst_ignore));
             const folderPath = targ.build_path;
+            const isBuildPath = yield fs_1.ASYNC.isPathExists(folderPath);
+            if (!isBuildPath) {
+                throw new error_1.default(`the build path doesn't exists: ${folderPath}`, {
+                    exit: 1,
+                    skipHelp: true
+                });
+            }
+            const ignoreFile = yield fs_1.ASYNC.readFile((0, path_1.join)(_targ.source, constants_1.FILENAME.catalyst_ignore));
+            const excludePatterns = [
+                '**/.DS_Store',
+                '**/.vscode/**/*',
+                `**/${constants_1.FILENAME.log}`,
+                `**/${constants_1.FILENAME.config}`,
+                `**/${constants_1.FILENAME.rc}`,
+                `**/${constants_1.FILENAME.app_config}`,
+                `**/${constants_1.FILENAME.catalyst_ignore}`,
+                ...((ignoreFile === null || ignoreFile === void 0 ? void 0 : ignoreFile.split('\n')) || [])
+            ];
             const folderContents = yield fs_1.ASYNC.walk(folderPath, {
                 filter: {
-                    exclude: [
-                        '**/.DS_Store',
-                        '**/.vscode/**/*',
-                        `**/${constants_1.FILENAME.app_config}`,
-                        `**/${constants_1.FILENAME.catalyst_ignore}`,
-                        ...((ignoreFile === null || ignoreFile === void 0 ? void 0 : ignoreFile.split('\n')) || [])
-                    ],
+                    exclude: (path) => __awaiter(void 0, void 0, void 0, function* () {
+                        return !!excludePatterns.find((glob) => (0, minimatch_1.default)(path.replace(folderPath + path_1.sep, ''), glob, { dot: true }));
+                    }),
                     excludeDir: true
                 }
             });
+            const zip = new archiver_1.default();
             folderContents.forEach((content) => {
                 zip.add(content.path === folderPath
                     ? (0, path_1.basename)(content.path)
@@ -234,6 +248,7 @@ exports.default = (standAlone = false) => __awaiter(void 0, void 0, void 0, func
             }
         }
         catch (err) {
+            throbber.remove(throbberName);
             (0, logger_1.debug)(err);
             _targ.validity = {
                 valid: false,

package/lib/endpoints/index.js

@@ -41,10 +41,10 @@ function orgAPI({ auth = true } = {}) {
     });
 }
 exports.orgAPI = orgAPI;
-function projectAPI({ auth = true, org = (0, project_1.getEnvId)() } = {}) {
+function projectAPI({ auth = true, org = (0, project_1.getEnvId)(), printError = true } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         const project = (yield Promise.resolve().then(() => __importStar(require('./lib/project')))).default;
-        return new project({ authNeeded: auth }, org);
+        return new project({ authNeeded: auth, printError }, org);
     });
 }
 exports.projectAPI = projectAPI;

package/lib/endpoints/lib/tunnel.js

@@ -62,5 +62,23 @@ class TunnelAPI {
             });
         });
     }
+    tunnelCallback(status, details, data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(this.opts).post(`/baas/v1/project/${this.projectId}/tunneling/callback`, {
+                body: {
+                    status,
+                    content: Object.assign({}, details),
+                    data
+                }
+            });
+            if (res.status >= 200 && res.status <= 299) {
+                return;
+            }
+            (0, logger_1.debug)(`tunnel callback response from server ::: status=${res.status} ::: body=${res.body}`);
+            throw new error_1.default('Server Error: Unexpected Response from server.', {
+                exit: 2
+            });
+        });
+    }
 }
 exports.default = TunnelAPI;

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

@@ -141,21 +141,8 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                 })
             }))).source
         };
-    const appConfigPth = (0, path_1.join)(_appSailConfig.source, constants_1.FILENAME.app_config);
-    const isAppConfig = yield fs_1.ASYNC.fileExists(appConfigPth);
     const existingSails = config_1.appSailConfig.raw() || [];
-    yield prompt_1.default.register('file-path');
-    const appSail = yield prompt_1.default.ask(prompt_1.default.question('buildPath', 'Please provide the build path of your AppSail service: ', {
-        type: 'file-path',
-        validate: (pth) => __awaiter(void 0, void 0, void 0, function* () {
-            const buildPath = (0, path_1.resolve)(runtime_store_1.default.get('cwd'), pth.value);
-            if ((yield fs_1.ASYNC.dirExists(buildPath)) || (yield fs_1.ASYNC.fileExists(buildPath))) {
-                return true;
-            }
-            return 'Path does not exists';
-        }),
-        when: !_appSailConfig.build
-    }), prompt_1.default.question('name', 'Please provide the name for your AppSail: ', {
+    const appName = yield prompt_1.default.ask(prompt_1.default.question('name', 'Please provide the name for your AppSail: ', {
         type: 'input',
         default: 'AppSail',
         validate: (name) => {
@@ -172,20 +159,45 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                     : true;
         }
     }));
-    const appSailStack = _appSailConfig.stack ||
-        (yield (0, common_1.getRuntimePromptAnswer)('Please choose a stack for your AppSail: '));
     const payload = {
-        source: _appSailConfig.source,
-        name: appSail.name
+        source: (0, path_1.relative)((0, project_1.getProjectRoot)(), _appSailConfig.source) || '.',
+        name: appName.name
     };
+    const appConfigPth = (0, path_1.join)(_appSailConfig.source, constants_1.FILENAME.app_config);
+    const isAppConfig = yield fs_1.ASYNC.fileExists(appConfigPth);
+    if (isAppConfig) {
+        (0, logger_1.info)();
+        (0, logger_1.warning)(`The ${(0, ansi_colors_1.bold)(constants_1.FILENAME.app_config)} file is already present in the appsail directory`);
+    }
+    const overWrite = yield prompt_1.default.ask(prompt_1.default.question('appConfig', 'Do you wish to overwrite the ' + constants_1.FILENAME.app_config, {
+        type: 'confirm',
+        default: false,
+        when: isAppConfig
+    }));
+    const activeWrite = overWrite.appConfig !== false;
+    if (!activeWrite) {
+        runtime_store_1.default.set('payload.appsail.targets', [payload]);
+        return;
+    }
+    const buildPath = yield prompt_1.default.ask(prompt_1.default.question('path', 'Please provide the build path of your AppSail service: ', {
+        type: 'input',
+        rootPath: _appSailConfig.source,
+        when: !_appSailConfig.build && activeWrite
+    }));
+    const appSailStack = _appSailConfig.stack ||
+        (yield (0, common_1.getRuntimePromptAnswer)('Please choose a stack for your AppSail: '));
     const appConfig = {
         command: _appSailConfig.command ||
-            'echo Please specify the start-up command in the app-config.json file under the key command',
-        build_path: _appSailConfig.build || './' + (0, path_1.relative)(_appSailConfig.source, appSail.buildPath),
+            'echo Please specify the start-up command in the app-config.json file under the key command for AppSail $X_ZC_RESOURCE_NAME',
+        build_path: _appSailConfig.build ||
+            ((0, path_1.isAbsolute)(buildPath.path)
+                ? (0, path_1.relative)(_appSailConfig.source, buildPath.path) || '.'
+                : buildPath.path),
         stack: appSailStack.runtime,
         env_variables: {},
         memory: _appSailConfig.memory || 256,
-        scripts: _appSailConfig.scripts || {}
+        scripts: _appSailConfig.scripts || {},
+        raw: {}
     };
     if (appSailStack.lang === 'java') {
         const platform = yield prompt_1.default.ask(prompt_1.default.question('value', 'Please choose a platform for your AppSail: ', {
@@ -208,10 +220,5 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         }
     }
     runtime_store_1.default.set('payload.appsail.targets', [payload]);
-    if (isAppConfig) {
-        (0, logger_1.message)((0, ansi_colors_1.bold)(`app-config.json`) + ` file already exist in ${(0, ansi_colors_1.underline)(_appSailConfig.source)}`);
-    }
-    else {
-        yield fs_1.ASYNC.writeJSONFile(appConfigPth, appConfig);
-    }
+    activeWrite && (yield fs_1.ASYNC.writeJSONFile(appConfigPth, appConfig));
 });

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

@@ -38,7 +38,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const index_js_1 = __importDefault(require("../../../prompt/index.js"));
 const index_js_2 = require("../../../util_modules/constants/index.js");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
     const clientInitAnswer = yield index_js_1.default.ask(index_js_1.default.question('clientFlavour', 'Choose the type of client to initialise: ', {
         type: 'list',
         choices: index_js_2.PLUGIN.client.map((plugin) => {
@@ -48,5 +47,5 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             });
         })
     }));
-    return (yield (_a = './initializers/' + clientInitAnswer.clientFlavour, Promise.resolve().then(() => __importStar(require(_a))))).default();
+    return (yield Promise.resolve().then(() => __importStar(require('./initializers/' + clientInitAnswer.clientFlavour)))).default();
 });

package/lib/init/features/project.js

@@ -34,26 +34,16 @@ const client_utils_1 = require("../../client-utils");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
     const orgAPI = yield (0, endpoints_1.orgAPI)();
-    const projectAPIWithoutOrg = yield (0, endpoints_1.projectAPI)();
     const defaultRCProjectName = (0, project_1.getDefaultProjectName)(null);
     const defaultRCProjectId = (0, project_1.getDefaultProjectId)(null);
     if (defaultRCProjectName !== null &&
         defaultRCProjectId !== null &&
         !(0, option_1.getOptionValue)('force', false)) {
-        (0, logger_1.message)(constants_1.FILENAME.rc + ' already has ' + (0, ansi_colors_1.bold)(defaultRCProjectName) + ' as a default project.');
-        try {
-            yield projectAPIWithoutOrg.getProject(defaultRCProjectId);
-            throw new error_1.default('Skipping project setup, since project directory contains a default project. To overwrite use --force option');
-        }
-        catch (err) {
-            if (js_1.JS.get(err, 'context.response.statusCode') !== 404) {
-                throw err;
-            }
-            (0, logger_1.warning)('cleaning up ' +
-                constants_1.FILENAME.rc +
-                ' since the current default project for this folder is not found in remote');
-            yield (0, project_1.removeProject)(defaultRCProjectId + '');
-        }
+        (0, logger_1.message)(constants_1.FILENAME.rc +
+            ' already has ' +
+            (0, ansi_colors_1.bold)(defaultRCProjectName) +
+            ' as a default project. To overwrite use --force option');
+        throw new error_1.default('Skipping project setup, since project directory contains a default project. To overwrite use --force option', { skipHelp: true, exit: 0 });
     }
     const orgList = yield orgAPI.getAllOrgs();
     if (orgList.length === 0) {

package/lib/internal/api.js

@@ -47,7 +47,7 @@ const project_1 = require("../util_modules/project");
 const fs_1 = require("fs");
 const throbber_1 = __importDefault(require("../throbber"));
 class API {
-    constructor({ authNeeded = true, resolveOnError = false, maxRetry = 3, env = constants_1.DEFAULT.env_name, log = {}, headers = {}, isExternal = false, origin = constants_1.ORIGIN.admin, showWarning = true, envId = (0, project_1.getEnvId)() } = {}) {
+    constructor({ authNeeded = true, resolveOnError = false, maxRetry = 3, env = constants_1.DEFAULT.env_name, log = {}, headers = {}, isExternal = false, origin = constants_1.ORIGIN.admin, showWarning = true, envId = (0, project_1.getEnvId)(), printError = true } = {}) {
         this.requestOpts = {
             url: origin,
             method: 'GET',
@@ -73,6 +73,7 @@ class API {
         this.maxRetryCount = maxRetry;
         this.retryCount = 0;
         this.showWarning = showWarning;
+        this.printError = printError;
     }
     _logReq() {
         let qs = this.requestOpts.qs
@@ -113,7 +114,9 @@ class API {
             (0, logger_1.debug)('TOTAL TIME TAKEN : ' + Number(resp.timings.end.toFixed(3)) + ' ms\n');
             (0, logger_1.debug)('REQUEST PHASES : ' + resp.timingPhases);
         }
-        if (this.logOpts.progress !== undefined) {
+        if (resp.statusCode >= 200 &&
+            resp.statusCode < 300 &&
+            this.logOpts.progress !== undefined) {
             js_1.JS.set(this.logOpts, 'progress.total', resp.headers['content-length']);
             this.downloadProgress = new progress_1.default(this.logOpts.progress);
         }
@@ -153,11 +156,11 @@ class API {
         if (resp.statusCode >= 400 && !this.logOpts.skipRespBody) {
             (0, logger_1.debug)('Response Body : ' + JSON.stringify(resp.body) + '\n');
             if (!this.resolveOnHTTPError) {
-                const errRes = (0, errorResponse_1.default)(resp, body);
+                const errRes = (0, errorResponse_1.default)(resp, body, !this.printError);
                 this._logDownloadProgress({ error: errRes });
                 throw errRes;
             }
-            this._logDownloadProgress({ error: (0, errorResponse_1.default)(resp, body, true) });
+            this._logDownloadProgress({ error: (0, errorResponse_1.default)(resp, body, !this.printError) });
         }
         return {
             status: resp.statusCode,
@@ -188,6 +191,7 @@ class API {
             return new Promise((resolve, reject) => {
                 const responseBuffer = [];
                 let isJSONResponse = false;
+                let isErrorPage = false;
                 const throbber = throbber_1.default.getInstance();
                 if (this.logOpts.uploadProgress !== undefined &&
                     this.logOpts.stream instanceof fs_1.ReadStream) {
@@ -230,6 +234,7 @@ class API {
                 }))
                     .on('response', (resp) => {
                     isJSONResponse = js_1.JS.includes(resp.headers['content-type'], 'json');
+                    isErrorPage = !(resp.statusCode >= 200 && resp.statusCode < 300);
                     this._logResp(resp);
                 })
                     .on('complete', (resp, body) => __awaiter(this, void 0, void 0, function* () {
@@ -244,7 +249,9 @@ class API {
                     if (isJSONResponse) {
                         responseBuffer.push(data);
                     }
-                    this._logDownloadProgress({ chunk: data });
+                    if (!isErrorPage) {
+                        this._logDownloadProgress({ chunk: data });
+                    }
                 });
             });
         });
@@ -252,6 +259,7 @@ class API {
     fire(method, path, options) {
         return __awaiter(this, void 0, void 0, function* () {
             this.resolveOnHTTPError = js_1.JS.get(options, 'resolveOnError', this.resolveOnHTTPError);
+            this.printError = (options === null || options === void 0 ? void 0 : options.printError) || this.printError;
             this.maxRetryCount = js_1.JS.get(options, 'maxRetry', this.maxRetryCount);
             this.authNeeded = js_1.JS.get(options, 'authNeeded', this.authNeeded);
             this.logOpts = js_1.JS.get(options, 'log', this.logOpts);

package/lib/internal/command.js

@@ -229,8 +229,7 @@ class Command {
                 (0, logger_1.debug)(e);
             }
             yield Promise.all(js_1.JS.map(this.beforeRunners, (before) => __awaiter(this, void 0, void 0, function* () {
-                var _a;
-                const beforeModule = (yield (_a = '../command_needs/' + before.fn, Promise.resolve().then(() => __importStar(require(_a))))).default;
+                const beforeModule = (yield Promise.resolve().then(() => __importStar(require('../command_needs/' + before.fn)))).default;
                 return beforeModule.call(this, before.args);
             })));
             return this.cmdAction.call(this, ...args);

package/lib/migration/index.js

@@ -44,7 +44,6 @@ const rc_1 = __importDefault(require("../internal/rc"));
 const fs_1 = require("../util_modules/fs");
 const logger_1 = require("../util_modules/logger");
 const runMigration = (rc, migFiles, idx = 0) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
     if (migFiles.length <= idx) {
         return Promise.resolve();
     }
@@ -55,7 +54,7 @@ const runMigration = (rc, migFiles, idx = 0) => __awaiter(void 0, void 0, void 0
         return runMigration(rc, migFiles, ++idx);
     }
     try {
-        const migModule = yield (_a = migFile, Promise.resolve().then(() => __importStar(require(_a))));
+        const migModule = yield Promise.resolve().then(() => __importStar(require(migFile)));
         if (migModule.isRequire()) {
             (0, logger_1.debug)('migration started for v' + currentMigFileVersion);
             migModule.migrate();
@@ -84,7 +83,6 @@ const runMigration = (rc, migFiles, idx = 0) => __awaiter(void 0, void 0, void 0
     return runMigration(rc, migFiles, ++idx);
 });
 const runGlobalMigration = (migFiles) => __awaiter(void 0, void 0, void 0, function* () {
-    var _b;
     if (migFiles.length === 0) {
         return;
     }
@@ -98,7 +96,7 @@ const runGlobalMigration = (migFiles) => __awaiter(void 0, void 0, void 0, funct
         return runGlobalMigration(migFiles);
     }
     try {
-        const migModule = yield (_b = migFile, Promise.resolve().then(() => __importStar(require(_b))));
+        const migModule = yield Promise.resolve().then(() => __importStar(require(migFile)));
         if (migModule.isRequire()) {
             (0, logger_1.debug)('migration started for v' + currentMigFileVersion);
             migModule.migrate();

package/lib/optional-import.js

@@ -42,7 +42,6 @@ const async_js_1 = require("./util_modules/fs/lib/async.js");
 const error_js_1 = __importDefault(require("./error.js"));
 const ansi_colors_1 = require("ansi-colors");
 exports.default = (name, source) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
     if (name === (0, path_1.basename)(name)) {
         const projectModulePath = (0, project_js_1.resolveProjectPath)((0, path_1.join)(source, 'node_modules', name));
         const projectModulePathExists = yield (0, async_js_1.dirExists)(projectModulePath);
@@ -54,7 +53,7 @@ exports.default = (name, source) => __awaiter(void 0, void 0, void 0, function*
             });
         }
         app_module_path_1.default.addPath(projectModulePath);
-        return _a = projectModulePath, Promise.resolve().then(() => __importStar(require(_a)));
+        return Promise.resolve().then(() => __importStar(require(projectModulePath)));
     }
     const projectModulePath = (0, project_js_1.resolveProjectPath)(name);
     const projectModulePathExists = yield (0, async_js_1.dirExists)(projectModulePath);
@@ -66,5 +65,5 @@ exports.default = (name, source) => __awaiter(void 0, void 0, void 0, function*
         });
     }
     app_module_path_1.default.addPath(projectModulePath);
-    return _b = projectModulePath, Promise.resolve().then(() => __importStar(require(_b)));
+    return Promise.resolve().then(() => __importStar(require(projectModulePath)));
 });

package/lib/prompt/types/file-path.js

@@ -36,7 +36,7 @@ class InquirerFilePath extends inquirer_autocomplete_prompt_1.default {
     constructor(question, rl, answers) {
         const { rootPath = '.', exclude = [] } = question;
         const questionBase = Object.assign({
-            emptyText: 'No valid file inside current directory!. Try giving the entire path and press ' +
+            emptyText: 'No valid file path inside current directory!. Try giving the entire path and press ' +
                 (0, ansi_colors_1.cyan)('<return> ') +
                 'key'
         }, question, {