firebase-tools 15.1.0 → 15.2.0

package/lib/deploy/functions/runtimes/discovery/index.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.detectFromOutputPath = exports.detectFromPort = exports.detectFromYaml = exports.yamlToBuild = exports.getFunctionDiscoveryTimeout = void 0;
+exports.getFunctionDiscoveryTimeout = getFunctionDiscoveryTimeout;
+exports.yamlToBuild = yamlToBuild;
+exports.detectFromYaml = detectFromYaml;
+exports.detectFromPort = detectFromPort;
+exports.detectFromOutputPath = detectFromOutputPath;
 const node_fetch_1 = require("node-fetch");
 const fs = require("fs");
 const path = require("path");
@@ -13,7 +17,6 @@ const TIMEOUT_OVERRIDE_ENV_VAR = "FUNCTIONS_DISCOVERY_TIMEOUT";
 function getFunctionDiscoveryTimeout() {
     return +(process.env[TIMEOUT_OVERRIDE_ENV_VAR] || 0) * 1000;
 }
-exports.getFunctionDiscoveryTimeout = getFunctionDiscoveryTimeout;
 function yamlToBuild(yaml, project, region, runtime) {
     try {
         if (!yaml.specVersion) {
@@ -28,7 +31,6 @@ function yamlToBuild(yaml, project, region, runtime) {
         throw new error_1.FirebaseError("Failed to parse build specification", { children: [err] });
     }
 }
-exports.yamlToBuild = yamlToBuild;
 async function detectFromYaml(directory, project, runtime) {
     let text;
     try {
@@ -47,7 +49,6 @@ async function detectFromYaml(directory, project, runtime) {
     const parsed = yaml.parse(text);
     return yamlToBuild(parsed, project, api.functionsDefaultRegion(), runtime);
 }
-exports.detectFromYaml = detectFromYaml;
 async function detectFromPort(port, project, runtime, initialDelay = 0, timeout = 10000) {
     let res;
     const discoveryTimeout = getFunctionDiscoveryTimeout() || timeout;
@@ -68,8 +69,8 @@ async function detectFromPort(port, project, runtime, initialDelay = 0, timeout
             break;
         }
         catch (err) {
-            if ((err === null || err === void 0 ? void 0 : err.name) === "FetchError" ||
-                ["ECONNREFUSED", "ECONNRESET", "ETIMEDOUT"].includes(err === null || err === void 0 ? void 0 : err.code)) {
+            if (err?.name === "FetchError" ||
+                ["ECONNREFUSED", "ECONNRESET", "ETIMEDOUT"].includes(err?.code)) {
                 continue;
             }
             throw err;
@@ -93,10 +94,8 @@ async function detectFromPort(port, project, runtime, initialDelay = 0, timeout
     }
     return yamlToBuild(parsed, project, api.functionsDefaultRegion(), runtime);
 }
-exports.detectFromPort = detectFromPort;
 async function detectFromOutputPath(childProcess, manifestPath, project, runtime, timeout = 10000) {
     return new Promise((resolve, reject) => {
-        var _a;
         let stderrBuffer = "";
         let resolved = false;
         const discoveryTimeout = getFunctionDiscoveryTimeout() || timeout;
@@ -106,16 +105,15 @@ async function detectFromOutputPath(childProcess, manifestPath, project, runtime
                 reject(new error_1.FirebaseError(`User code failed to load. Cannot determine backend specification. Timeout after ${discoveryTimeout}ms`));
             }
         }, discoveryTimeout);
-        (_a = childProcess.stderr) === null || _a === void 0 ? void 0 : _a.on("data", (chunk) => {
+        childProcess.stderr?.on("data", (chunk) => {
             stderrBuffer += chunk.toString();
         });
         childProcess.on("exit", async (code) => {
-            var _a;
             if (!resolved) {
                 clearTimeout(timer);
                 resolved = true;
                 if (code !== 0 && code !== null) {
-                    const errorMessage = (_a = stderrBuffer.trim()) !== null && _a !== void 0 ? _a : `Discovery process exited with code ${code}`;
+                    const errorMessage = stderrBuffer.trim() ?? `Discovery process exited with code ${code}`;
                     reject(new error_1.FirebaseError(`User code failed to load. Cannot determine backend specification.\n${errorMessage}`));
                 }
                 else {
@@ -144,4 +142,3 @@ async function detectFromOutputPath(childProcess, manifestPath, project, runtime
         });
     });
 }
-exports.detectFromOutputPath = detectFromOutputPath;

package/lib/deploy/functions/runtimes/discovery/parsing.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertKeyTypes = exports.requireKeys = void 0;
+exports.requireKeys = requireKeys;
+exports.assertKeyTypes = assertKeyTypes;
 const error_1 = require("../../../../error");
 function requireKeys(prefix, yaml, ...keys) {
     if (prefix) {
@@ -12,7 +13,6 @@ function requireKeys(prefix, yaml, ...keys) {
         }
     }
 }
-exports.requireKeys = requireKeys;
 function assertKeyTypes(prefix, yaml, schema) {
     if (!yaml) {
         return;
@@ -92,4 +92,3 @@ function assertKeyTypes(prefix, yaml, schema) {
         }
     }
 }
-exports.assertKeyTypes = assertKeyTypes;

package/lib/deploy/functions/runtimes/discovery/v1alpha1.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildFromV1Alpha1 = void 0;
+exports.buildFromV1Alpha1 = buildFromV1Alpha1;
 const build = require("../../build");
 const backend = require("../../backend");
 const proto_1 = require("../../../../gcp/proto");
@@ -43,7 +43,6 @@ function buildFromV1Alpha1(yaml, project, region, runtime) {
     }
     return bd;
 }
-exports.buildFromV1Alpha1 = buildFromV1Alpha1;
 function parseRequiredAPIs(manifest) {
     const requiredAPIs = manifest.requiredAPIs || [];
     for (const { api, reason } of requiredAPIs) {
@@ -76,6 +75,7 @@ function assertBuildEndpoint(ep, id) {
         environmentVariables: "object?",
         secretEnvironmentVariables: "array?",
         httpsTrigger: "object",
+        dataConnectGraphqlTrigger: "object",
         callableTrigger: "object",
         eventTrigger: "object",
         scheduleTrigger: "object",
@@ -94,6 +94,9 @@ function assertBuildEndpoint(ep, id) {
     if (ep.httpsTrigger) {
         triggerCount++;
     }
+    if (ep.dataConnectGraphqlTrigger) {
+        triggerCount++;
+    }
     if (ep.callableTrigger) {
         triggerCount++;
     }
@@ -133,6 +136,12 @@ function assertBuildEndpoint(ep, id) {
             invoker: "array?",
         });
     }
+    else if (build.isDataConnectGraphqlTriggered(ep)) {
+        (0, parsing_1.assertKeyTypes)(prefix + ".dataConnectGraphqlTrigger", ep.dataConnectGraphqlTrigger, {
+            invoker: "array?",
+            schemaFilePath: "string?",
+        });
+    }
     else if (build.isCallableTriggered(ep)) {
         (0, parsing_1.assertKeyTypes)(prefix + ".callableTrigger", ep.callableTrigger, {
             genkitAction: "string?",
@@ -192,7 +201,6 @@ function assertBuildEndpoint(ep, id) {
     }
 }
 function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
-    var _a;
     let triggered;
     if (build.isEventTriggered(ep)) {
         const eventTrigger = {
@@ -205,7 +213,7 @@ function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
         (0, proto_1.copyIfPresent)(eventTrigger, ep.eventTrigger, "serviceAccount", "eventFilterPathPatterns", "region");
         (0, proto_1.convertIfPresent)(eventTrigger, ep.eventTrigger, "channel", (c) => resolveChannelName(project, c, defaultRegion));
         (0, proto_1.convertIfPresent)(eventTrigger, ep.eventTrigger, "eventFilters", (filters) => {
-            const copy = Object.assign({}, filters);
+            const copy = { ...filters };
             if (copy["topic"] && !copy["topic"].startsWith("projects/")) {
                 copy["topic"] = `projects/${project}/topics/${copy["topic"]}`;
             }
@@ -217,6 +225,11 @@ function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
         triggered = { httpsTrigger: {} };
         (0, proto_1.copyIfPresent)(triggered.httpsTrigger, ep.httpsTrigger, "invoker");
     }
+    else if (build.isDataConnectGraphqlTriggered(ep)) {
+        triggered = { dataConnectGraphqlTrigger: {} };
+        (0, proto_1.copyIfPresent)(triggered.dataConnectGraphqlTrigger, ep.dataConnectGraphqlTrigger, "invoker");
+        (0, proto_1.copyIfPresent)(triggered.dataConnectGraphqlTrigger, ep.dataConnectGraphqlTrigger, "schemaFilePath");
+    }
     else if (build.isCallableTriggered(ep)) {
         triggered = { callableTrigger: {} };
         (0, proto_1.copyIfPresent)(triggered.callableTrigger, ep.callableTrigger, "genkitAction");
@@ -224,7 +237,7 @@ function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
     else if (build.isScheduleTriggered(ep)) {
         const st = {
             schedule: ep.scheduleTrigger.schedule || "",
-            timeZone: (_a = ep.scheduleTrigger.timeZone) !== null && _a !== void 0 ? _a : null,
+            timeZone: ep.scheduleTrigger.timeZone ?? null,
         };
         if (ep.scheduleTrigger.retryConfig) {
             st.retryConfig = {};
@@ -250,13 +263,13 @@ function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
             tq.invoker = null;
         }
         if (ep.taskQueueTrigger.retryConfig) {
-            tq.retryConfig = Object.assign({}, ep.taskQueueTrigger.retryConfig);
+            tq.retryConfig = { ...ep.taskQueueTrigger.retryConfig };
         }
         else if (ep.taskQueueTrigger.retryConfig === null) {
             tq.retryConfig = null;
         }
         if (ep.taskQueueTrigger.rateLimits) {
-            tq.rateLimits = Object.assign({}, ep.taskQueueTrigger.rateLimits);
+            tq.rateLimits = { ...ep.taskQueueTrigger.rateLimits };
         }
         else if (ep.taskQueueTrigger.rateLimits === null) {
             tq.rateLimits = null;
@@ -270,8 +283,14 @@ function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
         throw new error_1.FirebaseError(`Do not recognize trigger type for endpoint ${id}. Try upgrading ` +
             "firebase-tools with npm install -g firebase-tools@latest");
     }
-    const parsed = Object.assign({ platform: ep.platform || "gcfv2", region: ep.region || [defaultRegion], project,
-        runtime, entryPoint: ep.entryPoint }, triggered);
+    const parsed = {
+        platform: ep.platform || "gcfv2",
+        region: ep.region || [defaultRegion],
+        project,
+        runtime,
+        entryPoint: ep.entryPoint,
+        ...triggered,
+    };
     if ("serviceAccountEmail" in ep) {
         parsed.serviceAccount = ep.serviceAccountEmail;
     }
@@ -329,7 +348,7 @@ function resolveChannelName(projectId, channel, defaultRegion) {
         return "projects/" + projectId + "/locations/" + location + "/channels/" + channelId;
     }
     const match = CHANNEL_NAME_REGEX.exec(channel);
-    if (!(match === null || match === void 0 ? void 0 : match.groups)) {
+    if (!match?.groups) {
         throw new error_1.FirebaseError("Invalid channel name format.");
     }
     const matchedProjectId = match.groups.project;

package/lib/deploy/functions/runtimes/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRuntimeDelegate = void 0;
+exports.getRuntimeDelegate = getRuntimeDelegate;
 const node = require("./node");
 const python = require("./python");
 const validate = require("../validate");
@@ -21,4 +21,3 @@ async function getRuntimeDelegate(context) {
     }
     throw new error_1.FirebaseError(`Could not detect runtime for functions at ${sourceDir}`);
 }
-exports.getRuntimeDelegate = getRuntimeDelegate;

package/lib/deploy/functions/runtimes/node/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Delegate = exports.tryCreateDelegate = void 0;
+exports.Delegate = void 0;
+exports.tryCreateDelegate = tryCreateDelegate;
 const os = require("os");
 const fs = require("fs");
 const path = require("path");
@@ -24,7 +25,7 @@ async function tryCreateDelegate(context) {
     try {
         await fs.promises.access(packageJsonPath);
     }
-    catch (_a) {
+    catch {
         logger_1.logger.debug("Customer code is not Node");
         return undefined;
     }
@@ -35,7 +36,6 @@ async function tryCreateDelegate(context) {
     }
     return new Delegate(context.projectId, context.projectDir, context.sourceDir, runtime);
 }
-exports.tryCreateDelegate = tryCreateDelegate;
 class Delegate {
     constructor(projectId, projectDir, sourceDir, runtime) {
         this.projectId = projectId;
@@ -117,8 +117,14 @@ class Delegate {
             "Please file a bug on Github (https://github.com/firebase/firebase-tools/).");
     }
     spawnFunctionsProcess(config, envs) {
-        var _a, _b;
-        const env = Object.assign(Object.assign({}, envs), { FUNCTIONS_CONTROL_API: "true", HOME: process.env.HOME, PATH: process.env.PATH, NODE_ENV: process.env.NODE_ENV, __FIREBASE_FRAMEWORKS_ENTRY__: process.env.__FIREBASE_FRAMEWORKS_ENTRY__ });
+        const env = {
+            ...envs,
+            FUNCTIONS_CONTROL_API: "true",
+            HOME: process.env.HOME,
+            PATH: process.env.PATH,
+            NODE_ENV: process.env.NODE_ENV,
+            __FIREBASE_FRAMEWORKS_ENTRY__: process.env.__FIREBASE_FRAMEWORKS_ENTRY__,
+        };
         if (Object.keys(config || {}).length) {
             env.CLOUD_RUNTIME_CONFIG = JSON.stringify(config);
         }
@@ -128,19 +134,22 @@ class Delegate {
             cwd: this.sourceDir,
             stdio: ["ignore", "pipe", "pipe"],
         });
-        (_a = childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (chunk) => {
+        childProcess.stdout?.on("data", (chunk) => {
             logger_1.logger.info(chunk.toString("utf8"));
         });
-        (_b = childProcess.stderr) === null || _b === void 0 ? void 0 : _b.on("data", (chunk) => {
+        childProcess.stderr?.on("data", (chunk) => {
             logger_1.logger.error(chunk.toString("utf8"));
         });
         return childProcess;
     }
     execAdmin(config, envs, manifestPath) {
-        return this.spawnFunctionsProcess(config, Object.assign(Object.assign({}, envs), { FUNCTIONS_MANIFEST_OUTPUT_PATH: manifestPath }));
+        return this.spawnFunctionsProcess(config, {
+            ...envs,
+            FUNCTIONS_MANIFEST_OUTPUT_PATH: manifestPath,
+        });
     }
     serveAdmin(config, envs, port) {
-        const childProcess = this.spawnFunctionsProcess(config, Object.assign(Object.assign({}, envs), { PORT: port }));
+        const childProcess = this.spawnFunctionsProcess(config, { ...envs, PORT: port });
         return Promise.resolve(async () => {
             const p = new Promise((resolve, reject) => {
                 childProcess.once("exit", resolve);

package/lib/deploy/functions/runtimes/node/parseRuntimeAndValidateSDK.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRuntimeChoice = exports.RUNTIME_NOT_SET = void 0;
+exports.RUNTIME_NOT_SET = void 0;
+exports.getRuntimeChoice = getRuntimeChoice;
 const path = require("path");
 const error_1 = require("../../../../error");
 const supported = require("../supported");
@@ -35,4 +36,3 @@ function getRuntimeChoiceFromPackageJson(sourceDir) {
 function getRuntimeChoice(sourceDir, runtimeFromConfig) {
     return runtimeFromConfig || getRuntimeChoiceFromPackageJson(sourceDir);
 }
-exports.getRuntimeChoice = getRuntimeChoice;

package/lib/deploy/functions/runtimes/node/validate.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.packageJsonIsValid = void 0;
+exports.packageJsonIsValid = packageJsonIsValid;
 const path = require("path");
 const error_1 = require("../../../../error");
 const logger_1 = require("../../../../logger");
@@ -31,4 +31,3 @@ function packageJsonIsValid(sourceDirName, sourceDir, projectDir) {
         throw new error_1.FirebaseError(msg);
     }
 }
-exports.packageJsonIsValid = packageJsonIsValid;

package/lib/deploy/functions/runtimes/node/versioning.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkFunctionsSDKVersion = exports.getLatestSDKVersion = exports.getFunctionsSDKVersion = exports.findModuleVersion = exports.FUNCTIONS_SDK_VERSION_TOO_OLD_WARNING = void 0;
+exports.FUNCTIONS_SDK_VERSION_TOO_OLD_WARNING = void 0;
+exports.findModuleVersion = findModuleVersion;
+exports.getFunctionsSDKVersion = getFunctionsSDKVersion;
+exports.getLatestSDKVersion = getLatestSDKVersion;
+exports.checkFunctionsSDKVersion = checkFunctionsSDKVersion;
 const fs = require("fs");
 const path = require("path");
 const clc = require("colorette");
@@ -35,7 +39,6 @@ function findModuleVersion(name, resolvedPath) {
         searchPath = path.dirname(searchPath);
     }
 }
-exports.findModuleVersion = findModuleVersion;
 function getFunctionsSDKVersion(sourceDir) {
     try {
         return findModuleVersion("firebase-functions", require.resolve("firebase-functions", { paths: [sourceDir] }));
@@ -48,9 +51,7 @@ function getFunctionsSDKVersion(sourceDir) {
         return;
     }
 }
-exports.getFunctionsSDKVersion = getFunctionsSDKVersion;
 function getLatestSDKVersion() {
-    var _a;
     const child = spawn.sync("npm", ["show", "firebase-functions", "--json=true"], {
         encoding: "utf8",
         timeout: NPM_COMMAND_TIMEOUT_MILLIES,
@@ -63,9 +64,8 @@ function getLatestSDKVersion() {
     if (Object.keys(output).length === 0) {
         return;
     }
-    return (_a = output["dist-tags"]) === null || _a === void 0 ? void 0 : _a["latest"];
+    return output["dist-tags"]?.["latest"];
 }
-exports.getLatestSDKVersion = getLatestSDKVersion;
 function checkFunctionsSDKVersion(currentVersion) {
     try {
         if (semver.lt(currentVersion, MIN_SDK_VERSION)) {
@@ -92,4 +92,3 @@ function checkFunctionsSDKVersion(currentVersion) {
         return;
     }
 }
-exports.checkFunctionsSDKVersion = checkFunctionsSDKVersion;

package/lib/deploy/functions/runtimes/python/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Delegate = exports.getPythonBinary = exports.tryCreateDelegate = void 0;
+exports.Delegate = void 0;
+exports.tryCreateDelegate = tryCreateDelegate;
+exports.getPythonBinary = getPythonBinary;
 const fs = require("fs");
 const path = require("path");
 const node_fetch_1 = require("node-fetch");
@@ -13,13 +15,12 @@ const python_1 = require("../../../../functions/python");
 const error_1 = require("../../../../error");
 const functional_1 = require("../../../../functional");
 async function tryCreateDelegate(context) {
-    var _a;
     const requirementsTextPath = path.join(context.sourceDir, "requirements.txt");
     if (!(await (0, util_1.promisify)(fs.exists)(requirementsTextPath))) {
         logger_1.logger.debug("Customer code is not Python code.");
         return;
     }
-    const runtime = (_a = context.runtime) !== null && _a !== void 0 ? _a : supported.latest("python");
+    const runtime = context.runtime ?? supported.latest("python");
     if (!supported.isRuntime(runtime)) {
         throw new error_1.FirebaseError(`Runtime ${runtime} is not a valid Python runtime`);
     }
@@ -28,7 +29,6 @@ async function tryCreateDelegate(context) {
     }
     return Promise.resolve(new Delegate(context.projectId, context.sourceDir, runtime));
 }
-exports.tryCreateDelegate = tryCreateDelegate;
 function getPythonBinary(runtime) {
     if (process.platform === "win32") {
         return "python.exe";
@@ -47,7 +47,6 @@ function getPythonBinary(runtime) {
     }
     (0, functional_1.assertExhaustive)(runtime, `Unhandled python runtime ${runtime}`);
 }
-exports.getPythonBinary = getPythonBinary;
 class Delegate {
     constructor(projectId, sourceDir, runtime) {
         this.projectId = projectId;
@@ -64,7 +63,6 @@ class Delegate {
         return this._bin;
     }
     async modulesDir() {
-        var _a, _b;
         if (!this._modulesDir) {
             let out = "";
             let stderr = "";
@@ -73,12 +71,12 @@ class Delegate {
                 "-c",
                 '"import firebase_functions; import os; print(os.path.dirname(firebase_functions.__file__))"',
             ], this.sourceDir, {});
-            (_a = child.stderr) === null || _a === void 0 ? void 0 : _a.on("data", (chunk) => {
+            child.stderr?.on("data", (chunk) => {
                 const chunkString = chunk.toString();
                 stderr = stderr + chunkString;
                 logger_1.logger.debug(`stderr: ${chunkString}`);
             });
-            (_b = child.stdout) === null || _b === void 0 ? void 0 : _b.on("data", (chunk) => {
+            child.stdout?.on("data", (chunk) => {
                 const chunkString = chunk.toString();
                 out = out + chunkString;
                 logger_1.logger.debug(`stdout: ${chunkString}`);
@@ -113,16 +111,18 @@ class Delegate {
         return Promise.resolve();
     }
     async serveAdmin(port, envs) {
-        var _a, _b;
         const modulesDir = await this.modulesDir();
-        const envWithAdminPort = Object.assign(Object.assign({}, envs), { ADMIN_PORT: port.toString() });
+        const envWithAdminPort = {
+            ...envs,
+            ADMIN_PORT: port.toString(),
+        };
         const args = [this.bin, `"${path.join(modulesDir, "private", "serving.py")}"`];
         logger_1.logger.debug(`Running admin server with args: ${JSON.stringify(args)} and env: ${JSON.stringify(envWithAdminPort)} in ${this.sourceDir}`);
         const childProcess = (0, python_1.runWithVirtualEnv)(args, this.sourceDir, envWithAdminPort);
-        (_a = childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (chunk) => {
+        childProcess.stdout?.on("data", (chunk) => {
             logger_1.logger.info(chunk.toString("utf8"));
         });
-        (_b = childProcess.stderr) === null || _b === void 0 ? void 0 : _b.on("data", (chunk) => {
+        childProcess.stderr?.on("data", (chunk) => {
             logger_1.logger.error(chunk.toString("utf8"));
         });
         return Promise.resolve(async () => {

package/lib/deploy/functions/runtimes/supported/index.js

@@ -14,7 +14,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.guardVersionSupport = exports.isDecommissioned = exports.latest = exports.runtimeIsLanguage = exports.isRuntime = void 0;
+exports.isRuntime = isRuntime;
+exports.runtimeIsLanguage = runtimeIsLanguage;
+exports.latest = latest;
+exports.isDecommissioned = isDecommissioned;
+exports.guardVersionSupport = guardVersionSupport;
 const error_1 = require("../../../../error");
 const utils = require("../../../../utils");
 const types_1 = require("./types");
@@ -22,11 +26,9 @@ __exportStar(require("./types"), exports);
 function isRuntime(maybe) {
     return maybe in types_1.RUNTIMES;
 }
-exports.isRuntime = isRuntime;
 function runtimeIsLanguage(runtime, language) {
     return runtime.startsWith(language);
 }
-exports.runtimeIsLanguage = runtimeIsLanguage;
 function latest(language, runtimes = Object.keys(types_1.RUNTIMES)) {
     const sorted = runtimes
         .filter((s) => runtimeIsLanguage(s, language))
@@ -46,12 +48,10 @@ function latest(language, runtimes = Object.keys(types_1.RUNTIMES)) {
     }
     return latest;
 }
-exports.latest = latest;
 function isDecommissioned(runtime, now = new Date()) {
     const cutoff = new Date(types_1.RUNTIMES[runtime].decommissionDate);
     return cutoff < now;
 }
-exports.isDecommissioned = isDecommissioned;
 function guardVersionSupport(runtime, now = new Date()) {
     const { deprecationDate, decommissionDate } = types_1.RUNTIMES[runtime];
     const decommission = new Date(decommissionDate);
@@ -77,4 +77,3 @@ function guardVersionSupport(runtime, now = new Date()) {
             "details on the lifecycle policy");
     }
 }
-exports.guardVersionSupport = guardVersionSupport;

package/lib/deploy/functions/services/auth.js

@@ -27,22 +27,21 @@ class AuthBlockingService {
         }
     }
     configChanged(newConfig, config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
-        if (((_b = (_a = newConfig.triggers) === null || _a === void 0 ? void 0 : _a.beforeCreate) === null || _b === void 0 ? void 0 : _b.functionUri) !==
-            ((_d = (_c = config.triggers) === null || _c === void 0 ? void 0 : _c.beforeCreate) === null || _d === void 0 ? void 0 : _d.functionUri) ||
-            ((_f = (_e = newConfig.triggers) === null || _e === void 0 ? void 0 : _e.beforeSignIn) === null || _f === void 0 ? void 0 : _f.functionUri) !==
-                ((_h = (_g = config.triggers) === null || _g === void 0 ? void 0 : _g.beforeSignIn) === null || _h === void 0 ? void 0 : _h.functionUri) ||
-            ((_k = (_j = newConfig.triggers) === null || _j === void 0 ? void 0 : _j.beforeSendEmail) === null || _k === void 0 ? void 0 : _k.functionUri) !==
-                ((_m = (_l = config.triggers) === null || _l === void 0 ? void 0 : _l.beforeSendEmail) === null || _m === void 0 ? void 0 : _m.functionUri) ||
-            ((_p = (_o = newConfig.triggers) === null || _o === void 0 ? void 0 : _o.beforeSendSms) === null || _p === void 0 ? void 0 : _p.functionUri) !== ((_r = (_q = config.triggers) === null || _q === void 0 ? void 0 : _q.beforeSendSms) === null || _r === void 0 ? void 0 : _r.functionUri)) {
+        if (newConfig.triggers?.beforeCreate?.functionUri !==
+            config.triggers?.beforeCreate?.functionUri ||
+            newConfig.triggers?.beforeSignIn?.functionUri !==
+                config.triggers?.beforeSignIn?.functionUri ||
+            newConfig.triggers?.beforeSendEmail?.functionUri !==
+                config.triggers?.beforeSendEmail?.functionUri ||
+            newConfig.triggers?.beforeSendSms?.functionUri !== config.triggers?.beforeSendSms?.functionUri) {
             return true;
         }
-        if (!!((_s = newConfig.forwardInboundCredentials) === null || _s === void 0 ? void 0 : _s.accessToken) !==
-            !!((_t = config.forwardInboundCredentials) === null || _t === void 0 ? void 0 : _t.accessToken) ||
-            !!((_u = newConfig.forwardInboundCredentials) === null || _u === void 0 ? void 0 : _u.idToken) !==
-                !!((_v = config.forwardInboundCredentials) === null || _v === void 0 ? void 0 : _v.idToken) ||
-            !!((_w = newConfig.forwardInboundCredentials) === null || _w === void 0 ? void 0 : _w.refreshToken) !==
-                !!((_x = config.forwardInboundCredentials) === null || _x === void 0 ? void 0 : _x.refreshToken)) {
+        if (!!newConfig.forwardInboundCredentials?.accessToken !==
+            !!config.forwardInboundCredentials?.accessToken ||
+            !!newConfig.forwardInboundCredentials?.idToken !==
+                !!config.forwardInboundCredentials?.idToken ||
+            !!newConfig.forwardInboundCredentials?.refreshToken !==
+                !!config.forwardInboundCredentials?.refreshToken) {
             return true;
         }
         return false;
@@ -51,29 +50,44 @@ class AuthBlockingService {
         const newBlockingConfig = await identityPlatform.getBlockingFunctionsConfig(endpoint.project);
         const oldBlockingConfig = (0, utils_1.cloneDeep)(newBlockingConfig);
         if (endpoint.blockingTrigger.eventType === events.v1.BEFORE_CREATE_EVENT) {
-            newBlockingConfig.triggers = Object.assign(Object.assign({}, newBlockingConfig.triggers), { beforeCreate: {
+            newBlockingConfig.triggers = {
+                ...newBlockingConfig.triggers,
+                beforeCreate: {
                     functionUri: endpoint.uri,
-                } });
+                },
+            };
         }
         else if (endpoint.blockingTrigger.eventType === events.v1.BEFORE_SIGN_IN_EVENT) {
-            newBlockingConfig.triggers = Object.assign(Object.assign({}, newBlockingConfig.triggers), { beforeSignIn: {
+            newBlockingConfig.triggers = {
+                ...newBlockingConfig.triggers,
+                beforeSignIn: {
                     functionUri: endpoint.uri,
-                } });
+                },
+            };
         }
         else if (endpoint.blockingTrigger.eventType === events.v1.BEFORE_SEND_EMAIL_EVENT) {
-            newBlockingConfig.triggers = Object.assign(Object.assign({}, newBlockingConfig.triggers), { beforeSendEmail: {
+            newBlockingConfig.triggers = {
+                ...newBlockingConfig.triggers,
+                beforeSendEmail: {
                     functionUri: endpoint.uri,
-                } });
+                },
+            };
         }
         else if (endpoint.blockingTrigger.eventType === events.v1.BEFORE_SEND_SMS_EVENT) {
-            newBlockingConfig.triggers = Object.assign(Object.assign({}, newBlockingConfig.triggers), { beforeSendSms: {
+            newBlockingConfig.triggers = {
+                ...newBlockingConfig.triggers,
+                beforeSendSms: {
                     functionUri: endpoint.uri,
-                } });
+                },
+            };
         }
         else {
             throw new error_1.FirebaseError(`Received invalid blocking trigger event type ${endpoint.blockingTrigger.eventType}`);
         }
-        newBlockingConfig.forwardInboundCredentials = Object.assign(Object.assign({}, oldBlockingConfig.forwardInboundCredentials), endpoint.blockingTrigger.options);
+        newBlockingConfig.forwardInboundCredentials = {
+            ...oldBlockingConfig.forwardInboundCredentials,
+            ...endpoint.blockingTrigger.options,
+        };
         if (!this.configChanged(newBlockingConfig, oldBlockingConfig)) {
             return;
         }
@@ -87,25 +101,24 @@ class AuthBlockingService {
         return this.triggerQueue;
     }
     async unregisterTriggerLocked(endpoint) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
         const blockingConfig = await identityPlatform.getBlockingFunctionsConfig(endpoint.project);
-        if (endpoint.uri !== ((_b = (_a = blockingConfig.triggers) === null || _a === void 0 ? void 0 : _a.beforeCreate) === null || _b === void 0 ? void 0 : _b.functionUri) &&
-            endpoint.uri !== ((_d = (_c = blockingConfig.triggers) === null || _c === void 0 ? void 0 : _c.beforeSignIn) === null || _d === void 0 ? void 0 : _d.functionUri) &&
-            endpoint.uri !== ((_f = (_e = blockingConfig.triggers) === null || _e === void 0 ? void 0 : _e.beforeSendEmail) === null || _f === void 0 ? void 0 : _f.functionUri) &&
-            endpoint.uri !== ((_h = (_g = blockingConfig.triggers) === null || _g === void 0 ? void 0 : _g.beforeSendSms) === null || _h === void 0 ? void 0 : _h.functionUri)) {
+        if (endpoint.uri !== blockingConfig.triggers?.beforeCreate?.functionUri &&
+            endpoint.uri !== blockingConfig.triggers?.beforeSignIn?.functionUri &&
+            endpoint.uri !== blockingConfig.triggers?.beforeSendEmail?.functionUri &&
+            endpoint.uri !== blockingConfig.triggers?.beforeSendSms?.functionUri) {
             return;
         }
-        if (endpoint.uri === ((_k = (_j = blockingConfig.triggers) === null || _j === void 0 ? void 0 : _j.beforeCreate) === null || _k === void 0 ? void 0 : _k.functionUri)) {
-            (_l = blockingConfig.triggers) === null || _l === void 0 ? true : delete _l.beforeCreate;
+        if (endpoint.uri === blockingConfig.triggers?.beforeCreate?.functionUri) {
+            delete blockingConfig.triggers?.beforeCreate;
         }
-        if (endpoint.uri === ((_o = (_m = blockingConfig.triggers) === null || _m === void 0 ? void 0 : _m.beforeSignIn) === null || _o === void 0 ? void 0 : _o.functionUri)) {
-            (_p = blockingConfig.triggers) === null || _p === void 0 ? true : delete _p.beforeSignIn;
+        if (endpoint.uri === blockingConfig.triggers?.beforeSignIn?.functionUri) {
+            delete blockingConfig.triggers?.beforeSignIn;
         }
-        if (endpoint.uri === ((_r = (_q = blockingConfig.triggers) === null || _q === void 0 ? void 0 : _q.beforeSendEmail) === null || _r === void 0 ? void 0 : _r.functionUri)) {
-            (_s = blockingConfig.triggers) === null || _s === void 0 ? true : delete _s.beforeSendEmail;
+        if (endpoint.uri === blockingConfig.triggers?.beforeSendEmail?.functionUri) {
+            delete blockingConfig.triggers?.beforeSendEmail;
         }
-        if (endpoint.uri === ((_u = (_t = blockingConfig.triggers) === null || _t === void 0 ? void 0 : _t.beforeSendSms) === null || _u === void 0 ? void 0 : _u.functionUri)) {
-            (_v = blockingConfig.triggers) === null || _v === void 0 ? true : delete _v.beforeSendSms;
+        if (endpoint.uri === blockingConfig.triggers?.beforeSendSms?.functionUri) {
+            delete blockingConfig.triggers?.beforeSendSms;
         }
         await identityPlatform.setBlockingFunctionsConfig(endpoint.project, blockingConfig);
     }

package/lib/deploy/functions/services/database.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureDatabaseTriggerRegion = void 0;
+exports.ensureDatabaseTriggerRegion = ensureDatabaseTriggerRegion;
 const error_1 = require("../../../error");
 function ensureDatabaseTriggerRegion(endpoint) {
     if (!endpoint.eventTrigger.region) {
@@ -11,4 +11,3 @@ function ensureDatabaseTriggerRegion(endpoint) {
     }
     return Promise.resolve();
 }
-exports.ensureDatabaseTriggerRegion = ensureDatabaseTriggerRegion;