zcatalyst-cli 1.15.0-beta.2 → 1.15.0-beta.4

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

@@ -29,7 +29,54 @@ const runtime_1 = __importDefault(require("../../../util_modules/constants/lib/r
 const error_1 = __importDefault(require("../../../error"));
 const python_1 = require("../../../fn-utils/lib/python");
 const throbber_1 = __importDefault(require("../../../throbber"));
-exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
+function selFnsPrompt(targs, fnDirPath) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const choicesObj = targs.reduce((accumulator, fn) => {
+            const name = fn.name;
+            const type = fn.type === constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.applogic]
+                ? constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.advanced]
+                : fn.type;
+            const choice = prompt_1.default.choice(name + ' (' + fn.stack + ')', {
+                value: {
+                    id: fn.id + '',
+                    stack: fn.stack,
+                    name,
+                    type: type,
+                    source: (0, path_1.join)(fnDirPath, name)
+                },
+                short: name
+            });
+            accumulator[type] = js_1.JS.isArray(accumulator[type])
+                ? accumulator[type].concat([choice])
+                : [choice];
+            return accumulator;
+        }, {});
+        const choicesArr = js_1.JS.transform(choicesObj, (result, value, key) => {
+            result.push(prompt_1.default.separator('----' + key + '----'));
+            result.push(...value);
+            return result;
+        }, []);
+        const functionsAns = yield prompt_1.default.ask(prompt_1.default.question('functions', 'Select all the functions that you want to pull from remote console : ', {
+            type: 'checkbox',
+            choices: choicesArr,
+            validate: (ansArr) => {
+                if (js_1.JS.isEmpty(ansArr)) {
+                    return ('Must select at least one feature.\n' +
+                        '(Press ' +
+                        (0, ansi_colors_1.cyan)('<space>') +
+                        ' to select, ' +
+                        (0, ansi_colors_1.cyan)('<a>') +
+                        ' to toggle all, ' +
+                        (0, ansi_colors_1.cyan)('<i>') +
+                        ' to invert selection)');
+                }
+                return true;
+            }
+        }));
+        return functionsAns.functions;
+    });
+}
+exports.default = (_fns) => __awaiter(void 0, void 0, void 0, function* () {
     const fnAPI = yield (0, endpoints_1.functionsAPI)();
     const fnDirName = config_1.functionsConfig.source();
     const fnDirPath = (0, project_1.resolveProjectPath)(fnDirName);
@@ -38,50 +85,26 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         (0, logger_1.info)('No function found in remote console.');
         return;
     }
-    const choicesObj = fnArr.reduce((accumulator, fn) => {
-        const name = fn.name;
-        const type = fn.type === constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.applogic]
-            ? constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.advanced]
-            : fn.type;
-        const choice = prompt_1.default.choice(name + ' (' + fn.stack + ')', {
-            value: {
-                id: fn.id + '',
-                stack: fn.stack,
-                name,
-                type: type,
-                source: (0, path_1.join)(fnDirPath, name)
-            },
-            short: name
-        });
-        accumulator[type] = js_1.JS.isArray(accumulator[type])
-            ? accumulator[type].concat([choice])
-            : [choice];
-        return accumulator;
-    }, {});
-    const choicesArr = js_1.JS.transform(choicesObj, (result, value, key) => {
-        result.push(prompt_1.default.separator('----' + key + '----'));
-        result.push(...value);
-        return result;
-    }, []);
-    const functionsAns = yield prompt_1.default.ask(prompt_1.default.question('functions', 'Select all the functions that you want to pull from remote console : ', {
-        type: 'checkbox',
-        choices: choicesArr,
-        validate: (ansArr) => {
-            if (js_1.JS.isEmpty(ansArr)) {
-                return ('Must select at least one feature.\n' +
-                    '(Press ' +
-                    (0, ansi_colors_1.cyan)('<space>') +
-                    ' to select, ' +
-                    (0, ansi_colors_1.cyan)('<a>') +
-                    ' to toggle all, ' +
-                    (0, ansi_colors_1.cyan)('<i>') +
-                    ' to invert selection)');
+    const fns = Array.isArray(_fns) && _fns.length > 0
+        ? _fns.map((fn) => {
+            const idx = fnArr.findIndex((_fn) => _fn.name === fn);
+            if (idx === -1) {
+                throw new error_1.default('Cannot find the function in remote: ' + fn, {
+                    exit: 2
+                });
             }
-            return true;
-        }
-    }));
+            const fnTarg = fnArr.splice(idx, 1)[0];
+            return {
+                id: fnTarg.id + '',
+                stack: fnTarg.stack,
+                name: fnTarg.name,
+                type: fnTarg.type,
+                source: (0, path_1.join)(fnDirPath, fnTarg.name)
+            };
+        })
+        : yield selFnsPrompt(fnArr, fnDirPath);
     const dirOverwriteQns = [];
-    yield Promise.all(functionsAns.functions.map((fn) => __awaiter(void 0, void 0, void 0, function* () {
+    yield Promise.all(fns.map((fn) => __awaiter(void 0, void 0, void 0, function* () {
         const folderExists = yield fs_1.ASYNC.dirExists(fn.source);
         if (folderExists) {
             dirOverwriteQns.push(prompt_1.default.question(fn.name, 'Directory ' + (0, ansi_colors_1.underline)(fn.source) + ' already exists. Overwrite ?', {
@@ -91,7 +114,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         }
     })));
     const dirOverwriteAns = yield prompt_1.default.ask(...dirOverwriteQns);
-    let targets = functionsAns.functions.filter((fn) => {
+    let targets = fns.filter((fn) => {
         if (dirOverwriteAns[fn.name] === undefined || dirOverwriteAns[fn.name]) {
             return true;
         }
@@ -116,13 +139,13 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         yield fs_1.ASYNC.ensureDir(fn.source);
         const buffer = (yield fnAPI.download(fn.id));
         yield new archiver_1.default().load(buffer).extract((0, path_1.join)(fnDirPath, fn.name)).finalize();
-        if ((_a = fn.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.nodejs)) {
+        if ((_a = fn.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.node.value)) {
             yield (0, languages_1.node)(fn);
         }
-        else if ((_b = fn.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java)) {
+        else if ((_b = fn.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java.value)) {
             yield (0, languages_1.java)(fn);
         }
-        else if ((_c = fn.stack) === null || _c === void 0 ? void 0 : _c.startsWith(runtime_1.default.language.python)) {
+        else if ((_c = fn.stack) === null || _c === void 0 ? void 0 : _c.startsWith(runtime_1.default.language.python.value)) {
             yield (0, languages_1.python)(fn);
             const reqFile = (0, path_1.join)(fn.source, constants_1.FILENAME.functions.python_requirements);
             const requirementsExists = yield fs_1.ASYNC.readFile(reqFile);

package/lib/serve/features/appsail.js

@@ -0,0 +1,37 @@
+"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 appsail_utils_1 = require("../../appsail-utils");
+const port_resolver_1 = __importDefault(require("../../port-resolver"));
+const runtime_store_1 = __importDefault(require("../../runtime-store"));
+const config_1 = require("../../util_modules/config");
+const logger_1 = require("../../util_modules/logger");
+exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
+    const allTargets = yield config_1.appSailConfig.getAllTargetDetails();
+    const optionTargets = (0, appsail_utils_1.filterTargets)(allTargets || []);
+    if (optionTargets.length === 0) {
+        (0, logger_1.debug)('AppSail targets are empty');
+        return;
+    }
+    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;
+        if (!targ.validity.valid) {
+            return targ;
+        }
+        const port = yield port_resolver_1.default.getPort('appsail', 'http', (_a = targ.appSail) === null || _a === void 0 ? void 0 : _a.name);
+        return Object.assign(Object.assign({}, targ), { port });
+    })));
+    runtime_store_1.default.set('context.appsail.targets', filledTargets);
+});

package/lib/serve/features/index.js

@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.apig = exports.functions = exports.client = void 0;
+exports.appsail = 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"));
@@ -74,3 +74,10 @@ function apig() {
     });
 }
 exports.apig = apig;
+function appsail() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const appSailModule = yield Promise.resolve().then(() => __importStar(require('./appsail.js')));
+        yield appSailModule.default();
+    });
+}
+exports.appsail = appsail;

package/lib/serve/index.js

@@ -99,11 +99,31 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                 advancedServer.add('functions', target);
             }
             else if (target.type === constants_1.FN_TYPE.basic &&
-                ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python))) {
+                ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python.value))) {
                 advancedServer.add('functions', target);
             }
             return target.valid;
         });
+        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) +
+                        '] since ' +
+                        sail.validity.reason);
+                    return false;
+                }
+                advancedServer.add('appsail', sail);
+                return true;
+            });
+            if (validAppSail.length === 0) {
+                (0, logger_1.labeled)('AppSail', 'No targets are ready to be served in local').WARN();
+                serveTargets.splice(serveTargets.indexOf('appsail'), 1);
+                runtime_store_1.default.set('context.targets', serveTargets);
+            }
+        }
         if (serveTargets.includes('client')) {
             const client = runtime_store_1.default.get('context.client', false);
             if (client && client.valid) {
@@ -130,13 +150,10 @@ 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' });
         }
-        const basicFn = runtime_store_1.default
-            .get('context.functions.targets', [])
-            .find((target) => {
+        const basicFn = functionTargets.find((target) => {
             var _a;
             return target.type === constants_1.FN_TYPE.basic &&
-                !((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python)) &&
-                target.valid;
+                !((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.python.value));
         });
         if (basicFn) {
             yield basicFnServer.start();