feat(firestore): add firestore collection and doc observables

Author: davideast

.gitignore

@@ -9,3 +9,6 @@ npm-debug.log
 angularfire2-*.tgz
 *.ngfactory.ts
 *.ngsummary.json
+firestore-module.tgz
+.DS_Store
+yarn-error.log

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angularfire2",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0-rc.3",
   "description": "The official library of Firebase and Angular.",
   "private": true,
   "scripts": {
@@ -33,6 +33,7 @@
     "@angular/platform-browser": "^4.0.0",
     "@angular/platform-browser-dynamic": "^4.0.0",
     "firebase": "^4.0.0",
+    "firestore": "file:firestore-module.tgz",
     "rxjs": "^5.0.1",
     "zone.js": "^0.8.0"
   },
@@ -72,7 +73,7 @@
     "systemjs": "^0.19.16",
     "systemjs-builder": "^0.15.7",
     "traceur": "0.0.96",
-    "typescript": "^2.3.4"
+    "typescript": "^2.4.2"
   },
   "typings": "index.d.ts"
 }

src/core/firebase.app.module.ts

@@ -1,6 +1,8 @@
 import { InjectionToken, } from '@angular/core';
 import { FirebaseAppConfig } from './';
 import * as firebase from 'firebase/app';
+// TODO(davideast): Replace once Firestore is merged in firebase.d.ts
+import { Firestore } from 'firestore';
 
 export const FirebaseAppConfigToken = new InjectionToken<FirebaseAppConfig>('FirebaseAppConfigToken');
 
@@ -12,21 +14,22 @@ export class FirebaseApp implements firebase.app.App {
   messaging: () => firebase.messaging.Messaging;
   storage: () => firebase.storage.Storage;
   delete: () => firebase.Promise<any>;
+  firestore: () => Firestore;
 }
 
 export function _firebaseAppFactory(config: FirebaseAppConfig, appName?: string): FirebaseApp {
   try {
     if (appName) {
-      return firebase.initializeApp(config, appName);
+      return firebase.initializeApp(config, appName) as FirebaseApp;
     } else {
-      return firebase.initializeApp(config);
+      return firebase.initializeApp(config) as FirebaseApp;
     }
   }
   catch (e) {
     if (e.code === "app/duplicate-app") {
-      return firebase.app(e.name);
+      return firebase.app(e.name) as FirebaseApp;
     }
 
-    return firebase.app(null!);
+    return firebase.app(null!) as FirebaseApp;
   }
 }

src/firestore/firestore.module.ts

@@ -0,0 +1,24 @@
+import { NgModule, NgZone } from '@angular/core';
+import { FirebaseApp, AngularFireModule } from 'angularfire2';
+import { AngularFirestore } from './firestore';
+import * as firestore from 'firestore';
+
+export function _getAngularFirestore(app: FirebaseApp) {
+  return new AngularFirestore(app);
+}
+
+export const AngularFirestoreProvider = {
+  provide: AngularFirestore,
+  useFactory: _getAngularFirestore,
+  deps: [ FirebaseApp ]
+};
+
+export const FIRESTORE_PROVIDERS = [
+  AngularFirestoreProvider,
+];
+
+@NgModule({
+  imports: [ AngularFireModule ],
+  providers: [ FIRESTORE_PROVIDERS ]
+})
+export class AngularFirestoreModule { }

src/firestore/firestore.spec.ts

@@ -0,0 +1,31 @@
+import { FirebaseApp, FirebaseAppConfig, AngularFireModule} from 'angularfire2';
+import { AngularFirestore, AngularFirestoreModule } from 'angularfire2/firestore';
+import * as firebase from 'firebase/app';
+
+import { TestBed, inject } from '@angular/core/testing';
+import { COMMON_CONFIG } from './test-config';
+
+describe('AngularFirestore', () => {
+  let app: firebase.app.App;
+  let db: AngularFirestore;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        AngularFireModule.initializeApp(COMMON_CONFIG),
+        AngularFirestoreModule
+      ]
+    });
+    inject([FirebaseApp, AngularFirestore], (_app: firebase.app.App, _db: AngularFirestore) => {
+      app = _app;
+      db = _db;
+    })();
+  });
+
+  afterEach(done => {
+    app.delete().then(done, done.fail);
+    // ref.off();
+    // ref.remove(done);
+  });
+
+});

src/firestore/firestore.ts

@@ -0,0 +1,87 @@
+import * as firebase from 'firebase/app';
+import * as firestore from 'firestore';
+import 'firestore';
+import { Firestore, CollectionReference, Query } from 'firestore';
+import { Observable } from 'rxjs/Observable';
+import { Observer } from 'rxjs/Observer';
+import { Operator } from 'rxjs/Operator';
+import { Subscriber } from 'rxjs/Subscriber';
+import { Subscription } from 'rxjs/Subscription';
+
+import { Injectable } from '@angular/core';
+import { FirebaseApp } from 'angularfire2';
+
+@Injectable()
+export class AngularFirestore {
+  firestore: Firestore;
+
+  constructor(public app: FirebaseApp) {
+    this.firestore = app.firestore();
+  }
+  
+  collection(path: string, queryFn: (ref: CollectionReference) => Query = ref => ref): Observable<firestore.QuerySnapshot> {
+    const ref = this.firestore.collection(path);
+    const query = queryFn(ref);    
+    return new Observable(subscriber => {
+      const unsubscribe = query.onSnapshot(subscriber);
+      return new Subscription(unsubscribe);
+    });
+  }
+
+  doc(path: string): Observable<firestore.DocumentSnapshot> {
+    const ref = this.firestore.doc(path);
+    return new Observable(subscriber => {
+      const unsubscribe = ref.onSnapshot(subscriber);
+      return new Subscription(unsubscribe);
+    });
+  }
+
+}
+
+export class FirestoreDocumentReferenceObservable<T> extends Observable<T> {
+  constructor(public originalRef: firestore.DocumentReference, subscribe?: <R>(subscriber: Subscriber<R>) => Subscription) {
+    super(subscribe);
+  }
+  
+  lift<T, R>(operator: Operator<T, R>): Observable<R> {
+    const observable = new FirestoreDocumentReferenceObservable<R>(this.originalRef);
+    observable.source = this;
+    observable.operator = operator;
+    observable.originalRef = this.originalRef;
+    return observable;
+  }
+}
+
+export class FirestoreCollectionReferenceObservable<T> extends Observable<T> {
+  constructor(public originalRef: firestore.CollectionReference, public query: firestore.Query, subscribe?: <R>(subscriber: Subscriber<R>) => Subscription) {
+    super(subscribe);
+  }
+  
+  lift<T, R>(operator: Operator<T, R>): Observable<R> {
+    const observable = new FirestoreCollectionReferenceObservable<R>(this.originalRef, this.query);
+    observable.source = this;
+    observable.operator = operator;
+    observable.query = this.query;
+    observable.originalRef = this.originalRef;
+    return observable;
+  }
+}
+
+/**
+ *   collection(path: string, queryFn: (ref: CollectionReference) => Query = ref => ref): Observable<firestore.QuerySnapshot> {
+    const ref = this.firestore.collection(path);
+    const query = queryFn(ref);    
+    return new FirestoreCollectionReferenceObservable(ref, query, subscriber => {
+      const unsubscribe = query.onSnapshot(subscriber.next, subscriber.error, subscriber.complete);
+      return new Subscription(unsubscribe);
+    });
+  }
+
+  doc(path: string): Observable<firestore.DocumentSnapshot> {
+    const ref = this.firestore.doc(path);
+    return new FirestoreDocumentReferenceObservable(ref, subscriber => {
+      const unsubscribe = ref.onSnapshot(subscriber.next, subscriber.error, subscriber.complete);
+      return new Subscription(unsubscribe);
+    });
+  }
+ */

src/firestore/index.spec.ts

@@ -0,0 +1 @@
+export * from './public_api';

src/firestore/index.ts

@@ -0,0 +1,31 @@
+{
+  "name": "angularfire2/auth",
+  "version": "ANGULARFIRE2_VERSION",
+  "description": "The auth module",
+  "main": "../bundles/auth.umd.js",
+  "module": "index.js",
+  "es2015": "./es2015/index.js",
+  "keywords": [
+    "angular",
+    "firebase",
+    "rxjs"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/angular/angularfire2.git"
+  },
+  "author": "angular,firebase",
+  "license": "MIT",
+  "peerDependencies": {
+    "angularfire2": "ANGULARFIRE2_VERSION",
+    "@angular/common": "ANGULAR_VERSION",
+    "@angular/core": "ANGULAR_VERSION",
+    "@angular/platform-browser": "ANGULAR_VERSION",
+    "@angular/platform-browser-dynamic": "ANGULAR_VERSION",
+    "firebase": "FIREBASE_VERSION",
+    "firestore": "FIRESTORE_VERSION",
+    "rxjs": "RXJS_VERSION",
+    "zone.js": "ZONEJS_VERSION"
+  },
+  "typings": "index.d.ts"
+}

src/firestore/package.json

@@ -0,0 +1,2 @@
+export * from './firestore';
+export * from './firestore.module';