Finish fixing strictNullCheck errors

Author: hsubox76

packages/rxfire/database/list/index.ts

@@ -42,11 +42,11 @@ export function list(
   query: database.Query,
   events?: ListenEvent[]
 ): Observable<QueryChange[]> {
-  events = validateEventsArray(events);
+  const eventsToList = validateEventsArray(events);
   return fromOnce(query).pipe(
     switchMap(change => {
       const childEvent$ = [of(change)];
-      events.forEach(event => childEvent$.push(fromRef(query, event)));
+      eventsToList.forEach(event => childEvent$.push(fromRef(query, event)));
       return merge(...childEvent$).pipe(scan(buildView, []));
     }),
     distinctUntilChanged()
@@ -94,11 +94,11 @@ function buildView(current: QueryChange[], change: QueryChange) {
   const { snapshot, prevKey, event } = change;
   const { key } = snapshot;
   const currentKeyPosition = positionFor(current, key);
-  const afterPreviousKeyPosition = positionAfter(current, prevKey);
+  const afterPreviousKeyPosition = positionAfter(current, prevKey || undefined);
   switch (event) {
     case ListenEvent.value:
       if (change.snapshot && change.snapshot.exists()) {
-        let prevKey = null;
+        let prevKey: string | null = null;
         change.snapshot.forEach(snapshot => {
           const action: QueryChange = {
             snapshot,

packages/rxfire/database/utils.ts

@@ -26,14 +26,15 @@ export function isNil(obj: any): boolean {
  * that is populated with all the Realtime Database child events.
  * @param events
  */
-export function validateEventsArray(events?: ListenEvent[]) {
+export function validateEventsArray(events?: ListenEvent[]): ListenEvent[] {
+  let validatedEvents: ListenEvent[] = [];
   if (isNil(events) || events!.length === 0) {
-    events = [
+    validatedEvents = [
       ListenEvent.added,
       ListenEvent.removed,
       ListenEvent.changed,
       ListenEvent.moved
     ];
   }
-  return events;
+  return validatedEvents;
 }

packages/rxfire/firestore/collection/index.ts

@@ -37,7 +37,7 @@ const filterEvents = (events?: firestore.DocumentChangeType[]) =>
     let hasChange = false;
     for (let i = 0; i < changes.length; i++) {
       const change = changes[i];
-      if (events.indexOf(change.type) >= 0) {
+      if (events && events.indexOf(change.type) >= 0) {
         hasChange = true;
         break;
       }

packages/rxfire/firestore/document/index.ts

@@ -36,7 +36,7 @@ export function docData<T>(
 }
 
 export function snapToData(
-  snapshot: firestore.QueryDocumentSnapshot,
+  snapshot: firestore.DocumentSnapshot,
   idField?: string
 ) {
   return {

packages/testing/src/api/index.ts

@@ -93,7 +93,7 @@ export type AppOptions = {
 /** Construct an App authenticated with options.auth. */
 export function initializeTestApp(options: AppOptions): firebase.app.App {
   return initializeApp(
-    options.auth ? createUnsecuredJwt(options.auth) : null,
+    options.auth ? createUnsecuredJwt(options.auth) : undefined,
     options.databaseName,
     options.projectId
   );