Final fixes for 5.2.0 release

.travis.yml

@@ -44,5 +44,4 @@ script:
     ./node_modules/.bin/karma start --single-run --browsers ChromeHeadlessTravis --reporters mocha &&
     yarn test:node &&
     node tools/run-typings-test.js &&
-    cd test/ng-build/ng6 &&
-    yarn && yarn build:prod
+    bash ./test/ng-build/build.sh

CHANGELOG.md

@@ -1,20 +1,22 @@
 <a name="5.2.0"></a>
 # [5.2.0](https://github.com/angular/angularfire2/compare/5.1.3...5.2.0) (2019-05-24)
 
+AngularFire 5.2 introduces support for Angular 8 and version 6 of the Firebase SDK.
+
 ### Bug Fixes
 
 * **firestore:** Fix for builds targeting Node ([#2079](https://github.com/angular/angularfire2/issues/2079)) ([8a33826](https://github.com/angular/angularfire2/commit/8a33826))
 * **storage:** Typo in updateMetadata method ([#2029](https://github.com/angular/angularfire2/issues/2029)) ([6133296](https://github.com/angular/angularfire2/commit/6133296))
 
 ### Features
 
-* **performance:** AngularFire Performance Monitoring ([#2064](https://github.com/angular/angularfire2/issues/2064))
+* **performance:** AngularFire Performance Monitoring ([#2064](https://github.com/angular/angularfire2/issues/2064)) ([2469e77](https://github.com/angular/angularfire2/commit/2469e7721ffaea755ab6b95b66610e1495692342))
 * **auth-guard:** AngularFire Auth Guards ([#2016](https://github.com/angular/angularfire2/issues/2016)) ([e32164d](https://github.com/angular/angularfire2/commit/e32164d))
 * **firestore:** Added option to include document IDs on valueChanges() ([#1976](https://github.com/angular/angularfire2/issues/1976)) ([7108875](https://github.com/angular/angularfire2/commit/7108875))
 * **firestore:** Support Firestore Collection Group Queries ([#2066](https://github.com/angular/angularfire2/issues/2066)) ([c34c0f3](https://github.com/angular/angularfire2/commit/c34c0f3))
 * **functions:** Allow configuration of Functions Emulator Origin ([#2017](https://github.com/angular/angularfire2/issues/2017)) ([d12b4c5](https://github.com/angular/angularfire2/commit/d12b4c5))
 * **schematics:** ng deploy schematic ([#2046](https://github.com/angular/angularfire2/issues/2046)) ([be0a1fb](https://github.com/angular/angularfire2/commit/be0a1fb))
-
+* **firestore:** path on `AngularFirestoreCollection`'s `.doc` is optional ([#1974](https://github.com/angular/angularfire2/issues/1974)) ([c2354f8](https://github.com/angular/angularfire2/commit/c2354f8))
 
 
 <a name="5.1.2"></a>

docs/performance/getting-started.md

@@ -51,23 +51,27 @@ ngOnInit() {
 }
 ```
 
-### `trace(name:string)`
+### `trace(name, options?)`
 
 The most basic operator, `trace` will measure the amount of time it takes for your observable to either complete or emit its first value. Beyond the basic trace there are several other operators:
 
-### `traceUntil(name:string, test: (T) => Boolean)`
+### `traceUntil(name, test: (T) => Boolean, options?)`
 
 Trace the observable until the first emission that passes the provided test.
 
-### `traceWhile(name:string, test: (T) => Boolean)`
+If the `orComplete` option is passed it will complete the trace when the observable completes, even if an emission never passed the provided test.
 
-Trace the observable until the first emission that fails the provided test.
+### `traceWhile(name, test: (T) => Boolean, options?)`
 
-### `traceUntilLast(name:string)`
+Starting with an emission that passes the provided test, trace until an emission fails the test.
+
+If the `orComplete` option is passed it will complete any existing trace when the observable completes.
+
+### `traceUntilLast(name, options?)`
 
 Trace the observable until completion.
 
-### `traceUntilFirst(name: string)`
+### `traceUntilFirst(name, options?)`
 
 Traces the observable until the first emission.
 

package.json

@@ -33,15 +33,15 @@
   },
   "homepage": "https://github.com/angular/angularfire2#readme",
   "dependencies": {
-    "@angular-devkit/architect": "^0.800.0-rc.4 || >=8.0.0 <9 || 9.0.0-0",
-    "@angular-devkit/core": ">=6.0.0 <9 || 9.0.0-0",
-    "@angular-devkit/schematics": ">=6.0.0 <9 || 9.0.0-0",
-    "@angular/common": ">=6.0.0 <9 || 9.0.0-0",
-    "@angular/compiler": ">=6.0.0 <9 || 9.0.0-0",
-    "@angular/core": ">=6.0.0 <9 || 9.0.0-0",
-    "@angular/platform-browser": ">=6.0.0 <9 || 9.0.0-0",
-    "@angular/platform-browser-dynamic": ">=6.0.0 <9 || 9.0.0-0",
-    "@angular/router": ">=6.0.0 <9 || 9.0.0-0",
+    "@angular-devkit/architect": "^0.800.0-rc.4 || >=8.0.0 <9 || ^9.0.0-0",
+    "@angular-devkit/core": ">=6.0.0 <9 || ^8.0.0-0 || ^9.0.0-0",
+    "@angular-devkit/schematics": ">=6.0.0 <9 || ^8.0.0-0 || ^9.0.0-0",
+    "@angular/common": ">=6.0.0 <9 || ^8.0.0-0 || ^9.0.0-0",
+    "@angular/compiler": ">=6.0.0 <9 || ^8.0.0-0 || ^9.0.0-0",
+    "@angular/core": ">=6.0.0 <9 || ^8.0.0-0 || ^9.0.0-0",
+    "@angular/platform-browser": ">=6.0.0 <9 || ^8.0.0-0 || ^9.0.0-0",
+    "@angular/platform-browser-dynamic": ">=6.0.0 <9 || ^8.0.0-0 || ^9.0.0-0",
+    "@angular/router": ">=6.0.0 <9 || ^8.0.0-0 || ^9.0.0-0",
     "firebase": ">= 5.5.7 <7",
     "firebase-tools": "^6.10.0",
     "fuzzy": "^0.1.3",
@@ -57,9 +57,9 @@
     "utf-8-validate": "~4.0.0"
   },
   "devDependencies": {
-    "@angular/animations": ">=6.0.0 <9 || 9.0.0-0",
-    "@angular/compiler-cli": ">=6.0.0 <9 || 9.0.0-0",
-    "@angular/platform-server": ">=6.0.0 <9 || 9.0.0-0",
+    "@angular/animations": ">=6.0.0 <9 || ^8.0.0-0 || ^9.0.0-0",
+    "@angular/compiler-cli": ">=6.0.0 <9 || ^8.0.0-0 || ^9.0.0-0",
+    "@angular/platform-server": ">=6.0.0 <9 || ^8.0.0-0 || ^9.0.0-0",
     "@types/inquirer": "^0.0.44",
     "@types/jasmine": "^2.5.36",
     "@types/request": "0.0.30",

src/firestore/collection/collection.ts

@@ -154,7 +154,7 @@ export class AngularFirestoreCollection<T=DocumentData> {
    * Create a reference to a single document in a collection.
    * @param path
    */
-  doc<T>(path: string): AngularFirestoreDocument<T> {
+  doc<T>(path?: string): AngularFirestoreDocument<T> {
     return new AngularFirestoreDocument<T>(this.ref.doc(path), this.afs);
   }
 }

src/performance/performance.module.ts

@@ -6,4 +6,8 @@ import 'firebase/performance';
 @NgModule({
   providers: [ AngularFirePerformance ]
 })
-export class AngularFirePerformanceModule { }
+export class AngularFirePerformanceModule {
+  constructor(_: AngularFirePerformance) {
+    // DI inject AFP here for the automatic data collection
+  } 
+}

src/performance/performance.ts

@@ -1,7 +1,8 @@
 import { Injectable, NgZone, ApplicationRef, InjectionToken, Inject, Optional } from '@angular/core';
-import { Observable } from 'rxjs';
+import { Observable, Subscription } from 'rxjs';
 import { first, tap } from 'rxjs/operators';
 import { performance } from 'firebase/app';
+import { FirebaseApp } from '@angular/fire';
 
 export const AUTOMATICALLY_TRACE_CORE_NG_METRICS = new InjectionToken<boolean>('angularfire2.performance.auto_trace');
 export const INSTRUMENTATION_ENABLED = new InjectionToken<boolean>('angularfire2.performance.instrumentationEnabled');
@@ -21,14 +22,15 @@ export class AngularFirePerformance {
   performance: performance.Performance;
 
   constructor(
+    app: FirebaseApp,
     @Optional() @Inject(AUTOMATICALLY_TRACE_CORE_NG_METRICS) automaticallyTraceCoreNgMetrics:boolean|null,
     @Optional() @Inject(INSTRUMENTATION_ENABLED) instrumentationEnabled:boolean|null,
     @Optional() @Inject(DATA_COLLECTION_ENABLED) dataCollectionEnabled:boolean|null,
     appRef: ApplicationRef,
     private zone: NgZone
   ) {
 
-    this.performance = zone.runOutsideAngular(() => performance());
+    this.performance = zone.runOutsideAngular(() => app.performance());
 
     if (instrumentationEnabled == false) { this.performance.instrumentationEnabled = false }
     if (dataCollectionEnabled == false) { this.performance.dataCollectionEnabled = false }
@@ -37,8 +39,8 @@ export class AngularFirePerformance {
 
       // TODO determine more built in metrics
       appRef.isStable.pipe(
-        this.traceUntilLast('isStable'),
-        first(it => it)
+        first(it => it),
+        this.traceUntilComplete('isStable')
       ).subscribe();
 
     }
@@ -73,51 +75,66 @@ export class AngularFirePerformance {
     })
   );
 
-  traceUntil = <T=any>(name:string, test: (a:T) => boolean, options?: TraceOptions) => (source$: Observable<T>) => {
+  traceUntil = <T=any>(name:string, test: (a:T) => boolean, options?: TraceOptions & { orComplete?: boolean }) => (source$: Observable<T>) => new Observable<T>(subscriber => {
     const traceSubscription = this.trace$(name, options).subscribe();
     return source$.pipe(
-      tap(a => { if (test(a)) { traceSubscription.unsubscribe() }})
-    )
-  };
+      tap(
+        a  => test(a) && traceSubscription.unsubscribe(),
+        () => {},
+        () => options && options.orComplete && traceSubscription.unsubscribe()
+      )
+    ).subscribe(subscriber);
+  });
 
-  traceWhile = <T=any>(name:string, test: (a:T) => boolean, options?: TraceOptions) => (source$: Observable<T>) => {
-    const traceSubscription = this.trace$(name, options).subscribe();
+  traceWhile = <T=any>(name:string, test: (a:T) => boolean, options?: TraceOptions & { orComplete?: boolean}) => (source$: Observable<T>) => new Observable<T>(subscriber => {
+    let traceSubscription: Subscription|undefined;
     return source$.pipe(
-      tap(a => { if (!test(a)) { traceSubscription.unsubscribe() }})
-    )
-  };
+      tap(
+        a  => {
+          if (test(a)) {
+            traceSubscription = traceSubscription || this.trace$(name, options).subscribe();
+          } else {
+            traceSubscription && traceSubscription.unsubscribe();
+            traceSubscription = undefined;
+          }
+        },
+        () => {},
+        () => options && options.orComplete && traceSubscription && traceSubscription.unsubscribe()
+      )
+    ).subscribe(subscriber);
+  });
 
-  traceUntilLast= <T=any>(name:string, options?: TraceOptions) => (source$: Observable<T>) => {
+  traceUntilComplete = <T=any>(name:string, options?: TraceOptions) => (source$: Observable<T>) => new Observable<T>(subscriber => {
     const traceSubscription = this.trace$(name, options).subscribe();
     return source$.pipe(
       tap(
         () => {},
         () => {},
         () => traceSubscription.unsubscribe()
       )
-    )
-  };
+    ).subscribe(subscriber);
+  });
 
-  traceUntilFirst = <T=any>(name:string, options?: TraceOptions) => (source$: Observable<T>) => {
+  traceUntilFirst = <T=any>(name:string, options?: TraceOptions) => (source$: Observable<T>) => new Observable<T>(subscriber => {
     const traceSubscription = this.trace$(name, options).subscribe();
     return source$.pipe(
       tap(
         () => traceSubscription.unsubscribe(),
         () => {},
         () => {}
       )
-    )
-  };
+    ).subscribe(subscriber);
+  });
 
-  trace = <T=any>(name:string, options?: TraceOptions) => (source$: Observable<T>) => {
+  trace = <T=any>(name:string, options?: TraceOptions) => (source$: Observable<T>) => new Observable<T>(subscriber => {
     const traceSubscription = this.trace$(name, options).subscribe();
     return source$.pipe(
       tap(
         () => traceSubscription.unsubscribe(),
         () => {},
         () => traceSubscription.unsubscribe()
       )
-    )
-  };
+    ).subscribe(subscriber);
+  });
 
 }

test/ng-build/build.sh

@@ -1 +1,3 @@
-cd ng6 && ng build --prod
+cd ./test/ng-build/ng6 && yarn && npx ng build --prod &&
+cd ../ng7 && yarn && npx ng build --prod &&
+cd ../ng8 && yarn && npx ng build --prod

test/ng-build/ng6/package.json

@@ -17,12 +17,12 @@
     "@angular/common": "6.0.1",
     "@angular/compiler": "6.0.1",
     "@angular/core": "6.0.1",
+    "@angular/fire": "../../../dist/packages-dist",
     "@angular/forms": "6.0.1",
     "@angular/http": "6.0.1",
     "@angular/platform-browser": "6.0.1",
     "@angular/platform-browser-dynamic": "6.0.1",
     "@angular/router": "6.0.1",
-    "@angular/fire": "../../../dist/packages-dist",
     "core-js": "^2.4.1",
     "rxjs": "^6.0.0",
     "zone.js": "^0.8.14"

test/ng-build/ng6/src/app/app.component.ts

@@ -3,6 +3,9 @@ import { FirebaseApp } from '@angular/fire';
 import { AngularFireDatabase } from '@angular/fire/database';
 import { AngularFireAuth } from '@angular/fire/auth';
 import { AngularFirestore } from '@angular/fire/firestore';
+import { AngularFireStorage } from '@angular/fire/storage';
+import { AngularFireMessaging } from '@angular/fire/messaging';
+import { AngularFireFunctions } from '@angular/fire/functions';
 
 @Component({
   selector: 'app-root',
@@ -32,8 +35,11 @@ export class AppComponent {
     private readonly app: FirebaseApp,
     private readonly db: AngularFireDatabase,
     private readonly auth: AngularFireAuth,
-    private readonly afStore: AngularFirestore
+    private readonly afStore: AngularFirestore,
+    private readonly storage: AngularFireStorage,
+    private readonly messaging: AngularFireMessaging,
+    private readonly functions: AngularFireFunctions
   ) {
-    console.log(app, db, auth, afStore);
+    console.log(app, db, auth, afStore, storage, messaging, functions);
   }
 }

test/ng-build/ng6/src/app/app.module.ts

@@ -4,6 +4,9 @@ import { FirebaseOptionsToken, AngularFireModule } from '@angular/fire';
 import { AngularFireDatabaseModule } from '@angular/fire/database';
 import { AngularFireAuthModule } from '@angular/fire/auth';
 import { AngularFirestoreModule } from '@angular/fire/firestore';
+import { AngularFireStorageModule } from '@angular/fire/storage';
+import { AngularFireFunctionsModule } from '@angular/fire/functions';
+import { AngularFireMessagingModule } from '@angular/fire/messaging';
 
 import { AppComponent } from './app.component';
 
@@ -23,7 +26,10 @@ import { AppComponent } from './app.component';
     }),
     AngularFireAuthModule,
     AngularFireDatabaseModule,
-    AngularFirestoreModule
+    AngularFirestoreModule,
+    AngularFireStorageModule,
+    AngularFireMessagingModule,
+    AngularFireFunctionsModule
   ],
   bootstrap: [AppComponent]
 })