firebase-tools 14.2.2 → 14.3.0

package/lib/commands/init.js

@@ -15,6 +15,7 @@ const fsutils = require("../fsutils");
 const utils = require("../utils");
 const experiments_1 = require("../experiments");
 const templates_1 = require("../templates");
+const error_1 = require("../error");
 const homeDir = os.homedir();
 const BANNER_TEXT = (0, templates_1.readTemplateSync)("banner.txt");
 const GITIGNORE_TEMPLATE = (0, templates_1.readTemplateSync)("_gitignore");
@@ -112,7 +113,8 @@ exports.command = new command_1.Command("init [feature]")
     .help(HELP)
     .before(requireAuth_1.requireAuth)
     .action(initAction);
-function initAction(feature, options) {
+async function initAction(feature, options) {
+    var _a;
     if (feature && !featureNames.includes(feature)) {
         return utils.reject(clc.bold(feature) +
             " is not a supported feature; must be one of " +
@@ -152,66 +154,47 @@ function initAction(feature, options) {
             fallback: {},
         }),
     };
-    let next;
     if (process.platform === "win32") {
-        next = (0, prompt_1.promptOnce)({
-            type: "confirm",
-            message: "Are you ready to proceed?",
-        });
+        if (!(await (0, prompt_1.confirm)("Are you ready to proceed?"))) {
+            throw new error_1.FirebaseError("Aborted by user.", { exit: 1 });
+        }
+    }
+    if (feature) {
+        setup.featureArg = true;
+        setup.features = [feature];
     }
     else {
-        next = Promise.resolve(true);
+        setup.features = await (0, prompt_1.checkbox)({
+            message: "Which Firebase features do you want to set up for this directory? " +
+                "Press Space to select features, then Enter to confirm your choices.",
+            choices: choices.filter((c) => !c.hidden),
+        });
     }
-    return next
-        .then((proceed) => {
-        if (!proceed) {
-            return utils.reject("Aborted by user.", { exit: 1 });
-        }
-        if (feature) {
-            setup.featureArg = true;
-            setup.features = [feature];
-            return undefined;
-        }
-        return (0, prompt_1.prompt)(setup, [
-            {
-                type: "checkbox",
-                name: "features",
-                message: "Which Firebase features do you want to set up for this directory? " +
-                    "Press Space to select features, then Enter to confirm your choices.",
-                choices: choices.filter((c) => !c.hidden),
-            },
-        ]);
-    })
-        .then(() => {
-        var _a;
-        if (!setup.features || ((_a = setup.features) === null || _a === void 0 ? void 0 : _a.length) === 0) {
-            return utils.reject("Must select at least one feature. Use " +
-                clc.bold(clc.underline("SPACEBAR")) +
-                " to select features, or specify a feature by running " +
-                clc.bold("firebase init [feature_name]"));
-        }
-        setup.features.unshift("project");
-        const allAccounts = (0, auth_1.getAllAccounts)();
-        if (allAccounts.length > 1) {
-            setup.features.unshift("account");
-        }
-        if (setup.features.includes("hosting") && setup.features.includes("hosting:github")) {
-            setup.features = setup.features.filter((f) => f !== "hosting:github");
-        }
-        return (0, init_1.init)(setup, config, options);
-    })
-        .then(() => {
-        logger_1.logger.info();
-        utils.logBullet("Writing configuration info to " + clc.bold("firebase.json") + "...");
-        config.writeProjectFile("firebase.json", setup.config);
-        utils.logBullet("Writing project information to " + clc.bold(".firebaserc") + "...");
-        config.writeProjectFile(".firebaserc", setup.rcfile);
-        if (!fsutils.fileExistsSync(config.path(".gitignore"))) {
-            utils.logBullet("Writing gitignore file to " + clc.bold(".gitignore") + "...");
-            config.writeProjectFile(".gitignore", GITIGNORE_TEMPLATE);
-        }
-        logger_1.logger.info();
-        utils.logSuccess("Firebase initialization complete!");
-    });
+    if (!setup.features || ((_a = setup.features) === null || _a === void 0 ? void 0 : _a.length) === 0) {
+        throw new error_1.FirebaseError("Must select at least one feature. Use " +
+            clc.bold(clc.underline("SPACEBAR")) +
+            " to select features, or specify a feature by running " +
+            clc.bold("firebase init [feature_name]"));
+    }
+    setup.features.unshift("project");
+    const allAccounts = (0, auth_1.getAllAccounts)();
+    if (allAccounts.length > 1) {
+        setup.features.unshift("account");
+    }
+    if (setup.features.includes("hosting") && setup.features.includes("hosting:github")) {
+        setup.features = setup.features.filter((f) => f !== "hosting:github");
+    }
+    await (0, init_1.init)(setup, config, options);
+    logger_1.logger.info();
+    utils.logBullet("Writing configuration info to " + clc.bold("firebase.json") + "...");
+    config.writeProjectFile("firebase.json", setup.config);
+    utils.logBullet("Writing project information to " + clc.bold(".firebaserc") + "...");
+    config.writeProjectFile(".firebaserc", setup.rcfile);
+    if (!fsutils.fileExistsSync(config.path(".gitignore"))) {
+        utils.logBullet("Writing gitignore file to " + clc.bold(".gitignore") + "...");
+        config.writeProjectFile(".gitignore", GITIGNORE_TEMPLATE);
+    }
+    logger_1.logger.info();
+    utils.logSuccess("Firebase initialization complete!");
 }
 exports.initAction = initAction;

package/lib/commands/login.js

@@ -28,11 +28,7 @@ exports.command = new command_1.Command("login")
     }
     if (!options.reauth) {
         utils.logBullet("Firebase optionally collects CLI and Emulator Suite usage and error reporting information to help improve our products. Data is collected in accordance with Google's privacy policy (https://policies.google.com/privacy) and is not used to identify you.\n");
-        const collectUsage = await (0, prompt_1.promptOnce)({
-            type: "confirm",
-            name: "collectUsage",
-            message: "Allow Firebase to collect CLI and Emulator Suite usage and error reporting information?",
-        });
+        const collectUsage = await (0, prompt_1.confirm)("Allow Firebase to collect CLI and Emulator Suite usage and error reporting information?");
         configstore_1.configstore.set("usage", collectUsage);
         if (collectUsage) {
             utils.logBullet("To change your data collection preference at any time, run `firebase logout` and log in again.");

package/lib/commands/logout.js

@@ -5,8 +5,8 @@ const command_1 = require("../command");
 const logger_1 = require("../logger");
 const clc = require("colorette");
 const utils = require("../utils");
-const prompt_1 = require("../prompt");
 const auth_1 = require("../auth");
+const prompt_1 = require("../prompt");
 exports.command = new command_1.Command("logout [email]")
     .description("log the CLI out of Firebase")
     .action(logoutAction);
@@ -38,8 +38,7 @@ async function logoutAction(email, options) {
                     value: a,
                 };
             });
-            newDefaultAccount = await (0, prompt_1.promptOnce)({
-                type: "list",
+            newDefaultAccount = await (0, prompt_1.select)({
                 message: "You are logging out of your default account, which account should become the new default?",
                 choices,
             });

package/lib/commands/open.js

@@ -67,8 +67,7 @@ exports.command = new command_1.Command("open [link]")
         throw new error_1.FirebaseError("Unrecognized link name. Valid links are:\n\n" + LINKS.map((l) => l.arg).join("\n"));
     }
     if (!link) {
-        const name = await (0, prompt_1.promptOnce)({
-            type: "list",
+        const name = await (0, prompt_1.select)({
             message: "What link would you like to open?",
             choices: CHOICES,
         });

package/lib/commands/projects-create.js

@@ -4,7 +4,6 @@ exports.command = void 0;
 const command_1 = require("../command");
 const error_1 = require("../error");
 const projects_1 = require("../management/projects");
-const prompt_1 = require("../prompt");
 const requireAuth_1 = require("../requireAuth");
 exports.command = new command_1.Command("projects:create [projectId]")
     .description("creates a new Google Cloud Platform project, then adds Firebase resources to the project")
@@ -18,7 +17,7 @@ exports.command = new command_1.Command("projects:create [projectId]")
         throw new error_1.FirebaseError("Invalid argument, please provide only one type of project parent (organization or folder)");
     }
     if (!options.nonInteractive) {
-        await (0, prompt_1.prompt)(options, projects_1.PROJECTS_CREATE_QUESTIONS);
+        options = Object.assign(Object.assign({}, options), (await (0, projects_1.promptProjectCreation)()));
     }
     if (!options.projectId) {
         throw new error_1.FirebaseError("Project ID cannot be empty");

package/lib/commands/remoteconfig-rollback.js

@@ -35,13 +35,13 @@ exports.command = new command_1.Command("remoteconfig:rollback")
             `. ` +
             `Invalid Version Number`);
     }
-    const confirm = await (0, prompt_1.promptOnce)({
-        type: "confirm",
-        name: "force",
+    const proceed = await (0, prompt_1.confirm)({
         message: "Proceed to rollback template to version " + targetVersion + "?",
         default: false,
-    }, options);
-    if (!confirm) {
+        force: options.force,
+        nonInteractive: options.nonInteractive,
+    });
+    if (!proceed) {
         return;
     }
     return (0, rollback_1.rollbackTemplate)((0, projectUtils_1.needProjectId)(options), targetVersion);

package/lib/commands/use.js

@@ -9,6 +9,7 @@ const prompt_1 = require("../prompt");
 const requireAuth_1 = require("../requireAuth");
 const command_2 = require("../command");
 const utils = require("../utils");
+const error_1 = require("../error");
 function listAliases(options) {
     if (options.rc.hasProjects) {
         logger_1.logger.info("Project aliases for", clc.bold(options.projectRoot || "") + ":");
@@ -29,6 +30,106 @@ function listAliases(options) {
 function verifyMessage(name) {
     return "please verify project " + clc.bold(name) + " exists and you have access.";
 }
+async function setNewActive(projectOrAlias, aliasOpt, options) {
+    let project;
+    const hasAlias = options.rc.hasProjectAlias(projectOrAlias);
+    const resolvedProject = options.rc.resolveAlias(projectOrAlias);
+    (0, command_2.validateProjectId)(resolvedProject);
+    try {
+        project = await (0, projects_1.getProject)(resolvedProject);
+    }
+    catch (_a) {
+        throw new error_1.FirebaseError("Invalid project selection, " + verifyMessage(projectOrAlias));
+    }
+    if (aliasOpt) {
+        if (!project) {
+            throw new error_1.FirebaseError(`Cannot create alias ${clc.bold(aliasOpt)}, ${verifyMessage(projectOrAlias)}`);
+        }
+        options.rc.addProjectAlias(aliasOpt, projectOrAlias);
+        logger_1.logger.info("Created alias", clc.bold(aliasOpt), "for", resolvedProject + ".");
+    }
+    if (hasAlias) {
+        if (!project) {
+            throw new error_1.FirebaseError(`Unable to use alias ${clc.bold(projectOrAlias)}, ${verifyMessage(resolvedProject)}`);
+        }
+        utils.makeActiveProject(options.projectRoot, projectOrAlias);
+        logger_1.logger.info("Now using alias", clc.bold(projectOrAlias), "(" + resolvedProject + ")");
+    }
+    else if (project) {
+        utils.makeActiveProject(options.projectRoot, projectOrAlias);
+        logger_1.logger.info("Now using project", clc.bold(projectOrAlias));
+    }
+    else {
+        throw new error_1.FirebaseError(`Invalid project selection, ${verifyMessage(projectOrAlias)}`);
+    }
+}
+function unalias(alias, options) {
+    if (options.rc.hasProjectAlias(alias)) {
+        options.rc.removeProjectAlias(alias);
+        logger_1.logger.info("Removed alias", clc.bold(alias));
+        logger_1.logger.info();
+        listAliases(options);
+    }
+}
+async function addAlias(options) {
+    if (options.nonInteractive) {
+        return utils.reject("Cannot run " +
+            clc.bold("firebase use --add") +
+            " in non-interactive mode. Use " +
+            clc.bold("firebase use <project_id> --alias <alias>") +
+            " instead.");
+    }
+    const projects = await (0, projects_1.listFirebaseProjects)();
+    const results = {};
+    const project = await (0, prompt_1.select)({
+        message: "Which project do you want to add?",
+        choices: projects.map((p) => p.projectId).sort(),
+    });
+    const alias = await (0, prompt_1.input)({
+        message: "What alias do you want to use for this project? (e.g. staging)",
+        validate: (input) => {
+            return input && input.length > 0;
+        },
+    });
+    options.rc.addProjectAlias(alias, project);
+    utils.makeActiveProject(options.projectRoot, results.alias);
+    logger_1.logger.info();
+    logger_1.logger.info("Created alias", clc.bold(results.alias || ""), "for", results.project + ".");
+    logger_1.logger.info("Now using alias", clc.bold(results.alias || "") + " (" + results.project + ")");
+}
+function clearAlias(options) {
+    utils.makeActiveProject(options.projectRoot, undefined);
+    delete options.projectAlias;
+    delete options.project;
+    logger_1.logger.info("Cleared active project.");
+    logger_1.logger.info();
+    listAliases(options);
+}
+async function genericUse(options) {
+    if (options.nonInteractive || !process.stdout.isTTY) {
+        if (options.project) {
+            logger_1.logger.info(options.project);
+            return options.project;
+        }
+        return utils.reject("No active project");
+    }
+    if (options.projectAlias) {
+        logger_1.logger.info("Active Project:", clc.bold(clc.cyan(options.projectAlias + " (" + options.project + ")")));
+    }
+    else if (options.project) {
+        logger_1.logger.info("Active Project:", clc.bold(clc.cyan(options.project)));
+    }
+    else {
+        let msg = "No project is currently active";
+        if (options.rc.hasProjects) {
+            msg += ", and no aliases have been created.";
+        }
+        logger_1.logger.info(msg + ".");
+    }
+    logger_1.logger.info();
+    listAliases(options);
+    return options.project;
+}
 exports.command = new command_1.Command("use [alias_or_project_id]")
     .description("set an active Firebase project for your working directory")
     .option("--add", "create a new project alias interactively")
@@ -49,117 +150,16 @@ exports.command = new command_1.Command("use [alias_or_project_id]")
             " to start a project directory in the current folder.");
     }
     if (newActive) {
-        let project;
-        const hasAlias = options.rc.hasProjectAlias(newActive);
-        const resolvedProject = options.rc.resolveAlias(newActive);
-        (0, command_2.validateProjectId)(resolvedProject);
-        return (0, projects_1.getProject)(resolvedProject)
-            .then((foundProject) => {
-            project = foundProject;
-        })
-            .catch(() => {
-            return utils.reject("Invalid project selection, " + verifyMessage(newActive));
-        })
-            .then(() => {
-            if (aliasOpt) {
-                if (!project) {
-                    return utils.reject("Cannot create alias " + clc.bold(aliasOpt) + ", " + verifyMessage(newActive));
-                }
-                options.rc.addProjectAlias(aliasOpt, newActive);
-                logger_1.logger.info("Created alias", clc.bold(aliasOpt), "for", resolvedProject + ".");
-            }
-            if (hasAlias) {
-                if (!project) {
-                    return utils.reject("Unable to use alias " +
-                        clc.bold(newActive) +
-                        ", " +
-                        verifyMessage(resolvedProject));
-                }
-                utils.makeActiveProject(options.projectRoot, newActive);
-                logger_1.logger.info("Now using alias", clc.bold(newActive), "(" + resolvedProject + ")");
-            }
-            else if (project) {
-                utils.makeActiveProject(options.projectRoot, newActive);
-                logger_1.logger.info("Now using project", clc.bold(newActive));
-            }
-            else {
-                return utils.reject("Invalid project selection, " + verifyMessage(newActive));
-            }
-        });
-    }
-    else if (options.unalias) {
-        if (options.rc.hasProjectAlias(options.unalias)) {
-            options.rc.removeProjectAlias(options.unalias);
-            logger_1.logger.info("Removed alias", clc.bold(options.unalias));
-            logger_1.logger.info();
-            listAliases(options);
-        }
+        return setNewActive(newActive, aliasOpt, options);
     }
-    else if (options.add) {
-        if (options.nonInteractive) {
-            return utils.reject("Cannot run " +
-                clc.bold("firebase use --add") +
-                " in non-interactive mode. Use " +
-                clc.bold("firebase use <project_id> --alias <alias>") +
-                " instead.");
-        }
-        return (0, projects_1.listFirebaseProjects)().then((projects) => {
-            const results = {};
-            return (0, prompt_1.prompt)(results, [
-                {
-                    type: "list",
-                    name: "project",
-                    message: "Which project do you want to add?",
-                    choices: projects.map((p) => p.projectId).sort(),
-                },
-                {
-                    type: "input",
-                    name: "alias",
-                    message: "What alias do you want to use for this project? (e.g. staging)",
-                    validate: (input) => {
-                        return input && input.length > 0;
-                    },
-                },
-            ]).then(() => {
-                options.rc.addProjectAlias(results.alias, results.project);
-                utils.makeActiveProject(options.projectRoot, results.alias);
-                logger_1.logger.info();
-                logger_1.logger.info("Created alias", clc.bold(results.alias || ""), "for", results.project + ".");
-                logger_1.logger.info("Now using alias", clc.bold(results.alias || "") + " (" + results.project + ")");
-            });
-        });
-    }
-    else if (options.clear) {
-        utils.makeActiveProject(options.projectRoot, undefined);
-        options.projectAlias = null;
-        options.project = null;
-        logger_1.logger.info("Cleared active project.");
-        logger_1.logger.info();
-        listAliases(options);
+    if (options.unalias) {
+        return unalias(options.unalias, options);
     }
-    else {
-        if (options.nonInteractive || !process.stdout.isTTY) {
-            if (options.project) {
-                logger_1.logger.info(options.project);
-                return options.project;
-            }
-            return utils.reject("No active project");
-        }
-        if (options.projectAlias) {
-            logger_1.logger.info("Active Project:", clc.bold(clc.cyan(options.projectAlias + " (" + options.project + ")")));
-        }
-        else if (options.project) {
-            logger_1.logger.info("Active Project:", clc.bold(clc.cyan(options.project)));
-        }
-        else {
-            let msg = "No project is currently active";
-            if (options.rc.hasProjects) {
-                msg += ", and no aliases have been created.";
-            }
-            logger_1.logger.info(msg + ".");
-        }
-        logger_1.logger.info();
-        listAliases(options);
-        return options.project;
+    if (options.add) {
+        return addAlias(options);
+    }
+    if (options.clear) {
+        return clearAlias(options);
     }
+    return genericUse(options);
 });

package/lib/config.js

@@ -179,8 +179,7 @@ class Config {
             existingContent = fsutils.readFile(writeTo);
         }
         if (existingContent && existingContent !== content && !force) {
-            next = await (0, prompt_1.promptOnce)({
-                type: "confirm",
+            next = await (0, prompt_1.confirm)({
                 message: "File " + clc.underline(path) + " already exists. Overwrite?",
                 default: !!confirmByDefault,
             });

package/lib/dataconnect/build.js

@@ -44,9 +44,8 @@ async function handleBuildErrors(errors, nonInteractive, force, dryRun) {
             throw new error_1.FirebaseError("Explicit acknowledgement required for breaking schema or connector changes and new insecure operations. Rerun this command with --force to deploy these changes.");
         }
         else if (!nonInteractive && !force && !dryRun) {
-            const result = await (0, prompt_1.promptOnce)({
+            const result = await (0, prompt_1.select)({
                 message: "Would you like to proceed with these changes?",
-                type: "list",
                 choices,
                 default: "abort",
             });
@@ -59,9 +58,8 @@ async function handleBuildErrors(errors, nonInteractive, force, dryRun) {
         utils.logLabeledWarning("dataconnect", `There are existing insecure operations or changes in your schema or connectors that may cause unexpected behavior in your existing applications:\n` +
             (0, graphqlError_1.prettifyTable)(interactiveAcks));
         if (!nonInteractive && !force && !dryRun) {
-            const result = await (0, prompt_1.promptOnce)({
+            const result = await (0, prompt_1.select)({
                 message: "Would you like to proceed with these changes?",
-                type: "list",
                 choices,
                 default: "proceed",
             });

package/lib/dataconnect/client.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.upsertConnector = exports.listConnectors = exports.deleteConnector = exports.getConnector = exports.deleteSchema = exports.upsertSchema = exports.getSchema = exports.deleteService = exports.createService = exports.listAllServices = exports.getService = exports.listLocations = void 0;
+exports.upsertConnector = exports.listConnectors = exports.deleteConnector = exports.getConnector = exports.deleteSchema = exports.upsertSchema = exports.listSchemas = exports.getSchema = exports.deleteService = exports.createService = exports.listAllServices = exports.getService = exports.listLocations = void 0;
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const operationPoller = require("../operation-poller");
@@ -70,6 +70,25 @@ async function getSchema(serviceName) {
     }
 }
 exports.getSchema = getSchema;
+async function listSchemas(serviceName, fields = []) {
+    const schemas = [];
+    const getNextPage = async (pageToken = "") => {
+        const res = await dataconnectClient().get(`${serviceName}/schemas`, {
+            queryParams: {
+                pageSize: PAGE_SIZE_MAX,
+                pageToken,
+                fields: fields.join(","),
+            },
+        });
+        schemas.push(...(res.body.schemas || []));
+        if (res.body.nextPageToken) {
+            await getNextPage(res.body.nextPageToken);
+        }
+    };
+    await getNextPage();
+    return schemas;
+}
+exports.listSchemas = listSchemas;
 async function upsertSchema(schema, validateOnly = false) {
     const op = await dataconnectClient().patch(`${schema.name}`, schema, {
         queryParams: {

package/lib/dataconnect/schemaMigration.js

@@ -307,12 +307,7 @@ async function promptForSchemaMigration(options, instanceName, databaseId, err,
             { name: "Abort changes", value: "none" },
         ];
         const defaultValue = validationMode === "STRICT_AFTER_COMPATIBLE" ? "none" : "all";
-        return await (0, prompt_1.promptOnce)({
-            message: message,
-            type: "list",
-            choices,
-            default: defaultValue,
-        });
+        return await (0, prompt_1.select)({ message, choices, default: defaultValue });
     }
     if (!validateOnly) {
         throw new error_1.FirebaseError("Command aborted. Your database schema is incompatible with your Data Connect schema. Run `firebase dataconnect:sql:migrate` to migrate your database schema");

package/lib/deploy/functions/params.js

@@ -219,9 +219,7 @@ function populateDefaultParams(config) {
 async function handleSecret(secretParam, projectId) {
     const metadata = await secretManager.getSecretMetadata(projectId, secretParam.name, "latest");
     if (!metadata.secret) {
-        const secretValue = await (0, prompt_1.promptOnce)({
-            name: secretParam.name,
-            type: "password",
+        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 ${secretParam.name}. Enter a value for ${secretParam.label || secretParam.name}:`,
         });
         await secretManager.createSecret(projectId, secretParam.name, (0, secretManager_1.labels)());
@@ -454,31 +452,28 @@ async function promptResourceStrings(prompt, input, projectId) {
 function shouldRetry(obj) {
     return typeof obj === "object" && obj.message !== undefined;
 }
-async function promptText(prompt, input, resolvedDefault, converter) {
-    const res = await (0, prompt_1.promptOnce)({
-        type: "input",
+async function promptText(prompt, textInput, resolvedDefault, converter) {
+    const res = await (0, prompt_1.input)({
         default: resolvedDefault,
         message: prompt,
     });
-    if (input.text.validationRegex) {
-        const userRe = new RegExp(input.text.validationRegex);
+    if (textInput.text.validationRegex) {
+        const userRe = new RegExp(textInput.text.validationRegex);
         if (!userRe.test(res)) {
-            logger_1.logger.error(input.text.validationErrorMessage ||
+            logger_1.logger.error(textInput.text.validationErrorMessage ||
                 `Input did not match provided validator ${userRe.toString()}, retrying...`);
-            return promptText(prompt, input, resolvedDefault, converter);
+            return promptText(prompt, textInput, resolvedDefault, converter);
         }
     }
     const converted = converter(res.toString());
     if (shouldRetry(converted)) {
         logger_1.logger.error(converted.message);
-        return promptText(prompt, input, resolvedDefault, converter);
+        return promptText(prompt, textInput, resolvedDefault, converter);
     }
     return converted;
 }
 async function promptSelect(prompt, input, resolvedDefault, converter) {
-    const response = await (0, prompt_1.promptOnce)({
-        name: "input",
-        type: "list",
+    const response = await (0, prompt_1.select)({
         default: resolvedDefault,
         message: prompt,
         choices: input.select.options.map((option) => {
@@ -497,9 +492,7 @@ async function promptSelect(prompt, input, resolvedDefault, converter) {
     return converted;
 }
 async function promptSelectMultiple(prompt, input, resolvedDefault, converter) {
-    const response = await (0, prompt_1.promptOnce)({
-        name: "input",
-        type: "checkbox",
+    const response = await (0, prompt_1.checkbox)({
         default: resolvedDefault,
         message: prompt,
         choices: input.multiSelect.options.map((option) => {

package/lib/deploy/functions/prompts.js

@@ -39,12 +39,7 @@ async function promptForFailurePolicies(options, want, have) {
             exit: 1,
         });
     }
-    const proceed = await (0, prompt_1.promptOnce)({
-        type: "confirm",
-        name: "confirm",
-        default: false,
-        message: "Would you like to proceed with deployment?",
-    });
+    const proceed = await (0, prompt_1.confirm)("Would you like to proceed with deployment?");
     if (!proceed) {
         throw new error_1.FirebaseError("Deployment canceled.", { exit: 1 });
     }
@@ -105,10 +100,7 @@ async function promptForUnsafeMigration(fnsToUpdate, options) {
         return safeUpdates;
     }
     for (const eu of unsafeUpdates) {
-        const shouldUpdate = await (0, prompt_1.promptOnce)({
-            type: "confirm",
-            name: "confirm",
-            default: false,
+        const shouldUpdate = await (0, prompt_1.confirm)({
             message: `[${(0, functionsDeployHelper_1.getFunctionLabel)(eu.endpoint)}] Would you like to proceed with the unsafe migration?`,
         });
         if (shouldUpdate) {
@@ -177,12 +169,7 @@ async function promptForMinInstances(options, want, have) {
         "\n\n" +
         costLine;
     utils.logLabeledWarning("functions", warnMessage);
-    const proceed = await (0, prompt_1.promptOnce)({
-        type: "confirm",
-        name: "confirm",
-        default: false,
-        message: "Would you like to proceed with deployment?",
-    });
+    const proceed = await (0, prompt_1.confirm)("Would you like to proceed with deployment?");
     if (!proceed) {
         throw new error_1.FirebaseError("Deployment canceled.", { exit: 1 });
     }
@@ -200,19 +187,10 @@ async function promptForCleanupPolicyDays(options, locations) {
             `Pass the --force option to automatically set up a cleanup policy or ` +
             "run 'firebase functions:artifacts:setpolicy' to manually set up a cleanup policy.");
     }
-    const result = await (0, prompt_1.promptOnce)({
-        type: "input",
-        name: "days",
-        default: artifacts.DEFAULT_CLEANUP_DAYS.toString(),
+    return await (0, prompt_1.number)({
+        default: artifacts.DEFAULT_CLEANUP_DAYS,
         message: "How many days do you want to keep container images before they're deleted?",
-        validate: (input) => {
-            const days = parseInt(input);
-            if (isNaN(days) || days < 0) {
-                return "Please enter a non-negative number";
-            }
-            return true;
-        },
+        validate: (days) => !days || isNaN(days) || days < 0 ? "Please enter a non-negative number" : true,
     });
-    return parseInt(result);
 }
 exports.promptForCleanupPolicyDays = promptForCleanupPolicyDays;