getInstance({...}) for manual initialization

jamesdaniels · jamesdaniels · commit feac6353007f · 2019-05-16T16:47:27.000-07:00
diff --git a/src/auth/auth.ts b/src/auth/auth.ts
@@ -1,11 +1,16 @@
 import { Injectable, Inject, Optional, NgZone, PLATFORM_ID } from '@angular/core';
 import { Observable, of, from } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
-import { FirebaseAppConfig, FirebaseOptions } from '@angular/fire';
+import { FirebaseAppConfig, FirebaseOptions, TypicalDependencyInjection } from '@angular/fire';
 import { User, auth } from 'firebase/app';
 
 import { FirebaseAuth, FirebaseOptionsToken, FirebaseNameOrConfigToken, _firebaseAppFactory, FirebaseZoneScheduler } from '@angular/fire';
 
+// TODO clean up anys
+export const getInstance =
+  (config: TypicalDependencyInjection) =>
+    new AngularFireAuth(config.options,( <any>config).appName || (<any>config).appConfig, config.platformId, config.zone);
+
 @Injectable()
 export class AngularFireAuth {
 
diff --git a/src/core/firebase.app.module.ts b/src/core/firebase.app.module.ts
@@ -1,8 +1,11 @@
-import { InjectionToken, NgModule, Optional } from '@angular/core';
+import { InjectionToken, NgModule, Optional, NgZone } from '@angular/core';
 import { auth, database, firestore, functions, messaging, storage } from 'firebase/app';
 // @ts-ignore (https://github.com/firebase/firebase-js-sdk/pull/1206)
 import firebase from 'firebase/app'; // once fixed can pull in as "default as firebase" above
 
+export type AllowOnlyOneOf<T, Keys extends keyof T = keyof T> = Pick<T, Exclude<keyof T, Keys>> & { [K in Keys]-?: Partial<Record<Exclude<Keys, K>, undefined>> }[Keys]
+export type TypicalDependencyInjection = AllowOnlyOneOf<{ options: FirebaseOptions, platformId: Object, zone: NgZone, appName?: string, appConfig?: FirebaseAppConfig }, 'appName'|'appConfig'>;
+
 // Public types don't expose FirebaseOptions or FirebaseAppConfig
 export type FirebaseOptions = {[key:string]: any};
 export type FirebaseAppConfig = {[key:string]: any};
diff --git a/src/database/database.ts b/src/database/database.ts
@@ -4,7 +4,12 @@ import { getRef } from './utils';
 import { InjectionToken } from '@angular/core';
 import { createListReference } from './list/create-reference';
 import { createObjectReference } from './object/create-reference';
-import { FirebaseDatabase, FirebaseOptions, FirebaseAppConfig, FirebaseOptionsToken, FirebaseNameOrConfigToken, RealtimeDatabaseURL, _firebaseAppFactory, FirebaseZoneScheduler } from '@angular/fire';
+import { FirebaseDatabase, FirebaseOptions, FirebaseAppConfig, FirebaseOptionsToken, FirebaseNameOrConfigToken, RealtimeDatabaseURL, _firebaseAppFactory, FirebaseZoneScheduler, TypicalDependencyInjection } from '@angular/fire';
+
+// TODO clean up anys
+export const getInstance =
+  (config: TypicalDependencyInjection & { databaseURL?: string }) =>
+    new AngularFireDatabase(config.options,( <any>config).appName || (<any>config).appConfig, config.databaseURL || null, config.platformId, config.zone);
 
 @Injectable()
 export class AngularFireDatabase {
diff --git a/src/firestore/firestore.ts b/src/firestore/firestore.ts
@@ -6,7 +6,7 @@ import { Settings, PersistenceSettings, CollectionReference, DocumentReference,
 import { AngularFirestoreDocument } from './document/document';
 import { AngularFirestoreCollection } from './collection/collection';
 
-import { FirebaseFirestore, FirebaseOptions, FirebaseAppConfig, FirebaseOptionsToken, FirebaseNameOrConfigToken, _firebaseAppFactory, FirebaseZoneScheduler } from '@angular/fire';
+import { FirebaseFirestore, FirebaseOptions, FirebaseAppConfig, FirebaseOptionsToken, FirebaseNameOrConfigToken, _firebaseAppFactory, FirebaseZoneScheduler, TypicalDependencyInjection } from '@angular/fire';
 import { isPlatformServer } from '@angular/common';
 
 import { firestore, SDK_VERSION } from 'firebase/app';
@@ -41,6 +41,11 @@ export function associateQuery(collectionRef: CollectionReference, queryFn = ref
   return { query, ref };
 }
 
+// TODO clean up anys
+export const getInstance =
+  (config: TypicalDependencyInjection & { enablePersistence?: boolean, settings?: Settings, persistenceSettings?: PersistenceSettings }) =>
+    new AngularFirestore(config.options,( <any>config).appName || (<any>config).appConfig, config.enablePersistence || null, config.settings || null, config.platformId, config.zone, config.persistenceSettings || null);
+
 /**
  * AngularFirestore Service
  *
diff --git a/src/functions/functions.ts b/src/functions/functions.ts
@@ -1,11 +1,16 @@
 import { Injectable, Inject, Optional, NgZone, PLATFORM_ID, InjectionToken } from '@angular/core';
 import { Observable, from } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { FirebaseOptions, FirebaseAppConfig } from '@angular/fire';
+import { FirebaseOptions, FirebaseAppConfig, TypicalDependencyInjection } from '@angular/fire';
 import { FirebaseFunctions, FirebaseOptionsToken, FirebaseNameOrConfigToken, _firebaseAppFactory, FirebaseZoneScheduler } from '@angular/fire';
 
 export const FunctionsRegionToken = new InjectionToken<string>('angularfire2.functions.region');
 
+// TODO clean up anys
+export const getInstance =
+  (config: TypicalDependencyInjection & { region?: string }) =>
+    new AngularFireFunctions(config.options,( <any>config).appName || (<any>config).appConfig || undefined, config.platformId, config.zone, config.region || null);
+
 @Injectable()
 export class AngularFireFunctions {
 
diff --git a/src/messaging/messaging.ts b/src/messaging/messaging.ts
@@ -3,9 +3,14 @@ import { isPlatformServer } from '@angular/common';
 import { messaging } from 'firebase/app';
 import { Observable, empty, from, of, throwError } from 'rxjs';
 import { mergeMap, catchError, map, switchMap, concat, defaultIfEmpty } from 'rxjs/operators';
-import { FirebaseOptions, FirebaseAppConfig, runOutsideAngular } from '@angular/fire';
+import { FirebaseOptions, FirebaseAppConfig, runOutsideAngular, TypicalDependencyInjection } from '@angular/fire';
 import { FirebaseOptionsToken, FirebaseNameOrConfigToken, _firebaseAppFactory, FirebaseZoneScheduler } from '@angular/fire';
 
+// TODO clean up anys
+export const getInstance =
+  (config: TypicalDependencyInjection) =>
+    new AngularFireMessaging(config.options,( <any>config).appName || (<any>config).appConfig || undefined, config.platformId, config.zone);
+
 @Injectable()
 export class AngularFireMessaging {
   messaging: Observable<messaging.Messaging>;
diff --git a/src/performance/performance.ts b/src/performance/performance.ts
@@ -13,6 +13,8 @@ export type TraceOptions = {
   metric$?:{[key:string]: Observable<number>}
 };
 
+export const getInstance = (options: { automaticallyTraceCoreNgMetrics?: boolean, appRef: ApplicationRef, zone: NgZone }) => new AngularFirePerformance(options.automaticallyTraceCoreNgMetrics || null, options.appRef, options.zone);
+
 @Injectable()
 export class AngularFirePerformance {
   
diff --git a/src/storage/storage.ts b/src/storage/storage.ts
@@ -2,12 +2,17 @@ import { Injectable, Inject, Optional, InjectionToken, NgZone, PLATFORM_ID } fro
 import { createStorageRef, AngularFireStorageReference } from './ref';
 import { createUploadTask, AngularFireUploadTask } from './task';
 import { Observable } from 'rxjs';
-import { FirebaseStorage, FirebaseOptions, FirebaseAppConfig, FirebaseOptionsToken, FirebaseNameOrConfigToken, FirebaseZoneScheduler, _firebaseAppFactory } from '@angular/fire';
+import { FirebaseStorage, TypicalDependencyInjection, FirebaseOptions, FirebaseAppConfig, FirebaseOptionsToken, FirebaseNameOrConfigToken, FirebaseZoneScheduler, _firebaseAppFactory } from '@angular/fire';
 
 import { UploadMetadata } from './interfaces';
 
 export const StorageBucket = new InjectionToken<string>('angularfire2.storageBucket');
 
+// TODO clean up anys
+export const getInstance =
+  (config: TypicalDependencyInjection & { bucket?: string }) =>
+    new AngularFireStorage(config.options,( <any>config).appName || (<any>config).appConfig, config.bucket || null, config.platformId, config.zone);
+
 /**
  * AngularFireStorage Service
  *
