feat(database): Add Database

Author: davideast

src/database/database.spec.ts

@@ -3,7 +3,6 @@ import { AngularFireDatabase, AngularFireDatabaseModule, URL } from '@angular/fi
 import { TestBed } from '@angular/core/testing';
 import { COMMON_CONFIG } from '../test-config';
 import { NgZone } from '@angular/core';
-import 'firebase/database';
 import { rando } from '../firestore/utils.spec';
 
 describe('AngularFireDatabase', () => {

src/database/database.ts

@@ -15,22 +15,22 @@ import {
 import { Observable } from 'rxjs';
 import 'firebase/database';
 import { USE_EMULATOR as USE_AUTH_EMULATOR } from '@angular/fire/auth';
-import firebase from 'firebase/app';
+import { Database } from 'firebase/database';
 import { ɵfetchInstance, ɵlogAuthEmulatorError } from '@angular/fire';
 
 export const URL = new InjectionToken<string>('angularfire2.realtimeDatabaseURL');
 
 // SEMVER(7): use Parameters to detirmine the useEmulator arguments
-// TODO(jamesdaniels): don't hardcode, but having tyepscript issues with firebase.database.Database
-// type UseEmulatorArguments = Parameters<typeof firebase.database.Database.prototype.useEmulator>;
+// TODO(jamesdaniels): don't hardcode, but having tyepscript issues with Database
+// type UseEmulatorArguments = Parameters<typeof Database.prototype.useEmulator>;
 type UseEmulatorArguments = [string, number];
 export const USE_EMULATOR = new InjectionToken<UseEmulatorArguments>('angularfire2.database.use-emulator');
 
 @Injectable({
   providedIn: 'any'
 })
 export class AngularFireDatabase {
-  public readonly database: firebase.database.Database;
+  public readonly database: Database;
 
   public readonly schedulers: ɵAngularFireSchedulers;
   public readonly keepUnstableUntilFirst: <T>(obs$: Observable<T>) => Observable<T>;
@@ -51,9 +51,11 @@ export class AngularFireDatabase {
     const useEmulator: UseEmulatorArguments | null = _useEmulator;
     const app = ɵfirebaseAppFactory(options, zone, nameOrConfig);
 
-    if (!firebase.auth && useAuthEmulator) {
-      ɵlogAuthEmulatorError();
-    }
+    // TODO(team): Figure out how to get detect potential Authentication instance 
+    // in vNext world
+    // if (!firebase.auth && useAuthEmulator) {
+    //   ɵlogAuthEmulatorError();
+    // }
 
     this.database = ɵfetchInstance(`${app.name}.database.${databaseURL}`, 'AngularFireDatabase', app, () => {
       const database = zone.runOutsideAngular(() => app.database(databaseURL || undefined));

src/database/interfaces.ts

@@ -1,7 +1,7 @@
 import { Observable } from 'rxjs';
-import firebase from 'firebase/app';
+import { Reference, ThenableReference, Query, DataSnapshot } from 'firebase/database';
 
-export type FirebaseOperation = string | firebase.database.Reference | firebase.database.DataSnapshot;
+export type FirebaseOperation = string | Reference | DataSnapshot;
 
 export interface AngularFireList<T> {
   query: DatabaseQuery;
@@ -12,7 +12,7 @@ export interface AngularFireList<T> {
   auditTrail(events?: ChildEvent[]): Observable<SnapshotAction<T>[]>;
   update(item: FirebaseOperation, data: Partial<T>): Promise<void>;
   set(item: FirebaseOperation, data: T): Promise<void>;
-  push(data: T): firebase.database.ThenableReference;
+  push(data: T): ThenableReference;
   remove(item?: FirebaseOperation): Promise<void>;
 }
 
@@ -50,22 +50,22 @@ export type SnapshotAction<T> = AngularFireAction<DatabaseSnapshot<T>>;
 
 export type Primitive = number | string | boolean;
 
-export interface DatabaseSnapshotExists<T> extends firebase.database.DataSnapshot {
+export interface DatabaseSnapshotExists<T> extends DataSnapshot {
   exists(): true;
   val(): T;
   forEach(action: (a: DatabaseSnapshot<T>) => boolean): boolean;
 }
 
-export interface DatabaseSnapshotDoesNotExist<T> extends firebase.database.DataSnapshot {
+export interface DatabaseSnapshotDoesNotExist<T> extends DataSnapshot {
   exists(): false;
   val(): null;
   forEach(action: (a: DatabaseSnapshot<T>) => boolean): boolean;
 }
 
 export type DatabaseSnapshot<T> = DatabaseSnapshotExists<T> | DatabaseSnapshotDoesNotExist<T>;
 
-export type DatabaseReference = firebase.database.Reference;
-export type DatabaseQuery = firebase.database.Query;
-export type DataSnapshot = firebase.database.DataSnapshot;
+export type DatabaseReference = Reference;
+export type DatabaseQuery = Query;
+export { DataSnapshot };
 export type QueryReference = DatabaseReference | DatabaseQuery;
 export type PathReference = QueryReference | string;

src/database/list/audit-trail.spec.ts

@@ -3,14 +3,13 @@ import { AngularFireDatabase, AngularFireDatabaseModule, auditTrail, ChildEvent,
 import { TestBed } from '@angular/core/testing';
 import { COMMON_CONFIG } from '../../test-config';
 import { skip } from 'rxjs/operators';
-import 'firebase/database';
-import firebase from 'firebase/app';
+import { Reference } from 'firebase/database';
 import { rando } from '../../firestore/utils.spec';
 
 describe('auditTrail', () => {
   let app: FirebaseApp;
   let db: AngularFireDatabase;
-  let createRef: (path: string) => firebase.database.Reference;
+  let createRef: (path: string) => Reference;
   let batch = {};
   const items = [{ name: 'zero' }, { name: 'one' }, { name: 'two' }].map((item, i) => ({ key: i.toString(), ...item }));
   Object.keys(items).forEach((key, i) => {

src/database/list/changes.spec.ts

@@ -1,16 +1,15 @@
-import firebase from 'firebase/app';
 import { AngularFireModule, FirebaseApp } from '@angular/fire';
 import { AngularFireDatabase, AngularFireDatabaseModule, listChanges, URL } from '@angular/fire/database';
 import { TestBed } from '@angular/core/testing';
 import { COMMON_CONFIG } from '../../test-config';
 import { skip, take } from 'rxjs/operators';
-import 'firebase/database';
+import { Reference } from 'firebase/database';
 import { rando } from '../../firestore/utils.spec';
 
 describe('listChanges', () => {
   let app: FirebaseApp;
   let db: AngularFireDatabase;
-  let ref: (path: string) => firebase.database.Reference;
+  let ref: (path: string) => Reference;
   let batch = {};
   const items = [{ name: 'zero' }, { name: 'one' }, { name: 'two' }].map((item, i) => ({ key: i.toString(), ...item }));
   Object.keys(items).forEach((key, i) => {

src/database/list/remove.ts

@@ -1,8 +1,6 @@
 import { DatabaseReference, DatabaseSnapshot, FirebaseOperation } from '../interfaces';
 import { checkOperationCases } from '../utils';
 
-// TODO(davideast): Find out why TS thinks this returns firebase.Primise
-// instead of Promise.
 export function createRemoveMethod<T>(ref: DatabaseReference) {
   return function remove(item?: FirebaseOperation): any {
     if (!item) { return ref.remove(); }

src/database/list/snapshot-changes.spec.ts

@@ -1,17 +1,16 @@
-import firebase from 'firebase/app';
 import { AngularFireModule, FirebaseApp } from '@angular/fire';
 import { AngularFireDatabase, AngularFireDatabaseModule, ChildEvent, snapshotChanges, URL } from '@angular/fire/database';
 import { TestBed } from '@angular/core/testing';
 import { COMMON_CONFIG } from '../../test-config';
 import { BehaviorSubject } from 'rxjs';
 import { skip, switchMap, take } from 'rxjs/operators';
-import 'firebase/database';
+import { Reference } from 'firebase/database';
 import { rando } from '../../firestore/utils.spec';
 
 describe('snapshotChanges', () => {
   let app: FirebaseApp;
   let db: AngularFireDatabase;
-  let createRef: (path: string) => firebase.database.Reference;
+  let createRef: (path: string) => Reference;
   let batch = {};
   const items = [{ name: 'zero' }, { name: 'one' }, { name: 'two' }].map((item, i) => ({ key: i.toString(), ...item }));
   Object.keys(items).forEach((key, i) => {

src/database/list/state-changes.spec.ts

@@ -4,13 +4,13 @@ import { AngularFireDatabase, AngularFireDatabaseModule, ChildEvent, stateChange
 import { TestBed } from '@angular/core/testing';
 import { COMMON_CONFIG } from '../../test-config';
 import { skip } from 'rxjs/operators';
-import 'firebase/database';
+import { Reference } from 'firebase/database';
 import { rando } from '../../firestore/utils.spec';
 
 describe('stateChanges', () => {
   let app: FirebaseApp;
   let db: AngularFireDatabase;
-  let createRef: (path: string) => firebase.database.Reference;
+  let createRef: (path: string) => Reference;
   let batch = {};
   const items = [{ name: 'zero' }, { name: 'one' }, { name: 'two' }].map((item, i) => ({ key: i.toString(), ...item }));
   Object.keys(items).forEach((key, i) => {

src/database/observable/fromRef.spec.ts

@@ -5,12 +5,12 @@ import { COMMON_CONFIG } from '../../test-config';
 import { take } from 'rxjs/operators';
 import { TestScheduler } from 'rxjs/testing';
 import { rando } from '../../firestore/utils.spec';
-import firebase from 'firebase/app';
+import { Reference } from 'firebase/database';
 
 describe('fromRef', () => {
   let app: FirebaseApp;
   let db: AngularFireDatabase;
-  let ref: (path: string) => firebase.database.Reference;
+  let ref: (path: string) => Reference;
   let batch = {};
   const items = [{ name: 'one' }, { name: 'two' }, { name: 'three' }].map(item => ({ key: rando(), ...item }));
   Object.keys(items).forEach((key) => {

src/database/utils.ts

@@ -1,5 +1,5 @@
 import { DatabaseReference, FirebaseOperation, FirebaseOperationCases, PathReference } from './interfaces';
-import firebase from 'firebase/app';
+import { Database } from 'firebase/database';
 
 export function isString(value: any): boolean {
   return typeof value === 'string';
@@ -23,7 +23,7 @@ export function isFirebaseRef(value: any): boolean {
  * @param database - Firebase Database
  * @param pathRef - Database path, relative or absolute
  */
-export function getRef(database: firebase.database.Database, pathRef: PathReference): DatabaseReference {
+export function getRef(database: Database, pathRef: PathReference): DatabaseReference {
   // if a db ref was passed in, just return it
   return isFirebaseRef(pathRef) ? pathRef as DatabaseReference
     : database.ref(pathRef as string);