zcatalyst-cli 1.26.2 → 1.27.0

package/lib/commands/client/setup.js

@@ -51,8 +51,15 @@ const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
 const scopes_js_1 = __importDefault(require("../../authentication/constants/scopes.js"));
 const index_1 = require("../../util_modules/logger/index");
+const prompt_fields_1 = require("../../init/features/client/prompt-fields");
 exports.default = new command_1.default('client:setup')
     .description('Set up and configure the client directory in your project directory')
+    .option(prompt_fields_1.clientPromptFields.get('clientType'))
+    .option(prompt_fields_1.clientPromptFields.get('name'))
+    .option(prompt_fields_1.clientPromptFields.get('js-ts'))
+    .option(prompt_fields_1.clientPromptFields.get('routing'))
+    .option(prompt_fields_1.clientPromptFields.get('stylesheet'))
+    .option(prompt_fields_1.clientPromptFields.get('overwrite'))
     .needs('auth', [scopes_js_1.default.webapp])
     .needs('config', { optional: true })
     .needs('rc')

package/lib/commands/deploy/index.js

@@ -85,7 +85,7 @@ exports.default = new command_1.default('deploy')
             return true;
         });
         (0, index_1.info)();
-        deployTargets.forEach((deploytarget) => {
+        for (const deploytarget of deployTargets) {
             switch (deploytarget) {
                 case 'client':
                     (0, index_1.info)();
@@ -98,7 +98,7 @@ exports.default = new command_1.default('deploy')
                     break;
                 case 'slate':
                     (0, index_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>>> Slate <<<<<<<<<<<<<<<'));
-                    (0, slate_1.slateLogger)();
+                    yield (0, slate_1.slateLogger)({ wait: false });
                     (0, index_1.info)();
                     break;
                 case 'apig':
@@ -121,7 +121,7 @@ exports.default = new command_1.default('deploy')
                     (0, utils_1.urlLogger)();
                     break;
             }
-        });
+        }
         if (deployTargets.length > 0) {
             (0, index_1.success)('Catalyst deploy complete!');
             (0, index_1.info)();

package/lib/commands/deploy/slate.js

@@ -50,22 +50,83 @@ const util_1 = require("../../deploy/util");
 const error_1 = __importDefault(require("../../error"));
 const command_1 = __importDefault(require("../../internal/command"));
 const logger_1 = require("../../util_modules/logger");
+const option_1 = require("../../util_modules/option");
+const runtime_store_1 = __importDefault(require("../../runtime-store"));
+const config_1 = require("../../util_modules/config");
+const prompt_1 = __importDefault(require("../../prompt"));
+const env_1 = require("../../util_modules/env");
+const ansi_colors_1 = require("ansi-colors");
+function resolveSlateTarget(name) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        const targets = ((_a = (yield config_1.slateConfig.getAllTargetDetails(false))) !== null && _a !== void 0 ? _a : []);
+        const validTargets = targets.filter((t) => { var _a; return ((_a = t.validity) === null || _a === void 0 ? void 0 : _a.valid) !== false; });
+        if (name) {
+            const match = targets.find((t) => t.name === name);
+            if (!match) {
+                throw new error_1.default(`Slate service "${name}" not found in config`, {
+                    exit: 1
+                });
+            }
+            if (((_b = match.validity) === null || _b === void 0 ? void 0 : _b.valid) === false) {
+                throw new error_1.default(`Slate service "${name}" is invalid: ${match.validity.reason}`, { exit: 1 });
+            }
+            runtime_store_1.default.set('context.opts.only', `slate:${name}`);
+            return;
+        }
+        if (validTargets.length === 0) {
+            throw new error_1.default('No valid Slate services found to deploy', {
+                skipHelp: true
+            });
+        }
+        if (validTargets.length === 1) {
+            runtime_store_1.default.set('context.opts.only', `slate:${validTargets[0].name}`);
+            return;
+        }
+        const cwd = runtime_store_1.default.get('cwd');
+        const cwdMatches = validTargets.filter((t) => { var _a; return (_a = t.source) === null || _a === void 0 ? void 0 : _a.includes(cwd); });
+        if (cwdMatches.length === 1) {
+            runtime_store_1.default.set('context.opts.only', `slate:${cwdMatches[0].name}`);
+            return;
+        }
+        const { selected } = yield prompt_1.default.ask(prompt_1.default.question('selected', 'Select a Slate service to deploy:', {
+            type: 'list',
+            choices: validTargets.map((t) => prompt_1.default.choice(t.name))
+        }));
+        runtime_store_1.default.set('context.opts.only', `slate:${selected}`);
+    });
+}
 exports.default = new command_1.default('slate')
-    .description('Deploy your Catalyst Slate service to Catalyst Development environment')
+    .description('Deploy your Catalyst Slate app to Catalyst Development environment')
+    .argument('[name]', 'Name of the Slate app to deploy')
     .option('-m <msg>', 'Please provide the description for your app deployment.')
     .option('--production', 'Deploy the slate app to production environment.')
+    .option('--no-wait', 'Deploy without waiting for build logs and status.')
     .needs('auth')
     .needs('config', { optional: true })
     .needs('rc', { optional: true })
-    .action(() => __awaiter(void 0, void 0, void 0, function* () {
+    .action((name) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         util_1.DeployEvents.emit('start');
+        if ((0, env_1.isNonInteractiveMode)() && !name) {
+            throw new error_1.default('Slate app name is required in non-interactive mode. Please provide the name of the Slate service to deploy.', {
+                exit: 1,
+                errorId: 'E_NON_INTERACTIVE_MODE_SLATE_NAME_REQUIRED',
+                arg: [(0, ansi_colors_1.italic)(`catalyst deploy slate ${(0, ansi_colors_1.green)('<slate-app-name>')}`)]
+            });
+        }
+        yield resolveSlateTarget(name);
         yield (yield Promise.resolve().then(() => __importStar(require('../../deploy')))).default({ feature: 'slate' });
         (0, logger_1.info)();
-        const deployTargets = (0, slate_1.slateLogger)();
-        if (deployTargets.length === 0) {
+        const wait = (0, option_1.getOptionValue)('wait', true);
+        const succeededTargets = yield (0, slate_1.slateLogger)({ wait });
+        const allTargets = runtime_store_1.default.get('context.payload.slate.targets', []);
+        if (succeededTargets.length === 0) {
             (0, logger_1.error)('Slate Deploy failed');
         }
+        else if (wait && succeededTargets.length < allTargets.length) {
+            (0, logger_1.success)(`Catalyst Slate Deploy is Live!)`);
+        }
         else {
             (0, logger_1.success)('Catalyst Slate Deploy is Live!');
         }

package/lib/commands/functions/add.js

@@ -51,8 +51,15 @@ const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
 const scopes_js_1 = __importDefault(require("../../authentication/constants/scopes.js"));
 const index_1 = require("../../util_modules/logger/index");
+const prompt_fields_1 = require("../../init/features/functions/prompt-fields");
+const prompt_fields_2 = require("../../init/util/prompt-fields");
 exports.default = new command_1.default('functions:add')
     .description('Add a function of the required stack to the function directory')
+    .option(prompt_fields_1.functionsAddPromptFields.get('name'))
+    .option(prompt_fields_1.functionsAddPromptFields.get('type'))
+    .option(prompt_fields_2.initCommonPromptFields.get('stack'))
+    .option(prompt_fields_1.functionsAddPromptFields.get('overwrite'))
+    .option(prompt_fields_1.functionsAddPromptFields.get('service'))
     .needs('auth', [scopes_js_1.default.functions])
     .needs('config', { optional: true })
     .needs('rc')

package/lib/commands/functions/delete.js

@@ -25,8 +25,10 @@ const scopes_js_1 = __importDefault(require("../../authentication/constants/scop
 const js_1 = require("../../util_modules/js");
 const index_1 = require("../../util_modules/logger/index");
 const option_1 = require("../../util_modules/option");
-exports.default = new command_1.default('functions:delete [function_name_or_id]')
+const env_1 = require("../../util_modules/env");
+exports.default = new command_1.default('functions:delete')
     .description('Delete a function from the remote console or the local directory')
+    .argument('[function_name_or_id]', 'name or id of the function to delete. This is required in non-interactive mode.')
     .option('--local', 'delete the functions in local machine.')
     .option('--remote', 'delete the functions in remote console.')
     .needs('auth', [scopes_js_1.default.projects])
@@ -46,7 +48,10 @@ exports.default = new command_1.default('functions:delete [function_name_or_id]'
             arg: [(0, ansi_colors_1.bold)('--local'), (0, ansi_colors_1.bold)('--remote')]
         });
     }
-    if (!localOpt && !remoteOpt) {
+    if (!localOpt && !remoteOpt && (0, env_1.isNonInteractiveMode)()) {
+        localOpt = true;
+    }
+    else if (!localOpt && !remoteOpt) {
         const locationAns = yield prompt_1.default.ask(prompt_1.default.question('location', 'Choose a location to get more information', {
             type: 'list',
             choices: [
@@ -93,6 +98,13 @@ exports.default = new command_1.default('functions:delete [function_name_or_id]'
             }
             target = [fnTarget];
         }
+        else if ((0, env_1.isNonInteractiveMode)()) {
+            throw new index_js_1.default('fn_name input missing in ni mode', {
+                exit: 1,
+                errorId: 'FDEL-8',
+                arg: [(0, ansi_colors_1.italic)(`catalyst functions:delete ${(0, ansi_colors_1.red)('<function-name>')} --local`)]
+            });
+        }
         const localTargets = target.map((fn) => (0, path_1.join)(sourceDir, fn));
         const localChoices = (yield (0, common_1.refineTargets)(localTargets, false)).map((fn) => {
             if (!fn.valid) {
@@ -122,6 +134,12 @@ exports.default = new command_1.default('functions:delete [function_name_or_id]'
         choiceArr.push(...localChoices);
     }
     if (remoteOpt) {
+        if ((0, env_1.isNonInteractiveMode)()) {
+            throw new index_js_1.default('Cannot use remote option in non-interactive mode', {
+                exit: 1,
+                errorId: 'FDEL-7'
+            });
+        }
         let remoteTargets = (yield fnApi.getAllFunctions());
         if (js_1.JS.isEmpty(remoteTargets)) {
             throw new index_js_1.default('No targets found in remote', {
@@ -182,7 +200,7 @@ exports.default = new command_1.default('functions:delete [function_name_or_id]'
             }
             return true;
         },
-        when: () => choiceArr.length > 2,
+        when: choiceArr.length > 2,
         pageSize: 15
     }));
     const fnToDelete = fnAns.functions !== undefined ? fnAns.functions : [choiceArr[1].value];
@@ -190,7 +208,7 @@ exports.default = new command_1.default('functions:delete [function_name_or_id]'
         .map((fn) => `${fn.name}(${fn.location})`)
         .join(',')}`, {
         type: 'confirm',
-        defaultAns: false
+        defaultAns: (0, env_1.isNonInteractiveMode)()
     }));
     if (!consentAns.consent) {
         (0, index_1.message)('Aborted by user');

package/lib/commands/functions/execute.js

@@ -57,69 +57,18 @@ const common_js_1 = require("../../fn-utils/lib/common.js");
 const index_js_3 = require("../../util_modules/constants/index.js");
 const path_1 = require("path");
 const ansi_colors_1 = require("ansi-colors");
-const async_js_1 = require("../../util_modules/fs/lib/async.js");
+const sync_js_1 = require("../../util_modules/fs/lib/sync.js");
 const index_js_4 = __importDefault(require("../../execute/index.js"));
-const project_js_1 = require("../../util_modules/project.js");
-function getInputs(exeTarget) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const inputsFile = (0, path_1.resolve)(exeTarget.source, typeof exeTarget.inputs === 'string' ? exeTarget.inputs : index_js_3.FILENAME.catalyst_inputs);
-        const projectRoot = (0, project_js_1.getProjectRoot)();
-        if (!inputsFile.startsWith(projectRoot)) {
-            throw new index_js_2.default(`Input file path ${exeTarget.inputs} is outside the project directory.`, {
-                exit: 1,
-                context: {
-                    resolvePath: inputsFile,
-                    targetSource: projectRoot,
-                    inputs: exeTarget.inputs
-                }
-            });
-        }
-        const targetInputs = yield (0, async_js_1.readJSONFile)(inputsFile).catch((err) => {
-            throw new index_js_2.default('Unable to read the inputs file', {
-                original: err,
-                exit: 1,
-                errorId: 'FEXE-2',
-                arg: [(0, ansi_colors_1.italic)(inputsFile), ansi_colors_1.italic.red(err || '')]
-            });
-        });
-        if (!targetInputs || Object.keys(targetInputs).length === 0) {
-            throw new index_js_2.default('Empty inputs', {
-                exit: 0,
-                errorId: 'FEXE-3',
-                arg: [
-                    (0, ansi_colors_1.bold)(index_js_3.FILENAME.catalyst_inputs),
-                    (0, ansi_colors_1.bold)(index_js_3.FILENAME.catalyst_config),
-                    (0, ansi_colors_1.bold)('execution.test_inputs')
-                ]
-            });
-        }
-        const inputKeys = Object.keys(targetInputs);
-        const keyOpt = (0, option_js_1.getOptionValue)('key', undefined);
-        if (keyOpt && !(keyOpt in targetInputs)) {
-            throw new index_js_2.default('Key not present in inputs', {
-                exit: 0,
-                errorId: 'FEXE-4',
-                arg: [
-                    ansi_colors_1.bold.italic('--key ' + (0, ansi_colors_1.red)(keyOpt)),
-                    (0, ansi_colors_1.bold)(inputKeys.map((key) => '* ' + key).join('\n'))
-                ]
-            });
-        }
-        const selectedKey = yield index_js_1.default.ask(index_js_1.default.question('key', 'Please select the input', {
-            type: 'list',
-            choices: inputKeys.map((key) => index_js_1.default.choice(key, { value: key, short: key })),
-            when: !keyOpt && inputKeys.length > 1
-        }));
-        return inputKeys.length === 1
-            ? targetInputs[inputKeys[0]]
-            : targetInputs[selectedKey.key] || targetInputs[keyOpt];
-    });
-}
+const index_1 = require("../../util_modules/logger/index");
+const execute_input_resolver_js_1 = require("../../execute/execute-input-resolver.js");
+const command_utils_js_1 = require("../../execute/command-utils.js");
+const util_1 = require("util");
 exports.default = new command_js_1.default('functions:execute')
     .argument('[function_name]', 'Name of the function to execute')
-    .argument('[data]', 'Input data for the function', '')
+    .argument('[data]', 'Input data for the function (deprecated)', '')
     .description('Execute the Non-Http functions')
-    .option('--key <input_key>', 'Specify the input to be provided incase of multiple inputs present')
+    .option('--input <value>', 'Function input: inline JSON, a JSON file path, or "-" for stdin')
+    .option('--key <input_key>', 'Specify the input to be provided in-case of multiple inputs present')
     .option('--debug [port]', 'the functions are invoked from local environment enabling debugging options on provided port.' +
     `(default: ${default_js_1.default.serve_port.debug.basicio})`)
     .option('--ignore-scripts', 'ignore teh pre and post lifecycle scripts')
@@ -127,6 +76,16 @@ exports.default = new command_js_1.default('functions:execute')
     .needs('config')
     .needs('rc')
     .action((functionName, data) => __awaiter(void 0, void 0, void 0, function* () {
+    const inputOption = (0, option_js_1.getOptionValue)('input', undefined);
+    if (!inputOption && data) {
+        (0, index_1.warning)('The positional [data] argument is deprecated and will be removed in a future release. Use --input <value> instead.');
+    }
+    if (!inputOption && !data) {
+        const stdinType = (0, sync_js_1.getStdinType)();
+        if (stdinType === 'pipe' || stdinType === 'file') {
+            (0, index_1.warning)('Piped stdin is ignored unless you pass --input -. Use --input - to consume piped JSON input.');
+        }
+    }
     const fnSource = FUNCTIONS_CONFIG.source();
     const rawFnTargets = FUNCTIONS_CONFIG.targets();
     if (!rawFnTargets || rawFnTargets.length === 0) {
@@ -185,23 +144,32 @@ exports.default = new command_js_1.default('functions:execute')
             ]
         });
     }
-    let jsonData;
-    try {
-        jsonData = data ? JSON.parse(data) : undefined;
+    let fnInput;
+    if (typeof inputOption === 'string') {
+        const resolvedInput = yield (0, execute_input_resolver_js_1.resolveExecuteInputOption)(inputOption);
+        if (!resolvedInput.ok) {
+            throw (0, execute_input_resolver_js_1.resolveInputError)(resolvedInput, inputOption);
+        }
+        fnInput = resolvedInput.value;
     }
-    catch (er) {
-        throw new index_js_2.default('Error parsing the JSON input', {
-            exit: 1,
-            errorId: 'FEXE-6',
-            arg: [ansi_colors_1.italic.red(data || '<empty-string>')]
-        });
+    else if (data) {
+        try {
+            fnInput = JSON.parse(data);
+        }
+        catch (er) {
+            throw new index_js_2.default('Error parsing the JSON input', {
+                exit: 1,
+                errorId: 'FEXE-6',
+                arg: [ansi_colors_1.italic.red(data || '<empty-string>')]
+            });
+        }
     }
-    const fnInput = jsonData || (yield getInputs(exeTarget));
-    if (!fnInput || typeof fnInput !== 'object') {
+    fnInput = yield (0, command_utils_js_1.getInputs)(exeTarget, fnInput);
+    if (!fnInput || typeof fnInput !== 'object' || Array.isArray(fnInput.ip)) {
         throw new index_js_2.default('Invalid input', {
             exit: 1,
             errorId: 'FEXE-5',
-            arg: [ansi_colors_1.bold.red(fnInput || '')]
+            arg: [ansi_colors_1.bold.red((0, util_1.inspect)(fnInput) || '')]
         });
     }
     const debugPort = (0, option_js_1.getOptionValue)('debug', false);

package/lib/commands/functions/setup.js

@@ -51,6 +51,8 @@ const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
 const scopes_js_1 = __importDefault(require("../../authentication/constants/scopes.js"));
 const index_1 = require("../../util_modules/logger/index");
+const env_1 = require("../../util_modules/env");
+const error_1 = __importDefault(require("../../error"));
 exports.default = new command_1.default('functions:setup')
     .description('Set up and configure the function directory in your project directory')
     .needs('auth', [scopes_js_1.default.functions])
@@ -58,6 +60,17 @@ exports.default = new command_1.default('functions:setup')
     .needs('rc')
     .ci(false)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
+    if ((0, env_1.isNonInteractiveMode)()) {
+        throw new error_1.default('The functions:setup command is disabled in non-interactive mode. Please use the functions:add command to add functions in non-interactive mode.', {
+            exit: 1,
+            errorId: 'E_NON_INTERACTIVE_MODE_FUNCTIONS_SETUP',
+            arg: [
+                ansi_colors_1.italic.yellow('catalyst functions:setup'),
+                (0, ansi_colors_1.bold)('non-interactive'),
+                ansi_colors_1.italic.green('catalyst functions:add')
+            ]
+        });
+    }
     const config = runtime_store_1.default.get('config');
     yield (yield Promise.resolve().then(() => __importStar(require('../../init/features')))).functions();
     yield config.save();

package/lib/commands/functions/shell.js

@@ -55,6 +55,8 @@ const constants_1 = require("../../util_modules/constants");
 const index_1 = require("../../util_modules/logger/index");
 const option_1 = require("../../util_modules/option");
 const project_1 = require("../../util_modules/project");
+const needed_scopes_1 = require("../../util_modules/server/needed-scopes");
+const env_1 = require("../../util_modules/env");
 exports.default = new command_1.default('functions:shell')
     .description('Launch a node shell to test emulated functions of any stack or type, other than Advanced I/O functions')
     .option('--only <targets>', 'only serve specified, comma-separated targets (e.g. "f1,f2")')
@@ -70,11 +72,23 @@ exports.default = new command_1.default('functions:shell')
     '\n' +
     '(deprecated: The watch mode will be enabled by default. To disable watch mode use the --no-watch option)')
     .option('--no-watch', 'disable watching the files for changes')
-    .needs('auth', constants_1.NEEDED_SCOPES.SERVE)
+    .needs('auth', needed_scopes_1.SERVE_SCOPES)
     .needs('config')
     .needs('rc')
     .ci(false)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
+    if ((0, env_1.isNonInteractiveMode)()) {
+        throw new error_1.default('The functions:shell command cannot be run in non-interactive mode. Please run the command in an interactive shell.', {
+            exit: 1,
+            errorId: 'FSHELL-2',
+            arg: [
+                (0, ansi_colors_1.bold)('functions:shell'),
+                (0, ansi_colors_1.bold)('non-interactive'),
+                (0, ansi_colors_1.bold)('functions:execute'),
+                (0, ansi_colors_1.italic)(`${(0, ansi_colors_1.dim)('>')} catalyst functions:execute -h`)
+            ]
+        });
+    }
     const httpOpt = (0, option_1.getOptionValue)('http', false);
     if (httpOpt && typeof httpOpt !== 'boolean') {
         runtime_store_1.default.set('context.port.http.bio', httpOpt);

package/lib/commands/iac/import.js

@@ -68,7 +68,7 @@ const js_1 = require("../../util_modules/js");
 const index_1 = require("../../util_modules/logger/index");
 const option_1 = require("../../util_modules/option");
 const shell_1 = require("../../util_modules/shell");
-const server_js_1 = require("../../util_modules/server.js");
+const index_js_2 = require("../../util_modules/server/index.js");
 const project_1 = require("../../util_modules/project");
 const getZipAndTemplate = (filePath, stagedDeploy) => __awaiter(void 0, void 0, void 0, function* () {
     const zipFile = filePath
@@ -119,7 +119,7 @@ const ensureUserAction = (deployRes) => __awaiter(void 0, void 0, void 0, functi
                 res(e);
             }
         }));
-        const destroyer = new server_js_1.ConnectionDestroyer(server);
+        const destroyer = new index_js_2.ConnectionDestroyer(server);
         server.listen(callbackPort, '127.0.0.1', () => {
             const urlString = accessUrl.toString();
             (0, index_1.info)();

package/lib/commands/init.js

@@ -56,16 +56,23 @@ const fs_1 = require("../util_modules/fs");
 const js_1 = require("../util_modules/js");
 const index_1 = require("../util_modules/logger/index");
 const shell_1 = require("../util_modules/shell");
+const project_1 = require("../util_modules/project");
+const error_1 = __importDefault(require("../error"));
+const env_1 = require("../util_modules/env");
 const saveAndComplete = (config) => __awaiter(void 0, void 0, void 0, function* () {
-    yield config.save();
-    (0, index_1.message)((0, ansi_colors_1.bold)(constants_1.FILENAME.config) + ' file has been successfully created with feature details.');
+    if (Object.keys(config.data).length > 0) {
+        yield config.save();
+        (0, index_1.message)((0, ansi_colors_1.bold)(constants_1.FILENAME.config) + ' file has been successfully created with feature details.');
+    }
     (0, index_1.info)();
     (0, index_1.success)('Catalyst initialization complete!');
 });
-exports.default = new command_1.default('init [feature]')
+exports.default = new command_1.default('init')
     .description('Initialize a Catalyst project, function, and client resources in the local directory')
+    .argument('[feature]', 'feature to initialize')
     .option('--force', 'force initialise a project for this directory')
-    .ignore(['project'])
+    .option('--project <project_id>', 'project id to initialize the project for')
+    .option('--org <org_id>', 'organization id to initialize the project for')
     .needs('auth', [scopes_js_1.default.projects, scopes_js_1.default.project_import_create])
     .needs('config', { optional: true })
     .needs('rc', { optional: true, resolveOnNotFound: true })
@@ -74,6 +81,7 @@ exports.default = new command_1.default('init [feature]')
     var _a;
     const config = runtime_store_1.default.get('config');
     const homeDir = (yield Promise.resolve().then(() => __importStar(require('os')))).homedir();
+    const projectId = (0, project_1.getDefaultProjectId)(false);
     const warnings = [];
     if (fs_1.SYNC.isPathOutside(homeDir, runtime_store_1.default.get('cwd'))) {
         warnings.push('You are currently outside your home directory');
@@ -81,7 +89,7 @@ exports.default = new command_1.default('init [feature]')
     if (runtime_store_1.default.get('cwd') === homeDir) {
         warnings.push('You are initializing your home directory as a Catalyst project');
     }
-    if (config.loaded) {
+    if (projectId) {
         warnings.push('You are initializing in an existing Catalyst project directory');
     }
     let warningText = '';
@@ -89,8 +97,7 @@ exports.default = new command_1.default('init [feature]')
         warningText =
             '\nBefore we get started, keep in mind:\n\n  ' +
                 ansi_colors_1.yellow.bold('* ') +
-                warnings.join('\n  ' + ansi_colors_1.yellow.bold('* ')) +
-                '\n';
+                warnings.join('\n  ' + ansi_colors_1.yellow.bold('* '));
     }
     (0, shell_1.clearStdout)(true);
     const bannerString = yield fs_1.ASYNC.readFile(constants_1.TEMPLATE.banner);
@@ -100,16 +107,22 @@ exports.default = new command_1.default('init [feature]')
         (0, ansi_colors_1.bold)(runtime_store_1.default.get('project.root')) +
         '\n' +
         warningText);
-    if (feature !== 'project') {
-        try {
-            yield (0, features_1.project)();
-        }
-        catch (er) {
-            (0, index_1.debug)(er);
-            return;
+    if ((0, env_1.isNonInteractiveMode)()) {
+        if (feature && feature !== 'project') {
+            throw new error_1.default('ni mode is only supported for project initialization.', {
+                exit: 1,
+                errorId: 'E_NON_INTERACTIVE_FEATURE_INIT'
+            });
         }
+        feature = 'project';
     }
-    (0, index_1.info)();
+    yield (0, features_1.project)();
+    if (feature === 'project') {
+        return saveAndComplete(config);
+    }
+    const askFeatIp = !runtime_store_1.default.get('context.payload.project.import', false) &&
+        typeof feature !== 'string';
+    askFeatIp && (0, index_1.info)();
     const featureAns = yield prompt_1.default.ask(prompt_1.default.question('features', 'Which are the features you want to setup for this folder?\n This step is optional! Press ' +
         (0, ansi_colors_1.cyan)('<return> ') +
         'to proceed.\n', {
@@ -132,12 +145,13 @@ exports.default = new command_1.default('init [feature]')
                 short: 'Slate'
             })
         ],
-        when: !runtime_store_1.default.get('context.payload.project.import', false) &&
-            typeof feature !== 'string'
+        when: askFeatIp
     }));
-    if (!((_a = featureAns.features) === null || _a === void 0 ? void 0 : _a.length) &&
-        (runtime_store_1.default.get('context.payload.project.import', false) ||
-            typeof feature !== 'string')) {
+    if (!((_a = featureAns.features) === null || _a === void 0 ? void 0 : _a.length) && !feature) {
+        (0, index_1.message)('No features selected for setup. Exiting...');
+        return saveAndComplete(config);
+    }
+    if (runtime_store_1.default.get('context.payload.project.import', false)) {
         return saveAndComplete(config);
     }
     if (typeof feature === 'string') {

package/lib/commands/login.js

@@ -50,6 +50,7 @@ exports.default = new command_1.default('login')
     .description('Log the CLI in to your Catalyst account')
     .option('--no-localhost', 'login without browser')
     .option('--force', 'force re-authentication')
+    .option('--dc <us|eu|in|au|ca|sa|jp|uae>', 'data center to login to')
     .ci(false)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
     const auth = yield Promise.resolve().then(() => __importStar(require('../authentication/index.js')));

package/lib/commands/pull.js

@@ -56,13 +56,32 @@ const env_1 = require("../util_modules/env");
 const fs_1 = require("../util_modules/fs");
 const js_1 = require("../util_modules/js");
 const index_1 = require("../util_modules/logger/index");
-exports.default = new command_1.default('pull [feature]')
+const utils_1 = require("../pull/utils");
+const common_1 = require("../init/util/common");
+const error_1 = __importDefault(require("../error"));
+exports.default = new command_1.default('pull')
     .description('Pull resources of your project from the remote console to the local directory')
+    .argument('[feature]', 'The feature to pull from the remote console. Valid values are: functions, client, apig')
+    .option(utils_1.promptPullFields.get('overwrite'))
+    .option(utils_1.promptPullFields.get('resource'))
     .needs('auth', [scopes_js_1.default.functions, scopes_js_1.default.webapp])
     .needs('config', { optional: true })
     .needs('rc')
+    .niHelp([
+    'In Non-Interactive mode at a time only one feature can be pulled.',
+    'In case of pulling multiple features, run the command multiple times.'
+]
+    .map((_txt) => '* ' + _txt)
+    .join('\n'))
     .ci(false)
     .action((feature) => __awaiter(void 0, void 0, void 0, function* () {
+    if ((0, env_1.isNonInteractiveMode)() && !feature) {
+        throw new error_1.default('In Non-Interactive mode the feature to pull must be specified as an argument. For example: catalyst pull functions', {
+            exit: 1,
+            errorId: 'E_NON_INTERACTIVE_PULL_NO_FEATURE',
+            arg: [(0, ansi_colors_1.italic)('<feature>'), (0, ansi_colors_1.italic)(`catalyst pull ${(0, ansi_colors_1.green)('functions')}`)]
+        });
+    }
     const config = runtime_store_1.default.get('config');
     const homeDir = (yield Promise.resolve().then(() => __importStar(require('os')))).homedir();
     const warnings = [];
@@ -97,6 +116,8 @@ exports.default = new command_1.default('pull [feature]')
         (0, index_1.message)('Aborted by user.');
         return;
     }
+    !(0, env_1.isNonInteractiveMode)() &&
+        (0, common_1.ignorableOptsTest)(utils_1.promptPullFields.get('resource').optKey, 'The overwrite option is not applicable for this command in interactive mode.');
     let featureAns = { features: [feature] };
     if (feature === undefined) {
         const featureChoices = [

package/lib/commands/serve.js

@@ -47,6 +47,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = __importDefault(require("../internal/command"));
 const constants_1 = require("../util_modules/constants");
+const needed_scopes_1 = require("../util_modules/server/needed-scopes");
 exports.default = new command_1.default('serve')
     .description('Serve Basic I/O and Advanced I/O functions, Appsail and the client, to test them locally')
     .option('--http <port>', 'start the server at specified port ')
@@ -59,7 +60,7 @@ exports.default = new command_1.default('serve')
     .option('--except <targets>', 'serve all targets except specified (e.g. "client")')
     .option('--ignore-scripts', 'ignore the pre and post lifecycle scripts')
     .option('--no-open', 'disable opening the client automatically when served')
-    .needs('auth', constants_1.NEEDED_SCOPES.SERVE)
+    .needs('auth', needed_scopes_1.SERVE_SCOPES)
     .needs('config')
     .needs('rc')
     .action(() => __awaiter(void 0, void 0, void 0, function* () {

package/lib/commands/slate/create.js

@@ -50,16 +50,19 @@ const command_1 = __importDefault(require("../../internal/command"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
 const logger_1 = require("../../util_modules/logger");
+const common_1 = require("../../init/util/common");
+const prompt_fields_1 = require("../../init/features/slate/prompt-fields");
 exports.default = new command_1.default('slate:create')
     .description('Generates a new Slate app with starter examples')
-    .option('--name <app_name>', 'Please provide name for your slate app')
-    .option('--framework <framework_name>', 'Specify framework name for your slate')
-    .option('--template <template_url>', 'Provide template url for your slate')
-    .option('--default', 'Set default app configurations')
+    .option(prompt_fields_1.slateAddPromptFields.get('name'))
+    .option(prompt_fields_1.slateAddPromptFields.get('framework'))
+    .option(prompt_fields_1.slateAddPromptFields.get('template'))
+    .option(prompt_fields_1.slateAddPromptFields.get('default'))
     .needs('auth')
     .needs('config', { optional: true })
     .needs('rc', { optional: true, generateRc: true })
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
+    (0, common_1.niIgnorableOptsTest)([prompt_fields_1.slateAddPromptFields.get('default').optKey], 'Ignoring the following options in non-interactive mode:');
     const config = runtime_store_1.default.get('config');
     yield (yield Promise.resolve().then(() => __importStar(require('../../init/features')))).slate();
     yield config.save();