firebase-functions 4.6.0 → 4.8.0

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

@@ -159,7 +159,7 @@ export interface StorageEvent extends CloudEvent<StorageObjectData> {
 /** StorageOptions extend EventHandlerOptions with a bucket name  */
 export interface StorageOptions extends options.EventHandlerOptions {
     /** The name of the bucket containing this object. */
-    bucket?: string;
+    bucket?: string | Expression<string>;
     /**
      * If true, do not deploy or emulate this function.
      */
@@ -259,7 +259,7 @@ export declare function onObjectArchived(handler: (event: StorageEvent) => any |
  * @param bucket - The name of the bucket containing this object.
  * @param handler - Event handler which is run every time a Google Cloud Storage archival occurs.
  */
-export declare function onObjectArchived(bucket: string, handler: (event: StorageEvent) => any | Promise<any>): CloudFunction<StorageEvent>;
+export declare function onObjectArchived(bucket: string | Expression<string>, handler: (event: StorageEvent) => any | Promise<any>): CloudFunction<StorageEvent>;
 /**
  * Event handler sent only when a bucket has enabled object versioning.
  * This event indicates that the live version of an object has become an
@@ -292,7 +292,7 @@ export declare function onObjectFinalized(handler: (event: StorageEvent) => any
  * @param bucket - The name of the bucket containing this object.
  * @param handler - Event handler which is run every time a Google Cloud Storage object creation occurs.
  */
-export declare function onObjectFinalized(bucket: string, handler: (event: StorageEvent) => any | Promise<any>): CloudFunction<StorageEvent>;
+export declare function onObjectFinalized(bucket: string | Expression<string>, handler: (event: StorageEvent) => any | Promise<any>): CloudFunction<StorageEvent>;
 /**
  * Event handler which fires every time a Google Cloud Storage object
  * creation occurs.
@@ -329,7 +329,7 @@ export declare function onObjectDeleted(handler: (event: StorageEvent) => any |
  * @param bucket - The name of the bucket containing this object.
  * @param handler - Event handler which is run every time a Google Cloud Storage object deletion occurs.
  */
-export declare function onObjectDeleted(bucket: string, handler: (event: StorageEvent) => any | Promise<any>): CloudFunction<StorageEvent>;
+export declare function onObjectDeleted(bucket: string | Expression<string>, handler: (event: StorageEvent) => any | Promise<any>): CloudFunction<StorageEvent>;
 /**
  * Event handler which fires every time a Google Cloud Storage deletion occurs.
  *
@@ -358,7 +358,7 @@ export declare function onObjectMetadataUpdated(handler: (event: StorageEvent) =
  * @param bucket - The name of the bucket containing this object.
  * @param handler - Event handler which is run every time a Google Cloud Storage object metadata update occurs.
  */
-export declare function onObjectMetadataUpdated(bucket: string, handler: (event: StorageEvent) => any | Promise<any>): CloudFunction<StorageEvent>;
+export declare function onObjectMetadataUpdated(bucket: string | Expression<string>, handler: (event: StorageEvent) => any | Promise<any>): CloudFunction<StorageEvent>;
 /**
  * Event handler which fires every time the metadata of an existing object
  * changes.

package/lib/v2/providers/storage.js

@@ -31,6 +31,7 @@ const encoding_1 = require("../../common/encoding");
 const manifest_1 = require("../../runtime/manifest");
 const trace_1 = require("../trace");
 const options = require("../options");
+const onInit_1 = require("../../common/onInit");
 /** @internal */
 exports.archivedEvent = "google.cloud.storage.object.v1.archived";
 /** @internal */
@@ -102,7 +103,7 @@ function onOperation(eventType, bucketOrOptsOrHandler, handler) {
     }
     const [opts, bucket] = getOptsAndBucket(bucketOrOptsOrHandler);
     const func = (raw) => {
-        return (0, trace_1.wrapTraceContext)(handler)(raw);
+        return (0, trace_1.wrapTraceContext)((0, onInit_1.withInit)(handler))(raw);
     };
     func.run = handler;
     Object.defineProperty(func, "__trigger", {
@@ -161,7 +162,8 @@ function getOptsAndBucket(bucketOrOpts) {
     var _a;
     let bucket;
     let opts;
-    if (typeof bucketOrOpts === "string") {
+    // If bucket is a string or Expression<string>
+    if (typeof bucketOrOpts === "string" || "value" in bucketOrOpts) {
         bucket = bucketOrOpts;
         opts = {};
     }
@@ -174,7 +176,7 @@ function getOptsAndBucket(bucketOrOpts) {
         throw new Error("Missing bucket name. If you are unit testing, please provide a bucket name" +
             " by providing bucket name directly in the event handler or by setting process.env.FIREBASE_CONFIG.");
     }
-    if (!/^[a-z\d][a-z\d\\._-]{1,230}[a-z\d]$/.test(bucket)) {
+    if (typeof bucket === "string" && !/^[a-z\d][a-z\d\\._-]{1,230}[a-z\d]$/.test(bucket)) {
         throw new Error(`Invalid bucket name ${bucket}`);
     }
     return [opts, bucket];

package/lib/v2/providers/tasks.js

@@ -31,6 +31,7 @@ const tasks_1 = require("../../common/providers/tasks");
 const options = require("../options");
 const trace_1 = require("../trace");
 const manifest_1 = require("../../runtime/manifest");
+const onInit_1 = require("../../common/onInit");
 function onTaskDispatched(optsOrHandler, handler) {
     let opts;
     if (arguments.length === 1) {
@@ -43,7 +44,7 @@ function onTaskDispatched(optsOrHandler, handler) {
     // onDispatchHandler sniffs the function length to determine which API to present.
     // fix the length to prevent api versions from being mismatched.
     const fixedLen = (req) => handler(req);
-    const func = (0, trace_1.wrapTraceContext)((0, tasks_1.onDispatchHandler)(fixedLen));
+    const func = (0, trace_1.wrapTraceContext)((0, onInit_1.withInit)((0, tasks_1.onDispatchHandler)(fixedLen)));
     Object.defineProperty(func, "__trigger", {
         get: () => {
             const baseOpts = options.optionsToTriggerAnnotations(options.getGlobalOptions());

package/lib/v2/providers/testLab.js

@@ -22,6 +22,7 @@
 // SOFTWARE.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onTestMatrixCompleted = exports.eventType = void 0;
+const onInit_1 = require("../../common/onInit");
 const manifest_1 = require("../../runtime/manifest");
 const options_1 = require("../options");
 const trace_1 = require("../trace");
@@ -43,7 +44,7 @@ function onTestMatrixCompleted(optsOrHandler, handler) {
     const baseOpts = (0, options_1.optionsToEndpoint)((0, options_1.getGlobalOptions)());
     const specificOpts = (0, options_1.optionsToEndpoint)(optsOrHandler);
     const func = (raw) => {
-        return (0, trace_1.wrapTraceContext)(handler)(raw);
+        return (0, trace_1.wrapTraceContext)((0, onInit_1.withInit)(handler))(raw);
     };
     func.run = handler;
     const ep = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-functions",
-  "version": "4.6.0",
+  "version": "4.8.0",
   "description": "Firebase SDK for Cloud Functions",
   "keywords": [
     "firebase",
@@ -110,6 +110,9 @@
       "v2": [
         "lib/v2"
       ],
+      "v2/core": [
+        "lib/v2/core"
+      ],
       "v2/alerts": [
         "lib/v2/providers/alerts"
       ],