fix(afs): get options are optional, zone work, and doc get (angular#1849)

Author: jamesdaniels

src/core/angularfire2.ts

@@ -51,11 +51,17 @@ export class FirebaseZoneScheduler {
 export const runOutsideAngular = (zone: NgZone) => <T>(obs$: Observable<T>): Observable<T> => {
   return new Observable<T>(subscriber => {
     return zone.runOutsideAngular(() => {
-      return obs$.subscribe(
-        value => zone.run(() => subscriber.next(value)),
-        error => zone.run(() => subscriber.error(error)),
-        ()    => zone.run(() => subscriber.complete()),
-      );
+      runInZone(zone)(obs$).subscribe(subscriber);
     });
   });
 }
+
+export const runInZone = (zone: NgZone) => <T>(obs$: Observable<T>): Observable<T> => {
+  return new Observable<T>(subscriber => {
+    return obs$.subscribe(
+      value => zone.run(() => subscriber.next(value)),
+      error => zone.run(() => subscriber.error(error)),
+      ()    => zone.run(() => subscriber.complete()),
+    );
+  });
+}

src/firestore/collection/collection.ts

@@ -3,10 +3,11 @@ import { fromCollectionRef } from '../observable/fromRef';
 import { map, filter, scan } from 'rxjs/operators';
 import { firestore } from 'firebase/app';
 
-import { DocumentChangeType, CollectionReference, Query, DocumentReference, DocumentData, QueryFn, AssociatedReference, DocumentChangeAction, DocumentChange } from '../interfaces';
+import { DocumentChangeType, CollectionReference, Query, DocumentReference, DocumentData, DocumentChangeAction } from '../interfaces';
 import { docChanges, sortedChanges } from './changes';
 import { AngularFirestoreDocument } from '../document/document';
 import { AngularFirestore } from '../firestore';
+import { runInZone } from 'angularfire2';
 
 export function validateEventsArray(events?: DocumentChangeType[]) {
   if(!events || events!.length === 0) {
@@ -116,8 +117,10 @@ export class AngularFirestoreCollection<T=DocumentData> {
    * Retrieve the results of the query once. 
    * @param options 
    */
-  get(options: firestore.GetOptions) {
-    return from(this.query.get(options));
+  get(options?: firestore.GetOptions) {
+    return from(this.query.get(options)).pipe(
+      runInZone(this.afs.scheduler.zone)
+    );
   }
 
   /**

src/firestore/document/document.ts

@@ -1,12 +1,12 @@
-import { Observable, Subscriber } from 'rxjs';
-import { DocumentReference, SetOptions, DocumentData, QueryFn, AssociatedReference, Action, DocumentSnapshot } from '../interfaces';
+import { Observable, from } from 'rxjs';
+import { DocumentReference, SetOptions, DocumentData, QueryFn, Action, DocumentSnapshot } from '../interfaces';
 import { fromDocRef } from '../observable/fromRef';
 import { map } from 'rxjs/operators';
 
-import { Injectable } from '@angular/core';
-
 import { AngularFirestore, associateQuery } from '../firestore';
 import { AngularFirestoreCollection } from '../collection/collection';
+import { firestore } from 'firebase/app';
+import { runInZone } from 'angularfire2';
 
 /**
  * AngularFirestoreDocument service
@@ -94,4 +94,14 @@ export class AngularFirestoreDocument<T=DocumentData> {
       })
     );
   }
+
+  /**
+   * Retrieve the document once.
+   * @param options
+   */
+  get(options?: firestore.GetOptions) {
+    return from(this.ref.get(options)).pipe(
+      runInZone(this.afs.scheduler.zone)
+    );
+  }
 }