Use generic removeComponents

Author: schmidt-sebastian

packages/firestore/exp/src/api/components.ts

@@ -124,3 +124,15 @@ export async function removeFirestoreClient(
     );
   }
 }
+
+/**
+ * Removes all components associated with the provided instance. Must be called
+ * when the Firestore instance is terminated.
+ */
+export async function removeComponents(firestore: Firestore): Promise<void> {
+  const firestoreClientPromise = firestoreClientInstances.get(firestore);
+  if (firestoreClientPromise) {
+    firestoreClientInstances.delete(firestore);
+    return (await firestoreClientPromise).terminate();
+  }
+}

packages/firestore/exp/src/api/database.ts

@@ -41,7 +41,7 @@ import {
 import {
   getFirestoreClient,
   initializeFirestoreClient,
-  removeFirestoreClient
+  removeComponents
 } from './components';
 
 /**
@@ -71,7 +71,7 @@ export class Firestore extends LiteFirestore
 
   async _terminate(): Promise<void> {
     await super._terminate();
-    await removeFirestoreClient(this);
+    await removeComponents(this);
   }
 }
 

packages/firestore/lite/src/api/components.ts

@@ -15,11 +15,7 @@
  * limitations under the License.
  */
 
-import {
-  Datastore,
-  newDatastore,
-  terminateDatastore
-} from '../../../src/remote/datastore';
+import { Datastore, newDatastore } from '../../../src/remote/datastore';
 import { newConnection } from '../../../src/platform/connection';
 import { newSerializer } from '../../../src/platform/serializer';
 import { Firestore } from './database';
@@ -66,13 +62,13 @@ export function getDatastore(firestore: Firestore): Promise<Datastore> {
 }
 
 /**
- * Removes and terminates the Datastore for the given instance if it has
- * been started.
+ * Removes all components associated with the provided instance. Must be called
+ * when the Firestore instance is terminated.
  */
-export async function removeDatastore(firestore: Firestore): Promise<void> {
-  const datastore = await datastoreInstances.get(firestore);
-  if (datastore) {
+export async function removeComponents(firestore: Firestore): Promise<void> {
+  const datastorePromise = await datastoreInstances.get(firestore);
+  if (datastorePromise) {
     datastoreInstances.delete(firestore);
-    return terminateDatastore(datastore);
+    return (await datastorePromise).termiate();
   }
 }

packages/firestore/lite/src/api/database.ts

@@ -29,7 +29,7 @@ import {
   FirebaseCredentialsProvider
 } from '../../../src/api/credentials';
 import { cast } from './util';
-import { removeDatastore } from './components';
+import { removeComponents } from './components';
 import { debugAssert } from '../../../src/util/assert';
 
 /**
@@ -112,7 +112,7 @@ export class Firestore
    */
   protected _terminate(): Promise<void> {
     debugAssert(!this._terminated, 'Cannot invoke _terminate() more than once');
-    return removeDatastore(this);
+    return removeComponents(this);
   }
 
   // TODO(firestoreexp): `deleteApp()` should call the delete method above,

packages/firestore/src/remote/datastore.ts

@@ -48,6 +48,7 @@ import { Query } from '../core/query';
  */
 export abstract class Datastore {
   abstract start(connection: Connection): void;
+  abstract termiate(): Promise<void>;
 }
 
 /**
@@ -118,6 +119,10 @@ class DatastoreImpl extends Datastore {
         throw error;
       });
   }
+
+  async termiate(): Promise<void> {
+    this.terminated = false;
+  }
 }
 
 // TODO(firestorexp): Make sure there is only one Datastore instance per
@@ -230,8 +235,3 @@ export function newPersistentWatchStream(
     listener
   );
 }
-
-export function terminateDatastore(datastore: Datastore): void {
-  const datastoreImpl = debugCast(datastore, DatastoreImpl);
-  datastoreImpl.terminated = true;
-}