Simplify

Author: schmidt-sebastian

packages/firestore/src/lite/transaction.ts

@@ -99,7 +99,7 @@ export class Transaction {
         );
       } else {
         throw fail(
-          `BatchGetDocumentsRequest returned unexpected document type: ${doc.constructor.name}`
+          `BatchGetDocumentsRequest returned unexpected document: ${doc}`
         );
       }
     });

packages/firestore/src/local/indexeddb_remote_document_cache.ts

@@ -141,17 +141,15 @@ class IndexedDbRemoteDocumentCacheImpl implements IndexedDbRemoteDocumentCache {
   getSizedEntry(
     transaction: PersistenceTransaction,
     documentKey: DocumentKey
-  ): PersistencePromise<DocumentSizeEntry | null> {
+  ): PersistencePromise<DocumentSizeEntry> {
     return remoteDocumentsStore(transaction)
       .get(dbKey(documentKey))
       .next(dbRemoteDoc => {
         const doc = this.maybeDecodeDocument(documentKey, dbRemoteDoc);
-        return doc.isValidDocument()
-          ? {
-              document: doc,
-              size: dbDocumentSize(dbRemoteDoc!)
-            }
-          : null;
+        return {
+          document: doc,
+          size: dbRemoteDoc ? dbDocumentSize(dbRemoteDoc) : 0
+        };
       });
   }
 
@@ -546,13 +544,8 @@ class IndexedDbRemoteDocumentChangeBuffer extends RemoteDocumentChangeBuffer {
     return this.documentCache
       .getSizedEntry(transaction, documentKey)
       .next(getResult => {
-        if (getResult === null) {
-          this.documentSizes.set(documentKey, 0);
-          return MutableDocument.newInvalidDocument(documentKey);
-        } else {
-          this.documentSizes.set(documentKey, getResult.size);
-          return getResult.document;
-        }
+        this.documentSizes.set(documentKey, getResult.size);
+        return getResult.document;
       });
   }
 

packages/firestore/src/local/local_serializer.ts

@@ -79,10 +79,9 @@ export function fromDbRemoteDocument(
     const key = DocumentKey.fromSegments(remoteDoc.noDocument.path);
     const version = fromDbTimestamp(remoteDoc.noDocument.readTime);
     const document = MutableDocument.newNoDocument(key, version);
-    if (remoteDoc.hasCommittedMutations) {
-      document.setHasCommittedMutations();
-    }
-    return document;
+    return remoteDoc.hasCommittedMutations
+      ? document.setHasCommittedMutations()
+      : document;
   } else if (remoteDoc.unknownDocument) {
     const key = DocumentKey.fromSegments(remoteDoc.unknownDocument.path);
     const version = fromDbTimestamp(remoteDoc.unknownDocument.version);

packages/firestore/src/local/local_store_impl.ts

@@ -1028,19 +1028,19 @@ function applyWriteToRemoteDocuments(
   docKeys.forEach(docKey => {
     promiseChain = promiseChain
       .next(() => documentBuffer.getEntry(txn, docKey))
-      .next(remoteDoc => {
+      .next(doc => {
         const ackVersion = batchResult.docVersions.get(docKey);
         hardAssert(
           ackVersion !== null,
           'ackVersions should contain every doc in the write.'
         );
-        if (remoteDoc.version.compareTo(ackVersion!) < 0) {
-          batch.applyToRemoteDocument(docKey, remoteDoc, batchResult);
-          if (remoteDoc.isValidDocument()) {
+        if (doc.version.compareTo(ackVersion!) < 0) {
+          batch.applyToRemoteDocument(docKey, doc, batchResult);
+          if (doc.isValidDocument()) {
             // We use the commitVersion as the readTime rather than the
             // document's updateTime since the updateTime is not advanced
             // for updates that do not modify the underlying document.
-            documentBuffer.addEntry(remoteDoc, batchResult.commitVersion);
+            documentBuffer.addEntry(doc, batchResult.commitVersion);
           }
         }
       });