@firebase/firestore 3.7.1 → 3.7.2-canary.457fc2eeb

package/dist/index.esm5.js

@@ -6,11 +6,11 @@ import { Component as c } from "@firebase/component";
 
 import { Logger as l, LogLevel as h } from "@firebase/logger";
 
-import { FirebaseError as f, getUA as d, isSafari as p, getModularInstance as v, createMockUserToken as y, deepEqual as m, getDefaultEmulatorHostnameAndPort as g, isIndexedDBAvailable as w } from "@firebase/util";
+import { FirebaseError as f, getUA as d, isSafari as p, getModularInstance as v, isIndexedDBAvailable as y, createMockUserToken as m, deepEqual as g, getDefaultEmulatorHostnameAndPort as w } from "@firebase/util";
 
-import { XhrIo as b, EventType as I, ErrorCode as E, createWebChannelTransport as T, getStatEventTarget as S, FetchXmlHttpFactory as D, WebChannel as _, Event as x, Stat as N } from "@firebase/webchannel-wrapper";
+import { XhrIo as b, EventType as I, ErrorCode as T, createWebChannelTransport as E, getStatEventTarget as S, FetchXmlHttpFactory as D, WebChannel as x, Event as _, Stat as A } from "@firebase/webchannel-wrapper";
 
-var A = "@firebase/firestore", C = /** @class */ function() {
+var N = "@firebase/firestore", C = /** @class */ function() {
     function t(t) {
         this.uid = t;
     }
@@ -70,7 +70,7 @@ C.MOCK_USER = new C("mock-user");
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var k = "9.12.1", O = new l("@firebase/firestore");
+var k = "9.13.0-canary.457fc2eeb", O = new l("@firebase/firestore");
 
 /**
  * @license
@@ -1128,7 +1128,7 @@ function gt(t, e) {
         /** The state of an index that has not yet been backfilled. */;
     }
     return t.empty = function() {
-        return new t(0, Et.min());
+        return new t(0, Tt.min());
     }, t;
 }();
 
@@ -1143,17 +1143,17 @@ function gt(t, e) {
     // `(readTime + 1, DocumentKey.empty())` since `> DocumentKey.empty()` matches
     // all valid document IDs.
     var n = t.toTimestamp().seconds, r = t.toTimestamp().nanoseconds + 1, i = st.fromTimestamp(1e9 === r ? new ut(n + 1, 0) : new ut(n, r));
-    return new Et(i, ft.empty(), e);
+    return new Tt(i, ft.empty(), e);
 }
 
 /** Creates a new offset based on the provided document. */ function It(t) {
-    return new Et(t.readTime, t.key, -1);
+    return new Tt(t.readTime, t.key, -1);
 }
 
 /**
  * Stores the latest read time, document and batch ID that were processed for an
  * index.
- */ var Et = /** @class */ function() {
+ */ var Tt = /** @class */ function() {
     function t(
     /**
      * The latest read time version that has been indexed by Firestore for this
@@ -1180,7 +1180,7 @@ function gt(t, e) {
     }, t;
 }();
 
-function Tt(t, e) {
+function Et(t, e) {
     var n = t.readTime.compareTo(e.readTime);
     return 0 !== n ? n : 0 !== (n = ft.comparator(t.documentKey, e.documentKey)) ? n : rt(t.largestBatchId, e.largestBatchId);
 }
@@ -1247,7 +1247,7 @@ function Tt(t, e) {
  * @param err - An error returned by a LocalStore operation.
  * @returns A Promise that resolves after we recovered, or the original error.
  */
-function _t(t) {
+function xt(t) {
     return e(this, void 0, void 0, (function() {
         return n(this, (function(e) {
             if (t.code !== K.FAILED_PRECONDITION || t.message !== St) throw t;
@@ -1284,7 +1284,7 @@ function _t(t) {
  *
  * NOTE: .then() and .catch() only allow a single consumer, unlike normal
  * Promises.
- */ var xt = /** @class */ function() {
+ */ var _t = /** @class */ function() {
     function t(t) {
         var e = this;
         // NOTE: next/catchCallback will always point to our own wrapper functions,
@@ -1409,7 +1409,7 @@ function _t(t) {
             i();
         }));
     }, t;
-}(), Nt = /** @class */ function() {
+}(), At = /** @class */ function() {
     function t(t, e) {
         var n = this;
         this.action = t, this.transaction = e, this.aborted = !1, 
@@ -1460,7 +1460,7 @@ function _t(t) {
         var e = this.transaction.objectStore(t);
         return new Rt(e);
     }, t;
-}(), At = /** @class */ function() {
+}(), Nt = /** @class */ function() {
     /*
      * Creates a new SimpleDb wrapper for IndexedDb database `name`.
      *
@@ -1482,7 +1482,7 @@ function _t(t) {
         return L("SimpleDb", "Removing database:", t), Vt(window.indexedDB.deleteDatabase(t)).toPromise();
     }, 
     /** Returns true if IndexedDB is available in the current environment. */ t.C = function() {
-        if (!w()) return !1;
+        if (!y()) return !1;
         if (t.N()) return !0;
         // We extensively use indexed array values and compound keys,
         // which IE and Edge do not support. However, they still have indexedDB
@@ -1593,11 +1593,11 @@ function _t(t) {
                                 // Wait for the transaction to complete (i.e. IndexedDb's onsuccess event to
                                 // fire), but still return the original transactionFnResult back to the
                                 // caller.
-                                return a.db = n.sent(), r = Nt.open(a.db, t, e ? "readonly" : "readwrite", i), s = o(r).next((function(t) {
+                                return a.db = n.sent(), r = At.open(a.db, t, e ? "readonly" : "readwrite", i), s = o(r).next((function(t) {
                                     return r.V(), t;
                                 })).catch((function(t) {
                                     // Abort the transaction if there was an error.
-                                    return r.abort(t), xt.reject(t);
+                                    return r.abort(t), _t.reject(t);
                                 })).toPromise(), c = {}, s.catch((function() {})), [ 4 /*yield*/ , r.v ];
 
                               case 3:
@@ -1790,7 +1790,7 @@ function _t(t) {
             }));
         }
         var o = this.store.getAll(n.range);
-        return new xt((function(t, e) {
+        return new _t((function(t, e) {
             o.onerror = function(t) {
                 e(t.target.error);
             }, o.onsuccess = function(e) {
@@ -1804,7 +1804,7 @@ function _t(t) {
      */
     t.prototype.J = function(t, e) {
         var n = this.store.getAll(t, null === e ? void 0 : e);
-        return new xt((function(t, e) {
+        return new _t((function(t, e) {
             n.onerror = function(t) {
                 e(t.target.error);
             }, n.onsuccess = function(e) {
@@ -1835,7 +1835,7 @@ function _t(t) {
      */
     t.prototype.tt = function(t) {
         var e = this.cursor({});
-        return new xt((function(n, r) {
+        return new _t((function(n, r) {
             e.onerror = function(t) {
                 var e = Mt(t.target.error);
                 r(e);
@@ -1848,16 +1848,16 @@ function _t(t) {
         }));
     }, t.prototype.H = function(t, e) {
         var n = [];
-        return new xt((function(r, i) {
+        return new _t((function(r, i) {
             t.onerror = function(t) {
                 i(t.target.error);
             }, t.onsuccess = function(t) {
                 var i = t.target.result;
                 if (i) {
                     var o = new Ct(i), u = e(i.primaryKey, i.value, o);
-                    if (u instanceof xt) {
+                    if (u instanceof _t) {
                         var s = u.catch((function(t) {
-                            return o.done(), xt.reject(t);
+                            return o.done(), _t.reject(t);
                         }));
                         n.push(s);
                     }
@@ -1865,7 +1865,7 @@ function _t(t) {
                 } else r();
             };
         })).next((function() {
-            return xt.waitFor(n);
+            return _t.waitFor(n);
         }));
     }, t.prototype.options = function(t, e) {
         var n;
@@ -1887,7 +1887,7 @@ function _t(t) {
  * Wraps an IDBRequest in a PersistencePromise, using the onsuccess / onerror
  * handlers to resolve / reject the PersistencePromise as appropriate.
  */ function Vt(t) {
-    return new xt((function(e, n) {
+    return new _t((function(e, n) {
         t.onsuccess = function(t) {
             var n = t.target.result;
             e(n);
@@ -1902,7 +1902,7 @@ function _t(t) {
 var Lt = !1;
 
 function Mt(t) {
-    var e = At.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) {
@@ -1955,7 +1955,7 @@ function Mt(t) {
                         [ 3 /*break*/ , 6 ]) : [ 3 /*break*/ , 4 ];
 
                       case 4:
-                        return [ 4 /*yield*/ , _t(i) ];
+                        return [ 4 /*yield*/ , xt(i) ];
 
                       case 5:
                         n.sent(), n.label = 6;
@@ -1997,7 +1997,7 @@ function Mt(t) {
     }, 
     /** Writes index entries until the cap is reached. Returns the number of documents processed. */ t.prototype.it = function(t, e) {
         var n = this, r = new Set, i = e, o = !0;
-        return xt.doWhile((function() {
+        return _t.doWhile((function() {
             return !0 === o && i > 0;
         }), (function() {
             return n.localStore.indexManager.getNextCollectionGroupToUpdate(t).next((function(e) {
@@ -2034,8 +2034,8 @@ function Mt(t) {
         var n = t;
         return e.changes.forEach((function(t, e) {
             var r = It(e);
-            Tt(r, n) > 0 && (n = r);
-        })), new Et(n.readTime, n.documentKey, Math.max(e.batchId, t.largestBatchId));
+            Et(r, n) > 0 && (n = r);
+        })), new Tt(n.readTime, n.documentKey, Math.max(e.batchId, t.largestBatchId));
     }, t;
 }(), qt = /** @class */ function() {
     function t(t, e) {
@@ -2914,7 +2914,7 @@ function se(t) {
 };
 
 /** Extracts the backend's type order for the provided value. */ function fe(t) {
-    return "nullValue" in t ? 0 /* NullValue */ : "booleanValue" in t ? 1 /* BooleanValue */ : "integerValue" in t || "doubleValue" in t ? 2 /* NumberValue */ : "timestampValue" in t ? 3 /* TimestampValue */ : "stringValue" in t ? 5 /* StringValue */ : "bytesValue" in t ? 6 /* BlobValue */ : "referenceValue" in t ? 7 /* RefValue */ : "geoPointValue" in t ? 8 /* GeoPointValue */ : "arrayValue" in t ? 9 /* ArrayValue */ : "mapValue" in t ? ne(t) ? 4 /* ServerTimestampValue */ : _e(t) ? 9007199254740991 /* MaxValue */ : 10 /* ObjectValue */ : q();
+    return "nullValue" in t ? 0 /* NullValue */ : "booleanValue" in t ? 1 /* BooleanValue */ : "integerValue" in t || "doubleValue" in t ? 2 /* NumberValue */ : "timestampValue" in t ? 3 /* TimestampValue */ : "stringValue" in t ? 5 /* StringValue */ : "bytesValue" in t ? 6 /* BlobValue */ : "referenceValue" in t ? 7 /* RefValue */ : "geoPointValue" in t ? 8 /* GeoPointValue */ : "arrayValue" in t ? 9 /* ArrayValue */ : "mapValue" in t ? ne(t) ? 4 /* ServerTimestampValue */ : xe(t) ? 9007199254740991 /* MaxValue */ : 10 /* ObjectValue */ : q();
 }
 
 /** Tests `left` and `right` for equality based on the backend semantics. */ function de(t, e) {
@@ -3121,11 +3121,11 @@ function we(t, e) {
     return !!t && "arrayValue" in t;
 }
 
-/** Returns true if `value` is a NullValue. */ function Ee(t) {
+/** Returns true if `value` is a NullValue. */ function Te(t) {
     return !!t && "nullValue" in t;
 }
 
-/** Returns true if `value` is NaN. */ function Te(t) {
+/** Returns true if `value` is NaN. */ function Ee(t) {
     return !!t && "doubleValue" in t && isNaN(Number(t.doubleValue));
 }
 
@@ -3161,11 +3161,11 @@ function we(t, e) {
     return Object.assign({}, t);
 }
 
-/** Returns true if the Value represents the canonical {@link #MAX_VALUE} . */ function _e(t) {
+/** Returns true if the Value represents the canonical {@link #MAX_VALUE} . */ function xe(t) {
     return "__max__" === (((t.mapValue || {}).fields || {}).__type__ || {}).stringValue;
 }
 
-/** Returns the lowest value for the given value type (inclusive). */ function xe(t) {
+/** Returns the lowest value for the given value type (inclusive). */ function _e(t) {
     return "nullValue" in t ? he : "booleanValue" in t ? {
         booleanValue: !1
     } : "integerValue" in t || "doubleValue" in t ? {
@@ -3190,7 +3190,7 @@ function we(t, e) {
     } : q();
 }
 
-/** Returns the largest value for the given value type (exclusive). */ function Ne(t) {
+/** Returns the largest value for the given value type (exclusive). */ function Ae(t) {
     return "nullValue" in t ? {
         booleanValue: !1
     } : "booleanValue" in t ? {
@@ -3215,7 +3215,7 @@ function we(t, e) {
     } : "mapValue" in t ? le : q();
 }
 
-function Ae(t, e) {
+function Ne(t, e) {
     var n = ve(t.value, e.value);
     return 0 !== n ? n : t.inclusive && !e.inclusive ? -1 : !t.inclusive && e.inclusive ? 1 : 0;
 }
@@ -3582,7 +3582,7 @@ function Fe(t) {
         switch (s.op) {
           case "<" /* LESS_THAN */ :
           case "<=" /* LESS_THAN_OR_EQUAL */ :
-            a = xe(s.value);
+            a = _e(s.value);
             break;
 
           case "==" /* EQUAL */ :
@@ -3600,7 +3600,7 @@ function Fe(t) {
             a = he;
             // Remaining filters cannot be used as lower bounds.
                 }
-        Ae({
+        Ne({
             value: r,
             inclusive: i
         }, {
@@ -3612,7 +3612,7 @@ function Fe(t) {
     // range to see if we can narrow the scope.
         if (null !== n) for (var l = 0; l < t.orderBy.length; ++l) if (t.orderBy[l].field.isEqual(e)) {
         var h = n.position[l];
-        Ae({
+        Ne({
             value: r,
             inclusive: i
         }, {
@@ -3637,7 +3637,7 @@ function Fe(t) {
         switch (s.op) {
           case ">=" /* GREATER_THAN_OR_EQUAL */ :
           case ">" /* GREATER_THAN */ :
-            a = Ne(s.value), c = !1;
+            a = Ae(s.value), c = !1;
             break;
 
           case "==" /* EQUAL */ :
@@ -4113,7 +4113,7 @@ function wn(t, e, n) {
  * Returns a value for a number that's appropriate to put into a proto.
  * The return value is an IntegerValue if it can safely represent the value,
  * otherwise a DoubleValue is returned.
- */ function En(t, e) {
+ */ function Tn(t, e) {
     return ce(e) ? In(e) : bn(t, e);
 }
 
@@ -4133,7 +4133,7 @@ function wn(t, e, n) {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/** Used to represent a field transform on a mutation. */ var Tn = function() {
+/** Used to represent a field transform on a mutation. */ var En = function() {
     // Make sure that the structural type of `TransformOperation` is unique.
     // See https://github.com/microsoft/TypeScript/issues/5451
     this._ = void 0;
@@ -4143,7 +4143,7 @@ function wn(t, e, n) {
  * Computes the local transform result against the provided `previousValue`,
  * optionally using the provided localWriteTime.
  */ function Sn(t, e, n) {
-    return t instanceof xn ? function(t, e) {
+    return t instanceof _n ? function(t, e) {
         var n = {
             fields: {
                 __type__: {
@@ -4160,11 +4160,11 @@ function wn(t, e, n) {
         return e && (n.fields.__previous_value__ = e), {
             mapValue: n
         };
-    }(n, e) : t instanceof Nn ? An(t, e) : t instanceof Cn ? kn(t, e) : function(t, e) {
+    }(n, e) : t instanceof An ? Nn(t, e) : t instanceof Cn ? kn(t, e) : function(t, e) {
         // PORTING NOTE: Since JavaScript's integer arithmetic is limited to 53 bit
         // precision and resolves overflows by reducing precision, we do not
         // manually cap overflows at 2^63.
-        var n = _n(t, e), r = Rn(n) + Rn(t.yt);
+        var n = xn(t, e), r = Rn(n) + Rn(t.yt);
         return be(n) && be(t.yt) ? In(r) : bn(t.It, r);
     }(t, e);
 }
@@ -4176,7 +4176,7 @@ function wn(t, e, n) {
     // The server just sends null as the transform result for array operations,
     // so we have to calculate a result the same as we do for local
     // applications.
-    return t instanceof Nn ? An(t, e) : t instanceof Cn ? kn(t, e) : n;
+    return t instanceof An ? Nn(t, e) : t instanceof Cn ? kn(t, e) : n;
 }
 
 /**
@@ -4193,7 +4193,7 @@ function wn(t, e, n) {
  *
  * @returns a base value to store along with the mutation, or null for
  * idempotent transforms.
- */ function _n(t, e) {
+ */ function xn(t, e) {
     return t instanceof On ? be(n = e) || function(t) {
         return !!t && "doubleValue" in t;
     }(n) ? e : {
@@ -4202,20 +4202,20 @@ function wn(t, e, n) {
     var n;
 }
 
-/** Transforms a value into a server-generated timestamp. */ var xn = /** @class */ function(e) {
+/** Transforms a value into a server-generated timestamp. */ var _n = /** @class */ function(e) {
     function n() {
         return null !== e && e.apply(this, arguments) || this;
     }
     return t(n, e), n;
-}(Tn), Nn = /** @class */ function(e) {
+}(En), An = /** @class */ function(e) {
     function n(t) {
         var n = this;
         return (n = e.call(this) || this).elements = t, n;
     }
     return t(n, e), n;
-}(Tn);
+}(En);
 
-/** Transforms an array value via a union operation. */ function An(t, e) {
+/** Transforms an array value via a union operation. */ function Nn(t, e) {
     for (var n = Vn(e), r = function(t) {
         n.some((function(e) {
             return de(e, t);
@@ -4236,7 +4236,7 @@ function wn(t, e, n) {
         return (n = e.call(this) || this).elements = t, n;
     }
     return t(n, e), n;
-}(Tn);
+}(En);
 
 function kn(t, e) {
     for (var n = Vn(e), r = function(t) {
@@ -4264,7 +4264,7 @@ function kn(t, e) {
         return (r = e.call(this) || this).It = t, r.yt = n, r;
     }
     return t(n, e), n;
-}(Tn);
+}(En);
 
 function Rn(t) {
     return te(t.integerValue || t.doubleValue);
@@ -4506,7 +4506,7 @@ e) {
  * idempotent mutations.
  */ function Kn(t, e) {
     for (var n = null, r = 0, i = t.fieldTransforms; r < i.length; r++) {
-        var o = i[r], u = e.data.field(o.field), s = _n(o.transform, u || null);
+        var o = i[r], u = e.data.field(o.field), s = xn(o.transform, u || null);
         null != s && (null === n && (n = ke.empty()), n.set(o.field, s));
     }
     return n || null;
@@ -4517,7 +4517,7 @@ function jn(t, e) {
         return void 0 === t && void 0 === e || !(!t || !e) && it(t, e, (function(t, e) {
             return function(t, e) {
                 return t.field.isEqual(e.field) && function(t, e) {
-                    return t instanceof Nn && e instanceof Nn || t instanceof Cn && e instanceof Cn ? it(t.elements, e.elements, de) : t instanceof On && e instanceof On ? de(t.yt, e.yt) : t instanceof xn && e instanceof xn;
+                    return t instanceof An && e instanceof An || t instanceof Cn && e instanceof Cn ? it(t.elements, e.elements, de) : t instanceof On && e instanceof On ? de(t.yt, e.yt) : t instanceof _n && e instanceof _n;
                 }(t.transform, e.transform);
             }(t, e);
         }));
@@ -5031,7 +5031,7 @@ n
 /** An RPC error indicating why the watch failed. */ , r) {
     void 0 === n && (n = Zt.EMPTY_BYTE_STRING), void 0 === r && (r = null), this.state = t, 
     this.targetIds = e, this.resumeToken = n, this.cause = r;
-}, Er = /** @class */ function() {
+}, Tr = /** @class */ function() {
     function t() {
         /**
          * The number of pending responses (adds or removes) that we are waiting on.
@@ -5137,7 +5137,7 @@ n
     }, t.prototype.$t = function() {
         this.Vt = !0, this.vt = !0;
     }, t;
-}(), Tr = /** @class */ function() {
+}(), Er = /** @class */ function() {
     function t(t) {
         this.Bt = t, 
         /** The internal state of all tracked targets. */
@@ -5333,7 +5333,7 @@ n
         this.zt(t).Mt();
     }, t.prototype.zt = function(t) {
         var e = this.Lt.get(t);
-        return e || (e = new Er, this.Lt.set(t, e)), e;
+        return e || (e = new Tr, this.Lt.set(t, e)), e;
     }, t.prototype.ne = function(t) {
         var e = this.qt.get(t);
         return e || (e = new zt(rt), this.qt = this.qt.insert(t, e)), e;
@@ -5362,7 +5362,7 @@ n
      */
     t.prototype.Jt = function(t) {
         var e = this;
-        this.Lt.set(t, new Er), this.Bt.getRemoteKeysForTarget(t).forEach((function(n) {
+        this.Lt.set(t, new Tr), this.Bt.getRemoteKeysForTarget(t).forEach((function(n) {
             e.jt(t, n, /*updatedDocument=*/ null);
         }));
     }, 
@@ -5405,10 +5405,10 @@ function Dr() {
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */ var _r = {
+ */ var xr = {
     asc: "ASCENDING",
     desc: "DESCENDING"
-}, xr = {
+}, _r = {
     "<": "LESS_THAN",
     "<=": "LESS_THAN_OR_EQUAL",
     ">": "GREATER_THAN",
@@ -5419,7 +5419,7 @@ function Dr() {
     in: "IN",
     "not-in": "NOT_IN",
     "array-contains-any": "ARRAY_CONTAINS_ANY"
-}, Nr = function(t, e) {
+}, Ar = function(t, e) {
     this.databaseId = t, this.gt = e;
 };
 
@@ -5440,7 +5440,7 @@ function Dr() {
 /**
  * Returns a value for a Date that's appropriate to put into a proto.
  */
-function Ar(t, e) {
+function Nr(t, e) {
     return t.gt ? new Date(1e3 * e.seconds).toISOString().replace(/\.\d*/, "").replace("Z", "") + "." + ("000000000" + e.nanoseconds).slice(-9) + "Z" : {
         seconds: "" + e.seconds,
         nanos: e.nanoseconds
@@ -5458,7 +5458,7 @@ function Ar(t, e) {
 /**
  * Returns a ByteString based on the proto string value.
  */ function kr(t, e) {
-    return Ar(t, e.toTimestamp());
+    return Nr(t, e.toTimestamp());
 }
 
 function Or(t) {
@@ -5546,11 +5546,11 @@ function Kr(t, e) {
     return e.fieldTransforms.length > 0 && (n.updateTransforms = e.fieldTransforms.map((function(t) {
         return function(t, e) {
             var n = e.transform;
-            if (n instanceof xn) return {
+            if (n instanceof _n) return {
                 fieldPath: e.field.canonicalString(),
                 setToServerValue: "REQUEST_TIME"
             };
-            if (n instanceof Nn) return {
+            if (n instanceof An) return {
                 fieldPath: e.field.canonicalString(),
                 appendMissingElements: {
                     values: n.elements
@@ -5583,9 +5583,9 @@ function jr(t, e) {
     }(e.currentDocument) : Pn.none(), r = e.updateTransforms ? e.updateTransforms.map((function(e) {
         return function(t, e) {
             var n = null;
-            if ("setToServerValue" in e) U("REQUEST_TIME" === e.setToServerValue), n = new xn; else if ("appendMissingElements" in e) {
+            if ("setToServerValue" in e) U("REQUEST_TIME" === e.setToServerValue), n = new _n; else if ("appendMissingElements" in e) {
                 var r = e.appendMissingElements.values || [];
-                n = new Nn(r);
+                n = new An(r);
             } else if ("removeAllFromArray" in e) {
                 var i = e.removeAllFromArray.values || [];
                 n = new Cn(i);
@@ -5646,26 +5646,26 @@ function zr(t, e) {
                 // visible for testing
                 return function(t) {
                     if ("==" /* EQUAL */ === t.op) {
-                        if (Te(t.value)) return {
+                        if (Ee(t.value)) return {
                             unaryFilter: {
                                 field: Zr(t.field),
                                 op: "IS_NAN"
                             }
                         };
-                        if (Ee(t.value)) return {
+                        if (Te(t.value)) return {
                             unaryFilter: {
                                 field: Zr(t.field),
                                 op: "IS_NULL"
                             }
                         };
                     } else if ("!=" /* NOT_EQUAL */ === t.op) {
-                        if (Te(t.value)) return {
+                        if (Ee(t.value)) return {
                             unaryFilter: {
                                 field: Zr(t.field),
                                 op: "IS_NOT_NAN"
                             }
                         };
-                        if (Ee(t.value)) return {
+                        if (Te(t.value)) return {
                             unaryFilter: {
                                 field: Zr(t.field),
                                 op: "IS_NOT_NULL"
@@ -5772,11 +5772,11 @@ function Hr(t) {
 }
 
 function Yr(t) {
-    return _r[t];
+    return xr[t];
 }
 
 function Xr(t) {
-    return xr[t];
+    return _r[t];
 }
 
 function Zr(t) {
@@ -6020,7 +6020,7 @@ function ni(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 li = {}, hi = [ "prefixPath", "collectionGroup", "readTime", "documentId" ], fi = [ "prefixPath", "collectionGroup", "documentId" ], di = [ "collectionGroup", "readTime", "prefixPath", "documentId" ], pi = [ "canonicalId", "targetId" ], vi = [ "targetId", "path" ], yi = [ "path", "targetId" ], mi = [ "collectionId", "parent" ], gi = [ "indexId", "uid" ], wi = [ "uid", "sequenceNumber" ], bi = [ "indexId", "uid", "arrayValue", "directionalValue", "orderedDocumentKey", "documentKey" ], Ii = [ "indexId", "uid", "orderedDocumentKey" ], Ei = [ "userId", "collectionPath", "documentId" ], Ti = [ "userId", "collectionPath", "largestBatchId" ], Si = [ "userId", "collectionGroup", "largestBatchId" ], Di = r(r([], r(r([], r(r([], r(r([], [ "mutationQueues", "mutations", "documentMutations", "remoteDocuments", "targets", "owner", "targetGlobal", "targetDocuments" ]), [ "clientMetadata" ])), [ "remoteDocumentGlobal" ])), [ "collectionParents" ])), [ "bundles", "namedQueries" ]), _i = r(r([], Di), [ "documentOverlays" ]), xi = [ "mutationQueues", "mutations", "documentMutations", "remoteDocumentsV14", "targets", "owner", "targetGlobal", "targetDocuments", "clientMetadata", "remoteDocumentGlobal", "collectionParents", "bundles", "namedQueries", "documentOverlays" ], Ni = xi, Ai = r(r([], Ni), [ "indexConfiguration", "indexState", "indexEntries" ]), Ci = /** @class */ function(e) {
+ */ var li = {}, hi = [ "prefixPath", "collectionGroup", "readTime", "documentId" ], fi = [ "prefixPath", "collectionGroup", "documentId" ], di = [ "collectionGroup", "readTime", "prefixPath", "documentId" ], pi = [ "canonicalId", "targetId" ], vi = [ "targetId", "path" ], yi = [ "path", "targetId" ], mi = [ "collectionId", "parent" ], gi = [ "indexId", "uid" ], wi = [ "uid", "sequenceNumber" ], bi = [ "indexId", "uid", "arrayValue", "directionalValue", "orderedDocumentKey", "documentKey" ], Ii = [ "indexId", "uid", "orderedDocumentKey" ], Ti = [ "userId", "collectionPath", "documentId" ], Ei = [ "userId", "collectionPath", "largestBatchId" ], Si = [ "userId", "collectionGroup", "largestBatchId" ], Di = r(r([], r(r([], r(r([], r(r([], [ "mutationQueues", "mutations", "documentMutations", "remoteDocuments", "targets", "owner", "targetGlobal", "targetDocuments" ]), [ "clientMetadata" ])), [ "remoteDocumentGlobal" ])), [ "collectionParents" ])), [ "bundles", "namedQueries" ]), xi = r(r([], Di), [ "documentOverlays" ]), _i = [ "mutationQueues", "mutations", "documentMutations", "remoteDocumentsV14", "targets", "owner", "targetGlobal", "targetDocuments", "clientMetadata", "remoteDocumentGlobal", "collectionParents", "bundles", "namedQueries", "documentOverlays" ], Ai = _i, Ni = r(r([], Ai), [ "indexConfiguration", "indexState", "indexEntries" ]), Ci = /** @class */ function(e) {
     function n(t, n) {
         var r = this;
         return (r = e.call(this) || this).ie = t, r.currentSequenceNumber = n, r;
@@ -6045,7 +6045,7 @@ function ni(t) {
  * limitations under the License.
  */ function ki(t, e) {
     var n = G(t);
-    return At.M(n.ie, e);
+    return Nt.M(n.ie, e);
 }
 
 /**
@@ -6244,7 +6244,7 @@ function ni(t) {
         return {
             name: Lr(t, e.key),
             fields: e.data.value.mapValue.fields,
-            updateTime: Ar(t, e.version.toTimestamp())
+            updateTime: Nr(t, e.version.toTimestamp())
         };
     }(t.re, e); else if (e.isNoDocument()) r.noDocument = {
         path: n.path.toArray(),
@@ -6468,7 +6468,7 @@ function Wi(t, e, n, r) {
         }));
     }, t.prototype.getOverlays = function(t, e) {
         var n = this, r = cr();
-        return xt.forEach(e, (function(e) {
+        return _t.forEach(e, (function(e) {
             return n.getOverlay(t, e).next((function(t) {
                 null !== t && r.set(e, t);
             }));
@@ -6480,7 +6480,7 @@ function Wi(t, e, n, r) {
         return n.forEach((function(n, o) {
             var u = new Vi(e, o);
             i.push(r.ue(t, u));
-        })), xt.waitFor(i);
+        })), _t.waitFor(i);
     }, t.prototype.removeOverlaysForBatchId = function(t, e, n) {
         var r = this, i = new Set;
         // Get the set of unique collection paths.
@@ -6493,7 +6493,7 @@ function Wi(t, e, n, r) {
             /*lowerOpen=*/ !1, 
             /*upperOpen=*/ !0);
             o.push(Ji(t).Y("collectionPathOverlayIndex", i));
-        })), xt.waitFor(o);
+        })), _t.waitFor(o);
     }, t.prototype.getOverlaysForCollection = function(t, e, n) {
         var r = this, i = cr(), o = ri(e), u = IDBKeyRange.bound([ this.userId, o, n ], [ this.userId, o, Number.POSITIVE_INFINITY ], 
         /*lowerOpen=*/ !0);
@@ -6587,7 +6587,7 @@ function Wi(t, e, n, r) {
         e.me(ee(t.bytesValue)), this.we(e); else if ("referenceValue" in t) this.ge(t.referenceValue, e); else if ("geoPointValue" in t) {
             var i = t.geoPointValue;
             this.le(e, 45), e.fe(i.latitude || 0), e.fe(i.longitude || 0);
-        } else "mapValue" in t ? _e(t) ? this.le(e, Number.MAX_SAFE_INTEGER) : (this.ye(t.mapValue, e), 
+        } else "mapValue" in t ? xe(t) ? this.le(e, Number.MAX_SAFE_INTEGER) : (this.ye(t.mapValue, e), 
         this.we(e)) : "arrayValue" in t ? (this.pe(t.arrayValue, e), this.we(e)) : q();
     }, t.prototype._e = function(t, e) {
         this.le(e, 25), this.Ie(t, e);
@@ -6960,37 +6960,37 @@ function ao(t, e) {
         this.Ye = new ho;
     }
     return t.prototype.addToCollectionParentIndex = function(t, e) {
-        return this.Ye.add(e), xt.resolve();
+        return this.Ye.add(e), _t.resolve();
     }, t.prototype.getCollectionParents = function(t, e) {
-        return xt.resolve(this.Ye.getEntries(e));
+        return _t.resolve(this.Ye.getEntries(e));
     }, t.prototype.addFieldIndex = function(t, e) {
         // Field indices are not supported with memory persistence.
-        return xt.resolve();
+        return _t.resolve();
     }, t.prototype.deleteFieldIndex = function(t, e) {
         // Field indices are not supported with memory persistence.
-        return xt.resolve();
+        return _t.resolve();
     }, t.prototype.getDocumentsMatchingTarget = function(t, e) {
         // Field indices are not supported with memory persistence.
-        return xt.resolve(null);
+        return _t.resolve(null);
     }, t.prototype.getIndexType = function(t, e) {
         // Field indices are not supported with memory persistence.
-        return xt.resolve(0 /* NONE */);
+        return _t.resolve(0 /* NONE */);
     }, t.prototype.getFieldIndexes = function(t, e) {
         // Field indices are not supported with memory persistence.
-        return xt.resolve([]);
+        return _t.resolve([]);
     }, t.prototype.getNextCollectionGroupToUpdate = function(t) {
         // Field indices are not supported with memory persistence.
-        return xt.resolve(null);
+        return _t.resolve(null);
     }, t.prototype.getMinOffset = function(t, e) {
-        return xt.resolve(Et.min());
+        return _t.resolve(Tt.min());
     }, t.prototype.getMinOffsetFromCollectionGroup = function(t, e) {
-        return xt.resolve(Et.min());
+        return _t.resolve(Tt.min());
     }, t.prototype.updateCollectionGroup = function(t, e, n) {
         // Field indices are not supported with memory persistence.
-        return xt.resolve();
+        return _t.resolve();
     }, t.prototype.updateIndexEntries = function(t, e) {
         // Field indices are not supported with memory persistence.
-        return xt.resolve();
+        return _t.resolve();
     }, t;
 }(), ho = /** @class */ function() {
     function t() {
@@ -7049,7 +7049,7 @@ function ao(t, e) {
             };
             return vo(t).put(o);
         }
-        return xt.resolve();
+        return _t.resolve();
     }, t.prototype.getCollectionParents = function(t, e) {
         var n = [], r = IDBKeyRange.bound([ e, "" ], [ ot(e), "" ], 
         /*lowerOpen=*/ !1, 
@@ -7101,14 +7101,14 @@ function ao(t, e) {
         }));
     }, t.prototype.getDocumentsMatchingTarget = function(t, e) {
         var n = this, r = yo(t), i = !0, o = new Map;
-        return xt.forEach(this.tn(e), (function(e) {
+        return _t.forEach(this.tn(e), (function(e) {
             return n.en(t, e).next((function(t) {
                 i && (i = !!t), o.set(e, t);
             }));
         })).next((function() {
             if (i) {
                 var t = pr(), u = [];
-                return xt.forEach(o, (function(i, o) {
+                return _t.forEach(o, (function(i, o) {
                     var s;
                     L("IndexedDbIndexManager", "Using index " + ("id=" + (s = i).indexId + "|cg=" + s.collectionGroup + "|f=" + s.fields.map((function(t) {
                         return t.fieldPath + ":" + t.kind;
@@ -7166,7 +7166,7 @@ function ao(t, e) {
                         }
                         return new Ze(n, r);
                     }(o, i), f = n.nn(i, o, l), d = n.nn(i, o, h), p = n.sn(i, o, c), v = n.rn(i.indexId, a, f, l.inclusive, d, h.inclusive, p);
-                    return xt.forEach(v, (function(n) {
+                    return _t.forEach(v, (function(n) {
                         return r.J(n, e.limit).next((function(e) {
                             e.forEach((function(e) {
                                 var n = ft.fromSegments(e.documentKey);
@@ -7178,7 +7178,7 @@ function ao(t, e) {
                     return u;
                 }));
             }
-            return xt.resolve(null);
+            return _t.resolve(null);
         }));
     }, t.prototype.tn = function(t) {
         var e = this.Ze.get(t);
@@ -7225,7 +7225,7 @@ function ao(t, e) {
         }));
     }, t.prototype.getIndexType = function(t, e) {
         var n = this, r = 2 /* FULL */;
-        return xt.forEach(this.tn(e), (function(e) {
+        return _t.forEach(this.tn(e), (function(e) {
             return n.en(t, e).next((function(t) {
                 t ? 0 /* NONE */ !== r && t.fields.length < function(t) {
                     for (var e = new zt(ht.comparator), n = !1, r = 0, i = t.filters; r < i.length; r++) {
@@ -7331,10 +7331,10 @@ function ao(t, e) {
         var n = this, r = mo(t), i = go(t);
         return (e ? r.W("collectionGroupIndex", IDBKeyRange.bound(e, e)) : r.W()).next((function(t) {
             var e = [];
-            return xt.forEach(t, (function(t) {
+            return _t.forEach(t, (function(t) {
                 return i.get([ t.indexId, n.uid ]).next((function(n) {
                     e.push(function(t, e) {
-                        var n = e ? new wt(e.sequenceNumber, new Et(Ui(e.readTime), new ft(ui(e.documentKey)), e.largestBatchId)) : wt.empty(), r = t.fields.map((function(t) {
+                        var n = e ? new wt(e.sequenceNumber, new Tt(Ui(e.readTime), new ft(ui(e.documentKey)), e.largestBatchId)) : wt.empty(), r = t.fields.map((function(t) {
                             var e = t[0], n = t[1];
                             return new mt(ht.fromServerFormat(e), n);
                         }));
@@ -7356,7 +7356,7 @@ function ao(t, e) {
         var r = this, i = mo(t), o = go(t);
         return this._n(t).next((function(t) {
             return i.W("collectionGroupIndex", IDBKeyRange.bound(e, e)).next((function(e) {
-                return xt.forEach(e, (function(e) {
+                return _t.forEach(e, (function(e) {
                     return o.put(Wi(e.indexId, r.user, t, n));
                 }));
             }));
@@ -7368,13 +7368,13 @@ function ao(t, e) {
         // data might be invalidated by other multi-tab clients, we can only trust
         // data within a single IndexedDB transaction. We therefore add a cache
         // here.
-                return xt.forEach(e, (function(e, i) {
+                return _t.forEach(e, (function(e, i) {
             var o = r.get(e.collectionGroup);
-            return (o ? xt.resolve(o) : n.getFieldIndexes(t, e.collectionGroup)).next((function(o) {
-                return r.set(e.collectionGroup, o), xt.forEach(o, (function(r) {
+            return (o ? _t.resolve(o) : n.getFieldIndexes(t, e.collectionGroup)).next((function(o) {
+                return r.set(e.collectionGroup, o), _t.forEach(o, (function(r) {
                     return n.wn(t, e, r).next((function(e) {
                         var o = n.mn(i, r);
-                        return e.isEqual(o) ? xt.resolve() : n.gn(t, i, r, e, o);
+                        return e.isEqual(o) ? _t.resolve() : n.gn(t, i, r, e, o);
                     }));
                 }));
             }));
@@ -7446,7 +7446,7 @@ function ao(t, e) {
         }), (
         /* onRemove= */ function(r) {
             u.push(o.pn(t, e, n, r));
-        })), xt.waitFor(u);
+        })), _t.waitFor(u);
     }, t.prototype._n = function(t) {
         var e = 1;
         return go(t).Z({
@@ -7492,7 +7492,7 @@ function ao(t, e) {
         return this.getFieldIndexes(t, e).next(wo);
     }, t.prototype.getMinOffset = function(t, e) {
         var n = this;
-        return xt.mapArray(this.tn(e), (function(e) {
+        return _t.mapArray(this.tn(e), (function(e) {
             return n.en(t, e).next((function(t) {
                 return t || q();
             }));
@@ -7549,9 +7549,9 @@ function wo(t) {
     U(0 !== t.length);
     for (var e = t[0].indexState.offset, n = e.largestBatchId, r = 1; r < t.length; r++) {
         var i = t[r].indexState.offset;
-        Tt(i, e) < 0 && (e = i), n < i.largestBatchId && (n = i.largestBatchId);
+        Et(i, e) < 0 && (e = i), n < i.largestBatchId && (n = i.largestBatchId);
     }
-    return new Et(e.readTime, e.documentKey, n);
+    return new Tt(e.readTime, e.documentKey, n);
 }
 
 /**
@@ -7611,7 +7611,7 @@ function wo(t) {
  * Delete a mutation batch and the associated document mutations.
  * @returns A PersistencePromise of the document mutations that were removed.
  */
-function Eo(t, e, n) {
+function To(t, e, n) {
     var r = t.store("mutations"), i = t.store("documentMutations"), o = [], u = IDBKeyRange.only(n.batchId), s = 0, a = r.Z({
         range: u
     }, (function(t, e, n) {
@@ -7624,14 +7624,14 @@ function Eo(t, e, n) {
         var f = h[l], d = ci(e, f.key.path, n.batchId);
         o.push(i.delete(d)), c.push(f.key);
     }
-    return xt.waitFor(o).next((function() {
+    return _t.waitFor(o).next((function() {
         return c;
     }));
 }
 
 /**
  * Returns an approximate size for the given document.
- */ function To(t) {
+ */ function Eo(t) {
     if (!t) return 0;
     var e;
     if (t.document) e = t.document; else if (t.unknownDocument) e = t.unknownDocument; else {
@@ -7696,7 +7696,7 @@ var So = /** @class */ function() {
         return U("" !== e.uid), new t(e.isAuthenticated() ? e.uid : "", n, r, i);
     }, t.prototype.checkEmpty = function(t) {
         var e = !0, n = IDBKeyRange.bound([ this.userId, Number.NEGATIVE_INFINITY ], [ this.userId, Number.POSITIVE_INFINITY ]);
-        return _o(t).Z({
+        return xo(t).Z({
             index: "userMutationsIndex",
             range: n
         }, (function(t, n, r) {
@@ -7705,7 +7705,7 @@ var So = /** @class */ function() {
             return e;
         }));
     }, t.prototype.addMutationBatch = function(t, e, n, r) {
-        var i = this, o = xo(t), u = _o(t);
+        var i = this, o = _o(t), u = xo(t);
         // The IndexedDb implementation in Chrome (and Firefox) does not handle
         // compound indices that include auto-generated keys correctly. To ensure
         // that the index entry is added correctly in all browsers, we perform two
@@ -7740,13 +7740,13 @@ var So = /** @class */ function() {
                 l.push(i.indexManager.addToCollectionParentIndex(t, e));
             })), t.addOnCommittedListener((function() {
                 i.In[s] = a.keys();
-            })), xt.waitFor(l).next((function() {
+            })), _t.waitFor(l).next((function() {
                 return a;
             }));
         }));
     }, t.prototype.lookupMutationBatch = function(t, e) {
         var n = this;
-        return _o(t).get(e).next((function(t) {
+        return xo(t).get(e).next((function(t) {
             return t ? (U(t.userId === n.userId), Bi(n.It, t)) : null;
         }));
     }, 
@@ -7759,7 +7759,7 @@ var So = /** @class */ function() {
     // PORTING NOTE: Multi-tab only.
     t.prototype.Tn = function(t, e) {
         var n = this;
-        return this.In[e] ? xt.resolve(this.In[e]) : this.lookupMutationBatch(t, e).next((function(t) {
+        return this.In[e] ? _t.resolve(this.In[e]) : this.lookupMutationBatch(t, e).next((function(t) {
             if (t) {
                 var r = t.keys();
                 return n.In[e] = r, r;
@@ -7768,7 +7768,7 @@ var So = /** @class */ function() {
         }));
     }, t.prototype.getNextMutationBatchAfterBatchId = function(t, e) {
         var n = this, r = e + 1, i = IDBKeyRange.lowerBound([ this.userId, r ]), o = null;
-        return _o(t).Z({
+        return xo(t).Z({
             index: "userMutationsIndex",
             range: i
         }, (function(t, e, i) {
@@ -7778,7 +7778,7 @@ var So = /** @class */ function() {
         }));
     }, t.prototype.getHighestUnacknowledgedBatchId = function(t) {
         var e = IDBKeyRange.upperBound([ this.userId, Number.POSITIVE_INFINITY ]), n = -1;
-        return _o(t).Z({
+        return xo(t).Z({
             index: "userMutationsIndex",
             range: e,
             reverse: !0
@@ -7789,7 +7789,7 @@ var So = /** @class */ function() {
         }));
     }, t.prototype.getAllMutationBatches = function(t) {
         var e = this, n = IDBKeyRange.bound([ this.userId, -1 ], [ this.userId, Number.POSITIVE_INFINITY ]);
-        return _o(t).W("userMutationsIndex", n).next((function(t) {
+        return xo(t).W("userMutationsIndex", n).next((function(t) {
             return t.map((function(t) {
                 return Bi(e.It, t);
             }));
@@ -7798,7 +7798,7 @@ var So = /** @class */ function() {
         var n = this, r = ai(this.userId, e.path), i = IDBKeyRange.lowerBound(r), o = [];
         // Scan the document-mutation index starting with a prefix starting with
         // the given documentKey.
-                return xo(t).Z({
+                return _o(t).Z({
             range: i
         }, (function(r, i, u) {
             var s = r[0], a = r[1], c = r[2], l = ui(a);
@@ -7811,7 +7811,7 @@ var So = /** @class */ function() {
             // can stop as soon as we hit any such row.
                         if (s === n.userId && e.path.isEqual(l)) 
             // Look up the mutation batch in the store.
-            return _o(t).get(c).next((function(t) {
+            return xo(t).get(c).next((function(t) {
                 if (!t) throw q();
                 U(t.userId === n.userId), o.push(Bi(n.It, t));
             }));
@@ -7822,7 +7822,7 @@ var So = /** @class */ function() {
     }, t.prototype.getAllMutationBatchesAffectingDocumentKeys = function(t, e) {
         var n = this, r = new zt(rt), i = [];
         return e.forEach((function(e) {
-            var o = ai(n.userId, e.path), u = IDBKeyRange.lowerBound(o), s = xo(t).Z({
+            var o = ai(n.userId, e.path), u = IDBKeyRange.lowerBound(o), s = _o(t).Z({
                 range: u
             }, (function(t, i, o) {
                 var u = t[0], s = t[1], a = t[2], c = ui(s);
@@ -7836,12 +7836,12 @@ var So = /** @class */ function() {
                                 u === n.userId && e.path.isEqual(c) ? r = r.add(a) : o.done();
             }));
             i.push(s);
-        })), xt.waitFor(i).next((function() {
+        })), _t.waitFor(i).next((function() {
             return n.En(t, r);
         }));
     }, t.prototype.getAllMutationBatchesAffectingQuery = function(t, e) {
         var n = this, r = e.path, i = r.length + 1, o = ai(this.userId, r), u = IDBKeyRange.lowerBound(o), s = new zt(rt);
-        return xo(t).Z({
+        return _o(t).Z({
             range: u
         }, (function(t, e, o) {
             var u = t[0], a = t[1], c = t[2], l = ui(a);
@@ -7859,19 +7859,19 @@ var So = /** @class */ function() {
         var n = this, r = [], i = [];
         // TODO(rockwood): Implement this using iterate.
         return e.forEach((function(e) {
-            i.push(_o(t).get(e).next((function(t) {
+            i.push(xo(t).get(e).next((function(t) {
                 if (null === t) throw q();
                 U(t.userId === n.userId), r.push(Bi(n.It, t));
             })));
-        })), xt.waitFor(i).next((function() {
+        })), _t.waitFor(i).next((function() {
             return r;
         }));
     }, t.prototype.removeMutationBatch = function(t, e) {
         var n = this;
-        return Eo(t.ie, this.userId, e).next((function(r) {
+        return To(t.ie, this.userId, e).next((function(r) {
             return t.addOnCommittedListener((function() {
                 n.An(e.batchId);
-            })), xt.forEach(r, (function(e) {
+            })), _t.forEach(r, (function(e) {
                 return n.referenceDelegate.markPotentiallyOrphaned(t, e);
             }));
         }));
@@ -7890,11 +7890,11 @@ var So = /** @class */ function() {
     }, t.prototype.performConsistencyCheck = function(t) {
         var e = this;
         return this.checkEmpty(t).next((function(n) {
-            if (!n) return xt.resolve();
+            if (!n) return _t.resolve();
             // Verify that there are no entries in the documentMutations index if
             // the queue is empty.
                         var r = IDBKeyRange.lowerBound([ e.userId ]), i = [];
-            return xo(t).Z({
+            return _o(t).Z({
                 range: r
             }, (function(t, n, r) {
                 if (t[0] === e.userId) {
@@ -7912,7 +7912,7 @@ var So = /** @class */ function() {
     /** Returns the mutation queue's metadata from IndexedDb. */
     t.prototype.Rn = function(t) {
         var e = this;
-        return No(t).get(this.userId).next((function(t) {
+        return Ao(t).get(this.userId).next((function(t) {
             return t || {
                 userId: e.userId,
                 lastAcknowledgedBatchId: -1,
@@ -7927,7 +7927,7 @@ var So = /** @class */ function() {
  *         mutation for the given key.
  */ function Do(t, e, n) {
     var r = ai(e, n.path), i = r[1], o = IDBKeyRange.lowerBound(r), u = !1;
-    return xo(t).Z({
+    return _o(t).Z({
         range: o,
         X: !0
     }, (function(t, n, r) {
@@ -7942,19 +7942,19 @@ var So = /** @class */ function() {
 /** Returns true if any mutation queue contains the given document. */
 /**
  * Helper to get a typed SimpleDbStore for the mutations object store.
- */ function _o(t) {
+ */ function xo(t) {
     return ki(t, "mutations");
 }
 
 /**
  * Helper to get a typed SimpleDbStore for the mutationQueues object store.
- */ function xo(t) {
+ */ function _o(t) {
     return ki(t, "documentMutations");
 }
 
 /**
  * Helper to get a typed SimpleDbStore for the mutationQueues object store.
- */ function No(t) {
+ */ function Ao(t) {
     return ki(t, "mutationQueues");
 }
 
@@ -7988,7 +7988,7 @@ var So = /** @class */ function() {
  * that persist across client restarts, while sync engine can independently
  * generate in-memory target IDs that are transient and can be reused after a
  * restart.
- */ var Ao = /** @class */ function() {
+ */ var No = /** @class */ function() {
     function t(t) {
         this.bn = t;
     }
@@ -8017,7 +8017,7 @@ var So = /** @class */ function() {
         return t.prototype.allocateTargetId = function(t) {
         var e = this;
         return this.Vn(t).next((function(n) {
-            var r = new Ao(n.highestTargetId);
+            var r = new No(n.highestTargetId);
             return n.highestTargetId = r.next(), e.Sn(t, n).next((function() {
                 return n.highestTargetId;
             }));
@@ -8066,7 +8066,7 @@ var So = /** @class */ function() {
             var a = Gi(s);
             a.sequenceNumber <= e && null === n.get(a.targetId) && (i++, o.push(r.removeTargetData(t, a)));
         })).next((function() {
-            return xt.waitFor(o);
+            return _t.waitFor(o);
         })).next((function() {
             return i;
         }));
@@ -8128,14 +8128,14 @@ var So = /** @class */ function() {
                 targetId: n,
                 path: u
             })), i.push(r.referenceDelegate.addReference(t, n, e));
-        })), xt.waitFor(i);
+        })), _t.waitFor(i);
     }, t.prototype.removeMatchingKeys = function(t, e, n) {
         var r = this, i = Ro(t);
         // PORTING NOTE: The reverse index (documentsTargets) is maintained by
         // IndexedDb.
-                return xt.forEach(e, (function(e) {
+                return _t.forEach(e, (function(e) {
             var o = ri(e.path);
-            return xt.waitFor([ i.delete([ n, o ]), r.referenceDelegate.removeReference(t, n, e) ]);
+            return _t.waitFor([ i.delete([ n, o ]), r.referenceDelegate.removeReference(t, n, e) ]);
         }));
     }, t.prototype.removeMatchingKeysForTargetId = function(t, e) {
         var n = Ro(t), r = IDBKeyRange.bound([ e ], [ e + 1 ], 
@@ -8308,7 +8308,7 @@ function ko(t) {
                         [ 3 /*break*/ , 6 ]) : [ 3 /*break*/ , 4 ];
 
                       case 4:
-                        return [ 4 /*yield*/ , _t(t) ];
+                        return [ 4 /*yield*/ , xt(t) ];
 
                       case 5:
                         e.sent(), e.label = 6;
@@ -8336,7 +8336,7 @@ function ko(t) {
         }));
     }, t.prototype.nthSequenceNumber = function(t, e) {
         var n = this;
-        if (0 === e) return xt.resolve(qt.at);
+        if (0 === e) return _t.resolve(qt.at);
         var r = new Lo(e);
         return this.$n.forEachTarget(t, (function(t) {
             return r.On(t.sequenceNumber);
@@ -8354,7 +8354,7 @@ function ko(t) {
     }, t.prototype.collect = function(t, e) {
         var n = this;
         return -1 === this.params.cacheSizeCollectionThreshold ? (L("LruGarbageCollector", "Garbage collection skipped; disabled"), 
-        xt.resolve(bo)) : this.getCacheSize(t).next((function(r) {
+        _t.resolve(bo)) : this.getCacheSize(t).next((function(r) {
             return r < n.params.cacheSizeCollectionThreshold ? (L("LruGarbageCollector", "Garbage collection skipped; Cache size " + r + " is lower than threshold " + n.params.cacheSizeCollectionThreshold), 
             bo) : n.Un(t, e);
         }));
@@ -8372,7 +8372,7 @@ function ko(t) {
             return i = e, s = Date.now(), c.removeOrphanedDocuments(t, n);
         })).next((function(t) {
             return a = Date.now(), R() <= h.DEBUG && L("LruGarbageCollector", "LRU Garbage Collection\n\tCounted targets in " + (o - l) + "ms\n\tDetermined least recently used " + r + " in " + (u - o) + "ms\n\tRemoved " + i + " targets in " + (s - u) + "ms\n\tRemoved " + t + " documents in " + (a - s) + "ms\nTotal Duration: " + (a - l) + "ms"), 
-            xt.resolve({
+            _t.resolve({
                 didRun: !0,
                 sequenceNumbersCollected: r,
                 targetsRemoved: i,
@@ -8424,9 +8424,9 @@ function ko(t) {
     t.prototype.Gn = function(t, e) {
         return function(t, e) {
             var n = !1;
-            return No(t).tt((function(r) {
+            return Ao(t).tt((function(r) {
                 return Do(t, r, e).next((function(t) {
-                    return t && (n = !0), xt.resolve(!t);
+                    return t && (n = !0), _t.resolve(!t);
                 }));
             })).next((function() {
                 return n;
@@ -8447,7 +8447,7 @@ function ko(t) {
                 i.push(a);
             }
         })).next((function() {
-            return xt.waitFor(i);
+            return _t.waitFor(i);
         })).next((function() {
             return r.apply(t);
         })).next((function() {
@@ -8584,7 +8584,7 @@ function ko(t) {
     t.prototype.getEntry = function(t, e) {
         this.assertNotApplied();
         var n = this.changes.get(e);
-        return void 0 !== n ? xt.resolve(n) : this.getFromCache(t, e);
+        return void 0 !== n ? _t.resolve(n) : this.getFromCache(t, e);
     }, 
     /**
      * Looks up several entries in the cache, forwarding to
@@ -8683,7 +8683,7 @@ function ko(t) {
         }, (function(t, i) {
             r = {
                 document: n.jn(e, i),
-                size: To(i)
+                size: Eo(i)
             };
         })).next((function() {
             return r;
@@ -8708,7 +8708,7 @@ function ko(t) {
         var n = this, r = or(), i = new Kt(ft.comparator);
         return this.zn(t, e, (function(t, e) {
             var o = n.jn(t, e);
-            r = r.insert(t, o), i = i.insert(t, To(e));
+            r = r.insert(t, o), i = i.insert(t, Eo(e));
         })).next((function() {
             return {
                 documents: r,
@@ -8716,7 +8716,7 @@ function ko(t) {
             };
         }));
     }, t.prototype.zn = function(t, e, n) {
-        if (e.isEmpty()) return xt.resolve();
+        if (e.isEmpty()) return _t.resolve();
         var i = new zt(Ho);
         e.forEach((function(t) {
             return i = i.add(t);
@@ -8749,7 +8749,7 @@ function ko(t) {
             return e;
         }));
     }, t.prototype.getAllFromCollectionGroup = function(t, e, n, r) {
-        var i = this, o = or(), u = Wo(e, n), s = Wo(e, Et.max());
+        var i = this, o = or(), u = Wo(e, n), s = Wo(e, Tt.max());
         return Qo(t).Z({
             index: "collectionGroupIndex",
             range: IDBKeyRange.bound(u, s, !0)
@@ -8858,7 +8858,7 @@ function ko(t) {
             if (n.push(e.Yn.removeEntry(t, o, s.readTime)), u.isValidDocument()) {
                 var a = Pi(e.Yn.It, u);
                 i = i.add(o.path.popLast());
-                var c = To(a);
+                var c = Eo(a);
                 r += c - s.size, n.push(e.Yn.addEntry(t, o, a));
             } else if (r -= s.size, e.trackRemovals) {
                 // In order to track removals, we store a "sentinel delete" in the
@@ -8870,7 +8870,7 @@ function ko(t) {
             }
         })), i.forEach((function(r) {
             n.push(e.Yn.indexManager.addToCollectionParentIndex(t, r));
-        })), n.push(this.Yn.updateMetadata(t, r)), xt.waitFor(n);
+        })), n.push(this.Yn.updateMetadata(t, r)), _t.waitFor(n);
     }, n.prototype.getFromCache = function(t, e) {
         var n = this;
         // Record the size of everything we load from the cache so we can compute a delta later.
@@ -9151,7 +9151,7 @@ e) {
                     }
                 })), u.push(n.documentOverlayCache.saveOverlays(t, a, l));
             }; s.hasNext(); ) a();
-            return xt.waitFor(u);
+            return _t.waitFor(u);
         })).next((function() {
             return r;
         }));
@@ -9200,14 +9200,14 @@ e) {
     t.prototype.getNextDocuments = function(t, e, n, r) {
         var i = this;
         return this.remoteDocumentCache.getAllFromCollectionGroup(t, e, n, r).next((function(o) {
-            var u = r - o.size > 0 ? i.documentOverlayCache.getOverlaysForCollectionGroup(t, e, n.largestBatchId, r - o.size) : xt.resolve(cr()), s = -1, a = o;
+            var u = r - o.size > 0 ? i.documentOverlayCache.getOverlaysForCollectionGroup(t, e, n.largestBatchId, r - o.size) : _t.resolve(cr()), s = -1, a = o;
             // The callsite will use the largest batch ID together with the latest read time to create
             // a new index offset. Since we only process batch IDs if all remote documents have been read,
             // no overlay will increase the overall read time. This is why we only need to special case
             // the batch id.
                         return u.next((function(e) {
-                return xt.forEach(e, (function(e, n) {
-                    return s < n.largestBatchId && (s = n.largestBatchId), o.get(e) ? xt.resolve() : i.getBaseDocument(t, e, n).next((function(t) {
+                return _t.forEach(e, (function(e, n) {
+                    return s < n.largestBatchId && (s = n.largestBatchId), o.get(e) ? _t.resolve() : i.getBaseDocument(t, e, n).next((function(t) {
                         a = a.insert(e, t);
                     }));
                 })).next((function() {
@@ -9231,7 +9231,7 @@ e) {
     }, t.prototype.getDocumentsMatchingCollectionGroupQuery = function(t, e, n) {
         var r = this, i = e.collectionGroup, o = sr();
         return this.indexManager.getCollectionParents(t, i).next((function(u) {
-            return xt.forEach(u, (function(u) {
+            return _t.forEach(u, (function(u) {
                 var s = function(t, e) {
                     return new nn(e, 
                     /*collectionGroup=*/ null, t.explicitOrderBy.slice(), t.filters.slice(), t.limit, t.limitType, t.startAt, t.endAt);
@@ -9268,14 +9268,14 @@ e) {
         }));
     }, 
     /** Returns a base document that can be used to apply `overlay`. */ t.prototype.getBaseDocument = function(t, e, n) {
-        return null === n || 1 /* Patch */ === n.mutation.type ? this.remoteDocumentCache.getEntry(t, e) : xt.resolve(Re.newInvalidDocument(e));
+        return null === n || 1 /* Patch */ === n.mutation.type ? this.remoteDocumentCache.getEntry(t, e) : _t.resolve(Re.newInvalidDocument(e));
     }, t;
 }(), Zo = /** @class */ function() {
     function t(t) {
         this.It = t, this.Zn = new Map, this.ts = new Map;
     }
     return t.prototype.getBundleMetadata = function(t, e) {
-        return xt.resolve(this.Zn.get(e));
+        return _t.resolve(this.Zn.get(e));
     }, t.prototype.saveBundleMetadata = function(t, e) {
         /** Decodes a BundleMetadata proto into a BundleMetadata object. */
         var n;
@@ -9283,9 +9283,9 @@ e) {
             id: (n = e).id,
             version: n.version,
             createTime: Or(n.createTime)
-        }), xt.resolve();
+        }), _t.resolve();
     }, t.prototype.getNamedQuery = function(t, e) {
-        return xt.resolve(this.ts.get(e));
+        return _t.resolve(this.ts.get(e));
     }, t.prototype.saveNamedQuery = function(t, e) {
         return this.ts.set(e.name, function(t) {
             return {
@@ -9293,7 +9293,7 @@ e) {
                 query: ji(t.bundledQuery),
                 readTime: Or(t.readTime)
             };
-        }(e)), xt.resolve();
+        }(e)), _t.resolve();
     }, t;
 }(), Jo = /** @class */ function() {
     function t() {
@@ -9302,10 +9302,10 @@ e) {
         this.overlays = new Kt(ft.comparator), this.es = new Map;
     }
     return t.prototype.getOverlay = function(t, e) {
-        return xt.resolve(this.overlays.get(e));
+        return _t.resolve(this.overlays.get(e));
     }, t.prototype.getOverlays = function(t, e) {
         var n = this, r = cr();
-        return xt.forEach(e, (function(e) {
+        return _t.forEach(e, (function(e) {
             return n.getOverlay(t, e).next((function(t) {
                 null !== t && r.set(e, t);
             }));
@@ -9316,12 +9316,12 @@ e) {
         var r = this;
         return n.forEach((function(n, i) {
             r.ue(t, e, i);
-        })), xt.resolve();
+        })), _t.resolve();
     }, t.prototype.removeOverlaysForBatchId = function(t, e, n) {
         var r = this, i = this.es.get(n);
         return void 0 !== i && (i.forEach((function(t) {
             return r.overlays = r.overlays.remove(t);
-        })), this.es.delete(n)), xt.resolve();
+        })), this.es.delete(n)), _t.resolve();
     }, t.prototype.getOverlaysForCollection = function(t, e, n) {
         for (var r = cr(), i = e.length + 1, o = new ft(e.child("")), u = this.overlays.getIteratorFrom(o); u.hasNext(); ) {
             var s = u.getNext().value, a = s.getKey();
@@ -9329,7 +9329,7 @@ e) {
             // Documents from sub-collections
                         a.path.length === i && s.largestBatchId > n && r.set(s.getKey(), s);
         }
-        return xt.resolve(r);
+        return _t.resolve(r);
     }, t.prototype.getOverlaysForCollectionGroup = function(t, e, n, r) {
         for (var i = new Kt((function(t, e) {
             return t - e;
@@ -9343,7 +9343,7 @@ e) {
         for (var a = cr(), c = i.getIterator(); c.hasNext() && (c.getNext().value.forEach((function(t, e) {
             return a.set(t, e);
         })), !(a.size() >= r)); ) ;
-        return xt.resolve(a);
+        return _t.resolve(a);
     }, t.prototype.ue = function(t, e, n) {
         // Remove the association of the overlay to its batch id.
         var r = this.overlays.get(n.key);
@@ -9439,7 +9439,7 @@ e) {
         this.gs = new zt(tu.ss);
     }
     return t.prototype.checkEmpty = function(t) {
-        return xt.resolve(0 === this.mutationQueue.length);
+        return _t.resolve(0 === this.mutationQueue.length);
     }, t.prototype.addMutationBatch = function(t, e, n, r) {
         var i = this.ws;
         this.ws++, this.mutationQueue.length > 0 && this.mutationQueue[this.mutationQueue.length - 1];
@@ -9450,24 +9450,24 @@ e) {
             var a = s[u];
             this.gs = this.gs.add(new tu(a.key, i)), this.indexManager.addToCollectionParentIndex(t, a.key.path.popLast());
         }
-        return xt.resolve(o);
+        return _t.resolve(o);
     }, t.prototype.lookupMutationBatch = function(t, e) {
-        return xt.resolve(this.ys(e));
+        return _t.resolve(this.ys(e));
     }, t.prototype.getNextMutationBatchAfterBatchId = function(t, e) {
         var n = e + 1, r = this.ps(n), i = r < 0 ? 0 : r;
         // The requested batchId may still be out of range so normalize it to the
         // start of the queue.
-                return xt.resolve(this.mutationQueue.length > i ? this.mutationQueue[i] : null);
+                return _t.resolve(this.mutationQueue.length > i ? this.mutationQueue[i] : null);
     }, t.prototype.getHighestUnacknowledgedBatchId = function() {
-        return xt.resolve(0 === this.mutationQueue.length ? -1 : this.ws - 1);
+        return _t.resolve(0 === this.mutationQueue.length ? -1 : this.ws - 1);
     }, t.prototype.getAllMutationBatches = function(t) {
-        return xt.resolve(this.mutationQueue.slice());
+        return _t.resolve(this.mutationQueue.slice());
     }, t.prototype.getAllMutationBatchesAffectingDocumentKey = function(t, e) {
         var n = this, r = new tu(e, 0), i = new tu(e, Number.POSITIVE_INFINITY), o = [];
         return this.gs.forEachInRange([ r, i ], (function(t) {
             var e = n.ys(t._s);
             o.push(e);
-        })), xt.resolve(o);
+        })), _t.resolve(o);
     }, t.prototype.getAllMutationBatchesAffectingDocumentKeys = function(t, e) {
         var n = this, r = new zt(rt);
         return e.forEach((function(t) {
@@ -9475,7 +9475,7 @@ e) {
             n.gs.forEachInRange([ e, i ], (function(t) {
                 r = r.add(t._s);
             }));
-        })), xt.resolve(this.Is(r));
+        })), _t.resolve(this.Is(r));
     }, t.prototype.getAllMutationBatchesAffectingQuery = function(t, e) {
         // Use the query path as a prefix for testing if a document matches the
         // query.
@@ -9497,7 +9497,7 @@ e) {
             // TODO(mcg): we'll need a different scanner when we implement
             // ancestor queries.
             e.length === r && (u = u.add(t._s)), !0);
-        }), o), xt.resolve(this.Is(u));
+        }), o), _t.resolve(this.Is(u));
     }, t.prototype.Is = function(t) {
         var e = this, n = [];
         // Construct an array of matching batches, sorted by batchID to ensure that
@@ -9510,7 +9510,7 @@ e) {
         var n = this;
         U(0 === this.Ts(e.batchId, "removed")), this.mutationQueue.shift();
         var r = this.gs;
-        return xt.forEach(e.mutations, (function(i) {
+        return _t.forEach(e.mutations, (function(i) {
             var o = new tu(i.key, e.batchId);
             return r = r.delete(o), n.referenceDelegate.markPotentiallyOrphaned(t, i.key);
         })).next((function() {
@@ -9520,9 +9520,9 @@ e) {
         // No-op since the memory mutation queue does not maintain a separate cache.
     }, t.prototype.containsKey = function(t, e) {
         var n = new tu(e, 0), r = this.gs.firstAfterOrEqual(n);
-        return xt.resolve(e.isEqual(r && r.key));
+        return _t.resolve(e.isEqual(r && r.key));
     }, t.prototype.performConsistencyCheck = function(t) {
-        return this.mutationQueue.length, xt.resolve();
+        return this.mutationQueue.length, _t.resolve();
     }, 
     /**
      * Finds the index of the given batchId in the mutation queue and asserts that
@@ -9599,13 +9599,13 @@ e) {
         e && (this.docs = this.docs.remove(t), this.size -= e.size);
     }, t.prototype.getEntry = function(t, e) {
         var n = this.docs.get(e);
-        return xt.resolve(n ? n.document.mutableCopy() : Re.newInvalidDocument(e));
+        return _t.resolve(n ? n.document.mutableCopy() : Re.newInvalidDocument(e));
     }, t.prototype.getEntries = function(t, e) {
         var n = this, r = or();
         return e.forEach((function(t) {
             var e = n.docs.get(t);
             r = r.insert(t, e ? e.document.mutableCopy() : Re.newInvalidDocument(t));
-        })), xt.resolve(r);
+        })), _t.resolve(r);
     }, t.prototype.getAllFromCollection = function(t, e, n) {
         for (var r = or(), i = new ft(e.child("")), o = this.docs.getIteratorFrom(i)
         // Documents are ordered by key, so we can use a prefix scan to narrow down
@@ -9613,15 +9613,15 @@ e) {
         ; o.hasNext(); ) {
             var u = o.getNext(), s = u.key, a = u.value.document;
             if (!e.isPrefixOf(s.path)) break;
-            s.path.length > e.length + 1 || Tt(It(a), n) <= 0 || (r = r.insert(a.key, a.mutableCopy()));
+            s.path.length > e.length + 1 || Et(It(a), n) <= 0 || (r = r.insert(a.key, a.mutableCopy()));
         }
-        return xt.resolve(r);
+        return _t.resolve(r);
     }, t.prototype.getAllFromCollectionGroup = function(t, e, n, r) {
         // This method should only be called from the IndexBackfiller if persistence
         // is enabled.
         q();
     }, t.prototype.As = function(t, e) {
-        return xt.forEach(this.docs, (function(t) {
+        return _t.forEach(this.docs, (function(t) {
             return e(t);
         }));
     }, t.prototype.newChangeBuffer = function(t) {
@@ -9629,7 +9629,7 @@ e) {
         // a separate changelog and does not need special handling for removals.
         return new ru(this);
     }, t.prototype.getSize = function(t) {
-        return xt.resolve(this.size);
+        return _t.resolve(this.size);
     }, t;
 }(), ru = /** @class */ function(e) {
     function n(t) {
@@ -9640,7 +9640,7 @@ e) {
         var e = this, n = [];
         return this.changes.forEach((function(r, i) {
             i.isValidDocument() ? n.push(e.Yn.addEntry(t, i)) : e.Yn.removeEntry(r);
-        })), xt.waitFor(n);
+        })), _t.waitFor(n);
     }, n.prototype.getFromCache = function(t, e) {
         return this.Yn.getEntry(t, e);
     }, n.prototype.getAllFromCache = function(t, e) {
@@ -9665,60 +9665,60 @@ e) {
              * A ordered bidirectional mapping between documents and the remote target
              * IDs.
              */
-        this.Ps = new $o, this.targetCount = 0, this.vs = Ao.Pn();
+        this.Ps = new $o, this.targetCount = 0, this.vs = No.Pn();
     }
     return t.prototype.forEachTarget = function(t, e) {
         return this.Rs.forEach((function(t, n) {
             return e(n);
-        })), xt.resolve();
+        })), _t.resolve();
     }, t.prototype.getLastRemoteSnapshotVersion = function(t) {
-        return xt.resolve(this.lastRemoteSnapshotVersion);
+        return _t.resolve(this.lastRemoteSnapshotVersion);
     }, t.prototype.getHighestSequenceNumber = function(t) {
-        return xt.resolve(this.bs);
+        return _t.resolve(this.bs);
     }, t.prototype.allocateTargetId = function(t) {
-        return this.highestTargetId = this.vs.next(), xt.resolve(this.highestTargetId);
+        return this.highestTargetId = this.vs.next(), _t.resolve(this.highestTargetId);
     }, t.prototype.setTargetsMetadata = function(t, e, n) {
         return n && (this.lastRemoteSnapshotVersion = n), e > this.bs && (this.bs = e), 
-        xt.resolve();
+        _t.resolve();
     }, t.prototype.Dn = function(t) {
         this.Rs.set(t.target, t);
         var e = t.targetId;
-        e > this.highestTargetId && (this.vs = new Ao(e), this.highestTargetId = e), t.sequenceNumber > this.bs && (this.bs = t.sequenceNumber);
+        e > this.highestTargetId && (this.vs = new No(e), this.highestTargetId = e), t.sequenceNumber > this.bs && (this.bs = t.sequenceNumber);
     }, t.prototype.addTargetData = function(t, e) {
-        return this.Dn(e), this.targetCount += 1, xt.resolve();
+        return this.Dn(e), this.targetCount += 1, _t.resolve();
     }, t.prototype.updateTargetData = function(t, e) {
-        return this.Dn(e), xt.resolve();
+        return this.Dn(e), _t.resolve();
     }, t.prototype.removeTargetData = function(t, e) {
         return this.Rs.delete(e.target), this.Ps.ls(e.targetId), this.targetCount -= 1, 
-        xt.resolve();
+        _t.resolve();
     }, t.prototype.removeTargets = function(t, e, n) {
         var r = this, i = 0, o = [];
         return this.Rs.forEach((function(u, s) {
             s.sequenceNumber <= e && null === n.get(s.targetId) && (r.Rs.delete(u), o.push(r.removeMatchingKeysForTargetId(t, s.targetId)), 
             i++);
-        })), xt.waitFor(o).next((function() {
+        })), _t.waitFor(o).next((function() {
             return i;
         }));
     }, t.prototype.getTargetCount = function(t) {
-        return xt.resolve(this.targetCount);
+        return _t.resolve(this.targetCount);
     }, t.prototype.getTargetData = function(t, e) {
         var n = this.Rs.get(e) || null;
-        return xt.resolve(n);
+        return _t.resolve(n);
     }, t.prototype.addMatchingKeys = function(t, e, n) {
-        return this.Ps.us(e, n), xt.resolve();
+        return this.Ps.us(e, n), _t.resolve();
     }, t.prototype.removeMatchingKeys = function(t, e, n) {
         this.Ps.hs(e, n);
         var r = this.persistence.referenceDelegate, i = [];
         return r && e.forEach((function(e) {
             i.push(r.markPotentiallyOrphaned(t, e));
-        })), xt.waitFor(i);
+        })), _t.waitFor(i);
     }, t.prototype.removeMatchingKeysForTargetId = function(t, e) {
-        return this.Ps.ls(e), xt.resolve();
+        return this.Ps.ls(e), _t.resolve();
     }, t.prototype.getMatchingKeysForTargetId = function(t, e) {
         var n = this.Ps.ds(e);
-        return xt.resolve(n);
+        return _t.resolve(n);
     }, t.prototype.containsKey = function(t, e) {
-        return xt.resolve(this.Ps.containsKey(e));
+        return _t.resolve(this.Ps.containsKey(e));
     }, t;
 }(), ou = /** @class */ function() {
     /**
@@ -9778,7 +9778,7 @@ e) {
             return i.raiseOnCommittedEvent(), t;
         }));
     }, t.prototype.Ms = function(t, e) {
-        return xt.or(Object.values(this.Vs).map((function(n) {
+        return _t.or(Object.values(this.Vs).map((function(n) {
             return function() {
                 return n.containsKey(t, e);
             };
@@ -9808,11 +9808,11 @@ e) {
         enumerable: !1,
         configurable: !0
     }), t.prototype.addReference = function(t, e, n) {
-        return this.Fs.addReference(n, e), this.Ls.delete(n.toString()), xt.resolve();
+        return this.Fs.addReference(n, e), this.Ls.delete(n.toString()), _t.resolve();
     }, t.prototype.removeReference = function(t, e, n) {
-        return this.Fs.removeReference(n, e), this.Ls.add(n.toString()), xt.resolve();
+        return this.Fs.removeReference(n, e), this.Ls.add(n.toString()), _t.resolve();
     }, t.prototype.markPotentiallyOrphaned = function(t, e) {
-        return this.Ls.add(e.toString()), xt.resolve();
+        return this.Ls.add(e.toString()), _t.resolve();
     }, t.prototype.removeTarget = function(t, e) {
         var n = this;
         this.Fs.ls(e.targetId).forEach((function(t) {
@@ -9831,7 +9831,7 @@ e) {
     }, t.prototype.Os = function(t) {
         var e = this, n = this.persistence.getRemoteDocumentCache().newChangeBuffer();
         // Remove newly orphaned documents.
-                return xt.forEach(this.Ls, (function(r) {
+                return _t.forEach(this.Ls, (function(r) {
             var i = ft.fromPath(r);
             return e.Us(t, i).next((function(t) {
                 t || n.removeEntry(i, st.min());
@@ -9849,8 +9849,8 @@ e) {
         return 0;
     }, t.prototype.Us = function(t, e) {
         var n = this;
-        return xt.or([ function() {
-            return xt.resolve(n.Fs.containsKey(e));
+        return _t.or([ function() {
+            return _t.resolve(n.Fs.containsKey(e));
         }, function() {
             return n.persistence.getTargetCache().containsKey(t, e);
         }, function() {
@@ -9868,7 +9868,7 @@ e) {
      * to SCHEMA_VERSION. Different values of toVersion are only used for testing
      * and local feature development.
      */    return t.prototype.$ = function(t, e, n, r) {
-        var i = this, o = new Nt("createOrUpgrade", e);
+        var i = this, o = new At("createOrUpgrade", e);
         n < 1 && r >= 1 && (function(t) {
             t.createObjectStore("owner");
         }(t), function(t) {
@@ -9885,7 +9885,7 @@ e) {
         }(t));
         // Migration 2 to populate the targetGlobal object no longer needed since
         // migration 3 unconditionally clears it.
-        var u = xt.resolve();
+        var u = _t.resolve();
         return n < 3 && r >= 3 && (
         // Brand new clients don't need to drop and recreate--only clients that
         // potentially have corrupt data.
@@ -9925,7 +9925,7 @@ e) {
                     var r = e.store("mutations"), i = n.map((function(t) {
                         return r.put(t);
                     }));
-                    return xt.waitFor(i);
+                    return _t.waitFor(i);
                 }));
             }(t, o);
         }))), u = u.next((function() {
@@ -9968,9 +9968,9 @@ e) {
         }))), n < 12 && r >= 12 && (u = u.next((function() {
             !function(t) {
                 var e = t.createObjectStore("documentOverlays", {
-                    keyPath: Ei
+                    keyPath: Ti
                 });
-                e.createIndex("collectionPathOverlayIndex", Ti, {
+                e.createIndex("collectionPathOverlayIndex", Ei, {
                     unique: !1
                 }), e.createIndex("collectionGroupOverlayIndex", Si, {
                     unique: !1
@@ -10010,7 +10010,7 @@ e) {
     }, t.prototype.Ks = function(t) {
         var e = 0;
         return t.store("remoteDocuments").Z((function(t, n) {
-            e += To(n);
+            e += Eo(n);
         })).next((function() {
             var n = {
                 byteSize: e
@@ -10020,13 +10020,13 @@ e) {
     }, t.prototype.qs = function(t) {
         var e = this, n = t.store("mutationQueues"), r = t.store("mutations");
         return n.W().next((function(n) {
-            return xt.forEach(n, (function(n) {
+            return _t.forEach(n, (function(n) {
                 var i = IDBKeyRange.bound([ n.userId, -1 ], [ n.userId, n.lastAcknowledgedBatchId ]);
                 return r.W("userMutationsIndex", i).next((function(r) {
-                    return xt.forEach(r, (function(r) {
+                    return _t.forEach(r, (function(r) {
                         U(r.userId === n.userId);
                         var i = Bi(e.It, r);
-                        return Eo(t, n.userId, i).next((function() {}));
+                        return To(t, n.userId, i).next((function() {}));
                     }));
                 }));
             }));
@@ -10045,7 +10045,7 @@ e) {
                     return [ 0, ri(t) ];
                 }(o);
                 r.push(e.get(u).next((function(n) {
-                    return n ? xt.resolve() : function(n) {
+                    return n ? _t.resolve() : function(n) {
                         return e.put({
                             targetId: 0,
                             path: ri(n),
@@ -10054,7 +10054,7 @@ e) {
                     }(o);
                 })));
             })).next((function() {
-                return xt.waitFor(r);
+                return _t.waitFor(r);
             }));
         }));
     }, t.prototype.Qs = function(t, e) {
@@ -10110,7 +10110,7 @@ e) {
             };
             r.push(o.put(s));
         })).next((function() {
-            return xt.waitFor(r);
+            return _t.waitFor(r);
         }));
     }, t.prototype.zs = function(t, e) {
         var n = this, r = e.store("mutations"), i = Go(this.It), o = new ou(su.Bs, this.It.re);
@@ -10121,7 +10121,7 @@ e) {
                 Bi(n.It, t).keys().forEach((function(t) {
                     return i = i.add(t);
                 })), r.set(t.userId, i);
-            })), xt.forEach(r, (function(t, r) {
+            })), _t.forEach(r, (function(t, r) {
                 var u = new C(r), s = Zi.oe(n.It, u), a = o.getIndexManager(u), c = So.oe(u, n.It, a, o.referenceDelegate);
                 return new Xo(i, c, s, a).recalculateAndSaveOverlaysForDocumentKeys(new Ci(e, qt.at), t).next();
             }));
@@ -10192,7 +10192,7 @@ var lu = "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 Fo(this, i), this.ii = n + "main", this.It = new Mi(a), 
-        this.ri = new At(this.ii, this.Xs, new au(this.It)), this.Cs = new Co(this.referenceDelegate, this.It), 
+        this.ri = new Nt(this.ii, this.Xs, new au(this.It)), this.Cs = new Co(this.referenceDelegate, this.It), 
         this.remoteDocumentCache = Go(this.It), this.Ns = new Hi, 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."));
     }
@@ -10336,7 +10336,7 @@ var lu = "Failed to obtain exclusive access to the persistence layer. To allow s
     }, t.prototype.fi = function(t) {
         var e = this;
         return fu(t).get("owner").next((function(t) {
-            return xt.resolve(e.mi(t));
+            return _t.resolve(e.mi(t));
         }));
     }, t.prototype.gi = function(t) {
         return du(t).delete(this.clientId);
@@ -10360,7 +10360,7 @@ var lu = "Failed to obtain exclusive access to the persistence layer. To allow s
                                 return -1 === n.indexOf(t);
                             }));
                             // Delete metadata for clients that are no longer considered active.
-                                                        return xt.forEach(r, (function(t) {
+                                                        return _t.forEach(r, (function(t) {
                                 return e.delete(t.clientId);
                             })).next((function() {
                                 return r;
@@ -10411,7 +10411,7 @@ var lu = "Failed to obtain exclusive access to the persistence layer. To allow s
      */
     t.prototype.di = function(t) {
         var e = this;
-        return this.Ys ? xt.resolve(!0) : fu(t).get("owner").next((function(n) {
+        return this.Ys ? _t.resolve(!0) : fu(t).get("owner").next((function(n) {
             // A client is eligible for the primary lease if:
             // - its network is enabled and the client's tab is in the foreground.
             // - its network is enabled and no other client's tab is in the
@@ -10531,7 +10531,7 @@ var lu = "Failed to obtain exclusive access to the persistence layer. To allow s
     }, t.prototype.runTransaction = function(t, e, n) {
         var r = this;
         L("IndexedDbPersistence", "Starting transaction:", t);
-        var i, o, u = "readonly" === e ? "readonly" : "readwrite", s = 15 === (i = this.Xs) ? Ai : 14 === i ? Ni : 13 === i ? xi : 12 === i ? _i : 11 === i ? Di : void q();
+        var i, o, u = "readonly" === e ? "readonly" : "readwrite", s = 15 === (i = this.Xs) ? Ni : 14 === i ? Ai : 13 === i ? _i : 12 === i ? xi : 11 === i ? Di : void q();
         /** Returns the object stores for the provided schema. */        
         // Do all transactions as readwrite against all object stores, since we
         // are the only reader/writer.
@@ -10579,12 +10579,12 @@ var lu = "Failed to obtain exclusive access to the persistence layer. To allow s
         };
         return fu(t).put("owner", e);
     }, t.C = function() {
-        return At.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 = fu(t);
         return n.get("owner").next((function(t) {
-            return e.mi(t) ? (L("IndexedDbPersistence", "Releasing primary lease."), n.delete("owner")) : xt.resolve();
+            return e.mi(t) ? (L("IndexedDbPersistence", "Releasing primary lease."), n.delete("owner")) : _t.resolve();
         }));
     }, 
     /** Verifies that `updateTimeMs` is within `maxAgeMs`. */ t.prototype.pi = function(t, e) {
@@ -10809,7 +10809,7 @@ var vu = /** @class */ function() {
         // Queries that match all documents don't benefit from using
         // key-based lookups. It is more efficient to scan all documents in a
         // collection, rather than to perform individual lookups.
-        return xt.resolve(null);
+        return _t.resolve(null);
         var r = hn(e);
         return this.indexManager.getIndexType(t, r).next((function(i) {
             return 0 /* NONE */ === i ? null : (null !== e.limit && 1 /* PARTIAL */ === i && (
@@ -10885,7 +10885,7 @@ var vu = /** @class */ function() {
         return !!i && (i.hasPendingWrites || i.version.compareTo(r) > 0);
     }, t.prototype.Mi = function(t, e) {
         return R() <= h.DEBUG && L("QueryEngine", "Using full collection scan to execute query:", vn(e)), 
-        this.Ni.getDocumentsMatchingQuery(t, e, Et.min());
+        this.Ni.getDocumentsMatchingQuery(t, e, Tt.min());
     }, 
     /**
      * Combines the results from an indexed execution with the remaining documents
@@ -11078,7 +11078,7 @@ function wu(t, r) {
             trackRemovals: !0
         });
         return function(t, e, n, r) {
-            var i = n.batch, o = i.keys(), u = xt.resolve();
+            var i = n.batch, o = i.keys(), u = _t.resolve();
             return o.forEach((function(t) {
                 u = u.next((function() {
                     return r.getEntry(e, t);
@@ -11127,7 +11127,7 @@ function wu(t, r) {
  *
  * LocalDocuments are re-calculated if there are remaining mutations in the
  * queue.
- */ function Eu(t, e) {
+ */ function Tu(t, e) {
     var n = G(t), r = e.snapshotVersion, i = n.Ui;
     return n.persistence.runTransaction("Apply remote event", "readwrite-primary", (function(t) {
         var o = n.Gi.newChangeBuffer({
@@ -11183,7 +11183,7 @@ function wu(t, r) {
         })), 
         // Each loop iteration only affects its "own" doc, so it's safe to get all
         // the remote documents in advance in a single call.
-        u.push(Tu(t, o, e.documentUpdates).next((function(t) {
+        u.push(Eu(t, o, e.documentUpdates).next((function(t) {
             s = t.Wi, a = t.zi;
         }))), !r.isEqual(st.min())) {
             var c = n.Cs.getLastRemoteSnapshotVersion(t).next((function(e) {
@@ -11191,7 +11191,7 @@ function wu(t, r) {
             }));
             u.push(c);
         }
-        return xt.waitFor(u).next((function() {
+        return _t.waitFor(u).next((function() {
             return o.apply(t);
         })).next((function() {
             return n.localDocuments.getLocalViewOfDocuments(t, s, a);
@@ -11212,7 +11212,7 @@ function wu(t, r) {
  * @param documentBuffer - Document buffer to collect the resulted changes to be
  *        applied to storage.
  * @param documents - Documents to be applied.
- */ function Tu(t, e, n) {
+ */ function Eu(t, e, n) {
     var r = pr(), i = pr();
     return n.forEach((function(t) {
         return r = r.add(t);
@@ -11272,7 +11272,7 @@ function Su(t, e) {
             // This target has been listened to previously, so reuse the
             // previous targetID.
             // TODO(mcg): freshen last accessed date?
-            r = i, xt.resolve(r)) : n.Cs.allocateTargetId(t).next((function(i) {
+            r = i, _t.resolve(r)) : n.Cs.allocateTargetId(t).next((function(i) {
                 return r = new Li(e, i, 0 /* Listen */ , t.currentSequenceNumber), n.Cs.addTargetData(t, r).next((function() {
                     return r;
                 }));
@@ -11300,7 +11300,7 @@ function Su(t, e) {
  * Releasing a non-existing `Target` is a no-op.
  */
 // PORTING NOTE: `keepPersistedTargetData` is multi-tab only.
-function _u(t, r, i) {
+function xu(t, r, i) {
     return e(this, void 0, void 0, (function() {
         var e, o, u, s;
         return n(this, (function(n) {
@@ -11343,12 +11343,12 @@ function _u(t, r, i) {
  *
  * @param usePreviousResults - Whether results from previous executions can
  * be used to optimize this query execution.
- */ function xu(t, e, n) {
+ */ function _u(t, e, n) {
     var r = G(t), i = st.min(), o = pr();
     return r.persistence.runTransaction("Execute query", "readonly", (function(t) {
         return function(t, e, n) {
             var r = G(t), i = r.qi.get(n);
-            return void 0 !== i ? xt.resolve(r.Ui.get(i)) : r.Cs.getTargetData(e, n);
+            return void 0 !== i ? _t.resolve(r.Ui.get(i)) : r.Cs.getTargetData(e, n);
         }(r, t, hn(e)).next((function(e) {
             if (e) return i = e.lastLimboFreeSnapshotVersion, r.Cs.getMatchingKeysForTargetId(t, e.targetId).next((function(t) {
                 o = t;
@@ -11365,7 +11365,7 @@ function _u(t, r, i) {
 }
 
 // PORTING NOTE: Multi-Tab only.
-function Nu(t, e) {
+function Au(t, e) {
     var n = G(t), r = G(n.Cs), i = n.Ui.get(e);
     return i ? Promise.resolve(i.target) : n.persistence.runTransaction("Get target data", "readonly", (function(t) {
         return r.se(t, e).next((function(t) {
@@ -11381,7 +11381,7 @@ function Nu(t, e) {
  * since the prior call.
  */
 // PORTING NOTE: Multi-Tab only.
-function Au(t, e) {
+function Nu(t, e) {
     var n = G(t), r = n.Ki.get(e) || st.min();
     // Get the current maximum read time for the collection. This should always
     // exist, but to reduce the chance for regressions we default to
@@ -11437,7 +11437,7 @@ function Cu(t, e, n) {
                 // Allocates a target to hold all document keys from the bundle, such that
                 // they will not get garbage collected right away.
                 return p = n.sent(), [ 2 /*return*/ , e.persistence.runTransaction("Apply bundle documents", "readwrite", (function(t) {
-                    return Tu(t, d, s).next((function(e) {
+                    return Eu(t, d, s).next((function(e) {
                         return d.apply(t), e;
                     })).next((function(n) {
                         return e.Cs.removeMatchingKeysForTargetId(t, p.targetId).next((function() {
@@ -11993,28 +11993,31 @@ var Mu = /** @class */ function() {
         return new Promise((function(i, o) {
             var u = new b;
             u.setWithCredentials(!0), u.listenOnce(I.COMPLETE, (function() {
+                var e;
                 try {
                     switch (u.getLastErrorCode()) {
-                      case E.NO_ERROR:
-                        var e = u.getResponseJson();
-                        L("Connection", "XHR received:", JSON.stringify(e)), i(e);
+                      case T.NO_ERROR:
+                        var n = u.getResponseJson();
+                        L("Connection", "XHR received:", JSON.stringify(n)), i(n);
                         break;
 
-                      case E.TIMEOUT:
+                      case T.TIMEOUT:
                         L("Connection", 'RPC "' + t + '" timed out'), o(new j(K.DEADLINE_EXCEEDED, "Request time out"));
                         break;
 
-                      case E.HTTP_ERROR:
-                        var n = u.getStatus();
-                        if (L("Connection", 'RPC "' + t + '" failed with status:', n, "response text:", u.getResponseText()), 
-                        n > 0) {
-                            var r = u.getResponseJson().error;
-                            if (r && r.status && r.message) {
-                                var s = function(t) {
+                      case T.HTTP_ERROR:
+                        var r = u.getStatus();
+                        if (L("Connection", 'RPC "' + t + '" failed with status:', r, "response text:", u.getResponseText()), 
+                        r > 0) {
+                            var s = u.getResponseJson();
+                            Array.isArray(s) && (s = s[0]);
+                            var a = null === (e = s) || void 0 === e ? void 0 : e.error;
+                            if (a && a.status && a.message) {
+                                var c = function(t) {
                                     var e = t.toLowerCase().replace(/_/g, "-");
                                     return Object.values(K).indexOf(e) >= 0 ? e : K.UNKNOWN;
-                                }(r.status);
-                                o(new j(s, r.message));
+                                }(a.status);
+                                o(new j(c, a.message));
                             } else o(new j(K.UNKNOWN, "Server responded with status " + u.getStatus()));
                         } else 
                         // If we received an HTTP_ERROR but there's no status code,
@@ -12033,7 +12036,7 @@ var Mu = /** @class */ function() {
             u.send(e, "POST", s, n, 15);
         }));
     }, n.prototype.wo = function(t, e, n) {
-        var r = [ this.oo, "/", "google.firestore.v1.Firestore", "/", t, "/channel" ], i = T(), o = S(), u = {
+        var r = [ this.oo, "/", "google.firestore.v1.Firestore", "/", t, "/channel" ], i = E(), o = S(), u = {
             // Required for backend stickiness, routing behavior is based on this
             // parameter.
             httpSessionIdParam: "gsessionid",
@@ -12100,13 +12103,13 @@ var Mu = /** @class */ function() {
         // exception and rethrow using a setTimeout so they become visible again.
         // Note that eventually this function could go away if we are confident
         // enough the code is exception free.
-        return f(a, _.EventType.OPEN, (function() {
+        return f(a, x.EventType.OPEN, (function() {
             l || L("Connection", "WebChannel transport opened.");
-        })), f(a, _.EventType.CLOSE, (function() {
+        })), f(a, x.EventType.CLOSE, (function() {
             l || (l = !0, L("Connection", "WebChannel transport closed"), h.io());
-        })), f(a, _.EventType.ERROR, (function(t) {
+        })), f(a, x.EventType.ERROR, (function(t) {
             l || (l = !0, P("Connection", "WebChannel transport errored:", t), h.io(new j(K.UNAVAILABLE, "The operation could not be completed")));
-        })), f(a, _.EventType.MESSAGE, (function(t) {
+        })), f(a, x.EventType.MESSAGE, (function(t) {
             var e;
             if (!l) {
                 var n = t.data[0];
@@ -12138,8 +12141,8 @@ var Mu = /** @class */ function() {
                     l = !0, h.io(new j(u, s)), a.close();
                 } else L("Connection", "WebChannel received:", n), h.ro(n);
             }
-        })), f(o, x.STAT_EVENT, (function(t) {
-            t.stat === N.PROXY ? L("Connection", "Detected buffering proxy") : t.stat === N.NOPROXY && L("Connection", "Detected no buffering proxy");
+        })), f(o, _.STAT_EVENT, (function(t) {
+            t.stat === A.PROXY ? L("Connection", "Detected buffering proxy") : t.stat === A.NOPROXY && L("Connection", "Detected no buffering proxy");
         })), setTimeout((function() {
             // Technically we could/should wait for the WebChannel opened event,
             // but because we want to send the first message with the WebChannel
@@ -12266,7 +12269,7 @@ function Hu() {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ function Xu(t) {
-    return new Nr(t, /* useProto3Json= */ !0);
+    return new Ar(t, /* useProto3Json= */ !0);
 }
 
 /**
@@ -12357,14 +12360,14 @@ function Hu() {
     }, t;
 }(), Ju = /** @class */ function() {
     function t(t, e, n, r, i, o, u, s) {
-        this.Hs = t, this.vo = n, this.Vo = r, this.So = i, this.authCredentialsProvider = o, 
+        this.Hs = t, this.vo = n, this.Vo = r, this.connection = i, this.authCredentialsProvider = o, 
         this.appCheckCredentialsProvider = u, this.listener = s, this.state = 0 /* Initial */ , 
         /**
              * A close count that's incremented every time the stream is closed; used by
              * getCloseGuardedDispatcher() to invalidate callbacks that happen after
              * close.
              */
-        this.Do = 0, this.Co = null, this.xo = null, this.stream = null, this.No = new Zu(t, e)
+        this.So = 0, this.Do = null, this.Co = null, this.stream = null, this.xo = new Zu(t, e)
         /**
      * Returns true if start() has been called and no error has occurred. True
      * indicates the stream is open or in the process of opening (which
@@ -12373,14 +12376,14 @@ function Hu() {
      * outbound requests.
      */;
     }
-    return t.prototype.ko = function() {
-        return 1 /* Starting */ === this.state || 5 /* Backoff */ === this.state || this.Oo();
+    return t.prototype.No = function() {
+        return 1 /* Starting */ === this.state || 5 /* Backoff */ === this.state || this.ko();
     }, 
     /**
      * Returns true if the underlying RPC is open (the onOpen() listener has been
      * called) and the stream is ready for outbound requests.
      */
-    t.prototype.Oo = function() {
+    t.prototype.ko = function() {
         return 2 /* Open */ === this.state || 3 /* Healthy */ === this.state;
     }, 
     /**
@@ -12391,7 +12394,7 @@ function Hu() {
      * When start returns, isStarted() will return true.
      */
     t.prototype.start = function() {
-        4 /* Error */ !== this.state ? this.auth() : this.Mo();
+        4 /* Error */ !== this.state ? this.auth() : this.Oo();
     }, 
     /**
      * Stops the RPC. This call is idempotent and allowed regardless of the
@@ -12404,7 +12407,7 @@ function Hu() {
             return n(this, (function(t) {
                 switch (t.label) {
                   case 0:
-                    return this.ko() ? [ 4 /*yield*/ , this.close(0 /* Initial */) ] : [ 3 /*break*/ , 2 ];
+                    return this.No() ? [ 4 /*yield*/ , this.close(0 /* Initial */) ] : [ 3 /*break*/ , 2 ];
 
                   case 1:
                     t.sent(), t.label = 2;
@@ -12423,8 +12426,8 @@ function Hu() {
      * Each error will call the onClose() listener. That function can decide to
      * inhibit backoff if required.
      */
-    t.prototype.Fo = function() {
-        this.state = 0 /* Initial */ , this.No.reset();
+    t.prototype.Mo = function() {
+        this.state = 0 /* Initial */ , this.xo.reset();
     }, 
     /**
      * Marks this stream as idle. If no further actions are performed on the
@@ -12436,29 +12439,29 @@ function Hu() {
      * Only streams that are in state 'Open' can be marked idle, as all other
      * states imply pending network operations.
      */
-    t.prototype.$o = function() {
+    t.prototype.Fo = function() {
         var t = this;
         // Starts the idle time if we are in state 'Open' and are not yet already
         // running a timer (in which case the previous idle timeout still applies).
-                this.Oo() && null === this.Co && (this.Co = this.Hs.enqueueAfterDelay(this.vo, 6e4, (function() {
-            return t.Bo();
+                this.ko() && null === this.Do && (this.Do = this.Hs.enqueueAfterDelay(this.vo, 6e4, (function() {
+            return t.$o();
         })));
     }, 
-    /** Sends a message to the underlying stream. */ t.prototype.Lo = function(t) {
-        this.Uo(), this.stream.send(t);
+    /** Sends a message to the underlying stream. */ t.prototype.Bo = function(t) {
+        this.Lo(), this.stream.send(t);
     }, 
-    /** Called by the idle timer when the stream should close due to inactivity. */ t.prototype.Bo = function() {
+    /** Called by the idle timer when the stream should close due to inactivity. */ t.prototype.$o = function() {
         return e(this, void 0, void 0, (function() {
             return n(this, (function(t) {
-                return this.Oo() ? [ 2 /*return*/ , this.close(0 /* Initial */) ] : [ 2 /*return*/ ];
+                return this.ko() ? [ 2 /*return*/ , this.close(0 /* Initial */) ] : [ 2 /*return*/ ];
             }));
         }));
     }, 
-    /** Marks the stream as active again. */ t.prototype.Uo = function() {
-        this.Co && (this.Co.cancel(), this.Co = null);
+    /** Marks the stream as active again. */ t.prototype.Lo = function() {
+        this.Do && (this.Do.cancel(), this.Do = null);
     }, 
-    /** Cancels the health check delayed operation. */ t.prototype.qo = function() {
-        this.xo && (this.xo.cancel(), this.xo = null);
+    /** Cancels the health check delayed operation. */ t.prototype.Uo = function() {
+        this.Co && (this.Co.cancel(), this.Co = null);
     }, 
     /**
      * Closes the stream and cleans up as necessary:
@@ -12480,15 +12483,15 @@ function Hu() {
                   case 0:
                     // Notify the listener that the stream closed.
                     // Cancel any outstanding timers (they're guaranteed not to execute).
-                    return this.Uo(), this.qo(), this.No.cancel(), 
+                    return this.Lo(), this.Uo(), this.xo.cancel(), 
                     // Invalidates any stream-related callbacks (e.g. from auth or the
                     // underlying stream), guaranteeing they won't execute.
-                    this.Do++, 4 /* Error */ !== t ? 
+                    this.So++, 4 /* Error */ !== t ? 
                     // If this is an intentional close ensure we don't delay our next connection attempt.
-                    this.No.reset() : r && r.code === K.RESOURCE_EXHAUSTED ? (
+                    this.xo.reset() : r && r.code === K.RESOURCE_EXHAUSTED ? (
                     // Log the error. (Probably either 'quota exceeded' or 'max queue length reached'.)
                     M(r.toString()), M("Using maximum backoff delay to prevent overloading the backend."), 
-                    this.No.Ao()) : r && r.code === K.UNAUTHENTICATED && 3 /* Healthy */ !== this.state && (
+                    this.xo.Ao()) : r && r.code === K.UNAUTHENTICATED && 3 /* Healthy */ !== this.state && (
                     // "unauthenticated" error means the token was rejected. This should rarely
                     // happen since both Auth and AppCheck ensure a sufficient TTL when we
                     // request a token. If a user manually resets their system clock this can
@@ -12497,7 +12500,7 @@ function Hu() {
                     // to ensure that we fetch a new token.
                     this.authCredentialsProvider.invalidateToken(), this.appCheckCredentialsProvider.invalidateToken()), 
                     // Clean up the underlying stream because we are no longer interested in events.
-                    null !== this.stream && (this.Ko(), this.stream.close(), this.stream = null), 
+                    null !== this.stream && (this.qo(), this.stream.close(), this.stream = null), 
                     // This state must be assigned before calling onClose() to allow the callback to
                     // inhibit backoff or otherwise manipulate the state in its non-started state.
                     this.state = t, [ 4 /*yield*/ , this.listener.Zr(r) ];
@@ -12514,10 +12517,10 @@ function Hu() {
      * Can be overridden to perform additional cleanup before the stream is closed.
      * Calling super.tearDown() is not required.
      */
-    t.prototype.Ko = function() {}, t.prototype.auth = function() {
+    t.prototype.qo = function() {}, t.prototype.auth = function() {
         var t = this;
         this.state = 1 /* Starting */;
-        var e = this.Go(this.Do), n = this.Do;
+        var e = this.Ko(this.So), n = this.So;
         // TODO(mikelehen): Just use dispatchIfNotClosed, but see TODO below.
                 Promise.all([ this.authCredentialsProvider.getToken(), this.appCheckCredentialsProvider.getToken() ]).then((function(e) {
             var r = e[0], i = e[1];
@@ -12525,37 +12528,37 @@ function Hu() {
             // TODO(mikelehen): We really should just use dispatchIfNotClosed
             // and let this dispatch onto the queue, but that opened a spec test can
             // of worms that I don't want to deal with in this PR.
-                        t.Do === n && 
+                        t.So === n && 
             // Normally we'd have to schedule the callback on the AsyncQueue.
             // However, the following calls are safe to be called outside the
             // AsyncQueue since they don't chain asynchronous calls
-            t.Qo(r, i);
+            t.Go(r, i);
         }), (function(n) {
             e((function() {
                 var e = new j(K.UNKNOWN, "Fetching auth token failed: " + n.message);
-                return t.jo(e);
+                return t.Qo(e);
             }));
         }));
-    }, t.prototype.Qo = function(t, e) {
-        var n = this, r = this.Go(this.Do);
-        this.stream = this.Wo(t, e), this.stream.Yr((function() {
+    }, t.prototype.Go = function(t, e) {
+        var n = this, r = this.Ko(this.So);
+        this.stream = this.jo(t, e), this.stream.Yr((function() {
             r((function() {
-                return n.state = 2 /* Open */ , n.xo = n.Hs.enqueueAfterDelay(n.Vo, 1e4, (function() {
-                    return n.Oo() && (n.state = 3 /* Healthy */), Promise.resolve();
+                return n.state = 2 /* Open */ , n.Co = n.Hs.enqueueAfterDelay(n.Vo, 1e4, (function() {
+                    return n.ko() && (n.state = 3 /* Healthy */), Promise.resolve();
                 })), n.listener.Yr();
             }));
         })), this.stream.Zr((function(t) {
             r((function() {
-                return n.jo(t);
+                return n.Qo(t);
             }));
         })), this.stream.onMessage((function(t) {
             r((function() {
                 return n.onMessage(t);
             }));
         }));
-    }, t.prototype.Mo = function() {
+    }, t.prototype.Oo = function() {
         var t = this;
-        this.state = 5 /* Backoff */ , this.No.Ro((function() {
+        this.state = 5 /* Backoff */ , this.xo.Ro((function() {
             return e(t, void 0, void 0, (function() {
                 return n(this, (function(t) {
                     return this.state = 0 /* Initial */ , this.start(), [ 2 /*return*/ ];
@@ -12564,7 +12567,7 @@ function Hu() {
         }));
     }, 
     // Visible for tests
-    t.prototype.jo = function(t) {
+    t.prototype.Qo = function(t) {
         // In theory the stream could close cleanly, however, in our current model
         // we never expect this to happen because if we stop a stream ourselves,
         // this callback will never be called. To prevent cases where we retry
@@ -12577,11 +12580,11 @@ function Hu() {
      * us to turn auth / stream callbacks into no-ops if the stream is closed /
      * re-opened, etc.
      */
-    t.prototype.Go = function(t) {
+    t.prototype.Ko = function(t) {
         var e = this;
         return function(n) {
             e.Hs.enqueueAndForget((function() {
-                return e.Do === t ? n() : (L("PersistentStream", "stream callback skipped by getCloseGuardedDispatcher."), 
+                return e.So === t ? n() : (L("PersistentStream", "stream callback skipped by getCloseGuardedDispatcher."), 
                 Promise.resolve());
             }));
         };
@@ -12592,11 +12595,11 @@ function Hu() {
         return (s = e.call(this, t, "listen_stream_connection_backoff" /* ListenStreamConnectionBackoff */ , "listen_stream_idle" /* ListenStreamIdle */ , "health_check_timeout" /* HealthCheckTimeout */ , n, r, i, u) || this).It = o, 
         s;
     }
-    return t(n, e), n.prototype.Wo = function(t, e) {
-        return this.So.wo("Listen", t, e);
+    return t(n, e), n.prototype.jo = function(t, e) {
+        return this.connection.wo("Listen", t, e);
     }, n.prototype.onMessage = function(t) {
         // A successful response means the stream is healthy
-        this.No.reset();
+        this.xo.reset();
         var e = function(t, e) {
             var n;
             if ("targetChange" in e) {
@@ -12633,15 +12636,15 @@ function Hu() {
                 e.documentRemove;
                 var b = e.documentRemove;
                 b.document;
-                var I = Mr(t, b.document), E = b.removedTargetIds || [];
-                n = new wr([], E, I, null);
+                var I = Mr(t, b.document), T = b.removedTargetIds || [];
+                n = new wr([], T, I, null);
             } else {
                 if (!("filter" in e)) return q();
                 e.filter;
-                var T = e.filter;
-                T.targetId;
-                var S = T.count || 0, D = new tr(S), _ = T.targetId;
-                n = new br(_, D);
+                var E = e.filter;
+                E.targetId;
+                var S = E.count || 0, D = new tr(S), x = E.targetId;
+                n = new br(x, D);
             }
             return n;
         }(this.It, t), n = function(t) {
@@ -12652,7 +12655,7 @@ function Hu() {
             var e = t.targetChange;
             return e.targetIds && e.targetIds.length ? st.min() : e.readTime ? Or(e.readTime) : st.min();
         }(t);
-        return this.listener.zo(e, n);
+        return this.listener.Wo(e, n);
     }, 
     /**
      * Registers interest in the results of the given target. If the target
@@ -12660,7 +12663,7 @@ function Hu() {
      * affect the target will be streamed back as WatchChange messages that
      * reference the targetId.
      */
-    n.prototype.Ho = function(t) {
+    n.prototype.zo = function(t) {
         var e = {};
         e.database = qr(this.It), e.addTarget = function(t, e) {
             var n, r = e.target;
@@ -12672,7 +12675,7 @@ function Hu() {
             // TODO(wuandy): Consider removing above check because it is most likely true.
             // Right now, many tests depend on this behaviour though (leaving min() out
             // of serialization).
-            n.readTime = Ar(t, e.snapshotVersion.toTimestamp())), n;
+            n.readTime = Nr(t, e.snapshotVersion.toTimestamp())), n;
         }(this.It, t);
         var n = function(t, e) {
             var n = function(t, e) {
@@ -12694,48 +12697,48 @@ function Hu() {
                 "goog-listen-tags": n
             };
         }(this.It, t);
-        n && (e.labels = n), this.Lo(e);
+        n && (e.labels = n), this.Bo(e);
     }, 
     /**
      * Unregisters interest in the results of the target associated with the
      * given targetId.
      */
-    n.prototype.Jo = function(t) {
+    n.prototype.Ho = function(t) {
         var e = {};
-        e.database = qr(this.It), e.removeTarget = t, this.Lo(e);
+        e.database = qr(this.It), e.removeTarget = t, this.Bo(e);
     }, n;
 }(Ju), ts = /** @class */ function(e) {
     function n(t, n, r, i, o, u) {
         var s = this;
         return (s = e.call(this, t, "write_stream_connection_backoff" /* WriteStreamConnectionBackoff */ , "write_stream_idle" /* WriteStreamIdle */ , "health_check_timeout" /* HealthCheckTimeout */ , n, r, i, u) || this).It = o, 
-        s.Yo = !1, s;
+        s.Jo = !1, s;
     }
-    return t(n, e), Object.defineProperty(n.prototype, "Xo", {
+    return t(n, e), Object.defineProperty(n.prototype, "Yo", {
         /**
          * Tracks whether or not a handshake has been successfully exchanged and
          * the stream is ready to accept mutations.
          */
         get: function() {
-            return this.Yo;
+            return this.Jo;
         },
         enumerable: !1,
         configurable: !0
     }), 
     // Override of PersistentStream.start
     n.prototype.start = function() {
-        this.Yo = !1, this.lastStreamToken = void 0, e.prototype.start.call(this);
-    }, n.prototype.Ko = function() {
-        this.Yo && this.Zo([]);
-    }, n.prototype.Wo = function(t, e) {
-        return this.So.wo("Write", t, e);
+        this.Jo = !1, this.lastStreamToken = void 0, e.prototype.start.call(this);
+    }, n.prototype.qo = function() {
+        this.Jo && this.Xo([]);
+    }, n.prototype.jo = function(t, e) {
+        return this.connection.wo("Write", t, e);
     }, n.prototype.onMessage = function(t) {
         if (
         // Always capture the last stream token.
-        U(!!t.streamToken), this.lastStreamToken = t.streamToken, this.Yo) {
+        U(!!t.streamToken), this.lastStreamToken = t.streamToken, this.Jo) {
             // A successful first write response means the stream is healthy,
             // Note, that we could consider a successful handshake healthy, however,
             // the write itself might be causing an error we want to back off from.
-            this.No.reset();
+            this.xo.reset();
             var e = function(t, e) {
                 return t && t.length > 0 ? (U(void 0 !== e), t.map((function(t) {
                     return function(t, e) {
@@ -12751,46 +12754,46 @@ function Hu() {
                     }(t, e);
                 }))) : [];
             }(t.writeResults, t.commitTime), n = Or(t.commitTime);
-            return this.listener.tu(n, e);
+            return this.listener.Zo(n, e);
         }
         // The first response is always the handshake response
-                return U(!t.writeResults || 0 === t.writeResults.length), this.Yo = !0, 
-        this.listener.eu();
+                return U(!t.writeResults || 0 === t.writeResults.length), this.Jo = !0, 
+        this.listener.tu();
     }, 
     /**
      * Sends an initial streamToken to the server, performing the handshake
      * required to make the StreamingWrite RPC work. Subsequent
      * calls should wait until onHandshakeComplete was called.
      */
-    n.prototype.nu = function() {
+    n.prototype.eu = function() {
         // TODO(dimond): Support stream resumption. We intentionally do not set the
         // stream token on the handshake, ignoring any stream token we might have.
         var t = {};
-        t.database = qr(this.It), this.Lo(t);
+        t.database = qr(this.It), this.Bo(t);
     }, 
-    /** Sends a group of mutations to the Firestore backend to apply. */ n.prototype.Zo = function(t) {
+    /** Sends a group of mutations to the Firestore backend to apply. */ n.prototype.Xo = function(t) {
         var e = this, n = {
             streamToken: this.lastStreamToken,
             writes: t.map((function(t) {
                 return Kr(e.It, t);
             }))
         };
-        this.Lo(n);
+        this.Bo(n);
     }, n;
 }(Ju), es = /** @class */ function(e) {
     function n(t, n, r, i) {
         var o = this;
         return (o = e.call(this) || this).authCredentials = t, o.appCheckCredentials = n, 
-        o.So = r, o.It = i, o.su = !1, o;
+        o.connection = r, o.It = i, o.nu = !1, o;
     }
-    return t(n, e), n.prototype.iu = function() {
-        if (this.su) throw new j(K.FAILED_PRECONDITION, "The client has already been terminated.");
+    return t(n, e), n.prototype.su = function() {
+        if (this.nu) throw new j(K.FAILED_PRECONDITION, "The client has already been terminated.");
     }, 
     /** Invokes the provided RPC with auth and AppCheck tokens. */ n.prototype.ao = function(t, e, n) {
         var r = this;
-        return this.iu(), Promise.all([ this.authCredentials.getToken(), this.appCheckCredentials.getToken() ]).then((function(i) {
+        return this.su(), Promise.all([ this.authCredentials.getToken(), this.appCheckCredentials.getToken() ]).then((function(i) {
             var o = i[0], u = i[1];
-            return r.So.ao(t, e, n, o, u);
+            return r.connection.ao(t, e, n, o, u);
         })).catch((function(t) {
             throw "FirebaseError" === t.name ? (t.code === K.UNAUTHENTICATED && (r.authCredentials.invalidateToken(), 
             r.appCheckCredentials.invalidateToken()), t) : new j(K.UNKNOWN, t.toString());
@@ -12798,15 +12801,15 @@ function Hu() {
     }, 
     /** Invokes the provided RPC with streamed results with auth and AppCheck tokens. */ n.prototype._o = function(t, e, n, r) {
         var i = this;
-        return this.iu(), Promise.all([ this.authCredentials.getToken(), this.appCheckCredentials.getToken() ]).then((function(o) {
+        return this.su(), Promise.all([ this.authCredentials.getToken(), this.appCheckCredentials.getToken() ]).then((function(o) {
             var u = o[0], s = o[1];
-            return i.So._o(t, e, n, u, s, r);
+            return i.connection._o(t, e, n, u, s, r);
         })).catch((function(t) {
             throw "FirebaseError" === t.name ? (t.code === K.UNAUTHENTICATED && (i.authCredentials.invalidateToken(), 
             i.appCheckCredentials.invalidateToken()), t) : new j(K.UNKNOWN, t.toString());
         }));
     }, n.prototype.terminate = function() {
-        this.su = !0;
+        this.nu = !0;
     }, n;
 }((function() {}));
 
@@ -12879,19 +12882,19 @@ var ns = /** @class */ function() {
              * maximum defined by MAX_WATCH_STREAM_FAILURES, we'll set the OnlineState to
              * Offline.
              */
-        this.ru = 0, 
+        this.iu = 0, 
         /**
              * A timer that elapses after ONLINE_STATE_TIMEOUT_MS, at which point we
              * transition from OnlineState.Unknown to OnlineState.Offline without waiting
              * for the stream to actually fail (MAX_WATCH_STREAM_FAILURES times).
              */
-        this.ou = null, 
+        this.ru = null, 
         /**
              * Whether the client should log a warning message if it fails to connect to
              * the backend (initially true, cleared after a successful stream, or if we've
              * logged the message already).
              */
-        this.uu = !0
+        this.ou = !0
         /**
      * Called by RemoteStore when a watch stream is started (including on each
      * backoff attempt).
@@ -12900,10 +12903,10 @@ var ns = /** @class */ function() {
      * the onlineStateTimer.
      */;
     }
-    return t.prototype.cu = function() {
+    return t.prototype.uu = function() {
         var t = this;
-        0 === this.ru && (this.au("Unknown" /* Unknown */), this.ou = this.asyncQueue.enqueueAfterDelay("online_state_timeout" /* OnlineStateTimeout */ , 1e4, (function() {
-            return t.ou = null, t.hu("Backend didn't respond within 10 seconds."), t.au("Offline" /* Offline */), 
+        0 === this.iu && (this.cu("Unknown" /* Unknown */), this.ru = this.asyncQueue.enqueueAfterDelay("online_state_timeout" /* OnlineStateTimeout */ , 1e4, (function() {
+            return t.ru = null, t.au("Backend didn't respond within 10 seconds."), t.cu("Offline" /* Offline */), 
             Promise.resolve();
         })));
     }, 
@@ -12913,10 +12916,10 @@ var ns = /** @class */ function() {
      * allow multiple failures (based on MAX_WATCH_STREAM_FAILURES) before we
      * actually transition to the 'Offline' state.
      */
-    t.prototype.lu = function(t) {
-        "Online" /* Online */ === this.state ? this.au("Unknown" /* Unknown */) : (this.ru++, 
-        this.ru >= 1 && (this.fu(), this.hu("Connection failed 1 times. Most recent error: " + t.toString()), 
-        this.au("Offline" /* Offline */)));
+    t.prototype.hu = function(t) {
+        "Online" /* Online */ === this.state ? this.cu("Unknown" /* Unknown */) : (this.iu++, 
+        this.iu >= 1 && (this.lu(), this.au("Connection failed 1 times. Most recent error: " + t.toString()), 
+        this.cu("Offline" /* Offline */)));
     }, 
     /**
      * Explicitly sets the OnlineState to the specified state.
@@ -12926,17 +12929,17 @@ var ns = /** @class */ function() {
      * handleWatchStreamStart() and handleWatchStreamFailure().
      */
     t.prototype.set = function(t) {
-        this.fu(), this.ru = 0, "Online" /* Online */ === t && (
+        this.lu(), this.iu = 0, "Online" /* Online */ === t && (
         // We've connected to watch at least once. Don't warn the developer
         // about being offline going forward.
-        this.uu = !1), this.au(t);
-    }, t.prototype.au = function(t) {
+        this.ou = !1), this.cu(t);
+    }, t.prototype.cu = function(t) {
         t !== this.state && (this.state = t, this.onlineStateHandler(t));
-    }, t.prototype.hu = function(t) {
+    }, t.prototype.au = function(t) {
         var e = "Could not reach Cloud Firestore backend. " + t + "\nThis typically indicates that your device does not have a healthy Internet connection at the moment. The client will operate in offline mode until it is able to successfully connect to the backend.";
-        this.uu ? (M(e), this.uu = !1) : L("OnlineStateTracker", e);
-    }, t.prototype.fu = function() {
-        null !== this.ou && (this.ou.cancel(), this.ou = null);
+        this.ou ? (M(e), this.ou = !1) : L("OnlineStateTracker", e);
+    }, t.prototype.lu = function() {
+        null !== this.ru && (this.ru.cancel(), this.ru = null);
     }, t;
 }(), rs = function(
 /**
@@ -12964,7 +12967,7 @@ r, i, o, u) {
              * purely based on order, and so we can just shift() writes from the front of
              * the writePipeline as we receive responses.
              */
-    this.du = [], 
+    this.fu = [], 
     /**
              * A mapping of watched targets that the client cares about tracking and the
              * user has explicitly called a 'listen' for this target.
@@ -12974,12 +12977,12 @@ r, i, o, u) {
              * to the server. The targets removed with unlistens are removed eagerly
              * without waiting for confirmation from the listen stream.
              */
-    this._u = new Map, 
+    this.du = new Map, 
     /**
              * A set of reasons for why the RemoteStore may be offline. If empty, the
              * RemoteStore may start its network connections.
              */
-    this.wu = new Set, 
+    this._u = new Set, 
     /**
              * Event handlers that get called when the network is disabled or enabled.
              *
@@ -12987,7 +12990,7 @@ r, i, o, u) {
              * underlying streams (to support tree-shakeable streams). On Android and iOS,
              * the streams are created during construction of RemoteStore.
              */
-    this.mu = [], this.gu = u, this.gu.qr((function(t) {
+    this.wu = [], this.mu = u, this.mu.qr((function(t) {
         i.enqueueAndForget((function() {
             return e(s, void 0, void 0, (function() {
                 return n(this, (function(t) {
@@ -13000,10 +13003,10 @@ r, i, o, u) {
                                 return n(this, (function(n) {
                                     switch (n.label) {
                                       case 0:
-                                        return (e = G(t)).wu.add(4 /* ConnectivityChange */), [ 4 /*yield*/ , os(e) ];
+                                        return (e = G(t))._u.add(4 /* ConnectivityChange */), [ 4 /*yield*/ , os(e) ];
 
                                       case 1:
-                                        return n.sent(), e.yu.set("Unknown" /* Unknown */), e.wu.delete(4 /* ConnectivityChange */), 
+                                        return n.sent(), e.gu.set("Unknown" /* Unknown */), e._u.delete(4 /* ConnectivityChange */), 
                                         [ 4 /*yield*/ , is(e) ];
 
                                       case 2:
@@ -13022,7 +13025,7 @@ r, i, o, u) {
                 }));
             }));
         }));
-    })), this.yu = new ns(i, o);
+    })), this.gu = new ns(i, o);
 };
 
 /**
@@ -13047,7 +13050,7 @@ r, i, o, u) {
             switch (n.label) {
               case 0:
                 if (!fs(t)) return [ 3 /*break*/ , 4 ];
-                e = 0, r = t.mu, n.label = 1;
+                e = 0, r = t.wu, n.label = 1;
 
               case 1:
                 return e < r.length ? [ 4 /*yield*/ , (0, r[e])(/* enabled= */ !0) ] : [ 3 /*break*/ , 4 ];
@@ -13074,7 +13077,7 @@ r, i, o, u) {
         return n(this, (function(n) {
             switch (n.label) {
               case 0:
-                e = 0, r = t.mu, n.label = 1;
+                e = 0, r = t.wu, n.label = 1;
 
               case 1:
                 return e < r.length ? [ 4 /*yield*/ , (0, r[e])(/* enabled= */ !1) ] : [ 3 /*break*/ , 4 ];
@@ -13097,30 +13100,30 @@ r, i, o, u) {
  * is a no-op if the target of given `TargetData` is already being listened to.
  */ function us(t, e) {
     var n = G(t);
-    n._u.has(e.targetId) || (
+    n.du.has(e.targetId) || (
     // Mark this as something the client is currently listening for.
-    n._u.set(e.targetId, e), hs(n) ? 
+    n.du.set(e.targetId, e), hs(n) ? 
     // The listen will be sent in onWatchStreamOpen
-    ls(n) : Ns(n).Oo() && as(n, e));
+    ls(n) : As(n).ko() && as(n, e));
 }
 
 /**
  * Removes the listen from server. It is a no-op if the given target id is
  * not being listened to.
  */ function ss(t, e) {
-    var n = G(t), r = Ns(n);
-    n._u.delete(e), r.Oo() && cs(n, e), 0 === n._u.size && (r.Oo() ? r.$o() : fs(n) && 
+    var n = G(t), r = As(n);
+    n.du.delete(e), r.ko() && cs(n, e), 0 === n.du.size && (r.ko() ? r.Fo() : fs(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.
-    n.yu.set("Unknown" /* Unknown */));
+    n.gu.set("Unknown" /* Unknown */));
 }
 
 /**
  * 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 as(t, e) {
-    t.pu.Mt(e.targetId), Ns(t).Ho(e)
+    t.yu.Mt(e.targetId), As(t).zo(e)
     /**
  * We need to increment the expected number of pending responses we're due
  * from watch so we wait for the removal on the server before we process any
@@ -13129,18 +13132,18 @@ r, i, o, u) {
 }
 
 function cs(t, e) {
-    t.pu.Mt(e), Ns(t).Jo(e);
+    t.yu.Mt(e), As(t).Ho(e);
 }
 
 function ls(t) {
-    t.pu = new Tr({
+    t.yu = new Er({
         getRemoteKeysForTarget: function(e) {
             return t.remoteSyncer.getRemoteKeysForTarget(e);
         },
         se: function(e) {
-            return t._u.get(e) || null;
+            return t.du.get(e) || null;
         }
-    }), Ns(t).start(), t.yu.cu()
+    }), As(t).start(), t.gu.uu()
     /**
  * Returns whether the watch stream should be started because it's necessary
  * and has not yet been started.
@@ -13148,21 +13151,21 @@ function ls(t) {
 }
 
 function hs(t) {
-    return fs(t) && !Ns(t).ko() && t._u.size > 0;
+    return fs(t) && !As(t).No() && t.du.size > 0;
 }
 
 function fs(t) {
-    return 0 === G(t).wu.size;
+    return 0 === G(t)._u.size;
 }
 
 function ds(t) {
-    t.pu = void 0;
+    t.yu = void 0;
 }
 
 function ps(t) {
     return e(this, void 0, void 0, (function() {
         return n(this, (function(e) {
-            return t._u.forEach((function(e, n) {
+            return t.du.forEach((function(e, n) {
                 as(t, e);
             })), [ 2 /*return*/ ];
         }));
@@ -13174,11 +13177,11 @@ function vs(t, r) {
         return n(this, (function(e) {
             return ds(t), 
             // If we still need the watch stream, retry the connection.
-            hs(t) ? (t.yu.lu(r), ls(t)) : 
+            hs(t) ? (t.gu.hu(r), ls(t)) : 
             // No need to restart watch stream because there are no active targets.
             // The online state is set to unknown because there is no active attempt
             // at establishing a connection
-            t.yu.set("Unknown" /* Unknown */), [ 2 /*return*/ ];
+            t.gu.set("Unknown" /* Unknown */), [ 2 /*return*/ ];
         }));
     }));
 }
@@ -13189,7 +13192,7 @@ function ys(t, r, i) {
         return n(this, (function(a) {
             switch (a.label) {
               case 0:
-                if (t.yu.set("Online" /* Online */), !(r instanceof Ir && 2 /* Removed */ === r.state && r.cause)) 
+                if (t.gu.set("Online" /* Online */), !(r instanceof Ir && 2 /* Removed */ === r.state && r.cause)) 
                 // Mark the client as online since we got a message from the server
                 return [ 3 /*break*/ , 6 ];
                 a.label = 1;
@@ -13206,10 +13209,10 @@ function ys(t, r, i) {
                                 e = r.cause, i = 0, o = r.targetIds, n.label = 1;
 
                               case 1:
-                                return i < o.length ? (u = o[i], t._u.has(u) ? [ 4 /*yield*/ , t.remoteSyncer.rejectListen(u, e) ] : [ 3 /*break*/ , 3 ]) : [ 3 /*break*/ , 5 ];
+                                return i < o.length ? (u = o[i], t.du.has(u) ? [ 4 /*yield*/ , t.remoteSyncer.rejectListen(u, e) ] : [ 3 /*break*/ , 3 ]) : [ 3 /*break*/ , 5 ];
 
                               case 2:
-                                n.sent(), t._u.delete(u), t.pu.removeTarget(u), n.label = 3;
+                                n.sent(), t.du.delete(u), t.yu.removeTarget(u), n.label = 3;
 
                               case 3:
                                 n.label = 4;
@@ -13238,7 +13241,7 @@ function ys(t, r, i) {
                 return [ 3 /*break*/ , 13 ];
 
               case 6:
-                if (r instanceof wr ? t.pu.Gt(r) : r instanceof br ? t.pu.Yt(r) : t.pu.Wt(r), i.isEqual(st.min())) return [ 3 /*break*/ , 13 ];
+                if (r instanceof wr ? t.yu.Gt(r) : r instanceof br ? t.yu.Yt(r) : t.yu.Wt(r), i.isEqual(st.min())) return [ 3 /*break*/ , 13 ];
                 a.label = 7;
 
               case 7:
@@ -13252,24 +13255,24 @@ function ys(t, r, i) {
                  * SyncEngine.
                  */
                 function(t, e) {
-                    var n = t.pu.te(e);
+                    var n = t.yu.te(e);
                     // Update in-memory resume tokens. LocalStore will update the
                     // persistent view of these when applying the completed RemoteEvent.
                                         return n.targetChanges.forEach((function(n, r) {
                         if (n.resumeToken.approximateByteSize() > 0) {
-                            var i = t._u.get(r);
+                            var i = t.du.get(r);
                             // A watched target might have been removed already.
-                                                        i && t._u.set(r, i.withResumeToken(n.resumeToken, e));
+                                                        i && t.du.set(r, i.withResumeToken(n.resumeToken, e));
                         }
                     })), 
                     // Re-establish listens for the targets that have been invalidated by
                     // existence filter mismatches.
                     n.targetMismatches.forEach((function(e) {
-                        var n = t._u.get(e);
+                        var n = t.du.get(e);
                         if (n) {
                             // Clear the resume token for the target, since we're in a known mismatch
                             // state.
-                            t._u.set(e, n.withResumeToken(Zt.EMPTY_BYTE_STRING, n.snapshotVersion)), 
+                            t.du.set(e, n.withResumeToken(Zt.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.
                             cs(t, e);
@@ -13322,11 +13325,11 @@ function ys(t, r, i) {
               case 0:
                 if (!Ot(r)) throw r;
                 // Disable network and raise offline snapshots
-                return t.wu.add(1 /* IndexedDbFailed */), [ 4 /*yield*/ , os(t) ];
+                return t._u.add(1 /* IndexedDbFailed */), [ 4 /*yield*/ , os(t) ];
 
               case 1:
                 // Disable network and raise offline snapshots
-                return u.sent(), t.yu.set("Offline" /* Offline */), i || (
+                return u.sent(), t.gu.set("Offline" /* Offline */), i || (
                 // Use a simple read operation to determine if IndexedDB recovered.
                 // Ideally, we would expose a health check directly on SimpleDb, but
                 // RemoteStore only has access to persistence through LocalStore.
@@ -13342,7 +13345,7 @@ function ys(t, r, i) {
                                 return L("RemoteStore", "Retrying IndexedDB access"), [ 4 /*yield*/ , i() ];
 
                               case 1:
-                                return e.sent(), t.wu.delete(1 /* IndexedDbFailed */), [ 4 /*yield*/ , is(t) ];
+                                return e.sent(), t._u.delete(1 /* IndexedDbFailed */), [ 4 /*yield*/ , is(t) ];
 
                               case 2:
                                 return e.sent(), [ 2 /*return*/ ];
@@ -13370,7 +13373,7 @@ function ws(t) {
         return n(this, (function(n) {
             switch (n.label) {
               case 0:
-                e = G(t), r = As(e), i = e.du.length > 0 ? e.du[e.du.length - 1].batchId : -1, n.label = 1;
+                e = G(t), r = Ns(e), i = e.fu.length > 0 ? e.fu[e.fu.length - 1].batchId : -1, n.label = 1;
 
               case 1:
                 if (!
@@ -13379,7 +13382,7 @@ function ws(t) {
  * enabled and the write pipeline is not full).
  */
                 function(t) {
-                    return fs(t) && t.du.length < 10;
+                    return fs(t) && t.fu.length < 10;
                 }
                 /**
  * Queues additional writes to be sent to the write stream, sending them
@@ -13391,11 +13394,11 @@ function ws(t) {
                 return n.trys.push([ 2, 4, , 6 ]), [ 4 /*yield*/ , Su(e.localStore, i) ];
 
               case 3:
-                return null === (o = n.sent()) ? (0 === e.du.length && r.$o(), [ 3 /*break*/ , 7 ]) : (i = o.batchId, 
+                return null === (o = n.sent()) ? (0 === e.fu.length && r.Fo(), [ 3 /*break*/ , 7 ]) : (i = o.batchId, 
                 function(t, e) {
-                    t.du.push(e);
-                    var n = As(t);
-                    n.Oo() && n.Xo && n.Zo(e.mutations);
+                    t.fu.push(e);
+                    var n = Ns(t);
+                    n.ko() && n.Yo && n.Xo(e.mutations);
                 }(e, o), [ 3 /*break*/ , 6 ]);
 
               case 4:
@@ -13415,27 +13418,27 @@ function ws(t) {
 }
 
 function bs(t) {
-    return fs(t) && !As(t).ko() && t.du.length > 0;
+    return fs(t) && !Ns(t).No() && t.fu.length > 0;
 }
 
 function Is(t) {
-    As(t).start();
+    Ns(t).start();
 }
 
-function Es(t) {
+function Ts(t) {
     return e(this, void 0, void 0, (function() {
         return n(this, (function(e) {
-            return As(t).nu(), [ 2 /*return*/ ];
+            return Ns(t).eu(), [ 2 /*return*/ ];
         }));
     }));
 }
 
-function Ts(t) {
+function Es(t) {
     return e(this, void 0, void 0, (function() {
         var e, r, i, o;
         return n(this, (function(n) {
             // Send the write pipeline now that the stream is established.
-            for (e = As(t), r = 0, i = t.du; r < i.length; r++) o = i[r], e.Zo(o.mutations);
+            for (e = Ns(t), r = 0, i = t.fu; r < i.length; r++) o = i[r], e.Xo(o.mutations);
             return [ 2 /*return*/ ];
         }));
     }));
@@ -13447,7 +13450,7 @@ function Ss(t, r, i) {
         return n(this, (function(n) {
             switch (n.label) {
               case 0:
-                return e = t.du.shift(), o = Ri.from(e, r, i), [ 4 /*yield*/ , gs(t, (function() {
+                return e = t.fu.shift(), o = Ri.from(e, r, i), [ 4 /*yield*/ , gs(t, (function() {
                     return t.remoteSyncer.applySuccessfulWrite(o);
                 })) ];
 
@@ -13470,17 +13473,17 @@ function Ds(t, r) {
         return n(this, (function(i) {
             switch (i.label) {
               case 0:
-                return r && As(t).Xo ? [ 4 /*yield*/ , function(t, r) {
+                return r && Ns(t).Yo ? [ 4 /*yield*/ , function(t, r) {
                     return e(this, void 0, void 0, (function() {
                         var e, i;
                         return n(this, (function(n) {
                             switch (n.label) {
                               case 0:
-                                return er(i = r.code) && i !== K.ABORTED ? (e = t.du.shift(), 
+                                return er(i = r.code) && i !== K.ABORTED ? (e = t.fu.shift(), 
                                 // In this case it's also unlikely that the server itself is melting
                                 // down -- this was just a bad request so inhibit backoff on the next
                                 // restart.
-                                As(t).Fo(), [ 4 /*yield*/ , gs(t, (function() {
+                                Ns(t).Mo(), [ 4 /*yield*/ , gs(t, (function() {
                                     return t.remoteSyncer.rejectFailedWrite(e.batchId, r);
                                 })) ]) : [ 3 /*break*/ , 3 ];
 
@@ -13520,7 +13523,7 @@ function Ds(t, r) {
     }));
 }
 
-function _s(t, r) {
+function xs(t, r) {
     return e(this, void 0, void 0, (function() {
         var e, i;
         return n(this, (function(n) {
@@ -13531,15 +13534,15 @@ function _s(t, r) {
                 // Tear down and re-create our network streams. This will ensure we get a
                 // fresh auth token for the new user and re-fill the write pipeline with
                 // new mutations from the LocalStore (since mutations are per-user).
-                e.wu.add(3 /* CredentialChange */), [ 4 /*yield*/ , os(e) ];
+                e._u.add(3 /* CredentialChange */), [ 4 /*yield*/ , os(e) ];
 
               case 1:
                 return n.sent(), i && 
                 // Don't set the network status to Unknown if we are offline.
-                e.yu.set("Unknown" /* Unknown */), [ 4 /*yield*/ , e.remoteSyncer.handleCredentialChange(r) ];
+                e.gu.set("Unknown" /* Unknown */), [ 4 /*yield*/ , e.remoteSyncer.handleCredentialChange(r) ];
 
               case 2:
-                return n.sent(), e.wu.delete(3 /* CredentialChange */), [ 4 /*yield*/ , is(e) ];
+                return n.sent(), e._u.delete(3 /* CredentialChange */), [ 4 /*yield*/ , is(e) ];
 
               case 3:
                 // Tear down and re-create our network streams. This will ensure we get a
@@ -13553,22 +13556,22 @@ function _s(t, r) {
 
 /**
  * Toggles the network state when the client gains or loses its primary lease.
- */ function xs(t, r) {
+ */ function _s(t, r) {
     return e(this, void 0, void 0, (function() {
         var e;
         return n(this, (function(n) {
             switch (n.label) {
               case 0:
-                return e = G(t), r ? (e.wu.delete(2 /* IsSecondary */), [ 4 /*yield*/ , is(e) ]) : [ 3 /*break*/ , 2 ];
+                return e = G(t), r ? (e._u.delete(2 /* IsSecondary */), [ 4 /*yield*/ , is(e) ]) : [ 3 /*break*/ , 2 ];
 
               case 1:
                 return n.sent(), [ 3 /*break*/ , 5 ];
 
               case 2:
-                return r ? [ 3 /*break*/ , 4 ] : (e.wu.add(2 /* IsSecondary */), [ 4 /*yield*/ , os(e) ]);
+                return r ? [ 3 /*break*/ , 4 ] : (e._u.add(2 /* IsSecondary */), [ 4 /*yield*/ , os(e) ]);
 
               case 3:
-                n.sent(), e.yu.set("Unknown" /* Unknown */), n.label = 4;
+                n.sent(), e.gu.set("Unknown" /* Unknown */), n.label = 4;
 
               case 4:
                 n.label = 5;
@@ -13587,26 +13590,26 @@ function _s(t, r) {
  *
  * PORTING NOTE: On iOS and Android, the WatchStream gets registered on startup.
  * This is not done on Web to allow it to be tree-shaken.
- */ function Ns(t) {
+ */ function As(t) {
     var r = this;
-    return t.Iu || (
+    return t.pu || (
     // Create stream (but note that it is not started yet).
-    t.Iu = function(t, e, n) {
+    t.pu = function(t, e, n) {
         var r = G(t);
-        return r.iu(), new $u(e, r.So, r.authCredentials, r.appCheckCredentials, r.It, n);
+        return r.su(), new $u(e, r.connection, r.authCredentials, r.appCheckCredentials, r.It, n);
     }(t.datastore, t.asyncQueue, {
         Yr: ps.bind(null, t),
         Zr: vs.bind(null, t),
-        zo: ys.bind(null, t)
-    }), t.mu.push((function(i) {
+        Wo: ys.bind(null, t)
+    }), t.wu.push((function(i) {
         return e(r, void 0, void 0, (function() {
             return n(this, (function(e) {
                 switch (e.label) {
                   case 0:
-                    return i ? (t.Iu.Fo(), hs(t) ? ls(t) : t.yu.set("Unknown" /* Unknown */), [ 3 /*break*/ , 3 ]) : [ 3 /*break*/ , 1 ];
+                    return i ? (t.pu.Mo(), hs(t) ? ls(t) : t.gu.set("Unknown" /* Unknown */), [ 3 /*break*/ , 3 ]) : [ 3 /*break*/ , 1 ];
 
                   case 1:
-                    return [ 4 /*yield*/ , t.Iu.stop() ];
+                    return [ 4 /*yield*/ , t.pu.stop() ];
 
                   case 2:
                     e.sent(), ds(t), e.label = 3;
@@ -13616,7 +13619,7 @@ function _s(t, r) {
                 }
             }));
         }));
-    }))), t.Iu
+    }))), t.pu
     /**
  * If not yet initialized, registers the WriteStream and its network state
  * callback with `remoteStoreImpl`. Returns the existing stream if one is
@@ -13627,42 +13630,42 @@ function _s(t, r) {
  */;
 }
 
-function As(t) {
+function Ns(t) {
     var r = this;
-    return t.Tu || (
+    return t.Iu || (
     // Create stream (but note that it is not started yet).
-    t.Tu = function(t, e, n) {
+    t.Iu = function(t, e, n) {
         var r = G(t);
-        return r.iu(), new ts(e, r.So, r.authCredentials, r.appCheckCredentials, r.It, n);
+        return r.su(), new ts(e, r.connection, r.authCredentials, r.appCheckCredentials, r.It, n);
     }(t.datastore, t.asyncQueue, {
-        Yr: Es.bind(null, t),
+        Yr: Ts.bind(null, t),
         Zr: Ds.bind(null, t),
-        eu: Ts.bind(null, t),
-        tu: Ss.bind(null, t)
-    }), t.mu.push((function(i) {
+        tu: Es.bind(null, t),
+        Zo: Ss.bind(null, t)
+    }), t.wu.push((function(i) {
         return e(r, void 0, void 0, (function() {
             return n(this, (function(e) {
                 switch (e.label) {
                   case 0:
-                    return i ? (t.Tu.Fo(), [ 4 /*yield*/ , ws(t) ]) : [ 3 /*break*/ , 2 ];
+                    return i ? (t.Iu.Mo(), [ 4 /*yield*/ , ws(t) ]) : [ 3 /*break*/ , 2 ];
 
                   case 1:
                     // This will start the write stream if necessary.
                     return e.sent(), [ 3 /*break*/ , 4 ];
 
                   case 2:
-                    return [ 4 /*yield*/ , t.Tu.stop() ];
+                    return [ 4 /*yield*/ , t.Iu.stop() ];
 
                   case 3:
-                    e.sent(), t.du.length > 0 && (L("RemoteStore", "Stopping write stream with " + t.du.length + " pending writes"), 
-                    t.du = []), e.label = 4;
+                    e.sent(), t.fu.length > 0 && (L("RemoteStore", "Stopping write stream with " + t.fu.length + " pending writes"), 
+                    t.fu = []), e.label = 4;
 
                   case 4:
                     return [ 2 /*return*/ ];
                 }
             }));
         }));
-    }))), t.Tu
+    }))), t.Iu
     /**
  * @license
  * Copyright 2017 Google LLC
@@ -13861,25 +13864,25 @@ var Cs = /** @class */ function() {
     }, t;
 }(), Rs = /** @class */ function() {
     function t() {
-        this.Eu = new Kt(ft.comparator);
+        this.Tu = new Kt(ft.comparator);
     }
     return t.prototype.track = function(t) {
-        var e = t.doc.key, n = this.Eu.get(e);
+        var e = t.doc.key, n = this.Tu.get(e);
         n ? 
         // Merge the new change with the existing change.
-        0 /* Added */ !== t.type && 3 /* Metadata */ === n.type ? this.Eu = this.Eu.insert(e, t) : 3 /* Metadata */ === t.type && 1 /* Removed */ !== n.type ? this.Eu = this.Eu.insert(e, {
+        0 /* Added */ !== t.type && 3 /* Metadata */ === n.type ? this.Tu = this.Tu.insert(e, t) : 3 /* Metadata */ === t.type && 1 /* Removed */ !== n.type ? this.Tu = this.Tu.insert(e, {
             type: n.type,
             doc: t.doc
-        }) : 2 /* Modified */ === t.type && 2 /* Modified */ === n.type ? this.Eu = this.Eu.insert(e, {
+        }) : 2 /* Modified */ === t.type && 2 /* Modified */ === n.type ? this.Tu = this.Tu.insert(e, {
             type: 2 /* Modified */ ,
             doc: t.doc
-        }) : 2 /* Modified */ === t.type && 0 /* Added */ === n.type ? this.Eu = this.Eu.insert(e, {
+        }) : 2 /* Modified */ === t.type && 0 /* Added */ === n.type ? this.Tu = this.Tu.insert(e, {
             type: 0 /* Added */ ,
             doc: t.doc
-        }) : 1 /* Removed */ === t.type && 0 /* Added */ === n.type ? this.Eu = this.Eu.remove(e) : 1 /* Removed */ === t.type && 2 /* Modified */ === n.type ? this.Eu = this.Eu.insert(e, {
+        }) : 1 /* Removed */ === t.type && 0 /* Added */ === n.type ? this.Tu = this.Tu.remove(e) : 1 /* Removed */ === t.type && 2 /* Modified */ === n.type ? this.Tu = this.Tu.insert(e, {
             type: 1 /* Removed */ ,
             doc: n.doc
-        }) : 0 /* Added */ === t.type && 1 /* Removed */ === n.type ? this.Eu = this.Eu.insert(e, {
+        }) : 0 /* Added */ === t.type && 1 /* Removed */ === n.type ? this.Tu = this.Tu.insert(e, {
             type: 2 /* Modified */ ,
             doc: t.doc
         }) : 
@@ -13890,10 +13893,10 @@ var Cs = /** @class */ function() {
         // Removed->Modified
         // Metadata->Added
         // Removed->Metadata
-        q() : this.Eu = this.Eu.insert(e, t);
-    }, t.prototype.Au = function() {
+        q() : this.Tu = this.Tu.insert(e, t);
+    }, t.prototype.Eu = function() {
         var t = [];
-        return this.Eu.inorderTraversal((function(e, n) {
+        return this.Tu.inorderTraversal((function(e, n) {
             t.push(n);
         })), t;
     }, t;
@@ -13928,11 +13931,11 @@ var Cs = /** @class */ function() {
         return !0;
     }, t;
 }(), Ls = function() {
-    this.Ru = void 0, this.listeners = [];
+    this.Au = void 0, this.listeners = [];
 }, Ms = function() {
     this.queries = new rr((function(t) {
         return pn(t);
-    }), dn), this.onlineState = "Unknown" /* Unknown */ , this.bu = new Set;
+    }), dn), this.onlineState = "Unknown" /* Unknown */ , this.Ru = new Set;
 };
 
 /**
@@ -13968,7 +13971,7 @@ var Cs = /** @class */ function() {
                 return n.trys.push([ 1, 3, , 4 ]), s = u, [ 4 /*yield*/ , e.onListen(i) ];
 
               case 2:
-                return s.Ru = n.sent(), [ 3 /*break*/ , 4 ];
+                return s.Au = n.sent(), [ 3 /*break*/ , 4 ];
 
               case 3:
                 return a = n.sent(), c = ks(a, "Initialization of query '" + vn(r.query) + "' failed"), 
@@ -13977,7 +13980,7 @@ var Cs = /** @class */ function() {
               case 4:
                 return e.queries.set(i, u), u.listeners.push(r), 
                 // Run global snapshot listeners if a consistent snapshot has been emitted.
-                r.Pu(e.onlineState), u.Ru && r.vu(u.Ru) && Bs(e), [ 2 /*return*/ ];
+                r.bu(e.onlineState), u.Au && r.Pu(u.Au) && Bs(e), [ 2 /*return*/ ];
             }
         }));
     }));
@@ -13998,9 +14001,9 @@ function qs(t, e) {
         var u = o[i], s = u.query, a = n.queries.get(s);
         if (a) {
             for (var c = 0, l = a.listeners; c < l.length; c++) {
-                l[c].vu(u) && (r = !0);
+                l[c].Pu(u) && (r = !0);
             }
-            a.Ru = u;
+            a.Au = u;
         }
     }
     r && Bs(n);
@@ -14018,7 +14021,7 @@ function Us(t, e, n) {
 
 // Call all global snapshot listeners that have been set.
 function Bs(t) {
-    t.bu.forEach((function(t) {
+    t.Ru.forEach((function(t) {
         t.next();
     }));
 }
@@ -14030,12 +14033,12 @@ function Bs(t) {
  * It uses an Observer to dispatch events.
  */ var Gs = /** @class */ function() {
     function t(t, e, n) {
-        this.query = t, this.Vu = e, 
+        this.query = t, this.vu = e, 
         /**
              * Initial snapshots (e.g. from cache) may not be propagated to the wrapped
              * observer. This flag is set to true once we've actually raised an event.
              */
-        this.Su = !1, this.Du = null, this.onlineState = "Unknown" /* Unknown */ , this.options = n || {}
+        this.Vu = !1, this.Su = null, this.onlineState = "Unknown" /* Unknown */ , this.options = n || {}
         /**
      * Applies the new ViewSnapshot to this listener, raising a user-facing event
      * if applicable (depending on what changed, whether the user has opted into
@@ -14043,7 +14046,7 @@ function Bs(t) {
      * indeed raised.
      */;
     }
-    return t.prototype.vu = function(t) {
+    return t.prototype.Pu = function(t) {
         if (!this.options.includeMetadataChanges) {
             for (
             // Remove the metadata only changes.
@@ -14055,17 +14058,17 @@ function Bs(t) {
             /* excludesMetadataChanges= */ !0, t.hasCachedResults);
         }
         var o = !1;
-        return this.Su ? this.Cu(t) && (this.Vu.next(t), o = !0) : this.xu(t, this.onlineState) && (this.Nu(t), 
-        o = !0), this.Du = t, o;
+        return this.Vu ? this.Du(t) && (this.vu.next(t), o = !0) : this.Cu(t, this.onlineState) && (this.xu(t), 
+        o = !0), this.Su = t, o;
     }, t.prototype.onError = function(t) {
-        this.Vu.error(t);
+        this.vu.error(t);
     }, 
-    /** Returns whether a snapshot was raised. */ t.prototype.Pu = function(t) {
+    /** Returns whether a snapshot was raised. */ t.prototype.bu = function(t) {
         this.onlineState = t;
         var e = !1;
-        return this.Du && !this.Su && this.xu(this.Du, t) && (this.Nu(this.Du), e = !0), 
+        return this.Su && !this.Vu && this.Cu(this.Su, t) && (this.xu(this.Su), e = !0), 
         e;
-    }, t.prototype.xu = function(t, e) {
+    }, t.prototype.Cu = function(t, e) {
         // Always raise the first event when we're synced
         if (!t.fromCache) return !0;
         // NOTE: We consider OnlineState.Unknown as online (it should become Offline
@@ -14073,32 +14076,32 @@ function Bs(t) {
                 var n = "Offline" /* Offline */ !== e;
         // Don't raise the event if we're online, aren't synced yet (checked
         // above) and are waiting for a sync.
-                return (!this.options.ku || !n) && (!t.docs.isEmpty() || t.hasCachedResults || "Offline" /* Offline */ === e);
+                return (!this.options.Nu || !n) && (!t.docs.isEmpty() || t.hasCachedResults || "Offline" /* Offline */ === e);
         // Raise data from cache if we have any documents, have cached results before,
         // or we are offline.
-        }, t.prototype.Cu = function(t) {
+        }, t.prototype.Du = function(t) {
         // We don't need to handle includeDocumentMetadataChanges here because
         // the Metadata only changes have already been stripped out if needed.
         // At this point the only changes we will see are the ones we should
         // propagate.
         if (t.docChanges.length > 0) return !0;
-        var e = this.Du && this.Du.hasPendingWrites !== t.hasPendingWrites;
+        var e = this.Su && this.Su.hasPendingWrites !== t.hasPendingWrites;
         return !(!t.syncStateChanged && !e) && !0 === this.options.includeMetadataChanges;
         // Generally we should have hit one of the cases above, but it's possible
         // to get here if there were only metadata docChanges and they got
         // stripped out.
-        }, t.prototype.Nu = function(t) {
+        }, t.prototype.xu = function(t) {
         t = Vs.fromInitialDocuments(t.query, t.docs, t.mutatedKeys, t.fromCache, t.hasCachedResults), 
-        this.Su = !0, this.Vu.next(t);
+        this.Vu = !0, this.vu.next(t);
     }, t;
 }(), Ks = /** @class */ function() {
     function t(t, 
     // How many bytes this element takes to store in the bundle.
     e) {
-        this.payload = t, this.byteLength = e;
+        this.ku = t, this.byteLength = e;
     }
     return t.prototype.Ou = function() {
-        return "metadata" in this.payload;
+        return "metadata" in this.ku;
     }, t;
 }(), js = /** @class */ function() {
     function t(t) {
@@ -14134,13 +14137,13 @@ function Bs(t) {
     return t.prototype.Fu = function(t) {
         this.progress.bytesLoaded += t.byteLength;
         var e = this.progress.documentsLoaded;
-        if (t.payload.namedQuery) this.queries.push(t.payload.namedQuery); else if (t.payload.documentMetadata) {
+        if (t.ku.namedQuery) this.queries.push(t.ku.namedQuery); else if (t.ku.documentMetadata) {
             this.documents.push({
-                metadata: t.payload.documentMetadata
-            }), t.payload.documentMetadata.exists || ++e;
-            var n = ct.fromString(t.payload.documentMetadata.name);
+                metadata: t.ku.documentMetadata
+            }), t.ku.documentMetadata.exists || ++e;
+            var n = ct.fromString(t.ku.documentMetadata.name);
             this.collectionGroups.add(n.get(n.length - 2));
-        } else t.payload.document && (this.documents[this.documents.length - 1].document = t.payload.document, 
+        } else t.ku.document && (this.documents[this.documents.length - 1].document = t.ku.document, 
         ++e);
         return e !== this.progress.documentsLoaded ? (this.progress.documentsLoaded = e, 
         Object.assign({}, this.progress)) : null;
@@ -14353,7 +14356,7 @@ function zs(t) {
         var r = this, i = this.Qu;
         this.Qu = t.Qu, this.mutatedKeys = t.mutatedKeys;
         // Sort changes based on type and query comparator
-        var o = t.zu.Au();
+        var o = t.zu.Eu();
         o.sort((function(t, e) {
             return function(t, e) {
                 var n = function(t) {
@@ -14392,7 +14395,7 @@ function zs(t) {
      * Applies an OnlineState change to the view, potentially generating a
      * ViewChange if the view's syncState changes as a result.
      */
-    t.prototype.Pu = function(t) {
+    t.prototype.bu = function(t) {
         return this.current && "Offline" /* Offline */ === t ? (
         // If we're offline, set `current` to false and then call applyChanges()
         // to refresh our syncState and generate a ViewChange as appropriate. We
@@ -14538,7 +14541,7 @@ n) {
         /** Stores user completion handlers, indexed by User and BatchId. */
         this.hc = {}, 
         /** Stores user callbacks waiting for all pending writes to be acknowledged. */
-        this.lc = new Map, this.fc = Ao.vn(), this.onlineState = "Unknown" /* Unknown */ , 
+        this.lc = new Map, this.fc = No.vn(), this.onlineState = "Unknown" /* Unknown */ , 
         // The primary state is set to `true` or `false` immediately after Firestore
         // startup. In the interim, a client should only be considered primary if
         // `isPrimary` is true.
@@ -14564,7 +14567,7 @@ function $s(t, r) {
         return n(this, (function(n) {
             switch (n.label) {
               case 0:
-                return e = Na(t), (u = e.ic.get(r)) ? (
+                return e = Aa(t), (u = e.ic.get(r)) ? (
                 // PORTING NOTE: With Multi-Tab Web, it is possible that a query view
                 // already exists when EventManager calls us for the first time. This
                 // happens when the primary tab is already listening to this query on
@@ -14609,7 +14612,7 @@ function $s(t, r) {
                             return n(this, (function(n) {
                                 switch (n.label) {
                                   case 0:
-                                    return e = r.view.Wu(i), e.$i ? [ 4 /*yield*/ , xu(t.localStore, r.query, 
+                                    return e = r.view.Wu(i), e.$i ? [ 4 /*yield*/ , _u(t.localStore, r.query, 
                                     /* usePreviousResults= */ !1).then((function(t) {
                                         var n = t.documents;
                                         return r.view.Wu(n, e);
@@ -14629,7 +14632,7 @@ function $s(t, r) {
                             }));
                         }));
                     }(t, r, i, o);
-                }, [ 4 /*yield*/ , xu(t.localStore, r, 
+                }, [ 4 /*yield*/ , _u(t.localStore, r, 
                 /* usePreviousResults= */ !0) ];
 
               case 1:
@@ -14654,11 +14657,11 @@ function $s(t, r) {
                 }))), void e.ic.delete(r)) ] : e.isPrimaryClient ? (
                 // We need to remove the local query target first to allow us to verify
                 // whether any other client is still interested in this target.
-                e.sharedClientState.removeLocalQueryTarget(i.targetId), e.sharedClientState.isActiveQueryTarget(i.targetId) ? [ 3 /*break*/ , 2 ] : [ 4 /*yield*/ , _u(e.localStore, i.targetId, 
+                e.sharedClientState.removeLocalQueryTarget(i.targetId), e.sharedClientState.isActiveQueryTarget(i.targetId) ? [ 3 /*break*/ , 2 ] : [ 4 /*yield*/ , xu(e.localStore, i.targetId, 
                 /*keepPersistedTargetData=*/ !1).then((function() {
                     e.sharedClientState.clearQueryState(i.targetId), ss(e.remoteStore, i.targetId), 
                     ha(e, i.targetId);
-                })).catch(_t) ]) : [ 3 /*break*/ , 3 ];
+                })).catch(xt) ]) : [ 3 /*break*/ , 3 ];
 
               case 1:
                 n.sent(), n.label = 2;
@@ -14667,7 +14670,7 @@ function $s(t, r) {
                 return [ 3 /*break*/ , 5 ];
 
               case 3:
-                return ha(e, i.targetId), [ 4 /*yield*/ , _u(e.localStore, i.targetId, 
+                return ha(e, i.targetId), [ 4 /*yield*/ , xu(e.localStore, i.targetId, 
                 /*keepPersistedTargetData=*/ !0) ];
 
               case 4:
@@ -14695,7 +14698,7 @@ function $s(t, r) {
         return n(this, (function(n) {
             switch (n.label) {
               case 0:
-                e = Aa(t), n.label = 1;
+                e = Na(t), n.label = 1;
 
               case 1:
                 return n.trys.push([ 1, 5, , 6 ]), [ 4 /*yield*/ , function(t, e) {
@@ -14781,7 +14784,7 @@ function $s(t, r) {
                 e = G(t), n.label = 1;
 
               case 1:
-                return n.trys.push([ 1, 4, , 6 ]), [ 4 /*yield*/ , Eu(e.localStore, r) ];
+                return n.trys.push([ 1, 4, , 6 ]), [ 4 /*yield*/ , Tu(e.localStore, r) ];
 
               case 2:
                 return i = n.sent(), 
@@ -14801,7 +14804,7 @@ function $s(t, r) {
                 return n.sent(), [ 3 /*break*/ , 6 ];
 
               case 4:
-                return [ 4 /*yield*/ , _t(n.sent()) ];
+                return [ 4 /*yield*/ , xt(n.sent()) ];
 
               case 5:
                 return n.sent(), [ 3 /*break*/ , 6 ];
@@ -14825,7 +14828,7 @@ function $s(t, r) {
         if (r.isPrimaryClient && 0 /* RemoteStore */ === n || !r.isPrimaryClient && 1 /* SharedClientState */ === n) {
         var i = [];
         r.ic.forEach((function(t, n) {
-            var r = n.view.Pu(e);
+            var r = n.view.bu(e);
             r.snapshot && i.push(r.snapshot);
         })), function(t, e) {
             var n = G(t);
@@ -14834,10 +14837,10 @@ function $s(t, r) {
             n.queries.forEach((function(t, n) {
                 for (var i = 0, o = n.listeners; i < o.length; i++) {
                     // Run global snapshot listeners if a consistent snapshot has been emitted.
-                    o[i].Pu(e) && (r = !0);
+                    o[i].bu(e) && (r = !0);
                 }
             })), r && Bs(n);
-        }(r.eventManager, e), i.length && r.sc.zo(i), r.onlineState = e, r.isPrimaryClient && r.sharedClientState.setOnlineState(e);
+        }(r.eventManager, e), i.length && r.sc.Wo(i), r.onlineState = e, r.isPrimaryClient && r.sharedClientState.setOnlineState(e);
     }
 }
 
@@ -14878,10 +14881,10 @@ function $s(t, r) {
                 e.uc = e.uc.remove(u), e.cc.delete(r), va(e), [ 3 /*break*/ , 4 ];
 
               case 2:
-                return [ 4 /*yield*/ , _u(e.localStore, r, 
+                return [ 4 /*yield*/ , xu(e.localStore, r, 
                 /* keepPersistedTargetData */ !1).then((function() {
                     return ha(e, r, i);
-                })).catch(_t) ];
+                })).catch(xt) ];
 
               case 3:
                 n.sent(), n.label = 4;
@@ -14921,7 +14924,7 @@ function ua(t, r) {
                 return n.sent(), [ 3 /*break*/ , 6 ];
 
               case 4:
-                return [ 4 /*yield*/ , _t(n.sent()) ];
+                return [ 4 /*yield*/ , xt(n.sent()) ];
 
               case 5:
                 return n.sent(), [ 3 /*break*/ , 6 ];
@@ -14977,7 +14980,7 @@ function sa(t, r, i) {
                 return n.sent(), [ 3 /*break*/ , 6 ];
 
               case 4:
-                return [ 4 /*yield*/ , _t(n.sent()) ];
+                return [ 4 /*yield*/ , xt(n.sent()) ];
 
               case 5:
                 return n.sent(), [ 3 /*break*/ , 6 ];
@@ -15119,7 +15122,7 @@ function ya(t, r, i) {
                 })), [ 4 /*yield*/ , Promise.all(a) ]);
 
               case 1:
-                return c.sent(), o.sc.zo(u), [ 4 /*yield*/ , function(t, r) {
+                return c.sent(), o.sc.Wo(u), [ 4 /*yield*/ , function(t, r) {
                     return e(this, void 0, void 0, (function() {
                         var e, i, o, u, s, a, c, l, h;
                         return n(this, (function(n) {
@@ -15129,11 +15132,11 @@ function ya(t, r, i) {
 
                               case 1:
                                 return n.trys.push([ 1, 3, , 4 ]), [ 4 /*yield*/ , e.persistence.runTransaction("notifyLocalViewChanges", "readwrite", (function(t) {
-                                    return xt.forEach(r, (function(n) {
-                                        return xt.forEach(n.Si, (function(r) {
+                                    return _t.forEach(r, (function(n) {
+                                        return _t.forEach(n.Si, (function(r) {
                                             return e.persistence.referenceDelegate.addReference(t, n.targetId, r);
                                         })).next((function() {
-                                            return xt.forEach(n.Di, (function(r) {
+                                            return _t.forEach(n.Di, (function(r) {
                                                 return e.persistence.referenceDelegate.removeReference(t, n.targetId, r);
                                             }));
                                         }));
@@ -15226,7 +15229,7 @@ function ga(t, e) {
         return n(this, (function(n) {
             switch (n.label) {
               case 0:
-                return [ 4 /*yield*/ , xu((e = G(t)).localStore, r.query, 
+                return [ 4 /*yield*/ , _u((e = G(t)).localStore, r.query, 
                 /* usePreviousResults= */ !0) ];
 
               case 1:
@@ -15246,7 +15249,7 @@ function ba(t, r) {
     return e(this, void 0, void 0, (function() {
         var e;
         return n(this, (function(n) {
-            return [ 2 /*return*/ , Au((e = G(t)).localStore, r).then((function(t) {
+            return [ 2 /*return*/ , Nu((e = G(t)).localStore, r).then((function(t) {
                 return ya(e, t);
             })) ];
         }));
@@ -15265,7 +15268,7 @@ function Ia(t, r, i, o) {
                     var n = G(t), r = G(n.mutationQueue);
                     return n.persistence.runTransaction("Lookup mutation documents", "readonly", (function(t) {
                         return r.Tn(t, e).next((function(e) {
-                            return e ? n.localDocuments.getDocuments(t, e) : xt.resolve(null);
+                            return e ? n.localDocuments.getDocuments(t, e) : _t.resolve(null);
                         }));
                     }));
                 }((e = G(t)).localStore, r) ];
@@ -15312,17 +15315,17 @@ function Ia(t, r, i, o) {
 
 /** Applies a query target change from a different tab. */
 // PORTING NOTE: Multi-Tab only.
-function Ea(t, r) {
+function Ta(t, r) {
     return e(this, void 0, void 0, (function() {
         var e, i, o, u, s, a, c, l;
         return n(this, (function(n) {
             switch (n.label) {
               case 0:
-                return Na(e = G(t)), Aa(e), !0 !== r || !0 === e.dc ? [ 3 /*break*/ , 3 ] : (i = e.sharedClientState.getAllActiveQueryTargets(), 
-                [ 4 /*yield*/ , Ta(e, i.toArray()) ]);
+                return Aa(e = G(t)), Na(e), !0 !== r || !0 === e.dc ? [ 3 /*break*/ , 3 ] : (i = e.sharedClientState.getAllActiveQueryTargets(), 
+                [ 4 /*yield*/ , Ea(e, i.toArray()) ]);
 
               case 1:
-                return o = n.sent(), e.dc = !0, [ 4 /*yield*/ , xs(e.remoteStore, !0) ];
+                return o = n.sent(), e.dc = !0, [ 4 /*yield*/ , _s(e.remoteStore, !0) ];
 
               case 2:
                 for (n.sent(), u = 0, s = o; u < s.length; u++) a = s[u], us(e.remoteStore, a);
@@ -15332,13 +15335,13 @@ function Ea(t, r) {
                 return !1 !== r || !1 === e.dc ? [ 3 /*break*/ , 7 ] : (c = [], l = Promise.resolve(), 
                 e.rc.forEach((function(t, n) {
                     e.sharedClientState.isLocalQueryTarget(n) ? c.push(n) : l = l.then((function() {
-                        return ha(e, n), _u(e.localStore, n, 
+                        return ha(e, n), xu(e.localStore, n, 
                         /*keepPersistedTargetData=*/ !0);
                     })), ss(e.remoteStore, n);
                 })), [ 4 /*yield*/ , l ]);
 
               case 4:
-                return n.sent(), [ 4 /*yield*/ , Ta(e, c) ];
+                return n.sent(), [ 4 /*yield*/ , Ea(e, c) ];
 
               case 5:
                 return n.sent(), 
@@ -15348,7 +15351,7 @@ function Ea(t, r) {
                     e.cc.forEach((function(t, n) {
                         ss(e.remoteStore, n);
                     })), e.ac.fs(), e.cc = new Map, e.uc = new Kt(ft.comparator);
-                }(e), e.dc = !1, [ 4 /*yield*/ , xs(e.remoteStore, !1) ];
+                }(e), e.dc = !1, [ 4 /*yield*/ , _s(e.remoteStore, !1) ];
 
               case 6:
                 n.sent(), n.label = 7;
@@ -15360,7 +15363,7 @@ function Ea(t, r) {
     }));
 }
 
-function Ta(t, r, i) {
+function Ea(t, r, i) {
     return e(this, void 0, void 0, (function() {
         var e, i, o, u, s, a, c, l, h, f, d, p, v, y;
         return n(this, (function(n) {
@@ -15391,7 +15394,7 @@ function Ta(t, r, i) {
                 return [ 3 /*break*/ , 11 ];
 
               case 7:
-                return [ 4 /*yield*/ , Nu(e.localStore, a) ];
+                return [ 4 /*yield*/ , Au(e.localStore, a) ];
 
               case 8:
                 return y = n.sent(), [ 4 /*yield*/ , Du(e.localStore, y) ];
@@ -15410,7 +15413,7 @@ function Ta(t, r, i) {
                 return u++, [ 3 /*break*/ , 1 ];
 
               case 13:
-                return [ 2 /*return*/ , (e.sc.zo(o), i) ];
+                return [ 2 /*return*/ , (e.sc.Wo(o), i) ];
             }
         }));
     }));
@@ -15440,7 +15443,7 @@ function Da(t) {
 
 /** Applies a query target change from a different tab. */
 // PORTING NOTE: Multi-Tab only.
-function _a(t, r, i, o) {
+function xa(t, r, i, o) {
     return e(this, void 0, void 0, (function() {
         var e, u, s, a;
         return n(this, (function(n) {
@@ -15462,7 +15465,7 @@ function _a(t, r, i, o) {
                 return [ 3 /*break*/ , 6 ];
 
               case 1:
-                return [ 4 /*yield*/ , Au(e.localStore, mn(u[0])) ];
+                return [ 4 /*yield*/ , Nu(e.localStore, mn(u[0])) ];
 
               case 2:
                 return s = n.sent(), a = mr.createSynthesizedRemoteEventForCurrentChange(r, "current" === i, Zt.EMPTY_BYTE_STRING), 
@@ -15472,7 +15475,7 @@ function _a(t, r, i, o) {
                 return n.sent(), [ 3 /*break*/ , 7 ];
 
               case 4:
-                return [ 4 /*yield*/ , _u(e.localStore, r, 
+                return [ 4 /*yield*/ , xu(e.localStore, r, 
                 /* keepPersistedTargetData */ !0) ];
 
               case 5:
@@ -15488,19 +15491,19 @@ function _a(t, r, i, o) {
     }));
 }
 
-/** Adds or removes Watch targets for queries from different tabs. */ function xa(t, r, i) {
+/** Adds or removes Watch targets for queries from different tabs. */ function _a(t, r, i) {
     return e(this, void 0, void 0, (function() {
         var e, o, u, s, a, c, l, h, f, d;
         return n(this, (function(p) {
             switch (p.label) {
               case 0:
-                if (!(e = Na(t)).dc) return [ 3 /*break*/ , 10 ];
+                if (!(e = Aa(t)).dc) return [ 3 /*break*/ , 10 ];
                 o = 0, u = r, p.label = 1;
 
               case 1:
                 return o < u.length ? (s = u[o], e.rc.has(s) ? (
                 // A target might have been added in a previous attempt
-                L("SyncEngine", "Adding an already active target " + s), [ 3 /*break*/ , 5 ]) : [ 4 /*yield*/ , Nu(e.localStore, s) ]) : [ 3 /*break*/ , 6 ];
+                L("SyncEngine", "Adding an already active target " + s), [ 3 /*break*/ , 5 ]) : [ 4 /*yield*/ , Au(e.localStore, s) ]) : [ 3 /*break*/ , 6 ];
 
               case 2:
                 return a = p.sent(), [ 4 /*yield*/ , Du(e.localStore, a) ];
@@ -15520,10 +15523,10 @@ function _a(t, r, i, o) {
                     return n(this, (function(n) {
                         switch (n.label) {
                           case 0:
-                            return e.rc.has(t) ? [ 4 /*yield*/ , _u(e.localStore, t, 
+                            return e.rc.has(t) ? [ 4 /*yield*/ , xu(e.localStore, t, 
                             /* keepPersistedTargetData */ !1).then((function() {
                                 ss(e.remoteStore, t), ha(e, t);
-                            })).catch(_t) ] : [ 3 /*break*/ , 2 ];
+                            })).catch(xt) ] : [ 3 /*break*/ , 2 ];
 
                             // Release queries that are still active.
                                                       case 1:
@@ -15552,14 +15555,14 @@ function _a(t, r, i, o) {
     }));
 }
 
-function Na(t) {
+function Aa(t) {
     var e = G(t);
     return e.remoteStore.remoteSyncer.applyRemoteEvent = ra.bind(null, e), e.remoteStore.remoteSyncer.getRemoteKeysForTarget = ga.bind(null, e), 
-    e.remoteStore.remoteSyncer.rejectListen = oa.bind(null, e), e.sc.zo = qs.bind(null, e.eventManager), 
+    e.remoteStore.remoteSyncer.rejectListen = oa.bind(null, e), e.sc.Wo = qs.bind(null, e.eventManager), 
     e.sc.wc = Us.bind(null, e.eventManager), e;
 }
 
-function Aa(t) {
+function Na(t) {
     var e = G(t);
     return e.remoteStore.remoteSyncer.applySuccessfulWrite = ua.bind(null, e), e.remoteStore.remoteSyncer.rejectFailedWrite = sa.bind(null, e), 
     e
@@ -15745,7 +15748,7 @@ var ka = /** @class */ function() {
 
                   case 2:
                     // Enqueue writes from a previous session
-                    return n.sent(), [ 4 /*yield*/ , Aa(this.Ac.syncEngine) ];
+                    return n.sent(), [ 4 /*yield*/ , Na(this.Ac.syncEngine) ];
 
                   case 3:
                     // Enqueue writes from a previous session
@@ -15797,8 +15800,8 @@ var ka = /** @class */ function() {
                   case 1:
                     return u.sent(), i = this.Ac.syncEngine, this.sharedClientState instanceof Bu ? (this.sharedClientState.syncEngine = {
                         Fr: Ia.bind(null, i),
-                        $r: _a.bind(null, i),
-                        Br: xa.bind(null, i),
+                        $r: xa.bind(null, i),
+                        Br: _a.bind(null, i),
                         vi: Da.bind(null, i),
                         Mr: ba.bind(null, i)
                     }, [ 4 /*yield*/ , this.sharedClientState.start() ]) : [ 3 /*break*/ , 3 ];
@@ -15814,7 +15817,7 @@ var ka = /** @class */ function() {
                             return n(this, (function(e) {
                                 switch (e.label) {
                                   case 0:
-                                    return [ 4 /*yield*/ , Ea(this.Ac.syncEngine, t) ];
+                                    return [ 4 /*yield*/ , Ta(this.Ac.syncEngine, t) ];
 
                                   case 1:
                                     return e.sent(), this.gcScheduler && (t && !this.gcScheduler.started ? this.gcScheduler.start() : t || this.gcScheduler.stop()), 
@@ -15853,7 +15856,7 @@ var ka = /** @class */ function() {
                     /* startAsPrimary=*/ !t.synchronizeTabs), this.sharedClientState.onlineStateHandler = function(t) {
                         return ia(e.syncEngine, t, 1 /* SharedClientState */);
                     }, this.remoteStore.remoteSyncer.handleCredentialChange = ma.bind(null, this.syncEngine), 
-                    [ 4 /*yield*/ , xs(this.remoteStore, this.syncEngine.isPrimaryClient) ]);
+                    [ 4 /*yield*/ , _s(this.remoteStore, this.syncEngine.isPrimaryClient) ]);
 
                   case 1:
                     n.sent(), n.label = 2;
@@ -15889,14 +15892,14 @@ var ka = /** @class */ function() {
                 return n(this, (function(n) {
                     switch (n.label) {
                       case 0:
-                        return e = G(t), L("RemoteStore", "RemoteStore shutting down."), e.wu.add(5 /* Shutdown */), 
+                        return e = G(t), L("RemoteStore", "RemoteStore shutting down."), e._u.add(5 /* Shutdown */), 
                         [ 4 /*yield*/ , os(e) ];
 
                       case 1:
-                        return n.sent(), e.gu.shutdown(), 
+                        return n.sent(), e.mu.shutdown(), 
                         // Set the OnlineState to Unknown (rather than Offline) to avoid potentially
                         // triggering spurious listener events with cached data, etc.
-                        e.yu.set("Unknown" /* Unknown */), [ 2 /*return*/ ];
+                        e.gu.set("Unknown" /* Unknown */), [ 2 /*return*/ ];
                     }
                 }));
             }));
@@ -16138,7 +16141,7 @@ function Qa(t, e, n, r) {
         if ("string" == typeof r.mockUserToken) u = r.mockUserToken, s = C.MOCK_USER; else {
             // Let createMockUserToken validate first (catches common mistakes like
             // invalid field "uid" and missing field "sub" / "user_id".)
-            u = y(r.mockUserToken, null === (i = t._app) || void 0 === i ? void 0 : i.options.projectId);
+            u = m(r.mockUserToken, null === (i = t._app) || void 0 === i ? void 0 : i.options.projectId);
             var a = r.mockUserToken.sub || r.mockUserToken.user_id;
             if (!a) throw new j(K.INVALID_ARGUMENT, "mockUserToken must contain 'sub' or 'user_id' field!");
             s = new C(a);
@@ -16462,7 +16465,7 @@ function tc(t, r) {
     return t.prototype.next = function(t) {
         this.observer.next && this.Rc(this.observer.next, t);
     }, t.prototype.error = function(t) {
-        this.observer.error ? this.Rc(this.observer.error, t) : M("Uncaught Error in snapshot listener:", t);
+        this.observer.error ? this.Rc(this.observer.error, t) : M("Uncaught Error in snapshot listener:", t.toString());
     }, t.prototype.bc = function() {
         this.muted = !0;
     }, t.prototype.Rc = function(t, e) {
@@ -16486,7 +16489,7 @@ function tc(t, r) {
         this.buffer = new Uint8Array, this.vc = new TextDecoder("utf-8"), 
         // Read the metadata (which is the first element).
         this.Vc().then((function(t) {
-            t && t.Ou() ? n.metadata.resolve(t.payload.metadata) : n.metadata.reject(new Error("The first element of the bundle is not a metadata, it is\n             " + JSON.stringify(null == t ? void 0 : t.payload)));
+            t && t.Ou() ? n.metadata.resolve(t.ku.metadata) : n.metadata.reject(new Error("The first element of the bundle is not a metadata, it is\n             " + JSON.stringify(null == t ? void 0 : t.ku)));
         }), (function(t) {
             return n.metadata.reject(t);
         }));
@@ -16681,7 +16684,7 @@ function tc(t, r) {
                                 },
                                 parent: n.parent
                             };
-                        }(e.It, hn(r)), o = i.parent, e.So.co || delete i.parent, [ 4 /*yield*/ , e._o("RunAggregationQuery", o, i, /*expectedResponseCount=*/ 1) ];
+                        }(e.It, hn(r)), o = i.parent, e.connection.co || delete i.parent, [ 4 /*yield*/ , e._o("RunAggregationQuery", o, i, /*expectedResponseCount=*/ 1) ];
 
                       case 1:
                         return [ 2 /*return*/ , n.sent().filter((function(t) {
@@ -16884,14 +16887,14 @@ function tc(t, r) {
 }(), sc = /** @class */ function() {
     function t(t, e, n, r, i) {
         this.asyncQueue = t, this.datastore = e, this.options = n, this.updateFunction = r, 
-        this.deferred = i, this.kc = n.maxAttempts, this.No = new Zu(this.asyncQueue, "transaction_retry" /* TransactionRetry */)
+        this.deferred = i, this.kc = n.maxAttempts, this.xo = new Zu(this.asyncQueue, "transaction_retry" /* TransactionRetry */)
         /** Runs the transaction and sets the result on deferred. */;
     }
     return t.prototype.run = function() {
         this.kc -= 1, this.Oc();
     }, t.prototype.Oc = function() {
         var t = this;
-        this.No.Ro((function() {
+        this.xo.Ro((function() {
             return e(t, void 0, void 0, (function() {
                 var t, e, r = this;
                 return n(this, (function(n) {
@@ -16928,7 +16931,7 @@ function tc(t, r) {
             // In transactions, the backend will fail outdated reads with FAILED_PRECONDITION and
             // non-matching document versions with ABORTED. These errors should be retried.
             var e = t.code;
-            return "aborted" === e || "failed-precondition" === e || !er(e);
+            return "aborted" === e || "failed-precondition" === e || "already-exists" === e || !er(e);
         }
         return !1;
     }, t;
@@ -17110,9 +17113,9 @@ function lc(t, r) {
                 // The CredentialChangeListener of the online component provider takes
                 // precedence over the offline component provider.
                 t.setCredentialChangeListener((function(t) {
-                    return _s(r.remoteStore, t);
+                    return xs(r.remoteStore, t);
                 })), t.setAppCheckTokenChangeListener((function(t, e) {
-                    return _s(r.remoteStore, e);
+                    return xs(r.remoteStore, e);
                 })), t.onlineComponents = r, [ 2 /*return*/ ];
             }
         }));
@@ -17235,7 +17238,7 @@ function gc(t) {
                             }
                         }), u = new Gs(on(n.path), o, {
                             includeMetadataChanges: !0,
-                            ku: !0
+                            Nu: !0
                         });
                         return Ps(t, u);
                     }, [ 4 /*yield*/ , gc(t) ];
@@ -17272,7 +17275,7 @@ function bc(t, r, i) {
                             }
                         }), u = new Gs(n, o, {
                             includeMetadataChanges: !0,
-                            ku: !0
+                            Nu: !0
                         });
                         return Ps(t, u);
                     }, [ 4 /*yield*/ , gc(t) ];
@@ -17309,13 +17312,13 @@ var Ic = /** @class */ function() {
         // List of TimerIds to fast-forward delays for.
         this.jc = [], 
         // Backoff timer used to schedule retries for retryable operations
-        this.No = new Zu(this, "async_queue_retry" /* AsyncQueueRetry */), 
+        this.xo = new Zu(this, "async_queue_retry" /* AsyncQueueRetry */), 
         // Visibility handler that triggers an immediate retry of all retryable
         // operations. Meant to speed up recovery when we regain file system access
         // after page comes into foreground.
         this.Wc = function() {
             var e = Yu();
-            e && L("AsyncQueue", "Visibility state changed to " + e.visibilityState), t.No.Po();
+            e && L("AsyncQueue", "Visibility state changed to " + e.visibilityState), t.xo.Po();
         };
         var e = Yu();
         e && "function" == typeof e.addEventListener && e.addEventListener("visibilitychange", this.Wc);
@@ -17381,7 +17384,7 @@ var Ic = /** @class */ function() {
                     return n.trys.push([ 1, 3, , 4 ]), [ 4 /*yield*/ , this.Lc[0]() ];
 
                   case 2:
-                    return n.sent(), this.Lc.shift(), this.No.reset(), [ 3 /*break*/ , 4 ];
+                    return n.sent(), this.Lc.shift(), this.xo.reset(), [ 3 /*break*/ , 4 ];
 
                   case 3:
                     if (!Ot(t = n.sent())) throw t;
@@ -17401,7 +17404,7 @@ var Ic = /** @class */ function() {
                     // Since `backoffAndRun()` cancels an existing backoff and schedules a
                     // new backoff on every call, there is only ever a single additional
                     // operation in the queue.
-                    this.No.Ro((function() {
+                    this.xo.Ro((function() {
                         return e.Jc();
                     })), n.label = 5;
 
@@ -17516,7 +17519,7 @@ var Ic = /** @class */ function() {
     }, t;
 }();
 
-function Ec(t) {
+function Tc(t) {
     /**
  * Returns true if obj is an object and contains at least one of the specified
  * methods.
@@ -17531,7 +17534,7 @@ function Ec(t) {
     }(t);
 }
 
-var Tc = /** @class */ function() {
+var Ec = /** @class */ function() {
     function t() {
         this._progressObserver = {}, this._taskCompletionResolver = new Q, this._lastProgress = {
             taskState: "Running",
@@ -17617,7 +17620,7 @@ var Tc = /** @class */ function() {
         return this._firestoreClient || 
         // The client must be initialized to ensure that all subsequent API
         // usage throws an exception.
-        Ac(this), this._firestoreClient.terminate();
+        Nc(this), this._firestoreClient.terminate();
     }, n;
 }(ja);
 
@@ -17650,14 +17653,14 @@ var Tc = /** @class */ function() {
  * @param databaseId - The name of database.
  * @returns A newly initialized {@link Firestore} instance.
  */
-function _c(t, e, n) {
+function xc(t, e, n) {
     n || (n = "(default)");
     var r = _getProvider(t, "firestore");
     if (r.isInitialized(n)) {
         var i = r.getImmediate({
             identifier: n
         }), o = r.getOptions(n);
-        if (m(o, e)) return i;
+        if (g(o, e)) return i;
         throw new j(K.FAILED_PRECONDITION, "initializeFirestore() has already been called with different options. To avoid this error, call initializeFirestore() with the same options as when it was originally called, or call getFirestore() to return the already initialized instance.");
     }
     if (void 0 !== e.cacheSizeBytes && -1 !== e.cacheSizeBytes && e.cacheSizeBytes < 1048576) throw new j(K.INVALID_ARGUMENT, "cacheSizeBytes must be at least 1048576");
@@ -17667,12 +17670,12 @@ function _c(t, e, n) {
     });
 }
 
-function xc(t, e) {
+function _c(t, e) {
     var n = "object" == typeof t ? t : s(), i = "string" == typeof t ? t : e || "(default)", o = _getProvider(n, "firestore").getImmediate({
         identifier: i
     });
     if (!o._initialized) {
-        var u = g("firestore");
+        var u = w("firestore");
         u && Qa.apply(void 0, r([ o ], u));
     }
     return o;
@@ -17680,11 +17683,11 @@ function xc(t, e) {
 
 /**
  * @internal
- */ function Nc(t) {
-    return t._firestoreClient || Ac(t), t._firestoreClient.verifyNotTerminated(), t._firestoreClient;
+ */ function Ac(t) {
+    return t._firestoreClient || Nc(t), t._firestoreClient.verifyNotTerminated(), t._firestoreClient;
 }
 
-function Ac(t) {
+function Nc(t) {
     var e, n = t._freezeSettings(), r = function(t, e, n, r) {
         return new oe(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);
@@ -17715,7 +17718,7 @@ function Ac(t) {
  * @returns A `Promise` that represents successfully enabling persistent storage.
  */ function Cc(t, e) {
     Uc(t = Ua(t, Dc));
-    var n = Nc(t), r = t._freezeSettings(), i = new Va;
+    var n = Ac(t), r = t._freezeSettings(), i = new Va;
     return Oc(n, i, new Oa(i, r.cacheSizeBytes, null == e ? void 0 : e.forceOwnership));
 }
 
@@ -17742,7 +17745,7 @@ function Ac(t) {
  * storage.
  */ function kc(t) {
     Uc(t = Ua(t, Dc));
-    var e = Nc(t), n = t._freezeSettings(), r = new Va;
+    var e = Ac(t), n = t._freezeSettings(), r = new Va;
     return Oc(e, r, new Ra(r, n.cacheSizeBytes));
 }
 
@@ -17808,7 +17811,7 @@ function Rc(t) {
                             return n(this, (function(n) {
                                 switch (n.label) {
                                   case 0:
-                                    return At.C() ? (e = t + "main", [ 4 /*yield*/ , At.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*/ ];
@@ -17864,7 +17867,7 @@ function Vc(t) {
                 }));
             }));
         })), i.promise;
-    }(Nc(t = Ua(t, Dc)));
+    }(Ac(t = Ua(t, Dc)));
 }
 
 /**
@@ -17889,14 +17892,14 @@ function Vc(t) {
                       case 2:
                         return r = n.sent(), [ 2 /*return*/ , (e.setNetworkEnabled(!0), function(t) {
                             var e = G(t);
-                            return e.wu.delete(0 /* UserDisabled */), is(e);
+                            return e._u.delete(0 /* UserDisabled */), is(e);
                         }(r)) ];
                     }
                 }));
             }));
         }));
     }
-    /** Disables the network connection. Pending operations will not complete. */ (Nc(t = Ua(t, Dc)));
+    /** Disables the network connection. Pending operations will not complete. */ (Ac(t = Ua(t, Dc)));
 }
 
 /**
@@ -17927,12 +17930,12 @@ function Vc(t) {
                                 return n(this, (function(n) {
                                     switch (n.label) {
                                       case 0:
-                                        return (e = G(t)).wu.add(0 /* UserDisabled */), [ 4 /*yield*/ , os(e) ];
+                                        return (e = G(t))._u.add(0 /* UserDisabled */), [ 4 /*yield*/ , os(e) ];
 
                                       case 1:
                                         return n.sent(), 
                                         // Set the OnlineState to Offline so get()s return from cache, etc.
-                                        e.yu.set("Offline" /* Offline */), [ 2 /*return*/ ];
+                                        e.gu.set("Offline" /* Offline */), [ 2 /*return*/ ];
                                     }
                                 }));
                             }));
@@ -17946,7 +17949,7 @@ function Vc(t) {
  * Returns a Promise that resolves when all writes that were pending at the time
  * this method was called received server acknowledgement. An acknowledgement
  * can be either acceptance or rejection.
- */ (Nc(t = Ua(t, Dc)));
+ */ (Ac(t = Ua(t, Dc)));
 }
 
 /**
@@ -17986,7 +17989,7 @@ function Vc(t) {
 }
 
 function Fc(t, r) {
-    var i = Nc(t = Ua(t, Dc)), o = new Tc;
+    var i = Ac(t = Ua(t, Dc)), o = new Ec;
     /**
  * Takes an updateFunction in which a set of reads and writes can be performed
  * atomically. In the updateFunction, the client can read and write values
@@ -18064,7 +18067,7 @@ function qc(t, r) {
                 }));
             }));
         }));
-    }(Nc(t = Ua(t, Dc)), r).then((function(e) {
+    }(Ac(t = Ua(t, Dc)), r).then((function(e) {
         return e ? new Wa(t, null, e.query) : null;
     }));
 }
@@ -18518,7 +18521,7 @@ var nl = /** @class */ function(e) {
         return null !== e && e.apply(this, arguments) || this;
     }
     return t(n, e), n.prototype._toFieldTransform = function(t) {
-        return new Ln(t.path, new xn);
+        return new Ln(t.path, new _n);
     }, n.prototype.isEqual = function(t) {
         return t instanceof n;
     }, n;
@@ -18531,7 +18534,7 @@ var nl = /** @class */ function(e) {
         var e = el(this, t, 
         /*array=*/ !0), n = this._a.map((function(t) {
             return cl(t, e);
-        })), r = new Nn(n);
+        })), r = new An(n);
         return new Ln(t.path, r);
     }, n.prototype.isEqual = function(t) {
         // TODO(mrschmidt): Implement isEquals
@@ -18558,7 +18561,7 @@ var nl = /** @class */ function(e) {
         return (r = e.call(this, t) || this).wa = n, r;
     }
     return t(n, e), n.prototype._toFieldTransform = function(t) {
-        var e = new On(t.It, En(t.It, this.wa));
+        var e = new On(t.It, Tn(t.It, this.wa));
         return new Ln(t.path, e);
     }, n.prototype.isEqual = function(t) {
         // TODO(mrschmidt): Implement isEquals
@@ -18687,7 +18690,7 @@ var nl = /** @class */ function(e) {
         if (null === (t = v(t))) return {
             nullValue: "NULL_VALUE"
         };
-        if ("number" == typeof t) return En(e.It, t);
+        if ("number" == typeof t) return Tn(e.It, t);
         if ("boolean" == typeof t) return {
             booleanValue: t
         };
@@ -18697,7 +18700,7 @@ var nl = /** @class */ function(e) {
         if (t instanceof Date) {
             var n = ut.fromDate(t);
             return {
-                timestampValue: Ar(e.It, n)
+                timestampValue: Nr(e.It, n)
             };
         }
         if (t instanceof ut) {
@@ -18706,7 +18709,7 @@ var nl = /** @class */ function(e) {
             // truncation immediately without waiting for the backend to do that.
             var r = new ut(t.seconds, 1e3 * Math.floor(t.nanoseconds / 1e3));
             return {
-                timestampValue: Ar(e.It, r)
+                timestampValue: Nr(e.It, r)
             };
         }
         if (t instanceof Qc) return {
@@ -18962,7 +18965,7 @@ function bl(t, e) {
  * endBefore:1}, {@link (endAt:1)}, {@link limit} or {@link limitToLast} and
  * can then be passed to {@link query} to create a new query instance that
  * also contains this `QueryConstraint`.
- */ var El = function() {};
+ */ var Tl = function() {};
 
 /**
  * Creates a new immutable instance of {@link Query} that is extended to also include
@@ -18972,7 +18975,7 @@ function bl(t, e) {
  * @param queryConstraints - The list of {@link QueryConstraint}s to apply.
  * @throws if any of the provided query constraints cannot be combined with the
  * existing or new constraints.
- */ function Tl(t) {
+ */ function El(t) {
     for (var e = [], n = 1; n < arguments.length; n++) e[n - 1] = arguments[n];
     for (var r = 0, i = e; r < i.length; r++) {
         var o = i[r];
@@ -19065,7 +19068,7 @@ var Sl = /** @class */ function(e) {
             return new nn(t.path, t.collectionGroup, t.explicitOrderBy.slice(), n, t.limit, t.limitType, t.startAt, t.endAt);
         }(t._query, n));
     }, n;
-}(El);
+}(Tl);
 
 /**
  * Creates a {@link QueryConstraint} that enforces that documents must contain the
@@ -19082,7 +19085,7 @@ var Sl = /** @class */ function(e) {
     return new Sl(i, r, n);
 }
 
-var _l = /** @class */ function(e) {
+var xl = /** @class */ function(e) {
     function n(t, n) {
         var r = this;
         return (r = e.call(this) || this).ma = t, r.pa = n, r.type = "orderBy", r;
@@ -19106,7 +19109,7 @@ var _l = /** @class */ function(e) {
             return new nn(t.path, t.collectionGroup, n, t.filters.slice(), t.limit, t.limitType, t.startAt, t.endAt);
         }(t._query, e));
     }, n;
-}(El);
+}(Tl);
 
 /**
  * Creates a {@link QueryConstraint} that sorts the query result by the
@@ -19116,13 +19119,13 @@ var _l = /** @class */ function(e) {
  * @param directionStr - Optional direction to sort by ('asc' or 'desc'). If
  * not specified, order will be ascending.
  * @returns The created {@link Query}.
- */ function xl(t, e) {
+ */ function _l(t, e) {
     void 0 === e && (e = "asc");
     var n = e, r = bl("orderBy", t);
-    return new _l(r, n);
+    return new xl(r, n);
 }
 
-var Nl = /** @class */ function(e) {
+var Al = /** @class */ function(e) {
     function n(t, n, r) {
         var i = this;
         return (i = e.call(this) || this).type = t, i.Ia = n, i.Ta = r, i;
@@ -19130,15 +19133,15 @@ var Nl = /** @class */ function(e) {
     return t(n, e), n.prototype._apply = function(t) {
         return new Wa(t.firestore, t.converter, fn(t._query, this.Ia, this.Ta));
     }, n;
-}(El);
+}(Tl);
 
 /**
  * Creates a {@link QueryConstraint} that only returns the first matching documents.
  *
  * @param limit - The maximum number of items to return.
  * @returns The created {@link Query}.
- */ function Al(t) {
-    return Ba("limit", t), new Nl("limit", t, "F" /* First */)
+ */ function Nl(t) {
+    return Ba("limit", t), new Al("limit", t, "F" /* First */)
     /**
  * Creates a {@link QueryConstraint} that only returns the last matching documents.
  *
@@ -19151,7 +19154,7 @@ var Nl = /** @class */ function(e) {
 }
 
 function Cl(t) {
-    return Ba("limitToLast", t), new Nl("limitToLast", t, "L" /* Last */);
+    return Ba("limitToLast", t), new Al("limitToLast", t, "L" /* Last */);
 }
 
 var kl = /** @class */ function(e) {
@@ -19165,7 +19168,7 @@ var kl = /** @class */ function(e) {
             return new nn(t.path, t.collectionGroup, t.explicitOrderBy.slice(), t.filters.slice(), t.limit, t.limitType, e, t.endAt);
         }(t._query, e));
     }, n;
-}(El);
+}(Tl);
 
 function Ol() {
     for (var t = [], e = 0; e < arguments.length; e++) t[e] = arguments[e];
@@ -19190,7 +19193,7 @@ var Vl = /** @class */ function(e) {
             return new nn(t.path, t.collectionGroup, t.explicitOrderBy.slice(), t.filters.slice(), t.limit, t.limitType, t.startAt, e);
         }(t._query, e));
     }, n;
-}(El);
+}(Tl);
 
 function Ll() {
     for (var t = [], e = 0; e < arguments.length; e++) t[e] = arguments[e];
@@ -19570,9 +19573,10 @@ var Kl = /** @class */ function(e) {
             if (t._snapshot.oldDocs.isEmpty()) {
                 var n = 0;
                 return t._snapshot.docChanges.map((function(e) {
-                    return {
+                    var r = new zl(t._firestore, t._userDataWriter, e.doc.key, e.doc, new jl(t._snapshot.mutatedKeys.has(e.doc.key), t._snapshot.fromCache), t.query.converter);
+                    return e.doc, {
                         type: "added",
-                        doc: new zl(t._firestore, t._userDataWriter, e.doc.key, e.doc, new jl(t._snapshot.mutatedKeys.has(e.doc.key), t._snapshot.fromCache), t.query.converter),
+                        doc: r,
                         oldIndex: -1,
                         newIndex: n++
                     };
@@ -19674,7 +19678,7 @@ var Kl = /** @class */ function(e) {
  */ function Xl(t) {
     t = Ua(t, za);
     var e = Ua(t.firestore, Dc);
-    return wc(Nc(e), t._key).then((function(n) {
+    return wc(Ac(e), t._key).then((function(n) {
         return lh(e, t, n);
     }));
 }
@@ -19700,7 +19704,7 @@ var Zl = /** @class */ function(e) {
  * current document contents.
  */ function Jl(t) {
     t = Ua(t, za);
-    var r = Ua(t.firestore, Dc), i = Nc(r), o = new Zl(r);
+    var r = Ua(t.firestore, Dc), i = Ac(r), o = new Zl(r);
     return function(t, r) {
         var i = this, o = new Q;
         return t.asyncQueue.enqueueAndForget((function() {
@@ -19758,7 +19762,7 @@ var Zl = /** @class */ function(e) {
  */ function $l(t) {
     t = Ua(t, za);
     var e = Ua(t.firestore, Dc);
-    return wc(Nc(e), t._key, {
+    return wc(Ac(e), t._key, {
         source: "server"
     }).then((function(n) {
         return lh(e, t, n);
@@ -19776,7 +19780,7 @@ var Zl = /** @class */ function(e) {
  * @returns A `Promise` that will be resolved with the results of the query.
  */ function th(t) {
     t = Ua(t, Wa);
-    var e = Ua(t.firestore, Dc), n = Nc(e), r = new Zl(e);
+    var e = Ua(t.firestore, Dc), n = Ac(e), r = new Zl(e);
     return Il(t._query), bc(n, t._query).then((function(n) {
         return new Wl(e, r, t, n);
     }))
@@ -19790,7 +19794,7 @@ var Zl = /** @class */ function(e) {
 
 function eh(t) {
     t = Ua(t, Wa);
-    var r = Ua(t.firestore, Dc), i = Nc(r), o = new Zl(r);
+    var r = Ua(t.firestore, Dc), i = Ac(r), o = new Zl(r);
     return function(t, r) {
         var i = this, o = new Q;
         return t.asyncQueue.enqueueAndForget((function() {
@@ -19805,7 +19809,7 @@ function eh(t) {
                                 return n(this, (function(n) {
                                     switch (n.label) {
                                       case 0:
-                                        return n.trys.push([ 0, 2, , 3 ]), [ 4 /*yield*/ , xu(t, r, 
+                                        return n.trys.push([ 0, 2, , 3 ]), [ 4 /*yield*/ , _u(t, r, 
                                         /* usePreviousResults= */ !0) ];
 
                                       case 1:
@@ -19841,7 +19845,7 @@ function eh(t) {
  * @returns A `Promise` that will be resolved with the results of the query.
  */ function nh(t) {
     t = Ua(t, Wa);
-    var e = Ua(t.firestore, Dc), n = Nc(e), r = new Zl(e);
+    var e = Ua(t.firestore, Dc), n = Ac(e), r = new Zl(e);
     return bc(n, t._query, {
         source: "server"
     }).then((function(n) {
@@ -19897,11 +19901,11 @@ function sh(t) {
     var a = {
         includeMetadataChanges: !1
     }, c = 0;
-    "object" != typeof u[c] || Ec(u[c]) || (a = u[c], c++);
+    "object" != typeof u[c] || Tc(u[c]) || (a = u[c], c++);
     var l, h, f, d = {
         includeMetadataChanges: a.includeMetadataChanges
     };
-    if (Ec(u[c])) {
+    if (Tc(u[c])) {
         var p = u[c];
         u[c] = null === (r = p.next) || void 0 === r ? void 0 : r.bind(p), u[c + 1] = null === (i = p.error) || void 0 === i ? void 0 : i.bind(p), 
         u[c + 2] = null === (o = p.complete) || void 0 === o ? void 0 : o.bind(p);
@@ -19955,7 +19959,7 @@ function sh(t) {
                 }));
             }));
         };
-    }(Nc(h), f, d, l);
+    }(Ac(h), f, d, l);
 }
 
 function ah(t, r) {
@@ -19968,7 +19972,7 @@ function ah(t, r) {
                     switch (n.label) {
                       case 0:
                         return e = function(t, e) {
-                            G(t).bu.add(e), 
+                            G(t).Ru.add(e), 
                             // Immediately fire an initial event, indicating all existing listeners
                             // are in-sync.
                             e.next();
@@ -19987,7 +19991,7 @@ function ah(t, r) {
                         switch (n.label) {
                           case 0:
                             return e = function(t, e) {
-                                G(t).bu.delete(e);
+                                G(t).Ru.delete(e);
                             }, [ 4 /*yield*/ , gc(t) ];
 
                           case 1:
@@ -19997,7 +20001,7 @@ function ah(t, r) {
                 }));
             }));
         };
-    }(Nc(t = Ua(t, Dc)), Ec(r) ? r : {
+    }(Ac(t = Ua(t, Dc)), Tc(r) ? r : {
         next: r
     });
 }
@@ -20022,7 +20026,7 @@ function ah(t, r) {
                 }));
             }));
         })), o.promise;
-    }(Nc(t), r);
+    }(Ac(t), r);
 }
 
 /**
@@ -20061,7 +20065,7 @@ function ah(t, r) {
  * @returns `true` if the objects are "equal", as defined above, or `false`
  * otherwise.
  */ function hh(t, e) {
-    return $a(t.query, e.query) && m(t.data(), e.data());
+    return $a(t.query, e.query) && g(t.data(), e.data());
 }
 
 /**
@@ -20134,7 +20138,7 @@ function ah(t, r) {
                 }));
             }));
         })), u.promise;
-    }(Nc(r), t, new Zl(r));
+    }(Ac(r), t, new Zl(r));
 }
 
 /**
@@ -20381,7 +20385,7 @@ function ah(t, r) {
                 }));
             }));
         })), u.promise;
-    }(Nc(t), (function(e) {
+    }(Ac(t), (function(e) {
         return r(new mh(t, e));
     }), o);
 }
@@ -20444,7 +20448,7 @@ function ah(t, r) {
  * @param elements - The elements to remove from the array.
  * @returns The `FieldValue` sentinel for use in a call to `setDoc()` or
  * `updateDoc()`
- */ function Eh() {
+ */ function Th() {
     for (var t = [], e = 0; e < arguments.length; e++) t[e] = arguments[e];
     // NOTE: We don't actually parse the data until it's used in set() or
     // update() since we'd need the Firestore instance to do this.
@@ -20469,7 +20473,7 @@ function ah(t, r) {
  * @param n - The value to increment by.
  * @returns The `FieldValue` sentinel for use in a call to `setDoc()` or
  * `updateDoc()`
- */ function Th(t) {
+ */ function Eh(t) {
     return new ol("increment", t);
 }
 
@@ -20500,7 +20504,7 @@ function ah(t, r) {
  * @returns A {@link WriteBatch} that can be used to atomically execute multiple
  * writes.
  */ function Sh(t) {
-    return Nc(t = Ua(t, Dc)), new ph(t, (function(e) {
+    return Ac(t = Ua(t, Dc)), new ph(t, (function(e) {
         return ch(t, e);
     }))
     /**
@@ -20522,7 +20526,7 @@ function ah(t, r) {
 }
 
 function Dh(t, i) {
-    var o, u = Nc(t = Ua(t, Dc));
+    var o, u = Ac(t = Ua(t, Dc));
     // PORTING NOTE: We don't return an error if the user has not enabled
     // persistence since `enableIndexeddbPersistence()` can fail on the Web.
     if (!(null === (o = u.offlineComponents) || void 0 === o ? void 0 : o.indexBackfillerScheduler)) return P("Cannot enable indexes when persistence is disabled"), 
@@ -20537,9 +20541,9 @@ function Dh(t, i) {
             }
         }(t) : t, n = [];
         if (Array.isArray(e.indexes)) for (var r = 0, i = e.indexes; r < i.length; r++) {
-            var o = i[r], u = _h(o, "collectionGroup"), s = [];
+            var o = i[r], u = xh(o, "collectionGroup"), s = [];
             if (Array.isArray(o.fields)) for (var a = 0, c = o.fields; a < c.length; a++) {
-                var l = c[a], h = vl("setIndexConfiguration", _h(l, "fieldPath"));
+                var l = c[a], h = vl("setIndexConfiguration", xh(l, "fieldPath"));
                 "CONTAINS" === l.arrayConfig ? s.push(new mt(h, 2 /* CONTAINS */)) : "ASCENDING" === l.order ? s.push(new mt(h, 0 /* ASCENDING */)) : "DESCENDING" === l.order && s.push(new mt(h, 1 /* DESCENDING */));
             }
             n.push(new dt(dt.UNKNOWN_ID, u, s, wt.empty()));
@@ -20573,7 +20577,7 @@ function Dh(t, i) {
                                 u.push(o.deleteFieldIndex(t, e));
                             }));
                         })).next((function() {
-                            return xt.waitFor(u);
+                            return _t.waitFor(u);
                         }));
                     })) ];
                 }));
@@ -20582,7 +20586,7 @@ function Dh(t, i) {
     }));
 }
 
-function _h(t, e) {
+function xh(t, e) {
     if ("string" != typeof t[e]) throw new j(K.INVALID_ARGUMENT, "Missing string value for: " + e);
     return t[e];
 }
@@ -20599,9 +20603,9 @@ function _h(t, e) {
     return r = Object.assign({
         useFetchStreams: yh
     }, r), o._setSettings(r), o;
-}), "PUBLIC").setMultipleInstances(!0)), u(A, "3.7.1", void 0), 
+}), "PUBLIC").setMultipleInstances(!0)), u(N, "3.7.2-canary.457fc2eeb", void 0), 
 // BUILD_TARGET will be replaced by values like esm5, esm2017, cjs5, etc during the compilation
-u(A, "3.7.1", "esm5");
+u(N, "3.7.2-canary.457fc2eeb", "esm5");
 
-export { Bl as AbstractUserDataWriter, rc as AggregateField, ic as AggregateQuerySnapshot, Bc as Bytes, Sc as CACHE_SIZE_UNLIMITED, Ha as CollectionReference, za as DocumentReference, Ql as DocumentSnapshot, Gc as FieldPath, jc as FieldValue, Dc as Firestore, j as FirestoreError, Qc as GeoPoint, Tc as LoadBundleTask, Wa as Query, El as QueryConstraint, zl as QueryDocumentSnapshot, Wl as QuerySnapshot, jl as SnapshotMetadata, ut as Timestamp, mh as Transaction, ph as WriteBatch, ue as _DatabaseId, ft as _DocumentKey, tt as _EmptyAppCheckTokenProvider, W as _EmptyAuthCredentialsProvider, ht as _FieldPath, Ua as _cast, B as _debugAssert, Xt as _isBase64Available, P as _logWarn, Ma as _validateIsNotUsedTogether, uh as addDoc, hh as aggregateQuerySnapshotEqual, Eh as arrayRemove, Ih as arrayUnion, Rc as clearIndexedDbPersistence, Ya as collection, Xa as collectionGroup, Qa as connectFirestoreEmulator, oh as deleteDoc, wh as deleteField, Mc as disableNetwork, Za as doc, Kc as documentId, Cc as enableIndexedDbPersistence, kc as enableMultiTabIndexedDbPersistence, Lc as enableNetwork, Ml as endAt, Ll as endBefore, Nc as ensureFirestoreConfigured, ch as executeWrite, fh as getCountFromServer, Xl as getDoc, Jl as getDocFromCache, $l as getDocFromServer, th as getDocs, eh as getDocsFromCache, nh as getDocsFromServer, xc as getFirestore, Th as increment, _c as initializeFirestore, Al as limit, Cl as limitToLast, Fc as loadBundle, qc as namedQuery, sh as onSnapshot, ah as onSnapshotsInSync, xl as orderBy, Tl as query, $a as queryEqual, Ja as refEqual, gh as runTransaction, bh as serverTimestamp, rh as setDoc, Dh as setIndexConfiguration, V as setLogLevel, Yl as snapshotEqual, Rl as startAfter, Ol as startAt, Pc as terminate, ih as updateDoc, Vc as waitForPendingWrites, Dl as where, Sh as writeBatch };
+export { Bl as AbstractUserDataWriter, rc as AggregateField, ic as AggregateQuerySnapshot, Bc as Bytes, Sc as CACHE_SIZE_UNLIMITED, Ha as CollectionReference, za as DocumentReference, Ql as DocumentSnapshot, Gc as FieldPath, jc as FieldValue, Dc as Firestore, j as FirestoreError, Qc as GeoPoint, Ec as LoadBundleTask, Wa as Query, Tl as QueryConstraint, zl as QueryDocumentSnapshot, Wl as QuerySnapshot, jl as SnapshotMetadata, ut as Timestamp, mh as Transaction, ph as WriteBatch, ue as _DatabaseId, ft as _DocumentKey, tt as _EmptyAppCheckTokenProvider, W as _EmptyAuthCredentialsProvider, ht as _FieldPath, Ua as _cast, B as _debugAssert, Xt as _isBase64Available, P as _logWarn, Ma as _validateIsNotUsedTogether, uh as addDoc, hh as aggregateQuerySnapshotEqual, Th as arrayRemove, Ih as arrayUnion, Rc as clearIndexedDbPersistence, Ya as collection, Xa as collectionGroup, Qa as connectFirestoreEmulator, oh as deleteDoc, wh as deleteField, Mc as disableNetwork, Za as doc, Kc as documentId, Cc as enableIndexedDbPersistence, kc as enableMultiTabIndexedDbPersistence, Lc as enableNetwork, Ml as endAt, Ll as endBefore, Ac as ensureFirestoreConfigured, ch as executeWrite, fh as getCountFromServer, Xl as getDoc, Jl as getDocFromCache, $l as getDocFromServer, th as getDocs, eh as getDocsFromCache, nh as getDocsFromServer, _c as getFirestore, Eh as increment, xc as initializeFirestore, Nl as limit, Cl as limitToLast, Fc as loadBundle, qc as namedQuery, sh as onSnapshot, ah as onSnapshotsInSync, _l as orderBy, El as query, $a as queryEqual, Ja as refEqual, gh as runTransaction, bh as serverTimestamp, rh as setDoc, Dh as setIndexConfiguration, V as setLogLevel, Yl as snapshotEqual, Rl as startAfter, Ol as startAt, Pc as terminate, ih as updateDoc, Vc as waitForPendingWrites, Dl as where, Sh as writeBatch };
 //# sourceMappingURL=index.esm5.js.map