zcatalyst-cli 1.8.0 → 1.10.0

package/lib/internal/api.js

@@ -116,7 +116,8 @@ class API {
                 body = JSON.parse(rawResponseData.toString());
             }
             catch (e) {
-                logger_1.debug('API Parsing Error: ' + e.message);
+                const err = error_1.default.getErrorInstance(e);
+                logger_1.debug('API Parsing Error: ' + err.message);
             }
         }
         if (resp.statusCode >= 400 && !this.logOpts.skipRespBody) {
@@ -165,14 +166,10 @@ class API {
                                 try {
                                     resolve(yield this._retry(err));
                                 }
-                                catch (error) {
-                                    if (error instanceof error_1.default) {
-                                        reject(error);
-                                    }
-                                    reject(new error_1.default('API Error: ' + err.message, {
-                                        original: error,
-                                        exit: 2
-                                    }));
+                                catch (e) {
+                                    const error = error_1.default.getErrorInstance(e);
+                                    error.exit = 2;
+                                    reject(error);
                                 }
                                 break;
                         }

package/lib/internal/command.js

@@ -33,7 +33,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
 const strip_ansi_1 = __importDefault(require("strip-ansi"));
-const util_1 = require("util");
 const error_1 = __importDefault(require("../error"));
 const errorOut_1 = __importDefault(require("../errorOut"));
 const migration_1 = __importDefault(require("../migration"));
@@ -128,13 +127,14 @@ class Command {
             try {
                 yield runner.apply(this, programArgs);
                 const duration = Date.now() - start;
+                errorOut_1.default();
                 yield track_1.default(this.cmdName, 'success', duration);
-                process.exitCode = 0;
             }
             catch (err) {
                 const duration = Date.now() - start;
                 const errorEvent = err.exit === 1 ? 'Error (User)' : 'Error (Unexpected)';
                 const preppedMessage = strip_ansi_1.default(err.message || '');
+                errorOut_1.default(err);
                 yield track_1.default(errorEvent, preppedMessage, duration);
             }
         }));
@@ -173,7 +173,7 @@ class Command {
                 yield migration_1.default(runtime_store_1.default.get('context.cli.package.version'));
             }
             catch (e) {
-                logger_1.debug(util_1.inspect(e));
+                logger_1.debug(e);
             }
             yield Promise.all(js_1.JS.map(this.beforeRunners, (before) => __awaiter(this, void 0, void 0, function* () {
                 const beforeModule = (yield Promise.resolve().then(() => __importStar(require('../command_needs/' + before.fn)))).default;

package/lib/internal/config.js

@@ -68,11 +68,13 @@ class Config {
                 }
             }
             catch (e) {
-                throw new error_1.default('There was an error loading a file', {
-                    exit: 1,
-                    errorId: 'CONFIG-1',
-                    arg: [ansi_colors_1.bold(constants_1.FILENAME.config), e.message]
+                const err = error_1.default.getErrorInstance(e, {
+                    message: 'There was an error loading a file',
+                    skipHelp: false
                 });
+                err.errorId = 'CONFIG-1';
+                err.arg = [ansi_colors_1.bold(constants_1.FILENAME.config), err.message];
+                throw err;
             }
             if (canIgnore) {
                 return new Config(path_1.join(pd, constants_1.FILENAME.config));

package/lib/migration/index.js

@@ -63,10 +63,12 @@ const runMigration = (rc, migFiles, idx = 0) => __awaiter(void 0, void 0, void 0
             completed: false
         });
         rc.syncSave();
-        throw new error_1.default('Unable to run migration file ' + migFile, {
-            original: e,
-            exit: 2
+        const err = error_1.default.getErrorInstance(e, {
+            message: 'Unable to run migration file ' + migFile,
+            skipHelp: false
         });
+        err.exit = 2;
+        throw err;
     }
     rc.set(['migration', currentMigFileVersion], {
         completed: true
@@ -102,10 +104,12 @@ const runGlobalMigration = (migFiles) => __awaiter(void 0, void 0, void 0, funct
             error: util_1.inspect(e),
             completed: false
         });
-        throw new error_1.default('Unable to run migration file ' + migFile, {
-            original: e,
-            exit: 2
+        const err = error_1.default.getErrorInstance(e, {
+            message: 'Unable to run migration file ' + migFile,
+            skipHelp: false
         });
+        err.exit = 2;
+        throw err;
     }
     config_store_1.default.set('migration.' + currentMigFileVersion.replace(new RegExp('\\.', 'g'), '\\.'), {
         completed: true

package/lib/option-filter.js

@@ -175,7 +175,7 @@ function filterPorts() {
     });
 }
 exports.filterPorts = filterPorts;
-function filterTargets() {
+function filterTargets(pathSense = true) {
     const validTargetResultants = validateTargets();
     const config = runtime_store_1.default.get('config');
     let targets = validGlobalTargets.filter((t) => config.has(t));
@@ -185,6 +185,9 @@ function filterTargets() {
                 if (target === 'apig' && option_1.getCurrentCommand() === 'serve') {
                     return true;
                 }
+                if (!pathSense) {
+                    return true;
+                }
                 const targetRoot = project_1.resolveProjectPath(CONFIG[(target + 'Config')].source());
                 return (fs_1.SYNC.isPathInside(targetRoot, runtime_store_1.default.get('cwd')) ||
                     runtime_store_1.default.get('cwd') === targetRoot);

package/lib/port-resolver.js

@@ -68,25 +68,27 @@ class PortResolver {
             }
             catch (e) {
                 if (searchSpan === 0) {
-                    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
-                        ]
+                    const err = error_1.default.getErrorInstance(e, {
+                        message: `Provided port '${port}' is not available`,
+                        skipHelp: false
                     });
+                    err.errorId = 'PORT-RESOLVER-1';
+                    err.arg = [
+                        ansi_colors_1.bold.red(port + ''),
+                        type === 'debug' ? 'debugging' : 'serving',
+                        ansi_colors_1.bold(feature),
+                        name,
+                        type
+                    ];
+                    throw err;
                 }
-                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)]
+                const cerr = error_1.default.getErrorInstance(e, {
+                    message: `No ports from '${port}' to ${port + searchSpan} is free to use as a ${type} port.`,
+                    skipHelp: false
                 });
+                cerr.errorId = 'PORT-RESOLVER-2';
+                cerr.arg = [ansi_colors_1.bold(port + ''), ansi_colors_1.bold(port + searchSpan + ''), ansi_colors_1.bold('--' + type)];
+                throw cerr;
             }
             if (finalPort !== port) {
                 logger_1.debug(`${type} port : '${port}' is not available. Hence port '${finalPort}' will be used instead.`);

package/lib/prompt/index.js

@@ -0,0 +1,92 @@
+'use strict';
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const inquirer_1 = __importDefault(require("inquirer"));
+const error_1 = __importDefault(require("../error"));
+const choice = (name, _a = {}) => {
+    var { value = name, short = name, disabled = false, checked = false } = _a, otherOpts = __rest(_a, ["value", "short", "disabled", "checked"]);
+    return Object.assign({ name,
+        value,
+        short,
+        disabled,
+        checked }, otherOpts);
+};
+exports.default = {
+    register: (type) => __awaiter(void 0, void 0, void 0, function* () {
+        switch (type) {
+            case 'file-path':
+                const filePathExt = yield Promise.resolve().then(() => __importStar(require('./types/file-path')));
+                inquirer_1.default.registerPrompt('file-path', filePathExt.default);
+                break;
+            default:
+                throw new error_1.default('No such type registered', { exit: 2 });
+        }
+    }),
+    seperator: (line) => {
+        return new inquirer_1.default.Separator(line);
+    },
+    choice,
+    ask: (...questions) => {
+        return inquirer_1.default.prompt(questions);
+    },
+    question: (name, question, _a = {}) => {
+        var { type = 'input', defaultAns, choices = [], validate = () => {
+            return true;
+        }, filter = (ans) => {
+            return ans;
+        }, when = () => {
+            return true;
+        }, prefix = '', suffix = '' } = _a, otheropts = __rest(_a, ["type", "defaultAns", "choices", "validate", "filter", "when", "prefix", "suffix"]);
+        if (choices.length > 0 && typeof choices[0] === 'string') {
+            choices = choices.map((strChoice) => choice(strChoice));
+        }
+        return Object.assign({ type,
+            name, message: question, default: defaultAns, choices,
+            validate,
+            filter,
+            when,
+            prefix,
+            suffix }, otheropts);
+    }
+};

package/lib/prompt/types/file-path.js

@@ -0,0 +1,95 @@
+"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 choices_1 = __importDefault(require("inquirer/lib/objects/choices"));
+const inquirer_autocomplete_prompt_1 = __importDefault(require("inquirer-autocomplete-prompt"));
+const fuzzy_1 = __importDefault(require("fuzzy"));
+const fs_1 = require("../../util_modules/fs");
+const ansi_colors_1 = require("ansi-colors");
+function getPaths(rootPath, pattern, exclude, defaultItem) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const nodeList = yield fs_1.ASYNC.walk(rootPath, { exclude, excludeDir: false });
+        const filteredNodes = fuzzy_1.default.filter(pattern || '', nodeList).map((e) => e.string);
+        if (!pattern && defaultItem) {
+            filteredNodes.unshift(defaultItem);
+        }
+        return filteredNodes;
+    });
+}
+class InquirerFilePath extends inquirer_autocomplete_prompt_1.default {
+    constructor(question, rl, answers) {
+        const { rootPath = '.', exclude = [] } = question;
+        const questionBase = Object.assign({
+            emptyText: 'No valid file inside current directory!. Try giving the entire path and press ' +
+                ansi_colors_1.cyan('<return> ') +
+                'key'
+        }, question, {
+            source: (_, pattern) => getPaths(rootPath, pattern, exclude, question.default)
+        });
+        super(questionBase, rl, answers);
+    }
+    search(searchTerm) {
+        const _super = Object.create(null, {
+            search: { get: () => super.search }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            yield _super.search.call(this, searchTerm);
+            this.currentChoices.getChoice = (choiceIndex) => {
+                const choice = choices_1.default.prototype.getChoice.call(this.currentChoices, choiceIndex);
+                return {
+                    value: choice === null || choice === void 0 ? void 0 : choice.value,
+                    name: choice === null || choice === void 0 ? void 0 : choice.name,
+                    short: choice === null || choice === void 0 ? void 0 : choice.short
+                };
+            };
+        });
+    }
+    onSubmitAfterValidation(line) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const choice = this.currentChoices.getChoice(this.selected);
+            const value = (choice === null || choice === void 0 ? void 0 : choice.value) || line;
+            this.answerName = (choice === null || choice === void 0 ? void 0 : choice.name) || line;
+            this.shortAnswer = (choice === null || choice === void 0 ? void 0 : choice.short) || line;
+            this.answer = this.opt.filter ? this.opt.filter(value, this.answers) : value;
+            choice.value = this.answer;
+            this.status = 'answered';
+            this.render(undefined);
+            this.screen.done();
+            if (this.done) {
+                this.done(choice.value);
+            }
+        });
+    }
+    checkValidationResult(validationResult, lineOrRl) {
+        if (validationResult !== true) {
+            this.render(validationResult || 'try giving valid complete path..');
+        }
+        else {
+            this.onSubmitAfterValidation(lineOrRl);
+        }
+    }
+    onSubmit(line) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const lineOrRl = line || this.rl.line;
+            if (typeof this.opt.validate !== 'function') {
+                return this.onSubmitAfterValidation(lineOrRl);
+            }
+            const choice = this.currentChoices.getChoice(this.selected);
+            choice.value = choice.value ? choice.value : lineOrRl;
+            const validationResult = yield this.opt.validate(choice, this.answers);
+            this.checkValidationResult(validationResult, lineOrRl);
+        });
+    }
+}
+exports.default = InquirerFilePath;

package/lib/pull/features/client.js

@@ -59,7 +59,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         choices
     }));
     const clientZip = (yield webappAPI.download(historyAns.history));
-    yield new archiver_1.default().load(clientZip).extract('/', clientDirPath, { isFolder: true }).finalize();
+    yield new archiver_1.default().load(clientZip).extract(clientDirPath).finalize();
     yield client_utils_1.clientUtils.validate();
     runtime_store_1.default.set('payload.client', runtime_store_1.default.get('context.client'));
     runtime_store_1.default.set('payload.client.source', project_1.resolveProjectPath(clientDirName));

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/serve/index.js

@@ -35,12 +35,14 @@ 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* () {
@@ -51,9 +53,11 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         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 +
@@ -87,13 +91,13 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             (serveTargets.length === 1 && serveTargets[0] === 'apig')) {
             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(),