Undo some of the cleanup

Author: schmidt-sebastian

packages/firestore/src/core/component_provider.ts

@@ -180,8 +180,6 @@ export class MemoryComponentProvider implements ComponentProvider {
  * Provides all components needed for Firestore with IndexedDB persistence.
  */
 export class IndexedDbComponentProvider extends MemoryComponentProvider {
-  persistence!: IndexedDbPersistence;
-
   // TODO(tree-shaking): Create an IndexedDbComponentProvider and a
   // MultiTabComponentProvider. The IndexedDbComponentProvider should depend
   // on LocalStore and SyncEngine.
@@ -191,6 +189,11 @@ export class IndexedDbComponentProvider extends MemoryComponentProvider {
   async initialize(cfg: ComponentConfiguration): Promise<void> {
     await super.initialize(cfg);
 
+    debugAssert(
+      this.persistence instanceof IndexedDbPersistence,
+      'IndexedDbComponentProvider should provide IndexedDBPersistence'
+    );
+
     // NOTE: This will immediately call the listener, so we make sure to
     // set it after localStore / remoteStore are started.
     await this.persistence.setPrimaryStateListener(async isPrimary => {
@@ -208,6 +211,10 @@ export class IndexedDbComponentProvider extends MemoryComponentProvider {
   }
 
   createLocalStore(cfg: ComponentConfiguration): LocalStore {
+    debugAssert(
+      this.persistence instanceof IndexedDbPersistence,
+      'IndexedDbComponentProvider should provide IndexedDBPersistence'
+    );
     return new MultiTabLocalStore(
       this.persistence,
       new IndexFreeQueryEngine(),
@@ -232,6 +239,10 @@ export class IndexedDbComponentProvider extends MemoryComponentProvider {
   createGarbageCollectionScheduler(
     cfg: ComponentConfiguration
   ): GarbageCollectionScheduler | null {
+    debugAssert(
+      this.persistence instanceof IndexedDbPersistence,
+      'IndexedDbComponentProvider should provide IndexedDBPersistence'
+    );
     const garbageCollector = this.persistence.referenceDelegate
       .garbageCollector;
     return new LruScheduler(garbageCollector, cfg.asyncQueue);

packages/firestore/test/unit/specs/spec_test_components.ts

@@ -34,6 +34,7 @@ import { MutationQueue } from '../../../src/local/mutation_queue';
 import { TargetCache } from '../../../src/local/target_cache';
 import { RemoteDocumentCache } from '../../../src/local/remote_document_cache';
 import { IndexManager } from '../../../src/local/index_manager';
+import { IndexedDbPersistence } from '../../../src/local/indexeddb_persistence';
 import { PersistencePromise } from '../../../src/local/persistence_promise';
 import { debugAssert } from '../../../src/util/assert';
 import {
@@ -69,23 +70,17 @@ export class MockPersistence implements Persistence {
     return this.delegate.shutdown();
   }
 
-  setPrimaryStateListener(
-    primaryStateListener: PrimaryStateListener
-  ): Promise<void> {
-    return this.delegate.setPrimaryStateListener(primaryStateListener);
-  }
-
   setDatabaseDeletedListener(
     databaseDeletedListener: () => Promise<void>
   ): void {
     this.delegate.setDatabaseDeletedListener(databaseDeletedListener);
   }
 
-  setNetworkEnabled(networkEnabled: boolean): void {
-    this.delegate.setNetworkEnabled(networkEnabled);
-  }
-
   getActiveClients(): Promise<ClientId[]> {
+    debugAssert(
+      this.delegate instanceof IndexedDbPersistence,
+      `getActiveClients() requires IndexedDbPersistence`
+    );
     return this.delegate.getActiveClients();
   }
 
@@ -153,7 +148,6 @@ export class MockMemoryComponentProvider extends MemoryComponentProvider {
       'Can only start memory persistence'
     );
     const persistence = new MemoryPersistence(
-      cfg.clientId,
       this.gcEnabled
         ? MemoryEagerDelegate.factory
         : p => new MemoryLruDelegate(p, LruParams.DEFAULT)