zcatalyst-cli 1.8.0 → 1.10.0

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

@@ -19,6 +19,7 @@ const error_1 = __importDefault(require("../../error"));
 const constants_1 = require("../../util_modules/constants");
 const fs_1 = require("../../util_modules/fs");
 const js_1 = require("../../util_modules/js");
+const shell_1 = require("../../util_modules/shell");
 function validate(targets, idx) {
     return __awaiter(this, void 0, void 0, function* () {
         if (targets.length < idx + 1) {
@@ -47,10 +48,15 @@ function validate(targets, idx) {
                     ]
                 });
             }
+            const nodeModuleExists = yield fs_1.ASYNC.dirExists(path_1.join(currentTarget.source, constants_1.FILENAME.node_modules));
+            if (!nodeModuleExists) {
+                yield shell_1.spawn('npm', ['install'], { cwd: currentTarget.source }).ASYNC();
+            }
             currentTarget.valid = true;
             return validate(targets, ++idx);
         }
-        catch (err) {
+        catch (e) {
+            const err = error_1.default.getErrorInstance(e);
             currentTarget.valid = false;
             currentTarget.failure_reason = err.message;
             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/iac/status/bundle.js

@@ -0,0 +1,82 @@
+"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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const iac_1 = __importDefault(require("../../endpoints/lib/iac"));
+const api_timer_1 = __importDefault(require("../../api-timer"));
+const error_1 = __importDefault(require("../../error"));
+const throbber_1 = __importDefault(require("../../throbber"));
+const logger_1 = require("../../util_modules/logger");
+const util_1 = require("./util");
+const prompt_1 = __importDefault(require("../../prompt"));
+const fs_1 = require("../../util_modules/fs");
+const path_1 = require("path");
+const option_1 = require("../../util_modules/option");
+exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
+    const env = option_1.getOptionValue('production', false) ? 'Production' : 'Development';
+    const getSpinnerTxt = util_1.getSpinnerTxt('bundle');
+    const iacAPI = new iac_1.default(undefined, { env });
+    const bundleStatus = yield iacAPI.bundleStatus();
+    if (bundleStatus === undefined) {
+        throw new error_1.default('No export project available in server.', {
+            exit: 1,
+            errorId: 'B-1'
+        });
+    }
+    const throbber = throbber_1.default.getInstance();
+    const spinner = bundleStatus.id;
+    throbber.add(spinner, {
+        text: getSpinnerTxt(bundleStatus)
+    });
+    const timerAPI = new api_timer_1.default(iacAPI.bundleStatus.bind(iacAPI), 2000, 1);
+    timerAPI.on('data', (data) => __awaiter(void 0, void 0, void 0, function* () {
+        switch (data.status) {
+            case 'Scheduled':
+            case 'Processing':
+                throbber.update(spinner, {
+                    text: getSpinnerTxt(data) + '\nPress CTRL + C to exit listening to the status'
+                });
+                break;
+            case 'Error_Processing':
+                throbber.fail(spinner, {
+                    text: getSpinnerTxt(data, 'failed')
+                });
+                timerAPI.end();
+                break;
+            case 'Completed':
+                throbber.succeed(spinner, {
+                    text: getSpinnerTxt(data)
+                });
+                timerAPI.end(undefined, true);
+                break;
+            default:
+                logger_1.debug('Unknown status received : ', data.status);
+                timerAPI.end();
+        }
+    }));
+    timerAPI.on('error', (e) => {
+        logger_1.debug('Error encounted :', e);
+    });
+    timerAPI.on('end', () => throbber.stopAll());
+    timerAPI.start();
+    const isCompleted = yield timerAPI.waitForEnd();
+    if (isCompleted) {
+        const ans = yield prompt_1.default.ask(prompt_1.default.question('download', 'Would you like to download the export zip of this job to your cmd execution directory?', { type: 'confirm', defaultAns: true }));
+        if (ans.download) {
+            const hrTime = process.hrtime();
+            const fileName = `export_${bundleStatus.id}_${hrTime[0] * 1000000000 + hrTime[1]}.zip`;
+            const bundlezip = yield iacAPI.bundleDownload();
+            return fs_1.ASYNC.writeFile(path_1.join(process.cwd(), fileName), bundlezip);
+        }
+    }
+});

package/lib/iac/status/deploy.js

@@ -0,0 +1,74 @@
+"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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const iac_1 = __importDefault(require("../../endpoints/lib/iac"));
+const api_timer_1 = __importDefault(require("../../api-timer"));
+const option_1 = require("../../util_modules/option");
+const error_1 = __importDefault(require("../../error"));
+const throbber_1 = __importDefault(require("../../throbber"));
+const logger_1 = require("../../util_modules/logger");
+const util_1 = require("./util");
+exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
+    const getSpinnerTxt = util_1.getSpinnerTxt('deploy');
+    const idOpt = option_1.getOptionValue('id', false);
+    const iacAPI = new iac_1.default();
+    const allDeploys = yield iacAPI.allDeploys();
+    if (allDeploys.length <= 0) {
+        throw new error_1.default('No import projects available in server.');
+    }
+    const neededDeploys = allDeploys.filter((deploy) => deploy.id === idOpt || deploy.status === 'Scheduled');
+    if (neededDeploys.length <= 0) {
+        throw new error_1.default(idOpt
+            ? 'No import projects with given id exists.'
+            : 'No import projects currently scheduled.');
+    }
+    const deployDetails = neededDeploys[0];
+    const throbber = throbber_1.default.getInstance();
+    const spinner = deployDetails.id;
+    throbber.add(spinner, {
+        text: getSpinnerTxt(deployDetails)
+    });
+    const timerAPI = new api_timer_1.default(iacAPI.deployStatus.bind(iacAPI, deployDetails.id), 2000, 1);
+    timerAPI.on('data', (data) => __awaiter(void 0, void 0, void 0, function* () {
+        switch (data.status) {
+            case 'Scheduled':
+            case 'Processing':
+                throbber.update(spinner, {
+                    text: getSpinnerTxt(data) + '\nPress CTRL + C to exit listening to the status'
+                });
+                break;
+            case 'Error_Processing':
+                throbber.fail(spinner, {
+                    text: getSpinnerTxt(data, 'failed')
+                });
+                timerAPI.end();
+                break;
+            case 'Completed':
+                throbber.succeed(spinner, {
+                    text: getSpinnerTxt(data)
+                });
+                timerAPI.end(undefined, true);
+                break;
+            default:
+                logger_1.debug('Unknown status received : ', data.status);
+                timerAPI.end();
+        }
+    }));
+    timerAPI.on('error', (e) => {
+        logger_1.debug('Error encounted : ', e);
+    });
+    timerAPI.on('end', () => throbber.stopAll());
+    timerAPI.start();
+    yield timerAPI.waitForEnd();
+});

package/lib/iac/status/util/index.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSpinnerTxt = void 0;
+const getSpinnerTxt = (type) => (deployDetails, status) => {
+    var _a, _b;
+    const logs = [];
+    const processError = (_a = deployDetails.logs) === null || _a === void 0 ? void 0 : _a.processing_errors;
+    const validationError = (_b = deployDetails.logs) === null || _b === void 0 ? void 0 : _b.validation_errors;
+    if (processError) {
+        if (typeof processError === 'string') {
+            logs.push(`Error Message: ${processError}`);
+        }
+        else {
+            logs.push(`Error while processing "${processError.component}"`, `Error Message: ${processError.error_message}`);
+        }
+    }
+    if (validationError) {
+        logs.push('Error while validating : ');
+        logs.push(...validationError);
+    }
+    return [
+        `${type === 'bundle' ? 'Export' : 'Import'} Project "${deployDetails.project_details.project_name}" ${status ? status : deployDetails.status.toLowerCase()}`,
+        ...logs
+    ].join('\n' + ' '.repeat(status ? 2 : 4));
+};
+exports.getSpinnerTxt = getSpinnerTxt;

package/lib/index.js

@@ -3,31 +3,25 @@ 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 commander_1 = require("commander");
-const meant_1 = __importDefault(require("meant"));
 const client_1 = require("./client");
 const runtime_store_1 = __importDefault(require("./runtime-store"));
+const fs_1 = require("./util_modules/fs");
+const constants_1 = require("./util_modules/constants");
+const ansi_colors_1 = require("ansi-colors");
 const packageJson = runtime_store_1.default.get('context.cli.package');
 const { description, version } = packageJson;
 const program = new commander_1.Command();
 program.description(description);
-program.version(version, '-v, --version');
-program.option('-p, --project <name|project_id>', 'the catalyst project to use for this command');
-program.option('--token <token>', 'supply an auth token for this command');
-program.option('--dc <us|eu|in>', 'supply a DC to use for this command');
-program.option('--verbose', 'changes the log level to verbose for debug purpose');
+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');
+program.helpOption('-h, --help', 'Display help for a Catalyst command');
+program.showSuggestionAfterError();
+program.showHelpAfterError(`For more usage information use the ${ansi_colors_1.bold('catalyst help')} command`);
+program.addHelpText('before', fs_1.SYNC.readFile(constants_1.TEMPLATE.banner, 'utf-8') || '');
+program.addHelpText('afterAll', `\nFor detailed documentations please visit ${ansi_colors_1.underline('https://www.zoho.com/catalyst/help/cli-command-reference.html')}`);
 const cli = new client_1.Client(program);
-cli.onUnknownCommand((_OPTS, cmd) => {
-    const commandNames = cli.getAllCommandNames();
-    console.error();
-    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(', ')) + ' ?');
-    }
-    console.error();
-    process.exit(1);
-});
 exports.default = cli;

package/lib/init/features/client.js

@@ -14,11 +14,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
 const prompt_1 = __importDefault(require("../../prompt"));
-const runtime_store_1 = __importDefault(require("../../runtime-store"));
 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_1 = require("../util/client");
 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);
@@ -46,6 +46,5 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         }
     }));
     yield fs_1.ASYNC.findAndReplace(clientDirPath)(constants_1.PLACEHOLDER.client.package.name, clientNameAns.clientName);
-    runtime_store_1.default.set('payload.client.source', project_1.resolveProjectPath(constants_1.FOLDERNAME.client));
-    runtime_store_1.default.set('payload.client.name', clientNameAns.clientName);
+    return client_1.fillClientInitPayload(project_1.resolveProjectPath(constants_1.FOLDERNAME.client), clientNameAns.clientName);
 });

package/lib/init/features/functions/languages/java.js

@@ -24,6 +24,7 @@ const js_1 = require("../../../../util_modules/js");
 const integ_1 = require("../../../../fn-utils/lib/integ");
 const common_1 = require("../../../../fn-utils/lib/common");
 const runtime_1 = __importDefault(require("../../../../util_modules/constants/lib/runtime"));
+const functions_1 = require("../../../util/functions");
 exports.default = (stack) => () => __awaiter(void 0, void 0, void 0, function* () {
     const fnType = runtime_store_1.default.get('context.functions.type');
     const fnDirPath = path_1.join(runtime_store_1.default.get('context.functions.dir_path'));
@@ -85,9 +86,5 @@ exports.default = (stack) => () => __awaiter(void 0, void 0, void 0, function* (
     const userFnClassPath = path_1.join(fnDirPath, functionAns.name, constants_1.FILENAME.functions.java_classpath);
     const userFnLibPath = path_1.join(fnDirPath, functionAns.name, constants_1.FOLDERNAME.java_fn_lib);
     yield fn_utils_1.fnUtils.java.rewriteClasspath(userFnClassPath, userFnLibPath);
-    runtime_store_1.default.set('payload.functions.source', targetPath);
-    runtime_store_1.default.set('payload.functions.stack', stack);
-    runtime_store_1.default.set('payload.functions.name', functionAns.name);
-    runtime_store_1.default.set('payload.functions.class', functionAns.class);
-    runtime_store_1.default.set('payload.functions.type', fnType);
+    return functions_1.fillFunctionsInitPayload(targetPath, functionAns.name, stack, fnType);
 });

package/lib/init/features/functions/languages/node.js

@@ -25,6 +25,7 @@ const logger_1 = require("../../../../util_modules/logger");
 const js_1 = require("../../../../util_modules/js");
 const integ_1 = require("../../../../fn-utils/lib/integ");
 const runtime_1 = __importDefault(require("../../../../util_modules/constants/lib/runtime"));
+const functions_1 = require("../../../util/functions");
 exports.default = (stack) => () => __awaiter(void 0, void 0, void 0, function* () {
     const fnType = runtime_store_1.default.get('context.functions.type');
     const service = runtime_store_1.default.get('context.functions.integration.service', '');
@@ -70,9 +71,5 @@ exports.default = (stack) => () => __awaiter(void 0, void 0, void 0, function* (
         integ_config
     });
     yield npm_install_1.default(targetPath);
-    runtime_store_1.default.set('payload.functions.source', targetPath);
-    runtime_store_1.default.set('payload.functions.stack', stack);
-    runtime_store_1.default.set('payload.functions.name', finalJson.name);
-    runtime_store_1.default.set('payload.functions.main', finalJson.main);
-    runtime_store_1.default.set('payload.functions.type', fnType);
+    return functions_1.fillFunctionsInitPayload(targetPath, finalJson.name, stack, fnType);
 });

package/lib/init/features/index.js

@@ -75,7 +75,7 @@ function setFnConfig(featureName, add) {
     const config = runtime_store_1.default.get('config');
     featureContextArr.forEach((context) => {
         var _a, _b;
-        const targetSourceDir = featureName === 'functions' ? path_1.dirname(context.source) : path_1.basename(context.source);
+        const targetSourceDir = featureName === 'functions' ? path_1.dirname(context.source) : context.source;
         const targetSource = path_1.relative(project_1.getProjectRoot(), targetSourceDir);
         switch (featureName) {
             case 'functions':
@@ -125,7 +125,7 @@ function project() {
     return __awaiter(this, void 0, void 0, function* () {
         yield (yield Promise.resolve().then(() => __importStar(require('./project')))).default();
         const projectPayload = runtime_store_1.default.get('payload.project', null);
-        if (projectPayload === null) {
+        if (!projectPayload) {
             return;
         }
         yield project_1.upsertProject(projectPayload, {
@@ -133,10 +133,15 @@ function project() {
             active: true
         });
         yield upsertEnvArr(runtime_store_1.default.get('payload.env', null));
-        if (runtime_store_1.default.get('project.new', false)) {
+        if (runtime_store_1.default.get('payload.project.new', false)) {
             logger_1.message('New Project has been successfully created and associated with this directory.');
         }
         logger_1.message(ansi_colors_1.bold(constants_1.FILENAME.rc) + ' file has be successfully created with project details.');
+        const isImport = runtime_store_1.default.get('payload.project.import', false);
+        if (isImport) {
+            setFnConfig('functions', true);
+            setFnConfig('client', false);
+        }
     });
 }
 exports.project = project;

package/lib/init/features/project.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
+const import_1 = require("../../commands/iac/import");
 const endpoints_1 = require("../../endpoints");
 const error_1 = __importDefault(require("../../error"));
 const prompt_1 = __importDefault(require("../../prompt"));
@@ -21,33 +22,39 @@ const constants_1 = require("../../util_modules/constants");
 const js_1 = require("../../util_modules/js");
 const logger_1 = require("../../util_modules/logger");
 const option_1 = require("../../util_modules/option");
+const yaml_1 = __importDefault(require("yaml"));
 const project_1 = require("../../util_modules/project");
+const path_1 = require("path");
+const functions_1 = require("../util/functions");
+const project_2 = require("../util/project");
+const client_1 = require("../util/client");
+const runtime_1 = __importDefault(require("../../util_modules/constants/lib/runtime"));
+const fn_utils_1 = require("../../fn-utils");
+const client_utils_1 = require("../../client-utils");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
     const projectAPI = yield endpoints_1.projectAPI();
     const defaultRCProjectName = project_1.getDefaultProjectName(null);
     const defaultRCProjectId = project_1.getDefaultProjectId(null);
     if (defaultRCProjectName !== null &&
         defaultRCProjectId !== null &&
         !option_1.getOptionValue('force', false)) {
-        logger_1.message(constants_1.FILENAME.rc +
-            ' already has ' +
-            ansi_colors_1.bold(defaultRCProjectName) +
-            ' as a default project. To overwrite use ' +
-            ansi_colors_1.bold('--force') +
-            ' option');
+        logger_1.message(constants_1.FILENAME.rc + ' already has ' + ansi_colors_1.bold(defaultRCProjectName) + ' as a default project.');
         try {
             yield projectAPI.getProject(defaultRCProjectId);
-            logger_1.warning('skipping project setup. since project directory contains a default project. To overwrite use --force option');
-            return;
+            throw new error_1.default('Skipping project setup, since project directory contains a default project. To overwrite use --force option');
         }
         catch (err) {
-            if (js_1.JS.get(err, 'context.response.statusCode') === 404) {
-                logger_1.error('default project not found');
+            if (js_1.JS.get(err, 'context.response.statusCode') !== 404) {
+                throw err;
             }
-            throw err;
+            logger_1.warning('cleaning up ' +
+                constants_1.FILENAME.rc +
+                ' since the current default project for this folder is not found in remote');
+            yield project_1.removeProject(defaultRCProjectId + '');
         }
     }
-    logger_1.message('Setting up a default project for this folder\n');
+    logger_1.message('Setting up a new default project for this folder\n');
     const allProjects = (yield projectAPI.getAllProjects());
     if (allProjects.length === 0) {
         throw new error_1.default('Visit ' +
@@ -56,8 +63,12 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     }
     const projectChoices = [
         prompt_1.default.choice('[create a new project]', {
-            value: null,
+            value: 0,
             short: 'New-Project'
+        }),
+        prompt_1.default.choice('[import a existing project]', {
+            value: 1,
+            short: 'Import-project'
         })
     ];
     allProjects.forEach((project) => {
@@ -66,32 +77,58 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             short: project.project_name
         }));
     });
-    const projectAns = yield prompt_1.default.ask(prompt_1.default.question('project', 'Note: This process cannot be undone!\n ' +
-        'Select a default Catalyst project for this directory: ', {
+    const projectAns = yield prompt_1.default.ask(prompt_1.default.question('project', 'Select a default Catalyst project for this directory: ', {
         type: 'list',
         choices: js_1.JS.reverse(projectChoices)
     }));
     let selectedProject = projectAns.project;
-    if (selectedProject === null) {
-        const projectNameAns = yield prompt_1.default.ask(prompt_1.default.question('projectName', 'Provide a name for your new project?', {
-            validate: (ans) => {
-                if (ans.match(constants_1.REGEX.project.name)) {
-                    return true;
-                }
-                return 'Invalid project name';
-            }
+    if (typeof selectedProject !== 'number') {
+        return project_2.fillProjectPayload(selectedProject);
+    }
+    if (selectedProject === 0) {
+        const projectNameAns = yield prompt_1.default.ask(prompt_1.default.question('projectName', 'Provide a name for your new project:', {
+            validate: (ans) => (ans.match(constants_1.REGEX.project.name) ? true : 'Invalid project name')
         }));
         selectedProject = yield projectAPI.createProject(projectNameAns.projectName);
-        runtime_store_1.default.set('payload.project.new', true);
+        return project_2.fillProjectPayload(selectedProject, true);
     }
-    runtime_store_1.default.set('payload.project', selectedProject);
-    runtime_store_1.default.set('project', project_1.transformProject(selectedProject));
-    const envAPI = yield endpoints_1.envAPI();
-    const envArr = (yield envAPI.getEnvs(project_1.getProjectId()));
-    const envObj = js_1.JS.find(envArr, { env_name: constants_1.DEFAULT.env_name });
-    if (envObj === undefined) {
-        throw new error_1.default('There is no development environment found for this project. kindly contact support.');
+    const [zipArchive, template, importRes] = yield import_1.iacImport();
+    yield zipArchive
+        .extract(runtime_store_1.default.get('cwd'), '/', { recursive: true, ignoreInitial: false })
+        .finalize();
+    const parsedJSON = js_1.JS.parseJSON(template);
+    const templateJson = parsedJSON ? parsedJSON : yaml_1.default.parse(template);
+    const functions = ((_a = templateJson.components) === null || _a === void 0 ? void 0 : _a.Functions) || [];
+    const client = ((_b = templateJson.components) === null || _b === void 0 ? void 0 : _b.WebClient) || [];
+    yield Promise.all(functions.map(({ properties }) => __awaiter(void 0, void 0, void 0, function* () {
+        const source = properties.code.path.replace('/', path_1.sep).replace('.zip', '');
+        const stack = properties.stack.toLowerCase();
+        const refinedTargets = yield fn_utils_1.fnUtils.common.refineTargets([source], false);
+        const fnUtil = stack.startsWith(runtime_1.default.language.nodejs)
+            ? fn_utils_1.fnUtils.node
+            : stack.startsWith(runtime_1.default.language.java)
+                ? fn_utils_1.fnUtils.java
+                : null;
+        if (fnUtil === null) {
+            logger_1.warning(`skipping setup of function(${refinedTargets[0].name}) since provided stack ${stack} is not supported.`);
+            return;
+        }
+        if (!refinedTargets[0].valid) {
+            logger_1.debug('Invalid target : ' +
+                refinedTargets[0].name +
+                ' reason : ' +
+                refinedTargets[0].failure_reason);
+            logger_1.warning(`skipping setup of function(${refinedTargets[0].name}) since the package is invalid. \nContact catalyst support with debug log.`);
+            return;
+        }
+        functions_1.fillFunctionsInitPayload(source, properties.name, properties.stack, properties.type);
+    })));
+    if (client.length > 0) {
+        const { properties } = client[0];
+        const source = properties.code.path.replace('/', path_1.sep).replace('.zip', '');
+        yield client_utils_1.clientUtils.validate(source);
+        client_1.fillClientInitPayload(source, properties.app_name);
     }
-    runtime_store_1.default.set('payload.env', envArr);
-    runtime_store_1.default.set('project.env', project_1.transformEnv(envObj));
+    const projectDetails = yield projectAPI.getProject(importRes.project_details.id);
+    return project_2.fillProjectPayload(projectDetails, true, true);
 });

package/lib/init/util/client.js

@@ -0,0 +1,12 @@
+"use strict";
+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"));
+const fillClientInitPayload = (source, name) => {
+    runtime_store_1.default.set('payload.client.source', source);
+    runtime_store_1.default.set('payload.client.name', name);
+};
+exports.fillClientInitPayload = fillClientInitPayload;

package/lib/init/util/functions.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fillFunctionsInitPayload = void 0;
+const path_1 = require("path");
+const runtime_store_1 = __importDefault(require("../../runtime-store"));
+const fillFunctionsInitPayload = (source, name, stack, type) => {
+    const existingFns = runtime_store_1.default.get('payload.functions.targets', []);
+    existingFns.push({
+        source,
+        name,
+        stack,
+        type
+    });
+    runtime_store_1.default.set('payload.functions.targets', existingFns);
+    runtime_store_1.default.set('payload.functions.source', path_1.dirname(source));
+};
+exports.fillFunctionsInitPayload = fillFunctionsInitPayload;

package/lib/init/util/project.js

@@ -0,0 +1,35 @@
+"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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fillProjectPayload = void 0;
+const endpoints_1 = require("../../endpoints");
+const error_1 = __importDefault(require("../../error"));
+const runtime_store_1 = __importDefault(require("../../runtime-store"));
+const constants_1 = require("../../util_modules/constants");
+const project_1 = require("../../util_modules/project");
+const fillProjectPayload = (selectedProject, isNew = false, isImport = false) => __awaiter(void 0, void 0, void 0, function* () {
+    runtime_store_1.default.set('payload.project', selectedProject);
+    runtime_store_1.default.set('project', project_1.transformProject(selectedProject));
+    const envAPI = yield endpoints_1.envAPI();
+    const envArr = (yield envAPI.getEnvs(project_1.getProjectId()));
+    const envObj = envArr.find((env) => env.env_name === constants_1.DEFAULT.env_name);
+    if (envObj === undefined) {
+        throw new error_1.default('There is no development environment found for this project. Kindly contact support.', { exit: 2 });
+    }
+    runtime_store_1.default.set('payload.env', envArr);
+    runtime_store_1.default.set('project.env', project_1.transformEnv(envObj));
+    runtime_store_1.default.set('payload.project.new', isNew);
+    runtime_store_1.default.set('payload.project.import', isImport);
+});
+exports.fillProjectPayload = fillProjectPayload;