@firebase/firestore 4.7.1-canary.16d62d4fa → 4.7.1-canary.629919ea7

package/dist/firestore/src/global_index.d.ts

@@ -4960,7 +4960,7 @@ interface SharedClientState {
      * If the target id is already associated with local client, the method simply
      * returns its `QueryTargetState`.
      */
-    addLocalQueryTarget(targetId: TargetId): QueryTargetState;
+    addLocalQueryTarget(targetId: TargetId, addToActiveTargetIds?: boolean): QueryTargetState;
     /** Removes the Query Target ID association from the local client. */
     removeLocalQueryTarget(targetId: TargetId): void;
     /** Checks whether the target is associated with the local client. */

package/dist/firestore/src/local/shared_client_state.d.ts

@@ -60,7 +60,7 @@ export interface SharedClientState {
      * If the target id is already associated with local client, the method simply
      * returns its `QueryTargetState`.
      */
-    addLocalQueryTarget(targetId: TargetId): QueryTargetState;
+    addLocalQueryTarget(targetId: TargetId, addToActiveTargetIds?: boolean): QueryTargetState;
     /** Removes the Query Target ID association from the local client. */
     removeLocalQueryTarget(targetId: TargetId): void;
     /** Checks whether the target is associated with the local client. */
@@ -232,7 +232,7 @@ export declare class WebStorageSharedClientState implements SharedClientState {
     isActiveQueryTarget(targetId: TargetId): boolean;
     addPendingMutation(batchId: BatchId): void;
     updateMutationState(batchId: BatchId, state: 'acknowledged' | 'rejected', error?: FirestoreError): void;
-    addLocalQueryTarget(targetId: TargetId): QueryTargetState;
+    addLocalQueryTarget(targetId: TargetId, addToActiveTargetIds?: boolean): QueryTargetState;
     removeLocalQueryTarget(targetId: TargetId): void;
     isLocalQueryTarget(targetId: TargetId): boolean;
     clearQueryState(targetId: TargetId): void;
@@ -296,7 +296,7 @@ export declare class MemorySharedClientState implements SharedClientState {
     sequenceNumberHandler: ((sequenceNumber: ListenSequenceNumber) => void) | null;
     addPendingMutation(batchId: BatchId): void;
     updateMutationState(batchId: BatchId, state: 'acknowledged' | 'rejected', error?: FirestoreError): void;
-    addLocalQueryTarget(targetId: TargetId): QueryTargetState;
+    addLocalQueryTarget(targetId: TargetId, addToActiveTargetIds?: boolean): QueryTargetState;
     updateQueryState(targetId: TargetId, state: QueryTargetState, error?: FirestoreError): void;
     removeLocalQueryTarget(targetId: TargetId): void;
     isLocalQueryTarget(targetId: TargetId): boolean;

package/dist/index.cjs.js

@@ -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 b = "10.13.1-canary.16d62d4fa";
+let b = "10.13.1-canary.629919ea7";
 
 /**
  * @license
@@ -5895,7 +5895,7 @@ class BloomFilter {
     }
     // Calculate the ith hash value based on the hashed 64bit integers,
     // and calculate its corresponding bit index in the bitmap to be checked.
-    de(e, t, n) {
+    Ee(e, t, n) {
         // Calculate hashed value h(i) = h1 + (i * h2).
         let r = e.add(t.multiply(bloomBlob.Integer.fromNumber(n)));
         // Wrap if hash value overflow 64bit.
@@ -5903,7 +5903,7 @@ class BloomFilter {
         r.modulo(this.Te).toNumber();
     }
     // Return whether the bit on the given index in the bitmap is set to 1.
-    Ee(e) {
+    de(e) {
         return 0 != (this.bitmap[Math.floor(e / 8)] & 1 << e % 8);
     }
     mightContain(e) {
@@ -5911,8 +5911,8 @@ class BloomFilter {
         if (0 === this.Ie) return !1;
         const t = __PRIVATE_getMd5HashValue(e), [n, r] = __PRIVATE_get64BitUints(t);
         for (let e = 0; e < this.hashCount; e++) {
-            const t = this.de(n, r, e);
-            if (!this.Ee(t)) return !1;
+            const t = this.Ee(n, r, e);
+            if (!this.de(t)) return !1;
         }
         return !0;
     }
@@ -5924,7 +5924,7 @@ class BloomFilter {
         if (0 === this.Ie) return;
         const t = __PRIVATE_getMd5HashValue(e), [n, r] = __PRIVATE_get64BitUints(t);
         for (let e = 0; e < this.hashCount; e++) {
-            const t = this.de(n, r, e);
+            const t = this.Ee(n, r, e);
             this.Ae(t);
         }
     }
@@ -6533,13 +6533,13 @@ function __PRIVATE_snapshotChangesMap() {
     return new SortedMap(DocumentKey.comparator);
 }
 
-const de = (() => {
+const Ee = (() => {
     const e = {
         asc: "ASCENDING",
         desc: "DESCENDING"
     };
     return e;
-})(), Ee = (() => {
+})(), de = (() => {
     const e = {
         "<": "LESS_THAN",
         "<=": "LESS_THAN_OR_EQUAL",
@@ -7125,11 +7125,11 @@ function __PRIVATE_fromFilter(e) {
 }
 
 function __PRIVATE_toDirection(e) {
-    return de[e];
+    return Ee[e];
 }
 
 function __PRIVATE_toOperatorName(e) {
-    return Ee[e];
+    return de[e];
 }
 
 function __PRIVATE_toCompositeOperatorName(e) {
@@ -7714,59 +7714,59 @@ class __PRIVATE_FirestoreIndexValueWriter {
         this.Tt(e, t), 
         // Write separator to split index values
         // (see go/firestore-storage-format#encodings).
-        t.dt();
+        t.Et();
     }
     Tt(e, t) {
-        if ("nullValue" in e) this.Et(t, 5); else if ("booleanValue" in e) this.Et(t, 10), 
-        t.At(e.booleanValue ? 1 : 0); else if ("integerValue" in e) this.Et(t, 15), t.At(__PRIVATE_normalizeNumber(e.integerValue)); else if ("doubleValue" in e) {
+        if ("nullValue" in e) this.dt(t, 5); else if ("booleanValue" in e) this.dt(t, 10), 
+        t.At(e.booleanValue ? 1 : 0); else if ("integerValue" in e) this.dt(t, 15), t.At(__PRIVATE_normalizeNumber(e.integerValue)); else if ("doubleValue" in e) {
             const n = __PRIVATE_normalizeNumber(e.doubleValue);
-            isNaN(n) ? this.Et(t, 13) : (this.Et(t, 15), __PRIVATE_isNegativeZero(n) ? 
+            isNaN(n) ? this.dt(t, 13) : (this.dt(t, 15), __PRIVATE_isNegativeZero(n) ? 
             // -0.0, 0 and 0.0 are all considered the same
             t.At(0) : t.At(n));
         } else if ("timestampValue" in e) {
             let n = e.timestampValue;
-            this.Et(t, 20), "string" == typeof n && (n = __PRIVATE_normalizeTimestamp(n)), t.Rt(`${n.seconds || ""}`), 
+            this.dt(t, 20), "string" == typeof n && (n = __PRIVATE_normalizeTimestamp(n)), t.Rt(`${n.seconds || ""}`), 
             t.At(n.nanos || 0);
-        } else if ("stringValue" in e) this.Vt(e.stringValue, t), this.ft(t); else if ("bytesValue" in e) this.Et(t, 30), 
+        } else if ("stringValue" in e) this.Vt(e.stringValue, t), this.ft(t); else if ("bytesValue" in e) this.dt(t, 30), 
         t.gt(__PRIVATE_normalizeByteString(e.bytesValue)), this.ft(t); else if ("referenceValue" in e) this.yt(e.referenceValue, t); else if ("geoPointValue" in e) {
             const n = e.geoPointValue;
-            this.Et(t, 45), t.At(n.latitude || 0), t.At(n.longitude || 0);
-        } else "mapValue" in e ? __PRIVATE_isMaxValue(e) ? this.Et(t, Number.MAX_SAFE_INTEGER) : __PRIVATE_isVectorValue(e) ? this.wt(e.mapValue, t) : (this.St(e.mapValue, t), 
+            this.dt(t, 45), t.At(n.latitude || 0), t.At(n.longitude || 0);
+        } else "mapValue" in e ? __PRIVATE_isMaxValue(e) ? this.dt(t, Number.MAX_SAFE_INTEGER) : __PRIVATE_isVectorValue(e) ? this.wt(e.mapValue, t) : (this.St(e.mapValue, t), 
         this.ft(t)) : "arrayValue" in e ? (this.bt(e.arrayValue, t), this.ft(t)) : fail();
     }
     Vt(e, t) {
-        this.Et(t, 25), this.Dt(e, t);
+        this.dt(t, 25), this.Dt(e, t);
     }
     Dt(e, t) {
         t.Rt(e);
     }
     St(e, t) {
         const n = e.fields || {};
-        this.Et(t, 55);
+        this.dt(t, 55);
         for (const e of Object.keys(n)) this.Vt(e, t), this.Tt(n[e], t);
     }
     wt(e, t) {
         var n, r;
         const i = e.fields || {};
-        this.Et(t, 53);
+        this.dt(t, 53);
         // Vectors sort first by length
         const s = "value", o = (null === (r = null === (n = i[s].arrayValue) || void 0 === n ? void 0 : n.values) || void 0 === r ? void 0 : r.length) || 0;
-        this.Et(t, 15), t.At(__PRIVATE_normalizeNumber(o)), 
+        this.dt(t, 15), t.At(__PRIVATE_normalizeNumber(o)), 
         // Vectors then sort by position value
         this.Vt(s, t), this.Tt(i[s], t);
     }
     bt(e, t) {
         const n = e.values || [];
-        this.Et(t, 50);
+        this.dt(t, 50);
         for (const e of n) this.Tt(e, t);
     }
     yt(e, t) {
-        this.Et(t, 37);
+        this.dt(t, 37);
         DocumentKey.fromName(e).path.forEach((e => {
-            this.Et(t, 60), this.Dt(e, t);
+            this.dt(t, 60), this.Dt(e, t);
         }));
     }
-    Et(e, t) {
+    dt(e, t) {
         e.At(t);
     }
     ft(e) {
@@ -7966,7 +7966,7 @@ class __PRIVATE_AscendingIndexByteEncoder {
     At(e) {
         this.jt.kt(e);
     }
-    dt() {
+    Et() {
         this.jt.$t();
     }
 }
@@ -7984,7 +7984,7 @@ class __PRIVATE_DescendingIndexByteEncoder {
     At(e) {
         this.jt.Kt(e);
     }
-    dt() {
+    Et() {
         this.jt.Wt();
     }
 }
@@ -8682,7 +8682,7 @@ class __PRIVATE_IndexedDbIndexManager {
                             n.push(t.value), r && (r = t.inclusive);
                         }
                         return new Bound(n, r);
-                    }(s, i), c = this.In(i, s, a), l = this.In(i, s, u), h = this.Tn(i, s, _), P = this.dn(i.indexId, o, c, a.inclusive, l, u.inclusive, h);
+                    }(s, i), c = this.In(i, s, a), l = this.In(i, s, u), h = this.Tn(i, s, _), P = this.En(i.indexId, o, c, a.inclusive, l, u.inclusive, h);
                     return PersistencePromise.forEach(P, (i => n.G(i, t.limit).next((t => {
                         t.forEach((t => {
                             const n = DocumentKey.fromSegments(t.documentKey);
@@ -8705,14 +8705,14 @@ class __PRIVATE_IndexedDbIndexManager {
     /**
      * Constructs a key range query on `DbIndexEntryStore` that unions all
      * bounds.
-     */    dn(e, t, n, r, i, s, o) {
+     */    En(e, t, n, r, i, s, o) {
         // The number of total index scans we union together. This is similar to a
         // distributed normal form, but adapted for array values. We create a single
         // index range per value in an ARRAY_CONTAINS or ARRAY_CONTAINS_ANY filter
         // combined with the values from the query bounds.
         const _ = (null != t ? t.length : 1) * Math.max(n.length, i.length), a = _ / (null != t ? t.length : 1), u = [];
         for (let c = 0; c < _; ++c) {
-            const _ = t ? this.En(t[c / a]) : Re, l = this.An(e, _, n[c % a], r), h = this.Rn(e, _, i[c % a], s), P = o.map((t => this.An(e, _, t, 
+            const _ = t ? this.dn(t[c / a]) : Re, l = this.An(e, _, n[c % a], r), h = this.Rn(e, _, i[c % a], s), P = o.map((t => this.An(e, _, t, 
             /* inclusive= */ !0)));
             u.push(...this.createRange(l, h, P));
         }
@@ -8780,7 +8780,7 @@ class __PRIVATE_IndexedDbIndexManager {
         }
         return n.zt();
     }
-    /** Encodes a single value to the ascending index format. */    En(e) {
+    /** Encodes a single value to the ascending index format. */    dn(e) {
         const t = new __PRIVATE_IndexByteEncoder;
         return __PRIVATE_FirestoreIndexValueWriter.vt.It(e, t.Yt(0 /* IndexKind.ASCENDING */)), 
         t.zt();
@@ -8908,7 +8908,7 @@ class __PRIVATE_IndexedDbIndexManager {
         const i = __PRIVATE_fieldIndexGetArraySegment(t);
         if (null != i) {
             const s = e.data.field(i.fieldPath);
-            if (isArray(s)) for (const i of s.arrayValue.values || []) n = n.add(new __PRIVATE_IndexEntry(t.indexId, e.key, this.En(i), r));
+            if (isArray(s)) for (const i of s.arrayValue.values || []) n = n.add(new __PRIVATE_IndexEntry(t.indexId, e.key, this.dn(i), r));
         } else n = n.add(new __PRIVATE_IndexEntry(t.indexId, e.key, Re, r));
         return n;
     }
@@ -10854,16 +10854,16 @@ class OverlayedDocument {
  */ class __PRIVATE_ReferenceSet {
     constructor() {
         // A set of outstanding references to a document sorted by key.
-        this.Tr = new SortedSet(__PRIVATE_DocReference.dr), 
+        this.Tr = new SortedSet(__PRIVATE_DocReference.Er), 
         // A set of outstanding references to a document sorted by target id.
-        this.Er = new SortedSet(__PRIVATE_DocReference.Ar);
+        this.dr = new SortedSet(__PRIVATE_DocReference.Ar);
     }
     /** Returns true if the reference set contains no references. */    isEmpty() {
         return this.Tr.isEmpty();
     }
     /** Adds a reference to the given document key for the given ID. */    addReference(e, t) {
         const n = new __PRIVATE_DocReference(e, t);
-        this.Tr = this.Tr.add(n), this.Er = this.Er.add(n);
+        this.Tr = this.Tr.add(n), this.dr = this.dr.add(n);
     }
     /** Add references to the given document keys for the given ID. */    Rr(e, t) {
         e.forEach((e => this.addReference(e, t)));
@@ -10882,7 +10882,7 @@ class OverlayedDocument {
      * removed.
      */    gr(e) {
         const t = new DocumentKey(new ResourcePath([])), n = new __PRIVATE_DocReference(t, e), r = new __PRIVATE_DocReference(t, e + 1), i = [];
-        return this.Er.forEachInRange([ n, r ], (e => {
+        return this.dr.forEachInRange([ n, r ], (e => {
             this.Vr(e), i.push(e.key);
         })), i;
     }
@@ -10890,12 +10890,12 @@ class OverlayedDocument {
         this.Tr.forEach((e => this.Vr(e)));
     }
     Vr(e) {
-        this.Tr = this.Tr.delete(e), this.Er = this.Er.delete(e);
+        this.Tr = this.Tr.delete(e), this.dr = this.dr.delete(e);
     }
     yr(e) {
         const t = new DocumentKey(new ResourcePath([])), n = new __PRIVATE_DocReference(t, e), r = new __PRIVATE_DocReference(t, e + 1);
         let i = __PRIVATE_documentKeySet();
-        return this.Er.forEachInRange([ n, r ], (e => {
+        return this.dr.forEachInRange([ n, r ], (e => {
             i = i.add(e.key);
         })), i;
     }
@@ -10909,7 +10909,7 @@ class __PRIVATE_DocReference {
     constructor(e, t) {
         this.key = e, this.wr = t;
     }
-    /** Compare by key then by ID */    static dr(e, t) {
+    /** Compare by key then by ID */    static Er(e, t) {
         return DocumentKey.comparator(e.key, t.key) || __PRIVATE_primitiveComparator(e.wr, t.wr);
     }
     /** Compare by ID then by key */    static Ar(e, t) {
@@ -10943,7 +10943,7 @@ class __PRIVATE_DocReference {
         /** Next value to use when assigning sequential IDs to each mutation batch. */
         this.Sr = 1, 
         /** An ordered mapping between documents and the mutations batch IDs. */
-        this.br = new SortedSet(__PRIVATE_DocReference.dr);
+        this.br = new SortedSet(__PRIVATE_DocReference.Er);
     }
     checkEmpty(e) {
         return PersistencePromise.resolve(0 === this.mutationQueue.length);
@@ -11919,9 +11919,9 @@ class __PRIVATE_IndexedDbPersistence {
         /** The client metadata refresh task. */
         this.Ti = null, 
         /** The last time we garbage collected the client metadata object store. */
-        this.di = Number.NEGATIVE_INFINITY, 
+        this.Ei = Number.NEGATIVE_INFINITY, 
         /** A listener to notify on primary state changes. */
-        this.Ei = e => Promise.resolve(), !__PRIVATE_IndexedDbPersistence.D()) throw new FirestoreError(v.UNIMPLEMENTED, "This platform is either missing IndexedDB or is known to have an incomplete implementation. Offline persistence has been disabled.");
+        this.di = e => Promise.resolve(), !__PRIVATE_IndexedDbPersistence.D()) throw new FirestoreError(v.UNIMPLEMENTED, "This platform is either missing IndexedDB or is known to have an incomplete implementation. Offline persistence has been disabled.");
         this.referenceDelegate = new __PRIVATE_IndexedDbLruDelegateImpl(this, r), this.Ai = t + "main", 
         this.serializer = new __PRIVATE_LocalSerializer(_), this.Ri = new __PRIVATE_SimpleDb(this.Ai, this.hi, new __PRIVATE_SchemaConverter(this.serializer)), 
         this.$r = new __PRIVATE_IndexedDbGlobalsCache, this.Ur = new __PRIVATE_IndexedDbTargetCache(this.referenceDelegate, this.serializer), 
@@ -11956,7 +11956,7 @@ class __PRIVATE_IndexedDbPersistence {
      *
      * PORTING NOTE: This is only used for Web multi-tab.
      */    yi(e) {
-        return this.Ei = async t => {
+        return this.di = async t => {
             if (this.started) return e(t);
         }, e(this.isPrimary);
     }
@@ -11997,7 +11997,7 @@ class __PRIVATE_IndexedDbPersistence {
             inForeground: this.inForeground
         }).next((() => {
             if (this.isPrimary) return this.wi(e).next((e => {
-                e || (this.isPrimary = !1, this.ui.enqueueRetryable((() => this.Ei(!1))));
+                e || (this.isPrimary = !1, this.ui.enqueueRetryable((() => this.di(!1))));
             }));
         })).next((() => this.Si(e))).next((t => this.isPrimary && !t ? this.bi(e).next((() => !1)) : !!t && this.Di(e).next((() => !0)))))).catch((e => {
             if (__PRIVATE_isIndexedDbTransactionError(e)) 
@@ -12009,7 +12009,7 @@ class __PRIVATE_IndexedDbPersistence {
             return __PRIVATE_logDebug("IndexedDbPersistence", "Releasing owner lease after error during lease refresh", e), 
             /* isPrimary= */ !1;
         })).then((e => {
-            this.isPrimary !== e && this.ui.enqueueRetryable((() => this.Ei(e))), this.isPrimary = e;
+            this.isPrimary !== e && this.ui.enqueueRetryable((() => this.di(e))), this.isPrimary = e;
         }));
     }
     wi(e) {
@@ -12023,8 +12023,8 @@ class __PRIVATE_IndexedDbPersistence {
      * RemoteDocumentChanges and the ClientMetadata store based on the last update
      * time of all clients.
      */    async Fi() {
-        if (this.isPrimary && !this.Mi(this.di, 18e5)) {
-            this.di = Date.now();
+        if (this.isPrimary && !this.Mi(this.Ei, 18e5)) {
+            this.Ei = Date.now();
             const e = await this.runTransaction("maybeGarbageCollectMultiClientState", "readwrite-primary", (e => {
                 const t = __PRIVATE_getStore(e, "clientMetadata");
                 return t.U().next((e => {
@@ -12164,7 +12164,7 @@ class __PRIVATE_IndexedDbPersistence {
                 return this.Ri.runTransaction(e, r, i, (r => (s = new __PRIVATE_IndexedDbTransaction(r, this.Qr ? this.Qr.next() : __PRIVATE_ListenSequence.oe), 
         "readwrite-primary" === t ? this.wi(s).next((e => !!e || this.Si(s))).next((t => {
             if (!t) throw __PRIVATE_logError(`Failed to obtain primary lease for action '${e}'.`), 
-            this.isPrimary = !1, this.ui.enqueueRetryable((() => this.Ei(!1))), new FirestoreError(v.FAILED_PRECONDITION, F);
+            this.isPrimary = !1, this.ui.enqueueRetryable((() => this.di(!1))), new FirestoreError(v.FAILED_PRECONDITION, F);
             return n(s);
         })).next((e => this.Di(s).next((() => e)))) : this.Ki(s).next((() => n(s)))))).then((e => (s.raiseOnCommittedEvent(), 
         e)));
@@ -13006,9 +13006,9 @@ async function __PRIVATE_localStoreApplyBundledDocuments(e, t, n, r) {
     const i = __PRIVATE_debugCast(e);
     let s = __PRIVATE_documentKeySet(), o = __PRIVATE_mutableDocumentMap();
     for (const e of n) {
-        const n = t.ds(e.metadata.name);
+        const n = t.Es(e.metadata.name);
         e.document && (s = s.add(n));
-        const r = t.Es(e);
+        const r = t.ds(e);
         r.setReadTime(t.As(e.metadata.readTime)), o = o.insert(n, r);
     }
     const _ = i.cs.newChangeBuffer({
@@ -13325,18 +13325,20 @@ class __PRIVATE_LocalClientState {
         // in order, it is safe to delete the entry right after updating it.
         this.Qs(e);
     }
-    addLocalQueryTarget(e) {
-        let t = "not-current";
+    addLocalQueryTarget(e, t = !0) {
+        let n = "not-current";
         // Lookup an existing query state if the target ID was already registered
         // by another tab
                 if (this.isActiveQueryTarget(e)) {
-            const n = this.storage.getItem(createWebStorageQueryTargetMetadataKey(this.persistenceKey, e));
-            if (n) {
-                const r = __PRIVATE_QueryTargetMetadata.Rs(e, n);
-                r && (t = r.state);
+            const t = this.storage.getItem(createWebStorageQueryTargetMetadataKey(this.persistenceKey, e));
+            if (t) {
+                const r = __PRIVATE_QueryTargetMetadata.Rs(e, t);
+                r && (n = r.state);
             }
         }
-        return this.Ks.fs(e), this.Ns(), t;
+        // 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.Ks.fs(e), this.Ns(), n;
     }
     removeLocalQueryTarget(e) {
         this.Ks.gs(e), this.Ns();
@@ -13544,8 +13546,8 @@ class __PRIVATE_MemorySharedClientState {
     updateMutationState(e, t, n) {
         // No op.
     }
-    addLocalQueryTarget(e) {
-        return this.so.fs(e), this.oo[e] || "not-current";
+    addLocalQueryTarget(e, t = !0) {
+        return t && this.so.fs(e), this.oo[e] || "not-current";
     }
     updateQueryState(e, t, n) {
         this.oo[e] = t;
@@ -14417,7 +14419,7 @@ class __PRIVATE_PersistentStream {
         })), this.stream.mo((e => {
             n((() => this.I_(e)));
         })), this.stream.onMessage((e => {
-            n((() => 1 == ++this.e_ ? this.d_(e) : this.onNext(e)));
+            n((() => 1 == ++this.e_ ? this.E_(e) : this.onNext(e)));
         }));
     }
     i_() {
@@ -14461,7 +14463,7 @@ class __PRIVATE_PersistentStream {
     T_(e, t) {
         return this.connection.Bo("Listen", e, t);
     }
-    d_(e) {
+    E_(e) {
         return this.onNext(e);
     }
     onNext(e) {
@@ -14475,7 +14477,7 @@ class __PRIVATE_PersistentStream {
             const t = e.targetChange;
             return t.targetIds && t.targetIds.length ? SnapshotVersion.min() : t.readTime ? __PRIVATE_fromVersion(t.readTime) : SnapshotVersion.min();
         }(e);
-        return this.listener.E_(t, n);
+        return this.listener.d_(t, n);
     }
     /**
      * Registers interest in the results of the given target. If the target
@@ -14555,7 +14557,7 @@ class __PRIVATE_PersistentStream {
     T_(e, t) {
         return this.connection.Bo("Write", e, t);
     }
-    d_(e) {
+    E_(e) {
         // Always capture the last stream token.
         return __PRIVATE_hardAssert(!!e.streamToken), this.lastStreamToken = e.streamToken, 
         // The first response is always the handshake response
@@ -15150,7 +15152,7 @@ async function __PRIVATE_remoteStoreHandleCredentialChange(e, t) {
         Eo: __PRIVATE_onWatchStreamConnected.bind(null, e),
         Ro: __PRIVATE_onWatchStreamOpen.bind(null, e),
         mo: __PRIVATE_onWatchStreamClose.bind(null, e),
-        E_: __PRIVATE_onWatchStreamChange.bind(null, e)
+        d_: __PRIVATE_onWatchStreamChange.bind(null, e)
     }), e.B_.push((async t => {
         t ? (e.K_.s_(), __PRIVATE_shouldStartWatchStream(e) ? __PRIVATE_startWatchStream(e) : e.q_.set("Unknown" /* OnlineState.Unknown */)) : (await e.K_.stop(), 
         __PRIVATE_cleanUpWatchStreamState(e));
@@ -15738,13 +15740,13 @@ class __PRIVATE_QueryListener {
     constructor(e) {
         this.serializer = e;
     }
-    ds(e) {
+    Es(e) {
         return fromName(this.serializer, e);
     }
     /**
      * Converts a BundleDocument to a MutableDocument.
-     */    Es(e) {
-        return e.metadata.exists ? __PRIVATE_fromDocument(this.serializer, e.document, !1) : MutableDocument.newNoDocument(this.ds(e.metadata.name), this.As(e.metadata.readTime));
+     */    ds(e) {
+        return e.metadata.exists ? __PRIVATE_fromDocument(this.serializer, e.document, !1) : MutableDocument.newNoDocument(this.Es(e.metadata.name), this.As(e.metadata.readTime));
     }
     As(e) {
         return __PRIVATE_fromVersion(e);
@@ -15786,7 +15788,7 @@ class __PRIVATE_QueryListener {
     ha(e) {
         const t = new Map, n = new __PRIVATE_BundleConverterImpl(this.serializer);
         for (const r of e) if (r.metadata.queries) {
-            const e = n.ds(r.metadata.name);
+            const e = n.Es(r.metadata.name);
             for (const n of r.metadata.queries) {
                 const r = (t.get(n) || __PRIVATE_documentKeySet()).add(e);
                 t.set(n, r);
@@ -15860,7 +15862,7 @@ class __PRIVATE_RemovedLimboDocument {
     constructor(e, 
     /** Documents included in the remote target */
     t) {
-        this.query = e, this.Ta = t, this.da = null, this.hasCachedResults = !1, 
+        this.query = e, this.Ta = t, this.Ea = null, this.hasCachedResults = !1, 
         /**
          * A flag whether the view is current with the backend. A view is considered
          * current after it has seen the current flag from the backend and did not
@@ -15869,7 +15871,7 @@ class __PRIVATE_RemovedLimboDocument {
          */
         this.current = !1, 
         /** Documents in the view but not in the remote target */
-        this.Ea = __PRIVATE_documentKeySet(), 
+        this.da = __PRIVATE_documentKeySet(), 
         /** Document Keys that have local changes */
         this.mutatedKeys = __PRIVATE_documentKeySet(), this.Aa = __PRIVATE_newQueryComparator(e), 
         this.Ra = new DocumentSet(this.Aa);
@@ -16014,10 +16016,10 @@ class __PRIVATE_RemovedLimboDocument {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ (e.type, t.type) || this.Aa(e.doc, t.doc))), this.pa(n), r = null != r && r;
-        const o = t && !r ? this.ya() : [], _ = 0 === this.Ea.size && this.current && !r ? 1 /* SyncState.Synced */ : 0 /* SyncState.Local */ , a = _ !== this.da;
+        const o = t && !r ? this.ya() : [], _ = 0 === this.da.size && this.current && !r ? 1 /* SyncState.Synced */ : 0 /* SyncState.Local */ , a = _ !== this.Ea;
         // We are at synced state if there is no limbo docs are waiting to be resolved, view is current
         // with the backend, and the query is not pending to reset due to existence filter mismatch.
-                if (this.da = _, 0 !== s.length || a) {
+                if (this.Ea = _, 0 !== s.length || a) {
             return {
                 snapshot: new ViewSnapshot(this.query, e.Ra, i, s, e.mutatedKeys, 0 /* SyncState.Local */ === _, a, 
                 /* excludesMetadataChanges= */ !1, !!n && n.resumeToken.approximateByteSize() > 0),
@@ -16068,15 +16070,15 @@ class __PRIVATE_RemovedLimboDocument {
         if (!this.current) return [];
         // TODO(klimt): Do this incrementally so that it's not quadratic when
         // updating many documents.
-                const e = this.Ea;
-        this.Ea = __PRIVATE_documentKeySet(), this.Ra.forEach((e => {
-            this.Sa(e.key) && (this.Ea = this.Ea.add(e.key));
+                const e = this.da;
+        this.da = __PRIVATE_documentKeySet(), this.Ra.forEach((e => {
+            this.Sa(e.key) && (this.da = this.da.add(e.key));
         }));
         // Diff the new limbo docs with the old limbo docs.
         const t = [];
         return e.forEach((e => {
-            this.Ea.has(e) || t.push(new __PRIVATE_RemovedLimboDocument(e));
-        })), this.Ea.forEach((n => {
+            this.da.has(e) || t.push(new __PRIVATE_RemovedLimboDocument(e));
+        })), this.da.forEach((n => {
             e.has(n) || t.push(new __PRIVATE_AddedLimboDocument(n));
         })), t;
     }
@@ -16101,7 +16103,7 @@ class __PRIVATE_RemovedLimboDocument {
      */
     // PORTING NOTE: Multi-tab only.
     ba(e) {
-        this.Ta = e.Ts, this.Ea = __PRIVATE_documentKeySet();
+        this.Ta = e.Ts, this.da = __PRIVATE_documentKeySet();
         const t = this.ma(e.documents);
         return this.applyChanges(t, /* limboResolutionEnabled= */ !0);
     }
@@ -16112,7 +16114,7 @@ class __PRIVATE_RemovedLimboDocument {
      */
     // PORTING NOTE: Multi-tab only.
     Da() {
-        return ViewSnapshot.fromInitialDocuments(this.query, this.Ra, this.mutatedKeys, 0 /* SyncState.Local */ === this.da, this.hasCachedResults);
+        return ViewSnapshot.fromInitialDocuments(this.query, this.Ra, this.mutatedKeys, 0 /* SyncState.Local */ === this.Ea, this.hasCachedResults);
     }
 }
 
@@ -16236,7 +16238,7 @@ async function __PRIVATE_syncEngineListen(e, t, n = !0) {
 }
 
 async function __PRIVATE_allocateTargetAndMaybeListen(e, t, n, r) {
-    const i = await __PRIVATE_localStoreAllocateTarget(e.localStore, __PRIVATE_queryToTarget(t)), s = i.targetId, o = n ? e.sharedClientState.addLocalQueryTarget(s) : "not-current";
+    const i = await __PRIVATE_localStoreAllocateTarget(e.localStore, __PRIVATE_queryToTarget(t)), s = i.targetId, o = e.sharedClientState.addLocalQueryTarget(s, n);
     let _;
     return r && (_ = await __PRIVATE_initializeViewAndComputeSnapshot(e, t, s, "current" === o, i.resumeToken)), 
     e.isPrimaryClient && n && __PRIVATE_remoteStoreListen(e.remoteStore, i), _;
@@ -16413,7 +16415,7 @@ async function __PRIVATE_allocateTargetAndMaybeListen(e, t, n, r) {
                 // Run global snapshot listeners if a consistent snapshot has been emitted.
                 e.Z_(t) && (r = !0);
             })), r && __PRIVATE_raiseSnapshotsInSyncEvent(n);
-        }(r.eventManager, t), e.length && r.Ca.E_(e), r.onlineState = t, r.isPrimaryClient && r.sharedClientState.setOnlineState(t);
+        }(r.eventManager, t), e.length && r.Ca.d_(e), r.onlineState = t, r.isPrimaryClient && r.sharedClientState.setOnlineState(t);
     }
 }
 
@@ -16617,7 +16619,7 @@ async function __PRIVATE_syncEngineEmitNewSnapsAndNotifyLocalStore(e, t, n) {
                 s.push(t);
             }
         })));
-    })), await Promise.all(o), r.Ca.E_(i), await async function __PRIVATE_localStoreNotifyLocalViewChanges(e, t) {
+    })), await Promise.all(o), r.Ca.d_(i), await async function __PRIVATE_localStoreNotifyLocalViewChanges(e, t) {
         const n = __PRIVATE_debugCast(e);
         try {
             await n.persistence.runTransaction("notifyLocalViewChanges", "readwrite", (e => PersistencePromise.forEach(t, (t => PersistencePromise.forEach(t.$i, (r => n.persistence.referenceDelegate.addReference(e, t.targetId, r))).next((() => PersistencePromise.forEach(t.Ui, (r => n.persistence.referenceDelegate.removeReference(e, t.targetId, r)))))))));
@@ -16795,7 +16797,7 @@ async function __PRIVATE_synchronizeQueryViewsAndRaiseSnapshots(e, t, n) {
         }
         i.push(t);
     }
-    return r.Ca.E_(s), i;
+    return r.Ca.d_(s), i;
 }
 
 /**
@@ -16878,7 +16880,7 @@ function __PRIVATE_ensureWatchCallbacks(e) {
     return t.remoteStore.remoteSyncer.applyRemoteEvent = __PRIVATE_syncEngineApplyRemoteEvent.bind(null, t), 
     t.remoteStore.remoteSyncer.getRemoteKeysForTarget = __PRIVATE_syncEngineGetRemoteKeysForTarget.bind(null, t), 
     t.remoteStore.remoteSyncer.rejectListen = __PRIVATE_syncEngineRejectListen.bind(null, t), 
-    t.Ca.E_ = __PRIVATE_eventManagerOnWatchChange.bind(null, t.eventManager), t.Ca.$a = __PRIVATE_eventManagerOnWatchError.bind(null, t.eventManager), 
+    t.Ca.d_ = __PRIVATE_eventManagerOnWatchChange.bind(null, t.eventManager), t.Ca.$a = __PRIVATE_eventManagerOnWatchError.bind(null, t.eventManager), 
     t;
 }
 
@@ -18603,13 +18605,13 @@ function doc(e, t, ...n) {
         // 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.du = () => {
+        this.Eu = () => {
             const e = getDocument();
             e && __PRIVATE_logDebug("AsyncQueue", "Visibility state changed to " + e.visibilityState), 
             this.t_.jo();
         };
         const e = getDocument();
-        e && "function" == typeof e.addEventListener && e.addEventListener("visibilitychange", this.du);
+        e && "function" == typeof e.addEventListener && e.addEventListener("visibilitychange", this.Eu);
     }
     get isShuttingDown() {
         return this.cu;
@@ -18622,7 +18624,7 @@ function doc(e, t, ...n) {
         this.enqueue(e);
     }
     enqueueAndForgetEvenWhileRestricted(e) {
-        this.Eu(), 
+        this.du(), 
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         this.Au(e);
     }
@@ -18630,11 +18632,11 @@ function doc(e, t, ...n) {
         if (!this.cu) {
             this.cu = !0, this.Iu = e || !1;
             const t = getDocument();
-            t && "function" == typeof t.removeEventListener && t.removeEventListener("visibilitychange", this.du);
+            t && "function" == typeof t.removeEventListener && t.removeEventListener("visibilitychange", this.Eu);
         }
     }
     enqueue(e) {
-        if (this.Eu(), this.cu) 
+        if (this.du(), this.cu) 
         // Return a Promise which never resolves.
         return new Promise((() => {}));
         // Create a deferred Promise that we can return to the callee. This
@@ -18711,13 +18713,13 @@ function doc(e, t, ...n) {
         return this.au = t, t;
     }
     enqueueAfterDelay(e, t, n) {
-        this.Eu(), 
+        this.du(), 
         // Fast-forward delays for timerIds that have been overridden.
         this.Tu.indexOf(e) > -1 && (t = 0);
         const r = DelayedOperation.createAndSchedule(this, e, t, n, (e => this.Vu(e)));
         return this.lu.push(r), r;
     }
-    Eu() {
+    du() {
         this.hu && fail();
     }
     verifyOperationInProgress() {}
@@ -22233,9 +22235,9 @@ let Me = null;
         return r = Object.assign({
             useFetchStreams: t
         }, r), s._setSettings(r), s;
-    }), "PUBLIC").setMultipleInstances(!0)), app.registerVersion(S, "4.7.1-canary.16d62d4fa", e), 
+    }), "PUBLIC").setMultipleInstances(!0)), app.registerVersion(S, "4.7.1-canary.629919ea7", e), 
     // BUILD_TARGET will be replaced by values like esm5, esm2017, cjs5, etc during the compilation
-    app.registerVersion(S, "4.7.1-canary.16d62d4fa", "cjs2017");
+    app.registerVersion(S, "4.7.1-canary.629919ea7", "cjs2017");
 }();
 
 exports.AbstractUserDataWriter = AbstractUserDataWriter;