firebase-tools 15.1.0 → 15.2.0

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

@@ -1,7 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureDataConnectTriggerRegion = void 0;
+exports.ensureDataConnectTriggerRegion = ensureDataConnectTriggerRegion;
+exports.getDataConnectP4SA = getDataConnectP4SA;
+const api_1 = require("../../../api");
 const error_1 = require("../../../error");
+const AUTOPUSH_DATACONNECT_SA_DOMAIN = "gcp-sa-autopush-dataconnect.iam.gserviceaccount.com";
+const STAGING_DATACONNECT_SA_DOMAIN = "gcp-sa-staging-dataconnect.iam.gserviceaccount.com";
+const PROD_DATACONNECT_SA_DOMAIN = "gcp-sa-firebasedataconnect.iam.gserviceaccount.com";
 function ensureDataConnectTriggerRegion(endpoint) {
     if (!endpoint.eventTrigger.region) {
         endpoint.eventTrigger.region = endpoint.region;
@@ -11,4 +16,13 @@ function ensureDataConnectTriggerRegion(endpoint) {
     }
     return Promise.resolve();
 }
-exports.ensureDataConnectTriggerRegion = ensureDataConnectTriggerRegion;
+function getDataConnectP4SA(projectNumber) {
+    const origin = (0, api_1.dataconnectOrigin)();
+    if (origin.includes("autopush")) {
+        return `service-${projectNumber}@${AUTOPUSH_DATACONNECT_SA_DOMAIN}`;
+    }
+    if (origin.includes("staging")) {
+        return `service-${projectNumber}@${STAGING_DATACONNECT_SA_DOMAIN}`;
+    }
+    return `service-${projectNumber}@${PROD_DATACONNECT_SA_DOMAIN}`;
+}

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

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

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureFirestoreTriggerRegion = exports.clearCache = void 0;
+exports.clearCache = clearCache;
+exports.ensureFirestoreTriggerRegion = ensureFirestoreTriggerRegion;
 const firestore = require("../../../gcp/firestore");
 const error_1 = require("../../../error");
 const dbCache = new Map();
@@ -9,7 +10,6 @@ function clearCache() {
     dbCache.clear();
     dbPromiseCache.clear();
 }
-exports.clearCache = clearCache;
 async function getDatabase(project, databaseId) {
     const key = `${project}/${databaseId}`;
     if (dbCache.has(key)) {
@@ -33,8 +33,7 @@ async function getDatabase(project, databaseId) {
     return dbPromise;
 }
 async function ensureFirestoreTriggerRegion(endpoint) {
-    var _a;
-    const db = await getDatabase(endpoint.project, ((_a = endpoint.eventTrigger.eventFilters) === null || _a === void 0 ? void 0 : _a.database) || "(default)");
+    const db = await getDatabase(endpoint.project, endpoint.eventTrigger.eventFilters?.database || "(default)");
     const dbRegion = db.locationId;
     if (!endpoint.eventTrigger.region) {
         endpoint.eventTrigger.region = dbRegion;
@@ -43,4 +42,3 @@ async function ensureFirestoreTriggerRegion(endpoint) {
         throw new error_1.FirebaseError("A firestore trigger location must match the firestore database region.");
     }
 }
-exports.ensureFirestoreTriggerRegion = ensureFirestoreTriggerRegion;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serviceForEndpoint = exports.noopProjectBindings = exports.noop = void 0;
+exports.noopProjectBindings = exports.noop = void 0;
+exports.serviceForEndpoint = serviceForEndpoint;
 const backend = require("../backend");
 const auth_1 = require("./auth");
 const storage_1 = require("./storage");
@@ -131,4 +132,3 @@ function serviceForEndpoint(endpoint) {
     }
     return noOpService;
 }
-exports.serviceForEndpoint = serviceForEndpoint;

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

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

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureStorageTriggerRegion = exports.obtainStorageBindings = void 0;
+exports.obtainStorageBindings = obtainStorageBindings;
+exports.ensureStorageTriggerRegion = ensureStorageTriggerRegion;
 const storage = require("../../../gcp/storage");
 const logger_1 = require("../../../logger");
 const error_1 = require("../../../error");
@@ -15,13 +16,11 @@ async function obtainStorageBindings(projectNumber) {
     };
     return [pubsubPublisherBinding];
 }
-exports.obtainStorageBindings = obtainStorageBindings;
 async function ensureStorageTriggerRegion(endpoint) {
-    var _a;
     const { eventTrigger } = endpoint;
     if (!eventTrigger.region) {
         logger_1.logger.debug("Looking up bucket region for the storage event trigger");
-        if (!((_a = eventTrigger.eventFilters) === null || _a === void 0 ? void 0 : _a.bucket)) {
+        if (!eventTrigger.eventFilters?.bucket) {
             throw new error_1.FirebaseError("Error: storage event trigger is missing bucket filter: " +
                 JSON.stringify(eventTrigger, null, 2));
         }
@@ -41,4 +40,3 @@ async function ensureStorageTriggerRegion(endpoint) {
         throw new error_1.FirebaseError(`A function in region ${endpoint.region} cannot listen to a bucket in region ${eventTrigger.region}`);
     }
 }
-exports.ensureStorageTriggerRegion = ensureStorageTriggerRegion;

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

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

package/lib/deploy/functions/triggerRegionHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureTriggerRegions = void 0;
+exports.ensureTriggerRegions = ensureTriggerRegions;
 const backend = require("./backend");
 const services_1 = require("./services");
 async function ensureTriggerRegions(want) {
@@ -13,4 +13,3 @@ async function ensureTriggerRegions(want) {
     }
     await Promise.all(regionLookups);
 }
-exports.ensureTriggerRegions = ensureTriggerRegions;

package/lib/deploy/functions/validate.js

@@ -1,6 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.secretsAreValid = exports.functionIdsAreValid = exports.functionsDirectoryExists = exports.endpointsAreUnique = exports.validateTimeoutConfig = exports.cpuConfigIsValid = exports.endpointsAreValid = exports.MAX_V2_SCHEDULE_ATTEMPT_DEADLINE_SECONDS = exports.DEFAULT_V2_SCHEDULE_ATTEMPT_DEADLINE_SECONDS = void 0;
+exports.MAX_V2_SCHEDULE_ATTEMPT_DEADLINE_SECONDS = exports.DEFAULT_V2_SCHEDULE_ATTEMPT_DEADLINE_SECONDS = void 0;
+exports.endpointsAreValid = endpointsAreValid;
+exports.cpuConfigIsValid = cpuConfigIsValid;
+exports.validateTimeoutConfig = validateTimeoutConfig;
+exports.endpointsAreUnique = endpointsAreUnique;
+exports.functionsDirectoryExists = functionsDirectoryExists;
+exports.functionIdsAreValid = functionIdsAreValid;
+exports.secretsAreValid = secretsAreValid;
 const path = require("path");
 const clc = require("colorette");
 const error_1 = require("../../error");
@@ -27,10 +34,9 @@ function matchingIds(endpoints, filter) {
 }
 const mem = (endpoint) => endpoint.availableMemoryMb || backend.DEFAULT_MEMORY;
 const cpu = (endpoint) => {
-    var _a;
     return endpoint.cpu === "gcf_gen1"
         ? backend.memoryToGen1Cpu(mem(endpoint))
-        : (_a = endpoint.cpu) !== null && _a !== void 0 ? _a : backend.memoryToGen2Cpu(mem(endpoint));
+        : endpoint.cpu ?? backend.memoryToGen2Cpu(mem(endpoint));
 };
 function validateScheduledTimeout(ep) {
     if (backend.isScheduleTriggered(ep) &&
@@ -69,7 +75,6 @@ function endpointsAreValid(wantBackend) {
     }
     cpuConfigIsValid(endpoints);
 }
-exports.endpointsAreValid = endpointsAreValid;
 function cpuConfigIsValid(endpoints) {
     const gcfV1WithCPU = matchingIds(endpoints, (endpoint) => endpoint.platform === "gcfv1" && typeof endpoint["cpu"] !== "undefined");
     if (gcfV1WithCPU.length) {
@@ -122,7 +127,6 @@ function cpuConfigIsValid(endpoints) {
         throw new error_1.FirebaseError(msg);
     }
 }
-exports.cpuConfigIsValid = cpuConfigIsValid;
 function validateTimeoutConfig(endpoints) {
     const invalidEndpoints = [];
     for (const ep of endpoints) {
@@ -143,7 +147,9 @@ function validateTimeoutConfig(endpoints) {
         else if (backend.isTaskQueueTriggered(ep)) {
             limit = MAX_V2_TASK_QUEUE_TIMEOUT_SECONDS;
         }
-        else if (backend.isHttpsTriggered(ep) || backend.isCallableTriggered(ep)) {
+        else if (backend.isHttpsTriggered(ep) ||
+            backend.isCallableTriggered(ep) ||
+            backend.isDataConnectGraphqlTriggered(ep)) {
             limit = MAX_V2_HTTP_TIMEOUT_SECONDS;
         }
         if (limit !== undefined && timeout > limit) {
@@ -162,7 +168,6 @@ function validateTimeoutConfig(endpoints) {
         "\n\nFor more information, see https://firebase.google.com/docs/functions/quotas#time_limits";
     throw new error_1.FirebaseError(msg);
 }
-exports.validateTimeoutConfig = validateTimeoutConfig;
 function endpointsAreUnique(backends) {
     const endpointToCodebases = {};
     for (const [codebase, b] of Object.entries(backends)) {
@@ -185,7 +190,6 @@ function endpointsAreUnique(backends) {
     const msgs = Object.entries(conflicts).map(([fn, codebases]) => `${fn}: ${codebases.join(",")}`);
     throw new error_1.FirebaseError("More than one codebase claims following functions:\n\t" + `${msgs.join("\n\t")}`);
 }
-exports.endpointsAreUnique = endpointsAreUnique;
 function functionsDirectoryExists(sourceDir, projectDir) {
     if (!fsutils.dirExistsSync(sourceDir)) {
         const sourceDirName = path.relative(projectDir, sourceDir);
@@ -194,7 +198,6 @@ function functionsDirectoryExists(sourceDir, projectDir) {
         throw new error_1.FirebaseError(msg);
     }
 }
-exports.functionsDirectoryExists = functionsDirectoryExists;
 function functionIdsAreValid(functions) {
     const functionName = /^[a-zA-Z][a-zA-Z0-9_-]{0,62}$/;
     const invalidIds = functions.filter((fn) => !functionName.test(fn.id));
@@ -204,7 +207,6 @@ function functionIdsAreValid(functions) {
         throw new error_1.FirebaseError(msg);
     }
 }
-exports.functionIdsAreValid = functionIdsAreValid;
 async function secretsAreValid(projectId, wantBackend) {
     const endpoints = backend
         .allEndpoints(wantBackend)
@@ -212,7 +214,6 @@ async function secretsAreValid(projectId, wantBackend) {
     validatePlatformTargets(endpoints);
     await validateSecretVersions(projectId, endpoints);
 }
-exports.secretsAreValid = secretsAreValid;
 const secretsSupportedPlatforms = ["gcfv1", "gcfv2"];
 function validatePlatformTargets(endpoints) {
     const unsupported = endpoints.filter((e) => !secretsSupportedPlatforms.includes(e.platform));

package/lib/deploy/hosting/convertConfig.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertConfig = exports.findEndpointForRewrite = void 0;
+exports.findEndpointForRewrite = findEndpointForRewrite;
+exports.convertConfig = convertConfig;
 const error_1 = require("../../error");
 const backend = require("../functions/backend");
 const utils_1 = require("../../utils");
@@ -58,11 +59,9 @@ function findEndpointForRewrite(site, targetBackend, id, region) {
         foundMatchingId: true,
     };
 }
-exports.findEndpointForRewrite = findEndpointForRewrite;
 async function convertConfig(context, functionsPayload, deploy) {
-    var _a, _b, _c, _d;
     const config = {};
-    const hasBackends = !!((_a = deploy.config.rewrites) === null || _a === void 0 ? void 0 : _a.some((r) => "function" in r || "run" in r));
+    const hasBackends = !!deploy.config.rewrites?.some((r) => "function" in r || "run" in r);
     const wantBackend = backend.merge(...Object.values(functionsPayload.functions || {}).map((c) => c.wantBackend));
     let haveBackend = backend.empty();
     if (hasBackends) {
@@ -80,11 +79,13 @@ async function convertConfig(context, functionsPayload, deploy) {
             }
         }
     }
-    config.rewrites = (_b = deploy.config.rewrites) === null || _b === void 0 ? void 0 : _b.map((rewrite) => {
-        var _a;
+    config.rewrites = deploy.config.rewrites?.map((rewrite) => {
         const target = extractPattern("rewrite", rewrite);
         if ("destination" in rewrite) {
-            return Object.assign(Object.assign({}, target), { path: rewrite.destination });
+            return {
+                ...target,
+                path: rewrite.destination,
+            };
         }
         if ("function" in rewrite) {
             if (typeof rewrite.function === "string") {
@@ -98,14 +99,14 @@ async function convertConfig(context, functionsPayload, deploy) {
                 : undefined;
             const endpoint = deployingEndpointSearch.matchingEndpoint
                 ? deployingEndpointSearch.matchingEndpoint
-                : existingEndpointSearch === null || existingEndpointSearch === void 0 ? void 0 : existingEndpointSearch.matchingEndpoint;
+                : existingEndpointSearch?.matchingEndpoint;
             if (!endpoint) {
-                if (deployingEndpointSearch.foundMatchingId || (existingEndpointSearch === null || existingEndpointSearch === void 0 ? void 0 : existingEndpointSearch.foundMatchingId)) {
+                if (deployingEndpointSearch.foundMatchingId || existingEndpointSearch?.foundMatchingId) {
                     throw new error_1.FirebaseError(`Unable to find a valid endpoint for function. Functions matching the rewrite
   are present but in the wrong region.`);
                 }
                 (0, utils_1.logLabeledWarning)(`hosting[${deploy.config.site}]`, `Unable to find a valid endpoint for function \`${id}\`, but still including it in the config`);
-                const apiRewrite = Object.assign(Object.assign({}, target), { function: id });
+                const apiRewrite = { ...target, function: id };
                 if (region) {
                     apiRewrite.functionRegion = region;
                 }
@@ -118,12 +119,19 @@ async function convertConfig(context, functionsPayload, deploy) {
                 if (rewrite.function.pinTag) {
                     throw new error_1.FirebaseError(`Function ${endpoint.id} is a 1st gen function and therefore does not support the ${(0, colorette_1.bold)("pinTag")} option`);
                 }
-                return Object.assign(Object.assign({}, target), { function: endpoint.id, functionRegion: endpoint.region });
+                return {
+                    ...target,
+                    function: endpoint.id,
+                    functionRegion: endpoint.region,
+                };
             }
-            const apiRewrite = Object.assign(Object.assign({}, target), { run: {
-                    serviceId: (_a = endpoint.runServiceId) !== null && _a !== void 0 ? _a : endpoint.id,
+            const apiRewrite = {
+                ...target,
+                run: {
+                    serviceId: endpoint.runServiceId ?? endpoint.id,
                     region: endpoint.region,
-                } });
+                },
+            };
             if (rewrite.function.pinTag) {
                 if (endpoint.minInstances) {
                     throw new error_1.FirebaseError(`Function ${endpoint.id} has minInstances set and is in a rewrite ` +
@@ -139,13 +147,16 @@ async function convertConfig(context, functionsPayload, deploy) {
             if (!rewrite.dynamicLinks) {
                 throw new error_1.FirebaseError("Can only set dynamicLinks to true in a rewrite");
             }
-            return Object.assign(Object.assign({}, target), { dynamicLinks: true });
+            return { ...target, dynamicLinks: true };
         }
         if ("run" in rewrite) {
-            const apiRewrite = Object.assign(Object.assign({}, target), { run: {
+            const apiRewrite = {
+                ...target,
+                run: {
                     serviceId: rewrite.run.serviceId,
                     region: rewrite.run.region || "us-central1",
-                } });
+                },
+            };
             if (rewrite.run.pinTag) {
                 experiments.assertEnabled("pintags", "pin to a run service revision");
                 apiRewrite.run.tag = runTags.TODO_TAG_NAME;
@@ -164,23 +175,28 @@ async function convertConfig(context, functionsPayload, deploy) {
         const versionId = (0, utils_1.last)(deploy.version.split("/"));
         await runTags.setRewriteTags(config.rewrites, context.projectId, versionId);
     }
-    config.redirects = (_c = deploy.config.redirects) === null || _c === void 0 ? void 0 : _c.map((redirect) => {
-        const apiRedirect = Object.assign(Object.assign({}, extractPattern("redirect", redirect)), { location: redirect.destination });
+    config.redirects = deploy.config.redirects?.map((redirect) => {
+        const apiRedirect = {
+            ...extractPattern("redirect", redirect),
+            location: redirect.destination,
+        };
         if (redirect.type) {
             apiRedirect.statusCode = redirect.type;
         }
         return apiRedirect;
     });
-    config.headers = (_d = deploy.config.headers) === null || _d === void 0 ? void 0 : _d.map((header) => {
+    config.headers = deploy.config.headers?.map((header) => {
         const headers = {};
         for (const { key, value } of header.headers || []) {
             headers[key] = value;
         }
-        return Object.assign(Object.assign({}, extractPattern("header", header)), { headers });
+        return {
+            ...extractPattern("header", header),
+            headers,
+        };
     });
     proto.copyIfPresent(config, deploy.config, "cleanUrls", "appAssociation", "i18n");
     proto.convertIfPresent(config, deploy.config, "trailingSlashBehavior", "trailingSlash", (b) => b ? "ADD" : "REMOVE");
     proto.pruneUndefiends(config);
     return config;
 }
-exports.convertConfig = convertConfig;

package/lib/deploy/hosting/deploy.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deploy = void 0;
+exports.deploy = deploy;
 const uploader_1 = require("./uploader");
 const detectProjectRoot_1 = require("../../detectProjectRoot");
 const listFiles_1 = require("../../listFiles");
@@ -11,8 +11,7 @@ const ora = require("ora");
 const fsutils_1 = require("../../fsutils");
 const error_1 = require("../../error");
 async function deploy(context, options) {
-    var _a, _b;
-    if (!((_a = context.hosting) === null || _a === void 0 ? void 0 : _a.deploys)) {
+    if (!context.hosting?.deploys) {
         return;
     }
     const spinner = ora();
@@ -25,12 +24,11 @@ async function deploy(context, options) {
         }
     }
     async function runDeploys(deploys, debugging) {
-        var _a;
         const deploy = deploys.shift();
         if (!deploy) {
             return;
         }
-        if (!((_a = deploy.config) === null || _a === void 0 ? void 0 : _a.public)) {
+        if (!deploy.config?.public) {
             (0, utils_1.logLabeledBullet)(`hosting[${deploy.config.site}]`, 'no "public" directory to upload, continuing with release');
             return runDeploys(deploys, debugging);
         }
@@ -79,7 +77,6 @@ async function deploy(context, options) {
         return runDeploys(deploys, debugging);
     }
     const debugging = !!(options.debug || options.nonInteractive);
-    const deploys = [...(((_b = context.hosting) === null || _b === void 0 ? void 0 : _b.deploys) || [])];
+    const deploys = [...(context.hosting?.deploys || [])];
     return runDeploys(deploys, debugging);
 }
-exports.deploy = deploy;

package/lib/deploy/hosting/hashcache.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dump = exports.load = void 0;
+exports.load = load;
+exports.dump = dump;
 const fs = require("fs-extra");
 const path = require("path");
 const logger_1 = require("../../logger");
@@ -29,7 +30,6 @@ function load(cwd, name) {
         return new Map();
     }
 }
-exports.load = load;
 function dump(cwd, name, data) {
     let st = "";
     let count = 0;
@@ -45,4 +45,3 @@ function dump(cwd, name, data) {
         logger_1.logger.debug(`[hosting] unable to store hash cache [${name}]: ${e.stack}`);
     }
 }
-exports.dump = dump;

package/lib/deploy/hosting/prepare.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unsafePins = exports.prepare = exports.addPinnedFunctionsToOnlyString = exports.hasPinnedFunctions = void 0;
+exports.hasPinnedFunctions = hasPinnedFunctions;
+exports.addPinnedFunctionsToOnlyString = addPinnedFunctionsToOnlyString;
+exports.prepare = prepare;
+exports.unsafePins = unsafePins;
 const error_1 = require("../../error");
 const api = require("../../hosting/api");
 const config = require("../../hosting/config");
@@ -31,9 +34,7 @@ function hasPinnedFunctions(options) {
     }
     return false;
 }
-exports.hasPinnedFunctions = hasPinnedFunctions;
 async function addPinnedFunctionsToOnlyString(context, options) {
-    var _a;
     if (!options.only) {
         return false;
     }
@@ -45,7 +46,7 @@ async function addPinnedFunctionsToOnlyString(context, options) {
             if (!("function" in r) || typeof r.function !== "object" || !r.function.pinTag) {
                 continue;
             }
-            const endpoint = (_a = (await backend.existingBackend(context)).endpoints[r.function.region || "us-central1"]) === null || _a === void 0 ? void 0 : _a[r.function.functionId];
+            const endpoint = (await backend.existingBackend(context)).endpoints[r.function.region || "us-central1"]?.[r.function.functionId];
             if (endpoint) {
                 options.only = (0, ensureTargeted_1.ensureTargeted)(options.only, endpoint.codebase || "default", endpoint.id);
             }
@@ -66,7 +67,6 @@ async function addPinnedFunctionsToOnlyString(context, options) {
     }
     return addedFunctions.length !== 0;
 }
-exports.addPinnedFunctionsToOnlyString = addPinnedFunctionsToOnlyString;
 async function prepare(context, options) {
     handlePublicDirectoryFlag(options);
     const configs = config.hostingConfig(options);
@@ -74,8 +74,9 @@ async function prepare(context, options) {
         return Promise.resolve();
     }
     const versions = await Promise.all(configs.map(async (config) => {
-        var _a, _b;
-        const labels = Object.assign({}, deploymentTool.labels());
+        const labels = {
+            ...deploymentTool.labels(),
+        };
         if (config.webFramework) {
             labels["firebase-web-framework"] = config.webFramework;
         }
@@ -88,8 +89,10 @@ async function prepare(context, options) {
             utils.logLabeledError("Hosting", msg);
             throw new Error(msg);
         }
-        const runPins = (_b = (_a = config.rewrites) === null || _a === void 0 ? void 0 : _a.filter((r) => "run" in r && r.run.pinTag)) === null || _b === void 0 ? void 0 : _b.map((r) => r.run.serviceId);
-        if (runPins === null || runPins === void 0 ? void 0 : runPins.length) {
+        const runPins = config.rewrites
+            ?.filter((r) => "run" in r && r.run.pinTag)
+            ?.map((r) => r.run.serviceId);
+        if (runPins?.length) {
             utils.logLabeledBullet("hosting", `The site ${clc.bold(config.site)} will pin rewrites to the current ` +
                 `latest revision of service(s) ${runPins.map(clc.bold).join(",")}`);
         }
@@ -112,7 +115,6 @@ async function prepare(context, options) {
         context.hosting.deploys.push({ config, version });
     }
 }
-exports.prepare = prepare;
 function rewriteTarget(source) {
     if ("glob" in source) {
         return source.glob;
@@ -128,7 +130,6 @@ function rewriteTarget(source) {
     }
 }
 async function unsafePins(context, config) {
-    var _a, _b, _c, _d;
     if ((context.hostingChannel || "live") === "live") {
         return [];
     }
@@ -140,7 +141,7 @@ async function unsafePins(context, config) {
         }
         if ("function" in rewrite && typeof rewrite.function === "object" && rewrite.function.pinTag) {
             const region = rewrite.function.region || "us-central1";
-            const endpoint = (_a = (await backend.existingBackend(context)).endpoints[region]) === null || _a === void 0 ? void 0 : _a[rewrite.function.functionId];
+            const endpoint = (await backend.existingBackend(context)).endpoints[region]?.[rewrite.function.functionId];
             if (!endpoint) {
                 continue;
             }
@@ -152,7 +153,7 @@ async function unsafePins(context, config) {
     }
     const channelConfig = await api.getChannel(context.projectId, config.site, "live");
     const existingUntaggedRewrites = {};
-    for (const rewrite of ((_d = (_c = (_b = channelConfig === null || channelConfig === void 0 ? void 0 : channelConfig.release) === null || _b === void 0 ? void 0 : _b.version) === null || _c === void 0 ? void 0 : _c.config) === null || _d === void 0 ? void 0 : _d.rewrites) || []) {
+    for (const rewrite of channelConfig?.release?.version?.config?.rewrites || []) {
         if ("run" in rewrite && !rewrite.run.tag) {
             existingUntaggedRewrites[rewriteTarget(rewrite)] =
                 `${rewrite.run.region}/${rewrite.run.serviceId}`;
@@ -160,4 +161,3 @@ async function unsafePins(context, config) {
     }
     return Object.keys(targetTaggedRewrites).filter((target) => targetTaggedRewrites[target] === existingUntaggedRewrites[target]);
 }
-exports.unsafePins = unsafePins;

package/lib/deploy/hosting/release.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.release = void 0;
+exports.release = release;
 const api = require("../../hosting/api");
 const logger_1 = require("../../logger");
 const utils = require("../../utils");
@@ -37,4 +37,3 @@ async function release(context, options, functionsPayload) {
         utils.logLabeledSuccess(`hosting[${deploy.config.site}]`, "release complete");
     }));
 }
-exports.release = release;

package/lib/deploy/index.js

@@ -48,7 +48,7 @@ const isDeployingWebFramework = (options) => {
     if (!config)
         return false;
     const normalizedConfig = Array.isArray(config) ? config : [config];
-    const webFrameworksInConfig = normalizedConfig.filter((c) => c === null || c === void 0 ? void 0 : c.source);
+    const webFrameworksInConfig = normalizedConfig.filter((c) => c?.source);
     if (webFrameworksInConfig.length === 0)
         return false;
     if (!options.only)
@@ -64,7 +64,6 @@ const isDeployingWebFramework = (options) => {
 };
 exports.isDeployingWebFramework = isDeployingWebFramework;
 const deploy = async function (targetNames, options, customContext = {}) {
-    var _a, _b, _c, _d;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const payload = {};
     const context = Object.assign({ projectId }, customContext);
@@ -145,10 +144,10 @@ const deploy = async function (targetNames, options, customContext = {}) {
             params[t] = "true";
         }
         void (0, track_1.trackGA4)("product_deploy", params, duration);
-        const stats = (_a = context === null || context === void 0 ? void 0 : context.dataconnect) === null || _a === void 0 ? void 0 : _a.deployStats;
+        const stats = context?.dataconnect?.deployStats;
         if (stats) {
             const fdcParams = (0, context_1.deployStatsParams)(stats);
-            void (0, track_1.trackGA4)("dataconnect_deploy", Object.assign(Object.assign({}, fdcParams), baseParams), duration);
+            void (0, track_1.trackGA4)("dataconnect_deploy", { ...fdcParams, ...baseParams }, duration);
         }
     }
     const successMessage = options.dryRun ? "Dry run complete!" : "Deploy complete!";
@@ -156,13 +155,13 @@ const deploy = async function (targetNames, options, customContext = {}) {
     (0, utils_1.logSuccess)((0, colorette_1.bold)((0, colorette_1.underline)(successMessage)));
     logger_1.logger.info();
     const deployedHosting = (0, lodash_1.includes)(targetNames, "hosting");
-    logger_1.logger.info((0, colorette_1.bold)("Project Console:"), (0, utils_1.consoleUrl)((_b = options.project) !== null && _b !== void 0 ? _b : "_", "/overview"));
+    logger_1.logger.info((0, colorette_1.bold)("Project Console:"), (0, utils_1.consoleUrl)(options.project ?? "_", "/overview"));
     if (deployedHosting) {
-        (0, lodash_1.each)((_c = context.hosting) === null || _c === void 0 ? void 0 : _c.deploys, (deploy) => {
+        (0, lodash_1.each)(context.hosting?.deploys, (deploy) => {
             logger_1.logger.info((0, colorette_1.bold)("Hosting URL:"), (0, utils_1.addSubdomain)((0, api_1.hostingOrigin)(), deploy.config.site));
         });
-        const versionNames = (_d = context.hosting) === null || _d === void 0 ? void 0 : _d.deploys.map((deploy) => deploy.version);
-        return { hosting: (versionNames === null || versionNames === void 0 ? void 0 : versionNames.length) === 1 ? versionNames[0] : versionNames };
+        const versionNames = context.hosting?.deploys.map((deploy) => deploy.version);
+        return { hosting: versionNames?.length === 1 ? versionNames[0] : versionNames };
     }
     else {
         return { hosting: undefined };

package/lib/deploy/lifecycleHooks.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lifecycleHooks = void 0;
+exports.lifecycleHooks = lifecycleHooks;
 const utils = require("../utils");
 const clc = require("colorette");
 const childProcess = require("child_process");
@@ -44,13 +44,12 @@ function runCommand(command, childOptions) {
     });
 }
 function getChildEnvironment(target, overallOptions, config) {
-    var _a;
     const projectId = needProjectId(overallOptions);
     const projectDir = overallOptions.projectRoot;
     let resourceDir;
     switch (target) {
         case "hosting":
-            resourceDir = overallOptions.config.path((_a = config.public) !== null && _a !== void 0 ? _a : config.source);
+            resourceDir = overallOptions.config.path(config.public ?? config.source);
             break;
         case "functions":
             resourceDir = overallOptions.config.path(config.source);
@@ -120,7 +119,7 @@ function getReleventConfigs(target, options) {
     });
     if (target === "functions") {
         let onlyConfigs = [];
-        const matched = onlyTargets.reduce((matched, target) => (Object.assign(Object.assign({}, matched), { [target]: false })), {});
+        const matched = onlyTargets.reduce((matched, target) => ({ ...matched, [target]: false }), {});
         for (const config of targetConfigs) {
             if (!config.codebase) {
                 onlyConfigs.push(config);
@@ -153,4 +152,3 @@ function lifecycleHooks(target, hook) {
         }, Promise.resolve());
     };
 }
-exports.lifecycleHooks = lifecycleHooks;

package/lib/deploy/remoteconfig/deploy.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-async function default_1() { }
 exports.default = default_1;
+async function default_1() { }