@firebase/firestore 3.8.0 → 3.8.1-canary.0bab0b7a7

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.0";
+const version$1 = "3.8.1-canary.0bab0b7a7";
 
 /**
  * @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.15.0";
+const version = "9.16.0-canary.0bab0b7a7";
 
 /**
  * @license
@@ -5593,6 +5593,15 @@ function canonifyFilter(filter) {
             filter.op.toString() +
             canonicalId(filter.value));
     }
+    else if (compositeFilterIsFlatConjunction(filter)) {
+        // Older SDK versions use an implicit AND operation between their filters.
+        // In the new SDK versions, the developer may use an explicit AND filter.
+        // To stay consistent with the old usages, we add a special case to ensure
+        // the canonical ID for these two are the same. For example:
+        // `col.whereEquals("a", 1).whereEquals("b", 2)` should have the same
+        // canonical ID as `col.where(and(equals("a",1), equals("b",2)))`.
+        return filter.filters.map(filter => canonifyFilter(filter)).join(',');
+    }
     else {
         // filter instanceof CompositeFilter
         const canonicalIdsString = filter.filters
@@ -13065,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(),
@@ -13086,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;
         });
@@ -13371,8 +13385,10 @@ const SCHEMA_VERSION = 15;
 class OverlayedDocument {
     constructor(overlayedDocument, 
     /**
-     * The fields that are locally mutated by patch mutations. If the overlayed
-     * document is from set or delete mutations, this returns null.
+     * The fields that are locally mutated by patch mutations.
+     *
+     * If the overlayed	document is from set or delete mutations, this is `null`.
+     * If there is no overlay (mutation) for the document, this is an empty `FieldMask`.
      */
     mutatedFields) {
         this.overlayedDocument = overlayedDocument;
@@ -13524,6 +13540,11 @@ class LocalDocumentsView {
                 mutatedFields.set(doc.key, overlay.mutation.getFieldMask());
                 mutationApplyToLocalView(overlay.mutation, doc, overlay.mutation.getFieldMask(), Timestamp.now());
             }
+            else {
+                // no overlay exists
+                // Using EMPTY to indicate there is no overlay for the document.
+                mutatedFields.set(doc.key, FieldMask.empty());
+            }
         });
         return this.recalculateAndSaveOverlays(transaction, recalculateDocuments).next(recalculatedFields => {
             recalculatedFields.forEach((documentKey, mask) => mutatedFields.set(documentKey, mask));
@@ -13689,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) => {
@@ -14296,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()) {
@@ -14315,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);
@@ -28717,13 +28743,14 @@ class QueryCompositeFilterConstraint extends AppliableConstraint {
     }
 }
 /**
- * Creates a {@link QueryCompositeFilterConstraint} that performs a logical OR
- * of all the provided {@link QueryFilterConstraint}s.
+ * Creates a new {@link QueryCompositeFilterConstraint} that is a disjunction of
+ * the given filter constraints. A disjunction filter includes a document if it
+ * satisfies any of the given filters.
  *
- * @param queryConstraints - Optional. The {@link QueryFilterConstraint}s
- * for OR operation. These must be created with calls to {@link where},
- * {@link or}, or {@link and}.
- * @returns The created {@link QueryCompositeFilterConstraint}.
+ * @param queryConstraints - Optional. The list of
+ * {@link QueryFilterConstraint}s to perform a disjunction for. These must be
+ * created with calls to {@link where}, {@link or}, or {@link and}.
+ * @returns The newly created {@link QueryCompositeFilterConstraint}.
  * @internal TODO remove this internal tag with OR Query support in the server
  */
 function or(...queryConstraints) {
@@ -28732,13 +28759,14 @@ function or(...queryConstraints) {
     return QueryCompositeFilterConstraint._create("or" /* CompositeOperator.OR */, queryConstraints);
 }
 /**
- * Creates a {@link QueryCompositeFilterConstraint} that performs a logical AND
- * of all the provided {@link QueryFilterConstraint}s.
+ * Creates a new {@link QueryCompositeFilterConstraint} that is a conjunction of
+ * the given filter constraints. A conjunction filter includes a document if it
+ * satisfies all of the given filters.
  *
- * @param queryConstraints - Optional. The {@link QueryFilterConstraint}s
- * for AND operation. These must be created with calls to {@link where},
- * {@link or}, or {@link and}.
- * @returns The created {@link QueryCompositeFilterConstraint}.
+ * @param queryConstraints - Optional. The list of
+ * {@link QueryFilterConstraint}s to perform a conjunction for. These must be
+ * created with calls to {@link where}, {@link or}, or {@link and}.
+ * @returns The newly created {@link QueryCompositeFilterConstraint}.
  * @internal TODO remove this internal tag with OR Query support in the server
  */
 function and(...queryConstraints) {
@@ -29781,7 +29809,8 @@ function getDocs(query) {
 }
 /**
  * Executes the query and returns the results as a `QuerySnapshot` from cache.
- * Returns an error if the document is not currently cached.
+ * Returns an empty result set if no documents matching the query are currently
+ * cached.
  *
  * @returns A `Promise` that will be resolved with the results of the query.
  */