zcatalyst-cli 1.8.0 → 1.10.0

package/lib/commands/iac/import.js

@@ -0,0 +1,187 @@
+'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.iacImport = void 0;
+const ansi_colors_1 = require("ansi-colors");
+const http_1 = require("http");
+const open_1 = __importDefault(require("open"));
+const path_1 = require("path");
+const url_1 = require("url");
+const archiver_1 = __importDefault(require("../../archiver"));
+const iac_1 = __importDefault(require("../../endpoints/lib/iac"));
+const error_1 = __importDefault(require("../../error"));
+const command_1 = __importDefault(require("../../internal/command"));
+const port_resolver_1 = __importDefault(require("../../port-resolver"));
+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 js_1 = require("../../util_modules/js");
+const logger_1 = require("../../util_modules/logger");
+const option_1 = require("../../util_modules/option");
+const shell_1 = require("../../util_modules/shell");
+const getZipAndTemplate = (filePath, stagedDeploy) => __awaiter(void 0, void 0, void 0, function* () {
+    const zipFile = filePath
+        ? yield fs_1.ASYNC.readFile(fs_1.untildify(filePath), 'buffer')
+        : (stagedDeploy === null || stagedDeploy === void 0 ? void 0 : stagedDeploy.id)
+            ? yield new iac_1.default().deployDownload(stagedDeploy.id)
+            : undefined;
+    if (!zipFile) {
+        throw filePath
+            ? new error_1.default('Provided zip file path does not exists!')
+            : new error_1.default('Unable to get zip file from server!', { exit: 2 });
+    }
+    const zipArchive = new archiver_1.default().load(zipFile);
+    const templateFile = yield zipArchive.readFile(constants_1.REGEX.project.template);
+    if (!templateFile) {
+        throw new error_1.default('No project template found', {
+            exit: 1,
+            errorId: 'I-1'
+        });
+    }
+    return [zipArchive, templateFile];
+});
+const ensureUserAction = (deployRes) => __awaiter(void 0, void 0, void 0, function* () {
+    const userActionError = yield new Promise((res, rej) => __awaiter(void 0, void 0, void 0, function* () {
+        const callbackPort = yield port_resolver_1.default.getFreePort(3000, 10, false);
+        const accessUrl = new url_1.URL(`/baas/v1/project/import/${deployRes.id}/deploy`, `${constants_1.ORIGIN.admin}`);
+        accessUrl.searchParams.set('redirect_url', `http://localhost:${callbackPort}/success`);
+        const server = http_1.createServer((req, resp) => __awaiter(void 0, void 0, void 0, function* () {
+            try {
+                if (req.url !== '/success') {
+                    resp.writeHead(404);
+                    resp.end();
+                    return;
+                }
+                const htmlFile = yield fs_1.ASYNC.readFile(path_1.join(__dirname, '../../../templates/iacSuccess.html'));
+                resp.setHeader('Content-Type', 'text/html');
+                resp.writeHead(200);
+                resp.end(htmlFile, () => {
+                    req.socket.destroy();
+                    server.close(res);
+                });
+            }
+            catch (e) {
+                server.close(() => res(e));
+            }
+        }));
+        server.listen(callbackPort, () => {
+            const urlString = accessUrl.toString();
+            logger_1.info();
+            logger_1.info('Visit this URL on this device to proceed:');
+            logger_1.info(ansi_colors_1.bold.underline(urlString));
+            logger_1.info();
+            open_1.default(urlString).catch();
+        });
+        server.on('error', (err) => {
+            rej(err);
+        });
+    }));
+    if (userActionError) {
+        throw new error_1.default('Error while verifying user action', {
+            original: userActionError,
+            exit: 2
+        });
+    }
+    logger_1.info();
+    logger_1.success(`Successfully scheduled import job for project "${deployRes.project_details.project_name}" with jobid "${deployRes.id}"`);
+    if (option_1.getCurrentCommand() === 'init' || env_1.isPrimaryShell()) {
+        const exitListeners = process.listeners('exit');
+        process.removeAllListeners('exit');
+        const allGlobalOpts = runtime_store_1.default.get('opts.globalOpts', {});
+        const optsArr = Object.keys(allGlobalOpts).reduce((arr, key) => {
+            arr.push('--' + key);
+            if (allGlobalOpts[key]) {
+                arr.push(allGlobalOpts[key]);
+            }
+            return arr;
+        }, ['--id', deployRes.id]);
+        yield shell_1.spawn('catalyst', ['iac:status', 'import', ...optsArr], {
+            shell: true,
+            stdio: 'inherit'
+        }).ASYNC();
+        (exitListeners || []).forEach((listner) => {
+            process.addListener('exit', listner);
+        });
+    }
+});
+const iacImport = (filePath, projectName) => __awaiter(void 0, void 0, void 0, function* () {
+    const iacAPI = new iac_1.default();
+    const allDeploys = yield iacAPI.allDeploys();
+    const stagedDeploy = allDeploys.find((deploy) => deploy.status === 'Staged');
+    const stagedAns = yield prompt_1.default.ask(prompt_1.default.question('consent', `Do you wish to continue setting up the already staged project (${stagedDeploy === null || stagedDeploy === void 0 ? void 0 : stagedDeploy.project_details.project_name}):`, {
+        type: 'confirm',
+        defaultAns: true,
+        suffix: '\n Note: Declining will delete the old staged project!',
+        when: !!stagedDeploy
+    }));
+    if (stagedDeploy && (stagedAns === null || stagedAns === void 0 ? void 0 : stagedAns.consent)) {
+        const [zipArchive, templateFile] = yield getZipAndTemplate(undefined, stagedDeploy);
+        yield ensureUserAction(stagedDeploy);
+        return [zipArchive, templateFile, stagedDeploy];
+    }
+    if (stagedDeploy && !(stagedAns === null || stagedAns === void 0 ? void 0 : stagedAns.consent)) {
+        yield iacAPI.deployDelete(stagedDeploy.id);
+        logger_1.message(`Successfully deleted project ${stagedDeploy === null || stagedDeploy === void 0 ? void 0 : stagedDeploy.project_details.project_name} from console.`);
+    }
+    if (!filePath) {
+        yield prompt_1.default.register('file-path');
+    }
+    const userReply = yield prompt_1.default.ask(prompt_1.default.question('projectName', 'Provide a name for your new project:', {
+        when: !projectName,
+        validate: (ans) => ans.match(constants_1.REGEX.project.name)
+            ? true
+            : `Project Name is invalid, it should match ${constants_1.REGEX.project.name}`
+    }), prompt_1.default.question('filePath', 'Provide the path of the zip file that you would like to use?', {
+        type: 'file-path',
+        when: !filePath,
+        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 'Invalid zip file!';
+        })
+    }));
+    projectName = (userReply.projectName || projectName);
+    filePath = (userReply.filePath || filePath);
+    if (!filePath.endsWith('.zip')) {
+        throw new error_1.default('Provided file type is not supported. Provide a zip path.');
+    }
+    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));
+    yield ensureUserAction(deployRes);
+    return [zipArchive, templateFile, deployRes];
+});
+exports.iacImport = iacImport;
+exports.default = new command_1.default('iac:import [file_path]')
+    .description('Deploy the iac zip file to console and create a new project with it.')
+    .option('-n, --name <project_name>', 'name of the project to be used')
+    .needs('auth', [
+    constants_1.SCOPE.project_import_read,
+    constants_1.SCOPE.project_import_create,
+    constants_1.SCOPE.project_import_delete
+])
+    .needs('config', { optional: true })
+    .needs('rc', { optional: true })
+    .action((filePath) => __awaiter(void 0, void 0, void 0, function* () {
+    const nameOptValue = option_1.getOptionValue('name');
+    if (nameOptValue && !nameOptValue.match(constants_1.REGEX.project.name)) {
+        throw new error_1.default(`Project Name is invalid, it should match ${constants_1.REGEX.project.name}`);
+    }
+    yield exports.iacImport(filePath, nameOptValue);
+}));

package/lib/commands/iac/pack.js

@@ -0,0 +1,129 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = require("path");
+const archiver_1 = __importDefault(require("../../archiver"));
+const client_utils_1 = require("../../client-utils");
+const languages_1 = require("../../deploy/features/functions/languages");
+const error_1 = __importDefault(require("../../error"));
+const fn_utils_1 = require("../../fn-utils");
+const command_1 = __importDefault(require("../../internal/command"));
+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");
+const logger_1 = require("../../util_modules/logger");
+const yaml_1 = __importDefault(require("yaml"));
+const ansi_colors_1 = require("ansi-colors");
+exports.default = new command_1.default('iac:pack [zip_name]')
+    .description('Creates a import ready zip file')
+    .needs('auth')
+    .needs('config')
+    .action((userZipName) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
+    const config = runtime_store_1.default.get('config');
+    const rootDir = path_1.dirname(config.configPath);
+    const filesAtRoot = yield fs_1.ASYNC.walk(rootDir, { excludeDir: true, depth: 1 });
+    const templateFilePth = filesAtRoot.find((fileName) => fileName.match(constants_1.REGEX.project.template));
+    if (templateFilePth === undefined) {
+        throw new error_1.default('No template file found', { exit: 1 });
+    }
+    const templateFile = yield fs_1.ASYNC.readFile(templateFilePth);
+    if (templateFile === undefined) {
+        throw new error_1.default('Unable to read template file', { exit: 1 });
+    }
+    const templateJson = js_1.JS.parseJSON(templateFile) || yaml_1.default.parse(templateFile);
+    const templateFns = ((_a = templateJson.components) === null || _a === void 0 ? void 0 : _a.Functions) || [];
+    const templateClient = ((_b = templateJson.components) === null || _b === void 0 ? void 0 : _b.WebClient) || [];
+    const hrTime = process.hrtime();
+    const archiveName = (userZipName === null || userZipName === void 0 ? void 0 : userZipName.replace('.zip', '')) || `iac_${hrTime[0] * 1000000000 + hrTime[1]}`;
+    const finalZip = new archiver_1.default(archiveName);
+    const optionFilter = yield Promise.resolve().then(() => __importStar(require('../../option-filter')));
+    const components = optionFilter.filterTargets(false);
+    yield Promise.all(components.map((component) => __awaiter(void 0, void 0, void 0, function* () {
+        switch (component) {
+            case 'functions':
+                const fnTargets = yield fn_utils_1.fnUtils.common.validate();
+                const refinedFns = yield fn_utils_1.fnUtils.common.refineTargets(fnTargets, false);
+                const fnNameByCodePath = {};
+                const [nodeFns, javaFns] = refinedFns.reduce((acc, fn) => {
+                    var _a, _b;
+                    if (!fn.valid) {
+                        throw new error_1.default(`Unable to pack since "${fn.name}" is not valid. Reason: ${fn.failure_reason}`);
+                    }
+                    const fnTemplateConfig = templateFns.find((tfn) => fn.name === tfn.properties.name);
+                    if (!fnTemplateConfig) {
+                        throw new error_1.default(`No property found for function ${fn.name} in project template`, { exit: 1 });
+                    }
+                    fnNameByCodePath[fn.name] = fnTemplateConfig.properties.code.path;
+                    if ((_a = fn.stack) === null || _a === void 0 ? void 0 : _a.startsWith(runtime_1.default.language.nodejs)) {
+                        acc[0].push(fn);
+                    }
+                    if ((_b = fn.stack) === null || _b === void 0 ? void 0 : _b.startsWith(runtime_1.default.language.java)) {
+                        acc[1].push(fn);
+                    }
+                    return acc;
+                }, [[], []]);
+                const packedNodeFns = yield languages_1.node(nodeFns);
+                const packedJavaFns = yield languages_1.java(javaFns);
+                const packedFns = [...(packedNodeFns || []), ...(packedJavaFns || [])];
+                packedFns.forEach((fn) => {
+                    if (!fn.valid) {
+                        throw new error_1.default(`Unable to pack since "${fn.name}" is not valid. Reason: ${fn.failure_reason}`);
+                    }
+                    finalZip.add(fnNameByCodePath[fn.name], fn.zip_stream);
+                });
+                break;
+            case 'client':
+                yield client_utils_1.clientUtils.validate();
+                const clientName = runtime_store_1.default.get('context.client.name');
+                const clientTeamplateConfig = templateClient.find((tClient) => clientName === tClient.properties.app_name);
+                if (!clientTeamplateConfig) {
+                    throw new error_1.default(`No property found for client ${clientName} in project template`, { exit: 1 });
+                }
+                const clientZipStream = yield client_utils_1.clientUtils.pack();
+                finalZip.add(clientTeamplateConfig.properties.code.path, clientZipStream);
+                break;
+            default:
+                logger_1.debug(`skipping ${component} since there is no processing needed`);
+                break;
+        }
+    })));
+    finalZip.add(path_1.parse(templateFilePth).name + '.json', JSON.stringify(templateJson, null, 2) + '\n');
+    yield (yield finalZip.finalize()).writeZip(rootDir);
+    logger_1.message(ansi_colors_1.bold(path_1.relative(runtime_store_1.default.get('cwd'), path_1.join(rootDir, archiveName))) +
+        '.zip file has been successfully created.');
+    logger_1.info();
+    logger_1.success('Catalyst pack complete');
+}));

package/lib/commands/iac/status.js

@@ -0,0 +1,63 @@
+'use strict';
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ansi_colors_1 = require("ansi-colors");
+const error_1 = __importDefault(require("../../error"));
+const command_1 = __importDefault(require("../../internal/command"));
+const constants_1 = require("../../util_modules/constants");
+exports.default = new command_1.default('iac:status <operation>')
+    .description('Displays the status of iac schedule progress')
+    .option('--id <id>', 'Schedule id of the import operation.')
+    .option('--production', 'flag for pointing to production environment (only for export)')
+    .needs('auth', [constants_1.SCOPE.project_import_read, constants_1.SCOPE.project_export_read])
+    .needs('config', { optional: true })
+    .needs('rc', { optional: true })
+    .action((operation) => __awaiter(void 0, void 0, void 0, function* () {
+    switch (operation) {
+        case 'import':
+            const { default: deploy } = yield Promise.resolve().then(() => __importStar(require('../../iac/status/deploy')));
+            yield deploy();
+            break;
+        case 'export':
+            const { default: bundle } = yield Promise.resolve().then(() => __importStar(require('../../iac/status/bundle')));
+            yield bundle();
+            break;
+        default:
+            throw new error_1.default('Unsupported operation', {
+                exit: 1,
+                errorId: 'S-1',
+                arg: [ansi_colors_1.bold(operation)]
+            });
+    }
+    return;
+}));

package/lib/commands/index.js

@@ -54,6 +54,10 @@ exports.default = (client) => {
         loadCommand('project:reset'),
         loadCommand('init'),
         loadCommand('pull'),
+        loadCommand('iac:pack'),
+        loadCommand('iac:import'),
+        loadCommand('iac:export'),
+        loadCommand('iac:status'),
         loadCommand('apig:status'),
         loadCommand('apig:enable'),
         loadCommand('apig:disable'),

package/lib/commands/init.js

@@ -32,6 +32,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
+const features_1 = require("../init/features");
 const command_1 = __importDefault(require("../internal/command"));
 const prompt_1 = __importDefault(require("../prompt"));
 const runtime_store_1 = __importDefault(require("../runtime-store"));
@@ -41,14 +42,26 @@ const fs_1 = require("../util_modules/fs");
 const js_1 = require("../util_modules/js");
 const logger_1 = require("../util_modules/logger");
 const shell_1 = require("../util_modules/shell");
+const saveAndComplete = (config) => __awaiter(void 0, void 0, void 0, function* () {
+    yield config.save();
+    logger_1.message(ansi_colors_1.bold(constants_1.FILENAME.config) + ' file has been successfully created with feature details.');
+    logger_1.info();
+    logger_1.success('Catalyst initialization complete!');
+});
 exports.default = new command_1.default('init [feature]')
-    .description('Initialize a Catalyst sample project in the current directory')
+    .description('Initialize a Catalyst project, function, and client resources in the local directory')
     .option('--force', 'force initialise a project for this directory')
     .ignore(['project'])
-    .needs('auth', [constants_1.SCOPE.projects, constants_1.SCOPE.stratus_create, constants_1.SCOPE.stratus_read])
+    .needs('auth', [
+    constants_1.SCOPE.projects,
+    constants_1.SCOPE.stratus_create,
+    constants_1.SCOPE.stratus_read,
+    constants_1.SCOPE.project_import_create
+])
     .needs('config', { optional: true })
     .needs('rc', { optional: true, resolveOnNotFound: true })
     .action((feature) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const config = runtime_store_1.default.get('config');
     const homeDir = (yield Promise.resolve().then(() => __importStar(require('os')))).homedir();
     const warnings = [];
@@ -70,7 +83,7 @@ exports.default = new command_1.default('init [feature]')
                 '\n';
     }
     shell_1.clearStdout(true);
-    const bannerString = yield fs_1.ASYNC.readFile(constants_1.TEMPLATE.banner, 'utf8');
+    const bannerString = yield fs_1.ASYNC.readFile(constants_1.TEMPLATE.banner);
     logger_1.info('\n' +
         ansi_colors_1.blueBright.bold(bannerString) +
         "\nYou're about to initialize a Catalyst project in this directory:\n\n  " +
@@ -86,12 +99,12 @@ exports.default = new command_1.default('init [feature]')
         logger_1.message('Aborted by user.');
         return;
     }
-    let featureAns;
-    if (typeof feature === 'string') {
-        featureAns = { features: [feature] };
-    }
-    else {
-        const featureChoices = [
+    yield features_1.project();
+    const featureAns = yield prompt_1.default.ask(prompt_1.default.question('features', 'Which are the features you want to setup for this folder?\n This step is optional! Press ' +
+        ansi_colors_1.cyan('<return> ') +
+        'to proceed.\n', {
+        type: 'checkbox',
+        choices: [
             prompt_1.default.choice('Functions: Configure and deploy http/non-http functions', {
                 value: 'functions',
                 short: 'Functions'
@@ -99,25 +112,19 @@ exports.default = new command_1.default('init [feature]')
             prompt_1.default.choice('Client: Configure and deploy client files', {
                 value: 'client',
                 short: 'Client'
-            }),
-            prompt_1.default.choice('Project: Sets a base project for this directory', {
-                value: 'project',
-                short: 'Project',
-                disabled: ansi_colors_1.red('"mandatory"')
             })
-        ];
-        featureAns = yield prompt_1.default.ask(prompt_1.default.question('features', 'Which are the features you want to setup for this folder?\n This step is optional if you already have a project press ' +
-            ansi_colors_1.cyan('<return>') +
-            ' to proceed.\n', {
-            type: 'checkbox',
-            choices: featureChoices
-        }));
+        ],
+        when: !runtime_store_1.default.get('payload.project.import', false) &&
+            typeof feature !== 'string'
+    }));
+    if (!((_a = featureAns.features) === null || _a === void 0 ? void 0 : _a.length) &&
+        (runtime_store_1.default.get('payload.project.import', false) || typeof feature !== 'string')) {
+        return saveAndComplete(config);
+    }
+    if (typeof feature === 'string') {
+        featureAns.features = [feature];
     }
-    const features = js_1.JS.get(featureAns, 'features', []);
-    runtime_store_1.default.set('context.features', ['project'].concat(features));
+    runtime_store_1.default.set('context.features', featureAns.features);
     yield (yield Promise.resolve().then(() => __importStar(require('../init')))).default();
-    yield config.save();
-    logger_1.message(ansi_colors_1.bold(constants_1.FILENAME.config) + ' file has been successfully created with feature details.');
-    logger_1.info();
-    logger_1.success('Catalyst initialization complete!');
+    return saveAndComplete(config);
 }));

package/lib/commands/login.js

@@ -33,7 +33,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = __importDefault(require("../internal/command"));
 exports.default = new command_1.default('login')
-    .description('Log the CLI in to your Zoho Catalyst account')
+    .description('Log the CLI in to your Catalyst account')
     .option('--no-localhost', 'login without browser')
     .option('--force', 'force reauthentication')
     .action(() => __awaiter(void 0, void 0, void 0, function* () {

package/lib/commands/logout.js

@@ -33,7 +33,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = __importDefault(require("../internal/command"));
 exports.default = new command_1.default('logout')
-    .description('Log the CLI out of your Zoho Catalyst account')
+    .description('Log the CLI out of your Catalyst account')
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
     const auth = yield Promise.resolve().then(() => __importStar(require('../authentication')));
     return auth.logout();

package/lib/commands/project/list.js

@@ -35,10 +35,11 @@ const ansi_colors_1 = require("ansi-colors");
 const endpoints_1 = require("../../endpoints");
 const command_1 = __importDefault(require("../../internal/command"));
 const constants_1 = require("../../util_modules/constants");
+const project_1 = __importDefault(require("../../util_modules/constants/project"));
 const logger_1 = require("../../util_modules/logger");
-const project_1 = require("../../util_modules/project");
+const project_2 = require("../../util_modules/project");
 exports.default = new command_1.default('project:list')
-    .description('List the Catalyst projects you have access to')
+    .description('List all the Catalyst projects you have access to')
     .needs('auth', [constants_1.SCOPE.projects])
     .needs('config', { optional: true, resolveOnNotFound: true })
     .needs('rc', { optional: true })
@@ -55,19 +56,22 @@ exports.default = new command_1.default('project:list')
         { hAlign: 'center', content: ansi_colors_1.red.bold('Project Name') },
         { hAlign: 'center', content: ansi_colors_1.red.bold('Project ID') }
     ]);
-    const activeProjectId = project_1.getProjectId(null);
-    const defaultProjectId = project_1.getDefaultProjectId(null);
+    const activeProjectId = project_2.getProjectId(null);
+    const defaultProjectId = project_2.getDefaultProjectId(null);
     projects.forEach((project) => {
         let displayId = project.id + '';
         let displayName = project.project_name;
-        let enhance = null;
+        let enhance = '';
         if (activeProjectId === displayId) {
             enhance = ' (active)';
         }
         if (defaultProjectId === displayId) {
-            enhance = enhance === null ? ' (base)' : enhance + ' (base)';
+            enhance += ' (base)';
         }
-        if (enhance !== null) {
+        if (project.project_type && !project_1.default.accepted_types.includes(project.project_type)) {
+            enhance += `(${project.project_type})`;
+        }
+        if (enhance !== '') {
             displayName = ansi_colors_1.cyan(displayName + enhance);
             displayId = ansi_colors_1.cyan(displayId + '');
         }

package/lib/commands/project/reset.js

@@ -17,7 +17,7 @@ const constants_1 = require("../../util_modules/constants");
 const logger_1 = require("../../util_modules/logger");
 const project_1 = require("../../util_modules/project");
 exports.default = new command_1.default('project:reset')
-    .description('Clear an active selection of project and reset to base project')
+    .description('Clear an active project selection and reset to the base project')
     .needs('auth', [constants_1.SCOPE.projects])
     .needs('config', { optional: true, resolveOnNotFound: true })
     .needs('rc')