firebase-tools 15.1.0 → 15.2.0

package/lib/deploy/functions/ensure.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.secretAccess = exports.cloudBuildEnabled = exports.defaultServiceAccount = void 0;
+exports.defaultServiceAccount = defaultServiceAccount;
+exports.cloudBuildEnabled = cloudBuildEnabled;
+exports.secretAccess = secretAccess;
 const clc = require("colorette");
 const ensureApiEnabled_1 = require("../../ensureApiEnabled");
 const error_1 = require("../../error");
@@ -28,7 +30,6 @@ async function defaultServiceAccount(e) {
     }
     (0, functional_1.assertExhaustive)(e.platform);
 }
-exports.defaultServiceAccount = defaultServiceAccount;
 function nodeBillingError(projectId) {
     return new error_1.FirebaseError(`Cloud Functions deployment requires the pay-as-you-go (Blaze) billing plan. To upgrade your project, visit the following URL:
 
@@ -50,8 +51,7 @@ ${FAQ_URL}
 `);
 }
 function isPermissionError(e) {
-    var _a, _b, _c;
-    return ((_c = (_b = (_a = e.context) === null || _a === void 0 ? void 0 : _a.body) === null || _b === void 0 ? void 0 : _b.error) === null || _c === void 0 ? void 0 : _c.status) === "PERMISSION_DENIED";
+    return e.context?.body?.error?.status === "PERMISSION_DENIED";
 }
 async function cloudBuildEnabled(projectId) {
     try {
@@ -67,7 +67,6 @@ async function cloudBuildEnabled(projectId) {
         throw e;
     }
 }
-exports.cloudBuildEnabled = cloudBuildEnabled;
 async function secretsToServiceAccounts(b) {
     const secretsToSa = {};
     for (const e of backend.allEndpoints(b)) {
@@ -81,7 +80,6 @@ async function secretsToServiceAccounts(b) {
     return secretsToSa;
 }
 async function secretAccess(projectId, wantBackend, haveBackend, dryRun) {
-    var _a, _b;
     const ensureAccess = async (secret, serviceAccounts) => {
         (0, utils_1.logLabeledBullet)("functions", `ensuring ${clc.bold(serviceAccounts.join(", "))} access to secret ${clc.bold(secret)}.`);
         if (dryRun) {
@@ -99,9 +97,9 @@ async function secretAccess(projectId, wantBackend, haveBackend, dryRun) {
     const haveSecrets = await secretsToServiceAccounts(haveBackend);
     for (const [secret, serviceAccounts] of Object.entries(haveSecrets)) {
         for (const serviceAccount of serviceAccounts) {
-            (_a = wantSecrets[secret]) === null || _a === void 0 ? void 0 : _a.delete(serviceAccount);
+            wantSecrets[secret]?.delete(serviceAccount);
         }
-        if (((_b = wantSecrets[secret]) === null || _b === void 0 ? void 0 : _b.size) === 0) {
+        if (wantSecrets[secret]?.size === 0) {
             delete wantSecrets[secret];
         }
     }
@@ -111,4 +109,3 @@ async function secretAccess(projectId, wantBackend, haveBackend, dryRun) {
     }
     await Promise.all(ensure);
 }
-exports.secretAccess = secretAccess;

package/lib/deploy/functions/functionsDeployHelper.js

@@ -1,6 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEndpointFiltered = exports.isCodebaseFiltered = exports.groupEndpointsByCodebase = exports.targetCodebases = exports.getFunctionLabel = exports.getHumanFriendlyPlatformName = exports.getEndpointFilters = exports.parseFunctionSelector = exports.endpointMatchesFilter = exports.endpointMatchesAnyFilter = void 0;
+exports.endpointMatchesAnyFilter = endpointMatchesAnyFilter;
+exports.endpointMatchesFilter = endpointMatchesFilter;
+exports.parseFunctionSelector = parseFunctionSelector;
+exports.getEndpointFilters = getEndpointFilters;
+exports.getHumanFriendlyPlatformName = getHumanFriendlyPlatformName;
+exports.getFunctionLabel = getFunctionLabel;
+exports.targetCodebases = targetCodebases;
+exports.groupEndpointsByCodebase = groupEndpointsByCodebase;
+exports.isCodebaseFiltered = isCodebaseFiltered;
+exports.isEndpointFiltered = isEndpointFiltered;
 const backend = require("./backend");
 const projectConfig_1 = require("../../functions/projectConfig");
 const functional_1 = require("../../functional");
@@ -10,7 +19,6 @@ function endpointMatchesAnyFilter(endpoint, filters) {
     }
     return filters.some((filter) => endpointMatchesFilter(endpoint, filter));
 }
-exports.endpointMatchesAnyFilter = endpointMatchesAnyFilter;
 function endpointMatchesFilter(endpoint, filter) {
     if (endpoint.codebase && filter.codebase) {
         if (endpoint.codebase !== filter.codebase) {
@@ -31,7 +39,6 @@ function endpointMatchesFilter(endpoint, filter) {
     }
     return true;
 }
-exports.endpointMatchesFilter = endpointMatchesFilter;
 function parseFunctionSelector(selector, config) {
     const fragments = selector.split(":");
     if (fragments.length < 2) {
@@ -48,7 +55,6 @@ function parseFunctionSelector(selector, config) {
         },
     ];
 }
-exports.parseFunctionSelector = parseFunctionSelector;
 function getEndpointFilters(options, config) {
     if (!options.only) {
         return undefined;
@@ -68,7 +74,6 @@ function getEndpointFilters(options, config) {
     }
     return filters;
 }
-exports.getEndpointFilters = getEndpointFilters;
 function getHumanFriendlyPlatformName(platform) {
     if (platform === "gcfv1") {
         return "1st Gen";
@@ -81,7 +86,6 @@ function getHumanFriendlyPlatformName(platform) {
     }
     (0, functional_1.assertExhaustive)(platform);
 }
-exports.getHumanFriendlyPlatformName = getHumanFriendlyPlatformName;
 function getFunctionLabel(fn) {
     let id = `${fn.id}(${fn.region})`;
     if (fn.codebase && fn.codebase !== projectConfig_1.DEFAULT_CODEBASE) {
@@ -89,7 +93,6 @@ function getFunctionLabel(fn) {
     }
     return id;
 }
-exports.getFunctionLabel = getFunctionLabel;
 function targetCodebases(config, filters) {
     const codebasesFromConfig = [...new Set(Object.values(config).map((c) => c.codebase))];
     if (!filters) {
@@ -109,7 +112,6 @@ function targetCodebases(config, filters) {
     }
     return intersections;
 }
-exports.targetCodebases = targetCodebases;
 function groupEndpointsByCodebase(wantBackends, haveEndpoints) {
     const grouped = {};
     let endpointsToAssign = haveEndpoints;
@@ -128,15 +130,12 @@ function groupEndpointsByCodebase(wantBackends, haveEndpoints) {
     }
     return grouped;
 }
-exports.groupEndpointsByCodebase = groupEndpointsByCodebase;
 function isCodebaseFiltered(codebase, filters) {
     return filters.some((filter) => {
         const noIdChunks = (filter.idChunks || []).length === 0;
         return noIdChunks && filter.codebase === codebase;
     });
 }
-exports.isCodebaseFiltered = isCodebaseFiltered;
 function isEndpointFiltered(endpoint, filters) {
     return filters.some((filter) => endpointMatchesFilter(endpoint, filter));
 }
-exports.isEndpointFiltered = isEndpointFiltered;

package/lib/deploy/functions/params.js

@@ -1,6 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveParams = exports.ParamValue = exports.isMultiSelectInput = exports.isResourceInput = exports.isSelectInput = exports.isTextInput = exports.resolveBoolean = exports.resolveList = exports.resolveString = exports.resolveInt = void 0;
+exports.ParamValue = void 0;
+exports.resolveInt = resolveInt;
+exports.resolveString = resolveString;
+exports.resolveList = resolveList;
+exports.resolveBoolean = resolveBoolean;
+exports.isTextInput = isTextInput;
+exports.isSelectInput = isSelectInput;
+exports.isResourceInput = isResourceInput;
+exports.isMultiSelectInput = isMultiSelectInput;
+exports.resolveParams = resolveParams;
 const logger_1 = require("../../logger");
 const error_1 = require("../../error");
 const prompt_1 = require("../../prompt");
@@ -25,7 +34,6 @@ function resolveInt(from, paramValues) {
     }
     return (0, cel_1.resolveExpression)("number", from, paramValues);
 }
-exports.resolveInt = resolveInt;
 function resolveString(from, paramValues) {
     let output = from;
     const celCapture = /{{ .+? }}/g;
@@ -39,7 +47,6 @@ function resolveString(from, paramValues) {
     }
     return output;
 }
-exports.resolveString = resolveString;
 function resolveList(from, paramValues) {
     if (!from) {
         return [];
@@ -54,30 +61,24 @@ function resolveList(from, paramValues) {
         (0, functional_1.assertExhaustive)(from);
     }
 }
-exports.resolveList = resolveList;
 function resolveBoolean(from, paramValues) {
     if (typeof from === "boolean") {
         return from;
     }
     return (0, cel_1.resolveExpression)("boolean", from, paramValues);
 }
-exports.resolveBoolean = resolveBoolean;
 function isTextInput(input) {
     return {}.hasOwnProperty.call(input, "text");
 }
-exports.isTextInput = isTextInput;
 function isSelectInput(input) {
     return {}.hasOwnProperty.call(input, "select");
 }
-exports.isSelectInput = isSelectInput;
 function isResourceInput(input) {
     return {}.hasOwnProperty.call(input, "resource");
 }
-exports.isResourceInput = isResourceInput;
 function isMultiSelectInput(input) {
     return {}.hasOwnProperty.call(input, "multiSelect");
 }
-exports.isMultiSelectInput = isMultiSelectInput;
 class ParamValue {
     constructor(rawValue, internal, types) {
         this.rawValue = rawValue;
@@ -192,7 +193,6 @@ async function resolveParams(params, firebaseConfig, userEnvs, nonInteractive, i
     }
     return paramValues;
 }
-exports.resolveParams = resolveParams;
 function populateDefaultParams(config) {
     const defaultParams = {};
     if (config.databaseURL && config.databaseURL !== "") {

package/lib/deploy/functions/prepare.js

@@ -1,6 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureAllRequiredAPIsEnabled = exports.warnIfNewGenkitFunctionIsMissingSecrets = exports.loadCodebases = exports.resolveCpuAndConcurrency = exports.inferBlockingDetails = exports.updateEndpointTargetedStatus = exports.inferDetailsFromExisting = exports.prepare = exports.EVENTARC_SOURCE_ENV = void 0;
+exports.EVENTARC_SOURCE_ENV = void 0;
+exports.prepare = prepare;
+exports.inferDetailsFromExisting = inferDetailsFromExisting;
+exports.updateEndpointTargetedStatus = updateEndpointTargetedStatus;
+exports.inferBlockingDetails = inferBlockingDetails;
+exports.resolveCpuAndConcurrency = resolveCpuAndConcurrency;
+exports.loadCodebases = loadCodebases;
+exports.warnIfNewGenkitFunctionIsMissingSecrets = warnIfNewGenkitFunctionIsMissingSecrets;
+exports.ensureAllRequiredAPIsEnabled = ensureAllRequiredAPIsEnabled;
 const clc = require("colorette");
 const proto = require("../../gcp/proto");
 const backend = require("./backend");
@@ -30,10 +38,8 @@ const backend_1 = require("./backend");
 const functional_1 = require("../../functional");
 const prepare_1 = require("../extensions/prepare");
 const prompt = require("../../prompt");
-const experiments = require("../../experiments");
 exports.EVENTARC_SOURCE_ENV = "EVENTARC_CLOUD_EVENT_SOURCE";
 async function prepare(context, options, payload) {
-    var _a, _b;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
     context.config = (0, projectConfig_1.normalizeAndValidate)(options.config.src.functions);
@@ -55,12 +61,9 @@ async function prepare(context, options, payload) {
     context.firebaseConfig = firebaseConfig;
     context.codebaseDeployEvents = {};
     let runtimeConfig = { firebase: firebaseConfig };
-    const allowFunctionsConfig = experiments.isEnabled("legacyRuntimeConfigCommands");
     const targetedCodebaseConfigs = context.config.filter((cfg) => codebases.includes(cfg.codebase));
-    if (allowFunctionsConfig &&
-        checkAPIsEnabled[1] &&
-        targetedCodebaseConfigs.some(projectConfig_1.shouldUseRuntimeConfig)) {
-        runtimeConfig = Object.assign(Object.assign({}, runtimeConfig), (await (0, prepareFunctionsUpload_1.getFunctionsConfig)(projectId)));
+    if (checkAPIsEnabled[1] && targetedCodebaseConfigs.some(projectConfig_1.shouldUseRuntimeConfig)) {
+        runtimeConfig = { ...runtimeConfig, ...(await (0, prepareFunctionsUpload_1.getFunctionsConfig)(projectId)) };
     }
     context.hasRuntimeConfig = Object.keys(runtimeConfig).some((k) => k !== "firebase");
     const wantBuilds = await loadCodebases(context.config, options, firebaseConfig, runtimeConfig, context.filters);
@@ -84,7 +87,7 @@ async function prepare(context, options, payload) {
         };
         proto.convertIfPresent(userEnvOpt, localCfg, "configDir", (cd) => options.config.path(cd));
         const userEnvs = functionsEnv.loadUserEnvs(userEnvOpt);
-        const envs = Object.assign(Object.assign({}, userEnvs), firebaseEnvs);
+        const envs = { ...userEnvs, ...firebaseEnvs };
         const { backend: wantBackend, envs: resolvedEnvs } = await build.resolveBackend({
             build: wantBuild,
             firebaseConfig,
@@ -96,8 +99,8 @@ async function prepare(context, options, payload) {
         let hasEnvsFromParams = false;
         wantBackend.environmentVariables = envs;
         for (const envName of Object.keys(resolvedEnvs)) {
-            const isList = (_a = resolvedEnvs[envName]) === null || _a === void 0 ? void 0 : _a.legalList;
-            const envValue = (_b = resolvedEnvs[envName]) === null || _b === void 0 ? void 0 : _b.toSDK();
+            const isList = resolvedEnvs[envName]?.legalList;
+            const envValue = resolvedEnvs[envName]?.toSDK();
             if (envValue &&
                 !resolvedEnvs[envName].internal &&
                 (!Object.prototype.hasOwnProperty.call(wantBackend.environmentVariables, envName) || isList)) {
@@ -106,7 +109,7 @@ async function prepare(context, options, payload) {
             }
         }
         for (const endpoint of backend.allEndpoints(wantBackend)) {
-            endpoint.environmentVariables = Object.assign({}, (wantBackend.environmentVariables || {}));
+            endpoint.environmentVariables = { ...(wantBackend.environmentVariables || {}) };
             let resource;
             if (endpoint.platform === "gcfv1") {
                 resource = `projects/${endpoint.project}/locations/${endpoint.region}/functions/${endpoint.id}`;
@@ -155,15 +158,22 @@ async function prepare(context, options, payload) {
             (0, utils_1.logLabeledBullet)("functions", `preparing ${clc.bold(sourceDirName)} directory for uploading...`);
         }
         if (backend.someEndpoint(wantBackend, (e) => e.platform === "gcfv2")) {
-            const packagedSource = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(sourceDir, localCfg);
-            source.functionsSourceV2 = packagedSource === null || packagedSource === void 0 ? void 0 : packagedSource.pathToSource;
-            source.functionsSourceV2Hash = packagedSource === null || packagedSource === void 0 ? void 0 : packagedSource.hash;
+            const schPathSet = new Set();
+            for (const e of backend.allEndpoints(wantBackend)) {
+                if (backend.isDataConnectGraphqlTriggered(e) &&
+                    e.dataConnectGraphqlTrigger.schemaFilePath) {
+                    schPathSet.add(e.dataConnectGraphqlTrigger.schemaFilePath);
+                }
+            }
+            const packagedSource = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(options.config.projectDir, sourceDir, localCfg, [...schPathSet]);
+            source.functionsSourceV2 = packagedSource?.pathToSource;
+            source.functionsSourceV2Hash = packagedSource?.hash;
         }
         if (backend.someEndpoint(wantBackend, (e) => e.platform === "gcfv1")) {
             const configForUpload = (0, projectConfig_1.shouldUseRuntimeConfig)(localCfg) ? runtimeConfig : undefined;
-            const packagedSource = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(sourceDir, localCfg, configForUpload);
-            source.functionsSourceV1 = packagedSource === null || packagedSource === void 0 ? void 0 : packagedSource.pathToSource;
-            source.functionsSourceV1Hash = packagedSource === null || packagedSource === void 0 ? void 0 : packagedSource.hash;
+            const packagedSource = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(options.config.projectDir, sourceDir, localCfg, [], configForUpload);
+            source.functionsSourceV1 = packagedSource?.pathToSource;
+            source.functionsSourceV1Hash = packagedSource?.hash;
         }
         context.sources[codebase] = source;
     }
@@ -197,17 +207,18 @@ async function prepare(context, options, payload) {
     updateEndpointTargetedStatus(wantBackends, context.filters || []);
     (0, applyHash_1.applyBackendHashToBackends)(wantBackends, context);
 }
-exports.prepare = prepare;
 function inferDetailsFromExisting(want, have, usedDotenv) {
-    var _a;
     for (const wantE of backend.allEndpoints(want)) {
-        const haveE = (_a = have.endpoints[wantE.region]) === null || _a === void 0 ? void 0 : _a[wantE.id];
+        const haveE = have.endpoints[wantE.region]?.[wantE.id];
         if (!haveE) {
             continue;
         }
         wantE.runServiceId = haveE.runServiceId;
         if (!usedDotenv) {
-            wantE.environmentVariables = Object.assign(Object.assign({}, haveE.environmentVariables), wantE.environmentVariables);
+            wantE.environmentVariables = {
+                ...haveE.environmentVariables,
+                ...wantE.environmentVariables,
+            };
         }
         if (typeof wantE.availableMemoryMb === "undefined" && haveE.availableMemoryMb) {
             wantE.availableMemoryMb = haveE.availableMemoryMb;
@@ -219,7 +230,6 @@ function inferDetailsFromExisting(want, have, usedDotenv) {
         maybeCopyTriggerRegion(wantE, haveE);
     }
 }
-exports.inferDetailsFromExisting = inferDetailsFromExisting;
 function maybeCopyTriggerRegion(wantE, haveE) {
     if (!backend.isEventTriggered(wantE) || !backend.isEventTriggered(haveE)) {
         return;
@@ -240,9 +250,7 @@ function updateEndpointTargetedStatus(wantBackends, endpointFilters) {
         }
     }
 }
-exports.updateEndpointTargetedStatus = updateEndpointTargetedStatus;
 function inferBlockingDetails(want) {
-    var _a, _b, _c;
     const authBlockingEndpoints = backend
         .allEndpoints(want)
         .filter((ep) => backend.isBlockingTriggered(ep) &&
@@ -254,9 +262,9 @@ function inferBlockingDetails(want) {
     let idToken = false;
     let refreshToken = false;
     for (const blockingEp of authBlockingEndpoints) {
-        accessToken || (accessToken = !!((_a = blockingEp.blockingTrigger.options) === null || _a === void 0 ? void 0 : _a.accessToken));
-        idToken || (idToken = !!((_b = blockingEp.blockingTrigger.options) === null || _b === void 0 ? void 0 : _b.idToken));
-        refreshToken || (refreshToken = !!((_c = blockingEp.blockingTrigger.options) === null || _c === void 0 ? void 0 : _c.refreshToken));
+        accessToken || (accessToken = !!blockingEp.blockingTrigger.options?.accessToken);
+        idToken || (idToken = !!blockingEp.blockingTrigger.options?.idToken);
+        refreshToken || (refreshToken = !!blockingEp.blockingTrigger.options?.refreshToken);
     }
     for (const blockingEp of authBlockingEndpoints) {
         if (!blockingEp.blockingTrigger.options) {
@@ -267,7 +275,6 @@ function inferBlockingDetails(want) {
         blockingEp.blockingTrigger.options.refreshToken = refreshToken;
     }
 }
-exports.inferBlockingDetails = inferBlockingDetails;
 function resolveCpuAndConcurrency(want) {
     for (const e of backend.allEndpoints(want)) {
         if (e.platform === "gcfv1") {
@@ -284,7 +291,6 @@ function resolveCpuAndConcurrency(want) {
         }
     }
 }
-exports.resolveCpuAndConcurrency = resolveCpuAndConcurrency;
 async function loadCodebases(config, options, firebaseConfig, runtimeConfig, filters) {
     const codebases = (0, functionsDeployHelper_1.targetCodebases)(config, filters);
     const projectId = (0, projectUtils_1.needProjectId)(options);
@@ -321,24 +327,25 @@ async function loadCodebases(config, options, firebaseConfig, runtimeConfig, fil
         const codebaseRuntimeConfig = (0, projectConfig_1.shouldUseRuntimeConfig)(codebaseConfig)
             ? runtimeConfig
             : { firebase: firebaseConfig };
-        const discoveredBuild = await runtimeDelegate.discoverBuild(codebaseRuntimeConfig, Object.assign(Object.assign({}, firebaseEnvs), { GOOGLE_CLOUD_QUOTA_PROJECT: projectId }));
+        const discoveredBuild = await runtimeDelegate.discoverBuild(codebaseRuntimeConfig, {
+            ...firebaseEnvs,
+            GOOGLE_CLOUD_QUOTA_PROJECT: projectId,
+        });
         discoveredBuild.runtime = codebaseConfig.runtime;
         build.applyPrefix(discoveredBuild, codebaseConfig.prefix || "");
         wantBuilds[codebase] = discoveredBuild;
     }
     return wantBuilds;
 }
-exports.loadCodebases = loadCodebases;
 async function warnIfNewGenkitFunctionIsMissingSecrets(have, want, options) {
     if (options.force) {
         return;
     }
     const newAndMissingSecrets = backend.allEndpoints(backend.matchingBackend(want, (e) => {
-        var _a;
         if (!backend.isCallableTriggered(e) || !e.callableTrigger.genkitAction) {
             return false;
         }
-        if ((_a = e.secretEnvironmentVariables) === null || _a === void 0 ? void 0 : _a.length) {
+        if (e.secretEnvironmentVariables?.length) {
             return false;
         }
         return !backend.hasEndpoint(have)(e);
@@ -352,7 +359,6 @@ async function warnIfNewGenkitFunctionIsMissingSecrets(have, want, options) {
         }
     }
 }
-exports.warnIfNewGenkitFunctionIsMissingSecrets = warnIfNewGenkitFunctionIsMissingSecrets;
 async function ensureAllRequiredAPIsEnabled(projectNumber, wantBackend) {
     await Promise.all(Object.values(wantBackend.requiredAPIs).map(({ api }) => {
         return ensureApiEnabled.ensure(projectNumber, api, "functions", false);
@@ -373,4 +379,3 @@ async function ensureAllRequiredAPIsEnabled(projectNumber, wantBackend) {
         await ensureApiEnabled.ensure(projectNumber, (0, api_1.secretManagerOrigin)(), "functions", false);
     }
 }
-exports.ensureAllRequiredAPIsEnabled = ensureAllRequiredAPIsEnabled;

package/lib/deploy/functions/prepareFunctionsUpload.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertToSortedKeyValueArray = exports.prepareFunctionsUpload = exports.getFunctionsConfig = void 0;
+exports.getFunctionsConfig = getFunctionsConfig;
+exports.prepareFunctionsUpload = prepareFunctionsUpload;
+exports.convertToSortedKeyValueArray = convertToSortedKeyValueArray;
 const archiver = require("archiver");
 const clc = require("colorette");
 const filesize = require("filesize");
@@ -15,13 +17,12 @@ const utils = require("../../utils");
 const fsAsync = require("../../fsAsync");
 const CONFIG_DEST_FILE = ".runtimeconfig.json";
 async function getFunctionsConfig(projectId) {
-    var _a, _b;
     try {
         return await functionsConfig.materializeAll(projectId);
     }
     catch (err) {
         logger_1.logger.debug(err);
-        let errorCode = (_b = (_a = err === null || err === void 0 ? void 0 : err.context) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.statusCode;
+        let errorCode = err?.context?.response?.statusCode;
         if (!errorCode) {
             logger_1.logger.debug("Got unexpected error from Runtime Config; it has no status code:", err);
             errorCode = 500;
@@ -35,16 +36,15 @@ async function getFunctionsConfig(projectId) {
     }
     return {};
 }
-exports.getFunctionsConfig = getFunctionsConfig;
 async function pipeAsync(from, to) {
     from.pipe(to);
     await from.finalize();
     return new Promise((resolve, reject) => {
-        to.on("finish", resolve);
+        to.on("finish", () => resolve());
         to.on("error", reject);
     });
 }
-async function packageSource(sourceDir, config, runtimeConfig) {
+async function packageSource(projectDir, sourceDir, config, additionalSources, runtimeConfig) {
     const tmpFile = tmp.fileSync({ prefix: "firebase-functions-", postfix: ".zip" }).name;
     const fileStream = fs.createWriteStream(tmpFile, {
         flags: "w",
@@ -65,6 +65,19 @@ async function packageSource(sourceDir, config, runtimeConfig) {
                 mode: file.mode,
             });
         }
+        for (const name of additionalSources) {
+            const absPath = utils.resolveWithin(projectDir, name);
+            if (!fs.existsSync(absPath)) {
+                throw new error_1.FirebaseError(clc.bold(absPath) + " does not exist.", { exit: 1 });
+            }
+            const mode = fs.statSync(absPath).mode;
+            const fileHash = await (0, hash_1.getSourceHash)(absPath);
+            hashes.push(fileHash);
+            archive.file(absPath, {
+                name,
+                mode,
+            });
+        }
         if (typeof runtimeConfig !== "undefined") {
             const runtimeConfigHashString = JSON.stringify(convertToSortedKeyValueArray(runtimeConfig));
             hashes.push(runtimeConfigHashString);
@@ -80,6 +93,9 @@ async function packageSource(sourceDir, config, runtimeConfig) {
         await pipeAsync(archive, fileStream);
     }
     catch (err) {
+        if (err instanceof error_1.FirebaseError) {
+            throw err;
+        }
         throw new error_1.FirebaseError("Could not read source directory. Remove links and shortcuts and try again.", {
             original: err,
             exit: 1,
@@ -94,10 +110,9 @@ async function packageSource(sourceDir, config, runtimeConfig) {
     const hash = hashes.join(".");
     return { pathToSource: tmpFile, hash };
 }
-async function prepareFunctionsUpload(sourceDir, config, runtimeConfig) {
-    return packageSource(sourceDir, config, runtimeConfig);
+async function prepareFunctionsUpload(projectDir, sourceDir, config, additionalSources, runtimeConfig) {
+    return packageSource(projectDir, sourceDir, config, additionalSources, runtimeConfig);
 }
-exports.prepareFunctionsUpload = prepareFunctionsUpload;
 function convertToSortedKeyValueArray(config) {
     if (typeof config !== "object" || config === null)
         return config;
@@ -107,4 +122,3 @@ function convertToSortedKeyValueArray(config) {
         return { key, value: convertToSortedKeyValueArray(config[key]) };
     });
 }
-exports.convertToSortedKeyValueArray = convertToSortedKeyValueArray;

package/lib/deploy/functions/pricing.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.monthlyMinInstanceCost = exports.canCalculateMinInstanceCost = exports.V2_FREE_TIER = exports.V1_FREE_TIER = exports.V2_RATES = exports.V1_RATES = void 0;
+exports.V2_FREE_TIER = exports.V1_FREE_TIER = exports.V2_RATES = exports.V1_RATES = void 0;
+exports.canCalculateMinInstanceCost = canCalculateMinInstanceCost;
+exports.monthlyMinInstanceCost = monthlyMinInstanceCost;
 const backend = require("./backend");
 const V1_REGION_TO_TIER = {
     "us-central1": 1,
@@ -124,7 +126,6 @@ function canCalculateMinInstanceCost(endpoint) {
     }
     return true;
 }
-exports.canCalculateMinInstanceCost = canCalculateMinInstanceCost;
 const SECONDS_PER_MONTH = 30 * 24 * 60 * 60;
 function monthlyMinInstanceCost(endpoints) {
     const usage = {
@@ -175,4 +176,3 @@ function monthlyMinInstanceCost(endpoints) {
     runCpuBill = Math.max(runCpuBill, 0);
     return v1MemoryBill + v1CpuBill + v2MemoryBill + v2CpuBill + runMemoryBill + runCpuBill;
 }
-exports.monthlyMinInstanceCost = monthlyMinInstanceCost;

package/lib/deploy/functions/prompts.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promptForCleanupPolicyDays = exports.promptForMinInstances = exports.promptForUnsafeMigration = exports.promptForFunctionDeletion = exports.promptForFailurePolicies = void 0;
+exports.promptForFailurePolicies = promptForFailurePolicies;
+exports.promptForFunctionDeletion = promptForFunctionDeletion;
+exports.promptForUnsafeMigration = promptForUnsafeMigration;
+exports.promptForMinInstances = promptForMinInstances;
+exports.promptForCleanupPolicyDays = promptForCleanupPolicyDays;
 const clc = require("colorette");
 const functionsDeployHelper_1 = require("./functionsDeployHelper");
 const error_1 = require("../../error");
@@ -18,8 +22,7 @@ async function promptForFailurePolicies(options, want, have) {
         return;
     }
     const newRetryEndpoints = retryEndpoints.filter((endpoint) => {
-        var _a;
-        const existing = (_a = have.endpoints[endpoint.region]) === null || _a === void 0 ? void 0 : _a[endpoint.id];
+        const existing = have.endpoints[endpoint.region]?.[endpoint.id];
         return !(existing && backend.isEventTriggered(existing) && existing.eventTrigger.retry);
     });
     if (newRetryEndpoints.length === 0) {
@@ -44,7 +47,6 @@ async function promptForFailurePolicies(options, want, have) {
         throw new error_1.FirebaseError("Deployment canceled.", { exit: 1 });
     }
 }
-exports.promptForFailurePolicies = promptForFailurePolicies;
 async function promptForFunctionDeletion(functionsToDelete, options) {
     let shouldDeleteFns = true;
     if (functionsToDelete.length === 0 || options.force) {
@@ -78,7 +80,6 @@ async function promptForFunctionDeletion(functionsToDelete, options) {
     }
     return shouldDeleteFns;
 }
-exports.promptForFunctionDeletion = promptForFunctionDeletion;
 async function promptForUnsafeMigration(fnsToUpdate, options) {
     const unsafeUpdates = fnsToUpdate.filter((eu) => eu.unsafe);
     if (unsafeUpdates.length === 0 || options.force) {
@@ -109,18 +110,16 @@ async function promptForUnsafeMigration(fnsToUpdate, options) {
     }
     return safeUpdates;
 }
-exports.promptForUnsafeMigration = promptForUnsafeMigration;
 async function promptForMinInstances(options, want, have) {
     if (options.force) {
         return;
     }
     const increasesCost = backend.someEndpoint(want, (wantE) => {
-        var _a;
         if (!pricing.canCalculateMinInstanceCost(wantE)) {
             return true;
         }
         const wantCost = pricing.monthlyMinInstanceCost([wantE]);
-        const haveE = (_a = have.endpoints[wantE.region]) === null || _a === void 0 ? void 0 : _a[wantE.id];
+        const haveE = have.endpoints[wantE.region]?.[wantE.id];
         let haveCost;
         if (!haveE) {
             haveCost = 0;
@@ -174,7 +173,6 @@ async function promptForMinInstances(options, want, have) {
         throw new error_1.FirebaseError("Deployment canceled.", { exit: 1 });
     }
 }
-exports.promptForMinInstances = promptForMinInstances;
 async function promptForCleanupPolicyDays(options, locations) {
     utils.logLabeledWarning("functions", `No cleanup policy detected for repositories in ${locations.join(", ")}. ` +
         "This may result in a small monthly bill as container images accumulate over time.");
@@ -193,4 +191,3 @@ async function promptForCleanupPolicyDays(options, locations) {
         validate: (days) => !days || isNaN(days) || days < 0 ? "Please enter a non-negative number" : true,
     });
 }
-exports.promptForCleanupPolicyDays = promptForCleanupPolicyDays;

package/lib/deploy/functions/release/executor.js

@@ -4,12 +4,11 @@ exports.InlineExecutor = exports.QueueExecutor = exports.DEFAULT_RETRY_CODES = v
 const queue_1 = require("../../../throttler/queue");
 exports.DEFAULT_RETRY_CODES = [429, 409, 503];
 function parseErrorCode(err) {
-    var _a, _b, _c, _d, _e, _f;
     return (err.status ||
         err.code ||
-        ((_b = (_a = err.context) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.statusCode) ||
-        ((_c = err.original) === null || _c === void 0 ? void 0 : _c.code) ||
-        ((_f = (_e = (_d = err.original) === null || _d === void 0 ? void 0 : _d.context) === null || _e === void 0 ? void 0 : _e.response) === null || _f === void 0 ? void 0 : _f.statusCode));
+        err.context?.response?.statusCode ||
+        err.original?.code ||
+        err.original?.context?.response?.statusCode);
 }
 async function handler(op) {
     try {
@@ -27,10 +26,10 @@ async function handler(op) {
 }
 class QueueExecutor {
     constructor(options) {
-        this.queue = new queue_1.Queue(Object.assign(Object.assign({}, options), { handler }));
+        this.queue = new queue_1.Queue({ ...options, handler });
     }
     async run(func, opts) {
-        const retryCodes = (opts === null || opts === void 0 ? void 0 : opts.retryCodes) || exports.DEFAULT_RETRY_CODES;
+        const retryCodes = opts?.retryCodes || exports.DEFAULT_RETRY_CODES;
         const op = {
             func,
             retryCodes,