zcatalyst-cli 1.10.1 → 1.12.1

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

@@ -16,10 +16,10 @@ exports.validate = void 0;
 const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
 const error_1 = __importDefault(require("../../error"));
+const npm_install_1 = __importDefault(require("../../init/dependencies/npm-install"));
 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) {
@@ -50,7 +50,7 @@ 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();
+                yield npm_install_1.default(currentTarget.source, true);
             }
             currentTarget.valid = true;
             return validate(targets, ++idx);

package/lib/init/dependencies/npm-install.js

@@ -12,23 +12,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+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 shell_1 = require("../../util_modules/shell");
-exports.default = (pth) => __awaiter(void 0, void 0, void 0, function* () {
+exports.default = (pth, skipPrompt = false) => __awaiter(void 0, void 0, void 0, function* () {
     const ans = yield prompt_1.default.ask(prompt_1.default.question('NPMinstall', 'Do you wish to install all dependencies now ? ', {
         type: 'confirm',
         defaultAns: true,
-        when: () => {
-            if (runtime_store_1.default.get('context.functions.type') === constants_1.FN_TYPE.integration) {
-                return false;
-            }
-            return true;
-        }
+        when: () => !skipPrompt
     }));
     if (ans.NPMinstall === undefined || ans.NPMinstall) {
-        return shell_1.spawn('npm', ['install'], { cwd: pth }).ASYNC();
+        return shell_1.spawn('npm', ['install'], { cwd: pth })
+            .ASYNC()
+            .catch((err) => {
+            throw error_1.default.getErrorInstance(err, {
+                message: 'Failure when executing npm install.'
+            });
+        });
     }
     return;
 });

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

@@ -0,0 +1,47 @@
+"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 index_js_1 = __importDefault(require("../../../prompt/index.js"));
+const index_js_2 = require("../../../util_modules/constants/index.js");
+exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
+    const clientInitAnswer = yield index_js_1.default.ask(index_js_1.default.question('clientFlavour', 'Choose the type of client to initialise: ', {
+        type: 'list',
+        choices: index_js_2.PLUGIN.client.map((plugin) => {
+            return index_js_1.default.choice(plugin + ' web app', {
+                value: plugin.toLowerCase(),
+                short: plugin.toUpperCase()
+            });
+        })
+    }));
+    return (yield Promise.resolve().then(() => __importStar(require('./initializers/' + clientInitAnswer.clientFlavour)))).default();
+});

package/lib/init/features/client/initializers/angular.js

@@ -0,0 +1,104 @@
+"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 file_names_js_1 = __importDefault(require("../../../../util_modules/constants/lib/file-names.js"));
+const plugin_js_1 = __importDefault(require("../../../../util_modules/constants/lib/plugin.js"));
+const placeholders_js_1 = __importDefault(require("../../../../util_modules/constants/lib/placeholders.js"));
+const folder_names_js_1 = __importDefault(require("../../../../util_modules/constants/lib/folder-names.js"));
+const project_js_1 = require("../../../../util_modules/project.js");
+const shell_js_1 = require("../../../../util_modules/shell.js");
+const runtime_store_js_1 = __importDefault(require("../../../../runtime-store.js"));
+const logger_js_1 = require("../../../../util_modules/logger.js");
+const ansi_colors_1 = require("ansi-colors");
+const client_js_1 = require("../../../util/client.js");
+const path_1 = require("path");
+const ASYNC = __importStar(require("../../../../util_modules/fs/lib/async.js"));
+const error_js_1 = __importDefault(require("../../../../error.js"));
+const { angular } = plugin_js_1.default;
+const { client } = placeholders_js_1.default;
+exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
+    const clientName = yield client_js_1.clientNamePrompt('Please provide a name for your Angular App:', 'angular-app');
+    const clientDirPath = project_js_1.resolveProjectPath(folder_names_js_1.default.client);
+    yield client_js_1.directoryOverridePrompt(clientDirPath);
+    const opts = [
+        angular.runner_command[1],
+        clientName,
+        '--directory',
+        folder_names_js_1.default.client,
+        '--skip-git',
+        'true'
+    ];
+    try {
+        const collection = require.resolve(path_1.join(angular.collection_name, 'package.json'));
+        yield shell_js_1.spawn(angular.runner_command[0], [...opts, '--collection', path_1.dirname(collection)], {
+            stdio: 'inherit',
+            cwd: runtime_store_js_1.default.get('cwd')
+        }).ASYNC();
+    }
+    catch (e) {
+        if (e === null) {
+            throw new error_js_1.default('Process aborted!', { exit: 0, skipHelp: true });
+        }
+        const err = error_js_1.default.getErrorInstance(e, {
+            message: 'Failure when creating new Angular App'
+        }).original;
+        if (!err.code || err.code !== 'ENOENT') {
+            throw err;
+        }
+        logger_js_1.info(`Angular CLI (${ansi_colors_1.red.italic('@angular/cli')}) not found....`);
+        logger_js_1.info(`Installing ${ansi_colors_1.bold('@angular/cli')} using ${ansi_colors_1.bold('npx')}`);
+        logger_js_1.info('Note: this may take a while...');
+        yield shell_js_1.spawn('npx', [
+            '-p',
+            angular.collection_name,
+            '-p',
+            angular.runner_package,
+            angular.runner_command[0],
+            ...opts,
+            '--collection',
+            angular.collection_name
+        ], {
+            stdio: 'inherit',
+            cwd: runtime_store_js_1.default.get('cwd')
+        })
+            .ASYNC()
+            .catch((err) => {
+            throw error_js_1.default.getErrorInstance(err, {
+                message: 'Failure when creating new Angular App with npx'
+            });
+        });
+    }
+    yield ASYNC.findAndReplace(path_1.join(clientDirPath, file_names_js_1.default.client.package_json))(client.package.name, clientName);
+    runtime_store_js_1.default.set('payload.client.plugin', angular.plugin);
+    return client_js_1.fillClientInitPayload(clientDirPath, clientName);
+});

package/lib/init/features/client/initializers/basic.js

@@ -0,0 +1,50 @@
+"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 folder_names_js_1 = __importDefault(require("../../../../util_modules/constants/lib/folder-names.js"));
+const placeholders_js_1 = __importDefault(require("../../../../util_modules/constants/lib/placeholders.js"));
+const template_js_1 = __importDefault(require("../../../../util_modules/constants/lib/template.js"));
+const ASYNC = __importStar(require("../../../../util_modules/fs/lib/async.js"));
+const logger_js_1 = require("../../../../util_modules/logger.js");
+const project_js_1 = require("../../../../util_modules/project.js");
+const client_js_1 = require("../../../util/client.js");
+exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
+    logger_js_1.message('A directory ' + ansi_colors_1.cyan.bold('client') + ' will be created with a webapp pre-configured.');
+    const clientDirPath = project_js_1.resolveProjectPath(folder_names_js_1.default.client);
+    yield client_js_1.directoryOverridePrompt(clientDirPath);
+    yield ASYNC.copyDir(template_js_1.default.client.basic.new, clientDirPath);
+    const clientName = yield client_js_1.clientNamePrompt('How do you want to address the client ?', 'sampleApp');
+    yield ASYNC.findAndReplace(clientDirPath)(placeholders_js_1.default.client.package.name, clientName);
+    return client_js_1.fillClientInitPayload(clientDirPath, clientName);
+});

package/lib/init/features/client/initializers/lyte.js

@@ -0,0 +1,56 @@
+"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 client_js_1 = require("../../../util/client.js");
+const runtime_store_js_1 = __importDefault(require("../../../../runtime-store.js"));
+const npm_install_js_1 = __importDefault(require("../../../dependencies/npm-install.js"));
+const plugin_js_1 = __importDefault(require("../../../../util_modules/constants/lib/plugin.js"));
+const template_js_1 = __importDefault(require("../../../../util_modules/constants/lib/template.js"));
+const placeholders_js_1 = __importDefault(require("../../../../util_modules/constants/lib/placeholders.js"));
+const folder_names_js_1 = __importDefault(require("../../../../util_modules/constants/lib/folder-names.js"));
+const ASYNC = __importStar(require("../../../../util_modules/fs/lib/async.js"));
+const project_js_1 = require("../../../../util_modules/project.js");
+const { lyte } = plugin_js_1.default;
+const { client } = placeholders_js_1.default;
+exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
+    const clientName = yield client_js_1.clientNamePrompt('Please provide a name for your Lyte web app: ', 'lyte-app');
+    const clientDirPath = project_js_1.resolveProjectPath(folder_names_js_1.default.client);
+    yield client_js_1.directoryOverridePrompt(clientDirPath);
+    yield ASYNC.copyDir(template_js_1.default.client.lyte, clientDirPath);
+    yield client_js_1.addDependency(path_1.join(clientDirPath, 'package.json'), { [lyte.plugin]: 'latest' }, { dev: true });
+    yield ASYNC.findAndReplace(clientDirPath)(client.package.name, clientName);
+    yield npm_install_js_1.default(clientDirPath, true);
+    runtime_store_js_1.default.set('payload.client.plugin', lyte.plugin);
+    return client_js_1.fillClientInitPayload(clientDirPath, clientName);
+});

package/lib/init/features/client/initializers/react.js

@@ -0,0 +1,78 @@
+"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 project_js_1 = require("../../../../util_modules/project.js");
+const shell_js_1 = require("../../../../util_modules/shell.js");
+const runtime_store_js_1 = __importDefault(require("../../../../runtime-store.js"));
+const ASYNC = __importStar(require("../../../../util_modules/fs/lib/async.js"));
+const path_1 = require("path");
+const os_1 = require("os");
+const index_js_1 = __importDefault(require("../../../../prompt/index.js"));
+const client_js_1 = require("../../../util/client.js");
+const plugin_js_1 = __importDefault(require("../../../../util_modules/constants/lib/plugin.js"));
+const template_js_1 = __importDefault(require("../../../../util_modules/constants/lib/template.js"));
+const placeholders_js_1 = __importDefault(require("../../../../util_modules/constants/lib/placeholders.js"));
+const error_js_1 = __importDefault(require("../../../../error.js"));
+const { react } = plugin_js_1.default;
+const { client } = placeholders_js_1.default;
+exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
+    const flavourPrompt = yield index_js_1.default.ask(index_js_1.default.question('flavour', `Choose an option to create the React App:`, {
+        type: 'list',
+        choices: [
+            index_js_1.default.choice('JavaScript', { value: 'js', short: 'JavaScript' }),
+            index_js_1.default.choice('TypeScript', { value: 'ts', short: 'TypeScript' })
+        ]
+    }));
+    const clientName = yield client_js_1.clientNamePrompt('Please provide a name for your React App:', 'react-app');
+    const clientDirPath = project_js_1.resolveProjectPath(clientName);
+    yield client_js_1.directoryOverridePrompt(clientDirPath);
+    const catalystTempDir = path_1.join(os_1.tmpdir(), '.catalyst');
+    const reactPluginDir = path_1.join(catalystTempDir, 'react');
+    yield ASYNC.emptyDir(reactPluginDir);
+    yield ASYNC.copyDir(flavourPrompt.flavour === 'ts' ? template_js_1.default.client.react.ts : template_js_1.default.client.react.js, reactPluginDir);
+    yield client_js_1.addDependency(path_1.join(reactPluginDir, 'template.json'), { [react.plugin]: 'latest' }, { depPath: ['package'] });
+    yield ASYNC.findAndReplace(reactPluginDir)(client.package.name, clientName);
+    yield shell_js_1.spawn('npx', [react.runner_command[0], clientName, '--template', 'file:' + reactPluginDir], {
+        stdio: 'inherit',
+        cwd: runtime_store_js_1.default.get('cwd')
+    })
+        .ASYNC()
+        .catch((err) => {
+        throw error_js_1.default.getErrorInstance(err, {
+            message: 'Failure while Creating react app',
+            skipHelp: false
+        });
+    });
+    runtime_store_js_1.default.set('payload.client.plugin', react.plugin);
+    return client_js_1.fillClientInitPayload(clientDirPath, clientName);
+});

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

@@ -85,7 +85,8 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             logger_1.debug('Language cannot be identified hence skipping');
             return acc;
         }
-        const lang = languages_1.default[langArr[0]];
+        const runtimeLang = langArr[0];
+        const langFn = languages_1.default[runtimeLang];
         let displayValue = value;
         let disabled = false;
         if (runtimeDetails.eol_runtimes && runtimeDetails.eol_runtimes[value]) {
@@ -106,14 +107,22 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                     return acc;
             }
         }
-        acc.push(prompt_1.default.choice(displayValue, { value: lang(value), short: value, disabled }));
+        if (acc[runtimeLang].length === 0) {
+            const sep = {
+                node: '---NodeJS---',
+                java: '----Java----'
+            };
+            acc[runtimeLang].push(prompt_1.default.separator(sep[runtimeLang]));
+        }
+        acc[runtimeLang].push(prompt_1.default.choice(displayValue, { value: langFn(value), short: value, disabled }));
         return acc;
-    }, []);
+    }, { node: [], java: [] });
+    const runtimeChoicesArr = [...runtimeChoices.java, ...runtimeChoices.node];
     const runtimeAns = yield prompt_1.default.ask(prompt_1.default.question('runtime', 'Which runtime do you prefer to write your function?', {
         type: 'list',
-        choices: runtimeChoices,
+        choices: runtimeChoicesArr,
         when: () => {
-            return runtimeChoices.length > 1;
+            return runtimeChoicesArr.length > 1;
         }
     }));
     if (runtimeAns === undefined || runtimeAns.runtime === undefined) {

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

@@ -70,6 +70,8 @@ exports.default = (stack) => () => __awaiter(void 0, void 0, void 0, function* (
         type: fnType,
         integ_config
     });
-    yield npm_install_1.default(targetPath);
+    fnType === constants_1.FN_TYPE.integration
+        ? yield npm_install_1.default(targetPath, true)
+        : yield npm_install_1.default(targetPath);
     return functions_1.fillFunctionsInitPayload(targetPath, finalJson.name, stack, fnType);
 });

package/lib/init/features/index.js

@@ -98,6 +98,13 @@ function setFnConfig(featureName, add) {
                 break;
             case 'client':
                 config.set('client.source', targetSource);
+                const plugin = runtime_store_1.default.get('payload.client.plugin', false);
+                if (plugin) {
+                    config.set('client.plugin', plugin);
+                }
+                else {
+                    config.unset('client.plugin');
+                }
                 break;
             case 'apig':
                 config.set('apig.rules', targetSource);
@@ -109,21 +116,21 @@ function setFnConfig(featureName, add) {
 exports.setFnConfig = setFnConfig;
 function functions(add = false) {
     return __awaiter(this, void 0, void 0, function* () {
-        yield (yield Promise.resolve().then(() => __importStar(require('./functions')))).default();
+        yield (yield Promise.resolve().then(() => __importStar(require('./functions/index.js')))).default();
         setFnConfig('functions', add);
     });
 }
 exports.functions = functions;
 function client() {
     return __awaiter(this, void 0, void 0, function* () {
-        yield (yield Promise.resolve().then(() => __importStar(require('./client')))).default();
+        yield (yield Promise.resolve().then(() => __importStar(require('./client/index.js')))).default();
         setFnConfig('client', false);
     });
 }
 exports.client = client;
 function project() {
     return __awaiter(this, void 0, void 0, function* () {
-        yield (yield Promise.resolve().then(() => __importStar(require('./project')))).default();
+        yield (yield Promise.resolve().then(() => __importStar(require('./project.js')))).default();
         const projectPayload = runtime_store_1.default.get('payload.project', null);
         if (!projectPayload) {
             return;

package/lib/init/features/project.js

@@ -58,7 +58,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const allProjects = (yield projectAPI.getAllProjects());
     if (allProjects.length === 0) {
         throw new error_1.default('Visit ' +
-            ansi_colors_1.underline(constants_1.ORIGIN.admin) +
+            ansi_colors_1.underline(constants_1.ORIGIN.console) +
             ' for creation of your first project before you continue.', { exit: 1 });
     }
     const projectChoices = [

package/lib/init/util/client.js

@@ -1,12 +1,97 @@
 "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 });
-exports.fillClientInitPayload = void 0;
-const runtime_store_1 = __importDefault(require("../../runtime-store"));
+exports.addDependency = exports.clientNamePrompt = exports.directoryOverridePrompt = exports.fillClientInitPayload = void 0;
+const ansi_colors_1 = require("ansi-colors");
+const runtime_store_js_1 = __importDefault(require("../../runtime-store.js"));
+const error_js_1 = __importDefault(require("../../error.js"));
+const index_js_1 = __importDefault(require("../../prompt/index.js"));
+const regex_js_1 = __importDefault(require("../../util_modules/constants/lib/regex.js"));
+const ASYNC = __importStar(require("../../util_modules/fs/lib/async.js"));
+const logger_js_1 = require("../../util_modules/logger.js");
+const js_js_1 = require("../../util_modules/js.js");
 const fillClientInitPayload = (source, name) => {
-    runtime_store_1.default.set('payload.client.source', source);
-    runtime_store_1.default.set('payload.client.name', name);
+    runtime_store_js_1.default.set('payload.client.source', source);
+    runtime_store_js_1.default.set('payload.client.name', name);
 };
 exports.fillClientInitPayload = fillClientInitPayload;
+function directoryOverridePrompt(dir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const foldeExists = yield ASYNC.dirExists(dir);
+        if (foldeExists) {
+            const overwriteAns = yield index_js_1.default.ask(index_js_1.default.question('overwrite', 'Directory ' + ansi_colors_1.underline(dir) + ' already exists. Overwrite ?', {
+                type: 'confirm',
+                defaultAns: false
+            }));
+            if (!overwriteAns.overwrite) {
+                throw new error_js_1.default('Skipping client setup since unable to override the already existing client', { exit: 0, errorId: 'CLIENT-UTILS-6', arg: [ansi_colors_1.italic.red(dir)] });
+            }
+            yield ASYNC.deleteDir(dir);
+        }
+    });
+}
+exports.directoryOverridePrompt = directoryOverridePrompt;
+function clientNamePrompt(question, defaultAns) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const namePrompt = yield index_js_1.default.ask(index_js_1.default.question('name', question, {
+            type: 'input',
+            defaultAns,
+            validate: (ans) => {
+                if (ans.match(regex_js_1.default.client.package_name)) {
+                    return true;
+                }
+                return 'Invalid client name';
+            }
+        }));
+        return namePrompt.name;
+    });
+}
+exports.clientNamePrompt = clientNamePrompt;
+function addDependency(filePath, dep, { dev = false, depPath = [] } = {}) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const packageJson = yield ASYNC.readJSONFile(filePath);
+            if (packageJson) {
+                depPath.push(dev ? 'devDependencies' : 'dependencies');
+                js_js_1.JS.assign(dep, js_js_1.JS.get(packageJson, depPath));
+                js_js_1.JS.set(packageJson, depPath, dep);
+                yield ASYNC.writeJSONFile(filePath, packageJson);
+            }
+        }
+        catch (e) {
+            const err = error_js_1.default.getErrorInstance(e, { skipHelp: true });
+            logger_js_1.debug(`unable to write to ${filePath}: ${err.message}`);
+        }
+    });
+}
+exports.addDependency = addDependency;

package/lib/internal/command.js

@@ -167,7 +167,10 @@ class Command {
                 args.push({});
             }
             const [opts, command] = args.slice(-2);
-            runtime_store_1.default.set('opts', Object.assign({ _name: command.name() }, opts));
+            const unknownOpts = this.allowUnknownOptions
+                ? command.parseOptions(process.argv).unknown
+                : undefined;
+            runtime_store_1.default.set('opts', Object.assign({ _name: command.name(), unknownOpts }, opts));
             this._prepare(command);
             try {
                 yield migration_1.default(runtime_store_1.default.get('context.cli.package.version'));

package/lib/internal/config.js

@@ -70,7 +70,8 @@ class Config {
             catch (e) {
                 const err = error_1.default.getErrorInstance(e, {
                     message: 'There was an error loading a file',
-                    skipHelp: false
+                    skipHelp: false,
+                    fileName: __filename
                 });
                 err.errorId = 'CONFIG-1';
                 err.arg = [ansi_colors_1.bold(constants_1.FILENAME.config), err.message];