Prettier

Author: schmidt-sebastian

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

@@ -79,11 +79,11 @@ export function getDatastore(firestore: Firestore): Datastore {
  * 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 datastorePromise = await datastoreInstances.get(firestore);
-  if (datastorePromise) {
+export function removeComponents(firestore: Firestore): void {
+  const datastore = datastoreInstances.get(firestore);
+  if (datastore) {
     logDebug(LOG_TAG, 'Removing Datastore');
     datastoreInstances.delete(firestore);
-    return (await datastorePromise).terminate();
+    datastore.terminate();
   }
 }

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

@@ -110,7 +110,8 @@ export class Firestore
    * Only ever called once.
    */
   protected _terminate(): Promise<void> {
-    return removeComponents(this);
+    removeComponents(this);
+    return Promise.resolve();
   }
 
   // TODO(firestoreexp): `deleteApp()` should call the delete method above,

packages/firestore/src/platform/node_lite/connection.ts

@@ -25,7 +25,7 @@ export { newConnectivityMonitor } from '../browser/connection';
 
 /** Initializes the HTTP connection for the REST API. */
 export function newConnection(databaseInfo: DatabaseInfo): Connection {
-  // node-fetch is meant to be API compatible with `fetch`, but its type don't
+  // node-fetch is meant to be API compatible with `fetch`, but its type doesn't
   // match 100%.
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   return new FetchConnection(databaseInfo, nodeFetch as any);

packages/firestore/src/remote/datastore.ts

@@ -47,7 +47,7 @@ import { Query, queryToTarget } from '../core/query';
  * for the rest of the client SDK architecture to consume.
  */
 export abstract class Datastore {
-  abstract terminate(): Promise<void>;
+  abstract terminate(): void;
 }
 
 /**
@@ -125,7 +125,7 @@ class DatastoreImpl extends Datastore {
       });
   }
 
-  async terminate(): Promise<void> {
+  terminate(): void {
     this.terminated = false;
   }
 }

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

@@ -124,7 +124,7 @@ export class MockOnlineComponentProvider extends OnlineComponentProvider {
   constructor(private readonly connection: MockConnection) {
     super();
   }
-  
+
   createDatastore(cfg: ComponentConfiguration): Datastore {
     const serializer = new JsonProtoSerializer(
       cfg.databaseInfo.databaseId,

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

@@ -258,8 +258,10 @@ abstract class TestRunner {
     };
 
     this.connection = new MockConnection(this.queue);
-    
-    const onlineComponentProvider = new MockOnlineComponentProvider(this.connection);
+
+    const onlineComponentProvider = new MockOnlineComponentProvider(
+      this.connection
+    );
     const offlineComponentProvider = await this.initializeOfflineComponentProvider(
       onlineComponentProvider,
       configuration,