Simplify

Author: schmidt-sebastian

packages/firestore/src/local/indexeddb_mutation_batch_impl.ts

@@ -79,7 +79,9 @@ export function removeMutationBatch(
 /**
  * Returns an approximate size for the given document.
  */
-export function dbDocumentSize(doc: DbRemoteDocument): number {
+export function dbDocumentSize(doc: DbRemoteDocument | null): number {
+  if (!doc) return 0;
+
   let value: unknown;
   if (doc.document) {
     value = doc.document;

packages/firestore/src/local/indexeddb_remote_document_cache.ts

@@ -148,7 +148,7 @@ class IndexedDbRemoteDocumentCacheImpl implements IndexedDbRemoteDocumentCache {
         const doc = this.maybeDecodeDocument(documentKey, dbRemoteDoc);
         return {
           document: doc,
-          size: dbRemoteDoc ? dbDocumentSize(dbRemoteDoc) : 0
+          size: dbDocumentSize(dbRemoteDoc)
         };
       });
   }
@@ -187,16 +187,8 @@ class IndexedDbRemoteDocumentCacheImpl implements IndexedDbRemoteDocumentCache {
       documentKeys,
       (key, dbRemoteDoc) => {
         const doc = this.maybeDecodeDocument(key, dbRemoteDoc);
-        if (doc.isValidDocument()) {
-          results = results.insert(key, doc);
-          sizeMap = sizeMap.insert(key, dbDocumentSize(dbRemoteDoc!));
-        } else {
-          results = results.insert(
-            key,
-            MutableDocument.newInvalidDocument(key)
-          );
-          sizeMap = sizeMap.insert(key, 0);
-        }
+        results = results.insert(key, doc);
+        sizeMap = sizeMap.insert(key, dbDocumentSize(dbRemoteDoc));
       }
     ).next(() => {
       return { documents: results, sizeMap };

packages/firestore/src/model/mutation.ts

@@ -188,7 +188,7 @@ export function preconditionIsValidForDocument(
  * PatchMutation      InvalidDocument(v0)   UnknownDocument(v3)
  * DeleteMutation     Document(v3)          NoDocument(v0)
  * DeleteMutation     NoDocument(v3)        NoDocument(v0)
- * DeleteMutation     InvalidDocument(v0)  NoDocument(v0)
+ * DeleteMutation     InvalidDocument(v0)   NoDocument(v0)
  *
  * For acknowledged mutations, we use the updateTime of the WriteResponse as
  * the resulting version for Set and Patch mutations. As deletes have no

packages/firestore/src/model/object_value.ts

@@ -16,7 +16,6 @@
  */
 
 import {
-  MapValue,
   MapValue as ProtoMapValue,
   Value as ProtoValue
 } from '../protos/firestore_proto_api';
@@ -82,8 +81,8 @@ export class ObjectValue {
   }
 
   /** Returns the full protobuf representation. */
-  toProto(): { mapValue: MapValue } {
-    return this.field(FieldPath.emptyPath()) as { mapValue: MapValue };
+  toProto(): { mapValue: ProtoMapValue } {
+    return this.field(FieldPath.emptyPath()) as { mapValue: ProtoMapValue };
   }
 
   /**

packages/firestore/src/remote/serializer.ts

@@ -410,7 +410,7 @@ export function fromDocument(
   if (hasCommittedMutations) {
     result.setHasCommittedMutations();
   }
-  return result;
+  return hasCommittedMutations ? result.setHasCommittedMutations() : result;
 }
 
 function fromFound(

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

@@ -424,29 +424,29 @@ function genericRemoteDocumentCacheTests(
     // This test verifies that the MemoryMutationCache returns copies of all
     // data to ensure that the documents in the cache cannot be modified.
     function verifyOldValue(d: Document): void {
-      expect(d.data.field(field('ver'))).to.deep.equal(wrap(0));
+      expect(d.data.field(field('state'))).to.deep.equal(wrap('old'));
     }
 
-    let document = doc('coll/doc', 1, { ver: 0 });
+    let document = doc('coll/doc', 1, { state: 'old' });
     await cache.addEntries([document], /* readTime= */ version(1));
     verifyOldValue(document);
-    document.data.set(field('ver'), wrap(1));
+    document.data.set(field('state'), wrap('new'));
 
     document = await cache.getEntry(key('coll/doc'));
     verifyOldValue(document);
-    document.data.set(field('ver'), wrap(1));
+    document.data.set(field('state'), wrap('new'));
 
     document = await cache
       .getEntries(documentKeySet(key('coll/doc')))
       .then(m => m.get(key('coll/doc'))!);
     verifyOldValue(document);
-    document.data.set(field('ver'), wrap(1));
+    document.data.set(field('state'), wrap('new'));
 
     document = await cache
       .getEntries(documentKeySet(key('coll/doc')))
       .then(m => m.get(key('coll/doc'))!);
     verifyOldValue(document);
-    document.data.set(field('ver'), wrap(1));
+    document.data.set(field('state'), wrap('new'));
 
     const query1 = query('coll');
     document = await cache