Use Event Trigger, coerce data deltaSnapshot into array (#68)

* change trigger creation to be EventFlow format (#49)
* coerce deltaSnapshot val into array if keys are integers (#63)

Author: laurenzlong

.gitignore

@@ -7,4 +7,4 @@ lib
 coverage
 node_modules
 typings
-.vscode
+.vscode/

.vscode/settings.json

@@ -8,9 +8,14 @@ export interface TriggerAnnotated {
   __trigger: TriggerDefinition;
 }
 
+export interface EventTriggerDefinition {
+  eventType: string;
+  resource: string;
+  path?: string;
+}
 export interface TriggerDefinition {
-  service: string;
-  event: string;
+  httpsTrigger?: Object;
+  eventTrigger?: EventTriggerDefinition;
 }
 
 /* A CloudFunction is both an object that exports its trigger definitions at __trigger and

.vscode/tasks.json

@@ -42,11 +42,13 @@ export default class DatabaseBuilder extends FunctionBuilder {
     return this._makeHandler(handler, 'data.write');
   }
 
-  protected _toTrigger(event?: string): DatabaseTriggerDefinition {
+  protected _toTrigger(event: string): TriggerDefinition {
     return {
-      service: 'firebase.database',
-      event: 'write',
-      path: this._path,
+      eventTrigger: {
+        eventType: 'providers/firebase.database/eventTypes/' + event,
+        resource: 'projects/' + process.env.GCLOUD_PROJECT,
+        path: this._path,
+      },
     };
   }
 

src/builder.ts

@@ -24,15 +24,14 @@ export default class CloudHttpsBuilder extends FunctionBuilder {
         });
       });
     };
-    wrappedHandler.__trigger = this._toTrigger('request');
+    wrappedHandler.__trigger = this._toTrigger();
 
     return wrappedHandler;
   }
 
-  protected _toTrigger(event: string): TriggerDefinition {
+  protected _toTrigger(): TriggerDefinition {
     return {
-      service: 'cloud.http',
-      event,
+      httpsTrigger: {},
     };
   }
 }

src/builders/database-builder.ts

@@ -30,10 +30,6 @@ export class PubsubMessage {
   }
 }
 
-export interface CloudPubsubTriggerDefinition extends TriggerDefinition {
-  topic: string;
-}
-
 export default class PubsubBuilder extends FunctionBuilder {
   topic: string;
   event: string;
@@ -48,11 +44,12 @@ export default class PubsubBuilder extends FunctionBuilder {
     return this._makeHandler(handler, 'topic.publish');
   }
 
-  protected _toTrigger(event: string): CloudPubsubTriggerDefinition {
+  protected _toTrigger(event: string): TriggerDefinition {
     return {
-      service: 'cloud.pubsub',
-      event: 'message',
-      topic: this.topic,
+      eventTrigger: {
+        eventType: 'providers/cloud.pubsub/eventTypes/' + event,
+        resource: 'projects/' + process.env.GCLOUD_PROJECT + '/topics/' + this.topic,
+      },
     };
   }
 

src/builders/https-builder.ts

@@ -58,10 +58,6 @@ export interface StorageObject {
   };
 }
 
-export interface CloudStorageTriggerDefinition extends TriggerDefinition {
-  bucket: string;
-}
-
 export default class CloudStorageBuilder extends FunctionBuilder {
   bucket: string;
 
@@ -76,11 +72,12 @@ export default class CloudStorageBuilder extends FunctionBuilder {
     return this._makeHandler(handler, 'object.change');
   }
 
-  protected _toTrigger(event: string): CloudStorageTriggerDefinition {
+  protected _toTrigger(event: string): TriggerDefinition {
     return {
-      service: 'cloud.storage',
-      bucket: this.bucket,
-      event: 'object',
+      eventTrigger: {
+        eventType: 'providers/cloud.storage/eventTypes/' + event,
+        resource: this.bucket? 'projects/' + process.env.GCLOUD_PROJECT + '/buckets/' + this.bucket: null,
+      },
     };
   }
 }

src/builders/pubsub-builder.ts

@@ -53,7 +53,43 @@ export default class DatabaseDeltaSnapshot {
   val(): any {
     let parts = pathParts(this._childPath);
     let source = this._isPrevious ? this._data : this._newData;
-    return _.cloneDeep(parts.length ? _.get(source, parts, null) : source);
+    let node = _.cloneDeep(parts.length ? _.get(source, parts, null) : source);
+    return this._checkAndConvertToArray(node);
+  }
+
+  /* Recursive function to check if keys are numeric & convert node object to array if they are */
+  _checkAndConvertToArray(node): any {
+    if (!node) {
+      return null;
+    }
+    if (typeof node !== 'object') {
+      return node;
+    }
+    let obj = { };
+    let numKeys = 0;
+    let maxKey = 0;
+    let allIntegerKeys = true;
+    _.forEach(node, (childNode, key) => {
+      obj[key] = this._checkAndConvertToArray(childNode);
+      numKeys++;
+      const integerRegExp = /^(0|[1-9]\d*)$/;
+      if (allIntegerKeys && integerRegExp.test(key)) {
+        maxKey = Math.max(maxKey, Number(key));
+      } else {
+        allIntegerKeys = false;
+      }
+    });
+
+    if (allIntegerKeys && maxKey < 2 * numKeys) {
+      // convert to array.
+      let array = [];
+      _.forOwn(obj, (val, key) => {
+        array[key] = val;
+      });
+
+      return array;
+    }
+    return obj;
   }
 
   exists(): boolean {

src/builders/storage-builder.ts

@@ -19,17 +19,14 @@ describe('DatabaseBuilder', () => {
     it('should append paths if called multiple times', () => {
       subject.path('first/bit');
       subject.path('{id}/second/bit');
-      return expect(subject['_toTrigger']()).to.deep.equal({
-        service: 'firebase.database',
-        event: 'write',
-        path: '/first/bit/{id}/second/bit',
-      });
+      return expect(subject['_toTrigger']('data.write').eventTrigger.path).to.equal('/first/bit/{id}/second/bit');
     });
   });
 
   describe('#_toTrigger()', () => {
     it('should return "write" as the default event type', () => {
-      expect(subject['_toTrigger']().event).to.eq('write');
+      let eventType = subject['_toTrigger']('data.write').eventTrigger.eventType;
+      expect(eventType).to.eq('providers/firebase.database/eventTypes/data.write');
     });
   });