zcatalyst-cli 1.9.1 → 1.10.0

package/lib/commands/deploy.js

@@ -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

@@ -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

@@ -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,6 +24,149 @@ 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('Display the job status of a Data Store import or export operation')
     .option('--production', 'flag for pointing to production environment.')
@@ -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/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 memory allocation of a function in your project')
+    .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/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('functions:setup')
-    .description('Set up the function directory in your project directory')
+    .description('Set up and configure the function directory in your project directory')
     .needs('auth', [constants_1.SCOPE.functions])
     .needs('config')
     .needs('rc')

package/lib/commands/help.js

@@ -5,33 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
 const command_1 = __importDefault(require("../internal/command"));
-const fs_1 = require("../util_modules/fs");
-const constants_1 = require("../util_modules/constants");
 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('help [command]')
-    .description('Display the command reference or help for a specific command')
+    .description('Display help information')
     .action(function help(commandName) {
     var _a, _b, _c;
-    if (option_1.getOptionValue('info', false)) {
-        const helpPth = project_1.resolveProjectPath(constants_1.FILENAME.command_log);
-        const rawHelp = fs_1.SYNC.readFile(helpPth);
-        if (rawHelp === undefined) {
-            logger_1.info('No recent logs');
-            return;
-        }
-        const logHelp = JSON.parse(rawHelp);
-        const helpMsg = ansi_colors_1.bold('\nCOMMAND   : ') +
-            logHelp.command +
-            ansi_colors_1.bold('\nEXECUTION : ') +
-            logHelp.status +
-            '\n' +
-            (logHelp.help !== undefined ? '\n' + logHelp.help.join('\n') : '');
-        logger_1.info(helpMsg);
-        logger_1.info(`If you couldn't find the needed help here, feel free to reach us through ${ansi_colors_1.bold.underline('support@zohocatalyst.com')}`);
-        return;
-    }
     if (commandName === undefined) {
         (_a = this.client) === null || _a === void 0 ? void 0 : _a.cli.outputHelp();
         logger_1.info();

package/lib/commands/iac/export.js

@@ -0,0 +1,85 @@
+'use strict';
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const endpoints_1 = require("../../endpoints");
+const iac_1 = __importDefault(require("../../endpoints/lib/iac"));
+const error_1 = __importDefault(require("../../error"));
+const command_1 = __importDefault(require("../../internal/command"));
+const prompt_1 = __importDefault(require("../../prompt"));
+const runtime_store_1 = __importDefault(require("../../runtime-store"));
+const constants_1 = require("../../util_modules/constants");
+const env_1 = require("../../util_modules/env");
+const logger_1 = require("../../util_modules/logger");
+const option_1 = require("../../util_modules/option");
+const project_1 = require("../../util_modules/project");
+const shell_1 = require("../../util_modules/shell");
+const getExportProjectId = () => __awaiter(void 0, void 0, void 0, function* () {
+    const projectId = project_1.getProjectId(null);
+    if (projectId !== null) {
+        return projectId;
+    }
+    const allProjects = (yield (yield endpoints_1.projectAPI()).getAllProjects());
+    if (allProjects.length === 0) {
+        throw new error_1.default('No projects found', {
+            exit: 0,
+            errorId: 'PROJ-USE-1'
+        });
+    }
+    if (allProjects.length === 1) {
+        logger_1.message('only one project found in remote, using that');
+        return allProjects[0].id;
+    }
+    const projectAns = yield prompt_1.default.ask(prompt_1.default.question('project', 'Which project do you wish to export ? ', {
+        type: 'list',
+        choices: allProjects.map((project) => {
+            return prompt_1.default.choice(project.project_name, {
+                value: project.id,
+                short: project.project_name
+            });
+        })
+    }));
+    return projectAns.project;
+});
+exports.default = new command_1.default('iac:export')
+    .description('Create a zip file out of existing project in console')
+    .option('--production', 'flag for pointing to production environment')
+    .needs('auth', [constants_1.SCOPE.project_export_read, constants_1.SCOPE.project_export_create])
+    .needs('config', { optional: true })
+    .needs('rc', { optional: true })
+    .action(() => __awaiter(void 0, void 0, void 0, function* () {
+    const env = option_1.getOptionValue('production', false) ? 'Production' : 'Development';
+    const projectId = yield getExportProjectId();
+    const bundleResp = yield new iac_1.default(projectId, { env }).bundle(constants_1.IAC.template_format.json);
+    logger_1.info();
+    logger_1.success(`Successfully scheduled export job for project "${project_1.getProjectName(projectId)}" with jobid "${bundleResp.id}"`);
+    if (env_1.isPrimaryShell()) {
+        const exitListeners = process.listeners('exit');
+        process.removeAllListeners('exit');
+        const allGlobalOpts = runtime_store_1.default.get('opts.globalOpts', {});
+        const optsArr = Object.keys(allGlobalOpts).reduce((arr, key) => {
+            arr.push('--' + key);
+            if (allGlobalOpts[key]) {
+                arr.push(allGlobalOpts[key]);
+            }
+            return arr;
+        }, (env === 'Production' ? ['--production'] : []));
+        shell_1.spawn('catalyst', ['iac:status', 'export', ...optsArr], {
+            shell: true,
+            stdio: 'inherit'
+        }).SYNC();
+        (exitListeners || []).forEach((listner) => {
+            process.addListener('exit', listner);
+        });
+    }
+}));