Address PR comments

Author: hsubox76

packages-exp/analytics-exp/src/api.test.ts

@@ -35,7 +35,7 @@ const fakeDynamicConfig = stub(
 });
 
 // Fake indexedDB.open() request
-let fakeRequest = {
+const fakeRequest = {
   onsuccess: () => {},
   result: {
     close: () => {}
@@ -46,13 +46,7 @@ let idbOpenStub = stub();
 // Stub indexedDB.open() because sinon's clock does not know
 // how to wait for the real indexedDB callbacks to resolve.
 function stubIdbOpen(): void {
-  (fakeRequest = {
-    onsuccess: () => {},
-    result: {
-      close: () => {}
-    }
-  }),
-    (idbOpenStub = stub(indexedDB, 'open').returns(fakeRequest as any));
+  idbOpenStub = stub(indexedDB, 'open').returns(fakeRequest as any);
 }
 
 describe('FirebaseAnalytics API tests', () => {
@@ -79,12 +73,6 @@ describe('FirebaseAnalytics API tests', () => {
     fakeDynamicConfig.restore();
   });
 
-  it('initializeAnalytics() returns an Analytics instance', async () => {
-    app = getFullApp(fakeAppParams);
-    const analyticsInstance = initializeAnalytics(app);
-    expect(analyticsInstance.app).to.equal(app);
-    await clock.runAllAsync();
-  });
   it('initializeAnalytics() with same (no) options returns same instance', async () => {
     app = getFullApp(fakeAppParams);
     const analyticsInstance = initializeAnalytics(app);

packages-exp/analytics-exp/src/api.ts

@@ -99,12 +99,7 @@ export function initializeAnalytics(
   );
   if (analyticsProvider.isInitialized()) {
     const existingInstance = analyticsProvider.getImmediate();
-    if (
-      deepEqual(
-        options.config || {},
-        (analyticsProvider.getOptions() as AnalyticsSettings)?.config || {}
-      )
-    ) {
+    if (deepEqual(options, analyticsProvider.getOptions())) {
       return existingInstance;
     } else {
       throw ERROR_FACTORY.create(AnalyticsError.ALREADY_INITIALIZED);

packages-exp/analytics-exp/src/errors.ts

@@ -36,7 +36,6 @@ const ERRORS: ErrorMap<AnalyticsError> = {
     ' already exists. ' +
     'Only one Firebase Analytics instance can be created for each appId.',
   [AnalyticsError.ALREADY_INITIALIZED]:
-    'Firebase Analytics has already been initialized with these options. ' +
     'initializeAnalytics() cannot be called again with different options than those ' +
     'it was initially called with. It can be called again with the same options to ' +
     'return the existing instance, or getAnalytics() can be used ' +

packages-exp/analytics-exp/src/index.test.ts

@@ -48,7 +48,7 @@ let clock: sinon.SinonFakeTimers;
 let fakeInstallations: _FirebaseInstallationsInternal;
 
 // Fake indexedDB.open() request
-let fakeRequest = {
+const fakeRequest = {
   onsuccess: () => {},
   result: {
     close: () => {}
@@ -67,13 +67,7 @@ function stubFetch(status: number, body: object): void {
 // Stub indexedDB.open() because sinon's clock does not know
 // how to wait for the real indexedDB callbacks to resolve.
 function stubIdbOpen(): void {
-  (fakeRequest = {
-    onsuccess: () => {},
-    result: {
-      close: () => {}
-    }
-  }),
-    (idbOpenStub = stub(indexedDB, 'open').returns(fakeRequest as any));
+    idbOpenStub = stub(indexedDB, 'open').returns(fakeRequest as any);
 }
 
 describe('FirebaseAnalytics instance tests', () => {

packages-exp/analytics-exp/src/index.ts

@@ -43,7 +43,7 @@ declare global {
   }
 }
 
-export function registerAnalytics(): void {
+function registerAnalytics(): void {
   _registerComponent(
     new Component(
       ANALYTICS_TYPE,

packages-exp/analytics-exp/testing/get-fake-firebase-services.ts

@@ -22,7 +22,7 @@ import {
 } from '@firebase/app-exp';
 import { Component, ComponentType } from '@firebase/component';
 import { _FirebaseInstallationsInternal } from '@firebase/installations-exp';
-import { registerAnalytics } from '../src';
+import { AnalyticsService } from '../src/factory';
 
 const fakeConfig = {
   projectId: 'projectId',
@@ -63,12 +63,20 @@ export function getFullApp(fakeAppParams?: {
   apiKey?: string;
   measurementId?: string;
 }): FirebaseApp {
-  registerAnalytics();
   _registerComponent(
     new Component(
       'installations-exp-internal',
       () => {
-        return getFakeInstallations();
+        return {} as _FirebaseInstallationsInternal;
+      },
+      ComponentType.PUBLIC
+    )
+  );
+  _registerComponent(
+    new Component(
+      'analytics-exp',
+      () => {
+        return {} as AnalyticsService;
       },
       ComponentType.PUBLIC
     )

packages-exp/app-check-exp/src/errors.ts

@@ -33,8 +33,8 @@ const ERRORS: ErrorMap<AppCheckError> = {
   [AppCheckError.ALREADY_INITIALIZED]:
     'You have already called initializeAppCheck() for FirebaseApp {$appName} with ' +
     'different options. To avoid this error, call initializeAppCheck() with the ' +
-    'same options as when it was originally called, or call getAppCheck() to return the' +
-    ' already initialized instance.',
+    'same options as when it was originally called. This will return the ' +
+    'already initialized instance.',
   [AppCheckError.USE_BEFORE_ACTIVATION]:
     'App Check is being used before initializeAppCheck() is called for FirebaseApp {$appName}. ' +
     'Call initializeAppCheck() before instantiating other Firebase services.',

packages/component/src/provider.ts

@@ -38,7 +38,7 @@ export class Provider<T extends Name> {
     string,
     Deferred<NameServiceMapping[T]>
   > = new Map();
-  private readonly instancesOptions: Map<string, InitializeOptions> = new Map();
+  private readonly instancesOptions: Map<string, Record<string, unknown>> = new Map();
   private onInitCallbacks: Map<string, Set<OnInitCallBack<T>>> = new Map();
 
   constructor(
@@ -219,7 +219,7 @@ export class Provider<T extends Name> {
     return this.instances.has(identifier);
   }
 
-  getOptions(identifier: string = DEFAULT_ENTRY_NAME): InitializeOptions {
+  getOptions(identifier: string = DEFAULT_ENTRY_NAME): Record<string, unknown> {
     return this.instancesOptions.get(identifier) || {};
   }