zcatalyst-cli 1.7.1 → 1.9.1

package/lib/migration/index.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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;
 };

package/lib/option-filter.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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;
 };
@@ -41,12 +41,26 @@ function enrichOptsData(opt, optValue, validTargets, multiTargetSupport = true)
         .split(',')
         .reduce((accumulator, entry, entryIndex, optArr) => {
         if (optArr.indexOf(entry) !== entryIndex) {
-            throw new error_1.default(`Duplicate target found for ${ansi_colors_1.bold(entry)}.`, { exit: 1 });
+            optArr[entryIndex] = ansi_colors_1.red(optArr[entryIndex]);
+            throw new error_1.default(`Duplicate target found for ${ansi_colors_1.bold(entry)}.`, {
+                exit: 1,
+                errorId: 'OPT-FILTER-1',
+                arg: [
+                    ansi_colors_1.bold('--' + opt),
+                    ansi_colors_1.bold('Option input: ') + ansi_colors_1.italic('--' + opt + ' ' + optArr.join(','))
+                ]
+            });
         }
         const entrySet = entry.split(':');
         if (!validTargets.includes(entrySet[0])) {
-            throw new error_1.default(`Invalid target "${entrySet[0]}" specified for option "${opt}". The valid targets are one of "${validTargets.join(',')}".`, {
-                exit: 1
+            throw new error_1.default(`Invalid target "${entrySet[0]}" specified for option "${opt}".`, {
+                exit: 1,
+                errorId: 'OPT-FILTER-2',
+                arg: [
+                    ansi_colors_1.bold.red(entrySet[0]),
+                    ansi_colors_1.bold('--' + opt),
+                    ansi_colors_1.bold(validTargets.map((target) => '* ' + target).join('\n'))
+                ]
             });
         }
         if (!multiTargetSupport && accumulator.some((res) => res.target === entrySet[0])) {
@@ -58,11 +72,24 @@ function enrichOptsData(opt, optValue, validTargets, multiTargetSupport = true)
             hasFilter: false,
             target: entrySet[0]
         };
-        if (accumulator.some((res) => res.target === entrySet[0] &&
-            ((res.hasFilter && entrySet.length === 1) ||
-                (!res.hasFilter && entrySet.length === 2)))) {
-            throw new error_1.default(`Target "${entrySet[0]}" is specified with and without a filter for option "${opt}". Only one should be used.`, {
-                exit: 1
+        if (accumulator.some((res, idx) => {
+            const truthy = res.target === entrySet[0] &&
+                ((res.hasFilter && entrySet.length === 1) ||
+                    (!res.hasFilter && entrySet.length === 2));
+            if (truthy) {
+                optArr[idx] = ansi_colors_1.red(optArr[idx]);
+                optArr[entryIndex] = ansi_colors_1.red(optArr[entryIndex]);
+            }
+            return truthy;
+        })) {
+            throw new error_1.default(`Target "${entrySet[0]}" is specified with and without a filter for option "${opt}".`, {
+                exit: 1,
+                errorId: 'OPT-FILTER-3',
+                arg: [
+                    ansi_colors_1.bold.red(entrySet[0]),
+                    ansi_colors_1.bold('--' + opt),
+                    ansi_colors_1.bold('Option input: ') + ansi_colors_1.italic(`--${opt} ${optArr.join(',')}`)
+                ]
             });
         }
         if (entrySet.length > 1) {
@@ -79,7 +106,9 @@ function enrichOptsData(opt, optValue, validTargets, multiTargetSupport = true)
 function validateTargets() {
     if (option_1.getOptionValue('except', false) && option_1.getOptionValue('only', false)) {
         throw new error_1.default('Cannot specify both --only and --except', {
-            exit: 1
+            exit: 1,
+            errorId: 'OPT-FILTER-4',
+            arg: [ansi_colors_1.bold('--only'), ansi_colors_1.bold('--except')]
         });
     }
     const enrichedOnlyOpts = enrichOptsData('only', option_1.getOptionValue('only'), validGlobalTargets);
@@ -95,10 +124,26 @@ function validateTargets() {
 function validatePorts() {
     const customHttpPort = option_1.getOptionValue('http', false);
     const enrichedDebugOpts = enrichOptsData('debug', option_1.getOptionValue('debug'), Object.keys(constants_1.DEFAULT.serve_port.debug));
-    if (enrichedDebugOpts.some((opt) => !opt.hasFilter)) {
-        throw new error_1.default('Cannot specify "--debug <target>" alone.' +
-            ' It must be in the format of "--debug <target>:<port>"' +
-            'Incase of advancedio "--debug advancedio:<name>:<port>"', { exit: 1 });
+    if (enrichedDebugOpts.some((opt) => {
+        const noFilter = !opt.hasFilter;
+        if (opt.target === 'client') {
+            throw new error_1.default('Client cannot be debugged', {
+                exit: 1,
+                errorId: 'OPT-FILTER-5'
+            });
+        }
+        return noFilter;
+    })) {
+        throw new error_1.default('Cannot specify "--debug <target>" alone.', {
+            exit: 1,
+            errorId: 'OPT-FILTER-6',
+            arg: [
+                ansi_colors_1.bold('--debug'),
+                ansi_colors_1.italic.red('--debug <target>'),
+                ansi_colors_1.bold('* basicio: ') + ansi_colors_1.italic.green('--debug basicio:<port>'),
+                ansi_colors_1.bold('* advancedio: ') + ansi_colors_1.italic.green('--debug advancedio:<name>:<port>')
+            ]
+        });
     }
     return {
         port: customHttpPort,
@@ -110,7 +155,16 @@ function filterPorts() {
     runtime_store_1.default.set(`context.port.http.master`, validOptResultants.port);
     validOptResultants.debug.forEach((res) => {
         if (res.target === constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.advanced] && !res.specific) {
-            throw new error_1.default('Cannot specify "--debug <target>:<port>" alone for advancedio. It must be in the format of "--debug advancedio:<name>:<port>"', { exit: 1 });
+            throw new error_1.default('Invalid input format for advancedio target', {
+                exit: 1,
+                errorId: 'OPT-FILTER-7',
+                arg: [
+                    ansi_colors_1.bold('--debug'),
+                    ansi_colors_1.bold('advancedio'),
+                    ansi_colors_1.italic.red('--debug advancedio:<name|port>'),
+                    ansi_colors_1.italic.green('--debug advancedio:<name>:<port>')
+                ]
+            });
         }
         else if (res.target === constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.basic]) {
             runtime_store_1.default.set(`context.port.debug.${res.target}`, res.filter);
@@ -155,16 +209,19 @@ function filterTargets() {
     }
     targets = js_1.JS.uniq(targets);
     if (targets.length === 0) {
-        throw new error_1.default('Cannot understand what targets. Check that you specified valid targets' +
-            ' if you used the --only or --except option. Otherwise, check your ' +
-            constants_1.FILENAME.config +
-            ' to ensure that your project is initialized for the desired features.', {
-            exit: 1
+        const aid = option_1.getOptionValue('except', false)
+            ? `the ${ansi_colors_1.bold('--except')} option does not rule out all the valid targets.`
+            : `the desired features are initialised in the ${ansi_colors_1.bold(constants_1.FILENAME.config)} file.`;
+        throw new error_1.default('Cannot understand what targets.', {
+            exit: 1,
+            errorId: 'OPT-FILTER-8',
+            arg: [aid]
         });
     }
     if (targets.length === 1 && targets.includes('apig') && option_1.getCurrentCommand() === 'serve') {
-        throw new error_1.default('API Gateway cannot be served separately in local kindly include other components.', {
-            exit: 1
+        throw new error_1.default('API Gateway cannot be served separately', {
+            exit: 1,
+            errorId: 'OPT-FILTER-9'
         });
     }
     runtime_store_1.default.set('context.targets', targets);

package/lib/optional-import.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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;
 };

package/lib/plugin-loader.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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;
 };

package/lib/port-resolver.js

@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const ansi_colors_1 = require("ansi-colors");
 const portfinder_1 = require("portfinder");
 const error_1 = __importDefault(require("./error"));
 const runtime_store_1 = __importDefault(require("./runtime-store"));
@@ -26,7 +27,10 @@ class PortResolver {
             if (searchSpan < 0) {
                 throw new Error('unable find port. searchSpan has reached the bottom line');
             }
-            const port = yield portfinder_1.getPortPromise({ port: startPort, stopPort: startPort + searchSpan });
+            const port = yield portfinder_1.getPortPromise({
+                port: startPort,
+                stopPort: startPort + searchSpan
+            });
             if (PortResolver.isPortTaken(port)) {
                 if (dupCheck) {
                     return PortResolver.getFreePort(port + 1, searchSpan - (port - startPort), dupCheck);
@@ -64,9 +68,25 @@ class PortResolver {
             }
             catch (e) {
                 if (searchSpan === 0) {
-                    throw new error_1.default(`Provided port '${port}' is not available please provide a new one`, { exit: 1, original: e });
+                    throw new error_1.default(`Provided port '${port}' is not available`, {
+                        exit: 1,
+                        original: e,
+                        errorId: 'PORT-RESOLVER-1',
+                        arg: [
+                            ansi_colors_1.bold.red(port + ''),
+                            type === 'debug' ? 'debugging' : 'serving',
+                            ansi_colors_1.bold(feature),
+                            name,
+                            type
+                        ]
+                    });
                 }
-                throw new error_1.default(`No ports from '${port}' to ${port + searchSpan} is free to use as a ${type} port.`, { exit: 1, original: e });
+                throw new error_1.default(`No ports from '${port}' to ${port + searchSpan} is free to use as a ${type} port.`, {
+                    exit: 1,
+                    original: e,
+                    errorId: 'PORT-RESOLVER-2',
+                    arg: [ansi_colors_1.bold(port + ''), ansi_colors_1.bold(port + searchSpan + ''), ansi_colors_1.bold('--' + type)]
+                });
             }
             if (finalPort !== port) {
                 logger_1.debug(`${type} port : '${port}' is not available. Hence port '${finalPort}' will be used instead.`);

package/lib/prompt.js

@@ -20,7 +20,7 @@ exports.default = {
         return new inquirer_1.default.Separator(line);
     },
     choice: (name, _a = {}) => {
-        var { value = name, short = value, disabled = false, checked = false } = _a, otherOpts = __rest(_a, ["value", "short", "disabled", "checked"]);
+        var { value = name, short = name, disabled = false, checked = false } = _a, otherOpts = __rest(_a, ["value", "short", "disabled", "checked"]);
         return Object.assign({ name,
             value,
             short,

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

@@ -25,6 +25,7 @@ const fs_1 = require("../../../util_modules/fs");
 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"));
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const fnAPI = yield endpoints_1.functionsAPI();
     const fnDirName = config_1.functionsConfig.source();
@@ -104,19 +105,18 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     }));
     runtime_store_1.default.set('context.functions.targets', targets);
     targets = yield Promise.all(targets.map((fn) => __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();
-        switch (fn.stack) {
-            case constants_1.STACK.node10:
-                yield languages_1.node(fn);
-                break;
-            case constants_1.STACK.java8:
-                yield languages_1.java(fn);
-                break;
+        if ((_a = fn.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.nodejs)) {
+            yield languages_1.node(fn);
+        }
+        else if ((_b = fn.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java)) {
+            yield languages_1.java(fn);
         }
         return fn;
     })));

package/lib/pull/features/index.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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;
 };

package/lib/pull/index.js

@@ -26,9 +26,16 @@ function pull() {
         }
         const feature = featureList.shift();
         if (!Object.keys(features_1.default).includes(feature)) {
-            throw new error_1.default(ansi_colors_1.bold(feature) +
-                ' is not a valid feature. Must be one of ' +
-                Object.keys(features_1.default).join(','), { exit: 1 });
+            throw new error_1.default('invalid feature for pull', {
+                exit: 1,
+                errorId: 'PULL-1',
+                arg: [
+                    ansi_colors_1.bold.red(feature),
+                    ansi_colors_1.bold(Object.keys(features_1.default)
+                        .map((feat) => '* ' + feat)
+                        .join('\n'))
+                ]
+            });
         }
         const MODULE = features_1.default[feature];
         logger_1.info(ansi_colors_1.bold('\n' + ansi_colors_1.white('===> ') + js_1.JS.capitalize(feature) + ' Setup'));

package/lib/repl-server.js

@@ -39,13 +39,15 @@ class Repl {
     }
     emit(eventName, ...inputs) {
         if (this.server === null) {
-            throw new error_1.default('emit cannot be called before server is started');
+            throw new error_1.default('emit cannot be called before server is started', { exit: 2 });
         }
         return this.server.emit(eventName, inputs);
     }
     showPrompt() {
         if (this.server === null) {
-            throw new error_1.default('showPrompt cannot be called before server is started');
+            throw new error_1.default('showPrompt cannot be called before server is started', {
+                exit: 2
+            });
         }
         if (!this.closed) {
             this.server.displayPrompt();
@@ -53,7 +55,7 @@ class Repl {
     }
     setContext(command, exe) {
         if (this.server === null) {
-            throw new error_1.default('context cannot be set before server is started');
+            throw new error_1.default('context cannot be set before server is started', { exit: 2 });
         }
         const context = this.server.context;
         this.context.push({ command, exe });
@@ -65,7 +67,7 @@ class Repl {
     }
     close() {
         if (this.server === null) {
-            throw new error_1.default('close cannot be called before server is started');
+            throw new error_1.default('close cannot be called before server is started', { exit: 2 });
         }
         this.server.close();
     }
@@ -95,7 +97,9 @@ class Repl {
     wait() {
         return new Promise((res) => {
             if (this.server === null) {
-                throw new error_1.default('wait cannot be called before server is started');
+                throw new error_1.default('wait cannot be called before server is started', {
+                    exit: 2
+                });
             }
             this.server.on('close', () => {
                 this.resume();

package/lib/serve/features/index.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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;
 };
@@ -35,10 +35,19 @@ exports.apig = exports.functions = exports.client = void 0;
 const port_resolver_1 = __importDefault(require("../../port-resolver"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
+const logger_1 = require("../../util_modules/logger");
 function client() {
     return __awaiter(this, void 0, void 0, function* () {
         const clientModule = yield Promise.resolve().then(() => __importStar(require('./client')));
-        yield clientModule.default();
+        try {
+            yield clientModule.default();
+        }
+        catch (err) {
+            logger_1.info();
+            logger_1.warning('Skipping the serve of Client because of the error: ' + err.message);
+            logger_1.info();
+            return;
+        }
         const clientName = runtime_store_1.default.get('context.client.name');
         const finalPort = yield port_resolver_1.default.getPort('client', 'http', clientName);
         runtime_store_1.default.set('context.port.http.client.' + clientName, finalPort);

package/lib/serve/index.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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;
 };
@@ -35,25 +35,29 @@ const path_1 = require("path");
 const client_utils_1 = require("../client-utils");
 const error_1 = __importDefault(require("../error"));
 const fn_utils_1 = require("../fn-utils");
+const fn_watcher_1 = __importDefault(require("../fn-watcher"));
 const port_resolver_1 = __importDefault(require("../port-resolver"));
 const runtime_store_1 = __importDefault(require("../runtime-store"));
 const http_functions_1 = __importDefault(require("../shell/dependencies/http-functions"));
 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 features = __importStar(require("./features"));
 const server_1 = __importDefault(require("./server"));
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
-    let serveTargets = runtime_store_1.default.get('context.targets', []);
+    const serveTargets = runtime_store_1.default.get('context.targets', []);
     const advancedServer = new server_1.default();
     const basicFnServer = new http_functions_1.default();
     try {
         const masterPort = yield port_resolver_1.default.getPort('master', 'http', 'master', false);
         runtime_store_1.default.set('context.port.http.master', masterPort);
         yield Promise.all(serveTargets.map((target) => features[target]()));
-        const funtionTargets = runtime_store_1.default
-            .get('context.functions.targets', [])
-            .filter((target) => {
+        const rawTargets = runtime_store_1.default.get('context.functions.targets', []);
+        if (option_1.getOptionValue('watch', false)) {
+            yield Promise.all(rawTargets.map((target) => __awaiter(void 0, void 0, void 0, function* () { return (target.valid ? fn_watcher_1.default(target) : undefined); })));
+        }
+        const funtionTargets = rawTargets.filter((target) => {
             if (!target.valid) {
                 logger_1.warning('skipping serve of function [' +
                     target.name +
@@ -67,11 +71,17 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             return target.valid;
         });
         if (serveTargets.includes('client')) {
-            advancedServer.add('client', runtime_store_1.default.get('context.client'));
+            const client = runtime_store_1.default.get('context.client', false);
+            if (client && client.valid) {
+                advancedServer.add('client', client);
+            }
+            else {
+                serveTargets.splice(serveTargets.indexOf('client'), 1);
+            }
         }
         if (serveTargets.includes('functions') && funtionTargets.length === 0) {
             logger_1.labeled('functions', 'No targets are ready to be served in local').WARN();
-            serveTargets = serveTargets.filter((target) => target !== 'functions');
+            serveTargets.splice(serveTargets.indexOf('functions'), 1);
             runtime_store_1.default.set('context.targets', serveTargets);
         }
         if (serveTargets.includes('functions')) {
@@ -79,15 +89,15 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         }
         if (serveTargets.length === 0 ||
             (serveTargets.length === 1 && serveTargets[0] === 'apig')) {
-            throw new error_1.default('No components to serve !!!', { exit: 1 });
+            throw new error_1.default('No components to serve', { exit: 0, errorId: 'SERVE-1' });
         }
-        yield advancedServer.start();
         const basicFn = runtime_store_1.default
             .get('context.functions.targets', [])
             .find((target) => target.type === constants_1.FN_TYPE.basic && target.valid);
         if (basicFn) {
             yield basicFnServer.start();
         }
+        yield advancedServer.start();
         yield advancedServer.wait();
         yield Promise.all([
             fs_1.ASYNC.deleteDir(path_1.join(runtime_store_1.default.get('cwd'), '.build')).catch(),