firebase-functions 4.8.0 → 4.8.2

package/lib/common/params.d.ts

@@ -1,3 +1,4 @@
+import { Expression } from "../params";
 /**
  * A type that splits literal string S with delimiter D.
  *
@@ -27,6 +28,6 @@ export type Extract<Part extends string> = Part extends `{${infer Param}=**}` ?
  *
  * For flexibility reasons, ParamsOf<string> is Record<string, string>
  */
-export type ParamsOf<PathPattern extends string> = string extends PathPattern ? Record<string, string> : {
-    [Key in Extract<Split<NullSafe<PathPattern>, "/">[number]>]: string;
+export type ParamsOf<PathPattern extends string | Expression<string>> = PathPattern extends Expression<string> ? Record<string, string> : string extends PathPattern ? Record<string, string> : {
+    [Key in Extract<Split<NullSafe<Exclude<PathPattern, Expression<string>>>, "/">[number]>]: string;
 };

package/lib/v1/cloud-functions.js

@@ -35,6 +35,7 @@ Object.defineProperty(exports, "Change", { enumerable: true, get: function () {
 const WILDCARD_REGEX = new RegExp("{[^/{}]*}", "g");
 /** @internal */
 function makeCloudFunction({ contextOnlyHandler, dataConstructor = (raw) => raw.data, eventType, handler, labels = {}, legacyEventType, options = {}, provider, service, triggerResource, }) {
+    handler = (0, onInit_1.withInit)(handler !== null && handler !== void 0 ? handler : contextOnlyHandler);
     const cloudFunction = (data, context) => {
         if (legacyEventType && context.eventType === legacyEventType) {
             /*
@@ -70,7 +71,6 @@ function makeCloudFunction({ contextOnlyHandler, dataConstructor = (raw) => raw.
         else {
             context.params = context.params || _makeParams(context, triggerResource);
         }
-        handler = (0, onInit_1.withInit)(handler);
         let promise;
         if (labels && labels["deployment-scheduled"]) {
             // Scheduled function do not have meaningful data, so exclude it

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

@@ -2,6 +2,7 @@ import * as firestore from "firebase-admin/firestore";
 import { ParamsOf } from "../../common/params";
 import { Change, CloudEvent, CloudFunction } from "../core";
 import { EventHandlerOptions } from "../options";
+import { Expression } from "../../params";
 export { Change };
 /** A Firestore DocumentSnapshot */
 export type DocumentSnapshot = firestore.DocumentSnapshot;
@@ -28,11 +29,11 @@ export interface FirestoreEvent<T, Params = Record<string, string>> extends Clou
 /** DocumentOptions extend EventHandlerOptions with provided document and optional database and namespace.  */
 export interface DocumentOptions<Document extends string = string> extends EventHandlerOptions {
     /** The document path */
-    document: Document;
+    document: Document | Expression<string>;
     /** The Firestore database */
-    database?: string;
+    database?: string | Expression<string>;
     /** The Firestore namespace */
-    namespace?: string;
+    namespace?: string | Expression<string>;
 }
 /**
  * Event handler which triggers when a document is created, updated, or deleted in Firestore.

package/lib/v2/providers/firestore.js

@@ -93,7 +93,10 @@ function getOpts(documentOrOpts) {
         opts = {};
     }
     else {
-        document = (0, path_1.normalizePath)(documentOrOpts.document);
+        document =
+            typeof documentOrOpts.document === "string"
+                ? (0, path_1.normalizePath)(documentOrOpts.document)
+                : documentOrOpts.document;
         database = documentOrOpts.database || "(default)";
         namespace = documentOrOpts.namespace || "(default)";
         opts = { ...documentOrOpts };
@@ -191,9 +194,13 @@ function makeEndpoint(eventType, opts, document, database, namespace) {
         namespace,
     };
     const eventFilterPathPatterns = {};
-    document.hasWildcards()
-        ? (eventFilterPathPatterns.document = document.getValue())
-        : (eventFilters.document = document.getValue());
+    const maybePattern = typeof document === "string" ? new path_pattern_1.PathPattern(document).hasWildcards() : true;
+    if (maybePattern) {
+        eventFilterPathPatterns.document = document;
+    }
+    else {
+        eventFilters.document = document;
+    }
     return {
         ...(0, manifest_1.initV2Endpoint)((0, options_1.getGlobalOptions)(), opts),
         platform: "gcfv2",
@@ -215,32 +222,32 @@ exports.makeEndpoint = makeEndpoint;
 /** @internal */
 function onOperation(eventType, documentOrOpts, handler) {
     const { document, database, namespace, opts } = getOpts(documentOrOpts);
-    const documentPattern = new path_pattern_1.PathPattern(document);
     // wrap the handler
     const func = (raw) => {
         const event = raw;
+        const documentPattern = new path_pattern_1.PathPattern(typeof document === "string" ? document : document.value());
         const params = makeParams(event.document, documentPattern);
         const firestoreEvent = makeFirestoreEvent(eventType, event, params);
         return (0, trace_1.wrapTraceContext)((0, onInit_1.withInit)(handler))(firestoreEvent);
     };
     func.run = handler;
-    func.__endpoint = makeEndpoint(eventType, opts, documentPattern, database, namespace);
+    func.__endpoint = makeEndpoint(eventType, opts, document, database, namespace);
     return func;
 }
 exports.onOperation = onOperation;
 /** @internal */
 function onChangedOperation(eventType, documentOrOpts, handler) {
     const { document, database, namespace, opts } = getOpts(documentOrOpts);
-    const documentPattern = new path_pattern_1.PathPattern(document);
     // wrap the handler
     const func = (raw) => {
         const event = raw;
+        const documentPattern = new path_pattern_1.PathPattern(typeof document === "string" ? document : document.value());
         const params = makeParams(event.document, documentPattern);
         const firestoreEvent = makeChangedFirestoreEvent(event, params);
         return (0, trace_1.wrapTraceContext)((0, onInit_1.withInit)(handler))(firestoreEvent);
     };
     func.run = handler;
-    func.__endpoint = makeEndpoint(eventType, opts, documentPattern, database, namespace);
+    func.__endpoint = makeEndpoint(eventType, opts, document, database, namespace);
     return func;
 }
 exports.onChangedOperation = onChangedOperation;

package/lib/v2/providers/https.js

@@ -50,11 +50,18 @@ function onRequest(optsOrHandler, handler) {
             // Respect `cors: false` to turn off cors even if debug feature is enabled.
             origin = opts.cors === false ? false : true;
         }
+        // Arrays cause the access-control-allow-origin header to be dynamic based
+        // on the origin header of the request. If there is only one element in the
+        // array, this is unnecessary.
+        if (Array.isArray(origin) && origin.length === 1) {
+            origin = origin[0];
+        }
+        const middleware = cors({ origin });
         const userProvidedHandler = handler;
         handler = (req, res) => {
             return new Promise((resolve) => {
                 res.on("finish", resolve);
-                cors({ origin })(req, res, () => {
+                middleware(req, res, () => {
                     resolve(userProvidedHandler(req, res));
                 });
             });
@@ -116,7 +123,13 @@ function onCall(optsOrHandler, handler) {
     else {
         opts = optsOrHandler;
     }
-    const origin = (0, debug_1.isDebugFeatureEnabled)("enableCors") ? true : "cors" in opts ? opts.cors : true;
+    let origin = (0, debug_1.isDebugFeatureEnabled)("enableCors") ? true : "cors" in opts ? opts.cors : true;
+    // Arrays cause the access-control-allow-origin header to be dynamic based
+    // on the origin header of the request. If there is only one element in the
+    // array, this is unnecessary.
+    if (Array.isArray(origin) && origin.length === 1) {
+        origin = origin[1];
+    }
     // onCallHandler sniffs the function length to determine which API to present.
     // fix the length to prevent api versions from being mismatched.
     const fixedLen = (req) => (0, onInit_1.withInit)(handler)(req);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-functions",
-  "version": "4.8.0",
+  "version": "4.8.2",
   "description": "Firebase SDK for Cloud Functions",
   "keywords": [
     "firebase",
@@ -201,7 +201,6 @@
     "@types/express": "4.17.3",
     "cors": "^2.8.5",
     "express": "^4.17.1",
-    "node-fetch": "^2.6.7",
     "protobufjs": "^7.2.2"
   },
   "devDependencies": {