zcatalyst-cli 1.21.0 → 1.22.1

package/lib/pull/features/client.js

@@ -22,15 +22,15 @@ const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const config_1 = require("../../util_modules/config");
 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 index_1 = require("../../util_modules/logger/index");
+const path_1 = require("path");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const clientDirName = config_1.clientConfig.source();
-    const clientDirPath = (0, project_1.resolveProjectPath)(clientDirName);
+    const clientDirPath = clientDirName;
     const webappAPI = yield (0, endpoints_1.clientAPI)();
     const historyArr = (yield webappAPI.getAllHistory());
     if (historyArr.length === 0) {
-        (0, logger_1.info)('No history details found in remote console');
+        (0, index_1.info)('No history details found in remote console');
         return;
     }
     const folderExits = yield fs_1.ASYNC.dirExists(clientDirPath);
@@ -41,7 +41,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         }))
         : { overwrite: true };
     if (!overwriteAns.overwrite) {
-        (0, logger_1.info)('Skipping client pull');
+        (0, index_1.info)('Skipping client pull');
         return;
     }
     yield fs_1.ASYNC.deleteDir(clientDirPath).catch();
@@ -52,7 +52,8 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         }
         return prompt_1.default.choice(history.app_version + live, {
             value: history.history_id,
-            short: history.app_version
+            short: history.app_version,
+            id: history.app_version
         });
     });
     const historyAns = yield prompt_1.default.ask(prompt_1.default.question('history', 'Select a Catalyst client app version : ', {
@@ -62,10 +63,10 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const clientZip = (yield webappAPI.download(historyAns.history));
         yield new archiver_1.default().load(clientZip).extract(clientDirPath).finalize();
-        yield client_utils_1.clientUtils.validate();
+        yield client_utils_1.clientUtils.validate({ skipPluginValidation: true });
     }
     catch (err) {
-        runtime_store_1.default.set('payload.client.status', 1);
+        runtime_store_1.default.set('context.payload.client.status', 1);
         if (err instanceof error_1.default) {
             throw new error_1.default(err.message, {
                 exit: err.exit,
@@ -74,6 +75,6 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         }
         throw err;
     }
-    runtime_store_1.default.set('payload.client', runtime_store_1.default.get('context.client'));
-    runtime_store_1.default.set('payload.client.source', (0, project_1.resolveProjectPath)(clientDirName));
+    runtime_store_1.default.set('context.payload.client', runtime_store_1.default.get('context.client'));
+    runtime_store_1.default.set('context.payload.client.source', (0, path_1.basename)(clientDirName));
 });

package/lib/pull/features/functions/index.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (_fns?: Array<string>) => Promise<void>;
+export default _default;

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

@@ -23,14 +23,13 @@ const config_1 = require("../../../util_modules/config");
 const constants_1 = require("../../../util_modules/constants");
 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 index_1 = require("../../../util_modules/logger/index");
 const runtime_1 = __importDefault(require("../../../util_modules/constants/lib/runtime"));
 const error_1 = __importDefault(require("../../../error"));
 const python_1 = require("../../../fn-utils/lib/python");
 const throbber_1 = __importDefault(require("../../../throbber"));
-const ensure_java_userconfig_1 = require("../../../fn-utils/lib/ensure-java-userconfig");
-const char_1 = require("../../../util_modules/char");
+const ensure_java_userconfig_1 = require("../../../fn-utils/lib/java/ensure-java-userconfig");
+const logger_1 = require("../../../util_modules/logger");
 function selFnsPrompt(targs, fnDirPath) {
     return __awaiter(this, void 0, void 0, function* () {
         const choicesObj = targs.reduce((accumulator, fn) => {
@@ -39,6 +38,7 @@ function selFnsPrompt(targs, fnDirPath) {
                 ? constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.advanced]
                 : fn.type;
             const choice = prompt_1.default.choice(name + ' (' + fn.stack + ')', {
+                id: name,
                 value: {
                     id: fn.id + '',
                     stack: fn.stack,
@@ -80,11 +80,10 @@ function selFnsPrompt(targs, fnDirPath) {
 }
 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);
+    const fnDirPath = config_1.functionsConfig.source();
     const fnArr = (yield fnAPI.getAllFunctions());
     if (!Array.isArray(fnArr) || fnArr.length === 0) {
-        (0, logger_1.info)('No function found in remote console.');
+        (0, index_1.info)('No function found in remote console.');
         return;
     }
     const fns = Array.isArray(_fns) && _fns.length > 0
@@ -120,7 +119,7 @@ exports.default = (_fns) => __awaiter(void 0, void 0, void 0, function* () {
         if (dirOverwriteAns[fn.name] === undefined || dirOverwriteAns[fn.name]) {
             return true;
         }
-        (0, logger_1.message)('skipping pull of function: ' + fn.name);
+        (0, index_1.message)('skipping pull of function: ' + fn.name);
         return false;
     });
     if (js_1.JS.isEmpty(targets)) {
@@ -148,8 +147,14 @@ exports.default = (_fns) => __awaiter(void 0, void 0, void 0, function* () {
                 yield (0, languages_1.node)(fn);
             }
             else if ((_b = fn.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java.value)) {
-                yield (0, ensure_java_userconfig_1.ensureJava)(fn);
-                yield (0, languages_1.java)(fn);
+                const binPath = yield (0, ensure_java_userconfig_1.ensureJava)(fn.stack);
+                if (binPath) {
+                    yield (0, languages_1.java)(fn);
+                }
+                else {
+                    fn.valid = false;
+                    fn.failure_reason = 'unable to detect the java bin path';
+                }
             }
             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);
@@ -177,54 +182,46 @@ exports.default = (_fns) => __awaiter(void 0, void 0, void 0, function* () {
         }
         catch (err) {
             const error = err;
-            let message = error.message;
-            if (error instanceof error_1.default) {
-                if (error.errorId && error.errorId === 'JAVACONFIG-3') {
-                    message = `You are trying to pull a function of a higher stack version[${fn.stack}]. Please provide a valid java binary path for the config key ${fn.stack}.bin to pull function[${fn.name}].`;
-                }
-            }
             throbber.remove('function_pull_' + fn.name);
-            (0, logger_1.warning)(`Skipping pull of function(${fn.name}). ${message}`);
-            fn.failure_reason = `there was an error while pulling function [${fn.name}]. ${message}`;
+            (0, index_1.warning)(`Skipping pull of function(${fn.name}). ${error.message}`);
+            fn.failure_reason = `there was an error while pulling function [${fn.name}]. ${error.message}`;
             isFnPulledFailed = true;
         }
         throbber.remove('function_pull_' + fn.name);
         return fn;
     })));
     targets = targets.filter((target) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         if (!target.valid &&
-            !((_a = target.failure_reason) === null || _a === void 0 ? void 0 : _a.startsWith('unable to locate python')) &&
-            !((_b = target.failure_reason) === null || _b === void 0 ? void 0 : _b.includes('You are trying to pull a function of a higher stack version'))) {
-            (0, logger_1.debug)('Invalid target : ' + target.name + ' reason : ' + target.failure_reason);
-            (0, logger_1.warning)(`skipping pull of function(${target.name}) since the package is invalid. \nContact catalyst support with debug log.`);
+            !((_a = target.failure_reason) === null || _a === void 0 ? void 0 : _a.toString().startsWith('unable to locate python')) &&
+            !((_b = target.failure_reason) === null || _b === void 0 ? void 0 : _b.toString().includes('You are trying to pull a function of a higher stack version')) &&
+            !((_c = target.failure_reason) === null || _c === void 0 ? void 0 : _c.toString().includes('unable to detect the java bin path'))) {
+            (0, index_1.debug)('Invalid target : ' + target.name + ' reason : ' + target.failure_reason);
+            (0, index_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 });
         }
-        else if (!target.valid && ((_c = target.failure_reason) === null || _c === void 0 ? void 0 : _c.startsWith('unable to locate python'))) {
-            (0, logger_1.warning)(`skipping pull of function(${target.name}) since ${target.failure_reason}`);
-        }
-        if (target.compilationError) {
-            target.compilationError.forEach((error) => {
-                console.log(`${(0, ansi_colors_1.red)(char_1.CHAR.error)} Error while compiling function[${target.name}]`);
-                console.log(error);
-            });
-        }
-        if (target.compilationWarning) {
-            target.compilationWarning.forEach((warn) => {
-                console.warn(`${(0, ansi_colors_1.yellow)(char_1.CHAR.warning)} Warning while compiling function[${target.name}]`);
-                console.warn(warn);
-            });
+        else if (!target.valid &&
+            ((_d = target.failure_reason) === null || _d === void 0 ? void 0 : _d.toString().startsWith('unable to locate python'))) {
+            (0, index_1.warning)(`skipping pull of function(${target.name}) since ${target.failure_reason}`);
         }
+        (_g = (_f = (_e = target.additionalInfo) === null || _e === void 0 ? void 0 : _e.compilerOut) === null || _f === void 0 ? void 0 : _f.error) === null || _g === void 0 ? void 0 : _g.forEach((error) => {
+            console.log(`${(0, ansi_colors_1.red)(logger_1.CHAR.error)} Error while compiling function[${target.name}]`);
+            console.log(error);
+        });
+        (_k = (_j = (_h = target.additionalInfo) === null || _h === void 0 ? void 0 : _h.compilerOut) === null || _j === void 0 ? void 0 : _j.warning) === null || _k === void 0 ? void 0 : _k.forEach((warn) => {
+            console.warn(`${(0, ansi_colors_1.yellow)(logger_1.CHAR.warning)} Warning while compiling function[${target.name}]`);
+            console.warn(warn);
+        });
         return target.valid;
     });
     if (isFnPulled) {
-        runtime_store_1.default.set('payload.functions.targets', targets);
-        runtime_store_1.default.set('payload.functions.source', fnDirName);
+        runtime_store_1.default.set('context.payload.functions.targets', targets);
+        runtime_store_1.default.set('context.payload.functions.source', (0, path_1.basename)(config_1.functionsConfig.source()));
         if (isFnPulledFailed) {
-            runtime_store_1.default.set('payload.functions.status', 1);
+            runtime_store_1.default.set('context.payload.functions.status', 1);
         }
         else {
-            runtime_store_1.default.set('payload.functions.status', 2);
+            runtime_store_1.default.set('context.payload.functions.status', 2);
         }
     }
 });

package/lib/pull/features/functions/languages.d.ts

@@ -0,0 +1,4 @@
+import { IFnTarget, JavaFn, NodeFn, PythonFn } from '../../../fn-utils/lib/common';
+export declare function node(target: IFnTarget<NodeFn>): Promise<void>;
+export declare function java(target: IFnTarget<JavaFn>): Promise<void>;
+export declare function python(target: IFnTarget<PythonFn>): Promise<void>;

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

@@ -15,21 +15,21 @@ const js_1 = require("../../../util_modules/js");
 function node(target) {
     return __awaiter(this, void 0, void 0, function* () {
         const refinedTargets = yield fn_utils_1.fnUtils.common.refineTargets([target.source]);
-        yield fn_utils_1.fnUtils.node.validate([js_1.JS.assignIn(target, refinedTargets[0])], 0);
+        yield fn_utils_1.fnUtils.node.validate([js_1.JS.assignIn(target, refinedTargets[0])]);
     });
 }
 exports.node = node;
 function java(target) {
     return __awaiter(this, void 0, void 0, function* () {
         const refinedTargets = yield fn_utils_1.fnUtils.common.refineTargets([target.source]);
-        yield fn_utils_1.fnUtils.java.validate([js_1.JS.assignIn(target, refinedTargets[0])], 0);
+        yield fn_utils_1.fnUtils.java.validate([js_1.JS.assignIn(target, refinedTargets[0])]);
     });
 }
 exports.java = java;
 function python(target) {
     return __awaiter(this, void 0, void 0, function* () {
         const refinedTargets = yield fn_utils_1.fnUtils.common.refineTargets([target.source]);
-        yield fn_utils_1.fnUtils.python.validate([js_1.JS.assignIn(target, refinedTargets[0])], 0);
+        yield fn_utils_1.fnUtils.python.validate([js_1.JS.assignIn(target, refinedTargets[0])]);
     });
 }
 exports.python = python;

package/lib/pull/features/index.d.ts

@@ -0,0 +1,6 @@
+declare const _default: {
+    functions: () => Promise<void>;
+    client: () => Promise<void>;
+    apig: () => Promise<void>;
+};
+export default _default;

package/lib/pull/index.d.ts

@@ -0,0 +1,2 @@
+declare function pull(): Promise<void>;
+export default pull;

package/lib/pull/index.js

@@ -13,10 +13,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
-const error_1 = __importDefault(require("../error"));
+const index_js_1 = __importDefault(require("../error/index.js"));
 const runtime_store_1 = __importDefault(require("../runtime-store"));
 const js_1 = require("../util_modules/js");
-const logger_1 = require("../util_modules/logger");
+const index_1 = require("../util_modules/logger/index");
 const features_1 = __importDefault(require("./features"));
 function pull() {
     return __awaiter(this, void 0, void 0, function* () {
@@ -26,7 +26,7 @@ function pull() {
         }
         const feature = featureList.shift();
         if (!Object.keys(features_1.default).includes(feature)) {
-            throw new error_1.default('invalid feature for pull', {
+            throw new index_js_1.default('invalid feature for pull', {
                 exit: 1,
                 errorId: 'PULL-1',
                 arg: [
@@ -38,13 +38,13 @@ function pull() {
             });
         }
         const MODULE = features_1.default[feature];
-        (0, logger_1.info)((0, ansi_colors_1.bold)('\n' + (0, ansi_colors_1.white)('===> ') + js_1.JS.capitalize(feature) + ' Setup'));
+        (0, index_1.info)((0, ansi_colors_1.bold)('\n' + (0, ansi_colors_1.white)('===> ') + js_1.JS.capitalize(feature) + ' Setup'));
         yield MODULE().catch((err) => {
-            (0, logger_1.info)();
-            (0, logger_1.warning)(`Skipping pull of ${feature}. Since ${err.message}.\nContact Catalyst Support with catalyst-debug.log file.`);
+            (0, index_1.info)();
+            (0, index_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));
+        if (runtime_store_1.default.get('context.payload.' + feature, false)) {
+            runtime_store_1.default.set('context.payload.features', runtime_store_1.default.get('context.payload.features', []).concat(feature));
         }
         return pull();
     });

package/lib/repl-server.d.ts

@@ -0,0 +1,32 @@
+/// <reference types="node" />
+import { REPLServer } from 'repl';
+declare class Repl {
+    prompt: string;
+    writer: (output: unknown) => string;
+    useColors: boolean;
+    ignoreUndefined: boolean;
+    server: null | REPLServer;
+    context: Array<{
+        command: string;
+        exe: unknown;
+    }>;
+    paused: boolean;
+    closed: boolean;
+    pureEmit: (event: string | symbol, ...args: Array<any>) => boolean;
+    constructor({ prompt, writer, useColors, ignoreUndefined }?: {
+        prompt?: string | undefined;
+        writer?: ((output: unknown) => string) | undefined;
+        useColors?: boolean | undefined;
+        ignoreUndefined?: boolean | undefined;
+    });
+    start(): Repl;
+    emit(eventName: string, ...inputs: Array<any>): boolean;
+    showPrompt(): void;
+    setContext(command: string, exe: unknown): Repl;
+    close(): void;
+    pause(): void;
+    resume(): void;
+    wait(): Promise<void>;
+    write(str?: string): void;
+}
+export default Repl;

package/lib/repl-server.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const repl_1 = require("repl");
 const util_1 = require("util");
-const error_1 = __importDefault(require("./error"));
-const logger_1 = require("./util_modules/logger");
+const index_js_1 = __importDefault(require("./error/index.js"));
+const index_1 = require("./util_modules/logger/index");
 const stdin = process.stdin;
 const ASCII_ETX_CODE = 0x03;
 class Repl {
@@ -40,13 +40,13 @@ class Repl {
     }
     emit(eventName, ...inputs) {
         if (this.server === null) {
-            throw new error_1.default('emit cannot be called before server is started', { exit: 2 });
+            throw new index_js_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 index_js_1.default('showPrompt cannot be called before server is started', {
                 exit: 2
             });
         }
@@ -56,7 +56,7 @@ class Repl {
     }
     setContext(command, exe) {
         if (this.server === null) {
-            throw new error_1.default('context cannot be set before server is started', { exit: 2 });
+            throw new index_js_1.default('context cannot be set before server is started', { exit: 2 });
         }
         const context = this.server.context;
         this.context.push({ command, exe });
@@ -68,7 +68,7 @@ class Repl {
     }
     close() {
         if (this.server === null) {
-            throw new error_1.default('close cannot be called before server is started', { exit: 2 });
+            throw new index_js_1.default('close cannot be called before server is started', { exit: 2 });
         }
         this.server.close();
     }
@@ -98,7 +98,7 @@ 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 index_js_1.default('wait cannot be called before server is started', {
                     exit: 2
                 });
             }
@@ -114,7 +114,7 @@ class Repl {
         if (((_a = this.server) === null || _a === void 0 ? void 0 : _a.getCursorPos().cols) !== this.prompt.length) {
             (_b = this.server) === null || _b === void 0 ? void 0 : _b.prompt();
         }
-        (0, logger_1.info)(str);
+        (0, index_1.info)(str);
         (_c = this.server) === null || _c === void 0 ? void 0 : _c.prompt();
     }
 }

package/lib/runtime-store.d.ts

@@ -0,0 +1,3 @@
+import _runtime from './util_modules/runtime-store';
+declare const _default: _runtime;
+export default _default;

package/lib/runtime-store.js

@@ -1,13 +1,7 @@
-'use strict';
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const js_1 = require("./util_modules/js");
-class runtime {
-    static get(path, fallback) {
-        return js_1.JS.get(runtime.store, path, fallback);
-    }
-    static set(path, value) {
-        js_1.JS.set(runtime.store, path, value);
-    }
-}
-exports.default = runtime;
-runtime.store = {};
+const runtime_store_1 = __importDefault(require("./util_modules/runtime-store"));
+exports.default = new runtime_store_1.default('CLI');

package/lib/serve/features/apig.d.ts

@@ -0,0 +1,3 @@
+import { IAPIGLocal } from '../../apig-utils';
+declare const _default: () => Promise<IAPIGLocal | undefined>;
+export default _default;

package/lib/serve/features/apig.js

@@ -11,13 +11,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const apig_utils_1 = require("../../apig-utils");
 const config_1 = require("../../util_modules/config");
-const logger_1 = require("../../util_modules/logger");
+const index_1 = require("../../util_modules/logger/index");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     if (!config_1.apigConfig.enabled()) {
-        (0, logger_1.info)('Skipping API Gateway rules');
+        (0, index_1.info)('Skipping API Gateway rules');
         return;
     }
-    apig_utils_1.apigUtils.executeHook({ prefix: 'pre', command: 'serve' });
+    yield apig_utils_1.apigUtils.executeHook({ prefix: 'pre', command: 'serve' });
     const rulesArr = yield apig_utils_1.apigUtils.validate();
     return apig_utils_1.apigUtils.compile(rulesArr);
 });

package/lib/serve/features/appsail.d.ts

@@ -0,0 +1,16 @@
+import { TAppSailDetails } from '../../util_modules/config/lib/appsail';
+export type TAppSailServerDetails = TAppSailDetails & {
+    port: {
+        appsail: {
+            host: number;
+            container?: number;
+        };
+        proxy: number;
+        debug: {
+            host: number;
+            container?: number;
+        };
+    };
+};
+declare const _default: () => Promise<Array<TAppSailServerDetails>>;
+export default _default;

package/lib/serve/features/appsail.js

@@ -18,16 +18,17 @@ const port_resolver_1 = __importDefault(require("../../port-resolver"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const config_1 = require("../../util_modules/config");
 const constants_1 = require("../../util_modules/constants");
-const logger_1 = require("../../util_modules/logger");
+const index_1 = require("../../util_modules/logger/index");
 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;
+        (0, index_1.debug)('AppSail targets are empty');
+        return [];
     }
-    const validated = (0, appsail_utils_1.validateAppSail)(optionTargets);
+    const validated = yield (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, _c, _d, _e, _f, _g, _h, _j, _k;
         if (!targ.validity.valid) {
             return targ;
         }
@@ -38,12 +39,53 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         }).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: targ.name + '_proxy',
-            server: 'service',
-            searchSpan: constants_1.DEFAULT.serve_port.search_span.http_port
-        });
-        return Object.assign(Object.assign({}, targ), { port: { appsail: appsailPort, proxy: proxyPort }, trigger: { kill: false } });
+        const AppSailServerDetails = Object.assign(Object.assign({}, targ), { port: {
+                appsail: {
+                    host: -1
+                },
+                proxy: proxyPort,
+                debug: {
+                    host: runtime_store_1.default.get(`context.port.debug.appsail.${targ.name}`, -1),
+                    container: (_b = (_a = targ.config) === null || _a === void 0 ? void 0 : _a.port) === null || _b === void 0 ? void 0 : _b.debug
+                }
+            } });
+        if (targ.runtime === 'catalyst') {
+            try {
+                const appsailPort = ((_d = (_c = targ.config) === null || _c === void 0 ? void 0 : _c.port) === null || _d === void 0 ? void 0 : _d.http)
+                    ? yield port_resolver_1.default.getFreePort(targ.config.port.http)
+                    : yield port_resolver_1.default.getPort('appsail', 'http', {
+                        name: targ.name + '_proxy',
+                        server: 'service',
+                        searchSpan: constants_1.DEFAULT.serve_port.search_span.http_port
+                    });
+                AppSailServerDetails.port.appsail.host = appsailPort;
+            }
+            catch (er) {
+                throw new error_1.default(((_f = (_e = targ.config) === null || _e === void 0 ? void 0 : _e.port) === null || _f === void 0 ? void 0 : _f.http)
+                    ? `The port ${(_h = (_g = targ.config) === null || _g === void 0 ? void 0 : _g.port) === null || _h === void 0 ? void 0 : _h.http} configured for the AppSail ${targ.name} is not available`
+                    : 'Unable to find a free port to serve the AppSail: ' + targ.name, {
+                    exit: 1,
+                    original: er
+                });
+            }
+        }
+        else {
+            try {
+                const hostBindPort = yield port_resolver_1.default.getPort('appsail', 'http', {
+                    name: targ.name + '_proxy',
+                    server: 'service',
+                    searchSpan: constants_1.DEFAULT.serve_port.search_span.http_port
+                });
+                AppSailServerDetails.port.appsail.host = hostBindPort;
+                AppSailServerDetails.port.appsail.container = (_k = (_j = targ.config) === null || _j === void 0 ? void 0 : _j.port) === null || _k === void 0 ? void 0 : _k.http;
+            }
+            catch (er) {
+                throw new error_1.default('Unable to find a host port to bind with the AppSail container for serving the AppSail: ' +
+                    targ.name, { exit: 1, original: er });
+            }
+        }
+        return AppSailServerDetails;
     })));
     runtime_store_1.default.set('context.appsail.targets', filledTargets);
+    return filledTargets;
 });

package/lib/serve/features/client.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => Promise<Record<string, unknown>>;
+export default _default;

package/lib/serve/features/client.js

@@ -11,6 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const client_utils_1 = require("../../client-utils");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
-    client_utils_1.clientUtils.executeHook({ prefix: 'pre', command: 'serve' });
+    yield client_utils_1.clientUtils.executeHook({ prefix: 'pre', command: 'serve' });
     return client_utils_1.clientUtils.validate();
 });

package/lib/serve/features/index.d.ts

@@ -0,0 +1,8 @@
+import { IFnTarget } from '../../fn-utils/lib/common.js';
+import { TAppSailServerDetails } from './appsail.js';
+import { TSlateServerDetails } from './slate.js';
+export declare function client(): Promise<void>;
+export declare function functions(): Promise<Array<IFnTarget>>;
+export declare function apig(): Promise<void>;
+export declare function appsail(): Promise<Array<TAppSailServerDetails>>;
+export declare function slate(): Promise<Array<TSlateServerDetails>>;

package/lib/serve/features/index.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.slate = exports.appsail = exports.apig = exports.functions = exports.client = void 0;
-const error_1 = __importDefault(require("../../error"));
+const index_js_1 = __importDefault(require("../../error/index.js"));
 const port_resolver_1 = __importDefault(require("../../port-resolver"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
@@ -48,7 +48,7 @@ function client() {
             yield clientModule.default();
         }
         catch (e) {
-            const err = error_1.default.getErrorInstance(e);
+            const err = index_js_1.default.getErrorInstance(e);
             (0, logger_1.info)();
             (0, logger_1.warning)('Skipping the serve of Client because of the error: ' + err.message);
             (0, logger_1.info)();
@@ -66,7 +66,7 @@ exports.client = client;
 function functions() {
     return __awaiter(this, void 0, void 0, function* () {
         const fnModule = yield Promise.resolve().then(() => __importStar(require('../../shell/prepare')));
-        yield fnModule.default([constants_1.FN_TYPE.basic, constants_1.FN_TYPE.advanced, constants_1.FN_TYPE.browserLogic]);
+        return fnModule.default([constants_1.FN_TYPE.basic, constants_1.FN_TYPE.advanced, constants_1.FN_TYPE.browserLogic]);
     });
 }
 exports.functions = functions;
@@ -80,14 +80,14 @@ 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();
+        return appSailModule.default();
     });
 }
 exports.appsail = appsail;
 function slate() {
     return __awaiter(this, void 0, void 0, function* () {
-        const appSailModule = yield Promise.resolve().then(() => __importStar(require('./slate.js')));
-        yield appSailModule.default();
+        const slateModule = yield Promise.resolve().then(() => __importStar(require('./slate.js')));
+        return slateModule.default();
     });
 }
 exports.slate = slate;

package/lib/serve/features/slate.d.ts

@@ -0,0 +1,12 @@
+import { ISlateConfig } from '../../util_modules/config/lib/slate';
+export type TSlateServerDetails = ISlateConfig & {
+    port: {
+        slate: number;
+        proxy: number;
+    };
+    trigger: {
+        kill: boolean;
+    };
+};
+declare const _default: () => Promise<Array<TSlateServerDetails>>;
+export default _default;

package/lib/serve/features/slate.js

@@ -24,7 +24,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const optionTargets = slate_utils_1.slateUtils.filterTargets(allTargets || []);
     if (optionTargets.length === 0) {
         (0, logger_1.debug)('Slate targets are empty');
-        return;
+        return [];
     }
     const validated = (0, slate_utils_1.validateServeCommand)(optionTargets);
     const filledTargets = yield Promise.all(validated.map((targ) => __awaiter(void 0, void 0, void 0, function* () {
@@ -46,4 +46,5 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         return Object.assign(Object.assign({}, targ), { port: { slate: slatePort, proxy: proxyPort }, trigger: { kill: false } });
     })));
     runtime_store_1.default.set('context.slate.targets', filledTargets);
+    return filledTargets;
 });

package/lib/serve/index.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => Promise<void>;
+export default _default;