chore(lint): Clean the rest of database files

NothingEverHappens · NothingEverHappens · commit 1318921fa449 · 2020-04-28T19:09:19.000-04:00
diff --git a/src/database/database.spec.ts b/src/database/database.spec.ts
@@ -1,11 +1,10 @@
 import { AngularFireModule, FIREBASE_APP_NAME, FIREBASE_OPTIONS, FirebaseApp } from '@angular/fire';
 import { AngularFireDatabase, AngularFireDatabaseModule, URL } from './public_api';
-import { inject, TestBed } from '@angular/core/testing';
+import { TestBed } from '@angular/core/testing';
 import { COMMON_CONFIG } from '../test-config';
 import { NgZone } from '@angular/core';
 import 'firebase/database';
 import { rando } from '../firestore/utils.spec';
-import { Test } from 'tslint';
 
 describe('AngularFireDatabase', () => {
   let app: FirebaseApp;
@@ -21,7 +20,7 @@ describe('AngularFireDatabase', () => {
         AngularFireDatabaseModule
       ],
       providers: [
-        { provide: URL, useValue: 'http://localhost:9000'}
+        { provide: URL, useValue: 'http://localhost:9000' }
       ]
     });
 
@@ -80,10 +79,9 @@ describe('AngularFireDatabase w/options', () => {
         { provide: URL, useValue: url }
       ]
     });
-    inject([FirebaseApp, AngularFireDatabase], (app_: FirebaseApp, _db: AngularFireDatabase) => {
-      app = app_;
-      db = _db;
-    })();
+
+    app = TestBed.inject(FirebaseApp);
+    db = TestBed.inject(AngularFireDatabase);
   });
 
   afterEach(() => {
@@ -104,20 +102,20 @@ describe('AngularFireDatabase w/options', () => {
       expect(db.database.app.name).toEqual(firebaseAppName);
     });
 
-/* INVESTIGATE database(url) does not seem to be working
+    /* INVESTIGATE database(url) does not seem to be working
 
-    it('database be pointing to the provided DB instance', () => {
-      expect(db.database.ref().toString()).toEqual(url);
-    });
+        it('database be pointing to the provided DB instance', () => {
+          expect(db.database.ref().toString()).toEqual(url);
+        });
 
-    it('list should be using the provided DB instance', () => {
-      expect(db.list(query).query.toString()).toEqual(`${url}/${query}`);
-    });
+        it('list should be using the provided DB instance', () => {
+          expect(db.list(query).query.toString()).toEqual(`${url}/${query}`);
+        });
 
-    it('object should be using the provided DB instance', () => {
-      expect(db.object(query).query.toString()).toEqual(`${url}/${query}`);
-    });
-*/
+        it('object should be using the provided DB instance', () => {
+          expect(db.object(query).query.toString()).toEqual(`${url}/${query}`);
+        });
+    */
   });
 
 });
diff --git a/src/database/database.ts b/src/database/database.ts
@@ -21,8 +21,8 @@ export class AngularFireDatabase {
 
   constructor(
     @Inject(FIREBASE_OPTIONS) options: FirebaseOptions,
-    @Optional() @Inject(FIREBASE_APP_NAME) nameOrConfig: string|FirebaseAppConfig|null|undefined,
-    @Optional() @Inject(URL) databaseURL: string|null,
+    @Optional() @Inject(FIREBASE_APP_NAME) nameOrConfig: string | FirebaseAppConfig | null | undefined,
+    @Optional() @Inject(URL) databaseURL: string | null,
     // tslint:disable-next-line:ban-types
     @Inject(PLATFORM_ID) platformId: Object,
     zone: NgZone
@@ -45,7 +45,7 @@ export class AngularFireDatabase {
     return createListReference<T>(query, this);
   }
 
-  object<T>(pathOrRef: PathReference): AngularFireObject<T>  {
+  object<T>(pathOrRef: PathReference): AngularFireObject<T> {
     const ref = getRef(this.database, pathOrRef);
     return createObjectReference<T>(ref, this);
   }
diff --git a/src/database/object/create-reference.ts b/src/database/object/create-reference.ts
@@ -8,7 +8,7 @@ export function createObjectReference<T= any>(query: DatabaseQuery, afDatabase:
     query,
     snapshotChanges<T>() {
       return createObjectSnapshotChanges<T>(query, afDatabase.schedulers.outsideAngular)().pipe(
-        afDatabase.keepUnstableUntilFirst!
+        afDatabase.keepUnstableUntilFirst
       );
     },
     update(data: Partial<T>) { return query.ref.update(data as any) as Promise<void>; },
diff --git a/src/database/observable/fromRef.spec.ts b/src/database/observable/fromRef.spec.ts
@@ -1,7 +1,7 @@
 import { DatabaseReference } from '../interfaces';
 import { AngularFireModule, FirebaseApp, ɵZoneScheduler } from '@angular/fire';
 import { AngularFireDatabase, AngularFireDatabaseModule, fromRef } from '../public_api';
-import { inject, TestBed } from '@angular/core/testing';
+import { TestBed } from '@angular/core/testing';
 import { COMMON_CONFIG } from '../../test-config';
 import { take } from 'rxjs/operators';
 import { TestScheduler } from 'rxjs/testing';
@@ -13,7 +13,7 @@ describe('fromRef', () => {
   let ref: (path: string) => DatabaseReference;
   let batch = {};
   const items = [{ name: 'one' }, { name: 'two' }, { name: 'three' }].map(item => ({ key: rando(), ...item }));
-  Object.keys(items).forEach(function(key) {
+  Object.keys(items).forEach((key) => {
     const itemValue = items[key];
     batch[itemValue.key] = itemValue;
   });
@@ -27,14 +27,13 @@ describe('fromRef', () => {
         AngularFireDatabaseModule
       ],
       providers: [
-        { provide: URL, useValue: 'http://localhost:9000'}
+        { provide: URL, useValue: 'http://localhost:9000' }
       ]
     });
-    inject([FirebaseApp, AngularFireDatabase], (app_: FirebaseApp, db_: AngularFireDatabase) => {
-      app = app_;
-      db = db_;
-      ref = (path: string) => db.database.ref(path);
-    })();
+
+    app = TestBed.inject(FirebaseApp);
+    db = TestBed.inject(AngularFireDatabase);
+    ref = (path: string) => db.database.ref(path);
   });
 
   afterEach(() => {
@@ -47,7 +46,7 @@ describe('fromRef', () => {
     const obs = fromRef(itemRef, 'value');
     let count = 0;
     expect(count).toEqual(0);
-    const sub = obs.subscribe(change => {
+    const sub = obs.subscribe(() => {
       count = count + 1;
       expect(count).toEqual(1);
       sub.unsubscribe();
@@ -90,8 +89,8 @@ describe('fromRef', () => {
 
     // Error
     const errorObservable = fromRef({
-      once: (event, snap, err) => err()
-    } as any,
+        once: (event, snap, err) => err()
+      } as any,
       'value',
       'once',
       testScheduler
@@ -120,7 +119,8 @@ describe('fromRef', () => {
       scheduler
     );
     completeObservable.subscribe(
-      () => { },
+      () => {
+      },
       () => fail('Should not error'),
       () => expect(Zone.current.name).toEqual('ExpectedZone')
     );
@@ -133,7 +133,7 @@ describe('fromRef', () => {
     const itemRef = ref(rando());
     itemRef.set({});
     const obs = fromRef(itemRef, 'value');
-    const sub = obs.pipe(take(1)).subscribe(change => {
+    obs.pipe(take(1)).subscribe(change => {
       expect(change.payload.exists()).toEqual(false);
       expect(change.payload.val()).toEqual(null);
     }).add(done);
@@ -143,15 +143,17 @@ describe('fromRef', () => {
     const itemRef = ref(rando());
     itemRef.set(batch);
     const obs = fromRef(itemRef, 'value', 'once');
-    obs.subscribe(change => { }, () => { }, done);
+    obs.subscribe(() => {
+    }, () => {
+    }, done);
   });
 
   it('it should listen and then unsubscribe', (done) => {
     const itemRef = ref(rando());
     itemRef.set(batch);
     const obs = fromRef(itemRef, 'value');
     let count = 0;
-    const sub = obs.subscribe(change => {
+    const sub = obs.subscribe(() => {
       count = count + 1;
       // hard coding count to one will fail if the unsub
       // doesn't actually unsub
@@ -173,7 +175,7 @@ describe('fromRef', () => {
         count = count + 1;
         const { type, payload } = change;
         expect(type).toEqual('child_added');
-        expect(payload.val()).toEqual(batch[payload.key!]);
+        expect(payload.val()).toEqual(batch[payload.key]);
         if (count === items.length) {
           done();
           sub.unsubscribe();
@@ -230,7 +232,8 @@ describe('fromRef', () => {
         sub.unsubscribe();
         done();
       });
-      itemRef.child(key).setPriority(-100, () => { });
+      itemRef.child(key).setPriority(-100, () => {
+      });
     });
 
     it('should stream back a value event', (done: any) => {
@@ -252,9 +255,12 @@ describe('fromRef', () => {
       itemRef.set(batch);
       const query = itemRef.orderByChild('name').equalTo(items[0].name);
       const obs = fromRef(query, 'value');
-      const sub = obs.subscribe(change => {
-        let child;
-        change.payload.forEach(snap => { child = snap.val(); return true; });
+      obs.subscribe(change => {
+        let child = null;
+        change.payload.forEach(snap => {
+          child = snap.val();
+          return true;
+        });
         expect(child).toEqual(items[0]);
         done();
       });
diff --git a/src/database/observable/fromRef.ts b/src/database/observable/fromRef.ts
@@ -11,22 +11,28 @@ interface SnapshotPrevKey<T> {
  * Create an observable from a Database Reference or Database Query.
  * @param ref Database Reference
  * @param event Listen event type ('value', 'added', 'changed', 'removed', 'moved')
+ * @param listenType 'on' or 'once'
+ * @param scheduler - Rxjs scheduler
  */
-export function fromRef<T>(ref: DatabaseQuery, event: ListenEvent, listenType = 'on', scheduler: SchedulerLike = asyncScheduler): Observable<AngularFireAction<DatabaseSnapshot<T>>> {
+export function fromRef<T>(ref: DatabaseQuery,
+                           event: ListenEvent,
+                           listenType = 'on',
+                           scheduler: SchedulerLike = asyncScheduler
+): Observable<AngularFireAction<DatabaseSnapshot<T>>> {
   return new Observable<SnapshotPrevKey<T>>(subscriber => {
     let fn: any | null = null;
     fn = ref[listenType](event, (snapshot, prevKey) => {
       scheduler.schedule(() => {
         subscriber.next({ snapshot, prevKey });
       });
-      if (listenType == 'once') {
+      if (listenType === 'once') {
         scheduler.schedule(() => subscriber.complete());
       }
     }, err => {
       scheduler.schedule(() => subscriber.error(err));
     });
 
-    if (listenType == 'on') {
+    if (listenType === 'on') {
       return {
         unsubscribe() {
           if (fn != null) {
@@ -35,13 +41,18 @@ export function fromRef<T>(ref: DatabaseQuery, event: ListenEvent, listenType =
         }
       };
     } else {
-      return { unsubscribe() { } };
+      return {
+        unsubscribe() {
+        }
+      };
     }
   }).pipe(
     map(payload => {
       const { snapshot, prevKey } = payload;
       let key: string | null = null;
-      if (snapshot.exists()) { key = snapshot.key; }
+      if (snapshot.exists()) {
+        key = snapshot.key;
+      }
       return { type: event, payload: snapshot, prevKey, key };
     }),
     share()
