zcatalyst-cli 1.9.0 → 1.11.0

package/lib/command_needs/auth.js

@@ -41,9 +41,18 @@ exports.default = (inScopes = []) => {
         });
     }
     logger_1.debug(`> authorizing via ${tokenObj.option} option`);
-    const commandScopes = [constants_1.SCOPE.projects, ...inScopes].filter((value, index, self) => self.indexOf(value) === index);
-    logger_1.debug('> command requires scopes: ' + JSON.stringify([constants_1.SCOPE.projects].concat(inScopes || [])));
-    runtime_store_1.default.set('auth_scopes', commandScopes);
+    const existingScopes = config_store_1.default.get(`${activeDC}.scopes`, []);
+    const requiredScopes = [constants_1.SCOPE.projects, ...inScopes];
+    logger_1.debug('> command requires scopes: ' + JSON.stringify(requiredScopes));
+    const hasAllScope = requiredScopes.every((scope) => existingScopes.includes(scope));
+    if (!tokenObj.temp && !env_1.isCI && !hasAllScope) {
+        throw new error_1.default('Re-login required due to missing scopes!!', {
+            exit: 0,
+            errorId: 'AUTH-2',
+            arg: [ansi_colors_1.bold('catalyst login --force')]
+        });
+    }
+    runtime_store_1.default.set('auth_scopes', requiredScopes);
     runtime_store_1.default.set('user', config_store_1.default.get(`${activeDC}.user`, null));
     runtime_store_1.default.set('credential', credential_1.default.init(tokenObj.token, tokenObj.temp));
 };

package/lib/command_needs/rc.js

@@ -18,16 +18,17 @@ const error_1 = __importDefault(require("../error"));
 const rc_1 = __importDefault(require("../internal/rc"));
 const runtime_store_1 = __importDefault(require("../runtime-store"));
 const constants_1 = require("../util_modules/constants");
+const project_1 = __importDefault(require("../util_modules/constants/project"));
 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");
+const project_2 = require("../util_modules/project");
 exports.default = ({ optional = false, resolveOnNotFound = false } = {}) => __awaiter(void 0, void 0, void 0, function* () {
     const projectOpt = option_1.getGlobalOptionValue('project', null);
     const projectApi = yield endpoints_1.projectAPI();
     const envApi = yield endpoints_1.envAPI();
     const convertProjectToProperties = (project) => {
-        project = project_1.transformProject(project);
+        project = project_2.transformProject(project);
         runtime_store_1.default.set('project.name', project.name);
         runtime_store_1.default.set('project.id', project.id + '');
         runtime_store_1.default.set('project.domain', project.domain);
@@ -39,7 +40,7 @@ exports.default = ({ optional = false, resolveOnNotFound = false } = {}) => __aw
                 exit: 2
             });
         }
-        runtime_store_1.default.set('project.env', project_1.transformEnv(envObj));
+        runtime_store_1.default.set('project.env', project_2.transformEnv(envObj));
     };
     let ignoreRC = false;
     if (projectOpt !== null) {
@@ -60,7 +61,11 @@ exports.default = ({ optional = false, resolveOnNotFound = false } = {}) => __aw
                     arg: [
                         ansi_colors_1.bold(projectOpt),
                         ansi_colors_1.bold('--project'),
-                        ansi_colors_1.bold(projectArr.map((project) => '* ' + project.project_name).join('\n'))
+                        ansi_colors_1.bold(projectArr
+                            .filter((proj) => proj.project_type &&
+                            project_1.default.accepted_types.includes(proj.project_type))
+                            .map((project) => '* ' + project.project_name)
+                            .join('\n'))
                     ]
                 });
             }
@@ -146,7 +151,7 @@ exports.default = ({ optional = false, resolveOnNotFound = false } = {}) => __aw
             logger_1.message('cleaning up ' +
                 constants_1.FILENAME.rc +
                 ' since the current active project for this folder is not found in remote');
-            yield project_1.removeProject(finalProjectObj.id + '');
+            yield project_2.removeProject(finalProjectObj.id + '');
             if (resolveOnNotFound) {
                 finalProjectObj = undefined;
                 return;
@@ -170,8 +175,8 @@ exports.default = ({ optional = false, resolveOnNotFound = false } = {}) => __aw
                 exit: 2
             });
         }
-        finalEnvObj = project_1.transformEnv(envObj);
-        yield project_1.upsertEnv(finalProjectObj.id + '', envObj, {
+        finalEnvObj = project_2.transformEnv(envObj);
+        yield project_2.upsertEnv(finalProjectObj.id + '', envObj, {
             active: true,
             base: js_1.JS.isEmpty(defaultRCEnv)
         });

package/lib/commands/apig/disable.js

@@ -20,7 +20,7 @@ const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
 const logger_1 = require("../../util_modules/logger");
 exports.default = new command_1.default('apig:disable')
-    .description('disable api gateway if not already disabled')
+    .description('Disable API Gateway for your project')
     .needs('auth', [constants_1.SCOPE.projects])
     .needs('config')
     .needs('rc')

package/lib/commands/apig/enable.js

@@ -20,7 +20,7 @@ const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
 const logger_1 = require("../../util_modules/logger");
 exports.default = new command_1.default('apig:enable')
-    .description('enables api gateway if not already enabled')
+    .description('Enable API Gateway for your project')
     .needs('auth', [constants_1.SCOPE.projects])
     .needs('config')
     .needs('rc')

package/lib/commands/apig/status.js

@@ -22,7 +22,7 @@ const constants_1 = require("../../util_modules/constants");
 const logger_1 = require("../../util_modules/logger");
 const option_1 = require("../../util_modules/option");
 exports.default = new command_1.default('apig:status')
-    .description('Displays the status of catalyst api gateway and schedule progress')
+    .description('Obtain the current status of API Gateway for your project and the schedule progress')
     .option('--previous', 'show previous schedule status instead of current one')
     .needs('auth', [constants_1.SCOPE.projects])
     .needs('config')
@@ -46,13 +46,14 @@ exports.default = new command_1.default('apig:status')
         report = (yield api.getScheduleReport(previousOpt));
     }
     catch (e) {
-        if (e.status && e.status === 404) {
+        const err = error_1.default.getErrorInstance(e);
+        if (err.status && err.status === 404) {
             throw new error_1.default('There is no report available.', {
                 exit: 0,
                 errorId: 'STAT-1'
             });
         }
-        throw e;
+        throw err;
     }
     const spinner = 'API Gateway Upsert';
     const throbber = throbber_1.default.getInstance();
@@ -192,13 +193,14 @@ exports.default = new command_1.default('apig:status')
                 report = (yield api.getScheduleReport(false));
             }
             catch (ex) {
-                if (ex.status && ex.status === 404) {
+                const err = error_1.default.getErrorInstance(ex);
+                if (err.status && err.status === 404) {
                     report = (yield api.getScheduleReport(true));
                 }
                 else {
                     throbber.stopAll();
                     needIteration = false;
-                    reject(ex);
+                    reject(err);
                 }
             }
         }

package/lib/commands/client/delete.js

@@ -28,7 +28,7 @@ const logger_1 = require("../../util_modules/logger");
 const option_1 = require("../../util_modules/option");
 const project_1 = require("../../util_modules/project");
 exports.default = new command_1.default('client:delete [client_version]')
-    .description('Removes the selected version of client')
+    .description('Delete a version of the client from the remote console or the local directory')
     .option('--local', 'removes the client from local machine')
     .option('--remote', 'removes the selected client from remote console')
     .needs('auth', [constants_1.SCOPE.webapp])
@@ -87,10 +87,9 @@ exports.default = new command_1.default('client:delete [client_version]')
                 localDel.version = version;
             }
             catch (error) {
-                logger_1.debug('Failed to read ' +
-                    constants_1.FILENAME.client.package_json +
-                    ' Reason: ' +
-                    error.message);
+                const err = error_1.default.getErrorInstance(error);
+                err.exit = 2;
+                logger_1.debug('Failed to read ' + constants_1.FILENAME.client.package_json + ' Reason: ' + err.message);
             }
             if (clientVersion !== undefined && clientVersion !== localDel.version) {
                 throw new error_1.default('version unavailable in local', {

package/lib/commands/client/setup.js

@@ -37,7 +37,7 @@ const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
 const logger_1 = require("../../util_modules/logger");
 exports.default = new command_1.default('client:setup')
-    .description('Setup and configure Client files')
+    .description('Set up and configure the client directory in your project directory')
     .needs('auth', [constants_1.SCOPE.webapp])
     .needs('config')
     .needs('rc')

package/lib/commands/deploy.js

@@ -36,7 +36,7 @@ const runtime_store_1 = __importDefault(require("../runtime-store"));
 const constants_1 = require("../util_modules/constants");
 const logger_1 = require("../util_modules/logger");
 exports.default = new command_1.default('deploy')
-    .description('Deploy your code from working directory to your Catalyst Project')
+    .description('Deploy the Catalyst project and project resources to the remote console from the local directory')
     .option('--only <targets>', 'only deploy specified, comma-separated targets (e.g. "functions,client").' +
     ' For Functions you can specify which functions to deploy with colon notation' +
     ' (e.g. "--only functions:<function_name>,functions:<function_name>"). ')
@@ -49,7 +49,9 @@ exports.default = new command_1.default('deploy')
     const optionFilter = yield Promise.resolve().then(() => __importStar(require('../option-filter')));
     optionFilter.filterTargets();
     yield (yield Promise.resolve().then(() => __importStar(require('../deploy')))).default();
-    const deployTargets = runtime_store_1.default.get('payload.targets', []).filter((deploytarget) => {
+    const deployTargets = runtime_store_1.default
+        .get('payload.targets', [])
+        .filter((deploytarget) => {
         if (!runtime_store_1.default.get('payload.' + deploytarget + '.deploy', false)) {
             logger_1.info();
             logger_1.labeled(deploytarget, 'deploy skipped').ERROR();

package/lib/commands/ds/export.js

@@ -35,7 +35,7 @@ const getReadConfigFromPath = (pth) => __awaiter(void 0, void 0, void 0, functio
     return configJSON;
 });
 exports.default = new command_1.default('ds:export [table]')
-    .description('Read bulk data from table in catalyst datastore')
+    .description('Bulk read records from a table in the Catalyst Data Store')
     .option('--table <name|id>', 'Name or ID of the table from which data is to be read (eg. "UserDetails")')
     .option('--config <path>', 'Path of the configuration json file to be used for export.')
     .option('--page <page>', 'Number which denotes the range of rows to be fetched (eg. "1")')
@@ -69,7 +69,9 @@ exports.default = new command_1.default('ds:export [table]')
         const allGlobalOpts = runtime_store_1.default.get('opts.globalOpts', {});
         const optsArr = Object.keys(allGlobalOpts).reduce((arr, key) => {
             arr.push('--' + key);
-            arr.push(allGlobalOpts[key]);
+            if (allGlobalOpts[key]) {
+                arr.push(allGlobalOpts[key]);
+            }
             return arr;
         }, (env === 'Production' ? ['--production'] : []));
         shell_1.spawn('catalyst', ['ds:status', 'export', readResponse.job_id + '', ...optsArr], {

package/lib/commands/ds/import.js

@@ -36,7 +36,7 @@ const getWriteConfigFromPath = (pth) => __awaiter(void 0, void 0, void 0, functi
     return configJSON;
 });
 exports.default = new command_1.default('ds:import [file]')
-    .description('Write bulk data to table in catalyst datastore')
+    .description('Bulk write records to a table in the Catalyst Data Store')
     .option('--table <name|id>', 'Name or ID of the table to which data to be written (e.g. "UserDetails")')
     .option('--config <path>', 'Path of the configuration json file to be used for import.')
     .option('--production', 'flag for pointing to production environment')
@@ -82,7 +82,9 @@ exports.default = new command_1.default('ds:import [file]')
         const allGlobalOpts = runtime_store_1.default.get('opts.globalOpts', {});
         const optsArr = Object.keys(allGlobalOpts).reduce((arr, key) => {
             arr.push('--' + key);
-            arr.push(allGlobalOpts[key]);
+            if (allGlobalOpts[key]) {
+                arr.push(allGlobalOpts[key]);
+            }
             return arr;
         }, (env === 'Production' ? ['--production'] : []));
         shell_1.spawn('catalyst', ['ds:status', 'import', writeResponse.job_id + '', ...optsArr], {

package/lib/commands/ds/status.js

@@ -24,8 +24,151 @@ const constants_1 = require("../../util_modules/constants");
 const fs_1 = require("../../util_modules/fs");
 const logger_1 = require("../../util_modules/logger");
 const option_1 = require("../../util_modules/option");
+const getSpinnerTxt = (mainTable, finalReport) => {
+    var _a, _b, _c, _d;
+    const spaceRpt = ' '.repeat(35);
+    let spinnerTxt = '\n' + spaceRpt;
+    spinnerTxt += mainTable
+        .toString()
+        .split('\n')
+        .join('\n' + spaceRpt);
+    spinnerTxt += '\n';
+    if (finalReport === undefined) {
+        return spinnerTxt;
+    }
+    if (finalReport.status === 'Completed') {
+        spinnerTxt += ansi_colors_1.green(((_a = finalReport.results) === null || _a === void 0 ? void 0 : _a.description) + '');
+        if (((_b = finalReport.results) === null || _b === void 0 ? void 0 : _b.download_url) !== undefined) {
+            spinnerTxt += '\n';
+            spinnerTxt += ansi_colors_1.bold(`Download URL : ${(_c = finalReport.results) === null || _c === void 0 ? void 0 : _c.download_url}`);
+        }
+    }
+    else {
+        spinnerTxt += ansi_colors_1.red(ansi_colors_1.bold('Reason : ') + ((_d = finalReport.results) === null || _d === void 0 ? void 0 : _d.description));
+    }
+    return spinnerTxt;
+};
+const spinnerFn = (jobId, dsReport, cumulativeStatus, throbber, spinner, bulkApi, displayOpr, action) => (resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
+    if (jobId === undefined) {
+        reject('Job Id cannot be empty!');
+        return;
+    }
+    let needIteration = true;
+    const reportTable = new cli_table_1.default();
+    Object.keys(cumulativeStatus).forEach((table) => {
+        const initialCount = reportTable.length;
+        let tableRowCount = reportTable.length;
+        ['insert', 'update', 'upsert', 'read'].forEach((statusAct) => {
+            const operationObj = cumulativeStatus[table][statusAct];
+            if (operationObj !== null && operationObj !== undefined) {
+                let operationRowCount = 0;
+                if (operationObj.rows_processed !== undefined &&
+                    operationObj.rows_processed >= 0) {
+                    reportTable[tableRowCount++] = [
+                        'Processed',
+                        operationObj.rows_processed + ''
+                    ];
+                    operationRowCount++;
+                }
+                if (operationObj.fail_count !== undefined && operationObj.fail_count >= 0) {
+                    reportTable[tableRowCount++] = ['Failure', operationObj.fail_count + ''];
+                    operationRowCount++;
+                }
+                if (operationRowCount > 0) {
+                    reportTable[tableRowCount - operationRowCount].unshift({
+                        hAlign: 'center',
+                        vAlign: 'center',
+                        rowSpan: operationRowCount,
+                        content: statusAct.toUpperCase()
+                    });
+                }
+            }
+        });
+        if (tableRowCount > 0) {
+            reportTable[initialCount].unshift({
+                hAlign: 'center',
+                vAlign: 'center',
+                rowSpan: tableRowCount,
+                content: ansi_colors_1.cyan.bold(table)
+            });
+        }
+    });
+    switch (dsReport.status) {
+        case 'In-Progress':
+            if (reportTable.length === 0) {
+                reportTable.unshift([
+                    { hAlign: 'center', content: ansi_colors_1.yellow.bold('Yet to start') }
+                ]);
+            }
+            else {
+                reportTable.unshift([
+                    {
+                        hAlign: 'center',
+                        colSpan: 4,
+                        content: ansi_colors_1.cyan.bold('In-Progress')
+                    }
+                ]);
+            }
+            break;
+        case 'Completed':
+            reportTable.unshift([
+                {
+                    hAlign: 'center',
+                    colSpan: 4,
+                    content: ansi_colors_1.green.bold(displayOpr + ' Job Completed')
+                }
+            ]);
+            dsReport = (yield bulkApi.getReport(action, jobId));
+            throbber.succeed(spinner, {
+                text: getSpinnerTxt(reportTable, dsReport)
+            });
+            needIteration = false;
+            resolve();
+            break;
+        case 'Failed':
+            reportTable.unshift([
+                {
+                    hAlign: 'center',
+                    content: ansi_colors_1.red.bold(displayOpr + ' Job Failed!')
+                }
+            ]);
+            dsReport = (yield bulkApi.getReport(action, jobId));
+            throbber.fail(spinner, {
+                text: getSpinnerTxt(reportTable, dsReport)
+            });
+            needIteration = false;
+            resolve();
+            break;
+        default:
+            needIteration = false;
+            reject(new error_1.default('unknown state received', { exit: 2 }));
+            break;
+    }
+    if (dsReport.status === 'In-Progress') {
+        throbber.update(spinner, {
+            text: getSpinnerTxt(reportTable) + 'Press CTRL + C to exit listening to the status'
+        });
+        try {
+            cumulativeStatus = (yield bulkApi.getStatus(action, jobId));
+            if (Object.keys(cumulativeStatus).length === 0) {
+                dsReport = (yield bulkApi.getReport(action, jobId));
+                if (dsReport.status === 'Completed') {
+                    cumulativeStatus = (yield bulkApi.getStatus(action, jobId, true));
+                }
+            }
+        }
+        catch (ex) {
+            throbber.stopAll();
+            needIteration = false;
+            reject(ex);
+        }
+    }
+    if (needIteration) {
+        setTimeout(() => spinnerFn(jobId, dsReport, cumulativeStatus, throbber, spinner, bulkApi, displayOpr, action)(resolve, reject), 2000);
+    }
+});
 exports.default = new command_1.default('ds:status <operation> [jobid]')
-    .description('Displays the status of catalyst datastore bulk schedule progress')
+    .description('Display the job status of a Data Store import or export operation')
     .option('--production', 'flag for pointing to production environment.')
     .needs('auth', [constants_1.SCOPE.projects, constants_1.SCOPE.datastore, constants_1.SCOPE.row])
     .needs('config')
@@ -70,7 +213,7 @@ exports.default = new command_1.default('ds:status <operation> [jobid]')
     if (jobId === undefined) {
         throw new error_1.default('Job ID is empty!', { exit: 2 });
     }
-    let dsReport = (yield bulkApi.getReport(action, jobId).catch((err) => {
+    const dsReport = (yield bulkApi.getReport(action, jobId).catch((err) => {
         if (err.status === 404) {
             throw new error_1.default('No jobs found for the given id', {
                 exit: 1,
@@ -88,154 +231,7 @@ exports.default = new command_1.default('ds:status <operation> [jobid]')
     const spinner = 'DS bulk ' + operation;
     const throbber = throbber_1.default.getInstance();
     throbber.add(spinner);
-    const getSpinnerTxt = (mainTable, finalReport) => {
-        var _a, _b, _c, _d;
-        const spaceRpt = ' '.repeat(35);
-        let spinnerTxt = '\n' + spaceRpt;
-        spinnerTxt += mainTable
-            .toString()
-            .split('\n')
-            .join('\n' + spaceRpt);
-        spinnerTxt += '\n';
-        if (finalReport === undefined) {
-            return spinnerTxt;
-        }
-        if (finalReport.status === 'Completed') {
-            spinnerTxt += ansi_colors_1.green(((_a = finalReport.results) === null || _a === void 0 ? void 0 : _a.description) + '');
-            if (((_b = finalReport.results) === null || _b === void 0 ? void 0 : _b.download_url) !== undefined) {
-                spinnerTxt += '\n';
-                spinnerTxt += ansi_colors_1.bold(`Download URL : ${(_c = finalReport.results) === null || _c === void 0 ? void 0 : _c.download_url}`);
-            }
-        }
-        else {
-            spinnerTxt += ansi_colors_1.red(ansi_colors_1.bold('Reason : ') + ((_d = finalReport.results) === null || _d === void 0 ? void 0 : _d.description));
-        }
-        return spinnerTxt;
-    };
-    const spinnerFn = (resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
-        if (jobId === undefined) {
-            reject('Job Id cannot be empty!');
-            return;
-        }
-        let needIteration = true;
-        const reportTable = new cli_table_1.default();
-        Object.keys(cumulativeStatus).forEach((table) => {
-            const initialCount = reportTable.length;
-            let tableRowCount = reportTable.length;
-            ['insert', 'update', 'upsert', 'read'].forEach((statusAct) => {
-                const operationObj = cumulativeStatus[table][statusAct];
-                if (operationObj !== null && operationObj !== undefined) {
-                    let operationRowCount = 0;
-                    if (operationObj.rows_processed !== undefined &&
-                        operationObj.rows_processed >= 0) {
-                        reportTable[tableRowCount++] = [
-                            'Processed',
-                            operationObj.rows_processed + ''
-                        ];
-                        operationRowCount++;
-                    }
-                    if (operationObj.fail_count !== undefined && operationObj.fail_count >= 0) {
-                        reportTable[tableRowCount++] = [
-                            'Failure',
-                            operationObj.fail_count + ''
-                        ];
-                        operationRowCount++;
-                    }
-                    if (operationRowCount > 0) {
-                        reportTable[tableRowCount - operationRowCount].unshift({
-                            hAlign: 'center',
-                            vAlign: 'center',
-                            rowSpan: operationRowCount,
-                            content: statusAct.toUpperCase()
-                        });
-                    }
-                }
-            });
-            if (tableRowCount > 0) {
-                reportTable[initialCount].unshift({
-                    hAlign: 'center',
-                    vAlign: 'center',
-                    rowSpan: tableRowCount,
-                    content: ansi_colors_1.cyan.bold(table)
-                });
-            }
-        });
-        switch (dsReport.status) {
-            case 'In-Progress':
-                if (reportTable.length === 0) {
-                    reportTable.unshift([
-                        { hAlign: 'center', content: ansi_colors_1.yellow.bold('Yet to start') }
-                    ]);
-                }
-                else {
-                    reportTable.unshift([
-                        {
-                            hAlign: 'center',
-                            colSpan: 4,
-                            content: ansi_colors_1.cyan.bold('In-Progress')
-                        }
-                    ]);
-                }
-                break;
-            case 'Completed':
-                reportTable.unshift([
-                    {
-                        hAlign: 'center',
-                        colSpan: 4,
-                        content: ansi_colors_1.green.bold(displayOpr + ' Job Completed')
-                    }
-                ]);
-                dsReport = (yield bulkApi.getReport(action, jobId));
-                throbber.succeed(spinner, {
-                    text: getSpinnerTxt(reportTable, dsReport)
-                });
-                needIteration = false;
-                resolve();
-                break;
-            case 'Failed':
-                reportTable.unshift([
-                    {
-                        hAlign: 'center',
-                        content: ansi_colors_1.red.bold(displayOpr + ' Job Failed!')
-                    }
-                ]);
-                dsReport = (yield bulkApi.getReport(action, jobId));
-                throbber.fail(spinner, {
-                    text: getSpinnerTxt(reportTable, dsReport)
-                });
-                needIteration = false;
-                resolve();
-                break;
-            default:
-                needIteration = false;
-                reject(new error_1.default('unknown state received', { exit: 2 }));
-                break;
-        }
-        if (dsReport.status === 'In-Progress') {
-            throbber.update(spinner, {
-                text: getSpinnerTxt(reportTable) +
-                    'Press CTRL + C to exit listening to the status'
-            });
-            try {
-                cumulativeStatus = (yield bulkApi.getStatus(action, jobId));
-                if (Object.keys(cumulativeStatus).length === 0) {
-                    dsReport = (yield bulkApi.getReport(action, jobId));
-                    if (dsReport.status === 'Completed') {
-                        cumulativeStatus = (yield bulkApi.getStatus(action, jobId, true));
-                    }
-                }
-            }
-            catch (ex) {
-                throbber.stopAll();
-                needIteration = false;
-                reject(ex);
-            }
-        }
-        if (needIteration) {
-            setTimeout(() => spinnerFn(resolve, reject), 2000);
-        }
-    });
-    yield new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () { return spinnerFn(resolve, reject); }));
+    yield new Promise(spinnerFn(jobId, dsReport, cumulativeStatus, throbber, spinner, bulkApi, displayOpr, action));
     if (dsReport.results && dsReport.results.download_url) {
         const ans = yield prompt_1.default.ask(prompt_1.default.question('download', 'Do you like to download the report of this job to your cmd execution directory?', { type: 'confirm', defaultAns: false }));
         if (ans.download) {

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

@@ -42,21 +42,15 @@ const option_1 = require("../../../util_modules/option");
 const project_1 = require("../../../util_modules/project");
 exports.default = new command_1.default('event:generate <source> <action>')
     .alias('generate:event')
-    .description('Generate sample payloads from different event sources of catalyst')
+    .description('Generate sample payloads from different components or custom event sources to test Event functions')
     .option('-rid, --rule-id <rule_identifier>', 'rule_identifier that will be used if the source is custom')
     .option('-e, --event-bus <event_bus_name>', 'event bus name that should be used')
     .allowUnknownOpts()
     .needs('rc')
     .needs('auth')
     .action(function generate(source, action) {
-    var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const args = (_a = this.client) === null || _a === void 0 ? void 0 : _a.cli.parseOptions(process.argv);
-        let unknownArgs = args.unknown;
-        if (unknownArgs === undefined) {
-            logger_1.debug('No unknownArgs supplied');
-            unknownArgs = [];
-        }
+        const unknownArgs = option_1.getUnknownOpts([]);
         if (unknownArgs.length % 2 !== 0) {
             throw new error_1.default('Unknown options are not provided as key value pairs', {
                 exit: 1,
@@ -89,8 +83,8 @@ exports.default = new command_1.default('event:generate <source> <action>')
             if (currentIndex % 2 === 0) {
                 if (!currentValue.startsWith('--') &&
                     currentValue !== '-e' &&
-                    currentValue !== '-rid') {
-                    const knownArgs = args.operands.slice(2).join(' ');
+                    currentValue !== '-rid' &&
+                    currentValue !== '--verbose') {
                     const fault = unknownArgs === null || unknownArgs === void 0 ? void 0 : unknownArgs.map((arg) => {
                         if (arg === currentValue) {
                             return ansi_colors_1.red(arg);
@@ -100,10 +94,7 @@ exports.default = new command_1.default('event:generate <source> <action>')
                     throw new error_1.default('Invalid option format detected', {
                         exit: 1,
                         errorId: 'IDX-3',
-                        arg: [
-                            ansi_colors_1.bold('[catalyst ' + knownArgs + ' ' + fault + ']'),
-                            ansi_colors_1.bold('--<option> <value>')
-                        ]
+                        arg: [ansi_colors_1.italic(fault), ansi_colors_1.bold('--<option> <value>')]
                     });
                 }
                 previousValue[currentValue.slice(2)] = optionArr[currentIndex + 1];

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

@@ -37,7 +37,7 @@ const command_1 = __importDefault(require("../../../internal/command"));
 const constants_1 = require("../../../util_modules/constants");
 const option_1 = require("../../../util_modules/option");
 exports.default = new command_1.default('event:generate:integ <service>')
-    .description('Generate sample payload for testing your integration functions in local')
+    .description('Generate sample payloads for the required integration service to test Integration functions')
     .option('--inputs <inputs>', 'inputs to generate the integ event provided as comma seperated values')
     .needs('rc')
     .needs('auth')

package/lib/commands/functions/add.js

@@ -37,7 +37,7 @@ const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
 const logger_1 = require("../../util_modules/logger");
 exports.default = new command_1.default('functions:add')
-    .description('Add single function of desirable stack to catalyst functions')
+    .description('Add a function of the required stack to the function directory')
     .needs('auth', [constants_1.SCOPE.functions])
     .needs('config')
     .needs('rc')

package/lib/commands/functions/config.js

@@ -20,7 +20,7 @@ const ansi_colors_1 = require("ansi-colors");
 const prompt_1 = __importDefault(require("../../prompt"));
 const common_1 = require("../../fn-utils/lib/common");
 exports.default = new command_1.default('functions:config [function_name_or_id]')
-    .description('Configure the resources for the functions deployed to the Catalyst remote console')
+    .description('Perform advanced configurations such as memory allocation on a function in your project')
     .option('--memory <value>', 'use this option to configure the memory for the function. ex: --memory 128')
     .needs('auth', [constants_1.SCOPE.functions])
     .needs('config')

package/lib/commands/functions/delete.js

@@ -26,7 +26,7 @@ const logger_1 = require("../../util_modules/logger");
 const option_1 = require("../../util_modules/option");
 const project_1 = require("../../util_modules/project");
 exports.default = new command_1.default('functions:delete [function_name_or_id]')
-    .description('Removes the selected functions')
+    .description('Delete a function from the remote console or the local directory')
     .option('--local', 'delete the functions in local machine.')
     .option('--remote', 'delete the functions in remote console.')
     .needs('auth', [constants_1.SCOPE.projects])