zcatalyst-cli 1.10.1 → 1.12.1

package/docs/client-utils.toml

@@ -22,3 +22,8 @@ link = 'https://www.zoho.com/catalyst/help/project-directory-structure.html#Clie
 context = '''Error when ${arg[0]} the Client with the ${arg[1]} plugin.'''
 aid = '''Please rectify the below error to continue. \n${arg[2]}'''
 link = ''
+
+[CLIENT-UTILS-6]
+context = '''Client Setup Skipped: Since the consent to overwrite the existing directory was not given.'''
+aid = '''Existing directory: ${arg[0]}'''
+link = ''

package/docs/command_needs/auth.toml

@@ -5,5 +5,5 @@ link = 'https://www.zoho.com/catalyst/help/cli-login.html'
 
 [AUTH-2]
 context = '''Oops! It looks like there is a scope missing for running this command'''
-aid = '''Please use the ${arg[0]} command to re-login, or provide different auth token via ${arg[1]} param'''
+aid = '''Please use the ${arg[0]} command to re-login'''
 link = 'https://www.zoho.com/catalyst/help/cli-login.html'

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/docs/plugin-loader.toml

@@ -0,0 +1,4 @@
+[PLG-LDR-1]
+context = '''The ${arg[0]} plugin configured to ${arg[1]} the ${arg[2]} is not found.'''
+aid = '''Please install the ${arg[0]} plugin either locally or globally to ${arg[1]} the ${arg[2]}.'''
+link = ''

package/docs/serve/server/index.toml

@@ -0,0 +1,4 @@
+[SERVE-IDX-1]
+context = '''Error when serving the ${arg[0]} with the ${arg[1]} plugin.'''
+aid = '''Please rectify the below error to serve the ${arg[0]}: \n${arg[2]}'''
+link = ''

package/docs/serve/server/lib/web_client/server.toml

@@ -0,0 +1,4 @@
+[WEB-CLIENT-SERVER-1]
+context = '''The file provided as homepage(${arg[0]}) for the web-client is not found inside the client source directory.'''
+aid = '''Please provide a valid file as the web-client homepage'''
+link = ''

package/lib/apig-utils.js

@@ -202,7 +202,8 @@ exports.apigUtils = {
                             message: 'source_endpoint provided for apig rule "' +
                                 rule.name +
                                 '" is not valid',
-                            skipHelp: false
+                            skipHelp: false,
+                            fileName: __filename
                         });
                         err.errorId = 'APIG-UTILS-9';
                         err.arg = [

package/lib/authentication/login.js

@@ -13,7 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
-const http_1 = __importDefault(require("http"));
+const http_1 = require("http");
+const server_js_1 = require("../util_modules/server.js");
 const open_1 = __importDefault(require("open"));
 const path_1 = require("path");
 const portfinder_1 = require("portfinder");
@@ -277,12 +278,10 @@ class Login {
                 const callbackUrl = this._getCallbackUrl(port);
                 const authUrl = this._getLoginUrl(callbackUrl);
                 let reqCount = 0;
-                const server = http_1.default.createServer((req, res) => __awaiter(this, void 0, void 0, function* () {
+                const server = http_1.createServer((req, res) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         let processReq = true;
-                        if (reqCount + 1 > 1 ||
-                            req.url === '/favicon.ico' ||
-                            req.url === undefined) {
+                        if (reqCount + 1 > 1 || req.url === '/favicon.ico' || req.url === undefined) {
                             logger_1.debug('unknown request received : ' + req.url);
                             processReq = false;
                             res.writeHead(404);
@@ -305,7 +304,7 @@ class Login {
                                     defaultAns: true
                                 }));
                                 if (!ans.DC) {
-                                    server.close();
+                                    yield destroyer.destroy(true).catch((err) => logger_1.debug(err));
                                     reject(new error_1.default('Aborted by user.\n', {
                                         exit: 1
                                     }));
@@ -317,7 +316,8 @@ class Login {
                             js_1.JS.set(result, 'token', this.salt + '_' + result.refresh_token);
                             credential_1.default.oneTimeToken = result.access_token;
                             const userDetails = yield this._getUserDetails();
-                            server.close();
+                            yield destroyer.destroy(true).catch((err) => logger_1.debug(err));
+                            yield new Promise((res) => setTimeout(res, 2000));
                             resolve({
                                 user: userDetails,
                                 token: result,
@@ -327,23 +327,21 @@ class Login {
                         }
                         else if (processReq) {
                             yield this._respondWithFile(req, res, 400, '../../templates/loginFailure.html');
-                            server.close();
+                            yield destroyer.destroy(true).catch((err) => logger_1.debug(err));
                             reject(new error_1.default("Credentials doesn't seem to be valid.\n", {
                                 exit: 1
                             }));
                         }
                     }
                     catch (e) {
-                        server.close();
+                        yield destroyer.destroy(true).catch((err) => logger_1.debug(err));
                         reject(new error_1.default('Server crashed with error.\n', {
                             exit: 2,
                             original: error_1.default.getErrorInstance(e)
                         }));
                     }
                 }));
-                server.on('connection', (socket) => {
-                    socket.unref();
-                });
+                const destroyer = new server_js_1.ConnectionDestroyer(server);
                 server.listen(port, () => {
                     logger_1.info();
                     logger_1.info('Visit this URL on this device to log in:');

package/lib/client-utils.js

@@ -71,8 +71,8 @@ exports.clientUtils = {
         runtime_store_1.default.set('context.client.source', sourceDir);
         runtime_store_1.default.set('context.client.login_redirect', loginRedirect || homepage);
         runtime_store_1.default.set('context.client.package_json', packageJsonFile);
-        const validatePlugin = yield plugin_loader_1.default('client', 'validate');
-        if (validatePlugin === undefined) {
+        const validatePlugin = yield plugin_loader_1.default('client', 'validate').catch((err) => logger_1.debug(err));
+        if (typeof validatePlugin !== 'function') {
             runtime_store_1.default.set('context.client.valid', true);
             return packageJson;
         }
@@ -81,7 +81,8 @@ exports.clientUtils = {
         }
         catch (e) {
             const err = error_1.default.getErrorInstance(e, {
-                skipHelp: false
+                skipHelp: false,
+                fileName: __filename
             });
             err.errorId = 'CLIENT-UTILS-5';
             err.arg = [
@@ -107,8 +108,8 @@ exports.clientUtils = {
     },
     pack: () => __awaiter(void 0, void 0, void 0, function* () {
         let source = project_1.resolveProjectPath(config_1.clientConfig.source());
-        const buildPlugin = yield plugin_loader_1.default('client', 'build');
-        if (buildPlugin !== undefined) {
+        const buildPlugin = yield plugin_loader_1.default('client', 'build').catch((err) => logger_1.debug(err));
+        if (typeof buildPlugin === 'function') {
             try {
                 logger_1.message(`Plugin : "${runtime_store_1.default.get(`context.client.plugins.build`)}" is used for client deploy`);
                 const outputDir = yield buildPlugin(source, runtime_store_1.default);
@@ -119,7 +120,8 @@ exports.clientUtils = {
             }
             catch (e) {
                 const err = error_1.default.getErrorInstance(e, {
-                    skipHelp: false
+                    skipHelp: false,
+                    fileName: __filename
                 });
                 err.errorId = 'CLIENT-UTILS-5';
                 err.arg = [

package/lib/command_needs/auth.js

@@ -45,11 +45,11 @@ exports.default = (inScopes = []) => {
     const requiredScopes = [constants_1.SCOPE.projects, ...inScopes];
     logger_1.debug('> command requires scopes: ' + JSON.stringify(requiredScopes));
     const hasAllScope = requiredScopes.every((scope) => existingScopes.includes(scope));
-    if (!hasAllScope) {
+    if (!tokenObj.temp && !env_1.isCI && !hasAllScope) {
         throw new error_1.default('Re-login required due to missing scopes!!', {
             exit: 0,
             errorId: 'AUTH-2',
-            arg: [ansi_colors_1.bold('catalyst login --force'), ansi_colors_1.bold('--token')]
+            arg: [ansi_colors_1.bold('catalyst login --force')]
         });
     }
     runtime_store_1.default.set('auth_scopes', requiredScopes);

package/lib/commands/client/delete.js

@@ -88,6 +88,7 @@ exports.default = new command_1.default('client:delete [client_version]')
             }
             catch (error) {
                 const err = error_1.default.getErrorInstance(error);
+                err.exit = 2;
                 logger_1.debug('Failed to read ' + constants_1.FILENAME.client.package_json + ' Reason: ' + err.message);
             }
             if (clientVersion !== undefined && clientVersion !== localDel.version) {
@@ -153,7 +154,7 @@ exports.default = new command_1.default('client:delete [client_version]')
             }
             historyArr = [ipVersion];
         }
-        choicesArray.push(prompt_1.default.seperator('-------REMOTE-------'));
+        choicesArray.push(prompt_1.default.separator('-------REMOTE-------'));
         js_1.JS.forEach(historyArr, (history) => {
             const version = js_1.JS.get(history, 'status', false)
                 ? `${history.app_version} (${ansi_colors_1.cyan('live')})`

package/lib/commands/ds/status.js

@@ -123,7 +123,7 @@ const spinnerFn = (jobId, dsReport, cumulativeStatus, throbber, spinner, bulkApi
                 text: getSpinnerTxt(reportTable, dsReport)
             });
             needIteration = false;
-            resolve();
+            resolve(dsReport);
             break;
         case 'Failed':
             reportTable.unshift([
@@ -137,7 +137,7 @@ const spinnerFn = (jobId, dsReport, cumulativeStatus, throbber, spinner, bulkApi
                 text: getSpinnerTxt(reportTable, dsReport)
             });
             needIteration = false;
-            resolve();
+            resolve(dsReport);
             break;
         default:
             needIteration = false;
@@ -231,13 +231,13 @@ exports.default = new command_1.default('ds:status <operation> [jobid]')
     const spinner = 'DS bulk ' + operation;
     const throbber = throbber_1.default.getInstance();
     throbber.add(spinner);
-    yield new Promise(spinnerFn(jobId, dsReport, cumulativeStatus, throbber, spinner, bulkApi, displayOpr, action));
-    if (dsReport.results && dsReport.results.download_url) {
+    const finalDsReport = yield new Promise(spinnerFn(jobId, dsReport, cumulativeStatus, throbber, spinner, bulkApi, displayOpr, action));
+    if (finalDsReport.results && finalDsReport.results.download_url) {
         const ans = yield prompt_1.default.ask(prompt_1.default.question('download', 'Do you like to download the report of this job to your cmd execution directory?', { type: 'confirm', defaultAns: false }));
         if (ans.download) {
             const hrTime = process.hrtime();
             const fileName = `${displayOpr}_${jobId}_${hrTime[0] * 1000000000 + hrTime[1]}.zip`;
-            const bulkReport = (yield bulkApi.downloadReport(dsReport.results.download_url, fileName));
+            const bulkReport = (yield bulkApi.downloadReport(finalDsReport.results.download_url, fileName));
             return fs_1.ASYNC.writeFile(path_1.join(process.cwd(), fileName), bulkReport);
         }
     }

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

@@ -49,14 +49,8 @@ exports.default = new command_1.default('event:generate <source> <action>')
     .needs('rc')
     .needs('auth')
     .action(function generate(source, action) {
-    var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const args = (_a = this.client) === null || _a === void 0 ? void 0 : _a.cli.parseOptions(process.argv);
-        let unknownArgs = args.unknown;
-        if (unknownArgs === undefined) {
-            logger_1.debug('No unknownArgs supplied');
-            unknownArgs = [];
-        }
+        const unknownArgs = option_1.getUnknownOpts([]);
         if (unknownArgs.length % 2 !== 0) {
             throw new error_1.default('Unknown options are not provided as key value pairs', {
                 exit: 1,
@@ -89,8 +83,8 @@ exports.default = new command_1.default('event:generate <source> <action>')
             if (currentIndex % 2 === 0) {
                 if (!currentValue.startsWith('--') &&
                     currentValue !== '-e' &&
-                    currentValue !== '-rid') {
-                    const knownArgs = args.operands.slice(2).join(' ');
+                    currentValue !== '-rid' &&
+                    currentValue !== '--verbose') {
                     const fault = unknownArgs === null || unknownArgs === void 0 ? void 0 : unknownArgs.map((arg) => {
                         if (arg === currentValue) {
                             return ansi_colors_1.red(arg);
@@ -100,10 +94,7 @@ exports.default = new command_1.default('event:generate <source> <action>')
                     throw new error_1.default('Invalid option format detected', {
                         exit: 1,
                         errorId: 'IDX-3',
-                        arg: [
-                            ansi_colors_1.bold('[catalyst ' + knownArgs + ' ' + fault + ']'),
-                            ansi_colors_1.bold('--<option> <value>')
-                        ]
+                        arg: [ansi_colors_1.italic(fault), ansi_colors_1.bold('--<option> <value>')]
                     });
                 }
                 previousValue[currentValue.slice(2)] = optionArr[currentIndex + 1];

package/lib/commands/functions/delete.js

@@ -116,7 +116,7 @@ exports.default = new command_1.default('functions:delete [function_name_or_id]'
             });
         });
         if (localChoices.length > 0) {
-            localChoices.unshift(prompt_1.default.seperator('-------LOCAL-------'));
+            localChoices.unshift(prompt_1.default.separator('-------LOCAL-------'));
         }
         choiceArr.push(...localChoices);
     }
@@ -165,7 +165,7 @@ exports.default = new command_1.default('functions:delete [function_name_or_id]'
             });
         });
         if (remoteChoices.length > 0) {
-            remoteChoices.unshift(prompt_1.default.seperator('-------REMOTE------'));
+            remoteChoices.unshift(prompt_1.default.separator('-------REMOTE------'));
         }
         choiceArr.push(...remoteChoices);
     }

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/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,17 @@ 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 server_js_1 = require("../../util_modules/server.js");
 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,18 +87,21 @@ 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, () => {
+                resp.end(htmlFile, () => __awaiter(void 0, void 0, void 0, function* () {
                     req.socket.destroy();
-                    server.close(res);
-                });
+                    yield destroyer.destroy().catch((err) => logger_1.debug(err));
+                    res();
+                }));
             }
             catch (e) {
-                server.close(() => res(e));
+                yield destroyer.destroy().catch((err) => logger_1.debug(err));
+                res(e);
             }
         }));
+        const destroyer = new server_js_1.ConnectionDestroyer(server);
         server.listen(callbackPort, () => {
             const urlString = accessUrl.toString();
             logger_1.info();
@@ -111,7 +136,9 @@ const ensureUserAction = (deployRes) => __awaiter(void 0, void 0, void 0, functi
         yield shell_1.spawn('catalyst', ['iac:status', 'import', ...optsArr], {
             shell: true,
             stdio: 'inherit'
-        }).ASYNC();
+        })
+            .ASYNC()
+            .catch((err) => logger_1.debug(err));
         (exitListeners || []).forEach((listner) => {
             process.addListener('exit', listner);
         });
@@ -150,7 +177,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!';
         })
@@ -163,7 +190,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/commands/init.js

@@ -90,7 +90,7 @@ exports.default = new command_1.default('init [feature]')
         ansi_colors_1.bold(runtime_store_1.default.get('project.root')) +
         '\n' +
         warningText);
-    const windownConfirmation = env_1.isWindows()
+    const windownConfirmation = env_1.isWindows
         ? yield prompt_1.default.ask(prompt_1.default.question('confirmation', 'Are you ready to proceed?', {
             type: 'confirm'
         }))

package/lib/commands/pull.js

@@ -72,7 +72,7 @@ exports.default = new command_1.default('pull [feature]')
         ansi_colors_1.bold(runtime_store_1.default.get('project.root')) +
         '\n' +
         warningText);
-    const ans = env_1.isWindows()
+    const ans = env_1.isWindows
         ? yield prompt_1.default.ask(prompt_1.default.question('confirmation', 'Are you ready to proceed?', {
             type: 'confirm'
         }))

package/lib/commands/serve.js

@@ -41,9 +41,10 @@ exports.default = new command_1.default('serve')
     .option('--proxy <url>', 'proxy url to proxy any unknown request to the given url ' +
     '(e.g. "http://localhost:8080")')
     .option('--only <targets>', 'only serve specified, comma-separated targets (e.g. "client,functions:f1")')
-    .option('--watch', 'watch for file and directory changes and enable hot reload')
+    .option('--no-watch', 'disable watching the files for changes')
     .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])
     .needs('config')
     .needs('rc')

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/error.js

@@ -8,7 +8,7 @@ const runtime_store_1 = __importDefault(require("./runtime-store"));
 const default_1 = __importDefault(require("./util_modules/constants/lib/default"));
 class CatalystError extends Error {
     constructor(message, options = {}) {
-        var _a;
+        var _a, _b;
         super(message);
         this.name = default_1.default.catalystError;
         this.status = options.status || 500;
@@ -24,15 +24,15 @@ class CatalystError extends Error {
                 this.fileName =
                     options.fileName === undefined && stackArr[1] !== undefined
                         ? stackArr[1].replace(/\.[^.]+$/, '').replace(/^[^(]+\(/, '')
-                        : options.fileName;
-                runtime_store_1.default.set('log.' + this.fileName, runtime_store_1.default.get('log.' + this.fileName, []).concat(this));
+                        : (_b = options.fileName) === null || _b === void 0 ? void 0 : _b.replace(/\.[^.]+$/, '');
+                runtime_store_1.default.set(`[log]["${this.fileName}"]`, runtime_store_1.default.get(`[log]["${this.fileName}"]`, []).concat(this));
             }
         }
         catch (e) {
             runtime_store_1.default.set('log.faultyError', runtime_store_1.default.get('log.faultyError', []).concat(this));
         }
     }
-    static getErrorInstance(unknownError, { message, skipHelp } = {}) {
+    static getErrorInstance(unknownError, { message, skipHelp, fileName } = {}) {
         if (unknownError instanceof CatalystError) {
             if (message) {
                 unknownError.message = message;
@@ -42,21 +42,24 @@ class CatalystError extends Error {
         if (unknownError instanceof Error) {
             return new CatalystError(message || unknownError.message, {
                 original: unknownError,
-                skipHelp: skipHelp === undefined ? true : skipHelp
+                skipHelp: skipHelp === undefined ? true : skipHelp,
+                fileName
             });
         }
         const newError = new CatalystError(message || 'Malformed 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/errorOut.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const logger_1 = require("./util_modules/logger");
 const error_1 = __importDefault(require("./error"));
 const constants_1 = require("./util_modules/constants");
-const contextHelp_1 = __importDefault(require("./util_modules/contextHelp"));
+const context_help_1 = __importDefault(require("./util_modules/context-help"));
 exports.default = (error, status) => {
     if (typeof error === 'string') {
         error = new error_1.default('An unexpected error has occurred.', {
@@ -23,7 +23,7 @@ exports.default = (error, status) => {
         });
     }
     try {
-        const exitCode = contextHelp_1.default();
+        const exitCode = context_help_1.default();
         process.exitCode = typeof exitCode === 'number' ? exitCode : 2;
     }
     catch (err) {

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

@@ -158,8 +158,8 @@ function refineTargets(rawTargets, mapRemoteFn = true) {
                     failure_reason: 'there is no valid ' + constants_1.FILENAME.catalyst_config + ' file present'
                 };
             }
-            const validatePlugin = yield plugin_loader_1.default('functions', 'validate', fnPath);
-            if (validatePlugin !== undefined) {
+            const validatePlugin = yield plugin_loader_1.default('functions', 'validate', fnPath).catch((err) => logger_1.debug(err));
+            if (typeof validatePlugin === 'function') {
                 try {
                     yield validatePlugin(option_1.getCurrentCommand(), fnPath, runtime_store_1.default, catalystJson);
                 }
@@ -249,8 +249,8 @@ function pack(target) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             let source = target.source;
-            const buildPlugin = yield plugin_loader_1.default('functions', 'build', source);
-            if (buildPlugin !== undefined) {
+            const buildPlugin = yield plugin_loader_1.default('functions', 'build', source).catch((err) => logger_1.debug(err));
+            if (typeof buildPlugin === 'function') {
                 try {
                     logger_1.message(`Plugin : "${runtime_store_1.default.get(`context.functions.plugins.build.${source}`)}" is used for functions deploy`);
                     const outputDir = yield buildPlugin(source, runtime_store_1.default);

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

@@ -82,7 +82,7 @@ const keyWords = [
     'volatile',
     'while'
 ];
-exports.classPathSep = env_1.isWindows() ? ';' : ':';
+exports.classPathSep = env_1.isWindows ? ';' : ':';
 function containsKeyWord(name) {
     return keyWords.some((keyWord) => {
         if (name === keyWord ||
@@ -192,16 +192,17 @@ function normaliseClasspath(pth, libFolder) {
 }
 exports.normaliseClasspath = normaliseClasspath;
 function compileTarget(target) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const targetSource = target.source;
         const outputFolder = path_1.join(targetSource, '.output');
         const integ = target.integ_config;
-        const entries = [path_1.join(targetSource, target.index + '.java')];
+        const entries = [path_1.join(targetSource, ((_a = target.index) === null || _a === void 0 ? void 0 : _a.replace(/\./g, path_1.sep)) + '.java')];
         if (integ && integ.length > 0) {
             integ.forEach((integConf) => {
                 const handlers = integConf.handlers;
                 Object.keys(handlers).forEach((handler) => {
-                    entries.push(path_1.join(targetSource, handlers[handler].replace(new RegExp('\\.', 'g'), path_1.sep) + '.java'));
+                    entries.push(path_1.join(targetSource, handlers[handler].replace(/\./g, path_1.sep) + '.java'));
                 });
             });
         }
@@ -338,6 +339,7 @@ function checkJavaCompatibility() {
     });
 }
 function validate(targets, idx) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         if (targets.length < idx + 1) {
             return;
@@ -348,7 +350,7 @@ function validate(targets, idx) {
             const classpath = path_1.join(targetSource, constants_1.FILENAME.functions.java_classpath);
             const projectPath = path_1.join(targetSource, constants_1.FILENAME.functions.java_project);
             const libFolder = path_1.join(targetSource, 'lib');
-            const entry = path_1.join(targetSource, currentTarget.index + '.java');
+            const entry = path_1.join(targetSource, ((_a = currentTarget.index) === null || _a === void 0 ? void 0 : _a.replace(/\./g, path_1.sep)) + '.java');
             const entryFileExists = yield fs_1.ASYNC.fileExists(entry);
             const classPathExists = yield fs_1.ASYNC.fileExists(classpath);
             if (!entryFileExists) {