Lint/Prettier

Author: schmidt-sebastian

packages/firestore/src/local/indexeddb_schema.ts

@@ -134,40 +134,35 @@ export class SchemaConverter implements SimpleDbSchemaConverter {
 
     const indexedDbTransaction = new IndexedDbTransaction(txn);
     return queuesStore.loadAll().next(queues => {
-      let p = PersistencePromise.resolve();
-      for (const queue of queues) {
-        p = p.next(() => {
-          const mutationQueue = new IndexedDbMutationQueue(
-            queue.userId,
-            this.serializer
+      return PersistencePromise.forEach(queues, queue => {
+        const mutationQueue = new IndexedDbMutationQueue(
+          queue.userId,
+          this.serializer
+        );
+        const range = IDBKeyRange.bound(
+          [queue.userId, BATCHID_UNKNOWN],
+          [queue.userId, queue.lastAcknowledgedBatchId]
+        );
+
+        return mutationsStore
+          .loadAll(DbMutationBatch.userMutationsIndex, range)
+          .next(dbBatches => {
+            return PersistencePromise.forEach(dbBatches, dbBatch => {
+              assert(
+                dbBatch.userId === queue.userId,
+                `Cannot process batch ${dbBatch.batchId} from unexpected user`
+              );
+              const batch = this.serializer.fromDbMutationBatch(dbBatch);
+              return mutationQueue.removeMutationBatch(
+                indexedDbTransaction,
+                batch
+              );
+            });
+          })
+          .next(() =>
+            mutationQueue.performConsistencyCheck(indexedDbTransaction)
           );
-          const range = IDBKeyRange.bound(
-            [queue.userId, BATCHID_UNKNOWN],
-            [queue.userId, queue.lastAcknowledgedBatchId]
-          );
-
-          return mutationsStore
-            .loadAll(DbMutationBatch.userMutationsIndex, range)
-            .next(dbBatches => {
-              let removeP = PersistencePromise.resolve();
-              for (const dbBatch of dbBatches) {
-                assert(
-                  dbBatch.userId === queue.userId,
-                  `Cannot process batch ${dbBatch.batchId} from unexpected user`
-                );
-                const batch = this.serializer.fromDbMutationBatch(dbBatch);
-                removeP = removeP.next(() =>
-                  mutationQueue.removeMutationBatch(indexedDbTransaction, batch)
-                );
-              }
-              return removeP;
-            })
-            .next(() =>
-              mutationQueue.performConsistencyCheck(indexedDbTransaction)
-            );
-        });
-      }
-      return p;
+      });
     });
   }
 }

packages/firestore/src/local/simple_db.ts

@@ -22,7 +22,6 @@ import { SCHEMA_VERSION } from './indexeddb_schema';
 import { AnyJs } from '../util/misc';
 import { Deferred } from '../util/promise';
 import { Code, FirestoreError } from '../util/error';
-import { DatabaseId } from '../core/database_info';
 
 const LOG_TAG = 'SimpleDb';
 

packages/firestore/test/unit/local/encoded_resource_path.test.ts

@@ -25,7 +25,6 @@ import {
 } from '../../../src/local/simple_db';
 import { ResourcePath } from '../../../src/model/path';
 import { path } from '../../util/helpers';
-import { INDEXEDDB_TEST_DATABASE_ID } from './persistence_test_helpers';
 
 let db: SimpleDb;
 const sep = '\u0001\u0001';

packages/firestore/test/unit/local/simple_db.test.ts

@@ -28,7 +28,6 @@ import {
   SimpleDbStore,
   SimpleDbTransaction
 } from '../../../src/local/simple_db';
-import { DatabaseId } from '../../../src/core/database_info';
 
 chai.use(chaiAsPromised);