zcatalyst-cli 1.11.0 → 1.11.1

package/lib/client-utils.js

@@ -27,7 +27,6 @@ const js_1 = require("./util_modules/js");
 const logger_1 = require("./util_modules/logger");
 const option_1 = require("./util_modules/option");
 const project_1 = require("./util_modules/project");
-const prompt_1 = __importDefault(require("./prompt"));
 exports.clientUtils = {
     validate: (source) => __awaiter(void 0, void 0, void 0, function* () {
         const sourceDir = source || project_1.resolveProjectPath(config_1.clientConfig.source());
@@ -150,31 +149,5 @@ exports.clientUtils = {
         }
         conf.unset('client');
         yield conf.save();
-    }),
-    directoryOverridePrompt: (dir) => __awaiter(void 0, void 0, void 0, function* () {
-        const foldeExists = yield fs_1.ASYNC.dirExists(dir);
-        if (foldeExists) {
-            const overwriteAns = yield prompt_1.default.ask(prompt_1.default.question('overwrite', 'Directory ' + ansi_colors_1.underline(dir) + ' already exists. Overwrite ?', {
-                type: 'confirm',
-                defaultAns: false
-            }));
-            if (!overwriteAns.overwrite) {
-                throw new error_1.default('Skipping client setup since unable to override the already existing client', { exit: 0, errorId: 'CLIENT-UTILS-6', arg: [ansi_colors_1.italic.red(dir)] });
-            }
-            yield fs_1.ASYNC.deleteDir(dir);
-        }
-    }),
-    clientNamePrompt: (question, defaultAns) => __awaiter(void 0, void 0, void 0, function* () {
-        const namePrompt = yield prompt_1.default.ask(prompt_1.default.question('name', question, {
-            type: 'input',
-            defaultAns,
-            validate: (ans) => {
-                if (ans.match(constants_1.REGEX.client.package_name)) {
-                    return true;
-                }
-                return 'Invalid client name';
-            }
-        }));
-        return namePrompt.name;
     })
 };

package/lib/commands/iac/import.js

@@ -1,4 +1,23 @@
 '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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 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) {
@@ -27,14 +46,16 @@ const prompt_1 = __importDefault(require("../../prompt"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
 const env_1 = require("../../util_modules/env");
-const fs_1 = require("../../util_modules/fs");
+const ASYNC = __importStar(require("../../util_modules/fs/lib/async.js"));
+const SYNC = __importStar(require("../../util_modules/fs/lib/sync.js"));
+const utils_js_1 = require("../../util_modules/fs/utils.js");
 const js_1 = require("../../util_modules/js");
 const logger_1 = require("../../util_modules/logger");
 const option_1 = require("../../util_modules/option");
 const shell_1 = require("../../util_modules/shell");
 const getZipAndTemplate = (filePath, stagedDeploy) => __awaiter(void 0, void 0, void 0, function* () {
     const zipFile = filePath
-        ? yield fs_1.ASYNC.readFile(fs_1.untildify(filePath), 'buffer')
+        ? yield ASYNC.readFile(utils_js_1.untildify(filePath), 'buffer')
         : (stagedDeploy === null || stagedDeploy === void 0 ? void 0 : stagedDeploy.id)
             ? yield new iac_1.default().deployDownload(stagedDeploy.id)
             : undefined;
@@ -65,7 +86,7 @@ const ensureUserAction = (deployRes) => __awaiter(void 0, void 0, void 0, functi
                     resp.end();
                     return;
                 }
-                const htmlFile = yield fs_1.ASYNC.readFile(path_1.join(__dirname, '../../../templates/iacSuccess.html'));
+                const htmlFile = yield ASYNC.readFile(path_1.join(__dirname, '../../../templates/iacSuccess.html'));
                 resp.setHeader('Content-Type', 'text/html');
                 resp.writeHead(200);
                 resp.end(htmlFile, () => {
@@ -152,7 +173,7 @@ const iacImport = (filePath, projectName) => __awaiter(void 0, void 0, void 0, f
         exclude: ['**/!(*.zip)', '**/.*'],
         validate: ({ value }) => __awaiter(void 0, void 0, void 0, function* () {
             if (value && value.endsWith('.zip')) {
-                return (yield fs_1.ASYNC.fileExists(value)) ? true : 'File does not exists!';
+                return (yield ASYNC.fileExists(value)) ? true : 'File does not exists!';
             }
             return 'Invalid zip file!';
         })
@@ -165,7 +186,7 @@ const iacImport = (filePath, projectName) => __awaiter(void 0, void 0, void 0, f
     const [zipArchive, templateFile] = yield getZipAndTemplate(filePath);
     const parsedJSON = js_1.JS.parseJSON(templateFile);
     const format = parsedJSON ? constants_1.IAC.template_format.json : constants_1.IAC.template_format.yml;
-    const deployRes = yield new iac_1.default().deploy(projectName, format, fs_1.SYNC.getReadStream(filePath));
+    const deployRes = yield new iac_1.default().deploy(projectName, format, SYNC.getReadStream(filePath));
     yield ensureUserAction(deployRes);
     return [zipArchive, templateFile, deployRes];
 });

package/lib/endpoints/lib/sdk.js

@@ -31,10 +31,10 @@ class SDK {
             if (targetSDK === undefined || targetUrl === undefined) {
                 throw new error_1.default('SDK target missing', { exit: 2 });
             }
-            const res = yield new api_1.default(this.opts).get(`/catalyst/downloads/sdk/java/${targetUrl}_latest.zip`, {
+            const res = yield new api_1.default(this.opts).get(`/downloads/sdk/java/${targetUrl}_latest.zip`, {
                 json: false,
                 encoding: null,
-                origin: constants_1.ORIGIN.zoho,
+                origin: constants_1.ORIGIN.catalystStatic,
                 log: {
                     progress: {
                         title: targetSDK.replace(new RegExp('_', 'g'), '-')

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

@@ -1,4 +1,23 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 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) {
@@ -16,7 +35,6 @@ const file_names_js_1 = __importDefault(require("../../../../util_modules/consta
 const plugin_js_1 = __importDefault(require("../../../../util_modules/constants/lib/plugin.js"));
 const placeholders_js_1 = __importDefault(require("../../../../util_modules/constants/lib/placeholders.js"));
 const folder_names_js_1 = __importDefault(require("../../../../util_modules/constants/lib/folder-names.js"));
-const client_utils_js_1 = require("../../../../client-utils.js");
 const project_js_1 = require("../../../../util_modules/project.js");
 const shell_js_1 = require("../../../../util_modules/shell.js");
 const runtime_store_js_1 = __importDefault(require("../../../../runtime-store.js"));
@@ -25,14 +43,14 @@ 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 index_js_1 = require("../../../../util_modules/fs/index.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_utils_js_1.clientUtils.clientNamePrompt('Please provide a name for your Angular App:', 'angular-app');
+    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_utils_js_1.clientUtils.directoryOverridePrompt(clientDirPath);
+    yield client_js_1.directoryOverridePrompt(clientDirPath);
     const opts = [
         angular.runner_command[1],
         clientName,
@@ -80,7 +98,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             }
         }).ASYNC();
     }
-    yield index_js_1.ASYNC.findAndReplace(path_1.join(clientDirPath, file_names_js_1.default.client.package_json))(client.package.name, clientName);
+    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)));

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

@@ -1,4 +1,23 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 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) {
@@ -8,20 +27,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 });
 const ansi_colors_1 = require("ansi-colors");
-const constants_1 = require("../../../../util_modules/constants");
-const fs_1 = require("../../../../util_modules/fs");
-const logger_1 = require("../../../../util_modules/logger");
-const project_1 = require("../../../../util_modules/project");
-const client_utils_1 = require("../../../../client-utils");
-const client_1 = require("../../../util/client");
+const folder_names_js_1 = __importDefault(require("../../../../util_modules/constants/lib/folder-names.js"));
+const placeholders_js_1 = __importDefault(require("../../../../util_modules/constants/lib/placeholders.js"));
+const template_js_1 = __importDefault(require("../../../../util_modules/constants/lib/template.js"));
+const ASYNC = __importStar(require("../../../../util_modules/fs/lib/async.js"));
+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_1.message('A directory ' + ansi_colors_1.cyan.bold('client') + ' will be created with a webapp pre-configured.');
-    const clientDirPath = project_1.resolveProjectPath(constants_1.FOLDERNAME.client);
-    yield client_utils_1.clientUtils.directoryOverridePrompt(clientDirPath);
-    yield fs_1.ASYNC.copyDir(constants_1.TEMPLATE.client.basic.new, clientDirPath);
-    const clientName = yield client_utils_1.clientUtils.clientNamePrompt('How do you want to address the client ?', 'sampleApp');
-    yield fs_1.ASYNC.findAndReplace(clientDirPath)(constants_1.PLACEHOLDER.client.package.name, clientName);
-    return client_1.fillClientInitPayload(clientDirPath, clientName);
+    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);
+    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');
+    yield ASYNC.findAndReplace(clientDirPath)(placeholders_js_1.default.client.package.name, clientName);
+    return client_js_1.fillClientInitPayload(clientDirPath, clientName);
 });

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

@@ -1,4 +1,23 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 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) {
@@ -12,33 +31,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const constants_1 = require("../../../../util_modules/constants");
-const fs_1 = require("../../../../util_modules/fs");
-const project_1 = require("../../../../util_modules/project");
-const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
 const path_1 = require("path");
-const client_utils_1 = require("../../../../client-utils");
-const global_space_1 = __importDefault(require("../../../../util_modules/global-space"));
-const npm_install_1 = __importDefault(require("../../../dependencies/npm-install"));
-const client_1 = require("../../../util/client");
-const { lyte } = constants_1.PLUGIN;
-const { client } = constants_1.PLACEHOLDER;
+const client_js_1 = require("../../../util/client.js");
+const runtime_store_js_1 = __importDefault(require("../../../../runtime-store.js"));
+const npm_install_js_1 = __importDefault(require("../../../dependencies/npm-install.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 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_utils_1.clientUtils.clientNamePrompt('Please provide a name for your Lyte web app: ', 'lyte-app');
-    const clientDirPath = project_1.resolveProjectPath(constants_1.FOLDERNAME.client);
-    yield client_utils_1.clientUtils.directoryOverridePrompt(clientDirPath);
-    yield fs_1.ASYNC.copyDir(constants_1.TEMPLATE.client.lyte, clientDirPath);
-    const isModuleFound = yield global_space_1.default(lyte.plugin);
-    yield fs_1.ASYNC.findAndReplace(clientDirPath)([client.package.name, client.package.devDependencies], [
-        clientName,
-        isModuleFound
-            ? ''
-            : ',\n  "devDependencies": ' +
-                JSON.stringify({ [lyte.plugin]: 'latest' }, null, '    ').replace(/\n}/g, '\n  }')
-    ]);
-    yield npm_install_1.default(clientDirPath, true);
-    runtime_store_1.default.set('payload.client.plugin', isModuleFound
+    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);
+    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 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_1.getProjectRoot(), path_1.join(clientDirPath, 'node_modules', lyte.plugin)));
-    return client_1.fillClientInitPayload(clientDirPath, clientName);
+        : path_1.relative(project_js_1.getProjectRoot(), path_1.join(clientDirPath, 'node_modules', lyte.plugin)));
+    return client_js_1.fillClientInitPayload(clientDirPath, clientName);
 });

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

@@ -1,4 +1,23 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 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) {
@@ -12,42 +31,47 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const constants_1 = require("../../../../util_modules/constants");
-const client_utils_1 = require("../../../../client-utils");
-const project_1 = require("../../../../util_modules/project");
-const shell_1 = require("../../../../util_modules/shell");
-const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
-const fs_1 = require("../../../../util_modules/fs");
+const project_js_1 = require("../../../../util_modules/project.js");
+const shell_js_1 = require("../../../../util_modules/shell.js");
+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_1 = __importDefault(require("../../../../util_modules/global-space"));
-const prompt_1 = __importDefault(require("../../../../prompt"));
-const client_1 = require("../../../util/client");
-const { react } = constants_1.PLUGIN;
-const { client } = constants_1.PLACEHOLDER;
+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 { react } = plugin_js_1.default;
+const { client } = placeholders_js_1.default;
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
-    const flavourPrompt = yield prompt_1.default.ask(prompt_1.default.question('flavour', `Choose an option to create the React App:`, {
+    const flavourPrompt = yield index_js_1.default.ask(index_js_1.default.question('flavour', `Choose an option to create the React App:`, {
         type: 'list',
         choices: [
-            prompt_1.default.choice('JavaScript', { value: 'js', short: 'JavaScript' }),
-            prompt_1.default.choice('TypeScript', { value: 'ts', short: 'TypeScript' })
+            index_js_1.default.choice('JavaScript', { value: 'js', short: 'JavaScript' }),
+            index_js_1.default.choice('TypeScript', { value: 'ts', short: 'TypeScript' })
         ]
     }));
-    const clientName = yield client_utils_1.clientUtils.clientNamePrompt('Please provide a name for your React App:', 'react-app');
-    const clientDirPath = project_1.resolveProjectPath(clientName);
-    yield client_utils_1.clientUtils.directoryOverridePrompt(clientDirPath);
+    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');
-    yield fs_1.ASYNC.emptyDir(reactPluginDir);
-    yield fs_1.ASYNC.copyDir(flavourPrompt.flavour === 'ts' ? constants_1.TEMPLATE.client.react.ts : constants_1.TEMPLATE.client.react.js, reactPluginDir);
-    const isModuleFound = yield global_space_1.default(react.plugin);
-    yield fs_1.ASYNC.findAndReplace(path_1.join(reactPluginDir))([client.package.name, client.package.devDependencies], [clientName, isModuleFound ? '' : `, "devDependencies": { "${react.plugin}": "latest" }`]);
-    yield shell_1.spawn('npx', [react.runner_command[0], clientName, '--template', 'file:' + reactPluginDir], {
+    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 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_1.default.get('cwd')
+        cwd: runtime_store_js_1.default.get('cwd')
     }).ASYNC();
-    runtime_store_1.default.set('payload.client.plugin', isModuleFound
+    runtime_store_js_1.default.set('payload.client.plugin', isModuleFound
         ? react.plugin
-        : path_1.relative(project_1.getProjectRoot(), path_1.join(clientDirPath, 'node_modules', react.plugin)));
-    return client_1.fillClientInitPayload(clientDirPath, clientName);
+        : path_1.relative(project_js_1.getProjectRoot(), path_1.join(clientDirPath, 'node_modules', react.plugin)));
+    return client_js_1.fillClientInitPayload(clientDirPath, clientName);
 });

package/lib/init/util/client.js

@@ -1,12 +1,96 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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.fillClientInitPayload = void 0;
-const runtime_store_1 = __importDefault(require("../../runtime-store"));
+exports.addDevDep = 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"));
+const index_js_1 = __importDefault(require("../../prompt/index.js"));
+const regex_js_1 = __importDefault(require("../../util_modules/constants/lib/regex.js"));
+const ASYNC = __importStar(require("../../util_modules/fs/lib/async.js"));
+const logger_js_1 = require("../../util_modules/logger.js");
+const js_js_1 = require("../../util_modules/js.js");
 const fillClientInitPayload = (source, name) => {
-    runtime_store_1.default.set('payload.client.source', source);
-    runtime_store_1.default.set('payload.client.name', name);
+    runtime_store_js_1.default.set('payload.client.source', source);
+    runtime_store_js_1.default.set('payload.client.name', name);
 };
 exports.fillClientInitPayload = fillClientInitPayload;
+function directoryOverridePrompt(dir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const foldeExists = yield ASYNC.dirExists(dir);
+        if (foldeExists) {
+            const overwriteAns = yield index_js_1.default.ask(index_js_1.default.question('overwrite', 'Directory ' + ansi_colors_1.underline(dir) + ' already exists. Overwrite ?', {
+                type: 'confirm',
+                defaultAns: false
+            }));
+            if (!overwriteAns.overwrite) {
+                throw new error_js_1.default('Skipping client setup since unable to override the already existing client', { exit: 0, errorId: 'CLIENT-UTILS-6', arg: [ansi_colors_1.italic.red(dir)] });
+            }
+            yield ASYNC.deleteDir(dir);
+        }
+    });
+}
+exports.directoryOverridePrompt = directoryOverridePrompt;
+function clientNamePrompt(question, defaultAns) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const namePrompt = yield index_js_1.default.ask(index_js_1.default.question('name', question, {
+            type: 'input',
+            defaultAns,
+            validate: (ans) => {
+                if (ans.match(regex_js_1.default.client.package_name)) {
+                    return true;
+                }
+                return 'Invalid client name';
+            }
+        }));
+        return namePrompt.name;
+    });
+}
+exports.clientNamePrompt = clientNamePrompt;
+function addDevDep(filePath, dep, depPath = []) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const packageJson = yield ASYNC.readJSONFile(filePath);
+            if (packageJson) {
+                depPath.push('devDependencies');
+                js_js_1.JS.set(packageJson, depPath, dep);
+                yield ASYNC.writeJSONFile(filePath, packageJson);
+            }
+        }
+        catch (e) {
+            const err = error_js_1.default.getErrorInstance(e, { skipHelp: true });
+            logger_js_1.debug(`unable to write to ${filePath}: ${err.message}`);
+        }
+    });
+}
+exports.addDevDep = addDevDep;

package/lib/serve/server/lib/master.js

@@ -82,10 +82,6 @@ const proxyResponseHandler = (systemRoutes) => (proxyRes, req, res) => {
         }
     }
 };
-const generateConnectionId = () => {
-    const offset = Math.floor(Math.random() * 10);
-    return Date.now() + offset + '';
-};
 function spinUpMaster(listenPort, otherServerDetails) {
     return __awaiter(this, void 0, void 0, function* () {
         const projectDetails = {
@@ -135,7 +131,7 @@ function spinUpMaster(listenPort, otherServerDetails) {
         })
             .on('proxyRes', proxyResponseHandler(systemRoutes))
             .on('proxyReq', (proxyReq) => {
-            const id = generateConnectionId();
+            const id = js_1.JS.randomNumber(4) + '';
             connections[id] = proxyReq;
             proxyReq.on('finish', () => {
                 delete connections[id];
@@ -235,7 +231,7 @@ function spinUpMaster(listenPort, otherServerDetails) {
             connections[connectionId].destroy();
         }));
         expressServer.on('connection', (socket) => {
-            const id = generateConnectionId();
+            const id = js_1.JS.randomNumber(4) + '';
             connections[id] = socket;
             socket.on('close', () => {
                 delete connections[id];

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

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = __importDefault(require("express"));
-const utils_js_1 = require("./utils.js");
+const events_1 = require("events");
 const chokidar_1 = require("chokidar");
 const logger_js_1 = require("../../../../util_modules/logger.js");
 const index_js_1 = require("../../../../util_modules/constants/index.js");
@@ -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 utils_js_1.WebClientEvent();
+        const eventListner = 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

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

@@ -4,8 +4,7 @@ exports.default = Object.freeze({
     client: {
         port: '{{_PORT_}}',
         package: {
-            name: '{{_NAME_}}',
-            devDependencies: '{{_DEV_DEPENDENCIES_}}'
+            name: '{{_NAME_}}'
         }
     },
     functions: {

package/lib/util_modules/constants/lib/urls.js

@@ -24,12 +24,12 @@ class URL {
         }
         return URL._app.replace('.com', dc.ext);
     }
-    static get zoho() {
+    static get catalystStatic() {
         const dc = dc_1.getActiveDCType();
         if (dc === undefined) {
-            return URL._zoho;
+            return URL._catalystStatic;
         }
-        return URL._zoho.replace('.com', dc.ext);
+        return URL._catalystStatic.replace('.com', dc.ext);
     }
     static get console() {
         const dc = dc_1.getActiveDCType();
@@ -43,5 +43,5 @@ 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._catalystStatic = env_1.envOverride('CATALYST_STATIC', 'https://catalyst.zoho.com');
 URL._console = env_1.envOverride('CATALYST_CONSOLE_URL', 'https://console.catalyst.zoho.com');

package/lib/util_modules/fs/index.js

@@ -18,17 +18,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ASYNC = exports.SYNC = exports.untildify = void 0;
-const os_1 = __importDefault(require("os"));
+exports.ASYNC = exports.SYNC = void 0;
 const ASYNC = __importStar(require("./lib/async"));
 exports.ASYNC = ASYNC;
 const SYNC = __importStar(require("./lib/sync"));
 exports.SYNC = SYNC;
-const tildRegex = /^~(?=$|\/|\\)/;
-const homeDirectory = os_1.default.homedir();
-const untildify = (pth) => homeDirectory ? pth.replace(tildRegex, homeDirectory) : pth;
-exports.untildify = untildify;