firebase-tools 15.1.0 → 15.2.0

package/lib/emulator/downloadableEmulators.js

@@ -1,6 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isIncomaptibleArchError = exports.start = exports.downloadIfNecessary = exports.stop = exports.getPID = exports.get = exports.getDownloadDetails = exports.requiresJava = exports.handleEmulatorProcessError = exports._getCommand = exports.getLogFileName = void 0;
+exports.getLogFileName = getLogFileName;
+exports._getCommand = _getCommand;
+exports.handleEmulatorProcessError = handleEmulatorProcessError;
+exports.requiresJava = requiresJava;
+exports.getDownloadDetails = getDownloadDetails;
+exports.get = get;
+exports.getPID = getPID;
+exports.stop = stop;
+exports.downloadIfNecessary = downloadIfNecessary;
+exports.start = start;
+exports.isIncomaptibleArchError = isIncomaptibleArchError;
 const lsofi = require("lsofi");
 const types_1 = require("./types");
 const constants_1 = require("./constants");
@@ -36,19 +46,31 @@ function generateDownloadDetails(emulator) {
             return {
                 downloadPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.database.downloadPathRelativeToCacheDir),
                 version: EMULATOR_UPDATE_DETAILS.database.version,
-                opts: Object.assign(Object.assign({}, EMULATOR_UPDATE_DETAILS.database), { cacheDir: CACHE_DIR, namePrefix: "firebase-database-emulator" }),
+                opts: {
+                    ...EMULATOR_UPDATE_DETAILS.database,
+                    cacheDir: CACHE_DIR,
+                    namePrefix: "firebase-database-emulator",
+                },
             };
         case "firestore":
             return {
                 downloadPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.firestore.downloadPathRelativeToCacheDir),
                 version: EMULATOR_UPDATE_DETAILS.firestore.version,
-                opts: Object.assign(Object.assign({}, EMULATOR_UPDATE_DETAILS.firestore), { cacheDir: CACHE_DIR, namePrefix: "cloud-firestore-emulator" }),
+                opts: {
+                    ...EMULATOR_UPDATE_DETAILS.firestore,
+                    cacheDir: CACHE_DIR,
+                    namePrefix: "cloud-firestore-emulator",
+                },
             };
         case "storage":
             return {
                 downloadPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.storage.downloadPathRelativeToCacheDir),
                 version: EMULATOR_UPDATE_DETAILS.storage.version,
-                opts: Object.assign(Object.assign({}, EMULATOR_UPDATE_DETAILS.storage), { cacheDir: CACHE_DIR, namePrefix: "cloud-storage-rules-emulator" }),
+                opts: {
+                    ...EMULATOR_UPDATE_DETAILS.storage,
+                    cacheDir: CACHE_DIR,
+                    namePrefix: "cloud-storage-rules-emulator",
+                },
             };
         case "ui":
             return {
@@ -56,7 +78,13 @@ function generateDownloadDetails(emulator) {
                 downloadPath: path.join(CACHE_DIR, emulatorUiDetails.downloadPathRelativeToCacheDir),
                 unzipDir: path.join(CACHE_DIR, `ui-v${emulatorUiDetails.version}`),
                 binaryPath: path.join(CACHE_DIR, emulatorUiDetails.binaryPathRelativeToCacheDir),
-                opts: Object.assign(Object.assign({}, emulatorUiDetails), { cacheDir: CACHE_DIR, skipCache: experiments.isEnabled("emulatoruisnapshot"), skipChecksumAndSize: experiments.isEnabled("emulatoruisnapshot"), namePrefix: "ui" }),
+                opts: {
+                    ...emulatorUiDetails,
+                    cacheDir: CACHE_DIR,
+                    skipCache: experiments.isEnabled("emulatoruisnapshot"),
+                    skipChecksumAndSize: experiments.isEnabled("emulatoruisnapshot"),
+                    namePrefix: "ui",
+                },
             };
         case "pubsub":
             return {
@@ -64,14 +92,24 @@ function generateDownloadDetails(emulator) {
                 version: EMULATOR_UPDATE_DETAILS.pubsub.version,
                 unzipDir: path.join(CACHE_DIR, `pubsub-emulator-${EMULATOR_UPDATE_DETAILS.pubsub.version}`),
                 binaryPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.pubsub.binaryPathRelativeToCacheDir),
-                opts: Object.assign(Object.assign({}, EMULATOR_UPDATE_DETAILS.pubsub), { cacheDir: CACHE_DIR, namePrefix: "pubsub-emulator" }),
+                opts: {
+                    ...EMULATOR_UPDATE_DETAILS.pubsub,
+                    cacheDir: CACHE_DIR,
+                    namePrefix: "pubsub-emulator",
+                },
             };
         case "dataconnect":
             return {
                 downloadPath: path.join(CACHE_DIR, dataconnectDetails.downloadPathRelativeToCacheDir),
                 version: dataconnectDetails.version,
                 binaryPath: path.join(CACHE_DIR, dataconnectDetails.downloadPathRelativeToCacheDir),
-                opts: Object.assign(Object.assign({}, dataconnectDetails), { cacheDir: CACHE_DIR, skipChecksumAndSize: false, namePrefix: "dataconnect-emulator", auth: false }),
+                opts: {
+                    ...dataconnectDetails,
+                    cacheDir: CACHE_DIR,
+                    skipChecksumAndSize: false,
+                    namePrefix: "dataconnect-emulator",
+                    auth: false,
+                },
             };
         default:
             throw new Error(`Invalid downloadable emulator: ${emulator}`);
@@ -191,7 +229,6 @@ function getExecPath(name) {
 function getLogFileName(name) {
     return `${name}-debug.log`;
 }
-exports.getLogFileName = getLogFileName;
 function _getCommand(emulator, args) {
     const baseCmd = Commands[emulator];
     const defaultPort = constants_1.Constants.getDefaultPort(emulator);
@@ -232,7 +269,6 @@ function _getCommand(emulator, args) {
         port: args.port,
     };
 }
-exports._getCommand = _getCommand;
 async function _fatal(emulator, errorMsg) {
     try {
         const logger = emulatorLogger_1.EmulatorLogger.forEmulator(emulator);
@@ -256,22 +292,19 @@ async function handleEmulatorProcessError(emulator, err, port) {
         await _fatal(emulator, `${description} has exited: ${err}`);
     }
 }
-exports.handleEmulatorProcessError = handleEmulatorProcessError;
 function requiresJava(emulator) {
     if (emulator in Commands) {
         return Commands[emulator].binary === "java";
     }
     return false;
 }
-exports.requiresJava = requiresJava;
 async function _runBinary(emulator, command, extraEnv) {
     return new Promise((resolve) => {
-        var _a, _b;
         const logger = emulatorLogger_1.EmulatorLogger.forEmulator(emulator.name);
         emulator.stdout = fs.createWriteStream(getLogFileName(emulator.name));
         try {
             const opts = {
-                env: Object.assign(Object.assign({}, process.env), extraEnv),
+                env: { ...process.env, ...extraEnv },
                 detached: true,
                 stdio: ["inherit", "pipe", "pipe"],
             };
@@ -300,11 +333,11 @@ async function _runBinary(emulator, command, extraEnv) {
             return;
         }
         logger.logLabeled("BULLET", emulator.name, `${description} logging to ${clc.bold(getLogFileName(emulator.name))}`);
-        (_a = emulator.instance.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (data) => {
+        emulator.instance.stdout?.on("data", (data) => {
             logger.log("DEBUG", data.toString());
             emulator.stdout.write(data);
         });
-        (_b = emulator.instance.stderr) === null || _b === void 0 ? void 0 : _b.on("data", (data) => {
+        emulator.instance.stderr?.on("data", (data) => {
             logger.log("DEBUG", data.toString());
             emulator.stdout.write(data);
             if (data.toString().includes("java.lang.UnsupportedClassVersionError")) {
@@ -342,16 +375,13 @@ function getDownloadDetails(emulator) {
     }
     return details;
 }
-exports.getDownloadDetails = getDownloadDetails;
 function get(emulator) {
     return EmulatorDetails[emulator];
 }
-exports.get = get;
 function getPID(emulator) {
     const emulatorInstance = get(emulator).instance;
     return emulatorInstance && emulatorInstance.pid ? emulatorInstance.pid : 0;
 }
-exports.getPID = getPID;
 async function stop(targetName) {
     const emulator = get(targetName);
     return new Promise((resolve, reject) => {
@@ -374,7 +404,6 @@ async function stop(targetName) {
         }
     });
 }
-exports.stop = stop;
 async function downloadIfNecessary(targetName) {
     const hasEmulator = fs.existsSync(getExecPath(targetName));
     if (!hasEmulator) {
@@ -382,7 +411,6 @@ async function downloadIfNecessary(targetName) {
     }
     return Commands[targetName];
 }
-exports.downloadIfNecessary = downloadIfNecessary;
 async function start(targetName, args, extraEnv = {}) {
     const downloadDetails = getDownloadDetails(targetName);
     const emulator = get(targetName);
@@ -404,11 +432,8 @@ async function start(targetName, args, extraEnv = {}) {
     logger.log("DEBUG", `Starting ${constants_1.Constants.description(targetName)} with command ${JSON.stringify(command)}`);
     return _runBinary(emulator, command, extraEnv);
 }
-exports.start = start;
 function isIncomaptibleArchError(err) {
-    var _a;
     return ((0, error_1.hasMessage)(err) &&
-        /Unknown system error/.test((_a = err.message) !== null && _a !== void 0 ? _a : "") &&
+        /Unknown system error/.test(err.message ?? "") &&
         process.platform === "darwin");
 }
-exports.isIncomaptibleArchError = isIncomaptibleArchError;

package/lib/emulator/emulatorLogger.js

@@ -22,7 +22,7 @@ var Verbosity;
     Verbosity[Verbosity["INFO"] = 1] = "INFO";
     Verbosity[Verbosity["QUIET"] = 2] = "QUIET";
     Verbosity[Verbosity["SILENT"] = 3] = "SILENT";
-})(Verbosity = exports.Verbosity || (exports.Verbosity = {}));
+})(Verbosity || (exports.Verbosity = Verbosity = {}));
 class EmulatorLogger {
     constructor(name, data = {}) {
         this.name = name;
@@ -71,7 +71,13 @@ class EmulatorLogger {
             logger_1.logger.debug(`${type}: ${text}`);
             return;
         }
-        const mergedData = Object.assign(Object.assign({}, data), { metadata: Object.assign(Object.assign({}, data.metadata), { message: text }) });
+        const mergedData = {
+            ...data,
+            metadata: {
+                ...data.metadata,
+                message: text,
+            },
+        };
         switch (type) {
             case "DEBUG":
                 logger_1.logger.debug(text, mergedData);
@@ -111,7 +117,10 @@ class EmulatorLogger {
                 this.handleSystemLog(log);
                 break;
             case "USER":
-                this.log("USER", `${clc.blackBright("> ")} ${log.text}`, Object.assign({ user: (0, utils_1.tryParse)(log.text) }, this.data));
+                this.log("USER", `${clc.blackBright("> ")} ${log.text}`, {
+                    user: (0, utils_1.tryParse)(log.text),
+                    ...this.data,
+                });
                 break;
             case "DEBUG":
                 if (log.data && Object.keys(log.data).length > 0) {
@@ -202,7 +211,13 @@ You can probably fix this by running "npm install ${systemLog.data.name}@latest"
             logger_1.logger.debug(`[${label}] ${text}`);
             return;
         }
-        const mergedData = Object.assign(Object.assign({}, this.data), { metadata: Object.assign(Object.assign({}, this.data.metadata), { message: text }) });
+        const mergedData = {
+            ...this.data,
+            metadata: {
+                ...this.data.metadata,
+                message: text,
+            },
+        };
         switch (type) {
             case "DEBUG":
                 logger_1.logger.debug(`[${label}] ${text}`);

package/lib/emulator/env.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.maybeUsePortForwarding = exports.getCredentialsEnvironment = exports.setEnvVarsForEmulators = void 0;
+exports.setEnvVarsForEmulators = setEnvVarsForEmulators;
+exports.getCredentialsEnvironment = getCredentialsEnvironment;
+exports.maybeUsePortForwarding = maybeUsePortForwarding;
 const constants_1 = require("./constants");
 const types_1 = require("./types");
 const functionsEmulatorShared_1 = require("./functionsEmulatorShared");
@@ -42,7 +44,6 @@ function setEnvVarsForEmulators(env, emulators) {
         }
     }
 }
-exports.setEnvVarsForEmulators = setEnvVarsForEmulators;
 async function getCredentialsEnvironment(account, logger, logLabel, silent = false) {
     const credentialEnv = {};
     if (await (0, defaultCredentials_1.hasDefaultCredentials)()) {
@@ -58,19 +59,17 @@ async function getCredentialsEnvironment(account, logger, logLabel, silent = fal
     }
     return credentialEnv;
 }
-exports.getCredentialsEnvironment = getCredentialsEnvironment;
 function maybeUsePortForwarding(i) {
-    var _a;
     const portForwardingHost = process.env.WEB_HOST;
     if (portForwardingHost) {
-        const info = Object.assign({}, i);
+        const info = { ...i };
         if (info.host.includes(portForwardingHost)) {
             return info;
         }
         const url = `${info.port}-${portForwardingHost}`;
         info.host = url;
-        info.listen = (_a = info.listen) === null || _a === void 0 ? void 0 : _a.map((listen) => {
-            const l = Object.assign({}, listen);
+        info.listen = info.listen?.map((listen) => {
+            const l = { ...listen };
             l.address = url;
             l.port = 443;
             return l;
@@ -85,4 +84,3 @@ function maybeUsePortForwarding(i) {
     }
     return i;
 }
-exports.maybeUsePortForwarding = maybeUsePortForwarding;

package/lib/emulator/eventarcEmulator.js

@@ -156,10 +156,9 @@ class EventarcEmulator {
     }
     matchesAll(event, eventFilters) {
         return Object.entries(eventFilters).every(([key, value]) => {
-            var _a, _b;
-            let attr = (_a = event[key]) !== null && _a !== void 0 ? _a : event.attributes[key];
+            let attr = event[key] ?? event.attributes[key];
             if (typeof attr === "object" && !Array.isArray(attr)) {
-                attr = (_b = attr.ceTimestamp) !== null && _b !== void 0 ? _b : attr.ceString;
+                attr = attr.ceTimestamp ?? attr.ceString;
             }
             return attr === value;
         });

package/lib/emulator/eventarcEmulatorUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cloudEventFromProtoToJson = void 0;
+exports.cloudEventFromProtoToJson = cloudEventFromProtoToJson;
 const error_1 = require("../error");
 const BUILT_IN_ATTRS = ["time", "datacontenttype", "subject"];
 function cloudEventFromProtoToJson(ce) {
@@ -34,14 +34,11 @@ function cloudEventFromProtoToJson(ce) {
     }
     return out;
 }
-exports.cloudEventFromProtoToJson = cloudEventFromProtoToJson;
 function getOptionalAttribute(ce, attr, type) {
-    var _a, _b;
-    return (_b = (_a = ce === null || ce === void 0 ? void 0 : ce["attributes"]) === null || _a === void 0 ? void 0 : _a[attr]) === null || _b === void 0 ? void 0 : _b[type];
+    return ce?.["attributes"]?.[attr]?.[type];
 }
 function getRequiredAttribute(ce, attr, type) {
-    var _a, _b;
-    const val = (_b = (_a = ce === null || ce === void 0 ? void 0 : ce["attributes"]) === null || _a === void 0 ? void 0 : _a[attr]) === null || _b === void 0 ? void 0 : _b[type];
+    const val = ce?.["attributes"]?.[attr]?.[type];
     if (val === undefined) {
         throw new error_1.FirebaseError("CloudEvent must contain " + attr + " attribute");
     }

package/lib/emulator/extensions/postinstall.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replaceConsoleLinks = void 0;
+exports.replaceConsoleLinks = replaceConsoleLinks;
 const registry_1 = require("../registry");
 const types_1 = require("../types");
 function replaceConsoleLinks(postinstall) {
@@ -38,4 +38,3 @@ function replaceConsoleLinks(postinstall) {
     }
     return subbedPostinstall;
 }
-exports.replaceConsoleLinks = replaceConsoleLinks;

package/lib/emulator/extensions/validation.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkForUnemulatedTriggerTypes = exports.getUnemulatedAPIs = void 0;
+exports.getUnemulatedAPIs = getUnemulatedAPIs;
+exports.checkForUnemulatedTriggerTypes = checkForUnemulatedTriggerTypes;
 const planner = require("../../deploy/extensions/planner");
 const controller_1 = require("../controller");
 const constants_1 = require("../constants");
@@ -14,11 +15,10 @@ const EMULATED_APIS = [
     "identitytoolkit.googleapis.com",
 ];
 async function getUnemulatedAPIs(projectId, instances) {
-    var _a;
     const unemulatedAPIs = {};
     for (const i of instances) {
         const extensionSpec = await planner.getExtensionSpec(i);
-        for (const api of (_a = extensionSpec.apis) !== null && _a !== void 0 ? _a : []) {
+        for (const api of extensionSpec.apis ?? []) {
             if (!EMULATED_APIS.includes(api.apiName)) {
                 if (unemulatedAPIs[api.apiName]) {
                     unemulatedAPIs[api.apiName].instanceIds.push(i.instanceId);
@@ -37,10 +37,8 @@ async function getUnemulatedAPIs(projectId, instances) {
     }
     return Object.values(unemulatedAPIs);
 }
-exports.getUnemulatedAPIs = getUnemulatedAPIs;
 function checkForUnemulatedTriggerTypes(backend, options) {
-    var _a;
-    const triggers = (_a = backend.predefinedTriggers) !== null && _a !== void 0 ? _a : [];
+    const triggers = backend.predefinedTriggers ?? [];
     const unemulatedTriggers = triggers
         .filter((definition) => {
         if (definition.httpsTrigger) {
@@ -69,4 +67,3 @@ function checkForUnemulatedTriggerTypes(backend, options) {
         .map((definition) => constants_1.Constants.getServiceName((0, functionsEmulatorShared_1.getFunctionService)(definition)));
     return [...new Set(unemulatedTriggers)];
 }
-exports.checkForUnemulatedTriggerTypes = checkForUnemulatedTriggerTypes;

package/lib/emulator/extensionsEmulator.js

@@ -49,17 +49,16 @@ class ExtensionsEmulator {
         if (!functionsEmulator) {
             throw new error_1.FirebaseError("Extensions Emulator is running but Functions emulator is not. This should never happen.");
         }
-        return Object.assign(Object.assign({}, functionsEmulator.getInfo()), { name: this.getName() });
+        return { ...functionsEmulator.getInfo(), name: this.getName() };
     }
     getName() {
         return types_1.Emulators.EXTENSIONS;
     }
     async readManifest() {
-        var _a;
         this.want = await planner.want({
             projectId: this.args.projectId,
             projectNumber: this.args.projectNumber,
-            aliases: (_a = this.args.aliases) !== null && _a !== void 0 ? _a : [],
+            aliases: this.args.aliases ?? [],
             projectDir: this.args.projectDir,
             extensions: this.args.extensions,
             emulatorMode: true,
@@ -194,16 +193,15 @@ class ExtensionsEmulator {
         return emulatableBackend;
     }
     autoPopulatedParams(instance) {
-        var _a;
         const projectId = this.args.projectId;
         return {
-            PROJECT_ID: projectId !== null && projectId !== void 0 ? projectId : "",
+            PROJECT_ID: projectId ?? "",
             EXT_INSTANCE_ID: instance.instanceId,
-            DATABASE_INSTANCE: projectId !== null && projectId !== void 0 ? projectId : "",
+            DATABASE_INSTANCE: projectId ?? "",
             DATABASE_URL: `https://${projectId}.firebaseio.com`,
             STORAGE_BUCKET: `${projectId}.appspot.com`,
             ALLOWED_EVENT_TYPES: instance.allowedEventTypes ? instance.allowedEventTypes.join(",") : "",
-            EVENTARC_CHANNEL: (_a = instance.eventarcChannel) !== null && _a !== void 0 ? _a : "",
+            EVENTARC_CHANNEL: instance.eventarcChannel ?? "",
             EVENTARC_CLOUD_EVENT_SOURCE: `projects/${projectId}/instances/${instance.instanceId}`,
         };
     }
@@ -266,7 +264,6 @@ class ExtensionsEmulator {
         return clc.underline(clc.bold(uiUrl.toString()));
     }
     extensionsInfoTable() {
-        var _a;
         const filtedBackends = this.filterUnemulatedTriggers(this.backends);
         const uiRunning = registry_1.EmulatorRegistry.isRunning(types_1.Emulators.UI);
         const tableHead = ["Extension Instance Name", "Extension Ref"];
@@ -276,7 +273,7 @@ class ExtensionsEmulator {
         const table = new Table({ head: tableHead, style: { head: ["yellow"] } });
         for (const b of filtedBackends) {
             if (b.extensionInstanceId) {
-                const tableEntry = [b.extensionInstanceId, ((_a = b.extensionVersion) === null || _a === void 0 ? void 0 : _a.ref) || "Local Extension"];
+                const tableEntry = [b.extensionInstanceId, b.extensionVersion?.ref || "Local Extension"];
                 if (uiRunning)
                     tableEntry.push(this.extensionDetailsUILink(b));
                 table.push(tableEntry);