firebase-tools 14.2.2 → 14.3.1

package/lib/mcp/tools/storage/index.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.storageTools = void 0;
+const get_download_url_1 = require("./get_download_url");
+const get_rules_1 = require("./get_rules");
+exports.storageTools = [get_rules_1.get_rules, get_download_url_1.get_object_download_url];

package/lib/mcp/types.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SERVER_FEATURES = void 0;
-exports.SERVER_FEATURES = ["project", "firestore", "storage", "dataconnect", "auth"];
+exports.SERVER_FEATURES = ["firestore", "storage", "dataconnect", "auth"];

package/lib/prompt.js

@@ -1,80 +1,93 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promptForDirectory = exports.confirm = exports.promptOnce = exports.prompt = void 0;
-const inquirer = require("inquirer");
-const path = require("path");
-const fsutils_1 = require("./fsutils");
+exports.search = exports.password = exports.number = exports.select = exports.checkbox = exports.confirm = exports.input = exports.guard = exports.Separator = void 0;
+const inquirer = require("@inquirer/prompts");
 const error_1 = require("./error");
-const logger_1 = require("./logger");
-inquirer.registerPrompt("autocomplete", require("inquirer-autocomplete-prompt"));
-async function prompt(options, questions) {
-    const prompts = [];
-    for (const question of questions) {
-        if (question.name && options[question.name] === undefined) {
-            prompts.push(question);
-        }
+var prompts_1 = require("@inquirer/prompts");
+Object.defineProperty(exports, "Separator", { enumerable: true, get: function () { return prompts_1.Separator; } });
+function guard(opts) {
+    if (!opts.nonInteractive) {
+        return { shouldReturn: false, value: undefined };
     }
-    if (prompts.length && options.nonInteractive) {
-        const missingOptions = Array.from(new Set(prompts.map((p) => p.name))).join(", ");
-        throw new error_1.FirebaseError(`Missing required options (${missingOptions}) while running in non-interactive mode`, {
-            children: prompts,
-        });
+    if (typeof opts.default !== "undefined") {
+        return { shouldReturn: true, value: opts.default };
     }
-    const answers = await inquirer.prompt(prompts);
-    Object.keys(answers).forEach((k) => {
-        options[k] = answers[k];
-    });
-    return answers;
-}
-exports.prompt = prompt;
-async function promptOnce(question, options = {}) {
-    var _a;
-    question.name = ((_a = question.name) === null || _a === void 0 ? void 0 : _a.replace(/\./g, "/")) || "question";
-    await prompt(options, [question]);
-    return options[question.name];
+    throw new error_1.FirebaseError(`Question "${opts.message}" does not have a default and cannot be answered in non-interactive mode`);
 }
-exports.promptOnce = promptOnce;
-async function confirm(args) {
-    var _a;
-    if (!args.nonInteractive && !args.force) {
-        const message = (_a = args.message) !== null && _a !== void 0 ? _a : `Do you wish to continue?`;
-        return await promptOnce({
-            type: "confirm",
-            message,
-            default: args.default,
-        });
-    }
-    else if (args.nonInteractive && !args.force) {
-        throw new error_1.FirebaseError("Pass the --force flag to use this command in non-interactive mode");
+exports.guard = guard;
+async function input(opts) {
+    if (typeof opts === "string") {
+        opts = { message: opts };
     }
     else {
-        return true;
+        const { shouldReturn, value } = guard(opts);
+        if (shouldReturn) {
+            return value;
+        }
     }
+    return inquirer.input(opts);
 }
-exports.confirm = confirm;
-async function promptForDirectory(args) {
-    let dir = "";
-    while (!dir) {
-        const promptPath = await promptOnce({
-            message: args.message,
-        });
-        let target;
-        if (args.relativeTo) {
-            target = path.resolve(args.relativeTo, promptPath);
-        }
-        else {
-            target = args.config.path(promptPath);
-        }
-        if ((0, fsutils_1.fileExistsSync)(target)) {
-            logger_1.logger.error(`Expected a directory, but ${target} is a file. Please provide a path to a directory.`);
+exports.input = input;
+async function confirm(opts) {
+    if (typeof opts === "string") {
+        opts = { message: opts };
+    }
+    else {
+        if (opts.force) {
+            return true;
         }
-        else if (!(0, fsutils_1.dirExistsSync)(target)) {
-            logger_1.logger.error(`Directory ${target} not found. Please provide a path to a directory`);
+        const { shouldReturn, value } = guard(opts);
+        if (shouldReturn) {
+            return value;
         }
-        else {
-            dir = target;
+    }
+    return inquirer.confirm(opts);
+}
+exports.confirm = confirm;
+async function checkbox(opts) {
+    const { shouldReturn, value } = guard(opts);
+    if (shouldReturn) {
+        return value;
+    }
+    return inquirer.checkbox(Object.assign(Object.assign({}, opts), { loop: true }));
+}
+exports.checkbox = checkbox;
+async function select(opts) {
+    const { shouldReturn, value } = guard(opts);
+    if (shouldReturn) {
+        return value;
+    }
+    return inquirer.select(Object.assign(Object.assign({}, opts), { loop: false }));
+}
+exports.select = select;
+async function number(opts) {
+    if (typeof opts === "string") {
+        opts = { message: opts };
+    }
+    else {
+        const { shouldReturn, value } = guard(opts);
+        if (shouldReturn) {
+            return value;
         }
     }
-    return dir;
+    return (await inquirer.number(Object.assign(Object.assign({}, opts), { required: true })));
+}
+exports.number = number;
+async function password(opts) {
+    if (typeof opts === "string") {
+        opts = { message: opts };
+    }
+    else {
+        guard(opts);
+    }
+    return inquirer.password(Object.assign(Object.assign({}, opts), { mask: "" }));
+}
+exports.password = password;
+async function search(opts) {
+    const { shouldReturn, value } = guard(opts);
+    if (shouldReturn) {
+        return value;
+    }
+    return inquirer.search(opts);
 }
-exports.promptForDirectory = promptForDirectory;
+exports.search = search;

package/lib/requireTosAcceptance.js

@@ -4,6 +4,7 @@ exports.requireTosAcceptance = void 0;
 const error_1 = require("./error");
 const firedata_1 = require("./gcp/firedata");
 const api_1 = require("./api");
+const auth_1 = require("./auth");
 const consoleLandingPage = new Map([
     [firedata_1.APPHOSTING_TOS_ID, `${(0, api_1.consoleOrigin)()}/project/_/apphosting`],
     [firedata_1.DATA_CONNECT_TOS_ID, `${(0, api_1.consoleOrigin)()}/project/_/dataconnect`],
@@ -13,6 +14,9 @@ function requireTosAcceptance(tosId) {
 }
 exports.requireTosAcceptance = requireTosAcceptance;
 async function requireTos(tosId) {
+    if (!(0, auth_1.loggedIn)()) {
+        return;
+    }
     const res = await (0, firedata_1.getTosStatus)();
     if ((0, firedata_1.isProductTosAccepted)(res, tosId)) {
         return;

package/lib/rulesDeploy.js

@@ -71,13 +71,11 @@ class RulesDeploy {
             if (await (0, resourceManager_1.serviceAccountHasRoles)(projectNumber, saEmail, [CROSS_SERVICE_RULES_ROLE], true)) {
                 return;
             }
-            const addRole = this.options.force ||
-                (await (0, prompt_1.promptOnce)({
-                    type: "confirm",
-                    name: "rulesRole",
-                    message: `Cloud Storage for Firebase needs an IAM Role to use cross-service rules. Grant the new role?`,
-                    default: true,
-                }, this.options));
+            const addRole = await (0, prompt_1.confirm)({
+                message: `Cloud Storage for Firebase needs an IAM Role to use cross-service rules. Grant the new role?`,
+                default: true,
+                force: this.options.force,
+            });
             if (addRole) {
                 await (0, resourceManager_1.addServiceAccountToRoles)(projectNumber, saEmail, [CROSS_SERVICE_RULES_ROLE], true);
                 utils.logLabeledBullet(RulesetType[this.type], "updated service account for cross-service rules...");
@@ -119,14 +117,11 @@ class RulesDeploy {
             utils.logLabeledBullet(RulesetType[this.type], "quota exceeded error while uploading rules");
             const history = await gcp.rules.listAllRulesets(this.options.project);
             if (history.length > RULESET_COUNT_LIMIT) {
-                const confirm = this.options.force ||
-                    (await (0, prompt_1.promptOnce)({
-                        type: "confirm",
-                        name: "force",
-                        message: `You have ${history.length} rules, do you want to delete the oldest ${RULESETS_TO_GC} to free up space?`,
-                        default: false,
-                    }, this.options));
-                if (confirm) {
+                const confirmed = await (0, prompt_1.confirm)({
+                    message: `You have ${history.length} rules, do you want to delete the oldest ${RULESETS_TO_GC} to free up space?`,
+                    force: this.options.force,
+                });
+                if (confirmed) {
                     const releases = await gcp.rules.listAllReleases(this.options.project);
                     const unreleased = history.filter((ruleset) => {
                         return !releases.find((release) => release.rulesetName === ruleset.name);

package/lib/track.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.track = exports.cliSession = exports.vscodeSession = exports.emulatorSession = exports.trackVSCode = exports.trackEmulator = exports.trackGA4 = exports.usageEnabled = exports.GA4_PROPERTIES = void 0;
+exports.cliSession = exports.vscodeSession = exports.emulatorSession = exports.trackVSCode = exports.trackEmulator = exports.trackGA4 = exports.usageEnabled = exports.GA4_PROPERTIES = void 0;
 const node_fetch_1 = require("node-fetch");
-const ua = require("universal-analytics");
 const uuid_1 = require("uuid");
 const auth_1 = require("./auth");
 const configstore_1 = require("./configstore");
@@ -189,35 +188,3 @@ function isDebugMode() {
     }
     return false;
 }
-const FIREBASE_ANALYTICS_UA = process.env.FIREBASE_ANALYTICS_UA || "UA-29174744-3";
-let visitor;
-function ensureUAVisitor() {
-    if (!visitor) {
-        let anonId = configstore_1.configstore.get("analytics-uuid");
-        if (!anonId) {
-            anonId = (0, uuid_1.v4)();
-            configstore_1.configstore.set("analytics-uuid", anonId);
-        }
-        visitor = ua(FIREBASE_ANALYTICS_UA, anonId, {
-            strictCidFormat: false,
-            https: true,
-        });
-        visitor.set("cd1", process.platform);
-        visitor.set("cd2", process.version);
-        visitor.set("cd3", process.env.FIREPIT_VERSION || "none");
-    }
-}
-function track(action, label, duration = 0) {
-    ensureUAVisitor();
-    return new Promise((resolve) => {
-        if (usageEnabled() && configstore_1.configstore.get("tokens")) {
-            visitor.event("Firebase CLI " + pkg.version, action, label, duration).send(() => {
-                resolve();
-            });
-        }
-        else {
-            resolve();
-        }
-    });
-}
-exports.track = track;

package/lib/utils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.openInBrowser = exports.connectableHostname = exports.randomInt = exports.debounce = exports.last = exports.cloneDeep = exports.groupBy = exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.sleep = exports.promiseWithSpinner = exports.setupLoggers = exports.tryParse = exports.tryStringify = exports.promiseProps = exports.withTimeout = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.setVSCodeEnvVars = exports.getInheritedOption = exports.consoleUrl = exports.vscodeEnvVars = exports.envOverrides = exports.IS_WINDOWS = void 0;
-exports.updateOrCreateGitignore = exports.readSecretValue = exports.generateId = exports.wrappedSafeLoad = exports.readFileFromDirectory = exports.getHostnameFromUrl = exports.openInBrowserPopup = void 0;
+exports.promptForDirectory = exports.updateOrCreateGitignore = exports.readSecretValue = exports.generateId = exports.wrappedSafeLoad = exports.readFileFromDirectory = exports.getHostnameFromUrl = exports.openInBrowserPopup = void 0;
 const fs = require("fs-extra");
 const tty = require("tty");
 const path = require("node:path");
@@ -25,6 +25,7 @@ const logger_1 = require("./logger");
 const prompt_1 = require("./prompt");
 const templates_1 = require("./templates");
 const vsCodeUtils_1 = require("./vsCodeUtils");
+const fsutils_1 = require("./fsutils");
 exports.IS_WINDOWS = process.platform === "win32";
 const SUCCESS_CHAR = exports.IS_WINDOWS ? "+" : "✔";
 const WARNING_CHAR = exports.IS_WINDOWS ? "!" : "⚠";
@@ -577,10 +578,7 @@ function generateId(n = 6) {
 exports.generateId = generateId;
 function readSecretValue(prompt, dataFile) {
     if ((!dataFile || dataFile === "-") && tty.isatty(0)) {
-        return (0, prompt_1.promptOnce)({
-            type: "password",
-            message: prompt,
-        });
+        return (0, prompt_1.password)({ message: prompt });
     }
     let input = 0;
     if (dataFile && dataFile !== "-") {
@@ -612,3 +610,27 @@ function updateOrCreateGitignore(dirPath, entries) {
     fs.writeFileSync(gitignorePath, content);
 }
 exports.updateOrCreateGitignore = updateOrCreateGitignore;
+async function promptForDirectory(args) {
+    let dir = "";
+    while (!dir) {
+        const promptPath = await (0, prompt_1.input)(args.message);
+        let target;
+        if (args.relativeTo) {
+            target = path.resolve(args.relativeTo, promptPath);
+        }
+        else {
+            target = args.config.path(promptPath);
+        }
+        if ((0, fsutils_1.fileExistsSync)(target)) {
+            logger_1.logger.error(`Expected a directory, but ${target} is a file. Please provide a path to a directory.`);
+        }
+        else if (!(0, fsutils_1.dirExistsSync)(target)) {
+            logger_1.logger.error(`Directory ${target} not found. Please provide a path to a directory`);
+        }
+        else {
+            dir = target;
+        }
+    }
+    return dir;
+}
+exports.promptForDirectory = promptForDirectory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "14.2.2",
+  "version": "14.3.1",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -63,6 +63,7 @@
     "@electric-sql/pglite": "^0.2.16",
     "@google-cloud/cloud-sql-connector": "^1.3.3",
     "@google-cloud/pubsub": "^4.5.0",
+    "@inquirer/prompts": "^7.4.0",
     "@modelcontextprotocol/sdk": "^1.10.2",
     "abort-controller": "^3.0.0",
     "ajv": "^8.17.1",
@@ -91,8 +92,6 @@
     "gaxios": "^6.7.0",
     "glob": "^10.4.1",
     "google-auth-library": "^9.11.0",
-    "inquirer": "^8.2.6",
-    "inquirer-autocomplete-prompt": "^2.0.1",
     "js-yaml": "^3.14.1",
     "jsonwebtoken": "^9.0.0",
     "leven": "^3.1.0",

package/lib/mcp/tools/project/index.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.projectTools = void 0;
-const get_project_js_1 = require("./get_project.js");
-const get_sdk_config_js_1 = require("./get_sdk_config.js");
-const list_apps_js_1 = require("./list_apps.js");
-exports.projectTools = [get_project_js_1.get_project, list_apps_js_1.list_apps, get_sdk_config_js_1.get_sdk_config];