zcatalyst-cli 1.26.1 → 1.27.0

package/lib/prompt/overwrite-prompt.d.ts

@@ -0,0 +1,11 @@
+import type { IQuestion, PromptFieldHandle } from './index';
+type OverwriteResource = 'Directory' | 'File';
+interface OverwritePromptOpts {
+    fieldOrName?: string | PromptFieldHandle;
+    resourceName: string;
+    resourceType?: OverwriteResource;
+    contextText?: string;
+    defaultAns?: boolean | null;
+}
+export declare const overwritePromptQuestion: ({ fieldOrName, resourceName, resourceType, contextText, defaultAns }: OverwritePromptOpts) => IQuestion;
+export {};

package/lib/prompt/overwrite-prompt.js

@@ -0,0 +1,16 @@
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.overwritePromptQuestion = void 0;
+const ansi_colors_1 = require("ansi-colors");
+const question_factory_1 = require("./question-factory");
+const overwritePromptQuestion = ({ fieldOrName = 'overwrite', resourceName, resourceType = 'Directory', contextText = '', defaultAns = false }) => {
+    const messageSuffix = contextText ? ` ${contextText}` : '';
+    const qOpts = {
+        type: 'confirm'
+    };
+    if (defaultAns !== null) {
+        qOpts['defaultAns'] = defaultAns;
+    }
+    return (0, question_factory_1.buildQuestion)(fieldOrName, `${resourceType} ${(0, ansi_colors_1.underline)(resourceName)} already exists${messageSuffix}. Overwrite ?`, qOpts);
+};
+exports.overwritePromptQuestion = overwritePromptQuestion;

package/lib/prompt/question-factory.d.ts

@@ -0,0 +1,34 @@
+import inquirer from 'inquirer';
+import Separator from 'inquirer/lib/objects/separator';
+import { PromptFieldHandle } from './register-fields';
+import type { TreeData, TreeNode } from './types/tree';
+import CatalystError from '../error';
+export interface IChoice extends inquirer.ChoiceOptions, inquirer.ListChoiceOptions, inquirer.CheckboxChoiceOptions {
+    id?: string;
+}
+export interface IQuestion extends inquirer.Question, inquirer.ListQuestionOptions {
+    fieldOrName: string | PromptFieldHandle;
+    type?: inquirer.QuestionTypeName | 'file-path' | 'tree' | 'search-box' | 'with-desc';
+    defaultAns?: unknown;
+    choices?: Array<IChoice | TSeparator> | Array<string | TSeparator>;
+    treeChoices?: Array<TreeNode | TreeData>;
+    rootPath?: string;
+    exclude?: Array<string>;
+    excludeDir?: boolean;
+    ignoreFiles?: boolean;
+    depth?: number;
+    empTxt?: string;
+    validatingText?: string;
+    description?: string;
+    searchable?: boolean;
+    pageSize?: number;
+    highlight?: boolean;
+    notFoundMsg?: string;
+    searchMsg?: string;
+    boxType?: string;
+    source?: (answersSoFar: unknown, input: string | undefined) => Promise<unknown> | unknown;
+    niInputMissingError?: CatalystError | string;
+}
+export type TSeparator = Separator;
+export declare function getQuestionPromptName(question: IQuestion): string;
+export declare function buildQuestion(fieldOrName: string | PromptFieldHandle, messageText: string, { type, defaultAns, choices, validate, filter, when, prefix, suffix, ...otheropts }?: Omit<IQuestion, 'name' | 'fieldOrName'>): IQuestion;

package/lib/prompt/question-factory.js

@@ -0,0 +1,41 @@
+'use strict';
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getQuestionPromptName = getQuestionPromptName;
+exports.buildQuestion = buildQuestion;
+const choice_1 = require("./choice");
+const register_fields_1 = require("./register-fields");
+function getQuestionPromptName(question) {
+    return question.fieldOrName instanceof register_fields_1.PromptFieldHandle
+        ? question.fieldOrName.promptName
+        : question.fieldOrName;
+}
+function buildQuestion(fieldOrName, messageText, _a = {}) {
+    var { type = 'input', defaultAns, choices = [], validate = () => {
+        return true;
+    }, filter = (ans) => {
+        return ans;
+    }, when = () => {
+        return true;
+    }, prefix = '', suffix = '' } = _a, otheropts = __rest(_a, ["type", "defaultAns", "choices", "validate", "filter", "when", "prefix", "suffix"]);
+    if (choices.length > 0 && typeof choices[0] === 'string') {
+        choices = choices.map((strChoice) => (0, choice_1.choice)(strChoice));
+    }
+    return Object.assign({ type,
+        fieldOrName, message: messageText, default: defaultAns, choices,
+        validate,
+        filter,
+        when,
+        prefix,
+        suffix }, otheropts);
+}

package/lib/prompt/register-fields.d.ts

@@ -0,0 +1,24 @@
+export type PromptFieldDef = {
+    name: string;
+    cliOption: {
+        description: string;
+        option: string;
+    };
+};
+export type PromptFieldNames<T extends ReadonlyArray<PromptFieldDef>> = T[number]['name'];
+export type DefinedPromptFields<T extends ReadonlyArray<PromptFieldDef>> = PromptFieldsRegistry<T>;
+export declare class PromptFieldHandle<F extends PromptFieldDef = PromptFieldDef> extends Array<string> {
+    readonly def: F;
+    constructor(def: F);
+    get optKey(): string;
+    get promptName(): string;
+    toCliOpts(): [string, string];
+}
+export declare class PromptFieldsRegistry<T extends ReadonlyArray<PromptFieldDef>> {
+    readonly map: Map<string, PromptFieldHandle<PromptFieldDef>>;
+    constructor(fields: T);
+    get<K extends PromptFieldNames<T>>(name: K): PromptFieldHandle<Extract<T[number], {
+        name: K;
+    }>>;
+}
+export declare function definePromptFields<T extends ReadonlyArray<PromptFieldDef>>(fields: T): PromptFieldsRegistry<T>;

package/lib/prompt/register-fields.js

@@ -0,0 +1,37 @@
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PromptFieldsRegistry = exports.PromptFieldHandle = void 0;
+exports.definePromptFields = definePromptFields;
+const cli_option_key_1 = require("./cli-option-key");
+class PromptFieldHandle extends Array {
+    constructor(def) {
+        super();
+        this.def = def;
+        this.push(this.def.cliOption.option, this.def.cliOption.description);
+    }
+    get optKey() {
+        return (0, cli_option_key_1.commanderOptionKey)(this.def.cliOption.option);
+    }
+    get promptName() {
+        return this.def.name;
+    }
+    toCliOpts() {
+        return [this.def.cliOption.option, this.def.cliOption.description];
+    }
+}
+exports.PromptFieldHandle = PromptFieldHandle;
+class PromptFieldsRegistry {
+    constructor(fields) {
+        this.map = new Map();
+        for (const f of fields) {
+            this.map.set(f.name, new PromptFieldHandle(f));
+        }
+    }
+    get(name) {
+        return this.map.get(name);
+    }
+}
+exports.PromptFieldsRegistry = PromptFieldsRegistry;
+function definePromptFields(fields) {
+    return new PromptFieldsRegistry(fields);
+}

package/lib/pull/features/apig.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,10 +45,9 @@ 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 apig_utils_1 = require("../../apig-utils");
 const endpoints_1 = require("../../endpoints");
-const prompt_1 = __importDefault(require("../../prompt"));
+const prompt_1 = __importStar(require("../../prompt"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const config_1 = require("../../util_modules/config");
 const fs_1 = require("../../util_modules/fs");
@@ -23,6 +55,10 @@ const sync_1 = require("../../util_modules/fs/lib/sync");
 const index_1 = require("../../util_modules/logger/index");
 const project_1 = require("../../util_modules/project");
 const error_1 = __importDefault(require("../../error"));
+const env_1 = require("../../util_modules/env");
+const option_1 = require("../../util_modules/option");
+const utils_1 = require("../utils");
+const ansi_colors_1 = require("ansi-colors");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const apigName = config_1.apigConfig.rules();
     const apigDirPath = (0, project_1.resolveProjectPath)(apigName);
@@ -37,7 +73,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         (0, index_1.info)();
         const consent = yield prompt_1.default.ask(prompt_1.default.question('enable', 'The APIG is disable in catalyst console, Do you want to enable it and pull the APIG rules now ?', {
             type: 'confirm',
-            defaultAns: false
+            defaultAns: (0, env_1.isNonInteractiveMode)()
         }));
         if (!consent.enable) {
             (0, index_1.info)('Skipping APIG pull. Since the APIG is disabled in catalyst console.');
@@ -47,12 +83,27 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     }
     const fileExists = yield fs_1.ASYNC.fileExists(apigDirPath);
     const overwriteAns = fileExists
-        ? yield prompt_1.default.ask(prompt_1.default.question('overwrite', 'File ' + (0, ansi_colors_1.underline)(apigDirPath) + ' already exists. Overwrite ?', {
-            type: 'confirm',
-            defaultAns: false
+        ? yield prompt_1.default.ask((0, prompt_1.overwritePromptQuestion)({
+            resourceName: apigDirPath,
+            resourceType: 'File',
+            defaultAns: (0, env_1.isNonInteractiveMode)() &&
+                (0, option_1.getOptionValue)(utils_1.promptPullFields.get('overwrite').optKey, false)
+                ? true
+                : false
         }))
         : { overwrite: true };
     if (!overwriteAns.overwrite) {
+        if ((0, env_1.isNonInteractiveMode)()) {
+            throw new error_1.default('APIG pull failed as the APIG rules file already exists and the --overwrite option is not used to overwrite the file in local.', {
+                exit: 1,
+                errorId: 'E_NON_INTERACTIVE_APIG_PULL_OVERWRITE',
+                arg: [
+                    ansi_colors_1.italic.red(apigDirPath),
+                    (0, ansi_colors_1.italic)('--overwrite'),
+                    (0, ansi_colors_1.italic)(`catalyst pull apig ${(0, ansi_colors_1.green)('--overwrite')}`)
+                ]
+            });
+        }
         (0, index_1.info)('Skipping APIG pull');
         return;
     }

package/lib/pull/features/client.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) {
@@ -17,51 +50,101 @@ const archiver_1 = __importDefault(require("../../archiver"));
 const client_utils_1 = require("../../client-utils");
 const endpoints_1 = require("../../endpoints");
 const error_1 = __importDefault(require("../../error"));
-const prompt_1 = __importDefault(require("../../prompt"));
+const prompt_1 = __importStar(require("../../prompt"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const config_1 = require("../../util_modules/config");
 const fs_1 = require("../../util_modules/fs");
 const js_1 = require("../../util_modules/js");
 const index_1 = require("../../util_modules/logger/index");
 const path_1 = require("path");
+const env_1 = require("../../util_modules/env");
+const option_1 = require("../../util_modules/option");
+const utils_1 = require("../utils");
+function getPullClientVersion() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const webappAPI = yield (0, endpoints_1.clientAPI)();
+        const historyArr = (yield webappAPI.getAllHistory());
+        if (historyArr.length === 0) {
+            (0, index_1.warning)('No Web Client app version found, Ensure that a Web Client is deployed in catalyst console before pulling it.');
+            return;
+        }
+        const resource = (0, option_1.getOptionValue)(utils_1.promptPullFields.get('resource').optKey, undefined);
+        if (resource) {
+            const resources = resource.split(',');
+            if (resources.length > 1) {
+                throw new error_1.default('Multiple resources are not allowed for client pull. Please specify only one client version to pull.', {
+                    exit: 1,
+                    errorId: 'E_NON_INTERACTIVE_CLIENT_PULL_MULTIPLE_RESOURCES',
+                    arg: [(0, ansi_colors_1.italic)('catalyst pull client --resource <client_version>')]
+                });
+            }
+            const _appVersion = historyArr.find((history) => history.app_version === resources[0]);
+            return _appVersion ? _appVersion.history_id : undefined;
+        }
+        else if ((0, env_1.isNonInteractiveMode)()) {
+            throw new error_1.default('Client pull failed. Please specify the client version to pull using --resource option in non-interactive mode.', {
+                exit: 1,
+                errorId: 'E_NON_INTERACTIVE_CLIENT_PULL_NO_RESOURCE',
+                arg: [
+                    (0, ansi_colors_1.italic)('--resource'),
+                    (0, ansi_colors_1.italic)(`catalyst pull client ${(0, ansi_colors_1.green)('--resource <client_version>')}`),
+                    (0, ansi_colors_1.bold)(historyArr.map((history) => '* ' + history.app_version).join('\n'))
+                ]
+            });
+        }
+        const choices = historyArr.map((history) => {
+            let live = '';
+            if (js_1.JS.get(history, 'status', false)) {
+                live = (0, ansi_colors_1.cyan)(' (LIVE)');
+            }
+            return prompt_1.default.choice(history.app_version + live, {
+                value: history.history_id,
+                short: history.app_version,
+                id: history.app_version
+            });
+        });
+        const historyAns = yield prompt_1.default.ask(prompt_1.default.question('history', 'Select a Catalyst client app version : ', {
+            type: 'list',
+            choices
+        }));
+        return historyAns.history;
+    });
+}
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const clientDirName = config_1.clientConfig.source();
     const clientDirPath = clientDirName;
     const webappAPI = yield (0, endpoints_1.clientAPI)();
-    const historyArr = (yield webappAPI.getAllHistory());
-    if (historyArr.length === 0) {
-        (0, index_1.info)('No history details found in remote console');
+    const historyAns = yield getPullClientVersion();
+    if (!historyAns)
         return;
-    }
     const folderExits = yield fs_1.ASYNC.dirExists(clientDirPath);
     const overwriteAns = folderExits
-        ? yield prompt_1.default.ask(prompt_1.default.question('overwrite', 'Directory ' + (0, ansi_colors_1.underline)(clientDirName) + ' already exists. Overwrite ?', {
-            type: 'confirm',
-            defaultAns: false
+        ? yield prompt_1.default.ask((0, prompt_1.overwritePromptQuestion)({
+            resourceName: clientDirName,
+            defaultAns: (0, env_1.isNonInteractiveMode)() &&
+                (0, option_1.getOptionValue)(utils_1.promptPullFields.get('overwrite').optKey, false)
+                ? true
+                : false
         }))
         : { overwrite: true };
     if (!overwriteAns.overwrite) {
+        if ((0, env_1.isNonInteractiveMode)()) {
+            throw new error_1.default('Client pull failed as the client directory already exists and the --overwrite option is not used to overwrite the file in local', {
+                exit: 1,
+                errorId: 'E_NON_INTERACTIVE_CLIENT_PULL_NO_OVERWRITE',
+                arg: [
+                    ansi_colors_1.italic.red(clientDirPath),
+                    (0, ansi_colors_1.italic)('--overwrite'),
+                    (0, ansi_colors_1.italic)(`catalyst pull client ${(0, ansi_colors_1.green)('--overwrite')}`)
+                ]
+            });
+        }
         (0, index_1.info)('Skipping client pull');
         return;
     }
     yield fs_1.ASYNC.deleteDir(clientDirPath).catch();
-    const choices = historyArr.map((history) => {
-        let live = '';
-        if (js_1.JS.get(history, 'status', false)) {
-            live = (0, ansi_colors_1.cyan)(' (LIVE)');
-        }
-        return prompt_1.default.choice(history.app_version + live, {
-            value: history.history_id,
-            short: history.app_version,
-            id: history.app_version
-        });
-    });
-    const historyAns = yield prompt_1.default.ask(prompt_1.default.question('history', 'Select a Catalyst client app version : ', {
-        type: 'list',
-        choices
-    }));
     try {
-        const clientZip = (yield webappAPI.download(historyAns.history));
+        const clientZip = (yield webappAPI.download(historyAns));
         yield new archiver_1.default().load(clientZip).extract(clientDirPath).finalize();
         yield client_utils_1.clientUtils.validate({ skipPluginValidation: true });
     }

package/lib/pull/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) {
@@ -17,7 +50,7 @@ const path_1 = require("path");
 const languages_1 = require("./languages");
 const archiver_1 = __importDefault(require("../../../archiver"));
 const endpoints_1 = require("../../../endpoints");
-const prompt_1 = __importDefault(require("../../../prompt"));
+const prompt_1 = __importStar(require("../../../prompt"));
 const runtime_store_1 = __importDefault(require("../../../runtime-store"));
 const config_1 = require("../../../util_modules/config");
 const constants_1 = require("../../../util_modules/constants");
@@ -30,8 +63,12 @@ const python_1 = require("../../../fn-utils/lib/python");
 const throbber_1 = __importDefault(require("../../../throbber"));
 const ensure_java_userconfig_1 = require("../../../fn-utils/lib/java/ensure-java-userconfig");
 const logger_1 = require("../../../util_modules/logger");
+const env_1 = require("../../../util_modules/env");
+const utils_1 = require("../../utils");
+const option_1 = require("../../../util_modules/option");
 function selFnsPrompt(targs, fnDirPath) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const choicesObj = targs.reduce((accumulator, fn) => {
             const name = fn.name;
             const type = fn.type === constants_1.REMOTE_REF.functions.type[constants_1.FN_TYPE.applogic]
@@ -58,6 +95,49 @@ function selFnsPrompt(targs, fnDirPath) {
             result.push(...value);
             return result;
         }, []);
+        if ((0, env_1.isNonInteractiveMode)()) {
+            const fns = ((_a = ((0, option_1.getOptionValue)(utils_1.promptPullFields.get('resource').optKey, undefined) ||
+                undefined)) === null || _a === void 0 ? void 0 : _a.split(',')) || [];
+            if (fns.length === 0) {
+                throw new error_1.default('Fns to pull not specified in non-interactive mode', {
+                    exit: 1,
+                    errorId: 'E_NON_INTERACTIVE_FNS_PULL-1',
+                    arg: [
+                        (0, ansi_colors_1.italic)('--resource'),
+                        (0, ansi_colors_1.italic)('catalyst pull functions --resource fn1,fn2,fn3'),
+                        (0, ansi_colors_1.bold)(choicesArr
+                            .filter((_choice) => { var _a; return !!_choice.id || !!((_a = _choice.value) === null || _a === void 0 ? void 0 : _a.name); })
+                            .map((choice) => '* ' + (choice.id || choice.value.name))
+                            .join('\n'))
+                    ]
+                });
+            }
+            return fns.reduce((_fnsArr, _fn) => {
+                const _choice = choicesArr.find((_choice) => {
+                    var _a;
+                    return (_choice.id && _choice.id === _fn) ||
+                        (((_a = _choice.value) === null || _a === void 0 ? void 0 : _a.name) && _choice.value.name === _fn);
+                });
+                if (_choice) {
+                    _fnsArr.push(_choice.value);
+                }
+                else {
+                    throw new error_1.default('Cannot find the function in remote: ' + _fn, {
+                        exit: 1,
+                        errorId: 'E_NON_INTERACTIVE_FNS_PULL-2',
+                        arg: [
+                            (0, ansi_colors_1.italic)(`--resource ${(0, ansi_colors_1.red)(_fn)}`),
+                            (0, ansi_colors_1.italic)('--resource'),
+                            (0, ansi_colors_1.bold)(choicesArr
+                                .filter((_choice) => { var _a; return !!_choice.id || !!((_a = _choice.value) === null || _a === void 0 ? void 0 : _a.name); })
+                                .map((choice) => '* ' + (choice.id || choice.value.name))
+                                .join('\n'))
+                        ]
+                    });
+                }
+                return _fnsArr;
+            }, []);
+        }
         const functionsAns = yield prompt_1.default.ask(prompt_1.default.question('functions', 'Select all the functions that you want to pull from remote console : ', {
             type: 'checkbox',
             choices: choicesArr,
@@ -108,15 +188,31 @@ exports.default = (_fns) => __awaiter(void 0, void 0, void 0, function* () {
     yield Promise.all(fns.map((fn) => __awaiter(void 0, void 0, void 0, function* () {
         const folderExists = yield fs_1.ASYNC.dirExists(fn.source);
         if (folderExists) {
-            dirOverwriteQns.push(prompt_1.default.question(fn.name, 'Directory ' + (0, ansi_colors_1.underline)(fn.source) + ' already exists. Overwrite ?', {
-                type: 'confirm',
-                defaultAns: false
+            dirOverwriteQns.push((0, prompt_1.overwritePromptQuestion)({
+                fieldOrName: fn.name,
+                resourceName: fn.source,
+                defaultAns: (0, env_1.isNonInteractiveMode)() ? true : false
             }));
         }
     })));
     const dirOverwriteAns = yield prompt_1.default.ask(...dirOverwriteQns);
     const targets = fns.filter((fn) => {
         if (dirOverwriteAns[fn.name] === undefined || dirOverwriteAns[fn.name]) {
+            if ((0, env_1.isNonInteractiveMode)()) {
+                const overWriteOpt = (0, option_1.getOptionValue)(utils_1.promptPullFields.get('overwrite').optKey, false);
+                if (!overWriteOpt) {
+                    throw new error_1.default('Cannot overwrite existing function directory in non-interactive mode as the --overwrite option is not specified', {
+                        exit: 1,
+                        errorId: 'E_NON_INTERACTIVE_FNS_PULL-3',
+                        arg: [
+                            (0, ansi_colors_1.bold)(`(${fn.name})`),
+                            (0, ansi_colors_1.italic)('catalyst pull'),
+                            (0, ansi_colors_1.italic)('--overwrite'),
+                            (0, ansi_colors_1.italic)(`catalyst pull functions --resource ${(0, option_1.getOptionValue)(utils_1.promptPullFields.get('resource').optKey, 'fn1,fn2,fn3')} ${(0, ansi_colors_1.bold)('--overwrite')}`)
+                        ]
+                    });
+                }
+            }
             return true;
         }
         (0, index_1.message)('skipping pull of function: ' + fn.name);

package/lib/pull/index.js

@@ -41,7 +41,7 @@ function pull() {
         (0, index_1.info)((0, ansi_colors_1.bold)('\n' + (0, ansi_colors_1.white)('===> ') + js_1.JS.capitalize(feature) + ' Setup'));
         yield MODULE().catch((err) => {
             (0, index_1.info)();
-            (0, index_1.warning)(`Skipping pull of ${feature}. Since ${err.message}.\nContact Catalyst Support with catalyst-debug.log file.`);
+            (0, index_1.warning)(`Skipping pull of ${feature}. Since ${err.message}.`);
         });
         if (runtime_store_1.default.get('context.payload.' + feature, false)) {
             runtime_store_1.default.set('context.payload.features', runtime_store_1.default.get('context.payload.features', []).concat(feature));

package/lib/pull/utils.d.ts

@@ -0,0 +1,13 @@
+export declare const promptPullFields: import("../prompt").PromptFieldsRegistry<readonly [{
+    readonly name: "overwrite";
+    readonly cliOption: {
+        readonly option: "--overwrite";
+        readonly description: "Overwrite existing resources such as functions/client/apig in the local directory if present";
+    };
+}, {
+    readonly name: "resource";
+    readonly cliOption: {
+        readonly option: "--resource <fn_name|client_version>";
+        readonly description: "Specify the name of the resource to pull as comma separated values. For example: --resource func1,func2 (only applicable for Non-Interactive mode)";
+    };
+}]>;

package/lib/pull/utils.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.promptPullFields = void 0;
+const prompt_1 = require("../prompt");
+exports.promptPullFields = (0, prompt_1.definePromptFields)([
+    {
+        name: 'overwrite',
+        cliOption: {
+            option: '--overwrite',
+            description: 'Overwrite existing resources such as functions/client/apig in the local directory if present'
+        }
+    },
+    {
+        name: 'resource',
+        cliOption: {
+            option: '--resource <fn_name|client_version>',
+            description: 'Specify the name of the resource to pull as comma separated values. For example: --resource func1,func2 (only applicable for Non-Interactive mode)'
+        }
+    }
+]);

package/lib/repl-server.d.ts

@@ -21,6 +21,10 @@ declare class Repl {
     start(): Repl;
     emit(eventName: string, ...inputs: Array<any>): boolean;
     showPrompt(): void;
+    defineCommand(keyword: string, cmd: {
+        help?: string;
+        action: (this: REPLServer, args: string) => void;
+    }): Repl;
     setContext(command: string, exe: unknown): Repl;
     close(): void;
     pause(): void;

package/lib/repl-server.js

@@ -58,6 +58,15 @@ class Repl {
             this.server.displayPrompt();
         }
     }
+    defineCommand(keyword, cmd) {
+        if (this.server === null) {
+            throw new index_js_1.default('command cannot be defined before server is started', {
+                exit: 2
+            });
+        }
+        this.server.defineCommand(keyword, cmd);
+        return this;
+    }
     setContext(command, exe) {
         if (this.server === null) {
             throw new index_js_1.default('context cannot be set before server is started', { exit: 2 });