zcatalyst-cli 1.17.5 → 1.17.6

package/docs/endpoints/lib/env.toml

@@ -0,0 +1,3 @@
+[ENV-1]
+context = '''The ${arg[0]} environment for the project ${arg[1]} has been ${arg[2]}.'''
+aid = '''Please contact catalyst support at ${arg[3]}'''

package/lib/bin/catalyst.js

@@ -44,7 +44,7 @@ const errorOut_1 = __importDefault(require("../errorOut"));
 (0, logger_1.debug)(js_1.JS.repeat('-', 70));
 (0, logger_1.debug)();
 process.on('beforeExit', (code) => __awaiter(void 0, void 0, void 0, function* () {
-    code = process.exitCode || code;
+    code = Number(process.exitCode) || code;
     if (code > 0 && process.stdout.isTTY) {
         const lastError = config_store_1.default.get('lastError', 0);
         const timestamp = Date.now();

package/lib/commands/event/generate/index.js

@@ -54,6 +54,7 @@ exports.default = new command_1.default('event:generate <source> <action>')
     .needs('auth')
     .action(function generate(source, action) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const unknownArgs = (0, option_1.getUnknownOpts)([]);
         if (unknownArgs.length % 2 !== 0) {
             throw new error_1.default('Unknown options are not provided as key value pairs', {
@@ -175,7 +176,7 @@ exports.default = new command_1.default('event:generate <source> <action>')
                     break;
             }
         });
-        const sourceModule = (yield Promise.resolve().then(() => __importStar(require('../../../event_generate/' + source)))).default;
+        const sourceModule = (yield (_a = '../../../event_generate/' + source, Promise.resolve().then(() => __importStar(require(_a))))).default;
         eventJsonContent = yield sourceModule(eventJsonContent, optionMap, action);
         const jsonContent = JSON.parse(eventJsonContent);
         Object.keys(jsonContent).forEach((key) => {

package/lib/commands/event/generate/integ.js

@@ -46,6 +46,7 @@ exports.default = new command_1.default('event:generate:integ <service>')
     .needs('rc')
     .needs('auth')
     .action((service) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const availableServices = Object.keys(constants_1.INTEG.service_map);
     if (!availableServices.includes(service)) {
         throw new error_1.default('Unknown service requested', {
@@ -56,7 +57,7 @@ exports.default = new command_1.default('event:generate:integ <service>')
     }
     const inputs = (0, option_1.getOptionValue)('inputs', '');
     const serviceValue = constants_1.INTEG.service_map[service];
-    const serviceModule = (yield Promise.resolve().then(() => __importStar(require(`../../../event_generate/integration/${serviceValue}`))))
+    const serviceModule = (yield (_a = `../../../event_generate/integration/${serviceValue}`, Promise.resolve().then(() => __importStar(require(_a)))))
         .default;
     const payload = yield serviceModule(inputs);
     process.stdout.write(payload + '\n');

package/lib/commands/functions/shell.js

@@ -50,7 +50,7 @@ exports.default = new command_1.default('functions:shell')
     '\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('auth', [constants_1.SCOPE.functions, constants_1.SCOPE.functions_execution, constants_1.SCOPE.custom_token_generation])
     .needs('config')
     .needs('rc')
     .action(() => __awaiter(void 0, void 0, void 0, function* () {

package/lib/commands/index.js

@@ -36,7 +36,8 @@ exports.default = (client) => {
     function loadCommand(name) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => setTimeout(() => __awaiter(this, void 0, void 0, function* () {
-                const cmd = (yield Promise.resolve().then(() => __importStar(require('./' + name.split(':').join('/'))))).default;
+                var _a;
+                const cmd = (yield (_a = './' + name.split(':').join('/'), Promise.resolve().then(() => __importStar(require(_a))))).default;
                 try {
                     cmd.register(client);
                     resolve();

package/lib/commands/serve.js

@@ -49,7 +49,13 @@ exports.default = new command_1.default('serve')
     .option('--except <targets>', 'serve all targets except specified (e.g. "client")')
     .option('--ignore-scripts', 'ignore the pre and post lifescycle scripts')
     .option('--no-open', 'disable opening the client automatically when served')
-    .needs('auth', [constants_1.SCOPE.functions, constants_1.SCOPE.functions_execution, constants_1.SCOPE.webapp, constants_1.SCOPE.pdf_shot])
+    .needs('auth', [
+    constants_1.SCOPE.functions,
+    constants_1.SCOPE.functions_execution,
+    constants_1.SCOPE.webapp,
+    constants_1.SCOPE.pdf_shot,
+    constants_1.SCOPE.custom_token_generation
+])
     .needs('config')
     .needs('rc')
     .action(() => __awaiter(void 0, void 0, void 0, function* () {

package/lib/endpoints/lib/env.js

@@ -12,19 +12,37 @@ 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 error_1 = __importDefault(require("../../error"));
 const api_1 = __importDefault(require("../../internal/api"));
+const constants_1 = require("../../util_modules/constants");
 const logger_1 = require("../../util_modules/logger");
 class Env {
     constructor(opts, org) {
         this.opts = opts;
         this.opts.envId = org;
     }
-    getEnvs(projectId) {
+    getEnvs(projectId, throwErr = true) {
         return __awaiter(this, void 0, void 0, function* () {
             const res = yield new api_1.default(this.opts).get('/baas/v1/project/' + projectId + '/environment');
             if (res.body && res.body.data) {
-                return res.body.data;
+                const data = res.body.data;
+                if (throwErr) {
+                    const devEnv = data.find((env) => env.env_name === constants_1.DEFAULT.env_name);
+                    if ((devEnv === null || devEnv === void 0 ? void 0 : devEnv.env_status) === 'Blocked') {
+                        throw new error_1.default('Environment blocked', {
+                            exit: 1,
+                            errorId: 'ENV-1',
+                            arg: [
+                                (0, ansi_colors_1.bold)(constants_1.DEFAULT.env_name),
+                                (0, ansi_colors_1.bold)(projectId),
+                                ansi_colors_1.bold.red('blocked'),
+                                ansi_colors_1.italic.underline('support@zohocatalyst.com')
+                            ]
+                        });
+                    }
+                }
+                return data;
             }
             (0, logger_1.debug)('get environment response from server : ' + JSON.stringify(res.body));
             throw new error_1.default('Server Error: Unexpected Response from server.', {

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

@@ -38,6 +38,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const index_js_1 = __importDefault(require("../../../prompt/index.js"));
 const index_js_2 = require("../../../util_modules/constants/index.js");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const clientInitAnswer = yield index_js_1.default.ask(index_js_1.default.question('clientFlavour', 'Choose the type of client to initialise: ', {
         type: 'list',
         choices: index_js_2.PLUGIN.client.map((plugin) => {
@@ -47,5 +48,5 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             });
         })
     }));
-    return (yield Promise.resolve().then(() => __importStar(require('./initializers/' + clientInitAnswer.clientFlavour)))).default();
+    return (yield (_a = './initializers/' + clientInitAnswer.clientFlavour, Promise.resolve().then(() => __importStar(require(_a))))).default();
 });

package/lib/internal/command.js

@@ -206,7 +206,8 @@ class Command {
                 (0, logger_1.debug)(e);
             }
             yield Promise.all(js_1.JS.map(this.beforeRunners, (before) => __awaiter(this, void 0, void 0, function* () {
-                const beforeModule = (yield Promise.resolve().then(() => __importStar(require('../command_needs/' + before.fn)))).default;
+                var _a;
+                const beforeModule = (yield (_a = '../command_needs/' + before.fn, Promise.resolve().then(() => __importStar(require(_a))))).default;
                 return beforeModule.call(this, before.args);
             })));
             return this.cmdAction.call(this, ...args);

package/lib/migration/index.js

@@ -44,6 +44,7 @@ const rc_1 = __importDefault(require("../internal/rc"));
 const fs_1 = require("../util_modules/fs");
 const logger_1 = require("../util_modules/logger");
 const runMigration = (rc, migFiles, idx = 0) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     if (migFiles.length <= idx) {
         return Promise.resolve();
     }
@@ -54,7 +55,7 @@ const runMigration = (rc, migFiles, idx = 0) => __awaiter(void 0, void 0, void 0
         return runMigration(rc, migFiles, ++idx);
     }
     try {
-        const migModule = yield Promise.resolve().then(() => __importStar(require(migFile)));
+        const migModule = yield (_a = migFile, Promise.resolve().then(() => __importStar(require(_a))));
         if (migModule.isRequire()) {
             (0, logger_1.debug)('migration started for v' + currentMigFileVersion);
             migModule.migrate();
@@ -83,6 +84,7 @@ const runMigration = (rc, migFiles, idx = 0) => __awaiter(void 0, void 0, void 0
     return runMigration(rc, migFiles, ++idx);
 });
 const runGlobalMigration = (migFiles) => __awaiter(void 0, void 0, void 0, function* () {
+    var _b;
     if (migFiles.length === 0) {
         return;
     }
@@ -96,7 +98,7 @@ const runGlobalMigration = (migFiles) => __awaiter(void 0, void 0, void 0, funct
         return runGlobalMigration(migFiles);
     }
     try {
-        const migModule = yield Promise.resolve().then(() => __importStar(require(migFile)));
+        const migModule = yield (_b = migFile, Promise.resolve().then(() => __importStar(require(_b))));
         if (migModule.isRequire()) {
             (0, logger_1.debug)('migration started for v' + currentMigFileVersion);
             migModule.migrate();

package/lib/optional-import.js

@@ -42,6 +42,7 @@ 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* () {
+    var _a, _b;
     if (name === (0, path_1.basename)(name)) {
         const projectModulePath = (0, project_js_1.resolveProjectPath)((0, path_1.join)(source, 'node_modules', name));
         const projectModulePathExists = yield (0, async_js_1.dirExists)(projectModulePath);
@@ -53,7 +54,7 @@ exports.default = (name, source) => __awaiter(void 0, void 0, void 0, function*
             });
         }
         app_module_path_1.default.addPath(projectModulePath);
-        return Promise.resolve().then(() => __importStar(require(projectModulePath)));
+        return _a = projectModulePath, Promise.resolve().then(() => __importStar(require(_a)));
     }
     const projectModulePath = (0, project_js_1.resolveProjectPath)(name);
     const projectModulePathExists = yield (0, async_js_1.dirExists)(projectModulePath);
@@ -65,5 +66,5 @@ exports.default = (name, source) => __awaiter(void 0, void 0, void 0, function*
         });
     }
     app_module_path_1.default.addPath(projectModulePath);
-    return Promise.resolve().then(() => __importStar(require(projectModulePath)));
+    return _b = projectModulePath, Promise.resolve().then(() => __importStar(require(_b)));
 });

package/lib/prompt/types/tree.js

@@ -26,6 +26,9 @@ var ETreeState;
     ETreeState[ETreeState["EXPANDED"] = 3] = "EXPANDED";
 })(ETreeState || (ETreeState = {}));
 class TreeNode {
+    get indent() {
+        return this.level * 2;
+    }
     constructor(root) {
         _TreeNode_instances.add(this);
         this.open = false;
@@ -36,9 +39,6 @@ class TreeNode {
         this.level = 1;
         this.root = root;
     }
-    get indent() {
-        return this.level * 2;
-    }
     addNode(node) {
         if (node instanceof TreeNode) {
             this.leaves.push(node);

package/lib/util_modules/constants/lib/default.js

@@ -12,22 +12,22 @@ exports.default = Object.freeze({
     serve_port: {
         http: {
             master: 3000,
+            advancedio: 4000,
+            basicio: 4200,
+            browser_logic: 4400,
             appsail: {
                 master: 3000,
-                service: 3060
+                service: 4500
             },
-            advancedio: 3010,
-            basicio: 3040,
-            client: 3050,
-            browser_logic: 3100
+            client: 5000
         },
         debug: {
             master: -1,
             advancedio: 8000,
-            basicio: 8010,
-            client: -1,
-            appsail: 8020,
-            browser_logic: 8040
+            basicio: 8200,
+            browser_logic: 8400,
+            appsail: -1,
+            client: -1
         }
     },
     event_bus: {

package/lib/util_modules/constants/lib/scopes.js

@@ -27,6 +27,7 @@ exports.default = Object.freeze({
     project_user_create: 'ZohoCatalyst.projects.users.CREATE',
     project_user_delete: 'ZohoCatalyst.projects.users.DELETE',
     project_user_update: 'ZohoCatalyst.projects.users.UPDATE',
+    custom_token_generation: 'ZohoCatalyst.authentication.CREATE',
     email_send: 'ZohoCatalyst.email.CREATE',
     datastore: 'ZohoCatalyst.tables.ALL',
     row: 'ZohoCatalyst.tables.rows.ALL',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.17.5",
+	"version": "1.17.6",
 	"description": "Command Line Tool for CATALYST",
 	"main": "./lib/index.js",
 	"bin": {
@@ -71,7 +71,7 @@
 		"@types/jest": "^27.4.1",
 		"@types/lodash": "^4.14.182",
 		"@types/minimatch": "^5.1.2",
-		"@types/node": "^17.0.25",
+		"@types/node": "^20.12.7",
 		"@types/request": "^2.48.8",
 		"@types/semver": "^7.3.9",
 		"@types/update-notifier": "^5.1.0",
@@ -87,7 +87,7 @@
 		"npm-run-all": "^4.1.5",
 		"prettier": "^2.6.2",
 		"ts-jest": "^27.1.4",
-		"typescript": "^4.6.3"
+		"typescript": "^4.9.5"
 	},
 	"scripts": {
 		"build": "gulp build",