firebase-functions 7.2.0-rc.0 → 7.2.1

package/lib/common/utilities/path.js

@@ -9,7 +9,7 @@ function normalizePath(path) {
 	if (!path) {
 		return "";
 	}
-	return path.replace(/^\//, "").replace(/\/$/, "");
+	return path.replace(/^\//, "").replace(/\/$/, "").replace(/\/{2,}/g, "/");
 }
 /**
 * Normalizes a given path and splits it into an array of segments.

package/lib/esm/common/utilities/path.mjs

@@ -8,7 +8,7 @@ function normalizePath(path) {
 	if (!path) {
 		return "";
 	}
-	return path.replace(/^\//, "").replace(/\/$/, "");
+	return path.replace(/^\//, "").replace(/\/$/, "").replace(/\/{2,}/g, "/");
 }
 /**
 * Normalizes a given path and splits it into an array of segments.

package/lib/esm/params/index.mjs

@@ -1,5 +1,5 @@
 import { __export } from "../_virtual/rolldown_runtime.mjs";
-import { BUCKET_PICKER, BooleanParam, Expression, FloatParam, IntParam, InternalExpression, JsonSecretParam, ListParam, SecretParam, StringParam, multiSelect, select } from "./types.mjs";
+import { BUCKET_PICKER, BooleanParam, Expression, FloatParam, IntParam, InternalExpression, InterpolationExpression, JsonSecretParam, ListParam, SecretParam, StringParam, multiSelect, select } from "./types.mjs";
 
 //#region src/params/index.ts
 var params_exports = /* @__PURE__ */ __export({
@@ -15,6 +15,7 @@ var params_exports = /* @__PURE__ */ __export({
 	defineList: () => defineList,
 	defineSecret: () => defineSecret,
 	defineString: () => defineString,
+	expr: () => expr,
 	gcloudProject: () => gcloudProject,
 	multiSelect: () => multiSelect,
 	projectID: () => projectID,
@@ -59,23 +60,23 @@ function clearParams() {
 * A built-in parameter that resolves to the default RTDB database URL associated
 * with the project, without prompting the deployer. Empty string if none exists.
 */
-const databaseURL = new InternalExpression("DATABASE_URL", (env) => JSON.parse(env.FIREBASE_CONFIG)?.databaseURL || "");
+const databaseURL = new InternalExpression("DATABASE_URL", (env) => JSON.parse(env.FIREBASE_CONFIG || "{}")?.databaseURL || "");
 /**
 * A built-in parameter that resolves to the Cloud project ID associated with
 * the project, without prompting the deployer.
 */
-const projectID = new InternalExpression("PROJECT_ID", (env) => JSON.parse(env.FIREBASE_CONFIG)?.projectId || "");
+const projectID = new InternalExpression("PROJECT_ID", (env) => JSON.parse(env.FIREBASE_CONFIG || "{}")?.projectId || "");
 /**
 * A built-in parameter that resolves to the Cloud project ID, without prompting
 * the deployer.
 */
-const gcloudProject = new InternalExpression("GCLOUD_PROJECT", (env) => JSON.parse(env.FIREBASE_CONFIG)?.projectId || "");
+const gcloudProject = new InternalExpression("GCLOUD_PROJECT", (env) => JSON.parse(env.FIREBASE_CONFIG || "{}")?.projectId || "");
 /**
 * A builtin parameter that resolves to the Cloud storage bucket associated
 * with the function, without prompting the deployer. Empty string if not
 * defined.
 */
-const storageBucket = new InternalExpression("STORAGE_BUCKET", (env) => JSON.parse(env.FIREBASE_CONFIG)?.storageBucket || "");
+const storageBucket = new InternalExpression("STORAGE_BUCKET", (env) => JSON.parse(env.FIREBASE_CONFIG || "{}")?.storageBucket || "");
 /**
 * Declares a secret param, that will persist values only in Cloud Secret Manager.
 * Secrets are stored internally as bytestrings. Use `ParamOptions.as` to provide type
@@ -84,8 +85,8 @@ const storageBucket = new InternalExpression("STORAGE_BUCKET", (env) => JSON.par
 * @param name The name of the environment variable to use to load the parameter.
 * @returns A parameter with a `string` return type for `.value`.
 */
-function defineSecret(name) {
-	const param = new SecretParam(name);
+function defineSecret(name, options = {}) {
+	const param = new SecretParam(name, options);
 	registerParam(param);
 	return param;
 }
@@ -101,8 +102,8 @@ function defineSecret(name) {
 * @returns A parameter whose `.value()` method returns the parsed JSON object.
 * ```
 */
-function defineJsonSecret(name) {
-	const param = new JsonSecretParam(name);
+function defineJsonSecret(name, options = {}) {
+	const param = new JsonSecretParam(name, options);
 	registerParam(param);
 	return param;
 }
@@ -168,6 +169,19 @@ function defineList(name, options = {}) {
 	registerParam(param);
 	return param;
 }
+/**
+* Creates an Expression representing a string, which can interpolate
+* other Expressions into it using template literal syntax.
+*
+* @example
+* ```
+* const topicParam = defineString('TOPIC');
+* const topicExpr = expr`projects/my-project/topics/${topicParam}`;
+* ```
+*/
+function expr(strings, ...values) {
+	return new InterpolationExpression(strings, values);
+}
 
 //#endregion
-export { BUCKET_PICKER, Expression, clearParams, databaseURL, declaredParams, defineBoolean, defineFloat, defineInt, defineJsonSecret, defineList, defineSecret, defineString, gcloudProject, multiSelect, params_exports, projectID, select, storageBucket };
+export { BUCKET_PICKER, Expression, clearParams, databaseURL, declaredParams, defineBoolean, defineFloat, defineInt, defineJsonSecret, defineList, defineSecret, defineString, expr, gcloudProject, multiSelect, params_exports, projectID, select, storageBucket };

package/lib/esm/params/types.mjs

@@ -29,7 +29,7 @@ var Expression = class {
 		throw new Error("Not implemented");
 	}
 	/** Returns the expression's representation as a braced CEL expression. */
-	toCEL() {
+	toCEL(_transform = (a) => a) {
 		return `{{ ${this.toString()} }}`;
 	}
 	/** Returns the expression's representation as JSON. */
@@ -37,9 +37,75 @@ var Expression = class {
 		return this.toString();
 	}
 };
+/**
+* An InterpolationExpression allows string fragments and Expressions to be
+* joined natively into a new Expression block evaluating to a string string.
+*/
+var InterpolationExpression = class extends Expression {
+	constructor(strings, values) {
+		super();
+		this.strings = strings;
+		this.values = values;
+	}
+	/** @internal */
+	runtimeValue() {
+		return this.strings.reduce((result, str, i) => {
+			const val = i < this.values.length ? String(valueOf(this.values[i])) : "";
+			return result + str + val;
+		}, "");
+	}
+	toCEL(transform$1 = (a) => a) {
+		const exprPlaceholders = [];
+		const PLACEHOLDER_PREFIX = "🤿🤿🤿🐙🐙🐙";
+		const PLACEHOLDER_SUFFIX = "🐙🐙🐙🤿🤿🤿";
+		const rawString = this.strings.reduce((result, str, i) => {
+			if (i >= this.values.length) {
+				return result + str;
+			}
+			const val = this.values[i];
+			let valStr;
+			if (val instanceof Expression) {
+				valStr = `${PLACEHOLDER_PREFIX}${exprPlaceholders.length}${PLACEHOLDER_SUFFIX}`;
+				exprPlaceholders.push(val.toCEL());
+			} else {
+				valStr = String(val);
+			}
+			return result + str + valStr;
+		}, "");
+		let transformed = transform$1(rawString);
+		for (let i = 0; i < exprPlaceholders.length; i++) {
+			const placeholder = `${PLACEHOLDER_PREFIX}${i}${PLACEHOLDER_SUFFIX}`;
+			transformed = transformed.split(placeholder).join(exprPlaceholders[i]);
+		}
+		return transformed;
+	}
+};
+/** @internal */
+var TransformedStringExpression = class extends Expression {
+	constructor(source, transformer) {
+		super();
+		this.source = source;
+		this.transformer = transformer;
+	}
+	runtimeValue() {
+		return this.transformer(valueOf(this.source));
+	}
+	toCEL() {
+		return this.source instanceof Expression ? this.source.toCEL(this.transformer) : this.transformer(this.source);
+	}
+};
 function valueOf(arg) {
 	return arg instanceof Expression ? arg.runtimeValue() : arg;
 }
+function celOf(arg) {
+	return arg instanceof Expression ? arg.toCEL() : arg;
+}
+/**
+* Transforms a string or a string expression using a function.
+*/
+function transform(source, transformer) {
+	return new TransformedStringExpression(source, transformer);
+}
 /**
 * Returns how an entity (either an `Expression` or a literal value) should be represented in CEL.
 * - Expressions delegate to the `.toString()` method, which is used by the WireManifest
@@ -91,7 +157,7 @@ var CompareExpression = class extends Expression {
 	}
 	/** @internal */
 	runtimeValue() {
-		const left = this.lhs.runtimeValue();
+		const left = valueOf(this.lhs);
 		const right = valueOf(this.rhs);
 		switch (this.cmp) {
 			case "==": return Array.isArray(left) ? this.arrayEquals(left, right) : left === right;
@@ -108,8 +174,7 @@ var CompareExpression = class extends Expression {
 		return a.every((item) => b.includes(item)) && b.every((item) => a.includes(item));
 	}
 	toString() {
-		const rhsStr = refOf(this.rhs);
-		return `${this.lhs} ${this.cmp} ${rhsStr}`;
+		return `${refOf(this.lhs)} ${this.cmp} ${refOf(this.rhs)}`;
 	}
 	/** Returns a `TernaryExpression` which can resolve to one of two values, based on the resolution of this comparison. */
 	thenElse(ifTrue, ifFalse) {
@@ -231,7 +296,8 @@ var SecretParam = class {
 	static {
 		this.type = "secret";
 	}
-	constructor(name) {
+	constructor(name, options = {}) {
+		this.options = options;
 		this.name = name;
 	}
 	/** @internal */
@@ -246,7 +312,8 @@ var SecretParam = class {
 	toSpec() {
 		return {
 			type: "secret",
-			name: this.name
+			name: this.name,
+			...this.options
 		};
 	}
 	/** Returns the secret's value at runtime. Throws an error if accessed during deployment. */
@@ -268,7 +335,8 @@ var JsonSecretParam = class {
 	static {
 		this.type = "secret";
 	}
-	constructor(name) {
+	constructor(name, options = {}) {
+		this.options = options;
 		this.name = name;
 	}
 	/** @internal */
@@ -288,6 +356,7 @@ var JsonSecretParam = class {
 		return {
 			type: "secret",
 			name: this.name,
+			...this.options,
 			format: "json"
 		};
 	}
@@ -410,4 +479,4 @@ var ListParam = class extends Param {
 };
 
 //#endregion
-export { BUCKET_PICKER, BooleanParam, CompareExpression, Expression, FloatParam, IntParam, InternalExpression, JsonSecretParam, ListParam, Param, SecretParam, StringParam, TernaryExpression, multiSelect, select };
+export { BUCKET_PICKER, BooleanParam, CompareExpression, Expression, FloatParam, IntParam, InternalExpression, InterpolationExpression, JsonSecretParam, ListParam, Param, SecretParam, StringParam, TernaryExpression, TransformedStringExpression, celOf, multiSelect, select, transform, valueOf };

package/lib/esm/v1/cloud-functions.mjs

@@ -1,4 +1,5 @@
 import { warn } from "../logger/index.mjs";
+import { Expression, celOf, valueOf } from "../params/types.mjs";
 import { RESET_VALUE, ResetValue } from "../common/options.mjs";
 import { initV1Endpoint, initV1ScheduleTrigger } from "../runtime/manifest.mjs";
 import { Change } from "../common/change.mjs";
@@ -55,10 +56,11 @@ function makeCloudFunction({ contextOnlyHandler, dataConstructor = (raw) => raw.
 		if (triggerResource() == null) {
 			return {};
 		}
+		const tr = triggerResource();
 		const trigger = {
 			...optionsToTrigger(options),
 			eventTrigger: {
-				resource: triggerResource(),
+				resource: celOf(tr),
 				eventType: legacyEventType || provider + "." + eventType,
 				service
 			}
@@ -81,13 +83,16 @@ function makeCloudFunction({ contextOnlyHandler, dataConstructor = (raw) => raw.
 			...optionsToEndpoint(options)
 		};
 		if (options.schedule) {
-			endpoint.scheduleTrigger = initV1ScheduleTrigger(options.schedule.schedule, options);
+			endpoint.scheduleTrigger = initV1ScheduleTrigger(celOf(options.schedule.schedule), options);
 			copyIfPresent(endpoint.scheduleTrigger, options.schedule, "timeZone");
+			if (endpoint.scheduleTrigger.timeZone instanceof Expression) {
+				endpoint.scheduleTrigger.timeZone = endpoint.scheduleTrigger.timeZone.toCEL();
+			}
 			copyIfPresent(endpoint.scheduleTrigger.retryConfig, options.schedule.retryConfig, "retryCount", "maxDoublings", "maxBackoffDuration", "maxRetryDuration", "minBackoffDuration");
 		} else {
 			endpoint.eventTrigger = {
 				eventType: legacyEventType || provider + "." + eventType,
-				eventFilters: { resource: triggerResource() },
+				eventFilters: { resource: celOf(triggerResource()) },
 				retry: !!options.failurePolicy
 			};
 		}
@@ -110,7 +115,7 @@ function _makeParams(context, triggerResourceGetter) {
 	if (!context.resource) {
 		return {};
 	}
-	const triggerResource = triggerResourceGetter();
+	const triggerResource = valueOf(triggerResourceGetter());
 	const wildcards = triggerResource.match(WILDCARD_REGEX);
 	const params = {};
 	const eventResourceParts = context?.resource?.name?.split?.("/");

package/lib/esm/v1/providers/analytics.mjs

@@ -1,4 +1,5 @@
 import { __export } from "../../_virtual/rolldown_runtime.mjs";
+import { expr } from "../../params/index.mjs";
 import { makeCloudFunction } from "../cloud-functions.mjs";
 
 //#region src/v1/providers/analytics.ts
@@ -34,7 +35,7 @@ function _eventWithOptions(analyticsEventType, options) {
 		if (!process.env.GCLOUD_PROJECT) {
 			throw new Error("process.env.GCLOUD_PROJECT is not set.");
 		}
-		return "projects/" + process.env.GCLOUD_PROJECT + "/events/" + analyticsEventType;
+		return expr`projects/${process.env.GCLOUD_PROJECT}/events/${analyticsEventType}`;
 	}, options);
 }
 /**
@@ -43,7 +44,7 @@ function _eventWithOptions(analyticsEventType, options) {
 * Access via `functions.analytics.event()`.
 */
 var AnalyticsEventBuilder = class {
-	/** @hidden */
+	/** @internal */
 	constructor(triggerResource, options) {
 		this.triggerResource = triggerResource;
 		this.options = options;

package/lib/esm/v1/providers/database.mjs

@@ -1,4 +1,6 @@
 import { __export } from "../../_virtual/rolldown_runtime.mjs";
+import { transform } from "../../params/types.mjs";
+import { expr } from "../../params/index.mjs";
 import { firebaseConfig } from "../../common/config.mjs";
 import { getApp } from "../../common/app.mjs";
 import { makeCloudFunction } from "../cloud-functions.mjs";
@@ -96,14 +98,14 @@ var InstanceBuilder = class {
 	* @returns Firebase Realtime Database reference builder interface.
 	*/
 	ref(path) {
-		const normalized = normalizePath(path);
-		return new RefBuilder(() => `projects/_/instances/${this.instance}/refs/${normalized}`, this.options);
+		const normalized = transform(path, normalizePath);
+		return new RefBuilder(() => expr`projects/_/instances/${this.instance}/refs/${normalized}`, this.options);
 	}
 };
 /** @internal */
 function _refWithOptions(path, options) {
 	const resourceGetter = () => {
-		const normalized = normalizePath(path);
+		const normalized = transform(path, normalizePath);
 		const databaseURL = firebaseConfig().databaseURL;
 		if (!databaseURL) {
 			throw new Error("Missing expected firebase config value databaseURL, " + "config is actually" + JSON.stringify(firebaseConfig()) + "\n If you are unit testing, please set process.env.FIREBASE_CONFIG");
@@ -121,7 +123,7 @@ function _refWithOptions(path, options) {
 		if (!instance$1) {
 			throw new Error("Invalid value for config firebase.databaseURL: " + databaseURL);
 		}
-		return `projects/_/instances/${instance$1}/refs/${normalized}`;
+		return expr`projects/_/instances/${instance$1}/refs/${normalized}`;
 	};
 	return new RefBuilder(resourceGetter, options);
 }

package/lib/esm/v1/providers/firestore.mjs

@@ -1,8 +1,10 @@
 import { __export } from "../../_virtual/rolldown_runtime.mjs";
+import { CompareExpression, Expression, transform } from "../../params/types.mjs";
+import { expr, projectID } from "../../params/index.mjs";
 import { Change } from "../../common/change.mjs";
 import { makeCloudFunction } from "../cloud-functions.mjs";
+import { normalizePath } from "../../common/utilities/path.mjs";
 import { createBeforeSnapshotFromJson, createSnapshotFromJson } from "../../common/providers/firestore.mjs";
-import { posix } from "path";
 
 //#region src/v1/providers/firestore.ts
 var firestore_exports = /* @__PURE__ */ __export({
@@ -74,13 +76,24 @@ var NamespaceBuilder = class {
 		this.namespace = namespace$1;
 	}
 	document(path) {
-		return new DocumentBuilder(() => {
+		const normalized = transform(path, normalizePath);
+		const triggerResource = () => {
 			if (!process.env.GCLOUD_PROJECT) {
 				throw new Error("process.env.GCLOUD_PROJECT is not set.");
 			}
-			const database$1 = posix.join("projects", process.env.GCLOUD_PROJECT, "databases", this.database);
-			return posix.join(database$1, this.namespace ? `documents@${this.namespace}` : "documents", path);
-		}, this.options);
+			let project = projectID;
+			if (process.env.GCLOUD_PROJECT && process.env.FUNCTIONS_CONTROL_API !== "true") {
+				project = process.env.GCLOUD_PROJECT;
+			}
+			let nsPart = "";
+			if (this.namespace instanceof Expression) {
+				nsPart = new CompareExpression("==", this.namespace, "").thenElse("", expr`@${this.namespace}`);
+			} else if (this.namespace) {
+				nsPart = `@${this.namespace}`;
+			}
+			return expr`projects/${project}/databases/${this.database}/documents${nsPart}/${normalized}`;
+		};
+		return new DocumentBuilder(triggerResource, this.options);
 	}
 };
 function snapshotConstructor(event) {
@@ -93,6 +106,7 @@ function changeConstructor(raw) {
 	return Change.fromObjects(beforeSnapshotConstructor(raw), snapshotConstructor(raw));
 }
 var DocumentBuilder = class {
+	/** @internal */
 	constructor(triggerResource, options) {
 		this.triggerResource = triggerResource;
 		this.options = options;

package/lib/esm/v1/providers/pubsub.mjs

@@ -1,4 +1,6 @@
 import { __export } from "../../_virtual/rolldown_runtime.mjs";
+import { Expression } from "../../params/types.mjs";
+import { expr } from "../../params/index.mjs";
 import { makeCloudFunction } from "../cloud-functions.mjs";
 
 //#region src/v1/providers/pubsub.ts
@@ -29,15 +31,16 @@ function topic(topic$1) {
 }
 /** @internal */
 function _topicWithOptions(topic$1, options) {
-	if (topic$1.indexOf("/") !== -1) {
+	if (typeof topic$1 === "string" && topic$1.indexOf("/") !== -1) {
 		throw new Error("Topic name may not have a /");
 	}
-	return new TopicBuilder(() => {
+	const triggerResource = () => {
 		if (!process.env.GCLOUD_PROJECT) {
 			throw new Error("process.env.GCLOUD_PROJECT is not set.");
 		}
-		return `projects/${process.env.GCLOUD_PROJECT}/topics/${topic$1}`;
-	}, options);
+		return expr`projects/${process.env.GCLOUD_PROJECT}/topics/${topic$1}`;
+	};
+	return new TopicBuilder(triggerResource, options);
 }
 /**
 * The Google Cloud Pub/Sub topic builder.
@@ -89,7 +92,7 @@ function _scheduleWithOptions(schedule$1, options) {
 	};
 	return new ScheduleBuilder(triggerResource, {
 		...options,
-		schedule: { schedule: schedule$1 }
+		schedule: { schedule: schedule$1 instanceof Expression ? schedule$1.toCEL() : schedule$1 }
 	});
 }
 /**

package/lib/esm/v1/providers/storage.mjs

@@ -1,4 +1,5 @@
 import { __export } from "../../_virtual/rolldown_runtime.mjs";
+import { expr } from "../../params/index.mjs";
 import { firebaseConfig } from "../../common/config.mjs";
 import { makeCloudFunction } from "../cloud-functions.mjs";
 
@@ -40,14 +41,14 @@ function object() {
 /** @internal */
 function _bucketWithOptions(options, bucket$1) {
 	const resourceGetter = () => {
-		bucket$1 = bucket$1 || firebaseConfig().storageBucket;
-		if (!bucket$1) {
+		const bucketName = bucket$1 || firebaseConfig().storageBucket;
+		if (!bucketName) {
 			throw new Error("Missing bucket name. If you are unit testing, please provide a bucket name" + " through `functions.storage.bucket(bucketName)`, or set process.env.FIREBASE_CONFIG.");
 		}
-		if (!/^[a-z\d][a-z\d\\._-]{1,230}[a-z\d]$/.test(bucket$1)) {
-			throw new Error(`Invalid bucket name ${bucket$1}`);
+		if (typeof bucketName === "string" && !/^[a-z\d][a-z\d\\._-]{1,230}[a-z\d]$/.test(bucketName)) {
+			throw new Error(`Invalid bucket name ${bucketName}`);
 		}
-		return `projects/_/buckets/${bucket$1}`;
+		return expr`projects/_/buckets/${bucketName}`;
 	};
 	return new BucketBuilder(resourceGetter, options);
 }

package/lib/esm/v2/dataconnect.doc.mjs

@@ -0,0 +1,13 @@
+import { __export } from "../_virtual/rolldown_runtime.mjs";
+import { mutationExecutedEventType, onMutationExecuted } from "./providers/dataconnect/index.mjs";
+import { graphql_exports } from "./providers/dataconnect/graphql.mjs";
+
+//#region src/v2/dataconnect.doc.ts
+var dataconnect_doc_exports = /* @__PURE__ */ __export({
+	graphql: () => graphql_exports,
+	mutationExecutedEventType: () => mutationExecutedEventType,
+	onMutationExecuted: () => onMutationExecuted
+});
+
+//#endregion
+export { dataconnect_doc_exports, graphql_exports as graphql, mutationExecutedEventType, onMutationExecuted };

package/lib/esm/v2/index.doc.mjs

@@ -6,6 +6,7 @@ import { onInit } from "../common/onInit.mjs";
 import { config } from "../v1/config.mjs";
 import { setGlobalOptions } from "./options.mjs";
 import { pubsub_exports } from "./providers/pubsub.mjs";
+import { dataconnect_doc_exports } from "./dataconnect.doc.mjs";
 import { alerts_exports } from "./providers/alerts/index.mjs";
 import { database_exports } from "./providers/database.mjs";
 import { eventarc_exports } from "./providers/eventarc.mjs";
@@ -17,8 +18,6 @@ import { tasks_exports } from "./providers/tasks.mjs";
 import { remoteConfig_exports } from "./providers/remoteConfig.mjs";
 import { testLab_exports } from "./providers/testLab.mjs";
 import { firestore_exports } from "./providers/firestore.mjs";
-import { dataconnect_exports } from "./providers/dataconnect/index.mjs";
 import { app } from "./index.mjs";
-import { graphql_exports } from "./providers/dataconnect/graphql.mjs";
 
-export { Change, alerts_exports as alerts, app, config, database_exports as database, dataconnect_exports as dataconnect, eventarc_exports as eventarc, firestore_exports as firestore, graphql_exports as graphql, https_exports as https, identity_exports as identity, logger, onInit, params_exports as params, pubsub_exports as pubsub, remoteConfig_exports as remoteConfig, scheduler_exports as scheduler, setGlobalOptions, storage_exports as storage, tasks_exports as tasks, testLab_exports as testLab, traceContext };
+export { Change, alerts_exports as alerts, app, config, database_exports as database, dataconnect_doc_exports as dataconnect, eventarc_exports as eventarc, firestore_exports as firestore, https_exports as https, identity_exports as identity, logger, onInit, params_exports as params, pubsub_exports as pubsub, remoteConfig_exports as remoteConfig, scheduler_exports as scheduler, setGlobalOptions, storage_exports as storage, tasks_exports as tasks, testLab_exports as testLab, traceContext };

package/lib/esm/v2/index.mjs

@@ -8,6 +8,7 @@ import { config } from "../v1/config.mjs";
 import { setGlobalOptions } from "./options.mjs";
 import { pubsub_exports } from "./providers/pubsub.mjs";
 import "./core.mjs";
+import { dataconnect_exports } from "./providers/dataconnect/index.mjs";
 import { alerts_exports } from "./providers/alerts/index.mjs";
 import { database_exports } from "./providers/database.mjs";
 import { eventarc_exports } from "./providers/eventarc.mjs";
@@ -19,7 +20,6 @@ import { tasks_exports } from "./providers/tasks.mjs";
 import { remoteConfig_exports } from "./providers/remoteConfig.mjs";
 import { testLab_exports } from "./providers/testLab.mjs";
 import { firestore_exports } from "./providers/firestore.mjs";
-import { dataconnect_exports } from "./providers/dataconnect/index.mjs";
 
 //#region src/v2/index.ts
 const app = { setEmulatedAdminApp: setApp };

package/lib/params/index.d.ts

@@ -2,11 +2,11 @@
  * @hidden
  * @alpha
  */
-import { BooleanParam, Expression, IntParam, Param, ParamOptions, SecretParam, JsonSecretParam, StringParam, ListParam } from "./types";
+import { BooleanParam, Expression, IntParam, Param, ParamOptions, SecretParam, JsonSecretParam, StringParam, ListParam, SecretParamOptions } from "./types";
 export { BUCKET_PICKER, select, multiSelect } from "./types";
 export type { TextInput, SelectInput, SelectOptions, MultiSelectInput, Param, SecretParam, JsonSecretParam, StringParam, BooleanParam, IntParam, ListParam, } from "./types";
 export { Expression };
-export type { ParamOptions };
+export type { ParamOptions, SecretParamOptions };
 type SecretOrExpr = Param<any> | SecretParam | JsonSecretParam<any>;
 export declare const declaredParams: SecretOrExpr[];
 /**
@@ -38,7 +38,7 @@ export declare const storageBucket: Param<string>;
  * @param name The name of the environment variable to use to load the parameter.
  * @returns A parameter with a `string` return type for `.value`.
  */
-export declare function defineSecret(name: string): SecretParam;
+export declare function defineSecret(name: string, options?: SecretParamOptions): SecretParam;
 /**
  * Declares a secret parameter that retrieves a structured JSON object in Cloud Secret Manager.
  * This is useful for managing groups of related configuration values, such as all settings
@@ -51,7 +51,7 @@ export declare function defineSecret(name: string): SecretParam;
  * @returns A parameter whose `.value()` method returns the parsed JSON object.
  * ```
  */
-export declare function defineJsonSecret<T = any>(name: string): JsonSecretParam<T>;
+export declare function defineJsonSecret<T = any>(name: string, options?: SecretParamOptions): JsonSecretParam<T>;
 /**
  * Declare a string parameter.
  *
@@ -84,3 +84,14 @@ export declare function defineInt(name: string, options?: ParamOptions<number>):
  * @returns A parameter with a `string[]` return type for `.value`.
  */
 export declare function defineList(name: string, options?: ParamOptions<string[]>): ListParam;
+/**
+ * Creates an Expression representing a string, which can interpolate
+ * other Expressions into it using template literal syntax.
+ *
+ * @example
+ * ```
+ * const topicParam = defineString('TOPIC');
+ * const topicExpr = expr`projects/my-project/topics/${topicParam}`;
+ * ```
+ */
+export declare function expr(strings: TemplateStringsArray, ...values: (string | Expression<string>)[]): Expression<string>;

package/lib/params/index.js

@@ -15,6 +15,7 @@ var params_exports = /* @__PURE__ */ require_rolldown_runtime.__export({
 	defineList: () => defineList,
 	defineSecret: () => defineSecret,
 	defineString: () => defineString,
+	expr: () => expr,
 	gcloudProject: () => gcloudProject,
 	multiSelect: () => require_params_types.multiSelect,
 	projectID: () => projectID,
@@ -59,23 +60,23 @@ function clearParams() {
 * A built-in parameter that resolves to the default RTDB database URL associated
 * with the project, without prompting the deployer. Empty string if none exists.
 */
-const databaseURL = new require_params_types.InternalExpression("DATABASE_URL", (env) => JSON.parse(env.FIREBASE_CONFIG)?.databaseURL || "");
+const databaseURL = new require_params_types.InternalExpression("DATABASE_URL", (env) => JSON.parse(env.FIREBASE_CONFIG || "{}")?.databaseURL || "");
 /**
 * A built-in parameter that resolves to the Cloud project ID associated with
 * the project, without prompting the deployer.
 */
-const projectID = new require_params_types.InternalExpression("PROJECT_ID", (env) => JSON.parse(env.FIREBASE_CONFIG)?.projectId || "");
+const projectID = new require_params_types.InternalExpression("PROJECT_ID", (env) => JSON.parse(env.FIREBASE_CONFIG || "{}")?.projectId || "");
 /**
 * A built-in parameter that resolves to the Cloud project ID, without prompting
 * the deployer.
 */
-const gcloudProject = new require_params_types.InternalExpression("GCLOUD_PROJECT", (env) => JSON.parse(env.FIREBASE_CONFIG)?.projectId || "");
+const gcloudProject = new require_params_types.InternalExpression("GCLOUD_PROJECT", (env) => JSON.parse(env.FIREBASE_CONFIG || "{}")?.projectId || "");
 /**
 * A builtin parameter that resolves to the Cloud storage bucket associated
 * with the function, without prompting the deployer. Empty string if not
 * defined.
 */
-const storageBucket = new require_params_types.InternalExpression("STORAGE_BUCKET", (env) => JSON.parse(env.FIREBASE_CONFIG)?.storageBucket || "");
+const storageBucket = new require_params_types.InternalExpression("STORAGE_BUCKET", (env) => JSON.parse(env.FIREBASE_CONFIG || "{}")?.storageBucket || "");
 /**
 * Declares a secret param, that will persist values only in Cloud Secret Manager.
 * Secrets are stored internally as bytestrings. Use `ParamOptions.as` to provide type
@@ -84,8 +85,8 @@ const storageBucket = new require_params_types.InternalExpression("STORAGE_BUCKE
 * @param name The name of the environment variable to use to load the parameter.
 * @returns A parameter with a `string` return type for `.value`.
 */
-function defineSecret(name) {
-	const param = new require_params_types.SecretParam(name);
+function defineSecret(name, options = {}) {
+	const param = new require_params_types.SecretParam(name, options);
 	registerParam(param);
 	return param;
 }
@@ -101,8 +102,8 @@ function defineSecret(name) {
 * @returns A parameter whose `.value()` method returns the parsed JSON object.
 * ```
 */
-function defineJsonSecret(name) {
-	const param = new require_params_types.JsonSecretParam(name);
+function defineJsonSecret(name, options = {}) {
+	const param = new require_params_types.JsonSecretParam(name, options);
 	registerParam(param);
 	return param;
 }
@@ -168,6 +169,19 @@ function defineList(name, options = {}) {
 	registerParam(param);
 	return param;
 }
+/**
+* Creates an Expression representing a string, which can interpolate
+* other Expressions into it using template literal syntax.
+*
+* @example
+* ```
+* const topicParam = defineString('TOPIC');
+* const topicExpr = expr`projects/my-project/topics/${topicParam}`;
+* ```
+*/
+function expr(strings, ...values) {
+	return new require_params_types.InterpolationExpression(strings, values);
+}
 
 //#endregion
 exports.BUCKET_PICKER = require_params_types.BUCKET_PICKER;
@@ -182,6 +196,7 @@ exports.defineJsonSecret = defineJsonSecret;
 exports.defineList = defineList;
 exports.defineSecret = defineSecret;
 exports.defineString = defineString;
+exports.expr = expr;
 exports.gcloudProject = gcloudProject;
 exports.multiSelect = require_params_types.multiSelect;
 Object.defineProperty(exports, 'params_exports', {