zcatalyst-cli 1.9.1 → 1.11.1

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);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.9.1",
+	"version": "1.11.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",
@@ -30,17 +31,17 @@
 		"chokidar": "^3.5.2",
 		"cli-cursor": "^3.1.0",
 		"cli-table3": "^0.6.0",
-		"commander": "^8.1.0",
+		"commander": "^8.2.0",
 		"conf": "^10.0.2",
 		"cross-spawn": "^7.0.3",
 		"express": "^4.17.1",
 		"fs-extra": "^10.0.0",
-		"global-dirs": "^3.0.0",
+		"fuzzy": "^0.1.3",
 		"http-proxy": "^1.18.1",
 		"inquirer": "^8.1.2",
+		"inquirer-autocomplete-prompt": "^1.4.0",
 		"jszip": "^3.7.1",
 		"lodash": "^4.17.21",
-		"meant": "^2.0.1",
 		"minimatch": "^3.0.4",
 		"moment": "^2.29.1",
 		"open": "^8.2.1",
@@ -52,7 +53,10 @@
 		"toml": "^3.0.0",
 		"update-notifier": "^5.1.0",
 		"winston": "^3.3.3",
-		"xml2js": "^0.4.23"
+		"ws": "^8.2.3",
+		"xml2js": "^0.4.23",
+		"yaml": "^1.10.2",
+		"zcatalyst-angular-schematics": "^0.0.1"
 	},
 	"devDependencies": {
 		"@types/app-module-path": "^2.2.0",
@@ -62,6 +66,7 @@
 		"@types/fs-extra": "^9.0.12",
 		"@types/http-proxy": "^1.17.7",
 		"@types/inquirer": "^7.3.3",
+		"@types/inquirer-autocomplete-prompt": "^1.3.3",
 		"@types/jest": "^26.0.24",
 		"@types/lodash": "^4.14.172",
 		"@types/minimatch": "^3.0.5",
@@ -69,6 +74,7 @@
 		"@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",

package/templates/iacSuccess.html

@@ -0,0 +1,391 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Catalyst CLI</title>
+    <link rel="icon" href="data:;base64,iVBORw0KGgo=">
+    <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
+    <style media="screen">
+        html,
+        body {
+            height: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+        
+        body {
+            overflow: hidden;
+        }
+        
+        .modalbox.success,
+        .modalbox.error {
+            box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
+            transition: all 0.3s cubic-bezier(0.25, 0.8, 0.25, 1);
+            -webkit-border-radius: 2px;
+            -moz-border-radius: 2px;
+            border-radius: 2px;
+            background: #fff;
+            padding: 25px 25px 15px;
+            text-align: center;
+        }
+        
+        .modalbox.success.animate .icon,
+        .modalbox.error.animate .icon {
+            -webkit-animation: fall-in 0.75s;
+            -moz-animation: fall-in 0.75s;
+            -o-animation: fall-in 0.75s;
+            animation: fall-in 0.75s;
+            box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
+        }
+        
+        .modalbox.success h1,
+        .modalbox.error h1 {
+            font-family: 'Montserrat', sans-serif;
+        }
+        
+        .modalbox.success p,
+        .modalbox.error p {
+            font-family: 'Open Sans', sans-serif;
+        }
+        
+        .modalbox.success button,
+        .modalbox.error button,
+        .modalbox.success button:active,
+        .modalbox.error button:active,
+        .modalbox.success button:focus,
+        .modalbox.error button:focus {
+            -webkit-transition: all 0.1s ease-in-out;
+            transition: all 0.1s ease-in-out;
+            -webkit-border-radius: 30px;
+            -moz-border-radius: 30px;
+            border-radius: 30px;
+            margin-top: 15px;
+            width: 80%;
+            background: transparent;
+            color: #4caf50;
+            border-color: #4caf50;
+            outline: none;
+        }
+        
+        .modalbox.success button:hover,
+        .modalbox.error button:hover,
+        .modalbox.success button:active:hover,
+        .modalbox.error button:active:hover,
+        .modalbox.success button:focus:hover,
+        .modalbox.error button:focus:hover {
+            color: #fff;
+            background: #4caf50;
+            border-color: transparent;
+        }
+        
+        .modalbox.success .icon,
+        .modalbox.error .icon {
+            position: relative;
+            margin: 0 auto;
+            margin-top: -75px;
+            background: #4caf50;
+            height: 100px;
+            width: 100px;
+            border-radius: 50%;
+        }
+        
+        .modalbox.success .icon span,
+        .modalbox.error .icon span {
+            font-size: 4em;
+            color: #fff;
+            text-align: center;
+            padding-top: 20px;
+        }
+        
+        .modalbox.error button,
+        .modalbox.error button:active,
+        .modalbox.error button:focus {
+            color: #f44336;
+            border-color: #f44336;
+        }
+        
+        .modalbox.error button:hover,
+        .modalbox.error button:active:hover,
+        .modalbox.error button:focus:hover {
+            color: #fff;
+            background: #f44336;
+        }
+        
+        .modalbox.error .icon {
+            background: #f44336;
+        }
+        
+        .modalbox.error .icon span {
+            padding-top: 25px;
+        }
+        
+        .center {
+            float: none;
+            margin-left: auto;
+            margin-right: auto;
+            /* stupid browser compat. smh */
+        }
+        
+        @-webkit-keyframes fall-in {
+            0% {
+                -ms-transform: scale(3, 3);
+                -webkit-transform: scale(3, 3);
+                transform: scale(3, 3);
+                opacity: 0;
+            }
+            50% {
+                -ms-transform: scale(1, 1);
+                -webkit-transform: scale(1, 1);
+                transform: scale(1, 1);
+                opacity: 1;
+            }
+            60% {
+                -ms-transform: scale(1.1, 1.1);
+                -webkit-transform: scale(1.1, 1.1);
+                transform: scale(1.1, 1.1);
+            }
+            100% {
+                -ms-transform: scale(1, 1);
+                -webkit-transform: scale(1, 1);
+                transform: scale(1, 1);
+            }
+        }
+        
+        @-moz-keyframes fall-in {
+            0% {
+                -ms-transform: scale(3, 3);
+                -webkit-transform: scale(3, 3);
+                transform: scale(3, 3);
+                opacity: 0;
+            }
+            50% {
+                -ms-transform: scale(1, 1);
+                -webkit-transform: scale(1, 1);
+                transform: scale(1, 1);
+                opacity: 1;
+            }
+            60% {
+                -ms-transform: scale(1.1, 1.1);
+                -webkit-transform: scale(1.1, 1.1);
+                transform: scale(1.1, 1.1);
+            }
+            100% {
+                -ms-transform: scale(1, 1);
+                -webkit-transform: scale(1, 1);
+                transform: scale(1, 1);
+            }
+        }
+        
+        @-o-keyframes fall-in {
+            0% {
+                -ms-transform: scale(3, 3);
+                -webkit-transform: scale(3, 3);
+                transform: scale(3, 3);
+                opacity: 0;
+            }
+            50% {
+                -ms-transform: scale(1, 1);
+                -webkit-transform: scale(1, 1);
+                transform: scale(1, 1);
+                opacity: 1;
+            }
+            60% {
+                -ms-transform: scale(1.1, 1.1);
+                -webkit-transform: scale(1.1, 1.1);
+                transform: scale(1.1, 1.1);
+            }
+            100% {
+                -ms-transform: scale(1, 1);
+                -webkit-transform: scale(1, 1);
+                transform: scale(1, 1);
+            }
+        }
+        
+        @-webkit-keyframes plunge {
+            0% {
+                margin-top: -100%;
+            }
+            100% {
+                margin-top: 25%;
+            }
+        }
+        
+        @-moz-keyframes plunge {
+            0% {
+                margin-top: -100%;
+            }
+            100% {
+                margin-top: 25%;
+            }
+        }
+        
+        @-o-keyframes plunge {
+            0% {
+                margin-top: -100%;
+            }
+            100% {
+                margin-top: 25%;
+            }
+        }
+        
+        @-moz-keyframes fall-in {
+            0% {
+                -ms-transform: scale(3, 3);
+                -webkit-transform: scale(3, 3);
+                transform: scale(3, 3);
+                opacity: 0;
+            }
+            50% {
+                -ms-transform: scale(1, 1);
+                -webkit-transform: scale(1, 1);
+                transform: scale(1, 1);
+                opacity: 1;
+            }
+            60% {
+                -ms-transform: scale(1.1, 1.1);
+                -webkit-transform: scale(1.1, 1.1);
+                transform: scale(1.1, 1.1);
+            }
+            100% {
+                -ms-transform: scale(1, 1);
+                -webkit-transform: scale(1, 1);
+                transform: scale(1, 1);
+            }
+        }
+        
+        @-webkit-keyframes fall-in {
+            0% {
+                -ms-transform: scale(3, 3);
+                -webkit-transform: scale(3, 3);
+                transform: scale(3, 3);
+                opacity: 0;
+            }
+            50% {
+                -ms-transform: scale(1, 1);
+                -webkit-transform: scale(1, 1);
+                transform: scale(1, 1);
+                opacity: 1;
+            }
+            60% {
+                -ms-transform: scale(1.1, 1.1);
+                -webkit-transform: scale(1.1, 1.1);
+                transform: scale(1.1, 1.1);
+            }
+            100% {
+                -ms-transform: scale(1, 1);
+                -webkit-transform: scale(1, 1);
+                transform: scale(1, 1);
+            }
+        }
+        
+        @-o-keyframes fall-in {
+            0% {
+                -ms-transform: scale(3, 3);
+                -webkit-transform: scale(3, 3);
+                transform: scale(3, 3);
+                opacity: 0;
+            }
+            50% {
+                -ms-transform: scale(1, 1);
+                -webkit-transform: scale(1, 1);
+                transform: scale(1, 1);
+                opacity: 1;
+            }
+            60% {
+                -ms-transform: scale(1.1, 1.1);
+                -webkit-transform: scale(1.1, 1.1);
+                transform: scale(1.1, 1.1);
+            }
+            100% {
+                -ms-transform: scale(1, 1);
+                -webkit-transform: scale(1, 1);
+                transform: scale(1, 1);
+            }
+        }
+        
+        @keyframes fall-in {
+            0% {
+                -ms-transform: scale(3, 3);
+                -webkit-transform: scale(3, 3);
+                transform: scale(3, 3);
+                opacity: 0;
+            }
+            50% {
+                -ms-transform: scale(1, 1);
+                -webkit-transform: scale(1, 1);
+                transform: scale(1, 1);
+                opacity: 1;
+            }
+            60% {
+                -ms-transform: scale(1.1, 1.1);
+                -webkit-transform: scale(1.1, 1.1);
+                transform: scale(1.1, 1.1);
+            }
+            100% {
+                -ms-transform: scale(1, 1);
+                -webkit-transform: scale(1, 1);
+                transform: scale(1, 1);
+            }
+        }
+        
+        @-moz-keyframes plunge {
+            0% {
+                margin-top: -100%;
+            }
+            100% {
+                margin-top: 15%;
+            }
+        }
+        
+        @-webkit-keyframes plunge {
+            0% {
+                margin-top: -100%;
+            }
+            100% {
+                margin-top: 15%;
+            }
+        }
+        
+        @-o-keyframes plunge {
+            0% {
+                margin-top: -100%;
+            }
+            100% {
+                margin-top: 15%;
+            }
+        }
+        
+        @keyframes plunge {
+            0% {
+                margin-top: -100%;
+            }
+            100% {
+                margin-top: 15%;
+            }
+        }
+    </style>
+</head>
+
+<body>
+    <div class="container">
+        <div class="row">
+            <div class="modalbox success col-sm-8 col-md-6 col-lg-5 center animate">
+                <div class="icon">
+                    <span class="glyphicon glyphicon-ok"></span>
+                </div>
+                <!--/.icon-->
+                <h1>Import Started!</h1>
+                <p>You can close this window and
+                    <br>continue using the <b>CLI</b></p>
+            </div>
+            <!--/.success-->
+        </div>
+        <!--/.row-->
+    </div>
+    <!--/.container-->
+</body>
+
+</html>