zcatalyst-cli 1.11.1 → 1.12.0

package/docs/optional-import.toml

@@ -0,0 +1,10 @@
+[OPT-IMP-1]
+context='''The Plugin(${arg[0]}) cannot be found in the ${arg[1]} path.'''
+aid='''Please ensure that the ${arg[0]} plugin is installed in the ${arg[2]} directory or
+Try providing the exact path to the ${arg[0]} plugin directory relative to the project root directory.'''
+link=''
+
+[OPT-IMP-2]
+context='''The Plugin directory(${arg[0]}) cannot be found in the ${arg[1]} path.'''
+aid='''Please ensure that you have provided the correct path to the Plugin directory.'''
+link=''

package/lib/commands/functions/shell.js

@@ -41,8 +41,11 @@ exports.default = new command_1.default('functions:shell')
     `(default: ${constants_1.DEFAULT.serve_port.http.basicio})`)
     .option('--debug [port]', 'the functions are invoked from local environment enabling debugging options on provided port.' +
     `(default: ${constants_1.DEFAULT.serve_port.debug.basicio})`)
-    .option('--ignore-scripts', 'ignore the pre and post lifescycle scripts')
-    .option('--watch', 'watch for file and directory changes and enable hot reload')
+    .option('--ignore-scripts', 'ignore the pre and post lifecycle scripts')
+    .option('--watch', 'watch for file and directory changes and enable hot reload' +
+    '\n' +
+    '(deprecated: The watch mode will be enabled by default. To disable watch mode use the --no-watch option)')
+    .option('--no-watch', 'disable watching the files for changes')
     .needs('auth', [constants_1.SCOPE.functions, constants_1.SCOPE.functions_execution])
     .needs('config')
     .needs('rc')

package/lib/error.js

@@ -50,14 +50,16 @@ class CatalystError extends Error {
             original: util_1.inspect(unknownError),
             skipHelp: skipHelp === undefined ? true : skipHelp
         });
-        if ('message' in unknownError) {
-            newError.message = unknownError.message;
-        }
-        if ('stack' in unknownError) {
-            newError.stack = unknownError.stack;
-        }
-        if ('name' in unknownError) {
-            newError.name = unknownError.name;
+        if (typeof unknownError === 'object') {
+            if ('message' in unknownError) {
+                newError.message = unknownError.message;
+            }
+            if ('stack' in unknownError) {
+                newError.stack = unknownError.stack;
+            }
+            if ('name' in unknownError) {
+                newError.name = unknownError.name;
+            }
         }
         return newError;
     }

package/lib/fn-utils/lib/node.js

@@ -16,10 +16,10 @@ exports.validate = void 0;
 const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
 const error_1 = __importDefault(require("../../error"));
+const npm_install_1 = __importDefault(require("../../init/dependencies/npm-install"));
 const constants_1 = require("../../util_modules/constants");
 const fs_1 = require("../../util_modules/fs");
 const js_1 = require("../../util_modules/js");
-const shell_1 = require("../../util_modules/shell");
 function validate(targets, idx) {
     return __awaiter(this, void 0, void 0, function* () {
         if (targets.length < idx + 1) {
@@ -50,7 +50,7 @@ function validate(targets, idx) {
             }
             const nodeModuleExists = yield fs_1.ASYNC.dirExists(path_1.join(currentTarget.source, constants_1.FILENAME.node_modules));
             if (!nodeModuleExists) {
-                yield shell_1.spawn('npm', ['install'], { cwd: currentTarget.source }).ASYNC();
+                yield npm_install_1.default(currentTarget.source, true);
             }
             currentTarget.valid = true;
             return validate(targets, ++idx);

package/lib/init/dependencies/npm-install.js

@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const error_1 = __importDefault(require("../../error"));
 const prompt_1 = __importDefault(require("../../prompt"));
 const shell_1 = require("../../util_modules/shell");
 exports.default = (pth, skipPrompt = false) => __awaiter(void 0, void 0, void 0, function* () {
@@ -21,7 +22,13 @@ exports.default = (pth, skipPrompt = false) => __awaiter(void 0, void 0, void 0,
         when: () => !skipPrompt
     }));
     if (ans.NPMinstall === undefined || ans.NPMinstall) {
-        return shell_1.spawn('npm', ['install'], { cwd: pth }).ASYNC();
+        return shell_1.spawn('npm', ['install'], { cwd: pth })
+            .ASYNC()
+            .catch((err) => {
+            throw error_1.default.getErrorInstance(err, {
+                message: 'Failure when executing npm install.'
+            });
+        });
     }
     return;
 });

package/lib/init/features/client/initializers/angular.js

@@ -42,7 +42,6 @@ const logger_js_1 = require("../../../../util_modules/logger.js");
 const ansi_colors_1 = require("ansi-colors");
 const client_js_1 = require("../../../util/client.js");
 const path_1 = require("path");
-const global_space_js_1 = __importDefault(require("../../../../util_modules/global-space.js"));
 const ASYNC = __importStar(require("../../../../util_modules/fs/lib/async.js"));
 const error_js_1 = __importDefault(require("../../../../error.js"));
 const { angular } = plugin_js_1.default;
@@ -59,22 +58,20 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         '--skip-git',
         'true'
     ];
-    const isModuleFound = (yield global_space_js_1.default(angular.plugin, false));
     try {
         const collection = require.resolve(path_1.join(angular.collection_name, 'package.json'));
         yield shell_js_1.spawn(angular.runner_command[0], [...opts, '--collection', path_1.dirname(collection)], {
             stdio: 'inherit',
-            cwd: runtime_store_js_1.default.get('cwd'),
-            env: {
-                CATALYST_ANGULAR_PLUGIN_GLOBAL: isModuleFound ? 'true' : 'false'
-            }
+            cwd: runtime_store_js_1.default.get('cwd')
         }).ASYNC();
     }
     catch (e) {
         if (e === null) {
             throw new error_js_1.default('Process aborted!', { exit: 0, skipHelp: true });
         }
-        const err = error_js_1.default.getErrorInstance(e).original;
+        const err = error_js_1.default.getErrorInstance(e, {
+            message: 'Failure when creating new Angular App'
+        }).original;
         if (!err.code || err.code !== 'ENOENT') {
             throw err;
         }
@@ -92,15 +89,16 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             angular.collection_name
         ], {
             stdio: 'inherit',
-            cwd: runtime_store_js_1.default.get('cwd'),
-            env: {
-                CATALYST_ANGULAR_PLUGIN_GLOBAL: isModuleFound ? 'true' : 'false'
-            }
-        }).ASYNC();
+            cwd: runtime_store_js_1.default.get('cwd')
+        })
+            .ASYNC()
+            .catch((err) => {
+            throw error_js_1.default.getErrorInstance(err, {
+                message: 'Failure when creating new Angular App with npx'
+            });
+        });
     }
     yield ASYNC.findAndReplace(path_1.join(clientDirPath, file_names_js_1.default.client.package_json))(client.package.name, clientName);
-    runtime_store_js_1.default.set('payload.client.plugin', isModuleFound
-        ? angular.plugin
-        : path_1.relative(project_js_1.getProjectRoot(), path_1.join(clientDirPath, 'node_modules', angular.plugin)));
+    runtime_store_js_1.default.set('payload.client.plugin', angular.plugin);
     return client_js_1.fillClientInitPayload(clientDirPath, clientName);
 });

package/lib/init/features/client/initializers/lyte.js

@@ -41,7 +41,6 @@ const placeholders_js_1 = __importDefault(require("../../../../util_modules/cons
 const folder_names_js_1 = __importDefault(require("../../../../util_modules/constants/lib/folder-names.js"));
 const ASYNC = __importStar(require("../../../../util_modules/fs/lib/async.js"));
 const project_js_1 = require("../../../../util_modules/project.js");
-const global_space_js_1 = __importDefault(require("../../../../util_modules/global-space.js"));
 const { lyte } = plugin_js_1.default;
 const { client } = placeholders_js_1.default;
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -49,13 +48,9 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const clientDirPath = project_js_1.resolveProjectPath(folder_names_js_1.default.client);
     yield client_js_1.directoryOverridePrompt(clientDirPath);
     yield ASYNC.copyDir(template_js_1.default.client.lyte, clientDirPath);
-    const isModuleFound = yield global_space_js_1.default(lyte.plugin);
-    !isModuleFound &&
-        (yield client_js_1.addDevDep(path_1.join(clientDirPath, 'package.json'), { [lyte.plugin]: 'latest' }));
+    yield client_js_1.addDependency(path_1.join(clientDirPath, 'package.json'), { [lyte.plugin]: 'latest' }, { dev: true });
     yield ASYNC.findAndReplace(clientDirPath)(client.package.name, clientName);
     yield npm_install_js_1.default(clientDirPath, true);
-    runtime_store_js_1.default.set('payload.client.plugin', isModuleFound
-        ? lyte.plugin
-        : path_1.relative(project_js_1.getProjectRoot(), path_1.join(clientDirPath, 'node_modules', lyte.plugin)));
+    runtime_store_js_1.default.set('payload.client.plugin', lyte.plugin);
     return client_js_1.fillClientInitPayload(clientDirPath, clientName);
 });

package/lib/init/features/client/initializers/react.js

@@ -37,12 +37,12 @@ const runtime_store_js_1 = __importDefault(require("../../../../runtime-store.js
 const ASYNC = __importStar(require("../../../../util_modules/fs/lib/async.js"));
 const path_1 = require("path");
 const os_1 = require("os");
-const global_space_js_1 = __importDefault(require("../../../../util_modules/global-space.js"));
 const index_js_1 = __importDefault(require("../../../../prompt/index.js"));
 const client_js_1 = require("../../../util/client.js");
 const plugin_js_1 = __importDefault(require("../../../../util_modules/constants/lib/plugin.js"));
 const template_js_1 = __importDefault(require("../../../../util_modules/constants/lib/template.js"));
 const placeholders_js_1 = __importDefault(require("../../../../util_modules/constants/lib/placeholders.js"));
+const error_js_1 = __importDefault(require("../../../../error.js"));
 const { react } = plugin_js_1.default;
 const { client } = placeholders_js_1.default;
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -60,18 +60,19 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const reactPluginDir = path_1.join(catalystTempDir, 'react');
     yield ASYNC.emptyDir(reactPluginDir);
     yield ASYNC.copyDir(flavourPrompt.flavour === 'ts' ? template_js_1.default.client.react.ts : template_js_1.default.client.react.js, reactPluginDir);
-    const isModuleFound = yield global_space_js_1.default(react.plugin);
-    !isModuleFound &&
-        (yield client_js_1.addDevDep(path_1.join(reactPluginDir, 'template.json'), { [react.plugin]: 'latest' }, [
-            'package'
-        ]));
+    yield client_js_1.addDependency(path_1.join(reactPluginDir, 'template.json'), { [react.plugin]: 'latest' }, { depPath: ['package'] });
     yield ASYNC.findAndReplace(reactPluginDir)(client.package.name, clientName);
     yield shell_js_1.spawn('npx', [react.runner_command[0], clientName, '--template', 'file:' + reactPluginDir], {
         stdio: 'inherit',
         cwd: runtime_store_js_1.default.get('cwd')
-    }).ASYNC();
-    runtime_store_js_1.default.set('payload.client.plugin', isModuleFound
-        ? react.plugin
-        : path_1.relative(project_js_1.getProjectRoot(), path_1.join(clientDirPath, 'node_modules', react.plugin)));
+    })
+        .ASYNC()
+        .catch((err) => {
+        throw error_js_1.default.getErrorInstance(err, {
+            message: 'Failure while Creating react app',
+            skipHelp: false
+        });
+    });
+    runtime_store_js_1.default.set('payload.client.plugin', react.plugin);
     return client_js_1.fillClientInitPayload(clientDirPath, clientName);
 });

package/lib/init/util/client.js

@@ -31,7 +31,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addDevDep = exports.clientNamePrompt = exports.directoryOverridePrompt = exports.fillClientInitPayload = void 0;
+exports.addDependency = exports.clientNamePrompt = exports.directoryOverridePrompt = exports.fillClientInitPayload = void 0;
 const ansi_colors_1 = require("ansi-colors");
 const runtime_store_js_1 = __importDefault(require("../../runtime-store.js"));
 const error_js_1 = __importDefault(require("../../error.js"));
@@ -77,12 +77,13 @@ function clientNamePrompt(question, defaultAns) {
     });
 }
 exports.clientNamePrompt = clientNamePrompt;
-function addDevDep(filePath, dep, depPath = []) {
+function addDependency(filePath, dep, { dev = false, depPath = [] } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             const packageJson = yield ASYNC.readJSONFile(filePath);
             if (packageJson) {
-                depPath.push('devDependencies');
+                depPath.push(dev ? 'devDependencies' : 'dependencies');
+                js_js_1.JS.assign(dep, js_js_1.JS.get(packageJson, depPath));
                 js_js_1.JS.set(packageJson, depPath, dep);
                 yield ASYNC.writeJSONFile(filePath, packageJson);
             }
@@ -93,4 +94,4 @@ function addDevDep(filePath, dep, depPath = []) {
         }
     });
 }
-exports.addDevDep = addDevDep;
+exports.addDependency = addDependency;

package/lib/optional-import.js

@@ -32,19 +32,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const app_module_path_1 = __importDefault(require("app-module-path"));
-const project_1 = require("./util_modules/project");
-const global_space_1 = __importDefault(require("./util_modules/global-space"));
+const project_js_1 = require("./util_modules/project.js");
 const path_1 = require("path");
-exports.default = (name) => __awaiter(void 0, void 0, void 0, function* () {
-    if (name !== path_1.basename(name)) {
-        const projectModulePath = project_1.resolveProjectPath(name);
+const async_js_1 = require("./util_modules/fs/lib/async.js");
+const error_js_1 = __importDefault(require("./error.js"));
+const ansi_colors_1 = require("ansi-colors");
+exports.default = (name, source) => __awaiter(void 0, void 0, void 0, function* () {
+    if (name === path_1.basename(name)) {
+        const projectModulePath = project_js_1.resolveProjectPath(path_1.join(source, 'node_modules', name));
+        const projectModulePathExists = yield async_js_1.dirExists(projectModulePath);
+        if (!projectModulePathExists) {
+            throw new error_js_1.default('Module path does not exists', {
+                errorId: 'OPT-IMP-1',
+                arg: [ansi_colors_1.bold(name), ansi_colors_1.italic.red(projectModulePath), ansi_colors_1.bold(source)],
+                exit: 1
+            });
+        }
         app_module_path_1.default.addPath(projectModulePath);
         return Promise.resolve().then(() => __importStar(require(projectModulePath)));
     }
-    const packageName = yield global_space_1.default(name);
-    if (typeof packageName === 'string') {
-        app_module_path_1.default.addPath(packageName);
-        return Promise.resolve().then(() => __importStar(require(packageName)));
+    const projectModulePath = project_js_1.resolveProjectPath(name);
+    const projectModulePathExists = yield async_js_1.dirExists(projectModulePath);
+    if (!projectModulePathExists) {
+        throw new error_js_1.default('Module path does not exists', {
+            errorId: 'OPT-IMP-2',
+            arg: [ansi_colors_1.bold(name), ansi_colors_1.italic.red(projectModulePath), ansi_colors_1.bold(source)],
+            exit: 1
+        });
     }
-    return;
+    app_module_path_1.default.addPath(projectModulePath);
+    return Promise.resolve().then(() => __importStar(require(projectModulePath)));
 });

package/lib/plugin-loader.js

@@ -32,18 +32,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
-const error_1 = __importDefault(require("./error"));
-const optional_import_1 = __importDefault(require("./optional-import"));
-const runtime_store_1 = __importDefault(require("./runtime-store"));
-const config = __importStar(require("./util_modules/config"));
+const error_js_1 = __importDefault(require("./error.js"));
+const optional_import_js_1 = __importDefault(require("./optional-import.js"));
+const runtime_store_js_1 = __importDefault(require("./runtime-store.js"));
+const ClientConfig = __importStar(require("./util_modules/config/lib/client.js"));
+const FunctionsConfig = __importStar(require("./util_modules/config/lib/functions.js"));
+const config = {
+    client: {
+        plugin: ClientConfig.plugin,
+        source: ClientConfig.source
+    },
+    functions: {
+        plugin: FunctionsConfig.plugin,
+        source: FunctionsConfig.source
+    }
+};
 const loadedPlugins = {};
 function pluginLoader(feature, name, source) {
     return __awaiter(this, void 0, void 0, function* () {
-        const configModule = config[(feature + 'Config')];
-        if (configModule === undefined) {
+        const pluginConfig = config[feature];
+        if (pluginConfig === undefined) {
             return;
         }
-        const plugins = configModule.plugin(name, source);
+        const plugins = pluginConfig.plugin(name, source);
         let specificPlugin;
         if (typeof plugins === 'string') {
             specificPlugin = plugins;
@@ -59,10 +70,10 @@ function pluginLoader(feature, name, source) {
             pluginMod = loadedPlugins[specificPlugin];
         }
         else {
-            pluginMod = yield optional_import_1.default(specificPlugin);
+            pluginMod = yield optional_import_js_1.default(specificPlugin, pluginConfig.source());
         }
         if (pluginMod === undefined) {
-            throw new error_1.default(`Configured plugin could not be found for [${feature}:${name}] - ${specificPlugin}`, {
+            throw new error_js_1.default(`Configured plugin could not be found for [${feature}:${name}] - ${specificPlugin}`, {
                 exit: 1,
                 errorId: 'PLG-LDR-1',
                 arg: [ansi_colors_1.italic.red(specificPlugin), ansi_colors_1.bold(name), ansi_colors_1.bold(feature)]
@@ -70,11 +81,11 @@ function pluginLoader(feature, name, source) {
         }
         loadedPlugins[specificPlugin] = pluginMod;
         if (typeof pluginMod === 'function') {
-            runtime_store_1.default.set(`context.${feature}.plugins.${name}${source ? '.' + source : ''}`, specificPlugin);
+            runtime_store_js_1.default.set(`context.${feature}.plugins.${name}${source ? '.' + source : ''}`, specificPlugin);
             return pluginMod;
         }
         else if (typeof pluginMod[name] === 'function') {
-            runtime_store_1.default.set(`context.${feature}.plugins.${name}${source ? '.' + source : ''}`, specificPlugin);
+            runtime_store_js_1.default.set(`context.${feature}.plugins.${name}${source ? '.' + source : ''}`, specificPlugin);
             return pluginMod[name];
         }
         return;

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

@@ -39,8 +39,8 @@ function prepareScriptFile(dir, port) {
 function stringInjector(source, anchorIdx, marker, inject) {
     const headLastIdx = anchorIdx + marker.length;
     const scriptPrefix = source.slice(0, headLastIdx);
-    const scriptSufix = source.slice(headLastIdx + 1);
-    return scriptPrefix + inject + scriptSufix;
+    const scriptSuffix = source.slice(headLastIdx);
+    return scriptPrefix + inject + scriptSuffix;
 }
 function injectScript(scriptLocale, indexHtml) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -60,7 +60,7 @@ function reloadApp(event, path, liveSockets) {
 }
 function webClientServer(httpPort, source, homepage, enableWatch) {
     return __awaiter(this, void 0, void 0, function* () {
-        const eventListner = new events_1.EventEmitter();
+        const eventListener = new events_1.EventEmitter();
         const catalystTempDir = path_1.join(source, '.catalyst');
         const socketServerPort = yield port_resolver_js_1.default.getFreePort(httpPort, 20, true);
         const reloadScriptSrc = enableWatch
@@ -75,7 +75,7 @@ function webClientServer(httpPort, source, homepage, enableWatch) {
             let watcherReady = false;
             clientWatcher.on('error', (err) => {
                 watcherReady = false;
-                eventListner.emit('error', new error_js_1.default('client watcher error', {
+                eventListener.emit('error', new error_js_1.default('client watcher error', {
                     original: err,
                     exit: 1,
                     skipHelp: true
@@ -112,9 +112,9 @@ function webClientServer(httpPort, source, homepage, enableWatch) {
                         reloadApp('Deletion of file(s) is', path_1.relative(source, path), liveSockets);
                     });
                 }, 1000);
-                eventListner.addListener('close', () => socketServer === null || socketServer === void 0 ? void 0 : socketServer.close());
+                eventListener.addListener('close', () => socketServer === null || socketServer === void 0 ? void 0 : socketServer.close());
             });
-            eventListner.addListener('close', () => {
+            eventListener.addListener('close', () => {
                 if (clientWatcher) {
                     clientWatcher.close();
                 }
@@ -130,7 +130,7 @@ function webClientServer(httpPort, source, homepage, enableWatch) {
                 (requestedFile.includes('.html') || requestedFile.includes('.htm'))) {
                 const homepageFile = yield index_js_2.ASYNC.readFile(path_1.join(source, homepage));
                 if (!homepageFile) {
-                    eventListner.emit('error', new error_js_1.default('Unable to read the homepage file', {
+                    eventListener.emit('error', new error_js_1.default('Unable to read the homepage file', {
                         exit: 1,
                         errorId: 'WEB-CLIENT-SERVER-1',
                         arg: [ansi_colors_1.red.italic(homepage)]
@@ -155,17 +155,17 @@ function webClientServer(httpPort, source, homepage, enableWatch) {
             });
         }));
         const server = app.listen(httpPort).on('error', (err) => {
-            eventListner.emit('error', err);
+            eventListener.emit('error', err);
         });
-        eventListner.on('error', (err) => {
+        eventListener.on('error', (err) => {
             logger_js_1.error('Error when serving the web-client: ' + err.message);
             logger_js_1.info('Please exit the command to get more info');
-            eventListner.emit('close');
+            eventListener.emit('close');
         });
-        eventListner.on('close', () => {
+        eventListener.on('close', () => {
             server.close(() => logger_js_1.debug('client server closed'));
         });
-        return new Promise((res) => server.on('listening', () => res(eventListner)));
+        return new Promise((res) => server.on('listening', () => res(eventListener)));
     });
 }
 exports.default = webClientServer;

package/lib/shell/index.js

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

package/lib/util_modules/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/lib/urls.js

@@ -1,38 +1,45 @@
 '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 catalystStatic() {
-        const dc = dc_1.getActiveDCType();
+        const dc = dc_js_1.getActiveDCType();
         if (dc === undefined) {
             return URL._catalystStatic;
         }
+        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_1.getActiveDCType();
+        const dc = dc_js_1.getActiveDCType();
         if (dc === undefined) {
             return URL._console;
         }
@@ -40,8 +47,9 @@ class URL {
     }
 }
 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._catalystStatic = env_1.envOverride('CATALYST_STATIC', 'https://catalyst.zoho.com');
-URL._console = env_1.envOverride('CATALYST_CONSOLE_URL', 'https://console.catalyst.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/global-space.js

@@ -1,99 +1,2 @@
 "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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.11.1",
+	"version": "1.12.0",
 	"description": "Command Line Tool for CATALYST",
 	"main": "./lib/index.js",
 	"bin": {
@@ -30,7 +30,7 @@
 		"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",
@@ -56,7 +56,7 @@
 		"ws": "^8.2.3",
 		"xml2js": "^0.4.23",
 		"yaml": "^1.10.2",
-		"zcatalyst-angular-schematics": "^0.0.1"
+		"zcatalyst-angular-schematics": "^0.1.0"
 	},
 	"devDependencies": {
 		"@types/app-module-path": "^2.2.0",

package/templates/init/functions/java/integ/cliq/com/handlers/BotHandler.java

@@ -156,10 +156,10 @@ public class BotHandler implements com.zc.cliq.interfaces.BotHandler {
 		String summary;
 		String bodyStr = new StringBuilder("*From*: ").append(reqBody.getString("fromAddress")).append("\n*Subject*: ").append(reqBody.getString("subject")).append("\n*Content*: ").append((summary = reqBody.getString("summary")).length() > 100 ? summary.substring(0, 100) : summary).toString();
 		Message msg = Message.getInstance(bodyStr);
-		msg.setBot("PostPerson", "https://previews.123rf.com/images/nastyatrel/nastyatrel2006/nastyatrel200600035/149438272-flat-vector-illustration-chat-bot-icon-flat-line-style-vector-.jpg");
+		msg.setBot("PostPerson", "https://www.zoho.com/sites/default/files/catalyst/functions-images/icon-robot.jpg");
 		CardDetails card = CardDetails.getInstance();
 		card.setTitle("New Mail");
-		card.setThumbnail("https://seekicon.com/free-icon-download/mail-icon_18.svg");
+		card.setThumbnail("https://www.zoho.com/sites/default/files/catalyst/functions-images/mail.svg");
 		msg.setCard(card);
 
 		ButtonObject button = new ButtonObject();

package/templates/init/functions/node/integ/cliq/handlers/bot-handler.js

@@ -117,12 +117,11 @@ botHandler.webHookHandler(async (req, res) => {
     const summary =  reqBody.summary || '';
     const bodyStr = `*From*: ${reqBody.fromAddress} \n *Subject*: ${reqBody.subject} \n *Content*: ${ summary.length > 100 ? summary.substring(0, 100): summary}`;
     
-    res.bot = res.newBotDetails('PostPerson',
-             'https://previews.123rf.com/images/nastyatrel/nastyatrel2006/nastyatrel200600035/149438272-flat-vector-illustration-chat-bot-icon-flat-line-style-vector-.jpg');
+    res.bot = res.newBotDetails('PostPerson', 'https://www.zoho.com/sites/default/files/catalyst/functions-images/icon-robot.jpg');
     
     const card = res.newCard();
     card.title = 'New Mail';
-    card.thumbnail = 'https://seekicon.com/free-icon-download/mail-icon_18.svg';
+    card.thumbnail = 'https://www.zoho.com/sites/default/files/catalyst/functions-images/mail.svg';
     res.card = card;
 
     const button = res.newButton();