zcatalyst-cli 1.26.2 → 1.27.0

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

@@ -59,16 +59,17 @@ const path_1 = require("path");
 const ASYNC = __importStar(require("../../../../util_modules/fs/lib/async.js"));
 const index_js_1 = __importDefault(require("../../../../error/index.js"));
 const index_js_2 = __importDefault(require("../../../../prompt/index.js"));
+const prompt_fields_1 = require("../prompt-fields");
 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 (0, client_js_1.clientNamePrompt)('Please provide a name for your Angular App:', 'angular-app');
     const clientDirPath = (0, project_js_1.resolveProjectPath)(folder_names_js_1.default.client);
     yield (0, client_js_1.directoryOverridePrompt)(clientDirPath);
-    const angularQuestions = yield index_js_2.default.ask(index_js_2.default.question('routing', 'Would you like to add Angular routing?', {
+    const angularQuestions = yield index_js_2.default.ask(index_js_2.default.question(prompt_fields_1.clientPromptFields.get('routing'), 'Would you like to add Angular routing?', {
         type: 'confirm',
         defaultAns: false
-    }), index_js_2.default.question('stylesheet', 'Which stylesheet format would you like to use?', {
+    }), index_js_2.default.question(prompt_fields_1.clientPromptFields.get('stylesheet'), 'Which stylesheet format would you like to use?', {
         type: 'list',
         choices: [
             index_js_2.default.choice('CSS', { id: 'CSS', value: 'css', short: 'CSS' }),

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

@@ -52,6 +52,7 @@ 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 prompt_fields_1 = require("../prompt-fields");
 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"));
@@ -60,11 +61,11 @@ const index_js_2 = __importDefault(require("../../../../error/index.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:`, {
+    const flavourPrompt = yield index_js_1.default.ask(index_js_1.default.question(prompt_fields_1.clientPromptFields.get('js-ts'), `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' })
+            index_js_1.default.choice('JavaScript', { id: 'js', value: 'js', short: 'JavaScript' }),
+            index_js_1.default.choice('TypeScript', { id: 'ts', value: 'ts', short: 'TypeScript' })
         ]
     }));
     const clientName = yield (0, client_js_1.clientNamePrompt)('Please provide a name for your React App:', 'react-app');

package/lib/init/features/client/prompt-fields.d.ts

@@ -0,0 +1,37 @@
+export declare const clientPromptFields: import("../../../prompt/register-fields").PromptFieldsRegistry<readonly [{
+    readonly name: "clientType";
+    readonly cliOption: {
+        readonly option: "--type <type>";
+        readonly description: "client type to initialize: react, angular, basic";
+    };
+}, {
+    readonly name: "name";
+    readonly cliOption: {
+        readonly option: "--name <name>";
+        readonly description: "client application name";
+    };
+}, {
+    readonly name: "js-ts";
+    readonly cliOption: {
+        readonly option: "--flavour <flavour>";
+        readonly description: "React variant: js or ts - (FOR REACT ONLY)";
+    };
+}, {
+    readonly name: "routing";
+    readonly cliOption: {
+        readonly option: "--routing";
+        readonly description: "enable Angular routing - (FOR ANGULAR ONLY)";
+    };
+}, {
+    readonly name: "stylesheet";
+    readonly cliOption: {
+        readonly option: "--stylesheet <format>";
+        readonly description: "Angular stylesheet format: css, scss, sass, less - (FOR ANGULAR ONLY)";
+    };
+}, {
+    readonly name: "overwrite";
+    readonly cliOption: {
+        readonly option: "--overwrite";
+        readonly description: "overwrite the web client source directory if already present";
+    };
+}]>;

package/lib/init/features/client/prompt-fields.js

@@ -0,0 +1,48 @@
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.clientPromptFields = void 0;
+const register_fields_1 = require("../../../prompt/register-fields");
+exports.clientPromptFields = (0, register_fields_1.definePromptFields)([
+    {
+        name: 'clientType',
+        cliOption: {
+            option: '--type <type>',
+            description: 'client type to initialize: react, angular, basic'
+        }
+    },
+    {
+        name: 'name',
+        cliOption: {
+            option: '--name <name>',
+            description: 'client application name'
+        }
+    },
+    {
+        name: 'js-ts',
+        cliOption: {
+            option: '--flavour <flavour>',
+            description: 'React variant: js or ts - (FOR REACT ONLY)'
+        }
+    },
+    {
+        name: 'routing',
+        cliOption: {
+            option: '--routing',
+            description: 'enable Angular routing - (FOR ANGULAR ONLY)'
+        }
+    },
+    {
+        name: 'stylesheet',
+        cliOption: {
+            option: '--stylesheet <format>',
+            description: 'Angular stylesheet format: css, scss, sass, less - (FOR ANGULAR ONLY)'
+        }
+    },
+    {
+        name: 'overwrite',
+        cliOption: {
+            option: '--overwrite',
+            description: 'overwrite the web client source directory if already present'
+        }
+    }
+]);

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

@@ -1,4 +1,37 @@
 'use strict';
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (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 () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __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) {
@@ -14,7 +47,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
 const integ_1 = require("../../../fn-utils/lib/integ");
-const prompt_1 = __importDefault(require("../../../prompt"));
+const prompt_1 = __importStar(require("../../../prompt"));
 const runtime_store_1 = __importDefault(require("../../../runtime-store"));
 const constants_1 = require("../../../util_modules/constants");
 const fs_1 = require("../../../util_modules/fs");
@@ -28,6 +61,7 @@ const signals_1 = require("../../../signals");
 const config_1 = require("../../../util_modules/config");
 const cliq_1 = __importDefault(require("../../../event_generate/integration/cliq"));
 const error_1 = __importDefault(require("../../../error"));
+const prompt_fields_1 = require("./prompt-fields");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const currentCmd = (0, option_1.getCurrentCommand)();
     const functionsDirPath = config_1.functionsConfig.source();
@@ -42,12 +76,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             ' will be created with a catalyst function pre-configured.\n');
         const folderExits = yield fs_1.ASYNC.dirExists(functionsDirPath);
         const overwriteAns = folderExits
-            ? yield prompt_1.default.ask(prompt_1.default.question('overwrite', 'Directory ' +
-                (0, ansi_colors_1.underline)(constants_1.FOLDERNAME.functions) +
-                ' already exists. Overwrite ?', {
-                type: 'confirm',
-                defaultAns: false
-            }))
+            ? yield prompt_1.default.ask((0, prompt_1.overwritePromptQuestion)({ resourceName: constants_1.FOLDERNAME.functions }))
             : { overwrite: true };
         if (!overwriteAns.overwrite) {
             (0, index_1.warning)('skipping function setup');
@@ -90,7 +119,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             short: 'integration'
         }));
     }
-    const fnTypeAns = yield prompt_1.default.ask(prompt_1.default.question('type', 'Which type of function do you like to create?', {
+    const fnTypeAns = yield prompt_1.default.ask(prompt_1.default.question(prompt_fields_1.functionsAddPromptFields.get('type'), 'Which type of function do you like to create?', {
         type: 'list',
         choices: fnTypeChoices
     }));

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

@@ -1,4 +1,37 @@
 'use strict';
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (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 () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __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) {
@@ -14,7 +47,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
-const prompt_1 = __importDefault(require("../../../../prompt"));
+const prompt_1 = __importStar(require("../../../../prompt"));
 const fn_utils_1 = require("../../../../fn-utils");
 const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
 const constants_1 = require("../../../../util_modules/constants");
@@ -27,12 +60,14 @@ const functions_1 = require("../../../util/functions");
 const browserLogic_1 = require("../../../../fn-utils/lib/browserLogic");
 const browserLogic_2 = __importDefault(require("../../../../util_modules/constants/lib/browserLogic"));
 const java_1 = require("../../../../fn-utils/lib/java");
+const prompt_fields_1 = require("../prompt-fields");
+const env_1 = require("../../../../util_modules/env");
 exports.default = (stack) => () => __awaiter(void 0, void 0, void 0, function* () {
     const fnType = runtime_store_1.default.get('context.functions.type');
     const fnDirPath = (0, path_1.join)(runtime_store_1.default.get('context.functions.dir_path'));
     yield fs_1.ASYNC.ensureDir(fnDirPath);
     const framework = fnType === constants_1.FN_TYPE.browserLogic ? yield (0, browserLogic_1.getBrowserLogicFramework)('java') : undefined;
-    const functionAns = yield prompt_1.default.ask(prompt_1.default.question('name', 'What will be the name of the java function? This will also be the folder name. ', {
+    const functionAns = yield prompt_1.default.ask(prompt_1.default.question(prompt_fields_1.functionsAddPromptFields.get('name'), 'What will be the name of the java function? This will also be the folder name. ', {
         defaultAns: 'sample',
         validate: (ans) => {
             if (ans.match(constants_1.REGEX.folder_name)) {
@@ -53,11 +88,11 @@ exports.default = (stack) => () => __awaiter(void 0, void 0, void 0, function* (
     const targetPath = (0, path_1.join)(fnDirPath, functionAns.name);
     const dirExists = yield fs_1.ASYNC.dirExists(targetPath);
     const overwriteAns = dirExists
-        ? yield prompt_1.default.ask(prompt_1.default.question('overwrite', 'Directory ' +
-            (0, ansi_colors_1.underline)(functionAns.name) +
-            ' already exists inside functions directory. Overwrite ?', {
-            type: 'confirm',
-            defaultAns: false
+        ? yield prompt_1.default.ask((0, prompt_1.overwritePromptQuestion)({
+            fieldOrName: prompt_fields_1.functionsAddPromptFields.get('overwrite'),
+            resourceName: functionAns.name,
+            contextText: 'inside functions directory',
+            defaultAns: (0, env_1.isNonInteractiveMode)() ? null : false
         }))
         : { overwrite: true };
     if (!overwriteAns.overwrite) {

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

@@ -1,4 +1,37 @@
 'use strict';
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (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 () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __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) {
@@ -12,9 +45,8 @@ 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 path_1 = require("path");
-const prompt_1 = __importDefault(require("../../../../prompt"));
+const prompt_1 = __importStar(require("../../../../prompt"));
 const npm_install_1 = __importDefault(require("../../../dependencies/npm-install"));
 const package_json_1 = __importDefault(require("../../../dependencies/package-json"));
 const fn_utils_1 = require("../../../../fn-utils");
@@ -28,6 +60,8 @@ const functions_1 = require("../../../util/functions");
 const browserLogic_1 = require("../../../../fn-utils/lib/browserLogic");
 const browserLogic_2 = __importDefault(require("../../../../util_modules/constants/lib/browserLogic"));
 const node_1 = require("../../../../fn-utils/lib/node");
+const prompt_fields_1 = require("../prompt-fields");
+const env_1 = require("../../../../util_modules/env");
 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', '');
@@ -39,11 +73,11 @@ exports.default = (stack) => () => __awaiter(void 0, void 0, void 0, function* (
     const targetPath = (0, path_1.join)(functionsDirPath, finalJson.name);
     const dirExists = yield fs_1.ASYNC.dirExists(targetPath);
     const overwriteAns = dirExists
-        ? yield prompt_1.default.ask(prompt_1.default.question('overwrite', 'Directory ' +
-            (0, ansi_colors_1.underline)(finalJson.name) +
-            ' already exists inside functions directory. Overwrite ?', {
-            type: 'confirm',
-            defaultAns: false
+        ? yield prompt_1.default.ask((0, prompt_1.overwritePromptQuestion)({
+            fieldOrName: prompt_fields_1.functionsAddPromptFields.get('overwrite'),
+            resourceName: finalJson.name,
+            contextText: 'inside functions directory',
+            defaultAns: (0, env_1.isNonInteractiveMode)() ? null : false
         }))
         : { overwrite: true };
     if (!overwriteAns.overwrite) {
@@ -76,9 +110,7 @@ exports.default = (stack) => () => __awaiter(void 0, void 0, void 0, function* (
         integ_config,
         integ_handler: ''
     });
-    fnType === constants_1.FN_TYPE.integration
-        ? yield (0, npm_install_1.default)(targetPath, true)
-        : yield (0, npm_install_1.default)(targetPath);
+    yield (0, npm_install_1.default)(targetPath, fnType === constants_1.FN_TYPE.integration || (0, env_1.isNonInteractiveMode)());
     (0, functions_1.fillFunctionsInitPayload)(targetPath, finalJson.name, stack, fnType);
     return targetPath;
 });

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

@@ -1,4 +1,37 @@
 'use strict';
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (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 () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __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) {
@@ -14,7 +47,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
-const prompt_1 = __importDefault(require("../../../../prompt"));
+const prompt_1 = __importStar(require("../../../../prompt"));
 const fn_utils_1 = require("../../../../fn-utils");
 const runtime_store_1 = __importDefault(require("../../../../runtime-store"));
 const constants_1 = require("../../../../util_modules/constants");
@@ -30,6 +63,8 @@ const error_1 = __importDefault(require("../../../../error"));
 const pip_install_1 = require("../../../dependencies/python/pip-install");
 const cli_table_1 = require("../../../../cli_table");
 const logger_1 = require("../../../../util_modules/logger");
+const prompt_fields_1 = require("../prompt-fields");
+const env_1 = require("../../../../util_modules/env");
 exports.default = (stack) => () => __awaiter(void 0, void 0, void 0, function* () {
     const fnType = runtime_store_1.default.get('context.functions.type');
     const fnDirPath = runtime_store_1.default.get('context.functions.dir_path');
@@ -38,7 +73,7 @@ exports.default = (stack) => () => __awaiter(void 0, void 0, void 0, function* (
     const templatePath = fnType === constants_1.FN_TYPE.integration
         ? js_1.JS.get(constants_1.TEMPLATE.functions.python[fnType], service)
         : constants_1.TEMPLATE.functions.python[fnType];
-    const functionAns = yield prompt_1.default.ask(prompt_1.default.question('name', 'package name: ', {
+    const functionAns = yield prompt_1.default.ask(prompt_1.default.question(prompt_fields_1.functionsAddPromptFields.get('name'), 'package name: ', {
         defaultAns: js_1.JS.snakeCase((0, project_1.getProjectName)('sample') + '_function'),
         validate: (ans) => {
             if (ans.match(constants_1.REGEX.folder_name)) {
@@ -58,11 +93,11 @@ exports.default = (stack) => () => __awaiter(void 0, void 0, void 0, function* (
     const targetPath = (0, path_1.join)(fnDirPath, functionAns.name);
     const dirExists = yield fs_1.ASYNC.dirExists(targetPath);
     const overwriteAns = dirExists
-        ? yield prompt_1.default.ask(prompt_1.default.question('overwrite', 'Directory ' +
-            (0, ansi_colors_1.underline)(functionAns.name) +
-            ' already exists inside functions directory. Overwrite ?', {
-            type: 'confirm',
-            defaultAns: false
+        ? yield prompt_1.default.ask((0, prompt_1.overwritePromptQuestion)({
+            fieldOrName: prompt_fields_1.functionsAddPromptFields.get('overwrite'),
+            resourceName: functionAns.name,
+            contextText: 'inside functions directory',
+            defaultAns: (0, env_1.isNonInteractiveMode)() ? null : false
         }))
         : { overwrite: true };
     if (!overwriteAns.overwrite) {

package/lib/init/features/functions/prompt-fields.d.ts

@@ -0,0 +1,25 @@
+export declare const functionsAddPromptFields: import("../../../prompt/register-fields").PromptFieldsRegistry<readonly [{
+    readonly name: "name";
+    readonly cliOption: {
+        readonly option: "--name <name>";
+        readonly description: "function package name";
+    };
+}, {
+    readonly name: "type";
+    readonly cliOption: {
+        readonly option: "--type <type>";
+        readonly description: "function type to scaffold <bio|aio|event|cron|browserlogic|job|integ>";
+    };
+}, {
+    readonly name: "overwrite";
+    readonly cliOption: {
+        readonly option: "--overwrite";
+        readonly description: "overwrite function directory when target already exists";
+    };
+}, {
+    readonly name: "service";
+    readonly cliOption: {
+        readonly option: "--integ-service <service>";
+        readonly description: "integration service for integ function type <ZohoCliq|Convokraft>";
+    };
+}]>;

package/lib/init/features/functions/prompt-fields.js

@@ -0,0 +1,34 @@
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.functionsAddPromptFields = void 0;
+const register_fields_1 = require("../../../prompt/register-fields");
+exports.functionsAddPromptFields = (0, register_fields_1.definePromptFields)([
+    {
+        name: 'name',
+        cliOption: {
+            option: '--name <name>',
+            description: 'function package name'
+        }
+    },
+    {
+        name: 'type',
+        cliOption: {
+            option: '--type <type>',
+            description: 'function type to scaffold <bio|aio|event|cron|browserlogic|job|integ>'
+        }
+    },
+    {
+        name: 'overwrite',
+        cliOption: {
+            option: '--overwrite',
+            description: 'overwrite function directory when target already exists'
+        }
+    },
+    {
+        name: 'service',
+        cliOption: {
+            option: '--integ-service <service>',
+            description: 'integration service for integ function type <ZohoCliq|Convokraft>'
+        }
+    }
+]);

package/lib/init/features/project.js

@@ -44,11 +44,12 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     if (defaultRCProjectName !== null &&
         defaultRCProjectId !== null &&
         !(0, option_1.getOptionValue)('force', false)) {
+        (0, index_1.info)();
         (0, index_1.message)(constants_1.FILENAME.rc +
             ' already has ' +
             (0, ansi_colors_1.bold)(defaultRCProjectName) +
             ' as a default project. To overwrite use --force option');
-        throw new error_1.default('Skipping project setup, since project directory contains a default project. To overwrite use --force option', { skipHelp: true, exit: 0 });
+        return;
     }
     const orgList = yield orgAPI.getAllOrgs();
     if (orgList.length === 0) {
@@ -61,14 +62,29 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         value: org,
         short: org.name
     }));
+    const _orgOpt = (0, option_1.getGlobalOptionValue)('org', null);
+    const orgOpt = _orgOpt
+        ? orgList.find((org) => org.id === _orgOpt || org.name === _orgOpt)
+        : null;
+    const whenOrgOpt = orgOpt === null && orgChoice.length > 1;
+    whenOrgOpt && (0, index_1.info)();
     const orgAns = yield prompt_1.default.ask(prompt_1.default.question('org', 'Select a default Catalyst portal for this directory: ', {
         type: 'list',
         choices: js_1.JS.reverse(orgChoice),
-        when: orgChoice.length > 1
+        when: whenOrgOpt,
+        niInputMissingError: new error_1.default('Non-interactive mode requires --org. Pass a valid org id or name to the --org option.', {
+            exit: 1,
+            errorId: 'E_NON_INTERACTIVE_MISSING_INPUTS_ORG_OPT',
+            arg: [
+                (0, ansi_colors_1.italic)('--org <org_id>'),
+                (0, ansi_colors_1.italic)(`catalyst init ${(0, ansi_colors_1.bold)('--org <org_id>')} --project <project_id>`),
+                (0, ansi_colors_1.bold)(orgChoice.map((org) => '* ' + org.name).join('\n'))
+            ],
+            skipHelp: true
+        })
     }));
-    const selectedOrg = orgAns.org || orgList[0];
+    const selectedOrg = orgOpt || orgAns.org || orgList[0];
     runtime_store_1.default.set('project.env.id', selectedOrg.id);
-    (0, index_1.message)('Setting up a new default project for this folder\n');
     const projectAPI = yield (0, endpoints_1.projectAPI)({ auth: true, org: selectedOrg.id });
     const allProjects = (yield projectAPI.getAllProjects());
     if (allProjects.length === 0) {
@@ -93,11 +109,30 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             short: project.project_name
         }));
     });
+    const _projectOpt = (0, option_1.getGlobalOptionValue)('project', null);
+    const projectOpt = _projectOpt
+        ? allProjects.find((project) => project.id === _projectOpt || project.project_name === _projectOpt)
+        : null;
     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)
+        choices: js_1.JS.reverse(projectChoices),
+        when: projectOpt === null,
+        niInputMissingError: new error_1.default('Non-interactive mode requires --project. Pass a valid project id or name to the --project option.', {
+            exit: 1,
+            errorId: 'E_NON_INTERACTIVE_MISSING_INPUTS_PROJECT_OPT',
+            arg: [
+                (0, ansi_colors_1.italic)('--project <project_id>'),
+                (0, ansi_colors_1.italic)(`catalyst init --org <org_id> ${(0, ansi_colors_1.bold)('--project <project_id>')}`),
+                (0, ansi_colors_1.bold)(allProjects
+                    .map((_proj) => '* ' + _proj.project_name + `(${_proj.id})`)
+                    .join('\n'))
+            ],
+            skipHelp: true
+        })
     }));
-    let selectedProject = projectAns.project;
+    (0, index_1.info)();
+    (0, index_1.message)('Setting up a new default project for this folder');
+    let selectedProject = projectOpt || projectAns.project;
     if (typeof selectedProject !== 'number') {
         return (0, project_2.fillProjectPayload)(selectedOrg, selectedProject);
     }

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

@@ -61,6 +61,7 @@ const constants_1 = require("../../../util_modules/constants");
 const project_1 = require("../../../util_modules/project");
 const toml_1 = require("../../../util_modules/toml");
 const async_1 = require("../../../util_modules/fs/lib/async");
+const env_1 = require("../../../util_modules/env");
 const DEFAULT_DEV_COMMANDS = {
     cra: 'PORT=$ZC_SLATE_PORT npm start',
     'create-react-app': 'PORT=$ZC_SLATE_PORT npm start',
@@ -397,6 +398,7 @@ function getConfigDetails(frameworkOpt, frameworks) {
         let editDefaultConfig;
         if (!(0, option_1.getOptionValue)('default')) {
             if (slateConfigs === null || slateConfigs === void 0 ? void 0 : slateConfigs.settings) {
+                (0, env_1.isNonInteractiveMode)() && (0, console_1.info)();
                 (0, console_1.log)(`Auto-detected App Configuration (${(0, ansi_colors_1.bold)(frameworkOpt)}):\n` +
                     `${(0, ansi_colors_1.grey)((0, ansi_colors_1.bold)('Install Command: ') +
                         (slateConfigs === null || slateConfigs === void 0 ? void 0 : slateConfigs.settings.install_command.placeholder))}\n` +

package/lib/init/features/slate/prompt-fields.d.ts

@@ -0,0 +1,31 @@
+export declare const slateAddPromptFields: import("../../../prompt/register-fields").PromptFieldsRegistry<readonly [{
+    readonly name: "name";
+    readonly cliOption: {
+        readonly option: "--name <name>";
+        readonly description: "Specify the name of the Slate application";
+    };
+}, {
+    readonly name: "framework";
+    readonly cliOption: {
+        readonly option: "--framework <framework_name>";
+        readonly description: "Specify the frontend framework (e.g., React, Angular, Vue)";
+    };
+}, {
+    readonly name: "source";
+    readonly cliOption: {
+        readonly option: "--source <path>";
+        readonly description: "Specify the source directory of the Slate application";
+    };
+}, {
+    readonly name: "template";
+    readonly cliOption: {
+        readonly option: "--template <template_url>";
+        readonly description: "Provide a template URL to initialize your Slate application";
+    };
+}, {
+    readonly name: "default";
+    readonly cliOption: {
+        readonly option: "--default";
+        readonly description: "Use default application configurations without prompting";
+    };
+}]>;