firebase-tools 14.2.2 → 14.3.0

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

@@ -38,8 +38,7 @@ async function doSetup(setup, config, options) {
             value: "overwrite",
         },
     ];
-    const initOpt = await (0, prompt_1.promptOnce)({
-        type: "list",
+    const initOpt = await (0, prompt_1.select)({
         message: "Would you like to initialize a new codebase, or overwrite an existing one?",
         default: "new",
         choices,
@@ -66,10 +65,7 @@ async function initNewCodebase(setup, config) {
             if (attempts++ >= MAX_ATTEMPTS) {
                 throw new error_1.FirebaseError("Exceeded max number of attempts to input valid codebase name. Please restart.");
             }
-            codebase = await (0, prompt_1.promptOnce)({
-                type: "input",
-                message: "What should be the name of this codebase?",
-            });
+            codebase = await (0, prompt_1.input)("What should be the name of this codebase?");
             try {
                 (0, projectConfig_1.validateCodebase)(codebase);
                 (0, projectConfig_1.assertUnique)(setup.config.functions, "codebase", codebase);
@@ -85,8 +81,7 @@ async function initNewCodebase(setup, config) {
                 throw new error_1.FirebaseError("Exceeded max number of attempts to input valid source. Please restart.");
             }
             attempts++;
-            source = await (0, prompt_1.promptOnce)({
-                type: "input",
+            source = await (0, prompt_1.input)({
                 message: `In what sub-directory would you like to initialize your functions for codebase ${clc.bold(codebase)}?`,
                 default: codebase,
             });
@@ -114,8 +109,7 @@ async function overwriteCodebase(setup, config) {
             name: cfg["codebase"],
             value: cfg["codebase"],
         }));
-        codebase = await (0, prompt_1.promptOnce)({
-            type: "list",
+        codebase = await (0, prompt_1.select)({
             message: "Which codebase would you like to overwrite?",
             choices,
         });
@@ -142,13 +136,12 @@ async function languageSetup(setup, config) {
             name: "TypeScript",
             value: "typescript",
         },
+        {
+            name: "Python",
+            value: "python",
+        },
     ];
-    choices.push({
-        name: "Python",
-        value: "python",
-    });
-    const language = await (0, prompt_1.promptOnce)({
-        type: "list",
+    const language = await (0, prompt_1.select)({
         message: "What language would you like to use to write Cloud Functions?",
         default: "javascript",
         choices,

package/lib/init/features/functions/javascript.js

@@ -10,35 +10,21 @@ const PACKAGE_LINTING_TEMPLATE = (0, templates_1.readTemplateSync)("init/functio
 const PACKAGE_NO_LINTING_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/javascript/package.nolint.json");
 const ESLINT_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/javascript/_eslintrc");
 const GITIGNORE_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/javascript/_gitignore");
-function setup(setup, config) {
-    return (0, prompt_1.prompt)(setup.functions, [
-        {
-            name: "lint",
-            type: "confirm",
-            message: "Do you want to use ESLint to catch probable bugs and enforce style?",
-            default: false,
-        },
-    ])
-        .then(() => {
-        if (setup.functions.lint) {
-            const cbconfig = (0, projectConfig_1.configForCodebase)(setup.config.functions, setup.functions.codebase);
-            cbconfig.predeploy = ['npm --prefix "$RESOURCE_DIR" run lint'];
-            return config
-                .askWriteProjectFile(`${setup.functions.source}/package.json`, PACKAGE_LINTING_TEMPLATE)
-                .then(() => {
-                config.askWriteProjectFile(`${setup.functions.source}/.eslintrc.js`, ESLINT_TEMPLATE);
-            });
-        }
-        return config.askWriteProjectFile(`${setup.functions.source}/package.json`, PACKAGE_NO_LINTING_TEMPLATE);
-    })
-        .then(() => {
-        return config.askWriteProjectFile(`${setup.functions.source}/index.js`, INDEX_TEMPLATE);
-    })
-        .then(() => {
-        return config.askWriteProjectFile(`${setup.functions.source}/.gitignore`, GITIGNORE_TEMPLATE);
-    })
-        .then(() => {
-        return (0, npm_dependencies_1.askInstallDependencies)(setup.functions, config);
-    });
+async function setup(setup, config) {
+    setup.functions.lint =
+        setup.functions.lint ||
+            (await (0, prompt_1.confirm)("Do you want to use ESLint to catch probable bugs and enforce style?"));
+    if (setup.functions.lint) {
+        const cbconfig = (0, projectConfig_1.configForCodebase)(setup.config.functions, setup.functions.codebase);
+        cbconfig.predeploy = ['npm --prefix "$RESOURCE_DIR" run lint'];
+        await config.askWriteProjectFile(`${setup.functions.source}/package.json`, PACKAGE_LINTING_TEMPLATE);
+        await config.askWriteProjectFile(`${setup.functions.source}/.eslintrc.js`, ESLINT_TEMPLATE);
+    }
+    else {
+        await config.askWriteProjectFile(`${setup.functions.source}/package.json`, PACKAGE_NO_LINTING_TEMPLATE);
+    }
+    await config.askWriteProjectFile(`${setup.functions.source}/index.js`, INDEX_TEMPLATE);
+    await config.askWriteProjectFile(`${setup.functions.source}/.gitignore`, GITIGNORE_TEMPLATE);
+    await (0, npm_dependencies_1.askInstallDependencies)(setup.functions, config);
 }
 exports.setup = setup;

package/lib/init/features/functions/npm-dependencies.js

@@ -5,14 +5,10 @@ const logger_1 = require("../../../logger");
 const prompt_1 = require("../../../prompt");
 const spawn_1 = require("../../spawn");
 async function askInstallDependencies(setup, config) {
-    await (0, prompt_1.prompt)(setup, [
-        {
-            name: "npm",
-            type: "confirm",
-            message: "Do you want to install dependencies with npm now?",
-            default: true,
-        },
-    ]);
+    setup.npm = await (0, prompt_1.confirm)({
+        message: "Do you want to install dependencies with npm now?",
+        default: true,
+    });
     if (setup.npm) {
         try {
             await (0, spawn_1.wrapSpawn)("npm", ["install"], config.projectDir + `/${setup.source}`);

package/lib/init/features/functions/python.js

@@ -25,9 +25,7 @@ async function setup(setup, config) {
         venvProcess.on("exit", resolve);
         venvProcess.on("error", reject);
     });
-    const install = await (0, prompt_1.promptOnce)({
-        name: "install",
-        type: "confirm",
+    const install = await (0, prompt_1.confirm)({
         message: "Do you want to install dependencies now?",
         default: true,
     });

package/lib/init/features/functions/typescript.js

@@ -12,48 +12,29 @@ const TSCONFIG_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/type
 const TSCONFIG_DEV_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/typescript/tsconfig.dev.json");
 const INDEX_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/typescript/index.ts");
 const GITIGNORE_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/typescript/_gitignore");
-function setup(setup, config) {
-    return (0, prompt_1.prompt)(setup.functions, [
-        {
-            name: "lint",
-            type: "confirm",
-            message: "Do you want to use ESLint to catch probable bugs and enforce style?",
-            default: true,
-        },
-    ])
-        .then(() => {
-        const cbconfig = (0, projectConfig_1.configForCodebase)(setup.config.functions, setup.functions.codebase);
-        cbconfig.predeploy = [];
-        if (setup.functions.lint) {
-            cbconfig.predeploy.push('npm --prefix "$RESOURCE_DIR" run lint');
-            cbconfig.predeploy.push('npm --prefix "$RESOURCE_DIR" run build');
-            return config
-                .askWriteProjectFile(`${setup.functions.source}/package.json`, PACKAGE_LINTING_TEMPLATE)
-                .then(() => {
-                return config.askWriteProjectFile(`${setup.functions.source}/.eslintrc.js`, ESLINT_TEMPLATE);
-            });
-        }
-        else {
-            cbconfig.predeploy.push('npm --prefix "$RESOURCE_DIR" run build');
-        }
-        return config.askWriteProjectFile(`${setup.functions.source}/package.json`, PACKAGE_NO_LINTING_TEMPLATE);
-    })
-        .then(() => {
-        return config.askWriteProjectFile(`${setup.functions.source}/tsconfig.json`, TSCONFIG_TEMPLATE);
-    })
-        .then(() => {
-        if (setup.functions.lint) {
-            return config.askWriteProjectFile(`${setup.functions.source}/tsconfig.dev.json`, TSCONFIG_DEV_TEMPLATE);
-        }
-    })
-        .then(() => {
-        return config.askWriteProjectFile(`${setup.functions.source}/src/index.ts`, INDEX_TEMPLATE);
-    })
-        .then(() => {
-        return config.askWriteProjectFile(`${setup.functions.source}/.gitignore`, GITIGNORE_TEMPLATE);
-    })
-        .then(() => {
-        return (0, npm_dependencies_1.askInstallDependencies)(setup.functions, config);
-    });
+async function setup(setup, config) {
+    setup.functions.lint =
+        setup.functions.lint ||
+            (await (0, prompt_1.confirm)({
+                message: "Do you want to use ESLint to catch probable bugs and enforce style?",
+                default: true,
+            }));
+    const cbconfig = (0, projectConfig_1.configForCodebase)(setup.config.functions, setup.functions.codebase);
+    cbconfig.predeploy = [];
+    if (setup.functions.lint) {
+        cbconfig.predeploy.push('npm --prefix "$RESOURCE_DIR" run lint');
+        cbconfig.predeploy.push('npm --prefix "$RESOURCE_DIR" run build');
+        await config.askWriteProjectFile(`${setup.functions.source}/package.json`, PACKAGE_LINTING_TEMPLATE);
+        await config.askWriteProjectFile(`${setup.functions.source}/.eslintrc.js`, ESLINT_TEMPLATE);
+        await config.askWriteProjectFile(`${setup.functions.source}/tsconfig.dev.json`, TSCONFIG_DEV_TEMPLATE);
+    }
+    else {
+        cbconfig.predeploy.push('npm --prefix "$RESOURCE_DIR" run build');
+        await config.askWriteProjectFile(`${setup.functions.source}/package.json`, PACKAGE_NO_LINTING_TEMPLATE);
+    }
+    await config.askWriteProjectFile(`${setup.functions.source}/tsconfig.json`, TSCONFIG_TEMPLATE);
+    await config.askWriteProjectFile(`${setup.functions.source}/src/index.ts`, INDEX_TEMPLATE);
+    await config.askWriteProjectFile(`${setup.functions.source}/.gitignore`, GITIGNORE_TEMPLATE);
+    await (0, npm_dependencies_1.askInstallDependencies)(setup.functions, config);
 }
 exports.setup = setup;

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.promptWriteMode = exports.isPackageJson = exports.isTsConfig = exports.genkitSetup = exports.ensureVertexApiEnabled = exports.doSetup = void 0;
 const fs = require("fs");
-const inquirer = require("inquirer");
 const path = require("path");
 const semver = require("semver");
 const clc = require("colorette");
@@ -115,17 +114,13 @@ async function doSetup(setup, config, options) {
         throw new error_1.FirebaseError("Failed to initialize Genkit prerequisite: Firebase functions");
     }
     const projectDir = `${config.projectDir}/${setup.functions.source}`;
-    const installType = (await inquirer.prompt([
-        {
-            name: "choice",
-            type: "list",
-            message: "Install the Genkit CLI globally or locally in this project?",
-            choices: [
-                { name: "Globally", value: "globally" },
-                { name: "Just this project", value: "project" },
-            ],
-        },
-    ])).choice;
+    const installType = await (0, prompt_1.select)({
+        message: "Install the Genkit CLI globally or locally in this project?",
+        choices: [
+            { name: "Globally", value: "globally" },
+            { name: "Just this project", value: "project" },
+        ],
+    });
     try {
         (0, utils_1.logLabeledBullet)("genkit", `Installing Genkit CLI version ${genkitInfo.cliVersion}`);
         if (installType === "globally") {
@@ -214,18 +209,13 @@ async function genkitSetup(options, genkitInfo, projectDir) {
     var _a, _b;
     const modelOptions = getModelOptions(genkitInfo);
     const supportedModels = Object.keys(modelOptions);
-    const answer = await inquirer.prompt([
-        {
-            type: "list",
-            name: "model",
-            message: "Select a model provider:",
-            choices: supportedModels.map((model) => ({
-                name: modelOptions[model].label,
-                value: model,
-            })),
-        },
-    ]);
-    const model = answer.model;
+    const model = await (0, prompt_1.select)({
+        message: "Select a model provider:",
+        choices: supportedModels.map((model) => ({
+            name: modelOptions[model].label,
+            value: model,
+        })),
+    });
     if (model === "vertexai") {
         await ensureVertexApiEnabled(options);
     }
@@ -419,19 +409,14 @@ function generateImportStatement(imports, name) {
     return `import {${imports}} from "${name}";`;
 }
 async function promptWriteMode(message, defaultOption = "merge") {
-    const answer = await inquirer.prompt([
-        {
-            type: "list",
-            name: "option",
-            message,
-            choices: [
-                { name: "Set if unset", value: "merge" },
-                { name: "Overwrite", value: "overwrite" },
-                { name: "Keep unchanged", value: "keep" },
-            ],
-            default: defaultOption,
-        },
-    ]);
-    return answer.option;
+    return (0, prompt_1.select)({
+        message,
+        choices: [
+            { name: "Set if unset", value: "merge" },
+            { name: "Overwrite", value: "overwrite" },
+            { name: "Keep unchanged", value: "keep" },
+        ],
+        default: defaultOption,
+    });
 }
 exports.promptWriteMode = promptWriteMode;

package/lib/init/features/hosting/github.js

@@ -75,7 +75,7 @@ async function initGitHub(setup) {
     let shouldWriteYMLHostingFile = true;
     let shouldWriteYMLDeployFile = false;
     if (fs.existsSync(YML_FULL_PATH_PULL_REQUEST)) {
-        const { overwrite } = await promptForWriteYMLFile({
+        const overwrite = await (0, prompt_1.confirm)({
             message: `GitHub workflow file for PR previews exists. Overwrite? ${YML_PULL_REQUEST_FILENAME}`,
         });
         shouldWriteYMLHostingFile = overwrite;
@@ -92,10 +92,9 @@ async function initGitHub(setup) {
                 shouldWriteYMLDeployFile = true;
             }
             else {
-                const { overwrite } = await promptForWriteYMLFile({
+                shouldWriteYMLDeployFile = await (0, prompt_1.confirm)({
                     message: `The GitHub workflow file for deploying to the live channel already exists. Overwrite? ${YML_MERGE_FILENAME}`,
                 });
-                shouldWriteYMLDeployFile = overwrite;
             }
         }
         else {
@@ -260,10 +259,8 @@ async function uploadSecretToGitHub(repo, ghAccessToken, encryptedServiceAccount
 async function promptForRepo(options, ghAccessToken) {
     let key = "";
     let keyId = "";
-    const { repo } = await (0, prompt_1.prompt)(options, [
-        {
-            type: "input",
-            name: "repo",
+    const { repo } = options.repo ||
+        (await (0, prompt_1.input)({
             default: defaultGithubRepo(),
             message: "For which GitHub repository would you like to set up a GitHub workflow? (format: user/repository)",
             validate: async (repo) => {
@@ -289,64 +286,36 @@ async function promptForRepo(options, ghAccessToken) {
                 }
                 return true;
             },
-        },
-    ]);
+        }));
     return { repo, key, keyId };
 }
 async function promptForBuildScript(useWebFrameworks) {
-    const { shouldSetupScript } = await (0, prompt_1.prompt)({}, [
-        {
-            type: "confirm",
-            name: "shouldSetupScript",
-            default: false,
-            message: "Set up the workflow to run a build script before every deploy?",
-        },
-    ]);
+    const shouldSetupScript = await (0, prompt_1.confirm)({
+        message: "Set up the workflow to run a build script before every deploy?",
+    });
     if (!shouldSetupScript) {
         return { script: undefined };
     }
-    const { script } = await (0, prompt_1.prompt)({}, [
-        {
-            type: "input",
-            name: "script",
-            default: useWebFrameworks ? undefined : "npm ci && npm run build",
-            message: "What script should be run before every deploy?",
-        },
-    ]);
+    const script = await (0, prompt_1.input)({
+        default: useWebFrameworks ? undefined : "npm ci && npm run build",
+        message: "What script should be run before every deploy?",
+    });
     return { script };
 }
 async function promptToSetupDeploys(defaultBranch) {
-    const { setupDeploys } = await (0, prompt_1.prompt)({}, [
-        {
-            type: "confirm",
-            name: "setupDeploys",
-            default: true,
-            message: "Set up automatic deployment to your site's live channel when a PR is merged?",
-        },
-    ]);
+    const setupDeploys = await (0, prompt_1.confirm)({
+        default: true,
+        message: "Set up automatic deployment to your site's live channel when a PR is merged?",
+    });
     if (!setupDeploys) {
         return { setupDeploys };
     }
-    const { branch } = await (0, prompt_1.prompt)({}, [
-        {
-            type: "input",
-            name: "branch",
-            default: defaultBranch,
-            message: "What is the name of the GitHub branch associated with your site's live channel?",
-        },
-    ]);
+    const branch = await (0, prompt_1.input)({
+        default: defaultBranch,
+        message: "What is the name of the GitHub branch associated with your site's live channel?",
+    });
     return { branch, setupDeploys };
 }
-async function promptForWriteYMLFile({ message }) {
-    return await (0, prompt_1.prompt)({}, [
-        {
-            type: "confirm",
-            name: "overwrite",
-            default: false,
-            message,
-        },
-    ]);
-}
 async function getGitHubUserDetails(ghAccessToken) {
     const { body: ghUserDetails } = await githubApiClient.get("/user", {
         headers: { Authorization: `token ${ghAccessToken}`, "User-Agent": "Firebase CLI" },

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

@@ -33,8 +33,7 @@ async function doSetup(setup, config, options) {
             hasHostingSite = false;
         }
         if (!hasHostingSite) {
-            const confirmCreate = await (0, prompt_1.promptOnce)({
-                type: "confirm",
+            const confirmCreate = await (0, prompt_1.confirm)({
                 message: "A Firebase Hosting site is required to deploy. Would you like to create one now?",
                 default: true,
             });
@@ -56,44 +55,33 @@ async function doSetup(setup, config, options) {
     if (experiments.isEnabled("webframeworks")) {
         if (discoveredFramework) {
             const name = frameworks_1.WebFrameworks[discoveredFramework.framework].name;
-            await (0, prompt_1.promptOnce)({
-                name: "useDiscoveredFramework",
-                type: "confirm",
-                default: true,
+            setup.hosting.useDiscoveredFramework = await (0, prompt_1.confirm)({
                 message: `Detected an existing ${name} codebase in the current directory, should we use this?`,
-            }, setup.hosting);
+                default: true,
+            });
         }
         if (setup.hosting.useDiscoveredFramework) {
             setup.hosting.source = ".";
             setup.hosting.useWebFrameworks = true;
         }
         else {
-            await (0, prompt_1.promptOnce)({
-                name: "useWebFrameworks",
-                type: "confirm",
-                default: false,
-                message: `Do you want to use a web framework? (${clc.bold("experimental")})`,
-            }, setup.hosting);
+            setup.hosting.useWebFrameworks = await (0, prompt_1.confirm)(`Do you want to use a web framework? (${clc.bold("experimental")})`);
         }
     }
     if (setup.hosting.useWebFrameworks) {
-        await (0, prompt_1.promptOnce)({
-            name: "source",
-            type: "input",
-            default: "hosting",
+        setup.hosting.source = await (0, prompt_1.input)({
             message: "What folder would you like to use for your web application's root directory?",
-        }, setup.hosting);
+            default: "hosting",
+        });
         if (setup.hosting.source !== ".")
             delete setup.hosting.useDiscoveredFramework;
         discoveredFramework = await (0, frameworks_1.discover)((0, path_1.join)(config.projectDir, setup.hosting.source));
         if (discoveredFramework) {
             const name = frameworks_1.WebFrameworks[discoveredFramework.framework].name;
-            await (0, prompt_1.promptOnce)({
-                name: "useDiscoveredFramework",
-                type: "confirm",
-                default: true,
+            setup.hosting.useDiscoveredFramework = await (0, prompt_1.confirm)({
                 message: `Detected an existing ${name} codebase in ${setup.hosting.source}, should we use this?`,
-            }, setup.hosting);
+                default: true,
+            });
         }
         if (setup.hosting.useDiscoveredFramework && discoveredFramework) {
             setup.hosting.webFramework = discoveredFramework.framework;
@@ -108,24 +96,24 @@ async function doSetup(setup, config, options) {
                 }
             }
             const defaultChoice = (_a = choices.find(({ value }) => value === (discoveredFramework === null || discoveredFramework === void 0 ? void 0 : discoveredFramework.framework))) === null || _a === void 0 ? void 0 : _a.value;
-            await (0, prompt_1.promptOnce)({
-                name: "whichFramework",
-                type: "list",
-                message: "Please choose the framework:",
-                default: defaultChoice,
-                choices,
-            }, setup.hosting);
+            setup.hosting.whichFramework =
+                setup.hosting.whichFramework ||
+                    (await (0, prompt_1.select)({
+                        message: "Please choose the framework:",
+                        default: defaultChoice,
+                        choices,
+                    }));
             if (discoveredFramework)
                 (0, node_fs_1.rmSync)(setup.hosting.source, { recursive: true });
             await frameworks_1.WebFrameworks[setup.hosting.whichFramework].init(setup, config);
         }
-        await (0, prompt_1.promptOnce)({
-            name: "region",
-            type: "list",
-            message: "In which region would you like to host server-side content, if applicable?",
-            default: constants_1.DEFAULT_REGION,
-            choices: constants_1.ALLOWED_SSR_REGIONS.filter((region) => region.recommended),
-        }, setup.hosting);
+        setup.hosting.region =
+            setup.hosting.region ||
+                (await (0, prompt_1.select)({
+                    message: "In which region would you like to host server-side content, if applicable?",
+                    default: constants_1.DEFAULT_REGION,
+                    choices: constants_1.ALLOWED_SSR_REGIONS.filter((region) => region.recommended),
+                }));
         setup.config.hosting = {
             source: setup.hosting.source,
             ignore: DEFAULT_IGNORES,
@@ -140,31 +128,22 @@ async function doSetup(setup, config, options) {
         logger_1.logger.info(`will contain Hosting assets to be uploaded with ${clc.bold("firebase deploy")}. If you`);
         logger_1.logger.info("have a build process for your assets, use your build's output directory.");
         logger_1.logger.info();
-        await (0, prompt_1.prompt)(setup.hosting, [
-            {
-                name: "public",
-                type: "input",
-                default: "public",
-                message: "What do you want to use as your public directory?",
-            },
-            {
-                name: "spa",
-                type: "confirm",
-                default: false,
-                message: "Configure as a single-page app (rewrite all urls to /index.html)?",
-            },
-        ]);
+        setup.hosting.public =
+            setup.hosting.public ||
+                (await (0, prompt_1.input)({
+                    message: "What do you want to use as your public directory?",
+                    default: "public",
+                }));
+        setup.hosting.spa =
+            setup.hosting.spa ||
+                (await (0, prompt_1.confirm)("Configure as a single-page app (rewrite all urls to /index.html)?"));
         setup.config.hosting = {
             public: setup.hosting.public,
             ignore: DEFAULT_IGNORES,
         };
     }
-    await (0, prompt_1.promptOnce)({
-        name: "github",
-        type: "confirm",
-        default: false,
-        message: "Set up automatic builds and deploys with GitHub?",
-    }, setup.hosting);
+    setup.hosting.github =
+        setup.hosting.github || (await (0, prompt_1.confirm)("Set up automatic builds and deploys with GitHub?"));
     if (!setup.hosting.useWebFrameworks) {
         if (setup.hosting.spa) {
             setup.config.hosting.rewrites = [{ source: "**", destination: "/index.html" }];

package/lib/init/features/project.js

@@ -6,8 +6,8 @@ const _ = require("lodash");
 const error_1 = require("../../error");
 const projects_1 = require("../../management/projects");
 const logger_1 = require("../../logger");
-const prompt_1 = require("../../prompt");
 const utils = require("../../utils");
+const prompt = require("../../prompt");
 const OPTION_NO_PROJECT = "Don't set up a default project";
 const OPTION_USE_PROJECT = "Use an existing project";
 const OPTION_NEW_PROJECT = "Create a new project";
@@ -24,14 +24,11 @@ function toInitProjectInfo(projectMetaData) {
 async function promptAndCreateNewProject() {
     utils.logBullet("If you want to create a project in a Google Cloud organization or folder, please use " +
         `"firebase projects:create" instead, and return to this command when you've created the project.`);
-    const promptAnswer = {};
-    await (0, prompt_1.prompt)(promptAnswer, projects_1.PROJECTS_CREATE_QUESTIONS);
-    if (!promptAnswer.projectId) {
+    const { projectId, displayName } = await (0, projects_1.promptProjectCreation)();
+    if (!projectId) {
         throw new error_1.FirebaseError("Project ID cannot be empty");
     }
-    return await (0, projects_1.createFirebaseProjectAndLog)(promptAnswer.projectId, {
-        displayName: promptAnswer.displayName,
-    });
+    return await (0, projects_1.createFirebaseProjectAndLog)(projectId, { displayName });
 }
 async function promptAndAddFirebaseToCloudProject() {
     const projectId = await (0, projects_1.promptAvailableProjectId)();
@@ -41,15 +38,8 @@ async function promptAndAddFirebaseToCloudProject() {
     return await (0, projects_1.addFirebaseToCloudProjectAndLog)(projectId);
 }
 async function projectChoicePrompt(options) {
-    const choices = [
-        { name: OPTION_USE_PROJECT, value: OPTION_USE_PROJECT },
-        { name: OPTION_NEW_PROJECT, value: OPTION_NEW_PROJECT },
-        { name: OPTION_ADD_FIREBASE, value: OPTION_ADD_FIREBASE },
-        { name: OPTION_NO_PROJECT, value: OPTION_NO_PROJECT },
-    ];
-    const projectSetupOption = await (0, prompt_1.promptOnce)({
-        type: "list",
-        name: "id",
+    const choices = [OPTION_USE_PROJECT, OPTION_NEW_PROJECT, OPTION_ADD_FIREBASE, OPTION_NO_PROJECT];
+    const projectSetupOption = await prompt.select({
         message: "Please select an option:",
         choices,
     });

package/lib/init/features/remoteconfig.js

@@ -6,9 +6,7 @@ const fsutils = require("../../fsutils");
 const clc = require("colorette");
 async function doSetup(setup, config) {
     setup.config.remoteconfig = {};
-    const jsonFilePath = await (0, prompt_1.promptOnce)({
-        type: "input",
-        name: "template",
+    const jsonFilePath = await (0, prompt_1.input)({
         message: "What file should be used for your Remote Config template?",
         default: "remoteconfig.template.json",
     });
@@ -17,11 +15,7 @@ async function doSetup(setup, config) {
             clc.bold(jsonFilePath) +
             " already exists." +
             " Do you want to overwrite the existing Remote Config template?";
-        const overwrite = await (0, prompt_1.promptOnce)({
-            type: "confirm",
-            message: msg,
-            default: false,
-        });
+        const overwrite = await (0, prompt_1.confirm)(msg);
         if (!overwrite) {
             return;
         }