firebase-functions 7.0.0 → 7.0.1-rc.0

package/lib/common/options.d.ts

@@ -1,9 +1,18 @@
+declare const RESET_VALUE_TAG: unique symbol;
 /**
  * Special configuration type to reset configuration to platform default.
  *
  * @alpha
  */
 export declare class ResetValue {
+    /**
+     * Handle the "Dual-Package Hazard".
+     *
+     * We implement custom `Symbol.hasInstance` to so CJS/ESM ResetValue instances
+     * are recognized as the same type.
+     */
+    static [Symbol.hasInstance](instance: unknown): boolean;
+    get [RESET_VALUE_TAG](): boolean;
     toJSON(): null;
     private constructor();
     static getInstance(): ResetValue;
@@ -12,3 +21,4 @@ export declare class ResetValue {
  * Special configuration value to reset configuration to platform default.
  */
 export declare const RESET_VALUE: ResetValue;
+export {};

package/lib/common/options.js

@@ -1,11 +1,24 @@
 
 //#region src/common/options.ts
+const RESET_VALUE_TAG = Symbol.for("firebase-functions:ResetValue:Tag");
 /**
 * Special configuration type to reset configuration to platform default.
 *
 * @alpha
 */
 var ResetValue = class ResetValue {
+	/**
+	* Handle the "Dual-Package Hazard".
+	*
+	* We implement custom `Symbol.hasInstance` to so CJS/ESM ResetValue instances
+	* are recognized as the same type.
+	*/
+	static [Symbol.hasInstance](instance) {
+		return instance?.[RESET_VALUE_TAG] === true;
+	}
+	get [RESET_VALUE_TAG]() {
+		return true;
+	}
 	toJSON() {
 		return null;
 	}

package/lib/esm/common/options.mjs

@@ -1,10 +1,23 @@
 //#region src/common/options.ts
+const RESET_VALUE_TAG = Symbol.for("firebase-functions:ResetValue:Tag");
 /**
 * Special configuration type to reset configuration to platform default.
 *
 * @alpha
 */
 var ResetValue = class ResetValue {
+	/**
+	* Handle the "Dual-Package Hazard".
+	*
+	* We implement custom `Symbol.hasInstance` to so CJS/ESM ResetValue instances
+	* are recognized as the same type.
+	*/
+	static [Symbol.hasInstance](instance) {
+		return instance?.[RESET_VALUE_TAG] === true;
+	}
+	get [RESET_VALUE_TAG]() {
+		return true;
+	}
 	toJSON() {
 		return null;
 	}

package/lib/esm/params/index.mjs

@@ -21,7 +21,20 @@ var params_exports = /* @__PURE__ */ __export({
 	select: () => select,
 	storageBucket: () => storageBucket
 });
-const declaredParams = [];
+/**
+* Use a global singleton to manage the list of declared parameters.
+*
+* This ensures that parameters are shared between CJS and ESM builds,
+* avoiding the "dual-package hazard" where the src/bin/firebase-functions.ts (CJS) sees
+* an empty list while the user's code (ESM) populates a different list.
+*/
+const majorVersion = typeof "7" !== "undefined" ? "7" : "0";
+const GLOBAL_SYMBOL = Symbol.for(`firebase-functions:params:declaredParams:v${majorVersion}`);
+const globalSymbols = globalThis;
+if (!globalSymbols[GLOBAL_SYMBOL]) {
+	globalSymbols[GLOBAL_SYMBOL] = [];
+}
+const declaredParams = globalSymbols[GLOBAL_SYMBOL];
 /**
 * Use a helper to manage the list such that parameters are uniquely
 * registered once only but order is preserved.

package/lib/esm/params/types.mjs

@@ -1,7 +1,20 @@
 import { warn } from "../logger/index.mjs";
 
 //#region src/params/types.ts
+const EXPRESSION_TAG = Symbol.for("firebase-functions:Expression:Tag");
 var Expression = class {
+	/**
+	* Handle the "Dual-Package Hazard" .
+	*
+	* We implement custom `Symbol.hasInstance` to so CJS/ESM Expression instances
+	* are recognized as the same type.
+	*/
+	static [Symbol.hasInstance](instance) {
+		return instance?.[EXPRESSION_TAG] === true;
+	}
+	get [EXPRESSION_TAG]() {
+		return true;
+	}
 	/** Returns the expression's runtime value, based on the CLI's resolution of parameters. */
 	value() {
 		if (process.env.FUNCTIONS_CONTROL_API === "true") {

package/lib/esm/runtime/manifest.mjs

@@ -99,7 +99,8 @@ const RESETTABLE_V2_SCHEDULE_OPTIONS = {
 	maxDoublings: null,
 	maxRetrySeconds: null,
 	minBackoffSeconds: null,
-	maxBackoffSeconds: null
+	maxBackoffSeconds: null,
+	attemptDeadlineSeconds: null
 };
 function initScheduleTrigger(resetOptions, schedule, ...opts) {
 	let scheduleTrigger = {
@@ -108,7 +109,11 @@ function initScheduleTrigger(resetOptions, schedule, ...opts) {
 	};
 	if (opts.every((opt) => !opt?.preserveExternalChanges)) {
 		for (const key of Object.keys(resetOptions)) {
-			scheduleTrigger.retryConfig[key] = RESET_VALUE;
+			if (key === "attemptDeadlineSeconds") {
+				scheduleTrigger[key] = RESET_VALUE;
+			} else {
+				scheduleTrigger.retryConfig[key] = RESET_VALUE;
+			}
 		}
 		scheduleTrigger = {
 			...scheduleTrigger,

package/lib/esm/v2/providers/scheduler.mjs

@@ -22,6 +22,7 @@ function getOpts(args) {
 	return {
 		schedule: args.schedule,
 		timeZone: args.timeZone,
+		attemptDeadlineSeconds: args.attemptDeadlineSeconds,
 		retryConfig: {
 			retryCount: args.retryCount,
 			maxRetrySeconds: args.maxRetrySeconds,
@@ -70,7 +71,7 @@ function onSchedule(args, handler) {
 		},
 		scheduleTrigger: initV2ScheduleTrigger(separatedOpts.schedule, globalOpts, separatedOpts.opts)
 	};
-	copyIfPresent(ep.scheduleTrigger, separatedOpts, "timeZone");
+	copyIfPresent(ep.scheduleTrigger, separatedOpts, "timeZone", "attemptDeadlineSeconds");
 	copyIfPresent(ep.scheduleTrigger.retryConfig, separatedOpts.retryConfig, "retryCount", "maxRetrySeconds", "minBackoffSeconds", "maxBackoffSeconds", "maxDoublings");
 	func.__endpoint = ep;
 	func.__requiredAPIs = [{

package/lib/params/index.js

@@ -21,7 +21,20 @@ var params_exports = /* @__PURE__ */ require_rolldown_runtime.__export({
 	select: () => require_params_types.select,
 	storageBucket: () => storageBucket
 });
-const declaredParams = [];
+/**
+* Use a global singleton to manage the list of declared parameters.
+*
+* This ensures that parameters are shared between CJS and ESM builds,
+* avoiding the "dual-package hazard" where the src/bin/firebase-functions.ts (CJS) sees
+* an empty list while the user's code (ESM) populates a different list.
+*/
+const majorVersion = typeof "7" !== "undefined" ? "7" : "0";
+const GLOBAL_SYMBOL = Symbol.for(`firebase-functions:params:declaredParams:v${majorVersion}`);
+const globalSymbols = globalThis;
+if (!globalSymbols[GLOBAL_SYMBOL]) {
+	globalSymbols[GLOBAL_SYMBOL] = [];
+}
+const declaredParams = globalSymbols[GLOBAL_SYMBOL];
 /**
 * Use a helper to manage the list such that parameters are uniquely
 * registered once only but order is preserved.

package/lib/params/types.d.ts

@@ -1,4 +1,13 @@
+declare const EXPRESSION_TAG: unique symbol;
 export declare abstract class Expression<T extends string | number | boolean | string[]> {
+    /**
+     * Handle the "Dual-Package Hazard" .
+     *
+     * We implement custom `Symbol.hasInstance` to so CJS/ESM Expression instances
+     * are recognized as the same type.
+     */
+    static [Symbol.hasInstance](instance: unknown): boolean;
+    get [EXPRESSION_TAG](): boolean;
     /** Returns the expression's runtime value, based on the CLI's resolution of parameters. */
     value(): T;
     /** Returns the expression's representation as a braced CEL expression. */

package/lib/params/types.js

@@ -1,7 +1,20 @@
 const require_logger_index = require('../logger/index.js');
 
 //#region src/params/types.ts
+const EXPRESSION_TAG = Symbol.for("firebase-functions:Expression:Tag");
 var Expression = class {
+	/**
+	* Handle the "Dual-Package Hazard" .
+	*
+	* We implement custom `Symbol.hasInstance` to so CJS/ESM Expression instances
+	* are recognized as the same type.
+	*/
+	static [Symbol.hasInstance](instance) {
+		return instance?.[EXPRESSION_TAG] === true;
+	}
+	get [EXPRESSION_TAG]() {
+		return true;
+	}
 	/** Returns the expression's runtime value, based on the CLI's resolution of parameters. */
 	value() {
 		if (process.env.FUNCTIONS_CONTROL_API === "true") {

package/lib/runtime/manifest.d.ts

@@ -70,6 +70,7 @@ export interface ManifestEndpoint {
     scheduleTrigger?: {
         schedule: string | Expression<string>;
         timeZone?: string | Expression<string> | ResetValue;
+        attemptDeadlineSeconds?: number | Expression<number> | ResetValue;
         retryConfig?: {
             retryCount?: number | Expression<number> | ResetValue;
             maxRetrySeconds?: string | Expression<string> | ResetValue;

package/lib/runtime/manifest.js

@@ -99,7 +99,8 @@ const RESETTABLE_V2_SCHEDULE_OPTIONS = {
 	maxDoublings: null,
 	maxRetrySeconds: null,
 	minBackoffSeconds: null,
-	maxBackoffSeconds: null
+	maxBackoffSeconds: null,
+	attemptDeadlineSeconds: null
 };
 function initScheduleTrigger(resetOptions, schedule, ...opts) {
 	let scheduleTrigger = {
@@ -108,7 +109,11 @@ function initScheduleTrigger(resetOptions, schedule, ...opts) {
 	};
 	if (opts.every((opt) => !opt?.preserveExternalChanges)) {
 		for (const key of Object.keys(resetOptions)) {
-			scheduleTrigger.retryConfig[key] = require_common_options.RESET_VALUE;
+			if (key === "attemptDeadlineSeconds") {
+				scheduleTrigger[key] = require_common_options.RESET_VALUE;
+			} else {
+				scheduleTrigger.retryConfig[key] = require_common_options.RESET_VALUE;
+			}
 		}
 		scheduleTrigger = {
 			...scheduleTrigger,

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

@@ -36,6 +36,12 @@ export interface ScheduleOptions extends options.GlobalOptions {
     schedule: string;
     /** The timezone that the schedule executes in. */
     timeZone?: timezone | Expression<string> | ResetValue;
+    /**
+     * The deadline for job attempts in seconds. If the request handler does not respond by this deadline,
+     * the request is cancelled and the attempt is marked as a `DEADLINE_EXCEEDED` failure.
+     * The value must be between 15 and 1800. Defaults to 180.
+     */
+    attemptDeadlineSeconds?: number | Expression<number> | ResetValue;
     /** The number of retry attempts for a failed run. */
     retryCount?: number | Expression<number> | ResetValue;
     /** The time limit for retrying. */

package/lib/v2/providers/scheduler.js

@@ -22,6 +22,7 @@ function getOpts(args) {
 	return {
 		schedule: args.schedule,
 		timeZone: args.timeZone,
+		attemptDeadlineSeconds: args.attemptDeadlineSeconds,
 		retryConfig: {
 			retryCount: args.retryCount,
 			maxRetrySeconds: args.maxRetrySeconds,
@@ -70,7 +71,7 @@ function onSchedule(args, handler) {
 		},
 		scheduleTrigger: require_runtime_manifest.initV2ScheduleTrigger(separatedOpts.schedule, globalOpts, separatedOpts.opts)
 	};
-	require_common_encoding.copyIfPresent(ep.scheduleTrigger, separatedOpts, "timeZone");
+	require_common_encoding.copyIfPresent(ep.scheduleTrigger, separatedOpts, "timeZone", "attemptDeadlineSeconds");
 	require_common_encoding.copyIfPresent(ep.scheduleTrigger.retryConfig, separatedOpts.retryConfig, "retryCount", "maxRetrySeconds", "minBackoffSeconds", "maxBackoffSeconds", "maxDoublings");
 	func.__endpoint = ep;
 	func.__requiredAPIs = [{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-functions",
-  "version": "7.0.0",
+  "version": "7.0.1-rc.0",
   "description": "Firebase SDK for Cloud Functions",
   "keywords": [
     "firebase",