firebase-tools 15.1.0 → 15.2.0

package/lib/emulator/controller.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.exportEmulatorData = exports.startAll = exports.shouldStart = exports.filterEmulatorTargets = exports.cleanShutdown = exports.onExit = exports.exportOnExit = void 0;
+exports.exportOnExit = exportOnExit;
+exports.onExit = onExit;
+exports.cleanShutdown = cleanShutdown;
+exports.filterEmulatorTargets = filterEmulatorTargets;
+exports.shouldStart = shouldStart;
+exports.startAll = startAll;
+exports.exportEmulatorData = exportEmulatorData;
 const clc = require("colorette");
 const fs = require("fs");
 const path = require("path");
@@ -65,17 +71,14 @@ async function exportOnExit(options) {
         }
     }
 }
-exports.exportOnExit = exportOnExit;
 async function onExit(options) {
     await exportOnExit(options);
 }
-exports.onExit = onExit;
 async function cleanShutdown() {
     emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.HUB).logLabeled("BULLET", "emulators", "Shutting down emulators.");
     await registry_1.EmulatorRegistry.stopAll();
     await (0, webhook_1.sendVSCodeMessage)({ message: webhook_1.VSCODE_MESSAGE.EMULATORS_SHUTDOWN });
 }
-exports.cleanShutdown = cleanShutdown;
 function filterEmulatorTargets(options) {
     let targets = [...types_1.ALL_SERVICE_EMULATORS];
     targets.push(types_1.Emulators.EXTENSIONS);
@@ -94,9 +97,7 @@ function filterEmulatorTargets(options) {
     }
     return targets;
 }
-exports.filterEmulatorTargets = filterEmulatorTargets;
 function shouldStart(options, name) {
-    var _a, _b;
     if (name === types_1.Emulators.HUB) {
         return true;
     }
@@ -106,7 +107,7 @@ function shouldStart(options, name) {
         if (options.ui) {
             return true;
         }
-        if (((_b = (_a = options.config.src.emulators) === null || _a === void 0 ? void 0 : _a.ui) === null || _b === void 0 ? void 0 : _b.enabled) === false) {
+        if (options.config.src.emulators?.ui?.enabled === false) {
             return false;
         }
         return targets.some((target) => types_1.EMULATORS_SUPPORTED_BY_UI.includes(target));
@@ -127,7 +128,6 @@ function shouldStart(options, name) {
     }
     return emulatorInTargets;
 }
-exports.shouldStart = shouldStart;
 function findExportMetadata(importPath) {
     const pathExists = fs.existsSync(importPath);
     if (!pathExists) {
@@ -169,11 +169,10 @@ function findExportMetadata(importPath) {
     }
 }
 async function startAll(options, showUI = true, runningTestScript = false) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     const targets = filterEmulatorTargets(options);
     options.targets = targets;
-    const singleProjectModeEnabled = ((_a = options.config.src.emulators) === null || _a === void 0 ? void 0 : _a.singleProjectMode) === undefined ||
-        ((_b = options.config.src.emulators) === null || _b === void 0 ? void 0 : _b.singleProjectMode);
+    const singleProjectModeEnabled = options.config.src.emulators?.singleProjectMode === undefined ||
+        options.config.src.emulators?.singleProjectMode;
     if (targets.length === 0) {
         throw new error_1.FirebaseError(`No emulators to start, run ${clc.bold("firebase init emulators")} to get started.`);
     }
@@ -260,7 +259,7 @@ async function startAll(options, showUI = true, runningTestScript = false) {
             const config = getListenConfig(options, emulator);
             listenConfig[emulator] = config;
             if (emulator === types_1.Emulators.FIRESTORE) {
-                const wsPortConfig = (_d = (_c = options.config.src.emulators) === null || _c === void 0 ? void 0 : _c.firestore) === null || _d === void 0 ? void 0 : _d.websocketPort;
+                const wsPortConfig = options.config.src.emulators?.firestore?.websocketPort;
                 listenConfig["firestore.websocket"] = {
                     host: config.host,
                     port: wsPortConfig || 9150,
@@ -268,7 +267,7 @@ async function startAll(options, showUI = true, runningTestScript = false) {
                 };
             }
             if (emulator === types_1.Emulators.DATACONNECT && !(0, api_1.dataConnectLocalConnString)()) {
-                const pglitePortConfig = (_f = (_e = options.config.src.emulators) === null || _e === void 0 ? void 0 : _e.dataconnect) === null || _f === void 0 ? void 0 : _f.postgresPort;
+                const pglitePortConfig = options.config.src.emulators?.dataconnect?.postgresPort;
                 listenConfig["dataconnect.postgres"] = {
                     host: config.host,
                     port: pglitePortConfig || 5432,
@@ -321,7 +320,7 @@ async function startAll(options, showUI = true, runningTestScript = false) {
         }
     }
     const hostingConfig = options.config.get("hosting");
-    if (Array.isArray(hostingConfig) ? hostingConfig.some((it) => it.source) : hostingConfig === null || hostingConfig === void 0 ? void 0 : hostingConfig.source) {
+    if (Array.isArray(hostingConfig) ? hostingConfig.some((it) => it.source) : hostingConfig?.source) {
         experiments.assertEnabled("webframeworks", "emulate a web framework");
         const emulators = [];
         for (const e of types_1.ALL_SERVICE_EMULATORS) {
@@ -342,7 +341,7 @@ async function startAll(options, showUI = true, runningTestScript = false) {
         for (const cfg of functionsCfg) {
             const localCfg = (0, projectConfig_1.requireLocal)(cfg, "Remote sources are not supported in the Functions emulator.");
             const functionsDir = path.join(projectDir, localCfg.source);
-            const runtime = ((_g = options.extDevRuntime) !== null && _g !== void 0 ? _g : cfg.runtime);
+            const runtime = (options.extDevRuntime ?? cfg.runtime);
             if (runtime && !(0, supported_1.isRuntime)(runtime)) {
                 throw new error_1.FirebaseError(`Cannot load functions from ${functionsDir} because it has invalid runtime ${runtime}`);
             }
@@ -351,7 +350,9 @@ async function startAll(options, showUI = true, runningTestScript = false) {
                 runtime,
                 codebase: localCfg.codebase,
                 prefix: localCfg.prefix,
-                env: Object.assign({}, options.extDevEnv),
+                env: {
+                    ...options.extDevEnv,
+                },
                 secretEnv: [],
                 predefinedTriggers: options.extDevTriggers,
                 ignore: localCfg.ignore,
@@ -366,7 +367,12 @@ async function startAll(options, showUI = true, runningTestScript = false) {
     const account = (0, auth_1.getProjectDefaultAccount)(options.projectRoot);
     if (emulatableBackends.length) {
         if (!listenForEmulator.functions || !listenForEmulator.eventarc || !listenForEmulator.tasks) {
-            listenForEmulator = await (0, portUtils_1.resolveHostAndAssignPorts)(Object.assign(Object.assign({}, listenForEmulator), { functions: (_h = listenForEmulator.functions) !== null && _h !== void 0 ? _h : getListenConfig(options, types_1.Emulators.FUNCTIONS), eventarc: (_j = listenForEmulator.eventarc) !== null && _j !== void 0 ? _j : getListenConfig(options, types_1.Emulators.EVENTARC), tasks: (_k = listenForEmulator.eventarc) !== null && _k !== void 0 ? _k : getListenConfig(options, types_1.Emulators.TASKS) }));
+            listenForEmulator = await (0, portUtils_1.resolveHostAndAssignPorts)({
+                ...listenForEmulator,
+                functions: listenForEmulator.functions ?? getListenConfig(options, types_1.Emulators.FUNCTIONS),
+                eventarc: listenForEmulator.eventarc ?? getListenConfig(options, types_1.Emulators.EVENTARC),
+                tasks: listenForEmulator.eventarc ?? getListenConfig(options, types_1.Emulators.TASKS),
+            });
             hubLogger.log("DEBUG", "late-assigned ports for functions and eventarc emulators", {
                 user: listenForEmulator,
             });
@@ -620,13 +626,13 @@ async function startAll(options, showUI = true, runningTestScript = false) {
         });
         await startEmulator(hostingEmulator);
     }
-    const apphostingEmulatorConfig = (_l = options.config.src.emulators) === null || _l === void 0 ? void 0 : _l[types_1.Emulators.APPHOSTING];
+    const apphostingEmulatorConfig = options.config.src.emulators?.[types_1.Emulators.APPHOSTING];
     if (listenForEmulator.apphosting) {
-        const rootDirectory = apphostingEmulatorConfig === null || apphostingEmulatorConfig === void 0 ? void 0 : apphostingEmulatorConfig.rootDirectory;
-        const backendRoot = (0, projectPath_1.resolveProjectPath)({}, rootDirectory !== null && rootDirectory !== void 0 ? rootDirectory : "./");
+        const rootDirectory = apphostingEmulatorConfig?.rootDirectory;
+        const backendRoot = (0, projectPath_1.resolveProjectPath)({}, rootDirectory ?? "./");
         let apphostingConfig;
         if (Array.isArray(options.config.src.apphosting)) {
-            const matchingAppHostingConfig = options.config.src.apphosting.filter((config) => { var _a; return (0, projectPath_1.resolveProjectPath)({}, path.join(".", (_a = config.rootDir) !== null && _a !== void 0 ? _a : "/")) === backendRoot; });
+            const matchingAppHostingConfig = options.config.src.apphosting.filter((config) => (0, projectPath_1.resolveProjectPath)({}, path.join(".", config.rootDir ?? "/")) === backendRoot);
             if (matchingAppHostingConfig.length === 1) {
                 apphostingConfig = matchingAppHostingConfig[0];
             }
@@ -635,16 +641,16 @@ async function startAll(options, showUI = true, runningTestScript = false) {
             apphostingConfig = options.config.src.apphosting;
         }
         const apphostingAddr = legacyGetFirstAddr(types_1.Emulators.APPHOSTING);
-        if (apphostingEmulatorConfig === null || apphostingEmulatorConfig === void 0 ? void 0 : apphostingEmulatorConfig.startCommandOverride) {
+        if (apphostingEmulatorConfig?.startCommandOverride) {
             const apphostingLogger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.APPHOSTING);
             apphostingLogger.logLabeled("WARN", types_1.Emulators.APPHOSTING, "The `firebase.json#emulators.apphosting.startCommandOverride` config is deprecated, please use `firebase.json#emulators.apphosting.startCommand` to set a custom start command instead");
         }
         const apphostingEmulator = new apphosting_1.AppHostingEmulator({
             projectId: options.project,
-            backendId: apphostingConfig === null || apphostingConfig === void 0 ? void 0 : apphostingConfig.backendId,
+            backendId: apphostingConfig?.backendId,
             host: apphostingAddr.host,
             port: apphostingAddr.port,
-            startCommand: (apphostingEmulatorConfig === null || apphostingEmulatorConfig === void 0 ? void 0 : apphostingEmulatorConfig.startCommand) || (apphostingEmulatorConfig === null || apphostingEmulatorConfig === void 0 ? void 0 : apphostingEmulatorConfig.startCommandOverride),
+            startCommand: apphostingEmulatorConfig?.startCommand || apphostingEmulatorConfig?.startCommandOverride,
             rootDirectory,
             options,
         });
@@ -687,14 +693,12 @@ async function startAll(options, showUI = true, runningTestScript = false) {
     });
     return { deprecationNotices };
 }
-exports.startAll = startAll;
 function getListenConfig(options, emulator) {
-    var _a, _b, _c, _d;
-    let host = ((_b = (_a = options.config.src.emulators) === null || _a === void 0 ? void 0 : _a[emulator]) === null || _b === void 0 ? void 0 : _b.host) || constants_1.Constants.getDefaultHost();
+    let host = options.config.src.emulators?.[emulator]?.host || constants_1.Constants.getDefaultHost();
     if (host === "localhost" && utils.isRunningInWSL()) {
         host = "127.0.0.1";
     }
-    const portVal = (_d = (_c = options.config.src.emulators) === null || _c === void 0 ? void 0 : _c[emulator]) === null || _d === void 0 ? void 0 : _d.port;
+    const portVal = options.config.src.emulators?.[emulator]?.port;
     let port;
     let portFixed;
     if (portVal) {
@@ -759,4 +763,3 @@ async function exportEmulatorData(exportPath, options, initiatedBy) {
     }
     utils.logSuccess("Export complete");
 }
-exports.exportEmulatorData = exportEmulatorData;

package/lib/emulator/databaseEmulator.js

@@ -121,7 +121,6 @@ class DatabaseEmulator {
         });
     }
     async updateRules(instance, rulesPath) {
-        var _a;
         const content = fs.readFileSync(rulesPath, "utf8");
         try {
             await registry_1.EmulatorRegistry.client(types_1.Emulators.DATABASE).put(`/.settings/rules.json`, content, {
@@ -133,7 +132,7 @@ class DatabaseEmulator {
             if (e.context && e.context.body) {
                 throw e.context.body.error;
             }
-            throw (_a = e.original) !== null && _a !== void 0 ? _a : e;
+            throw e.original ?? e;
         }
     }
     prettyPrintRulesError(filePath, error) {

package/lib/emulator/dataconnect/pgliteServer.js

@@ -1,25 +1,7 @@
 "use strict";
-var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
-var __asyncValues = (this && this.__asyncValues) || function (o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-};
-var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var g = generator.apply(thisArg, _arguments || []), i, q = [];
-    return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
-    function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
-    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
-    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
-    function fulfill(value) { resume("next", value); }
-    function reject(value) { resume("throw", value); }
-    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PGliteExtendedQueryPatch = exports.fromNodeSocket = exports.PostgresServer = exports.TRUNCATE_TABLES_SQL = void 0;
+exports.PGliteExtendedQueryPatch = exports.PostgresServer = exports.TRUNCATE_TABLES_SQL = void 0;
+exports.fromNodeSocket = fromNodeSocket;
 const pglite_1 = require("@electric-sql/pglite");
 const { dynamicImport } = require(true && "../../dynamicImport");
 const net = require("node:net");
@@ -51,38 +33,18 @@ class PostgresServer {
             const connection = await fromNodeSocket(socket, {
                 serverVersion: "17.4 (PGlite 0.3.3)",
                 auth: { method: "trust" },
-                onMessage(data, { isAuthenticated }) {
-                    return __asyncGenerator(this, arguments, function* onMessage_1() {
-                        var _a, e_1, _b, _c;
-                        if (!isAuthenticated) {
-                            return yield __await(void 0);
-                        }
-                        const db = yield __await(getDb());
-                        if (data[0] === pg_gateway_1.FrontendMessageCode.Terminate) {
-                            yield __await(db.query("DEALLOCATE ALL"));
-                        }
-                        const response = yield __await(db.execProtocolRaw(data));
-                        try {
-                            for (var _d = true, _e = __asyncValues(extendedQueryPatch.filterResponse(data, response)), _f; _f = yield __await(_e.next()), _a = _f.done, !_a;) {
-                                _c = _f.value;
-                                _d = false;
-                                try {
-                                    const message = _c;
-                                    yield yield __await(message);
-                                }
-                                finally {
-                                    _d = true;
-                                }
-                            }
-                        }
-                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                        finally {
-                            try {
-                                if (!_d && !_a && (_b = _e.return)) yield __await(_b.call(_e));
-                            }
-                            finally { if (e_1) throw e_1.error; }
-                        }
-                    });
+                async *onMessage(data, { isAuthenticated }) {
+                    if (!isAuthenticated) {
+                        return;
+                    }
+                    const db = await getDb();
+                    if (data[0] === pg_gateway_1.FrontendMessageCode.Terminate) {
+                        await db.query("DEALLOCATE ALL");
+                    }
+                    const response = await db.execProtocolRaw(data);
+                    for await (const message of extendedQueryPatch.filterResponse(data, response)) {
+                        yield message;
+                    }
                 },
             });
             const extendedQueryPatch = new PGliteExtendedQueryPatch(connection);
@@ -132,7 +94,7 @@ class PostgresServer {
         logger_1.logger.info("Opening database with Postgres 16...");
         const extensions = await this.getExtensions();
         const dataDir = this.baseDataDirectory;
-        const oldDb = new PGlite02(Object.assign(Object.assign({}, pgliteArgs), { dataDir }));
+        const oldDb = new PGlite02({ ...pgliteArgs, dataDir });
         await oldDb.waitReady;
         const oldVersion = await oldDb.query("SELECT version();");
         logger_1.logger.debug(`Old database version: ${oldVersion.rows[0].version}`);
@@ -155,7 +117,7 @@ class PostgresServer {
         logger_1.logger.info("If you need to use an older version of the Firebase CLI, you can restore from that directory.");
         logger_1.logger.info("Creating new database with Postgres 17...");
         const pg17Dir = this.getVersionedDataDir(17);
-        const newDb = new pglite_1.PGlite(Object.assign(Object.assign({}, pgliteArgs), { dataDir: pg17Dir }));
+        const newDb = new pglite_1.PGlite({ ...pgliteArgs, dataDir: pg17Dir });
         await newDb.waitReady;
         logger_1.logger.info("Importing data into new database...");
         const dumpText = await dumpResult.text();
@@ -197,14 +159,14 @@ class PostgresServer {
             }
         }
         try {
-            const db = new pglite_1.PGlite(Object.assign(Object.assign({}, baseArgs), { dataDir: pg17Dir }));
+            const db = new pglite_1.PGlite({ ...baseArgs, dataDir: pg17Dir });
             await db.waitReady;
             return db;
         }
         catch (err) {
             if (pg17Dir && (0, error_1.hasMessage)(err) && /Database already exists/.test(err.message)) {
                 fs.rmSync(pg17Dir, { force: true, recursive: true });
-                const db = new pglite_1.PGlite(Object.assign(Object.assign({}, baseArgs), { dataDir: pg17Dir }));
+                const db = new pglite_1.PGlite({ ...baseArgs, dataDir: pg17Dir });
                 await db.waitReady;
                 return db;
             }
@@ -234,10 +196,12 @@ async function fromNodeSocket(socket, options) {
     const rs = node_stream_1.Readable.toWeb(socket);
     const ws = node_stream_1.Writable.toWeb(socket);
     const opts = options
-        ? Object.assign({}, options) : undefined;
+        ? {
+            ...options,
+        }
+        : undefined;
     return new pg_gateway_1.PostgresConnection({ readable: rs, writable: ws }, opts);
 }
-exports.fromNodeSocket = fromNodeSocket;
 class PGliteExtendedQueryPatch {
     constructor(connection) {
         this.connection = connection;
@@ -245,55 +209,35 @@ class PGliteExtendedQueryPatch {
         this.eqpErrored = false;
         this.pgliteDebugLog = fs.createWriteStream("pglite-debug.log");
     }
-    filterResponse(message, response) {
-        return __asyncGenerator(this, arguments, function* filterResponse_1() {
-            var _a, e_2, _b, _c;
-            const pipelineStartMessages = [
-                pg_gateway_1.FrontendMessageCode.Parse,
-                pg_gateway_1.FrontendMessageCode.Bind,
-                pg_gateway_1.FrontendMessageCode.Close,
-            ];
-            const decoded = decoder.write(message);
-            this.pgliteDebugLog.write("Front: " + decoded);
-            if (pipelineStartMessages.includes(message[0])) {
-                this.isExtendedQuery = true;
-            }
-            if (message[0] === pg_gateway_1.FrontendMessageCode.Sync) {
-                this.isExtendedQuery = false;
-                this.eqpErrored = false;
+    async *filterResponse(message, response) {
+        const pipelineStartMessages = [
+            pg_gateway_1.FrontendMessageCode.Parse,
+            pg_gateway_1.FrontendMessageCode.Bind,
+            pg_gateway_1.FrontendMessageCode.Close,
+        ];
+        const decoded = decoder.write(message);
+        this.pgliteDebugLog.write("Front: " + decoded);
+        if (pipelineStartMessages.includes(message[0])) {
+            this.isExtendedQuery = true;
+        }
+        if (message[0] === pg_gateway_1.FrontendMessageCode.Sync) {
+            this.isExtendedQuery = false;
+            this.eqpErrored = false;
+        }
+        for await (const bm of (0, pg_gateway_1.getMessages)(response)) {
+            if (this.eqpErrored) {
+                continue;
             }
-            try {
-                for (var _d = true, _e = __asyncValues((0, pg_gateway_1.getMessages)(response)), _f; _f = yield __await(_e.next()), _a = _f.done, !_a;) {
-                    _c = _f.value;
-                    _d = false;
-                    try {
-                        const bm = _c;
-                        if (this.eqpErrored) {
-                            continue;
-                        }
-                        if (this.isExtendedQuery && bm[0] === pg_gateway_1.BackendMessageCode.ErrorMessage) {
-                            this.eqpErrored = true;
-                        }
-                        if (this.isExtendedQuery && bm[0] === pg_gateway_1.BackendMessageCode.ReadyForQuery) {
-                            this.pgliteDebugLog.write("Filtered: " + decoder.write(bm));
-                            continue;
-                        }
-                        this.pgliteDebugLog.write("Sent: " + decoder.write(bm));
-                        yield yield __await(bm);
-                    }
-                    finally {
-                        _d = true;
-                    }
-                }
+            if (this.isExtendedQuery && bm[0] === pg_gateway_1.BackendMessageCode.ErrorMessage) {
+                this.eqpErrored = true;
             }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
-            finally {
-                try {
-                    if (!_d && !_a && (_b = _e.return)) yield __await(_b.call(_e));
-                }
-                finally { if (e_2) throw e_2.error; }
+            if (this.isExtendedQuery && bm[0] === pg_gateway_1.BackendMessageCode.ReadyForQuery) {
+                this.pgliteDebugLog.write("Filtered: " + decoder.write(bm));
+                continue;
             }
-        });
+            this.pgliteDebugLog.write("Sent: " + decoder.write(bm));
+            yield bm;
+        }
     }
 }
 exports.PGliteExtendedQueryPatch = PGliteExtendedQueryPatch;

package/lib/emulator/dataconnectEmulator.js

@@ -30,7 +30,6 @@ class DataConnectEmulator {
         this.emulatorClient = new DataConnectEmulatorClient();
     }
     async start() {
-        var _a, _b, _c;
         let resolvedConfigDir;
         try {
             resolvedConfigDir = this.args.config.path(this.args.configDir);
@@ -62,10 +61,10 @@ class DataConnectEmulator {
         this.usingExistingEmulator = false;
         if (this.args.autoconnectToPostgres) {
             const info = await (0, load_1.load)(this.args.projectId, this.args.config, this.args.configDir);
-            const dbId = ((_a = (0, types_2.mainSchemaYaml)(info.dataConnectYaml).datasource.postgresql) === null || _a === void 0 ? void 0 : _a.database) || "postgres";
+            const dbId = (0, types_2.mainSchemaYaml)(info.dataConnectYaml).datasource.postgresql?.database || "postgres";
             const serviceId = info.dataConnectYaml.serviceId;
-            const pgPort = (_b = this.args.postgresListen) === null || _b === void 0 ? void 0 : _b[0].port;
-            const pgHost = (_c = this.args.postgresListen) === null || _c === void 0 ? void 0 : _c[0].address;
+            const pgPort = this.args.postgresListen?.[0].port;
+            const pgHost = this.args.postgresListen?.[0].address;
             let connStr = (0, api_1.dataConnectLocalConnString)();
             if (connStr) {
                 this.logger.logLabeled("INFO", "dataconnect", `FIREBASE_DATACONNECT_POSTGRESQL_STRING is set to ${clc.bold(connStr)} - using that instead of starting a new database`);
@@ -188,7 +187,6 @@ class DataConnectEmulator {
         });
     }
     static async build(args) {
-        var _a;
         const commandInfo = await (0, downloadableEmulators_1.downloadIfNecessary)(types_1.Emulators.DATACONNECT);
         const cmd = ["--logtostderr", "-v=2", "build", `--config_dir=${args.configDir}`];
         if (args.projectId) {
@@ -216,7 +214,7 @@ class DataConnectEmulator {
             return JSON.parse(res.stdout);
         }
         catch (err) {
-            throw new error_1.FirebaseError(`Unable to parse 'fdc build' output: ${(_a = res.stdout) !== null && _a !== void 0 ? _a : res.stderr}`);
+            throw new error_1.FirebaseError(`Unable to parse 'fdc build' output: ${res.stdout ?? res.stderr}`);
         }
     }
     async connectToPostgres(connectionString, database, serviceId) {
@@ -256,7 +254,7 @@ class DataConnectEmulator {
                 credsEnv.GOOGLE_APPLICATION_CREDENTIALS = defaultCredPath;
             }
         }
-        return Object.assign(Object.assign(Object.assign({}, process.env), extraEnv), credsEnv);
+        return { ...process.env, ...extraEnv, ...credsEnv };
     }
 }
 exports.DataConnectEmulator = DataConnectEmulator;
@@ -265,7 +263,6 @@ class DataConnectEmulatorClient {
         this.client = undefined;
     }
     async configureEmulator(body) {
-        var _a, _b;
         if (!this.client) {
             this.client = registry_1.EmulatorRegistry.client(types_1.Emulators.DATACONNECT);
         }
@@ -275,7 +272,7 @@ class DataConnectEmulatorClient {
         }
         catch (err) {
             if (err.status === 500) {
-                throw new error_1.FirebaseError(`Data Connect emulator: ${(_b = (_a = err === null || err === void 0 ? void 0 : err.context) === null || _a === void 0 ? void 0 : _a.body) === null || _b === void 0 ? void 0 : _b.message}`);
+                throw new error_1.FirebaseError(`Data Connect emulator: ${err?.context?.body?.message}`);
             }
             throw err;
         }

package/lib/emulator/download.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadExtensionVersion = exports.downloadEmulator = void 0;
+exports.downloadEmulator = downloadEmulator;
+exports.downloadExtensionVersion = downloadExtensionVersion;
 const crypto = require("crypto");
 const fs = require("fs-extra");
 const path = require("path");
@@ -35,7 +36,6 @@ async function downloadEmulator(name) {
     fs.chmodSync(executablePath, 0o755);
     removeOldFiles(name, emulator);
 }
-exports.downloadEmulator = downloadEmulator;
 async function downloadExtensionVersion(extensionVersionRef, sourceDownloadUri, targetDir) {
     const emulatorLogger = emulatorLogger_1.EmulatorLogger.forExtension({ ref: extensionVersionRef });
     emulatorLogger.logLabeled("BULLET", "extensions", `Starting download for ${extensionVersionRef} source code to ${targetDir}..`);
@@ -52,7 +52,6 @@ async function downloadExtensionVersion(extensionVersionRef, sourceDownloadUri,
     emulatorLogger.logLabeled("BULLET", "extensions", `Downloaded to ${targetDir}...`);
     await new Promise((resolve) => setTimeout(resolve, 1000));
 }
-exports.downloadExtensionVersion = downloadExtensionVersion;
 function removeOldFiles(name, emulator, removeAllVersions = false) {
     const currentLocalPath = emulator.downloadPath;
     const currentUnzipPath = emulator.unzipDir;

package/lib/emulator/downloadableEmulatorInfo.json

@@ -44,13 +44,13 @@
         }
     },
     "pubsub": {
-        "version": "0.8.17",
-        "expectedSize": 65162324,
-        "expectedChecksum": "a88ec6424e49af459b5c8a3657d69c06",
-        "expectedChecksumSHA256": "72a49d14ee6cd4c1a0fee4a46f520fe4d7465396a155c61abc0103905047edd3",
-        "remoteUrl": "https://storage.googleapis.com/firebase-preview-drop/emulator/pubsub-emulator-0.8.17.zip",
-        "downloadPathRelativeToCacheDir": "pubsub-emulator-0.8.17.zip",
-        "binaryPathRelativeToCacheDir": "pubsub-emulator-0.8.17/pubsub-emulator/bin/cloud-pubsub-emulator"
+        "version": "0.8.25",
+        "expectedSize": 52169500,
+        "expectedChecksum": "ff855b79e84d26b2b5b2d56e84e0fb51",
+        "expectedChecksumSHA256": "a69fe788be3b0b3866c55b7ed8790efa424a88e6f26843bdbe9d34b93c9509af",
+        "remoteUrl": "https://storage.googleapis.com/firebase-preview-drop/emulator/pubsub-emulator-0.8.25.zip",
+        "downloadPathRelativeToCacheDir": "pubsub-emulator-0.8.25.zip",
+        "binaryPathRelativeToCacheDir": "pubsub-emulator-0.8.25/pubsub-emulator/bin/cloud-pubsub-emulator"
     },
     "dataconnect": {
         "darwin": {