firebase-functions 7.2.5 → 7.3.0-rc.0

package/lib/runtime/manifest.d.ts

@@ -13,7 +13,6 @@ export interface ManifestExtension {
 }
 /**
  * A definition of a function as appears in the Manifest.
- *
  * @alpha
  */
 export interface ManifestEndpoint {
@@ -104,22 +103,44 @@ export interface ManifestRequiredAPI {
     reason: string;
 }
 /**
- * A definition of a function/extension deployment as appears in the Manifest.
+ * A definition of a lifecycle action as appears in the Manifest.
  *
  * @alpha
  */
+export interface ManifestLifecycleAction {
+    task?: {
+        function: string;
+        body?: Record<string, unknown>;
+    };
+    call?: {
+        function: string;
+        params?: Record<string, unknown>;
+    };
+    http?: {
+        function?: string;
+        url?: string;
+        method?: string;
+        headers?: Record<string, string>;
+        body?: unknown;
+    };
+}
+/**
+ * A definition of a function/extension deployment as appears in the Manifest.
+ * @alpha
+ */
 export interface ManifestStack {
     specVersion: "v1alpha1";
     params?: WireParamSpec<any>[];
     requiredAPIs: ManifestRequiredAPI[];
     endpoints: Record<string, ManifestEndpoint>;
     extensions?: Record<string, ManifestExtension>;
+    requiredRoles?: string[];
+    lifecycleHooks?: Record<string, ManifestLifecycleAction>;
 }
 /**
  * Returns the JSON representation of a ManifestStack, which has CEL
  * expressions in its options as object types, with its expressions
  * transformed into the actual CEL strings.
- *
  * @alpha
  */
 export declare function stackToWire(stack: ManifestStack): Record<string, unknown>;

package/lib/runtime/manifest.js

@@ -7,7 +7,6 @@ const require_common_options = require('../common/options.js');
 * Returns the JSON representation of a ManifestStack, which has CEL
 * expressions in its options as object types, with its expressions
 * transformed into the actual CEL strings.
-*
 * @alpha
 */
 function stackToWire(stack) {

package/lib/security/roles.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Global set of declared IAM roles required by this codebase.
+ * Accumulated in-memory during manifest generation.
+ */
+export declare const declaredRoles: Set<string>;

package/lib/security/roles.js

@@ -0,0 +1,19 @@
+
+//#region src/security/roles.ts
+/**
+* Global set of declared IAM roles required by this codebase.
+* Accumulated in-memory during manifest generation.
+*/
+const declaredRoles = new Set();
+/**
+* Registers a role to be required by this codebase.
+* Automatically deduplicates using the Set.
+* @internal
+*/
+function registerRole(role) {
+	declaredRoles.add(role);
+}
+
+//#endregion
+exports.declaredRoles = declaredRoles;
+exports.registerRole = registerRole;

package/lib/v1/cloud-functions.d.ts

@@ -49,10 +49,13 @@ export interface EventContext<Params = Record<string, string>> {
      * For more detail including token keys, see the
      * {@link https://firebase.google.com/docs/reference/rules/rules#properties | security rules reference}.
      *
-     * This field is only populated for Realtime Database triggers and Callable
-     * functions. For an unauthenticated user, this field is null. For Firebase
+     * This field is only populated for Realtime Database triggers. For an
+     * unauthenticated Realtime Database user, this field is `null`. For Firebase
      * admin users and event types that do not provide user information, this field
-     * does not exist.
+     * is not set.
+     *
+     * Callable functions use {@link https.CallableContext.auth} instead of
+     * `EventContext.auth`.
      */
     auth?: {
         uid: string;
@@ -72,8 +75,8 @@ export interface EventContext<Params = Record<string, string>> {
      *
      * - `UNAUTHENTICATED`: Unauthenticated action
      *
-     * - `null`: For event types that do not provide user information (all except
-     *   Realtime Database).
+     * This field is only populated for Realtime Database triggers. For event
+     * types that do not provide user information, this field is not set.
      */
     authType?: "ADMIN" | "USER" | "UNAUTHENTICATED";
     /**

package/lib/v1/cloud-functions.js

@@ -13,6 +13,7 @@ const WILDCARD_REGEX = new RegExp("{[^/{}]*}", "g");
 /** @internal */
 function makeCloudFunction({ contextOnlyHandler, dataConstructor = (raw) => raw.data, eventType, handler, labels = {}, legacyEventType, options = {}, provider, service, triggerResource }) {
 	handler = require_common_onInit.withInit(handler ?? contextOnlyHandler);
+	const contextOnlyHandlerWithInit = contextOnlyHandler && require_common_onInit.withInit(contextOnlyHandler);
 	const cloudFunction = (data, context) => {
 		if (legacyEventType && context.eventType === legacyEventType) {
 			context.eventType = provider + "." + eventType;
@@ -42,7 +43,7 @@ function makeCloudFunction({ contextOnlyHandler, dataConstructor = (raw) => raw.
 		}
 		let promise;
 		if (labels && labels["deployment-scheduled"]) {
-			promise = contextOnlyHandler(context);
+			promise = contextOnlyHandlerWithInit(context);
 		} else {
 			const dataOrChange = dataConstructor(event);
 			promise = handler(dataOrChange, context);

package/lib/v1/function-builder.d.ts

@@ -72,10 +72,10 @@ export declare class FunctionBuilder {
     get https(): {
         /**
          * Handle HTTP requests.
-         * @param handler A function that takes a request and response object,
+         * @param optsOrHandler Options or a function that takes a request and response object,
          * same signature as an Express app.
          */
-        onRequest: (handler: (req: https.Request, resp: express.Response) => void | Promise<void>) => import("./cloud-functions").HttpsFunction;
+        onRequest: (optsOrHandler: https.HttpsOptions | ((req: https.Request, resp: express.Response) => void | Promise<void>), handler?: (req: https.Request, resp: express.Response) => void | Promise<void>) => import("./cloud-functions").HttpsFunction;
         /**
          * Declares a callable method for clients to call using a Firebase SDK.
          * @param handler A method that takes a data and context and returns a value.

package/lib/v1/function-builder.js

@@ -200,7 +200,21 @@ var FunctionBuilder = class {
 			console.warn("RuntimeOptions.failurePolicy is not supported in https functions.");
 		}
 		return {
-			onRequest: (handler) => require_v1_providers_https._onRequestWithOptions(handler, this.options),
+			onRequest: (optsOrHandler, handler) => {
+				let opts;
+				let userHandler;
+				if (typeof optsOrHandler === "function") {
+					opts = {};
+					userHandler = optsOrHandler;
+				} else {
+					opts = optsOrHandler;
+					userHandler = handler;
+				}
+				return require_v1_providers_https._onRequestWithOptions(userHandler, {
+					...this.options,
+					...opts
+				});
+			},
 			onCall: (handler) => require_v1_providers_https._onCallWithOptions(handler, this.options)
 		};
 	}

package/lib/v1/index.d.ts

@@ -21,3 +21,4 @@ export * from "./function-configuration";
 import * as params from "../params";
 export { params };
 export { onInit } from "../common/onInit";
+export { requiresAPI } from "../common/api";

package/lib/v1/index.js

@@ -1,5 +1,6 @@
 const require_logger_index = require('../logger/index.js');
 const require_params_index = require('../params/index.js');
+const require_common_api = require('../common/api.js');
 const require_common_options = require('../common/options.js');
 const require_common_config = require('../common/config.js');
 const require_common_app = require('../common/app.js');
@@ -97,6 +98,7 @@ Object.defineProperty(exports, 'remoteConfig', {
     return require_v1_providers_remoteConfig.remoteConfig_exports;
   }
 });
+exports.requiresAPI = require_common_api.requiresAPI;
 exports.runWith = require_v1_function_builder.runWith;
 Object.defineProperty(exports, 'storage', {
   enumerable: true,

package/lib/v1/providers/https.d.ts

@@ -1,14 +1,22 @@
 import * as express from "express";
-import { CallableContext, FunctionsErrorCode, HttpsError, Request } from "../../common/providers/https";
+import { CallableContext, FunctionsErrorCode, HttpsError, type CorsOption, Request } from "../../common/providers/https";
 import { HttpsFunction, Runnable } from "../cloud-functions";
 export { HttpsError };
 export type { Request, CallableContext, FunctionsErrorCode };
+export interface HttpsOptions {
+    /**
+     * If true, allows CORS on requests to this function.
+     * If this is a `string` or `RegExp`, allows requests from domains that match the provided value.
+     * If this is an `Array`, allows requests from domains matching at least one entry of the array.
+     */
+    cors?: CorsOption;
+}
 /**
  * Handle HTTP requests.
- * @param handler A function that takes a request and response object,
+ * @param optsOrHandler Options or a function that takes a request and response object,
  * same signature as an Express app.
  */
-export declare function onRequest(handler: (req: Request, resp: express.Response) => void | Promise<void>): HttpsFunction;
+export declare function onRequest(optsOrHandler: HttpsOptions | ((req: Request, resp: express.Response) => void | Promise<void>), handler?: (req: Request, resp: express.Response) => void | Promise<void>): HttpsFunction;
 /**
  * Declares a callable method for clients to call using a Firebase SDK.
  * @param handler A method that takes a data and context and returns a value.

package/lib/v1/providers/https.js

@@ -1,10 +1,13 @@
 const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.js');
 const require_runtime_manifest = require('../../runtime/manifest.js');
+const require_common_debug = require('../../common/debug.js');
 const require_common_encoding = require('../../common/encoding.js');
 const require_common_onInit = require('../../common/onInit.js');
 const require_v1_cloud_functions = require('../cloud-functions.js');
 const require_common_providers_https = require('../../common/providers/https.js');
 const require_v2_trace = require('../../v2/trace.js');
+let cors = require("cors");
+cors = require_rolldown_runtime.__toESM(cors);
 
 //#region src/v1/providers/https.ts
 var https_exports = /* @__PURE__ */ require_rolldown_runtime.__export({
@@ -16,11 +19,20 @@ var https_exports = /* @__PURE__ */ require_rolldown_runtime.__export({
 });
 /**
 * Handle HTTP requests.
-* @param handler A function that takes a request and response object,
+* @param optsOrHandler Options or a function that takes a request and response object,
 * same signature as an Express app.
 */
-function onRequest(handler) {
-	return _onRequestWithOptions(handler, {});
+function onRequest(optsOrHandler, handler) {
+	let opts;
+	let userHandler;
+	if (typeof optsOrHandler === "function") {
+		opts = {};
+		userHandler = optsOrHandler;
+	} else {
+		opts = optsOrHandler;
+		userHandler = handler;
+	}
+	return _onRequestWithOptions(userHandler, opts);
 }
 /**
 * Declares a callable method for clients to call using a Firebase SDK.
@@ -31,6 +43,19 @@ function onCall(handler) {
 }
 /** @internal */
 function _onRequestWithOptions(handler, options) {
+	if (require_common_debug.isDebugFeatureEnabled("enableCors") || "cors" in options) {
+		const userProvidedHandler = handler;
+		handler = (req, res) => {
+			return new Promise((resolve) => {
+				res.on("finish", resolve);
+				const origin = require_common_providers_https.resolveCorsOrigin(options.cors);
+				const middleware = (0, cors.default)({ origin });
+				middleware(req, res, () => {
+					resolve(userProvidedHandler(req, res));
+				});
+			});
+		};
+	}
 	const cloudFunction = (req, res) => {
 		return require_v2_trace.wrapTraceContext(require_common_onInit.withInit(require_common_providers_https.withErrorHandler(handler)))(req, res);
 	};

package/lib/v2/index.d.ts

@@ -20,14 +20,16 @@ import * as firestore from "./providers/firestore";
 import * as dataconnect from "./providers/dataconnect";
 export { alerts, database, storage, https, identity, pubsub, tasks, eventarc, scheduler, remoteConfig, testLab, firestore, dataconnect, };
 export { logger } from "../logger";
-export { setGlobalOptions } from "./options";
-export type { GlobalOptions, SupportedRegion, MemoryOption, VpcEgressSetting, IngressSetting, EventHandlerOptions, } from "./options";
+export { setGlobalOptions, requiresRole } from "./options";
+export { requiresAPI } from "../common/api";
+export type { GlobalOptions, SupportedRegion, MemoryOption, VpcEgressSetting, IngressSetting, EventHandlerOptions, Role, } from "./options";
 export { onInit } from "./core";
 export type { CloudFunction, CloudEvent, ParamsOf } from "./core";
 export { Change } from "../common/change";
 export { traceContext } from "../common/trace";
 import * as params from "../params";
 export { params };
+export { afterFirstDeploy, afterRedeploy } from "../lifecycle";
 export { config } from "../v1/config";
 import { setApp as setEmulatedAdminApp } from "../common/app";
 export declare const app: {

package/lib/v2/index.doc.js

@@ -1,9 +1,12 @@
 const require_common_trace = require('../common/trace.js');
 const require_logger_index = require('../logger/index.js');
 const require_params_index = require('../params/index.js');
+const require_common_api = require('../common/api.js');
+const require_lifecycle_index = require('../lifecycle/index.js');
 const require_common_change = require('../common/change.js');
 const require_common_onInit = require('../common/onInit.js');
 const require_v1_config = require('../v1/config.js');
+const require_v2_security = require('./security.js');
 const require_v2_options = require('./options.js');
 const require_v2_dataconnect_doc = require('./dataconnect.doc.js');
 const require_v2_providers_alerts_index = require('./providers/alerts/index.js');
@@ -21,6 +24,8 @@ const require_v2_providers_firestore = require('./providers/firestore.js');
 const require_v2_index = require('./index.js');
 
 exports.Change = require_common_change.Change;
+exports.afterFirstDeploy = require_lifecycle_index.afterFirstDeploy;
+exports.afterRedeploy = require_lifecycle_index.afterRedeploy;
 Object.defineProperty(exports, 'alerts', {
   enumerable: true,
   get: function () {
@@ -85,6 +90,8 @@ Object.defineProperty(exports, 'remoteConfig', {
     return require_v2_providers_remoteConfig.remoteConfig_exports;
   }
 });
+exports.requiresAPI = require_common_api.requiresAPI;
+exports.requiresRole = require_v2_security.requiresRole;
 Object.defineProperty(exports, 'scheduler', {
   enumerable: true,
   get: function () {

package/lib/v2/index.js

@@ -1,11 +1,14 @@
 const require_common_trace = require('../common/trace.js');
 const require_logger_index = require('../logger/index.js');
 const require_params_index = require('../params/index.js');
+const require_common_api = require('../common/api.js');
+const require_lifecycle_index = require('../lifecycle/index.js');
 const require_common_app = require('../common/app.js');
 const require_common_change = require('../common/change.js');
 const require_common_onInit = require('../common/onInit.js');
 const require_v1_config = require('../v1/config.js');
 require('./core.js');
+const require_v2_security = require('./security.js');
 const require_v2_options = require('./options.js');
 const require_v2_providers_dataconnect_index = require('./providers/dataconnect/index.js');
 const require_v2_providers_alerts_index = require('./providers/alerts/index.js');
@@ -26,6 +29,8 @@ const app = { setEmulatedAdminApp: require_common_app.setApp };
 
 //#endregion
 exports.Change = require_common_change.Change;
+exports.afterFirstDeploy = require_lifecycle_index.afterFirstDeploy;
+exports.afterRedeploy = require_lifecycle_index.afterRedeploy;
 Object.defineProperty(exports, 'alerts', {
   enumerable: true,
   get: function () {
@@ -90,6 +95,8 @@ Object.defineProperty(exports, 'remoteConfig', {
     return require_v2_providers_remoteConfig.remoteConfig_exports;
   }
 });
+exports.requiresAPI = require_common_api.requiresAPI;
+exports.requiresRole = require_v2_security.requiresRole;
 Object.defineProperty(exports, 'scheduler', {
   enumerable: true,
   get: function () {

package/lib/v2/options.d.ts

@@ -66,8 +66,10 @@ export interface GlobalOptions {
      * HTTPS functions can specify a higher timeout.
      *
      * @remarks
-     * The minimum timeout for a 2nd gen function is 1s. The maximum timeout for a
-     * function depends on the type of function: Event handling functions have a
+     * The minimum timeout for a 2nd gen (and 1st gen) function is 0s; this has the precise
+     * meaning of being 'un-set' and ends up defaulting to 60s.
+     * The maximum timeout for a function depends on the type of function:
+     * Event handling functions have a
      * maximum timeout of 540s (9 minutes). HTTPS and callable functions have a
      * maximum timeout of 3,600s (1 hour). Task queue functions have a maximum
      * timeout of 1,800s (30 minutes).
@@ -203,3 +205,5 @@ export declare function __getSpec(): {
     globalOptions: GlobalOptions;
     params: ParamSpec<any>[];
 };
+export { requiresRole } from "./security";
+export type { Role } from "./security";

package/lib/v2/options.js

@@ -1,9 +1,34 @@
 const require_logger_index = require('../logger/index.js');
+const require_params_types = require('../params/types.js');
 const require_params_index = require('../params/index.js');
 const require_common_options = require('../common/options.js');
 const require_common_encoding = require('../common/encoding.js');
+const require_common_utilities_assertions = require('../common/utilities/assertions.js');
+const require_v2_security = require('./security.js');
 
 //#region src/v2/options.ts
+/**
+* Maximum timeout in seconds for event-handling functions (e.g. Firestore,
+* Realtime Database, Pub/Sub, Storage, Eventarc, alerts, scheduler).
+* See https://firebase.google.com/docs/functions/manage-functions
+* @internal
+*/
+const MAX_EVENT_TIMEOUT_SECONDS = 540;
+/**
+* Maximum timeout in seconds for HTTPS and callable functions.
+* @internal
+*/
+const MAX_HTTPS_TIMEOUT_SECONDS = 3600;
+/**
+* Maximum timeout in seconds for Task Queue functions.
+* @internal
+*/
+const MAX_TASK_TIMEOUT_SECONDS = 1800;
+/**
+* Maximum timeout in seconds for Identity blocking functions.
+* @internal
+*/
+const MAX_IDENTITY_TIMEOUT_SECONDS = 7;
 const MemoryOptionToMB = {
 	"128MiB": 128,
 	"256MiB": 256,
@@ -35,10 +60,58 @@ function getGlobalOptions() {
 	return globalOptions || {};
 }
 /**
+* Validate that `timeoutSeconds` (resolved with global option fallback) is
+* finite and within the accepted range for the given function kind. Throws a
+* plain `Error` matching the v1 `assertRuntimeOptionsValid` shape so the
+* problem surfaces at function-definition time instead of at deploy time.
+* `Expression`, `RESET_VALUE`, and `undefined` are skipped. Literal numbers
+* are range checked, and other types are rejected.
+* @internal
+*/
+function assertTimeoutSecondsValid(opts, kind) {
+	const timeoutSeconds = opts.timeoutSeconds === undefined ? getGlobalOptions().timeoutSeconds : opts.timeoutSeconds;
+	if (typeof timeoutSeconds !== "number") {
+		if (timeoutSeconds === undefined || timeoutSeconds instanceof require_params_types.Expression || timeoutSeconds instanceof require_common_options.ResetValue) {
+			return;
+		}
+		throw new Error(`timeoutSeconds must be a number, Expression, or RESET_VALUE. Got ${typeof timeoutSeconds}.`);
+	}
+	if (!Number.isFinite(timeoutSeconds)) {
+		throw new Error(`timeoutSeconds must be a finite number. Got ${timeoutSeconds}.`);
+	}
+	let max;
+	let label;
+	switch (kind) {
+		case "event":
+			max = MAX_EVENT_TIMEOUT_SECONDS;
+			label = "event-handling";
+			break;
+		case "https":
+			max = MAX_HTTPS_TIMEOUT_SECONDS;
+			label = "HTTPS and callable";
+			break;
+		case "task":
+			max = MAX_TASK_TIMEOUT_SECONDS;
+			label = "task queue";
+			break;
+		case "identity":
+			max = MAX_IDENTITY_TIMEOUT_SECONDS;
+			label = "blocking";
+			break;
+		default: require_common_utilities_assertions.assertNever(kind);
+	}
+	if (timeoutSeconds < 0 || timeoutSeconds > max) {
+		throw new Error(`timeoutSeconds must be between 0 and ${max} for ${label} functions. Got ${timeoutSeconds}.`);
+	}
+}
+/**
 * Apply GlobalOptions to trigger definitions.
 * @internal
 */
-function optionsToTriggerAnnotations(opts) {
+function optionsToTriggerAnnotations(opts, kind) {
+	if (kind !== undefined) {
+		assertTimeoutSecondsValid(opts, kind);
+	}
 	const annotation = {};
 	require_common_encoding.copyIfPresent(annotation, opts, "concurrency", "minInstances", "maxInstances", "ingressSettings", "labels", "vpcConnector", "secrets");
 	const vpcEgress = opts.vpcEgress ?? opts.vpcConnectorEgressSettings;
@@ -69,7 +142,10 @@ function optionsToTriggerAnnotations(opts) {
 * Apply GlobalOptions to endpoint manifest.
 * @internal
 */
-function optionsToEndpoint(opts) {
+function optionsToEndpoint(opts, kind) {
+	if (kind !== undefined) {
+		assertTimeoutSecondsValid(opts, kind);
+	}
 	const endpoint = {};
 	require_common_encoding.copyIfPresent(endpoint, opts, "omit", "concurrency", "minInstances", "maxInstances", "ingressSettings", "labels", "timeoutSeconds", "cpu");
 	require_common_encoding.convertIfPresent(endpoint, opts, "serviceAccountEmail", "serviceAccount");
@@ -127,9 +203,15 @@ function __getSpec() {
 }
 
 //#endregion
+exports.MAX_EVENT_TIMEOUT_SECONDS = MAX_EVENT_TIMEOUT_SECONDS;
+exports.MAX_HTTPS_TIMEOUT_SECONDS = MAX_HTTPS_TIMEOUT_SECONDS;
+exports.MAX_IDENTITY_TIMEOUT_SECONDS = MAX_IDENTITY_TIMEOUT_SECONDS;
+exports.MAX_TASK_TIMEOUT_SECONDS = MAX_TASK_TIMEOUT_SECONDS;
 exports.RESET_VALUE = require_common_options.RESET_VALUE;
 exports.__getSpec = __getSpec;
+exports.assertTimeoutSecondsValid = assertTimeoutSecondsValid;
 exports.getGlobalOptions = getGlobalOptions;
 exports.optionsToEndpoint = optionsToEndpoint;
 exports.optionsToTriggerAnnotations = optionsToTriggerAnnotations;
+exports.requiresRole = require_v2_security.requiresRole;
 exports.setGlobalOptions = setGlobalOptions;

package/lib/v2/providers/ai/index.js

@@ -90,7 +90,7 @@ function beforeGenerateContent(optsOrCb, cb) {
 	func.run = handler;
 	func = require_v2_trace.wrapTraceContext(require_common_onInit.withInit(func));
 	const baseOpts = require_v2_options.optionsToEndpoint(require_v2_options.getGlobalOptions());
-	const specificOpts = require_v2_options.optionsToEndpoint(opts);
+	const specificOpts = require_v2_options.optionsToEndpoint(opts, "https");
 	func.__endpoint = {
 		...require_runtime_manifest.initV2Endpoint(require_v2_options.getGlobalOptions(), opts),
 		platform: "gcfv2",
@@ -165,7 +165,7 @@ function afterGenerateContent(optsOrCb, cb) {
 	func.run = handler;
 	func = require_v2_trace.wrapTraceContext(require_common_onInit.withInit(func));
 	const baseOpts = require_v2_options.optionsToEndpoint(require_v2_options.getGlobalOptions());
-	const specificOpts = require_v2_options.optionsToEndpoint(opts);
+	const specificOpts = require_v2_options.optionsToEndpoint(opts, "https");
 	func.__endpoint = {
 		...require_runtime_manifest.initV2Endpoint(require_v2_options.getGlobalOptions(), opts),
 		platform: "gcfv2",

package/lib/v2/providers/alerts/alerts.js

@@ -21,7 +21,7 @@ function onAlertPublished(alertTypeOrOpts, handler) {
 */
 function getEndpointAnnotation(opts, alertType, appId) {
 	const baseOpts = require_v2_options.optionsToEndpoint(require_v2_options.getGlobalOptions());
-	const specificOpts = require_v2_options.optionsToEndpoint(opts);
+	const specificOpts = require_v2_options.optionsToEndpoint(opts, "event");
 	const endpoint = {
 		...require_runtime_manifest.initV2Endpoint(require_v2_options.getGlobalOptions(), opts),
 		platform: "gcfv2",

package/lib/v2/providers/database.d.ts

@@ -69,7 +69,7 @@ export interface ReferenceOptions<Ref extends string = string> extends options.E
      * Examples: 'my-instance-1', 'my-instance-*'
      * Note: The capture syntax cannot be used for 'instance'.
      */
-    instance?: string;
+    instance?: string | Expression<string>;
     /**
      * If true, do not deploy or emulate this function.
      */

package/lib/v2/providers/database.js

@@ -1,4 +1,6 @@
 const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.js');
+const require_params_types = require('../../params/types.js');
+require('../../params/index.js');
 const require_runtime_manifest = require('../../runtime/manifest.js');
 const require_common_app = require('../../common/app.js');
 const require_common_onInit = require('../../common/onInit.js');
@@ -163,10 +165,12 @@ function makeV1Context(eventType, databaseEvent) {
 /** @internal */
 function makeEndpoint(eventType, opts, path, instance) {
 	const baseOpts = require_v2_options.optionsToEndpoint(require_v2_options.getGlobalOptions());
-	const specificOpts = require_v2_options.optionsToEndpoint(opts);
+	const specificOpts = require_v2_options.optionsToEndpoint(opts, "event");
 	const eventFilters = {};
 	const eventFilterPathPatterns = { ref: path.getValue() };
-	if (instance.hasWildcards()) {
+	if (instance instanceof require_params_types.Expression) {
+		eventFilterPathPatterns.instance = instance;
+	} else if (instance.hasWildcards()) {
 		eventFilterPathPatterns.instance = instance.getValue();
 	} else {
 		eventFilters.instance = instance.getValue();
@@ -188,15 +192,24 @@ function makeEndpoint(eventType, opts, path, instance) {
 		}
 	};
 }
+function resolveInstancePattern(instance) {
+	return instance instanceof require_params_types.Expression ? new require_common_utilities_path_pattern.PathPattern(instance.value()) : instance;
+}
+function makeInstancePattern(instance) {
+	return instance instanceof require_params_types.Expression ? instance : new require_common_utilities_path_pattern.PathPattern(instance);
+}
+function makeTypedParams(event, pathPattern, instancePattern) {
+	return makeParams(event, pathPattern, resolveInstancePattern(instancePattern));
+}
 /** @internal */
 function onChangedOperation(eventType, referenceOrOpts, handler) {
 	const { path, instance, opts } = getOpts(referenceOrOpts);
 	const pathPattern = new require_common_utilities_path_pattern.PathPattern(path);
-	const instancePattern = new require_common_utilities_path_pattern.PathPattern(instance);
+	const instancePattern = makeInstancePattern(instance);
 	const func = (raw) => {
 		const event = raw;
 		const instanceUrl = getInstance(event);
-		const params = makeParams(event, pathPattern, instancePattern);
+		const params = makeTypedParams(event, pathPattern, instancePattern);
 		const databaseEvent = makeChangedDatabaseEvent(event, instanceUrl, params);
 		const compatEvent = require_v2_compat.addV1Compat(databaseEvent, {
 			context: () => makeV1Context(eventType, databaseEvent),
@@ -212,11 +225,11 @@ function onChangedOperation(eventType, referenceOrOpts, handler) {
 function onOperation(eventType, referenceOrOpts, handler) {
 	const { path, instance, opts } = getOpts(referenceOrOpts);
 	const pathPattern = new require_common_utilities_path_pattern.PathPattern(path);
-	const instancePattern = new require_common_utilities_path_pattern.PathPattern(instance);
+	const instancePattern = makeInstancePattern(instance);
 	const func = (raw) => {
 		const event = raw;
 		const instanceUrl = getInstance(event);
-		const params = makeParams(event, pathPattern, instancePattern);
+		const params = makeTypedParams(event, pathPattern, instancePattern);
 		const data = eventType === deletedEventType ? event.data.data : event.data.delta;
 		const databaseEvent = makeDatabaseEvent(event, data, instanceUrl, params);
 		const compatEvent = require_v2_compat.addV1Compat(databaseEvent, {

package/lib/v2/providers/dataconnect/graphql.js

@@ -82,7 +82,7 @@ function onGraphRequest(opts) {
 	})));
 	const globalOpts = require_v2_options.getGlobalOptions();
 	const baseOpts = require_v2_options.optionsToEndpoint(globalOpts);
-	const specificOpts = require_v2_options.optionsToEndpoint(opts);
+	const specificOpts = require_v2_options.optionsToEndpoint(opts, "https");
 	const endpoint = {
 		...require_runtime_manifest.initV2Endpoint(globalOpts, opts),
 		platform: "gcfv2",

package/lib/v2/providers/dataconnect/index.js

@@ -56,7 +56,7 @@ function getOpts(mutationOrOpts) {
 }
 function makeEndpoint(eventType, opts, service, connector, operation) {
 	const baseOpts = require_v2_options.optionsToEndpoint(require_v2_options.getGlobalOptions());
-	const specificOpts = require_v2_options.optionsToEndpoint(opts);
+	const specificOpts = require_v2_options.optionsToEndpoint(opts, "event");
 	const eventFilters = {};
 	const eventFilterPathPatterns = {};
 	if (service) {

package/lib/v2/providers/eventarc.js

@@ -20,7 +20,7 @@ function onCustomEventPublished(eventTypeOrOpts, handler) {
 	func.run = handler;
 	const channel = opts.channel ?? "locations/us-central1/channels/firebase";
 	const baseOpts = require_v2_options.optionsToEndpoint(require_v2_options.getGlobalOptions());
-	const specificOpts = require_v2_options.optionsToEndpoint(opts);
+	const specificOpts = require_v2_options.optionsToEndpoint(opts, "event");
 	const endpoint = {
 		...require_runtime_manifest.initV2Endpoint(require_v2_options.getGlobalOptions(), opts),
 		platform: "gcfv2",

package/lib/v2/providers/firestore.js

@@ -234,7 +234,7 @@ function makeChangedFirestoreEvent(event, params) {
 /** @internal */
 function makeEndpoint(eventType, opts, document, database, namespace) {
 	const baseOpts = require_v2_options.optionsToEndpoint(require_v2_options.getGlobalOptions());
-	const specificOpts = require_v2_options.optionsToEndpoint(opts);
+	const specificOpts = require_v2_options.optionsToEndpoint(opts, "event");
 	const eventFilters = {
 		database,
 		namespace