zcatalyst-cli 1.10.1 → 1.11.0

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/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/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/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/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/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.11.0",
 	"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",
@@ -36,7 +37,6 @@
 		"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.0.1"
 	},
 	"devDependencies": {
 		"@types/app-module-path": "^2.2.0",
@@ -72,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/init/client/lyte/build/build.js

@@ -0,0 +1,301 @@
+'use strict';
+
+var path,
+includeStyle,
+fs,
+sane,
+buildUtils,
+buildOptions;
+
+/** 
+	buildUtils contains all necessary functions for copying and building files.
+	---------------------------------------------------------------------------------------
+	* Available functions :
+	---------------------------------------------------------------------------------------
+	* buildUtils.copy.file({options})
+		-----options-----
+		src : source file
+		dist : destination file
+		minify : [optional]	If file needs to be minified in production mode. 
+			In development mode file will be copied.(default : false)
+	---------------------------------------------------------------------------------------
+	* buildUtils.copy.folder({options});
+		-----options-----
+		src : source folder
+		dist : destination folder
+		minify : [optional] If folder needs to be minified in production mode. 
+			In development mode file will be copied.(default : false)
+	---------------------------------------------------------------------------------------
+	* buildUtils.consolidate({options})
+		-----options-----
+		configPath : path from which, consolidation mapping json can be retrived.(json file)
+					(OR)
+		config : consolidation mapping(mapping)
+		module : consolidating module name(any string). To store consolidation mapping json
+			In order to store mapping and reusing it on build watch and build serve
+		file : [optional] When a particular file is changed and needs to be re-consolidated.
+	---------------------------------------------------------------------------------------
+
+**/
+/** 
+	For transpiling from es6 to es5 :
+	---------------------------------------------------------------------------------------
+	* var transpile = require(path.join(options.cliRoot,'lib','utilities','transpile'));
+		transpile({options})
+		----options---
+		file : single file path or path of the folder, that to convert from es6 to es5 
+		(OR)		     
+		content : Content of the file to convert
+		dist : destination file or folder
+		strict : [[optional]] To enable strict mode (default : false)
+		
+	---------------------------------------------------------------------------------------
+**/
+
+/**
+	For compiling the themes :
+	---------------------------------------------------------------------------------------
+	* buildUtils.compileThemes(buildOptions,{
+		src : Array of src File
+		dist : destination file
+		themeOptions : {
+			// list of less default options
+		}
+	})
+	
+	---------------------------------------------------------------------------------------
+**/
+
+module.exports = {
+	version : 1,
+	configureFolders : function(options) {
+		path = options.path;
+		options.outputFolder = "dist"; /* Folder at which the built files are to be needed. */
+		options.autoBundle = true ;/* autoBundle is to bundle all (routes,components,models,mixins,helpers and router.js file)*/
+		options.theming = false;
+		options.useStrict = false;
+		options.eslint = false;
+		buildUtils = require(path.join(options.cliRoot,'lib','utilities','buildUtils'));
+		var folders = { /* Available modules and its folder structures.*/
+			build : 'build',
+			routes : 'routes',
+			routers : 'router.js',
+			components : 'components',
+			adapters : path.join('data-store','adapters'),
+			models : path.join('data-store','models'),
+			serializers :path.join('data-store','serializers'),
+			mixins :'mixins',			
+			javascript : path.join('components','javascript'),
+			templates : path.join('components','templates'),
+			helpers : path.join('components','helpers'),
+			styles : path.join('components','styles'),
+			images : path.join('components','images'),
+			themes : path.join('css'),
+			tests : 'tests'
+		};
+		options.folders = {};
+		options.folders.src = {};
+		options.folders.dist = {};
+		for(var key in folders) {
+			options.folders.src[key] = path.join(options.root,folders[key]) /* Source folder of modules. */
+			options.folders.dist[key] = path.join(options.root,options.outputFolder,folders[key]) /* Destination folder of modules,
+			can be changed if needed. */
+		}		
+	},
+
+	/*-----------------------------------------------Build Process Starts-------------------------------------------*/
+	build : async function (options,dependencies)  {
+		fs = dependencies.fs; /* fs-extra */
+		sane = dependencies.sane; /* watcher */
+		buildOptions = options;
+		/*configuration for transpile*/	
+			options.transpile = false;
+			if(options.transpile) {
+				options.ignoreFoldersFromTranspile = [
+					"bower_components",
+					"node_modules"
+				]
+			}
+		/* Building of modules starts. Custom modules can be added in build function. */
+		await buildUtils.init(options); /* Provides options to buildUtils. */		
+		await buildUtils.build(['copyAppDir','routes','components','models','helpers','mixins','services']);		
+	},
+	/*-----------------------------------------------Build Process ends---------------------------------------------*/
+
+	builder : {
+		/*----------------------------------Copy Task---------------------------------------------------------------*/
+		copyAppDir : async function(module) {
+			/* Comment folders to skip copying folders from source folder to destination folder. */
+			/*By default outputFolder,routes,mixins,data-store,compdonents,build will be ignored from copying */
+			/*Given folder should be relative to the root path*/
+			var ignoreFolders = [
+				'node_modules'	
+			];
+			await buildUtils._super(module,ignoreFolders);
+			await buildUtils._completed(module);
+		},
+
+		/*-----------------------------------------------------------------------------------------------------------*/
+		routes : async function(module) {
+			
+			await buildUtils._super(module); 
+			/** _super of routes
+			----------------------
+			* Copies route files from source folder to destination folder.	
+			* Minifies route files if build is in production mode.
+			**/
+			await buildUtils._completed(module) /* Stops the timer and notifies that the module is completed. */
+		},
+
+		/*-----------------------------------------------------------------------------------------------------------*/
+		components : async function(module) {
+			includeStyle = true /* styles will be included to template by default. If not needed, toggle this property. */
+			await buildUtils._super(module,{includeStyle : includeStyle});
+			/** _super of components
+			-------------------------
+			* Compiles lyte files to html.
+			* Precompiles html files to get dynamic nodes.
+			* Appends style to template, if present. And then to component's javascript file.
+			* Copies component's files from source folder to destination folder.	
+			* Minifies components files if build is in production mode.
+			**/
+			await buildUtils._completed(module) /* Stops the timer and notifies that the module is completed. */
+		},
+
+		/*-----------------------------------------------------------------------------------------------------------*/
+		helpers : async function(module) {
+			await buildUtils._super(module);
+			/** _super of helpers
+			----------------------
+			* Copies file from source folder to destination folder(minifies if build
+					is in production mode).
+			**/
+			await buildUtils._completed(module) /* Stops the timer and notifies that the module is completed. */
+		},
+
+		/*-----------------------------------------------------------------------------------------------------------*/
+		models : async function(module) {
+			await buildUtils._super(module);
+			/** _super of models
+			----------------------
+			* Concats model, adapter and serializer to a single file(minifies if build
+					is in production mode).
+			* Copies file from source folder to destination folder.	
+			**/
+			await buildUtils._completed(module) /* Stops the timer and notifies that the module is completed. */
+		},
+
+		/*-----------------------------------------------------------------------------------------------------------*/
+		mixins : async function(module) {
+			await buildUtils._super(module);
+			/** _super of mixins
+			----------------------
+			* Copies mixins files from source folder to destination folder.	
+			* Minifies mixins files if build is in production mode.
+			**/
+			await buildUtils._completed(module) /* Stops the timer and notifies that the module is completed. */
+		},
+		services : async function(module) {
+			
+			await buildUtils._super(module); 
+			/** _super of services
+			----------------------
+			* Copies services files from source folder to destination folder.	
+			* Minifies services files if build is in production mode.
+			**/
+			await buildUtils._completed(module) /* Stops the timer and notifies that the module is completed. */
+		},
+		/*-----------------------------------------------------------------------------------------------------------*/
+	},
+
+	/*------------------------------------------Watch changes and build---------------------------------------------*/
+	watcher : {
+		copyAppDir : async function(module,file,modification) {
+			/* Comment folders to skip copying folders from source folder to destination folder. */
+			await buildUtils._super(module,{
+				file : file,
+				modification : modification
+			});
+		},
+		/*----------------------------------------------------------------------------------------------------------*/
+		routes : async function(module,file,modification) {
+			await buildUtils._super(module,{
+				file :file,
+				modification : modification 
+			});
+			/** _super of routes on watcher
+			-------------------------------
+			* Copies specifed route files from source folder to destination folder.	
+			* Minifies route files if build is in production mode.
+			**/
+		},
+
+		/*----------------------------------------------------------------------------------------------------------*/
+		components : async function(module,file,modification) {
+			await buildUtils._super(module,{
+				file : file,
+				modification :modification,
+				includeStyle : includeStyle
+			});
+			/** _super of components on watcher
+			-----------------------------------
+			* Compiles specified lyte files to html.
+			* Precompiles specified html files to get dynamic nodes.
+			* Appends style to template, if present. And then to component's javascript file.
+			* Copies specified component's files from source folder to destination folder.	
+			* Minifies specified component files if build is in production mode.
+			**/
+		},
+
+		/*----------------------------------------------------------------------------------------------------------*/
+		helpers : async function(module,file,modification) {
+			await buildUtils._super(module,{
+				file : file,
+				modification : modification
+			});
+			/** _super of helpers on watcher
+			---------------------------------
+			* Copies modified file from source folder to destination folder(minifies if build is in production mode).
+			**/
+		},
+
+		/*----------------------------------------------------------------------------------------------------------*/
+		models : async function(module,file,modification) {
+			await buildUtils._super(module,{
+				file :file,
+				modification :modification
+			});
+			/** _super of models on watcher
+			-------------------------------
+			* Concats model, adapter and serializer to a single file(minifies if build
+					is in production mode).
+			* Copies file from source folder to destination folder.	
+			**/
+		},
+
+		/*----------------------------------------------------------------------------------------------------------*/
+		mixins : async function(module,file,modification) {
+			await buildUtils._super(module,{
+				file : file,
+				modification :modification
+			});
+			/** _super of mixins on watcher
+			---------------------------------
+			* Copies modified file from source folder to destination folder(minifies if build is in production mode).
+			**/
+		},
+
+		services : async function(module,file,modification) {
+			await buildUtils._super(module,{
+				file : file,
+				modification :modification
+			});
+			/** _super of services on watcher
+			---------------------------------
+			* Copies modified file from source folder to destination folder(minifies if build is in production mode).
+			**/
+		}
+
+		
+	}
+};