zcatalyst-cli 1.9.0 → 1.11.0

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

@@ -0,0 +1,10 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebClientEvent = void 0;
+const events_1 = __importDefault(require("events"));
+class WebClientEvent extends events_1.default {
+}
+exports.WebClientEvent = WebClientEvent;

package/lib/shell/dependencies/http-functions.js

@@ -235,7 +235,7 @@ class HttpFunctions {
             };
             shell_1.clearLine(process.stdout);
             const masterPort = runtime_store_1.default.get(`context.port.http.master`, -1);
-            const fnTargets = runtime_store_1.default.get('context.functions.targets');
+            const fnTargets = runtime_store_1.default.get('context.functions.targets', []);
             fnTargets
                 .filter((t) => t.url !== undefined && t.type === constants_1.FN_TYPE.basic)
                 .map((t) => {

package/lib/shell/index.js

@@ -46,7 +46,9 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const httpServer = new http_functions_1.default(replServer);
     try {
         yield prepare_1.default([constants_1.FN_TYPE.basic, constants_1.FN_TYPE.cron, constants_1.FN_TYPE.event, constants_1.FN_TYPE.integration]);
-        const targets = runtime_store_1.default.get('context.functions.targets', []).filter((target) => {
+        const targets = runtime_store_1.default
+            .get('context.functions.targets', [])
+            .filter((target) => {
             if (!target.valid) {
                 logger_1.warning('target [' +
                     target.name +

package/lib/track.js

@@ -16,6 +16,7 @@ const path_1 = require("path");
 const readline_1 = require("readline");
 const config_store_1 = __importDefault(require("./config-store"));
 const endpoints_1 = require("./endpoints");
+const error_1 = __importDefault(require("./error"));
 const runtime_store_1 = __importDefault(require("./runtime-store"));
 const fs_1 = require("./util_modules/fs");
 const logger_1 = require("./util_modules/logger");
@@ -52,7 +53,8 @@ exports.default = (event, message, duration) => __awaiter(void 0, void 0, void 0
             yield httpLogger.log(logInput);
         }
     }
-    catch (err) {
+    catch (e) {
+        const err = error_1.default.getErrorInstance(e);
         logger_1.debug('Unable to send debug log to server: ' + err.message);
     }
 });

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/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.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,3 +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/file-names.js

@@ -20,5 +20,6 @@ exports.default = Object.freeze({
         system_rules: 'catalyst-system-rules.json'
     },
     catalyst_config: 'catalyst-config.json',
-    command_log: '.command.log'
+    command_log: '.command.log',
+    node_modules: 'node_modules'
 });

package/lib/util_modules/constants/lib/iac.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = Object.freeze({
+    template_format: {
+        json: 'JSON',
+        yml: 'YAML'
+    }
+});

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

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

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/regex.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const functionName = /(?!^\d+$)^(\w|-)+$/g;
 exports.default = Object.freeze({
     project: {
-        name: /^[a-zA-Z0-9][a-zA-Z0-9-]*$/g
+        name: /^[a-zA-Z0-9][a-zA-Z0-9-]*$/g,
+        template: /project-template-\d{1,2}\.\d{1,2}\.\d{1,2}.(yml|json)/g
     },
     client: {
         package_name: /^[a-zA-Z0-9][a-zA-Z0-9-]*$/g

package/lib/util_modules/constants/lib/scopes.js

@@ -15,6 +15,11 @@ exports.default = Object.freeze({
     queue_data_read: 'ZohoCatalyst.queue.data.READ',
     queue_data_create: 'ZohoCatalyst.queue.data.CREATE',
     projects: 'ZohoCatalyst.projects.ALL',
+    project_export_read: 'ZohoCatalyst.project.export.READ',
+    project_export_create: 'ZohoCatalyst.project.export.CREATE',
+    project_import_read: 'ZohoCatalyst.project.import.READ',
+    project_import_create: 'ZohoCatalyst.project.import.CREATE',
+    project_import_delete: 'ZohoCatalyst.project.import.DELETE',
     cron: 'ZohoCatalyst.cron.ALL',
     zcql: 'ZohoCatalyst.zcql.CREATE',
     webapp: 'ZohoCatalyst.webapp.ALL',

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

@@ -31,9 +31,17 @@ class URL {
         }
         return URL._zoho.replace('.com', dc.ext);
     }
+    static get console() {
+        const dc = dc_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._console = env_1.envOverride('CATALYST_CONSOLE_URL', 'https://console.catalyst.zoho.com');

package/lib/util_modules/constants/project.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const PROJECT = Object.freeze({
+    accepted_types: ['Live', 'Demo']
+});
+exports.default = PROJECT;

package/lib/util_modules/{contextHelp.js → context-help.js}

@@ -10,10 +10,11 @@ const fs_1 = require("./fs");
 const logger_1 = require("./logger");
 const toml_1 = __importDefault(require("./parser/toml"));
 function help() {
+    let exitCode = 0;
     const logs = runtime_store_1.default.get('log');
     if (logs === undefined) {
         logger_1.debug('NO ERRORS REGISTERED');
-        return;
+        return exitCode;
     }
     const logKeys = Object.keys(logs);
     const fillTemplate = (...arg) => {
@@ -28,6 +29,7 @@ function help() {
         const errQueue = logs[key];
         if (key === 'faultyError') {
             errQueue.forEach((err) => {
+                exitCode = err.exit > exitCode ? err.exit : exitCode;
                 outputError(err, errQueue);
                 return;
             });
@@ -36,6 +38,7 @@ function help() {
         const doc = fs_1.SYNC.readFile(docPath) || '';
         const catHelp = toml_1.default(doc);
         errQueue.forEach((err) => {
+            exitCode = err.exit > exitCode ? err.exit : exitCode;
             if (err.errorId === undefined || catHelp === undefined || catHelp === {}) {
                 outputError(err, errQueue);
                 return;
@@ -59,6 +62,7 @@ function help() {
             errQueue.shift();
         });
     });
+    return exitCode;
 }
 exports.default = help;
 function outputError(err, errQueue) {

package/lib/util_modules/env.js

@@ -1,24 +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) {
+    if (!process || process.env.CATALYST_SUB_PROCESS) {
         return false;
     }
-    if (process.env.CATALYST_SUB_PROCESS) {
-        return !process.env.CATALYST_SUB_PROCESS;
-    }
-    if (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,9 +18,17 @@ 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 = void 0;
+exports.ASYNC = exports.SYNC = exports.untildify = void 0;
+const os_1 = __importDefault(require("os"));
 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,26 +17,31 @@ 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("..");
 function dirExists(pth) {
     return __awaiter(this, void 0, void 0, function* () {
-        const stats = yield fs_extra_1.default.stat(pth).catch(() => false);
+        const stats = yield fs_extra_1.default.stat(__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(pth).catch(() => false);
+        const stats = yield fs_extra_1.default.stat(__1.untildify(pth)).catch(() => false);
         return stats && stats.isFile();
     });
 }
 exports.fileExists = fileExists;
-function readFile(pth, encoding = 'utf8') {
+function readFile(pth, type) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (yield fileExists(pth)) {
-            return fs_extra_1.default.readFile(pth, encoding);
+        if (!(yield fileExists(pth))) {
+            return undefined;
         }
-        return undefined;
+        return (type === 'buffer'
+            ? fs_extra_1.default.readFile(pth)
+            : type
+                ? fs_extra_1.default.readFile(pth, type)
+                : fs_extra_1.default.readFile(pth, 'utf8'));
     });
 }
 exports.readFile = readFile;
@@ -70,27 +75,29 @@ function dirList(dir) {
     });
 }
 exports.dirList = dirList;
-function walk(dir, exclude = []) {
+function walk(dir, { exclude = [], excludeDir = true, depth = -1 } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
+        if (depth === 0) {
+            return [];
+        }
         const isDir = yield fs_extra_1.default.stat(dir).then((stat) => stat.isDirectory());
         const files = isDir ? yield fs_extra_1.default.readdir(dir) : [path_1.default.basename(dir)];
-        const folderContentPromise = files
-            .map((entry) => {
-            return isDir ? path_1.default.join(dir, entry) : dir;
-        })
-            .filter((entryPath) => {
-            let match = false;
-            for (const glob of exclude) {
-                match = minimatch_1.default(entryPath, glob);
-                if (match) {
-                    return false;
+        const folderContentPromise = files.map((entry) => __awaiter(this, void 0, void 0, function* () {
+            const entryPath = isDir ? path_1.default.join(dir, entry) : dir;
+            const stats = yield fs_extra_1.default.stat(entryPath);
+            const isEntryPthDir = stats.isDirectory();
+            let excludeMatch = false;
+            if (!(isEntryPthDir && !excludeDir)) {
+                for (const glob of exclude) {
+                    excludeMatch = excludeMatch || minimatch_1.default(entryPath, glob);
                 }
             }
-            return true;
-        })
-            .map((entryPath) => __awaiter(this, void 0, void 0, function* () {
-            const stats = yield fs_extra_1.default.stat(entryPath);
-            return stats.isDirectory() ? walk(entryPath, exclude) : [entryPath];
+            if (excludeMatch) {
+                return [];
+            }
+            return isEntryPthDir
+                ? walk(entryPath, { exclude, excludeDir, depth: --depth })
+                : [entryPath];
         }));
         const folderContents = yield Promise.all(folderContentPromise);
         return folderContents.reduce((all, folderContent) => all.concat(folderContent), []);

package/lib/util_modules/global-space.js

@@ -0,0 +1,99 @@
+"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.getYarnNodePth = exports.getNpmNodePth = void 0;
+const shell_js_1 = require("./shell.js");
+const plugin_js_1 = __importDefault(require("./constants/lib/plugin.js"));
+const env_js_1 = require("./env.js");
+const path_1 = require("path");
+const index_js_1 = require("./fs/index.js");
+const runtime_store_js_1 = __importDefault(require("../runtime-store.js"));
+const logger_js_1 = require("./logger.js");
+function getNpmNodePth() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const cachedPath = runtime_store_js_1.default.get('npm.nodePath', false);
+        if (cachedPath) {
+            return cachedPath;
+        }
+        const spawnres = yield shell_js_1.spawn(plugin_js_1.default.mangaer.npm.command, plugin_js_1.default.mangaer.npm.opts, {
+            stdio: 'pipe'
+        }).ASYNC();
+        const nodePath = spawnres.stdout.replace(/\n/g, env_js_1.isWindows ? '\\node_modules' : '/lib/node_modules');
+        runtime_store_js_1.default.set('npm.nodePath', nodePath);
+        return nodePath;
+    });
+}
+exports.getNpmNodePth = getNpmNodePth;
+function getYarnNodePth() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const cachedPath = runtime_store_js_1.default.get('yarn.nodePath', false);
+        if (cachedPath) {
+            return cachedPath;
+        }
+        const spawnres = yield shell_js_1.spawn(plugin_js_1.default.mangaer.yarn.command, plugin_js_1.default.mangaer.yarn.opts, {
+            stdio: 'pipe'
+        }).ASYNC();
+        const nodePath = spawnres.stdout.replace(/\n/g, path_1.sep + 'node_modules');
+        runtime_store_js_1.default.set('yarn.nodePath', nodePath);
+        return nodePath;
+    });
+}
+exports.getYarnNodePth = getYarnNodePth;
+function findNpmPkg(pkgName, fallback) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const nodeModulesPath = yield getNpmNodePth().catch((err) => logger_js_1.debug(err));
+            const pkgPath = path_1.join(nodeModulesPath, pkgName);
+            return (yield index_js_1.ASYNC.dirExists(pkgPath)) ? pkgPath : fallback;
+        }
+        catch (e) {
+            logger_js_1.debug('NPM pkg find error');
+            logger_js_1.debug(e);
+        }
+        return fallback;
+    });
+}
+function findYarnPkg(pkgName, fallback) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const nodeModulesPath = yield getYarnNodePth().catch((err) => logger_js_1.debug(err));
+            const pkgPath = path_1.join(nodeModulesPath, pkgName);
+            return (yield index_js_1.ASYNC.dirExists(pkgPath)) ? pkgPath : fallback;
+        }
+        catch (e) {
+            logger_js_1.debug('YARN pkg find error');
+            logger_js_1.debug(e);
+        }
+        return fallback;
+    });
+}
+function findPkg(pkgName, fallback = false, pkgManager) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (pkgManager) {
+            return pkgManager === 'npm'
+                ? findNpmPkg(pkgName, fallback)
+                : findYarnPkg(pkgName, fallback);
+        }
+        const npmPkg = yield findNpmPkg(pkgName, fallback);
+        if (npmPkg !== null) {
+            return npmPkg;
+        }
+        const yarnPkg = yield findYarnPkg(pkgName, fallback);
+        if (yarnPkg !== null) {
+            return yarnPkg;
+        }
+        return fallback;
+    });
+}
+exports.default = findPkg;

package/lib/util_modules/js.js

@@ -42,5 +42,11 @@ exports.JS = lodash_1.default.mixin({
             exports.JS.removeNullAndUndefined(val)) ||
             ((val === null || val === undefined) && delete copy[key]));
         return copy;
+    },
+    parseJSON: (str) => {
+        try {
+            return JSON.parse(str);
+        }
+        catch (e) { }
     }
 });

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/parser/toml.js

@@ -10,6 +10,10 @@ exports.default = (str) => {
         return toml_1.parse(str);
     }
     catch (e) {
-        throw new error_1.default('TOML Parsing error on line ' + e.line + ', column ' + e.column + ': ' + e.message, { exit: 2 });
+        const err = error_1.default.getErrorInstance(e, {
+            message: 'TOML Parsing error'
+        });
+        err.exit = 2;
+        throw err;
     }
 };

package/lib/util_modules/project.js

@@ -199,6 +199,9 @@ function transformProject(projectObj) {
                     name: value.project_domain_name
                 };
                 break;
+            case 'project_type':
+                key = 'type';
+                break;
             default:
                 break;
         }

package/lib/util_modules/shell.js

@@ -49,25 +49,26 @@ function spawn(command, opts, _a = {}) {
                 stdio,
                 shell }, otherOpts));
             return new Promise((res, rej) => {
+                var _a;
                 let message = '';
-                childProcess.on('error', (err) => {
-                    rej(err);
+                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', (err) => rej(err));
                 childProcess.on('exit', (code) => {
                     if (code !== 0) {
                         rej(code);
                     }
-                    res(message);
+                    res({ message, stdout });
                 });
             });
         },
         RAW: () => {
-            const child = cross_spawn_1.default(command, opts, Object.assign({ cwd, stdio, shell }, otherOpts));
-            child.on('error', (err) => logger_1.debug(err));
+            const child = cross_spawn_1.default(command, opts, Object.assign({ cwd, stdio, shell }, otherOpts)).on('error', logger_1.debug);
             return child;
         }
     };
@@ -75,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) + '"';
@@ -93,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);
     }