Fall back to event.params if event.resource is undefined. (#92)

Author: jspri

spec/cloud-functions.spec.ts

@@ -79,15 +79,15 @@ describe('makeParams', () => {
     handler: () => null,
   };
 
-  const testEvent: Event<string> = {
-    resource: 'projects/_/instances/pid/ref/a/nested/b',
-    data: 'data',
-  };
-
   it('should construct params from the event resource', () => {
     let args: any = _.assign({}, cloudFunctionArgs, {handler: (e) => e});
     let cf = makeCloudFunction(args);
 
+    const testEvent: Event<string> = {
+      resource: 'projects/_/instances/pid/ref/a/nested/b',
+      data: 'data',
+    };
+
     return expect(cf(testEvent)).to.eventually.deep.equal({
       resource: 'projects/_/instances/pid/ref/a/nested/b',
       data: 'data',
@@ -97,4 +97,25 @@ describe('makeParams', () => {
       },
     });
   });
+
+  it('should construct params from the event params', () => {
+    let args: any = _.assign({}, cloudFunctionArgs, {handler: (e) => e});
+    let cf = makeCloudFunction(args);
+
+    const testEvent: Event<string> = {
+      data: 'data',
+      params: {
+        foo: 'a',
+        bar: 'b',
+      },
+    };
+
+    return expect(cf(testEvent)).to.eventually.deep.equal({
+      data: 'data',
+      params: {
+        foo: 'a',
+        bar: 'b',
+      },
+    });
+  });
 });

src/cloud-functions.ts

@@ -73,7 +73,11 @@ export interface MakeCloudFunctionArgs<EventData> {
   after?: (raw: Event<any>) => void;
 }
 
-function _makeParams (event: Event<any>, triggerResource: string): { [option: string]: any } {
+function _makeParams(event: Event<any>, triggerResource: string): { [option: string]: any } {  
+  if (!event.resource) { // In unit testing, "resource" may not be populated for a test event.
+    return event.params || {};
+  }
+
   let wildcards = triggerResource.match(WILDCARD_REGEX);
   let params = {};
   if (wildcards) {
@@ -86,6 +90,7 @@ function _makeParams (event: Event<any>, triggerResource: string): { [option: st
       params[wildcardNoBraces] = eventResourceParts[position];
     });
   }
+
   return params;
 };