zcatalyst-cli 1.18.0-beta.5 → 1.18.0-beta.7

package/docs/commands/zest/generate/index.toml

@@ -0,0 +1,4 @@
+[ZEST-GEN-1]
+context = '''Oops! It's looks like you haven't created any specification.'''
+aid = '''Please visit the below link to add a zest specifications.'''
+link = 'https://docs-ea.catalyst.localzoho.com/en/zest/help/introduction/'

package/lib/authentication/login.js

@@ -33,11 +33,15 @@ const logger_1 = require("../util_modules/logger");
 const option_1 = require("../util_modules/option");
 const crypto_1 = require("crypto");
 exports.missingScopes = {
-    [constants_1.DC_TYPE.in.value]: ['dataverse'],
-    [constants_1.DC_TYPE.eu.value]: ['quick_ml', 'dataverse'],
-    [constants_1.DC_TYPE.au.value]: ['dataverse'],
-    [constants_1.DC_TYPE.ca.value]: ['quick_ml', 'dataverse']
+    [constants_1.DC_TYPE.in.value]: getScopes(['zest', 'dataverse']),
+    [constants_1.DC_TYPE.eu.value]: getScopes(['zest', 'quick_ml', 'dataverse']),
+    [constants_1.DC_TYPE.au.value]: getScopes(['zest', 'dataverse']),
+    [constants_1.DC_TYPE.ca.value]: getScopes(['zest', 'quick_ml', 'dataverse']),
+    [constants_1.DC_TYPE.sa.value]: getScopes(['zest', 'quick_ml', 'dataverse'])
 };
+function getScopes(keys) {
+    return Object.keys(constants_1.SCOPE).filter((scope) => keys.some((prefix) => scope.startsWith(prefix)));
+}
 class Login {
     constructor(localhost = true, user = true) {
         this.localhost = localhost;

package/lib/code-deck.js

@@ -20,6 +20,7 @@ const prompt_1 = __importDefault(require("./prompt"));
 const tree_1 = require("./prompt/types/tree");
 const runtime_store_1 = __importDefault(require("./runtime-store"));
 const logger_1 = require("./util_modules/logger");
+const project_1 = require("./util_modules/project");
 const shell_1 = require("./util_modules/shell");
 function listenDeploy(id, gitUrl) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -31,7 +32,7 @@ function listenDeploy(id, gitUrl) {
                     arr.push(allGlobalOpts[key]);
                 }
                 return arr;
-            }, ['--id', id]);
+            }, ['--id', id, '--org', (0, project_1.getEnvId)() || '']);
             const childRes = yield (0, shell_1.spawn)('catalyst', ['iac:status', 'import', ...optsArr], {
                 shell: true,
                 stdio: ['inherit', 'inherit', 'inherit', 'ipc'],

package/lib/commands/appsail/add.js

@@ -50,7 +50,7 @@ exports.default = new command_1.default('appsail:add')
     const config = runtime_store_1.default.get('config');
     yield (yield Promise.resolve().then(() => __importStar(require('../../init/features')))).appsail();
     yield config.save();
-    (0, logger_1.message)((0, ansi_colors_1.bold)(constants_1.FILENAME.config) + ' file has been successfully updated with functions details.');
+    (0, logger_1.message)((0, ansi_colors_1.bold)(constants_1.FILENAME.config) + ' file has been successfully updated with appsail details.');
     (0, logger_1.info)();
     (0, logger_1.success)('AppSail service successfully linked');
 }));

package/lib/commands/iac/export.js

@@ -73,7 +73,11 @@ exports.default = new command_1.default('iac:export')
                 arr.push(allGlobalOpts[key]);
             }
             return arr;
-        }, (env === 'Production' ? ['--production'] : []));
+        }, [
+            '--org',
+            (0, project_1.getEnvId)(),
+            ...(env === 'Production' ? ['--production'] : [])
+        ]);
         (0, shell_1.spawn)('catalyst', ['iac:status', 'export', ...optsArr], {
             shell: true,
             stdio: 'inherit'

package/lib/commands/iac/import.js

@@ -58,6 +58,7 @@ const logger_1 = require("../../util_modules/logger");
 const option_1 = require("../../util_modules/option");
 const shell_1 = require("../../util_modules/shell");
 const server_js_1 = require("../../util_modules/server.js");
+const project_1 = require("../../util_modules/project");
 const getZipAndTemplate = (filePath, stagedDeploy) => __awaiter(void 0, void 0, void 0, function* () {
     const zipFile = filePath
         ? yield ASYNC.readFile((0, utils_js_1.untildify)(filePath), 'buffer')
@@ -84,6 +85,8 @@ const ensureUserAction = (deployRes) => __awaiter(void 0, void 0, void 0, functi
         const callbackPort = yield port_resolver_1.default.getFreePort(3000, 10, false);
         const accessUrl = new url_1.URL(`/baas/v1/project/import/${deployRes.id}/deploy`, `${constants_1.ORIGIN.admin}`);
         accessUrl.searchParams.set('redirect_url', `http://localhost:${callbackPort}/success`);
+        const orgId = (0, project_1.getEnvId)();
+        orgId && accessUrl.searchParams.set('catalyst_org', orgId);
         const server = (0, http_1.createServer)((req, resp) => __awaiter(void 0, void 0, void 0, function* () {
             try {
                 if (req.url !== '/success') {
@@ -136,7 +139,7 @@ const ensureUserAction = (deployRes) => __awaiter(void 0, void 0, void 0, functi
                 arr.push(allGlobalOpts[key]);
             }
             return arr;
-        }, ['--id', deployRes.id]);
+        }, ['--id', deployRes.id, '--org', (0, project_1.getEnvId)() || '']);
         yield (0, shell_1.spawn)('catalyst', ['iac:status', 'import', ...optsArr], {
             shell: true,
             stdio: 'inherit'

package/lib/commands/index.js

@@ -80,6 +80,7 @@ exports.default = (client) => {
         loadCommand('codelib:install'),
         loadCommand('event:generate'),
         loadCommand('event:generate:integ'),
+        loadCommand('zest:generate'),
         loadCommand('event:generate:job'),
         loadCommand('serve'),
         loadCommand('deploy'),

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

@@ -0,0 +1,304 @@
+'use strict';
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+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.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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 command_1 = __importDefault(require("../../../internal/command"));
+const constants_1 = require("../../../util_modules/constants");
+const prompt_1 = __importDefault(require("../../../prompt"));
+const js_1 = require("../../../util_modules/js");
+const endpoints_1 = require("../../../endpoints");
+const runtime_store_1 = __importDefault(require("../../../runtime-store"));
+const archiver_1 = __importDefault(require("../../../archiver"));
+const logger_1 = require("../../../util_modules/logger");
+const inquirer_1 = __importStar(require("inquirer"));
+const error_1 = __importDefault(require("../../../error"));
+const project_1 = require("../../../util_modules/project");
+const features_1 = require("../../../init/features");
+const path_1 = require("path");
+const throbber_1 = __importDefault(require("../../../throbber"));
+const config_1 = require("../../../util_modules/config");
+const common_1 = require("../../../init/util/common");
+const ansi_colors_1 = require("ansi-colors");
+const fs_1 = require("../../../util_modules/fs");
+const console_1 = require("console");
+function getSpecification(specs = []) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const res = (yield (yield (0, endpoints_1.zestAPI)()).getSpecifications());
+        if (!res) {
+            return specs;
+        }
+        specs.push(...res.specifications);
+        if (res.info.more_records) {
+            yield getSpecification(specs);
+        }
+        return specs;
+    });
+}
+function searchSpecification(filter, specArray = []) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (filter) {
+            const response = [];
+            specArray.forEach((spec) => {
+                if (spec.name.includes(filter)) {
+                    response.push(spec);
+                }
+            });
+            return response;
+        }
+        return specArray;
+    });
+}
+function pollScheduledJob(job_id) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const throbber = throbber_1.default.getInstance();
+        try {
+            const res = (yield (yield (0, endpoints_1.zestAPI)()).getScheduledJob(job_id));
+            const status = js_1.JS.capitalize(res.scheduled_jobs[0].status);
+            if (status === 'Completed') {
+                throbber.succeed('processing', { text: `Status >> ${status}` });
+                return res;
+            }
+            throbber.add('processing', { text: `Status >> ${status}` });
+            if (status === 'Failed') {
+                throbber.fail('processing', { text: `Status >> ${status}` });
+                throw new error_1.default('zest generation failed', {
+                    exit: 2,
+                    original: `${res.scheduled_jobs[0].action_info.failure_reason}`
+                });
+            }
+            yield js_1.JS.sleep(1000);
+        }
+        catch (err) {
+            throw new error_1.default('Error while processing scheduled job', {
+                exit: 2,
+                original: err
+            });
+        }
+        return yield pollScheduledJob(job_id);
+    });
+}
+function downloadSourceCode(fileId, outputDir, srcType, srcName) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const zestZip = (yield (yield (0, endpoints_1.zestAPI)()).getFile(fileId, srcType, srcName));
+        yield new archiver_1.default().load(zestZip).extract(outputDir).finalize();
+    });
+}
+exports.default = new command_1.default('zest:generate')
+    .description('Generate the functions or appsail source code for your ZEST Specifications')
+    .needs('auth', [
+    constants_1.SCOPE.zest_spec_all,
+    constants_1.SCOPE.zest_schedule_job_read,
+    constants_1.SCOPE.zest_spec_all,
+    constants_1.SCOPE.zest_spec_src_action
+])
+    .needs('config', { optional: true })
+    .needs('rc', { skipOrgCheck: false })
+    .action(() => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const specArray = yield getSpecification();
+    if (specArray.length === 0) {
+        throw new error_1.default('No Specifications Found', {
+            exit: 1,
+            errorId: 'ZEST-GEN-1'
+        });
+    }
+    yield prompt_1.default.register('search-box');
+    const specName = yield inquirer_1.default.prompt([
+        {
+            type: 'search-box',
+            name: 'specs',
+            searchable: true,
+            pageSize: 10,
+            highlight: true,
+            notFoundMsg: 'No specifications found!',
+            searchMsg: 'Search specifications...',
+            message: 'Please search and select the specifications(Use space key to select)',
+            source(_answersSoFar, input) {
+                input || (input = '');
+                return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
+                    const fuzzyResult = yield searchSpecification(input, specArray);
+                    const data = fuzzyResult.map((element) => {
+                        return {
+                            name: `${element.name}(${element.version})`,
+                            value: element.id
+                        };
+                    });
+                    resolve(data);
+                }));
+            },
+            validate: (ansArr) => {
+                if (js_1.JS.isEmpty(ansArr)) {
+                    return 'Must select one specification.';
+                }
+                return true;
+            }
+        }
+    ]);
+    const srcTypeAns = yield prompt_1.default.ask(prompt_1.default.question('source', 'Please specify which source type you want to download', {
+        type: 'list',
+        choices: [
+            prompt_1.default.choice('Function', {
+                value: 'functions'
+            }),
+            prompt_1.default.choice('AppSail', {
+                value: 'appsail'
+            })
+        ]
+    }));
+    const srcType = srcTypeAns.source;
+    const sourceLabel = srcType.replace('functions', 'function');
+    const runtimeChoices = yield (0, common_1.getRuntimeChoices)({ fnType: 'aio' });
+    const ignoreRuntimes = ['node14', 'node12', 'node20'];
+    const stackChoices = runtimeChoices.filter((choice) => {
+        if (!(choice instanceof inquirer_1.Separator)) {
+            return !ignoreRuntimes.includes(choice.value.runtime);
+        }
+        return choice;
+    });
+    const srcStackAns = yield prompt_1.default.ask(prompt_1.default.question('stack', `Please select the language for your ${sourceLabel}`, {
+        type: 'list',
+        choices: stackChoices.map((choice) => {
+            if (!(choice instanceof inquirer_1.Separator)) {
+                return choice;
+            }
+            return choice;
+        }),
+        when: () => {
+            return runtimeChoices.length > 1;
+        }
+    }));
+    const srcStack = srcStackAns.stack.runtime;
+    const existingSails = config_1.appSailConfig.raw() || [];
+    const existingFuncs = ((_a = config_1.functionsConfig.raw()) === null || _a === void 0 ? void 0 : _a.targets) || [];
+    const source = yield prompt_1.default.ask(prompt_1.default.question('name', `Please provide a name for your ${(0, ansi_colors_1.bold)(sourceLabel)} `, {
+        type: 'input',
+        default: 'sample',
+        validate: (input) => __awaiter(void 0, void 0, void 0, function* () {
+            if (input === '') {
+                return 'Please provide a valid name.';
+            }
+            if (input === '' || !input.match(constants_1.REGEX.functions.package.name)) {
+                return `Special characters are not allowed. Includes only alphabets, numbers, hyphen and underscores.`;
+            }
+            if (srcType === 'functions' &&
+                existingFuncs.findIndex((func) => func === input) !== -1) {
+                return 'function name already exists';
+            }
+            if (srcType === 'appsail' &&
+                existingSails.findIndex((appSail) => appSail.name === input) !== -1) {
+                return 'appsail name already exists';
+            }
+            return true;
+        })
+    }));
+    const srcName = source.name;
+    let sourceCodeRes;
+    const resources = [];
+    specName.specs.forEach((element) => {
+        resources.push({ id: element });
+    });
+    const config = runtime_store_1.default.get('config');
+    let payload, outputDir;
+    if (srcType === 'appsail') {
+        const generateAppsailParams = {
+            resources: resources,
+            stack: srcStack,
+            name: srcName
+        };
+        outputDir = (0, project_1.resolveProjectPath)(`appsail-${srcName}`);
+        payload = {
+            source: outputDir,
+            name: srcName
+        };
+        if (srcStackAns.stack.lang.startsWith('java')) {
+            const basePackage = yield prompt_1.default.ask(prompt_1.default.question('basePkg', 'Please specify the base package name', {
+                type: 'input',
+                default: 'com.zoho'
+            }));
+            const install = yield prompt_1.default.ask(prompt_1.default.question('consent', 'Do you wish to install dependencies ? ', {
+                type: 'confirm',
+                default: true
+            }));
+            Object.assign(generateAppsailParams, {
+                with_dependency: install.consent,
+                config: {
+                    base_package: basePackage.basePkg
+                }
+            });
+        }
+        sourceCodeRes = yield (yield (0, endpoints_1.zestAPI)()).generateAppsail(generateAppsailParams);
+    }
+    else {
+        const functionsDirPath = (0, project_1.resolveProjectPath)(config.get('functions.source') || constants_1.FOLDERNAME.functions);
+        outputDir = (0, path_1.join)(functionsDirPath, srcName);
+        payload = {
+            source: outputDir,
+            name: srcName,
+            stack: srcStack,
+            type: 'aio'
+        };
+        sourceCodeRes = yield (yield (0, endpoints_1.zestAPI)()).generateFunction(resources, srcStack, srcName);
+    }
+    const folderExists = yield fs_1.ASYNC.dirExists(outputDir);
+    const overwriteAns = folderExists
+        ? yield prompt_1.default.ask(prompt_1.default.question('overwrite', 'Directory ' + (0, ansi_colors_1.underline)(outputDir) + ' already exists. Overwrite ?', {
+            type: 'confirm',
+            defaultAns: false
+        }))
+        : { overwrite: true };
+    if (!overwriteAns.overwrite) {
+        (0, logger_1.labeled)('zest', `${sourceLabel} generation skipped.`).WARN();
+        return;
+    }
+    yield fs_1.ASYNC.deleteDir(outputDir);
+    runtime_store_1.default.set(`payload.${srcType}.targets`, [payload]);
+    const job_id = sourceCodeRes.job_id;
+    const throbber = throbber_1.default.getInstance();
+    (0, console_1.info)('\n' + (0, ansi_colors_1.white)('==> ') + `Generating ${js_1.JS.capitalize(sourceLabel)}`);
+    const fileId = yield pollScheduledJob(job_id).then((data) => {
+        throbber.remove('processing');
+        return data.scheduled_jobs[0].action_info.file_id;
+    });
+    (0, console_1.info)('\n' + (0, ansi_colors_1.white)('==> ') + `Downloading ${js_1.JS.capitalize(sourceLabel)}`);
+    yield downloadSourceCode(fileId, outputDir, sourceLabel, srcName);
+    (0, features_1.setCatalystConfig)(srcType, true);
+    yield config.save();
+    (0, console_1.info)();
+    (0, logger_1.message)((0, ansi_colors_1.bold)(constants_1.FILENAME.config) +
+        ` file has been successfully updated with ${sourceLabel} details.`);
+    (0, console_1.info)();
+    (0, logger_1.success)(`Zest successfully generated in ${(0, ansi_colors_1.bold)((0, path_1.join)(outputDir))}.`);
+}));

package/lib/endpoints/index.js

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.credentialsAPI = exports.tunnelAPI = exports.commonAPI = exports.jobScheduling = exports.codeDeck = exports.gitHubAPI = exports.stratusAPI = exports.appSailAPI = exports.logAPI = exports.eventBusAPI = exports.functionsAPI = exports.applogicAPI = exports.bulkDSAPI = exports.apigAPI = exports.clientAPI = exports.datastoreAPI = exports.zcqlAPI = exports.queueAPI = exports.filestoreAPI = exports.cacheAPI = exports.sdkAPI = exports.envAPI = exports.projectAPI = exports.orgAPI = void 0;
+exports.tunnelAPI = exports.commonAPI = exports.jobScheduling = exports.codeDeck = exports.gitHubAPI = exports.stratusAPI = exports.zestAPI = exports.appSailAPI = exports.logAPI = exports.eventBusAPI = exports.functionsAPI = exports.applogicAPI = exports.bulkDSAPI = exports.apigAPI = exports.clientAPI = exports.datastoreAPI = exports.zcqlAPI = exports.queueAPI = exports.filestoreAPI = exports.cacheAPI = exports.sdkAPI = exports.envAPI = exports.projectAPI = exports.orgAPI = void 0;
 const project_1 = require("../util_modules/project");
 function orgAPI({ auth = true } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -156,6 +156,13 @@ function appSailAPI({ auth = true, projectId = (0, project_1.getProjectId)(), en
     });
 }
 exports.appSailAPI = appSailAPI;
+function zestAPI({ auth = true, projectId = (0, project_1.getProjectId)(), env = (0, project_1.getEnvName)() } = {}) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const zest = (yield Promise.resolve().then(() => __importStar(require('./lib/zest.js')))).default;
+        return new zest(projectId, { authNeeded: auth, env, isExternal: true });
+    });
+}
+exports.zestAPI = zestAPI;
 function stratusAPI({ auth = true, projectId = (0, project_1.getProjectId)(), env = (0, project_1.getEnvName)() } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         const stratus = (yield Promise.resolve().then(() => __importStar(require('./lib/stratus')))).default;
@@ -198,10 +205,3 @@ function tunnelAPI({ auth = true, projectId = (0, project_1.getProjectId)() } =
     });
 }
 exports.tunnelAPI = tunnelAPI;
-function credentialsAPI({ auth = false, projectId = (0, project_1.getProjectId)() } = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const credentials = (yield Promise.resolve().then(() => __importStar(require('./lib/credentials')))).default;
-        return new credentials(projectId, { authNeeded: auth });
-    });
-}
-exports.credentialsAPI = credentialsAPI;

package/lib/endpoints/lib/zest.js

@@ -0,0 +1,124 @@
+'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 error_1 = __importDefault(require("../../error"));
+const api_1 = __importDefault(require("../../internal/api"));
+const js_1 = require("../../util_modules/js");
+const logger_1 = require("../../util_modules/logger");
+const project_1 = require("../../util_modules/project");
+class Zest {
+    constructor(projectId, opts) {
+        this.opts = Object.assign(Object.assign({}, opts), { headers: {
+                'CATALYST-ORG': (0, project_1.getEnvId)()
+            } });
+        this.projectId = projectId;
+    }
+    getSpecifications(query) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const res = yield new api_1.default(this.opts).get(`/zest/v1/project/${this.projectId}/specifications`, {
+                    qs: query,
+                    log: {
+                        awaitingSpinner: 'Getting Zest Specifications'
+                    }
+                });
+                if (res.body || res.status === 204) {
+                    return res.body;
+                }
+                (0, logger_1.debug)('get specifications response from server : ' + res.body);
+                throw new error_1.default('Server Error: Unexpected Response from server.', {
+                    exit: 2
+                });
+            }
+            catch (err) {
+                if (err.status === 429) {
+                    const responseData = err.context;
+                    const retryAfter = responseData.response.headers['Retry-After'];
+                    setTimeout(() => __awaiter(this, void 0, void 0, function* () { return yield this.getSpecifications(query); }), (retryAfter ? parseInt(retryAfter, 10) : 1) * 1000);
+                }
+                throw err;
+            }
+        });
+    }
+    generateFunction(resources, specEnv, name) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(this.opts).post(`/zest/v1/project/${this.projectId}/specifications/actions/generate_function`, {
+                body: {
+                    name,
+                    stack: specEnv,
+                    resources: resources
+                },
+                log: {
+                    awaitingSpinner: `Scheduling Function Generation ${name}`
+                }
+            });
+            if (res.body && res.body.details && res.body.code === 'SCHEDULED') {
+                return res.body.details;
+            }
+            (0, logger_1.debug)('generate function response from server : ' + res.body);
+            throw new error_1.default('Server Error: Unexpected Response from server.', {
+                exit: 2
+            });
+        });
+    }
+    generateAppsail(requestJson) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(this.opts).post(`/zest/v1/project/${this.projectId}/specifications/actions/generate_appsail`, {
+                body: requestJson,
+                log: {
+                    awaitingSpinner: `Scheduling Appsail Generation${requestJson.name}`
+                }
+            });
+            if (res.body && res.body.details && res.body.code === 'SCHEDULED') {
+                return res.body.details;
+            }
+            (0, logger_1.debug)('generate appsail response from server : ' + res.body);
+            throw new error_1.default('Server Error: Unexpected Response from server.', {
+                exit: 2
+            });
+        });
+    }
+    getScheduledJob(job_id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(this.opts).get(`/zest/v1/scheduled_jobs/${job_id}`);
+            if (res.body) {
+                return res.body;
+            }
+            (0, logger_1.debug)('get scheduled job response from server : ' + res.body);
+            throw new error_1.default('Server Error: Unexpected Response from server.', {
+                exit: 2
+            });
+        });
+    }
+    getFile(file_id, source, name) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield new api_1.default(Object.assign(Object.assign({}, this.opts), { json: false })).get(`/zest/v1/files/${file_id}`, {
+                encoding: null,
+                log: {
+                    progress: {
+                        title: `${js_1.JS.capitalize(source)} (${name})`
+                    }
+                }
+            });
+            if (res.body) {
+                return res.body;
+            }
+            (0, logger_1.debug)('get file response from server : ' + res);
+            throw new error_1.default('Server Error: Unexpected Response from server.', {
+                exit: 2
+            });
+        });
+    }
+}
+exports.default = Zest;

package/lib/express_middlewares/authenticator.js

@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const project_1 = __importDefault(require("../endpoints/lib/project"));
 const credential_1 = __importDefault(require("../internal/credential"));
-const endpoints_1 = require("../endpoints");
 exports.default = (req, _RES, next) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const projectId = req.headers['x-zc-projectid'];
@@ -35,16 +34,7 @@ exports.default = (req, _RES, next) => __awaiter(void 0, void 0, void 0, functio
     }, [false, false, false]);
     if (hasCSRF && hasADT && hasBDT) {
         req.headers['x-zc-user-type'] = 'project-user';
-        try {
-            const jwtResponse = yield (yield (0, endpoints_1.credentialsAPI)()).generateJWTToken(cookie);
-            const tokenRes = yield (yield (0, endpoints_1.credentialsAPI)()).convertJwtToAuthToken(jwtResponse);
-            req.headers['x-zc-user-cred-type'] = 'token';
-            req.headers['x-zc-user-cred-token'] = tokenRes
-                .access_token;
-        }
-        catch (err) {
-            req.headers['x-zc-cookie'] = cookie;
-        }
+        req.headers['x-zc-cookie'] = cookie;
     }
     else if (typeof authorization !== 'undefined') {
         const currentUser = yield new project_1.default({

package/lib/fn-utils/lib/common.js

@@ -341,7 +341,12 @@ function pack(target) {
 }
 exports.pack = pack;
 function generateUrlForTarget(target) {
-    const urlDefault = 'https://' + (0, project_1.getDomainPrefix)() + '.' + constants_1.ORIGIN.app.replace('https://', '');
+    const domainPrefix = (0, project_1.getDomainPrefix)(false);
+    if (!domainPrefix) {
+        (0, logger_1.warning)('Failed to retrieve the domain name, so the function URL generation was skipped.');
+        return;
+    }
+    const urlDefault = 'https://' + domainPrefix + '.' + constants_1.ORIGIN.app.replace('https://', '');
     switch (target.type) {
         case constants_1.FN_TYPE.basic:
         case constants_1.FN_TYPE.browserLogic:

package/lib/init/features/project.js

@@ -61,6 +61,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         when: orgChoice.length > 1
     }));
     const selectedOrg = orgAns.org || orgList[0];
+    runtime_store_1.default.set('project.env.id', selectedOrg.id);
     (0, logger_1.message)('Setting up a new default project for this folder\n');
     const projectAPI = yield (0, endpoints_1.projectAPI)({ auth: true, org: selectedOrg.id });
     const allProjects = (yield projectAPI.getAllProjects());

package/lib/internal/api.js

@@ -47,11 +47,11 @@ 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)(), printError = true } = {}) {
+    constructor({ authNeeded = true, resolveOnError = false, maxRetry = 3, env = constants_1.DEFAULT.env_name, log = {}, headers = {}, isExternal = false, origin = constants_1.ORIGIN.admin, json = true, showWarning = true, envId = (0, project_1.getEnvId)(), printError = true } = {}) {
         this.requestOpts = {
             url: origin,
             method: 'GET',
-            json: true,
+            json,
             headers
         };
         const projectSecretKey = process.env.CATALYST_PROJECT_SECRET_KEY;

package/lib/prompt/index.js

@@ -63,11 +63,14 @@ exports.default = {
                 const filePathExt = yield Promise.resolve().then(() => __importStar(require('./types/file-path')));
                 inquirer_1.default.registerPrompt('file-path', filePathExt.default);
                 break;
-            case 'tree': {
+            case 'tree':
                 const treeExt = yield Promise.resolve().then(() => __importStar(require('./types/tree')));
                 inquirer_1.default.registerPrompt('tree', treeExt.default);
                 break;
-            }
+            case 'search-box':
+                const searchExt = yield Promise.resolve().then(() => __importStar(require('./types/search-box')));
+                inquirer_1.default.registerPrompt('search-box', searchExt.default);
+                break;
             default:
                 throw new error_1.default('No such type registered', { exit: 2 });
         }

package/lib/prompt/types/search-box.js

@@ -0,0 +1,281 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const chalk_1 = __importDefault(require("chalk"));
+const cli_cursor_1 = __importDefault(require("cli-cursor"));
+const figures_1 = __importDefault(require("figures"));
+const choices_1 = __importDefault(require("inquirer/lib/objects/choices"));
+const base_1 = __importDefault(require("inquirer/lib/prompts/base"));
+const events_1 = __importDefault(require("inquirer/lib/utils/events"));
+const paginator_1 = __importDefault(require("inquirer/lib/utils/paginator"));
+const operators_1 = require("rxjs/operators");
+class SearchBox extends base_1.default {
+    constructor(questions, rl, answers) {
+        super(questions, rl, answers);
+        this.pointer = 0;
+        if (this.opt.highlight == null) {
+            this.opt.highlight = false;
+        }
+        if (typeof this.opt.searchable == null) {
+            this.opt.searchable = false;
+        }
+        if (typeof this.opt.default == null) {
+            this.opt.default = undefined;
+        }
+        if (this.opt.source == null) {
+            this.throwParamError('source');
+        }
+        if (this.opt.notFoundMsg === undefined) {
+            this.opt.notFoundMsg = 'No results...';
+        }
+        if (this.opt.searchMsg === undefined) {
+            this.opt.searchMsg = 'Searching...';
+        }
+        this.pointer = 0;
+        this.firstSourceLoading = true;
+        this.choices = new choices_1.default([], answers);
+        this.checkedChoices = [];
+        this.value = [];
+        this.lastQuery = undefined;
+        this.searching = false;
+        this.lastSourcePromise = undefined;
+        this.default = this.opt.default;
+        this.opt.default = undefined;
+        this.selection = [];
+        this.done = undefined;
+        this.paginator = new paginator_1.default(this.screen);
+    }
+    _run(callback) {
+        this.done = callback;
+        this.executeSource().then(() => {
+            const events = (0, events_1.default)(this.rl);
+            const validation = this.handleSubmitEvents(events.line.pipe((0, operators_1.map)(this.getCurrentValue.bind(this))));
+            validation.success.forEach(this.onEnd.bind(this));
+            validation.error.forEach(this.onError.bind(this));
+            events.normalizedUpKey
+                .pipe((0, operators_1.takeUntil)(validation.success))
+                .forEach(this.onUpKey.bind(this));
+            events.normalizedDownKey
+                .pipe((0, operators_1.takeUntil)(validation.success))
+                .forEach(this.onDownKey.bind(this));
+            events.spaceKey.pipe((0, operators_1.takeUntil)(validation.success)).forEach(this.onSpaceKey.bind(this));
+            if (this.opt.searchable === false) {
+                events.numberKey
+                    .pipe((0, operators_1.takeUntil)(validation.success))
+                    .forEach(this.onNumberKey.bind(this));
+                events.aKey.pipe((0, operators_1.takeUntil)(validation.success)).forEach(this.onAllKey.bind(this));
+                events.iKey
+                    .pipe((0, operators_1.takeUntil)(validation.success))
+                    .forEach(this.onInverseKey.bind(this));
+            }
+            else {
+                events.keypress
+                    .pipe((0, operators_1.takeUntil)(validation.success))
+                    .forEach(this.onKeypress.bind(this));
+            }
+            if (this.rl.line) {
+                this.onKeypress();
+            }
+            cli_cursor_1.default.hide();
+            this.render();
+        });
+        return this;
+    }
+    getValue(choice) {
+        if (choice.type === 'separator') {
+            return undefined;
+        }
+        return choice.value;
+    }
+    executeSource() {
+        let sourcePromise;
+        this.rl.line = this.rl.line.trim();
+        if (this.rl.line === this.lastQuery) {
+            return Promise.resolve(undefined);
+        }
+        if (this.opt.searchable) {
+            sourcePromise = this.opt.source(this.answers, this.rl.line);
+        }
+        else {
+            sourcePromise = this.opt.source(this.answers, undefined);
+        }
+        this.lastQuery = this.rl.line;
+        this.lastSourcePromise = sourcePromise;
+        this.searching = true;
+        sourcePromise.then((choices) => {
+            if (this.lastSourcePromise !== sourcePromise) {
+                return;
+            }
+            this.searching = false;
+            this.choices = new choices_1.default(choices, this.answers);
+            this.choices.forEach((choice) => {
+                var _a;
+                if (this.value.some((eachValue) => this.getValue(choice) === eachValue)) {
+                    this.toggleChoice(choice, true);
+                }
+                else {
+                    this.toggleChoice(choice, false);
+                }
+                if (this.default !== null) {
+                    if ((_a = this.default) === null || _a === void 0 ? void 0 : _a.some((defaultValue) => this.getValue(choice) === defaultValue)) {
+                        this.toggleChoice(choice, true);
+                    }
+                }
+            });
+            this.pointer = 0;
+            this.render();
+            this.default = undefined;
+            this.firstSourceLoading = false;
+        });
+        return sourcePromise;
+    }
+    render(error) {
+        let message = this.getQuestion();
+        let bottomContent = '';
+        if (this.status === 'answered') {
+            message += chalk_1.default.cyan(this.selection.join(', '));
+            return this.screen.render(message, bottomContent);
+        }
+        if (this.firstSourceLoading) {
+            if (this.opt.searchable) {
+                message += `(Press ${chalk_1.default.cyan.bold('<space>')} to select, or type anything to filter the list)`;
+            }
+            else {
+                message += `(Press ${chalk_1.default.cyan.bold('<space>')} to select, ${chalk_1.default.cyan.bold('<a>')} to toggle all, ${chalk_1.default.cyan.bold('<i>')} to invert selection)`;
+            }
+        }
+        if (this.opt.searchable) {
+            message += this.rl.line;
+        }
+        if (this.searching) {
+            message += `\n  ${chalk_1.default.cyan(this.opt.searchMsg)}`;
+        }
+        else if (!this.choices.length) {
+            message += `\n  ${chalk_1.default.yellow(this.opt.notFoundMsg)}`;
+        }
+        else {
+            const choicesStr = this.renderChoices(this.choices, this.pointer);
+            const choice = this.choices.getChoice(this.pointer);
+            const indexPosition = this.choices.indexOf(choice);
+            message += `\n${this.paginator.paginate(choicesStr, indexPosition, this.opt.pageSize)}`;
+        }
+        if (error) {
+            bottomContent = chalk_1.default.red('>> ') + error;
+        }
+        return this.screen.render(message, bottomContent);
+    }
+    onEnd(state) {
+        var _a;
+        this.status = 'answered';
+        this.render();
+        this.screen.done();
+        cli_cursor_1.default.show();
+        (_a = this.done) === null || _a === void 0 ? void 0 : _a.call(this, 'value' in state ? state.value : undefined);
+    }
+    onError(state) {
+        if (state.isValid) {
+            this.render();
+        }
+    }
+    getCurrentValue() {
+        this.selection = this.checkedChoices.map((checkedChoice) => checkedChoice.short);
+        const values = this.checkedChoices.map((checkedChoice) => checkedChoice.value);
+        return values;
+    }
+    onUpKey() {
+        const len = this.choices.realLength;
+        this.pointer = this.pointer > 0 ? this.pointer - 1 : len - 1;
+        this.render();
+    }
+    onDownKey() {
+        const len = this.choices.realLength;
+        this.pointer = this.pointer < len - 1 ? this.pointer + 1 : 0;
+        this.render();
+    }
+    onNumberKey(input) {
+        if (input <= this.choices.realLength) {
+            this.pointer = input - 1;
+            this.toggleChoice(this.choices.getChoice(this.pointer));
+        }
+        this.render();
+    }
+    onSpaceKey() {
+        if (this.choices.getChoice(this.pointer) == null) {
+            return;
+        }
+        this.toggleChoice(this.choices.getChoice(this.pointer));
+        this.render();
+    }
+    onAllKey() {
+        const shouldBeChecked = Boolean(this.choices.find((choice) => {
+            return choice.type !== 'separator' && !choice.checked;
+        }));
+        this.choices.forEach((choice) => {
+            if (choice.type !== 'separator') {
+                choice.checked = shouldBeChecked;
+            }
+            return choice;
+        });
+        this.render();
+    }
+    onInverseKey() {
+        this.choices.forEach((choice) => {
+            if (choice.type !== 'separator') {
+                choice.checked = !choice.checked;
+            }
+        });
+        this.render();
+    }
+    onKeypress() {
+        this.executeSource();
+        this.render();
+    }
+    toggleChoice(choice, nextChecked) {
+        var _a;
+        if (choice.type === 'separator') {
+            return;
+        }
+        const checked = nextChecked == null ? !((_a = choice.checked) !== null && _a !== void 0 ? _a : false) : nextChecked;
+        this.value = this.value.filter((eachValue) => eachValue !== choice.value);
+        this.checkedChoices = this.checkedChoices.filter((checkedChoice) => checkedChoice.value !== choice.value);
+        choice.checked = false;
+        if (checked === true) {
+            this.value.push(choice.value);
+            this.checkedChoices.push(choice);
+            choice.checked = true;
+        }
+    }
+    static getCheckboxFigure(checked = false) {
+        return checked ? chalk_1.default.green(figures_1.default.radioOn) : figures_1.default.radioOff;
+    }
+    renderChoices(choices, pointer) {
+        const output = [];
+        let separatorOffset = 0;
+        choices.forEach((choice, index) => {
+            if (choice.type === 'separator') {
+                separatorOffset += 1;
+                output.push(` ${choice}\n`);
+                return;
+            }
+            if (choice.disabled) {
+                separatorOffset += 1;
+                output.push(` - ${choice.name} (${typeof choice.disabled === 'string' ? choice.disabled : 'Disabled'})\n`);
+                return;
+            }
+            if (index - separatorOffset === pointer) {
+                output.push(chalk_1.default.cyan(figures_1.default.pointer));
+                output.push(SearchBox.getCheckboxFigure(choice.checked));
+                output.push(' ');
+                output.push(this.opt.highlight ? chalk_1.default.gray(choice.name) : choice.name);
+            }
+            else {
+                output.push(` ${SearchBox.getCheckboxFigure(choice.checked)} ${choice.name}`);
+            }
+            output.push('\n');
+        });
+        return output.join('').replace(/\n$/, '');
+    }
+}
+exports.default = SearchBox;

package/lib/util_modules/constants/lib/dc-type.js

@@ -40,5 +40,13 @@ exports.default = Object.freeze({
         w_auth: 'us',
         m_auth: 'us',
         ext: '.ca'
+    },
+    sa: {
+        loc: 'SaudiArabia',
+        ref: 'sa',
+        value: 'sa',
+        w_auth: 'us',
+        m_auth: 'us',
+        ext: '.sa'
     }
 });

package/lib/util_modules/constants/lib/scopes.js

@@ -75,5 +75,10 @@ exports.default = Object.freeze({
     bucket_read: 'ZohoCatalyst.buckets.READ',
     object_create: 'ZohoCatalyst.buckets.objects.CREATE',
     pipline_read: 'ZohoCatalyst.pipeline.READ',
-    pipeline_exec_create: 'ZohoCatalyst.pipeline.execution.CREATE'
+    pipeline_exec_create: 'ZohoCatalyst.pipeline.execution.CREATE',
+    zest_file_read: 'ZohoZEST.files.READ',
+    zest_spec_read: 'ZohoZEST.specifications.READ',
+    zest_spec_all: 'ZohoZEST.specifications.ALL',
+    zest_spec_src_action: 'ZohoZEST.specifications.sources.CREATE',
+    zest_schedule_job_read: 'ZohoZEST.scheduled_jobs.READ'
 });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.18.0-beta.5",
+	"version": "1.18.0-beta.7",
 	"description": "Command Line Tool for CATALYST",
 	"main": "./lib/index.js",
 	"bin": {
@@ -25,7 +25,7 @@
 	"homepage": "https://catalyst.zoho.com",
 	"license": "MIT",
 	"dependencies": {
-		"ansi-colors": "^4.1.1",
+		"ansi-colors": "^4.1.3",
 		"app-module-path": "^2.2.0",
 		"better-queue": "^3.8.10",
 		"chokidar": "^3.5.3",

package/lib/endpoints/lib/credentials.js

@@ -1,59 +0,0 @@
-"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 api_1 = __importDefault(require("../../internal/api"));
-const logger_1 = require("../../util_modules/logger");
-const error_1 = __importDefault(require("../../error"));
-const project_1 = require("../../util_modules/project");
-const constants_1 = require("../../util_modules/constants");
-const js_1 = require("../../util_modules/js");
-class Credentials {
-    constructor(projectId, opts) {
-        this.opts = opts;
-        this.projectId = projectId;
-        this.projectDomain = `https://${(0, project_1.getDomainPrefix)()}.${constants_1.ORIGIN.app.replace('https://', '')}`;
-    }
-    generateJWTToken(cookie) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const res = yield new api_1.default(Object.assign(Object.assign({}, this.opts), { headers: { Cookie: cookie }, origin: this.projectDomain })).get(`/baas/v1/project/${this.projectId}/authentication/custom-token`);
-            if (res.body && res.body.data) {
-                return res.body.data;
-            }
-            (0, logger_1.debug)('Download response from server : ' + res.body);
-            throw new error_1.default('Server Error: Unexpected Response from server.', {
-                exit: 2
-            });
-        });
-    }
-    convertJwtToAuthToken(reqOpts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const res = yield new api_1.default(Object.assign(Object.assign({}, this.opts), { origin: constants_1.ORIGIN.iamPortal, headers: { Origin: this.projectDomain } })).post(`/clientoauth/v2/${(0, project_1.getDomainKey)()}/remote/auth`, {
-                qs: {
-                    response_type: 'remote_token',
-                    jwt_token: reqOpts.jwt_token,
-                    client_id: reqOpts.client_id,
-                    scope: js_1.JS.values(reqOpts.scopes).join(' ')
-                }
-            });
-            if (res.body) {
-                return res.body;
-            }
-            (0, logger_1.debug)('Download response from server : ' + res.body);
-            throw new error_1.default('Server Error: Unexpected Response from server.', {
-                exit: 2
-            });
-        });
-    }
-}
-exports.default = Credentials;