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

package/dist/index.esm5.js

@@ -10,7 +10,7 @@ import { FirebaseError as f, getUA as d, isSafari as p, getModularInstance as y,
 
 import { XhrIo as b, EventType as I, ErrorCode as T, createWebChannelTransport as E, getStatEventTarget as S, FetchXmlHttpFactory as _, WebChannel as D, Event as x, Stat as A } from "@firebase/webchannel-wrapper";
 
-var C = "@firebase/firestore", N = /** @class */ function() {
+var N = "@firebase/firestore", C = /** @class */ function() {
     function t(t) {
         this.uid = t;
     }
@@ -48,11 +48,11 @@ var C = "@firebase/firestore", N = /** @class */ function() {
  * Simple wrapper around a nullable UID. Mostly exists to make code more
  * readable.
  */
-/** A user with a null UID. */ N.UNAUTHENTICATED = new N(null), 
+/** A user with a null UID. */ C.UNAUTHENTICATED = new C(null), 
 // TODO(mikelehen): Look into getting a proper uid-equivalent for
 // non-FirebaseAuth providers.
-N.GOOGLE_CREDENTIALS = new N("google-credentials-uid"), N.FIRST_PARTY = new N("first-party-uid"), 
-N.MOCK_USER = new N("mock-user");
+C.GOOGLE_CREDENTIALS = new C("google-credentials-uid"), C.FIRST_PARTY = new C("first-party-uid"), 
+C.MOCK_USER = new C("mock-user");
 
 /**
  * @license
@@ -70,7 +70,7 @@ N.MOCK_USER = new N("mock-user");
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var k = "9.15.0", F = new l("@firebase/firestore");
+var k = "9.16.0-canary.0bab0b7a7", F = new l("@firebase/firestore");
 
 /**
  * @license
@@ -391,7 +391,7 @@ e) {
     }, t.prototype.invalidateToken = function() {}, t.prototype.start = function(t, e) {
         // Fire with initial user.
         t.enqueueRetryable((function() {
-            return e(N.UNAUTHENTICATED);
+            return e(C.UNAUTHENTICATED);
         }));
     }, t.prototype.shutdown = function() {}, t;
 }(), H = /** @class */ function() {
@@ -420,7 +420,7 @@ e) {
     function t(t) {
         this.t = t, 
         /** Tracks the current User. */
-        this.currentUser = N.UNAUTHENTICATED, 
+        this.currentUser = C.UNAUTHENTICATED, 
         /**
              * Counter used to detect if the token changed while a getToken request was
              * outstanding.
@@ -497,11 +497,11 @@ e) {
     // to guarantee to get the actual user.
     t.prototype.u = function() {
         var t = this.auth && this.auth.getUid();
-        return U(null === t || "string" == typeof t), new N(t);
+        return U(null === t || "string" == typeof t), new C(t);
     }, t;
 }(), X = /** @class */ function() {
     function t(t, e, n, r) {
-        this.h = t, this.l = e, this.m = n, this.g = r, this.type = "FirstParty", this.user = N.FIRST_PARTY, 
+        this.h = t, this.l = e, this.m = n, this.g = r, this.type = "FirstParty", this.user = C.FIRST_PARTY, 
         this.p = new Map
         /** Gets an authorization token, using a provided factory function, or falling back to First Party GAPI. */;
     }
@@ -530,7 +530,7 @@ e) {
     }, t.prototype.start = function(t, e) {
         // Fire with initial uid.
         t.enqueueRetryable((function() {
-            return e(N.FIRST_PARTY);
+            return e(C.FIRST_PARTY);
         }));
     }, t.prototype.shutdown = function() {}, t.prototype.invalidateToken = function() {}, 
     t;
@@ -1460,7 +1460,7 @@ function Dt(t) {
         var e = this.transaction.objectStore(t);
         return new Ot(e);
     }, t;
-}(), Ct = /** @class */ function() {
+}(), Nt = /** @class */ function() {
     /*
      * Creates a new SimpleDb wrapper for IndexedDb database `name`.
      *
@@ -1642,7 +1642,7 @@ function Dt(t) {
     }, t.prototype.close = function() {
         this.db && this.db.close(), this.db = void 0;
     }, t;
-}(), Nt = /** @class */ function() {
+}(), Ct = /** @class */ function() {
     function t(t) {
         this.q = t, this.U = !1, this.K = null;
     }
@@ -1854,7 +1854,7 @@ function Dt(t) {
             }, t.onsuccess = function(t) {
                 var i = t.target.result;
                 if (i) {
-                    var o = new Nt(i), u = e(i.primaryKey, i.value, o);
+                    var o = new Ct(i), u = e(i.primaryKey, i.value, o);
                     if (u instanceof xt) {
                         var a = u.catch((function(t) {
                             return o.done(), xt.reject(t);
@@ -1902,7 +1902,7 @@ function Dt(t) {
 var Vt = !1;
 
 function Mt(t) {
-    var e = Ct.D(d());
+    var e = Nt.D(d());
     if (e >= 12.2 && e < 13) {
         var n = "An internal error was encountered in the Indexed Database server";
         if (t.message.indexOf(n) >= 0) {
@@ -2835,7 +2835,7 @@ function _e(t, e, n) {
     }, n.prototype.getFirstInequalityField = function() {
         return this.isInequality() ? this.field : null;
     }, n;
-}(xe), Ce = /** @class */ function(e) {
+}(xe), Ne = /** @class */ function(e) {
     function n(t, n) {
         var r = this;
         return (r = e.call(this) || this).filters = t, r.op = n, r.ht = null, r;
@@ -2845,7 +2845,7 @@ function _e(t, e, n) {
      */    return t(n, e), n.create = function(t, e) {
         return new n(t, e);
     }, n.prototype.matches = function(t) {
-        return Ne(this) ? void 0 === this.filters.find((function(e) {
+        return Ce(this) ? void 0 === this.filters.find((function(e) {
             return !e.matches(t);
         })) : void 0 !== this.filters.find((function(e) {
             return e.matches(t);
@@ -2876,7 +2876,7 @@ function _e(t, e, n) {
     }, n;
 }(xe);
 
-function Ne(t) {
+function Ce(t) {
     return "and" /* CompositeOperator.AND */ === t.op;
 }
 
@@ -2887,14 +2887,14 @@ function ke(t) {
 /**
  * Returns true if this filter is a conjunction of field filters only. Returns false otherwise.
  */ function Fe(t) {
-    return Oe(t) && Ne(t);
+    return Oe(t) && Ce(t);
 }
 
 /**
  * Returns true if this filter does not contain any composite filters. Returns false otherwise.
  */ function Oe(t) {
     for (var e = 0, n = t.filters; e < n.length; e++) {
-        if (n[e] instanceof Ce) return !1;
+        if (n[e] instanceof Ne) return !1;
     }
     return !0;
 }
@@ -2905,6 +2905,16 @@ function Re(t) {
     // the same description, such as the int 3 and the string "3". So we should
     // add the types in here somehow, too.
     return t.field.canonicalString() + t.op.toString() + le(t.value);
+    if (Fe(t)) 
+    // 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 t.filters.map((function(t) {
+        return Re(t);
+    })).join(",");
     // filter instanceof CompositeFilter
     var e = t.filters.map((function(t) {
         return Re(t);
@@ -2915,8 +2925,8 @@ function Re(t) {
 function Ve(t, e) {
     return t instanceof Ae ? function(t, e) {
         return e instanceof Ae && t.op === e.op && t.field.isEqual(e.field) && ue(t.value, e.value);
-    }(t, e) : t instanceof Ce ? function(t, e) {
-        return e instanceof Ce && t.op === e.op && t.filters.length === e.filters.length && t.filters.reduce((function(t, n, r) {
+    }(t, e) : t instanceof Ne ? function(t, e) {
+        return e instanceof Ne && t.op === e.op && t.filters.length === e.filters.length && t.filters.reduce((function(t, n, r) {
             return t && Ve(n, e.filters[r]);
         }), !0);
     }(t, e) : void q();
@@ -2924,13 +2934,13 @@ function Ve(t, e) {
 
 function Me(t, e) {
     var n = t.filters.concat(e);
-    return Ce.create(n, t.op);
+    return Ne.create(n, t.op);
 }
 
 /** Returns a debug description for `filter`. */ function Le(t) {
     return t instanceof Ae ? function(t) {
         return "".concat(t.field.canonicalString(), " ").concat(t.op, " ").concat(le(t.value));
-    }(t) : t instanceof Ce ? function(t) {
+    }(t) : t instanceof Ne ? function(t) {
         return t.op.toString() + " {" + t.getFilters().map(Le).join(" ,") + "}";
     }(t) : "Filter";
 }
@@ -4233,10 +4243,10 @@ function An(t) {
 /**
  * Returns a new comparator function that can be used to compare two documents
  * based on the Query's ordering constraint.
- */ function Cn(t) {
+ */ function Nn(t) {
     return function(e, n) {
         for (var r = !1, i = 0, o = bn(t); i < o.length; i++) {
-            var u = o[i], a = Nn(u, e, n);
+            var u = o[i], a = Cn(u, e, n);
             if (0 !== a) return a;
             r = r || u.field.isKeyField();
         }
@@ -4244,7 +4254,7 @@ function An(t) {
     };
 }
 
-function Nn(t, e, n) {
+function Cn(t, e, n) {
     var r = t.field.isKeyField() ? ft.comparator(e.key, n.key) : function(t, e, n) {
         var r = e.data.field(t), i = n.data.field(t);
         return null !== r && null !== i ? se(r, i) : q();
@@ -5154,9 +5164,9 @@ function xr() {
     // PORTING NOTE: Multi-tab only
         return t.createSynthesizedRemoteEventForCurrentChange = function(e, n, r) {
         var i = new Map;
-        return i.set(e, Cr.createSynthesizedTargetChangeForCurrentChange(e, n, r)), new t(at.min(), i, xr(), vr(), _r());
+        return i.set(e, Nr.createSynthesizedTargetChangeForCurrentChange(e, n, r)), new t(at.min(), i, xr(), vr(), _r());
     }, t;
-}(), Cr = /** @class */ function() {
+}(), Nr = /** @class */ function() {
     function t(
     /**
      * An opaque, server-assigned token that allows watching a query to be resumed
@@ -5197,7 +5207,7 @@ function xr() {
     return t.createSynthesizedTargetChangeForCurrentChange = function(e, n, r) {
         return new t(r, n, _r(), _r(), _r());
     }, t;
-}(), Nr = function(
+}(), Cr = function(
 /** The new document applies to all of these targets. */
 t, 
 /** The new document is removed from all of these targets. */
@@ -5315,7 +5325,7 @@ n
               default:
                 q();
             }
-        })), new Cr(this.bt, this.Pt, t, e, n);
+        })), new Nr(this.bt, this.Pt, t, e, n);
     }, 
     /**
      * Resets the document changes and sets `hasPendingChanges` to false.
@@ -5840,7 +5850,7 @@ function ii(t, e) {
         collectionId: r.lastSegment()
     } ]);
     var i = function(t) {
-        if (0 !== t.length) return fi(Ce.create(t, "and" /* CompositeOperator.AND */));
+        if (0 !== t.length) return fi(Ne.create(t, "and" /* CompositeOperator.AND */));
     }(e.filters);
     i && (n.structuredQuery.where = i);
     var o = function(t) {
@@ -5881,7 +5891,7 @@ function oi(t) {
     var u = [];
     n.where && (u = function(t) {
         var e = ui(t);
-        return e instanceof Ce && Fe(e) ? e.getFilters() : [ e ];
+        return e instanceof Ne && Fe(e) ? e.getFilters() : [ e ];
     }(n.where));
     var a = [];
     n.orderBy && (a = n.orderBy.map((function(t) {
@@ -5987,7 +5997,7 @@ function ui(t) {
             }
         }(t.fieldFilter.op), t.fieldFilter.value);
     }(t) : void 0 !== t.compositeFilter ? function(t) {
-        return Ce.create(t.compositeFilter.filters.map((function(t) {
+        return Ne.create(t.compositeFilter.filters.map((function(t) {
             return ui(t);
         })), function(t) {
             switch (t) {
@@ -6062,7 +6072,7 @@ function fi(t) {
                 value: t.value
             }
         };
-    }(t) : t instanceof Ce ? function(t) {
+    }(t) : t instanceof Ne ? function(t) {
         var e = t.getFilters().map((function(t) {
             return fi(t);
         }));
@@ -6236,7 +6246,7 @@ function pi(t) {
  * there is no useful information to store as the value. The raw (unencoded)
  * path cannot be stored because IndexedDb doesn't store prototype
  * information.
- */ var Ti = {}, Ei = [ "prefixPath", "collectionGroup", "readTime", "documentId" ], Si = [ "prefixPath", "collectionGroup", "documentId" ], _i = [ "collectionGroup", "readTime", "prefixPath", "documentId" ], Di = [ "canonicalId", "targetId" ], xi = [ "targetId", "path" ], Ai = [ "path", "targetId" ], Ci = [ "collectionId", "parent" ], Ni = [ "indexId", "uid" ], ki = [ "uid", "sequenceNumber" ], Fi = [ "indexId", "uid", "arrayValue", "directionalValue", "orderedDocumentKey", "documentKey" ], Oi = [ "indexId", "uid", "orderedDocumentKey" ], Ri = [ "userId", "collectionPath", "documentId" ], Vi = [ "userId", "collectionPath", "largestBatchId" ], Mi = [ "userId", "collectionGroup", "largestBatchId" ], Li = r(r([], r(r([], r(r([], r(r([], [ "mutationQueues", "mutations", "documentMutations", "remoteDocuments", "targets", "owner", "targetGlobal", "targetDocuments" ], !1), [ "clientMetadata" ], !1), !0), [ "remoteDocumentGlobal" ], !1), !0), [ "collectionParents" ], !1), !0), [ "bundles", "namedQueries" ], !1), Pi = r(r([], Li, !0), [ "documentOverlays" ], !1), qi = [ "mutationQueues", "mutations", "documentMutations", "remoteDocumentsV14", "targets", "owner", "targetGlobal", "targetDocuments", "clientMetadata", "remoteDocumentGlobal", "collectionParents", "bundles", "namedQueries", "documentOverlays" ], Ui = qi, Bi = r(r([], Ui, !0), [ "indexConfiguration", "indexState", "indexEntries" ], !1), Gi = /** @class */ function(e) {
+ */ var Ti = {}, Ei = [ "prefixPath", "collectionGroup", "readTime", "documentId" ], Si = [ "prefixPath", "collectionGroup", "documentId" ], _i = [ "collectionGroup", "readTime", "prefixPath", "documentId" ], Di = [ "canonicalId", "targetId" ], xi = [ "targetId", "path" ], Ai = [ "path", "targetId" ], Ni = [ "collectionId", "parent" ], Ci = [ "indexId", "uid" ], ki = [ "uid", "sequenceNumber" ], Fi = [ "indexId", "uid", "arrayValue", "directionalValue", "orderedDocumentKey", "documentKey" ], Oi = [ "indexId", "uid", "orderedDocumentKey" ], Ri = [ "userId", "collectionPath", "documentId" ], Vi = [ "userId", "collectionPath", "largestBatchId" ], Mi = [ "userId", "collectionGroup", "largestBatchId" ], Li = r(r([], r(r([], r(r([], r(r([], [ "mutationQueues", "mutations", "documentMutations", "remoteDocuments", "targets", "owner", "targetGlobal", "targetDocuments" ], !1), [ "clientMetadata" ], !1), !0), [ "remoteDocumentGlobal" ], !1), !0), [ "collectionParents" ], !1), !0), [ "bundles", "namedQueries" ], !1), Pi = r(r([], Li, !0), [ "documentOverlays" ], !1), qi = [ "mutationQueues", "mutations", "documentMutations", "remoteDocumentsV14", "targets", "owner", "targetGlobal", "targetDocuments", "clientMetadata", "remoteDocumentGlobal", "collectionParents", "bundles", "namedQueries", "documentOverlays" ], Ui = qi, Bi = r(r([], Ui, !0), [ "indexConfiguration", "indexState", "indexEntries" ], !1), Gi = /** @class */ function(e) {
     function n(t, n) {
         var r = this;
         return (r = e.call(this) || this).se = t, r.currentSequenceNumber = n, r;
@@ -6261,7 +6271,7 @@ function pi(t) {
  * limitations under the License.
  */ function Ki(t, e) {
     var n = G(t);
-    return Ct.M(n.se, e);
+    return Nt.M(n.se, e);
 }
 
 /**
@@ -7201,12 +7211,12 @@ function Io(t, e) {
  * input into a disjunction of equality filters and returns the expanded filter.
  */ function Eo(t) {
     var e, n;
-    if (U(t instanceof Ae || t instanceof Ce), t instanceof Ae) {
+    if (U(t instanceof Ae || t instanceof Ne), t instanceof Ae) {
         if (t instanceof Ke) {
             var r = (null === (n = null === (e = t.value.arrayValue) || void 0 === e ? void 0 : e.values) || void 0 === n ? void 0 : n.map((function(e) {
                 return Ae.create(t.field, "==" /* Operator.EQUAL */ , e);
             }))) || [];
-            return Ce.create(r, "or" /* CompositeOperator.OR */);
+            return Ne.create(r, "or" /* CompositeOperator.OR */);
         }
         // We have reached other kinds of field filters.
                 return t;
@@ -7215,7 +7225,7 @@ function Io(t, e) {
         var i = t.filters.map((function(t) {
         return Eo(t);
     }));
-    return Ce.create(i, t.op);
+    return Ne.create(i, t.op);
 }
 
 /**
@@ -7243,7 +7253,7 @@ function _o(t) {
  * Returns true if the given filter is the conjunction of one or more field filters. e.g. (a == 10
  * && b == 20)
  */ function Do(t) {
-    return t instanceof Ce && Fe(t);
+    return t instanceof Ne && Fe(t);
 }
 
 /**
@@ -7260,7 +7270,7 @@ function _o(t) {
      * field filters. e.g. (a == 10) || (b==20 && c==30)
      */
     function(t) {
-        if (t instanceof Ce && ke(t)) {
+        if (t instanceof Ne && ke(t)) {
             for (var e = 0, n = t.getFilters(); e < n.length; e++) {
                 var r = n[e];
                 if (!_o(r) && !Do(r)) return !1;
@@ -7272,55 +7282,55 @@ function _o(t) {
 }
 
 function Ao(t) {
-    if (U(t instanceof Ae || t instanceof Ce), t instanceof Ae) return t;
+    if (U(t instanceof Ae || t instanceof Ne), t instanceof Ae) return t;
     if (1 === t.filters.length) return Ao(t.filters[0]);
     // Compute DNF for each of the subfilters first
         var e = t.filters.map((function(t) {
         return Ao(t);
-    })), n = Ce.create(e, t.op);
-    return xo(n = ko(n)) ? n : (U(n instanceof Ce), U(Ne(n)), U(n.filters.length > 1), 
+    })), n = Ne.create(e, t.op);
+    return xo(n = ko(n)) ? n : (U(n instanceof Ne), U(Ce(n)), U(n.filters.length > 1), 
     n.filters.reduce((function(t, e) {
-        return Co(t, e);
+        return No(t, e);
     })));
 }
 
-function Co(t, e) {
+function No(t, e) {
     var n;
-    return U(t instanceof Ae || t instanceof Ce), U(e instanceof Ae || e instanceof Ce), 
+    return U(t instanceof Ae || t instanceof Ne), U(e instanceof Ae || e instanceof Ne), 
     // FieldFilter FieldFilter
     n = t instanceof Ae ? e instanceof Ae ? function(t, e) {
         // Conjunction distribution for two field filters is the conjunction of them.
-        return Ce.create([ t, e ], "and" /* CompositeOperator.AND */);
-    }(t, e) : No(t, e) : e instanceof Ae ? No(e, t) : function(t, e) {
+        return Ne.create([ t, e ], "and" /* CompositeOperator.AND */);
+    }(t, e) : Co(t, e) : e instanceof Ae ? Co(e, t) : function(t, e) {
         // There are four cases:
         // (A & B) & (C & D) --> (A & B & C & D)
         // (A & B) & (C | D) --> (A & B & C) | (A & B & D)
         // (A | B) & (C & D) --> (C & D & A) | (C & D & B)
         // (A | B) & (C | D) --> (A & C) | (A & D) | (B & C) | (B & D)
         // Case 1 is a merge.
-        if (U(t.filters.length > 0 && e.filters.length > 0), Ne(t) && Ne(e)) return Me(t, e.getFilters());
+        if (U(t.filters.length > 0 && e.filters.length > 0), Ce(t) && Ce(e)) return Me(t, e.getFilters());
         // Case 2,3,4 all have at least one side (lhs or rhs) that is a disjunction. In all three cases
         // we should take each element of the disjunction and distribute it over the other side, and
         // return the disjunction of the distribution results.
                 var n = ke(t) ? t : e, r = ke(t) ? e : t, i = n.filters.map((function(t) {
-            return Co(t, r);
+            return No(t, r);
         }));
-        return Ce.create(i, "or" /* CompositeOperator.OR */);
+        return Ne.create(i, "or" /* CompositeOperator.OR */);
     }(t, e), ko(n);
 }
 
-function No(t, e) {
+function Co(t, e) {
     // There are two cases:
     // A & (B & C) --> (A & B & C)
     // A & (B | C) --> (A & B) | (A & C)
-    if (Ne(e)) 
+    if (Ce(e)) 
     // Case 1
     return Me(e, t.getFilters());
     // Case 2
     var n = e.filters.map((function(e) {
-        return Co(t, e);
+        return No(t, e);
     }));
-    return Ce.create(n, "or" /* CompositeOperator.OR */);
+    return Ne.create(n, "or" /* CompositeOperator.OR */);
 }
 
 /**
@@ -7333,7 +7343,7 @@ function No(t, e) {
  *
  * <p>For more info, visit: https://en.wikipedia.org/wiki/Associative_property#Propositional_logic
  */ function ko(t) {
-    if (U(t instanceof Ae || t instanceof Ce), t instanceof Ae) return t;
+    if (U(t instanceof Ae || t instanceof Ne), t instanceof Ae) return t;
     var e = t.getFilters();
     // If the composite filter only contains 1 filter, apply associativity to it.
         if (1 === e.length) return ko(e[0]);
@@ -7352,7 +7362,7 @@ function No(t, e) {
     // Note that the `compositeSubfilter` has been eliminated, and its filters (B, C, D) have been
     // added to the top-level "compositeFilter".
         return n.forEach((function(e) {
-        e instanceof Ae ? r.push(e) : e instanceof Ce && (e.op === t.op ? 
+        e instanceof Ae ? r.push(e) : e instanceof Ne && (e.op === t.op ? 
         // compositeFilter: (A | (B | C))
         // compositeSubfilter: (B | C)
         // Result: (A | B | C)
@@ -7365,7 +7375,7 @@ function No(t, e) {
         // compositeSubfilter: (B & C)
         // Result: (A | (B & C))
         r.push(e));
-    })), 1 === r.length ? r[0] : Ce.create(r, t.op)
+    })), 1 === r.length ? r[0] : Ne.create(r, t.op)
     /**
  * @license
  * Copyright 2019 Google LLC
@@ -7614,7 +7624,7 @@ var Fo = /** @class */ function() {
         }));
     }, t.prototype.Ze = function(t) {
         var e = this.Xe.get(t);
-        return e || (e = 0 === t.filters.length ? [ t ] : So(Ce.create(t.filters, "and" /* CompositeOperator.AND */)).map((function(e) {
+        return e || (e = 0 === t.filters.length ? [ t ] : So(Ne.create(t.filters, "and" /* CompositeOperator.AND */)).map((function(e) {
             return un(t.path, t.collectionGroup, t.orderBy, e.getFilters(), t.limit, t.startAt, t.endAt);
         })), this.Xe.set(t, e), e);
     }, 
@@ -9171,14 +9181,16 @@ function Jo(t) {
             // above won't go through them is when the cache is empty.
             for (;a; ) n(a, null), a = u.hasNext() ? u.getNext() : null;
         }));
-    }, t.prototype.getAllFromCollection = function(t, e, n) {
-        var r = this, i = [ e.popLast().toArray(), e.lastSegment(), Xi(n.readTime), n.documentKey.path.isEmpty() ? "" : n.documentKey.path.lastSegment() ], o = [ e.popLast().toArray(), e.lastSegment(), [ Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER ], "" ];
-        return fu(t).W(IDBKeyRange.bound(i, o, !0)).next((function(t) {
-            for (var e = vr(), n = 0, i = t; n < i.length; n++) {
-                var o = i[n], u = r.jn(ft.fromSegments(o.prefixPath.concat(o.collectionGroup, o.documentId)), o);
-                e = e.insert(u.key, u);
+    }, t.prototype.getDocumentsMatchingQuery = function(t, e, n, r) {
+        var i = this, o = e.path, u = [ o.popLast().toArray(), o.lastSegment(), Xi(n.readTime), n.documentKey.path.isEmpty() ? "" : n.documentKey.path.lastSegment() ], a = [ o.popLast().toArray(), o.lastSegment(), [ Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER ], "" ];
+        return fu(t).W(IDBKeyRange.bound(u, a, !0)).next((function(t) {
+            for (var n = vr(), o = 0, u = t; o < u.length; o++) {
+                var a = u[o], s = i.jn(ft.fromSegments(a.prefixPath.concat(a.collectionGroup, a.documentId)), a);
+                s.isFoundDocument() && (xn(e, s) || r.has(s.key)) && (
+                // Either the document matches the given query, or it is mutated.
+                n = n.insert(s.key, s));
             }
-            return e;
+            return n;
         }));
     }, t.prototype.getAllFromCollectionGroup = function(t, e, n, r) {
         var i = this, o = vr(), u = pu(e, n), a = pu(e, Tt.max());
@@ -9434,8 +9446,10 @@ function pu(t, e) {
  * locally mutated.
  */ var vu = function(t, 
 /**
-     * 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`.
      */
 e) {
     this.overlayedDocument = t, this.mutatedFields = e;
@@ -9543,8 +9557,11 @@ e) {
             // NOTE: we recalculate when `overlay` is undefined as well, because there
             // might be a patch mutation whose precondition does not match before the
             // change (hence overlay is undefined), but would now match.
-                        r.has(e.key) && (void 0 === u || u.mutation instanceof rr) ? i = i.insert(e.key, e) : void 0 !== u && (o.set(e.key, u.mutation.getFieldMask()), 
-            $n(u.mutation, e, u.mutation.getFieldMask(), ut.now()));
+                        r.has(e.key) && (void 0 === u || u.mutation instanceof rr) ? i = i.insert(e.key, e) : void 0 !== u ? (o.set(e.key, u.mutation.getFieldMask()), 
+            $n(u.mutation, e, u.mutation.getFieldMask(), ut.now())) : 
+            // no overlay exists
+            // Using EMPTY to indicate there is no overlay for the document.
+            o.set(e.key, tn.empty());
         })), this.recalculateAndSaveOverlays(t, i).next((function(t) {
             return t.forEach((function(t, e) {
                 return o.set(t, e);
@@ -9680,22 +9697,22 @@ e) {
     }, t.prototype.getDocumentsMatchingCollectionQuery = function(t, e, n) {
         var r, i = this;
         // Query the remote documents and overlay mutations.
-                return this.remoteDocumentCache.getAllFromCollection(t, e.path, n).next((function(o) {
-            return r = o, i.documentOverlayCache.getOverlaysForCollection(t, e.path, n.largestBatchId);
+                return this.documentOverlayCache.getOverlaysForCollection(t, e.path, n.largestBatchId).next((function(o) {
+            return r = o, i.remoteDocumentCache.getDocumentsMatchingQuery(t, e, n, r);
         })).next((function(t) {
             // As documents might match the query because of their overlay we need to
             // include documents for all overlays in the initial document set.
-            t.forEach((function(t, e) {
-                var n = e.getKey();
-                null === r.get(n) && (r = r.insert(n, rn.newInvalidDocument(n)));
+            r.forEach((function(e, n) {
+                var r = n.getKey();
+                null === t.get(r) && (t = t.insert(r, rn.newInvalidDocument(r)));
             }));
             // Apply the overlays and match against the query.
             var n = gr();
-            return r.forEach((function(r, i) {
-                var o = t.get(r);
+            return t.forEach((function(t, i) {
+                var o = r.get(t);
                 void 0 !== o && $n(o.mutation, i, tn.empty(), ut.now()), 
                 // Finally, insert the documents that still match the query
-                xn(e, i) && (n = n.insert(r, i));
+                xn(e, i) && (n = n.insert(t, i));
             })), n;
         }));
     }, t;
@@ -10035,16 +10052,16 @@ e) {
             var e = n.docs.get(t);
             r = r.insert(t, e ? e.document.mutableCopy() : rn.newInvalidDocument(t));
         })), xt.resolve(r);
-    }, t.prototype.getAllFromCollection = function(t, e, n) {
-        for (var r = vr(), i = new ft(e.child("")), o = this.docs.getIteratorFrom(i)
+    }, t.prototype.getDocumentsMatchingQuery = function(t, e, n, r) {
+        for (var i = vr(), o = e.path, u = new ft(o.child("")), a = this.docs.getIteratorFrom(u)
         // Documents are ordered by key, so we can use a prefix scan to narrow down
         // the documents we need to match the query against.
-        ; o.hasNext(); ) {
-            var u = o.getNext(), a = u.key, s = u.value.document;
-            if (!e.isPrefixOf(a.path)) break;
-            a.path.length > e.length + 1 || Et(It(s), n) <= 0 || (r = r.insert(s.key, s.mutableCopy()));
+        ; a.hasNext(); ) {
+            var s = a.getNext(), c = s.key, l = s.value.document;
+            if (!o.isPrefixOf(c.path)) break;
+            c.path.length > o.length + 1 || Et(It(l), n) <= 0 || (r.has(l.key) || xn(e, l)) && (i = i.insert(l.key, l.mutableCopy()));
         }
-        return xt.resolve(r);
+        return xt.resolve(i);
     }, t.prototype.getAllFromCollectionGroup = function(t, e, n, r) {
         // This method should only be called from the IndexBackfiller if persistence
         // is enabled.
@@ -10286,7 +10303,7 @@ e) {
             return n.persistence.Ms(t, e);
         } ]);
     }, t;
-}(), Cu = /** @class */ function() {
+}(), Nu = /** @class */ function() {
     function t(t) {
         this.yt = t;
     }
@@ -10309,7 +10326,7 @@ e) {
             }).createIndex("userMutationsIndex", wi, {
                 unique: !0
             }), t.createObjectStore("documentMutations");
-        }(t), Nu(t), function(t) {
+        }(t), Cu(t), function(t) {
             t.createObjectStore("remoteDocuments");
         }(t));
         // Migration 2 to populate the targetGlobal object no longer needed since
@@ -10320,7 +10337,7 @@ e) {
         // potentially have corrupt data.
         0 !== n && (function(t) {
             t.deleteObjectStore("targetDocuments"), t.deleteObjectStore("targets"), t.deleteObjectStore("targetGlobal");
-        }(t), Nu(t)), u = u.next((function() {
+        }(t), Cu(t)), u = u.next((function() {
             /**
      * Creates the target global singleton row.
      *
@@ -10426,7 +10443,7 @@ e) {
                 }).createIndex("collectionGroupIndex", "collectionGroup", {
                     unique: !1
                 }), t.createObjectStore("indexState", {
-                    keyPath: Ni
+                    keyPath: Ci
                 }).createIndex("sequenceNumberIndex", ki, {
                     unique: !1
                 }), t.createObjectStore("indexEntries", {
@@ -10489,7 +10506,7 @@ e) {
     }, t.prototype.Qs = function(t, e) {
         // Create the index.
         t.createObjectStore("collectionParents", {
-            keyPath: Ci
+            keyPath: Ni
         });
         var n = e.store("collectionParents"), r = new Oo, i = function(t) {
             if (r.add(t)) {
@@ -10551,7 +10568,7 @@ e) {
                     return i = i.add(t);
                 })), r.set(t.userId, i);
             })), xt.forEach(r, (function(t, r) {
-                var u = new N(r), a = co.re(n.yt, u), s = o.getIndexManager(u), c = Qo.re(u, n.yt, s, o.referenceDelegate);
+                var u = new C(r), a = co.re(n.yt, u), s = o.getIndexManager(u), c = Qo.re(u, n.yt, s, o.referenceDelegate);
                 return new mu(i, c, a, s).recalculateAndSaveOverlaysForDocumentKeys(new Gi(e, qt.at), t).next();
             }));
         }));
@@ -10579,7 +10596,7 @@ e) {
  * have a cached version in remoteDocumentCache or local mutations for the
  * document). The view is computed by applying the mutations in the
  * MutationQueue to the RemoteDocumentCache.
- */ function Nu(t) {
+ */ function Cu(t) {
     t.createObjectStore("targetDocuments", {
         keyPath: xi
     }).createIndex("documentTargetsIndex", Ai, {
@@ -10621,7 +10638,7 @@ var ku = "Failed to obtain exclusive access to the persistence layer. To allow s
             return Promise.resolve();
         }, !t.C()) throw new j(K.UNIMPLEMENTED, "This platform is either missing IndexedDB or is known to have an incomplete implementation. Offline persistence has been disabled.");
         this.referenceDelegate = new ou(this, i), this.ii = n + "main", this.yt = new Hi(s), 
-        this.ri = new Ct(this.ii, this.Xs, new Cu(this.yt)), this.Cs = new Zo(this.referenceDelegate, this.yt), 
+        this.ri = new Nt(this.ii, this.Xs, new Nu(this.yt)), this.Cs = new Zo(this.referenceDelegate, this.yt), 
         this.remoteDocumentCache = cu(this.yt), this.Ns = new uo, this.window && this.window.localStorage ? this.oi = this.window.localStorage : (this.oi = null, 
         !1 === l && M("IndexedDbPersistence", "LocalStorage is unavailable. As a result, persistence may not work reliably. In particular enablePersistence() could fail immediately after refreshing the page."));
     }
@@ -11008,7 +11025,7 @@ var ku = "Failed to obtain exclusive access to the persistence layer. To allow s
         };
         return Ou(t).put("owner", e);
     }, t.C = function() {
-        return Ct.C();
+        return Nt.C();
     }, 
     /** Checks the primary lease and removes it if we are the current primary. */ t.prototype._i = function(t) {
         var e = this, n = Ou(t);
@@ -11277,7 +11294,7 @@ var Mu = /** @class */ function() {
     /** Applies the query filter and sorting to the provided documents.  */ t.prototype.Fi = function(t, e) {
         // Sort the documents and re-apply the query filter since previously
         // matching documents do not necessarily still match the query.
-        var n = new Ze(Cn(t));
+        var n = new Ze(Nn(t));
         return e.forEach((function(e, r) {
             xn(t, r) && (n = n.add(r));
         })), n;
@@ -12263,7 +12280,7 @@ var ra = /** @class */ function() {
      */
     t.prototype.Dr = function(t, e) {
         var n = this.dr.exec(t), r = Number(n[1]), i = void 0 !== n[2] ? n[2] : null;
-        return ra.Zi(new N(i), r, e);
+        return ra.Zi(new C(i), r, e);
     }, 
     /**
      * Parses a query target state from WebStorage. Returns 'null' if the value
@@ -13055,19 +13072,19 @@ function ya() {
                         fields: s.document.fields
                     }
                 }), d = rn.newFoundDocument(c, l, h, f), p = s.targetIds || [], y = s.removedTargetIds || [];
-                n = new Nr(p, y, d.key, d);
+                n = new Cr(p, y, d.key, d);
             } else if ("documentDelete" in e) {
                 e.documentDelete;
                 var v = e.documentDelete;
                 v.document;
                 var m = Hr(t, v.document), g = v.readTime ? jr(v.readTime) : at.min(), w = rn.newNoDocument(m, g), b = v.removedTargetIds || [];
-                n = new Nr([], b, w.key, w);
+                n = new Cr([], b, w.key, w);
             } else if ("documentRemove" in e) {
                 e.documentRemove;
                 var I = e.documentRemove;
                 I.document;
                 var T = Hr(t, I.document), E = I.removedTargetIds || [];
-                n = new Nr([], E, T, null);
+                n = new Cr([], E, T, null);
             } else {
                 if (!("filter" in e)) return q();
                 e.filter;
@@ -13534,7 +13551,7 @@ r, i, o, u) {
     // Mark this as something the client is currently listening for.
     n.du.set(e.targetId, e), Fa(n) ? 
     // The listen will be sent in onWatchStreamOpen
-    ka(n) : Ya(n).ko() && Ca(n, e));
+    ka(n) : Ya(n).ko() && Na(n, e));
 }
 
 /**
@@ -13542,7 +13559,7 @@ r, i, o, u) {
  * not being listened to.
  */ function Aa(t, e) {
     var n = G(t), r = Ya(n);
-    n.du.delete(e), r.ko() && Na(n, e), 0 === n.du.size && (r.ko() ? r.Fo() : Oa(n) && 
+    n.du.delete(e), r.ko() && Ca(n, e), 0 === n.du.size && (r.ko() ? r.Fo() : Oa(n) && 
     // Revert to OnlineState.Unknown if the watch stream is not open and we
     // have no listeners, since without any listens to send we cannot
     // confirm if the stream is healthy and upgrade to OnlineState.Online.
@@ -13552,7 +13569,7 @@ r, i, o, u) {
 /**
  * We need to increment the the expected number of pending responses we're due
  * from watch so we wait for the ack to process any messages from this target.
- */ function Ca(t, e) {
+ */ function Na(t, e) {
     t.yu.Ot(e.targetId), Ya(t).zo(e)
     /**
  * We need to increment the expected number of pending responses we're due
@@ -13561,7 +13578,7 @@ r, i, o, u) {
  */;
 }
 
-function Na(t, e) {
+function Ca(t, e) {
     t.yu.Ot(e), Ya(t).Ho(e);
 }
 
@@ -13596,7 +13613,7 @@ function Va(t) {
     return e(this, void 0, void 0, (function() {
         return n(this, (function(e) {
             return t.du.forEach((function(e, n) {
-                Ca(t, e);
+                Na(t, e);
             })), [ 2 /*return*/ ];
         }));
     }));
@@ -13671,7 +13688,7 @@ function La(t, r, i) {
                 return [ 3 /*break*/ , 13 ];
 
               case 6:
-                if (r instanceof Nr ? t.yu.Kt(r) : r instanceof kr ? t.yu.Jt(r) : t.yu.jt(r), i.isEqual(at.min())) return [ 3 /*break*/ , 13 ];
+                if (r instanceof Cr ? t.yu.Kt(r) : r instanceof kr ? t.yu.Jt(r) : t.yu.jt(r), i.isEqual(at.min())) return [ 3 /*break*/ , 13 ];
                 s.label = 7;
 
               case 7:
@@ -13705,13 +13722,13 @@ function La(t, r, i) {
                             t.du.set(e, n.withResumeToken(Yt.EMPTY_BYTE_STRING, n.snapshotVersion)), 
                             // Cause a hard reset by unwatching and rewatching immediately, but
                             // deliberately don't send a resume token so that we get a full update.
-                            Na(t, e);
+                            Ca(t, e);
                             // Mark the target we send as being on behalf of an existence filter
                             // mismatch, but don't actually retain that in listenTargets. This ensures
                             // that we flag the first re-listen this way without impacting future
                             // listens of this target (that might happen e.g. on reconnect).
                             var r = new Wi(n.target, e, 1 /* TargetPurpose.ExistenceFilterMismatch */ , n.sequenceNumber);
-                            Ca(t, r);
+                            Na(t, r);
                         }
                     })), t.remoteSyncer.applyRemoteEvent(n);
                 }(t, i) ] : [ 3 /*break*/ , 10 ];
@@ -14696,7 +14713,7 @@ function ds(t) {
         /** Documents in the view but not in the remote target */
         this.Ku = _r(), 
         /** Document Keys that have local changes */
-        this.mutatedKeys = _r(), this.Gu = Cn(t), this.Qu = new $a(this.Gu);
+        this.mutatedKeys = _r(), this.Gu = Nn(t), this.Qu = new $a(this.Gu);
     }
     return Object.defineProperty(t.prototype, "ju", {
         /**
@@ -15068,7 +15085,7 @@ function bs(t, r) {
                 /* usePreviousResults= */ !0) ];
 
               case 1:
-                return a = d.sent(), s = new vs(r, a.Hi), c = s.Wu(a.documents), l = Cr.createSynthesizedTargetChangeForCurrentChange(i, o && "Offline" /* OnlineState.Offline */ !== t.onlineState, u), 
+                return a = d.sent(), s = new vs(r, a.Hi), c = s.Wu(a.documents), l = Nr.createSynthesizedTargetChangeForCurrentChange(i, o && "Offline" /* OnlineState.Offline */ !== t.onlineState, u), 
                 h = s.applyChanges(c, 
                 /* updateLimboDocuments= */ t.isPrimaryClient, l), Rs(t, i, h.Xu), f = new ms(r, i, s), 
                 [ 2 /*return*/ , (t.ic.set(r, f), t.rc.has(i) ? t.rc.get(i).push(r) : t.rc.set(i, [ r ]), 
@@ -15345,7 +15362,7 @@ function xs(t, r) {
                 // raise events immediately (depending on whether the watcher is caught
                 // up), so we raise user callbacks first so that they consistently happen
                 // before listen events.
-                ks(e, i, /*error=*/ null), Ns(e, i), e.sharedClientState.updateMutationState(i, "acknowledged"), 
+                ks(e, i, /*error=*/ null), Cs(e, i), e.sharedClientState.updateMutationState(i, "acknowledged"), 
                 [ 4 /*yield*/ , Ls(e, o) ];
 
               case 3:
@@ -15401,7 +15418,7 @@ function As(t, r, i) {
                 // raise events immediately (depending on whether the watcher is caught up),
                 // so we raise user callbacks first so that they consistently happen before
                 // listen events.
-                ks(e, r, i), Ns(e, r), e.sharedClientState.updateMutationState(r, "rejected", i), 
+                ks(e, r, i), Cs(e, r), e.sharedClientState.updateMutationState(r, "rejected", i), 
                 [ 4 /*yield*/ , Ls(e, o) ];
 
               case 3:
@@ -15427,7 +15444,7 @@ function As(t, r, i) {
 /**
  * Registers a user callback that resolves when all pending mutations at the moment of calling
  * are acknowledged .
- */ function Cs(t, r) {
+ */ function Ns(t, r) {
     return e(this, void 0, void 0, (function() {
         var e, i, o, u, a;
         return n(this, (function(n) {
@@ -15462,7 +15479,7 @@ function As(t, r, i) {
 /**
  * Triggers the callbacks that are waiting for this batch id to get acknowledged by server,
  * if there are any.
- */ function Ns(t, e) {
+ */ function Cs(t, e) {
     (t.lc.get(e) || []).forEach((function(t) {
         t.resolve();
     })), t.lc.delete(e)
@@ -15718,7 +15735,7 @@ function Gs(t, r, i, o) {
                 "acknowledged" === i || "rejected" === i ? (
                 // NOTE: Both these methods are no-ops for batches that originated from
                 // other clients.
-                ks(e, r, o || null), Ns(e, r), function(t, e) {
+                ks(e, r, o || null), Cs(e, r), function(t, e) {
                     G(G(t).mutationQueue).An(e);
                 }(e.localStore, r)) : q(), n.label = 4;
 
@@ -16570,13 +16587,13 @@ function fc(t, e, n, r) {
         ssl: !1
     })), r.mockUserToken) {
         var u, a;
-        if ("string" == typeof r.mockUserToken) u = r.mockUserToken, a = N.MOCK_USER; else {
+        if ("string" == typeof r.mockUserToken) u = r.mockUserToken, a = C.MOCK_USER; else {
             // Let createMockUserToken validate first (catches common mistakes like
             // invalid field "uid" and missing field "sub" / "user_id".)
             u = m(r.mockUserToken, null === (i = t._app) || void 0 === i ? void 0 : i.options.projectId);
             var s = r.mockUserToken.sub || r.mockUserToken.user_id;
             if (!s) throw new j(K.INVALID_ARGUMENT, "mockUserToken must contain 'sub' or 'user_id' field!");
-            a = new N(s);
+            a = new C(s);
         }
         t._authCredentials = new H(new z(u, a));
     }
@@ -17362,7 +17379,7 @@ function Ic(t, r) {
         }
         return !1;
     }, t;
-}(), Cc = /** @class */ function() {
+}(), Nc = /** @class */ function() {
     function t(t, r, 
     /**
      * Asynchronous queue responsible for all of our internal processing. When
@@ -17375,7 +17392,7 @@ function Ic(t, r) {
     i, o) {
         var u = this;
         this.authCredentials = t, this.appCheckCredentials = r, this.asyncQueue = i, this.databaseInfo = o, 
-        this.user = N.UNAUTHENTICATED, this.clientId = nt.R(), this.authCredentialListener = function() {
+        this.user = C.UNAUTHENTICATED, this.clientId = nt.R(), this.authCredentialListener = function() {
             return Promise.resolve();
         }, this.appCheckCredentialListener = function() {
             return Promise.resolve();
@@ -17481,7 +17498,7 @@ function Ic(t, r) {
  *
  * Takes a bundle stream or buffer, and presents abstractions to read bundled
  * elements out of the underlying content.
- */ function Nc(t, r) {
+ */ function Cc(t, r) {
     return e(this, void 0, void 0, (function() {
         var i, o, u = this;
         return n(this, (function(a) {
@@ -17555,7 +17572,7 @@ function Fc(t) {
             switch (e.label) {
               case 0:
                 return t.offlineComponents ? [ 3 /*break*/ , 2 ] : (V("FirestoreClient", "Using default OfflineComponentProvider"), 
-                [ 4 /*yield*/ , Nc(t, new Js) ]);
+                [ 4 /*yield*/ , Cc(t, new Js) ]);
 
               case 1:
                 e.sent(), e.label = 2;
@@ -18118,7 +18135,7 @@ function Xc(t) {
     var e, n = t._freezeSettings(), r = function(t, e, n, r) {
         return new Ut(t, e, n, r.host, r.ssl, r.experimentalForceLongPolling, r.experimentalAutoDetectLongPolling, r.useFetchStreams);
     }(t._databaseId, (null === (e = t._app) || void 0 === e ? void 0 : e.options.appId) || "", t._persistenceKey, n);
-    t._firestoreClient = new Cc(t._authCredentials, t._appCheckCredentials, t._queue, r);
+    t._firestoreClient = new Nc(t._authCredentials, t._appCheckCredentials, t._queue, r);
 }
 
 /**
@@ -18189,7 +18206,7 @@ function Xc(t) {
             return n(this, (function(n) {
                 switch (n.label) {
                   case 0:
-                    return n.trys.push([ 0, 3, , 4 ]), [ 4 /*yield*/ , Nc(t, i) ];
+                    return n.trys.push([ 0, 3, , 4 ]), [ 4 /*yield*/ , Cc(t, i) ];
 
                   case 1:
                     return n.sent(), [ 4 /*yield*/ , kc(t, r) ];
@@ -18238,7 +18255,7 @@ function tl(t) {
                             return n(this, (function(n) {
                                 switch (n.label) {
                                   case 0:
-                                    return Ct.C() ? (e = t + "main", [ 4 /*yield*/ , Ct.delete(e) ]) : [ 2 /*return*/ , Promise.resolve() ];
+                                    return Nt.C() ? (e = t + "main", [ 4 /*yield*/ , Nt.delete(e) ]) : [ 2 /*return*/ , Promise.resolve() ];
 
                                   case 1:
                                     return n.sent(), [ 2 /*return*/ ];
@@ -18286,7 +18303,7 @@ function el(t) {
                 return n(this, (function(n) {
                     switch (n.label) {
                       case 0:
-                        return e = Cs, [ 4 /*yield*/ , Lc(t) ];
+                        return e = Ns, [ 4 /*yield*/ , Lc(t) ];
 
                       case 1:
                         return [ 2 /*return*/ , e.apply(void 0, [ n.sent(), i ]) ];
@@ -18960,7 +18977,7 @@ var El = /** @class */ function(e) {
     return t(n, e), n.prototype._toFieldTransform = function(t) {
         var e = Tl(this, t, 
         /*array=*/ !0), n = this._a.map((function(t) {
-            return Nl(t, e);
+            return Cl(t, e);
         })), r = new qn(n);
         return new zn(t.path, r);
     }, n.prototype.isEqual = function(t) {
@@ -18975,7 +18992,7 @@ var El = /** @class */ function(e) {
     return t(n, e), n.prototype._toFieldTransform = function(t) {
         var e = Tl(this, t, 
         /*array=*/ !0), n = this._a.map((function(t) {
-            return Nl(t, e);
+            return Cl(t, e);
         })), r = new Bn(n);
         return new zn(t.path, r);
     }, n.prototype.isEqual = function(t) {
@@ -19009,7 +19026,7 @@ var El = /** @class */ function(e) {
         if (r instanceof Il) 
         // Add it to the field mask, but don't add anything to updateData.
         o.push(a); else {
-            var c = Nl(r, s);
+            var c = Cl(r, s);
             null != c && (o.push(a), u.set(a, c));
         }
     }));
@@ -19032,7 +19049,7 @@ var El = /** @class */ function(e) {
         if (p instanceof Il) 
         // Add it to the field mask, but don't add anything to updateData.
         l.push(d); else {
-            var m = Nl(p, v);
+            var m = Cl(p, v);
             null != m && (l.push(d), h.set(d, m));
         }
     }
@@ -19046,8 +19063,8 @@ var El = /** @class */ function(e) {
  *
  * @param allowArrays - Whether the query value is an array that may directly
  * contain additional arrays (e.g. the operand of an `in` query).
- */ function Cl(t, e, n, r) {
-    return void 0 === r && (r = !1), Nl(n, t.da(r ? 4 /* UserDataSource.ArrayArgument */ : 3 /* UserDataSource.Argument */ , e));
+ */ function Nl(t, e, n, r) {
+    return void 0 === r && (r = !1), Cl(n, t.da(r ? 4 /* UserDataSource.ArrayArgument */ : 3 /* UserDataSource.Argument */ , e));
 }
 
 /**
@@ -19058,7 +19075,7 @@ var El = /** @class */ function(e) {
  * the source of the data being parsed, etc.
  * @returns The parsed value, or null if the value was a FieldValue sentinel
  * that should not be included in the resulting parsed data.
- */ function Nl(t, e) {
+ */ function Cl(t, e) {
     if (Fl(
     // Unwrap the API type from the Compat SDK. This will return the API type
     // from firestore-exp.
@@ -19098,7 +19115,7 @@ var El = /** @class */ function(e) {
         if (e.settings.oa && 4 /* UserDataSource.ArrayArgument */ !== e.sa) throw e.ha("Nested arrays are not supported");
         return function(t, e) {
             for (var n = [], r = 0, i = 0, o = t; i < o.length; i++) {
-                var u = Nl(o[i], e.aa(r));
+                var u = Cl(o[i], e.aa(r));
                 null == u && (
                 // Just include nulls in the array for fields being replaced with a
                 // sentinel.
@@ -19165,7 +19182,7 @@ function kl(t, e) {
     // If we encounter an empty object, we explicitly add it to the update
     // mask to ensure that the server creates a map entry.
     e.path && e.path.length > 0 && e.fieldMask.push(e.path) : Kt(t, (function(t, r) {
-        var i = Nl(r, e.ra(t));
+        var i = Cl(r, e.ra(t));
         null != i && (n[t] = i);
     })), {
         mapValue: {
@@ -19459,7 +19476,7 @@ function Bl(t, e) {
                     };
                 } else a = ch(r, t, u);
             } else "in" /* Operator.IN */ !== o && "not-in" /* Operator.NOT_IN */ !== o && "array-contains-any" /* Operator.ARRAY_CONTAINS_ANY */ !== o || lh(u, o), 
-            a = Cl(n, "where", u, 
+            a = Nl(n, "where", u, 
             /* allowArrays= */ "in" /* Operator.IN */ === o || "not-in" /* Operator.NOT_IN */ === o);
             return Ae.create(i, o, a);
         }(t._query, 0, e, t.firestore._databaseId, this._field, this._op, this._value);
@@ -19508,7 +19525,7 @@ function Bl(t, e) {
         })).filter((function(t) {
             return t.getFilters().length > 0;
         }));
-        return 1 === e.length ? e[0] : Ce.create(e, this._getOperator());
+        return 1 === e.length ? e[0] : Ne.create(e, this._getOperator());
     }, n.prototype._apply = function(t) {
         var e = this._parse(t);
         return 0 === e.getFilters().length ? t : (function(t, e) {
@@ -19525,13 +19542,14 @@ function Bl(t, e) {
 }(Kl);
 
 /**
- * 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 Yl() {
     for (var t = [], e = 0; e < arguments.length; e++) t[e] = arguments[e];
@@ -19540,13 +19558,14 @@ function Bl(t, e) {
         return dh("or", t);
     })), Hl._create("or" /* CompositeOperator.OR */ , t)
     /**
- * 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
  */;
 }
@@ -19783,7 +19802,7 @@ function ah() {
                 var h = new ft(l);
                 a.push(fe(e, h));
             } else {
-                var f = Cl(n, r, c);
+                var f = Nl(n, r, c);
                 a.push(f);
             }
         }
@@ -20358,7 +20377,8 @@ var Sh = /** @class */ function(e) {
     }))
     /**
  * 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.
  */;
@@ -20415,7 +20435,7 @@ function Ah(t) {
  * server. Returns an error if the network is not available.
  *
  * @returns A `Promise` that will be resolved with the results of the query.
- */ function Ch(t) {
+ */ function Nh(t) {
     t = ac(t, pc);
     var e = ac(t.firestore, zc), n = Yc(e), r = new Sh(e);
     return Bc(n, t._query, {
@@ -20425,7 +20445,7 @@ function Ah(t) {
     }));
 }
 
-function Nh(t, e, n) {
+function Ch(t, e, n) {
     t = ac(t, dc);
     var r = ac(t.firestore, zc), i = yh(t.converter, e, n);
     return Mh(r, [ bl(wl(r), "setDoc", t._key, i, null !== t.converter, n).toMutation(t._key, Hn.none()) ]);
@@ -21174,9 +21194,9 @@ function $h(t, e) {
     return r = Object.assign({
         useFetchStreams: Kh
     }, r), o._setSettings(r), o;
-}), "PUBLIC").setMultipleInstances(!0)), u(C, "3.8.0", void 0), 
+}), "PUBLIC").setMultipleInstances(!0)), u(N, "3.8.1-canary.0bab0b7a7", void 0), 
 // BUILD_TARGET will be replaced by values like esm5, esm2017, cjs5, etc during the compilation
-u(C, "3.8.0", "esm5");
+u(N, "3.8.1-canary.0bab0b7a7", "esm5");
 
-export { ph as AbstractUserDataWriter, Sc as AggregateField, _c as AggregateQuerySnapshot, sl as Bytes, Qc as CACHE_SIZE_UNLIMITED, yc as CollectionReference, dc as DocumentReference, gh as DocumentSnapshot, cl as FieldPath, hl as FieldValue, zc as Firestore, j as FirestoreError, fl as GeoPoint, jc as LoadBundleTask, pc as Query, Hl as QueryCompositeFilterConstraint, jl as QueryConstraint, wh as QueryDocumentSnapshot, oh as QueryEndAtConstraint, zl as QueryFieldFilterConstraint, $l as QueryLimitConstraint, Zl as QueryOrderByConstraint, bh as QuerySnapshot, nh as QueryStartAtConstraint, mh as SnapshotMetadata, ut as Timestamp, jh as Transaction, Bh as WriteBatch, Bt as _DatabaseId, ft as _DocumentKey, tt as _EmptyAppCheckTokenProvider, W as _EmptyAuthCredentialsProvider, ht as _FieldPath, ac as _cast, B as _debugAssert, Ht as _isBase64Available, L as _logWarn, rc as _validateIsNotUsedTogether, Oh as addDoc, Ph as aggregateQuerySnapshotEqual, Xl as and, Yh as arrayRemove, Hh as arrayUnion, tl as clearIndexedDbPersistence, vc as collection, mc as collectionGroup, fc as connectFirestoreEmulator, Fh as deleteDoc, zh as deleteField, rl as disableNetwork, gc as doc, ll as documentId, Zc as enableIndexedDbPersistence, Jc as enableMultiTabIndexedDbPersistence, nl as enableNetwork, ah as endAt, uh as endBefore, Yc as ensureFirestoreConfigured, Mh as executeWrite, qh as getCountFromServer, Eh as getDoc, _h as getDocFromCache, Dh as getDocFromServer, xh as getDocs, Ah as getDocsFromCache, Ch as getDocsFromServer, Hc as getFirestore, Xh as increment, Wc as initializeFirestore, th as limit, eh as limitToLast, ol as loadBundle, ul as namedQuery, Rh as onSnapshot, Vh as onSnapshotsInSync, Yl as or, Jl as orderBy, Ql as query, bc as queryEqual, wc as refEqual, Qh as runTransaction, Wh as serverTimestamp, Nh as setDoc, Jh as setIndexConfiguration, R as setLogLevel, Th as snapshotEqual, ih as startAfter, rh as startAt, il as terminate, kh as updateDoc, el as waitForPendingWrites, Wl as where, Zh as writeBatch };
+export { ph as AbstractUserDataWriter, Sc as AggregateField, _c as AggregateQuerySnapshot, sl as Bytes, Qc as CACHE_SIZE_UNLIMITED, yc as CollectionReference, dc as DocumentReference, gh as DocumentSnapshot, cl as FieldPath, hl as FieldValue, zc as Firestore, j as FirestoreError, fl as GeoPoint, jc as LoadBundleTask, pc as Query, Hl as QueryCompositeFilterConstraint, jl as QueryConstraint, wh as QueryDocumentSnapshot, oh as QueryEndAtConstraint, zl as QueryFieldFilterConstraint, $l as QueryLimitConstraint, Zl as QueryOrderByConstraint, bh as QuerySnapshot, nh as QueryStartAtConstraint, mh as SnapshotMetadata, ut as Timestamp, jh as Transaction, Bh as WriteBatch, Bt as _DatabaseId, ft as _DocumentKey, tt as _EmptyAppCheckTokenProvider, W as _EmptyAuthCredentialsProvider, ht as _FieldPath, ac as _cast, B as _debugAssert, Ht as _isBase64Available, L as _logWarn, rc as _validateIsNotUsedTogether, Oh as addDoc, Ph as aggregateQuerySnapshotEqual, Xl as and, Yh as arrayRemove, Hh as arrayUnion, tl as clearIndexedDbPersistence, vc as collection, mc as collectionGroup, fc as connectFirestoreEmulator, Fh as deleteDoc, zh as deleteField, rl as disableNetwork, gc as doc, ll as documentId, Zc as enableIndexedDbPersistence, Jc as enableMultiTabIndexedDbPersistence, nl as enableNetwork, ah as endAt, uh as endBefore, Yc as ensureFirestoreConfigured, Mh as executeWrite, qh as getCountFromServer, Eh as getDoc, _h as getDocFromCache, Dh as getDocFromServer, xh as getDocs, Ah as getDocsFromCache, Nh as getDocsFromServer, Hc as getFirestore, Xh as increment, Wc as initializeFirestore, th as limit, eh as limitToLast, ol as loadBundle, ul as namedQuery, Rh as onSnapshot, Vh as onSnapshotsInSync, Yl as or, Jl as orderBy, Ql as query, bc as queryEqual, wc as refEqual, Qh as runTransaction, Wh as serverTimestamp, Ch as setDoc, Jh as setIndexConfiguration, R as setLogLevel, Th as snapshotEqual, ih as startAfter, rh as startAt, il as terminate, kh as updateDoc, el as waitForPendingWrites, Wl as where, Zh as writeBatch };
 //# sourceMappingURL=index.esm5.js.map