zcatalyst-cli 1.26.2 → 1.27.0

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

@@ -14,6 +14,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 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");
@@ -23,9 +24,21 @@ const option_1 = require("../../../util_modules/option");
 const common_1 = require("../../util/common");
 const project_1 = require("../../../util_modules/project");
 const utils_1 = require("./utils");
+const prompt_fields_1 = require("./prompt-fields");
+const env_1 = require("../../../util_modules/env");
+const custom_runtime_1 = require("./utils/custom-runtime");
+const prompt_fields_2 = require("../../util/prompt-fields");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     (0, index_1.info)();
     (0, index_1.info)((0, ansi_colors_1.white)('=> ') + 'Configure AppSail');
+    const sourceFromOption = (0, option_1.getOptionValue)(prompt_fields_1.appsailAddPromptFields.get('source').optKey, undefined);
+    const sourceFromOptionTrimmed = typeof sourceFromOption === 'string' ? sourceFromOption.trim() : '';
+    if ((0, env_1.isNonInteractiveMode)() &&
+        (0, option_1.getCurrentCommand)() === 'appsail:add' &&
+        sourceFromOptionTrimmed === '') {
+        throw new error_1.default('Non-interactive mode requires --source. Pass an absolute path to the AppSail source directory, or a docker image/archive source (see catalyst appsail:add --help).', { exit: 2 });
+    }
+    const runtimeDetectedFromSource = (0, utils_1.detectRuntimeFromSourceOption)(sourceFromOption);
     const descArr = [
         '',
         `  Catalyst let's you choose the runtime of your choice for your AppSail. You can either select`,
@@ -35,9 +48,10 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         ''
     ];
     yield prompt_1.default.register('with-desc');
-    const runtimeQuestion = yield prompt_1.default.ask(prompt_1.default.question('runtime', 'Please select the runtime for your AppSail to continue:', {
+    const runtimeQuestion = yield prompt_1.default.ask(prompt_1.default.question('runtimeType', 'Please select the runtime type for your AppSail to continue:', {
         type: 'with-desc',
         description: (0, ansi_colors_1.italic)(descArr.join('\n')),
+        when: !(0, env_1.isNonInteractiveMode)() && runtimeDetectedFromSource === undefined,
         choices: [
             prompt_1.default.choice('Catalyst-Managed Runtime', {
                 value: 'catalyst',
@@ -49,11 +63,32 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             })
         ]
     }));
-    if (runtimeQuestion.runtime === 'custom') {
+    const effectiveRuntime = runtimeDetectedFromSource !== null && runtimeDetectedFromSource !== void 0 ? runtimeDetectedFromSource : runtimeQuestion.runtimeType;
+    if (effectiveRuntime === 'custom') {
+        const portOpt = (0, option_1.getOptionValue)(prompt_fields_1.appsailAddPromptFields.get('port').optKey, undefined);
+        const commandOpt = (0, option_1.getOptionValue)(prompt_fields_1.appsailAddPromptFields.get('command').optKey, undefined);
+        (0, common_1.niIgnorableOptsTest)([
+            prompt_fields_2.initCommonPromptFields.get('stack').optKey,
+            prompt_fields_1.appsailAddPromptFields.get('overwrite').optKey,
+            prompt_fields_1.appsailAddPromptFields.get('buildPath').optKey,
+            prompt_fields_1.appsailAddPromptFields.get('platform').optKey
+        ], 'The following options are not applicable for the custom runtime in non-interactive mode and will be ignored.');
         const payload = {
-            source: yield (0, utils_1.getCustomAppSailSource)(),
+            source: yield (0, custom_runtime_1.getCustomAppSailSource)(sourceFromOption),
             name: yield (0, utils_1.getAppSailName)()
         };
+        if (commandOpt) {
+            payload.command = commandOpt;
+        }
+        if (portOpt) {
+            const _port = parseInt(portOpt);
+            if (isNaN(_port) || _port < 1 || _port > 65535) {
+                throw new error_1.default(`Invalid port number provided: ${portOpt}. Please provide a valid port number between 1 and 65535.`, { exit: 1 });
+            }
+            payload.port = {
+                http: _port
+            };
+        }
         runtime_store_1.default.set('context.payload.appsail.targets', [payload]);
         return;
     }
@@ -67,22 +102,25 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const sourcePath = yield prompt_1.default.ask(prompt_1.default.question('currentDir', 'Do you want to initialize an AppSail in this directory?', {
         type: 'confirm',
         default: true,
-        when: !pulledSource
+        when: !pulledSource && !(0, env_1.isNonInteractiveMode)() && sourceFromOption === undefined
     }));
     const _appSailConfig = sourcePath.currentDir
         ? { source: runtime_store_1.default.get('cwd') }
-        : pulledSource || {
-            source: (yield prompt_1.default.ask(prompt_1.default.question('source', "Please provide the exact path to your AppSail's source directory:", {
-                type: 'input',
-                validate: (pth) => __awaiter(void 0, void 0, void 0, function* () {
-                    return (0, path_1.isAbsolute)(pth)
-                        ? (yield fs_1.ASYNC.dirExists(pth))
-                            ? true
-                            : 'Provided path does not exists'
-                        : 'Please provide an absolute path';
-                })
-            }))).source
-        };
+        : pulledSource ||
+            (sourceFromOption !== undefined
+                ? { source: yield (0, utils_1.resolveCatalystSourceFromOption)(sourceFromOption) }
+                : {
+                    source: (yield prompt_1.default.ask(prompt_1.default.question(prompt_fields_1.appsailAddPromptFields.get('source'), "Please provide the exact path to your AppSail's source directory:", {
+                        type: 'input',
+                        validate: (pth) => __awaiter(void 0, void 0, void 0, function* () {
+                            return (0, path_1.isAbsolute)(pth)
+                                ? (yield fs_1.ASYNC.dirExists(pth))
+                                    ? true
+                                    : 'Provided path does not exists'
+                                : 'Please provide an absolute path';
+                        })
+                    }))).source
+                });
     const payload = {
         source: (0, path_1.relative)((0, project_1.getProjectRoot)(), _appSailConfig.source) || '.',
         name: yield (0, utils_1.getAppSailName)()
@@ -93,37 +131,48 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         (0, index_1.info)();
         (0, index_1.warning)(`The ${(0, ansi_colors_1.bold)(constants_1.FILENAME.app_config)} file is already present in the appsail directory`);
     }
-    const overWrite = yield prompt_1.default.ask(prompt_1.default.question('appConfig', 'Do you wish to overwrite the ' + constants_1.FILENAME.app_config + '?', {
+    const overwriteOpt = prompt_fields_1.appsailAddPromptFields.get('overwrite');
+    const overWrite = yield prompt_1.default.ask(prompt_1.default.question(overwriteOpt, 'Do you wish to overwrite the ' + constants_1.FILENAME.app_config + '?', {
         type: 'confirm',
         default: false,
         when: isAppConfig
     }));
-    const activeWrite = overWrite.appConfig !== false;
+    const activeWrite = overWrite[overwriteOpt.promptName] !== false;
     if (!activeWrite) {
         runtime_store_1.default.set('context.payload.appsail.targets', [payload]);
+        (0, index_1.info)();
+        (0, index_1.info)((0, ansi_colors_1.bold)(`${constants_1.FILENAME.app_config} will not be overwritten. Keeping the existing configuration file.`));
+        if ((0, env_1.isNonInteractiveMode)()) {
+            (0, index_1.info)();
+            (0, index_1.info)(`To overwrite the existing configuration file, use the ${(0, ansi_colors_1.bold)('--overwrite-config')} option.`);
+        }
+        (0, index_1.info)();
         return;
     }
-    const buildPath = yield prompt_1.default.ask(prompt_1.default.question('path', 'Please provide the build path of your AppSail:', {
+    const buildPath = yield prompt_1.default.ask(prompt_1.default.question(prompt_fields_1.appsailAddPromptFields.get('buildPath'), 'Please provide the build path of your AppSail:', {
         type: 'input',
         rootPath: _appSailConfig.source,
-        when: !_appSailConfig.build && activeWrite
+        when: !_appSailConfig.build && activeWrite,
+        defaultAns: './'
     }));
+    const appCmdFromOpt = (0, option_1.getOptionValue)(prompt_fields_1.appsailAddPromptFields.get('command').optKey, 'echo Please specify the start-up command in the app-config.json file under the key command for AppSail $X_ZC_RESOURCE_NAME');
     const appSailStack = _appSailConfig.stack ||
         (yield (0, common_1.getRuntimePromptAnswer)('Please choose a stack for your AppSail: '));
+    const _buildPath = buildPath[prompt_fields_1.appsailAddPromptFields.get('buildPath').promptName];
+    (0, common_1.niIgnorableOptsTest)(prompt_fields_1.appsailAddPromptFields.get('port').optKey, 'The following option is not applicable for the Catalyst-Managed runtime in non-interactive mode and will be ignored.');
     const appConfig = {
-        command: _appSailConfig.command ||
-            'echo Please specify the start-up command in the app-config.json file under the key command for AppSail $X_ZC_RESOURCE_NAME',
+        command: _appSailConfig.command || appCmdFromOpt,
         build_path: _appSailConfig.build ||
-            ((0, path_1.isAbsolute)(buildPath.path)
-                ? (0, path_1.relative)(_appSailConfig.source, buildPath.path) || '.'
-                : buildPath.path),
+            ((0, path_1.isAbsolute)(_buildPath)
+                ? (0, path_1.relative)(_appSailConfig.source, _buildPath) || '.'
+                : _buildPath),
         stack: appSailStack.runtime,
         env_variables: {},
         memory: _appSailConfig.memory || 256,
         scripts: _appSailConfig.scripts || {}
     };
     if (appSailStack.lang === 'java') {
-        const platformQ = yield prompt_1.default.ask(prompt_1.default.question('platform', 'Please choose a platform for your AppSail: ', {
+        const platformQ = yield prompt_1.default.ask(prompt_1.default.question(prompt_fields_1.appsailAddPromptFields.get('platform'), 'Please choose a platform for your AppSail: ', {
             type: 'list',
             choices: [
                 prompt_1.default.choice('JavaSE', {

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

@@ -0,0 +1,43 @@
+export declare const appsailAddPromptFields: import("../../../prompt/register-fields").PromptFieldsRegistry<readonly [{
+    readonly name: "name";
+    readonly cliOption: {
+        readonly option: "--name <name>";
+        readonly description: "appsail service name";
+    };
+}, {
+    readonly name: "source";
+    readonly cliOption: {
+        readonly option: "--source <source>";
+        readonly description: "absolute path to appsail source directory or docker image url or docker archive url";
+    };
+}, {
+    readonly name: "overwrite";
+    readonly cliOption: {
+        readonly option: "--overwrite-config";
+        readonly description: "overwrite existing app-config.json when present, applicable for catalyst runtime";
+    };
+}, {
+    readonly name: "buildPath";
+    readonly cliOption: {
+        readonly option: "--build <path>";
+        readonly description: "appsail build path relative to source, applicable for catalyst runtime";
+    };
+}, {
+    readonly name: "platform";
+    readonly cliOption: {
+        readonly option: "--platform <platform>";
+        readonly description: "appsail java platform <javase|war>";
+    };
+}, {
+    readonly name: "command";
+    readonly cliOption: {
+        readonly option: "--command <command>";
+        readonly description: "startup command for appsail";
+    };
+}, {
+    readonly name: "port";
+    readonly cliOption: {
+        readonly option: "--port <httpPort>";
+        readonly description: "http port for appsail, applicable only for custom runtime";
+    };
+}]>;

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

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.appsailAddPromptFields = void 0;
+const register_fields_1 = require("../../../prompt/register-fields");
+exports.appsailAddPromptFields = (0, register_fields_1.definePromptFields)([
+    {
+        name: 'name',
+        cliOption: {
+            option: '--name <name>',
+            description: 'appsail service name'
+        }
+    },
+    {
+        name: 'source',
+        cliOption: {
+            option: '--source <source>',
+            description: 'absolute path to appsail source directory or docker image url or docker archive url'
+        }
+    },
+    {
+        name: 'overwrite',
+        cliOption: {
+            option: '--overwrite-config',
+            description: 'overwrite existing app-config.json when present, applicable for catalyst runtime'
+        }
+    },
+    {
+        name: 'buildPath',
+        cliOption: {
+            option: '--build <path>',
+            description: 'appsail build path relative to source, applicable for catalyst runtime'
+        }
+    },
+    {
+        name: 'platform',
+        cliOption: {
+            option: '--platform <platform>',
+            description: 'appsail java platform <javase|war>'
+        }
+    },
+    {
+        name: 'command',
+        cliOption: {
+            option: '--command <command>',
+            description: 'startup command for appsail'
+        }
+    },
+    {
+        name: 'port',
+        cliOption: {
+            option: '--port <httpPort>',
+            description: 'http port for appsail, applicable only for custom runtime'
+        }
+    }
+]);

package/lib/init/features/appsail/utils/custom-runtime.d.ts

@@ -0,0 +1,3 @@
+export declare function getContainerImageTag(): Promise<string>;
+export declare function resolveCustomAppSailSourceFromOption(sourceInput: string): Promise<string>;
+export declare function getCustomAppSailSource(sourceInput?: string): Promise<string>;

package/lib/init/features/appsail/utils/custom-runtime.js

@@ -0,0 +1,161 @@
+"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.getContainerImageTag = getContainerImageTag;
+exports.resolveCustomAppSailSourceFromOption = resolveCustomAppSailSourceFromOption;
+exports.getCustomAppSailSource = getCustomAppSailSource;
+const image_1 = require("@zcatalyst/container-plugin/out/endpoints/image");
+const container_1 = require("../../../../util_modules/container");
+const js_1 = require("../../../../util_modules/js");
+const ansi_colors_1 = require("ansi-colors");
+const prompt_1 = __importDefault(require("../../../../prompt"));
+const error_1 = __importDefault(require("../../../../error"));
+const project_1 = require("../../../../util_modules/project");
+const path_1 = require("path");
+const fs_1 = require("../../../../util_modules/fs");
+function getContainerImageTag() {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield (0, container_1.isSocketAccessible)();
+        const images = (yield (0, image_1.getAllLocalImages)()).reduce((_images, img) => {
+            var _a;
+            (_a = img.RepoTags) === null || _a === void 0 ? void 0 : _a.forEach((tag) => _images.push({ imgName: tag, id: img.Id }));
+            return _images;
+        }, []);
+        const searchImages = (filter) => {
+            const filteredImages = [];
+            images.forEach((img) => {
+                var _a;
+                if (filter === '' ||
+                    img.id.includes(filter) ||
+                    ((_a = img.imgName) === null || _a === void 0 ? void 0 : _a.toLowerCase().includes(filter.toLowerCase()))) {
+                    filteredImages.push({
+                        name: `${img.imgName} ${(0, ansi_colors_1.dim)(img.id.substring(7, 17))}`,
+                        value: img.imgName || img.id
+                    });
+                    return;
+                }
+            });
+            return filteredImages;
+        };
+        yield prompt_1.default.register('search-box');
+        const image = yield prompt_1.default.ask(prompt_1.default.question('name', 'Please search and select the image to link:', {
+            type: 'search-box',
+            boxType: 'list',
+            searchable: true,
+            pageSize: 10,
+            highlight: true,
+            notFoundMsg: 'No Images found!',
+            searchMsg: 'Searching images...',
+            source(_answersSoFar, input) {
+                input || (input = '');
+                return Promise.resolve(searchImages(input));
+            },
+            validate: (ansArr) => {
+                if (js_1.JS.isEmpty(ansArr)) {
+                    return 'Must select an Image';
+                }
+                return true;
+            }
+        }));
+        return `docker://${image.name}`;
+    });
+}
+function resolveCustomAppSailSourceFromOption(sourceInput) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const source = sourceInput.trim();
+        if (!source) {
+            throw new error_1.default('AppSail source cannot be empty for custom runtime.', {
+                exit: 2
+            });
+        }
+        const isDockerArchiveProtocol = source.startsWith('docker-archive://');
+        const isDockerImageProtocol = source.startsWith('docker://');
+        if (isDockerImageProtocol) {
+            const imageName = source.slice('docker://'.length).trim();
+            if (!imageName) {
+                throw new error_1.default('Invalid docker image source. Use format docker://<image[:tag]>.', { exit: 2 });
+            }
+            return source;
+        }
+        const archivePathOrImage = isDockerArchiveProtocol
+            ? source.slice('docker-archive://'.length)
+            : source;
+        const archivePathCandidate = (0, path_1.isAbsolute)(archivePathOrImage)
+            ? archivePathOrImage
+            : (0, project_1.resolveProjectPath)(archivePathOrImage);
+        const isArchiveLike = archivePathOrImage.endsWith('.tar');
+        if (isDockerArchiveProtocol || isArchiveLike) {
+            if (!(yield fs_1.ASYNC.fileExists(archivePathCandidate))) {
+                throw new error_1.default('Provided docker archive path does not exist.', {
+                    exit: 2
+                });
+            }
+            if (!archivePathCandidate.endsWith('.tar')) {
+                throw new error_1.default('Provided file is not a valid docker archive. Please provide a .tar file.', { exit: 2 });
+            }
+            const normalized = (0, path_1.relative)((0, project_1.getProjectRoot)(), archivePathCandidate);
+            return `docker-archive://${normalized}`;
+        }
+        return `docker://${source}`;
+    });
+}
+function getCustomAppSailSource(sourceInput) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (sourceInput !== undefined) {
+            return resolveCustomAppSailSourceFromOption(sourceInput);
+        }
+        const dockerProtocol = yield prompt_1.default.ask(prompt_1.default.question('type', 'Please choose one of the supported protocols:', {
+            type: 'list',
+            choices: [
+                prompt_1.default.choice(`Docker image ${(0, ansi_colors_1.italic)('(docker://)')}`, {
+                    value: 'image',
+                    short: 'Docker image'
+                }),
+                prompt_1.default.choice(`Docker archive ${(0, ansi_colors_1.italic)('(docker-archive://)')}`, {
+                    value: 'docker-archive',
+                    short: 'Docker archive'
+                })
+            ]
+        }));
+        switch (dockerProtocol.type) {
+            case 'image': {
+                return getContainerImageTag();
+            }
+            case 'docker-archive': {
+                const archivePath = yield prompt_1.default.ask(prompt_1.default.question('archive', 'Please provide the path to the docker archive file: ', {
+                    type: 'input',
+                    validate: (pth) => __awaiter(this, void 0, void 0, function* () {
+                        if (!(0, path_1.isAbsolute)(pth)) {
+                            return 'Please provide an absolute path';
+                        }
+                        if (!(yield fs_1.ASYNC.fileExists(pth))) {
+                            return 'Provided path does not exists';
+                        }
+                        if (!pth.endsWith('.tar')) {
+                            return 'Provided file is not a valid docker archive. Please provide a .tar file';
+                        }
+                        return true;
+                    })
+                }));
+                const path = (0, path_1.relative)((0, project_1.getProjectRoot)(), archivePath.archive);
+                return `docker-archive://${path}`;
+            }
+            default: {
+                throw new error_1.default('Unsupported protocol selected for AppSail source', {
+                    exit: 2
+                });
+            }
+        }
+    });
+}

package/lib/init/features/appsail/{utils.d.ts → utils/index.d.ts}

@@ -12,5 +12,5 @@ export type _TAppSailInitConfig = {
 };
 export declare function getAppSailZip(): Promise<_TAppSailInitConfig>;
 export declare function getAppSailName(): Promise<string>;
-export declare function getContainerImageTag(): Promise<string>;
-export declare function getCustomAppSailSource(): Promise<string>;
+export declare function detectRuntimeFromSourceOption(sourceInput?: string): 'custom' | 'catalyst' | undefined;
+export declare function resolveCatalystSourceFromOption(sourceInput: string): Promise<string>;

package/lib/init/features/appsail/utils/index.js

@@ -0,0 +1,170 @@
+"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.getAppSailZip = getAppSailZip;
+exports.getAppSailName = getAppSailName;
+exports.detectRuntimeFromSourceOption = detectRuntimeFromSourceOption;
+exports.resolveCatalystSourceFromOption = resolveCatalystSourceFromOption;
+const ansi_colors_1 = require("ansi-colors");
+const path_1 = require("path");
+const archiver_1 = __importDefault(require("../../../../archiver"));
+const endpoints_1 = require("../../../../endpoints");
+const error_1 = __importDefault(require("../../../../error"));
+const prompt_1 = __importDefault(require("../../../../prompt"));
+const config_1 = require("../../../../util_modules/config");
+const appsail_1 = require("../../../../util_modules/config/lib/appsail");
+const constants_1 = require("../../../../util_modules/constants");
+const fs_1 = require("../../../../util_modules/fs");
+const logger_1 = require("../../../../util_modules/logger");
+const project_1 = require("../../../../util_modules/project");
+const prompt_fields_1 = require("../prompt-fields");
+function getAppSailZip() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const _gitHubAPI = yield (0, endpoints_1.gitHubAPI)();
+        const gitRepo = yield prompt_1.default.ask(prompt_1.default.question('repo', 'Please choose from the list of recommended projects to get started', {
+            type: 'list',
+            choices: [
+                prompt_1.default.choice(`appsail-nodejs - ${(0, ansi_colors_1.underline)('https://github.com/catalystbyzoho/appsail-nodejs')}`, {
+                    value: {
+                        api: _gitHubAPI.appsailNodejs.bind(_gitHubAPI),
+                        command: 'node index.js',
+                        source: (0, project_1.resolveProjectPath)('appsail-nodejs'),
+                        build: './',
+                        stack: {
+                            runtime: 'node16',
+                            lang: 'node'
+                        },
+                        scripts: {
+                            preserve: 'npm install',
+                            predeploy: 'npm install'
+                        },
+                        memory: 256
+                    },
+                    short: 'appsail-nodejs'
+                }),
+                prompt_1.default.choice(`appsail-java - ${(0, ansi_colors_1.underline)('https://github.com/catalystbyzoho/appsail-java')}`, {
+                    value: {
+                        api: _gitHubAPI.appsailJava.bind(_gitHubAPI),
+                        command: 'java -jar demo-0.0.1-SNAPSHOT.jar',
+                        source: (0, project_1.resolveProjectPath)('appsail-java'),
+                        build: (0, path_1.join)('target', 'demo-0.0.1-SNAPSHOT.jar'),
+                        stack: {
+                            runtime: 'java8',
+                            lang: 'java'
+                        },
+                        scripts: {
+                            preserve: './mvnw clean install',
+                            predeploy: './mvnw clean install'
+                        },
+                        memory: 512,
+                        platform: 'javase'
+                    },
+                    short: 'appsail-java'
+                }),
+                prompt_1.default.choice(`appsail-python - ${(0, ansi_colors_1.underline)('https://github.com/catalystbyzoho/appsail-python')}`, {
+                    value: {
+                        api: _gitHubAPI.appsailPython.bind(_gitHubAPI),
+                        command: 'python3 app.py',
+                        source: (0, project_1.resolveProjectPath)('appsail-python'),
+                        build: './',
+                        stack: {
+                            runtime: 'python_3_9',
+                            lang: 'python'
+                        },
+                        scripts: {
+                            preserve: 'python3 -m pip install -r ./requirements.txt -t ./ --upgrade',
+                            predeploy: 'python3 -m pip install -r ./requirements.txt -t ./ --upgrade'
+                        },
+                        memory: 256
+                    },
+                    short: 'appsail-python'
+                })
+            ]
+        }));
+        (0, logger_1.info)();
+        (0, logger_1.info)((0, ansi_colors_1.white)('=>') + ' Downloading code');
+        const code = (yield gitRepo.repo.api());
+        const repoDir = gitRepo.repo.source;
+        yield fs_1.ASYNC.ensureDir(repoDir);
+        const zip = new archiver_1.default();
+        zip.load(code);
+        zip.extract(repoDir, '/', {
+            isFolder: true,
+            ignoreLevel: 1
+        });
+        yield zip.finalize();
+        (0, logger_1.success)(`Successfully downloaded the code to ${ansi_colors_1.bold.green(gitRepo.repo.source)}`);
+        return {
+            source: gitRepo.repo.source,
+            build: gitRepo.repo.build,
+            stack: gitRepo.repo.stack,
+            command: gitRepo.repo.command,
+            scripts: gitRepo.repo.scripts,
+            memory: gitRepo.repo.memory,
+            platform: gitRepo.repo.platform
+        };
+    });
+}
+function getAppSailName() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const existingSails = config_1.appSailConfig.raw() || [];
+        const appName = yield prompt_1.default.ask(prompt_1.default.question(prompt_fields_1.appsailAddPromptFields.get('name'), 'Please provide the name for your AppSail: ', {
+            type: 'input',
+            default: 'AppSail',
+            validate: (name) => {
+                const exists = existingSails.findIndex((appSail) => appSail.name === name) !== -1
+                    ? 'AppSail already exists'
+                    : true;
+                const match = name.match(constants_1.REGEX.appsail.name)
+                    ? true
+                    : 'Invalid AppSail name: Name must contain only alphanumeric and hyphen';
+                return typeof exists === 'string'
+                    ? exists
+                    : typeof match === 'string'
+                        ? match
+                        : true;
+            }
+        }));
+        return appName.name;
+    });
+}
+function detectRuntimeFromSourceOption(sourceInput) {
+    if (sourceInput === undefined) {
+        return undefined;
+    }
+    const source = sourceInput.trim();
+    if (!source) {
+        return undefined;
+    }
+    if ((0, appsail_1.isCustomAppSailSource)(source)) {
+        return 'custom';
+    }
+    return 'catalyst';
+}
+function resolveCatalystSourceFromOption(sourceInput) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const source = sourceInput.trim();
+        if (!(0, path_1.isAbsolute)(source)) {
+            throw new error_1.default('Please provide an absolute path for AppSail source directory.', {
+                exit: 2
+            });
+        }
+        if (!(yield fs_1.ASYNC.dirExists(source))) {
+            throw new error_1.default('Provided AppSail source directory does not exist.', {
+                exit: 2
+            });
+        }
+        return source;
+    });
+}

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

@@ -47,16 +47,17 @@ var __importDefault = (this && this.__importDefault) || function (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");
+const prompt_fields_js_1 = require("./prompt-fields.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: ', {
+    const clientInitAnswer = yield index_js_1.default.ask(index_js_1.default.question(prompt_fields_js_1.clientPromptFields.get('clientType'), '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', {
-                id: plugin.toUpperCase(),
+                id: plugin.toLowerCase(),
                 value: plugin.toLowerCase(),
                 short: plugin.toUpperCase()
             });
         })
     }));
-    return (yield Promise.resolve(`${'./initializers/' + clientInitAnswer.clientFlavour}`).then(s => __importStar(require(s)))).default();
+    return (yield Promise.resolve(`${'./initializers/' + clientInitAnswer.clientType}`).then(s => __importStar(require(s)))).default();
 });