firebase-tools 13.31.1 → 13.31.2

package/lib/dataconnect/build.js

@@ -34,7 +34,7 @@ async function handleBuildErrors(errors, nonInteractive, force, dryRun) {
     const requiredForces = errors.filter((w) => { var _a; return ((_a = w.extensions) === null || _a === void 0 ? void 0 : _a.warningLevel) === "REQUIRE_FORCE"; });
     if (requiredForces.length && !force) {
         utils.logLabeledError("dataconnect", `There are changes in your schema or connectors that will result in broken behavior:\n` +
-            (0, graphqlError_1.prettifyWithWorkaround)(requiredForces));
+            (0, graphqlError_1.prettifyTable)(requiredForces));
         throw new error_1.FirebaseError("Rerun this command with --force to deploy these changes.");
     }
     const interactiveAcks = errors.filter((w) => { var _a; return ((_a = w.extensions) === null || _a === void 0 ? void 0 : _a.warningLevel) === "INTERACTIVE_ACK"; });
@@ -44,14 +44,14 @@ async function handleBuildErrors(errors, nonInteractive, force, dryRun) {
         { name: "Reject changes and abort", value: "abort" },
     ];
     if (requiredAcks.length) {
-        utils.logLabeledWarning("dataconnect", `There are changes in your schema or connectors that may break your existing applications. These changes require explicit acknowledgement to proceed. You may either reject the changes and update your sources with the suggested workaround(s), if any, or acknowledge these changes and proceed with the deployment:\n` +
-            (0, graphqlError_1.prettifyWithWorkaround)(requiredAcks));
+        utils.logLabeledWarning("dataconnect", `There are changes in your schema or connectors that may break your existing applications or introduce operations that are insecure. These changes require explicit acknowledgement to proceed. You may either reject the changes and update your sources with the suggested workaround(s), if any, or acknowledge these changes and proceed with the deployment:\n` +
+            (0, graphqlError_1.prettifyTable)(requiredAcks));
         if (nonInteractive && !force) {
-            throw new error_1.FirebaseError("Explicit acknowledgement required for breaking schema or connector changes. Rerun this command with --force to deploy these changes.");
+            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)({
-                message: "Would you like to proceed with these breaking changes?",
+                message: "Would you like to proceed with these changes?",
                 type: "list",
                 choices,
                 default: "abort",
@@ -62,8 +62,8 @@ async function handleBuildErrors(errors, nonInteractive, force, dryRun) {
         }
     }
     if (interactiveAcks.length) {
-        utils.logLabeledWarning("dataconnect", `There are changes in your schema or connectors that may cause unexpected behavior in your existing applications:\n` +
-            interactiveAcks.map(graphqlError_1.prettify).join("\n"));
+        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)({
                 message: "Would you like to proceed with these changes?",

package/lib/dataconnect/graphqlError.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prettifyWithWorkaround = exports.prettify = void 0;
+exports.prettifyTable = exports.prettify = void 0;
 const Table = require("cli-table3");
 function prettify(err) {
     var _a, _b, _c, _d;
-    const message = err.message;
+    let message = err.message;
     let header = (_b = (_a = err.extensions) === null || _a === void 0 ? void 0 : _a.file) !== null && _b !== void 0 ? _b : "";
     if (err.locations && err.locations.length) {
         const line = (_d = (_c = err.locations[0]) === null || _c === void 0 ? void 0 : _c.line) !== null && _d !== void 0 ? _d : "";
@@ -12,33 +12,60 @@ function prettify(err) {
             header += `:${line}`;
         }
     }
+    if (err.path && err.path.length) {
+        let pathStr = "On ";
+        for (let i = 0; i < err.path.length; i++) {
+            if (typeof err.path[i] === "string") {
+                if (i === 0) {
+                    pathStr += err.path[i];
+                }
+                else {
+                    pathStr = `${pathStr}.${err.path[i]}`;
+                }
+            }
+            else {
+                pathStr = `${pathStr}[${err.path[i]}]`;
+            }
+        }
+        message = `${pathStr}: ${message}`;
+    }
     return header.length ? `${header}: ${message}` : message;
 }
 exports.prettify = prettify;
-function prettifyWithWorkaround(errs) {
+function splitIssueMessage(err) {
+    const msg = err.message.split(": ");
+    if (msg.length >= 2) {
+        return [msg[0], msg.slice(1).join(":")];
+    }
+    return ["", err.message];
+}
+function prettifyTable(errs) {
     var _a, _b;
     const table = new Table({
-        head: ["Issue", "Workaround", "Reason"],
+        head: ["Type", "Issue", "Workaround", "Reason"],
         style: { head: ["yellow"] },
-        colWidths: [50, 50, 50],
+        colWidths: [20, 50, 50, 50],
         wordWrap: true,
     });
+    errs.sort((a, b) => a.message.localeCompare(b.message));
     for (const e of errs) {
+        const msg = splitIssueMessage(e);
+        e.message = msg[1];
         if (!((_b = (_a = e.extensions) === null || _a === void 0 ? void 0 : _a.workarounds) === null || _b === void 0 ? void 0 : _b.length)) {
-            table.push([prettify(e), "", ""]);
+            table.push([msg[0], prettify(e), "", ""]);
         }
         else {
             const workarounds = e.extensions.workarounds;
             for (let i = 0; i < workarounds.length; i++) {
                 if (i === 0) {
-                    table.push([prettify(e), workarounds[i].description, workarounds[i].reason]);
+                    table.push([msg[0], prettify(e), workarounds[i].description, workarounds[i].reason]);
                 }
                 else {
-                    table.push(["", workarounds[i].description, workarounds[i].reason]);
+                    table.push(["", "", workarounds[i].description, workarounds[i].reason]);
                 }
             }
         }
     }
     return table.toString();
 }
-exports.prettifyWithWorkaround = prettifyWithWorkaround;
+exports.prettifyTable = prettifyTable;

package/lib/emulator/apphosting/serve.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.start = void 0;
+exports.getEmulatorEnvs = exports.start = void 0;
 const net_1 = require("net");
 const portUtils_1 = require("../portUtils");
 const developmentServer_1 = require("./developmentServer");
@@ -50,7 +50,8 @@ function availablePort(host, port) {
 }
 function getEmulatorEnvs() {
     const envs = {};
-    const emulatorInfos = registry_1.EmulatorRegistry.listRunningWithInfo();
+    const emulatorInfos = registry_1.EmulatorRegistry.listRunningWithInfo().filter((emulator) => emulator.name !== types_1.Emulators.APPHOSTING);
     (0, env_1.setEnvVarsForEmulators)(envs, emulatorInfos);
     return envs;
 }
+exports.getEmulatorEnvs = getEmulatorEnvs;

package/lib/emulator/dataconnect/pgliteServer.js

@@ -79,6 +79,9 @@ class PostgresServer {
     }
     async getDb() {
         if (!this.db) {
+            if (this.dataDirectory && !fs.existsSync(this.dataDirectory)) {
+                fs.mkdirSync(this.dataDirectory, { recursive: true });
+            }
             const vector = (await dynamicImport("@electric-sql/pglite/vector")).vector;
             const uuidOssp = (await dynamicImport("@electric-sql/pglite/contrib/uuid_ossp")).uuid_ossp;
             const pgliteArgs = {

package/lib/emulator/dataconnectEmulator.js

@@ -70,7 +70,7 @@ class DataConnectEmulator {
                     dataDirectory = this.args.config.path(dataDirectory);
                 }
                 const postgresDumpPath = this.args.importPath
-                    ? path.join(this.args.config.path(this.args.importPath), "postgres.tar.gz")
+                    ? path.join(this.args.importPath, "postgres.tar.gz")
                     : undefined;
                 this.postgresServer = new pgliteServer_1.PostgresServer({
                     dataDirectory,

package/lib/emulator/downloadableEmulators.js

@@ -48,20 +48,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.8.1",
-            expectedSize: 25469696,
-            expectedChecksum: "dc8b5c38838ebe667e2e93c51c14578a",
+            version: "1.8.2",
+            expectedSize: 25506560,
+            expectedChecksum: "2db676cb9d30b289897ffb7e5aa1ef63",
         }
         : process.platform === "win32"
             ? {
-                version: "1.8.1",
-                expectedSize: 25904128,
-                expectedChecksum: "4ba969a49ade413c3f68f5bb0287af22",
+                version: "1.8.2",
+                expectedSize: 25936384,
+                expectedChecksum: "08e6ca0ad20893b565fb57effd687eb8",
             }
             : {
-                version: "1.8.1",
-                expectedSize: 25383064,
-                expectedChecksum: "1117c1c3cc0fca725dd7a869c1d2e90f",
+                version: "1.8.2",
+                expectedSize: 25415832,
+                expectedChecksum: "24e0eb78acb619ed91f6d268dd18df05",
             },
 };
 exports.DownloadDetails = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.31.1",
+  "version": "13.31.2",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {