zcatalyst-cli 1.18.0-beta.0 → 1.18.0-beta.10

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

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

package/lib/prompt/types/tree.js

@@ -26,6 +26,9 @@ var ETreeState;
     ETreeState[ETreeState["EXPANDED"] = 3] = "EXPANDED";
 })(ETreeState || (ETreeState = {}));
 class TreeNode {
+    get indent() {
+        return this.level * 2;
+    }
     constructor(root) {
         _TreeNode_instances.add(this);
         this.open = false;
@@ -36,9 +39,6 @@ class TreeNode {
         this.level = 1;
         this.root = root;
     }
-    get indent() {
-        return this.level * 2;
-    }
     addNode(node) {
         if (node instanceof TreeNode) {
             this.leaves.push(node);

package/lib/serve/features/appsail.js

@@ -27,22 +27,21 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     }
     const validated = (0, appsail_utils_1.validateAppSail)(optionTargets);
     const filledTargets = yield Promise.all(validated.map((targ) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
         if (!targ.validity.valid) {
             return targ;
         }
         const proxyPort = yield port_resolver_1.default.getPort('appsail', 'http', {
-            name: ((_a = targ.appSail) === null || _a === void 0 ? void 0 : _a.name) + '_proxy',
+            name: targ.name + '_proxy',
             searchSpan: 10,
             server: 'master'
         }).catch((err) => {
             throw new error_1.default('No free ports between 3000 and 3010. AppSail needs the ports within this range to function properly', { original: err });
         });
         const appsailPort = yield port_resolver_1.default.getPort('appsail', 'http', {
-            name: ((_b = targ.appSail) === null || _b === void 0 ? void 0 : _b.name) + '_proxy',
+            name: targ.name + '_proxy',
             server: 'service'
         });
-        return Object.assign(Object.assign({}, targ), { port: { appsail: appsailPort, proxy: proxyPort } });
+        return Object.assign(Object.assign({}, targ), { port: { appsail: appsailPort, proxy: proxyPort }, trigger: { kill: false } });
     })));
     runtime_store_1.default.set('context.appsail.targets', filledTargets);
 });

package/lib/serve/index.js

@@ -108,10 +108,9 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         if (serveTargets.includes('appsail')) {
             const appSail = runtime_store_1.default.get('context.appsail.targets', []);
             const validAppSail = appSail.filter((sail) => {
-                var _a;
                 if (!sail.validity.valid) {
                     (0, logger_1.warning)('skipping serve of AppSail service [' +
-                        ((_a = sail.appSail) === null || _a === void 0 ? void 0 : _a.name) +
+                        sail.name +
                         '] since ' +
                         sail.validity.reason);
                     return false;

package/lib/serve/server/index.js

@@ -117,7 +117,7 @@ class Server {
             });
     }
     startServer(details, masterPort) {
-        var _a, _b, _c;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             if (details.target === undefined) {
                 return details;
@@ -170,7 +170,7 @@ class Server {
                 if (details.type === 'appsail') {
                     const target = details.target;
                     target.validity.valid = false;
-                    (0, logger_1.labeled)(`AppSail[${(_c = target.appSail) === null || _c === void 0 ? void 0 : _c.name}]`, error).ERROR();
+                    (0, logger_1.labeled)(`AppSail[${target.name}]`, error).ERROR();
                 }
                 else if (details.type === 'client') {
                     const target = details.target;
@@ -252,7 +252,7 @@ class Server {
                 }
                 this.masterServer =
                     masterTargets.length > 0
-                        ? yield (0, master_1.default)(masterPort, masterTargets.targets)
+                        ? yield (0, master_1.default)(masterPort, { otherServerDetails: masterTargets.targets })
                         : undefined;
                 startPromise = new Promise((res) => {
                     this.masterServer
@@ -284,16 +284,16 @@ class Server {
             }
             if (this.targetsMap.appSail.length > 0) {
                 yield Promise.all(this.targetsMap.appSail.map((targSail) => this.startServer(targSail, -1).then((details) => {
-                    var _a, _b, _c, _d, _e, _f;
+                    var _a, _b, _c, _d;
                     const serverDetails = details;
                     if (!((_a = serverDetails.target) === null || _a === void 0 ? void 0 : _a.validity.valid)) {
                         return;
                     }
                     logUrls.appsail.targs.push(targSail);
                     logUrls.appsail.nameMaxLength =
-                        ((_c = (_b = targSail.target) === null || _b === void 0 ? void 0 : _b.appSail) === null || _c === void 0 ? void 0 : _c.name) &&
-                            ((_e = (_d = targSail.target) === null || _d === void 0 ? void 0 : _d.appSail) === null || _e === void 0 ? void 0 : _e.name.length) > logUrls.appsail.nameMaxLength
-                            ? (_f = targSail.target) === null || _f === void 0 ? void 0 : _f.appSail.name.length
+                        ((_b = targSail.target) === null || _b === void 0 ? void 0 : _b.name) &&
+                            ((_c = targSail.target) === null || _c === void 0 ? void 0 : _c.name.length) > logUrls.appsail.nameMaxLength
+                            ? (_d = targSail.target) === null || _d === void 0 ? void 0 : _d.name.length
                             : logUrls.appsail.nameMaxLength;
                 })));
             }
@@ -302,6 +302,11 @@ class Server {
                 var _a;
                 switch (targType) {
                     case 'functions': {
+                        const headersDisplayed = {
+                            bio: false,
+                            aio: false,
+                            blo: false
+                        };
                         Object.entries(logTarg).forEach((x) => {
                             const [_targType, _logTarg] = x;
                             if (_logTarg.targs.length === 0) {
@@ -310,48 +315,66 @@ class Server {
                             loggedEntries++;
                             switch (_targType) {
                                 case 'bio': {
-                                    (0, logger_1.info)();
-                                    (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>> BasicIO <<<<<<<<<<<<<< '));
                                     _logTarg.targs.forEach((t) => {
-                                        var _a;
+                                        var _a, _b;
                                         const target = t;
-                                        if (!((_a = target.target) === null || _a === void 0 ? void 0 : _a.url)) {
+                                        if (!((_a = target.target) === null || _a === void 0 ? void 0 : _a.valid)) {
+                                            return;
+                                        }
+                                        if (!((_b = target.target) === null || _b === void 0 ? void 0 : _b.url)) {
                                             throw new error_1.default('Target URL not found', {
                                                 exit: 2
                                             });
                                         }
+                                        if (headersDisplayed.bio === false) {
+                                            (0, logger_1.info)();
+                                            (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>> BasicIO <<<<<<<<<<<<<< '));
+                                            headersDisplayed.bio = true;
+                                        }
                                         bioLogUrl(target, masterPort, _logTarg.nameMaxLength);
                                     });
                                     (0, logger_1.info)();
                                     break;
                                 }
                                 case 'aio': {
-                                    (0, logger_1.info)();
-                                    (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>> AdvancedIO <<<<<<<<<<<< '));
                                     _logTarg.targs.forEach((t) => {
-                                        var _a;
+                                        var _a, _b;
                                         const _target = t;
-                                        if (!((_a = _target.target) === null || _a === void 0 ? void 0 : _a.url)) {
+                                        if (!((_a = _target.target) === null || _a === void 0 ? void 0 : _a.valid)) {
+                                            return;
+                                        }
+                                        if (!((_b = _target.target) === null || _b === void 0 ? void 0 : _b.url)) {
                                             throw new error_1.default('Target URL not found', {
                                                 exit: 2
                                             });
                                         }
+                                        if (headersDisplayed.aio === false) {
+                                            (0, logger_1.info)();
+                                            (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>> AdvancedIO <<<<<<<<<<<< '));
+                                            headersDisplayed.aio = true;
+                                        }
                                         aioLogUrl(_target, masterPort, _logTarg.nameMaxLength);
                                     });
                                     (0, logger_1.info)();
                                     break;
                                 }
                                 case 'browserlogic': {
-                                    (0, logger_1.info)();
-                                    (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>> BrowserLogic <<<<<<<<<<< '));
                                     _logTarg.targs.forEach((t) => {
-                                        var _a;
+                                        var _a, _b;
                                         const target = t;
-                                        if (!((_a = target.target) === null || _a === void 0 ? void 0 : _a.url)) {
+                                        if (!((_a = target.target) === null || _a === void 0 ? void 0 : _a.valid)) {
+                                            return;
+                                        }
+                                        if (!((_b = target.target) === null || _b === void 0 ? void 0 : _b.url)) {
                                             throw new error_1.default('Target URL not found', {
                                                 exit: 2
                                             });
                                         }
+                                        if (headersDisplayed.blo === false) {
+                                            (0, logger_1.info)();
+                                            (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>> BrowserLogic <<<<<<<<<<< '));
+                                            headersDisplayed.blo = true;
+                                        }
                                         bioLogUrl(target, masterPort, _logTarg.nameMaxLength);
                                     });
                                     (0, logger_1.info)();
@@ -367,12 +390,18 @@ class Server {
                             return;
                         }
                         loggedEntries++;
-                        (0, logger_1.info)();
-                        (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>> AppSail <<<<<<<<<<<<<< '));
+                        let isHeaderDisplayed = false;
                         _logTarg.targs.forEach((t) => {
-                            var _a;
                             const targetSail = t.target;
-                            const targName = ((_a = targetSail.appSail) === null || _a === void 0 ? void 0 : _a.name) + '';
+                            if (!targetSail.validity.valid) {
+                                return;
+                            }
+                            if (isHeaderDisplayed === false) {
+                                (0, logger_1.info)();
+                                (0, logger_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>> AppSail <<<<<<<<<<<<<< '));
+                                isHeaderDisplayed = true;
+                            }
+                            const targName = targetSail.name + '';
                             (0, logger_1.labeled)(targName +
                                 ' '.repeat((_logTarg.nameMaxLength || targName.length) - targName.length), `http://localhost:${targetSail.port.proxy}`).MESSAGE();
                         });