firebase-tools 14.2.2 → 14.3.0

package/lib/commands/database-set.js

@@ -36,13 +36,13 @@ exports.command = new command_1.Command("database:set <path> [infile]")
     if (options.disableTriggers) {
         dbJsonURL.searchParams.set("disableTriggers", "true");
     }
-    const confirm = await (0, prompt_1.promptOnce)({
-        type: "confirm",
-        name: "force",
-        default: false,
+    const confirmed = await (0, prompt_1.confirm)({
         message: "You are about to overwrite all data at " + clc.cyan(dbPath) + ". Are you sure?",
-    }, options);
-    if (!confirm) {
+        default: false,
+        force: options.force,
+        nonInteractive: options.nonInteractive,
+    });
+    if (!confirmed) {
         throw new error_1.FirebaseError("Command aborted.");
     }
     const inStream = utils.stringToStream(options.data) || (infile ? fs.createReadStream(infile) : process.stdin);

package/lib/commands/database-update.js

@@ -32,12 +32,12 @@ exports.command = new command_1.Command("database:update <path> [infile]")
     }
     const origin = (0, api_1.realtimeOriginOrEmulatorOrCustomUrl)(options.instanceDetails.databaseUrl);
     const url = utils.getDatabaseUrl(origin, options.instance, path);
-    const confirmed = await (0, prompt_1.promptOnce)({
-        type: "confirm",
-        name: "force",
-        default: false,
+    const confirmed = await (0, prompt_1.confirm)({
         message: `You are about to modify data at ${clc.cyan(url)}. Are you sure?`,
-    }, options);
+        default: false,
+        force: options.force,
+        nonInteractive: options.nonInteractive,
+    });
     if (!confirmed) {
         throw new error_1.FirebaseError("Command aborted.");
     }

package/lib/commands/dataconnect-sql-shell.js

@@ -35,11 +35,9 @@ const sqlKeywords = [
 ];
 async function promptForQuery() {
     let query = "";
-    let line = "";
+    const line = "";
     do {
-        const question = {
-            type: "input",
-            name: "line",
+        let line = await (0, prompt_1.input)({
             message: query ? "> " : "Enter your SQL query (or '.exit'):",
             transformer: (input) => {
                 return input
@@ -47,8 +45,8 @@ async function promptForQuery() {
                     .map((word) => (sqlKeywords.includes(word.toUpperCase()) ? clc.cyan(word) : word))
                     .join(" ");
             },
-        };
-        ({ line } = await (0, prompt_1.prompt)({ nonInteractive: false }, [question]));
+            nonInteractive: false,
+        });
         line = line.trimEnd();
         if (line.toLowerCase() === ".exit") {
             return ".exit";

package/lib/commands/ext-dev-deprecate.js

@@ -50,6 +50,7 @@ async function deprecate(extensionRef, versionPredicate, options) {
     });
     if (filteredExtensionVersions.length > 0) {
         const consent = await (0, prompt_1.confirm)({
+            message: "Continue?",
             default: false,
             force: options.force,
             nonInteractive: options.nonInteractive,

package/lib/commands/ext-dev-init.js

@@ -30,9 +30,7 @@ exports.command = new command_1.Command("ext:dev:init")
     const config = new config_1.Config({}, { projectDir: cwd, cwd: cwd });
     try {
         let welcome;
-        const lang = await (0, prompt_1.promptOnce)({
-            type: "list",
-            name: "language",
+        const lang = await (0, prompt_1.select)({
             message: "In which language do you want to write the Cloud Functions for your extension?",
             default: "javascript",
             choices: [
@@ -83,9 +81,7 @@ async function typescriptSelected(config) {
     const gitignoreTemplate = (0, templates_1.readTemplateSync)("extensions/typescript/_gitignore");
     const mocharcTemplate = (0, templates_1.readTemplateSync)("extensions/typescript/_mocharc");
     const eslintTemplate = (0, templates_1.readTemplateSync)("init/functions/typescript/_eslintrc");
-    const lint = await (0, prompt_1.promptOnce)({
-        name: "lint",
-        type: "confirm",
+    const lint = await (0, prompt_1.confirm)({
         message: "Do you want to use ESLint to catch probable bugs and enforce style?",
         default: true,
     });
@@ -119,12 +115,7 @@ async function javascriptSelected(config) {
     const packageNoLintingTemplate = (0, templates_1.readTemplateSync)("extensions/javascript/package.nolint.json");
     const gitignoreTemplate = (0, templates_1.readTemplateSync)("extensions/javascript/_gitignore");
     const eslintTemplate = (0, templates_1.readTemplateSync)("init/functions/javascript/_eslintrc");
-    const lint = await (0, prompt_1.promptOnce)({
-        name: "lint",
-        type: "confirm",
-        message: "Do you want to use ESLint to catch probable bugs and enforce style?",
-        default: false,
-    });
+    const lint = await (0, prompt_1.confirm)("Do you want to use ESLint to catch probable bugs and enforce style?");
     const templates = readCommonTemplates();
     await config.askWriteProjectFile("extension.yaml", templates.extSpecTemplate);
     await config.askWriteProjectFile("PREINSTALL.md", templates.preinstallTemplate);

package/lib/commands/ext-dev-register.js

@@ -6,12 +6,12 @@ const marked_1 = require("marked");
 const command_1 = require("../command");
 const publisherApi_1 = require("../extensions/publisherApi");
 const projectUtils_1 = require("../projectUtils");
-const prompt_1 = require("../prompt");
 const extensionsHelper_1 = require("../extensions/extensionsHelper");
 const tos_1 = require("../extensions/tos");
 const requirePermissions_1 = require("../requirePermissions");
 const error_1 = require("../error");
 const utils = require("../utils");
+const prompt_1 = require("../prompt");
 exports.command = new command_1.Command("ext:dev:register")
     .description("register a publisher ID; run this before publishing your first extension")
     .before(requirePermissions_1.requirePermissions, ["firebaseextensions.sources.create"])
@@ -24,9 +24,7 @@ exports.command = new command_1.Command("ext:dev:register")
         "This value identifies you in Firebase's registry of extensions as the author of your extensions. " +
         "Examples: my-company-name, MyGitHubUsername.\n\n" +
         "You can only do this once for each project.";
-    const publisherId = await (0, prompt_1.promptOnce)({
-        name: "publisherId",
-        type: "input",
+    const publisherId = await (0, prompt_1.input)({
         message: msg,
         default: projectId,
     });

package/lib/commands/ext-dev-undeprecate.js

@@ -37,8 +37,7 @@ exports.command = new command_1.Command("ext:dev:undeprecate <extensionRef> <ver
     if (extensionVersions.length > 0) {
         if (!options.force) {
             const confirmMessage = "You are about to undeprecate these extension version(s). Do you wish to continue?";
-            const consent = await (0, prompt_1.promptOnce)({
-                type: "confirm",
+            const consent = await (0, prompt_1.confirm)({
                 message: confirmMessage,
                 default: false,
             });

package/lib/commands/ext-dev-usage.js

@@ -44,9 +44,7 @@ exports.command = new command_1.Command("ext:dev:usage <publisherId>")
                 "  - This publisher has not published any extensions\n\n" +
                 "If you are expecting some extensions to appear, please make sure you have the correct publisher ID and try again.");
         }
-        extensionName = await (0, prompt_1.promptOnce)({
-            type: "list",
-            name: "extension",
+        extensionName = await (0, prompt_1.select)({
             message: "Which published extension do you want to view the stats for?",
             choices: extensions.map((e) => {
                 const [_, name] = e.ref.split("/");

package/lib/commands/ext-export.js

@@ -37,9 +37,8 @@ exports.command = new command_1.Command("ext:export")
     (0, export_1.displayExportInfo)(withRefSubbed, withoutRef);
     if (!options.nonInteractive &&
         !options.force &&
-        !(await (0, prompt_1.promptOnce)({
+        !(await (0, prompt_1.confirm)({
             message: "Do you wish to add these Extension instances to firebase.json?",
-            type: "confirm",
             default: true,
         }))) {
         logger_1.logger.info("Exiting. No changes made.");

package/lib/commands/ext-install.js

@@ -75,6 +75,7 @@ exports.command = new command_1.Command("ext:install [extensionRefOrLocalPath]")
         throw new error_1.FirebaseError(`Failed to parse ${clc.bold(extensionRef)} as an extension version or a path to a local extension. Please specify a valid reference.`);
     }
     if (!(await (0, prompt_1.confirm)({
+        message: "Continue?",
         nonInteractive: options.nonInteractive,
         force: options.force,
         default: true,

package/lib/commands/ext-sdk-install.js

@@ -75,6 +75,7 @@ exports.command = new command_1.Command("ext:sdk:install <extensionName>")
         }
     }
     if (!(await (0, prompt_1.confirm)({
+        message: "Continue?",
         nonInteractive: options.nonInteractive,
         force: options.force,
         default: true,

package/lib/commands/ext-update.js

@@ -52,6 +52,7 @@ exports.command = new command_1.Command("ext:update <extensionInstanceId> [updat
     }
     utils.logLabeledBullet(extensionsHelper_1.logPrefix, `Updating ${clc.bold(instanceId)} from version ${clc.bold(oldExtensionVersion.ref)} to version ${clc.bold(newExtensionVersion.ref)}.`);
     if (!(await (0, prompt_1.confirm)({
+        message: "Continue?",
         nonInteractive: options.nonInteractive,
         force: options.force,
         default: false,

package/lib/commands/firestore-backups-delete.js

@@ -19,8 +19,7 @@ exports.command = new command_1.Command("firestore:backups:delete <backup>")
     const backup = await (0, firestore_1.getBackup)(backupName);
     if (!options.force) {
         const confirmMessage = `You are about to delete ${backupName}. Do you wish to continue?`;
-        const consent = await (0, prompt_1.promptOnce)({
-            type: "confirm",
+        const consent = await (0, prompt_1.confirm)({
             message: confirmMessage,
             default: false,
         });

package/lib/commands/firestore-backups-schedules-delete.js

@@ -19,8 +19,7 @@ exports.command = new command_1.Command("firestore:backups:schedules:delete <bac
     const backupSchedule = await (0, firestore_1.getBackupSchedule)(backupScheduleName);
     if (!options.force) {
         const confirmMessage = `You are about to delete ${backupScheduleName}. Do you wish to continue?`;
-        const consent = await (0, prompt_1.promptOnce)({
-            type: "confirm",
+        const consent = await (0, prompt_1.confirm)({
             message: confirmMessage,
             default: false,
         });

package/lib/commands/firestore-databases-delete.js

@@ -21,11 +21,7 @@ exports.command = new command_1.Command("firestore:databases:delete <database>")
     const printer = new pretty_print_1.PrettyPrint();
     if (!options.force) {
         const confirmMessage = `You are about to delete projects/${options.project}/databases/${database}. Do you wish to continue?`;
-        const consent = await (0, prompt_1.promptOnce)({
-            type: "confirm",
-            message: confirmMessage,
-            default: false,
-        });
+        const consent = await (0, prompt_1.confirm)(confirmMessage);
         if (!consent) {
             throw new error_1.FirebaseError("Delete database canceled.");
         }

package/lib/commands/firestore-delete.js

@@ -71,13 +71,13 @@ exports.command = new command_1.Command("firestore:delete [path]")
         allCollections: options.allCollections,
         databaseId: options.database,
     });
-    const confirm = await (0, prompt_1.promptOnce)({
-        type: "confirm",
-        name: "force",
-        default: false,
+    const confirmed = await (0, prompt_1.confirm)({
         message: confirmationMessage(deleteOp, options),
-    }, options);
-    if (!confirm) {
+        default: false,
+        force: options.force,
+        nonInteractive: options.nonInteractive,
+    });
+    if (!confirmed) {
         return utils.reject("Command aborted.", { exit: 1 });
     }
     if (options.allCollections) {

package/lib/commands/functions-artifacts-setpolicy.js

@@ -62,7 +62,12 @@ exports.command = new command_1.Command("functions:artifacts:setpolicy")
         if (existingPolicy) {
             (0, utils_1.logBullet)(`Note: This will remove the existing cleanup policy from the repository.`);
         }
-        const confirmOptOut = await (0, prompt_1.confirm)(Object.assign(Object.assign({}, options), { default: true, message: "Do you want to continue?" }));
+        const confirmOptOut = await (0, prompt_1.confirm)({
+            message: "Do you want to continue?",
+            default: true,
+            force: options.force,
+            nonInteractive: options.nonInteractive,
+        });
         if (!confirmOptOut) {
             throw new error_1.FirebaseError("Command aborted.", { exit: 1 });
         }
@@ -103,7 +108,12 @@ exports.command = new command_1.Command("functions:artifacts:setpolicy")
     if (artifacts.hasCleanupOptOut(repository)) {
         (0, utils_1.logBullet)(`Note: This repository was previously opted out from cleanup policy. This action will remove the opt-out status.`);
     }
-    const confirmSetup = await (0, prompt_1.confirm)(Object.assign(Object.assign({}, options), { default: true, message: "Do you want to continue?" }));
+    const confirmSetup = await (0, prompt_1.confirm)({
+        message: "Do you want to continue?",
+        default: true,
+        force: options.force,
+        nonInteractive: options.nonInteractive,
+    });
     if (!confirmSetup) {
         throw new error_1.FirebaseError("Command aborted.", { exit: 1 });
     }

package/lib/commands/functions-config-export.js

@@ -42,13 +42,11 @@ async function checkRequiredPermission(pInfos) {
         }
         (0, utils_1.logWarning)("You are missing the following permissions to read functions config on project " +
             `${clc.bold(pInfo.projectId)}:\n\t${result.missing.join("\n\t")}`);
-        const confirm = await (0, prompt_1.promptOnce)({
-            type: "confirm",
-            name: "skip",
-            default: true,
+        const confirmed = await (0, prompt_1.confirm)({
             message: `Continue without importing configs from project ${pInfo.projectId}?`,
+            default: true,
         });
-        if (!confirm) {
+        if (!confirmed) {
             throw new error_1.FirebaseError("Command aborted!");
         }
     }
@@ -56,12 +54,10 @@ async function checkRequiredPermission(pInfos) {
 async function promptForPrefix(errMsg) {
     (0, utils_1.logWarning)("The following configs keys could not be exported as environment variables:\n");
     (0, utils_1.logWarning)(errMsg);
-    return await (0, prompt_1.promptOnce)({
-        type: "input",
-        name: "prefix",
+    return await (0, prompt_1.input)({
         default: "CONFIG_",
         message: "Enter a PREFIX to rename invalid environment variable keys:",
-    }, {});
+    });
 }
 function fromEntries(itr) {
     const obj = {};

package/lib/commands/functions-delete.js

@@ -56,14 +56,14 @@ exports.command = new command_1.Command("functions:delete [filters...]")
         throw new error_1.FirebaseError(`The specified filters do not match any existing functions in project ${clc.bold(context.projectId)}.`);
     }
     const deleteList = allEpToDelete.map((func) => `\t${helper.getFunctionLabel(func)}`).join("\n");
-    const confirmDeletion = await (0, prompt_1.promptOnce)({
-        type: "confirm",
-        name: "force",
-        default: false,
+    const confirmDeletion = await (0, prompt_1.confirm)({
         message: "You are about to delete the following Cloud Functions:\n" +
             deleteList +
             "\n  Are you sure?",
-    }, options);
+        default: false,
+        force: options.force,
+        nonInteractive: options.nonInteractive,
+    });
     if (!confirmDeletion) {
         throw new error_1.FirebaseError("Command aborted.");
     }

package/lib/commands/functions-deletegcfartifacts.js

@@ -27,12 +27,12 @@ exports.command = new command_1.Command("functions:deletegcfartifacts")
     const dockerHelper = {};
     try {
         const gcfPaths = await (0, containerCleaner_1.listGcfPaths)(projectId, regions, dockerHelper);
-        const confirmDeletion = await (0, prompt_1.promptOnce)({
-            type: "confirm",
-            name: "force",
+        const confirmDeletion = await (0, prompt_1.confirm)({
             default: false,
             message: getConfirmationMessage(gcfPaths),
-        }, options);
+            force: options.force,
+            nonInteractive: options.nonInteractive,
+        });
         if (!confirmDeletion) {
             throw new error_1.FirebaseError("Command aborted.", { exit: 1 });
         }

package/lib/commands/functions-secrets-destroy.js

@@ -40,16 +40,14 @@ exports.command = new command_1.Command("functions:secrets:destroy <KEY>[@versio
             return;
         }
     }
-    if (!options.force) {
-        const confirm = await (0, prompt_1.promptOnce)({
-            name: "destroy",
-            type: "confirm",
-            default: true,
-            message: `Are you sure you want to destroy ${sv.secret.name}@${sv.versionId}`,
-        }, options);
-        if (!confirm) {
-            return;
-        }
+    const areYouSure = await (0, prompt_1.confirm)({
+        message: `Are you sure you want to destroy ${sv.secret.name}@${sv.versionId}`,
+        default: true,
+        nonInteractive: options.nonInteractive,
+        force: options.force,
+    });
+    if (!areYouSure) {
+        return;
     }
     await (0, secretManager_1.destroySecretVersion)(projectId, name, version);
     (0, utils_1.logBullet)(`Destroyed secret version ${name}@${sv.versionId}`);

package/lib/commands/functions-secrets-prune.js

@@ -38,20 +38,19 @@ exports.command = new command_1.Command("functions:secrets:prune")
     }
     (0, utils_1.logBullet)(`Found ${pruned.length} unused active secret versions:\n\t` +
         pruned.map((sv) => `${sv.secret}@${sv.version}`).join("\n\t"));
-    if (!options.force) {
-        const confirm = await (0, prompt_1.promptOnce)({
-            name: "destroy",
-            type: "confirm",
-            default: true,
+    const confirmed = options.destroy ||
+        (await (0, prompt_1.confirm)({
             message: `Do you want to destroy unused secret versions?`,
-        }, options);
-        if (!confirm) {
-            (0, utils_1.logBullet)("Run the following commands to destroy each unused secret version:\n\t" +
-                pruned
-                    .map((sv) => `firebase functions:secrets:destroy ${sv.secret}@${sv.version}`)
-                    .join("\n\t"));
-            return;
-        }
+            default: true,
+            force: options.force,
+            nonInteractive: options.nonInteractive,
+        }));
+    if (!confirmed) {
+        (0, utils_1.logBullet)("Run the following commands to destroy each unused secret version:\n\t" +
+            pruned
+                .map((sv) => `firebase functions:secrets:destroy ${sv.secret}@${sv.version}`)
+                .join("\n\t"));
+        return;
     }
     await Promise.all(pruned.map((sv) => (0, secretManager_1.destroySecretVersion)(projectId, sv.secret, sv.version)));
     (0, utils_1.logSuccess)("Destroyed all unused secrets!");

package/lib/commands/functions-secrets-set.js

@@ -53,21 +53,17 @@ exports.command = new command_1.Command("functions:secrets:set <KEY>")
     }
     (0, utils_1.logBullet)(`${endpointsToUpdate.length} functions are using stale version of secret ${secret.name}:\n\t` +
         endpointsToUpdate.map((e) => `${e.id}(${e.region})`).join("\n\t"));
-    if (!options.force) {
-        let confirm = false;
-        if (!options.nonInteractive) {
-            confirm = await (0, prompt_1.promptOnce)({
-                name: "redeploy",
-                type: "confirm",
-                default: true,
-                message: `Do you want to re-deploy the functions and destroy the stale version of secret ${secret.name}?`,
-            }, options);
-        }
-        if (!confirm) {
-            (0, utils_1.logBullet)("Please deploy your functions for the change to take effect by running:\n\t" +
-                clc.bold("firebase deploy --only functions"));
-            return;
-        }
+    const redeploy = options.nonInteractive
+        ? false
+        : await (0, prompt_1.confirm)({
+            message: `Do you want to re-deploy the functions and destroy the stale version of secret ${secret.name}?`,
+            default: true,
+            force: options.force,
+        });
+    if (!redeploy) {
+        (0, utils_1.logBullet)("Please deploy your functions for the change to take effect by running:\n\t" +
+            clc.bold("firebase deploy --only functions"));
+        return;
     }
     const updateOps = endpointsToUpdate.map(async (e) => {
         (0, utils_1.logBullet)(`Updating function ${e.id}(${e.region})...`);

package/lib/commands/hosting-channel-create.js

@@ -45,8 +45,7 @@ exports.command = new command_1.Command("hosting:channel:create [channelId]")
     }
     channelId =
         channelId ||
-            (await (0, prompt_1.promptOnce)({
-                type: "input",
+            (await (0, prompt_1.input)({
                 message: "Please provide a URL-friendly name for the channel:",
                 validate: (s) => s.length > 0,
             }));

package/lib/commands/hosting-channel-delete.js

@@ -24,12 +24,12 @@ exports.command = new command_1.Command("hosting:channel:delete <channelId>")
     const siteId = options.site;
     channelId = (0, api_1.normalizeName)(channelId);
     const channel = await (0, api_1.getChannel)(projectId, siteId, channelId);
-    const confirmed = await (0, prompt_1.promptOnce)({
-        name: "force",
-        type: "confirm",
+    const confirmed = await (0, prompt_1.confirm)({
         message: `Are you sure you want to delete the Hosting Channel ${(0, colorette_1.underline)(channelId)} for site ${(0, colorette_1.underline)(siteId)}?`,
         default: false,
-    }, options);
+        force: options.force,
+        nonInteractive: options.nonInteractive,
+    });
     if (!confirmed) {
         return;
     }

package/lib/commands/hosting-channel-open.js

@@ -11,8 +11,8 @@ const requirePermissions_1 = require("../requirePermissions");
 const projectUtils_1 = require("../projectUtils");
 const requireConfig_1 = require("../requireConfig");
 const utils_1 = require("../utils");
-const prompt_1 = require("../prompt");
 const requireHostingSite_1 = require("../requireHostingSite");
+const prompt_1 = require("../prompt");
 exports.command = new command_1.Command("hosting:channel:open [channelId]")
     .description("opens the URL for a Firebase Hosting channel")
     .help("if unable to open the URL in a browser, it will be displayed in the output")
@@ -29,8 +29,7 @@ exports.command = new command_1.Command("hosting:channel:open [channelId]")
         }
         const channels = await (0, api_1.listChannels)(projectId, siteId);
         (0, lodash_1.sortBy)(channels, ["name"]);
-        channelId = await (0, prompt_1.promptOnce)({
-            type: "list",
+        channelId = await (0, prompt_1.select)({
             message: "Which channel would you like to open?",
             choices: channels.map((c) => (0, lodash_1.last)(c.name.split("/")) || c.name),
         });

package/lib/commands/hosting-disable.js

@@ -17,12 +17,12 @@ exports.command = new command_1.Command("hosting:disable")
     .before(requireHostingSite_1.requireHostingSite)
     .action(async (options) => {
     const siteToDisable = options.site;
-    const confirm = await (0, prompt_1.promptOnce)({
-        type: "confirm",
-        name: "force",
+    const confirmed = await (0, prompt_1.confirm)({
         message: `Are you sure you want to disable Firebase Hosting for the site ${clc.underline(siteToDisable)}\n${clc.underline("This will immediately make your site inaccessible!")}`,
-    }, options);
-    if (!confirm) {
+        force: options.force,
+        nonInteractive: options.nonInteractive,
+    });
+    if (!confirmed) {
         return;
     }
     const c = new apiv2_1.Client({ urlPrefix: (0, api_1.hostingApiOrigin)(), apiVersion: "v1beta1", auth: true });

package/lib/commands/hosting-sites-delete.js

@@ -24,12 +24,12 @@ exports.command = new command_1.Command("hosting:sites:delete <siteId>")
     }
     logger_1.logger.info(`Deleting a site is a permanent action. If you delete a site, Firebase doesn't maintain records of deployed files or deployment history, and the site ${(0, colorette_1.underline)(siteId)} cannot be reactivated by you or anyone else.`);
     logger_1.logger.info();
-    const confirmed = await (0, prompt_1.promptOnce)({
-        name: "force",
-        type: "confirm",
+    const confirmed = await (0, prompt_1.confirm)({
         message: `Are you sure you want to delete the Hosting site ${(0, colorette_1.underline)(siteId)} for project ${(0, colorette_1.underline)(projectId)}? `,
         default: false,
-    }, options);
+        force: options.force,
+        nonInteractive: options.nonInteractive,
+    });
     if (!confirmed) {
         return;
     }