chore(build): Add strictNullCheck compatibility (angular#1030)

Author: davideast

package.json

@@ -75,7 +75,7 @@
     "systemjs": "^0.19.16",
     "systemjs-builder": "^0.15.7",
     "traceur": "0.0.96",
-    "typescript": "^2.2.2",
+    "typescript": "^2.3.2",
     "zone.js": "^0.8.0"
   },
   "typings": "index.d.ts"

src/app/firebase.app.module.ts

@@ -27,6 +27,6 @@ export function _firebaseAppFactory(config: FirebaseAppConfig, appName?: string)
       return firebase.app(e.name);
     }
 
-    return firebase.app(null);
+    return firebase.app(null!);
   }
 }

src/auth/auth.spec.ts

@@ -91,7 +91,7 @@ describe('AngularFireAuth', () => {
     // Check that the first value is null and second is the auth user
     const subs = afAuth.authState.subscribe(user => {
       if (count === 0) {
-        expect(user).toBe(null);
+        expect(user).toBe(null!);
         count = count + 1;
         mockAuthState.next(firebaseUser);
       } else {
@@ -100,7 +100,7 @@ describe('AngularFireAuth', () => {
         done();
       }
     }, done, done.fail);
-    mockAuthState.next(null);
+    mockAuthState.next(null!);
   });
 
   it('should emit auth updates through idToken', (done: any) => {
@@ -109,7 +109,7 @@ describe('AngularFireAuth', () => {
     // Check that the first value is null and second is the auth user
     const subs = afAuth.idToken.subscribe(user => {
       if (count === 0) {
-        expect(user).toBe(null);
+        expect(user).toBe(null!);
         count = count + 1;
         mockAuthState.next(firebaseUser);
       } else {
@@ -118,7 +118,7 @@ describe('AngularFireAuth', () => {
         done();
       }
     }, done, done.fail);
-    mockAuthState.next(null);
+    mockAuthState.next(null!);
   });
 
 });

src/auth/auth.ts

@@ -42,7 +42,7 @@ export class AngularFireAuth {
 export function FirebaseAuthStateObservable(app: FirebaseApp): Observable<firebase.User> {
   const authState = Observable.create((observer: Observer<firebase.User>) => {
     app.auth().onAuthStateChanged(
-      (user?: firebase.User) => observer.next(user),
+      (user?: firebase.User) => observer.next(user!),
       (error: firebase.auth.Error) => observer.error(error),
       () => observer.complete()
     );
@@ -58,10 +58,10 @@ export function FirebaseAuthStateObservable(app: FirebaseApp): Observable<fireba
 export function FirebaseIdTokenObservable(app: FirebaseApp): Observable<firebase.User> {
   const idToken = Observable.create((observer: Observer<firebase.User>) => {
     app.auth().onIdTokenChanged(
-      (user?: firebase.User) => observer.next(user),
+      (user?: firebase.User) => observer.next(user!),
       (error: firebase.auth.Error) => observer.error(error),
       () => observer.complete()
     )
   });
   return observeOn.call(idToken, new utils.ZoneScheduler(Zone.current));
-}
+}

src/database/firebase_list_factory.spec.ts

@@ -416,7 +416,7 @@ describe('FirebaseListFactory', () => {
 
       questions.$ref.ref.push({ number: 1 })
         .then(() => {
-          let calls = [];
+          let calls: string[] = [];
           questions.$ref.ref.once('child_added', (snap) => calls.push('child_added:' + snap.val().number));
           skipAndTake(questions).subscribe(
             (list) => {
@@ -611,13 +611,13 @@ describe('FirebaseListFactory', () => {
 
       it('should move the child to the beginning if prevKey is null', () => {
         expect(
-          onChildChanged([val1, val2, val3], val2, toKey, null)
+          onChildChanged([val1, val2, val3], val2, toKey, null!)
         ).toEqual([val2, val1, val3]);
       });
 
       it('should not duplicate the first item if it is the one that changed', () => {
         expect(
-          onChildChanged([val1, val2, val3], val1, toKey, null)
+          onChildChanged([val1, val2, val3], val1, toKey, null!)
         ).not.toEqual([val1, val1, val2, val3]);
       });
 

src/database/firebase_list_factory.ts

@@ -6,7 +6,7 @@ import { FirebaseListObservable } from './firebase_list_observable';
 import { Observer } from 'rxjs/Observer';
 import { observeOn } from 'rxjs/operator/observeOn';
 import { observeQuery } from './query_observable';
-import { Query, FirebaseListFactoryOpts, DatabaseReference, DatabaseQuery } from '../interfaces';
+import { Query, FirebaseListFactoryOpts, DatabaseReference, DatabaseQuery, DatabaseSnapshot } from '../interfaces';
 import { switchMap } from 'rxjs/operator/switchMap';
 import { map } from 'rxjs/operator/map';
 
@@ -115,10 +115,10 @@ function firebaseListObservable(ref: firebase.database.Reference | DatabaseQuery
   const listObs = new FirebaseListObservable(ref, (obs: Observer<any[]>) => {
 
     // Keep track of callback handles for calling ref.off(event, handle)
-    const handles = [];
+    const handles: { event: string, handle: (a: DatabaseSnapshot, b?: string | null | undefined) => any }[] = [];
     let hasLoaded = false;
-    let lastLoadedKey: string = null;
-    let array = [];
+    let lastLoadedKey: string = null!;
+    let array: DatabaseSnapshot[] = [];
 
     // The list children are always added to, removed from and changed within
     // the array using the child_added/removed/changed events. The value event
@@ -193,7 +193,7 @@ export function onChildAdded(arr:any[], child:any, toKey:(element:any)=>string,
   if (!arr.length) {
     return [child];
   }
-  return arr.reduce((accumulator:firebase.database.DataSnapshot[], curr:firebase.database.DataSnapshot, i:number) => {
+  return arr.reduce((accumulator: DatabaseSnapshot[], curr: DatabaseSnapshot, i:number) => {
     if (!prevKey && i===0) {
       accumulator.push(child);
     }

src/database/firebase_list_observable.spec.ts

@@ -52,7 +52,7 @@ describe('FirebaseListObservable', () => {
 
   describe('push', () => {
     it('should throw an exception if pushed when not subscribed', () => {
-      O = new FirebaseListObservable(null, (observer:Observer<any>) => {});
+      O = new FirebaseListObservable(null!, (observer:Observer<any>) => {});
 
       expect(() => {
         O.push('foo');
@@ -76,7 +76,7 @@ describe('FirebaseListObservable', () => {
       let childAddedSpy = jasmine.createSpy('childAdded');
 
       ref.on('child_added', childAddedSpy);
-      O.remove(child.key)
+      O.remove(child.key!)
         .then(() => (<any>ref).once('value'))
         .then((data:firebase.database.DataSnapshot) => {
           expect(childAddedSpy.calls.argsFor(0)[0].val()).toEqual(orphan);
@@ -158,7 +158,7 @@ describe('FirebaseListObservable', () => {
       let childChangedSpy = jasmine.createSpy('childChanged');
       const orphanChange = { changed: true }
       ref.on('child_changed', childChangedSpy);
-      O.set(child.key, orphanChange)
+      O.set(child.key!, orphanChange)
         .then(() => (<any>ref).once('value'))
         .then((data:firebase.database.DataSnapshot) => {
           expect(childChangedSpy.calls.argsFor(0)[0].val()).not.toEqual({
@@ -250,7 +250,7 @@ describe('FirebaseListObservable', () => {
       let childChangedSpy = jasmine.createSpy('childChanged');
       const orphanChange = { changed: true }
       ref.on('child_changed', childChangedSpy);
-      O.update(child.key, orphanChange)
+      O.update(child.key!, orphanChange)
         .then(() => (<any>ref).once('value'))
         .then((data:firebase.database.DataSnapshot) => {
           expect(childChangedSpy.calls.argsFor(0)[0].val()).toEqual({

src/database/firebase_list_observable.ts

@@ -63,11 +63,11 @@ export class FirebaseListObservable<T> extends Observable<T> {
     if (utils.isString(item)) {
       return cases.stringCase();
     } else if (utils.isFirebaseRef(item)) {
-      return cases.firebaseCase();
+      return cases.firebaseCase!();
     } else if (utils.isFirebaseDataSnapshot(item)) {
-      return cases.snapshotCase();
+      return cases.snapshotCase!();
     } else if (utils.isAFUnwrappedSnapshot(item)) {
-      return cases.unwrappedSnapshotCase()
+      return cases.unwrappedSnapshotCase!()
     }
     throw new Error(`Method requires a key, snapshot, reference, or unwrapped snapshot. Got: ${typeof item}`);
   }

src/database/firebase_object_observable.spec.ts

@@ -44,7 +44,7 @@ describe('FirebaseObjectObservable', () => {
 
   describe('$ref', () => {
     it('should match the database path passed in the constructor', () => {
-      expect(O.$ref.toString()).toEqual(ref.toString());
+      expect(O.$ref!.toString()).toEqual(ref.toString());
     });
   });
 

src/database/query_observable.spec.ts

@@ -38,7 +38,7 @@ describe('observeQuery', () => {
     let completeSpy = jasmine.createSpy('complete');
     let query = { orderByChild: 'height', equalTo: 10 };
     let obs = observeQuery(query, false);
-    obs.subscribe(nextSpy, null, completeSpy);
+    obs.subscribe(nextSpy, () => {}, completeSpy);
     expect(nextSpy).toHaveBeenCalledWith({
       orderByChild: 'height',
       equalTo: 10
@@ -51,7 +51,7 @@ describe('observeQuery', () => {
     let completeSpy = jasmine.createSpy('complete');
     let query:any = null;
     let obs = observeQuery(query, false);
-    obs.subscribe(nextSpy, null, completeSpy);
+    obs.subscribe(nextSpy, () => {}, completeSpy);
     expect(nextSpy).toHaveBeenCalledWith(null);
     expect(completeSpy).toHaveBeenCalled();
   });
@@ -65,7 +65,7 @@ describe('observeQuery', () => {
     };
     let obs = observeQuery(query, false);
     let noOrderyQuery = { orderByKey: false };
-    obs.subscribe(nextSpy, null, completeSpy);
+    obs.subscribe(nextSpy, () => {}, completeSpy);
     query.orderByKey.next(true);
     expect(nextSpy).toHaveBeenCalledWith({ orderByKey: true});
     nextSpy.calls.reset();
@@ -82,11 +82,11 @@ describe('observeQuery', () => {
       orderByKey: new Subject<boolean>()
     };
     let obs = observeQuery(query, false);
-    obs.subscribe(nextSpy, null, completeSpy);
+    obs.subscribe(nextSpy, () => {}, completeSpy);
     query.orderByKey.next(true);
     expect(nextSpy).toHaveBeenCalledWith({ orderByKey: true });
     nextSpy.calls.reset();
-    query.orderByKey.next(null);
+    query.orderByKey.next(null!);
     expect(nextSpy).toHaveBeenCalledWith({});
   });
 

src/database/query_observable.ts

@@ -11,7 +11,7 @@ import { hasKey, isNil } from '../utils';
 
 export function observeQuery(query: Query, audit: boolean = true): Observable<ScalarQuery> {
   if (isNil(query)) {
-    return observableOf(null);
+    return observableOf(null!);
   }
 
   return Observable.create((observer: Observer<ScalarQuery>) => {
@@ -93,7 +93,7 @@ export function getOrderObservables(query: Query): Observable<OrderBySelection>
     return merge.apply(observables[0], observables.slice(1));
   } else {
     return new Observable<OrderBySelection>(subscriber => {
-      subscriber.next(null);
+      subscriber.next(null!);
     });
   }
 }
@@ -111,7 +111,7 @@ export function getLimitToObservables(query: Query): Observable<LimitToSelection
     return mergedObs;
   } else {
     return new Observable<LimitToSelection>(subscriber => {
-      subscriber.next(null);
+      subscriber.next(null!);
     });
   }
 }

tsconfig.json

@@ -11,6 +11,7 @@
     "inlineSources": true,
     "declaration": true,
     "removeComments": true,
+    "strictNullChecks": true,
     "lib": [
       "es2015",
       "dom"

tsconfig.publish.es6.json

@@ -11,6 +11,7 @@
     "inlineSources": true,
     "declaration": true,
     "removeComments": true,
+    "strictNullChecks": true,
     "lib": [
       "es2015",
       "dom"