@firebase/firestore 3.4.1-canary.be7ccb8ed → 3.4.2

package/dist/index.rn.js

@@ -2,11 +2,11 @@ import { _getProvider, getApp as t, _removeServiceInstance as e, _registerCompon
 
 import { Component as r } from "@firebase/component";
 
-import { Logger as o, LogLevel as c } from "@firebase/logger";
+import { Logger as o, LogLevel as a } from "@firebase/logger";
 
-import { FirebaseError as a, base64 as u, getUA as h, isIndexedDBAvailable as l, isSafari as f, isMobileCordova as d, isReactNative as w, isElectron as _, isIE as m, isUWP as g, isBrowserExtension as y, createMockUserToken as p, getModularInstance as T, deepEqual as E } from "@firebase/util";
+import { FirebaseError as c, base64 as u, getUA as h, isIndexedDBAvailable as l, isSafari as f, isMobileCordova as d, isReactNative as w, isElectron as _, isIE as m, isUWP as g, isBrowserExtension as y, createMockUserToken as p, getModularInstance as T, deepEqual as E } from "@firebase/util";
 
-import { XhrIo as I, EventType as A, ErrorCode as R, createWebChannelTransport as b, getStatEventTarget as P, FetchXmlHttpFactory as v, WebChannel as V, Event as S, Stat as D } from "@firebase/webchannel-wrapper";
+import { XhrIo as I, EventType as A, ErrorCode as R, createWebChannelTransport as P, getStatEventTarget as b, FetchXmlHttpFactory as v, WebChannel as V, Event as S, Stat as D } from "@firebase/webchannel-wrapper";
 
 const C = "@firebase/firestore";
 
@@ -70,7 +70,7 @@ N.MOCK_USER = new N("mock-user");
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-let k = "9.6.1-canary.be7ccb8ed";
+let k = "9.6.2";
 
 /**
  * @license
@@ -112,14 +112,14 @@ function $() {
 }
 
 function F(t, ...e) {
-    if (x.logLevel <= c.DEBUG) {
+    if (x.logLevel <= a.DEBUG) {
         const n = e.map(B);
         x.debug(`Firestore (${k}): ${t}`, ...n);
     }
 }
 
 function M(t, ...e) {
-    if (x.logLevel <= c.ERROR) {
+    if (x.logLevel <= a.ERROR) {
         const n = e.map(B);
         x.error(`Firestore (${k}): ${t}`, ...n);
     }
@@ -128,7 +128,7 @@ function M(t, ...e) {
 /**
  * @internal
  */ function L(t, ...e) {
-    if (x.logLevel <= c.WARN) {
+    if (x.logLevel <= a.WARN) {
         const n = e.map(B);
         x.warn(`Firestore (${k}): ${t}`, ...n);
     }
@@ -356,7 +356,7 @@ e) {
     DATA_LOSS: "data-loss"
 };
 
-/** An error returned by a Firestore operation. */ class W extends a {
+/** An error returned by a Firestore operation. */ class W extends c {
     /** @hideconstructor */
     constructor(
     /**
@@ -733,14 +733,14 @@ function ot(t, e) {
     return t < e ? -1 : t > e ? 1 : 0;
 }
 
-/** Helper to compare arrays using isEqual(). */ function ct(t, e, n) {
+/** Helper to compare arrays using isEqual(). */ function at(t, e, n) {
     return t.length === e.length && t.every(((t, s) => n(t, e[s])));
 }
 
 /**
  * Returns the immediate lexicographically-following string. This is useful to
  * construct an inclusive range for indexeddb iterators.
- */ function at(t) {
+ */ function ct(t) {
     // Return the input string, with an additional NUL byte appended.
     return t + "\0";
 }
@@ -1195,7 +1195,7 @@ const mt = /^[_a-zA-Z][_a-zA-Z0-9]*$/;
         return !1;
     }
     isEqual(t) {
-        return ct(this.fields, t.fields, ((t, e) => t.isEqual(e)));
+        return at(this.fields, t.fields, ((t, e) => t.isEqual(e)));
     }
 }
 
@@ -1377,7 +1377,7 @@ const It = new RegExp(/^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d(?:\.(\d+))?Z$/);
     return "number" == typeof t ? t : "string" == typeof t ? Number(t) : 0;
 }
 
-/** Converts the possible Proto types for Blobs into a ByteString. */ function bt(t) {
+/** Converts the possible Proto types for Blobs into a ByteString. */ function Pt(t) {
     return "string" == typeof t ? Et.fromBase64String(t) : Et.fromUint8Array(t);
 }
 
@@ -1414,7 +1414,7 @@ const It = new RegExp(/^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d(?:\.(\d+))?Z$/);
  *   FieldValueOptions to value().
  * - With respect to other ServerTimestampValues, they sort by their
  *   localWriteTime.
- */ function Pt(t) {
+ */ function bt(t) {
     var e, n;
     return "server_timestamp" === (null === (n = ((null === (e = null == t ? void 0 : t.mapValue) || void 0 === e ? void 0 : e.fields) || {}).__type__) || void 0 === n ? void 0 : n.stringValue);
 }
@@ -1430,7 +1430,7 @@ const It = new RegExp(/^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d(?:\.(\d+))?Z$/);
  */
 function vt(t) {
     const e = t.mapValue.fields.__previous_value__;
-    return Pt(e) ? vt(e) : e;
+    return bt(e) ? vt(e) : e;
 }
 
 /**
@@ -1547,7 +1547,7 @@ function St(t) {
  * limitations under the License.
  */
 /** Extracts the backend's type order for the provided value. */ function kt(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 ? Pt(t) ? 4 /* ServerTimestampValue */ : 10 /* ObjectValue */ : U();
+    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 ? bt(t) ? 4 /* ServerTimestampValue */ : 10 /* ObjectValue */ : U();
 }
 
 /** Tests `left` and `right` for equality based on the backend semantics. */ function xt(t, e) {
@@ -1578,7 +1578,7 @@ function St(t) {
 
       case 6 /* BlobValue */ :
         return function(t, e) {
-            return bt(t.bytesValue).isEqual(bt(e.bytesValue));
+            return Pt(t.bytesValue).isEqual(Pt(e.bytesValue));
         }(t, e);
 
       case 7 /* RefValue */ :
@@ -1600,7 +1600,7 @@ function St(t) {
         }(t, e);
 
       case 9 /* ArrayValue */ :
-        return ct(t.arrayValue.values || [], e.arrayValue.values || [], xt);
+        return at(t.arrayValue.values || [], e.arrayValue.values || [], xt);
 
       case 10 /* ObjectValue */ :
         return function(t, e) {
@@ -1650,7 +1650,7 @@ function Ot(t, e) {
 
       case 6 /* BlobValue */ :
         return function(t, e) {
-            const n = bt(t), s = bt(e);
+            const n = Pt(t), s = Pt(e);
             return n.compareTo(s);
         }(t.bytesValue, e.bytesValue);
 
@@ -1721,7 +1721,7 @@ function Lt(t) {
     return "nullValue" in t ? "null" : "booleanValue" in t ? "" + t.booleanValue : "integerValue" in t ? "" + t.integerValue : "doubleValue" in t ? "" + t.doubleValue : "timestampValue" in t ? function(t) {
         const e = At(t);
         return `time(${e.seconds},${e.nanos})`;
-    }(t.timestampValue) : "stringValue" in t ? t.stringValue : "bytesValue" in t ? bt(t.bytesValue).toBase64() : "referenceValue" in t ? (n = t.referenceValue, 
+    }(t.timestampValue) : "stringValue" in t ? t.stringValue : "bytesValue" in t ? Pt(t.bytesValue).toBase64() : "referenceValue" in t ? (n = t.referenceValue, 
     Nt.fromName(n).toString()) : "geoPointValue" in t ? `geo(${(e = t.geoPointValue).latitude},${e.longitude})` : "arrayValue" in t ? function(t) {
         let e = "[", n = !0;
         for (const s of t.values || []) n ? n = !1 : e += ",", e += Lt(s);
@@ -2123,7 +2123,7 @@ class ne extends class {} {
     /**
      * Creates a filter based on the provided arguments.
      */    static create(t, e, n) {
-        return t.isKeyField() ? "in" /* IN */ === e || "not-in" /* NOT_IN */ === e ? this.P(t, e, n) : new ie(t, e, n) : "array-contains" /* ARRAY_CONTAINS */ === e ? new ae(t, n) : "in" /* IN */ === e ? new ue(t, n) : "not-in" /* NOT_IN */ === e ? new he(t, n) : "array-contains-any" /* ARRAY_CONTAINS_ANY */ === e ? new le(t, n) : new ne(t, e, n);
+        return t.isKeyField() ? "in" /* IN */ === e || "not-in" /* NOT_IN */ === e ? this.P(t, e, n) : new ie(t, e, n) : "array-contains" /* ARRAY_CONTAINS */ === e ? new ce(t, n) : "in" /* IN */ === e ? new ue(t, n) : "not-in" /* NOT_IN */ === e ? new he(t, n) : "array-contains-any" /* ARRAY_CONTAINS_ANY */ === e ? new le(t, n) : new ne(t, e, n);
     }
     static P(t, e, n) {
         return "in" /* IN */ === e ? new re(t, n) : new oe(t, n);
@@ -2182,7 +2182,7 @@ class ie extends ne {
 
 /** Filter that matches on key fields within an array. */ class re extends ne {
     constructor(t, e) {
-        super(t, "in" /* IN */ , e), this.keys = ce("in" /* IN */ , e);
+        super(t, "in" /* IN */ , e), this.keys = ae("in" /* IN */ , e);
     }
     matches(t) {
         return this.keys.some((e => e.isEqual(t.key)));
@@ -2191,19 +2191,19 @@ class ie extends ne {
 
 /** Filter that matches on key fields not present within an array. */ class oe extends ne {
     constructor(t, e) {
-        super(t, "not-in" /* NOT_IN */ , e), this.keys = ce("not-in" /* NOT_IN */ , e);
+        super(t, "not-in" /* NOT_IN */ , e), this.keys = ae("not-in" /* NOT_IN */ , e);
     }
     matches(t) {
         return !this.keys.some((e => e.isEqual(t.key)));
     }
 }
 
-function ce(t, e) {
+function ae(t, e) {
     var n;
     return ((null === (n = e.arrayValue) || void 0 === n ? void 0 : n.values) || []).map((t => Nt.fromName(t.referenceValue)));
 }
 
-/** A Filter that implements the array-contains operator. */ class ae extends ne {
+/** A Filter that implements the array-contains operator. */ class ce extends ne {
     constructor(t, e) {
         super(t, "array-contains" /* ARRAY_CONTAINS */ , e);
     }
@@ -2334,16 +2334,16 @@ function ge(t, e) {
      * Initializes a Query with a path and optional additional query constraints.
      * Path must currently be empty if this is a collection group query.
      */
-    constructor(t, e = null, n = [], s = [], i = null, r = "F" /* First */ , o = null, c = null) {
+    constructor(t, e = null, n = [], s = [], i = null, r = "F" /* First */ , o = null, a = null) {
         this.path = t, this.collectionGroup = e, this.explicitOrderBy = n, this.filters = s, 
-        this.limit = i, this.limitType = r, this.startAt = o, this.endAt = c, this.S = null, 
+        this.limit = i, this.limitType = r, this.startAt = o, this.endAt = a, this.S = null, 
         // The corresponding `Target` of this `Query` instance.
         this.D = null, this.startAt, this.endAt;
     }
 }
 
-/** Creates a new Query instance with the options provided. */ function pe(t, e, n, s, i, r, o, c) {
-    return new ye(t, e, n, s, i, r, o, c);
+/** Creates a new Query instance with the options provided. */ function pe(t, e, n, s, i, r, o, a) {
+    return new ye(t, e, n, s, i, r, o, a);
 }
 
 /** Creates a new Query for a query that matches all documents at `path` */ function Te(t) {
@@ -2380,7 +2380,7 @@ function Re(t) {
  * Returns whether the query matches a collection group rather than a specific
  * collection.
  */
-function be(t) {
+function Pe(t) {
     return null !== t.collectionGroup;
 }
 
@@ -2388,7 +2388,7 @@ function be(t) {
  * Returns the implicit order by constraint that is used to execute the Query,
  * which can be different from the order by constraints the user provided (e.g.
  * the SDK and backend always orders by `__name__`).
- */ function Pe(t) {
+ */ function be(t) {
     const e = j(t);
     if (null === e.S) {
         e.S = [];
@@ -2415,10 +2415,10 @@ function be(t) {
  * Converts this `Query` instance to it's corresponding `Target` representation.
  */ function ve(t) {
     const e = j(t);
-    if (!e.D) if ("F" /* First */ === e.limitType) e.D = Yt(e.path, e.collectionGroup, Pe(e), e.filters, e.limit, e.startAt, e.endAt); else {
+    if (!e.D) if ("F" /* First */ === e.limitType) e.D = Yt(e.path, e.collectionGroup, be(e), e.filters, e.limit, e.startAt, e.endAt); else {
         // Flip the orderBy directions since we want the last results
         const t = [];
-        for (const n of Pe(e)) {
+        for (const n of be(e)) {
             const e = "desc" /* DESCENDING */ === n.dir ? "asc" /* ASCENDING */ : "desc" /* DESCENDING */;
             t.push(new we(n.field, e));
         }
@@ -2467,8 +2467,8 @@ function Ce(t) {
         return !0;
     }
     /** Makes sure a document is within the bounds, if provided. */ (t, e) && function(t, e) {
-        if (t.startAt && !me(t.startAt, Pe(t), e)) return !1;
-        if (t.endAt && me(t.endAt, Pe(t), e)) return !1;
+        if (t.startAt && !me(t.startAt, be(t), e)) return !1;
+        if (t.endAt && me(t.endAt, be(t), e)) return !1;
         return !0;
     }
     /**
@@ -2480,7 +2480,7 @@ function Ce(t) {
 function ke(t) {
     return (e, n) => {
         let s = !1;
-        for (const i of Pe(t)) {
+        for (const i of be(t)) {
             const t = xe(i, e, n);
             if (0 !== t) return t;
             s = s || i.field.isKeyField();
@@ -2724,7 +2724,7 @@ function He(t) {
 
 function Ye(t, e) {
     return t.field.isEqual(e.field) && function(t, e) {
-        return t instanceof Ke && e instanceof Ke || t instanceof Qe && e instanceof Qe ? ct(t.elements, e.elements, xt) : t instanceof Ge && e instanceof Ge ? xt(t.N, e.N) : t instanceof qe && e instanceof qe;
+        return t instanceof Ke && e instanceof Ke || t instanceof Qe && e instanceof Qe ? at(t.elements, e.elements, xt) : t instanceof Ge && e instanceof Ge ? xt(t.N, e.N) : t instanceof qe && e instanceof qe;
     }(t.transform, e.transform);
 }
 
@@ -2840,7 +2840,7 @@ class Xe {
  *     of the document.
  * @param mutationResult - The result of applying the mutation from the backend.
  */ function nn(t, e, n) {
-    t instanceof an ? function(t, e, n) {
+    t instanceof cn ? function(t, e, n) {
         // Unlike setMutationApplyToLocalView, if we're applying a mutation to a
         // remote document the server has accepted the mutation so the precondition
         // must have held.
@@ -2875,13 +2875,13 @@ class Xe {
  * @param localWriteTime - A timestamp indicating the local write time of the
  *     batch this mutation is a part of.
  */ function sn(t, e, n) {
-    t instanceof an ? function(t, e, n) {
+    t instanceof cn ? function(t, e, n) {
         if (!tn(t.precondition, e)) 
         // The mutation failed to apply (e.g. a document ID created with add()
         // caused a name collision).
         return;
         const s = t.value.clone(), i = fn(t.fieldTransforms, n, e);
-        s.setAll(i), e.convertToFoundDocument(cn(e), s).setHasLocalMutations();
+        s.setAll(i), e.convertToFoundDocument(an(e), s).setHasLocalMutations();
     }
     /**
  * A mutation that modifies fields of the document at the given key with the
@@ -2898,7 +2898,7 @@ class Xe {
  */ (t, e, n) : t instanceof un ? function(t, e, n) {
         if (!tn(t.precondition, e)) return;
         const s = fn(t.fieldTransforms, n, e), i = e.data;
-        i.setAll(hn(t)), i.setAll(s), e.convertToFoundDocument(cn(e), i).setHasLocalMutations();
+        i.setAll(hn(t)), i.setAll(s), e.convertToFoundDocument(an(e), i).setHasLocalMutations();
     }
     /**
  * Returns a FieldPath/Value map with the content of the PatchMutation.
@@ -2943,7 +2943,7 @@ class Xe {
 
 function on(t, e) {
     return t.type === e.type && (!!t.key.isEqual(e.key) && (!!t.precondition.isEqual(e.precondition) && (!!function(t, e) {
-        return void 0 === t && void 0 === e || !(!t || !e) && ct(t, e, ((t, e) => Ye(t, e)));
+        return void 0 === t && void 0 === e || !(!t || !e) && at(t, e, ((t, e) => Ye(t, e)));
     }(t.fieldTransforms, e.fieldTransforms) && (0 /* Set */ === t.type ? t.value.isEqual(e.value) : 1 /* Patch */ !== t.type || t.data.isEqual(e.data) && t.fieldMask.isEqual(e.fieldMask)))));
 }
 
@@ -2952,14 +2952,14 @@ function on(t, e) {
  * mutation. Mutations are defined to return the version of the base document
  * only if it is an existing document. Deleted and unknown documents have a
  * post-mutation version of SnapshotVersion.min().
- */ function cn(t) {
+ */ function an(t) {
     return t.isFoundDocument() ? t.version : ht.min();
 }
 
 /**
  * A mutation that creates or replaces the document at the given key with the
  * object value contents.
- */ class an extends en {
+ */ class cn extends en {
     constructor(t, e, n, s = []) {
         super(), this.key = t, this.value = e, this.precondition = n, this.fieldTransforms = s, 
         this.type = 0 /* Set */;
@@ -2997,8 +2997,8 @@ function hn(t) {
     const s = new Map;
     q(t.length === n.length);
     for (let i = 0; i < n.length; i++) {
-        const r = t[i], o = r.transform, c = e.data.field(r.field);
-        s.set(r.field, Be(o, c, n[i]));
+        const r = t[i], o = r.transform, a = e.data.field(r.field);
+        s.set(r.field, Be(o, a, n[i]));
     }
     return s;
 }
@@ -3690,10 +3690,10 @@ class Rn {
  * 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.
- */ const bn = new Tn(Nt.comparator);
+ */ const Pn = new Tn(Nt.comparator);
 
-function Pn() {
-    return bn;
+function bn() {
+    return Pn;
 }
 
 const vn = new Tn(Nt.comparator);
@@ -3778,7 +3778,7 @@ function xn() {
     // PORTING NOTE: Multi-tab only
     static createSynthesizedRemoteEventForCurrentChange(t, e) {
         const n = new Map;
-        return n.set(t, On.createSynthesizedTargetChangeForCurrentChange(t, e)), new $n(ht.min(), n, xn(), Pn(), Nn());
+        return n.set(t, On.createSynthesizedTargetChangeForCurrentChange(t, e)), new $n(ht.min(), n, xn(), bn(), Nn());
     }
 }
 
@@ -3998,7 +3998,7 @@ class Un {
         /** The internal state of all tracked targets. */
         this.nt = new Map, 
         /** Keeps track of the documents to update since the last raised snapshot. */
-        this.st = Pn(), 
+        this.st = bn(), 
         /** A mapping of document keys to their set of target IDs. */
         this.it = qn(), 
         /**
@@ -4011,8 +4011,8 @@ class Un {
     /**
      * Processes and adds the DocumentWatchChange to the current set of changes.
      */    ot(t) {
-        for (const e of t.$) t.O && t.O.isFoundDocument() ? this.ct(e, t.O) : this.at(e, t.key, t.O);
-        for (const e of t.removedTargetIds) this.at(e, t.key, t.O);
+        for (const e of t.$) t.O && t.O.isFoundDocument() ? this.at(e, t.O) : this.ct(e, t.key, t.O);
+        for (const e of t.removedTargetIds) this.ct(e, t.key, t.O);
     }
     /** Processes and adds the WatchTargetChange to the current set of changes. */    ut(t) {
         this.forEachTarget(t, (e => {
@@ -4082,7 +4082,7 @@ class Un {
                 // until it is resolved, essentially exposing inconsistency between
                 // queries.
                 const n = new Nt(t.path);
-                this.at(e, n, Ht.newNoDocument(n, ht.min()));
+                this.ct(e, n, Ht.newNoDocument(n, ht.min()));
             } else q(1 === n); else {
                 this._t(e) !== n && (
                 // Existence filter mismatch: We reset the mapping and raise a new
@@ -4109,7 +4109,7 @@ class Un {
                     // instead resulting in an explicit delete message and we could
                     // remove this special logic.
                     const e = new Nt(i.target.path);
-                    null !== this.st.get(e) || this.yt(s, e) || this.at(s, e, Ht.newNoDocument(e, t));
+                    null !== this.st.get(e) || this.yt(s, e) || this.ct(s, e, Ht.newNoDocument(e, t));
                 }
                 n.j && (e.set(s, n.G()), n.H());
             }
@@ -4128,14 +4128,14 @@ class Un {
             })), s && (n = n.add(t));
         }));
         const s = new $n(t, e, this.rt, this.st, n);
-        return this.st = Pn(), this.it = qn(), this.rt = new An(ot), s;
+        return this.st = bn(), this.it = qn(), this.rt = new An(ot), s;
     }
     /**
      * Adds the provided document to the internal list of document updates and
      * its document key to the given target's mapping.
      */
     // Visible for testing.
-    ct(t, e) {
+    at(t, e) {
         if (!this.lt(t)) return;
         const n = this.yt(t, e.key) ? 2 /* Modified */ : 0 /* Added */;
         this.ht(t).J(e.key, n), this.st = this.st.insert(e.key, e), this.it = this.it.insert(e.key, this.Tt(e.key).add(t));
@@ -4148,7 +4148,7 @@ class Un {
      * to update the remote document cache.
      */
     // Visible for testing.
-    at(t, e, n) {
+    ct(t, e, n) {
         if (!this.lt(t)) return;
         const s = this.ht(t);
         this.yt(t, e) ? s.J(e, 1 /* Removed */) : 
@@ -4203,7 +4203,7 @@ class Un {
      */    ft(t) {
         this.nt.set(t, new Bn);
         this.et.getRemoteKeysForTarget(t).forEach((e => {
-            this.at(t, e, /*updatedDocument=*/ null);
+            this.ct(t, e, /*updatedDocument=*/ null);
         }));
     }
     /**
@@ -4322,7 +4322,7 @@ function Yn(t, e) {
 
 function Xn(t) {
     const e = _t.fromString(t);
-    return q(Ps(e)), e;
+    return q(bs(e)), e;
 }
 
 function Zn(t, e) {
@@ -4373,7 +4373,7 @@ function os(t, e, n) {
     return n && o.setHasCommittedMutations(), n ? o.setHasCommittedMutations() : o;
 }
 
-function cs(t, e) {
+function as(t, e) {
     return "found" in e ? function(t, e) {
         q(!!e.found), e.found.name, e.found.updateTime;
         const n = ts(t, e.found.name), s = Jn(e.found.updateTime), i = new Gt({
@@ -4389,7 +4389,7 @@ function cs(t, e) {
     }(t, e) : U();
 }
 
-function as(t, e) {
+function cs(t, e) {
     let n;
     if ("targetChange" in e) {
         e.targetChange;
@@ -4400,7 +4400,7 @@ function as(t, e) {
         }(e.targetChange.targetChangeType || "NO_CHANGE"), i = e.targetChange.targetIds || [], r = function(t, e) {
             return t.C ? (q(void 0 === e || "string" == typeof e), Et.fromBase64String(e || "")) : (q(void 0 === e || e instanceof Uint8Array), 
             Et.fromUint8Array(e || new Uint8Array));
-        }(t, e.targetChange.resumeToken), o = e.targetChange.cause, c = o && function(t) {
+        }(t, e.targetChange.resumeToken), o = e.targetChange.cause, a = o && function(t) {
             const e = void 0 === t.code ? Q.UNKNOWN : pn(t.code);
             return new W(e, t.message || "");
         }
@@ -4412,7 +4412,7 @@ function as(t, e) {
  * our generated proto interfaces say Int32Value must be. But GRPC actually
  * expects a { value: <number> } struct.
  */ (o);
-        n = new Ln(s, i, r, c || null);
+        n = new Ln(s, i, r, a || null);
     } else if ("documentChange" in e) {
         e.documentChange;
         const s = e.documentChange;
@@ -4421,14 +4421,14 @@ function as(t, e) {
             mapValue: {
                 fields: s.document.fields
             }
-        }), c = Ht.newFoundDocument(i, r, o), a = s.targetIds || [], u = s.removedTargetIds || [];
-        n = new Fn(a, u, c.key, c);
+        }), a = Ht.newFoundDocument(i, r, o), c = s.targetIds || [], u = s.removedTargetIds || [];
+        n = new Fn(c, u, a.key, a);
     } else if ("documentDelete" in e) {
         e.documentDelete;
         const s = e.documentDelete;
         s.document;
-        const i = ts(t, s.document), r = s.readTime ? Jn(s.readTime) : ht.min(), o = Ht.newNoDocument(i, r), c = s.removedTargetIds || [];
-        n = new Fn([], c, o.key, o);
+        const i = ts(t, s.document), r = s.readTime ? Jn(s.readTime) : ht.min(), o = Ht.newNoDocument(i, r), a = s.removedTargetIds || [];
+        n = new Fn([], a, o.key, o);
     } else if ("documentRemove" in e) {
         e.documentRemove;
         const s = e.documentRemove;
@@ -4450,13 +4450,13 @@ function as(t, e) {
 
 function us(t, e) {
     let n;
-    if (e instanceof an) n = {
+    if (e instanceof cn) n = {
         update: rs(t, e.key, e.value)
     }; else if (e instanceof dn) n = {
         delete: Zn(t, e.key)
     }; else if (e instanceof un) n = {
         update: rs(t, e.key, e.data),
-        updateMask: bs(e.fieldMask)
+        updateMask: Ps(e.fieldMask)
     }; else {
         if (!(e instanceof wn)) return U();
         n = {
@@ -4524,7 +4524,7 @@ function hs(t, e) {
             }(e.updateMask);
             return new un(i, r, t, n, s);
         }
-        return new an(i, r, n, s);
+        return new cn(i, r, n, s);
     }
     if (e.delete) {
         const s = ts(t, e.delete);
@@ -4671,15 +4671,15 @@ function ws(t) {
         // visible for testing
         (t.direction));
     }(t))));
-    let c = null;
-    n.limit && (c = function(t) {
+    let a = null;
+    n.limit && (a = function(t) {
         let e;
         return e = "object" == typeof t ? t.value : t, St(e) ? null : e;
     }(n.limit));
-    let a = null;
-    n.startAt && (a = ys(n.startAt));
+    let c = null;
+    n.startAt && (c = ys(n.startAt));
     let u = null;
-    return n.endAt && (u = ys(n.endAt)), pe(e, i, o, r, c, "F" /* First */ , a, u);
+    return n.endAt && (u = ys(n.endAt)), pe(e, i, o, r, a, "F" /* First */ , c, u);
 }
 
 function _s(t, e) {
@@ -4808,14 +4808,14 @@ function Rs(t) {
     }
 }
 
-function bs(t) {
+function Ps(t) {
     const e = [];
     return t.fields.forEach((t => e.push(t.canonicalString()))), {
         fieldPaths: e
     };
 }
 
-function Ps(t) {
+function bs(t) {
     // Resource names have at least 4 components (project ID, database ID)
     return t.length >= 4 && "projects" === t.get(0) && "databases" === t.get(2);
 }
@@ -5720,12 +5720,12 @@ class Ys {
         // bug we're checking for should exist in iOS >= 12.2 and < 13, but for
         // whatever reason it's much harder to hit after 12.2 so we only proactively
         // log on 12.2.
-        12.2 === Xs.bt(h()) && M("Firestore persistence suffers from a bug in iOS 12.2 Safari that may cause your app to stop working. See https://stackoverflow.com/q/56496296/110915 for details and a potential workaround.");
+        12.2 === Xs.Pt(h()) && M("Firestore persistence suffers from a bug in iOS 12.2 Safari that may cause your app to stop working. See https://stackoverflow.com/q/56496296/110915 for details and a potential workaround.");
     }
     /** Deletes the specified database. */    static delete(t) {
         return F("SimpleDb", "Removing database:", t), si(window.indexedDB.deleteDatabase(t)).toPromise();
     }
-    /** Returns true if IndexedDB is available in the current environment. */    static Pt() {
+    /** Returns true if IndexedDB is available in the current environment. */    static bt() {
         if (!l()) return !1;
         if (Xs.vt()) return !0;
         // We extensively use indexed array values and compound keys,
@@ -5735,7 +5735,7 @@ class Ys {
         // For tracking support of this feature, see here:
         // https://developer.microsoft.com/en-us/microsoft-edge/platform/status/indexeddbarraysandmultientrysupport/
         // Check the UA string to find out the browser.
-                const t = h(), e = Xs.bt(t), n = 0 < e && e < 10, s = Xs.Vt(t), i = 0 < s && s < 4.5;
+                const t = h(), e = Xs.Pt(t), n = 0 < e && e < 10, s = Xs.Vt(t), i = 0 < s && s < 4.5;
         // IE 10
         // ua = 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Trident/6.0)';
         // IE 11
@@ -5758,7 +5758,7 @@ class Ys {
     }
     // visible for testing
     /** Parse User Agent to determine iOS version. Returns -1 if not found. */
-    static bt(t) {
+    static Pt(t) {
         const e = t.match(/i(?:phone|pad|pod) os ([\d_]+)/i), n = e ? e[1].split("_").slice(0, 2).join(".") : "-1";
         return Number(n);
     }
@@ -6028,7 +6028,7 @@ class Ys {
 let ii = !1;
 
 function ri(t) {
-    const e = Xs.bt(h());
+    const e = Xs.Pt(h());
     if (e >= 12.2 && e < 13) {
         const e = "An internal error was encountered in the Indexed Database server";
         if (t.message.indexOf(e) >= 0) {
@@ -6066,7 +6066,7 @@ function ri(t) {
     }
 }
 
-function ci(t, e) {
+function ai(t, e) {
     const n = j(t);
     return Xs.Dt(n.Wt, e);
 }
@@ -6089,7 +6089,7 @@ function ci(t, e) {
  */
 /**
  * A batch of mutations that will be sent as one unit to the backend.
- */ class ai {
+ */ class ci {
     /**
      * @param batchId - The unique ID of this mutation batch.
      * @param localWriteTime - The original write time of this mutation.
@@ -6150,7 +6150,7 @@ function ci(t, e) {
         return this.mutations.reduce(((t, e) => t.add(e.key)), Nn());
     }
     isEqual(t) {
-        return this.batchId === t.batchId && ct(this.mutations, t.mutations, ((t, e) => on(t, e))) && ct(this.baseMutations, t.baseMutations, ((t, e) => on(t, e)));
+        return this.batchId === t.batchId && at(this.mutations, t.mutations, ((t, e) => on(t, e))) && at(this.baseMutations, t.baseMutations, ((t, e) => on(t, e)));
     }
 }
 
@@ -6345,7 +6345,7 @@ function yi(t, e) {
         }
     }
     const s = e.mutations.map((e => hs(t.Gt, e))), i = ut.fromMillis(e.localWriteTimeMs);
-    return new ai(e.batchId, i, n, s);
+    return new ci(e.batchId, i, n, s);
 }
 
 /** Decodes a DbTarget into TargetData */ function pi(t) {
@@ -6447,13 +6447,13 @@ class Ii {
 /**
  * Helper to get a typed SimpleDbStore for the bundles object store.
  */ function Ai(t) {
-    return ci(t, Qs.store);
+    return ai(t, Qs.store);
 }
 
 /**
  * Helper to get a typed SimpleDbStore for the namedQueries object store.
  */ function Ri(t) {
-    return ci(t, Ws.store);
+    return ai(t, Ws.store);
 }
 
 /**
@@ -6474,9 +6474,9 @@ class Ii {
  */
 /**
  * An in-memory implementation of IndexManager.
- */ class bi {
+ */ class Pi {
     constructor() {
-        this.zt = new Pi;
+        this.zt = new bi;
     }
     addToCollectionParentIndex(t, e) {
         return this.zt.add(e), Js.resolve();
@@ -6490,7 +6490,7 @@ class Ii {
  * Internal implementation of the collection-parent index exposed by MemoryIndexManager.
  * Also used for in-memory caching by IndexedDbIndexManager and initial index population
  * in indexeddb_schema.ts
- */ class Pi {
+ */ class bi {
     constructor() {
         this.index = {};
     }
@@ -6535,7 +6535,7 @@ class Ii {
          * This is *NOT* a complete cache of what's in persistence and so can never be used to
          * satisfy reads.
          */
-        this.Ht = new Pi;
+        this.Ht = new bi;
     }
     /**
      * Adds a new entry to the collection parent index.
@@ -6560,7 +6560,7 @@ class Ii {
         return Js.resolve();
     }
     getCollectionParents(t, e) {
-        const n = [], s = IDBKeyRange.bound([ e, "" ], [ at(e), "" ], 
+        const n = [], s = IDBKeyRange.bound([ e, "" ], [ ct(e), "" ], 
         /*lowerOpen=*/ !1, 
         /*upperOpen=*/ !0);
         return Vi(t).Bt(s).next((t => {
@@ -6581,7 +6581,7 @@ class Ii {
  * Helper to get a typed SimpleDbStore for the collectionParents
  * document store.
  */ function Vi(t) {
-    return ci(t, Ks.store);
+    return ai(t, Ks.store);
 }
 
 /**
@@ -6645,12 +6645,12 @@ class Di {
  */
 function Ci(t, e, n) {
     const s = t.store(xs.store), i = t.store($s.store), r = [], o = IDBKeyRange.only(n.batchId);
-    let c = 0;
-    const a = s.jt({
+    let a = 0;
+    const c = s.jt({
         range: o
-    }, ((t, e, n) => (c++, n.delete())));
-    r.push(a.next((() => {
-        q(1 === c);
+    }, ((t, e, n) => (a++, n.delete())));
+    r.push(c.next((() => {
+        q(1 === a);
     })));
     const u = [];
     for (const t of n.mutations) {
@@ -6750,20 +6750,20 @@ class ki {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         return r.add({}).next((o => {
             q("number" == typeof o);
-            const c = new ai(o, e, n, s), a = function(t, e, n) {
+            const a = new ci(o, e, n, s), c = function(t, e, n) {
                 const s = n.baseMutations.map((e => us(t.Gt, e))), i = n.mutations.map((e => us(t.Gt, e)));
                 return new xs(e, n.batchId, n.localWriteTime.toMillis(), s, i);
-            }(this.k, this.userId, c), u = [];
+            }(this.k, this.userId, a), u = [];
             let h = new An(((t, e) => ot(t.canonicalString(), e.canonicalString())));
             for (const t of s) {
                 const e = $s.key(this.userId, t.key.path, o);
-                h = h.add(t.key.path.popLast()), u.push(r.put(a)), u.push(i.put(e, $s.PLACEHOLDER));
+                h = h.add(t.key.path.popLast()), u.push(r.put(c)), u.push(i.put(e, $s.PLACEHOLDER));
             }
             return h.forEach((e => {
                 u.push(this.Jt.addToCollectionParentIndex(t, e));
             })), t.addOnCommittedListener((() => {
-                this.Yt[o] = c.keys();
-            })), Js.waitFor(u).next((() => c));
+                this.Yt[o] = a.keys();
+            })), Js.waitFor(u).next((() => a));
         }));
     }
     lookupMutationBatch(t, e) {
@@ -6817,7 +6817,7 @@ class ki {
         return Oi(t).jt({
             range: s
         }, ((n, s, r) => {
-            const [o, c, a] = n, u = Ds(c);
+            const [o, a, c] = n, u = Ds(a);
             // Only consider rows matching exactly the specific key of
             // interest. Note that because we order by path first, and we
             // order terminators before path separators, we'll encounter all
@@ -6827,7 +6827,7 @@ class ki {
             // can stop as soon as we hit any such row.
                         if (o === this.userId && e.path.isEqual(u)) 
             // Look up the mutation batch in the store.
-            return $i(t).get(a).next((t => {
+            return $i(t).get(c).next((t => {
                 if (!t) throw U();
                 q(t.userId === this.userId), i.push(yi(this.k, t));
             }));
@@ -6841,7 +6841,7 @@ class ki {
             const i = $s.prefixForPath(this.userId, e.path), r = IDBKeyRange.lowerBound(i), o = Oi(t).jt({
                 range: r
             }, ((t, s, i) => {
-                const [r, o, c] = t, a = Ds(o);
+                const [r, o, a] = t, c = Ds(o);
                 // Only consider rows matching exactly the specific key of
                 // interest. Note that because we order by path first, and we
                 // order terminators before path separators, we'll encounter all
@@ -6849,7 +6849,7 @@ class ki {
                 // the rows for documentKey will occur before any rows for
                 // documents nested in a subcollection beneath documentKey so we
                 // can stop as soon as we hit any such row.
-                                r === this.userId && e.path.isEqual(a) ? n = n.add(c) : i.done();
+                                r === this.userId && e.path.isEqual(c) ? n = n.add(a) : i.done();
             }));
             s.push(o);
         })), Js.waitFor(s).next((() => this.te(t, n)));
@@ -6863,14 +6863,14 @@ class ki {
         return Oi(t).jt({
             range: r
         }, ((t, e, i) => {
-            const [r, c, a] = t, u = Ds(c);
+            const [r, a, c] = t, u = Ds(a);
             r === this.userId && n.isPrefixOf(u) ? 
             // Rows with document keys more than one segment longer than the
             // query path can't be matches. For example, a query on 'rooms'
             // can't match the document /rooms/abc/messages/xyx.
             // TODO(mcg): we'll need a different scanner when we implement
             // ancestor queries.
-            u.length === s && (o = o.add(a)) : i.done();
+            u.length === s && (o = o.add(c)) : i.done();
         })).next((() => this.te(t, o)));
     }
     te(t, e) {
@@ -6939,8 +6939,8 @@ class ki {
         range: r,
         Kt: !0
     }, ((t, n, s) => {
-        const [r, c, /*batchID*/ a] = t;
-        r === e && c === i && (o = !0), s.done();
+        const [r, a, /*batchID*/ c] = t;
+        r === e && a === i && (o = !0), s.done();
     })).next((() => o));
 }
 
@@ -6949,19 +6949,19 @@ class ki {
  * Helper to get a typed SimpleDbStore for the mutations object store.
  */
 function $i(t) {
-    return ci(t, xs.store);
+    return ai(t, xs.store);
 }
 
 /**
  * Helper to get a typed SimpleDbStore for the mutationQueues object store.
  */ function Oi(t) {
-    return ci(t, $s.store);
+    return ai(t, $s.store);
 }
 
 /**
  * Helper to get a typed SimpleDbStore for the mutationQueues object store.
  */ function Fi(t) {
-    return ci(t, ks.store);
+    return ai(t, ks.store);
 }
 
 /**
@@ -7043,7 +7043,7 @@ class Mi {
     allocateTargetId(t) {
         return this.oe(t).next((e => {
             const n = new Mi(e.highestTargetId);
-            return e.highestTargetId = n.next(), this.ce(t, e).next((() => e.highestTargetId));
+            return e.highestTargetId = n.next(), this.ae(t, e).next((() => e.highestTargetId));
         }));
     }
     getLastRemoteSnapshotVersion(t) {
@@ -7054,18 +7054,18 @@ class Mi {
     }
     setTargetsMetadata(t, e, n) {
         return this.oe(t).next((s => (s.highestListenSequenceNumber = e, n && (s.lastRemoteSnapshotVersion = n.toTimestamp()), 
-        e > s.highestListenSequenceNumber && (s.highestListenSequenceNumber = e), this.ce(t, s))));
+        e > s.highestListenSequenceNumber && (s.highestListenSequenceNumber = e), this.ae(t, s))));
     }
     addTargetData(t, e) {
-        return this.ae(t, e).next((() => this.oe(t).next((n => (n.targetCount += 1, this.ue(e, n), 
-        this.ce(t, n))))));
+        return this.ce(t, e).next((() => this.oe(t).next((n => (n.targetCount += 1, this.ue(e, n), 
+        this.ae(t, n))))));
     }
     updateTargetData(t, e) {
-        return this.ae(t, e);
+        return this.ce(t, e);
     }
     removeTargetData(t, e) {
         return this.removeMatchingKeysForTargetId(t, e.targetId).next((() => Bi(t).delete(e.targetId))).next((() => this.oe(t))).next((e => (q(e.targetCount > 0), 
-        e.targetCount -= 1, this.ce(t, e))));
+        e.targetCount -= 1, this.ae(t, e))));
     }
     /**
      * Drops any targets with sequence number less than or equal to the upper bound, excepting those
@@ -7075,8 +7075,8 @@ class Mi {
         let s = 0;
         const i = [];
         return Bi(t).jt(((r, o) => {
-            const c = pi(o);
-            c.sequenceNumber <= e && null === n.get(c.targetId) && (s++, i.push(this.removeTargetData(t, c)));
+            const a = pi(o);
+            a.sequenceNumber <= e && null === n.get(a.targetId) && (s++, i.push(this.removeTargetData(t, a)));
         })).next((() => Js.waitFor(i))).next((() => s));
     }
     /**
@@ -7090,10 +7090,10 @@ class Mi {
     oe(t) {
         return Ui(t).get(qs.key).next((t => (q(null !== t), t)));
     }
-    ce(t, e) {
+    ae(t, e) {
         return Ui(t).put(qs.key, e);
     }
-    ae(t, e) {
+    ce(t, e) {
         return Bi(t).put(Ti(this.k, e));
     }
     /**
@@ -7163,7 +7163,7 @@ class Mi {
         })).next((() => i));
     }
     containsKey(t, e) {
-        const n = vs(e.path), s = IDBKeyRange.bound([ n ], [ at(n) ], 
+        const n = vs(e.path), s = IDBKeyRange.bound([ n ], [ ct(n) ], 
         /*lowerOpen=*/ !1, 
         /*upperOpen=*/ !0);
         let i = 0;
@@ -7194,19 +7194,19 @@ class Mi {
 /**
  * Helper to get a typed SimpleDbStore for the queries object store.
  */ function Bi(t) {
-    return ci(t, Bs.store);
+    return ai(t, Bs.store);
 }
 
 /**
  * Helper to get a typed SimpleDbStore for the target globals object store.
  */ function Ui(t) {
-    return ci(t, qs.store);
+    return ai(t, qs.store);
 }
 
 /**
  * Helper to get a typed SimpleDbStore for the document target object store.
  */ function qi(t) {
-    return ci(t, Us.store);
+    return ai(t, Us.store);
 }
 
 /**
@@ -7345,16 +7345,16 @@ class Mi {
         return this.ge.getCacheSize(t);
     }
     Te(t, e) {
-        let n, s, i, r, o, a, u;
+        let n, s, i, r, o, c, u;
         const h = Date.now();
         return this.calculateTargetCount(t, this.params.percentileToCollect).next((e => (
         // Cap at the configured max
         e > this.params.maximumSequenceNumbersToCollect ? (F("LruGarbageCollector", `Capping sequence numbers to collect down to the maximum of ${this.params.maximumSequenceNumbersToCollect} from ${e}`), 
         s = this.params.maximumSequenceNumbersToCollect) : s = e, r = Date.now(), this.nthSequenceNumber(t, s)))).next((s => (n = s, 
-        o = Date.now(), this.removeTargets(t, n, e)))).next((e => (i = e, a = Date.now(), 
+        o = Date.now(), this.removeTargets(t, n, e)))).next((e => (i = e, c = Date.now(), 
         this.removeOrphanedDocuments(t, n)))).next((t => {
-            if (u = Date.now(), $() <= c.DEBUG) {
-                F("LruGarbageCollector", `LRU Garbage Collection\n\tCounted targets in ${r - h}ms\n\tDetermined least recently used ${s} in ` + (o - r) + "ms\n" + `\tRemoved ${i} targets in ` + (a - o) + "ms\n" + `\tRemoved ${t} documents in ` + (u - a) + "ms\n" + `Total Duration: ${u - h}ms`);
+            if (u = Date.now(), $() <= a.DEBUG) {
+                F("LruGarbageCollector", `LRU Garbage Collection\n\tCounted targets in ${r - h}ms\n\tDetermined least recently used ${s} in ` + (o - r) + "ms\n" + `\tRemoved ${i} targets in ` + (c - o) + "ms\n" + `\tRemoved ${t} documents in ` + (u - c) + "ms\n" + `Total Duration: ${u - h}ms`);
             }
             return Js.resolve({
                 didRun: !0,
@@ -7711,23 +7711,23 @@ function Hi(t, e) {
         return this.getMetadata(t).next((n => (n.byteSize += e, this.Re(t, n))));
     }
     getEntry(t, e) {
-        return er(t).get(nr(e)).next((t => this.be(e, t)));
+        return er(t).get(nr(e)).next((t => this.Pe(e, t)));
     }
     /**
      * Looks up an entry in the cache.
      *
      * @param documentKey - The key of the entry to look up.
      * @returns The cached document entry and its size.
-     */    Pe(t, e) {
+     */    be(t, e) {
         return er(t).get(nr(e)).next((t => ({
-            document: this.be(e, t),
+            document: this.Pe(e, t),
             size: Ni(t)
         })));
     }
     getEntries(t, e) {
-        let n = Pn();
+        let n = bn();
         return this.ve(t, e, ((t, e) => {
-            const s = this.be(t, e);
+            const s = this.Pe(t, e);
             n = n.insert(t, s);
         })).next((() => n));
     }
@@ -7738,9 +7738,9 @@ function Hi(t, e) {
      * @returns A map of documents indexed by key and a map of sizes indexed by
      *     key (zero if the document does not exist).
      */    Ve(t, e) {
-        let n = Pn(), s = new Tn(Nt.comparator);
+        let n = bn(), s = new Tn(Nt.comparator);
         return this.ve(t, e, ((t, e) => {
-            const i = this.be(t, e);
+            const i = this.Pe(t, e);
             n = n.insert(t, i), s = s.insert(t, Ni(e));
         })).next((() => ({
             documents: n,
@@ -7769,7 +7769,7 @@ function Hi(t, e) {
         }));
     }
     getDocumentsMatchingQuery(t, e, n) {
-        let s = Pn();
+        let s = bn();
         const i = e.path.length + 1, r = {};
         if (n.isEqual(ht.min())) {
             // Documents are ordered by key, so we can use a prefix scan to narrow
@@ -7810,7 +7810,7 @@ function Hi(t, e) {
     /**
      * Decodes `remoteDoc` and returns the document (or null, if the document
      * corresponds to the format used for sentinel deletes).
-     */    be(t, e) {
+     */    Pe(t, e) {
         if (e) {
             const t = fi(this.k, e);
             // Whether the document is a sentinel removal and should only be used in the
@@ -7851,10 +7851,10 @@ class Zi extends Yi {
         return this.changes.forEach(((i, r) => {
             const o = this.Ce.get(i);
             if (r.document.isValidDocument()) {
-                const c = di(this.De.k, r.document, this.getReadTime(i));
+                const a = di(this.De.k, r.document, this.getReadTime(i));
                 s = s.add(i.path.popLast());
-                const a = Ni(c);
-                n += a - o, e.push(this.De.addEntry(t, i, c));
+                const c = Ni(a);
+                n += c - o, e.push(this.De.addEntry(t, i, a));
             } else if (n -= o, this.trackRemovals) {
                 // In order to track removals, we store a "sentinel delete" in the
                 // RemoteDocumentCache. This entry is represented by a NoDocument
@@ -7869,7 +7869,7 @@ class Zi extends Yi {
     }
     getFromCache(t, e) {
         // Record the size of everything we load from the cache so we can compute a delta later.
-        return this.De.Pe(t, e).next((t => (this.Ce.set(e, t.size), t.document)));
+        return this.De.be(t, e).next((t => (this.Ce.set(e, t.size), t.document)));
     }
     getAllFromCache(t, e) {
         // Record the size of everything we load from the cache so we can compute
@@ -7885,13 +7885,13 @@ class Zi extends Yi {
 }
 
 function tr(t) {
-    return ci(t, Ls.store);
+    return ai(t, Ls.store);
 }
 
 /**
  * Helper to get a typed SimpleDbStore for the remoteDocuments object store.
  */ function er(t) {
-    return ci(t, Ms.store);
+    return ai(t, Ms.store);
 }
 
 function nr(t) {
@@ -8080,7 +8080,7 @@ function nr(t) {
         t.createObjectStore(Ks.store, {
             keyPath: Ks.keyPath
         });
-        const n = e.store(Ks.store), s = new Pi, i = t => {
+        const n = e.store(Ks.store), s = new bi, i = t => {
             if (s.add(t)) {
                 const e = t.lastSegment(), s = t.popLast();
                 return n.put({
@@ -8184,14 +8184,14 @@ class or {
      * Whether to synchronize the in-memory state of multiple tabs and share
      * access to local persistence.
      */
-    t, e, n, s, i, r, o, c, a, 
+    t, e, n, s, i, r, o, a, c, 
     /**
      * If set to true, forcefully obtains database access. Existing tabs will
      * no longer be able to access IndexedDB.
      */
     u) {
         if (this.allowTabSynchronization = t, this.persistenceKey = e, this.clientId = n, 
-        this.Fe = i, this.window = r, this.document = o, this.Me = a, this.Le = u, this.Be = null, 
+        this.Fe = i, this.window = r, this.document = o, this.Me = c, this.Le = u, this.Be = null, 
         this.Ue = !1, this.isPrimary = !1, this.networkEnabled = !0, 
         /** Our window.unload handler, if registered. */
         this.qe = null, this.inForeground = !1, 
@@ -8202,8 +8202,8 @@ class or {
         /** The last time we garbage collected the client metadata object store. */
         this.Qe = Number.NEGATIVE_INFINITY, 
         /** A listener to notify on primary state changes. */
-        this.We = t => Promise.resolve(), !or.Pt()) throw new W(Q.UNIMPLEMENTED, "This platform is either missing IndexedDB or is known to have an incomplete implementation. Offline persistence has been disabled.");
-        this.referenceDelegate = new zi(this, s), this.Ge = e + "main", this.k = new li(c), 
+        this.We = t => Promise.resolve(), !or.bt()) throw new W(Q.UNIMPLEMENTED, "This platform is either missing IndexedDB or is known to have an incomplete implementation. Offline persistence has been disabled.");
+        this.referenceDelegate = new zi(this, s), this.Ge = e + "main", this.k = new li(a), 
         this.ze = new Xs(this.Ge, 11, new sr(this.k)), this.He = new Li(this.referenceDelegate, this.k), 
         this.Jt = new vi, this.Je = function(t, e) {
             return new Xi(t, e);
@@ -8277,11 +8277,11 @@ class or {
      * primary state listener if the client either newly obtained or released its
      * primary lease.
      */    Ze() {
-        return this.runTransaction("updateClientMetadataAndTryBecomePrimary", "readwrite", (t => ar(t).put(new js(this.clientId, Date.now(), this.networkEnabled, this.inForeground)).next((() => {
+        return this.runTransaction("updateClientMetadataAndTryBecomePrimary", "readwrite", (t => cr(t).put(new js(this.clientId, Date.now(), this.networkEnabled, this.inForeground)).next((() => {
             if (this.isPrimary) return this.rn(t).next((t => {
                 t || (this.isPrimary = !1, this.Fe.enqueueRetryable((() => this.We(!1))));
             }));
-        })).next((() => this.on(t))).next((e => this.isPrimary && !e ? this.cn(t).next((() => !1)) : !!e && this.an(t).next((() => !0)))))).catch((t => {
+        })).next((() => this.on(t))).next((e => this.isPrimary && !e ? this.an(t).next((() => !1)) : !!e && this.cn(t).next((() => !0)))))).catch((t => {
             if (ei(t)) 
             // Proceed with the existing state. Any subsequent access to
             // IndexedDB will verify the lease.
@@ -8294,10 +8294,10 @@ class or {
         }));
     }
     rn(t) {
-        return cr(t).get(Ns.key).next((t => Js.resolve(this.un(t))));
+        return ar(t).get(Ns.key).next((t => Js.resolve(this.un(t))));
     }
     hn(t) {
-        return ar(t).delete(this.clientId);
+        return cr(t).delete(this.clientId);
     }
     /**
      * If the garbage collection threshold has passed, prunes the
@@ -8307,7 +8307,7 @@ class or {
         if (this.isPrimary && !this.fn(this.Qe, 18e5)) {
             this.Qe = Date.now();
             const t = await this.runTransaction("maybeGarbageCollectMultiClientState", "readwrite-primary", (t => {
-                const e = ci(t, js.store);
+                const e = ai(t, js.store);
                 return e.Bt().next((t => {
                     const n = this.dn(t, 18e5), s = t.filter((t => -1 === n.indexOf(t)));
                     // Delete metadata for clients that are no longer considered active.
@@ -8339,7 +8339,7 @@ class or {
      * (foreground) client should become leaseholder instead.
      */    on(t) {
         if (this.Le) return Js.resolve(!0);
-        return cr(t).get(Ns.key).next((e => {
+        return ar(t).get(Ns.key).next((e => {
             // 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
@@ -8368,7 +8368,7 @@ class or {
                     return !1;
                 }
             }
-            return !(!this.networkEnabled || !this.inForeground) || ar(t).Bt().next((t => void 0 === this.dn(t, 5e3).find((t => {
+            return !(!this.networkEnabled || !this.inForeground) || cr(t).Bt().next((t => void 0 === this.dn(t, 5e3).find((t => {
                 if (this.clientId !== t.clientId) {
                     const e = !this.networkEnabled && t.networkEnabled, n = !this.inForeground && t.inForeground, s = this.networkEnabled === t.networkEnabled;
                     if (e || n && s) return !0;
@@ -8387,7 +8387,7 @@ class or {
         // has obtained the primary lease.
         await this.ze.runTransaction("shutdown", "readwrite", [ Ns.store, js.store ], (t => {
             const e = new oi(t, st.I);
-            return this.cn(e).next((() => this.hn(e)));
+            return this.an(e).next((() => this.hn(e)));
         })), this.ze.close(), 
         // Remove the entry marking the client as zombied from LocalStorage since
         // we successfully deleted its metadata from IndexedDb.
@@ -8406,7 +8406,7 @@ class or {
      *
      * PORTING NOTE: This is only used for Web multi-tab.
      */    Tn() {
-        return this.runTransaction("getActiveClients", "readonly", (t => ar(t).Bt().next((t => this.dn(t, 18e5).map((t => t.clientId))))));
+        return this.runTransaction("getActiveClients", "readonly", (t => cr(t).Bt().next((t => this.dn(t, 18e5).map((t => t.clientId))))));
     }
     get started() {
         return this.Ue;
@@ -8437,7 +8437,7 @@ class or {
             if (!e) throw M(`Failed to obtain primary lease for action '${t}'.`), this.isPrimary = !1, 
             this.Fe.enqueueRetryable((() => this.We(!1))), new W(Q.FAILED_PRECONDITION, zs);
             return n(i);
-        })).next((t => this.an(i).next((() => t)))) : this.En(i).next((() => n(i)))))).then((t => (i.raiseOnCommittedEvent(), 
+        })).next((t => this.cn(i).next((() => t)))) : this.En(i).next((() => n(i)))))).then((t => (i.raiseOnCommittedEvent(), 
         t)));
     }
     /**
@@ -8447,22 +8447,22 @@ class or {
     // TODO(b/114226234): Remove this check when `synchronizeTabs` can no longer
     // be turned off.
     En(t) {
-        return cr(t).get(Ns.key).next((t => {
+        return ar(t).get(Ns.key).next((t => {
             if (null !== t && this.fn(t.leaseTimestampMs, 5e3) && !this._n(t.ownerId) && !this.un(t) && !(this.Le || this.allowTabSynchronization && t.allowTabSynchronization)) throw new W(Q.FAILED_PRECONDITION, rr);
         }));
     }
     /**
      * Obtains or extends the new primary lease for the local client. This
      * method does not verify that the client is eligible for this lease.
-     */    an(t) {
+     */    cn(t) {
         const e = new Ns(this.clientId, this.allowTabSynchronization, Date.now());
-        return cr(t).put(Ns.key, e);
+        return ar(t).put(Ns.key, e);
     }
-    static Pt() {
-        return Xs.Pt();
+    static bt() {
+        return Xs.bt();
     }
-    /** Checks the primary lease and removes it if we are the current primary. */    cn(t) {
-        const e = cr(t);
+    /** Checks the primary lease and removes it if we are the current primary. */    an(t) {
+        const e = ar(t);
         return e.get(Ns.key).next((t => this.un(t) ? (F("IndexedDbPersistence", "Releasing primary lease."), 
         e.delete(Ns.key)) : Js.resolve()));
     }
@@ -8546,14 +8546,14 @@ class or {
 
 /**
  * Helper to get a typed SimpleDbStore for the primary client object store.
- */ function cr(t) {
-    return ci(t, Ns.store);
+ */ function ar(t) {
+    return ai(t, Ns.store);
 }
 
 /**
  * Helper to get a typed SimpleDbStore for the client metadata object store.
- */ function ar(t) {
-    return ci(t, js.store);
+ */ function cr(t) {
+    return ai(t, js.store);
 }
 
 /**
@@ -8622,9 +8622,9 @@ class hr {
      * @returns Local view of the document or null if we don't have any cached
      * state for it.
      */    Rn(t, e) {
-        return this.An.getAllMutationBatchesAffectingDocumentKey(t, e).next((n => this.bn(t, e, n)));
+        return this.An.getAllMutationBatchesAffectingDocumentKey(t, e).next((n => this.Pn(t, e, n)));
     }
-    /** Internal version of `getDocument` that allows reusing batches. */    bn(t, e, n) {
+    /** Internal version of `getDocument` that allows reusing batches. */    Pn(t, e, n) {
         return this.Je.getEntry(t, e).next((t => {
             for (const e of n) e.applyToLocalView(t);
             return t;
@@ -8632,7 +8632,7 @@ class hr {
     }
     // Returns the view of the given `docs` as they would appear after applying
     // all mutations in the given `batches`.
-    Pn(t, e) {
+    bn(t, e) {
         t.forEach(((t, n) => {
             for (const t of e) t.applyToLocalView(n);
         }));
@@ -8649,7 +8649,7 @@ class hr {
      * Applies the local view the given `baseDocs` without retrieving documents
      * from the local store.
      */    Vn(t, e) {
-        return this.An.getAllMutationBatchesAffectingDocumentKeys(t, e).next((t => this.Pn(e, t)));
+        return this.An.getAllMutationBatchesAffectingDocumentKeys(t, e).next((t => this.bn(e, t)));
     }
     /**
      * Performs a query against the local view of all documents.
@@ -8665,7 +8665,7 @@ class hr {
  */
         return function(t) {
             return Nt.isDocumentKey(t.path) && null === t.collectionGroup && 0 === t.filters.length;
-        }(e) ? this.Sn(t, e.path) : be(e) ? this.Dn(t, e, n) : this.Cn(t, e, n);
+        }(e) ? this.Sn(t, e.path) : Pe(e) ? this.Dn(t, e, n) : this.Cn(t, e, n);
     }
     Sn(t, e) {
         // Just do a simple document lookup.
@@ -8808,7 +8808,7 @@ class hr {
             return 0 === t.filters.length && null === t.limit && null == t.startAt && null == t.endAt && (0 === t.explicitOrderBy.length || 1 === t.explicitOrderBy.length && t.explicitOrderBy[0].field.isKeyField());
         }(e) || n.isEqual(ht.min()) ? this.Mn(t, e) : this.Fn.vn(t, s).next((i => {
             const r = this.Ln(e, i);
-            return (Ee(e) || Ie(e)) && this.Bn(e.limitType, r, s, n) ? this.Mn(t, e) : ($() <= c.DEBUG && F("QueryEngine", "Re-using previous result from %s to execute query: %s", n.toString(), Ce(e)), 
+            return (Ee(e) || Ie(e)) && this.Bn(e.limitType, r, s, n) ? this.Mn(t, e) : ($() <= a.DEBUG && F("QueryEngine", "Re-using previous result from %s to execute query: %s", n.toString(), Ce(e)), 
             this.Fn.getDocumentsMatchingQuery(t, e, n).next((t => (
             // We merge `previousResults` into `updateResults`, since
             // `updateResults` is already a DocumentMap. If a document is
@@ -8854,7 +8854,7 @@ class hr {
         return !!i && (i.hasPendingWrites || i.version.compareTo(s) > 0);
     }
     Mn(t, e) {
-        return $() <= c.DEBUG && F("QueryEngine", "Using full collection scan to execute query:", Ce(e)), 
+        return $() <= a.DEBUG && F("QueryEngine", "Using full collection scan to execute query:", Ce(e)), 
         this.Fn.getDocumentsMatchingQuery(t, e, ht.min());
     }
 }
@@ -9033,21 +9033,19 @@ function yr(t) {
         // Reset newTargetDataByTargetMap in case this transaction gets re-run.
                 i = n.qn;
         const o = [];
-        e.targetChanges.forEach(((e, r) => {
-            const c = i.get(r);
+        e.targetChanges.forEach(((r, a) => {
+            const c = i.get(a);
             if (!c) return;
             // Only update the remote keys if the target is still active. This
             // ensures that we can persist the updated target data along with
             // the updated assignment.
-                        o.push(n.He.removeMatchingKeys(t, e.removedDocuments, r).next((() => n.He.addMatchingKeys(t, e.addedDocuments, r))));
-            const a = e.resumeToken;
-            // Update the resume token if the change includes one.
-                        if (a.approximateByteSize() > 0) {
-                const u = c.withResumeToken(a, s).withSequenceNumber(t.currentSequenceNumber);
-                i = i.insert(r, u), 
-                // Update the target data if there are target changes (or if
-                // sufficient time has passed since the last update).
-                /**
+                        o.push(n.He.removeMatchingKeys(t, r.removedDocuments, a).next((() => n.He.addMatchingKeys(t, r.addedDocuments, a))));
+            let u = c.withSequenceNumber(t.currentSequenceNumber);
+            e.targetMismatches.has(a) ? u = u.withResumeToken(Et.EMPTY_BYTE_STRING, ht.min()).withLastLimboFreeSnapshotVersion(ht.min()) : r.resumeToken.approximateByteSize() > 0 && (u = u.withResumeToken(r.resumeToken, s)), 
+            i = i.insert(a, u), 
+            // Update the target data if there are target changes (or if
+            // sufficient time has passed since the last update).
+            /**
  * Returns true if the newTargetData should be persisted during an update of
  * an active target. TargetData should always be persisted when a target is
  * being released and should not call this function.
@@ -9058,28 +9056,27 @@ function yr(t) {
  * values from getting too stale after a crash, but this doesn't have to be
  * too frequent.
  */
-                function(t, e, n) {
-                    // Always persist target data if we don't already have a resume token.
-                    if (q(e.resumeToken.approximateByteSize() > 0), 0 === t.resumeToken.approximateByteSize()) return !0;
-                    // Don't allow resume token changes to be buffered indefinitely. This
-                    // allows us to be reasonably up-to-date after a crash and avoids needing
-                    // to loop over all active queries on shutdown. Especially in the browser
-                    // we may not get time to do anything interesting while the current tab is
-                    // closing.
-                                        if (e.snapshotVersion.toMicroseconds() - t.snapshotVersion.toMicroseconds() >= 3e8) return !0;
-                    // Otherwise if the only thing that has changed about a target is its resume
-                    // token it's not worth persisting. Note that the RemoteStore keeps an
-                    // in-memory view of the currently active targets which includes the current
-                    // resume token, so stream failure or user changes will still use an
-                    // up-to-date resume token regardless of what we do here.
-                                        return n.addedDocuments.size + n.modifiedDocuments.size + n.removedDocuments.size > 0;
-                }
-                /**
- * Notifies local store of the changed views to locally pin documents.
- */ (c, u, e) && o.push(n.He.updateTargetData(t, u));
+            function(t, e, n) {
+                // Always persist target data if we don't already have a resume token.
+                if (0 === t.resumeToken.approximateByteSize()) return !0;
+                // Don't allow resume token changes to be buffered indefinitely. This
+                // allows us to be reasonably up-to-date after a crash and avoids needing
+                // to loop over all active queries on shutdown. Especially in the browser
+                // we may not get time to do anything interesting while the current tab is
+                // closing.
+                                if (e.snapshotVersion.toMicroseconds() - t.snapshotVersion.toMicroseconds() >= 3e8) return !0;
+                // Otherwise if the only thing that has changed about a target is its resume
+                // token it's not worth persisting. Note that the RemoteStore keeps an
+                // in-memory view of the currently active targets which includes the current
+                // resume token, so stream failure or user changes will still use an
+                // up-to-date resume token regardless of what we do here.
+                                return n.addedDocuments.size + n.modifiedDocuments.size + n.removedDocuments.size > 0;
             }
+            /**
+ * Notifies local store of the changed views to locally pin documents.
+ */ (c, u, r) && o.push(n.He.updateTargetData(t, u));
         }));
-        let c = Pn();
+        let a = bn();
         // HACK: The only reason we allow a null snapshot version is so that we
         // can synthesize remote events when we get permission denied errors while
         // trying to resolve the state of a locally cached document that is in
@@ -9090,12 +9087,12 @@ function yr(t) {
         // Each loop iteration only affects its "own" doc, so it's safe to get all the remote
         // documents in advance in a single call.
         o.push(Tr(t, r, e.documentUpdates, s, void 0).next((t => {
-            c = t;
+            a = t;
         }))), !s.isEqual(ht.min())) {
             const e = n.He.getLastRemoteSnapshotVersion(t).next((e => n.He.setTargetsMetadata(t, t.currentSequenceNumber, s)));
             o.push(e);
         }
-        return Js.waitFor(o).next((() => r.apply(t))).next((() => n.Wn.Vn(t, c))).next((() => c));
+        return Js.waitFor(o).next((() => r.apply(t))).next((() => n.Wn.Vn(t, a))).next((() => a));
     })).then((t => (n.qn = i, t)));
 }
 
@@ -9120,9 +9117,9 @@ function yr(t) {
 i) {
     let r = Nn();
     return n.forEach((t => r = r.add(t))), e.getEntries(t, r).next((t => {
-        let r = Pn();
+        let r = bn();
         return n.forEach(((n, o) => {
-            const c = t.get(n), a = (null == i ? void 0 : i.get(n)) || s;
+            const a = t.get(n), c = (null == i ? void 0 : i.get(n)) || s;
             // Note: The order of the steps below is important, since we want
             // to ensure that rejected limbo resolutions (which fabricate
             // NoDocuments with SnapshotVersion.min()) never add documents to
@@ -9131,8 +9128,8 @@ i) {
             // NoDocuments with SnapshotVersion.min() are used in manufactured
             // events. We remove these documents from cache since we lost
             // access.
-            e.removeEntry(n, a), r = r.insert(n, o)) : !c.isValidDocument() || o.version.compareTo(c.version) > 0 || 0 === o.version.compareTo(c.version) && c.hasPendingWrites ? (e.addEntry(o, a), 
-            r = r.insert(n, o)) : F("LocalStore", "Ignoring outdated watch update for ", n, ". Current version:", c.version, " Watch version:", o.version);
+            e.removeEntry(n, c), r = r.insert(n, o)) : !a.isValidDocument() || o.version.compareTo(a.version) > 0 || 0 === o.version.compareTo(a.version) && a.hasPendingWrites ? (e.addEntry(o, c), 
+            r = r.insert(n, o)) : F("LocalStore", "Ignoring outdated watch update for ", n, ". Current version:", a.version, " Watch version:", o.version);
         })), r;
     }));
 }
@@ -9233,7 +9230,7 @@ async function Ar(t, e, n) {
 }
 
 // PORTING NOTE: Multi-Tab only.
-function br(t, e) {
+function Pr(t, e) {
     const n = j(t), s = j(n.He), i = n.qn.get(e);
     return i ? Promise.resolve(i.target) : n.persistence.runTransaction("Get target data", "readonly", (t => s.Et(t, e).next((t => t ? t.target : null))));
 }
@@ -9245,15 +9242,15 @@ function br(t, e) {
  * since the prior call.
  */
 // PORTING NOTE: Multi-Tab only.
-function Pr(t) {
+function br(t) {
     const e = j(t);
     return e.persistence.runTransaction("Get new document changes", "readonly", (t => function(t, e, n) {
         const s = j(t);
-        let i = Pn(), r = wi(n);
-        const o = er(e), c = IDBKeyRange.lowerBound(r, !0);
+        let i = bn(), r = wi(n);
+        const o = er(e), a = IDBKeyRange.lowerBound(r, !0);
         return o.jt({
             index: Ms.readTimeIndex,
-            range: c
+            range: a
         }, ((t, e) => {
             // Unlike `getEntry()` and others, `getNewDocumentChanges()` parses
             // the documents directly since we want to keep sentinel deletes.
@@ -9310,12 +9307,12 @@ async function vr(t) {
  */
 async function Vr(t, e, n, s) {
     const i = j(t);
-    let r = Nn(), o = Pn(), c = Dn();
+    let r = Nn(), o = bn(), a = Dn();
     for (const t of n) {
         const n = e.Hn(t.metadata.name);
-        t.document && (r = r.add(n)), o = o.insert(n, e.Jn(t)), c = c.insert(n, e.Yn(t.metadata.readTime));
+        t.document && (r = r.add(n)), o = o.insert(n, e.Jn(t)), a = a.insert(n, e.Yn(t.metadata.readTime));
     }
-    const a = i.Qn.newChangeBuffer({
+    const c = i.Qn.newChangeBuffer({
         trackRemovals: !0
     }), u = await Ir(i, function(t) {
         // It is OK that the path used for the query is not valid, because this will
@@ -9324,7 +9321,7 @@ async function Vr(t, e, n, s) {
     }(s));
     // Allocates a target to hold all document keys from the bundle, such that
     // they will not get garbage collected right away.
-        return i.persistence.runTransaction("Apply bundle documents", "readwrite", (t => Tr(t, a, o, ht.min(), c).next((e => (a.apply(t), 
+        return i.persistence.runTransaction("Apply bundle documents", "readwrite", (t => Tr(t, c, o, ht.min(), a).next((e => (c.apply(t), 
     e))).next((e => i.He.removeMatchingKeysForTargetId(t, u.targetId).next((() => i.He.addMatchingKeys(t, r, u.targetId))).next((() => i.Wn.Vn(t, e))).next((() => e))))));
 }
 
@@ -9528,7 +9525,7 @@ class Nr {
     addMutationBatch(t, e, n, s) {
         const i = this.ds;
         this.ds++, this.An.length > 0 && this.An[this.An.length - 1];
-        const r = new ai(i, e, n, s);
+        const r = new ci(i, e, n, s);
         this.An.push(r);
         // Track references by document key and index collection parents.
         for (const e of s) this.ws = this.ws.add(new Nr(e.key, i)), this.Jt.addToCollectionParentIndex(t, e.key.path.popLast());
@@ -9717,14 +9714,14 @@ class xr {
         return Js.resolve(n ? n.document.mutableCopy() : Ht.newInvalidDocument(e));
     }
     getEntries(t, e) {
-        let n = Pn();
+        let n = bn();
         return e.forEach((t => {
             const e = this.docs.get(t);
             n = n.insert(t, e ? e.document.mutableCopy() : Ht.newInvalidDocument(t));
         })), Js.resolve(n);
     }
     getDocumentsMatchingQuery(t, e, n) {
-        let s = Pn();
+        let s = bn();
         // Documents are ordered by key, so we can use a prefix scan to narrow down
         // the documents we need to match the query against.
                 const i = new Nt(e.path.child("")), r = this.docs.getIteratorFrom(i);
@@ -9809,7 +9806,7 @@ class $r extends Yi {
          * A ordered bidirectional mapping between documents and the remote target
          * IDs.
          */
-        this.Rs = new Cr, this.targetCount = 0, this.bs = Mi.ie();
+        this.Rs = new Cr, this.targetCount = 0, this.Ps = Mi.ie();
     }
     forEachTarget(t, e) {
         return this.Is.forEach(((t, n) => e(n))), Js.resolve();
@@ -9821,22 +9818,22 @@ class $r extends Yi {
         return Js.resolve(this.As);
     }
     allocateTargetId(t) {
-        return this.highestTargetId = this.bs.next(), Js.resolve(this.highestTargetId);
+        return this.highestTargetId = this.Ps.next(), Js.resolve(this.highestTargetId);
     }
     setTargetsMetadata(t, e, n) {
         return n && (this.lastRemoteSnapshotVersion = n), e > this.As && (this.As = e), 
         Js.resolve();
     }
-    ae(t) {
+    ce(t) {
         this.Is.set(t.target, t);
         const e = t.targetId;
-        e > this.highestTargetId && (this.bs = new Mi(e), this.highestTargetId = e), t.sequenceNumber > this.As && (this.As = t.sequenceNumber);
+        e > this.highestTargetId && (this.Ps = new Mi(e), this.highestTargetId = e), t.sequenceNumber > this.As && (this.As = t.sequenceNumber);
     }
     addTargetData(t, e) {
-        return this.ae(e), this.targetCount += 1, Js.resolve();
+        return this.ce(e), this.targetCount += 1, Js.resolve();
     }
     updateTargetData(t, e) {
-        return this.ae(e), Js.resolve();
+        return this.ce(e), Js.resolve();
     }
     removeTargetData(t, e) {
         return this.Is.delete(e.target), this.Rs.us(e.targetId), this.targetCount -= 1, 
@@ -9907,9 +9904,9 @@ class Fr {
      * checked or asserted on every access.
      */
     constructor(t, e) {
-        this.Ps = {}, this.Be = new st(0), this.Ue = !1, this.Ue = !0, this.referenceDelegate = t(this), 
+        this.bs = {}, this.Be = new st(0), this.Ue = !1, this.Ue = !0, this.referenceDelegate = t(this), 
         this.He = new Or(this);
-        this.Jt = new bi, this.Je = function(t, e) {
+        this.Jt = new Pi, this.Je = function(t, e) {
             return new xr(t, e);
         }(this.Jt, (t => this.referenceDelegate.vs(t))), this.k = new li(e), this.Ye = new Dr(this.k);
     }
@@ -9933,8 +9930,8 @@ class Fr {
         return this.Jt;
     }
     getMutationQueue(t) {
-        let e = this.Ps[t.toKey()];
-        return e || (e = new kr(this.Jt, this.referenceDelegate), this.Ps[t.toKey()] = e), 
+        let e = this.bs[t.toKey()];
+        return e || (e = new kr(this.Jt, this.referenceDelegate), this.bs[t.toKey()] = e), 
         e;
     }
     getTargetCache() {
@@ -9953,7 +9950,7 @@ class Fr {
         t)));
     }
     Ds(t, e) {
-        return Js.or(Object.values(this.Ps).map((n => () => n.containsKey(t, e))));
+        return Js.or(Object.values(this.bs).map((n => () => n.containsKey(t, e))));
     }
 }
 
@@ -10266,7 +10263,7 @@ class Gr {
         // mutations but before we observe WebStorage events.
         this.window.addEventListener("storage", this.Us);
     }
-    /** Returns 'true' if WebStorage is available in the current environment. */    static Pt(t) {
+    /** Returns 'true' if WebStorage is available in the current environment. */    static bt(t) {
         return !(!t || !t.localStorage);
     }
     async start() {
@@ -10353,7 +10350,7 @@ class Gr {
         this.oi(t);
     }
     notifyBundleLoaded() {
-        this.ci();
+        this.ai();
     }
     shutdown() {
         this.started && (this.window.removeEventListener("storage", this.Us), this.removeItem(this.Qs), 
@@ -10379,7 +10376,7 @@ class Gr {
                 if (this.started) {
                     if (null !== e.key) if (this.Gs.test(e.key)) {
                         if (null == e.newValue) {
-                            const t = this.ai(e.key);
+                            const t = this.ci(e.key);
                             return this.ui(t, null);
                         }
                         {
@@ -10448,13 +10445,13 @@ class Gr {
         const s = qr(this.persistenceKey, t), i = new jr(t, e, n);
         this.setItem(s, i.Fs());
     }
-    ci() {
+    ai() {
         this.setItem(this.Ys, "value-not-used");
     }
     /**
      * Parses a client state key in WebStorage. Returns null if the key does not
      * match the expected key format.
-     */    ai(t) {
+     */    ci(t) {
         const e = this.Gs.exec(t);
         return e ? e[1] : null;
     }
@@ -10462,7 +10459,7 @@ class Gr {
      * Parses a client state in WebStorage. Returns 'null' if the value could not
      * be parsed.
      */    hi(t, e) {
-        const n = this.ai(t);
+        const n = this.ci(t);
         return Qr.Os(n, e);
     }
     /**
@@ -10612,10 +10609,10 @@ class Hr {
  */
 class Yr {
     constructor() {
-        this.Ii = () => this.Ai(), this.Ri = () => this.bi(), this.Pi = [], this.vi();
+        this.Ii = () => this.Ai(), this.Ri = () => this.Pi(), this.bi = [], this.vi();
     }
     Ei(t) {
-        this.Pi.push(t);
+        this.bi.push(t);
     }
     shutdown() {
         window.removeEventListener("online", this.Ii), window.removeEventListener("offline", this.Ri);
@@ -10625,16 +10622,16 @@ class Yr {
     }
     Ai() {
         F("ConnectivityMonitor", "Network connectivity changed: AVAILABLE");
-        for (const t of this.Pi) t(0 /* AVAILABLE */);
+        for (const t of this.bi) t(0 /* AVAILABLE */);
     }
-    bi() {
+    Pi() {
         F("ConnectivityMonitor", "Network connectivity changed: UNAVAILABLE");
-        for (const t of this.Pi) t(1 /* UNAVAILABLE */);
+        for (const t of this.bi) t(1 /* UNAVAILABLE */);
     }
     // TODO(chenbrian): Consider passing in window either into this component or
     // here for testing via FakeWindow.
     /** Checks that all used attributes of window are available. */
-    static Pt() {
+    static bt() {
         return "undefined" != typeof window && void 0 !== window.addEventListener && void 0 !== window.removeEventListener;
     }
 }
@@ -10818,12 +10815,12 @@ class {
                     F("Connection", 'RPC "' + t + '" completed.');
                 }
             }));
-            const c = JSON.stringify(s);
-            o.send(e, "POST", c, n, 15);
+            const a = JSON.stringify(s);
+            o.send(e, "POST", a, n, 15);
         }));
     }
     Qi(t, e, n) {
-        const s = [ this.Mi, "/", "google.firestore.v1.Firestore", "/", t, "/channel" ], i = b(), r = P(), o = {
+        const s = [ this.Mi, "/", "google.firestore.v1.Firestore", "/", t, "/channel" ], i = P(), r = b(), o = {
             // Required for backend stickiness, routing behavior is based on this
             // parameter.
             httpSessionIdParam: "gsessionid",
@@ -10864,9 +10861,9 @@ class {
         // known to (sometimes) not include an Origin. See
         // https://github.com/firebase/firebase-js-sdk/issues/1491.
         d() || w() || _() || m() || g() || y() || (o.httpHeadersOverwriteParam = "$httpHeaders");
-        const c = s.join("");
-        F("Connection", "Creating WebChannel: " + c, o);
-        const a = i.createWebChannel(c, o);
+        const a = s.join("");
+        F("Connection", "Creating WebChannel: " + a, o);
+        const c = i.createWebChannel(a, o);
         // WebChannel supports sending the first message with the handshake - saving
         // a network round trip. However, it will have to call send in the same
         // JS event loop as open. In order to enforce this, we delay actually
@@ -10879,9 +10876,9 @@ class {
                 const l = new Zr({
             Vi: t => {
                 h ? F("Connection", "Not sending because WebChannel is closed:", t) : (u || (F("Connection", "Opening WebChannel transport."), 
-                a.open(), u = !0), F("Connection", "WebChannel sending:", t), a.send(t));
+                c.open(), u = !0), F("Connection", "WebChannel sending:", t), c.send(t));
             },
-            Si: () => a.close()
+            Si: () => c.close()
         }), f = (t, e, n) => {
             // TODO(dimond): closure typing seems broken because WebChannel does
             // not implement goog.events.Listenable
@@ -10899,13 +10896,13 @@ class {
         // 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, V.EventType.OPEN, (() => {
+                return f(c, V.EventType.OPEN, (() => {
             h || F("Connection", "WebChannel transport opened.");
-        })), f(a, V.EventType.CLOSE, (() => {
+        })), f(c, V.EventType.CLOSE, (() => {
             h || (h = !0, F("Connection", "WebChannel transport closed"), l.Oi());
-        })), f(a, V.EventType.ERROR, (t => {
+        })), f(c, V.EventType.ERROR, (t => {
             h || (h = !0, L("Connection", "WebChannel transport errored:", t), l.Oi(new W(Q.UNAVAILABLE, "The operation could not be completed")));
-        })), f(a, V.EventType.MESSAGE, (t => {
+        })), f(c, V.EventType.MESSAGE, (t => {
             var e;
             if (!h) {
                 const n = t.data[0];
@@ -10935,7 +10932,7 @@ class {
                     }(t), n = i.message;
                     void 0 === e && (e = Q.INTERNAL, n = "Unknown error status: " + t + " with message " + i.message), 
                     // Mark closed so no further events are propagated
-                    h = !0, l.Oi(new W(e, n)), a.close();
+                    h = !0, l.Oi(new W(e, n)), c.close();
                 } else F("Connection", "WebChannel received:", n), l.Fi(n);
             }
         })), f(r, S.STAT_EVENT, (t => {
@@ -11150,15 +11147,15 @@ class io {
  *  ListenerType: The type of the listener that will be used for callbacks
  */
 class ro {
-    constructor(t, e, n, s, i, r, o, c) {
+    constructor(t, e, n, s, i, r, o, a) {
         this.Fe = t, this.nr = n, this.sr = s, this.ir = i, this.authCredentialsProvider = r, 
-        this.appCheckCredentialsProvider = o, this.listener = c, this.state = 0 /* Initial */ , 
+        this.appCheckCredentialsProvider = o, this.listener = a, 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.rr = 0, this.cr = null, this.ar = null, this.stream = null, this.ur = new io(t, e);
+        this.rr = 0, this.ar = null, this.cr = null, this.stream = null, this.ur = new io(t, e);
     }
     /**
      * Returns true if start() has been called and no error has occurred. True
@@ -11214,7 +11211,7 @@ class ro {
      */    _r() {
         // 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.lr() && null === this.cr && (this.cr = this.Fe.enqueueAfterDelay(this.nr, 6e4, (() => this.mr())));
+        this.lr() && null === this.ar && (this.ar = this.Fe.enqueueAfterDelay(this.nr, 6e4, (() => this.mr())));
     }
     /** Sends a message to the underlying stream. */    gr(t) {
         this.yr(), this.stream.send(t);
@@ -11226,10 +11223,10 @@ class ro {
         return this.close(0 /* Initial */);
     }
     /** Marks the stream as active again. */    yr() {
-        this.cr && (this.cr.cancel(), this.cr = null);
+        this.ar && (this.ar.cancel(), this.ar = null);
     }
     /** Cancels the health check delayed operation. */    pr() {
-        this.ar && (this.ar.cancel(), this.ar = null);
+        this.cr && (this.cr.cancel(), this.cr = null);
     }
     /**
      * Closes the stream and cleans up as necessary:
@@ -11297,7 +11294,7 @@ class ro {
     Ir(t, e) {
         const n = this.Er(this.rr);
         this.stream = this.Rr(t, e), this.stream.Di((() => {
-            n((() => (this.state = 2 /* Open */ , this.ar = this.Fe.enqueueAfterDelay(this.sr, 1e4, (() => (this.lr() && (this.state = 3 /* Healthy */), 
+            n((() => (this.state = 2 /* Open */ , this.cr = this.Fe.enqueueAfterDelay(this.sr, 1e4, (() => (this.lr() && (this.state = 3 /* Healthy */), 
             Promise.resolve()))), this.listener.Di())));
         })), this.stream.Ni((t => {
             n((() => this.Ar(t)));
@@ -11348,7 +11345,7 @@ class ro {
     onMessage(t) {
         // A successful response means the stream is healthy
         this.ur.reset();
-        const e = as(this.k, t), n = function(t) {
+        const e = cs(this.k, t), n = function(t) {
             // We have only reached a consistent snapshot for the entire stream if there
             // is a read_time set and it applies to all targets (i.e. the list of
             // targets is empty). The backend is guaranteed to send such responses.
@@ -11356,14 +11353,14 @@ class ro {
             const e = t.targetChange;
             return e.targetIds && e.targetIds.length ? ht.min() : e.readTime ? Jn(e.readTime) : ht.min();
         }(t);
-        return this.listener.br(e, n);
+        return this.listener.Pr(e, n);
     }
     /**
      * Registers interest in the results of the given target. If the target
      * includes a resumeToken it will be included in the request. Results that
      * affect the target will be streamed back as WatchChange messages that
      * reference the targetId.
-     */    Pr(t) {
+     */    br(t) {
         const e = {};
         e.database = ss(this.k), e.addTarget = function(t, e) {
             let n;
@@ -11406,7 +11403,7 @@ class ro {
  * okay to use the same streamToken for the calls to writeMutations.
  *
  * TODO(b/33271235): Use proto types
- */ class co extends ro {
+ */ class ao extends ro {
     constructor(t, e, n, s, i, r) {
         super(t, "write_stream_connection_backoff" /* WriteStreamConnectionBackoff */ , "write_stream_idle" /* WriteStreamIdle */ , "health_check_timeout" /* HealthCheckTimeout */ , e, n, s, r), 
         this.k = i, this.Vr = !1;
@@ -11485,7 +11482,7 @@ class ro {
  * An implementation of Datastore that exposes additional state for internal
  * consumption.
  */
-class ao extends class {} {
+class co extends class {} {
     constructor(t, e, n, s) {
         super(), this.authCredentials = t, this.appCheckCredentials = e, this.ir = n, this.k = s, 
         this.$r = !1;
@@ -11712,7 +11709,7 @@ function wo(t, e) {
  * 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 mo(t, e) {
-    t.Yr.X(e.targetId), Fo(t).Pr(e);
+    t.Yr.X(e.targetId), Fo(t).br(e);
 }
 
 /**
@@ -11786,7 +11783,7 @@ async function Ro(t, e, n) {
  */ (t, e);
     } catch (n) {
         F("RemoteStore", "Failed to remove targets %s: %s ", e.targetIds.join(","), n), 
-        await bo(t, n);
+        await Po(t, n);
     } else if (e instanceof Fn ? t.Yr.ot(e) : e instanceof Mn ? t.Yr.dt(e) : t.Yr.ut(e), 
     !n.isEqual(ht.min())) try {
         const e = await yr(t.localStore);
@@ -11832,7 +11829,7 @@ async function Ro(t, e, n) {
             })), t.remoteSyncer.applyRemoteEvent(n);
         }(t, n);
     } catch (e) {
-        F("RemoteStore", "Failed to raise snapshot:", e), await bo(t, e);
+        F("RemoteStore", "Failed to raise snapshot:", e), await Po(t, e);
     }
 }
 
@@ -11844,7 +11841,7 @@ async function Ro(t, e, n) {
  *
  * The returned Promise is resolved once the network is disabled and before
  * any retry attempt.
- */ async function bo(t, e, n) {
+ */ async function Po(t, e, n) {
     if (!ei(e)) throw e;
     t.Gr.add(1 /* IndexedDbFailed */), 
     // Disable network and raise offline snapshots
@@ -11863,8 +11860,8 @@ async function Ro(t, e, n) {
 /**
  * Executes `op`. If `op` fails, takes the network offline until `op`
  * succeeds. Returns after the first attempt.
- */ function Po(t, e) {
-    return e().catch((n => bo(t, n, e)));
+ */ function bo(t, e) {
+    return e().catch((n => Po(t, n, e)));
 }
 
 async function vo(t) {
@@ -11878,7 +11875,7 @@ async function vo(t) {
         }
         s = t.batchId, So(e, t);
     } catch (t) {
-        await bo(e, t);
+        await Po(e, t);
     }
     Do(e) && Co(e);
 }
@@ -11919,7 +11916,7 @@ async function ko(t) {
 
 async function xo(t, e, n) {
     const s = t.Qr.shift(), i = ui.from(s, e, n);
-    await Po(t, (() => t.remoteSyncer.applySuccessfulWrite(i))), 
+    await bo(t, (() => t.remoteSyncer.applySuccessfulWrite(i))), 
     // It's possible that with the completion of this mutation another
     // slot has freed up.
     await vo(t);
@@ -11940,7 +11937,7 @@ async function $o(t, e) {
             // 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.
-                        Mo(t).wr(), await Po(t, (() => t.remoteSyncer.rejectFailedWrite(n.batchId, e))), 
+                        Mo(t).wr(), await bo(t, (() => t.remoteSyncer.rejectFailedWrite(n.batchId, e))), 
             // It's possible that with the completion of this mutation
             // another slot has freed up.
             await vo(t);
@@ -11993,7 +11990,7 @@ async function Oo(t, e) {
  */ (t.datastore, t.asyncQueue, {
         Di: Io.bind(null, t),
         Ni: Ao.bind(null, t),
-        br: Ro.bind(null, t)
+        Pr: Ro.bind(null, t)
     }), t.zr.push((async e => {
         e ? (t.Xr.wr(), po(t) ? yo(t) : t.Jr.set("Unknown" /* Unknown */)) : (await t.Xr.stop(), 
         Eo(t));
@@ -12012,7 +12009,7 @@ async function Oo(t, e) {
     // Create stream (but note that it is not started yet).
     t.Zr = function(t, e, n) {
         const s = j(t);
-        return s.Or(), new co(e, s.ir, s.authCredentials, s.appCheckCredentials, s.k, n);
+        return s.Or(), new ao(e, s.ir, s.authCredentials, s.appCheckCredentials, s.k, n);
     }(t.datastore, t.asyncQueue, {
         Di: No.bind(null, t),
         Ni: $o.bind(null, t),
@@ -12273,9 +12270,9 @@ class Lo {
 }
 
 class Ko {
-    constructor(t, e, n, s, i, r, o, c) {
+    constructor(t, e, n, s, i, r, o, a) {
         this.query = t, this.docs = e, this.oldDocs = n, this.docChanges = s, this.mutatedKeys = i, 
-        this.fromCache = r, this.syncStateChanged = o, this.excludesMetadataChanges = c;
+        this.fromCache = r, this.syncStateChanged = o, this.excludesMetadataChanges = a;
     }
     /** Returns a view snapshot as if all documents in the snapshot were added. */    static fromInitialDocuments(t, e, n, s) {
         const i = [];
@@ -12394,12 +12391,12 @@ function Jo(t) {
  * It uses an Observer to dispatch events.
  */ class Yo {
     constructor(t, e, n) {
-        this.query = t, this.co = e, 
+        this.query = t, this.ao = 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.ao = !1, this.uo = null, this.onlineState = "Unknown" /* Unknown */ , this.options = n || {};
+        this.co = !1, this.uo = null, this.onlineState = "Unknown" /* Unknown */ , this.options = n || {};
     }
     /**
      * Applies the new ViewSnapshot to this listener, raising a user-facing event
@@ -12415,16 +12412,16 @@ function Jo(t) {
             /* excludesMetadataChanges= */ !0);
         }
         let e = !1;
-        return this.ao ? this.ho(t) && (this.co.next(t), e = !0) : this.lo(t, this.onlineState) && (this.fo(t), 
+        return this.co ? this.ho(t) && (this.ao.next(t), e = !0) : this.lo(t, this.onlineState) && (this.fo(t), 
         e = !0), this.uo = t, e;
     }
     onError(t) {
-        this.co.error(t);
+        this.ao.error(t);
     }
     /** Returns whether a snapshot was raised. */    ro(t) {
         this.onlineState = t;
         let e = !1;
-        return this.uo && !this.ao && this.lo(this.uo, t) && (this.fo(this.uo), e = !0), 
+        return this.uo && !this.co && this.lo(this.uo, t) && (this.fo(this.uo), e = !0), 
         e;
     }
     lo(t, e) {
@@ -12451,8 +12448,8 @@ function Jo(t) {
         // stripped out.
         }
     fo(t) {
-        t = Ko.fromInitialDocuments(t.query, t.docs, t.mutatedKeys, t.fromCache), this.ao = !0, 
-        this.co.next(t);
+        t = Ko.fromInitialDocuments(t.query, t.docs, t.mutatedKeys, t.fromCache), this.co = !0, 
+        this.ao.next(t);
     }
 }
 
@@ -12524,13 +12521,13 @@ function Jo(t) {
 /**
  * A class to process the elements from a bundle, load them into local
  * storage and provide progress update while loading.
- */ class tc {
+ */ class ta {
     constructor(t, e, n) {
         this.mo = t, this.localStore = e, this.k = n, 
         /** Batched queries to be saved into storage */
         this.queries = [], 
         /** Batched documents to be saved into storage */
-        this.documents = [], this.progress = ec(t);
+        this.documents = [], this.progress = ea(t);
     }
     /**
      * Adds an element from the bundle to the loader.
@@ -12569,7 +12566,7 @@ function Jo(t) {
 /**
  * Returns a `LoadBundleTaskProgress` representing the initial progress of
  * loading a bundle.
- */ function ec(t) {
+ */ function ea(t) {
     return {
         taskState: "Running",
         documentsLoaded: 0,
@@ -12599,13 +12596,13 @@ function Jo(t) {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-class nc {
+class na {
     constructor(t) {
         this.key = t;
     }
 }
 
-class sc {
+class sa {
     constructor(t) {
         this.key = t;
     }
@@ -12615,7 +12612,7 @@ class sc {
  * View is responsible for computing the final merged truth of what docs are in
  * a query. It gets notified of local and remote changes to docs, and applies
  * the query filters and limits to determine the most correct possible results.
- */ class ic {
+ */ class ia {
     constructor(t, 
     /** Documents included in the remote target */
     e) {
@@ -12635,7 +12632,7 @@ class sc {
     /**
      * The set of remote documents that the server has told us belongs to the target associated with
      * this view.
-     */    get bo() {
+     */    get Po() {
         return this.To;
     }
     /**
@@ -12647,7 +12644,7 @@ class sc {
      * @param previousChanges - If this is being called with a refill, then start
      *        with this set of docs and changes instead of the current view.
      * @returns a new set of docs, changes, and refill flag.
-     */    Po(t, e) {
+     */    bo(t, e) {
         const n = e ? e.vo : new qo, s = e ? e.Ro : this.Ro;
         let i = e ? e.mutatedKeys : this.mutatedKeys, r = s, o = !1;
         // Track the last doc in a (full) limit. This is necessary, because some
@@ -12658,7 +12655,7 @@ class sc {
         // deletes. So we keep this doc at the old limit to compare the updates to.
         // Note that this should never get used in a refill (when previousChanges is
         // set), because there will only be adds -- no deletes or updates.
-        const c = Ee(this.query) && s.size === this.query.limit ? s.last() : null, a = Ie(this.query) && s.size === this.query.limit ? s.first() : null;
+        const a = Ee(this.query) && s.size === this.query.limit ? s.last() : null, c = Ie(this.query) && s.size === this.query.limit ? s.first() : null;
         // Drop documents out to meet limit/limitToLast requirement.
         if (t.inorderTraversal(((t, e) => {
             const u = s.get(t), h = Ne(this.query, e) ? e : null, l = !!u && this.mutatedKeys.has(u.key), f = !!h && (h.hasLocalMutations || 
@@ -12674,7 +12671,7 @@ class sc {
                 }), d = !0) : this.Vo(u, h) || (n.track({
                     type: 2 /* Modified */ ,
                     doc: h
-                }), d = !0, (c && this.Ao(h, c) > 0 || a && this.Ao(h, a) < 0) && (
+                }), d = !0, (a && this.Ao(h, a) > 0 || c && this.Ao(h, c) < 0) && (
                 // This doc moved from inside the limit to outside the limit.
                 // That means there may be some other doc in the local cache
                 // that should be included instead.
@@ -12685,7 +12682,7 @@ class sc {
             }), d = !0) : u && !h && (n.track({
                 type: 1 /* Removed */ ,
                 doc: u
-            }), d = !0, (c || a) && (
+            }), d = !0, (a || c) && (
             // A doc was removed from a full limit query. We'll need to
             // requery from the local cache to see if we know about some other
             // doc that should be in the results.
@@ -12769,10 +12766,10 @@ class sc {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ (t.type, e.type) || this.Ao(t.doc, e.doc))), this.So(n);
-        const r = e ? this.Do() : [], o = 0 === this.Io.size && this.current ? 1 /* Synced */ : 0 /* Local */ , c = o !== this.Eo;
-        if (this.Eo = o, 0 !== i.length || c) {
+        const r = e ? this.Do() : [], o = 0 === this.Io.size && this.current ? 1 /* Synced */ : 0 /* Local */ , a = o !== this.Eo;
+        if (this.Eo = o, 0 !== i.length || a) {
             return {
-                snapshot: new Ko(this.query, t.Ro, s, i, t.mutatedKeys, 0 /* Local */ === o, c, 
+                snapshot: new Ko(this.query, t.Ro, s, i, t.mutatedKeys, 0 /* Local */ === o, a, 
                 /* excludesMetadataChanges= */ !1),
                 Co: r
             };
@@ -12828,9 +12825,9 @@ class sc {
         // Diff the new limbo docs with the old limbo docs.
         const e = [];
         return t.forEach((t => {
-            this.Io.has(t) || e.push(new sc(t));
+            this.Io.has(t) || e.push(new sa(t));
         })), this.Io.forEach((n => {
-            t.has(n) || e.push(new nc(n));
+            t.has(n) || e.push(new na(n));
         })), e;
     }
     /**
@@ -12855,7 +12852,7 @@ class sc {
     // PORTING NOTE: Multi-tab only.
     ko(t) {
         this.To = t.zn, this.Io = Nn();
-        const e = this.Po(t.documents);
+        const e = this.bo(t.documents);
         return this.applyChanges(e, /*updateLimboDocuments=*/ !0);
     }
     /**
@@ -12873,7 +12870,7 @@ class sc {
  * QueryView contains all of the data that SyncEngine needs to keep track of for
  * a particular query.
  */
-class rc {
+class ra {
     constructor(
     /**
      * The query itself.
@@ -12895,7 +12892,7 @@ class rc {
     }
 }
 
-/** Tracks a limbo resolution. */ class oc {
+/** Tracks a limbo resolution. */ class oa {
     constructor(t) {
         this.key = t, 
         /**
@@ -12920,7 +12917,7 @@ class rc {
  * the class is not exported so they are only accessible from this module.
  * This is useful to implement optional features (like bundles) in free
  * functions, such that they are tree-shakeable.
- */ class cc {
+ */ class aa {
     constructor(t, e, n, 
     // PORTING NOTE: Manages state synchronization in multi-tab environments.
     s, i, r) {
@@ -12966,8 +12963,8 @@ class rc {
  * server. All the subsequent view snapshots or errors are sent to the
  * subscribed handlers. Returns the initial snapshot.
  */
-async function ac(t, e) {
-    const n = Fc(t);
+async function ca(t, e) {
+    const n = Fa(t);
     let s, i;
     const r = n.Fo.get(e);
     if (r) 
@@ -12979,7 +12976,7 @@ async function ac(t, e) {
     // case and calls `listen` to obtain this ID.
     s = r.targetId, n.sharedClientState.addLocalQueryTarget(s), i = r.view.xo(); else {
         const t = await Ir(n.localStore, ve(e)), r = n.sharedClientState.addLocalQueryTarget(t.targetId);
-        s = t.targetId, i = await uc(n, e, s, "current" === r), n.isPrimaryClient && wo(n.remoteStore, t);
+        s = t.targetId, i = await ua(n, e, s, "current" === r), n.isPrimaryClient && wo(n.remoteStore, t);
     }
     return i;
 }
@@ -12987,31 +12984,31 @@ async function ac(t, e) {
 /**
  * Registers a view for a previously unknown query and computes its initial
  * snapshot.
- */ async function uc(t, e, n, s) {
+ */ async function ua(t, e, n, s) {
     // PORTING NOTE: On Web only, we inject the code that registers new Limbo
     // targets based on view changes. This allows us to only depend on Limbo
     // changes when user code includes queries.
     t.Go = (e, n, s) => async function(t, e, n, s) {
-        let i = e.view.Po(n);
+        let i = e.view.bo(n);
         i.Bn && (
         // The query has a limit and some docs were removed, so we need
         // to re-run the query against the local store to make sure we
         // didn't lose any good docs that had been past the limit.
         i = await Rr(t.localStore, e.query, 
-        /* usePreviousResults= */ !1).then((({documents: t}) => e.view.Po(t, i))));
+        /* usePreviousResults= */ !1).then((({documents: t}) => e.view.bo(t, i))));
         const r = s && s.targetChanges.get(e.targetId), o = e.view.applyChanges(i, 
         /* updateLimboDocuments= */ t.isPrimaryClient, r);
-        return Ic(t, e.targetId, o.Co), o.snapshot;
+        return Ia(t, e.targetId, o.Co), o.snapshot;
     }(t, e, n, s);
     const i = await Rr(t.localStore, e, 
-    /* usePreviousResults= */ !0), r = new ic(e, i.zn), o = r.Po(i.documents), c = On.createSynthesizedTargetChangeForCurrentChange(n, s && "Offline" /* Offline */ !== t.onlineState), a = r.applyChanges(o, 
-    /* updateLimboDocuments= */ t.isPrimaryClient, c);
-    Ic(t, n, a.Co);
-    const u = new rc(e, n, r);
-    return t.Fo.set(e, u), t.Mo.has(n) ? t.Mo.get(n).push(e) : t.Mo.set(n, [ e ]), a.snapshot;
+    /* usePreviousResults= */ !0), r = new ia(e, i.zn), o = r.bo(i.documents), a = On.createSynthesizedTargetChangeForCurrentChange(n, s && "Offline" /* Offline */ !== t.onlineState), c = r.applyChanges(o, 
+    /* updateLimboDocuments= */ t.isPrimaryClient, a);
+    Ia(t, n, c.Co);
+    const u = new ra(e, n, r);
+    return t.Fo.set(e, u), t.Mo.has(n) ? t.Mo.get(n).push(e) : t.Mo.set(n, [ e ]), c.snapshot;
 }
 
-/** Stops listening to the query. */ async function hc(t, e) {
+/** Stops listening to the query. */ async function ha(t, e) {
     const n = j(t), s = n.Fo.get(e), i = n.Mo.get(s.targetId);
     if (i.length > 1) return n.Mo.set(s.targetId, i.filter((t => !Se(t, e)))), void n.Fo.delete(e);
     // No other queries are mapped to the target, clean up the query and the target.
@@ -13022,9 +13019,9 @@ async function ac(t, e) {
         n.sharedClientState.isActiveQueryTarget(s.targetId) || await Ar(n.localStore, s.targetId, 
         /*keepPersistedTargetData=*/ !1).then((() => {
             n.sharedClientState.clearQueryState(s.targetId), _o(n.remoteStore, s.targetId), 
-            Tc(n, s.targetId);
+            Ta(n, s.targetId);
         })).catch(Ki);
-    } else Tc(n, s.targetId), await Ar(n.localStore, s.targetId, 
+    } else Ta(n, s.targetId), await Ar(n.localStore, s.targetId, 
     /*keepPersistedTargetData=*/ !0);
 }
 
@@ -13037,8 +13034,8 @@ async function ac(t, e) {
  * have completed, *not* when the write was acked by the backend. The
  * userCallback is resolved once the write was acked/rejected by the
  * backend (or failed locally for any other reason).
- */ async function lc(t, e, n) {
-    const s = Mc(t);
+ */ async function la(t, e, n) {
+    const s = Ma(t);
     try {
         const t = await function(t, e) {
             const n = j(t), s = ut.now(), i = e.reduce(((t, e) => t.add(e.key)), Nn());
@@ -13073,7 +13070,7 @@ async function ac(t, e) {
         /**
  * Resolves or rejects the user callback for the given batch and then discards
  * it.
- */ (s, t.batchId, n), await bc(s, t.changes), await vo(s.remoteStore);
+ */ (s, t.batchId, n), await Pa(s, t.changes), await vo(s.remoteStore);
     } catch (t) {
         // If we can't persist the mutation, we reject the user callback and
         // don't send the mutation. The user can then retry the write.
@@ -13086,7 +13083,7 @@ async function ac(t, e) {
  * Applies one remote event to the sync engine, notifying any views of the
  * changes, and releasing any pending mutation batches that would become
  * visible because of the snapshot version the remote event contains.
- */ async function fc(t, e) {
+ */ async function fa(t, e) {
     const n = j(t);
     try {
         const t = await pr(n.localStore, e);
@@ -13099,7 +13096,7 @@ async function ac(t, e) {
             q(t.addedDocuments.size + t.modifiedDocuments.size + t.removedDocuments.size <= 1), 
             t.addedDocuments.size > 0 ? s.$o = !0 : t.modifiedDocuments.size > 0 ? q(s.$o) : t.removedDocuments.size > 0 && (q(s.$o), 
             s.$o = !1));
-        })), await bc(n, t, e);
+        })), await Pa(n, t, e);
     } catch (t) {
         await Ki(t);
     }
@@ -13108,7 +13105,7 @@ async function ac(t, e) {
 /**
  * Applies an OnlineState change to the sync engine and notifies any views of
  * the change.
- */ function dc(t, e, n) {
+ */ function da(t, e, n) {
     const s = j(t);
     // If we are the secondary client, we explicitly ignore the remote store's
     // online state (the local client may go offline, even though the primary
@@ -13128,7 +13125,7 @@ async function ac(t, e) {
                 // Run global snapshot listeners if a consistent snapshot has been emitted.
                 t.ro(e) && (s = !0);
             })), s && Jo(n);
-        }(s.eventManager, e), t.length && s.Oo.br(t), s.onlineState = e, s.isPrimaryClient && s.sharedClientState.setOnlineState(e);
+        }(s.eventManager, e), t.length && s.Oo.Pr(t), s.onlineState = e, s.isPrimaryClient && s.sharedClientState.setOnlineState(e);
     }
 }
 
@@ -13142,7 +13139,7 @@ async function ac(t, e) {
  * @param err - A description of the condition that has forced the rejection.
  * Nearly always this will be an indication that the user is no longer
  * authorized to see the data matching the target.
- */ async function wc(t, e, n) {
+ */ async function wa(t, e, n) {
     const s = j(t);
     // PORTING NOTE: Multi-tab only.
         s.sharedClientState.updateQueryState(e, "rejected", n);
@@ -13159,18 +13156,18 @@ async function ac(t, e) {
         const n = Nn().add(r), i = new $n(ht.min(), 
         /* targetChanges= */ new Map, 
         /* targetMismatches= */ new An(ot), t, n);
-        await fc(s, i), 
+        await fa(s, i), 
         // Since this query failed, we won't want to manually unlisten to it.
         // We only remove it from bookkeeping after we successfully applied the
         // RemoteEvent. If `applyRemoteEvent()` throws, we want to re-listen to
         // this query when the RemoteStore restarts the Watch stream, which should
         // re-trigger the target failure.
-        s.Bo = s.Bo.remove(r), s.Uo.delete(e), Rc(s);
+        s.Bo = s.Bo.remove(r), s.Uo.delete(e), Ra(s);
     } else await Ar(s.localStore, e, 
-    /* keepPersistedTargetData */ !1).then((() => Tc(s, e, n))).catch(Ki);
+    /* keepPersistedTargetData */ !1).then((() => Ta(s, e, n))).catch(Ki);
 }
 
-async function _c(t, e) {
+async function _a(t, e) {
     const n = j(t), s = e.batch.batchId;
     try {
         const t = await gr(n.localStore, e);
@@ -13178,14 +13175,14 @@ async function _c(t, e) {
         // raise events immediately (depending on whether the watcher is caught
         // up), so we raise user callbacks first so that they consistently happen
         // before listen events.
-                pc(n, s, /*error=*/ null), yc(n, s), n.sharedClientState.updateMutationState(s, "acknowledged"), 
-        await bc(n, t);
+                pa(n, s, /*error=*/ null), ya(n, s), n.sharedClientState.updateMutationState(s, "acknowledged"), 
+        await Pa(n, t);
     } catch (t) {
         await Ki(t);
     }
 }
 
-async function mc(t, e, n) {
+async function ma(t, e, n) {
     const s = j(t);
     try {
         const t = await function(t, e) {
@@ -13205,8 +13202,8 @@ async function mc(t, e, n) {
         // raise events immediately (depending on whether the watcher is caught up),
         // so we raise user callbacks first so that they consistently happen before
         // listen events.
-                pc(s, e, n), yc(s, e), s.sharedClientState.updateMutationState(e, "rejected", n), 
-        await bc(s, t);
+                pa(s, e, n), ya(s, e), s.sharedClientState.updateMutationState(e, "rejected", n), 
+        await Pa(s, t);
     } catch (n) {
         await Ki(n);
     }
@@ -13215,7 +13212,7 @@ async function mc(t, e, n) {
 /**
  * Registers a user callback that resolves when all pending mutations at the moment of calling
  * are acknowledged .
- */ async function gc(t, e) {
+ */ async function ga(t, e) {
     const n = j(t);
     To(n.remoteStore) || F("SyncEngine", "The network is disabled. The task returned by 'awaitPendingWrites()' will not complete until the network is enabled.");
     try {
@@ -13237,13 +13234,13 @@ async function mc(t, e, n) {
 /**
  * Triggers the callbacks that are waiting for this batch id to get acknowledged by server,
  * if there are any.
- */ function yc(t, e) {
+ */ function ya(t, e) {
     (t.jo.get(e) || []).forEach((t => {
         t.resolve();
     })), t.jo.delete(e);
 }
 
-/** Reject all outstanding callbacks waiting for pending writes to complete. */ function pc(t, e, n) {
+/** Reject all outstanding callbacks waiting for pending writes to complete. */ function pa(t, e, n) {
     const s = j(t);
     let i = s.Ko[s.currentUser.toKey()];
     // NOTE: Mutations restored from persistence won't have callbacks, so it's
@@ -13254,39 +13251,39 @@ async function mc(t, e, n) {
     }
 }
 
-function Tc(t, e, n = null) {
+function Ta(t, e, n = null) {
     t.sharedClientState.removeLocalQueryTarget(e);
     for (const s of t.Mo.get(e)) t.Fo.delete(s), n && t.Oo.zo(s, n);
     if (t.Mo.delete(e), t.isPrimaryClient) {
         t.qo.us(e).forEach((e => {
             t.qo.containsKey(e) || 
             // We removed the last reference for this key
-            Ec(t, e);
+            Ea(t, e);
         }));
     }
 }
 
-function Ec(t, e) {
+function Ea(t, e) {
     t.Lo.delete(e.path.canonicalString());
     // It's possible that the target already got removed because the query failed. In that case,
     // the key won't exist in `limboTargetsByKey`. Only do the cleanup if we still have the target.
     const n = t.Bo.get(e);
-    null !== n && (_o(t.remoteStore, n), t.Bo = t.Bo.remove(e), t.Uo.delete(n), Rc(t));
+    null !== n && (_o(t.remoteStore, n), t.Bo = t.Bo.remove(e), t.Uo.delete(n), Ra(t));
 }
 
-function Ic(t, e, n) {
-    for (const s of n) if (s instanceof nc) t.qo.addReference(s.key, e), Ac(t, s); else if (s instanceof sc) {
+function Ia(t, e, n) {
+    for (const s of n) if (s instanceof na) t.qo.addReference(s.key, e), Aa(t, s); else if (s instanceof sa) {
         F("SyncEngine", "Document no longer in limbo: " + s.key), t.qo.removeReference(s.key, e);
         t.qo.containsKey(s.key) || 
         // We removed the last reference for this key
-        Ec(t, s.key);
+        Ea(t, s.key);
     } else U();
 }
 
-function Ac(t, e) {
+function Aa(t, e) {
     const n = e.key, s = n.path.canonicalString();
     t.Bo.get(n) || t.Lo.has(s) || (F("SyncEngine", "New document in limbo: " + n), t.Lo.add(s), 
-    Rc(t));
+    Ra(t));
 }
 
 /**
@@ -13296,27 +13293,27 @@ function Ac(t, e) {
  * Without bounding the number of concurrent resolutions, the server can fail
  * with "resource exhausted" errors which can lead to pathological client
  * behavior as seen in https://github.com/firebase/firebase-js-sdk/issues/2683.
- */ function Rc(t) {
+ */ function Ra(t) {
     for (;t.Lo.size > 0 && t.Bo.size < t.maxConcurrentLimboResolutions; ) {
         const e = t.Lo.values().next().value;
         t.Lo.delete(e);
         const n = new Nt(_t.fromString(e)), s = t.Qo.next();
-        t.Uo.set(s, new oc(n)), t.Bo = t.Bo.insert(n, s), wo(t.remoteStore, new hi(ve(Te(n.path)), s, 2 /* LimboResolution */ , st.I));
+        t.Uo.set(s, new oa(n)), t.Bo = t.Bo.insert(n, s), wo(t.remoteStore, new hi(ve(Te(n.path)), s, 2 /* LimboResolution */ , st.I));
     }
 }
 
-async function bc(t, e, n) {
+async function Pa(t, e, n) {
     const s = j(t), i = [], r = [], o = [];
-    s.Fo.isEmpty() || (s.Fo.forEach(((t, c) => {
-        o.push(s.Go(c, e, n).then((t => {
+    s.Fo.isEmpty() || (s.Fo.forEach(((t, a) => {
+        o.push(s.Go(a, e, n).then((t => {
             if (t) {
-                s.isPrimaryClient && s.sharedClientState.updateQueryState(c.targetId, t.fromCache ? "not-current" : "current"), 
+                s.isPrimaryClient && s.sharedClientState.updateQueryState(a.targetId, t.fromCache ? "not-current" : "current"), 
                 i.push(t);
-                const e = fr.$n(c.targetId, t);
+                const e = fr.$n(a.targetId, t);
                 r.push(e);
             }
         })));
-    })), await Promise.all(o), s.Oo.br(i), await async function(t, e) {
+    })), await Promise.all(o), s.Oo.Pr(i), await async function(t, e) {
         const n = j(t);
         try {
             await n.persistence.runTransaction("notifyLocalViewChanges", "readwrite", (t => Js.forEach(e, (e => Js.forEach(e.kn, (s => n.persistence.referenceDelegate.addReference(t, e.targetId, s))).next((() => Js.forEach(e.xn, (s => n.persistence.referenceDelegate.removeReference(t, e.targetId, s)))))))));
@@ -13339,7 +13336,7 @@ async function bc(t, e, n) {
     }(s.localStore, r));
 }
 
-async function Pc(t, e) {
+async function ba(t, e) {
     const n = j(t);
     if (!n.currentUser.isEqual(e)) {
         F("SyncEngine", "User change. New user:", e.toKey());
@@ -13354,11 +13351,11 @@ async function Pc(t, e) {
             })), t.jo.clear();
         }(n, "'waitForPendingWrites' promise is rejected due to a user change."), 
         // TODO(b/114226417): Consider calling this only in the primary tab.
-        n.sharedClientState.handleUserChange(e, t.removedBatchIds, t.addedBatchIds), await bc(n, t.Gn);
+        n.sharedClientState.handleUserChange(e, t.removedBatchIds, t.addedBatchIds), await Pa(n, t.Gn);
     }
 }
 
-function vc(t, e) {
+function va(t, e) {
     const n = j(t), s = n.Uo.get(e);
     if (s && s.$o) return Nn().add(s.key);
     {
@@ -13367,7 +13364,7 @@ function vc(t, e) {
         if (!s) return t;
         for (const e of s) {
             const s = n.Fo.get(e);
-            t = t.unionWith(s.view.bo);
+            t = t.unionWith(s.view.Po);
         }
         return t;
     }
@@ -13376,10 +13373,10 @@ function vc(t, e) {
 /**
  * Reconcile the list of synced documents in an existing view with those
  * from persistence.
- */ async function Vc(t, e) {
+ */ async function Va(t, e) {
     const n = j(t), s = await Rr(n.localStore, e.query, 
     /* usePreviousResults= */ !0), i = e.view.ko(s);
-    return n.isPrimaryClient && Ic(n, e.targetId, i.Co), i;
+    return n.isPrimaryClient && Ia(n, e.targetId, i.Co), i;
 }
 
 /**
@@ -13387,14 +13384,14 @@ function vc(t, e) {
  * snapshots if needed.
  */
 // PORTING NOTE: Multi-Tab only.
-async function Sc(t) {
+async function Sa(t) {
     const e = j(t);
-    return Pr(e.localStore).then((t => bc(e, t)));
+    return br(e.localStore).then((t => Pa(e, t)));
 }
 
 /** Applies a mutation state to an existing batch.  */
 // PORTING NOTE: Multi-Tab only.
-async function Dc(t, e, n, s) {
+async function Da(t, e, n, s) {
     const i = j(t), r = await function(t, e) {
         const n = j(t), s = j(n.An);
         return n.persistence.runTransaction("Lookup mutation documents", "readonly", (t => s.Zt(t, e).next((e => e ? n.Wn.vn(t, e) : Js.resolve(null)))));
@@ -13408,11 +13405,11 @@ async function Dc(t, e, n, s) {
     await vo(i.remoteStore) : "acknowledged" === n || "rejected" === n ? (
     // NOTE: Both these methods are no-ops for batches that originated from
     // other clients.
-    pc(i, e, s || null), yc(i, e), function(t, e) {
+    pa(i, e, s || null), ya(i, e), function(t, e) {
         j(j(t).An).ee(e);
     }
     // PORTING NOTE: Multi-Tab only.
-    (i.localStore, e)) : U(), await bc(i, r)) : 
+    (i.localStore, e)) : U(), await Pa(i, r)) : 
     // A throttled tab may not have seen the mutation before it was completed
     // and removed from the mutation queue, in which case we won't have cached
     // the affected documents. In this case we can safely ignore the update
@@ -13425,26 +13422,26 @@ async function Dc(t, e, n, s) {
 
 /** Applies a query target change from a different tab. */
 // PORTING NOTE: Multi-Tab only.
-async function Cc(t, e) {
+async function Ca(t, e) {
     const n = j(t);
-    if (Fc(n), Mc(n), !0 === e && !0 !== n.Wo) {
+    if (Fa(n), Ma(n), !0 === e && !0 !== n.Wo) {
         // Secondary tabs only maintain Views for their local listeners and the
         // Views internal state may not be 100% populated (in particular
         // secondary tabs don't track syncedDocuments, the set of documents the
         // server considers to be in the target). So when a secondary becomes
         // primary, we need to need to make sure that all views for all targets
         // match the state on disk.
-        const t = n.sharedClientState.getAllActiveQueryTargets(), e = await Nc(n, t.toArray());
+        const t = n.sharedClientState.getAllActiveQueryTargets(), e = await Na(n, t.toArray());
         n.Wo = !0, await Oo(n.remoteStore, !0);
         for (const t of e) wo(n.remoteStore, t);
     } else if (!1 === e && !1 !== n.Wo) {
         const t = [];
         let e = Promise.resolve();
         n.Mo.forEach(((s, i) => {
-            n.sharedClientState.isLocalQueryTarget(i) ? t.push(i) : e = e.then((() => (Tc(n, i), 
+            n.sharedClientState.isLocalQueryTarget(i) ? t.push(i) : e = e.then((() => (Ta(n, i), 
             Ar(n.localStore, i, 
             /*keepPersistedTargetData=*/ !0)))), _o(n.remoteStore, i);
-        })), await e, await Nc(n, t), 
+        })), await e, await Na(n, t), 
         // PORTING NOTE: Multi-Tab only.
         function(t) {
             const e = j(t);
@@ -13467,7 +13464,7 @@ async function Cc(t, e) {
     }
 }
 
-async function Nc(t, e, n) {
+async function Na(t, e, n) {
     const s = j(t), i = [], r = [];
     for (const t of e) {
         let e;
@@ -13479,19 +13476,19 @@ async function Nc(t, e, n) {
             // state (the list of syncedDocuments may have gotten out of sync).
             e = await Ir(s.localStore, ve(n[0]));
             for (const t of n) {
-                const e = s.Fo.get(t), n = await Vc(s, e);
+                const e = s.Fo.get(t), n = await Va(s, e);
                 n.snapshot && r.push(n.snapshot);
             }
         } else {
             // For queries that never executed on this client, we need to
             // allocate the target in LocalStore and initialize a new View.
-            const n = await br(s.localStore, t);
-            e = await Ir(s.localStore, n), await uc(s, kc(n), t, 
+            const n = await Pr(s.localStore, t);
+            e = await Ir(s.localStore, n), await ua(s, ka(n), t, 
             /*current=*/ !1);
         }
         i.push(e);
     }
-    return s.Oo.br(r), i;
+    return s.Oo.Pr(r), i;
 }
 
 /**
@@ -13505,20 +13502,20 @@ async function Nc(t, e, n) {
  * difference will not cause issues.
  */
 // PORTING NOTE: Multi-Tab only.
-function kc(t) {
+function ka(t) {
     return pe(t.path, t.collectionGroup, t.orderBy, t.filters, t.limit, "F" /* First */ , t.startAt, t.endAt);
 }
 
 /** Returns the IDs of the clients that are currently active. */
 // PORTING NOTE: Multi-Tab only.
-function xc(t) {
+function xa(t) {
     const e = j(t);
     return j(j(e.localStore).persistence).Tn();
 }
 
 /** Applies a query target change from a different tab. */
 // PORTING NOTE: Multi-Tab only.
-async function $c(t, e, n, s) {
+async function $a(t, e, n, s) {
     const i = j(t);
     if (i.Wo) 
     // If we receive a target state notification via WebStorage, we are
@@ -13527,14 +13524,14 @@ async function $c(t, e, n, s) {
       case "current":
       case "not-current":
         {
-            const t = await Pr(i.localStore), s = $n.createSynthesizedRemoteEventForCurrentChange(e, "current" === n);
-            await bc(i, t, s);
+            const t = await br(i.localStore), s = $n.createSynthesizedRemoteEventForCurrentChange(e, "current" === n);
+            await Pa(i, t, s);
             break;
         }
 
       case "rejected":
         await Ar(i.localStore, e, 
-        /* keepPersistedTargetData */ !0), Tc(i, e, s);
+        /* keepPersistedTargetData */ !0), Ta(i, e, s);
         break;
 
       default:
@@ -13542,8 +13539,8 @@ async function $c(t, e, n, s) {
     }
 }
 
-/** Adds or removes Watch targets for queries from different tabs. */ async function Oc(t, e, n) {
-    const s = Fc(t);
+/** Adds or removes Watch targets for queries from different tabs. */ async function Oa(t, e, n) {
+    const s = Fa(t);
     if (s.Wo) {
         for (const t of e) {
             if (s.Mo.has(t)) {
@@ -13551,8 +13548,8 @@ async function $c(t, e, n, s) {
                 F("SyncEngine", "Adding an already active target " + t);
                 continue;
             }
-            const e = await br(s.localStore, t), n = await Ir(s.localStore, e);
-            await uc(s, kc(e), n.targetId, 
+            const e = await Pr(s.localStore, t), n = await Ir(s.localStore, e);
+            await ua(s, ka(e), n.targetId, 
             /*current=*/ !1), wo(s.remoteStore, n);
         }
         for (const t of n) 
@@ -13562,21 +13559,21 @@ async function $c(t, e, n, s) {
         // Release queries that are still active.
         await Ar(s.localStore, t, 
         /* keepPersistedTargetData */ !1).then((() => {
-            _o(s.remoteStore, t), Tc(s, t);
+            _o(s.remoteStore, t), Ta(s, t);
         })).catch(Ki);
     }
 }
 
-function Fc(t) {
+function Fa(t) {
     const e = j(t);
-    return e.remoteStore.remoteSyncer.applyRemoteEvent = fc.bind(null, e), e.remoteStore.remoteSyncer.getRemoteKeysForTarget = vc.bind(null, e), 
-    e.remoteStore.remoteSyncer.rejectListen = wc.bind(null, e), e.Oo.br = zo.bind(null, e.eventManager), 
+    return e.remoteStore.remoteSyncer.applyRemoteEvent = fa.bind(null, e), e.remoteStore.remoteSyncer.getRemoteKeysForTarget = va.bind(null, e), 
+    e.remoteStore.remoteSyncer.rejectListen = wa.bind(null, e), e.Oo.Pr = zo.bind(null, e.eventManager), 
     e.Oo.zo = Ho.bind(null, e.eventManager), e;
 }
 
-function Mc(t) {
+function Ma(t) {
     const e = j(t);
-    return e.remoteStore.remoteSyncer.applySuccessfulWrite = _c.bind(null, e), e.remoteStore.remoteSyncer.rejectFailedWrite = mc.bind(null, e), 
+    return e.remoteStore.remoteSyncer.applySuccessfulWrite = _a.bind(null, e), e.remoteStore.remoteSyncer.rejectFailedWrite = ma.bind(null, e), 
     e;
 }
 
@@ -13587,7 +13584,7 @@ function Mc(t) {
  * @param syncEngine - SyncEngine to use.
  * @param bundleReader - Bundle to load into the SDK.
  * @param task - LoadBundleTask used to update the loading progress to public API.
- */ function Lc(t, e, n) {
+ */ function La(t, e, n) {
     const s = j(t);
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
         (async function(t, e, n) {
@@ -13608,8 +13605,8 @@ function Mc(t) {
                     totalBytes: t.totalBytes
                 };
             }(s));
-            n._updateProgress(ec(s));
-            const i = new tc(s, t.localStore, e.k);
+            n._updateProgress(ea(s));
+            const i = new ta(s, t.localStore, e.k);
             let r = await e.Ho();
             for (;r; ) {
                 const t = await i.yo(r);
@@ -13619,7 +13616,7 @@ function Mc(t) {
             // TODO(b/160876443): This currently raises snapshots with
             // `fromCache=false` if users already listen to some queries and bundles
             // has newer version.
-                        await bc(t, o.In, 
+                        await Pa(t, o.In, 
             /* remoteEvent */ void 0), 
             // Save metadata, so loading the same bundle will skip.
             await function(t, e) {
@@ -13658,7 +13655,7 @@ function Mc(t) {
     }));
 }
 
-class Bc {
+class Ba {
     constructor() {
         this.synchronizeTabs = !1;
     }
@@ -13686,14 +13683,14 @@ class Bc {
 
 /**
  * Provides all components needed for Firestore with IndexedDB persistence.
- */ class Uc extends Bc {
+ */ class Ua extends Ba {
     constructor(t, e, n) {
-        super(), this.tc = t, this.cacheSizeBytes = e, this.forceOwnership = n, this.synchronizeTabs = !1;
+        super(), this.ta = t, this.cacheSizeBytes = e, this.forceOwnership = n, this.synchronizeTabs = !1;
     }
     async initialize(t) {
-        await super.initialize(t), await vr(this.localStore), await this.tc.initialize(this, t), 
+        await super.initialize(t), await vr(this.localStore), await this.ta.initialize(this, t), 
         // Enqueue writes from a previous session
-        await Mc(this.tc.syncEngine), await vo(this.tc.remoteStore), 
+        await Ma(this.ta.syncEngine), await vo(this.ta.remoteStore), 
         // NOTE: This will immediately call the listener, so we make sure to
         // set it after localStore / remoteStore are started.
         await this.persistence.sn((() => (this.gcScheduler && !this.gcScheduler.started && this.gcScheduler.start(this.localStore), 
@@ -13722,29 +13719,29 @@ class Bc {
  * In the legacy client, this provider is used to provide both multi-tab and
  * non-multi-tab persistence since we cannot tell at build time whether
  * `synchronizeTabs` will be enabled.
- */ class qc extends Uc {
+ */ class qa extends Ua {
     constructor(t, e) {
-        super(t, e, /* forceOwnership= */ !1), this.tc = t, this.cacheSizeBytes = e, this.synchronizeTabs = !0;
+        super(t, e, /* forceOwnership= */ !1), this.ta = t, this.cacheSizeBytes = e, this.synchronizeTabs = !0;
     }
     async initialize(t) {
         await super.initialize(t);
-        const e = this.tc.syncEngine;
+        const e = this.ta.syncEngine;
         this.sharedClientState instanceof zr && (this.sharedClientState.syncEngine = {
-            mi: Dc.bind(null, e),
-            gi: $c.bind(null, e),
-            yi: Oc.bind(null, e),
-            Tn: xc.bind(null, e),
-            _i: Sc.bind(null, e)
+            mi: Da.bind(null, e),
+            gi: $a.bind(null, e),
+            yi: Oa.bind(null, e),
+            Tn: xa.bind(null, e),
+            _i: Sa.bind(null, e)
         }, await this.sharedClientState.start()), 
         // NOTE: This will immediately call the listener, so we make sure to
         // set it after localStore / remoteStore are started.
         await this.persistence.sn((async t => {
-            await Cc(this.tc.syncEngine, t), this.gcScheduler && (t && !this.gcScheduler.started ? this.gcScheduler.start(this.localStore) : t || this.gcScheduler.stop());
+            await Ca(this.ta.syncEngine, t), this.gcScheduler && (t && !this.gcScheduler.started ? this.gcScheduler.start(this.localStore) : t || this.gcScheduler.stop());
         }));
     }
     Jo(t) {
         const e = eo();
-        if (!zr.Pt(e)) throw new W(Q.UNIMPLEMENTED, "IndexedDB persistence is only available on platforms that support LocalStorage.");
+        if (!zr.bt(e)) throw new W(Q.UNIMPLEMENTED, "IndexedDB persistence is only available on platforms that support LocalStorage.");
         const n = ur(t.databaseInfo.databaseId, t.databaseInfo.persistenceKey);
         return new zr(e, t.asyncQueue, n, t.clientId, t.initialUser);
     }
@@ -13753,13 +13750,13 @@ class Bc {
 /**
  * Initializes and wires the components that are needed to interface with the
  * network.
- */ class Kc {
+ */ class Ka {
     async initialize(t, e) {
         this.localStore || (this.localStore = t.localStore, this.sharedClientState = t.sharedClientState, 
         this.datastore = this.createDatastore(e), this.remoteStore = this.createRemoteStore(e), 
         this.eventManager = this.createEventManager(e), this.syncEngine = this.createSyncEngine(e, 
-        /* startAsPrimary=*/ !t.synchronizeTabs), this.sharedClientState.onlineStateHandler = t => dc(this.syncEngine, t, 1 /* SharedClientState */), 
-        this.remoteStore.remoteSyncer.handleCredentialChange = Pc.bind(null, this.syncEngine), 
+        /* startAsPrimary=*/ !t.synchronizeTabs), this.sharedClientState.onlineStateHandler = t => da(this.syncEngine, t, 1 /* SharedClientState */), 
+        this.remoteStore.remoteSyncer.handleCredentialChange = ba.bind(null, this.syncEngine), 
         await Oo(this.remoteStore, this.syncEngine.isPrimaryClient));
     }
     createEventManager(t) {
@@ -13769,20 +13766,20 @@ class Bc {
         const e = so(t.databaseInfo.databaseId), n = (s = t.databaseInfo, new to(s));
         var s;
         /** Return the Platform-specific connectivity monitor. */        return function(t, e, n, s) {
-            return new ao(t, e, n, s);
+            return new co(t, e, n, s);
         }(t.authCredentials, t.appCheckCredentials, n, e);
     }
     createRemoteStore(t) {
-        return e = this.localStore, n = this.datastore, s = t.asyncQueue, i = t => dc(this.syncEngine, t, 0 /* RemoteStore */), 
-        r = Yr.Pt() ? new Yr : new Jr, new ho(e, n, s, i, r);
+        return e = this.localStore, n = this.datastore, s = t.asyncQueue, i = t => da(this.syncEngine, t, 0 /* RemoteStore */), 
+        r = Yr.bt() ? new Yr : new Jr, new ho(e, n, s, i, r);
         var e, n, s, i, r;
         /** Re-enables the network. Idempotent. */    }
     createSyncEngine(t, e) {
         return function(t, e, n, 
         // PORTING NOTE: Manages state synchronization in multi-tab environments.
         s, i, r, o) {
-            const c = new cc(t, e, n, s, i, r);
-            return o && (c.Wo = !0), c;
+            const a = new aa(t, e, n, s, i, r);
+            return o && (a.Wo = !0), a;
         }(this.localStore, this.remoteStore, this.eventManager, this.sharedClientState, t.initialUser, t.maxConcurrentLimboResolutions, e);
     }
     terminate() {
@@ -13824,7 +13821,7 @@ class Bc {
  * @param bytesPerRead - How many bytes each `read()` from the returned reader
  *        will read.
  */
-function jc(t, e = 10240) {
+function ja(t, e = 10240) {
     let n = 0;
     // The TypeScript definition for ReadableStreamReader changed. We use
     // `any` here to allow this code to compile with different versions.
@@ -13890,7 +13887,7 @@ function jc(t, e = 10240) {
  * asynchronously. To allow immediate silencing, a mute call is added which
  * causes events scheduled to no longer be raised.
  */
-class Qc {
+class Qa {
     constructor(t) {
         this.observer = t, 
         /**
@@ -13900,15 +13897,15 @@ class Qc {
         this.muted = !1;
     }
     next(t) {
-        this.observer.next && this.ec(this.observer.next, t);
+        this.observer.next && this.ea(this.observer.next, t);
     }
     error(t) {
-        this.observer.error ? this.ec(this.observer.error, t) : console.error("Uncaught Error in snapshot listener:", t);
+        this.observer.error ? this.ea(this.observer.error, t) : console.error("Uncaught Error in snapshot listener:", t);
     }
-    nc() {
+    na() {
         this.muted = !0;
     }
-    ec(t, e) {
+    ea(t, e) {
         this.muted || setTimeout((() => {
             this.muted || t(e);
         }), 0);
@@ -13936,32 +13933,32 @@ class Qc {
  *
  * Takes a bundle stream or buffer, and presents abstractions to read bundled
  * elements out of the underlying content.
- */ class Wc {
+ */ class Wa {
     constructor(
     /** The reader to read from underlying binary bundle data source. */
     t, e) {
-        this.sc = t, this.k = e, 
+        this.sa = t, this.k = e, 
         /** Cached bundle metadata. */
         this.metadata = new G, 
         /**
          * Internal buffer to hold bundle content, accumulating incomplete element
          * content.
          */
-        this.buffer = new Uint8Array, this.ic = new TextDecoder("utf-8"), 
+        this.buffer = new Uint8Array, this.ia = new TextDecoder("utf-8"), 
         // Read the metadata (which is the first element).
-        this.rc().then((t => {
+        this.ra().then((t => {
             t && t._o() ? this.metadata.resolve(t.payload.metadata) : this.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 => this.metadata.reject(t)));
     }
     close() {
-        return this.sc.cancel();
+        return this.sa.cancel();
     }
     async getMetadata() {
         return this.metadata.promise;
     }
     async Ho() {
         // Makes sure metadata is read before proceeding.
-        return await this.getMetadata(), this.rc();
+        return await this.getMetadata(), this.ra();
     }
     /**
      * Reads from the head of internal buffer, and pulling more data from
@@ -13972,15 +13969,15 @@ class Qc {
      *
      * Returns either the bundled element, or null if we have reached the end of
      * the stream.
-     */    async rc() {
-        const t = await this.oc();
+     */    async ra() {
+        const t = await this.oa();
         if (null === t) return null;
-        const e = this.ic.decode(t), n = Number(e);
-        isNaN(n) && this.cc(`length string (${e}) is not valid number`);
-        const s = await this.ac(n);
+        const e = this.ia.decode(t), n = Number(e);
+        isNaN(n) && this.aa(`length string (${e}) is not valid number`);
+        const s = await this.ca(n);
         return new Xo(JSON.parse(s), t.length + n);
     }
-    /** First index of '{' from the underlying buffer. */    uc() {
+    /** First index of '{' from the underlying buffer. */    ua() {
         return this.buffer.findIndex((t => t === "{".charCodeAt(0)));
     }
     /**
@@ -13988,17 +13985,17 @@ class Qc {
      * return the content.
      *
      * If reached end of the stream, returns a null.
-     */    async oc() {
-        for (;this.uc() < 0; ) {
-            if (await this.hc()) break;
+     */    async oa() {
+        for (;this.ua() < 0; ) {
+            if (await this.ha()) break;
         }
         // Broke out of the loop because underlying stream is closed, and there
         // happens to be no more data to process.
                 if (0 === this.buffer.length) return null;
-        const t = this.uc();
+        const t = this.ua();
         // Broke out of the loop because underlying stream is closed, but still
         // cannot find an open bracket.
-                t < 0 && this.cc("Reached the end of bundle when a length string is expected.");
+                t < 0 && this.aa("Reached the end of bundle when a length string is expected.");
         const e = this.buffer.slice(0, t);
         // Update the internal buffer to drop the read length.
                 return this.buffer = this.buffer.slice(t), e;
@@ -14008,23 +14005,23 @@ class Qc {
      * number of bytes, pulling more data from the underlying stream if needed.
      *
      * Returns a string decoded from the read bytes.
-     */    async ac(t) {
+     */    async ca(t) {
         for (;this.buffer.length < t; ) {
-            await this.hc() && this.cc("Reached the end of bundle when more is expected.");
+            await this.ha() && this.aa("Reached the end of bundle when more is expected.");
         }
-        const e = this.ic.decode(this.buffer.slice(0, t));
+        const e = this.ia.decode(this.buffer.slice(0, t));
         // Update the internal buffer to drop the read json string.
                 return this.buffer = this.buffer.slice(t), e;
     }
-    cc(t) {
+    aa(t) {
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        throw this.sc.cancel(), new Error(`Invalid bundle format: ${t}`);
+        throw this.sa.cancel(), new Error(`Invalid bundle format: ${t}`);
     }
     /**
      * Pulls more data from underlying stream to internal buffer.
      * Returns a boolean indicating whether the stream is finished.
-     */    async hc() {
-        const t = await this.sc.read();
+     */    async ha() {
+        const t = await this.sa.read();
         if (!t.done) {
             const e = new Uint8Array(this.buffer.length + t.value.length);
             e.set(this.buffer), e.set(t.value, this.buffer.length), this.buffer = e;
@@ -14053,7 +14050,7 @@ class Qc {
  * Internal transaction object responsible for accumulating the mutations to
  * perform and the base versions for any documents read.
  */
-class Gc {
+class Ga {
     constructor(t) {
         this.datastore = t, 
         // The version of each document that was read during this transaction.
@@ -14078,14 +14075,14 @@ class Gc {
                 documents: e.map((t => Zn(n.k, t)))
             }, r = await n.ji("BatchGetDocuments", s, i), o = new Map;
             r.forEach((t => {
-                const e = cs(n.k, t);
+                const e = as(n.k, t);
                 o.set(e.key.toString(), e);
             }));
-            const c = [];
+            const a = [];
             return e.forEach((t => {
                 const e = o.get(t.toString());
-                q(!!e), c.push(e);
-            })), c;
+                q(!!e), a.push(e);
+            })), a;
         }(this.datastore, t);
         return e.forEach((t => this.recordVersion(t))), e;
     }
@@ -14194,29 +14191,29 @@ class Gc {
  * TransactionRunner encapsulates the logic needed to run and retry transactions
  * with backoff.
  */
-class zc {
+class za {
     constructor(t, e, n, s) {
         this.asyncQueue = t, this.datastore = e, this.updateFunction = n, this.deferred = s, 
-        this.lc = 5, this.ur = new io(this.asyncQueue, "transaction_retry" /* TransactionRetry */);
+        this.la = 5, this.ur = new io(this.asyncQueue, "transaction_retry" /* TransactionRetry */);
     }
     /** Runs the transaction and sets the result on deferred. */    run() {
-        this.lc -= 1, this.fc();
+        this.la -= 1, this.fa();
     }
-    fc() {
+    fa() {
         this.ur.Zi((async () => {
-            const t = new Gc(this.datastore), e = this.dc(t);
+            const t = new Ga(this.datastore), e = this.da(t);
             e && e.then((e => {
                 this.asyncQueue.enqueueAndForget((() => t.commit().then((() => {
                     this.deferred.resolve(e);
                 })).catch((t => {
-                    this.wc(t);
+                    this.wa(t);
                 }))));
             })).catch((t => {
-                this.wc(t);
+                this.wa(t);
             }));
         }));
     }
-    dc(t) {
+    da(t) {
         try {
             const e = this.updateFunction(t);
             return !St(e) && e.catch && e.then ? e : (this.deferred.reject(Error("Transaction callback must return a Promise")), 
@@ -14226,11 +14223,11 @@ class zc {
             return this.deferred.reject(t), null;
         }
     }
-    wc(t) {
-        this.lc > 0 && this._c(t) ? (this.lc -= 1, this.asyncQueue.enqueueAndForget((() => (this.fc(), 
+    wa(t) {
+        this.la > 0 && this._a(t) ? (this.la -= 1, this.asyncQueue.enqueueAndForget((() => (this.fa(), 
         Promise.resolve())))) : this.deferred.reject(t);
     }
-    _c(t) {
+    _a(t) {
         if ("FirebaseError" === t.name) {
             // In transactions, the backend will fail outdated reads with FAILED_PRECONDITION and
             // non-matching document versions with ABORTED. These errors should be retried.
@@ -14262,7 +14259,7 @@ class zc {
  * pieces of the client SDK architecture. It is responsible for creating the
  * async queue that is shared by all of the other components in the system.
  */
-class Hc {
+class Ha {
     constructor(t, e, 
     /**
      * Asynchronous queue responsible for all of our internal processing. When
@@ -14320,7 +14317,7 @@ class Hc {
     }
 }
 
-async function Jc(t, e) {
+async function Ja(t, e) {
     t.asyncQueue.verifyOperationInProgress(), F("FirestoreClient", "Initializing OfflineComponentProvider");
     const n = await t.getConfiguration();
     await e.initialize(n);
@@ -14333,9 +14330,9 @@ async function Jc(t, e) {
     e.persistence.setDatabaseDeletedListener((() => t.terminate())), t.offlineComponents = e;
 }
 
-async function Yc(t, e) {
+async function Ya(t, e) {
     t.asyncQueue.verifyOperationInProgress();
-    const n = await Xc(t);
+    const n = await Xa(t);
     F("FirestoreClient", "Initializing OnlineComponentProvider");
     const s = await t.getConfiguration();
     await e.initialize(n, s), 
@@ -14355,41 +14352,41 @@ async function Yc(t, e) {
     }(e.remoteStore, t))), t.onlineComponents = e;
 }
 
-async function Xc(t) {
+async function Xa(t) {
     return t.offlineComponents || (F("FirestoreClient", "Using default OfflineComponentProvider"), 
-    await Jc(t, new Bc)), t.offlineComponents;
+    await Ja(t, new Ba)), t.offlineComponents;
 }
 
-async function Zc(t) {
+async function Za(t) {
     return t.onlineComponents || (F("FirestoreClient", "Using default OnlineComponentProvider"), 
-    await Yc(t, new Kc)), t.onlineComponents;
+    await Ya(t, new Ka)), t.onlineComponents;
 }
 
-function ta(t) {
-    return Xc(t).then((t => t.persistence));
+function tc(t) {
+    return Xa(t).then((t => t.persistence));
 }
 
-function ea(t) {
-    return Xc(t).then((t => t.localStore));
+function ec(t) {
+    return Xa(t).then((t => t.localStore));
 }
 
-function na(t) {
-    return Zc(t).then((t => t.remoteStore));
+function nc(t) {
+    return Za(t).then((t => t.remoteStore));
 }
 
-function sa(t) {
-    return Zc(t).then((t => t.syncEngine));
+function sc(t) {
+    return Za(t).then((t => t.syncEngine));
 }
 
-async function ia(t) {
-    const e = await Zc(t), n = e.eventManager;
-    return n.onListen = ac.bind(null, e.syncEngine), n.onUnlisten = hc.bind(null, e.syncEngine), 
+async function ic(t) {
+    const e = await Za(t), n = e.eventManager;
+    return n.onListen = ca.bind(null, e.syncEngine), n.onUnlisten = ha.bind(null, e.syncEngine), 
     n;
 }
 
-/** Enables the network connection and re-enqueues all pending operations. */ function ra(t) {
+/** Enables the network connection and re-enqueues all pending operations. */ function rc(t) {
     return t.asyncQueue.enqueue((async () => {
-        const e = await ta(t), n = await na(t);
+        const e = await tc(t), n = await nc(t);
         return e.setNetworkEnabled(!0), function(t) {
             const e = j(t);
             return e.Gr.delete(0 /* UserDisabled */), lo(e);
@@ -14397,9 +14394,9 @@ async function ia(t) {
     }));
 }
 
-/** Disables the network connection. Pending operations will not complete. */ function oa(t) {
+/** Disables the network connection. Pending operations will not complete. */ function oc(t) {
     return t.asyncQueue.enqueue((async () => {
-        const e = await ta(t), n = await na(t);
+        const e = await tc(t), n = await nc(t);
         return e.setNetworkEnabled(!1), async function(t) {
             const e = j(t);
             e.Gr.add(0 /* UserDisabled */), await fo(e), 
@@ -14413,7 +14410,7 @@ async function ia(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.
- */ function ca(t, e) {
+ */ function ac(t, e) {
     const n = new G;
     return t.asyncQueue.enqueueAndForget((async () => async function(t, e, n) {
         try {
@@ -14430,19 +14427,19 @@ async function ia(t) {
     /**
  * Retrieves a latency-compensated document from the backend via a
  * SnapshotListener.
- */ (await ea(t), e, n))), n.promise;
+ */ (await ec(t), e, n))), n.promise;
 }
 
-function aa(t, e, n = {}) {
+function cc(t, e, n = {}) {
     const s = new G;
     return t.asyncQueue.enqueueAndForget((async () => function(t, e, n, s, i) {
-        const r = new Qc({
+        const r = new Qa({
             next: r => {
                 // Remove query first before passing event to user to avoid
                 // user actions affecting the now stale query.
                 e.enqueueAndForget((() => Go(t, o)));
-                const c = r.docs.has(n);
-                !c && r.fromCache ? 
+                const a = r.docs.has(n);
+                !a && r.fromCache ? 
                 // TODO(dimond): If we're online and the document doesn't
                 // exist then we resolve with a doc.exists set to false. If
                 // we're offline however, we reject the Promise in this
@@ -14450,7 +14447,7 @@ function aa(t, e, n = {}) {
                 // the server so we can deliver that even when you're
                 // offline 2) Actually reject the Promise in the online case
                 // if the document doesn't exist.
-                i.reject(new W(Q.UNAVAILABLE, "Failed to get document because the client is offline.")) : c && r.fromCache && s && "server" === s.source ? i.reject(new W(Q.UNAVAILABLE, 'Failed to get document from server. (However, this document does exist in the local cache. Run again without setting source to "server" to retrieve the cached document.)')) : i.resolve(r);
+                i.reject(new W(Q.UNAVAILABLE, "Failed to get document because the client is offline.")) : a && r.fromCache && s && "server" === s.source ? i.reject(new W(Q.UNAVAILABLE, 'Failed to get document from server. (However, this document does exist in the local cache. Run again without setting source to "server" to retrieve the cached document.)')) : i.resolve(r);
             },
             error: t => i.reject(t)
         }), o = new Yo(Te(n.path), r, {
@@ -14458,15 +14455,15 @@ function aa(t, e, n = {}) {
             wo: !0
         });
         return Wo(t, o);
-    }(await ia(t), t.asyncQueue, e, n, s))), s.promise;
+    }(await ic(t), t.asyncQueue, e, n, s))), s.promise;
 }
 
-function ua(t, e) {
+function uc(t, e) {
     const n = new G;
     return t.asyncQueue.enqueueAndForget((async () => async function(t, e, n) {
         try {
             const s = await Rr(t, e, 
-            /* usePreviousResults= */ !0), i = new ic(e, s.zn), r = i.Po(s.documents), o = i.applyChanges(r, 
+            /* usePreviousResults= */ !0), i = new ia(e, s.zn), r = i.bo(s.documents), o = i.applyChanges(r, 
             /* updateLimboDocuments= */ !1);
             n.resolve(o.snapshot);
         } catch (t) {
@@ -14477,13 +14474,13 @@ function ua(t, e) {
     /**
  * Retrieves a latency-compensated query snapshot from the backend via a
  * SnapshotListener.
- */ (await ea(t), e, n))), n.promise;
+ */ (await ec(t), e, n))), n.promise;
 }
 
-function ha(t, e, n = {}) {
+function hc(t, e, n = {}) {
     const s = new G;
     return t.asyncQueue.enqueueAndForget((async () => function(t, e, n, s, i) {
-        const r = new Qc({
+        const r = new Qa({
             next: n => {
                 // Remove query first before passing event to user to avoid
                 // user actions affecting the now stale query.
@@ -14495,20 +14492,20 @@ function ha(t, e, n = {}) {
             wo: !0
         });
         return Wo(t, o);
-    }(await ia(t), t.asyncQueue, e, n, s))), s.promise;
+    }(await ic(t), t.asyncQueue, e, n, s))), s.promise;
 }
 
-function la(t, e) {
-    const n = new Qc(e);
+function lc(t, e) {
+    const n = new Qa(e);
     return t.asyncQueue.enqueueAndForget((async () => function(t, e) {
         j(t).io.add(e), 
         // Immediately fire an initial event, indicating all existing listeners
         // are in-sync.
         e.next();
-    }(await ia(t), n))), () => {
-        n.nc(), t.asyncQueue.enqueueAndForget((async () => function(t, e) {
+    }(await ic(t), n))), () => {
+        n.na(), t.asyncQueue.enqueueAndForget((async () => function(t, e) {
             j(t).io.delete(e);
-        }(await ia(t), n)));
+        }(await ic(t), n)));
     };
 }
 
@@ -14526,25 +14523,25 @@ function la(t, e) {
  * accessed with the transaction will not reflect local changes that have not
  * been committed. For this reason, it is required that all reads are
  * performed before any writes. Transactions must be performed while online.
- */ function fa(t, e) {
+ */ function fc(t, e) {
     const n = new G;
     return t.asyncQueue.enqueueAndForget((async () => {
         const s = await function(t) {
-            return Zc(t).then((t => t.datastore));
+            return Za(t).then((t => t.datastore));
         }(t);
-        new zc(t.asyncQueue, s, e, n).run();
+        new za(t.asyncQueue, s, e, n).run();
     })), n.promise;
 }
 
-function da(t, e, n, s) {
+function dc(t, e, n, s) {
     const i = function(t, e) {
         let n;
         n = "string" == typeof t ? (new TextEncoder).encode(t) : t;
         return function(t, e) {
-            return new Wc(t, e);
+            return new Wa(t, e);
         }(function(t, e) {
-            if (t instanceof Uint8Array) return jc(t, e);
-            if (t instanceof ArrayBuffer) return jc(new Uint8Array(t), e);
+            if (t instanceof Uint8Array) return ja(t, e);
+            if (t instanceof ArrayBuffer) return ja(new Uint8Array(t), e);
             if (t instanceof ReadableStream) return t.getReader();
             throw new Error("Source of `toByteStreamReader` has to be a ArrayBuffer or ReadableStream");
         }(n), e);
@@ -14566,18 +14563,18 @@ function da(t, e, n, s) {
  * limitations under the License.
  */ (n, so(e));
     t.asyncQueue.enqueueAndForget((async () => {
-        Lc(await sa(t), i, s);
+        La(await sc(t), i, s);
     }));
 }
 
-function wa(t, e) {
+function wc(t, e) {
     return t.asyncQueue.enqueue((async () => function(t, e) {
         const n = j(t);
         return n.persistence.runTransaction("Get named query", "readonly", (t => n.Ye.getNamedQuery(t, e)));
-    }(await ea(t), e)));
+    }(await ec(t), e)));
 }
 
-class _a {
+class _c {
     /**
      * Constructs a DatabaseInfo using the provided host, databaseId and
      * persistenceKey.
@@ -14595,9 +14592,9 @@ class _a {
      * @param useFetchStreams Whether to use the Fetch API instead of
      * XMLHTTPRequest
      */
-    constructor(t, e, n, s, i, r, o, c) {
+    constructor(t, e, n, s, i, r, o, a) {
         this.databaseId = t, this.appId = e, this.persistenceKey = n, this.host = s, this.ssl = i, 
-        this.forceLongPolling = r, this.autoDetectLongPolling = o, this.useFetchStreams = c;
+        this.forceLongPolling = r, this.autoDetectLongPolling = o, this.useFetchStreams = a;
     }
 }
 
@@ -14606,7 +14603,7 @@ class _a {
  * Represents the database ID a Firestore client is associated with.
  * @internal
  */
-class ma {
+class mc {
     constructor(t, e) {
         this.projectId = t, this.database = e || "(default)";
     }
@@ -14614,7 +14611,7 @@ class ma {
         return "(default)" === this.database;
     }
     isEqual(t) {
-        return t instanceof ma && t.projectId === this.projectId && t.database === this.database;
+        return t instanceof mc && t.projectId === this.projectId && t.database === this.database;
     }
 }
 
@@ -14633,7 +14630,7 @@ class ma {
  * 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.
- */ const ga = new Map;
+ */ const gc = new Map;
 
 /**
  * An instance map that ensures only one Datastore exists per Firestore
@@ -14655,28 +14652,28 @@ class ma {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-function ya(t, e, n) {
+function yc(t, e, n) {
     if (!n) throw new W(Q.INVALID_ARGUMENT, `Function ${t}() cannot be called with an empty ${e}.`);
 }
 
 /**
  * Validates that two boolean options are not set at the same time.
  * @internal
- */ function pa(t, e, n, s) {
+ */ function pc(t, e, n, s) {
     if (!0 === e && !0 === s) throw new W(Q.INVALID_ARGUMENT, `${t} and ${n} cannot be used together.`);
 }
 
 /**
  * Validates that `path` refers to a document (indicated by the fact it contains
  * an even numbers of segments).
- */ function Ta(t) {
+ */ function Tc(t) {
     if (!Nt.isDocumentKey(t)) throw new W(Q.INVALID_ARGUMENT, `Invalid document reference. Document references must have an even number of segments, but ${t} has ${t.length}.`);
 }
 
 /**
  * Validates that `path` refers to a collection (indicated by the fact it
  * contains an odd numbers of segments).
- */ function Ea(t) {
+ */ function Ec(t) {
     if (Nt.isDocumentKey(t)) throw new W(Q.INVALID_ARGUMENT, `Invalid collection reference. Collection references must have an odd number of segments, but ${t} has ${t.length}.`);
 }
 
@@ -14685,7 +14682,7 @@ function ya(t, e, n) {
  * (i.e. excludes Array, Date, etc.).
  */
 /** Returns a string describing the type / value of the provided input. */
-function Ia(t) {
+function Ic(t) {
     if (void 0 === t) return "undefined";
     if (null === t) return "null";
     if ("string" == typeof t) return t.length > 20 && (t = `${t.substring(0, 20)}...`), 
@@ -14714,7 +14711,7 @@ function Ia(t) {
     return "function" == typeof t ? "a function" : U();
 }
 
-function Aa(t, 
+function Ac(t, 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 e) {
     if ("_delegate" in t && (
@@ -14723,14 +14720,14 @@ e) {
     t = t._delegate), !(t instanceof e)) {
         if (e.name === t.constructor.name) throw new W(Q.INVALID_ARGUMENT, "Type does not match the expected instance. Did you pass a reference from a different Firestore SDK?");
         {
-            const n = Ia(t);
+            const n = Ic(t);
             throw new W(Q.INVALID_ARGUMENT, `Expected type '${e.name}', but it was: ${n}`);
         }
     }
     return t;
 }
 
-function Ra(t, e) {
+function Rc(t, e) {
     if (e <= 0) throw new W(Q.INVALID_ARGUMENT, `Function ${t}() requires a positive number, but it was: ${e}.`);
 }
 
@@ -14756,7 +14753,7 @@ function Ra(t, e) {
  * user-supplied `FirestoreSettings` object. This is a separate type so that
  * defaults can be supplied and the value can be checked for equality.
  */
-class ba {
+class Pc {
     constructor(t) {
         var e;
         if (void 0 === t.host) {
@@ -14769,7 +14766,7 @@ class ba {
             this.cacheSizeBytes = t.cacheSizeBytes;
         }
         this.experimentalForceLongPolling = !!t.experimentalForceLongPolling, this.experimentalAutoDetectLongPolling = !!t.experimentalAutoDetectLongPolling, 
-        this.useFetchStreams = !!t.useFetchStreams, pa("experimentalForceLongPolling", t.experimentalForceLongPolling, "experimentalAutoDetectLongPolling", t.experimentalAutoDetectLongPolling);
+        this.useFetchStreams = !!t.useFetchStreams, pc("experimentalForceLongPolling", t.experimentalForceLongPolling, "experimentalAutoDetectLongPolling", t.experimentalAutoDetectLongPolling);
     }
     isEqual(t) {
         return this.host === t.host && this.ssl === t.ssl && this.credentials === t.credentials && this.cacheSizeBytes === t.cacheSizeBytes && this.experimentalForceLongPolling === t.experimentalForceLongPolling && this.experimentalAutoDetectLongPolling === t.experimentalAutoDetectLongPolling && this.ignoreUndefinedProperties === t.ignoreUndefinedProperties && this.useFetchStreams === t.useFetchStreams;
@@ -14796,18 +14793,18 @@ class ba {
  * The Cloud Firestore service interface.
  *
  * Do not call this constructor directly. Instead, use {@link getFirestore}.
- */ class Pa {
+ */ class bc {
     /** @hideconstructor */
     constructor(t, e, n) {
         this._authCredentials = e, this._appCheckCredentials = n, 
         /**
          * Whether it's a Firestore or Firestore Lite instance.
          */
-        this.type = "firestore-lite", this._persistenceKey = "(lite)", this._settings = new ba({}), 
-        this._settingsFrozen = !1, t instanceof ma ? this._databaseId = t : (this._app = t, 
+        this.type = "firestore-lite", this._persistenceKey = "(lite)", this._settings = new Pc({}), 
+        this._settingsFrozen = !1, t instanceof mc ? this._databaseId = t : (this._app = t, 
         this._databaseId = function(t) {
             if (!Object.prototype.hasOwnProperty.apply(t.options, [ "projectId" ])) throw new W(Q.INVALID_ARGUMENT, '"projectId" not provided in firebase.initializeApp.');
-            return new ma(t.options.projectId);
+            return new mc(t.options.projectId);
         }
         /**
  * Modify this instance to communicate with the Cloud Firestore emulator.
@@ -14838,7 +14835,7 @@ class ba {
     }
     _setSettings(t) {
         if (this._settingsFrozen) throw new W(Q.FAILED_PRECONDITION, "Firestore has already been started and its settings can no longer be changed. You can only modify settings before calling any other methods on a Firestore object.");
-        this._settings = new ba(t), void 0 !== t.credentials && (this._authCredentials = function(t) {
+        this._settings = new Pc(t), void 0 !== t.credentials && (this._authCredentials = function(t) {
             if (!t) return new H;
             switch (t.type) {
               case "gapi":
@@ -14883,15 +14880,15 @@ class ba {
  * when the `Firestore` instance is terminated.
  */
         return function(t) {
-            const e = ga.get(t);
-            e && (F("ComponentProvider", "Removing Datastore"), ga.delete(t), e.terminate());
+            const e = gc.get(t);
+            e && (F("ComponentProvider", "Removing Datastore"), gc.delete(t), e.terminate());
         }(this), Promise.resolve();
     }
 }
 
-function va(t, e, n, s = {}) {
+function vc(t, e, n, s = {}) {
     var i;
-    const r = (t = Aa(t, Pa))._getSettings();
+    const r = (t = Ac(t, bc))._getSettings();
     if ("firestore.googleapis.com" !== r.host && r.host !== e && L("Host has been set in both settings() and useEmulator(), emulator host will be used"), 
     t._setSettings(Object.assign(Object.assign({}, r), {
         host: `${e}:${n}`,
@@ -14930,7 +14927,7 @@ function va(t, e, n, s = {}) {
  * A `DocumentReference` refers to a document location in a Firestore database
  * and can be used to write, read, or listen to the location. The document at
  * the referenced location may or may not exist.
- */ class Va {
+ */ class Vc {
     /** @hideconstructor */
     constructor(t, 
     /**
@@ -14958,17 +14955,17 @@ function va(t, e, n, s = {}) {
     /**
      * The collection this `DocumentReference` belongs to.
      */    get parent() {
-        return new Da(this.firestore, this.converter, this._key.path.popLast());
+        return new Dc(this.firestore, this.converter, this._key.path.popLast());
     }
     withConverter(t) {
-        return new Va(this.firestore, t, this._key);
+        return new Vc(this.firestore, t, this._key);
     }
 }
 
 /**
  * A `Query` refers to a query which you can read or listen to. You can also
  * construct refined `Query` objects by adding filters and ordering.
- */ class Sa {
+ */ class Sc {
     // This is the lite version of the Query class in the main SDK.
     /** @hideconstructor protected */
     constructor(t, 
@@ -14981,14 +14978,14 @@ function va(t, e, n, s = {}) {
         this.type = "query", this.firestore = t;
     }
     withConverter(t) {
-        return new Sa(this.firestore, t, this._query);
+        return new Sc(this.firestore, t, this._query);
     }
 }
 
 /**
  * A `CollectionReference` object can be used for adding documents, getting
  * document references, and querying for documents (using {@link query}).
- */ class Da extends Sa {
+ */ class Dc extends Sc {
     /** @hideconstructor */
     constructor(t, e, n) {
         super(t, e, Te(n)), this._path = n, 
@@ -15009,23 +15006,23 @@ function va(t, e, n, s = {}) {
      * subcollection. If this isn't a subcollection, the reference is null.
      */    get parent() {
         const t = this._path.popLast();
-        return t.isEmpty() ? null : new Va(this.firestore, 
+        return t.isEmpty() ? null : new Vc(this.firestore, 
         /* converter= */ null, new Nt(t));
     }
     withConverter(t) {
-        return new Da(this.firestore, t, this._path);
+        return new Dc(this.firestore, t, this._path);
     }
 }
 
-function Ca(t, e, ...n) {
-    if (t = T(t), ya("collection", "path", e), t instanceof Pa) {
+function Cc(t, e, ...n) {
+    if (t = T(t), yc("collection", "path", e), t instanceof bc) {
         const s = _t.fromString(e, ...n);
-        return Ea(s), new Da(t, /* converter= */ null, s);
+        return Ec(s), new Dc(t, /* converter= */ null, s);
     }
     {
-        if (!(t instanceof Va || t instanceof Da)) throw new W(Q.INVALID_ARGUMENT, "Expected first argument to collection() to be a CollectionReference, a DocumentReference or FirebaseFirestore");
+        if (!(t instanceof Vc || t instanceof Dc)) throw new W(Q.INVALID_ARGUMENT, "Expected first argument to collection() to be a CollectionReference, a DocumentReference or FirebaseFirestore");
         const s = t._path.child(_t.fromString(e, ...n));
-        return Ea(s), new Da(t.firestore, 
+        return Ec(s), new Dc(t.firestore, 
         /* converter= */ null, s);
     }
 }
@@ -15042,9 +15039,9 @@ function Ca(t, e, ...n) {
  * collection or subcollection with this ID as the last segment of its path
  * will be included. Cannot contain a slash.
  * @returns The created `Query`.
- */ function Na(t, e) {
-    if (t = Aa(t, Pa), ya("collectionGroup", "collection id", e), e.indexOf("/") >= 0) throw new W(Q.INVALID_ARGUMENT, `Invalid collection ID '${e}' passed to function collectionGroup(). Collection IDs must not contain '/'.`);
-    return new Sa(t, 
+ */ function Nc(t, e) {
+    if (t = Ac(t, bc), yc("collectionGroup", "collection id", e), e.indexOf("/") >= 0) throw new W(Q.INVALID_ARGUMENT, `Invalid collection ID '${e}' passed to function collectionGroup(). Collection IDs must not contain '/'.`);
+    return new Sc(t, 
     /* converter= */ null, 
     /**
  * Creates a new Query for a collection group query that matches all documents
@@ -15055,19 +15052,19 @@ function Ca(t, e, ...n) {
     }(e));
 }
 
-function ka(t, e, ...n) {
+function kc(t, e, ...n) {
     if (t = T(t), 
     // We allow omission of 'pathString' but explicitly prohibit passing in both
     // 'undefined' and 'null'.
-    1 === arguments.length && (e = rt.A()), ya("doc", "path", e), t instanceof Pa) {
+    1 === arguments.length && (e = rt.A()), yc("doc", "path", e), t instanceof bc) {
         const s = _t.fromString(e, ...n);
-        return Ta(s), new Va(t, 
+        return Tc(s), new Vc(t, 
         /* converter= */ null, new Nt(s));
     }
     {
-        if (!(t instanceof Va || t instanceof Da)) throw new W(Q.INVALID_ARGUMENT, "Expected first argument to collection() to be a CollectionReference, a DocumentReference or FirebaseFirestore");
+        if (!(t instanceof Vc || t instanceof Dc)) throw new W(Q.INVALID_ARGUMENT, "Expected first argument to collection() to be a CollectionReference, a DocumentReference or FirebaseFirestore");
         const s = t._path.child(_t.fromString(e, ...n));
-        return Ta(s), new Va(t.firestore, t instanceof Da ? t.converter : null, new Nt(s));
+        return Tc(s), new Vc(t.firestore, t instanceof Dc ? t.converter : null, new Nt(s));
     }
 }
 
@@ -15078,8 +15075,8 @@ function ka(t, e, ...n) {
  * @param right - A reference to compare.
  * @returns true if the references point to the same location in the same
  * Firestore database.
- */ function xa(t, e) {
-    return t = T(t), e = T(e), (t instanceof Va || t instanceof Da) && (e instanceof Va || e instanceof Da) && (t.firestore === e.firestore && t.path === e.path && t.converter === e.converter);
+ */ function xc(t, e) {
+    return t = T(t), e = T(e), (t instanceof Vc || t instanceof Dc) && (e instanceof Vc || e instanceof Dc) && (t.firestore === e.firestore && t.path === e.path && t.converter === e.converter);
 }
 
 /**
@@ -15090,8 +15087,8 @@ function ka(t, e, ...n) {
  * @param right - A `Query` to compare.
  * @returns true if the references point to the same location in the same
  * Firestore database.
- */ function $a(t, e) {
-    return t = T(t), e = T(e), t instanceof Sa && e instanceof Sa && (t.firestore === e.firestore && Se(t._query, e._query) && t.converter === e.converter);
+ */ function $c(t, e) {
+    return t = T(t), e = T(e), t instanceof Sc && e instanceof Sc && (t.firestore === e.firestore && Se(t._query, e._query) && t.converter === e.converter);
 }
 
 /**
@@ -15109,42 +15106,42 @@ function ka(t, e, ...n) {
  * 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.
- */ class Oa {
+ */ class Oc {
     constructor() {
         // The last promise in the queue.
-        this.mc = Promise.resolve(), 
+        this.ma = Promise.resolve(), 
         // A list of retryable operations. Retryable operations are run in order and
         // retried with backoff.
-        this.gc = [], 
+        this.ga = [], 
         // Is this AsyncQueue being shut down? Once it is set to true, it will not
         // be changed again.
-        this.yc = !1, 
+        this.ya = !1, 
         // Operations scheduled to be queued in the future. Operations are
         // automatically removed after they are run or canceled.
-        this.Tc = [], 
+        this.pa = [], 
         // visible for testing
-        this.Ec = null, 
+        this.Ta = null, 
         // Flag set while there's an outstanding AsyncQueue operation, used for
         // assertion sanity-checks.
-        this.Ic = !1, 
+        this.Ea = !1, 
         // Enabled during shutdown on Safari to prevent future access to IndexedDB.
-        this.Ac = !1, 
+        this.Ia = !1, 
         // List of TimerIds to fast-forward delays for.
-        this.Rc = [], 
+        this.Aa = [], 
         // Backoff timer used to schedule retries for retryable operations
         this.ur = new io(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.bc = () => {
+        this.Ra = () => {
             const t = no();
             t && F("AsyncQueue", "Visibility state changed to " + t.visibilityState), this.ur.er();
         };
         const t = no();
-        t && "function" == typeof t.addEventListener && t.addEventListener("visibilitychange", this.bc);
+        t && "function" == typeof t.addEventListener && t.addEventListener("visibilitychange", this.Ra);
     }
     get isShuttingDown() {
-        return this.yc;
+        return this.ya;
     }
     /**
      * Adds a new operation to the queue without waiting for it to complete (i.e.
@@ -15154,44 +15151,44 @@ function ka(t, e, ...n) {
         this.enqueue(t);
     }
     enqueueAndForgetEvenWhileRestricted(t) {
-        this.Pc(), 
+        this.Pa(), 
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        this.vc(t);
+        this.ba(t);
     }
     enterRestrictedMode(t) {
-        if (!this.yc) {
-            this.yc = !0, this.Ac = t || !1;
+        if (!this.ya) {
+            this.ya = !0, this.Ia = t || !1;
             const e = no();
-            e && "function" == typeof e.removeEventListener && e.removeEventListener("visibilitychange", this.bc);
+            e && "function" == typeof e.removeEventListener && e.removeEventListener("visibilitychange", this.Ra);
         }
     }
     enqueue(t) {
-        if (this.Pc(), this.yc) 
+        if (this.Pa(), this.ya) 
         // Return a Promise which never resolves.
         return new Promise((() => {}));
         // Create a deferred Promise that we can return to the callee. This
         // allows us to return a "hanging Promise" only to the callee and still
         // advance the queue even when the operation is not run.
                 const e = new G;
-        return this.vc((() => this.yc && this.Ac ? Promise.resolve() : (t().then(e.resolve, e.reject), 
+        return this.ba((() => this.ya && this.Ia ? Promise.resolve() : (t().then(e.resolve, e.reject), 
         e.promise))).then((() => e.promise));
     }
     enqueueRetryable(t) {
-        this.enqueueAndForget((() => (this.gc.push(t), this.Vc())));
+        this.enqueueAndForget((() => (this.ga.push(t), this.va())));
     }
     /**
      * Runs the next operation from the retryable queue. If the operation fails,
      * reschedules with backoff.
-     */    async Vc() {
-        if (0 !== this.gc.length) {
+     */    async va() {
+        if (0 !== this.ga.length) {
             try {
-                await this.gc[0](), this.gc.shift(), this.ur.reset();
+                await this.ga[0](), this.ga.shift(), this.ur.reset();
             } catch (t) {
                 if (!ei(t)) throw t;
  // Failure will be handled by AsyncQueue
                                 F("AsyncQueue", "Operation failed with retryable error: " + t);
             }
-            this.gc.length > 0 && 
+            this.ga.length > 0 && 
             // If there are additional operations, we re-schedule `retryNextOp()`.
             // This is necessary to run retryable operations that failed during
             // their initial attempt since we don't know whether they are already
@@ -15202,12 +15199,12 @@ function ka(t, e, ...n) {
             // 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.ur.Zi((() => this.Vc()));
+            this.ur.Zi((() => this.va()));
         }
     }
-    vc(t) {
-        const e = this.mc.then((() => (this.Ic = !0, t().catch((t => {
-            this.Ec = t, this.Ic = !1;
+    ba(t) {
+        const e = this.ma.then((() => (this.Ea = !0, t().catch((t => {
+            this.Ta = t, this.Ea = !1;
             const e = 
             /**
  * Chrome includes Error.message in Error.stack. Other browsers do not.
@@ -15239,38 +15236,38 @@ function ka(t, e, ...n) {
             // all further attempts to chain (via .then) will just short-circuit
             // and return the rejected Promise.
             throw M("INTERNAL UNHANDLED ERROR: ", e), t;
-        })).then((t => (this.Ic = !1, t))))));
-        return this.mc = e, e;
+        })).then((t => (this.Ea = !1, t))))));
+        return this.ma = e, e;
     }
     enqueueAfterDelay(t, e, n) {
-        this.Pc(), 
+        this.Pa(), 
         // Fast-forward delays for timerIds that have been overriden.
-        this.Rc.indexOf(t) > -1 && (e = 0);
-        const s = Lo.createAndSchedule(this, t, e, n, (t => this.Sc(t)));
-        return this.Tc.push(s), s;
+        this.Aa.indexOf(t) > -1 && (e = 0);
+        const s = Lo.createAndSchedule(this, t, e, n, (t => this.Va(t)));
+        return this.pa.push(s), s;
     }
-    Pc() {
-        this.Ec && U();
+    Pa() {
+        this.Ta && U();
     }
     verifyOperationInProgress() {}
     /**
      * Waits until all currently queued tasks are finished executing. Delayed
      * operations are not run.
-     */    async Dc() {
+     */    async Sa() {
         // Operations in the queue prior to draining may have enqueued additional
         // operations. Keep draining the queue until the tail is no longer advanced,
         // which indicates that no more new operations were enqueued and that all
         // operations were executed.
         let t;
         do {
-            t = this.mc, await t;
-        } while (t !== this.mc);
+            t = this.ma, await t;
+        } while (t !== this.ma);
     }
     /**
      * For Tests: Determine if a delayed operation with a particular TimerId
      * exists.
-     */    Cc(t) {
-        for (const e of this.Tc) if (e.timerId === t) return !0;
+     */    Da(t) {
+        for (const e of this.pa) if (e.timerId === t) return !0;
         return !1;
     }
     /**
@@ -15279,28 +15276,28 @@ function ka(t, e, ...n) {
      * @param lastTimerId - Delayed operations up to and including this TimerId
      * will be drained. Pass TimerId.All to run all delayed operations.
      * @returns a Promise that resolves once all operations have been run.
-     */    Nc(t) {
+     */    Ca(t) {
         // Note that draining may generate more delayed ops, so we do that first.
-        return this.Dc().then((() => {
+        return this.Sa().then((() => {
             // Run ops in the same order they'd run if they ran naturally.
-            this.Tc.sort(((t, e) => t.targetTimeMs - e.targetTimeMs));
-            for (const e of this.Tc) if (e.skipDelay(), "all" /* All */ !== t && e.timerId === t) break;
-            return this.Dc();
+            this.pa.sort(((t, e) => t.targetTimeMs - e.targetTimeMs));
+            for (const e of this.pa) if (e.skipDelay(), "all" /* All */ !== t && e.timerId === t) break;
+            return this.Sa();
         }));
     }
     /**
      * For Tests: Skip all subsequent delays for a timer id.
-     */    kc(t) {
-        this.Rc.push(t);
+     */    Na(t) {
+        this.Aa.push(t);
     }
-    /** Called once a DelayedOperation is run or canceled. */    Sc(t) {
+    /** Called once a DelayedOperation is run or canceled. */    Va(t) {
         // NOTE: indexOf / slice are O(n), but delayedOperations is expected to be small.
-        const e = this.Tc.indexOf(t);
-        this.Tc.splice(e, 1);
+        const e = this.pa.indexOf(t);
+        this.pa.splice(e, 1);
     }
 }
 
-function Fa(t) {
+function Fc(t) {
     /**
  * Returns true if obj is an object and contains at least one of the specified
  * methods.
@@ -15335,7 +15332,7 @@ function Fa(t) {
  */ (t, [ "next", "error", "complete" ]);
 }
 
-class Ma {
+class Mc {
     constructor() {
         this._progressObserver = {}, this._taskCompletionResolver = new G, this._lastProgress = {
             taskState: "Running",
@@ -15419,27 +15416,27 @@ class Ma {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/** DOMException error code constants. */ const La = -1;
+/** DOMException error code constants. */ const Lc = -1;
 
 /**
  * The Cloud Firestore service interface.
  *
  * Do not call this constructor directly. Instead, use {@link getFirestore}.
  */
-class Ba extends Pa {
+class Bc extends bc {
     /** @hideconstructor */
     constructor(t, e, n) {
         super(t, e, n), 
         /**
          * Whether it's a {@link Firestore} or Firestore Lite instance.
          */
-        this.type = "firestore", this._queue = new Oa, this._persistenceKey = "name" in t ? t.name : "[DEFAULT]";
+        this.type = "firestore", this._queue = new Oc, this._persistenceKey = "name" in t ? t.name : "[DEFAULT]";
     }
     _terminate() {
         return this._firestoreClient || 
         // The client must be initialized to ensure that all subsequent API
         // usage throws an exception.
-        ja(this), this._firestoreClient.terminate();
+        jc(this), this._firestoreClient.terminate();
     }
 }
 
@@ -15453,7 +15450,7 @@ class Ba extends Pa {
  * be associated.
  * @param settings - A settings object to configure the {@link Firestore} instance.
  * @returns A newly initialized {@link Firestore} instance.
- */ function Ua(t, e) {
+ */ function Uc(t, e) {
     const n = _getProvider(t, "firestore");
     if (n.isInitialized()) {
         const t = n.getImmediate(), s = n.getOptions();
@@ -15474,22 +15471,22 @@ class Ba extends Pa {
  * @param app - The {@link @firebase/app#FirebaseApp} instance that the returned {@link Firestore}
  * instance is associated with.
  * @returns The {@link Firestore} instance of the provided app.
- */ function qa(e = t()) {
+ */ function qc(e = t()) {
     return _getProvider(e, "firestore").getImmediate();
 }
 
 /**
  * @internal
- */ function Ka(t) {
-    return t._firestoreClient || ja(t), t._firestoreClient.verifyNotTerminated(), t._firestoreClient;
+ */ function Kc(t) {
+    return t._firestoreClient || jc(t), t._firestoreClient.verifyNotTerminated(), t._firestoreClient;
 }
 
-function ja(t) {
+function jc(t) {
     var e;
     const n = t._freezeSettings(), s = function(t, e, n, s) {
-        return new _a(t, e, n, s.host, s.ssl, s.experimentalForceLongPolling, s.experimentalAutoDetectLongPolling, s.useFetchStreams);
+        return new _c(t, e, n, s.host, s.ssl, s.experimentalForceLongPolling, s.experimentalAutoDetectLongPolling, s.useFetchStreams);
     }(t._databaseId, (null === (e = t._app) || void 0 === e ? void 0 : e.options.appId) || "", t._persistenceKey, n);
-    t._firestoreClient = new Hc(t._authCredentials, t._appCheckCredentials, t._queue, s);
+    t._firestoreClient = new Ha(t._authCredentials, t._appCheckCredentials, t._queue, s);
 }
 
 /**
@@ -15514,10 +15511,10 @@ function ja(t) {
  * @param persistenceSettings - Optional settings object to configure
  * persistence.
  * @returns A `Promise` that represents successfully enabling persistent storage.
- */ function Qa(t, e) {
-    eu(t = Aa(t, Ba));
-    const n = Ka(t), s = t._freezeSettings(), i = new Kc;
-    return Ga(n, i, new Uc(i, s.cacheSizeBytes, null == e ? void 0 : e.forceOwnership));
+ */ function Qc(t, e) {
+    eu(t = Ac(t, Bc));
+    const n = Kc(t), s = t._freezeSettings(), i = new Ka;
+    return Gc(n, i, new Ua(i, s.cacheSizeBytes, null == e ? void 0 : e.forceOwnership));
 }
 
 /**
@@ -15541,10 +15538,10 @@ function ja(t) {
  * @param firestore - The {@link Firestore} instance to enable persistence for.
  * @returns A `Promise` that represents successfully enabling persistent
  * storage.
- */ function Wa(t) {
-    eu(t = Aa(t, Ba));
-    const e = Ka(t), n = t._freezeSettings(), s = new Kc;
-    return Ga(e, s, new qc(s, n.cacheSizeBytes));
+ */ function Wc(t) {
+    eu(t = Ac(t, Bc));
+    const e = Kc(t), n = t._freezeSettings(), s = new Ka;
+    return Gc(e, s, new qa(s, n.cacheSizeBytes));
 }
 
 /**
@@ -15552,11 +15549,11 @@ function ja(t) {
  * If the operation fails with a recoverable error (see
  * `canRecoverFromIndexedDbError()` below), the returned Promise is rejected
  * but the client remains usable.
- */ function Ga(t, e, n) {
+ */ function Gc(t, e, n) {
     const s = new G;
     return t.asyncQueue.enqueue((async () => {
         try {
-            await Jc(t, n), await Yc(t, e), s.resolve();
+            await Ja(t, n), await Ya(t, e), s.resolve();
         } catch (t) {
             if (!
             /**
@@ -15610,13 +15607,13 @@ function ja(t) {
     })).then((() => s.promise));
 }
 
-function za(t) {
+function zc(t) {
     if (t._initialized && !t._terminated) throw new W(Q.FAILED_PRECONDITION, "Persistence can only be cleared before a Firestore instance is initialized or after it is terminated.");
     const e = new G;
     return t._queue.enqueueAndForgetEvenWhileRestricted((async () => {
         try {
             await async function(t) {
-                if (!Xs.Pt()) return Promise.resolve();
+                if (!Xs.bt()) return Promise.resolve();
                 const e = t + "main";
                 await Xs.delete(e);
             }(ur(t._databaseId, t._persistenceKey)), e.resolve();
@@ -15641,11 +15638,11 @@ function za(t) {
  *
  * @returns A `Promise` which resolves when all currently pending writes have been
  * acknowledged by the backend.
- */ function Ha(t) {
+ */ function Hc(t) {
     return function(t) {
         const e = new G;
-        return t.asyncQueue.enqueueAndForget((async () => gc(await sa(t), e))), e.promise;
-    }(Ka(t = Aa(t, Ba)));
+        return t.asyncQueue.enqueueAndForget((async () => ga(await sc(t), e))), e.promise;
+    }(Kc(t = Ac(t, Bc)));
 }
 
 /**
@@ -15653,8 +15650,8 @@ function za(t) {
  * call to {@link disableNetwork}.
  *
  * @returns A `Promise` that is resolved once the network has been enabled.
- */ function Ja(t) {
-    return ra(Ka(t = Aa(t, Ba)));
+ */ function Jc(t) {
+    return rc(Kc(t = Ac(t, Bc)));
 }
 
 /**
@@ -15664,8 +15661,8 @@ function za(t) {
  * operations will be queued until the network is restored.
  *
  * @returns A `Promise` that is resolved once the network has been disabled.
- */ function Ya(t) {
-    return oa(Ka(t = Aa(t, Ba)));
+ */ function Yc(t) {
+    return oc(Kc(t = Ac(t, Bc)));
 }
 
 /**
@@ -15689,7 +15686,7 @@ function za(t) {
  *
  * @returns A `Promise` that is resolved when the instance has been successfully
  * terminated.
- */ function Xa(t) {
+ */ function Xc(t) {
     return e(t.app, "firestore"), t._delete();
 }
 
@@ -15703,9 +15700,9 @@ function za(t) {
  * @returns
  *   A `LoadBundleTask` object, which notifies callers with progress updates, and completion
  *   or error events. It can be used as a `Promise<LoadBundleTaskProgress>`.
- */ function Za(t, e) {
-    const n = Ka(t = Aa(t, Ba)), s = new Ma;
-    return da(n, t._databaseId, e, s), s;
+ */ function Zc(t, e) {
+    const n = Kc(t = Ac(t, Bc)), s = new Mc;
+    return dc(n, t._databaseId, e, s), s;
 }
 
 /**
@@ -15715,7 +15712,7 @@ function za(t) {
  * with resulting documents), and loaded to local cache using `loadBundle`. Once in local
  * cache, use this method to extract a {@link Query} by name.
  */ function tu(t, e) {
-    return wa(Ka(t = Aa(t, Ba)), e).then((e => e ? new Sa(t, null, e.query) : null));
+    return wc(Kc(t = Ac(t, Bc)), e).then((e => e ? new Sc(t, null, e.query) : null));
 }
 
 function eu(t) {
@@ -15973,14 +15970,14 @@ class nu {
  * 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.
- */ const cu = /^__.*__$/;
+ */ const au = /^__.*__$/;
 
-/** The result of parsing document data (e.g. for a setData call). */ class au {
+/** The result of parsing document data (e.g. for a setData call). */ class cu {
     constructor(t, e, n) {
         this.data = t, this.fieldMask = e, this.fieldTransforms = n;
     }
     toMutation(t, e) {
-        return null !== this.fieldMask ? new un(t, this.data, this.fieldMask, e, this.fieldTransforms) : new an(t, this.data, e, this.fieldTransforms);
+        return null !== this.fieldMask ? new un(t, this.data, this.fieldMask, e, this.fieldTransforms) : new cn(t, this.data, e, this.fieldTransforms);
     }
 }
 
@@ -16036,55 +16033,55 @@ function hu(t) {
         this.settings = t, this.databaseId = e, this.k = n, this.ignoreUndefinedProperties = s, 
         // Minor hack: If fieldTransforms is undefined, we assume this is an
         // external call and we need to validate the entire path.
-        void 0 === i && this.xc(), this.fieldTransforms = i || [], this.fieldMask = r || [];
+        void 0 === i && this.ka(), this.fieldTransforms = i || [], this.fieldMask = r || [];
     }
     get path() {
         return this.settings.path;
     }
-    get $c() {
-        return this.settings.$c;
+    get xa() {
+        return this.settings.xa;
     }
-    /** Returns a new context with the specified settings overwritten. */    Oc(t) {
+    /** Returns a new context with the specified settings overwritten. */    $a(t) {
         return new lu(Object.assign(Object.assign({}, this.settings), t), this.databaseId, this.k, this.ignoreUndefinedProperties, this.fieldTransforms, this.fieldMask);
     }
-    Fc(t) {
+    Oa(t) {
         var e;
-        const n = null === (e = this.path) || void 0 === e ? void 0 : e.child(t), s = this.Oc({
+        const n = null === (e = this.path) || void 0 === e ? void 0 : e.child(t), s = this.$a({
             path: n,
-            Mc: !1
+            Fa: !1
         });
-        return s.Lc(t), s;
+        return s.Ma(t), s;
     }
-    Bc(t) {
+    La(t) {
         var e;
-        const n = null === (e = this.path) || void 0 === e ? void 0 : e.child(t), s = this.Oc({
+        const n = null === (e = this.path) || void 0 === e ? void 0 : e.child(t), s = this.$a({
             path: n,
-            Mc: !1
+            Fa: !1
         });
-        return s.xc(), s;
+        return s.ka(), s;
     }
-    Uc(t) {
+    Ba(t) {
         // TODO(b/34871131): We don't support array paths right now; so make path
         // undefined.
-        return this.Oc({
+        return this.$a({
             path: void 0,
-            Mc: !0
+            Fa: !0
         });
     }
-    qc(t) {
-        return Cu(t, this.settings.methodName, this.settings.Kc || !1, this.path, this.settings.jc);
+    Ua(t) {
+        return Cu(t, this.settings.methodName, this.settings.qa || !1, this.path, this.settings.Ka);
     }
     /** Returns 'true' if 'fieldPath' was traversed when creating this context. */    contains(t) {
         return void 0 !== this.fieldMask.find((e => t.isPrefixOf(e))) || void 0 !== this.fieldTransforms.find((e => t.isPrefixOf(e.field)));
     }
-    xc() {
+    ka() {
         // TODO(b/34871131): Remove null check once we have proper paths for fields
         // within arrays.
-        if (this.path) for (let t = 0; t < this.path.length; t++) this.Lc(this.path.get(t));
+        if (this.path) for (let t = 0; t < this.path.length; t++) this.Ma(this.path.get(t));
     }
-    Lc(t) {
-        if (0 === t.length) throw this.qc("Document fields must not be empty");
-        if (hu(this.$c) && cu.test(t)) throw this.qc('Document fields cannot begin and end with "__"');
+    Ma(t) {
+        if (0 === t.length) throw this.Ua("Document fields must not be empty");
+        if (hu(this.xa) && au.test(t)) throw this.Ua('Document fields cannot begin and end with "__"');
     }
 }
 
@@ -16095,14 +16092,14 @@ function hu(t) {
     constructor(t, e, n) {
         this.databaseId = t, this.ignoreUndefinedProperties = e, this.k = n || so(t);
     }
-    /** Creates a new top-level parse context. */    Qc(t, e, n, s = !1) {
+    /** Creates a new top-level parse context. */    ja(t, e, n, s = !1) {
         return new lu({
-            $c: t,
+            xa: t,
             methodName: e,
-            jc: n,
+            Ka: n,
             path: gt.emptyPath(),
-            Mc: !1,
-            Kc: s
+            Fa: !1,
+            qa: s
         }, this.databaseId, this.k, this.ignoreUndefinedProperties);
     }
 }
@@ -16113,25 +16110,25 @@ function du(t) {
 }
 
 /** Parse document data from a set() call. */ function wu(t, e, n, s, i, r = {}) {
-    const o = t.Qc(r.merge || r.mergeFields ? 2 /* MergeSet */ : 0 /* Set */ , e, n, i);
+    const o = t.ja(r.merge || r.mergeFields ? 2 /* MergeSet */ : 0 /* Set */ , e, n, i);
     vu("Data must be an object, but it was:", o, s);
-    const c = bu(s, o);
-    let a, u;
-    if (r.merge) a = new yt(o.fieldMask), u = o.fieldTransforms; else if (r.mergeFields) {
+    const a = Pu(s, o);
+    let c, u;
+    if (r.merge) c = new yt(o.fieldMask), u = o.fieldTransforms; else if (r.mergeFields) {
         const t = [];
         for (const s of r.mergeFields) {
             const i = Vu(e, s, n);
             if (!o.contains(i)) throw new W(Q.INVALID_ARGUMENT, `Field '${i}' is specified in your field mask but missing from your input data.`);
             Nu(t, i) || t.push(i);
         }
-        a = new yt(t), u = o.fieldTransforms.filter((t => a.covers(t.field)));
-    } else a = null, u = o.fieldTransforms;
-    return new au(new Gt(c), a, u);
+        c = new yt(t), u = o.fieldTransforms.filter((t => c.covers(t.field)));
+    } else c = null, u = o.fieldTransforms;
+    return new cu(new Gt(a), c, u);
 }
 
 class _u extends ru {
     _toFieldTransform(t) {
-        if (2 /* MergeSet */ !== t.$c) throw 1 /* Update */ === t.$c ? t.qc(`${this._methodName}() can only appear at the top level of your update data`) : t.qc(`${this._methodName}() cannot be used with set() unless you pass {merge:true}`);
+        if (2 /* MergeSet */ !== t.xa) throw 1 /* Update */ === t.xa ? t.Ua(`${this._methodName}() can only appear at the top level of your update data`) : t.Ua(`${this._methodName}() cannot be used with set() unless you pass {merge:true}`);
         // No transform to add for a delete, but we need to add it to our
         // fieldMask so it gets deleted.
         return t.fieldMask.push(t.path), null;
@@ -16158,10 +16155,10 @@ class _u extends ru {
  * @param arrayElement - Whether or not the FieldValue has an array.
  */ function mu(t, e, n) {
     return new lu({
-        $c: 3 /* Argument */ ,
-        jc: e.settings.jc,
+        xa: 3 /* Argument */ ,
+        Ka: e.settings.Ka,
         methodName: t._methodName,
-        Mc: n
+        Fa: n
     }, e.databaseId, e.k, e.ignoreUndefinedProperties);
 }
 
@@ -16176,11 +16173,11 @@ class gu extends ru {
 
 class yu extends ru {
     constructor(t, e) {
-        super(t), this.Wc = e;
+        super(t), this.Qa = e;
     }
     _toFieldTransform(t) {
         const e = mu(this, t, 
-        /*array=*/ !0), n = this.Wc.map((t => Ru(t, e))), s = new Ke(n);
+        /*array=*/ !0), n = this.Qa.map((t => Ru(t, e))), s = new Ke(n);
         return new Je(t.path, s);
     }
     isEqual(t) {
@@ -16191,11 +16188,11 @@ class yu extends ru {
 
 class pu extends ru {
     constructor(t, e) {
-        super(t), this.Wc = e;
+        super(t), this.Qa = e;
     }
     _toFieldTransform(t) {
         const e = mu(this, t, 
-        /*array=*/ !0), n = this.Wc.map((t => Ru(t, e))), s = new Qe(n);
+        /*array=*/ !0), n = this.Qa.map((t => Ru(t, e))), s = new Qe(n);
         return new Je(t.path, s);
     }
     isEqual(t) {
@@ -16206,10 +16203,10 @@ class pu extends ru {
 
 class Tu extends ru {
     constructor(t, e) {
-        super(t), this.Gc = e;
+        super(t), this.Wa = e;
     }
     _toFieldTransform(t) {
-        const e = new Ge(t.k, Fe(t.k, this.Gc));
+        const e = new Ge(t.k, Fe(t.k, this.Wa));
         return new Je(t.path, e);
     }
     isEqual(t) {
@@ -16219,40 +16216,40 @@ class Tu extends ru {
 }
 
 /** Parse update data from an update() call. */ function Eu(t, e, n, s) {
-    const i = t.Qc(1 /* Update */ , e, n);
+    const i = t.ja(1 /* Update */ , e, n);
     vu("Data must be an object, but it was:", i, s);
     const r = [], o = Gt.empty();
     ft(s, ((t, s) => {
-        const c = Du(e, t, n);
+        const a = Du(e, t, n);
         // For Compat types, we have to "extract" the underlying types before
         // performing validation.
                 s = T(s);
-        const a = i.Bc(c);
+        const c = i.La(a);
         if (s instanceof _u) 
         // Add it to the field mask, but don't add anything to updateData.
-        r.push(c); else {
-            const t = Ru(s, a);
-            null != t && (r.push(c), o.set(c, t));
+        r.push(a); else {
+            const t = Ru(s, c);
+            null != t && (r.push(a), o.set(a, t));
         }
     }));
-    const c = new yt(r);
-    return new uu(o, c, i.fieldTransforms);
+    const a = new yt(r);
+    return new uu(o, a, i.fieldTransforms);
 }
 
 /** Parse update data from a list of field/value arguments. */ function Iu(t, e, n, s, i, r) {
-    const o = t.Qc(1 /* Update */ , e, n), c = [ Vu(e, s, n) ], a = [ i ];
+    const o = t.ja(1 /* Update */ , e, n), a = [ Vu(e, s, n) ], c = [ i ];
     if (r.length % 2 != 0) throw new W(Q.INVALID_ARGUMENT, `Function ${e}() needs to be called with an even number of arguments that alternate between field names and values.`);
-    for (let t = 0; t < r.length; t += 2) c.push(Vu(e, r[t])), a.push(r[t + 1]);
+    for (let t = 0; t < r.length; t += 2) a.push(Vu(e, r[t])), c.push(r[t + 1]);
     const u = [], h = Gt.empty();
     // We iterate in reverse order to pick the last value for a field if the
     // user specified the field multiple times.
-    for (let t = c.length - 1; t >= 0; --t) if (!Nu(u, c[t])) {
-        const e = c[t];
-        let n = a[t];
+    for (let t = a.length - 1; t >= 0; --t) if (!Nu(u, a[t])) {
+        const e = a[t];
+        let n = c[t];
         // For Compat types, we have to "extract" the underlying types before
         // performing validation.
                 n = T(n);
-        const s = o.Bc(e);
+        const s = o.La(e);
         if (n instanceof _u) 
         // Add it to the field mask, but don't add anything to updateData.
         u.push(e); else {
@@ -16271,7 +16268,7 @@ class Tu extends ru {
  * @param allowArrays - Whether the query value is an array that may directly
  * contain additional arrays (e.g. the operand of an `in` query).
  */ function Au(t, e, n, s = !1) {
-    return Ru(n, t.Qc(s ? 4 /* ArrayArgument */ : 3 /* Argument */ , e));
+    return Ru(n, t.ja(s ? 4 /* ArrayArgument */ : 3 /* Argument */ , e));
 }
 
 /**
@@ -16283,10 +16280,10 @@ class Tu extends ru {
  * @returns The parsed value, or null if the value was a FieldValue sentinel
  * that should not be included in the resulting parsed data.
  */ function Ru(t, e) {
-    if (Pu(
+    if (bu(
     // Unwrap the API type from the Compat SDK. This will return the API type
     // from firestore-exp.
-    t = T(t))) return vu("Unsupported field value:", e, t), bu(t, e);
+    t = T(t))) return vu("Unsupported field value:", e, t), Pu(t, e);
     if (t instanceof ru) 
     // FieldValues usually parse into transforms (except FieldValue.delete())
     // in which case we do not want to include this field in our parsed data
@@ -16299,8 +16296,8 @@ class Tu extends ru {
  */
     return function(t, e) {
         // Sentinels are only supported with writes, and not within arrays.
-        if (!hu(e.$c)) throw e.qc(`${t._methodName}() can only be used with update() and set()`);
-        if (!e.path) throw e.qc(`${t._methodName}() is not currently supported inside arrays`);
+        if (!hu(e.xa)) throw e.Ua(`${t._methodName}() can only be used with update() and set()`);
+        if (!e.path) throw e.Ua(`${t._methodName}() is not currently supported inside arrays`);
         const n = t._toFieldTransform(e);
         n && e.fieldTransforms.push(n);
     }
@@ -16324,12 +16321,12 @@ class Tu extends ru {
         // the set of values to be included for the IN query) that may directly
         // contain additional arrays (each representing an individual field
         // value), so we disable this validation.
-        if (e.settings.Mc && 4 /* ArrayArgument */ !== e.$c) throw e.qc("Nested arrays are not supported");
+        if (e.settings.Fa && 4 /* ArrayArgument */ !== e.xa) throw e.Ua("Nested arrays are not supported");
         return function(t, e) {
             const n = [];
             let s = 0;
             for (const i of t) {
-                let t = Ru(i, e.Uc(s));
+                let t = Ru(i, e.Ba(s));
                 null == t && (
                 // Just include nulls in the array for fields being replaced with a
                 // sentinel.
@@ -16379,14 +16376,14 @@ class Tu extends ru {
         if (t instanceof iu) return {
             bytesValue: zn(e.k, t._byteString)
         };
-        if (t instanceof Va) {
+        if (t instanceof Vc) {
             const n = e.databaseId, s = t.firestore._databaseId;
-            if (!s.isEqual(n)) throw e.qc(`Document reference is for database ${s.projectId}/${s.database} but should be for database ${n.projectId}/${n.database}`);
+            if (!s.isEqual(n)) throw e.Ua(`Document reference is for database ${s.projectId}/${s.database} but should be for database ${n.projectId}/${n.database}`);
             return {
                 referenceValue: Yn(t.firestore._databaseId || e.databaseId, t._key.path)
             };
         }
-        throw e.qc(`Unsupported field value: ${Ia(t)}`);
+        throw e.Ua(`Unsupported field value: ${Ic(t)}`);
     }
     /**
  * Checks whether an object looks like a JSON object that should be converted
@@ -16397,13 +16394,13 @@ class Tu extends ru {
  */ (t, e);
 }
 
-function bu(t, e) {
+function Pu(t, e) {
     const n = {};
     return dt(t) ? 
     // If we encounter an empty object, we explicitly add it to the update
     // mask to ensure that the server creates a map entry.
     e.path && e.path.length > 0 && e.fieldMask.push(e.path) : ft(t, ((t, s) => {
-        const i = Ru(s, e.Fc(t));
+        const i = Ru(s, e.Oa(t));
         null != i && (n[t] = i);
     })), {
         mapValue: {
@@ -16412,16 +16409,16 @@ function bu(t, e) {
     };
 }
 
-function Pu(t) {
-    return !("object" != typeof t || null === t || t instanceof Array || t instanceof Date || t instanceof ut || t instanceof ou || t instanceof iu || t instanceof Va || t instanceof ru);
+function bu(t) {
+    return !("object" != typeof t || null === t || t instanceof Array || t instanceof Date || t instanceof ut || t instanceof ou || t instanceof iu || t instanceof Vc || t instanceof ru);
 }
 
 function vu(t, e, n) {
-    if (!Pu(n) || !function(t) {
+    if (!bu(n) || !function(t) {
         return "object" == typeof t && null !== t && (Object.getPrototypeOf(t) === Object.prototype || null === Object.getPrototypeOf(t));
     }(n)) {
-        const s = Ia(n);
-        throw "an object" === s ? e.qc(t + " a custom object") : e.qc(t + " " + s);
+        const s = Ic(n);
+        throw "an object" === s ? e.Ua(t + " a custom object") : e.Ua(t + " " + s);
     }
 }
 
@@ -16465,11 +16462,11 @@ function vu(t, e, n) {
 
 function Cu(t, e, n, s, i) {
     const r = s && !s.isEmpty(), o = void 0 !== i;
-    let c = `Function ${e}() called with invalid data`;
-    n && (c += " (via `toFirestore()`)"), c += ". ";
-    let a = "";
-    return (r || o) && (a += " (found", r && (a += ` in field ${s}`), o && (a += ` in document ${i}`), 
-    a += ")"), new W(Q.INVALID_ARGUMENT, c + t + a);
+    let a = `Function ${e}() called with invalid data`;
+    n && (a += " (via `toFirestore()`)"), a += ". ";
+    let c = "";
+    return (r || o) && (c += " (found", r && (c += ` in field ${s}`), o && (c += ` in document ${i}`), 
+    c += ")"), new W(Q.INVALID_ARGUMENT, a + t + c);
 }
 
 /** Checks `haystack` if FieldPath `needle` is present. Runs in O(n). */ function Nu(t, e) {
@@ -16516,7 +16513,7 @@ function Cu(t, e, n, s, i) {
     /**
      * The `DocumentReference` for the document included in the `DocumentSnapshot`.
      */    get ref() {
-        return new Va(this._firestore, this._converter, this._key);
+        return new Vc(this._firestore, this._converter, this._key);
     }
     /**
      * Signals whether or not the document at the snapshot's location exists.
@@ -16824,7 +16821,7 @@ function Bu(t) {
  * @param right - A snapshot to compare.
  * @returns true if the snapshots are equal.
  */ function Uu(t, e) {
-    return t instanceof Fu && e instanceof Fu ? t._firestore === e._firestore && t._key.isEqual(e._key) && (null === t._document ? null === e._document : t._document.isEqual(e._document)) && t._converter === e._converter : t instanceof Lu && e instanceof Lu && (t._firestore === e._firestore && $a(t.query, e.query) && t.metadata.isEqual(e.metadata) && t._snapshot.isEqual(e._snapshot));
+    return t instanceof Fu && e instanceof Fu ? t._firestore === e._firestore && t._key.isEqual(e._key) && (null === t._document ? null === e._document : t._document.isEqual(e._document)) && t._converter === e._converter : t instanceof Lu && e instanceof Lu && (t._firestore === e._firestore && $c(t.query, e.query) && t.metadata.isEqual(e.metadata) && t._snapshot.isEqual(e._snapshot));
 }
 
 /**
@@ -16870,33 +16867,33 @@ function Bu(t) {
 
 class Qu extends Ku {
     constructor(t, e, n) {
-        super(), this.zc = t, this.Hc = e, this.Jc = n, this.type = "where";
+        super(), this.Ga = t, this.za = e, this.Ha = n, this.type = "where";
     }
     _apply(t) {
         const e = du(t.firestore), n = function(t, e, n, s, i, r, o) {
-            let c;
+            let a;
             if (i.isKeyField()) {
                 if ("array-contains" /* ARRAY_CONTAINS */ === r || "array-contains-any" /* ARRAY_CONTAINS_ANY */ === r) throw new W(Q.INVALID_ARGUMENT, `Invalid Query. You can't perform '${r}' queries on FieldPath.documentId().`);
                 if ("in" /* IN */ === r || "not-in" /* NOT_IN */ === r) {
                     oh(o, r);
                     const e = [];
                     for (const n of o) e.push(rh(s, t, n));
-                    c = {
+                    a = {
                         arrayValue: {
                             values: e
                         }
                     };
-                } else c = rh(s, t, o);
+                } else a = rh(s, t, o);
             } else "in" /* IN */ !== r && "not-in" /* NOT_IN */ !== r && "array-contains-any" /* ARRAY_CONTAINS_ANY */ !== r || oh(o, r), 
-            c = Au(n, e, o, 
+            a = Au(n, e, o, 
             /* allowArrays= */ "in" /* IN */ === r || "not-in" /* NOT_IN */ === r);
-            const a = ne.create(i, r, c);
+            const c = ne.create(i, r, a);
             return function(t, e) {
                 if (e.V()) {
                     const n = Re(t);
                     if (null !== n && !n.isEqual(e.field)) throw new W(Q.INVALID_ARGUMENT, `Invalid query. All where filters with an inequality (<, <=, !=, not-in, >, or >=) must be on the same field. But you have inequality filters on '${n.toString()}' and '${e.field.toString()}'`);
                     const s = Ae(t);
-                    null !== s && ch(t, e.field, s);
+                    null !== s && ah(t, e.field, s);
                 }
                 const n = function(t, e) {
                     for (const n of t.filters) if (e.indexOf(n.op) >= 0) return n.op;
@@ -16938,9 +16935,9 @@ class Qu extends Ku {
                 if (null !== n) 
                 // Special case when it's a duplicate op to give a slightly clearer error message.
                 throw n === e.op ? new W(Q.INVALID_ARGUMENT, `Invalid query. You cannot use more than one '${e.op.toString()}' filter.`) : new W(Q.INVALID_ARGUMENT, `Invalid query. You cannot use '${e.op.toString()}' filters with '${n.toString()}' filters.`);
-            }(t, a), a;
-        }(t._query, "where", e, t.firestore._databaseId, this.zc, this.Hc, this.Jc);
-        return new Sa(t.firestore, t.converter, function(t, e) {
+            }(t, c), c;
+        }(t._query, "where", e, t.firestore._databaseId, this.Ga, this.za, this.Ha);
+        return new Sc(t.firestore, t.converter, function(t, e) {
             const n = t.filters.concat([ e ]);
             return new ye(t.path, t.collectionGroup, t.explicitOrderBy.slice(), n, t.limit, t.limitType, t.startAt, t.endAt);
         }(t._query, n));
@@ -16964,7 +16961,7 @@ class Qu extends Ku {
 
 class Gu extends Ku {
     constructor(t, e) {
-        super(), this.zc = t, this.Yc = e, this.type = "orderBy";
+        super(), this.Ga = t, this.Ja = e, this.type = "orderBy";
     }
     _apply(t) {
         const e = function(t, e, n) {
@@ -16975,7 +16972,7 @@ class Gu extends Ku {
                 if (null === Ae(t)) {
                     // This is the first order by. It must match any inequality.
                     const n = Re(t);
-                    null !== n && ch(t, n, e.field);
+                    null !== n && ah(t, n, e.field);
                 }
             }(t, s), s;
         }
@@ -16989,8 +16986,8 @@ class Gu extends Ku {
  * Will throw if the document does not contain all fields of the order by
  * of the query or if any of the fields in the order by are an uncommitted
  * server timestamp.
- */ (t._query, this.zc, this.Yc);
-        return new Sa(t.firestore, t.converter, function(t, e) {
+ */ (t._query, this.Ga, this.Ja);
+        return new Sc(t.firestore, t.converter, function(t, e) {
             // TODO(dimond): validate that orderBy does not list the same key twice.
             const n = t.explicitOrderBy.concat([ e ]);
             return new ye(t.path, t.collectionGroup, n, t.filters.slice(), t.limit, t.limitType, t.startAt, t.endAt);
@@ -17013,10 +17010,10 @@ class Gu extends Ku {
 
 class Hu extends Ku {
     constructor(t, e, n) {
-        super(), this.type = t, this.Xc = e, this.Zc = n;
+        super(), this.type = t, this.Ya = e, this.Xa = n;
     }
     _apply(t) {
-        return new Sa(t.firestore, t.converter, Ve(t._query, this.Xc, this.Zc));
+        return new Sc(t.firestore, t.converter, Ve(t._query, this.Ya, this.Xa));
     }
 }
 
@@ -17026,7 +17023,7 @@ class Hu extends Ku {
  * @param limit - The maximum number of items to return.
  * @returns The created {@link Query}.
  */ function Ju(t) {
-    return Ra("limit", t), new Hu("limit", t, "F" /* First */);
+    return Rc("limit", t), new Hu("limit", t, "F" /* First */);
 }
 
 /**
@@ -17038,16 +17035,16 @@ class Hu extends Ku {
  * @param limit - The maximum number of items to return.
  * @returns The created {@link Query}.
  */ function Yu(t) {
-    return Ra("limitToLast", t), new Hu("limitToLast", t, "L" /* Last */);
+    return Rc("limitToLast", t), new Hu("limitToLast", t, "L" /* Last */);
 }
 
 class Xu extends Ku {
     constructor(t, e, n) {
-        super(), this.type = t, this.ta = e, this.ea = n;
+        super(), this.type = t, this.Za = e, this.tc = n;
     }
     _apply(t) {
-        const e = ih(t, this.type, this.ta, this.ea);
-        return new Sa(t.firestore, t.converter, function(t, e) {
+        const e = ih(t, this.type, this.Za, this.tc);
+        return new Sc(t.firestore, t.converter, function(t, e) {
             return new ye(t.path, t.collectionGroup, t.explicitOrderBy.slice(), t.filters.slice(), t.limit, t.limitType, e, t.endAt);
         }(t._query, e));
     }
@@ -17064,11 +17061,11 @@ function th(...t) {
 
 class eh extends Ku {
     constructor(t, e, n) {
-        super(), this.type = t, this.ta = e, this.ea = n;
+        super(), this.type = t, this.Za = e, this.tc = n;
     }
     _apply(t) {
-        const e = ih(t, this.type, this.ta, this.ea);
-        return new Sa(t.firestore, t.converter, function(t, e) {
+        const e = ih(t, this.type, this.Za, this.tc);
+        return new Sc(t.firestore, t.converter, function(t, e) {
             return new ye(t.path, t.collectionGroup, t.explicitOrderBy.slice(), t.filters.slice(), t.limit, t.limitType, t.startAt, e);
         }(t._query, e));
     }
@@ -17093,9 +17090,9 @@ function sh(...t) {
         // the provided document. Without the key (by using the explicit sort
         // orders), multiple documents could match the position, yielding duplicate
         // results.
-                for (const n of Pe(t)) if (n.field.isKeyField()) r.push(Bt(e, s.key)); else {
+                for (const n of be(t)) if (n.field.isKeyField()) r.push(Bt(e, s.key)); else {
             const t = s.data.field(n.field);
-            if (Pt(t)) throw new W(Q.INVALID_ARGUMENT, 'Invalid query. You are trying to start or end a query using a document for which the field "' + n.field + '" is an uncommitted server timestamp. (Since the value of this field is unknown, you cannot start/end a query with it.)');
+            if (bt(t)) throw new W(Q.INVALID_ARGUMENT, 'Invalid query. You are trying to start or end a query using a document for which the field "' + n.field + '" is an uncommitted server timestamp. (Since the value of this field is unknown, you cannot start/end a query with it.)');
             if (null === t) {
                 const t = n.field.canonicalString();
                 throw new W(Q.INVALID_ARGUMENT, `Invalid query. You are trying to start or end a query using a document for which the field '${t}' (used as the orderBy) does not exist.`);
@@ -17113,22 +17110,22 @@ function sh(...t) {
             // Use explicit order by's because it has to match the query the user made
             const o = t.explicitOrderBy;
             if (i.length > o.length) throw new W(Q.INVALID_ARGUMENT, `Too many arguments provided to ${s}(). The number of arguments must be less than or equal to the number of orderBy() clauses`);
-            const c = [];
+            const a = [];
             for (let r = 0; r < i.length; r++) {
-                const a = i[r];
+                const c = i[r];
                 if (o[r].field.isKeyField()) {
-                    if ("string" != typeof a) throw new W(Q.INVALID_ARGUMENT, `Invalid query. Expected a string for document ID in ${s}(), but got a ${typeof a}`);
-                    if (!be(t) && -1 !== a.indexOf("/")) throw new W(Q.INVALID_ARGUMENT, `Invalid query. When querying a collection and ordering by FieldPath.documentId(), the value passed to ${s}() must be a plain document ID, but '${a}' contains a slash.`);
-                    const n = t.path.child(_t.fromString(a));
+                    if ("string" != typeof c) throw new W(Q.INVALID_ARGUMENT, `Invalid query. Expected a string for document ID in ${s}(), but got a ${typeof c}`);
+                    if (!Pe(t) && -1 !== c.indexOf("/")) throw new W(Q.INVALID_ARGUMENT, `Invalid query. When querying a collection and ordering by FieldPath.documentId(), the value passed to ${s}() must be a plain document ID, but '${c}' contains a slash.`);
+                    const n = t.path.child(_t.fromString(c));
                     if (!Nt.isDocumentKey(n)) throw new W(Q.INVALID_ARGUMENT, `Invalid query. When querying a collection group and ordering by FieldPath.documentId(), the value passed to ${s}() must result in a valid document path, but '${n}' is not because it contains an odd number of segments.`);
                     const i = new Nt(n);
-                    c.push(Bt(e, i));
+                    a.push(Bt(e, i));
                 } else {
-                    const t = Au(n, s, a);
-                    c.push(t);
+                    const t = Au(n, s, c);
+                    a.push(t);
                 }
             }
-            return new fe(c, r);
+            return new fe(a, r);
         }
         /**
  * Parses the given `documentIdValue` into a `ReferenceValue`, throwing
@@ -17141,13 +17138,13 @@ function sh(...t) {
 function rh(t, e, n) {
     if ("string" == typeof (n = T(n))) {
         if ("" === n) throw new W(Q.INVALID_ARGUMENT, "Invalid query. When querying with FieldPath.documentId(), you must provide a valid document ID, but it was an empty string.");
-        if (!be(e) && -1 !== n.indexOf("/")) throw new W(Q.INVALID_ARGUMENT, `Invalid query. When querying a collection by FieldPath.documentId(), you must provide a plain document ID, but '${n}' contains a '/' character.`);
+        if (!Pe(e) && -1 !== n.indexOf("/")) throw new W(Q.INVALID_ARGUMENT, `Invalid query. When querying a collection by FieldPath.documentId(), you must provide a plain document ID, but '${n}' contains a '/' character.`);
         const s = e.path.child(_t.fromString(n));
         if (!Nt.isDocumentKey(s)) throw new W(Q.INVALID_ARGUMENT, `Invalid query. When querying a collection group by FieldPath.documentId(), the value provided must result in a valid document path, but '${s}' is not because it has an odd number of segments (${s.length}).`);
         return Bt(t, new Nt(s));
     }
-    if (n instanceof Va) return Bt(t, n._key);
-    throw new W(Q.INVALID_ARGUMENT, `Invalid query. When querying with FieldPath.documentId(), you must provide a valid string or a DocumentReference, but it was: ${Ia(n)}.`);
+    if (n instanceof Vc) return Bt(t, n._key);
+    throw new W(Q.INVALID_ARGUMENT, `Invalid query. When querying with FieldPath.documentId(), you must provide a valid string or a DocumentReference, but it was: ${Ic(n)}.`);
 }
 
 /**
@@ -17158,7 +17155,7 @@ function rh(t, e, n) {
     if (t.length > 10) throw new W(Q.INVALID_ARGUMENT, `Invalid Query. '${e.toString()}' filters support a maximum of 10 elements in the value array.`);
 }
 
-function ch(t, e, n) {
+function ah(t, e, n) {
     if (!n.isEqual(e)) throw new W(Q.INVALID_ARGUMENT, `Invalid query. You have a where filter with an inequality (<, <=, !=, not-in, >, or >=) on field '${e.toString()}' and so you must also use '${e.toString()}' as your first argument to orderBy(), but your first orderBy() is on field '${n.toString()}' instead.`);
 }
 
@@ -17183,7 +17180,7 @@ function ch(t, e, n) {
  * to the user.
  *
  * @internal
- */ class ah {
+ */ class ch {
     convertValue(t, e = "none") {
         switch (kt(t)) {
           case 0 /* NullValue */ :
@@ -17205,7 +17202,7 @@ function ch(t, e, n) {
             return t.stringValue;
 
           case 6 /* BlobValue */ :
-            return this.convertBytes(bt(t.bytesValue));
+            return this.convertBytes(Pt(t.bytesValue));
 
           case 7 /* RefValue */ :
             return this.convertReference(t.referenceValue);
@@ -17254,8 +17251,8 @@ function ch(t, e, n) {
     }
     convertDocumentKey(t, e) {
         const n = _t.fromString(t);
-        q(Ps(n));
-        const s = new ma(n.get(1), n.get(3)), i = new Nt(n.popFirst(5));
+        q(bs(n));
+        const s = new mc(n.get(1), n.get(3)), i = new Nt(n.popFirst(5));
         return s.isEqual(e) || 
         // TODO(b/64130202): Somehow support foreign references.
         M(`Document ${i} contains a document reference within a different database (${s.projectId}/${s.database}) which is not supported. It will be treated as a reference in the current database (${e.projectId}/${e.database}) instead.`), 
@@ -17296,7 +17293,7 @@ function ch(t, e, n) {
     s;
 }
 
-class hh extends ah {
+class hh extends ch {
     constructor(t) {
         super(), this.firestore = t;
     }
@@ -17305,7 +17302,7 @@ class hh extends ah {
     }
     convertReference(t) {
         const e = this.convertDocumentKey(t, this.firestore._databaseId);
-        return new Va(this.firestore, /* converter= */ null, e);
+        return new Vc(this.firestore, /* converter= */ null, e);
     }
 }
 
@@ -17440,12 +17437,12 @@ function fh(t, e) {
  * current document contents.
  */
 function dh(t) {
-    t = Aa(t, Va);
-    const e = Aa(t.firestore, Ba);
-    return aa(Ka(e), t._key).then((n => vh(e, t, n)));
+    t = Ac(t, Vc);
+    const e = Ac(t.firestore, Bc);
+    return cc(Kc(e), t._key).then((n => vh(e, t, n)));
 }
 
-class wh extends ah {
+class wh extends ch {
     constructor(t) {
         super(), this.firestore = t;
     }
@@ -17454,7 +17451,7 @@ class wh extends ah {
     }
     convertReference(t) {
         const e = this.convertDocumentKey(t, this.firestore._databaseId);
-        return new Va(this.firestore, /* converter= */ null, e);
+        return new Vc(this.firestore, /* converter= */ null, e);
     }
 }
 
@@ -17465,9 +17462,9 @@ class wh extends ah {
  * @returns A `Promise` resolved with a `DocumentSnapshot` containing the
  * current document contents.
  */ function _h(t) {
-    t = Aa(t, Va);
-    const e = Aa(t.firestore, Ba), n = Ka(e), s = new wh(e);
-    return ca(n, t._key).then((n => new Fu(e, s, t._key, n, new Ou(null !== n && n.hasLocalMutations, 
+    t = Ac(t, Vc);
+    const e = Ac(t.firestore, Bc), n = Kc(e), s = new wh(e);
+    return ac(n, t._key).then((n => new Fu(e, s, t._key, n, new Ou(null !== n && n.hasLocalMutations, 
     /* fromCache= */ !0), t.converter)));
 }
 
@@ -17478,9 +17475,9 @@ class wh extends ah {
  * @returns A `Promise` resolved with a `DocumentSnapshot` containing the
  * current document contents.
  */ function mh(t) {
-    t = Aa(t, Va);
-    const e = Aa(t.firestore, Ba);
-    return aa(Ka(e), t._key, {
+    t = Ac(t, Vc);
+    const e = Ac(t.firestore, Bc);
+    return cc(Kc(e), t._key, {
         source: "server"
     }).then((n => vh(e, t, n)));
 }
@@ -17495,9 +17492,9 @@ class wh extends ah {
  *
  * @returns A `Promise` that will be resolved with the results of the query.
  */ function gh(t) {
-    t = Aa(t, Sa);
-    const e = Aa(t.firestore, Ba), n = Ka(e), s = new wh(e);
-    return qu(t._query), ha(n, t._query).then((n => new Lu(e, s, t, n)));
+    t = Ac(t, Sc);
+    const e = Ac(t.firestore, Bc), n = Kc(e), s = new wh(e);
+    return qu(t._query), hc(n, t._query).then((n => new Lu(e, s, t, n)));
 }
 
 /**
@@ -17506,9 +17503,9 @@ class wh extends ah {
  *
  * @returns A `Promise` that will be resolved with the results of the query.
  */ function yh(t) {
-    t = Aa(t, Sa);
-    const e = Aa(t.firestore, Ba), n = Ka(e), s = new wh(e);
-    return ua(n, t._query).then((n => new Lu(e, s, t, n)));
+    t = Ac(t, Sc);
+    const e = Ac(t.firestore, Bc), n = Kc(e), s = new wh(e);
+    return uc(n, t._query).then((n => new Lu(e, s, t, n)));
 }
 
 /**
@@ -17517,28 +17514,28 @@ class wh extends ah {
  *
  * @returns A `Promise` that will be resolved with the results of the query.
  */ function ph(t) {
-    t = Aa(t, Sa);
-    const e = Aa(t.firestore, Ba), n = Ka(e), s = new wh(e);
-    return ha(n, t._query, {
+    t = Ac(t, Sc);
+    const e = Ac(t.firestore, Bc), n = Kc(e), s = new wh(e);
+    return hc(n, t._query, {
         source: "server"
     }).then((n => new Lu(e, s, t, n)));
 }
 
 function Th(t, e, n) {
-    t = Aa(t, Va);
-    const s = Aa(t.firestore, Ba), i = uh(t.converter, e, n);
-    return Ph(s, [ wu(du(s), "setDoc", t._key, i, null !== t.converter, n).toMutation(t._key, Ze.none()) ]);
+    t = Ac(t, Vc);
+    const s = Ac(t.firestore, Bc), i = uh(t.converter, e, n);
+    return bh(s, [ wu(du(s), "setDoc", t._key, i, null !== t.converter, n).toMutation(t._key, Ze.none()) ]);
 }
 
 function Eh(t, e, n, ...s) {
-    t = Aa(t, Va);
-    const i = Aa(t.firestore, Ba), r = du(i);
+    t = Ac(t, Vc);
+    const i = Ac(t.firestore, Bc), r = du(i);
     let o;
     o = "string" == typeof (
     // For Compat types, we have to "extract" the underlying types before
     // performing validation.
     e = T(e)) || e instanceof nu ? Iu(r, "updateDoc", t._key, e, n, s) : Eu(r, "updateDoc", t._key, e);
-    return Ph(i, [ o.toMutation(t._key, Ze.exists(!0)) ]);
+    return bh(i, [ o.toMutation(t._key, Ze.exists(!0)) ]);
 }
 
 /**
@@ -17548,7 +17545,7 @@ function Eh(t, e, n, ...s) {
  * @returns A Promise resolved once the document has been successfully
  * deleted from the backend (note that it won't resolve while you're offline).
  */ function Ih(t) {
-    return Ph(Aa(t.firestore, Ba), [ new dn(t._key, Ze.none()) ]);
+    return bh(Ac(t.firestore, Bc), [ new dn(t._key, Ze.none()) ]);
 }
 
 /**
@@ -17561,8 +17558,8 @@ function Eh(t, e, n, ...s) {
  * newly created document after it has been written to the backend (Note that it
  * won't resolve while you're offline).
  */ function Ah(t, e) {
-    const n = Aa(t.firestore, Ba), s = ka(t), i = uh(t.converter, e);
-    return Ph(n, [ wu(du(t.firestore), "addDoc", s._key, i, null !== t.converter, {}).toMutation(s._key, Ze.exists(!1)) ]).then((() => s));
+    const n = Ac(t.firestore, Bc), s = kc(t), i = uh(t.converter, e);
+    return bh(n, [ wu(du(t.firestore), "addDoc", s._key, i, null !== t.converter, {}).toMutation(s._key, Ze.exists(!1)) ]).then((() => s));
 }
 
 function Rh(t, ...e) {
@@ -17571,27 +17568,27 @@ function Rh(t, ...e) {
     let r = {
         includeMetadataChanges: !1
     }, o = 0;
-    "object" != typeof e[o] || Fa(e[o]) || (r = e[o], o++);
-    const c = {
+    "object" != typeof e[o] || Fc(e[o]) || (r = e[o], o++);
+    const a = {
         includeMetadataChanges: r.includeMetadataChanges
     };
-    if (Fa(e[o])) {
+    if (Fc(e[o])) {
         const t = e[o];
         e[o] = null === (n = t.next) || void 0 === n ? void 0 : n.bind(t), e[o + 1] = null === (s = t.error) || void 0 === s ? void 0 : s.bind(t), 
         e[o + 2] = null === (i = t.complete) || void 0 === i ? void 0 : i.bind(t);
     }
-    let a, u, h;
-    if (t instanceof Va) u = Aa(t.firestore, Ba), h = Te(t._key.path), a = {
+    let c, u, h;
+    if (t instanceof Vc) u = Ac(t.firestore, Bc), h = Te(t._key.path), c = {
         next: n => {
             e[o] && e[o](vh(u, t, n));
         },
         error: e[o + 1],
         complete: e[o + 2]
     }; else {
-        const n = Aa(t, Sa);
-        u = Aa(n.firestore, Ba), h = n._query;
+        const n = Ac(t, Sc);
+        u = Ac(n.firestore, Bc), h = n._query;
         const s = new wh(u);
-        a = {
+        c = {
             next: t => {
                 e[o] && e[o](new Lu(u, s, n, t));
             },
@@ -17600,15 +17597,15 @@ function Rh(t, ...e) {
         }, qu(t._query);
     }
     return function(t, e, n, s) {
-        const i = new Qc(s), r = new Yo(e, i, n);
-        return t.asyncQueue.enqueueAndForget((async () => Wo(await ia(t), r))), () => {
-            i.nc(), t.asyncQueue.enqueueAndForget((async () => Go(await ia(t), r)));
+        const i = new Qa(s), r = new Yo(e, i, n);
+        return t.asyncQueue.enqueueAndForget((async () => Wo(await ic(t), r))), () => {
+            i.na(), t.asyncQueue.enqueueAndForget((async () => Go(await ic(t), r)));
         };
-    }(Ka(u), h, c, a);
+    }(Kc(u), h, a, c);
 }
 
-function bh(t, e) {
-    return la(Ka(t = Aa(t, Ba)), Fa(e) ? e : {
+function Ph(t, e) {
+    return lc(Kc(t = Ac(t, Bc)), Fc(e) ? e : {
         next: e
     });
 }
@@ -17616,11 +17613,11 @@ function bh(t, e) {
 /**
  * Locally writes `mutations` on the async queue.
  * @internal
- */ function Ph(t, e) {
+ */ function bh(t, e) {
     return function(t, e) {
         const n = new G;
-        return t.asyncQueue.enqueueAndForget((async () => lc(await sa(t), e, n))), n.promise;
-    }(Ka(t), e);
+        return t.asyncQueue.enqueueAndForget((async () => la(await sc(t), e, n))), n.promise;
+    }(Kc(t), e);
 }
 
 /**
@@ -17731,7 +17728,7 @@ function bh(t, e) {
  * `updateFunction `is returned here. Otherwise, if the transaction failed, a
  * rejected promise with the corresponding failure error is returned.
  */ function Sh(t, e) {
-    return fa(Ka(t = Aa(t, Ba)), (n => e(new Vh(t, n))));
+    return fc(Kc(t = Ac(t, Bc)), (n => e(new Vh(t, n))));
 }
 
 /**
@@ -17846,7 +17843,7 @@ function bh(t, e) {
  * @returns A {@link WriteBatch} that can be used to atomically execute multiple
  * writes.
  */ function $h(t) {
-    return Ka(t = Aa(t, Ba)), new lh(t, (e => Ph(t, e)));
+    return Kc(t = Ac(t, Bc)), new lh(t, (e => bh(t, e)));
 }
 
 /**
@@ -17868,14 +17865,14 @@ function bh(t, e) {
     !function(t) {
         k = t;
     }(i), n(new r("firestore", ((t, {options: n}) => {
-        const s = t.getProvider("app").getImmediate(), i = new Ba(s, new Y(t.getProvider("auth-internal")), new et(t.getProvider("app-check-internal")));
+        const s = t.getProvider("app").getImmediate(), i = new Bc(s, new Y(t.getProvider("auth-internal")), new et(t.getProvider("app-check-internal")));
         return n = Object.assign({
             useFetchStreams: e
         }, n), i._setSettings(n), i;
-    }), "PUBLIC")), s(C, "3.4.1-canary.be7ccb8ed", t), 
+    }), "PUBLIC")), s(C, "3.4.2", t), 
     // BUILD_TARGET will be replaced by values like esm5, esm2017, cjs5, etc during the compilation
-    s(C, "3.4.1-canary.be7ccb8ed", "esm2017");
+    s(C, "3.4.2", "esm2017");
 }("rn", /* useFetchStreams= */ !1);
 
-export { ah as AbstractUserDataWriter, iu as Bytes, La as CACHE_SIZE_UNLIMITED, Da as CollectionReference, Va as DocumentReference, Fu as DocumentSnapshot, nu as FieldPath, ru as FieldValue, Ba as Firestore, W as FirestoreError, ou as GeoPoint, Ma as LoadBundleTask, Sa as Query, Ku as QueryConstraint, Mu as QueryDocumentSnapshot, Lu as QuerySnapshot, Ou as SnapshotMetadata, ut as Timestamp, Vh as Transaction, lh as WriteBatch, ma as _DatabaseId, Nt as _DocumentKey, nt as _EmptyAppCheckTokenProvider, H as _EmptyAuthCredentialsProvider, gt as _FieldPath, Aa as _cast, K as _debugAssert, Tt as _isBase64Available, L as _logWarn, pa as _validateIsNotUsedTogether, Ah as addDoc, kh as arrayRemove, Nh as arrayUnion, za as clearIndexedDbPersistence, Ca as collection, Na as collectionGroup, va as connectFirestoreEmulator, Ih as deleteDoc, Dh as deleteField, Ya as disableNetwork, ka as doc, su as documentId, Qa as enableIndexedDbPersistence, Wa as enableMultiTabIndexedDbPersistence, Ja as enableNetwork, sh as endAt, nh as endBefore, Ka as ensureFirestoreConfigured, Ph as executeWrite, dh as getDoc, _h as getDocFromCache, mh as getDocFromServer, gh as getDocs, yh as getDocsFromCache, ph as getDocsFromServer, qa as getFirestore, xh as increment, Ua as initializeFirestore, Ju as limit, Yu as limitToLast, Za as loadBundle, tu as namedQuery, Rh as onSnapshot, bh as onSnapshotsInSync, zu as orderBy, ju as query, $a as queryEqual, xa as refEqual, Sh as runTransaction, Ch as serverTimestamp, Th as setDoc, O as setLogLevel, Uu as snapshotEqual, th as startAfter, Zu as startAt, Xa as terminate, Eh as updateDoc, Ha as waitForPendingWrites, Wu as where, $h as writeBatch };
+export { ch as AbstractUserDataWriter, iu as Bytes, Lc as CACHE_SIZE_UNLIMITED, Dc as CollectionReference, Vc as DocumentReference, Fu as DocumentSnapshot, nu as FieldPath, ru as FieldValue, Bc as Firestore, W as FirestoreError, ou as GeoPoint, Mc as LoadBundleTask, Sc as Query, Ku as QueryConstraint, Mu as QueryDocumentSnapshot, Lu as QuerySnapshot, Ou as SnapshotMetadata, ut as Timestamp, Vh as Transaction, lh as WriteBatch, mc as _DatabaseId, Nt as _DocumentKey, nt as _EmptyAppCheckTokenProvider, H as _EmptyAuthCredentialsProvider, gt as _FieldPath, Ac as _cast, K as _debugAssert, Tt as _isBase64Available, L as _logWarn, pc as _validateIsNotUsedTogether, Ah as addDoc, kh as arrayRemove, Nh as arrayUnion, zc as clearIndexedDbPersistence, Cc as collection, Nc as collectionGroup, vc as connectFirestoreEmulator, Ih as deleteDoc, Dh as deleteField, Yc as disableNetwork, kc as doc, su as documentId, Qc as enableIndexedDbPersistence, Wc as enableMultiTabIndexedDbPersistence, Jc as enableNetwork, sh as endAt, nh as endBefore, Kc as ensureFirestoreConfigured, bh as executeWrite, dh as getDoc, _h as getDocFromCache, mh as getDocFromServer, gh as getDocs, yh as getDocsFromCache, ph as getDocsFromServer, qc as getFirestore, xh as increment, Uc as initializeFirestore, Ju as limit, Yu as limitToLast, Zc as loadBundle, tu as namedQuery, Rh as onSnapshot, Ph as onSnapshotsInSync, zu as orderBy, ju as query, $c as queryEqual, xc as refEqual, Sh as runTransaction, Ch as serverTimestamp, Th as setDoc, O as setLogLevel, Uu as snapshotEqual, th as startAfter, Zu as startAt, Xc as terminate, Eh as updateDoc, Hc as waitForPendingWrites, Wu as where, $h as writeBatch };
 //# sourceMappingURL=index.rn.js.map