zcatalyst-cli 1.18.0-beta.8 → 1.18.1

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

@@ -118,12 +118,7 @@ function downloadSourceCode(fileId, outputDir, srcType, srcName) {
 }
 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('auth', [])
     .needs('config', { optional: true })
     .needs('rc', { skipOrgCheck: false })
     .action(() => __awaiter(void 0, void 0, void 0, function* () {

package/lib/config-store.js

@@ -6,4 +6,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const conf_1 = __importDefault(require("conf"));
 const runtime_store_1 = __importDefault(require("./runtime-store"));
 const name = runtime_store_1.default.get('context.cli.package.name');
-exports.default = new conf_1.default({ configName: name, projectName: name });
+const path = process.env['X_ZC_CREDENTIAL_PATH'];
+exports.default = new conf_1.default({ configName: name, projectName: name, cwd: path });

package/lib/deploy/features/index.js

@@ -39,6 +39,9 @@ exports.default = {
     client: () => __awaiter(void 0, void 0, void 0, function* () {
         return (yield Promise.resolve().then(() => __importStar(require('./client')))).default();
     }),
+    slate: () => __awaiter(void 0, void 0, void 0, function* () {
+        return (yield Promise.resolve().then(() => __importStar(require('./slate')))).default();
+    }),
     apig: () => __awaiter(void 0, void 0, void 0, function* () {
         return (yield Promise.resolve().then(() => __importStar(require('./apig')))).default();
     }),

package/lib/deploy/features/slate.js

@@ -0,0 +1,123 @@
+'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 });
+exports.slateLogger = exports.getEnvironmentType = void 0;
+const slate_utils_1 = require("../../slate-utils");
+const endpoints_1 = require("../../endpoints");
+const runtime_store_1 = __importDefault(require("../../runtime-store"));
+const error_1 = __importDefault(require("../../error"));
+const config_1 = require("../../util_modules/config");
+const throbber_1 = __importDefault(require("../../throbber"));
+const logger_1 = require("../../util_modules/logger");
+const ansi_colors_1 = require("ansi-colors");
+const option_1 = require("../../util_modules/option");
+exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
+    const dId = process.env.ZC_APP_DEPLOYMENT_BUILD_ID;
+    const env = getEnvironmentType();
+    if (!dId) {
+        const targets = yield config_1.slateConfig.getAllTargetDetails(false);
+        if (!targets || targets.length === 0) {
+            throw new error_1.default('No targets found');
+        }
+        const filtered = slate_utils_1.slateUtils.filterTargets(targets);
+        const validTargets = filtered.filter((targ) => {
+            var _a, _b;
+            if ((_a = targ.validity) === null || _a === void 0 ? void 0 : _a.valid) {
+                return targ;
+            }
+            (0, logger_1.labeled)('Slate: ', 'Invalid Slate service ' + (0, ansi_colors_1.bold)(targ.name || 'Unknown')).ERROR();
+            (0, logger_1.error)('Reason: ' + ((_b = targ.validity) === null || _b === void 0 ? void 0 : _b.reason));
+            (0, logger_1.info)();
+            return false;
+        });
+        if (validTargets.length === 0) {
+            throw new error_1.default('No valid Slate services found to deploy', {
+                skipHelp: true
+            });
+        }
+        const slateAppConfigs = yield (yield (0, endpoints_1.slateAPI)({ env })).getAllApps();
+        const throbber = throbber_1.default.getInstance();
+        const deployRes = yield validTargets.reduce((result, _targ) => __awaiter(void 0, void 0, void 0, function* () {
+            var _a;
+            const targ = _targ;
+            const prevRes = yield result;
+            try {
+                const throbberName = `prepare_slate_${targ.name}`;
+                throbber.add(throbberName, {
+                    text: `Preparing Slate[${targ.name}]`
+                });
+                const isAppExists = slateAppConfigs.find((app) => app.name === targ.name);
+                const configDetails = !isAppExists
+                    ? (_a = (yield config_1.slateConfig.getTargetDetails(targ))) === null || _a === void 0 ? void 0 : _a.config
+                    : undefined;
+                const readStream = yield slate_utils_1.slateUtils.pack(targ.source);
+                throbber.remove(throbberName);
+                yield (yield (0, endpoints_1.slateAPI)({ env })).deploy(readStream.stream, readStream.length, targ.name, '', isAppExists === null || isAppExists === void 0 ? void 0 : isAppExists.id, configDetails ? JSON.stringify(configDetails) : '', (0, option_1.getOptionValue)('m') || '');
+            }
+            catch (err) {
+                (0, logger_1.debug)(err);
+                _targ.validity = {
+                    valid: false,
+                    reason: error_1.default.getErrorInstance(err).message
+                };
+            }
+            prevRes.push(_targ);
+            return Promise.resolve(prevRes);
+        }), Promise.resolve([]));
+        const deployedValidTargets = deployRes.filter((targ) => {
+            var _a, _b, _c;
+            if (!((_a = targ.validity) === null || _a === void 0 ? void 0 : _a.valid)) {
+                (0, logger_1.warning)('Deploy of Slate [' +
+                    targ.name +
+                    '] was unsuccessful since ' +
+                    ((_b = targ.validity) === null || _b === void 0 ? void 0 : _b.reason));
+            }
+            return (_c = targ.validity) === null || _c === void 0 ? void 0 : _c.valid;
+        });
+        runtime_store_1.default.set('payload.slate.targets', deployedValidTargets);
+        if (deployedValidTargets.length > 0) {
+            runtime_store_1.default.set('payload.slate.deploy', true);
+        }
+    }
+    else {
+        const source = runtime_store_1.default.get('cwd');
+        yield slate_utils_1.slateUtils.validate(source);
+        const readStream = yield slate_utils_1.slateUtils.pack();
+        try {
+            const deployRes = yield (yield (0, endpoints_1.slateAPI)({ env })).deploy(readStream.stream, readStream.length, process.env.ZC_APP_NAME, dId);
+            deployRes.name = process.env.ZC_APP_NAME;
+            runtime_store_1.default.set('payload.slate.targets', [deployRes]);
+            runtime_store_1.default.set('payload.slate.deploy', true);
+        }
+        catch (err) {
+            throw err;
+        }
+    }
+});
+function getEnvironmentType() {
+    var _a;
+    const isProduction = (0, option_1.getOptionValue)('production', false) ||
+        ((_a = process.env.ZC_ENVIRONMENT) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'production';
+    return isProduction ? 'Production' : 'Development';
+}
+exports.getEnvironmentType = getEnvironmentType;
+function slateLogger() {
+    const deployTargets = runtime_store_1.default.get('payload.slate.targets', []);
+    deployTargets.forEach((slate) => {
+        (0, logger_1.labeled)(`Slate(${slate.name})`, 'deploy successful').SUCCESS();
+        (0, logger_1.info)();
+    });
+    return deployTargets;
+}
+exports.slateLogger = slateLogger;

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.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;
+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.slateAPI = 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* () {
@@ -104,6 +104,13 @@ function clientAPI({ auth = true, projectId = (0, project_1.getProjectId)(), env
     });
 }
 exports.clientAPI = clientAPI;
+function slateAPI({ auth = true, projectId = (0, project_1.getProjectId)(), env = (0, project_1.getEnvName)() } = {}) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const slate = (yield Promise.resolve().then(() => __importStar(require('./lib/slate')))).default;
+        return new slate(projectId, { authNeeded: auth, env });
+    });
+}
+exports.slateAPI = slateAPI;
 function apigAPI({ auth = true, projectId = (0, project_1.getProjectId)(), env = (0, project_1.getEnvName)() } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         const apig = (yield Promise.resolve().then(() => __importStar(require('./lib/apig')))).default;

package/lib/endpoints/lib/env.js

@@ -37,7 +37,8 @@ class Env {
                                 (0, ansi_colors_1.bold)(constants_1.DEFAULT.env_name),
                                 (0, ansi_colors_1.bold)(projectId),
                                 ansi_colors_1.bold.red('blocked'),
-                                ansi_colors_1.italic.underline('support@zohocatalyst.com')
+                                ansi_colors_1.italic.underline('support@zohocatalyst.com'),
+                                ansi_colors_1.italic.red(JSON.stringify(devEnv.blocked_reason) || 'Unknown')
                             ]
                         });
                     }

package/lib/endpoints/lib/sdk.js

@@ -29,10 +29,10 @@ class SDK {
                 if (service === constants_1.INTEG.services.cliq) {
                     return `/downloads/sdk/java/${constants_1.INTEG.service_map[service]}/${constants_1.INTEG.java_dependencies[service]}_latest.zip`;
                 }
-                return '/downloads/sdk/java/catalyst_java_sdk_beta.zip';
+                return '/downloads/sdk/java/catalyst_java_sdk_latest.zip';
             }
             default: {
-                return '/downloads/sdk/java/catalyst_java_sdk_beta.zip';
+                return '/downloads/sdk/java/catalyst_java_sdk_latest.zip';
             }
         }
     }

package/lib/endpoints/lib/slate.js

@@ -0,0 +1,107 @@
+'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 logger_1 = require("../../util_modules/logger");
+const ansi_colors_1 = require("ansi-colors");
+const config_store_1 = __importDefault(require("../../config-store"));
+class Slate {
+    constructor(projectId, opts) {
+        this.opts = opts;
+        this.projectId = projectId;
+    }
+    getFrameworks() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const response = yield new api_1.default(this.opts).get('/slate/v1/frameworks', {
+                    log: {
+                        awaitingSpinner: 'Fetching frameworks from the server ...'
+                    }
+                });
+                if (response.body && response.body.data) {
+                    return response.body.data;
+                }
+            }
+            catch (err) {
+                if (err.status === 404) {
+                    throw new error_1.default('API Error: Slate not accessible', {
+                        exit: 1,
+                        errorId: 'SLDC-1',
+                        arg: [(0, ansi_colors_1.bold)(config_store_1.default.get('active_dc') + ''), (0, ansi_colors_1.bold)('support@zohocatalyst.com')]
+                    });
+                }
+                else {
+                    throw err;
+                }
+            }
+            throw new error_1.default('Error while fetching the frameworks', { exit: 2 });
+        });
+    }
+    getAllApps() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield new api_1.default(this.opts).get(`/slate/v1/project/${this.projectId}/app`, {
+                log: {
+                    awaitingSpinner: 'Fetching slate apps'
+                }
+            });
+            if (response.body && response.body.data) {
+                return response.body.data;
+            }
+            throw new error_1.default('Error while fetching the frameworks', { exit: 2 });
+        });
+    }
+    downloadTemplate() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.opts.origin = 'https://codeload.github.com';
+            this.opts.authNeeded = false;
+            const response = yield new api_1.default(Object.assign(Object.assign({}, this.opts), { isExternal: true })).get(`/catalystbyzoho/slate/zip/main`, {
+                log: {
+                    awaitingSpinner: 'Download template from github ...'
+                },
+                encoding: null
+            });
+            if (response.body) {
+                return response.body;
+            }
+            throw new error_1.default('Error while downloading the template', { exit: 2 });
+        });
+    }
+    deploy(sourceStream, contentLength, appName, deployId, appId, config, msg) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const formData = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ file: sourceStream }, (appId && { app_id: appId })), (deployId && { build_id: deployId })), (appId || deployId ? {} : { name: appName })), (config && { configuration: config })), (msg && { message: msg }));
+            const res = yield new api_1.default(this.opts).post(`/slate/v1/project/${this.projectId}/app/upload`, {
+                formData,
+                json: false,
+                log: {
+                    uploadProgress: {
+                        title: `Slate[${appName}]`,
+                        total: contentLength,
+                        progressType: 'upload'
+                    },
+                    stream: sourceStream,
+                    awaitingSpinner: 'deploying slate'
+                }
+            });
+            if (res.body && res.body.data) {
+                return res.body.data;
+            }
+            (0, logger_1.debug)('deploy slate response from server : ' + res.body);
+            throw new error_1.default('Server Error: Unexpected Response from server.', {
+                exit: 2
+            });
+        });
+    }
+}
+exports.default = Slate;

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

@@ -506,7 +506,7 @@ function getSDK(fnType, dest, stack, options = {}) {
         }
         yield new archiver_1.default()
             .load(sdkZip)
-            .extract(dest, new RegExp(`catalyst-${stack}`), { ignoreInitial: true })
+            .extract(dest, new RegExp(`catalyst-${stack}`), { ignoreLevel: 1 })
             .finalize();
     });
 }

package/lib/iac/status/deploy.js

@@ -19,7 +19,6 @@ const error_1 = __importDefault(require("../../error"));
 const throbber_1 = __importDefault(require("../../throbber"));
 const logger_1 = require("../../util_modules/logger");
 const util_1 = require("./util");
-const env_1 = require("../../util_modules/env");
 const ansi_colors_1 = require("ansi-colors");
 const code_deck_1 = require("../../code-deck");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -76,10 +75,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     timerAPI.on('error', (e) => {
         (0, logger_1.debug)('Error encountered : ', e);
     });
-    timerAPI.on('end', (_error, data) => {
-        if (data === true && !(0, env_1.isPrimaryShell)() && process.send) {
-            process.send('success');
-        }
+    timerAPI.on('end', () => {
         throbber.stopAll();
     });
     process.env.PARENT_COMMAND === 'codedeck' &&

package/lib/index.js

@@ -23,6 +23,6 @@ program.helpOption('-h, --help', 'Display help for a Catalyst command');
 program.showSuggestionAfterError();
 program.showHelpAfterError(`For more usage information use the ${(0, ansi_colors_1.bold)('catalyst help')} command`);
 program.addHelpText('before', fs_1.SYNC.readFile(constants_1.TEMPLATE.banner, 'utf-8') || '');
-program.addHelpText('afterAll', `\nFor detailed documentations please visit ${(0, ansi_colors_1.underline)('https://www.zoho.com/catalyst/help/cli-command-reference.html')}`);
+program.addHelpText('afterAll', `\nFor detailed documentations please visit ${(0, ansi_colors_1.underline)('https://docs.catalyst.zoho.com/en/cli/v1/cli-command-reference/')}`);
 const cli = new client_1.Client(program);
 exports.default = cli;

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

@@ -97,7 +97,7 @@ function getAppSailZip() {
         zip.load(code);
         zip.extract(repoDir, '/', {
             isFolder: true,
-            ignoreInitial: true
+            ignoreLevel: 1
         });
         yield zip.finalize();
         (0, logger_1.success)(`Successfully downloaded the code to ${ansi_colors_1.bold.green(gitRepo.repo.source)}`);
@@ -196,8 +196,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         stack: appSailStack.runtime,
         env_variables: {},
         memory: _appSailConfig.memory || 256,
-        scripts: _appSailConfig.scripts || {},
-        raw: {}
+        scripts: _appSailConfig.scripts || {}
     };
     if (appSailStack.lang === 'java') {
         const platform = yield prompt_1.default.ask(prompt_1.default.question('value', 'Please choose a platform for your AppSail: ', {

package/lib/init/features/index.js

@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.appsail = exports.project = exports.client = exports.functions = exports.setCatalystConfig = void 0;
+exports.appsail = exports.project = exports.slate = exports.client = exports.functions = exports.setCatalystConfig = void 0;
 const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
 const error_1 = __importDefault(require("../../error"));
@@ -118,6 +118,11 @@ function setCatalystConfig(featureName, add) {
                     config.unset('client.plugin');
                 }
                 break;
+            case 'slate': {
+                const targetArr = config.get('slate', []);
+                config.set('slate', js_1.JS.uniq(targetArr.concat([context])));
+                break;
+            }
             case 'apig':
                 config.set('apig.rules', targetSource);
                 config.set('apig.enabled', true);
@@ -140,6 +145,13 @@ function client() {
     });
 }
 exports.client = client;
+function slate(add = false) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield (yield Promise.resolve().then(() => __importStar(require('./slate/index.js')))).default(add);
+        setCatalystConfig('slate', false);
+    });
+}
+exports.slate = slate;
 function project() {
     return __awaiter(this, void 0, void 0, function* () {
         yield (yield Promise.resolve().then(() => __importStar(require('./project.js')))).default();

package/lib/init/features/project.js

@@ -103,7 +103,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     }
     const [zipArchive, template, importRes] = yield (0, import_1.iacImport)();
     yield zipArchive
-        .extract(runtime_store_1.default.get('cwd'), '/', { recursive: true, ignoreInitial: false })
+        .extract(runtime_store_1.default.get('cwd'), '/', { recursive: true, ignoreLevel: 0 })
         .finalize();
     const parsedJSON = js_1.JS.parseJSON(template);
     const templateJson = parsedJSON ? parsedJSON : (0, yaml_1.parse)(template);