Merge 5ed48fa into 9fb82cb

Author: ehsannas

packages/firestore/src/local/document_overlay_cache.ts

@@ -15,9 +15,12 @@
  * limitations under the License.
  */
 
-import { DocumentKeySet } from '../model/collections';
+import {
+  DocumentKeySet,
+  DocumentKeyToMutationMap,
+  DocumentKeyToOverlayMap
+} from '../model/collections';
 import { DocumentKey } from '../model/document_key';
-import { Mutation } from '../model/mutation';
 import { Overlay } from '../model/overlay';
 import { ResourcePath } from '../model/path';
 
@@ -51,7 +54,7 @@ export interface DocumentOverlayCache {
   saveOverlays(
     transaction: PersistenceTransaction,
     largestBatchId: number,
-    overlays: Map<DocumentKey, Mutation>
+    overlays: DocumentKeyToMutationMap
   ): PersistencePromise<void>;
 
   /** Removes overlays for the given document keys and batch ID. */
@@ -74,7 +77,7 @@ export interface DocumentOverlayCache {
     transaction: PersistenceTransaction,
     collection: ResourcePath,
     sinceBatchId: number
-  ): PersistencePromise<Map<DocumentKey, Overlay>>;
+  ): PersistencePromise<DocumentKeyToOverlayMap>;
 
   /**
    * Returns `count` overlays with a batch ID higher than `sinceBatchId` for the
@@ -95,5 +98,5 @@ export interface DocumentOverlayCache {
     collectionGroup: string,
     sinceBatchId: number,
     count: number
-  ): PersistencePromise<Map<DocumentKey, Overlay>>;
+  ): PersistencePromise<DocumentKeyToOverlayMap>;
 }

packages/firestore/src/local/indexeddb_document_overlay_cache.ts

@@ -16,9 +16,13 @@
  */
 
 import { User } from '../auth/user';
-import { DocumentKeySet } from '../model/collections';
+import {
+  DocumentKeySet,
+  DocumentKeyToMutationMap,
+  DocumentKeyToOverlayMap,
+  newDocumentKeyToOverlayMap
+} from '../model/collections';
 import { DocumentKey } from '../model/document_key';
-import { Mutation } from '../model/mutation';
 import { Overlay } from '../model/overlay';
 import { ResourcePath } from '../model/path';
 
@@ -74,10 +78,10 @@ export class IndexedDbDocumentOverlayCache implements DocumentOverlayCache {
   saveOverlays(
     transaction: PersistenceTransaction,
     largestBatchId: number,
-    overlays: Map<DocumentKey, Mutation>
+    overlays: DocumentKeyToMutationMap
   ): PersistencePromise<void> {
     const promises: Array<PersistencePromise<void>> = [];
-    overlays.forEach(mutation => {
+    overlays.forEach((_, mutation) => {
       const overlay = new Overlay(largestBatchId, mutation);
       promises.push(this.saveOverlay(transaction, overlay));
     });
@@ -118,8 +122,8 @@ export class IndexedDbDocumentOverlayCache implements DocumentOverlayCache {
     transaction: PersistenceTransaction,
     collection: ResourcePath,
     sinceBatchId: number
-  ): PersistencePromise<Map<DocumentKey, Overlay>> {
-    const result = new Map<DocumentKey, Overlay>();
+  ): PersistencePromise<DocumentKeyToOverlayMap> {
+    const result = newDocumentKeyToOverlayMap();
     const collectionPath = encodeResourcePath(collection);
     // We want batch IDs larger than `sinceBatchId`, and so the lower bound
     // is not inclusive.
@@ -144,8 +148,8 @@ export class IndexedDbDocumentOverlayCache implements DocumentOverlayCache {
     collectionGroup: string,
     sinceBatchId: number,
     count: number
-  ): PersistencePromise<Map<DocumentKey, Overlay>> {
-    const result = new Map<DocumentKey, Overlay>();
+  ): PersistencePromise<DocumentKeyToOverlayMap> {
+    const result = newDocumentKeyToOverlayMap();
     let currentBatchId: number | undefined = undefined;
     // We want batch IDs larger than `sinceBatchId`, and so the lower bound
     // is not inclusive.
@@ -167,7 +171,7 @@ export class IndexedDbDocumentOverlayCache implements DocumentOverlayCache {
           // `count` if there are more overlays from the `currentBatchId`.
           const overlay = fromDbDocumentOverlay(this.serializer, dbOverlay);
           if (
-            result.size < count ||
+            result.size() < count ||
             overlay.largestBatchId === currentBatchId
           ) {
             result.set(overlay.getKey(), overlay);