firebase-tools 14.2.2 → 14.3.0

package/lib/emulator/commandUtils.js

@@ -69,7 +69,7 @@ function printNoticeIfEmulated(options, emulator) {
     }
 }
 exports.printNoticeIfEmulated = printNoticeIfEmulated;
-function warnEmulatorNotSupported(options, emulator) {
+async function warnEmulatorNotSupported(options, emulator) {
     if (emulator !== types_1.Emulators.DATABASE && emulator !== types_1.Emulators.FIRESTORE) {
         return;
     }
@@ -80,18 +80,9 @@ function warnEmulatorNotSupported(options, emulator) {
     const envVal = process.env[envKey];
     if (envVal) {
         utils.logWarning(`You have set ${clc.bold(`${envKey}=${envVal}`)}, however this command does not support running against the ${emuName} so this action will affect production.`);
-        const opts = {
-            confirm: undefined,
-        };
-        return (0, prompt_1.promptOnce)({
-            type: "confirm",
-            default: false,
-            message: "Do you want to continue?",
-        }).then(() => {
-            if (!opts.confirm) {
-                return utils.reject("Command aborted.", { exit: 1 });
-            }
-        });
+        if (!(await (0, prompt_1.confirm)("Do you want to continue?"))) {
+            throw new error_1.FirebaseError("Command aborted.", { exit: 1 });
+        }
     }
 }
 exports.warnEmulatorNotSupported = warnEmulatorNotSupported;

package/lib/emulator/controller.js

@@ -583,8 +583,7 @@ async function startAll(options, showUI = true, runningTestScript = false) {
                 emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.DATACONNECT).logLabeled("WARN", "dataconnect", "'firebase.json#emulators.dataconnect.dataDir' is set and `--import` flag was passed. " +
                     "This will overwrite any data saved from previous runs.");
                 if (!options.nonInteractive &&
-                    !(await (0, prompt_1.promptOnce)({
-                        type: "confirm",
+                    !(await (0, prompt_1.confirm)({
                         message: `Do you wish to continue and overwrite data in ${dataDirectory}?`,
                         default: false,
                     }))) {

package/lib/emulator/downloadableEmulators.js

@@ -37,9 +37,9 @@ const EMULATOR_UPDATE_DETAILS = {
     ui: experiments.isEnabled("emulatoruisnapshot")
         ? { version: "SNAPSHOT", expectedSize: -1, expectedChecksum: "" }
         : {
-            version: "1.14.0",
-            expectedSize: 3615311,
-            expectedChecksum: "30763ff4a8b81e2c482f05b56799b5c0",
+            version: "1.15.0",
+            expectedSize: 3538469,
+            expectedChecksum: "2f13d5aea9524564c8b7adaa9cfa2128",
         },
     pubsub: {
         version: "0.8.14",
@@ -48,20 +48,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "2.4.0",
-            expectedSize: 27316992,
-            expectedChecksum: "615fb819b38dc61a36f18f0f8017379d",
+            version: "2.5.0",
+            expectedSize: 27378432,
+            expectedChecksum: "d18bc3a07be90886f6ec212f3393b66e",
         }
         : process.platform === "win32"
             ? {
-                version: "2.4.0",
-                expectedSize: 27774464,
-                expectedChecksum: "1968300587f73fff246aa5c2cf9008fe",
+                version: "2.5.0",
+                expectedSize: 27836416,
+                expectedChecksum: "d335e9295b00381eb12682bc944ffef7",
             }
             : {
-                version: "2.4.0",
-                expectedSize: 27230360,
-                expectedChecksum: "88407f13d5647aab496c3810666867a4",
+                version: "2.5.0",
+                expectedSize: 27295896,
+                expectedChecksum: "dc44dbfd972a9b3608794909df517077",
             },
 };
 exports.DownloadDetails = {

package/lib/emulator/initEmulators.js

@@ -8,21 +8,18 @@ const developmentServer_1 = require("./apphosting/developmentServer");
 const emulatorLogger_1 = require("./emulatorLogger");
 const types_1 = require("./types");
 const config_1 = require("../apphosting/config");
-const detectProjectRoot_1 = require("../detectProjectRoot");
 const projectUtils_1 = require("../projectUtils");
 const secrets_1 = require("../apphosting/secrets");
 exports.AdditionalInitFns = {
     [types_1.Emulators.APPHOSTING]: async (config) => {
-        var _a, _b;
+        var _a;
         const cwd = process.cwd();
         const additionalConfigs = new Map();
         const logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.APPHOSTING);
         logger.logLabeled("INFO", "Initializing Emulator");
-        const backendRelativeDir = await (0, prompt_1.promptOnce)({
-            name: "rootDir",
-            type: "input",
-            default: "./",
+        const backendRelativeDir = await (0, prompt_1.input)({
             message: "Specify your app's root directory relative to your repository",
+            default: "./",
         });
         additionalConfigs.set("rootDirectory", backendRelativeDir);
         const backendRoot = (0, path_1.join)(cwd, backendRelativeDir);
@@ -36,23 +33,19 @@ exports.AdditionalInitFns = {
         const projectId = (0, projectUtils_1.getProjectId)(config.options);
         let env = [];
         try {
-            const projectRoot = (_a = (0, detectProjectRoot_1.detectProjectRoot)({ cwd: config.options.cwd })) !== null && _a !== void 0 ? _a : backendRoot;
-            env = await (0, config_1.maybeGenerateEmulatorYaml)(projectId, projectRoot);
+            env = await (0, config_1.maybeGenerateEmulatorYaml)(projectId, backendRoot);
         }
         catch (e) {
             logger.log("WARN", "failed to export app hosting configs");
         }
-        const secretIds = (_b = env === null || env === void 0 ? void 0 : env.filter((e) => "secret" in e)) === null || _b === void 0 ? void 0 : _b.map((e) => e.secret);
+        const secretIds = (_a = env === null || env === void 0 ? void 0 : env.filter((e) => "secret" in e)) === null || _a === void 0 ? void 0 : _a.map((e) => e.secret);
         if (secretIds === null || secretIds === void 0 ? void 0 : secretIds.length) {
             if (!projectId) {
                 logger.log("WARN", "Cannot grant developers access to secrets for local development without knowing what project the secret is in. " +
                     `Run ${clc.bold(`firebase apphosting:secrets:grantaccess ${secretIds.join(",")} --project [project] --emails [email list]`)}`);
             }
             else {
-                const users = await (0, prompt_1.promptOnce)({
-                    type: "input",
-                    message: "Your config has secret values. Please provide a comma-separated list of users or groups who should have access to secrets for local development:",
-                });
+                const users = await (0, prompt_1.input)("Your config has secret values. Please provide a comma-separated list of users or groups who should have access to secrets for local development: ");
                 if (users.length) {
                     await (0, secrets_1.grantEmailsSecretAccess)(projectId, secretIds, users.split(",").map((u) => u.trim()));
                 }
@@ -68,13 +61,9 @@ exports.AdditionalInitFns = {
         const additionalConfig = {};
         const defaultDataConnectDir = config.get("dataconnect.source", "dataconnect");
         const defaultDataDir = config.get("emulators.dataconnect.dataDir", `${defaultDataConnectDir}/.dataconnect/pgliteData`);
-        if (await (0, prompt_1.promptOnce)({
-            name: "dataDir",
-            type: "confirm",
-            message: "Do you want to persist Postgres data from the Data Connect emulator between runs? " +
-                `Data will be saved to ${defaultDataDir}. ` +
-                `You can change this directory by editing 'firebase.json#emulators.dataconnect.dataDir'.`,
-        })) {
+        if (await (0, prompt_1.confirm)("Do you want to persist Postgres data from the Data Connect emulator between runs? " +
+            `Data will be saved to ${defaultDataDir}. ` +
+            `You can change this directory by editing 'firebase.json#emulators.dataconnect.dataDir'.`)) {
             additionalConfig["dataDir"] = defaultDataDir;
         }
         return additionalConfig;

package/lib/extensions/askUserForEventsConfig.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.askForEventArcLocation = exports.EXTENSIONS_DEFAULT_EVENT_ARC_REGION = exports.ALLOWED_EVENT_ARC_REGIONS = exports.askShouldCollectEventsConfig = exports.askForAllowedEventTypes = exports.getEventArcChannel = exports.askForEventsConfig = exports.checkAllowedEventTypesResponse = void 0;
-const prompt_1 = require("../prompt");
 const extensionsApi = require("../extensions/extensionsApi");
 const utils = require("../utils");
 const clc = require("colorette");
 const logger_1 = require("../logger");
 const marked_1 = require("marked");
+const prompt_1 = require("../prompt");
 function checkAllowedEventTypesResponse(response, validEvents) {
     const validEventTypes = validEvents.map((e) => e.type);
     if (response.length === 0) {
@@ -56,9 +56,7 @@ async function askForAllowedEventTypes(eventDescriptors, preselectedTypes) {
         value: e.type,
     }));
     while (!valid) {
-        response = await (0, prompt_1.promptOnce)({
-            name: "selectedEventTypesInput",
-            type: "checkbox",
+        response = await (0, prompt_1.checkbox)({
             default: preselectedTypes !== null && preselectedTypes !== void 0 ? preselectedTypes : [],
             message: `Please select the events [${eventTypes.length} types total] that this extension is permitted to emit. ` +
                 "You can implement your own handlers that trigger when these events are emitted to customize the extension's behavior. ",
@@ -70,13 +68,8 @@ async function askForAllowedEventTypes(eventDescriptors, preselectedTypes) {
     return response.filter((e) => e !== "");
 }
 exports.askForAllowedEventTypes = askForAllowedEventTypes;
-async function askShouldCollectEventsConfig() {
-    return (0, prompt_1.promptOnce)({
-        type: "confirm",
-        name: "shouldCollectEvents",
-        message: `Would you like to enable events?`,
-        default: false,
-    });
+function askShouldCollectEventsConfig() {
+    return (0, prompt_1.confirm)("Would you like to enable events?");
 }
 exports.askShouldCollectEventsConfig = askShouldCollectEventsConfig;
 exports.ALLOWED_EVENT_ARC_REGIONS = [
@@ -90,12 +83,10 @@ async function askForEventArcLocation(preselectedLocation) {
     let valid = false;
     let location = "";
     while (!valid) {
-        location = await (0, prompt_1.promptOnce)({
-            name: "input",
-            type: "list",
+        location = await (0, prompt_1.select)({
             default: preselectedLocation !== null && preselectedLocation !== void 0 ? preselectedLocation : exports.EXTENSIONS_DEFAULT_EVENT_ARC_REGION,
             message: "Which location would you like the Eventarc channel to live in? We recommend using the default option. A channel location that differs from the extension's Cloud Functions location can incur egress cost.",
-            choices: exports.ALLOWED_EVENT_ARC_REGIONS.map((e) => ({ checked: false, value: e })),
+            choices: exports.ALLOWED_EVENT_ARC_REGIONS,
         });
         valid = exports.ALLOWED_EVENT_ARC_REGIONS.includes(location);
         if (!valid) {

package/lib/extensions/askUserForParam.js

@@ -82,11 +82,7 @@ async function ask(args) {
     });
     if (advancedParams.length) {
         promises.push(async () => {
-            const shouldPrompt = await (0, prompt_1.promptOnce)({
-                type: "confirm",
-                message: "Do you want to configure any advanced parameters for this instance?",
-                default: false,
-            });
+            const shouldPrompt = await (0, prompt_1.confirm)("Do you want to configure any advanced parameters for this instance?");
             if (shouldPrompt) {
                 const advancedPromises = advancedParams.map((paramSpec) => {
                     return async () => {
@@ -126,14 +122,10 @@ async function askForParam(args) {
     while (!valid) {
         switch (paramSpec.type) {
             case types_1.ParamType.SELECT:
-                response = await (0, prompt_1.promptOnce)({
-                    name: "input",
-                    type: "list",
-                    default: () => {
-                        if (paramSpec.default) {
-                            return getInquirerDefault(_.get(paramSpec, "options", []), paramSpec.default);
-                        }
-                    },
+                response = await (0, prompt_1.select)({
+                    default: paramSpec.default
+                        ? getInquirerDefault(_.get(paramSpec, "options", []), paramSpec.default)
+                        : undefined,
                     message: "Which option do you want enabled for this parameter? " +
                         "Select an option with the arrow keys, and use Enter to confirm your choice. " +
                         "You may only select one option.",
@@ -142,21 +134,16 @@ async function askForParam(args) {
                 valid = checkResponse(response, paramSpec);
                 break;
             case types_1.ParamType.MULTISELECT:
-                response = await (0, utils_1.onceWithJoin)({
-                    name: "input",
-                    type: "checkbox",
-                    default: () => {
-                        if (paramSpec.default) {
-                            const defaults = paramSpec.default.split(",");
-                            return defaults.map((def) => {
-                                return getInquirerDefault(_.get(paramSpec, "options", []), def);
-                            });
-                        }
-                    },
+                response = (await (0, prompt_1.checkbox)({
+                    default: paramSpec.default
+                        ? paramSpec.default.split(",").map((def) => {
+                            return getInquirerDefault(_.get(paramSpec, "options", []), def);
+                        })
+                        : undefined,
                     message: "Which options do you want enabled for this parameter? " +
                         "Press Space to select, then Enter to confirm your choices. ",
                     choices: (0, utils_1.convertExtensionOptionToLabeledList)(paramSpec.options),
-                });
+                })).join(",");
                 valid = checkResponse(response, paramSpec);
                 break;
             case types_1.ParamType.SECRET:
@@ -175,9 +162,7 @@ async function askForParam(args) {
                 valid = true;
                 break;
             default:
-                response = await (0, prompt_1.promptOnce)({
-                    name: paramSpec.param,
-                    type: "input",
+                response = await (0, prompt_1.input)({
                     default: paramSpec.default,
                     message: `Enter a value for ${label}:`,
                 });
@@ -195,9 +180,7 @@ function isValidSecretLocations(secretLocations, paramSpec) {
 }
 async function promptSecretLocations(paramSpec) {
     if (paramSpec.required) {
-        return await (0, prompt_1.promptOnce)({
-            name: "input",
-            type: "checkbox",
+        return await (0, prompt_1.checkbox)({
             message: "Where would you like to store your secrets? You must select at least one value",
             choices: [
                 {
@@ -213,9 +196,7 @@ async function promptSecretLocations(paramSpec) {
             ],
         });
     }
-    return await (0, prompt_1.promptOnce)({
-        name: "input",
-        type: "checkbox",
+    return await (0, prompt_1.checkbox)({
         message: "Where would you like to store your secrets? " +
             "If you don't want to set this optional secret, leave both options unselected to skip it",
         choices: [
@@ -236,18 +217,13 @@ async function promptLocalSecret(instanceId, paramSpec) {
     let value;
     do {
         utils.logLabeledBullet(extensionsHelper_1.logPrefix, "Configure a local secret value for Extensions Emulator");
-        value = await (0, prompt_1.promptOnce)({
-            name: paramSpec.param,
-            type: "input",
-            message: `This secret will be stored in ./extensions/${instanceId}.secret.local.\n` +
-                `Enter value for "${paramSpec.label.trim()}" to be used by Extensions Emulator:`,
-        });
+        value = await (0, prompt_1.input)(`This secret will be stored in ./extensions/${instanceId}.secret.local.\n` +
+            `Enter value for "${paramSpec.label.trim()}" to be used by Extensions Emulator:`);
     } while (!value);
     return value;
 }
 async function promptReconfigureSecret(projectId, instanceId, paramSpec) {
-    const action = await (0, prompt_1.promptOnce)({
-        type: "list",
+    const action = await (0, prompt_1.select)({
         message: `Choose what you would like to do with this secret:`,
         choices: [
             { name: "Leave unchanged", value: SecretUpdateAction.LEAVE },
@@ -265,11 +241,7 @@ async function promptReconfigureSecret(projectId, instanceId, paramSpec) {
             else {
                 secretName = await generateSecretName(projectId, instanceId, paramSpec.param);
             }
-            const secretValue = await (0, prompt_1.promptOnce)({
-                name: paramSpec.param,
-                type: "password",
-                message: `This secret will be stored in Cloud Secret Manager as ${secretName}.\nEnter new value for ${paramSpec.label.trim()}:`,
-            });
+            const secretValue = await (0, prompt_1.password)(`This secret will be stored in Cloud Secret Manager as ${secretName}.\nEnter new value for ${paramSpec.label.trim()}:`);
             if (secretValue === "" && paramSpec.required) {
                 logger_1.logger.info(`Secret value cannot be empty for required param ${paramSpec.param}`);
                 return promptReconfigureSecret(projectId, instanceId, paramSpec);
@@ -296,12 +268,11 @@ async function promptReconfigureSecret(projectId, instanceId, paramSpec) {
 }
 async function promptCreateSecret(projectId, instanceId, paramSpec, secretName) {
     const name = secretName !== null && secretName !== void 0 ? secretName : (await generateSecretName(projectId, instanceId, paramSpec.param));
-    const secretValue = await (0, prompt_1.promptOnce)({
-        name: paramSpec.param,
-        type: "password",
-        default: paramSpec.default,
+    const secretValue = (await (0, prompt_1.password)({
         message: `This secret will be stored in Cloud Secret Manager (https://cloud.google.com/secret-manager/pricing) as ${name} and managed by Firebase Extensions (Firebase Extensions Service Agent will be granted Secret Admin role on this secret).\nEnter a value for ${paramSpec.label.trim()}:`,
-    });
+    })) ||
+        paramSpec.default ||
+        "";
     if (secretValue === "" && paramSpec.required) {
         logger_1.logger.info(`Secret value cannot be empty for required param ${paramSpec.param}`);
         return promptCreateSecret(projectId, instanceId, paramSpec, name);

package/lib/extensions/checkProjectBilling.js

@@ -25,9 +25,7 @@ async function openBillingAccount(projectId, url, open) {
             logger_1.logger.debug("Unable to open billing URL: " + err.stack);
         }
     }
-    await prompt.promptOnce({
-        name: "continue",
-        type: "confirm",
+    await prompt.confirm({
         message: "Press enter when finished upgrading your project to continue setting up your extension.",
         default: true,
     });
@@ -36,9 +34,7 @@ async function openBillingAccount(projectId, url, open) {
 async function chooseBillingAccount(projectId, accounts) {
     const choices = accounts.map((m) => m.displayName);
     choices.push(ADD_BILLING_ACCOUNT);
-    const answer = await prompt.promptOnce({
-        name: "billing",
-        type: "list",
+    const answer = await prompt.select({
         message: `Extensions require your project to be upgraded to the Blaze plan. You have access to the following billing accounts.
 Please select the one that you would like to associate with this project:`,
         choices: choices,
@@ -61,9 +57,7 @@ async function setUpBillingAccount(projectId) {
     logger_1.logger.info();
     logger_1.logger.info(clc.bold(clc.underline(billingURL)));
     logger_1.logger.info();
-    const open = await prompt.promptOnce({
-        name: "open-url",
-        type: "confirm",
+    const open = await prompt.confirm({
         message: "Press enter to open the URL.",
         default: true,
     });

package/lib/extensions/diagnose.js

@@ -5,8 +5,8 @@ const extensionsHelper_1 = require("./extensionsHelper");
 const getProjectNumber_1 = require("../getProjectNumber");
 const utils = require("../utils");
 const resourceManager = require("../gcp/resourceManager");
-const extensionsApi_1 = require("./extensionsApi");
 const prompt_1 = require("../prompt");
+const extensionsApi_1 = require("./extensionsApi");
 const logger_1 = require("../logger");
 const error_1 = require("../error");
 const SERVICE_AGENT_ROLE = "roles/firebasemods.serviceAgent";
@@ -36,11 +36,8 @@ async function diagnose(projectId) {
     else {
         utils.logWarning("Firebase Extensions Service Agent is missing a required IAM role " +
             "`Firebase Extensions API Service Agent`.");
-        const fix = await (0, prompt_1.promptOnce)({
-            type: "confirm",
-            message: "Would you like to fix the issue by updating IAM policy to include Firebase " +
-                "Extensions Service Agent with role `Firebase Extensions API Service Agent`",
-        });
+        const fix = await (0, prompt_1.confirm)("Would you like to fix the issue by updating IAM policy to include Firebase " +
+            "Extensions Service Agent with role `Firebase Extensions API Service Agent`");
         if (fix) {
             policy.bindings.push({
                 role: SERVICE_AGENT_ROLE,

package/lib/extensions/extensionsHelper.js

@@ -33,9 +33,9 @@ const storage_1 = require("../gcp/storage");
 const projectUtils_1 = require("../projectUtils");
 const extensionsApi_1 = require("./extensionsApi");
 const publisherApi_1 = require("./publisherApi");
+const prompt_1 = require("../prompt");
 const refs = require("./refs");
 const localHelper_1 = require("./localHelper");
-const prompt_1 = require("../prompt");
 const logger_1 = require("../logger");
 const utils_2 = require("../utils");
 const change_log_1 = require("./change-log");
@@ -309,8 +309,7 @@ async function promptForValidInstanceId(instanceId) {
     let newInstanceId = "";
     const instanceIdRegex = /^[a-z][a-z\d\-]*[a-z\d]$/;
     while (!instanceIdIsValid) {
-        newInstanceId = await (0, prompt_1.promptOnce)({
-            type: "input",
+        newInstanceId = await (0, prompt_1.input)({
             default: instanceId,
             message: `Please enter a new name for this instance:`,
         });
@@ -332,10 +331,7 @@ async function promptForValidRepoURI() {
     let repoIsValid = false;
     let extensionRoot = "";
     while (!repoIsValid) {
-        extensionRoot = await (0, prompt_1.promptOnce)({
-            type: "input",
-            message: "Enter the GitHub repo URI where this extension's source code is located:",
-        });
+        extensionRoot = await (0, prompt_1.input)("Enter the GitHub repo URI where this extension's source code is located:");
         if (!repoRegex.test(extensionRoot)) {
             logger_1.logger.info("Repo URI must follow this format: https://github.com/<user>/<repo>");
         }
@@ -347,8 +343,7 @@ async function promptForValidRepoURI() {
 }
 exports.promptForValidRepoURI = promptForValidRepoURI;
 async function promptForExtensionRoot(defaultRoot) {
-    return await (0, prompt_1.promptOnce)({
-        type: "input",
+    return await (0, prompt_1.input)({
         message: "Enter this extension's root directory in the repo (defaults to previous root if set):",
         default: defaultRoot,
     });
@@ -369,22 +364,20 @@ async function promptForReleaseStage(args) {
             };
             choices.push(stableChoice);
         }
-        stage = await (0, prompt_1.promptOnce)({
-            type: "list",
+        stage = await (0, prompt_1.select)({
             message: "Choose the release stage:",
             choices: choices,
             default: stage,
         });
         if (stage === "stable" && !args.hasVersions) {
-            logger_1.logger.info(`${clc.bold(clc.yellow("Warning:"))} It's highly recommended to first upload a pre-release version before choosing stable.`);
             const confirmed = await (0, prompt_1.confirm)({
+                message: `${clc.bold(clc.yellow("Warning:"))} It's highly recommended to first upload a pre-release version before choosing stable.`,
                 nonInteractive: args.nonInteractive,
                 force: args.force,
                 default: false,
             });
             if (!confirmed) {
-                stage = await (0, prompt_1.promptOnce)({
-                    type: "list",
+                stage = await (0, prompt_1.select)({
                     message: "Choose the release stage:",
                     choices: choices,
                     default: stage,
@@ -605,8 +598,7 @@ async function uploadExtensionVersionFromGitHubSource(args) {
     const defaultSourceRef = "HEAD";
     if (!sourceRef) {
         if (!args.nonInteractive) {
-            sourceRef = await (0, prompt_1.promptOnce)({
-                type: "input",
+            sourceRef = await (0, prompt_1.input)({
                 message: "Enter the commit hash, branch, or tag name to build from in the repo:",
                 default: defaultSourceRef,
             });
@@ -645,6 +637,7 @@ async function uploadExtensionVersionFromGitHubSource(args) {
         autoReview: stage === "stable" && autoReview,
     });
     const confirmed = await (0, prompt_1.confirm)({
+        message: "Continue?",
         nonInteractive: args.nonInteractive,
         force: args.force,
         default: false,
@@ -713,6 +706,7 @@ async function uploadExtensionVersionFromLocalSource(args) {
     const releaseNotes = validateReleaseNotes(args.rootDirectory, extensionSpec.version, extension);
     displayReleaseNotes({ extensionRef, newVersion, releaseNotes, autoReview: false });
     const confirmed = await (0, prompt_1.confirm)({
+        message: "Continue?",
         nonInteractive: args.nonInteractive,
         force: args.force,
         default: false,
@@ -818,9 +812,7 @@ function displayReleaseNotes(args) {
 exports.displayReleaseNotes = displayReleaseNotes;
 async function promptForOfficialExtension(message) {
     const officialExts = await (0, resolveSource_1.getExtensionRegistry)(true);
-    return await (0, prompt_1.promptOnce)({
-        name: "input",
-        type: "list",
+    return await (0, prompt_1.select)({
         message,
         choices: (0, utils_1.convertOfficialExtensionsToList)(officialExts),
         pageSize: Object.keys(officialExts).length,
@@ -829,15 +821,13 @@ async function promptForOfficialExtension(message) {
 exports.promptForOfficialExtension = promptForOfficialExtension;
 async function promptForRepeatInstance(projectName, extensionName) {
     const message = `An extension with the ID '${clc.bold(extensionName)}' already exists in the project '${clc.bold(projectName)}'. What would you like to do?`;
-    const choices = [
-        { name: "Update or reconfigure the existing instance", value: "updateExisting" },
-        { name: "Install a new instance with a different ID", value: "installNew" },
-        { name: "Cancel extension installation", value: "cancel" },
-    ];
-    return await (0, prompt_1.promptOnce)({
-        type: "list",
+    return await (0, prompt_1.select)({
         message,
-        choices,
+        choices: [
+            { name: "Update or reconfigure the existing instance", value: "updateExisting" },
+            { name: "Install a new instance with a different ID", value: "installNew" },
+            { name: "Cancel extension installation", value: "cancel" },
+        ],
     });
 }
 exports.promptForRepeatInstance = promptForRepeatInstance;

package/lib/extensions/manifest.js

@@ -24,8 +24,7 @@ async function writeToManifest(specs, config, options, allowOverwrite = false) {
             .map((i) => `${i[0]}: ${i[1]}`)
             .join("\n\t");
         if (allowOverwrite) {
-            const overwrite = await (0, prompt_1.promptOnce)({
-                type: "list",
+            const overwrite = await (0, prompt_1.select)({
                 message: `firebase.json already contains extensions:\n${currentExtensions}\nWould you like to overwrite or merge?`,
                 choices: [
                     { name: "Overwrite", value: true },

package/lib/extensions/tos.js

@@ -49,7 +49,11 @@ async function acceptLatestPublisherTOS(options, projectId) {
         else {
             const tosLink = extensionsTosUrl("publisher");
             logger_1.logger.info(`To continue, you must accept the Firebase Extensions Publisher Terms of Service: ${tosLink}`);
-            if (await (0, prompt_1.confirm)(Object.assign(Object.assign({}, options), { message: "Do you accept the Firebase Extensions Publisher Terms of Service?" }))) {
+            if (await (0, prompt_1.confirm)({
+                message: "Do you accept the Firebase Extensions Publisher Terms of Service?",
+                nonInteractive: options.nonInteractive,
+                force: options.force,
+            })) {
                 return acceptPublisherTOS(projectId, currentAcceptance.latestTosVersion);
             }
         }
@@ -69,7 +73,11 @@ async function acceptLatestAppDeveloperTOS(options, projectId, instanceIds) {
         if (currentAcceptance.lastAcceptedVersion) {
             logger_1.logger.debug(`User Terms of Service aready accepted on project ${projectId}.`);
         }
-        else if (!(await (0, prompt_1.confirm)(Object.assign(Object.assign({}, options), { message: "Do you accept the Firebase Extensions User Terms of Service?" })))) {
+        else if (!(await (0, prompt_1.confirm)({
+            message: "Do you accept the Firebase Extensions User Terms of Service?",
+            nonInteractive: options.nonInteractive,
+            force: options.force,
+        }))) {
             throw new error_1.FirebaseError("You must accept the terms of service to continue.");
         }
         const tosPromises = instanceIds.map((instanceId) => {

package/lib/extensions/utils.js

@@ -1,16 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getResourceRuntime = exports.formatTimestamp = exports.getRandomString = exports.convertOfficialExtensionsToList = exports.convertExtensionOptionToLabeledList = exports.onceWithJoin = void 0;
-const prompt_1 = require("../prompt");
+exports.getResourceRuntime = exports.formatTimestamp = exports.getRandomString = exports.convertOfficialExtensionsToList = exports.convertExtensionOptionToLabeledList = void 0;
 const types_1 = require("./types");
-async function onceWithJoin(question) {
-    const response = await (0, prompt_1.promptOnce)(question);
-    if (Array.isArray(response)) {
-        return response.join(",");
-    }
-    return response;
-}
-exports.onceWithJoin = onceWithJoin;
 function convertExtensionOptionToLabeledList(options) {
     return options.map((option) => {
         return {

package/lib/frameworks/index.js

@@ -177,8 +177,7 @@ async function prepareFrameworks(purpose, targetNames, context, options, emulato
                         console.warn(`No Firebase app associated with site ${site}, unable to provide authenticated server context.
   You can link a Web app to a Hosting site here https://console.firebase.google.com/project/${project}/settings/general/web`);
                         if (!options.nonInteractive) {
-                            const continueDeploy = await (0, prompt_1.promptOnce)({
-                                type: "confirm",
+                            const continueDeploy = await (0, prompt_1.confirm)({
                                 default: true,
                                 message: "Would you like to continue with the deploy?",
                             });

package/lib/frameworks/next/index.js

@@ -205,13 +205,16 @@ async function build(dir, target, context) {
 }
 exports.build = build;
 async function init(setup, config) {
-    const language = await (0, prompt_1.promptOnce)({
-        type: "list",
+    const language = await (0, prompt_1.select)({
         default: "TypeScript",
         message: "What language would you like to use?",
-        choices: ["JavaScript", "TypeScript"],
+        choices: [
+            { name: "JavaScript", value: "js" },
+            { name: "TypeScript", value: "ts" },
+        ],
     });
-    (0, child_process_1.execSync)(`npx --yes create-next-app@"${exports.supportedRange}" -e hello-world ${setup.hosting.source} --use-npm ${language === "TypeScript" ? "--ts" : "--js"}`, { stdio: "inherit", cwd: config.projectDir });
+    (0, child_process_1.execSync)(`npx --yes create-next-app@"${exports.supportedRange}" -e hello-world ` +
+        `${setup.hosting.source} --use-npm --${language}`, { stdio: "inherit", cwd: config.projectDir });
 }
 exports.init = init;
 async function ɵcodegenPublicDirectory(sourceDir, destDir, _, context) {

package/lib/frameworks/vite/index.js

@@ -17,8 +17,7 @@ exports.DEFAULT_BUILD_SCRIPT = ["vite build", "tsc && vite build"];
 const initViteTemplate = (template) => async (setup, config) => await init(setup, config, template);
 exports.initViteTemplate = initViteTemplate;
 async function init(setup, config, baseTemplate = "vanilla") {
-    const template = await (0, prompt_1.promptOnce)({
-        type: "list",
+    const template = await (0, prompt_1.select)({
         default: "JavaScript",
         message: "What language would you like to use?",
         choices: [