Export FirebaseApp

Author: jamesdaniels

package.json

@@ -34,7 +34,6 @@
     "@angular/core": "^5.0.0",
     "@angular/platform-browser": "^5.0.0",
     "@angular/platform-browser-dynamic": "^5.0.0",
-    "bufferutil": "^3.0.3",
     "@firebase/app": "^0.1.6",
     "@firebase/app-types": "^0.1.1",
     "@firebase/auth": "^0.3.2",
@@ -46,12 +45,13 @@
     "@firebase/messaging-types": "^0.1.1",
     "@firebase/storage": "^0.1.6",
     "@firebase/storage-types": "^0.1.1",
+    "bufferutil": "^3.0.3",
     "firebase": "^4.8.2",
     "rxjs": "^5.5.4",
     "utf-8-validate": "^4.0.0",
     "ws": "^3.3.2",
-    "zone.js": "^0.8.0",
-    "xmlhttprequest": "^1.8.0"
+    "xmlhttprequest": "^1.8.0",
+    "zone.js": "^0.8.0"
   },
   "devDependencies": {
     "@angular/compiler-cli": "^5.0.0",

src/auth/auth.spec.ts

@@ -1,4 +1,3 @@
-import { FirebaseApp } from '@firebase/app-types';
 import { User } from '@firebase/auth-types';
 import { ReflectiveInjector, Provider } from '@angular/core';
 import { Observable } from 'rxjs/Observable'
@@ -8,7 +7,7 @@ import { TestBed, inject } from '@angular/core/testing';
 import { _do } from 'rxjs/operator/do';
 import { take } from 'rxjs/operator/take';
 import { skip } from 'rxjs/operator/skip';
-import { FirebaseAppConfig, AngularFireModule, FirebaseAppName } from 'angularfire2';
+import { FirebaseApp, FirebaseAppConfig, AngularFireModule, FirebaseAppName } from 'angularfire2';
 import { AngularFireAuth, AngularFireAuthModule } from 'angularfire2/auth';
 import { COMMON_CONFIG } from './test-config';
 

src/auth/auth.ts

@@ -33,7 +33,7 @@ export class AngularFireAuth {
     @Optional() @Inject(FirebaseAppName) name:string
   ) {
     const app = _firebaseAppFactory(config, name);
-    this.auth = app.auth!();
+    this.auth = app.auth();
 
     const authStateZone = new NgZone({});
     this.authState = authStateZone.runOutsideAngular(() => {

src/core/angularfire2.spec.ts

@@ -1,9 +1,8 @@
 
 import { Reference } from '@firebase/database-types';
-import { FirebaseApp } from '@firebase/app-types';
 import { TestBed, inject, withModule, async } from '@angular/core/testing';
 import { ReflectiveInjector, Provider, PlatformRef, NgModule, Compiler, ApplicationRef, CompilerFactory } from '@angular/core';
-import { FirebaseAppConfig, AngularFireModule } from 'angularfire2';
+import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from 'angularfire2';
 import { Subscription } from 'rxjs/Subscription';
 import { COMMON_CONFIG } from './test-config';
 import { BrowserModule } from '@angular/platform-browser';

src/core/angularfire2.ts

@@ -6,12 +6,6 @@ import { queue } from 'rxjs/scheduler/queue';
 import firebase from '@firebase/app';
 import { FirebaseApp, FirebaseOptions } from '@firebase/app-types';
 
-export function _firebaseAppFactory(config: FirebaseOptions, name?: string): FirebaseApp {
-  const appName = name || '[DEFAULT]';
-  const existingApp = firebase.apps.filter(app => app.name == appName)[0];
-  return existingApp || firebase.initializeApp(config, appName);
-}
-
 export const FirebaseAppName = new InjectionToken<string>('angularfire2.appName');
 export const FirebaseAppConfig = new InjectionToken<FirebaseOptions>('angularfire2.config');
 

src/core/firebase.app.module.ts

@@ -1,7 +1,31 @@
 import { InjectionToken, NgZone, NgModule } from '@angular/core';
-import { FirebaseApp, FirebaseOptions } from '@firebase/app-types';
 
-import { _firebaseAppFactory, FirebaseAppConfig, FirebaseAppName } from './angularfire2';
+import { FirebaseAppConfig, FirebaseAppName } from './angularfire2';
+
+import firebase from '@firebase/app';
+import { FirebaseApp as _FirebaseApp, FirebaseOptions } from '@firebase/app-types';
+import { FirebaseAuth } from '@firebase/auth-types';
+import { FirebaseDatabase } from '@firebase/database-types';
+import { FirebaseMessaging } from '@firebase/messaging-types';
+import { FirebaseStorage } from '@firebase/storage-types';
+import { FirebaseFirestore } from '@firebase/firestore-types';
+
+export class FirebaseApp implements _FirebaseApp {
+    name: string;
+    options: {};
+    auth: () => FirebaseAuth;
+    database: (databaseURL?: string) => FirebaseDatabase;
+    messaging: () => FirebaseMessaging;
+    storage: (storageBucket?: string) => FirebaseStorage;
+    delete: () => Promise<void>;
+    firestore: () => FirebaseFirestore;
+}
+
+export function _firebaseAppFactory(config: FirebaseOptions, name?: string): FirebaseApp {
+    const appName = name || '[DEFAULT]';
+    const existingApp = firebase.apps.filter(app => app.name == appName)[0] as FirebaseApp;
+    return existingApp || firebase.initializeApp(config, appName) as FirebaseApp;
+}
 
 const FirebaseAppProvider = {
     provide: FirebaseApp,

src/database-deprecated/database.ts

@@ -24,7 +24,7 @@ export class AngularFireDatabase {
     @Optional() @Inject(RealtimeDatabaseURL) databaseURL:string
   ) {
     const app = _firebaseAppFactory(config, name);
-    this.database = app.database!(databaseURL || undefined);
+    this.database = app.database(databaseURL || undefined);
   }
 
   list(pathOrRef: PathReference, opts?:FirebaseListFactoryOpts):FirebaseListObservable<any[]> {

src/database/database.spec.ts

@@ -1,5 +1,4 @@
-import { FirebaseApp } from '@firebase/app-types';
-import { FirebaseAppConfig, AngularFireModule, FirebaseAppName } from 'angularfire2';
+import { FirebaseApp, FirebaseAppConfig, AngularFireModule, FirebaseAppName } from 'angularfire2';
 import { AngularFireDatabase, AngularFireDatabaseModule, RealtimeDatabaseURL } from 'angularfire2/database';
 import { TestBed, inject } from '@angular/core/testing';
 import { COMMON_CONFIG } from './test-config';

src/database/database.ts

@@ -3,7 +3,7 @@ import { FirebaseDatabase } from '@firebase/database-types';
 import { PathReference, DatabaseQuery, DatabaseReference, DatabaseSnapshot, ChildEvent, ListenEvent, QueryFn, AngularFireList, AngularFireObject } from './interfaces';
 import { getRef } from './utils';
 import { InjectionToken } from '@angular/core';
-import { FirebaseApp, FirebaseOptions } from '@firebase/app-types';
+import { FirebaseOptions } from '@firebase/app-types';
 import { createListReference } from './list/create-reference';
 import { createObjectReference } from './object/create-reference';
 import { FirebaseAppConfig, FirebaseAppName, RealtimeDatabaseURL, _firebaseAppFactory } from 'angularfire2';
@@ -18,7 +18,7 @@ export class AngularFireDatabase {
     @Optional() @Inject(RealtimeDatabaseURL) databaseURL:string
   ) {
     const app = _firebaseAppFactory(config, name);
-    this.database = app.database!(databaseURL || undefined);
+    this.database = app.database(databaseURL || undefined);
   }
 
   list<T>(pathOrRef: PathReference, queryFn?: QueryFn): AngularFireList<T> {

src/firestore/firestore.spec.ts

@@ -1,5 +1,4 @@
-import { FirebaseApp } from '@firebase/app-types';
-import { FirebaseAppConfig, AngularFireModule, FirebaseAppName } from 'angularfire2';
+import { FirebaseApp, FirebaseAppConfig, AngularFireModule, FirebaseAppName } from 'angularfire2';
 import { AngularFirestore } from './firestore';
 import { AngularFirestoreModule } from './firestore.module';
 import { AngularFirestoreDocument } from './document/document';

src/firestore/firestore.ts

@@ -110,7 +110,7 @@ export class AngularFirestore {
     @Optional() @Inject(EnablePersistenceToken) shouldEnablePersistence: boolean
   ) {
     const app = _firebaseAppFactory(config, name);
-    this.firestore = app.firestore!();
+    this.firestore = app.firestore();
 
     this.persistenceEnabled$ = shouldEnablePersistence ?
       from(this.firestore.enablePersistence().then(() => true, () => false)) :

src/storage/storage.spec.ts

@@ -1,8 +1,7 @@
-import { FirebaseApp  } from '@firebase/app-types';
 import { Observable } from 'rxjs/Observable'
 import { forkJoin } from 'rxjs/observable/forkJoin';
 import { TestBed, inject } from '@angular/core/testing';
-import { FirebaseAppConfig, AngularFireModule, FirebaseAppName } from 'angularfire2';
+import { FirebaseApp, FirebaseAppConfig, AngularFireModule, FirebaseAppName } from 'angularfire2';
 import { AngularFireStorageModule, AngularFireStorage, AngularFireUploadTask, StorageBucket } from 'angularfire2/storage';
 import { COMMON_CONFIG } from './test-config';
 

src/storage/storage.ts

@@ -25,7 +25,7 @@ export class AngularFireStorage {
     @Optional() @Inject(StorageBucket) storageBucket:string
   ) {
     const app = _firebaseAppFactory(config, name);
-    this.storage = app.storage!(storageBucket || undefined);
+    this.storage = app.storage(storageBucket || undefined);
   }
 
   ref(path: string) {

tools/build.js

@@ -66,7 +66,6 @@ const GLOBALS = {
   '@firebase/storage': 'firebase',
   '@firebase/util': 'firebase',
   '@firebase/webchannel-wrapper': 'firebase',
-  '@firebase/app-types': 'firebase',
   'rxjs/scheduler/queue': 'Rx.Scheduler',
   '@angular/core/testing': 'ng.core.testing',
   'angularfire2': 'angularfire2',