zcatalyst-cli 1.7.1 → 1.9.1

package/lib/express_middlewares/unknownReqProxy.js

@@ -1,16 +1,27 @@
 'use strict';
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = (proxyInstance, portDetails) => (req, res) => {
+const runtime_store_1 = __importDefault(require("../runtime-store"));
+const logger_1 = require("../util_modules/logger");
+exports.default = (proxyInstance, customProxyUrl) => (req, res) => {
     if (req.url.length === 1 && req.url.startsWith('/')) {
         res.redirect('/app/');
     }
-    else if (portDetails.bindPort !== undefined &&
-        !isNaN(portDetails.bindPort) &&
-        portDetails.bindPort !== -1 &&
-        req.url.match(/\/baas\/v1\/project\/[0-9]+\/function\/[A-z0-9]+\/execute.*/g)) {
+    else if (typeof customProxyUrl === 'string' &&
+        !req.url.match(/^(\/baas|\/app|\/server|\/oauthorize|\/__catalyst).*/g)) {
+        logger_1.debug(`proxying "${req.url}" to "${customProxyUrl}"`);
         proxyInstance.web(req, res, {
-            target: 'http://127.0.0.1:' + portDetails.bindPort,
-            ws: true
+            target: customProxyUrl,
+            ws: true,
+            changeOrigin: true,
+            secure: false,
+            headers: {
+                'User-Agent': runtime_store_1.default.get('context.cli.package.name') +
+                    '/' +
+                    runtime_store_1.default.get('context.cli.package.version')
+            }
         });
     }
     else {

package/lib/fn-utils/index.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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;
 };

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

@@ -16,8 +16,8 @@ exports.updateFnConfig = exports.getSDK = exports.deleteFunctionLocal = exports.
 const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
 const archiver_1 = __importDefault(require("../../archiver"));
-const cjson_1 = __importDefault(require("../../cjson"));
 const endpoints_1 = require("../../endpoints");
+const catalyst_details_1 = __importDefault(require("../../endpoints/lib/catalyst-details"));
 const error_1 = __importDefault(require("../../error"));
 const execute_script_1 = __importDefault(require("../../execute-script"));
 const plugin_loader_1 = __importDefault(require("../../plugin-loader"));
@@ -26,6 +26,7 @@ const prompt_1 = __importDefault(require("../../prompt"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const config_1 = require("../../util_modules/config");
 const constants_1 = require("../../util_modules/constants");
+const runtime_1 = __importDefault(require("../../util_modules/constants/lib/runtime"));
 const fs_1 = require("../../util_modules/fs");
 const js_1 = require("../../util_modules/js");
 const logger_1 = require("../../util_modules/logger");
@@ -36,13 +37,19 @@ function validate() {
         const sourceDir = project_1.resolveProjectPath(config_1.functionsConfig.source());
         const fnTargets = config_1.functionsConfig.targets();
         if (fnTargets === undefined || fnTargets.length === 0) {
-            throw new error_1.default(ansi_colors_1.bold('targets') + ' was found to be empty. Please specify them in ' + constants_1.FILENAME.config, { exit: 1 });
+            throw new error_1.default('targets was found to be empty', {
+                exit: 1,
+                errorId: 'COMMON-1',
+                arg: [ansi_colors_1.bold('targets'), ansi_colors_1.bold(constants_1.FILENAME.config)]
+            });
         }
         const sourceExists = yield fs_1.ASYNC.dirExists(sourceDir);
         if (!sourceExists) {
-            throw new error_1.default(ansi_colors_1.bold('"' + sourceDir + '"') +
-                ' directory was not found. Please create it or specify a different source directory in ' +
-                constants_1.FILENAME.config, { exit: 1 });
+            throw new error_1.default(sourceDir + ' directory was not found', {
+                exit: 1,
+                errorId: 'COMMON-2',
+                arg: [ansi_colors_1.bold(path_1.basename(sourceDir)), ansi_colors_1.bold(constants_1.FILENAME.config)]
+            });
         }
         const only = option_1.getOptionValue('only');
         let fnFilterGroups = [];
@@ -91,10 +98,20 @@ function validate() {
                 }));
             });
             if (unmatchedFilters.length > 0) {
+                const formattedTargets = fnTargets.map((fn) => '* ' + fn).join('\n');
                 throw new error_1.default('The filters ' +
                     ansi_colors_1.bold(unmatchedFilters.join(', ')) +
                     ' provided with --only option does not match with any functions in ' +
-                    constants_1.FILENAME.config, { exit: 1 });
+                    constants_1.FILENAME.config, {
+                    exit: 1,
+                    errorId: 'COMMON-3',
+                    arg: [
+                        ansi_colors_1.bold(unmatchedFilters.join(', ')),
+                        ansi_colors_1.bold('--only'),
+                        ansi_colors_1.bold(constants_1.FILENAME.config),
+                        ansi_colors_1.bold(formattedTargets)
+                    ]
+                });
             }
         }
         const filteredFns = fnFilterGroups.length > 0 ? js_1.JS.intersection(fnTargets, fnFilterGroups) : fnTargets;
@@ -107,9 +124,18 @@ exports.validate = validate;
 function refineTargets(rawTargets, mapRemoteFn = true) {
     return __awaiter(this, void 0, void 0, function* () {
         let remoteFnIdMap = {};
+        let runtimeDetails = { runtimes: [] };
         if (mapRemoteFn) {
             const fnAPI = yield endpoints_1.functionsAPI();
-            let allRemoteFns = (yield fnAPI.getAllFunctions());
+            runtimeDetails = runtime_store_1.default.get('context.catalyst.runtime');
+            let allRemoteFns = [];
+            [allRemoteFns, runtimeDetails] = yield Promise.all([
+                fnAPI.getAllFunctions(),
+                runtimeDetails
+                    ? Promise.resolve(runtimeDetails)
+                    : new catalyst_details_1.default().getDetails('runtime')
+            ]);
+            runtime_store_1.default.set('context.catalyst.runtime', runtimeDetails);
             if (!Array.isArray(allRemoteFns) || allRemoteFns.length === 0) {
                 allRemoteFns = [];
             }
@@ -120,8 +146,11 @@ function refineTargets(rawTargets, mapRemoteFn = true) {
         }
         return Promise.all(rawTargets.map((fnPath) => __awaiter(this, void 0, void 0, function* () {
             const catalystJsonPth = path_1.join(fnPath, constants_1.FILENAME.catalyst_config);
-            const configFileExists = yield fs_1.ASYNC.fileExists(catalystJsonPth);
-            if (!configFileExists) {
+            const catalystJson = yield fs_1.ASYNC.readJSONFile(catalystJsonPth, {
+                checkpath: true,
+                throws: false
+            });
+            if (!catalystJson) {
                 return {
                     name: path_1.basename(fnPath),
                     source: fnPath,
@@ -129,16 +158,55 @@ function refineTargets(rawTargets, mapRemoteFn = true) {
                     failure_reason: 'there is no valid ' + constants_1.FILENAME.catalyst_config + ' file present'
                 };
             }
-            const catalystJson = cjson_1.default(catalystJsonPth);
             const validatePlugin = yield plugin_loader_1.default('functions', 'validate', fnPath);
             if (validatePlugin !== undefined) {
                 try {
                     yield validatePlugin(option_1.getCurrentCommand(), fnPath, runtime_store_1.default, catalystJson);
                 }
                 catch (e) {
-                    throw new error_1.default(e, { exit: 1 });
+                    throw new error_1.default(e, {
+                        exit: 1,
+                        errorId: 'COMMON-4',
+                        original: e,
+                        arg: ['validating', e]
+                    });
                 }
             }
+            const fnName = js_1.JS.get(catalystJson, 'deployment.name');
+            const userStack = js_1.JS.get(catalystJson, 'deployment.stack');
+            if (!userStack || !runtimeDetails.runtimes.includes(userStack)) {
+                return {
+                    name: path_1.basename(fnPath),
+                    source: fnPath,
+                    valid: false,
+                    failure_reason: 'deployment.stack is unknown in ' + constants_1.FILENAME.catalyst_config + ' file.'
+                };
+            }
+            const eol = runtimeDetails.eol_runtimes && runtimeDetails.eol_runtimes[userStack];
+            switch (eol) {
+                case 1:
+                case 2:
+                    if (eol === 2 && remoteFnIdMap[fnName] === undefined) {
+                        return {
+                            name: fnName,
+                            source: fnPath,
+                            valid: false,
+                            failure_reason: `Stack ${userStack} is no longer supported for creation. Kindly change the stack in ${constants_1.FILENAME.catalyst_config} and try again.`
+                        };
+                    }
+                    logger_1.labeled(`functions(${fnName}) `, `Stack ${userStack} has reached EOL. Kindly update it as soon as possible.`).MESSAGE();
+                    break;
+                case 3:
+                    return {
+                        name: fnName,
+                        source: fnPath,
+                        valid: false,
+                        failure_reason: `Stack ${userStack} is no longer support. Kindly change the stack in ${constants_1.FILENAME.catalyst_config} and try again.`
+                    };
+                default:
+                    logger_1.debug(`unknown eol ${eol} hence skipping check`);
+                    break;
+            }
             let deploymentType = js_1.JS.get(catalystJson, 'deployment.type');
             if (deploymentType && deploymentType === constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.applogic]) {
                 deploymentType = constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.advanced];
@@ -147,8 +215,8 @@ function refineTargets(rawTargets, mapRemoteFn = true) {
                 yield fs_1.ASYNC.writeFile(catalystJsonPth, catalystJsonString, 'utf8');
             }
             const fnTarget = {
-                name: js_1.JS.get(catalystJson, 'deployment.name'),
-                stack: js_1.JS.get(catalystJson, 'deployment.stack'),
+                name: fnName,
+                stack: userStack,
                 type: constants_1.REFERENCE.functions.type[js_1.JS.get(catalystJson, 'deployment.type')],
                 index: js_1.JS.get(catalystJson, 'execution.main'),
                 source: fnPath,
@@ -176,6 +244,7 @@ function executeHook({ prefix, command }) {
 }
 exports.executeHook = executeHook;
 function pack(target) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         try {
             let source = target.source;
@@ -190,11 +259,16 @@ function pack(target) {
                     source = outputDir;
                 }
                 catch (e) {
-                    throw new error_1.default(e, { exit: 1 });
+                    throw new error_1.default(e, {
+                        exit: 1,
+                        errorId: 'COMMON-4',
+                        original: e,
+                        arg: ['building', e]
+                    });
                 }
             }
             const zip = new archiver_1.default(target.name);
-            if (target.stack === constants_1.STACK.java8) {
+            if ((_a = target.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.java)) {
                 const outputFolder = path_1.join(source, '.output');
                 const outputFiles = yield fs_1.ASYNC.walk(outputFolder);
                 outputFiles.forEach((file) => {
@@ -288,7 +362,7 @@ function resolveAllFnPorts(targets, idx = 0) {
                 }
                 break;
             default:
-                throw new error_1.default('Unknown command');
+                throw new error_1.default('Unknown command', { exit: 2 });
         }
         return resolveAllFnPorts(targets, idx + 1);
     });
@@ -346,7 +420,11 @@ function updateFnConfig(target) {
             ? parseInt(memoryPrompt.memory)
             : parseInt(memOption);
         if (!memValue) {
-            throw new error_1.default('Invalid memory value specified: ' + ansi_colors_1.bold(memOption + ''));
+            throw new error_1.default('value not a number', {
+                exit: 1,
+                errorId: 'COMMON-5',
+                arg: [ansi_colors_1.bold.red(memOption + ''), ansi_colors_1.bold('--memory')]
+            });
         }
         const consent = yield prompt_1.default.ask(prompt_1.default.question('confirm', `Do you want to update the memory configuration for the function ${target.name}(${target.id}) from ${targetConfig.memory + ' MB'} to ${memValue + ' MB ?'}`, {
             type: 'confirm',

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

@@ -19,6 +19,7 @@ const error_1 = __importDefault(require("../../error"));
 const prompt_1 = __importDefault(require("../../prompt"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
+const runtime_1 = __importDefault(require("../../util_modules/constants/lib/runtime"));
 const fs_1 = require("../../util_modules/fs");
 const js_1 = require("../../util_modules/js");
 function integHelper() {
@@ -67,7 +68,7 @@ function integHelper() {
     });
 }
 exports.integHelper = integHelper;
-function copyIntegHandlers(templatePath, targetPath, stack) {
+function copyIntegHandlers(templatePath, targetPath, lang) {
     return __awaiter(this, void 0, void 0, function* () {
         const service = runtime_store_1.default.get('context.functions.integration.service', false);
         if (!service) {
@@ -77,7 +78,7 @@ function copyIntegHandlers(templatePath, targetPath, stack) {
         switch (service) {
             case constants_1.INTEG.services.cliq:
                 const handlers = runtime_store_1.default.get('context.function.integration.cliq.handlers', []);
-                if (stack === constants_1.STACK.node10) {
+                if (lang === runtime_1.default.language.nodejs) {
                     const filePaths = constants_1.CLIQ.node_template_contents_initial_copy.map((path) => {
                         return path_1.join(templatePath, path);
                     });
@@ -91,7 +92,7 @@ function copyIntegHandlers(templatePath, targetPath, stack) {
                     yield fs_1.ASYNC.copyFiles(handlerPaths, path_1.join(targetPath, constants_1.CLIQ.node_handlers_template_dir));
                     integ_config.handlers = integHandlerConfig;
                 }
-                else if (stack === constants_1.STACK.java8) {
+                else if (lang === runtime_1.default.language.java) {
                     const filePaths = constants_1.CLIQ.java_template_contents_initial_copy.map((path) => {
                         return path_1.join(templatePath, path);
                     });

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

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validate = exports.projectFileValidation = exports.ensureJavaInvoker = exports.compileTarget = exports.normaliseClasspath = exports.rewriteClasspath = exports.isValidClassName = exports.containsKeyWord = exports.classPathSep = void 0;
+const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
 const semver_1 = require("semver");
 const xml2js_1 = __importDefault(require("xml2js"));
@@ -112,7 +113,7 @@ function rewriteClasspath(pth, libPth) {
         yield fs_1.ASYNC.ensureDir(libPth);
         const content = yield fs_1.ASYNC.readFile(pth);
         if (content === undefined) {
-            throw new error_1.default('Content of ' + pth + ' is not defined', { exit: 1 });
+            throw new error_1.default('Content of ' + pth + ' is not defined', { exit: 2 });
         }
         const files = yield fs_1.ASYNC.walk(path_1.dirname(libPth), ['**/.output']);
         const result = yield xml2js_1.default.parseStringPromise(content);
@@ -141,10 +142,11 @@ function normaliseClasspath(pth, libFolder) {
     return __awaiter(this, void 0, void 0, function* () {
         const content = yield fs_1.ASYNC.readFile(pth);
         if (content === undefined) {
-            throw new error_1.default('Content of ' + pth + ' is not defined', { exit: 1 });
+            throw new error_1.default('Content of ' + pth + ' is not defined', { exit: 2 });
         }
         const result = yield xml2js_1.default.parseStringPromise(content);
         const classPathEntries = js_1.JS.get(result, 'classpath.classpathentry', []);
+        const jarFilesList = [];
         yield Promise.all(classPathEntries.map((entry) => __awaiter(this, void 0, void 0, function* () {
             const row = entry.$;
             if (row.kind && row.kind === 'lib' && row.path) {
@@ -156,7 +158,12 @@ function normaliseClasspath(pth, libFolder) {
                         yield fs_1.ASYNC.copyFile(libPath, path_1.join(libFolder, jarName));
                     }
                     catch (err) {
-                        throw new error_1.default(libPath + ' mentioned in .classpath file missing');
+                        throw new error_1.default(libPath + ' mentioned in .classpath file missing', {
+                            exit: 1,
+                            errorId: 'JAVA-1',
+                            original: err,
+                            arg: [ansi_colors_1.bold(libPath), ansi_colors_1.bold('.classpath')]
+                        });
                     }
                 }
                 row.path = path_1.join(path_1.basename(libFolder), jarName);
@@ -166,12 +173,19 @@ function normaliseClasspath(pth, libFolder) {
                     }
                     catch (err) {
                         throw new error_1.default(libPath +
-                            ' mentioned in .classpath file missing. The .classpath file in the targets directory seems to be corrupted.');
+                            ' mentioned in .classpath file missing. The .classpath file in the target directory seems to be corrupted.', {
+                            exit: 1,
+                            errorId: 'JAVA-2',
+                            original: err,
+                            arg: [ansi_colors_1.bold('.classpath'), ansi_colors_1.bold(path_1.dirname(pth))]
+                        });
                     }
                 }
+                jarFilesList.push(path_1.join(libFolder, jarName));
             }
         })));
         js_1.JS.set(result, 'classpath.classpathentry', classPathEntries);
+        runtime_store_1.default.set('context.functions.java.libJarFiles', jarFilesList);
         const builder = new xml2js_1.default.Builder();
         return fs_1.ASYNC.writeFile(pth, builder.buildObject(result));
     });
@@ -266,12 +280,16 @@ function projectFileValidation(pth, target) {
         }
         const content = yield fs_1.ASYNC.readFile(pth);
         if (content === undefined) {
-            throw new error_1.default('Content of ' + pth + ' is undefined');
+            throw new error_1.default('Content of ' + pth + ' is undefined', { exit: 2 });
         }
         const result = yield xml2js_1.default.parseStringPromise(content);
         const name = js_1.JS.get(result, 'projectDescription.name')[0];
         if (name !== target.name) {
-            throw new error_1.default('project name mismatch in .project file for function ' + target.name, { exit: 1 });
+            throw new error_1.default('project name mismatch in .project file for function ' + target.name, {
+                exit: 1,
+                errorId: 'JAVA-3',
+                arg: [ansi_colors_1.bold(name), ansi_colors_1.bold(path_1.basename(pth)), ansi_colors_1.bold(target.name)]
+            });
         }
     });
 }
@@ -306,12 +324,18 @@ function checkJavaCompatibility() {
                 : javacVersionDetails;
         const javacVersion = semver_1.valid(semver_1.coerce(javacVersionDetails.split(' ')[1]));
         if (javacVersion === '' || javacVersion === null) {
-            throw new error_1.default('Unable to check the javac version. Kindly ensure that javac is installed and try again', { exit: 1 });
+            throw new error_1.default('Unable to check the javac version', {
+                exit: 0,
+                errorId: 'JAVA-4',
+                arg: [ansi_colors_1.bold('javac')]
+            });
         }
         if (semver_1.gtr(javacVersion, new semver_1.Range('<1.9', { includePrerelease: true }))) {
-            throw new error_1.default('javac version is above the compatible version "1.8.x". ' +
-                ' Kindly downgrade to version 1.8 or lower \n' +
-                'You can verify your javac version by executing javac --version or javac -version', { exit: 1 });
+            throw new error_1.default('javac version is above the compatible version', {
+                exit: 0,
+                errorId: 'JAVA-5',
+                arg: [ansi_colors_1.bold('javac'), ansi_colors_1.bold('1.8.x'), ansi_colors_1.bold('1.8')]
+            });
         }
     });
 }
@@ -330,7 +354,15 @@ function validate(targets, idx) {
             const entryFileExists = yield fs_1.ASYNC.fileExists(entry);
             const classPathExists = yield fs_1.ASYNC.fileExists(classpath);
             if (!entryFileExists) {
-                throw new error_1.default(path_1.basename(entry) + ' file is missing');
+                throw new error_1.default(path_1.basename(entry) + ' file is missing', {
+                    exit: 1,
+                    errorId: 'JAVA-6',
+                    arg: [
+                        ansi_colors_1.bold(path_1.basename(entry)),
+                        ansi_colors_1.bold(constants_1.FILENAME.catalyst_config),
+                        ansi_colors_1.bold(currentTarget.name)
+                    ]
+                });
             }
             if (!classPathExists) {
                 const templatePath = getTemplatePath(currentTarget);
@@ -341,8 +373,12 @@ function validate(targets, idx) {
             yield projectFileValidation(projectPath, currentTarget);
             yield checkJavaCompatibility();
             yield compileTarget(currentTarget).catch((err) => {
-                logger_1.debug(err);
-                throw new error_1.default('there was a compilation error!', { exit: 1, original: err });
+                throw new error_1.default('there was a compilation error!', {
+                    exit: 1,
+                    errorId: 'JAVA-7',
+                    original: err,
+                    skipHelp: !!option_1.getOptionValue('watch', false)
+                });
             });
             currentTarget.valid = true;
             return validate(targets, ++idx);

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

@@ -13,8 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validate = void 0;
+const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
-const cjson_1 = __importDefault(require("../../cjson"));
 const error_1 = __importDefault(require("../../error"));
 const constants_1 = require("../../util_modules/constants");
 const fs_1 = require("../../util_modules/fs");
@@ -27,16 +27,25 @@ function validate(targets, idx) {
         const currentTarget = targets[idx];
         try {
             const catalystFile = path_1.join(currentTarget.source, constants_1.FILENAME.catalyst_config);
-            const catalystFileExists = yield fs_1.ASYNC.fileExists(catalystFile);
-            if (!catalystFileExists) {
-                throw new error_1.default('no ' + constants_1.FILENAME.catalyst_config + ' file found', { exit: 1 });
+            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 data = cjson_1.default(catalystFile);
             const indexFile = 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) {
-                throw new error_1.default('main file does not exists');
+                throw new error_1.default('main file does not exists', {
+                    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)
+                    ]
+                });
             }
             currentTarget.valid = true;
             return validate(targets, ++idx);

package/lib/fn-watcher.js

@@ -0,0 +1,67 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+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: /(^|[\/\\])\../,
+            cwd: target.source,
+            ignoreInitial: true
+        });
+        watcher.on('next', () => __awaiter(void 0, void 0, void 0, function* () {
+            if (latestEvent === undefined) {
+                paused = false;
+                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...`);
+            watcher.emit('preparing');
+            target.failure_reason = undefined;
+            target.valid = true;
+            yield languages_1.prepareFunctions([target]);
+            if (currentLatestEvent.at === latestEvent.at) {
+                latestEvent = undefined;
+            }
+            if (target.valid) {
+                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)');
+            watcher.emit('next');
+        }));
+        watcher.on('all', (evnt, pth) => {
+            latestEvent = { evnt, pth, at: Date.now() };
+            if (paused) {
+                return;
+            }
+            paused = true;
+            watcher.emit('next');
+        });
+        watcher.on('ready', () => {
+            target.watcher = watcher;
+            res();
+        });
+        watcher.on('error', (err) => {
+            logger_1.debug(err);
+            logger_1.warning(`Unable to start watcher for target [${target.name}]. Skipping watch mode.`);
+            res();
+        });
+    });
+});

package/lib/index.js

@@ -4,25 +4,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
-const commander_1 = __importDefault(require("commander"));
+const commander_1 = require("commander");
 const meant_1 = __importDefault(require("meant"));
 const client_1 = require("./client");
 const runtime_store_1 = __importDefault(require("./runtime-store"));
 const packageJson = runtime_store_1.default.get('context.cli.package');
 const { description, version } = packageJson;
-commander_1.default.description(description);
-commander_1.default.version(version, '-v, --version');
-commander_1.default.option('-p, --project <name|project_id>', 'the catalyst project to use for this command');
-commander_1.default.option('--token <token>', 'supply an auth token for this command');
-commander_1.default.option('--dc <us|eu>', 'supply a DC to use for this command');
-commander_1.default.option('--verbose', 'changes the log level to verbose for debug purpose');
-const cli = new client_1.Client(commander_1.default);
-cli.onUnknownCommand((_CMD, cmd2) => {
+const program = new commander_1.Command();
+program.description(description);
+program.version(version, '-v, --version', 'Print the Catalyst CLI version number');
+program.option('-p, --project <name|project_id>', 'Specify the Catalyst project to be used for a command');
+program.option('--token <token>', 'Supply an authentication token for a command');
+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');
+const cli = new client_1.Client(program);
+cli.onUnknownCommand((_OPTS, cmd) => {
     const commandNames = cli.getAllCommandNames();
     console.error();
-    console.error('"' + ansi_colors_1.bold(cmd2.join(' ')) + '" is not a catalyst command');
-    let suggestion = meant_1.default(cmd2.join(' '), commandNames);
-    suggestion = suggestion || meant_1.default(cmd2.join(':'), commandNames);
+    console.error('"' + ansi_colors_1.bold(cmd.args.join(' ')) + '" is not a catalyst command');
+    let suggestion = meant_1.default(cmd.args.join(' '), commandNames);
+    suggestion = suggestion || meant_1.default(cmd.args.join(':'), commandNames);
     if (suggestion && suggestion.length) {
         console.error('Did you mean ' + ansi_colors_1.bold(suggestion.join(', ')) + ' ?');
     }

package/lib/init/dependencies/package-json.js

@@ -63,7 +63,9 @@ exports.default = (templateJsonDir = 'package.json', keys) => __awaiter(void 0,
     const answers = yield prompt_1.default.ask(...qns);
     let content = yield fs_1.ASYNC.readFile(templateJsonPath);
     if (content === undefined) {
-        throw new error_1.default('content of : ' + templateJsonPath + ' is undefined', { exit: 2 });
+        throw new error_1.default('content of : ' + templateJsonPath + ' is undefined', {
+            exit: 2
+        });
     }
     Object.keys(answers).forEach((placeholder) => {
         if (answers[placeholder] !== undefined) {