firebase-tools 10.0.0 → 10.1.2

package/lib/deploy/functions/prepare.js

@@ -16,10 +16,10 @@ const projectUtils_1 = require("../../projectUtils");
 const track_1 = require("../../track");
 const runtimes = require("./runtimes");
 const validate = require("./validate");
-const utils = require("../../utils");
 const logger_1 = require("../../logger");
 const triggerRegionHelper_1 = require("./triggerRegionHelper");
 const checkIam_1 = require("./checkIam");
+const error_1 = require("../../error");
 function hasUserConfig(config) {
     return Object.keys(config).length > 1;
 }
@@ -34,31 +34,37 @@ async function maybeEnableAR(projectId) {
     return true;
 }
 async function prepare(context, options, payload) {
-    if (!options.config.src.functions) {
-        return;
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const sourceDirName = options.config.get("functions.source");
+    if (!sourceDirName) {
+        throw new error_1.FirebaseError(`No functions code detected at default location (./functions), and no functions.source defined in firebase.json`);
     }
-    const runtimeDelegate = await runtimes.getRuntimeDelegate(context, options);
+    const sourceDir = options.config.path(sourceDirName);
+    const delegateContext = {
+        projectId,
+        sourceDir,
+        projectDir: options.config.projectDir,
+        runtime: options.config.get("functions.runtime") || "",
+    };
+    const runtimeDelegate = await runtimes.getRuntimeDelegate(delegateContext);
     logger_1.logger.debug(`Validating ${runtimeDelegate.name} source`);
     await runtimeDelegate.validate();
     logger_1.logger.debug(`Building ${runtimeDelegate.name} source`);
     await runtimeDelegate.build();
-    const projectId = projectUtils_1.needProjectId(options);
     const checkAPIsEnabled = await Promise.all([
         ensureApiEnabled.ensure(projectId, "cloudfunctions.googleapis.com", "functions"),
         ensureApiEnabled.check(projectId, "runtimeconfig.googleapis.com", "runtimeconfig", true),
-        ensureCloudBuildEnabled_1.ensureCloudBuildEnabled(projectId),
+        (0, ensureCloudBuildEnabled_1.ensureCloudBuildEnabled)(projectId),
         maybeEnableAR(projectId),
     ]);
     context.runtimeConfigEnabled = checkAPIsEnabled[1];
     context.artifactRegistryEnabled = checkAPIsEnabled[3];
     const firebaseConfig = await functionsConfig.getFirebaseConfig(options);
     context.firebaseConfig = firebaseConfig;
-    const runtimeConfig = await prepareFunctionsUpload_1.getFunctionsConfig(context);
-    utils.assertDefined(options.config.src.functions.source, "Error: 'functions.source' is not defined");
-    const source = options.config.src.functions.source;
+    const runtimeConfig = await (0, prepareFunctionsUpload_1.getFunctionsConfig)(context);
     const firebaseEnvs = functionsEnv.loadFirebaseEnvs(firebaseConfig, projectId);
     const userEnvOpt = {
-        functionsSource: options.config.path(source),
+        functionsSource: sourceDir,
         projectId: projectId,
         projectAlias: options.projectAlias,
     };
@@ -71,7 +77,7 @@ async function prepare(context, options, payload) {
         : usedDotenv
             ? "dotenv"
             : "none";
-    await track_1.track("functions_codebase_deploy_env_method", tag);
+    await (0, track_1.track)("functions_codebase_deploy_env_method", tag);
     logger_1.logger.debug(`Analyzing ${runtimeDelegate.name} backend spec`);
     const wantBackend = await runtimeDelegate.discoverSpec(runtimeConfig, firebaseEnvs);
     wantBackend.environmentVariables = Object.assign(Object.assign({}, userEnvs), firebaseEnvs);
@@ -90,16 +96,16 @@ async function prepare(context, options, payload) {
         await Promise.all(enablements);
     }
     if (backend.someEndpoint(wantBackend, () => true)) {
-        utils_1.logBullet(clc.cyan.bold("functions:") +
+        (0, utils_1.logBullet)(clc.cyan.bold("functions:") +
             " preparing " +
-            clc.bold(options.config.src.functions.source) +
+            clc.bold(sourceDirName) +
             " directory for uploading...");
     }
     if (backend.someEndpoint(wantBackend, (e) => e.platform === "gcfv1")) {
-        context.functionsSourceV1 = await prepareFunctionsUpload_1.prepareFunctionsUpload(runtimeConfig, options);
+        context.functionsSourceV1 = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(runtimeConfig, options);
     }
     if (backend.someEndpoint(wantBackend, (e) => e.platform === "gcfv2")) {
-        context.functionsSourceV2 = await prepareFunctionsUpload_1.prepareFunctionsUpload(undefined, options);
+        context.functionsSourceV2 = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(undefined, options);
     }
     for (const endpoint of backend.allEndpoints(wantBackend)) {
         endpoint.environmentVariables = wantBackend.environmentVariables;
@@ -108,16 +114,16 @@ async function prepare(context, options, payload) {
         return ensureApiEnabled.ensure(projectId, api, "functions", false);
     }));
     validate.functionIdsAreValid(backend.allEndpoints(wantBackend));
-    context.filters = functionsDeployHelper_1.getFilterGroups(options);
+    context.filters = (0, functionsDeployHelper_1.getFilterGroups)(options);
     const matchingBackend = backend.matchingBackend(wantBackend, (endpoint) => {
-        return functionsDeployHelper_1.functionMatchesAnyGroup(endpoint, context.filters);
+        return (0, functionsDeployHelper_1.functionMatchesAnyGroup)(endpoint, context.filters);
     });
     const haveBackend = await backend.existingBackend(context);
-    await checkIam_1.ensureServiceAgentRoles(projectId, wantBackend, haveBackend);
+    await (0, checkIam_1.ensureServiceAgentRoles)(projectId, wantBackend, haveBackend);
     inferDetailsFromExisting(wantBackend, haveBackend, usedDotenv);
-    await triggerRegionHelper_1.ensureTriggerRegions(wantBackend);
-    await prompts_1.promptForFailurePolicies(options, matchingBackend, haveBackend);
-    await prompts_1.promptForMinInstances(options, matchingBackend, haveBackend);
+    await (0, triggerRegionHelper_1.ensureTriggerRegions)(wantBackend);
+    await (0, prompts_1.promptForFailurePolicies)(options, matchingBackend, haveBackend);
+    await (0, prompts_1.promptForMinInstances)(options, matchingBackend, haveBackend);
     await backend.checkAvailability(context, wantBackend);
 }
 exports.prepare = prepare;

package/lib/deploy/functions/prompts.js

@@ -38,7 +38,7 @@ async function promptForFailurePolicies(options, want, have) {
             exit: 1,
         });
     }
-    const proceed = await prompt_1.promptOnce({
+    const proceed = await (0, prompt_1.promptOnce)({
         type: "confirm",
         name: "confirm",
         default: false,
@@ -56,7 +56,7 @@ async function promptForFunctionDeletion(functionsToDelete, force, nonInteractiv
     }
     const deleteList = functionsToDelete
         .sort(backend.compareFunctions)
-        .map((fn) => "\t" + functionsDeployHelper_1.getFunctionLabel(fn))
+        .map((fn) => "\t" + (0, functionsDeployHelper_1.getFunctionLabel)(fn))
         .join("\n");
     if (nonInteractive) {
         const deleteCommands = functionsToDelete
@@ -75,7 +75,7 @@ async function promptForFunctionDeletion(functionsToDelete, force, nonInteractiv
             "\n\nIf you are renaming a function or changing its region, it is recommended that you create the new " +
             "function first before deleting the old one to prevent event loss. For more info, visit " +
             clc.underline("https://firebase.google.com/docs/functions/manage-functions#modify" + "\n"));
-        shouldDeleteFns = await prompt_1.promptOnce({
+        shouldDeleteFns = await (0, prompt_1.promptOnce)({
             type: "confirm",
             name: "confirm",
             default: false,
@@ -121,7 +121,7 @@ async function promptForMinInstances(options, want, have) {
         .filter((fn) => fn.minInstances)
         .sort(backend.compareFunctions)
         .map((fn) => {
-        return (`\t${functionsDeployHelper_1.getFunctionLabel(fn)}: ${fn.minInstances} instances, ` +
+        return (`\t${(0, functionsDeployHelper_1.getFunctionLabel)(fn)}: ${fn.minInstances} instances, ` +
             backend.memoryOptionDisplayName(fn.availableMemoryMb || 256) +
             " of memory each");
     })
@@ -150,7 +150,7 @@ async function promptForMinInstances(options, want, have) {
         costLine +
         cudAnnotation;
     utils.logLabeledWarning("functions", warnMessage);
-    const proceed = await prompt_1.promptOnce({
+    const proceed = await (0, prompt_1.promptOnce)({
         type: "confirm",
         name: "confirm",
         default: false,

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

@@ -9,7 +9,10 @@ async function handler(op) {
     }
     catch (err) {
         const code = 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.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);
         if (code === 429 || code === 409) {
             throw err;
         }

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

@@ -119,7 +119,7 @@ class Fabricator {
             await this.createV2Function(endpoint);
         }
         else {
-            functional_1.assertExhaustive(endpoint.platform);
+            (0, functional_1.assertExhaustive)(endpoint.platform);
         }
         await this.setTrigger(endpoint);
     }
@@ -139,7 +139,7 @@ class Fabricator {
             await this.updateV2Function(update.endpoint);
         }
         else {
-            functional_1.assertExhaustive(update.endpoint.platform);
+            (0, functional_1.assertExhaustive)(update.endpoint.platform);
         }
         await this.setTrigger(update.endpoint);
     }
@@ -351,7 +351,7 @@ class Fabricator {
                 await this.upsertScheduleV2(endpoint);
                 return;
             }
-            functional_1.assertExhaustive(endpoint.platform);
+            (0, functional_1.assertExhaustive)(endpoint.platform);
         }
         else if (backend.isTaskQueueTriggered(endpoint)) {
             await this.upsertTaskQueue(endpoint);
@@ -367,7 +367,7 @@ class Fabricator {
                 await this.deleteScheduleV2(endpoint);
                 return;
             }
-            functional_1.assertExhaustive(endpoint.platform);
+            (0, functional_1.assertExhaustive)(endpoint.platform);
         }
         else if (backend.isTaskQueueTriggered(endpoint)) {
             await this.disableTaskQueue(endpoint);
@@ -415,7 +415,7 @@ class Fabricator {
             .catch(rethrowAs(endpoint, "disable task queue"));
     }
     logOpStart(op, endpoint) {
-        const runtime = runtimes_1.getHumanFriendlyRuntimeName(endpoint.runtime);
+        const runtime = (0, runtimes_1.getHumanFriendlyRuntimeName)(endpoint.runtime);
         const label = helper.getFunctionLabel(endpoint);
         utils.logBullet(`${clc.bold.cyan("functions:")} ${op} ${runtime} function ${clc.bold(label)}...`);
     }

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

@@ -39,7 +39,7 @@ async function release(context, options, payload) {
         executor: new executor.QueueExecutor({}),
         sourceUrl: context.sourceUrl,
         storage: context.storage,
-        appEngineLocation: functionsConfig_1.getAppEngineLocation(context.firebaseConfig),
+        appEngineLocation: (0, functionsConfig_1.getAppEngineLocation)(context.firebaseConfig),
     });
     const summary = await fab.applyPlan(plan);
     await reporter.logAndTrackDeployStats(summary);
@@ -71,7 +71,7 @@ function printTriggerUrls(results) {
             logger_1.logger.debug("Missing URI for HTTPS function in printTriggerUrls. This shouldn't happen");
             continue;
         }
-        logger_1.logger.info(clc.bold("Function URL"), `(${functionsDeployHelper_1.getFunctionLabel(httpsFunc)}):`, httpsFunc.uri);
+        logger_1.logger.info(clc.bold("Function URL"), `(${(0, functionsDeployHelper_1.getFunctionLabel)(httpsFunc)}):`, httpsFunc.uri);
     }
 }
 exports.printTriggerUrls = printTriggerUrls;

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

@@ -14,7 +14,7 @@ function calculateRegionalChanges(want, have, options) {
         .map((id) => want[id]);
     const endpointsToDelete = Object.keys(have)
         .filter((id) => !want[id])
-        .filter((id) => options.deleteAll || deploymentTool_1.isFirebaseManaged(have[id].labels || {}))
+        .filter((id) => options.deleteAll || (0, deploymentTool_1.isFirebaseManaged)(have[id].labels || {}))
         .map((id) => have[id]);
     const endpointsToUpdate = Object.keys(want)
         .filter((id) => have[id])
@@ -39,10 +39,10 @@ exports.calculateUpdate = calculateUpdate;
 function createDeploymentPlan(want, have, options = {}) {
     const deployment = {};
     want = backend.matchingBackend(want, (endpoint) => {
-        return functionsDeployHelper_1.functionMatchesAnyGroup(endpoint, options.filters || []);
+        return (0, functionsDeployHelper_1.functionMatchesAnyGroup)(endpoint, options.filters || []);
     });
     have = backend.matchingBackend(have, (endpoint) => {
-        return functionsDeployHelper_1.functionMatchesAnyGroup(endpoint, options.filters || []);
+        return (0, functionsDeployHelper_1.functionMatchesAnyGroup)(endpoint, options.filters || []);
     });
     const regions = new Set([...Object.keys(want.endpoints), ...Object.keys(have.endpoints)]);
     for (const region of regions) {
@@ -146,17 +146,17 @@ function checkForIllegalUpdate(want, have) {
     const wantType = triggerType(want);
     const haveType = triggerType(have);
     if (wantType != haveType) {
-        throw new error_1.FirebaseError(`[${functionsDeployHelper_2.getFunctionLabel(want)}] Changing from ${haveType} function to ${wantType} function is not allowed. Please delete your function and create a new one instead.`);
+        throw new error_1.FirebaseError(`[${(0, functionsDeployHelper_2.getFunctionLabel)(want)}] Changing from ${haveType} function to ${wantType} function is not allowed. Please delete your function and create a new one instead.`);
     }
     if (want.platform == "gcfv1" && have.platform == "gcfv2") {
-        throw new error_1.FirebaseError(`[${functionsDeployHelper_2.getFunctionLabel(want)}] Functions cannot be downgraded from GCFv2 to GCFv1`);
+        throw new error_1.FirebaseError(`[${(0, functionsDeployHelper_2.getFunctionLabel)(want)}] Functions cannot be downgraded from GCFv2 to GCFv1`);
     }
     exports.checkForV2Upgrade(want, have);
 }
 exports.checkForIllegalUpdate = checkForIllegalUpdate;
 function checkForV2Upgrade(want, have) {
     if (want.platform == "gcfv2" && have.platform == "gcfv1") {
-        throw new error_1.FirebaseError(`[${functionsDeployHelper_2.getFunctionLabel(have)}] Upgrading from GCFv1 to GCFv2 is not yet supported. Please delete your old function or wait for this feature to be ready.`);
+        throw new error_1.FirebaseError(`[${(0, functionsDeployHelper_2.getFunctionLabel)(have)}] Upgrading from GCFv1 to GCFv2 is not yet supported. Please delete your old function or wait for this feature to be ready.`);
     }
 }
 exports.checkForV2Upgrade = checkForV2Upgrade;

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

@@ -85,7 +85,7 @@ function printErrors(summary) {
     logger_1.logger.info("Functions deploy had errors with the following functions:" +
         errored
             .filter((r) => !(r.error instanceof AbortedDeploymentError))
-            .map((result) => `\n\t${functionsDeployHelper_1.getFunctionLabel(result.endpoint)}`)
+            .map((result) => `\n\t${(0, functionsDeployHelper_1.getFunctionLabel)(result.endpoint)}`)
             .join(""));
     printIamErrors(errored);
     printQuotaErrors(errored);
@@ -99,7 +99,7 @@ function printIamErrors(results) {
     }
     logger_1.logger.info("");
     logger_1.logger.info("Unable to set the invoker for the IAM policy on the following functions:" +
-        iamFailures.map((result) => `\n\t${functionsDeployHelper_1.getFunctionLabel(result.endpoint)}`).join(""));
+        iamFailures.map((result) => `\n\t${(0, functionsDeployHelper_1.getFunctionLabel)(result.endpoint)}`).join(""));
     logger_1.logger.info("");
     logger_1.logger.info("Some common causes of this:");
     logger_1.logger.info("");
@@ -124,7 +124,11 @@ function printQuotaErrors(results) {
             return false;
         }
         const original = r.error.original;
-        const code = (original === null || original === void 0 ? void 0 : original.status) || (original === null || original === void 0 ? void 0 : original.code) || ((_b = (_a = original === null || original === void 0 ? void 0 : original.context) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.statusCode) || ((_c = original === null || original === void 0 ? void 0 : original.original) === null || _c === void 0 ? void 0 : _c.code) || ((_f = (_e = (_d = original === null || original === void 0 ? void 0 : original.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);
+        const code = (original === null || original === void 0 ? void 0 : original.status) ||
+            (original === null || original === void 0 ? void 0 : original.code) ||
+            ((_b = (_a = original === null || original === void 0 ? void 0 : original.context) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.statusCode) ||
+            ((_c = original === null || original === void 0 ? void 0 : original.original) === null || _c === void 0 ? void 0 : _c.code) ||
+            ((_f = (_e = (_d = original === null || original === void 0 ? void 0 : original.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);
         return code === 429 || code === 409;
     });
     if (!hadQuotaError) {
@@ -145,7 +149,7 @@ function printAbortedErrors(results) {
     logger_1.logger.info("");
     logger_1.logger.info("Because there were errors creating or updating functions, the following " +
         "functions were not deleted" +
-        aborted.map((result) => `\n\t${functionsDeployHelper_1.getFunctionLabel(result.endpoint)}`).join(""));
+        aborted.map((result) => `\n\t${(0, functionsDeployHelper_1.getFunctionLabel)(result.endpoint)}`).join(""));
     logger_1.logger.info(`To delete these, use ${clc.bold("firebase functions:delete")}`);
 }
 exports.printAbortedErrors = printAbortedErrors;

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

@@ -10,7 +10,7 @@ const logger_1 = require("../../../../logger");
 const api = require("../../.../../../../api");
 const v1alpha1 = require("./v1alpha1");
 const error_1 = require("../../../../error");
-exports.readFileAsync = util_1.promisify(fs.readFile);
+exports.readFileAsync = (0, util_1.promisify)(fs.readFile);
 function yamlToBackend(yaml, project, region, runtime) {
     try {
         if (!yaml.specVersion) {
@@ -54,7 +54,7 @@ async function detectFromPort(port, project, runtime, timeout = 30000) {
     });
     while (true) {
         try {
-            res = await Promise.race([node_fetch_1.default(`http://localhost:${port}/backend.yaml`), timedOut]);
+            res = await Promise.race([(0, node_fetch_1.default)(`http://localhost:${port}/backend.yaml`), timedOut]);
             break;
         }
         catch (err) {

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

@@ -9,8 +9,8 @@ function backendFromV1Alpha1(yaml, project, region, runtime) {
     const manifest = JSON.parse(JSON.stringify(yaml));
     const bkend = backend.empty();
     bkend.requiredAPIs = parseRequiredAPIs(manifest);
-    parsing_1.requireKeys("", manifest, "endpoints");
-    parsing_1.assertKeyTypes("", manifest, {
+    (0, parsing_1.requireKeys)("", manifest, "endpoints");
+    (0, parsing_1.assertKeyTypes)("", manifest, {
         specVersion: "string",
         requiredAPIs: "object",
         endpoints: "object",
@@ -41,7 +41,7 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
     const allParsed = [];
     const prefix = `endpoints[${id}]`;
     const ep = manifest.endpoints[id];
-    parsing_1.assertKeyTypes(prefix, ep, {
+    (0, parsing_1.assertKeyTypes)(prefix, ep, {
         region: "array",
         platform: "string",
         entryPoint: "string",
@@ -83,8 +83,8 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
     for (const region of ep.region || [defaultRegion]) {
         let triggered;
         if (backend.isEventTriggered(ep)) {
-            parsing_1.requireKeys(prefix + ".eventTrigger", ep.eventTrigger, "eventType", "eventFilters");
-            parsing_1.assertKeyTypes(prefix + ".eventTrigger", ep.eventTrigger, {
+            (0, parsing_1.requireKeys)(prefix + ".eventTrigger", ep.eventTrigger, "eventType", "eventFilters");
+            (0, parsing_1.assertKeyTypes)(prefix + ".eventTrigger", ep.eventTrigger, {
                 eventFilters: "object",
                 eventType: "string",
                 retry: "boolean",
@@ -94,19 +94,19 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
             triggered = { eventTrigger: ep.eventTrigger };
         }
         else if (backend.isHttpsTriggered(ep)) {
-            parsing_1.assertKeyTypes(prefix + ".httpsTrigger", ep.httpsTrigger, {
+            (0, parsing_1.assertKeyTypes)(prefix + ".httpsTrigger", ep.httpsTrigger, {
                 invoker: "array",
             });
             triggered = { httpsTrigger: {} };
-            proto_1.copyIfPresent(triggered.httpsTrigger, ep.httpsTrigger, "invoker");
+            (0, proto_1.copyIfPresent)(triggered.httpsTrigger, ep.httpsTrigger, "invoker");
         }
         else if (backend.isScheduleTriggered(ep)) {
-            parsing_1.assertKeyTypes(prefix + ".scheduleTrigger", ep.scheduleTrigger, {
+            (0, parsing_1.assertKeyTypes)(prefix + ".scheduleTrigger", ep.scheduleTrigger, {
                 schedule: "string",
                 timeZone: "string",
                 retryConfig: "object",
             });
-            parsing_1.assertKeyTypes(prefix + ".scheduleTrigger.retryConfig", ep.scheduleTrigger.retryConfig, {
+            (0, parsing_1.assertKeyTypes)(prefix + ".scheduleTrigger.retryConfig", ep.scheduleTrigger.retryConfig, {
                 retryCount: "number",
                 maxDoublings: "number",
                 minBackoffDuration: "string",
@@ -116,20 +116,20 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
             triggered = { scheduleTrigger: ep.scheduleTrigger };
         }
         else if (backend.isTaskQueueTriggered(ep)) {
-            parsing_1.assertKeyTypes(prefix + ".taskQueueTrigger", ep.taskQueueTrigger, {
+            (0, parsing_1.assertKeyTypes)(prefix + ".taskQueueTrigger", ep.taskQueueTrigger, {
                 rateLimits: "object",
                 retryConfig: "object",
                 invoker: "array",
             });
             if (ep.taskQueueTrigger.rateLimits) {
-                parsing_1.assertKeyTypes(prefix + ".taskQueueTrigger.rateLimits", ep.taskQueueTrigger.rateLimits, {
+                (0, parsing_1.assertKeyTypes)(prefix + ".taskQueueTrigger.rateLimits", ep.taskQueueTrigger.rateLimits, {
                     maxBurstSize: "number",
                     maxConcurrentDispatches: "number",
                     maxDispatchesPerSecond: "number",
                 });
             }
             if (ep.taskQueueTrigger.retryConfig) {
-                parsing_1.assertKeyTypes(prefix + ".taskQueueTrigger.retryConfig", ep.taskQueueTrigger.retryConfig, {
+                (0, parsing_1.assertKeyTypes)(prefix + ".taskQueueTrigger.retryConfig", ep.taskQueueTrigger.retryConfig, {
                     maxAttempts: "number",
                     maxRetryDuration: "string",
                     minBackoff: "string",
@@ -143,12 +143,12 @@ function parseEndpoints(manifest, id, 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");
         }
-        parsing_1.requireKeys(prefix, ep, "entryPoint");
+        (0, parsing_1.requireKeys)(prefix, ep, "entryPoint");
         const parsed = Object.assign({ platform: ep.platform || "gcfv2", id,
             region,
             project,
             runtime, entryPoint: ep.entryPoint }, triggered);
-        proto_1.copyIfPresent(parsed, ep, "availableMemoryMb", "maxInstances", "minInstances", "concurrency", "serviceAccountEmail", "timeout", "vpcConnector", "vpcConnectorEgressSettings", "labels", "ingressSettings", "environmentVariables");
+        (0, proto_1.copyIfPresent)(parsed, ep, "availableMemoryMb", "maxInstances", "minInstances", "concurrency", "serviceAccountEmail", "timeout", "vpcConnector", "vpcConnectorEgressSettings", "labels", "ingressSettings", "environmentVariables");
         allParsed.push(parsed);
     }
     return allParsed;

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

@@ -10,7 +10,6 @@ const spawn = require("cross-spawn");
 const error_1 = require("../../../../error");
 const logger_1 = require("../../../../logger");
 const discovery = require("../discovery");
-const projectUtils_1 = require("../../../../projectUtils");
 const gomod = require("./gomod");
 const VERSION_TO_RUNTIME = {
     "1.13": "go113",
@@ -19,21 +18,18 @@ exports.ADMIN_SDK = "firebase.google.com/go/v4";
 exports.FUNCTIONS_SDK = "github.com/FirebaseExtended/firebase-functions-go";
 exports.FUNCTIONS_CODEGEN = exports.FUNCTIONS_SDK + "/support/codegen";
 exports.FUNCTIONS_RUNTIME = exports.FUNCTIONS_SDK + "/support/runtime";
-async function tryCreateDelegate(context, options) {
-    const relativeSourceDir = options.config.get("functions.source");
-    const sourceDir = options.config.path(relativeSourceDir);
-    const goModPath = path.join(sourceDir, "go.mod");
-    const projectId = projectUtils_1.needProjectId(options);
+async function tryCreateDelegate(context) {
+    const goModPath = path.join(context.sourceDir, "go.mod");
     let module;
     try {
-        const modBuffer = await util_1.promisify(fs.readFile)(goModPath);
+        const modBuffer = await (0, util_1.promisify)(fs.readFile)(goModPath);
         module = gomod.parseModule(modBuffer.toString("utf8"));
     }
     catch (err) {
         logger_1.logger.debug("Customer code is not Golang code (or they aren't using gomod)");
         return;
     }
-    let runtime = options.config.get("functions.runtime");
+    let runtime = context.runtime;
     if (!runtime) {
         if (!module.version) {
             throw new error_1.FirebaseError("Could not detect Golang version from go.mod");
@@ -43,7 +39,7 @@ async function tryCreateDelegate(context, options) {
         }
         runtime = VERSION_TO_RUNTIME[module.version];
     }
-    return new Delegate(projectId, sourceDir, runtime, module);
+    return new Delegate(context.projectId, context.sourceDir, runtime, module);
 }
 exports.tryCreateDelegate = tryCreateDelegate;
 class Delegate {
@@ -59,7 +55,7 @@ class Delegate {
     }
     async build() {
         try {
-            await util_1.promisify(fs.mkdir)(path.join(this.sourceDir, "autogen"));
+            await (0, util_1.promisify)(fs.mkdir)(path.join(this.sourceDir, "autogen"));
         }
         catch (err) {
             if ((err === null || err === void 0 ? void 0 : err.code) !== "EEXIST") {
@@ -80,18 +76,19 @@ class Delegate {
                 children: [new Error(genBinary.stderr.toString())],
             });
         }
-        await util_1.promisify(fs.writeFile)(path.join(this.sourceDir, "autogen", "main.go"), genBinary.stdout);
+        await (0, util_1.promisify)(fs.writeFile)(path.join(this.sourceDir, "autogen", "main.go"), genBinary.stdout);
     }
     watch() {
         return Promise.resolve(() => Promise.resolve());
     }
     serve(port, adminPort, envs) {
+        var _a;
         const childProcess = spawn("go", ["run", "./autogen"], {
             env: Object.assign(Object.assign({}, envs), { PORT: port.toString(), ADMIN_PORT: adminPort.toString(), HOME: process.env.HOME, PATH: process.env.PATH, GOPATH: process.env.GOPATH }),
             cwd: this.sourceDir,
             stdio: ["ignore", "pipe", "inherit"],
         });
-        childProcess.stdout.on("data", (chunk) => {
+        (_a = childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (chunk) => {
             logger_1.logger.debug(chunk.toString());
         });
         return Promise.resolve(async () => {
@@ -99,7 +96,7 @@ class Delegate {
                 childProcess.once("exit", resolve);
                 childProcess.once("error", reject);
             });
-            await node_fetch_1.default(`http://localhost:${adminPort}/quitquitquit`);
+            await (0, node_fetch_1.default)(`http://localhost:${adminPort}/quitquitquit`);
             setTimeout(() => {
                 if (!childProcess.killed) {
                     childProcess.kill("SIGKILL");
@@ -111,7 +108,7 @@ class Delegate {
     async discoverSpec(configValues, envs) {
         let discovered = await discovery.detectFromYaml(this.sourceDir, this.projectId, this.runtime);
         if (!discovered) {
-            const getPort = util_1.promisify(portfinder.getPort);
+            const getPort = (0, util_1.promisify)(portfinder.getPort);
             const port = await getPort();
             portfinder.basePort = port + 1;
             const adminPort = await getPort();

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

@@ -30,22 +30,18 @@ function getHumanFriendlyRuntimeName(runtime) {
 }
 exports.getHumanFriendlyRuntimeName = getHumanFriendlyRuntimeName;
 const factories = [node.tryCreateDelegate, golang.tryCreateDelegate];
-async function getRuntimeDelegate(context, options) {
-    const sourceDirName = options.config.get("functions.source");
-    if (!sourceDirName) {
-        throw new error_1.FirebaseError(`No functions code detected at default location (./functions), and no functions.source defined in firebase.json`);
-    }
-    validate.functionsDirectoryExists(options, sourceDirName);
-    const runtime = options.config.get("functions.runtime");
+async function getRuntimeDelegate(context) {
+    const { projectDir, sourceDir, runtime } = context;
+    validate.functionsDirectoryExists(sourceDir, projectDir);
     if (runtime && !isValidRuntime(runtime)) {
-        throw new error_1.FirebaseError("Cannot deploy function with runtime " + runtime);
+        throw new error_1.FirebaseError(`Cannot deploy function with runtime ${runtime}`);
     }
     for (const factory of factories) {
-        const delegate = await factory(context, options);
+        const delegate = await factory(context);
         if (delegate) {
             return delegate;
         }
     }
-    throw new error_1.FirebaseError(`Could not detect language for functions at ${options.config.get("functions.source")}`);
+    throw new error_1.FirebaseError(`Could not detect language for functions at ${sourceDir}`);
 }
 exports.getRuntimeDelegate = getRuntimeDelegate;

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

@@ -6,26 +6,22 @@ const fs = require("fs");
 const path = require("path");
 const error_1 = require("../../../../error");
 const parseRuntimeAndValidateSDK_1 = require("./parseRuntimeAndValidateSDK");
-const projectUtils_1 = require("../../../../projectUtils");
-const validate = require("./validate");
 const logger_1 = require("../../../../logger");
+const validate = require("./validate");
 const versioning = require("./versioning");
 const parseTriggers = require("./parseTriggers");
-async function tryCreateDelegate(context, options) {
-    const projectRelativeSourceDir = options.config.get("functions.source");
-    const sourceDir = options.config.path(projectRelativeSourceDir);
-    const packageJsonPath = path.join(sourceDir, "package.json");
-    if (!(await util_1.promisify(fs.exists)(packageJsonPath))) {
+async function tryCreateDelegate(context) {
+    const packageJsonPath = path.join(context.sourceDir, "package.json");
+    if (!(await (0, util_1.promisify)(fs.exists)(packageJsonPath))) {
         logger_1.logger.debug("Customer code is not Node");
         return undefined;
     }
-    let runtime = options.config.get("functions.runtime") || "";
-    runtime = parseRuntimeAndValidateSDK_1.getRuntimeChoice(sourceDir, runtime);
+    const runtime = (0, parseRuntimeAndValidateSDK_1.getRuntimeChoice)(context.sourceDir, context.runtime);
     if (!runtime.startsWith("nodejs")) {
         logger_1.logger.debug("Customer has a package.json but did not get a nodejs runtime. This should not happen");
         throw new error_1.FirebaseError(`Unexpected runtime ${runtime}`);
     }
-    return new Delegate(projectUtils_1.needProjectId(options), options.config.projectDir, sourceDir, runtime);
+    return new Delegate(context.projectId, context.projectDir, context.sourceDir, runtime);
 }
 exports.tryCreateDelegate = tryCreateDelegate;
 class Delegate {

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

@@ -25,7 +25,7 @@ function parseTriggers(projectId, sourceDir, configValues, envs) {
         if (env.NODE_OPTIONS) {
             env.NODE_OPTIONS = removeInspectOptions(env.NODE_OPTIONS.split(" ")).join(" ");
         }
-        const parser = child_process_1.fork(TRIGGER_PARSER, [sourceDir], {
+        const parser = (0, child_process_1.fork)(TRIGGER_PARSER, [sourceDir], {
             silent: true,
             env: env,
             execArgv: execArgv,
@@ -100,9 +100,9 @@ function addResourcesToBackend(projectId, runtime, annotation, want) {
             }
         }
         const endpoint = Object.assign({ platform: annotation.platform || "gcfv1", id: annotation.name, region: region, project: projectId, entryPoint: annotation.entryPoint, runtime: runtime }, triggered);
-        if (annotation.vpcConnector) {
+        if (annotation.vpcConnector != null) {
             let maybeId = annotation.vpcConnector;
-            if (!maybeId.includes("/")) {
+            if (maybeId && !maybeId.includes("/")) {
                 maybeId = `projects/${projectId}/locations/${region}/connectors/${maybeId}`;
             }
             endpoint.vpcConnector = maybeId;

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

@@ -9,7 +9,8 @@ const cjson = require("cjson");
 function assertFunctionsSourcePresent(data, sourceDir, projectDir) {
     const indexJsFile = path.join(sourceDir, data.main || "index.js");
     if (!fsutils.fileExistsSync(indexJsFile)) {
-        const msg = `${path.relative(projectDir, indexJsFile)} does not exist, can't deploy Cloud Functions`;
+        const relativeMainPath = path.relative(projectDir, indexJsFile);
+        const msg = `${relativeMainPath} does not exist, can't deploy Cloud Functions`;
         throw new error_1.FirebaseError(msg);
     }
 }

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

@@ -36,7 +36,7 @@ async function ensureStorageTriggerRegion(endpoint, eventTrigger) {
     }
     if (endpoint.region !== eventTrigger.region &&
         eventTrigger.region !== "us-central1" &&
-        !location_1.regionInLocation(endpoint.region, eventTrigger.region)) {
+        !(0, location_1.regionInLocation)(endpoint.region, eventTrigger.region)) {
         throw new error_1.FirebaseError(`A function in region ${endpoint.region} cannot listen to a bucket in region ${eventTrigger.region}`);
     }
 }

package/lib/deploy/functions/triggerRegionHelper.js

@@ -9,7 +9,7 @@ async function ensureTriggerRegions(want) {
         if (ep.platform === "gcfv1" || !backend.isEventTriggered(ep)) {
             continue;
         }
-        regionLookups.push(services_1.serviceForEndpoint(ep).ensureTriggerRegion(ep, ep.eventTrigger));
+        regionLookups.push((0, services_1.serviceForEndpoint)(ep).ensureTriggerRegion(ep, ep.eventTrigger));
     }
     await Promise.all(regionLookups);
 }