@firebase/firestore 4.7.7-canary.3418ef807 → 4.7.7-canary.4d2fc6e82

package/dist/index.cjs.js

@@ -9,7 +9,7 @@ var util = require('@firebase/util');
 var bloomBlob = require('@firebase/webchannel-wrapper/bloom-blob');
 var webchannelBlob = require('@firebase/webchannel-wrapper/webchannel-blob');
 
-const S = "@firebase/firestore", b = "4.7.7-canary.3418ef807";
+const S = "@firebase/firestore", b = "4.7.7-canary.4d2fc6e82";
 
 /**
  * @license
@@ -71,7 +71,7 @@ User.MOCK_USER = new User("mock-user");
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-let D = "11.3.0-canary.3418ef807";
+let D = "11.3.0-canary.4d2fc6e82";
 
 /**
  * @license
@@ -688,6 +688,31 @@ function __PRIVATE_randomBytes(e) {
     return n;
 }
 
+/**
+ * @license
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+/**
+ * An instance of the Platform's 'TextEncoder' implementation.
+ */ function __PRIVATE_newTextEncoder() {
+    return new TextEncoder;
+}
+
+/**
+ * An instance of the Platform's 'TextDecoder' implementation.
+ */
 /**
  * @license
  * Copyright 2017 Google LLC
@@ -709,7 +734,8 @@ function __PRIVATE_randomBytes(e) {
  *
  * @internal
  * Exported internally for testing purposes.
- */ class __PRIVATE_AutoId {
+ */
+class __PRIVATE_AutoId {
     static newId() {
         // Alphanumeric characters
         const e = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", t = 62 * Math.floor(256 / 62);
@@ -730,6 +756,16 @@ function __PRIVATE_primitiveComparator(e, t) {
     return e < t ? -1 : e > t ? 1 : 0;
 }
 
+/** Compare strings in UTF-8 encoded byte order */ function __PRIVATE_compareUtf8Strings(e, t) {
+    // Convert the string to UTF-8 encoded bytes
+    const n = __PRIVATE_newTextEncoder().encode(e), r = __PRIVATE_newTextEncoder().encode(t);
+    for (let e = 0; e < Math.min(n.length, r.length); e++) {
+        const t = __PRIVATE_primitiveComparator(n[e], r[e]);
+        if (0 !== t) return t;
+    }
+    return __PRIVATE_primitiveComparator(n.length, r.length);
+}
+
 /** Helper to compare arrays using isEqual(). */ function __PRIVATE_arrayEquals(e, t, n) {
     return e.length === t.length && e.every(((e, r) => n(e, t[r])));
 }
@@ -1020,13 +1056,11 @@ class Timestamp {
             const n = BasePath.compareSegments(e.get(r), t.get(r));
             if (0 !== n) return n;
         }
-        return Math.sign(e.length - t.length);
+        return __PRIVATE_primitiveComparator(e.length, t.length);
     }
     static compareSegments(e, t) {
         const n = BasePath.isNumericId(e), r = BasePath.isNumericId(t);
-        return n && !r ? -1 : !n && r ? 1 : n && r ? BasePath.extractNumericId(e).compare(BasePath.extractNumericId(t)) : 
-        // both non-numeric
-        e < t ? -1 : e > t ? 1 : 0;
+        return n && !r ? -1 : !n && r ? 1 : n && r ? BasePath.extractNumericId(e).compare(BasePath.extractNumericId(t)) : __PRIVATE_compareUtf8Strings(e, t);
     }
     // Checks if a segment is a numeric ID (starts with "__id" and ends with "__").
     static isNumericId(e) {
@@ -1814,13 +1848,13 @@ class __PRIVATE_SimpleDbTransaction {
  * within the key range or index.
  */ class __PRIVATE_IterationController {
     constructor(e) {
-        this.q = e, this.$ = !1, this.K = null;
+        this.q = e, this.$ = !1, this.U = null;
     }
     get isDone() {
         return this.$;
     }
-    get U() {
-        return this.K;
+    get K() {
+        return this.U;
     }
     set cursor(e) {
         this.q = e;
@@ -1834,7 +1868,7 @@ class __PRIVATE_SimpleDbTransaction {
      * This function can be called to skip to that next key, which could be
      * an index or a primary key.
      */    W(e) {
-        this.K = e;
+        this.U = e;
     }
     /**
      * Delete the current cursor value from the object store.
@@ -1993,7 +2027,7 @@ class __PRIVATE_SimpleDbTransaction {
                     const e = o.catch((e => (s.done(), PersistencePromise.reject(e))));
                     n.push(e);
                 }
-                s.isDone ? r() : null === s.U ? i.continue() : i.continue(s.U);
+                s.isDone ? r() : null === s.K ? i.continue() : i.continue(s.K);
             };
         })).next((() => PersistencePromise.waitFor(n)));
     }
@@ -2314,7 +2348,7 @@ function __PRIVATE_encodeResourcePath(e) {
  * 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 K = "remoteDocuments", U = "owner", W = "owner", G = "mutationQueues", z = "userId", j = "mutations", H = "batchId", J = "userMutationsIndex", Y = [ "userId", "batchId" ];
+ */ const U = "remoteDocuments", K = "owner", W = "owner", G = "mutationQueues", z = "userId", j = "mutations", H = "batchId", J = "userMutationsIndex", Y = [ "userId", "batchId" ];
 
 /**
  * @license
@@ -2359,7 +2393,7 @@ function __PRIVATE_newDbDocumentMutationPrefixForPath(e, t) {
  * there is no useful information to store as the value. The raw (unencoded)
  * path cannot be stored because IndexedDb doesn't store prototype
  * information.
- */ const Z = {}, X = "documentMutations", ee = "remoteDocumentsV14", te = [ "prefixPath", "collectionGroup", "readTime", "documentId" ], ne = "documentKeyIndex", re = [ "prefixPath", "collectionGroup", "documentId" ], ie = "collectionGroupIndex", se = [ "collectionGroup", "readTime", "prefixPath", "documentId" ], oe = "remoteDocumentGlobal", _e = "remoteDocumentGlobalKey", ae = "targets", ue = "queryTargetsIndex", ce = [ "canonicalId", "targetId" ], le = "targetDocuments", he = [ "targetId", "path" ], Pe = "documentTargetsIndex", Te = [ "path", "targetId" ], Ie = "targetGlobalKey", Ee = "targetGlobal", de = "collectionParents", Ae = [ "collectionId", "parent" ], Re = "clientMetadata", Ve = "clientId", me = "bundles", fe = "bundleId", ge = "namedQueries", pe = "name", ye = "indexConfiguration", we = "indexId", Se = "collectionGroupIndex", be = "collectionGroup", De = "indexState", ve = [ "indexId", "uid" ], Ce = "sequenceNumberIndex", Fe = [ "uid", "sequenceNumber" ], Me = "indexEntries", xe = [ "indexId", "uid", "arrayValue", "directionalValue", "orderedDocumentKey", "documentKey" ], Oe = "documentKeyIndex", Ne = [ "indexId", "uid", "orderedDocumentKey" ], Be = "documentOverlays", Le = [ "userId", "collectionPath", "documentId" ], ke = "collectionPathOverlayIndex", qe = [ "userId", "collectionPath", "largestBatchId" ], Qe = "collectionGroupOverlayIndex", $e = [ "userId", "collectionGroup", "largestBatchId" ], Ke = "globals", Ue = "name", We = [ ...[ ...[ ...[ ...[ G, j, X, K, ae, U, Ee, le ], Re ], oe ], de ], me, ge ], Ge = [ ...We, Be ], ze = [ G, j, X, ee, ae, U, Ee, le, Re, oe, de, me, ge, Be ], je = ze, He = [ ...je, ye, De, Me ], Je = He, Ye = [ ...He, Ke ];
+ */ const Z = {}, X = "documentMutations", ee = "remoteDocumentsV14", te = [ "prefixPath", "collectionGroup", "readTime", "documentId" ], ne = "documentKeyIndex", re = [ "prefixPath", "collectionGroup", "documentId" ], ie = "collectionGroupIndex", se = [ "collectionGroup", "readTime", "prefixPath", "documentId" ], oe = "remoteDocumentGlobal", _e = "remoteDocumentGlobalKey", ae = "targets", ue = "queryTargetsIndex", ce = [ "canonicalId", "targetId" ], le = "targetDocuments", he = [ "targetId", "path" ], Pe = "documentTargetsIndex", Te = [ "path", "targetId" ], Ie = "targetGlobalKey", Ee = "targetGlobal", de = "collectionParents", Ae = [ "collectionId", "parent" ], Re = "clientMetadata", Ve = "clientId", me = "bundles", fe = "bundleId", ge = "namedQueries", pe = "name", ye = "indexConfiguration", we = "indexId", Se = "collectionGroupIndex", be = "collectionGroup", De = "indexState", ve = [ "indexId", "uid" ], Ce = "sequenceNumberIndex", Fe = [ "uid", "sequenceNumber" ], Me = "indexEntries", xe = [ "indexId", "uid", "arrayValue", "directionalValue", "orderedDocumentKey", "documentKey" ], Oe = "documentKeyIndex", Ne = [ "indexId", "uid", "orderedDocumentKey" ], Be = "documentOverlays", Le = [ "userId", "collectionPath", "documentId" ], ke = "collectionPathOverlayIndex", qe = [ "userId", "collectionPath", "largestBatchId" ], Qe = "collectionGroupOverlayIndex", $e = [ "userId", "collectionGroup", "largestBatchId" ], Ue = "globals", Ke = "name", We = [ ...[ ...[ ...[ ...[ G, j, X, U, ae, K, Ee, le ], Re ], oe ], de ], me, ge ], Ge = [ ...We, Be ], ze = [ G, j, X, ee, ae, K, Ee, le, Re, oe, de, me, ge, Be ], je = ze, He = [ ...je, ye, De, Me ], Je = He, Ye = [ ...He, Ue ];
 
 /**
  * @license
@@ -3421,7 +3455,7 @@ function __PRIVATE_valueCompare(e, t) {
         return __PRIVATE_compareTimestamps(__PRIVATE_getLocalWriteTime(e), __PRIVATE_getLocalWriteTime(t));
 
       case 5 /* TypeOrder.StringValue */ :
-        return __PRIVATE_primitiveComparator(e.stringValue, t.stringValue);
+        return __PRIVATE_compareUtf8Strings(e.stringValue, t.stringValue);
 
       case 6 /* TypeOrder.BlobValue */ :
         return function __PRIVATE_compareBlobs(e, t) {
@@ -3469,7 +3503,7 @@ function __PRIVATE_valueCompare(e, t) {
             // canonical IDs are independent of insertion order.
             r.sort(), s.sort();
             for (let e = 0; e < r.length && e < s.length; ++e) {
-                const t = __PRIVATE_primitiveComparator(r[e], s[e]);
+                const t = __PRIVATE_compareUtf8Strings(r[e], s[e]);
                 if (0 !== t) return t;
                 const o = __PRIVATE_valueCompare(n[r[e]], i[s[e]]);
                 if (0 !== o) return o;
@@ -5881,32 +5915,6 @@ let At = null;
  * Sets the value of the `testingHooksSpi` object.
  * @param instance the instance to set.
  */
-/**
- * @license
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-/**
- * An instance of the Platform's 'TextEncoder' implementation.
- */
-function __PRIVATE_newTextEncoder() {
-    return new TextEncoder;
-}
-
-/**
- * An instance of the Platform's 'TextDecoder' implementation.
- */
 /**
  * @license
  * Copyright 2022 Google LLC
@@ -6279,13 +6287,13 @@ class __PRIVATE_WatchChangeAggregator {
         /** Keeps track of the documents to update since the last raised snapshot. */
         this.Qe = __PRIVATE_mutableDocumentMap(), this.$e = __PRIVATE_documentTargetMap(), 
         /** A mapping of document keys to their set of target IDs. */
-        this.Ke = __PRIVATE_documentTargetMap(), 
+        this.Ue = __PRIVATE_documentTargetMap(), 
         /**
          * A map of targets with existence filter mismatches. These targets are
          * known to be inconsistent and their listens needs to be re-established by
          * RemoteStore.
          */
-        this.Ue = new SortedMap(__PRIVATE_primitiveComparator);
+        this.Ke = new SortedMap(__PRIVATE_primitiveComparator);
     }
     /**
      * Processes and adds the DocumentWatchChange to the current set of changes.
@@ -6374,7 +6382,7 @@ class __PRIVATE_WatchChangeAggregator {
                         // trigger re-run of the query.
                         this.Ye(t);
                         const e = 2 /* BloomFilterApplicationStatus.FalsePositive */ === i ? "TargetPurposeExistenceFilterMismatchBloom" /* TargetPurpose.ExistenceFilterMismatchBloom */ : "TargetPurposeExistenceFilterMismatch" /* TargetPurpose.ExistenceFilterMismatch */;
-                        this.Ue = this.Ue.insert(t, e);
+                        this.Ke = this.Ke.insert(t, e);
                     }
                     null == At || At.rt(function __PRIVATE_createExistenceFilterMismatchInfoForTestingHooks(e, t, n, r, i) {
                         var s, o, _, a, u, c;
@@ -6486,7 +6494,7 @@ class __PRIVATE_WatchChangeAggregator {
         
         // TODO(gsoltis): Expand on this comment once GC is available in the JS
         // client.
-                this.Ke.forEach(((e, t) => {
+                this.Ue.forEach(((e, t) => {
             let r = !0;
             t.forEachWhile((e => {
                 const t = this.Xe(e);
@@ -6494,9 +6502,9 @@ class __PRIVATE_WatchChangeAggregator {
                 !1);
             })), r && (n = n.add(e));
         })), this.Qe.forEach(((t, n) => n.setReadTime(e)));
-        const r = new RemoteEvent(e, t, this.Ue, this.Qe, n);
+        const r = new RemoteEvent(e, t, this.Ke, this.Qe, n);
         return this.Qe = __PRIVATE_mutableDocumentMap(), this.$e = __PRIVATE_documentTargetMap(), 
-        this.Ke = __PRIVATE_documentTargetMap(), this.Ue = new SortedMap(__PRIVATE_primitiveComparator), 
+        this.Ue = __PRIVATE_documentTargetMap(), this.Ke = new SortedMap(__PRIVATE_primitiveComparator), 
         r;
     }
     /**
@@ -6508,7 +6516,7 @@ class __PRIVATE_WatchChangeAggregator {
         if (!this.Je(e)) return;
         const n = this.ut(e, t.key) ? 2 /* ChangeType.Modified */ : 0 /* ChangeType.Added */;
         this.He(e).xe(t.key, n), this.Qe = this.Qe.insert(t.key, t), this.$e = this.$e.insert(t.key, this._t(t.key).add(e)), 
-        this.Ke = this.Ke.insert(t.key, this.ct(t.key).add(e));
+        this.Ue = this.Ue.insert(t.key, this.ct(t.key).add(e));
     }
     /**
      * Removes the provided document from the target mapping. If the
@@ -6524,7 +6532,7 @@ class __PRIVATE_WatchChangeAggregator {
         this.ut(e, t) ? r.xe(t, 1 /* ChangeType.Removed */) : 
         // The document may have entered and left the target before we raised a
         // snapshot, so we can just ignore the change.
-        r.Oe(t), this.Ke = this.Ke.insert(t, this.ct(t).delete(e)), this.Ke = this.Ke.insert(t, this.ct(t).add(e)), 
+        r.Oe(t), this.Ue = this.Ue.insert(t, this.ct(t).delete(e)), this.Ue = this.Ue.insert(t, this.ct(t).add(e)), 
         n && (this.Qe = this.Qe.insert(t, n));
     }
     removeTarget(e) {
@@ -6549,8 +6557,8 @@ class __PRIVATE_WatchChangeAggregator {
         return t || (t = new __PRIVATE_TargetState, this.qe.set(e, t)), t;
     }
     ct(e) {
-        let t = this.Ke.get(e);
-        return t || (t = new SortedSet(__PRIVATE_primitiveComparator), this.Ke = this.Ke.insert(e, t)), 
+        let t = this.Ue.get(e);
+        return t || (t = new SortedSet(__PRIVATE_primitiveComparator), this.Ue = this.Ue.insert(e, t)), 
         t;
     }
     _t(e) {
@@ -7733,7 +7741,7 @@ function __PRIVATE_toDbIndexState(e, t, n, r) {
  * limitations under the License.
  */ class __PRIVATE_IndexedDbGlobalsCache {
     dt(e) {
-        return __PRIVATE_getStore(e, Ke);
+        return __PRIVATE_getStore(e, Ue);
     }
     getSessionToken(e) {
         return this.dt(e).get("sessionToken").next((e => {
@@ -7945,10 +7953,10 @@ function __PRIVATE_unsignedNumLength(e) {
         }
         this.qt();
     }
-    Kt(e) {
+    Ut(e) {
         // Values are encoded with a single byte length prefix, followed by the
         // actual value in big-endian format with leading 0 bytes dropped.
-        const t = this.Ut(e), n = __PRIVATE_unsignedNumLength(t);
+        const t = this.Kt(e), n = __PRIVATE_unsignedNumLength(t);
         this.Wt(1 + n), this.buffer[this.position++] = 255 & n;
         // Write the length
         for (let e = t.length - n; e < t.length; ++e) this.buffer[this.position++] = 255 & t[e];
@@ -7956,7 +7964,7 @@ function __PRIVATE_unsignedNumLength(e) {
     Gt(e) {
         // Values are encoded with a single byte length prefix, followed by the
         // inverted value in big-endian format with leading 0 bytes dropped.
-        const t = this.Ut(e), n = __PRIVATE_unsignedNumLength(t);
+        const t = this.Kt(e), n = __PRIVATE_unsignedNumLength(t);
         this.Wt(1 + n), this.buffer[this.position++] = ~(255 & n);
         // Write the length
         for (let e = t.length - n; e < t.length; ++e) this.buffer[this.position++] = ~(255 & t[e]);
@@ -7991,7 +7999,7 @@ function __PRIVATE_unsignedNumLength(e) {
      *   -0.0 < 0.0
      *   all non-NaN < NaN
      *   NaN = NaN
-     */    Ut(e) {
+     */    Kt(e) {
         const t = 
         /** Converts a JavaScript number to a byte array (using big endian encoding). */
         function __PRIVATE_doubleToLongBits(e) {
@@ -8050,7 +8058,7 @@ class __PRIVATE_AscendingIndexByteEncoder {
         this.Zt.Qt(e);
     }
     gt(e) {
-        this.Zt.Kt(e);
+        this.Zt.Ut(e);
     }
     Vt() {
         this.Zt.zt();
@@ -9559,14 +9567,14 @@ class __PRIVATE_TargetIdGenerator {
     next() {
         return this.$n += 2, this.$n;
     }
-    static Kn() {
+    static Un() {
         // The target cache generator must return '2' in its first call to `next()`
         // as there is no differentiation in the protocol layer between an unset
         // number and the number '0'. If we were to sent a target with target ID
         // '0', the backend would consider it unset and replace it with its own ID.
         return new __PRIVATE_TargetIdGenerator(0);
     }
-    static Un() {
+    static Kn() {
         // Sync engine assigns target IDs for limbo document detection.
         return new __PRIVATE_TargetIdGenerator(-1);
     }
@@ -11334,7 +11342,7 @@ class __PRIVATE_MemoryRemoteDocumentChangeBuffer extends RemoteDocumentChangeBuf
          * A ordered bidirectional mapping between documents and the remote target
          * IDs.
          */
-        this.Kr = new __PRIVATE_ReferenceSet, this.targetCount = 0, this.Ur = __PRIVATE_TargetIdGenerator.Kn();
+        this.Ur = new __PRIVATE_ReferenceSet, this.targetCount = 0, this.Kr = __PRIVATE_TargetIdGenerator.Un();
     }
     forEachTarget(e, t) {
         return this.Qr.forEach(((e, n) => t(n))), PersistencePromise.resolve();
@@ -11346,7 +11354,7 @@ class __PRIVATE_MemoryRemoteDocumentChangeBuffer extends RemoteDocumentChangeBuf
         return PersistencePromise.resolve(this.$r);
     }
     allocateTargetId(e) {
-        return this.highestTargetId = this.Ur.next(), PersistencePromise.resolve(this.highestTargetId);
+        return this.highestTargetId = this.Kr.next(), PersistencePromise.resolve(this.highestTargetId);
     }
     setTargetsMetadata(e, t, n) {
         return n && (this.lastRemoteSnapshotVersion = n), t > this.$r && (this.$r = t), 
@@ -11355,7 +11363,7 @@ class __PRIVATE_MemoryRemoteDocumentChangeBuffer extends RemoteDocumentChangeBuf
     zn(e) {
         this.Qr.set(e.target, e);
         const t = e.targetId;
-        t > this.highestTargetId && (this.Ur = new __PRIVATE_TargetIdGenerator(t), this.highestTargetId = t), 
+        t > this.highestTargetId && (this.Kr = new __PRIVATE_TargetIdGenerator(t), this.highestTargetId = t), 
         e.sequenceNumber > this.$r && (this.$r = e.sequenceNumber);
     }
     addTargetData(e, t) {
@@ -11365,7 +11373,7 @@ class __PRIVATE_MemoryRemoteDocumentChangeBuffer extends RemoteDocumentChangeBuf
         return this.zn(t), PersistencePromise.resolve();
     }
     removeTargetData(e, t) {
-        return this.Qr.delete(t.target), this.Kr.br(t.targetId), this.targetCount -= 1, 
+        return this.Qr.delete(t.target), this.Ur.br(t.targetId), this.targetCount -= 1, 
         PersistencePromise.resolve();
     }
     removeTargets(e, t, n) {
@@ -11384,24 +11392,24 @@ class __PRIVATE_MemoryRemoteDocumentChangeBuffer extends RemoteDocumentChangeBuf
         return PersistencePromise.resolve(n);
     }
     addMatchingKeys(e, t, n) {
-        return this.Kr.yr(t, n), PersistencePromise.resolve();
+        return this.Ur.yr(t, n), PersistencePromise.resolve();
     }
     removeMatchingKeys(e, t, n) {
-        this.Kr.Sr(t, n);
+        this.Ur.Sr(t, n);
         const r = this.persistence.referenceDelegate, i = [];
         return r && t.forEach((t => {
             i.push(r.markPotentiallyOrphaned(e, t));
         })), PersistencePromise.waitFor(i);
     }
     removeMatchingKeysForTargetId(e, t) {
-        return this.Kr.br(t), PersistencePromise.resolve();
+        return this.Ur.br(t), PersistencePromise.resolve();
     }
     getMatchingKeysForTargetId(e, t) {
-        const n = this.Kr.vr(t);
+        const n = this.Ur.vr(t);
         return PersistencePromise.resolve(n);
     }
     containsKey(e, t) {
-        return PersistencePromise.resolve(this.Kr.containsKey(t));
+        return PersistencePromise.resolve(this.Ur.containsKey(t));
     }
 }
 
@@ -11662,7 +11670,7 @@ class __PRIVATE_MemoryLruDelegate {
      */    B(e, t, n, r) {
         const i = new __PRIVATE_SimpleDbTransaction("createOrUpgrade", t);
         n < 1 && r >= 1 && (!function __PRIVATE_createPrimaryClientStore(e) {
-            e.createObjectStore(U);
+            e.createObjectStore(K);
         }(e), function __PRIVATE_createMutationQueue(e) {
             e.createObjectStore(G, {
                 keyPath: z
@@ -11679,7 +11687,7 @@ class __PRIVATE_MemoryLruDelegate {
  * Upgrade function to migrate the 'mutations' store from V1 to V3. Loads
  * and rewrites all data.
  */ (e), __PRIVATE_createQueryCache(e), function __PRIVATE_createLegacyRemoteDocumentCache(e) {
-            e.createObjectStore(K);
+            e.createObjectStore(U);
         }(e));
         // Migration 2 to populate the targetGlobal object no longer needed since
         // migration 3 unconditionally clears it.
@@ -11767,7 +11775,7 @@ class __PRIVATE_MemoryLruDelegate {
                 keyPath: te
             });
             t.createIndex(ne, re), t.createIndex(ie, se);
-        }(e))).next((() => this.hi(e, i))).next((() => e.deleteObjectStore(K)))), n < 14 && r >= 14 && (s = s.next((() => this.Pi(e, i)))), 
+        }(e))).next((() => this.hi(e, i))).next((() => e.deleteObjectStore(U)))), n < 14 && r >= 14 && (s = s.next((() => this.Pi(e, i)))), 
         n < 15 && r >= 15 && (s = s.next((() => function __PRIVATE_createFieldIndex(e) {
             const t = e.createObjectStore(ye, {
                 keyPath: we,
@@ -11796,15 +11804,15 @@ class __PRIVATE_MemoryLruDelegate {
             t.objectStore(Me).clear();
         }))), n < 17 && r >= 17 && (s = s.next((() => {
             !function __PRIVATE_createGlobalsStore(e) {
-                e.createObjectStore(Ke, {
-                    keyPath: Ue
+                e.createObjectStore(Ue, {
+                    keyPath: Ke
                 });
             }(e);
         }))), s;
     }
     ai(e) {
         let t = 0;
-        return e.store(K).Z(((e, n) => {
+        return e.store(U).Z(((e, n) => {
             t += __PRIVATE_dbDocumentSize(n);
         })).next((() => {
             const n = {
@@ -11828,7 +11836,7 @@ class __PRIVATE_MemoryLruDelegate {
      * Ensures that every document in the remote document cache has a corresponding sentinel row
      * with a sequence number. Missing rows are given the most recently used sequence number.
      */    ui(e) {
-        const t = e.store(le), n = e.store(K);
+        const t = e.store(le), n = e.store(U);
         return e.store(Ee).get(Ie).next((e => {
             const r = [];
             return n.Z(((n, i) => {
@@ -11859,7 +11867,7 @@ class __PRIVATE_MemoryLruDelegate {
         };
         // Helper to add an index entry iff we haven't already written it.
                 // Index existing remote documents.
-        return t.store(K).Z({
+        return t.store(U).Z({
             Y: !0
         }, ((e, t) => {
             const n = new ResourcePath(e);
@@ -11879,7 +11887,7 @@ class __PRIVATE_MemoryLruDelegate {
         }));
     }
     hi(e, t) {
-        const n = t.store(K), r = [];
+        const n = t.store(U), r = [];
         return n.Z(((e, n) => {
             const i = t.store(ee), s = function __PRIVATE_extractKey(e) {
                 return e.document ? new DocumentKey(ResourcePath.fromString(e.document.name).popFirst(5)) : e.noDocument ? DocumentKey.fromSegments(e.noDocument.path) : e.unknownDocument ? DocumentKey.fromSegments(e.unknownDocument.path) : fail();
@@ -12197,11 +12205,11 @@ class __PRIVATE_IndexedDbPersistence {
     async shutdown() {
         // The shutdown() operations are idempotent and can be called even when
         // start() aborted (e.g. because it couldn't acquire the persistence lease).
-        this.zr = !1, this.Ki(), this.Vi && (this.Vi.cancel(), this.Vi = null), this.Ui(), 
+        this.zr = !1, this.Ui(), this.Vi && (this.Vi.cancel(), this.Vi = null), this.Ki(), 
         this.Wi(), 
         // Use `SimpleDb.runTransaction` directly to avoid failing if another tab
         // has obtained the primary lease.
-        await this.pi.runTransaction("shutdown", "readwrite", [ U, Re ], (e => {
+        await this.pi.runTransaction("shutdown", "readwrite", [ K, Re ], (e => {
             const t = new __PRIVATE_IndexedDbTransaction(e, __PRIVATE_ListenSequence.ae);
             return this.xi(t).next((() => this.Bi(t)));
         })), this.pi.close(), 
@@ -12307,7 +12315,7 @@ class __PRIVATE_IndexedDbPersistence {
             this.wi())));
         }, this.document.addEventListener("visibilitychange", this.Ri), this.inForeground = "visible" === this.document.visibilityState);
     }
-    Ui() {
+    Ki() {
         this.Ri && (this.document.removeEventListener("visibilitychange", this.Ri), this.Ri = null);
     }
     /**
@@ -12325,7 +12333,7 @@ class __PRIVATE_IndexedDbPersistence {
             // Note: In theory, this should be scheduled on the AsyncQueue since it
             // accesses internal state. We execute this code directly during shutdown
             // to make sure it gets a chance to run.
-            this.Ki();
+            this.Ui();
             const e = /(?:Version|Mobile)\/1[456]/;
             util.isSafari() && (navigator.appVersion.match(e) || navigator.userAgent.match(e)) && 
             // On Safari 14, 15, and 16, we do not run any cleanup actions as it might
@@ -12356,7 +12364,7 @@ class __PRIVATE_IndexedDbPersistence {
     /**
      * Record client as zombied (a client that had its tab closed). Zombied
      * clients are ignored during primary tab selection.
-     */    Ki() {
+     */    Ui() {
         if (this.yi) try {
             this.yi.setItem(this.Qi(this.clientId), String(Date.now()));
         } catch (e) {
@@ -12379,7 +12387,7 @@ class __PRIVATE_IndexedDbPersistence {
 /**
  * Helper to get a typed SimpleDbStore for the primary client object store.
  */ function __PRIVATE_primaryClientStore(e) {
-    return __PRIVATE_getStore(e, U);
+    return __PRIVATE_getStore(e, K);
 }
 
 /**
@@ -13418,12 +13426,12 @@ class __PRIVATE_LocalClientState {
                 n && (this.xs = this.xs.insert(n.clientId, n));
             }
         }
-        this.Ks();
+        this.Us();
         // Check if there is an existing online state and call the callback handler
         // if applicable.
         const t = this.storage.getItem(this.Qs);
         if (t) {
-            const e = this.Us(t);
+            const e = this.Ks(t);
             e && this.Ws(e);
         }
         for (const e of this.Os) this.Ms(e);
@@ -13467,10 +13475,10 @@ class __PRIVATE_LocalClientState {
         }
         // If the query is listening to cache only, the target ID should not be registered with the
         // local Firestore client as an active watch target.
-                return t && this.Hs.Ds(e), this.Ks(), n;
+                return t && this.Hs.Ds(e), this.Us(), n;
     }
     removeLocalQueryTarget(e) {
-        this.Hs.vs(e), this.Ks();
+        this.Hs.vs(e), this.Us();
     }
     isLocalQueryTarget(e) {
         return this.Hs.activeTargetIds.has(e);
@@ -13537,7 +13545,7 @@ class __PRIVATE_LocalClientState {
                         }
                     } else if (t.key === this.Qs) {
                         if (null !== t.newValue) {
-                            const e = this.Us(t.newValue);
+                            const e = this.Ks(t.newValue);
                             if (e) return this.Ws(e);
                         }
                     } else if (t.key === this.Bs) {
@@ -13568,7 +13576,7 @@ class __PRIVATE_LocalClientState {
     get Hs() {
         return this.xs.get(this.Cs);
     }
-    Ks() {
+    Us() {
         this.setItem(this.Ns, this.Hs.bs());
     }
     zs(e, t, n) {
@@ -13625,7 +13633,7 @@ class __PRIVATE_LocalClientState {
     /**
      * Parses an online state from WebStorage. Returns 'null' if the value
      * could not be parsed.
-     */    Us(e) {
+     */    Ks(e) {
         return __PRIVATE_SharedOnlineState.Ss(e);
     }
     _o(e) {
@@ -13850,7 +13858,7 @@ function __PRIVATE_generateUniqueDebugId() {
  * 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 Kt = "RestConnection", Ut = {
+ */ const Ut = "RestConnection", Kt = {
     BatchGetDocuments: "batchGet",
     Commit: "commit",
     RunQuery: "runQuery",
@@ -13879,14 +13887,14 @@ class __PRIVATE_RestConnection {
     }
     So(e, t, n, r, i) {
         const s = __PRIVATE_generateUniqueDebugId(), o = this.bo(e, t.toUriEncodedString());
-        __PRIVATE_logDebug(Kt, `Sending RPC '${e}' ${s}:`, o, n);
+        __PRIVATE_logDebug(Ut, `Sending RPC '${e}' ${s}:`, o, n);
         const _ = {
             "google-cloud-resource-prefix": this.yo,
             "x-goog-request-params": this.wo
         };
-        return this.Do(_, r, i), this.vo(e, o, _, n).then((t => (__PRIVATE_logDebug(Kt, `Received RPC '${e}' ${s}: `, t), 
+        return this.Do(_, r, i), this.vo(e, o, _, n).then((t => (__PRIVATE_logDebug(Ut, `Received RPC '${e}' ${s}: `, t), 
         t)), (t => {
-            throw __PRIVATE_logWarn(Kt, `RPC '${e}' ${s} failed with error: `, t, "url: ", o, "request:", n), 
+            throw __PRIVATE_logWarn(Ut, `RPC '${e}' ${s} failed with error: `, t, "url: ", o, "request:", n), 
             t;
         }));
     }
@@ -13913,7 +13921,7 @@ class __PRIVATE_RestConnection {
         t && t.headers.forEach(((t, n) => e[n] = t)), n && n.headers.forEach(((t, n) => e[n] = t));
     }
     bo(e, t) {
-        const n = Ut[e];
+        const n = Kt[e];
         return `${this.po}/v1/${t}:${n}`;
     }
     /**
@@ -13973,10 +13981,10 @@ class __PRIVATE_RestConnection {
     $o() {
         this.Bo();
     }
-    Ko(e) {
+    Uo(e) {
         this.ko(e);
     }
-    Uo(e) {
+    Ko(e) {
         this.qo(e);
     }
 }
@@ -14128,10 +14136,10 @@ class __PRIVATE_WebChannelConnection extends __PRIVATE_RestConnection {
             h || (__PRIVATE_logDebug(Wt, `RPC '${e}' stream ${r} transport opened.`), P.Qo());
         })), __PRIVATE_unguardedEventListen(c, webchannelBlob.WebChannel.EventType.CLOSE, (() => {
             h || (h = !0, __PRIVATE_logDebug(Wt, `RPC '${e}' stream ${r} transport closed`), 
-            P.Ko());
+            P.Uo());
         })), __PRIVATE_unguardedEventListen(c, webchannelBlob.WebChannel.EventType.ERROR, (t => {
             h || (h = !0, __PRIVATE_logWarn(Wt, `RPC '${e}' stream ${r} transport errored:`, t), 
-            P.Ko(new FirestoreError(C.UNAVAILABLE, "The operation could not be completed")));
+            P.Uo(new FirestoreError(C.UNAVAILABLE, "The operation could not be completed")));
         })), __PRIVATE_unguardedEventListen(c, webchannelBlob.WebChannel.EventType.MESSAGE, (t => {
             var n;
             if (!h) {
@@ -14162,8 +14170,8 @@ class __PRIVATE_WebChannelConnection extends __PRIVATE_RestConnection {
                     }(t), i = o.message;
                     void 0 === n && (n = C.INTERNAL, i = "Unknown error status: " + t + " with message " + o.message), 
                     // Mark closed so no further events are propagated
-                    h = !0, P.Ko(new FirestoreError(n, i)), c.close();
-                } else __PRIVATE_logDebug(Wt, `RPC '${e}' stream ${r} received:`, i), P.Uo(i);
+                    h = !0, P.Uo(new FirestoreError(n, i)), c.close();
+                } else __PRIVATE_logDebug(Wt, `RPC '${e}' stream ${r} received:`, i), P.Ko(i);
             }
         })), __PRIVATE_unguardedEventListen(o, webchannelBlob.Event.STAT_EVENT, (t => {
             t.stat === webchannelBlob.Stat.PROXY ? __PRIVATE_logDebug(Wt, `RPC '${e}' stream ${r} detected buffering proxy`) : t.stat === webchannelBlob.Stat.NOPROXY && __PRIVATE_logDebug(Wt, `RPC '${e}' stream ${r} detected no buffering proxy`);
@@ -14898,7 +14906,7 @@ class __PRIVATE_RemoteStoreImpl {
          * purely based on order, and so we can just shift() writes from the front of
          * the writePipeline as we receive responses.
          */
-        this.K_ = [], 
+        this.U_ = [], 
         /**
          * A mapping of watched targets that the client cares about tracking and the
          * user has explicitly called a 'listen' for this target.
@@ -14908,7 +14916,7 @@ class __PRIVATE_RemoteStoreImpl {
          * to the server. The targets removed with unlistens are removed eagerly
          * without waiting for confirmation from the listen stream.
          */
-        this.U_ = new Map, 
+        this.K_ = new Map, 
         /**
          * A set of reasons for why the RemoteStore may be offline. If empty, the
          * RemoteStore may start its network connections.
@@ -14955,9 +14963,9 @@ async function __PRIVATE_enableNetworkInternal(e) {
  */
 function __PRIVATE_remoteStoreListen(e, t) {
     const n = __PRIVATE_debugCast(e);
-    n.U_.has(t.targetId) || (
+    n.K_.has(t.targetId) || (
     // Mark this as something the client is currently listening for.
-    n.U_.set(t.targetId, t), __PRIVATE_shouldStartWatchStream(n) ? 
+    n.K_.set(t.targetId, t), __PRIVATE_shouldStartWatchStream(n) ? 
     // The listen will be sent in onWatchStreamOpen
     __PRIVATE_startWatchStream(n) : __PRIVATE_ensureWatchStream(n).c_() && __PRIVATE_sendWatchRequest(n, t));
 }
@@ -14967,7 +14975,7 @@ function __PRIVATE_remoteStoreListen(e, t) {
  * not being listened to.
  */ function __PRIVATE_remoteStoreUnlisten(e, t) {
     const n = __PRIVATE_debugCast(e), r = __PRIVATE_ensureWatchStream(n);
-    n.U_.delete(t), r.c_() && __PRIVATE_sendUnwatchRequest(n, t), 0 === n.U_.size && (r.c_() ? r.P_() : __PRIVATE_canUseNetwork(n) && 
+    n.K_.delete(t), r.c_() && __PRIVATE_sendUnwatchRequest(n, t), 0 === n.K_.size && (r.c_() ? r.P_() : __PRIVATE_canUseNetwork(n) && 
     // Revert to OnlineState.Unknown if the watch stream is not open and we
     // have no listeners, since without any listens to send we cannot
     // confirm if the stream is healthy and upgrade to OnlineState.Online.
@@ -14996,7 +15004,7 @@ function __PRIVATE_remoteStoreListen(e, t) {
 function __PRIVATE_startWatchStream(e) {
     e.H_ = new __PRIVATE_WatchChangeAggregator({
         getRemoteKeysForTarget: t => e.remoteSyncer.getRemoteKeysForTarget(t),
-        lt: t => e.U_.get(t) || null,
+        lt: t => e.K_.get(t) || null,
         it: () => e.datastore.serializer.databaseId
     }), __PRIVATE_ensureWatchStream(e).start(), e.j_.B_();
 }
@@ -15005,7 +15013,7 @@ function __PRIVATE_startWatchStream(e) {
  * Returns whether the watch stream should be started because it's necessary
  * and has not yet been started.
  */ function __PRIVATE_shouldStartWatchStream(e) {
-    return __PRIVATE_canUseNetwork(e) && !__PRIVATE_ensureWatchStream(e).u_() && e.U_.size > 0;
+    return __PRIVATE_canUseNetwork(e) && !__PRIVATE_ensureWatchStream(e).u_() && e.K_.size > 0;
 }
 
 function __PRIVATE_canUseNetwork(e) {
@@ -15022,7 +15030,7 @@ async function __PRIVATE_onWatchStreamConnected(e) {
 }
 
 async function __PRIVATE_onWatchStreamOpen(e) {
-    e.U_.forEach(((t, n) => {
+    e.K_.forEach(((t, n) => {
         __PRIVATE_sendWatchRequest(e, t);
     }));
 }
@@ -15049,7 +15057,7 @@ async function __PRIVATE_onWatchStreamChange(e, t, n) {
             const n = t.cause;
             for (const r of t.targetIds) 
             // A watched target might have been removed already.
-            e.U_.has(r) && (await e.remoteSyncer.rejectListen(r, n), e.U_.delete(r), e.H_.removeTarget(r));
+            e.K_.has(r) && (await e.remoteSyncer.rejectListen(r, n), e.K_.delete(r), e.H_.removeTarget(r));
         }
         /**
  * Attempts to fill our write pipeline with writes from the LocalStore.
@@ -15079,21 +15087,21 @@ async function __PRIVATE_onWatchStreamChange(e, t, n) {
             // persistent view of these when applying the completed RemoteEvent.
                         return n.targetChanges.forEach(((n, r) => {
                 if (n.resumeToken.approximateByteSize() > 0) {
-                    const i = e.U_.get(r);
+                    const i = e.K_.get(r);
                     // A watched target might have been removed already.
-                                        i && e.U_.set(r, i.withResumeToken(n.resumeToken, t));
+                                        i && e.K_.set(r, i.withResumeToken(n.resumeToken, t));
                 }
             })), 
             // Re-establish listens for the targets that have been invalidated by
             // existence filter mismatches.
             n.targetMismatches.forEach(((t, n) => {
-                const r = e.U_.get(t);
+                const r = e.K_.get(t);
                 if (!r) 
                 // A watched target might have been removed already.
                 return;
                 // Clear the resume token for the target, since we're in a known mismatch
                 // state.
-                                e.U_.set(t, r.withResumeToken(ByteString.EMPTY_BYTE_STRING, r.snapshotVersion)), 
+                                e.K_.set(t, r.withResumeToken(ByteString.EMPTY_BYTE_STRING, r.snapshotVersion)), 
                 // Cause a hard reset by unwatching and rewatching immediately, but
                 // deliberately don't send a resume token so that we get a full update.
                 __PRIVATE_sendUnwatchRequest(e, t);
@@ -15144,11 +15152,11 @@ async function __PRIVATE_onWatchStreamChange(e, t, n) {
 
 async function __PRIVATE_fillWritePipeline(e) {
     const t = __PRIVATE_debugCast(e), n = __PRIVATE_ensureWriteStream(t);
-    let r = t.K_.length > 0 ? t.K_[t.K_.length - 1].batchId : Q;
+    let r = t.U_.length > 0 ? t.U_[t.U_.length - 1].batchId : Q;
     for (;__PRIVATE_canAddToWritePipeline(t); ) try {
         const e = await __PRIVATE_localStoreGetNextMutationBatch(t.localStore, r);
         if (null === e) {
-            0 === t.K_.length && n.P_();
+            0 === t.U_.length && n.P_();
             break;
         }
         r = e.batchId, __PRIVATE_addToWritePipeline(t, e);
@@ -15162,20 +15170,20 @@ async function __PRIVATE_fillWritePipeline(e) {
  * Returns true if we can add to the write pipeline (i.e. the network is
  * enabled and the write pipeline is not full).
  */ function __PRIVATE_canAddToWritePipeline(e) {
-    return __PRIVATE_canUseNetwork(e) && e.K_.length < 10;
+    return __PRIVATE_canUseNetwork(e) && e.U_.length < 10;
 }
 
 /**
  * Queues additional writes to be sent to the write stream, sending them
  * immediately if the write stream is established.
  */ function __PRIVATE_addToWritePipeline(e, t) {
-    e.K_.push(t);
+    e.U_.push(t);
     const n = __PRIVATE_ensureWriteStream(e);
     n.c_() && n.S_ && n.b_(t.mutations);
 }
 
 function __PRIVATE_shouldStartWriteStream(e) {
-    return __PRIVATE_canUseNetwork(e) && !__PRIVATE_ensureWriteStream(e).u_() && e.K_.length > 0;
+    return __PRIVATE_canUseNetwork(e) && !__PRIVATE_ensureWriteStream(e).u_() && e.U_.length > 0;
 }
 
 function __PRIVATE_startWriteStream(e) {
@@ -15189,11 +15197,11 @@ async function __PRIVATE_onWriteStreamOpen(e) {
 async function __PRIVATE_onWriteHandshakeComplete(e) {
     const t = __PRIVATE_ensureWriteStream(e);
     // Send the write pipeline now that the stream is established.
-        for (const n of e.K_) t.b_(n.mutations);
+        for (const n of e.U_) t.b_(n.mutations);
 }
 
 async function __PRIVATE_onMutationResult(e, t, n) {
-    const r = e.K_.shift(), i = MutationBatchResult.from(r, t, n);
+    const r = e.U_.shift(), i = MutationBatchResult.from(r, t, n);
     await __PRIVATE_executeWithRecovery(e, (() => e.remoteSyncer.applySuccessfulWrite(i))), 
     // It's possible that with the completion of this mutation another
     // slot has freed up.
@@ -15213,7 +15221,7 @@ async function __PRIVATE_onWriteStreamClose(e, t) {
         }(t.code)) {
             // This was a permanent error, the request itself was the problem
             // so it's not going to succeed if we resend it.
-            const n = e.K_.shift();
+            const n = e.U_.shift();
             // In this case it's also unlikely that the server itself is melting
             // down -- this was just a bad request so inhibit backoff on the next
             // restart.
@@ -15312,8 +15320,8 @@ async function __PRIVATE_remoteStoreHandleCredentialChange(e, t) {
     }), e.G_.push((async t => {
         t ? (e.Y_.h_(), 
         // This will start the write stream if necessary.
-        await __PRIVATE_fillWritePipeline(e)) : (await e.Y_.stop(), e.K_.length > 0 && (__PRIVATE_logDebug(zt, `Stopping write stream with ${e.K_.length} pending writes`), 
-        e.K_ = []));
+        await __PRIVATE_fillWritePipeline(e)) : (await e.Y_.stop(), e.U_.length > 0 && (__PRIVATE_logDebug(zt, `Stopping write stream with ${e.U_.length} pending writes`), 
+        e.U_ = []));
     }))), e.Y_;
 }
 
@@ -16327,11 +16335,11 @@ const Jt = "SyncEngine";
          * Keeps track of the information about an active limbo resolution for each
          * active target ID that was started for the purpose of limbo resolution.
          */
-        this.Ka = new Map, this.Ua = new __PRIVATE_ReferenceSet, 
+        this.Ua = new Map, this.Ka = new __PRIVATE_ReferenceSet, 
         /** Stores user completion handlers, indexed by User and BatchId. */
         this.Wa = {}, 
         /** Stores user callbacks waiting for all pending writes to be acknowledged. */
-        this.Ga = new Map, this.za = __PRIVATE_TargetIdGenerator.Un(), this.onlineState = "Unknown" /* OnlineState.Unknown */ , 
+        this.Ga = new Map, this.za = __PRIVATE_TargetIdGenerator.Kn(), this.onlineState = "Unknown" /* OnlineState.Unknown */ , 
         // The primary state is set to `true` or `false` immediately after Firestore
         // startup. In the interim, a client should only be considered primary if
         // `isPrimary` is true.
@@ -16511,7 +16519,7 @@ async function __PRIVATE_allocateTargetAndMaybeListen(e, t, n, r) {
         const e = await __PRIVATE_localStoreApplyRemoteEventToLocalCache(n.localStore, t);
         // Update `receivedDocument` as appropriate for any limbo targets.
                 t.targetChanges.forEach(((e, t) => {
-            const r = n.Ka.get(t);
+            const r = n.Ua.get(t);
             r && (
             // Since this is a limbo resolution lookup, it's for a single document
             // and it could be added, modified, or removed, but not a combination.
@@ -16565,7 +16573,7 @@ async function __PRIVATE_allocateTargetAndMaybeListen(e, t, n, r) {
     const r = __PRIVATE_debugCast(e);
     // PORTING NOTE: Multi-tab only.
         r.sharedClientState.updateQueryState(t, "rejected", n);
-    const i = r.Ka.get(t), s = i && i.key;
+    const i = r.Ua.get(t), s = i && i.key;
     if (s) {
         // TODO(klimt): We really only should do the following on permission
         // denied errors, but we don't have the cause code here.
@@ -16587,7 +16595,7 @@ async function __PRIVATE_allocateTargetAndMaybeListen(e, t, n, r) {
         // 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.
-        r.$a = r.$a.remove(s), r.Ka.delete(t), __PRIVATE_pumpEnqueuedLimboResolutions(r);
+        r.$a = r.$a.remove(s), r.Ua.delete(t), __PRIVATE_pumpEnqueuedLimboResolutions(r);
     } else await __PRIVATE_localStoreReleaseTarget(r.localStore, t, 
     /* keepPersistedTargetData */ !1).then((() => __PRIVATE_removeAndCleanupTarget(r, t, n))).catch(__PRIVATE_ignoreIfPrimaryLeaseLoss);
 }
@@ -16681,8 +16689,8 @@ function __PRIVATE_removeAndCleanupTarget(e, t, n = null) {
     e.sharedClientState.removeLocalQueryTarget(t);
     for (const r of e.qa.get(t)) e.ka.delete(r), n && e.La.Ja(r, n);
     if (e.qa.delete(t), e.isPrimaryClient) {
-        e.Ua.br(t).forEach((t => {
-            e.Ua.containsKey(t) || 
+        e.Ka.br(t).forEach((t => {
+            e.Ka.containsKey(t) || 
             // We removed the last reference for this key
             __PRIVATE_removeLimboTarget(e, t);
         }));
@@ -16695,14 +16703,14 @@ function __PRIVATE_removeLimboTarget(e, t) {
     // the key won't exist in `limboTargetsByKey`. Only do the cleanup if we still have the target.
     const n = e.$a.get(t);
     null !== n && (__PRIVATE_remoteStoreUnlisten(e.remoteStore, n), e.$a = e.$a.remove(t), 
-    e.Ka.delete(n), __PRIVATE_pumpEnqueuedLimboResolutions(e));
+    e.Ua.delete(n), __PRIVATE_pumpEnqueuedLimboResolutions(e));
 }
 
 function __PRIVATE_updateTrackedLimbos(e, t, n) {
-    for (const r of n) if (r instanceof __PRIVATE_AddedLimboDocument) e.Ua.addReference(r.key, t), 
+    for (const r of n) if (r instanceof __PRIVATE_AddedLimboDocument) e.Ka.addReference(r.key, t), 
     __PRIVATE_trackLimboChange(e, r); else if (r instanceof __PRIVATE_RemovedLimboDocument) {
-        __PRIVATE_logDebug(Jt, "Document no longer in limbo: " + r.key), e.Ua.removeReference(r.key, t);
-        e.Ua.containsKey(r.key) || 
+        __PRIVATE_logDebug(Jt, "Document no longer in limbo: " + r.key), e.Ka.removeReference(r.key, t);
+        e.Ka.containsKey(r.key) || 
         // We removed the last reference for this key
         __PRIVATE_removeLimboTarget(e, r.key);
     } else fail();
@@ -16726,7 +16734,7 @@ function __PRIVATE_trackLimboChange(e, t) {
         const t = e.Qa.values().next().value;
         e.Qa.delete(t);
         const n = new DocumentKey(ResourcePath.fromString(t)), r = e.za.next();
-        e.Ka.set(r, new LimboResolution(n)), e.$a = e.$a.insert(n, r), __PRIVATE_remoteStoreListen(e.remoteStore, new TargetData(__PRIVATE_queryToTarget(__PRIVATE_newQueryForPath(n.path)), r, "TargetPurposeLimboResolution" /* TargetPurpose.LimboResolution */ , __PRIVATE_ListenSequence.ae));
+        e.Ua.set(r, new LimboResolution(n)), e.$a = e.$a.insert(n, r), __PRIVATE_remoteStoreListen(e.remoteStore, new TargetData(__PRIVATE_queryToTarget(__PRIVATE_newQueryForPath(n.path)), r, "TargetPurposeLimboResolution" /* TargetPurpose.LimboResolution */ , __PRIVATE_ListenSequence.ae));
     }
 }
 
@@ -16794,7 +16802,7 @@ async function __PRIVATE_syncEngineHandleCredentialChange(e, t) {
 }
 
 function __PRIVATE_syncEngineGetRemoteKeysForTarget(e, t) {
-    const n = __PRIVATE_debugCast(e), r = n.Ka.get(t);
+    const n = __PRIVATE_debugCast(e), r = n.Ua.get(t);
     if (r && r.Ba) return __PRIVATE_documentKeySet().add(r.key);
     {
         let e = __PRIVATE_documentKeySet();
@@ -16886,9 +16894,9 @@ async function __PRIVATE_syncEngineApplyPrimaryState(e, t) {
         // PORTING NOTE: Multi-Tab only.
         function __PRIVATE_resetLimboDocuments(e) {
             const t = __PRIVATE_debugCast(e);
-            t.Ka.forEach(((e, n) => {
+            t.Ua.forEach(((e, n) => {
                 __PRIVATE_remoteStoreUnlisten(t.remoteStore, n);
-            })), t.Ua.Dr(), t.Ka = new Map, t.$a = new SortedMap(DocumentKey.comparator);
+            })), t.Ka.Dr(), t.Ua = new Map, t.$a = new SortedMap(DocumentKey.comparator);
         }
         /**
  * Reconcile the query views of the provided query targets with the state from
@@ -19747,7 +19755,7 @@ function __PRIVATE_isWrite(e) {
         });
         return r.$u(e), r;
     }
-    Ku(e) {
+    Uu(e) {
         var t;
         const n = null === (t = this.path) || void 0 === t ? void 0 : t.child(e), r = this.ku({
             path: n,
@@ -19755,7 +19763,7 @@ function __PRIVATE_isWrite(e) {
         });
         return r.Bu(), r;
     }
-    Uu(e) {
+    Ku(e) {
         // TODO(b/34871131): We don't support array paths right now; so make path
         // undefined.
         return this.ku({
@@ -19916,7 +19924,7 @@ class __PRIVATE_NumericIncrementFieldValueImpl extends FieldValue {
         // For Compat types, we have to "extract" the underlying types before
         // performing validation.
                 r = util.getModularInstance(r);
-        const a = i.Ku(_);
+        const a = i.Uu(_);
         if (r instanceof __PRIVATE_DeleteFieldValueImpl) 
         // Add it to the field mask, but don't add anything to updateData.
         s.push(_); else {
@@ -19942,7 +19950,7 @@ class __PRIVATE_NumericIncrementFieldValueImpl extends FieldValue {
         // For Compat types, we have to "extract" the underlying types before
         // performing validation.
                 n = util.getModularInstance(n);
-        const r = o.Ku(t);
+        const r = o.Uu(t);
         if (n instanceof __PRIVATE_DeleteFieldValueImpl) 
         // Add it to the field mask, but don't add anything to updateData.
         u.push(t); else {
@@ -20020,7 +20028,7 @@ class __PRIVATE_NumericIncrementFieldValueImpl extends FieldValue {
             const n = [];
             let r = 0;
             for (const i of e) {
-                let e = __PRIVATE_parseData(i, t.Uu(r));
+                let e = __PRIVATE_parseData(i, t.Ku(r));
                 null == e && (
                 // Just include nulls in the array for fields being replaced with a
                 // sentinel.