chore(lint): Clean up analytics

Author: NothingEverHappens

src/analytics/analytics.service.ts

@@ -85,7 +85,9 @@ export class ScreenTrackingService implements OnDestroy {
             return of({ ...params, [SCREEN_CLASS_KEY]: componentFactory.selector });
           } else if (loadChildren) {
             const loadedChildren = loadChildren();
-            const loadedChildren$: Observable<any> = (loadedChildren instanceof Observable) ? loadedChildren : from(Promise.resolve(loadedChildren));
+            const loadedChildren$: Observable<any> = (loadedChildren instanceof Observable) ?
+              loadedChildren :
+              from(Promise.resolve(loadedChildren));
             return loadedChildren$.pipe(
               map(lazyModule => {
                 if (lazyModule instanceof NgModuleFactory) {
@@ -95,7 +97,7 @@ export class ScreenTrackingService implements OnDestroy {
                   const routes = moduleRef.injector.get(ROUTES);
                   const component = routes[0][0].component; // should i just be grabbing 0-0 here?
                   try {
-                    const componentFactory = moduleRef.componentFactoryResolver.resolveComponentFactory(component!);
+                    const componentFactory = moduleRef.componentFactoryResolver.resolveComponentFactory(component);
                     return { ...params, [SCREEN_CLASS_KEY]: componentFactory.selector };
                   } catch (_) {
                     return { ...params, [SCREEN_CLASS_KEY]: DEFAULT_SCREEN_CLASS };
@@ -140,8 +142,9 @@ export class ScreenTrackingService implements OnDestroy {
           [FIREBASE_PREVIOUS_SCREEN_CLASS_KEY]: prior[SCREEN_CLASS_KEY],
           [FIREBASE_PREVIOUS_SCREEN_NAME_KEY]: prior[SCREEN_NAME_KEY],
           [FIREBASE_PREVIOUS_SCREEN_INSTANCE_ID_KEY]: prior[FIREBASE_SCREEN_INSTANCE_ID_KEY],
-          ...current!
-        } : current!),
+          ...current
+        } : current),
+        // tslint:disable-next-line:no-console
         tap(params => debugModeEnabled && console.info(SCREEN_VIEW_EVENT, params)),
         tap(params => zone.runOutsideAngular(() => analytics.logEvent(SCREEN_VIEW_EVENT, params)))
       ).subscribe();
@@ -167,6 +170,7 @@ export class UserTrackingService implements OnDestroy {
   constructor(
     analytics: AngularFireAnalytics,
     zone: NgZone,
+    // tslint:disable-next-line:ban-types
     @Inject(PLATFORM_ID) platformId: Object
   ) {
     const schedulers = new ɵAngularFireSchedulers(zone);
@@ -179,7 +183,7 @@ export class UserTrackingService implements OnDestroy {
           switchMap(() => analytics.app),
           map(app => app.auth()),
           switchMap(auth => new Observable<User | null>(auth.onAuthStateChanged.bind(auth))),
-          switchMap(user => analytics.setUserId(user ? user.uid : null!))
+          switchMap(user => analytics.setUserId(user ? user.uid : null))
         ).subscribe();
       });
     }

src/analytics/analytics.spec.ts

@@ -1,4 +1,4 @@
-import { inject, TestBed } from '@angular/core/testing';
+import { TestBed } from '@angular/core/testing';
 import { AngularFireModule, FirebaseApp } from '@angular/fire';
 import { AngularFireAnalytics, AngularFireAnalyticsModule } from './public_api';
 import { COMMON_CONFIG } from '../test-config';
@@ -16,10 +16,9 @@ describe('AngularFireAnalytics', () => {
         AngularFireAnalyticsModule
       ]
     });
-    inject([FirebaseApp, AngularFireAnalytics], (app_: FirebaseApp, _analytics: AngularFireAnalytics) => {
-      app = app_;
-      analytics = _analytics;
-    })();
+
+    app = TestBed.inject(FirebaseApp);
+    analytics = TestBed.inject(AngularFireAnalytics);
   });
 
   afterEach(() => {

src/analytics/analytics.ts

@@ -5,7 +5,9 @@ import { map, observeOn, shareReplay, switchMap, tap } from 'rxjs/operators';
 import { FIREBASE_APP_NAME, FIREBASE_OPTIONS, FirebaseAppConfig, FirebaseOptions, ɵAngularFireSchedulers, ɵfirebaseAppFactory, ɵlazySDKProxy, ɵPromiseProxy } from '@angular/fire';
 import { analytics } from 'firebase';
 
-export interface Config {[key: string]: any; }
+export interface Config {
+  [key: string]: any;
+}
 
 export const COLLECTION_ENABLED = new InjectionToken<boolean>('angularfire2.analytics.analyticsCollectionEnabled');
 export const APP_VERSION = new InjectionToken<string>('angularfire2.analytics.appVersion');
@@ -21,11 +23,12 @@ const GTAG_CONFIG_COMMAND = 'config';
 const GTAG_FUNCTION_NAME = 'gtag';
 const DATA_LAYER_NAME = 'dataLayer';
 
-export interface AngularFireAnalytics extends ɵPromiseProxy<analytics.Analytics> {}
+export interface AngularFireAnalytics extends ɵPromiseProxy<analytics.Analytics> {
+}
 
 let gtag: (...args: any[]) => void;
 let analyticsInitialized: Promise<void>;
-const analyticsInstanceCache: {[key: string]: Observable<analytics.Analytics>} = {};
+const analyticsInstanceCache: { [key: string]: Observable<analytics.Analytics> } = {};
 
 @Injectable({
   providedIn: 'any'
@@ -39,30 +42,36 @@ export class AngularFireAnalytics {
 
   constructor(
     @Inject(FIREBASE_OPTIONS) private options: FirebaseOptions,
-    @Optional() @Inject(FIREBASE_APP_NAME) nameOrConfig: string|FirebaseAppConfig|null|undefined,
-    @Optional() @Inject(COLLECTION_ENABLED) analyticsCollectionEnabled: boolean|null,
-    @Optional() @Inject(APP_VERSION) providedAppVersion: string|null,
-    @Optional() @Inject(APP_NAME) providedAppName: string|null,
-    @Optional() @Inject(DEBUG_MODE) debugModeEnabled: boolean|null,
-    @Optional() @Inject(CONFIG) providedConfig: Config|null,
+    @Optional() @Inject(FIREBASE_APP_NAME) nameOrConfig: string | FirebaseAppConfig | null | undefined,
+    @Optional() @Inject(COLLECTION_ENABLED) analyticsCollectionEnabled: boolean | null,
+    @Optional() @Inject(APP_VERSION) providedAppVersion: string | null,
+    @Optional() @Inject(APP_NAME) providedAppName: string | null,
+    @Optional() @Inject(DEBUG_MODE) debugModeEnabled: boolean | null,
+    @Optional() @Inject(CONFIG) providedConfig: Config | null,
+    // tslint:disable-next-line:ban-types
     @Inject(PLATFORM_ID) platformId: Object,
     zone: NgZone
   ) {
 
     if (!analyticsInitialized) {
       if (isPlatformBrowser(platformId)) {
-        gtag = window[GTAG_FUNCTION_NAME] || function() { window[DATA_LAYER_NAME].push(arguments); };
+        gtag = window[GTAG_FUNCTION_NAME] || (() => {
+          window[DATA_LAYER_NAME].push(arguments);
+        });
         window[DATA_LAYER_NAME] = window[DATA_LAYER_NAME] || [];
         analyticsInitialized = zone.runOutsideAngular(() =>
           new Promise(resolve => {
             window[GTAG_FUNCTION_NAME] = (...args: any[]) => {
-              if (args[0] == 'js') { resolve(); }
+              if (args[0] === 'js') {
+                resolve();
+              }
               gtag(...args);
             };
           })
         );
       } else {
-        gtag = () => {};
+        gtag = () => {
+        };
         analyticsInitialized = Promise.resolve();
       }
     }
@@ -75,17 +84,27 @@ export class AngularFireAnalytics {
         map(() => ɵfirebaseAppFactory(options, zone, nameOrConfig)),
         map(app => app.analytics()),
         tap(analytics => {
-          if (analyticsCollectionEnabled === false) { analytics.setAnalyticsCollectionEnabled(false); }
+          if (analyticsCollectionEnabled === false) {
+            analytics.setAnalyticsCollectionEnabled(false);
+          }
         }),
-        shareReplay({ bufferSize: 1, refCount: false }),
+        shareReplay({ bufferSize: 1, refCount: false })
       );
       analyticsInstanceCache[options[ANALYTICS_ID_FIELD]] = analytics;
     }
 
-    if (providedConfig)     { this.updateConfig(providedConfig); }
-    if (providedAppName)    { this.updateConfig({ [APP_NAME_KEY]:    providedAppName }); }
-    if (providedAppVersion) { this.updateConfig({ [APP_VERSION_KEY]: providedAppVersion }); }
-    if (debugModeEnabled)   { this.updateConfig({ [DEBUG_MODE_KEY]:  1 }); }
+    if (providedConfig) {
+      this.updateConfig(providedConfig);
+    }
+    if (providedAppName) {
+      this.updateConfig({ [APP_NAME_KEY]: providedAppName });
+    }
+    if (providedAppVersion) {
+      this.updateConfig({ [APP_VERSION_KEY]: providedAppVersion });
+    }
+    if (debugModeEnabled) {
+      this.updateConfig({ [DEBUG_MODE_KEY]: 1 });
+    }
 
     return ɵlazySDKProxy(this, analytics, zone);