zcatalyst-cli 1.11.1 → 1.13.0

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) {
@@ -27,14 +27,14 @@ function validate(targets, idx) {
         }
         const currentTarget = targets[idx];
         try {
-            const catalystFile = path_1.join(currentTarget.source, constants_1.FILENAME.catalyst_config);
+            const catalystFile = (0, path_1.join)(currentTarget.source, constants_1.FILENAME.catalyst_config);
             const data = yield fs_1.ASYNC.readJSONFile(catalystFile, { checkpath: true });
             if (data === undefined) {
                 throw new error_1.default('no ' + constants_1.FILENAME.catalyst_config + ' file found', {
                     exit: 1
                 });
             }
-            const indexFile = path_1.join(currentTarget.source, js_1.JS.get(data, 'execution.main', 'index.js'));
+            const indexFile = (0, path_1.join)(currentTarget.source, js_1.JS.get(data, 'execution.main', 'index.js'));
             currentTarget.index = indexFile;
             const indexFileExists = yield fs_1.ASYNC.fileExists(indexFile);
             if (!indexFileExists) {
@@ -42,15 +42,15 @@ function validate(targets, idx) {
                     errorId: 'NODE-1',
                     exit: 1,
                     arg: [
-                        ansi_colors_1.bold(currentTarget.index || 'undefined'),
-                        ansi_colors_1.bold(constants_1.FILENAME.catalyst_config),
-                        ansi_colors_1.bold(currentTarget.name)
+                        (0, ansi_colors_1.bold)(currentTarget.index || 'undefined'),
+                        (0, ansi_colors_1.bold)(constants_1.FILENAME.catalyst_config),
+                        (0, ansi_colors_1.bold)(currentTarget.name)
                     ]
                 });
             }
-            const nodeModuleExists = yield fs_1.ASYNC.dirExists(path_1.join(currentTarget.source, constants_1.FILENAME.node_modules));
+            const nodeModuleExists = yield fs_1.ASYNC.dirExists((0, path_1.join)(currentTarget.source, constants_1.FILENAME.node_modules));
             if (!nodeModuleExists) {
-                yield shell_1.spawn('npm', ['install'], { cwd: currentTarget.source }).ASYNC();
+                yield (0, npm_install_1.default)(currentTarget.source, true);
             }
             currentTarget.valid = true;
             return validate(targets, ++idx);

package/lib/fn-watcher.js

@@ -12,13 +12,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const chokidar_1 = require("chokidar");
 const languages_1 = require("./shell/prepare/languages");
 const logger_1 = require("./util_modules/logger");
-const shell_1 = require("./util_modules/shell");
 exports.default = (target) => __awaiter(void 0, void 0, void 0, function* () {
     return new Promise((res) => {
         let paused = false;
         let latestEvent;
-        const watcher = chokidar_1.watch(target.source, {
-            ignored: /(^|[\/\\])\../,
+        const watcher = (0, chokidar_1.watch)(target.source, {
+            ignored: [/(^|[\/\\])\../, 'node_modules/**/*', '/**/*.jar'],
             cwd: target.source,
             ignoreInitial: true
         });
@@ -28,12 +27,11 @@ exports.default = (target) => __awaiter(void 0, void 0, void 0, function* () {
                 return;
             }
             const currentLatestEvent = latestEvent;
-            shell_1.clearStdout(true);
-            logger_1.info(`\n${currentLatestEvent.evnt} of ${currentLatestEvent.pth} in ${target.name} detected. Preparing your function, please wait...`);
+            (0, logger_1.info)(`\n${currentLatestEvent.evnt} of ${currentLatestEvent.pth} in ${target.name} detected. Preparing your function, please wait...`);
             watcher.emit('preparing');
             target.failure_reason = undefined;
             target.valid = true;
-            yield languages_1.prepareFunctions([target]);
+            yield (0, languages_1.prepareFunctions)([target]);
             if (currentLatestEvent.at === latestEvent.at) {
                 latestEvent = undefined;
             }
@@ -41,9 +39,9 @@ exports.default = (target) => __awaiter(void 0, void 0, void 0, function* () {
                 watcher.emit('compiled');
                 return;
             }
-            logger_1.warning('target [' + target.name + '] is not a valid one reason : ' + target.failure_reason);
-            logger_1.info('Waiting for correction..');
-            logger_1.info('\n(To exit, press ^C)');
+            (0, logger_1.warning)('target [' + target.name + '] is not a valid one reason : ' + target.failure_reason);
+            (0, logger_1.info)('Waiting for correction..');
+            (0, logger_1.info)('\n(To exit, press ^C)');
             watcher.emit('next');
         }));
         watcher.on('all', (evnt, pth) => {
@@ -59,8 +57,8 @@ exports.default = (target) => __awaiter(void 0, void 0, void 0, function* () {
             res();
         });
         watcher.on('error', (err) => {
-            logger_1.debug(err);
-            logger_1.warning(`Unable to start watcher for target [${target.name}]. Skipping watch mode.`);
+            (0, logger_1.debug)(err);
+            (0, logger_1.warning)(`Unable to start watcher for target [${target.name}]. Skipping watch mode.`);
             res();
         });
     });

package/lib/iac/status/bundle.js

@@ -23,8 +23,8 @@ const fs_1 = require("../../util_modules/fs");
 const path_1 = require("path");
 const option_1 = require("../../util_modules/option");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
-    const env = option_1.getOptionValue('production', false) ? 'Production' : 'Development';
-    const getSpinnerTxt = util_1.getSpinnerTxt('bundle');
+    const env = (0, option_1.getOptionValue)('production', false) ? 'Production' : 'Development';
+    const getSpinnerTxt = (0, util_1.getSpinnerTxt)('bundle');
     const iacAPI = new iac_1.default(undefined, { env });
     const bundleStatus = yield iacAPI.bundleStatus();
     if (bundleStatus === undefined) {
@@ -60,12 +60,12 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                 timerAPI.end(undefined, true);
                 break;
             default:
-                logger_1.debug('Unknown status received : ', data.status);
+                (0, logger_1.debug)('Unknown status received : ', data.status);
                 timerAPI.end();
         }
     }));
     timerAPI.on('error', (e) => {
-        logger_1.debug('Error encounted :', e);
+        (0, logger_1.debug)('Error encounted :', e);
     });
     timerAPI.on('end', () => throbber.stopAll());
     timerAPI.start();
@@ -76,7 +76,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             const hrTime = process.hrtime();
             const fileName = `export_${bundleStatus.id}_${hrTime[0] * 1000000000 + hrTime[1]}.zip`;
             const bundlezip = yield iacAPI.bundleDownload();
-            return fs_1.ASYNC.writeFile(path_1.join(process.cwd(), fileName), bundlezip);
+            return fs_1.ASYNC.writeFile((0, path_1.join)(process.cwd(), fileName), bundlezip);
         }
     }
 });

package/lib/iac/status/deploy.js

@@ -20,8 +20,8 @@ const throbber_1 = __importDefault(require("../../throbber"));
 const logger_1 = require("../../util_modules/logger");
 const util_1 = require("./util");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
-    const getSpinnerTxt = util_1.getSpinnerTxt('deploy');
-    const idOpt = option_1.getOptionValue('id', false);
+    const getSpinnerTxt = (0, util_1.getSpinnerTxt)('deploy');
+    const idOpt = (0, option_1.getOptionValue)('id', false);
     const iacAPI = new iac_1.default();
     const allDeploys = yield iacAPI.allDeploys();
     if (allDeploys.length <= 0) {
@@ -61,12 +61,12 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                 timerAPI.end(undefined, true);
                 break;
             default:
-                logger_1.debug('Unknown status received : ', data.status);
+                (0, logger_1.debug)('Unknown status received : ', data.status);
                 timerAPI.end();
         }
     }));
     timerAPI.on('error', (e) => {
-        logger_1.debug('Error encounted : ', e);
+        (0, logger_1.debug)('Error encounted : ', e);
     });
     timerAPI.on('end', () => throbber.stopAll());
     timerAPI.start();

package/lib/index.js

@@ -20,8 +20,8 @@ program.option('--dc <us|eu|in>', 'Supply a data center for a command');
 program.option('--verbose', 'Change the log level to verbose for debugging purposes');
 program.helpOption('-h, --help', 'Display help for a Catalyst command');
 program.showSuggestionAfterError();
-program.showHelpAfterError(`For more usage information use the ${ansi_colors_1.bold('catalyst help')} command`);
+program.showHelpAfterError(`For more usage information use the ${(0, ansi_colors_1.bold)('catalyst help')} command`);
 program.addHelpText('before', fs_1.SYNC.readFile(constants_1.TEMPLATE.banner, 'utf-8') || '');
-program.addHelpText('afterAll', `\nFor detailed documentations please visit ${ansi_colors_1.underline('https://www.zoho.com/catalyst/help/cli-command-reference.html')}`);
+program.addHelpText('afterAll', `\nFor detailed documentations please visit ${(0, ansi_colors_1.underline)('https://www.zoho.com/catalyst/help/cli-command-reference.html')}`);
 const cli = new client_1.Client(program);
 exports.default = cli;

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 (0, 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/dependencies/package-json.js

@@ -23,12 +23,12 @@ const js_1 = require("../../util_modules/js");
 const logger_1 = require("../../util_modules/logger");
 const project_1 = require("../../util_modules/project");
 exports.default = (templateJsonDir = 'package.json', keys) => __awaiter(void 0, void 0, void 0, function* () {
-    const templateJsonPath = path_1.join(templateJsonDir, 'package.json');
+    const templateJsonPath = (0, path_1.join)(templateJsonDir, 'package.json');
     const qns = keys.map((qn) => {
         switch (qn) {
             case 'name':
                 return prompt_1.default.question('name', 'package name: ', {
-                    defaultAns: js_1.JS.snakeCase(project_1.getProjectName('sample') + '_function'),
+                    defaultAns: js_1.JS.snakeCase((0, project_1.getProjectName)('sample') + '_function'),
                     validate: (ans) => {
                         if (ans.match(constants_1.REGEX.functions.package.name)) {
                             return true;
@@ -54,11 +54,11 @@ exports.default = (templateJsonDir = 'package.json', keys) => __awaiter(void 0,
                 throw new error_1.default('unknown key provided', { exit: 2 });
         }
     });
-    logger_1.info('This utility will ask series of questions with sensible defaults for creating ' +
-        ansi_colors_1.cyan('package.json') +
+    (0, logger_1.info)('This utility will ask series of questions with sensible defaults for creating ' +
+        (0, ansi_colors_1.cyan)('package.json') +
         '\nFeel free to modify them if needed.\n');
-    logger_1.info('Use `' +
-        ansi_colors_1.bold('npm install <pkg> --save') +
+    (0, logger_1.info)('Use `' +
+        (0, ansi_colors_1.bold)('npm install <pkg> --save') +
         '` afterwards to install a package and \nsave it as a dependency in the package.json file.\n');
     const answers = yield prompt_1.default.ask(...qns);
     let content = yield fs_1.ASYNC.readFile(templateJsonPath);

package/lib/init/features/client/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -42,15 +46,14 @@ 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;
 const { client } = placeholders_js_1.default;
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
-    const clientName = yield client_js_1.clientNamePrompt('Please provide a name for your Angular App:', 'angular-app');
-    const clientDirPath = project_js_1.resolveProjectPath(folder_names_js_1.default.client);
-    yield client_js_1.directoryOverridePrompt(clientDirPath);
+    const clientName = yield (0, client_js_1.clientNamePrompt)('Please provide a name for your Angular App:', 'angular-app');
+    const clientDirPath = (0, project_js_1.resolveProjectPath)(folder_names_js_1.default.client);
+    yield (0, client_js_1.directoryOverridePrompt)(clientDirPath);
     const opts = [
         angular.runner_command[1],
         clientName,
@@ -59,29 +62,27 @@ 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)], {
+        const collection = require.resolve((0, path_1.join)(angular.collection_name, 'package.json'));
+        yield (0, shell_js_1.spawn)(angular.runner_command[0], [...opts, '--collection', (0, 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;
         }
-        logger_js_1.info(`Angular CLI (${ansi_colors_1.red.italic('@angular/cli')}) not found....`);
-        logger_js_1.info(`Installing ${ansi_colors_1.bold('@angular/cli')} using ${ansi_colors_1.bold('npx')}`);
-        logger_js_1.info('Note: this may take a while...');
-        yield shell_js_1.spawn('npx', [
+        (0, logger_js_1.info)(`Angular CLI (${ansi_colors_1.red.italic('@angular/cli')}) not found....`);
+        (0, logger_js_1.info)(`Installing ${(0, ansi_colors_1.bold)('@angular/cli')} using ${(0, ansi_colors_1.bold)('npx')}`);
+        (0, logger_js_1.info)('Note: this may take a while...');
+        yield (0, shell_js_1.spawn)('npx', [
             '-p',
             angular.collection_name,
             '-p',
@@ -92,15 +93,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)));
-    return client_js_1.fillClientInitPayload(clientDirPath, clientName);
+    yield ASYNC.findAndReplace((0, 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', angular.plugin);
+    return (0, client_js_1.fillClientInitPayload)(clientDirPath, clientName);
 });

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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -40,11 +44,11 @@ const logger_js_1 = require("../../../../util_modules/logger.js");
 const project_js_1 = require("../../../../util_modules/project.js");
 const client_js_1 = require("../../../util/client.js");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
-    logger_js_1.message('A directory ' + ansi_colors_1.cyan.bold('client') + ' will be created with a webapp pre-configured.');
-    const clientDirPath = project_js_1.resolveProjectPath(folder_names_js_1.default.client);
-    yield client_js_1.directoryOverridePrompt(clientDirPath);
+    (0, logger_js_1.message)('A directory ' + ansi_colors_1.cyan.bold('client') + ' will be created with a webapp pre-configured.');
+    const clientDirPath = (0, project_js_1.resolveProjectPath)(folder_names_js_1.default.client);
+    yield (0, client_js_1.directoryOverridePrompt)(clientDirPath);
     yield ASYNC.copyDir(template_js_1.default.client.basic.new, clientDirPath);
-    const clientName = yield client_js_1.clientNamePrompt('How do you want to address the client ?', 'sampleApp');
+    const clientName = yield (0, client_js_1.clientNamePrompt)('How do you want to address the client ?', 'sampleApp');
     yield ASYNC.findAndReplace(clientDirPath)(placeholders_js_1.default.client.package.name, clientName);
-    return client_js_1.fillClientInitPayload(clientDirPath, clientName);
+    return (0, client_js_1.fillClientInitPayload)(clientDirPath, clientName);
 });

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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -41,21 +45,16 @@ 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* () {
-    const clientName = yield client_js_1.clientNamePrompt('Please provide a name for your Lyte web app: ', 'lyte-app');
-    const clientDirPath = project_js_1.resolveProjectPath(folder_names_js_1.default.client);
-    yield client_js_1.directoryOverridePrompt(clientDirPath);
+    const clientName = yield (0, client_js_1.clientNamePrompt)('Please provide a name for your Lyte web app: ', 'lyte-app');
+    const clientDirPath = (0, project_js_1.resolveProjectPath)(folder_names_js_1.default.client);
+    yield (0, 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 (0, client_js_1.addDependency)((0, 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)));
-    return client_js_1.fillClientInitPayload(clientDirPath, clientName);
+    yield (0, npm_install_js_1.default)(clientDirPath, true);
+    runtime_store_js_1.default.set('payload.client.plugin', lyte.plugin);
+    return (0, client_js_1.fillClientInitPayload)(clientDirPath, clientName);
 });

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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -37,12 +41,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* () {
@@ -53,25 +57,26 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             index_js_1.default.choice('TypeScript', { value: 'ts', short: 'TypeScript' })
         ]
     }));
-    const clientName = yield client_js_1.clientNamePrompt('Please provide a name for your React App:', 'react-app');
-    const clientDirPath = project_js_1.resolveProjectPath(clientName);
-    yield client_js_1.directoryOverridePrompt(clientDirPath);
-    const catalystTempDir = path_1.join(os_1.tmpdir(), '.catalyst');
-    const reactPluginDir = path_1.join(catalystTempDir, 'react');
+    const clientName = yield (0, client_js_1.clientNamePrompt)('Please provide a name for your React App:', 'react-app');
+    const clientDirPath = (0, project_js_1.resolveProjectPath)(clientName);
+    yield (0, client_js_1.directoryOverridePrompt)(clientDirPath);
+    const catalystTempDir = (0, path_1.join)((0, os_1.tmpdir)(), '.catalyst');
+    const reactPluginDir = (0, 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 (0, client_js_1.addDependency)((0, 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], {
+    yield (0, 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)));
-    return client_js_1.fillClientInitPayload(clientDirPath, clientName);
+    })
+        .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 (0, client_js_1.fillClientInitPayload)(clientDirPath, clientName);
 });

package/lib/init/features/functions/index.js

@@ -25,24 +25,24 @@ const option_1 = require("../../../util_modules/option");
 const project_1 = require("../../../util_modules/project");
 const languages_1 = __importDefault(require("./languages"));
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
-    const currentCmd = option_1.getCurrentCommand();
-    const functionsDirPath = project_1.resolveProjectPath(constants_1.FOLDERNAME.functions);
+    const currentCmd = (0, option_1.getCurrentCommand)();
+    const functionsDirPath = (0, project_1.resolveProjectPath)(constants_1.FOLDERNAME.functions);
     runtime_store_1.default.set('context.functions.dir_path', functionsDirPath);
     if (currentCmd === 'init' || currentCmd === 'functions:setup') {
-        logger_1.message('A directory ' +
+        (0, logger_1.message)('A directory ' +
             ansi_colors_1.cyan.bold(constants_1.FOLDERNAME.functions) +
             ' will be created with a catalyst function pre-configured.\n');
         const folderExits = yield fs_1.ASYNC.dirExists(functionsDirPath);
         const overwriteAns = folderExits
             ? yield prompt_1.default.ask(prompt_1.default.question('overwrite', 'Directory ' +
-                ansi_colors_1.underline(constants_1.FOLDERNAME.functions) +
+                (0, ansi_colors_1.underline)(constants_1.FOLDERNAME.functions) +
                 ' already exists. Overwrite ?', {
                 type: 'confirm',
                 defaultAns: false
             }))
             : { overwrite: true };
         if (!overwriteAns.overwrite) {
-            logger_1.warning('skipping function setup');
+            (0, logger_1.warning)('skipping function setup');
             return;
         }
         yield fs_1.ASYNC.deleteDir(functionsDirPath).catch();
@@ -76,16 +76,17 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     }));
     runtime_store_1.default.set('context.functions.type', fnTypeAns.type);
     if (fnTypeAns.type === constants_1.FN_TYPE.integration) {
-        yield integ_1.integHelper();
+        yield (0, integ_1.integHelper)();
     }
     const runtimeDetails = (yield runtimeDetailsPromise);
     const runtimeChoices = runtimeDetails.runtimes.reduce((acc, value) => {
         const langArr = value.match(/[a-zA-Z]+/g);
         if (langArr === null || languages_1.default[langArr[0]] === undefined) {
-            logger_1.debug('Language cannot be identified hence skipping');
+            (0, logger_1.debug)('Language cannot be identified hence skipping');
             return acc;
         }
-        const lang = languages_1.default[langArr[0]];
+        const runtimeLang = langArr[0];
+        const langFn = languages_1.default[runtimeLang];
         let displayValue = value;
         let disabled = false;
         if (runtimeDetails.eol_runtimes && runtimeDetails.eol_runtimes[value]) {
@@ -102,22 +103,30 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                     disabled = true;
                     break;
                 default:
-                    logger_1.debug('unknown eol_runtime value ' + runtimeDetails.eol_runtimes[value]);
+                    (0, logger_1.debug)('unknown eol_runtime value ' + runtimeDetails.eol_runtimes[value]);
                     return acc;
             }
         }
-        acc.push(prompt_1.default.choice(displayValue, { value: lang(value), short: value, disabled }));
+        if (acc[runtimeLang].length === 0) {
+            const sep = {
+                node: '---NodeJS---',
+                java: '----Java----'
+            };
+            acc[runtimeLang].push(prompt_1.default.separator(sep[runtimeLang]));
+        }
+        acc[runtimeLang].push(prompt_1.default.choice(displayValue, { value: langFn(value), short: value, disabled }));
         return acc;
-    }, []);
+    }, { node: [], java: [] });
+    const runtimeChoicesArr = [...runtimeChoices.java, ...runtimeChoices.node];
     const runtimeAns = yield prompt_1.default.ask(prompt_1.default.question('runtime', 'Which runtime do you prefer to write your function?', {
         type: 'list',
-        choices: runtimeChoices,
+        choices: runtimeChoicesArr,
         when: () => {
-            return runtimeChoices.length > 1;
+            return runtimeChoicesArr.length > 1;
         }
     }));
     if (runtimeAns === undefined || runtimeAns.runtime === undefined) {
-        return languages_1.default.node('node14')();
+        return runtimeChoices.node[1].value();
     }
     return runtimeAns.runtime();
 });