@firebase/firestore 3.8.1 → 3.8.2-20230201003102

package/dist/index.node.mjs

@@ -8,7 +8,7 @@ import * as grpc from '@grpc/grpc-js';
 import * as protoLoader from '@grpc/proto-loader';
 
 const name = "@firebase/firestore";
-const version$1 = "3.8.1";
+const version$1 = "3.8.2-20230201003102";
 
 /**
  * @license
@@ -61,7 +61,7 @@ User.GOOGLE_CREDENTIALS = new User('google-credentials-uid');
 User.FIRST_PARTY = new User('first-party-uid');
 User.MOCK_USER = new User('mock-user');
 
-const version = "9.16.0";
+const version = "9.17.0-20230201003102";
 
 /**
  * @license
@@ -13074,7 +13074,8 @@ class IndexedDbRemoteDocumentCacheImpl {
             }
         });
     }
-    getAllFromCollection(transaction, collection, offset) {
+    getDocumentsMatchingQuery(transaction, query, offset, mutatedDocs) {
+        const collection = query.path;
         const startKey = [
             collection.popLast().toArray(),
             collection.lastSegment(),
@@ -13095,7 +13096,11 @@ class IndexedDbRemoteDocumentCacheImpl {
             let results = mutableDocumentMap();
             for (const dbRemoteDoc of dbRemoteDocs) {
                 const document = this.maybeDecodeDocument(DocumentKey.fromSegments(dbRemoteDoc.prefixPath.concat(dbRemoteDoc.collectionGroup, dbRemoteDoc.documentId)), dbRemoteDoc);
-                results = results.insert(document.key, document);
+                if (document.isFoundDocument() &&
+                    (queryMatches(query, document) || mutatedDocs.has(document.key))) {
+                    // Either the document matches the given query, or it is mutated.
+                    results = results.insert(document.key, document);
+                }
             }
             return results;
         });
@@ -13705,14 +13710,14 @@ class LocalDocumentsView {
     }
     getDocumentsMatchingCollectionQuery(transaction, query, offset) {
         // Query the remote documents and overlay mutations.
-        let remoteDocuments;
-        return this.remoteDocumentCache
-            .getAllFromCollection(transaction, query.path, offset)
-            .next(queryResults => {
-            remoteDocuments = queryResults;
-            return this.documentOverlayCache.getOverlaysForCollection(transaction, query.path, offset.largestBatchId);
+        let overlays;
+        return this.documentOverlayCache
+            .getOverlaysForCollection(transaction, query.path, offset.largestBatchId)
+            .next(result => {
+            overlays = result;
+            return this.remoteDocumentCache.getDocumentsMatchingQuery(transaction, query, offset, overlays);
         })
-            .next(overlays => {
+            .next(remoteDocuments => {
             // As documents might match the query because of their overlay we need to
             // include documents for all overlays in the initial document set.
             overlays.forEach((_, overlay) => {
@@ -14312,10 +14317,11 @@ class MemoryRemoteDocumentCacheImpl {
         });
         return PersistencePromise.resolve(results);
     }
-    getAllFromCollection(transaction, collectionPath, offset) {
+    getDocumentsMatchingQuery(transaction, query, offset, mutatedDocs) {
         let results = mutableDocumentMap();
         // Documents are ordered by key, so we can use a prefix scan to narrow down
         // the documents we need to match the query against.
+        const collectionPath = query.path;
         const prefix = new DocumentKey(collectionPath.child(''));
         const iterator = this.docs.getIteratorFrom(prefix);
         while (iterator.hasNext()) {
@@ -14331,6 +14337,10 @@ class MemoryRemoteDocumentCacheImpl {
                 // The document sorts before the offset.
                 continue;
             }
+            if (!mutatedDocs.has(document.key) && !queryMatches(query, document)) {
+                // The document cannot possibly match the query.
+                continue;
+            }
             results = results.insert(document.key, document.mutableCopy());
         }
         return PersistencePromise.resolve(results);