zcatalyst-cli 1.10.1 → 1.12.1

package/lib/shell/dependencies/invoker/bio/node.js

@@ -11,8 +11,11 @@ const buildDir = JSON.parse(args[4]);
 const requestFile = path.join(buildDir, '.catalyst', 'user_req_body');
 const responseFile = path.join(buildDir, '.catalyst', 'user_res_body');
 const metaFile = path.join(buildDir, '.catalyst', 'user_meta.json');
-const writeToFile = (resp, metaJson) => {
-    fs.writeFileSync(responseFile, JSON.stringify(resp));
+const writeToFile = (respJson, metaJson) => {
+    const respStr = JSON.stringify(respJson);
+    fs.writeFileSync(responseFile, respStr);
+    metaJson.response['Content-Type'] = 'application/json';
+    metaJson.response['Content-Length'] = respStr.length;
     fs.writeFileSync(metaFile, JSON.stringify(metaJson));
 };
 let body = {};

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')
     },

package/lib/util_modules/constants/lib/urls.js

@@ -1,39 +1,55 @@
 'use strict';
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const env_1 = require("../../env");
-const dc_1 = require("../../../dc");
+const env_js_1 = require("../../env.js");
+const dc_js_1 = require("../../../dc.js");
+const dc_type_js_1 = __importDefault(require("./dc-type.js"));
 class URL {
     static get auth() {
-        const dc = dc_1.getActiveDCType();
+        const dc = dc_js_1.getActiveDCType();
         if (dc === undefined) {
             return URL._auth;
         }
         return URL._auth.replace('.com', dc.ext);
     }
     static get admin() {
-        const dc = dc_1.getActiveDCType();
+        const dc = dc_js_1.getActiveDCType();
         if (dc === undefined) {
             return URL._admin;
         }
         return URL._admin.replace('.com', dc.ext);
     }
     static get app() {
-        const dc = dc_1.getActiveDCType();
+        const dc = dc_js_1.getActiveDCType();
         if (dc === undefined) {
             return URL._app;
         }
         return URL._app.replace('.com', dc.ext);
     }
-    static get zoho() {
-        const dc = dc_1.getActiveDCType();
+    static get catalystStatic() {
+        const dc = dc_js_1.getActiveDCType();
         if (dc === undefined) {
-            return URL._zoho;
+            return URL._catalystStatic;
         }
-        return URL._zoho.replace('.com', dc.ext);
+        if (dc.ext === dc_type_js_1.default.in.ext) {
+            return URL._zohoStatic.replace(dc_type_js_1.default.us.ext, dc_type_js_1.default.in.ext);
+        }
+        return URL._catalystStatic.replace('.com', dc.ext);
+    }
+    static get console() {
+        const dc = dc_js_1.getActiveDCType();
+        if (dc === undefined) {
+            return URL._console;
+        }
+        return URL._console.replace('.com', dc.ext);
     }
 }
 exports.default = URL;
-URL._auth = env_1.envOverride('CATALYST_AUTH_URL', 'https://accounts.zoho.com');
-URL._admin = env_1.envOverride('CATALYST_ADMIN_URL', 'https://api.catalyst.zoho.com');
-URL._app = env_1.envOverride('CATALYST_APP_URL', 'https://catalystserverless.com');
-URL._zoho = env_1.envOverride('ZOHO_URL', 'https://www.zoho.com');
+URL._auth = env_js_1.envOverride('CATALYST_AUTH_URL', 'https://accounts.zoho.com');
+URL._admin = env_js_1.envOverride('CATALYST_ADMIN_URL', 'https://api.catalyst.zoho.com');
+URL._app = env_js_1.envOverride('CATALYST_APP_URL', 'https://catalystserverless.com');
+URL._zohoStatic = env_js_1.envOverride('ZOHO_STATIC', 'https://www.zoho.com/catalyst');
+URL._catalystStatic = env_js_1.envOverride('CATALYST_STATIC', 'https://catalyst.zoho.com');
+URL._console = env_js_1.envOverride('CATALYST_CONSOLE_URL', 'https://console.catalyst.zoho.com');

package/lib/util_modules/env.js

@@ -1,21 +1,22 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEnvVariable = exports.envOverride = exports.isPrimaryShell = exports.isWindows = exports.isMac = void 0;
-function isMac() {
-    return process && process.platform === 'darwin';
-}
-exports.isMac = isMac;
-function isWindows() {
-    return (process &&
-        (process.platform === 'win32' ||
-            (process.env.OSTYPE !== undefined && /^(msys|cygwin)$/.test(process.env.OSTYPE))));
-}
-exports.isWindows = isWindows;
+exports.getEnvVariable = exports.envOverride = exports.isPrimaryShell = exports.isWindows = exports.isMac = exports.isCI = void 0;
+exports.isCI = process &&
+    !!(process.env.CI ||
+        process.env.CONTINUOUS_INTEGRATION ||
+        process.env.BUILD_NUMBER ||
+        process.env.RUN_ID ||
+        exports.name ||
+        false);
+exports.isMac = process && process.platform === 'darwin';
+exports.isWindows = process &&
+    (process.platform === 'win32' ||
+        (process.env.OSTYPE !== undefined && /^(msys|cygwin)$/.test(process.env.OSTYPE)));
 function isPrimaryShell() {
     if (!process || process.env.CATALYST_SUB_PROCESS) {
         return false;
     }
-    if (!isWindows() && process.env.SHLVL) {
+    if (!exports.isWindows && process.env.SHLVL) {
         return parseInt(process.env.SHLVL) <= 1;
     }
     return false;

package/lib/util_modules/fs/index.js

@@ -18,17 +18,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ASYNC = exports.SYNC = exports.untildify = void 0;
-const os_1 = __importDefault(require("os"));
+exports.ASYNC = exports.SYNC = void 0;
 const ASYNC = __importStar(require("./lib/async"));
 exports.ASYNC = ASYNC;
 const SYNC = __importStar(require("./lib/sync"));
 exports.SYNC = SYNC;
-const tildRegex = /^~(?=$|\/|\\)/;
-const homeDirectory = os_1.default.homedir();
-const untildify = (pth) => homeDirectory ? pth.replace(tildRegex, homeDirectory) : pth;
-exports.untildify = untildify;

package/lib/util_modules/fs/lib/async.js

@@ -17,17 +17,17 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const minimatch_1 = __importDefault(require("minimatch"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
-const __1 = require("..");
+const utils_js_1 = require("../utils.js");
 function dirExists(pth) {
     return __awaiter(this, void 0, void 0, function* () {
-        const stats = yield fs_extra_1.default.stat(__1.untildify(pth)).catch(() => false);
+        const stats = yield fs_extra_1.default.stat(utils_js_1.untildify(pth)).catch(() => false);
         return stats && stats.isDirectory();
     });
 }
 exports.dirExists = dirExists;
 function fileExists(pth) {
     return __awaiter(this, void 0, void 0, function* () {
-        const stats = yield fs_extra_1.default.stat(__1.untildify(pth)).catch(() => false);
+        const stats = yield fs_extra_1.default.stat(utils_js_1.untildify(pth)).catch(() => false);
         return stats && stats.isFile();
     });
 }

package/lib/util_modules/fs/utils.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.untildify = void 0;
+const os_1 = require("os");
+const tildRegex = /^~(?=$|\/|\\)/;
+const homeDirectory = os_1.homedir();
+const untildify = (pth) => homeDirectory ? pth.replace(tildRegex, homeDirectory) : pth;
+exports.untildify = untildify;

package/lib/util_modules/global-space.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/util_modules/option.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.getGlobalOptionValue = exports.setGlobalOption = exports.getOptionValue = exports.getCurrentCommand = void 0;
+exports.getUnknownOpts = exports.getGlobalOptionValue = exports.setGlobalOption = exports.getOptionValue = exports.getCurrentCommand = void 0;
 const runtime_store_1 = __importDefault(require("../runtime-store"));
 function getCurrentCommand(fallback) {
     return runtime_store_1.default.get('opts._name', fallback);
@@ -21,3 +21,7 @@ function getGlobalOptionValue(key, fallback) {
     return runtime_store_1.default.get('opts.globalOpts.' + key, fallback);
 }
 exports.getGlobalOptionValue = getGlobalOptionValue;
+function getUnknownOpts(fallback) {
+    return runtime_store_1.default.get('opts.unknownOpts', fallback);
+}
+exports.getUnknownOpts = getUnknownOpts;

package/lib/util_modules/server.js

@@ -0,0 +1,53 @@
+"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 });
+exports.ConnectionDestroyer = void 0;
+const http_proxy_1 = __importDefault(require("http-proxy"));
+class ConnectionDestroyer {
+    constructor(server) {
+        this.server = server;
+        this.connections = new Set();
+        if (this.server instanceof http_proxy_1.default) {
+            this.server.on('proxyReq', (req) => {
+                req.on('finish', () => this.connections.delete(req));
+                this.connections.add(req);
+            });
+        }
+        else {
+            this.server.on('connection', (sock) => {
+                sock.on('close', () => this.connections.delete(sock));
+                this.connections.add(sock);
+            });
+        }
+    }
+    destroy(terminate = true, err) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => {
+                this.connections.forEach((sock) => {
+                    sock.destroy(err);
+                });
+                if (terminate) {
+                    if (this.server instanceof http_proxy_1.default) {
+                        return this.server.close(() => resolve());
+                    }
+                    else {
+                        return this.server.close((err) => err instanceof Error ? reject(err) : resolve());
+                    }
+                }
+                resolve();
+            });
+        });
+    }
+}
+exports.ConnectionDestroyer = ConnectionDestroyer;

package/lib/util_modules/shell.js

@@ -47,19 +47,23 @@ function spawn(command, opts, _a = {}) {
         ASYNC: () => {
             const childProcess = cross_spawn_1.default(command, opts, Object.assign({ cwd,
                 stdio,
-                shell }, otherOpts)).on('error', logger_1.debug);
+                shell }, otherOpts));
             return new Promise((res, rej) => {
+                var _a;
                 let message = '';
+                let stdout = '';
+                (_a = childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (msg) => {
+                    stdout += msg.toString();
+                });
                 childProcess.on('message', (msg) => {
                     message += msg.toString();
-                    logger_1.debug(msg.toString());
                 });
-                childProcess.on('error', rej);
+                childProcess.on('error', (err) => rej(err));
                 childProcess.on('exit', (code) => {
                     if (code !== 0) {
                         rej(code);
                     }
-                    res(message);
+                    res({ message, stdout });
                 });
             });
         },
@@ -72,7 +76,7 @@ function spawn(command, opts, _a = {}) {
 exports.spawn = spawn;
 function which(commandName, { alwaysResolve = true }) {
     let cleanedCmd = commandName;
-    if (env_1.isWindows()) {
+    if (env_1.isWindows) {
         const isPathName = /[\\]/.test(commandName);
         if (isPathName) {
             const dirname = '"' + path_1.default.dirname(commandName) + '"';
@@ -90,7 +94,7 @@ function which(commandName, { alwaysResolve = true }) {
             .replace(/\\'''/g, "\\'");
     }
     return new Promise((resolve, reject) => {
-        if (env_1.isWindows()) {
+        if (env_1.isWindows) {
             if (/[\x00-\x1f<>:"|?*]/.test(commandName)) {
                 alwaysResolve ? resolve(false) : reject('controll char test failed');
             }

package/lib/winston.js

@@ -60,7 +60,7 @@ exports.logger = winston_1.createLogger({
     transports: [exports.transport.console],
     exitOnError: false
 });
-if (env_1.isPrimaryShell()) {
+if (env_1.isWindows || env_1.isPrimaryShell()) {
     if (usage) {
         exports.logger.add(exports.transport.http_log);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.10.1",
+	"version": "1.12.1",
 	"description": "Command Line Tool for CATALYST",
 	"main": "./lib/index.js",
 	"bin": {
@@ -9,6 +9,7 @@
 	"engines": {
 		"node": ">=12.0.0"
 	},
+	"preferGlobal": true,
 	"keywords": [
 		"cli",
 		"cloud",
@@ -29,14 +30,13 @@
 		"better-queue": "^3.8.10",
 		"chokidar": "^3.5.2",
 		"cli-cursor": "^3.1.0",
-		"cli-table3": "^0.6.0",
+		"cli-table3": "0.6.0",
 		"commander": "^8.2.0",
 		"conf": "^10.0.2",
 		"cross-spawn": "^7.0.3",
 		"express": "^4.17.1",
 		"fs-extra": "^10.0.0",
 		"fuzzy": "^0.1.3",
-		"global-dirs": "^3.0.0",
 		"http-proxy": "^1.18.1",
 		"inquirer": "^8.1.2",
 		"inquirer-autocomplete-prompt": "^1.4.0",
@@ -53,8 +53,10 @@
 		"toml": "^3.0.0",
 		"update-notifier": "^5.1.0",
 		"winston": "^3.3.3",
+		"ws": "^8.2.3",
 		"xml2js": "^0.4.23",
-		"yaml": "^1.10.2"
+		"yaml": "^1.10.2",
+		"zcatalyst-angular-schematics": "^0.1.0"
 	},
 	"devDependencies": {
 		"@types/app-module-path": "^2.2.0",
@@ -68,10 +70,11 @@
 		"@types/jest": "^26.0.24",
 		"@types/lodash": "^4.14.172",
 		"@types/minimatch": "^3.0.5",
-		"@types/node": "^16.6.0",
+		"@types/node": "^16.11.21",
 		"@types/request": "^2.48.7",
 		"@types/semver": "^7.3.8",
 		"@types/update-notifier": "^5.1.0",
+		"@types/ws": "^8.2.0",
 		"@types/xml2js": "^0.4.9",
 		"@typescript-eslint/eslint-plugin": "^4.29.1",
 		"@typescript-eslint/parser": "^4.29.1",