zcatalyst-cli 1.9.1 → 1.10.0

package/lib/pull/features/functions/index.js

@@ -26,6 +26,7 @@ const js_1 = require("../../../util_modules/js");
 const logger_1 = require("../../../util_modules/logger");
 const project_1 = require("../../../util_modules/project");
 const runtime_1 = __importDefault(require("../../../util_modules/constants/lib/runtime"));
+const error_1 = __importDefault(require("../../../error"));
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const fnAPI = yield endpoints_1.functionsAPI();
     const fnDirName = config_1.functionsConfig.source();
@@ -108,10 +109,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b;
         yield fs_1.ASYNC.ensureDir(fn.source);
         const buffer = (yield fnAPI.download(fn.id));
-        yield new archiver_1.default()
-            .load(buffer)
-            .extract('/', path_1.join(fnDirPath, fn.name), { isFolder: true })
-            .finalize();
+        yield new archiver_1.default().load(buffer).extract(path_1.join(fnDirPath, fn.name)).finalize();
         if ((_a = fn.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.nodejs)) {
             yield languages_1.node(fn);
         }
@@ -122,9 +120,9 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     })));
     targets = targets.filter((target) => {
         if (!target.valid) {
-            logger_1.debug('Invalid target : ' + target + ' reason : ' + target.failure_reason);
-            process.exitCode = 2;
-            logger_1.warning('skipping pull of functions since the package is invalid. \nContact catalyst support with debug log');
+            logger_1.debug('Invalid target : ' + target.name + ' reason : ' + target.failure_reason);
+            logger_1.warning(`skipping pull of function(${target.name}) since the package is invalid. \nContact catalyst support with debug log.`);
+            new error_1.default('invalid package: ' + target.name, { exit: 2 });
         }
         return target.valid;
     });

package/lib/pull/index.js

@@ -39,7 +39,10 @@ function pull() {
         }
         const MODULE = features_1.default[feature];
         logger_1.info(ansi_colors_1.bold('\n' + ansi_colors_1.white('===> ') + js_1.JS.capitalize(feature) + ' Setup'));
-        yield MODULE();
+        yield MODULE().catch((err) => {
+            logger_1.info();
+            logger_1.warning(`Skipping pull of ${feature}. Since ${err.message}.\nContact Catalyst Support with catalyst-debug.log file.`);
+        });
         if (runtime_store_1.default.get('payload.' + feature, false)) {
             runtime_store_1.default.set('payload.features', runtime_store_1.default.get('payload.features', []).concat(feature));
         }

package/lib/serve/features/index.js

@@ -32,6 +32,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.apig = exports.functions = exports.client = void 0;
+const error_1 = __importDefault(require("../../error"));
 const port_resolver_1 = __importDefault(require("../../port-resolver"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
@@ -42,7 +43,8 @@ function client() {
         try {
             yield clientModule.default();
         }
-        catch (err) {
+        catch (e) {
+            const err = error_1.default.getErrorInstance(e);
             logger_1.info();
             logger_1.warning('Skipping the serve of Client because of the error: ' + err.message);
             logger_1.info();

package/lib/shell/dependencies/http-functions.js

@@ -235,7 +235,7 @@ class HttpFunctions {
             };
             shell_1.clearLine(process.stdout);
             const masterPort = runtime_store_1.default.get(`context.port.http.master`, -1);
-            const fnTargets = runtime_store_1.default.get('context.functions.targets');
+            const fnTargets = runtime_store_1.default.get('context.functions.targets', []);
             fnTargets
                 .filter((t) => t.url !== undefined && t.type === constants_1.FN_TYPE.basic)
                 .map((t) => {

package/lib/shell/index.js

@@ -46,7 +46,9 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const httpServer = new http_functions_1.default(replServer);
     try {
         yield prepare_1.default([constants_1.FN_TYPE.basic, constants_1.FN_TYPE.cron, constants_1.FN_TYPE.event, constants_1.FN_TYPE.integration]);
-        const targets = runtime_store_1.default.get('context.functions.targets', []).filter((target) => {
+        const targets = runtime_store_1.default
+            .get('context.functions.targets', [])
+            .filter((target) => {
             if (!target.valid) {
                 logger_1.warning('target [' +
                     target.name +

package/lib/track.js

@@ -16,6 +16,7 @@ const path_1 = require("path");
 const readline_1 = require("readline");
 const config_store_1 = __importDefault(require("./config-store"));
 const endpoints_1 = require("./endpoints");
+const error_1 = __importDefault(require("./error"));
 const runtime_store_1 = __importDefault(require("./runtime-store"));
 const fs_1 = require("./util_modules/fs");
 const logger_1 = require("./util_modules/logger");
@@ -52,7 +53,8 @@ exports.default = (event, message, duration) => __awaiter(void 0, void 0, void 0
             yield httpLogger.log(logInput);
         }
     }
-    catch (err) {
+    catch (e) {
+        const err = error_1.default.getErrorInstance(e);
         logger_1.debug('Unable to send debug log to server: ' + err.message);
     }
 });

package/lib/util_modules/constants/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ORIGIN = exports.TEMPLATE = exports.SCOPE = exports.REMOTE_REF = exports.REGEX = exports.REFERENCE = exports.PLACEHOLDER = exports.INTEG = exports.FOLDERNAME = exports.FN_TYPE = exports.DC_TYPE = exports.FILENAME = exports.EVENT_SOURCE = exports.EVENT_REF = exports.DEFAULT = exports.CLIQ = exports.AUTH = exports.APIG_RULES = void 0;
+exports.IAC = exports.ORIGIN = exports.TEMPLATE = exports.SCOPE = exports.REMOTE_REF = exports.REGEX = exports.REFERENCE = exports.PLACEHOLDER = exports.INTEG = exports.FOLDERNAME = exports.FN_TYPE = exports.DC_TYPE = exports.FILENAME = exports.EVENT_SOURCE = exports.EVENT_REF = exports.DEFAULT = exports.CLIQ = exports.AUTH = exports.APIG_RULES = void 0;
 var apig_rules_1 = require("./lib/apig-rules");
 Object.defineProperty(exports, "APIG_RULES", { enumerable: true, get: function () { return __importDefault(apig_rules_1).default; } });
 var auth_1 = require("./lib/auth");
@@ -40,3 +40,5 @@ var template_1 = require("./lib/template");
 Object.defineProperty(exports, "TEMPLATE", { enumerable: true, get: function () { return __importDefault(template_1).default; } });
 var urls_1 = require("./lib/urls");
 Object.defineProperty(exports, "ORIGIN", { enumerable: true, get: function () { return __importDefault(urls_1).default; } });
+var iac_1 = require("./lib/iac");
+Object.defineProperty(exports, "IAC", { enumerable: true, get: function () { return __importDefault(iac_1).default; } });

package/lib/util_modules/constants/lib/file-names.js

@@ -20,5 +20,6 @@ exports.default = Object.freeze({
         system_rules: 'catalyst-system-rules.json'
     },
     catalyst_config: 'catalyst-config.json',
-    command_log: '.command.log'
+    command_log: '.command.log',
+    node_modules: 'node_modules'
 });

package/lib/util_modules/constants/lib/iac.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = Object.freeze({
+    template_format: {
+        json: 'JSON',
+        yml: 'YAML'
+    }
+});

package/lib/util_modules/constants/lib/regex.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const functionName = /(?!^\d+$)^(\w|-)+$/g;
 exports.default = Object.freeze({
     project: {
-        name: /^[a-zA-Z0-9][a-zA-Z0-9-]*$/g
+        name: /^[a-zA-Z0-9][a-zA-Z0-9-]*$/g,
+        template: /project-template-\d{1,2}\.\d{1,2}\.\d{1,2}.(yml|json)/g
     },
     client: {
         package_name: /^[a-zA-Z0-9][a-zA-Z0-9-]*$/g

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

@@ -15,6 +15,11 @@ exports.default = Object.freeze({
     queue_data_read: 'ZohoCatalyst.queue.data.READ',
     queue_data_create: 'ZohoCatalyst.queue.data.CREATE',
     projects: 'ZohoCatalyst.projects.ALL',
+    project_export_read: 'ZohoCatalyst.project.export.READ',
+    project_export_create: 'ZohoCatalyst.project.export.CREATE',
+    project_import_read: 'ZohoCatalyst.project.import.READ',
+    project_import_create: 'ZohoCatalyst.project.import.CREATE',
+    project_import_delete: 'ZohoCatalyst.project.import.DELETE',
     cron: 'ZohoCatalyst.cron.ALL',
     zcql: 'ZohoCatalyst.zcql.CREATE',
     webapp: 'ZohoCatalyst.webapp.ALL',

package/lib/util_modules/constants/project.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const PROJECT = Object.freeze({
+    accepted_types: ['Live', 'Demo']
+});
+exports.default = PROJECT;

package/lib/util_modules/contextHelp.js

@@ -10,10 +10,11 @@ const fs_1 = require("./fs");
 const logger_1 = require("./logger");
 const toml_1 = __importDefault(require("./parser/toml"));
 function help() {
+    let exitCode = 0;
     const logs = runtime_store_1.default.get('log');
     if (logs === undefined) {
         logger_1.debug('NO ERRORS REGISTERED');
-        return;
+        return exitCode;
     }
     const logKeys = Object.keys(logs);
     const fillTemplate = (...arg) => {
@@ -28,6 +29,7 @@ function help() {
         const errQueue = logs[key];
         if (key === 'faultyError') {
             errQueue.forEach((err) => {
+                exitCode = err.exit > exitCode ? err.exit : exitCode;
                 outputError(err, errQueue);
                 return;
             });
@@ -36,6 +38,7 @@ function help() {
         const doc = fs_1.SYNC.readFile(docPath) || '';
         const catHelp = toml_1.default(doc);
         errQueue.forEach((err) => {
+            exitCode = err.exit > exitCode ? err.exit : exitCode;
             if (err.errorId === undefined || catHelp === undefined || catHelp === {}) {
                 outputError(err, errQueue);
                 return;
@@ -59,6 +62,7 @@ function help() {
             errQueue.shift();
         });
     });
+    return exitCode;
 }
 exports.default = help;
 function outputError(err, errQueue) {

package/lib/util_modules/env.js

@@ -12,13 +12,10 @@ function isWindows() {
 }
 exports.isWindows = isWindows;
 function isPrimaryShell() {
-    if (!process) {
+    if (!process || process.env.CATALYST_SUB_PROCESS) {
         return false;
     }
-    if (process.env.CATALYST_SUB_PROCESS) {
-        return !process.env.CATALYST_SUB_PROCESS;
-    }
-    if (process.env.SHLVL) {
+    if (!isWindows() && process.env.SHLVL) {
         return parseInt(process.env.SHLVL) <= 1;
     }
     return false;

package/lib/util_modules/fs/index.js

@@ -18,9 +18,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ASYNC = exports.SYNC = void 0;
+exports.ASYNC = exports.SYNC = exports.untildify = void 0;
+const os_1 = __importDefault(require("os"));
 const ASYNC = __importStar(require("./lib/async"));
 exports.ASYNC = ASYNC;
 const SYNC = __importStar(require("./lib/sync"));
 exports.SYNC = SYNC;
+const tildRegex = /^~(?=$|\/|\\)/;
+const homeDirectory = os_1.default.homedir();
+const untildify = (pth) => homeDirectory ? pth.replace(tildRegex, homeDirectory) : pth;
+exports.untildify = untildify;

package/lib/util_modules/fs/lib/async.js

@@ -17,26 +17,31 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const minimatch_1 = __importDefault(require("minimatch"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
+const __1 = require("..");
 function dirExists(pth) {
     return __awaiter(this, void 0, void 0, function* () {
-        const stats = yield fs_extra_1.default.stat(pth).catch(() => false);
+        const stats = yield fs_extra_1.default.stat(__1.untildify(pth)).catch(() => false);
         return stats && stats.isDirectory();
     });
 }
 exports.dirExists = dirExists;
 function fileExists(pth) {
     return __awaiter(this, void 0, void 0, function* () {
-        const stats = yield fs_extra_1.default.stat(pth).catch(() => false);
+        const stats = yield fs_extra_1.default.stat(__1.untildify(pth)).catch(() => false);
         return stats && stats.isFile();
     });
 }
 exports.fileExists = fileExists;
-function readFile(pth, encoding = 'utf8') {
+function readFile(pth, type) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (yield fileExists(pth)) {
-            return fs_extra_1.default.readFile(pth, encoding);
+        if (!(yield fileExists(pth))) {
+            return undefined;
         }
-        return undefined;
+        return (type === 'buffer'
+            ? fs_extra_1.default.readFile(pth)
+            : type
+                ? fs_extra_1.default.readFile(pth, type)
+                : fs_extra_1.default.readFile(pth, 'utf8'));
     });
 }
 exports.readFile = readFile;
@@ -70,27 +75,29 @@ function dirList(dir) {
     });
 }
 exports.dirList = dirList;
-function walk(dir, exclude = []) {
+function walk(dir, { exclude = [], excludeDir = true, depth = -1 } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
+        if (depth === 0) {
+            return [];
+        }
         const isDir = yield fs_extra_1.default.stat(dir).then((stat) => stat.isDirectory());
         const files = isDir ? yield fs_extra_1.default.readdir(dir) : [path_1.default.basename(dir)];
-        const folderContentPromise = files
-            .map((entry) => {
-            return isDir ? path_1.default.join(dir, entry) : dir;
-        })
-            .filter((entryPath) => {
-            let match = false;
-            for (const glob of exclude) {
-                match = minimatch_1.default(entryPath, glob);
-                if (match) {
-                    return false;
+        const folderContentPromise = files.map((entry) => __awaiter(this, void 0, void 0, function* () {
+            const entryPath = isDir ? path_1.default.join(dir, entry) : dir;
+            const stats = yield fs_extra_1.default.stat(entryPath);
+            const isEntryPthDir = stats.isDirectory();
+            let excludeMatch = false;
+            if (!(isEntryPthDir && !excludeDir)) {
+                for (const glob of exclude) {
+                    excludeMatch = excludeMatch || minimatch_1.default(entryPath, glob);
                 }
             }
-            return true;
-        })
-            .map((entryPath) => __awaiter(this, void 0, void 0, function* () {
-            const stats = yield fs_extra_1.default.stat(entryPath);
-            return stats.isDirectory() ? walk(entryPath, exclude) : [entryPath];
+            if (excludeMatch) {
+                return [];
+            }
+            return isEntryPthDir
+                ? walk(entryPath, { exclude, excludeDir, depth: --depth })
+                : [entryPath];
         }));
         const folderContents = yield Promise.all(folderContentPromise);
         return folderContents.reduce((all, folderContent) => all.concat(folderContent), []);

package/lib/util_modules/js.js

@@ -42,5 +42,11 @@ exports.JS = lodash_1.default.mixin({
             exports.JS.removeNullAndUndefined(val)) ||
             ((val === null || val === undefined) && delete copy[key]));
         return copy;
+    },
+    parseJSON: (str) => {
+        try {
+            return JSON.parse(str);
+        }
+        catch (e) { }
     }
 });

package/lib/util_modules/parser/toml.js

@@ -10,6 +10,10 @@ exports.default = (str) => {
         return toml_1.parse(str);
     }
     catch (e) {
-        throw new error_1.default('TOML Parsing error on line ' + e.line + ', column ' + e.column + ': ' + e.message, { exit: 2 });
+        const err = error_1.default.getErrorInstance(e, {
+            message: 'TOML Parsing error'
+        });
+        err.exit = 2;
+        throw err;
     }
 };

package/lib/util_modules/project.js

@@ -199,6 +199,9 @@ function transformProject(projectObj) {
                     name: value.project_domain_name
                 };
                 break;
+            case 'project_type':
+                key = 'type';
+                break;
             default:
                 break;
         }

package/lib/util_modules/shell.js

@@ -47,16 +47,14 @@ function spawn(command, opts, _a = {}) {
         ASYNC: () => {
             const childProcess = cross_spawn_1.default(command, opts, Object.assign({ cwd,
                 stdio,
-                shell }, otherOpts));
+                shell }, otherOpts)).on('error', logger_1.debug);
             return new Promise((res, rej) => {
                 let message = '';
-                childProcess.on('error', (err) => {
-                    rej(err);
-                });
                 childProcess.on('message', (msg) => {
                     message += msg.toString();
                     logger_1.debug(msg.toString());
                 });
+                childProcess.on('error', rej);
                 childProcess.on('exit', (code) => {
                     if (code !== 0) {
                         rej(code);
@@ -66,8 +64,7 @@ function spawn(command, opts, _a = {}) {
             });
         },
         RAW: () => {
-            const child = cross_spawn_1.default(command, opts, Object.assign({ cwd, stdio, shell }, otherOpts));
-            child.on('error', (err) => logger_1.debug(err));
+            const child = cross_spawn_1.default(command, opts, Object.assign({ cwd, stdio, shell }, otherOpts)).on('error', logger_1.debug);
             return child;
         }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.9.1",
+	"version": "1.10.0",
 	"description": "Command Line Tool for CATALYST",
 	"main": "./lib/index.js",
 	"bin": {
@@ -30,17 +30,18 @@
 		"chokidar": "^3.5.2",
 		"cli-cursor": "^3.1.0",
 		"cli-table3": "^0.6.0",
-		"commander": "^8.1.0",
+		"commander": "^8.2.0",
 		"conf": "^10.0.2",
 		"cross-spawn": "^7.0.3",
 		"express": "^4.17.1",
 		"fs-extra": "^10.0.0",
+		"fuzzy": "^0.1.3",
 		"global-dirs": "^3.0.0",
 		"http-proxy": "^1.18.1",
 		"inquirer": "^8.1.2",
+		"inquirer-autocomplete-prompt": "^1.4.0",
 		"jszip": "^3.7.1",
 		"lodash": "^4.17.21",
-		"meant": "^2.0.1",
 		"minimatch": "^3.0.4",
 		"moment": "^2.29.1",
 		"open": "^8.2.1",
@@ -52,7 +53,8 @@
 		"toml": "^3.0.0",
 		"update-notifier": "^5.1.0",
 		"winston": "^3.3.3",
-		"xml2js": "^0.4.23"
+		"xml2js": "^0.4.23",
+		"yaml": "^1.10.2"
 	},
 	"devDependencies": {
 		"@types/app-module-path": "^2.2.0",
@@ -62,6 +64,7 @@
 		"@types/fs-extra": "^9.0.12",
 		"@types/http-proxy": "^1.17.7",
 		"@types/inquirer": "^7.3.3",
+		"@types/inquirer-autocomplete-prompt": "^1.3.3",
 		"@types/jest": "^26.0.24",
 		"@types/lodash": "^4.14.172",
 		"@types/minimatch": "^3.0.5",