zcatalyst-cli 1.10.0 → 1.12.0

package/lib/serve/index.js

@@ -54,7 +54,8 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         runtime_store_1.default.set('context.port.http.master', masterPort);
         yield Promise.all(serveTargets.map((target) => features[target]()));
         const rawTargets = runtime_store_1.default.get('context.functions.targets', []);
-        if (option_1.getOptionValue('watch', false)) {
+        const watchOpt = option_1.getOptionValue('watch', false);
+        if (watchOpt) {
             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) => {
@@ -73,6 +74,10 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         if (serveTargets.includes('client')) {
             const client = runtime_store_1.default.get('context.client', false);
             if (client && client.valid) {
+                client.opts = {
+                    open: option_1.getOptionValue('open', false),
+                    watch: watchOpt
+                };
                 advancedServer.add('client', client);
             }
             else {

package/lib/serve/server/index.js

@@ -1,4 +1,23 @@
 '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) {
@@ -35,6 +54,7 @@ const js_1 = require("../../util_modules/js");
 const logger_1 = require("../../util_modules/logger");
 const shell_1 = require("../../util_modules/shell");
 const master_1 = __importDefault(require("./lib/master"));
+const ansi_colors_1 = require("ansi-colors");
 class Server {
     constructor() {
         this.targetDetailsArr = [];
@@ -85,8 +105,8 @@ class Server {
             opts.push(details.httpPort + '');
             const targetSource = (_c = details.target) === null || _c === void 0 ? void 0 : _c.source;
             const configType = details.type === 'server' ? 'functions' : details.type;
-            const servePlugin = yield plugin_loader_1.default(configType, 'start', targetSource);
-            if (servePlugin !== undefined) {
+            const servePlugin = yield plugin_loader_1.default(configType, 'start', targetSource).catch((err) => logger_1.debug(err));
+            if (typeof servePlugin === 'function') {
                 const event = servePlugin(details, masterPort);
                 logger_1.labeled(label, `Plugin : "${runtime_store_1.default.get(`context.${configType}.plugins.start${targetSource ? '.' + targetSource : ''}`)}" is used for ${details.type} serve`).MESSAGE();
                 return event;
@@ -111,7 +131,7 @@ class Server {
             const label = `${details.type}[${(_a = details.target) === null || _a === void 0 ? void 0 : _a.name}]`;
             const _d = details.target, { ['watcher']: _ } = _d, serialisableTarget = __rest(_d, ['watcher']);
             const opts = [
-                path_1.join(__dirname, 'lib', details.type === 'client' ? 'client.js' : 'node.js'),
+                path_1.join(__dirname, 'lib', 'node.js'),
                 details.httpPort + '',
                 JSON.stringify(serialisableTarget)
             ];
@@ -121,12 +141,28 @@ class Server {
             }
             const targetSource = (_b = details.target) === null || _b === void 0 ? void 0 : _b.source;
             const configType = details.type === 'server' ? 'functions' : details.type;
-            const servePlugin = yield plugin_loader_1.default(configType, 'start', targetSource);
-            if (servePlugin !== undefined) {
-                const event = servePlugin(details, masterPort);
+            const servePlugin = yield plugin_loader_1.default(configType, 'start', targetSource).catch((err) => logger_1.debug(err));
+            if (typeof servePlugin === 'function') {
+                const event = servePlugin(details, masterPort).catch((e) => {
+                    var _a, _b;
+                    const err = error_1.default.getErrorInstance(e, {
+                        fileName: __filename,
+                        skipHelp: false
+                    });
+                    err.errorId = 'SERVE-IDX-1';
+                    err.arg = [
+                        configType,
+                        ansi_colors_1.bold(((_b = (_a = details.target) === null || _a === void 0 ? void 0 : _a.plugins) === null || _b === void 0 ? void 0 : _b.start)[targetSource] || 'start'),
+                        ansi_colors_1.bold('Error: ') + ansi_colors_1.italic.red(err.message)
+                    ];
+                    throw err;
+                });
                 logger_1.labeled(label, `Plugin : "${runtime_store_1.default.get(`context.${configType}.plugins.start${targetSource ? '.' + targetSource : ''}`)}" is used for ${details.type} serve`).MESSAGE();
                 return event;
             }
+            if (details.type === 'client') {
+                return yield (yield Promise.resolve().then(() => __importStar(require('./lib/web_client/index.js')))).default(details, masterPort);
+            }
             const child = shell_1.spawn('node', opts, {
                 cwd: targetSource,
                 stdio: 'pipe',
@@ -136,7 +172,7 @@ class Server {
                     X_ZOHO_CATALYST_CONSOLE_URL: constants_1.ORIGIN.admin
                 }
             }).RAW();
-            logger_1.labeled(label, `URL : http://localhost:${masterPort}/${details.type === 'client' ? 'app/' : 'server/' + ((_c = details.target) === null || _c === void 0 ? void 0 : _c.name) + '/'}`).MESSAGE();
+            logger_1.labeled(label, `URL : http://localhost:${masterPort}/server/${(_c = details.target) === null || _c === void 0 ? void 0 : _c.name}/`).MESSAGE();
             logger_1.info();
             return child;
         });
@@ -196,7 +232,15 @@ class Server {
             this.masterServer = server;
             return new Promise((res) => {
                 server.on('listening', () => {
-                    this.targetDetailsArr.forEach((targetDetails) => { var _a; return (_a = targetDetails.process) === null || _a === void 0 ? void 0 : _a.emit('start'); });
+                    this.targetDetailsArr.forEach((targetDetails) => {
+                        var _a;
+                        if (targetDetails.process &&
+                            'send' in targetDetails.process) {
+                            targetDetails.process.send('start');
+                            return;
+                        }
+                        (_a = targetDetails.process) === null || _a === void 0 ? void 0 : _a.emit('start');
+                    });
                     res();
                 });
             });

package/lib/serve/server/lib/master.js

@@ -122,26 +122,36 @@ function spinUpMaster(listenPort, otherServerDetails) {
             app.use('/', apig_matcher_1.default, auth_checker_1.default, url_rewriter_1.default);
         }
         const proxy = http_proxy_1.createProxyServer()
-            .on('error', (err, req) => {
+            .on('error', (err, req, res) => {
+            res.writeHead(503, { 'Content-Type': 'json' });
+            res.write(JSON.stringify({ error: 'unable to proxy request' }));
+            res.end();
             console.log('unable to proxy request ', req.url);
             console.error(err);
         })
-            .on('proxyRes', proxyResponseHandler(systemRoutes));
+            .on('proxyRes', proxyResponseHandler(systemRoutes))
+            .on('proxyReq', (proxyReq) => {
+            const id = js_1.JS.randomNumber(4) + '';
+            connections[id] = proxyReq;
+            proxyReq.on('finish', () => {
+                delete connections[id];
+            });
+        })
+            .on('close', () => logger_2.debug('proxy closed'));
         otherServerDetails.forEach((serverDetail) => {
             var _a, _b, _c, _d, _e, _f;
             switch (serverDetail.type) {
                 case 'client':
                     const appTarget = `http://127.0.0.1:${serverDetail.httpPort}/app/`;
                     app.use('/app', (req, res) => {
-                        var _a;
-                        if (req.url.startsWith('/local-redirect') &&
-                            ((_a = serverDetail.target) === null || _a === void 0 ? void 0 : _a.login_redirect)) {
-                            const isUrl = serverDetail.target.login_redirect.startsWith('/');
+                        const target = serverDetail.target;
+                        if (req.url.startsWith('/local-redirect') && target.login_redirect) {
+                            const isUrl = target.login_redirect.startsWith('/');
                             if (isUrl) {
-                                res.redirect(serverDetail.target.login_redirect);
+                                res.redirect(target.login_redirect);
                             }
                             else {
-                                res.redirect('/app/' + serverDetail.target.login_redirect);
+                                res.redirect('/app/' + target.login_redirect);
                             }
                         }
                         else {
@@ -192,7 +202,8 @@ function spinUpMaster(listenPort, otherServerDetails) {
                                 ws: true
                             });
                         });
-                        app.use('/baas/v1/project/:projectId/function/' + ((_f = serverDetail.target) === null || _f === void 0 ? void 0 : _f.id), (req, res) => {
+                        app.use('/baas/v1/project/:projectId/function/' +
+                            ((_f = serverDetail.target) === null || _f === void 0 ? void 0 : _f.id), (req, res) => {
                             var _a;
                             proxy.web(req, res, {
                                 target: `http://127.0.0.1:${serverDetail.httpPort}/server/${(_a = serverDetail.target) === null || _a === void 0 ? void 0 : _a.id}`,
@@ -216,10 +227,11 @@ function spinUpMaster(listenPort, otherServerDetails) {
             console.error(err);
         });
         expressServer.maxConnections = 100;
-        process.once('SIGINT', () => Object.keys(connections).forEach((sokcetId) => { var _a; return (_a = connections[sokcetId]) === null || _a === void 0 ? void 0 : _a.destroy(); }));
+        process.on('SIGINT', () => Object.keys(connections).forEach((connectionId) => {
+            connections[connectionId].destroy();
+        }));
         expressServer.on('connection', (socket) => {
-            const offset = Math.floor(Math.random() * 10);
-            const id = Date.now() + offset + '';
+            const id = js_1.JS.randomNumber(4) + '';
             connections[id] = socket;
             socket.on('close', () => {
                 delete connections[id];

package/lib/serve/server/lib/web_client/index.js

@@ -0,0 +1,30 @@
+'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 open_1 = __importDefault(require("open"));
+const logger_1 = require("../../../../util_modules/logger");
+const server_js_1 = __importDefault(require("./server.js"));
+exports.default = (details, masterPort) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const target = details.target;
+    const clientListner = yield server_js_1.default(details.httpPort, target.source, target.homepage, ((_a = target.opts) === null || _a === void 0 ? void 0 : _a.watch) || false);
+    clientListner.addListener('start', () => {
+        var _a, _b;
+        const appUrl = 'http://localhost:' + masterPort;
+        const label = `${details.type}[${(_a = details.target) === null || _a === void 0 ? void 0 : _a.name}]`;
+        logger_1.labeled(label, `URL : ${appUrl}/app/`).MESSAGE();
+        ((_b = details.target.opts) === null || _b === void 0 ? void 0 : _b.open) && open_1.default(appUrl).catch();
+    });
+    return clientListner;
+});

package/lib/serve/server/lib/web_client/server.js

@@ -0,0 +1,171 @@
+'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 express_1 = __importDefault(require("express"));
+const events_1 = require("events");
+const chokidar_1 = require("chokidar");
+const logger_js_1 = require("../../../../util_modules/logger.js");
+const index_js_1 = require("../../../../util_modules/constants/index.js");
+const error_js_1 = __importDefault(require("../../../../error.js"));
+const index_js_2 = require("../../../../util_modules/fs/index.js");
+const path_1 = require("path");
+const ws_1 = require("ws");
+const port_resolver_js_1 = __importDefault(require("../../../../port-resolver.js"));
+const ansi_colors_1 = require("ansi-colors");
+function prepareScriptFile(dir, port) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const scriptFile = yield index_js_2.ASYNC.readFile(index_js_1.TEMPLATE.client.basic.socket);
+        if (!scriptFile) {
+            throw new error_js_1.default('Unable to read the script file', { exit: 2 });
+        }
+        const scriptReady = scriptFile.replace(new RegExp(index_js_1.PLACEHOLDER.client.port, 'g'), port + '');
+        yield index_js_2.ASYNC.ensureDir(dir);
+        const scriptFilePath = path_1.join(dir, 'reload-script.js');
+        yield index_js_2.ASYNC.writeFile(scriptFilePath, scriptReady);
+        return scriptFilePath;
+    });
+}
+function stringInjector(source, anchorIdx, marker, inject) {
+    const headLastIdx = anchorIdx + marker.length;
+    const scriptPrefix = source.slice(0, headLastIdx);
+    const scriptSuffix = source.slice(headLastIdx);
+    return scriptPrefix + inject + scriptSuffix;
+}
+function injectScript(scriptLocale, indexHtml) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const headIdx = indexHtml.search(/<head>/gi);
+        const scriptTag = `\n<!--  Catalyst web client reload script -->\n<script type="text/javascript" src="${scriptLocale}"></script>\n`;
+        if (headIdx !== -1) {
+            return stringInjector(indexHtml, headIdx, '<head>', scriptTag);
+        }
+        const htmlIdx = indexHtml.search(/<html>/gi);
+        const headTag = `\n<head>${scriptTag}</head>\n`;
+        return stringInjector(indexHtml, htmlIdx, '<html>', headTag);
+    });
+}
+function reloadApp(event, path, liveSockets) {
+    logger_js_1.info(ansi_colors_1.cyan(`${event} detected in ${path} of the Web-Client.`));
+    liveSockets.forEach((socket) => socket.send('reload'));
+}
+function webClientServer(httpPort, source, homepage, enableWatch) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const eventListener = new events_1.EventEmitter();
+        const catalystTempDir = path_1.join(source, '.catalyst');
+        const socketServerPort = yield port_resolver_js_1.default.getFreePort(httpPort, 20, true);
+        const reloadScriptSrc = enableWatch
+            ? path_1.relative(source, yield prepareScriptFile(catalystTempDir, socketServerPort))
+            : undefined;
+        if (reloadScriptSrc) {
+            const clientWatcher = chokidar_1.watch(source, {
+                ignoreInitial: true,
+                ignored: ['node_modules/**/*']
+            });
+            const liveSockets = [];
+            let watcherReady = false;
+            clientWatcher.on('error', (err) => {
+                watcherReady = false;
+                eventListener.emit('error', new error_js_1.default('client watcher error', {
+                    original: err,
+                    exit: 1,
+                    skipHelp: true
+                }));
+            });
+            clientWatcher.on('ready', () => {
+                watcherReady = true;
+                const socketServer = new ws_1.WebSocketServer({
+                    port: socketServerPort,
+                    path: '/client-reload'
+                })
+                    .on('connection', (clientSocket) => {
+                    if (!watcherReady) {
+                        clientSocket.send('watcher not ready');
+                        clientSocket.close();
+                        return;
+                    }
+                    clientSocket.on('close', () => {
+                        const socketIdx = liveSockets.findIndex((socket) => socket === clientSocket);
+                        liveSockets.splice(socketIdx, 1);
+                    });
+                    liveSockets.push(clientSocket);
+                    clientSocket.send('connected');
+                })
+                    .on('error', (err) => logger_js_1.debug(err));
+                setTimeout(() => {
+                    clientWatcher.on('change', (path) => {
+                        reloadApp('Change(s) is', path_1.relative(source, path), liveSockets);
+                    });
+                    clientWatcher.on('add', (path) => {
+                        reloadApp('Addition of file(s) is', path_1.relative(source, path), liveSockets);
+                    });
+                    clientWatcher.on('unlink', (path) => {
+                        reloadApp('Deletion of file(s) is', path_1.relative(source, path), liveSockets);
+                    });
+                }, 1000);
+                eventListener.addListener('close', () => socketServer === null || socketServer === void 0 ? void 0 : socketServer.close());
+            });
+            eventListener.addListener('close', () => {
+                if (clientWatcher) {
+                    clientWatcher.close();
+                }
+                liveSockets.forEach((socket) => socket.close());
+                index_js_2.SYNC.deleteDir(catalystTempDir);
+            });
+        }
+        const app = express_1.default();
+        app.use('/app', (req, res) => __awaiter(this, void 0, void 0, function* () {
+            const requestedFile = req.url === '/' ? homepage : decodeURIComponent(req.path);
+            if (enableWatch &&
+                requestedFile === homepage &&
+                (requestedFile.includes('.html') || requestedFile.includes('.htm'))) {
+                const homepageFile = yield index_js_2.ASYNC.readFile(path_1.join(source, homepage));
+                if (!homepageFile) {
+                    eventListener.emit('error', new error_js_1.default('Unable to read the homepage file', {
+                        exit: 1,
+                        errorId: 'WEB-CLIENT-SERVER-1',
+                        arg: [ansi_colors_1.red.italic(homepage)]
+                    }));
+                    return;
+                }
+                const injectedHomePage = reloadScriptSrc
+                    ? yield injectScript(encodeURIComponent(reloadScriptSrc), homepageFile)
+                    : undefined;
+                res.contentType('text/html');
+                res.status(200);
+                res.send(injectedHomePage || homepageFile);
+                return;
+            }
+            res.sendFile(path_1.join(source, requestedFile), (err) => {
+                if (err) {
+                    logger_js_1.error('Unable to serve the requested file: ' + path_1.join(source, requestedFile));
+                    logger_js_1.debug(err.stack || err.message);
+                    res.status(404);
+                    res.send('Resource not found');
+                }
+            });
+        }));
+        const server = app.listen(httpPort).on('error', (err) => {
+            eventListener.emit('error', err);
+        });
+        eventListener.on('error', (err) => {
+            logger_js_1.error('Error when serving the web-client: ' + err.message);
+            logger_js_1.info('Please exit the command to get more info');
+            eventListener.emit('close');
+        });
+        eventListener.on('close', () => {
+            server.close(() => logger_js_1.debug('client server closed'));
+        });
+        return new Promise((res) => server.on('listening', () => res(eventListener)));
+    });
+}
+exports.default = webClientServer;

package/lib/shell/index.js

@@ -21,7 +21,7 @@ const fn_utils_1 = require("../fn-utils");
 const runtime_store_1 = __importDefault(require("../runtime-store"));
 const constants_1 = require("../util_modules/constants");
 const fs_1 = require("../util_modules/fs");
-const logger_1 = require("../util_modules/logger");
+const logger_js_1 = require("../util_modules/logger.js");
 const option_1 = require("../util_modules/option");
 const http_functions_1 = __importDefault(require("./dependencies/http-functions"));
 const local_function_1 = __importDefault(require("./dependencies/local-function"));
@@ -50,7 +50,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             .get('context.functions.targets', [])
             .filter((target) => {
             if (!target.valid) {
-                logger_1.warning('target [' +
+                logger_js_1.warning('target [' +
                     target.name +
                     '] is not a valid one reason : ' +
                     target.failure_reason);
@@ -64,9 +64,13 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             });
         }
         replServer.start();
-        const watchOpt = option_1.getOptionValue('watch', false);
+        const watchOpt = option_1.getOptionValue('watch');
+        if (watchOpt === true) {
+            logger_js_1.info();
+            logger_js_1.labeled('DEPRECATED', `The ${ansi_colors_1.italic.bold('--watch')} option is deprecated. \nThe watch mode will be enabled by default. If you wish to disable it use the ${ansi_colors_1.italic.bold('--no-watch')} option. \nPlease execute ${ansi_colors_1.bold('catalyst functions:shell ' + ansi_colors_1.italic('--help'))} command for more usage details.`).WARN();
+        }
         yield Promise.all(targets.map((target) => __awaiter(void 0, void 0, void 0, function* () {
-            if (watchOpt) {
+            if (watchOpt !== false) {
                 yield fn_watcher_1.default(target);
             }
             const localFn = new local_function_1.default(replServer, target);
@@ -85,8 +89,8 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         })));
         yield fs_1.ASYNC.deleteDir(path_1.join(runtime_store_1.default.get('cwd'), '.build')).catch();
         fn_utils_1.fnUtils.common.executeHook({ prefix: 'post', command: 'serve' });
-        logger_1.info();
-        logger_1.success('shell complete');
+        logger_js_1.info();
+        logger_js_1.success('shell complete');
     }
     catch (e) {
         yield Promise.all([

package/lib/util_modules/char.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CHAR = void 0;
 const ansi_colors_1 = require("ansi-colors");
 const env_1 = require("./env");
-const isSupported = !env_1.isWindows() || process.env.CI || process.env.TERM === 'xterm-256color';
+const isSupported = !env_1.isWindows || process.env.CI || process.env.TERM === 'xterm-256color';
 exports.CHAR = {
     success: isSupported ? ansi_colors_1.bold.green('✔') : ansi_colors_1.bold.green('√'),
     warning: isSupported ? ansi_colors_1.bold.yellow('⚠') : ansi_colors_1.bold.yellow('‼'),

package/lib/util_modules/config/lib/apig.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.script = exports.enabled = exports.rules = exports.raw = void 0;
+exports.source = exports.script = exports.enabled = exports.rules = exports.raw = void 0;
 const error_1 = __importDefault(require("../../../error"));
 const runtime_store_1 = __importDefault(require("../../../runtime-store"));
 const constants_1 = require("../../constants");
@@ -43,3 +43,4 @@ function script(name, fallback) {
     return (rawScripts && rawScripts[name]) || fallback;
 }
 exports.script = script;
+exports.source = rules;

package/lib/util_modules/config/lib/client.js

@@ -5,16 +5,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.script = exports.ignore = exports.plugin = exports.source = exports.raw = void 0;
 const path_1 = require("path");
-const error_1 = __importDefault(require("../../../error"));
-const runtime_store_1 = __importDefault(require("../../../runtime-store"));
-const constants_1 = require("../../constants");
-const js_1 = require("../../js");
-const logger_1 = require("../../logger");
+const error_js_1 = __importDefault(require("../../../error.js"));
+const runtime_store_js_1 = __importDefault(require("../../../runtime-store.js"));
+const file_names_js_1 = __importDefault(require("../../constants/lib/file-names.js"));
+const folder_names_js_1 = __importDefault(require("../../constants/lib/folder-names.js"));
+const js_js_1 = require("../../js.js");
 function raw(throwError = false) {
-    const config = runtime_store_1.default.get('config', null);
+    const config = runtime_store_js_1.default.get('config', null);
     if (config === null) {
         if (throwError) {
-            throw new error_1.default(constants_1.FILENAME.config + ' file is required', { exit: 2 });
+            throw new error_js_1.default(file_names_js_1.default.config + ' file is required', { exit: 2 });
         }
         return;
     }
@@ -23,13 +23,10 @@ function raw(throwError = false) {
 exports.raw = raw;
 function source() {
     const clientConfig = raw();
-    return (clientConfig && clientConfig.source) || constants_1.FOLDERNAME.client;
+    return (clientConfig && clientConfig.source) || folder_names_js_1.default.client;
 }
 exports.source = source;
-function plugin(name, source) {
-    if (source) {
-        logger_1.debug('Source config not supported for client');
-    }
+function plugin(name) {
     const clientConfig = raw();
     const rawPlugins = clientConfig && clientConfig.plugin;
     if (!rawPlugins) {
@@ -55,17 +52,17 @@ function ignore(sourcePath) {
     const clientConfig = raw();
     const ignoreArr = (clientConfig && clientConfig.ignore) || [];
     return ignoreArr.map((value) => {
-        if (js_1.JS.indexOf(value, path_1.sep) === js_1.JS.size(value) - 1) {
-            return '**' + path_1.sep + js_1.JS.initial(value).join('');
+        if (js_js_1.JS.indexOf(value, path_1.sep) === js_js_1.JS.size(value) - 1) {
+            return '**' + path_1.sep + js_js_1.JS.initial(value).join('');
         }
         else {
-            if (js_1.JS.startsWith(value, path_1.sep)) {
-                return js_1.JS.endsWith(value, path_1.sep)
-                    ? sourcePath + js_1.JS.initial(value).join('')
+            if (js_js_1.JS.startsWith(value, path_1.sep)) {
+                return js_js_1.JS.endsWith(value, path_1.sep)
+                    ? sourcePath + js_js_1.JS.initial(value).join('')
                     : sourcePath + value;
             }
-            return js_1.JS.endsWith(value, path_1.sep)
-                ? sourcePath + path_1.sep + js_1.JS.initial(value).join('')
+            return js_js_1.JS.endsWith(value, path_1.sep)
+                ? sourcePath + path_1.sep + js_js_1.JS.initial(value).join('')
                 : sourcePath + path_1.sep + value;
         }
     });
@@ -75,13 +72,13 @@ function script(name, fallback) {
     const clientConfig = raw();
     const rawScripts = clientConfig && (clientConfig === null || clientConfig === void 0 ? void 0 : clientConfig.scripts);
     if (rawScripts === undefined && fallback === undefined) {
-        throw new error_1.default('Scripts not found', { exit: 2 });
+        throw new error_js_1.default('Scripts not found', { exit: 2 });
     }
     if (name === undefined) {
         return rawScripts || fallback;
     }
     if (rawScripts && rawScripts[name] === undefined && fallback === undefined) {
-        throw new error_1.default('Scripts not found', { exit: 2 });
+        throw new error_js_1.default('Scripts not found', { exit: 2 });
     }
     return (rawScripts && rawScripts[name]) || fallback;
 }

package/lib/util_modules/constants/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IAC = exports.ORIGIN = exports.TEMPLATE = exports.SCOPE = exports.REMOTE_REF = exports.REGEX = exports.REFERENCE = exports.PLACEHOLDER = exports.INTEG = exports.FOLDERNAME = exports.FN_TYPE = exports.DC_TYPE = exports.FILENAME = exports.EVENT_SOURCE = exports.EVENT_REF = exports.DEFAULT = exports.CLIQ = exports.AUTH = exports.APIG_RULES = void 0;
+exports.IAC = exports.PLUGIN = exports.ORIGIN = exports.TEMPLATE = exports.SCOPE = exports.REMOTE_REF = exports.REGEX = exports.REFERENCE = exports.PLACEHOLDER = exports.INTEG = exports.FOLDERNAME = exports.FN_TYPE = exports.DC_TYPE = exports.FILENAME = exports.EVENT_SOURCE = exports.EVENT_REF = exports.DEFAULT = exports.CLIQ = exports.AUTH = exports.APIG_RULES = void 0;
 var apig_rules_1 = require("./lib/apig-rules");
 Object.defineProperty(exports, "APIG_RULES", { enumerable: true, get: function () { return __importDefault(apig_rules_1).default; } });
 var auth_1 = require("./lib/auth");
@@ -40,5 +40,7 @@ var template_1 = require("./lib/template");
 Object.defineProperty(exports, "TEMPLATE", { enumerable: true, get: function () { return __importDefault(template_1).default; } });
 var urls_1 = require("./lib/urls");
 Object.defineProperty(exports, "ORIGIN", { enumerable: true, get: function () { return __importDefault(urls_1).default; } });
+var plugin_1 = require("./lib/plugin");
+Object.defineProperty(exports, "PLUGIN", { enumerable: true, get: function () { return __importDefault(plugin_1).default; } });
 var iac_1 = require("./lib/iac");
 Object.defineProperty(exports, "IAC", { enumerable: true, get: function () { return __importDefault(iac_1).default; } });

package/lib/util_modules/constants/lib/placeholders.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Object.freeze({
     client: {
+        port: '{{_PORT_}}',
         package: {
             name: '{{_NAME_}}'
         }

package/lib/util_modules/constants/lib/plugin.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = Object.freeze({
+    mangaer: {
+        npm: {
+            command: 'npm',
+            opts: ['config', 'get', 'prefix', '--json']
+        },
+        yarn: {
+            command: 'yarn',
+            opts: ['global', 'dir']
+        }
+    },
+    client: ['Angular', 'React', 'Basic'],
+    react: {
+        plugin: 'zcatalyst-cli-plugin-react',
+        runner_command: ['create-react-app']
+    },
+    lyte: {
+        plugin: 'zcatalyst-cli-plugin-lyte'
+    },
+    angular: {
+        plugin: 'zcatalyst-cli-plugin-angular',
+        runner_command: ['ng', 'new'],
+        collection_name: 'zcatalyst-angular-schematics',
+        runner_package: '@angular/cli@v12-lts'
+    }
+});

package/lib/util_modules/constants/lib/template.js

@@ -7,7 +7,17 @@ exports.default = Object.freeze({
     banner: path_1.join(TEMPLATE_ROOT, 'banner.txt'),
     login_success: path_1.join(TEMPLATE_ROOT, 'loginSuccess.html'),
     login_fail: path_1.join(TEMPLATE_ROOT, 'loginFailure.html'),
-    client: path_1.join(TEMPLATE_ROOT, 'init/client'),
+    client: {
+        basic: {
+            new: path_1.join(TEMPLATE_ROOT, 'init', 'client', 'basic'),
+            socket: path_1.join(TEMPLATE_ROOT, 'web-socket.txt')
+        },
+        lyte: path_1.join(TEMPLATE_ROOT, 'init', 'client', 'lyte'),
+        react: {
+            js: path_1.join(TEMPLATE_ROOT, 'init', 'client', 'react', 'react_js'),
+            ts: path_1.join(TEMPLATE_ROOT, 'init', 'client', 'react', 'react_ts')
+        }
+    },
     applogic: {
         node: path_1.join(TEMPLATE_ROOT, 'init', 'applogic', 'node')
     },