use provider.initialize in firestore

Author: Feiyang1

packages/firestore/exp/register.ts

@@ -20,6 +20,7 @@ import { Component, ComponentType } from '@firebase/component';
 
 import { version } from '../package.json';
 import { FirebaseFirestore } from '../src/exp/database';
+import { Settings } from '../src/exp/settings';
 
 declare module '@firebase/component' {
   interface NameServiceMapping {
@@ -31,12 +32,16 @@ export function registerFirestore(): void {
   _registerComponent(
     new Component(
       'firestore-exp',
-      container => {
+      (container, { options: settings }: { options?: Settings }) => {
         const app = container.getProvider('app-exp').getImmediate()!;
-        return ((app, auth) => new FirebaseFirestore(app, auth))(
+        const firestoreInstance = new FirebaseFirestore(
           app,
           container.getProvider('auth-internal')
         );
+        if (settings) {
+          firestoreInstance._setSettings(settings);
+        }
+        return firestoreInstance;
       },
       ComponentType.PUBLIC
     )

packages/firestore/lite/register.ts

@@ -20,6 +20,7 @@ import { Component, ComponentType } from '@firebase/component';
 
 import { version } from '../package.json';
 import { FirebaseFirestore } from '../src/lite/database';
+import { Settings } from '../src/lite/settings';
 
 declare module '@firebase/component' {
   interface NameServiceMapping {
@@ -31,12 +32,16 @@ export function registerFirestore(): void {
   _registerComponent(
     new Component(
       'firestore/lite',
-      container => {
+      (container, { options: settings }: { options?: Settings }) => {
         const app = container.getProvider('app-exp').getImmediate()!;
-        return ((app, auth) => new FirebaseFirestore(app, auth))(
+        const firestoreInstance = new FirebaseFirestore(
           app,
           container.getProvider('auth-internal')
         );
+        if (settings) {
+          firestoreInstance._setSettings(settings);
+        }
+        return firestoreInstance;
       },
       ComponentType.PUBLIC
     )

packages/firestore/src/exp/database.ts

@@ -128,10 +128,6 @@ export function initializeFirestore(
     );
   }
 
-  /**
-   * create a firestore instance with the default settings
-   */
-  const firestore = provider.getImmediate() as FirebaseFirestore;
   if (
     settings.cacheSizeBytes !== undefined &&
     settings.cacheSizeBytes !== CACHE_SIZE_UNLIMITED &&
@@ -143,11 +139,7 @@ export function initializeFirestore(
     );
   }
 
-  /**
-   * update settings with the user supplied values on the firestore instance
-   */
-  firestore._setSettings(settings);
-  return firestore;
+  return provider.initialize({ options: settings });
 }
 
 /**

packages/firestore/src/lite/database.ts

@@ -193,9 +193,7 @@ export function initializeFirestore(
     );
   }
 
-  const firestore = provider.getImmediate() as FirebaseFirestore;
-  firestore._setSettings(settings);
-  return firestore;
+  return provider.initialize({ options: settings });
 }
 
 /**