@firebase/firestore 1.14.0-canary.daf63c2c → 1.14.0

package/dist/index.memory.esm.js

@@ -267,7 +267,7 @@ var b = {
             // outstanding so the response is potentially for a previous user (which
             // user, we can't be sure).
             if (t.I !== e) throw new A(b.ABORTED, "getToken aborted due to token change.");
-            return n ? (Le("string" == typeof n.accessToken, "Invalid tokenData returned from getToken():" + n), 
+            return n ? (Ve("string" == typeof n.accessToken, "Invalid tokenData returned from getToken():" + n), 
             new N(n.accessToken, t.currentUser)) : null;
         })) : Promise.resolve(null);
     }, t.prototype.l = function() {
@@ -285,7 +285,7 @@ var b = {
     // to guarantee to get the actual user.
     t.prototype.A = function() {
         var t = this.auth && this.auth.getUid();
-        return Le(null === t || "string" == typeof t, "Received invalid UID: " + t), new E(t);
+        return Ve(null === t || "string" == typeof t, "Received invalid UID: " + t), new E(t);
     }, t;
 }(), _ = /** @class */ function() {
     function t(t, e) {
@@ -331,7 +331,7 @@ var b = {
     }, t.prototype.toMillis = function() {
         return 1e3 * this.seconds + this.nanoseconds / 1e6;
     }, t.prototype.g = function(t) {
-        return this.seconds === t.seconds ? Ue(this.nanoseconds, t.nanoseconds) : Ue(this.seconds, t.seconds);
+        return this.seconds === t.seconds ? Oe(this.nanoseconds, t.nanoseconds) : Oe(this.seconds, t.seconds);
     }, t.prototype.isEqual = function(t) {
         return t.seconds === this.seconds && t.nanoseconds === this.nanoseconds;
     }, t.prototype.toString = function() {
@@ -382,8 +382,8 @@ var b = {
  */
 var D = /** @class */ function() {
     function t(t, e, n) {
-        void 0 === e ? e = 0 : e > t.length && Ve("offset " + e + " out of range " + t.length), 
-        void 0 === n ? n = t.length - e : n > t.length - e && Ve("length " + n + " out of range " + (t.length - e)), 
+        void 0 === e ? e = 0 : e > t.length && Le("offset " + e + " out of range " + t.length), 
+        void 0 === n ? n = t.length - e : n > t.length - e && Le("length " + n + " out of range " + (t.length - e)), 
         this.segments = t, this.offset = e, this.N = n;
     }
     return Object.defineProperty(t.prototype, "length", {
@@ -434,7 +434,7 @@ var D = /** @class */ function() {
         }
         return t.length < e.length ? -1 : t.length > e.length ? 1 : 0;
     }, t;
-}(), V = /** @class */ function(e) {
+}(), L = /** @class */ function(e) {
     function n() {
         return null !== e && e.apply(this, arguments) || this;
     }
@@ -467,9 +467,9 @@ var D = /** @class */ function() {
 /**
  * A slash-separated path for navigating resources (documents and collections)
  * within Firestore.
- */ V.H = new V([]);
+ */ L.H = new L([]);
 
-var L = /^[_a-zA-Z][_a-zA-Z0-9]*$/, O = /** @class */ function(e) {
+var V = /^[_a-zA-Z][_a-zA-Z0-9]*$/, U = /** @class */ function(e) {
     function n() {
         return null !== e && e.apply(this, arguments) || this;
     }
@@ -481,7 +481,7 @@ var L = /^[_a-zA-Z][_a-zA-Z0-9]*$/, O = /** @class */ function(e) {
      * without escaping.
      */
     n.J = function(t) {
-        return L.test(t);
+        return V.test(t);
     }, n.prototype.G = function() {
         return this.j().map((function(t) {
             return t = t.replace("\\", "\\\\").replace("`", "\\`"), n.J(t) || (t = "`" + t + "`"), 
@@ -530,7 +530,7 @@ var L = /^[_a-zA-Z][_a-zA-Z0-9]*$/, O = /** @class */ function(e) {
     }, n;
 }(D);
 
-/** A dot-separated path for navigating sub-objects within a document. */ O.H = new O([]);
+/** A dot-separated path for navigating sub-objects within a document. */ U.H = new U([]);
 
 /**
  * @license
@@ -548,21 +548,21 @@ var L = /^[_a-zA-Z][_a-zA-Z0-9]*$/, O = /** @class */ function(e) {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var U = /** @class */ function() {
+var O = /** @class */ function() {
     function t(t) {
         this.path = t;
     }
     return t.tt = function(e) {
-        return new t(V.K(e).$(5));
+        return new t(L.K(e).$(5));
     }, 
     /** Returns true if the document is in the specified collectionId. */ t.prototype.et = function(t) {
         return this.path.length >= 2 && this.path.get(this.path.length - 2) === t;
     }, t.prototype.isEqual = function(t) {
-        return null !== t && 0 === V.k(this.path, t.path);
+        return null !== t && 0 === L.k(this.path, t.path);
     }, t.prototype.toString = function() {
         return this.path.toString();
     }, t.k = function(t, e) {
-        return V.k(t.path, e.path);
+        return L.k(t.path, e.path);
     }, t.st = function(t) {
         return t.length % 2 == 0;
     }, 
@@ -573,11 +573,11 @@ var U = /** @class */ function() {
      * @return A new instance of DocumentKey
      */
     t.it = function(e) {
-        return new t(new V(e.slice()));
+        return new t(new L(e.slice()));
     }, t;
 }();
 
-U.EMPTY = new U(new V([]));
+O.EMPTY = new O(new L([]));
 
 /**
  * @license
@@ -676,15 +676,15 @@ var C = /** @class */ function() {
     }, 
     // Returns an iterator over the SortedMap.
     t.prototype.lt = function() {
-        return new q(this.root, null, this.k, !1);
+        return new P(this.root, null, this.k, !1);
     }, t.prototype._t = function(t) {
-        return new q(this.root, t, this.k, !1);
+        return new P(this.root, t, this.k, !1);
     }, t.prototype.dt = function() {
-        return new q(this.root, null, this.k, !0);
+        return new P(this.root, null, this.k, !0);
     }, t.prototype.ft = function(t) {
-        return new q(this.root, t, this.k, !0);
+        return new P(this.root, t, this.k, !0);
     }, t;
-}(), q = /** @class */ function() {
+}(), P = /** @class */ function() {
     function t(t, e, n, r) {
         this.wt = r, this.Tt = [];
         for (var i = 1; !t.q(); ) if (i = e ? n(t.key, e) : 1, 
@@ -813,10 +813,10 @@ var C = /** @class */ function() {
     // In a balanced RB tree, the black-depth (number of black nodes) from root to
     // leaves is equal on both sides.  This function verifies that or asserts.
     t.prototype.Ct = function() {
-        if (this.Vt() && this.left.Vt()) throw Ve("Red node has red child(" + this.key + "," + this.value + ")");
-        if (this.right.Vt()) throw Ve("Right child of (" + this.key + "," + this.value + ") is red");
+        if (this.Vt() && this.left.Vt()) throw Le("Red node has red child(" + this.key + "," + this.value + ")");
+        if (this.right.Vt()) throw Le("Right child of (" + this.key + "," + this.value + ") is red");
         var t = this.left.Ct();
-        if (t !== this.right.Ct()) throw Ve("Black depths differ");
+        if (t !== this.right.Ct()) throw Le("Black depths differ");
         return t + (this.Vt() ? 0 : 1);
     }, t;
 }();
@@ -834,31 +834,31 @@ M.EMPTY = new (/** @class */ function() {
     }
     return Object.defineProperty(t.prototype, "key", {
         get: function() {
-            throw Ve("LLRBEmptyNode has no key.");
+            throw Le("LLRBEmptyNode has no key.");
         },
         enumerable: !0,
         configurable: !0
     }), Object.defineProperty(t.prototype, "value", {
         get: function() {
-            throw Ve("LLRBEmptyNode has no value.");
+            throw Le("LLRBEmptyNode has no value.");
         },
         enumerable: !0,
         configurable: !0
     }), Object.defineProperty(t.prototype, "color", {
         get: function() {
-            throw Ve("LLRBEmptyNode has no color.");
+            throw Le("LLRBEmptyNode has no color.");
         },
         enumerable: !0,
         configurable: !0
     }), Object.defineProperty(t.prototype, "left", {
         get: function() {
-            throw Ve("LLRBEmptyNode has no left child.");
+            throw Le("LLRBEmptyNode has no left child.");
         },
         enumerable: !0,
         configurable: !0
     }), Object.defineProperty(t.prototype, "right", {
         get: function() {
-            throw Ve("LLRBEmptyNode has no right child.");
+            throw Le("LLRBEmptyNode has no right child.");
         },
         enumerable: !0,
         configurable: !0
@@ -918,7 +918,7 @@ M.EMPTY = new (/** @class */ function() {
  * NOTE: if provided comparator returns 0 for two elements, we consider them to
  * be equal!
  */
-var P = /** @class */ function() {
+var q = /** @class */ function() {
     function t(t) {
         this.k = t, this.data = new C(this.k);
     }
@@ -960,9 +960,9 @@ var P = /** @class */ function() {
         var e = this.data._t(t);
         return e.Rt() ? e.Et().key : null;
     }, t.prototype.lt = function() {
-        return new x(this.data.lt());
+        return new F(this.data.lt());
     }, t.prototype._t = function(t) {
-        return new x(this.data._t(t));
+        return new F(this.data._t(t));
     }, 
     /** Inserts or updates an element */ t.prototype.add = function(t) {
         return this.rt(this.data.remove(t).nt(t, !0));
@@ -999,7 +999,7 @@ var P = /** @class */ function() {
         var n = new t(this.k);
         return n.data = e, n;
     }, t;
-}(), x = /** @class */ function() {
+}(), F = /** @class */ function() {
     function t(t) {
         this.Lt = t;
     }
@@ -1032,7 +1032,7 @@ function G(t) {
     return e;
 }
 
-function F(t, e) {
+function x(t, e) {
     for (var n in t) Object.prototype.hasOwnProperty.call(t, n) && e(n, t[n]);
 }
 
@@ -1064,7 +1064,7 @@ function j(t) {
  * sent on the wire. This class abstracts away this differentiation by holding
  * the proto byte string in a common class that must be converted into a string
  * before being sent as a proto.
- */ var B = /** @class */ function() {
+ */ var Q = /** @class */ function() {
     function t(t) {
         this.$t = t;
     }
@@ -1089,17 +1089,17 @@ function j(t) {
     }, t.prototype.Mt = function() {
         return 2 * this.$t.length;
     }, t.prototype.C = function(t) {
-        return Ue(this.$t, t.$t);
+        return Oe(this.$t, t.$t);
     }, t.prototype.isEqual = function(t) {
         return this.$t === t.$t;
     }, t;
 }();
 
-function z(t) {
+function B(t) {
     return null == t;
 }
 
-/** Returns whether the value represents -0. */ function Q(t) {
+/** Returns whether the value represents -0. */ function z(t) {
     // Detect if the value is -0.0. Based on polyfill from
     // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
     return -0 === t && 1 / t == -1 / 0;
@@ -1140,15 +1140,15 @@ function z(t) {
  * limitations under the License.
  */
 // A RegExp matching ISO 8601 UTC timestamps with optional fraction.
-B.Ut = new B("");
+Q.Ut = new Q("");
 
 var W = new RegExp(/^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d(?:\.(\d+))?Z$/);
 
 /** Extracts the backend's type order for the provided value. */ function J(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 ? H(t) ? 4 /* ServerTimestampValue */ : 10 /* ObjectValue */ : Ve("Invalid value type: " + JSON.stringify(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 ? H(t) ? 4 /* ServerTimestampValue */ : 10 /* ObjectValue */ : Le("Invalid value type: " + JSON.stringify(t));
 }
 
-/** Tests `left` and `right` for equality based on the backend semantics. */ function X(t, e) {
+/** Tests `left` and `right` for equality based on the backend semantics. */ function Z(t, e) {
     var n = J(t);
     if (n !== J(e)) return !1;
     switch (n) {
@@ -1191,42 +1191,42 @@ var W = new RegExp(/^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d(?:\.(\d+))?Z$/);
             if ("integerValue" in t && "integerValue" in e) return nt(t.integerValue) === nt(e.integerValue);
             if ("doubleValue" in t && "doubleValue" in e) {
                 var n = nt(t.doubleValue), r = nt(e.doubleValue);
-                return n === r ? Q(n) === Q(r) : isNaN(n) && isNaN(r);
+                return n === r ? z(n) === z(r) : isNaN(n) && isNaN(r);
             }
             return !1;
         }(t, e);
 
       case 9 /* ArrayValue */ :
-        return Ce(t.arrayValue.values || [], e.arrayValue.values || [], X);
+        return Ce(t.arrayValue.values || [], e.arrayValue.values || [], Z);
 
       case 10 /* ObjectValue */ :
         return function(t, e) {
             var n = t.mapValue.fields || {}, r = e.mapValue.fields || {};
             if (G(n) !== G(r)) return !1;
-            for (var i in n) if (n.hasOwnProperty(i) && (void 0 === r[i] || !X(n[i], r[i]))) return !1;
+            for (var i in n) if (n.hasOwnProperty(i) && (void 0 === r[i] || !Z(n[i], r[i]))) return !1;
             return !0;
         }(t, e);
 
       default:
-        return Ve("Unexpected value type: " + JSON.stringify(t));
+        return Le("Unexpected value type: " + JSON.stringify(t));
     }
 }
 
-function K(t, e) {
+function X(t, e) {
     return void 0 !== (t.values || []).find((function(t) {
-        return X(t, e);
+        return Z(t, e);
     }));
 }
 
-function Z(t, e) {
+function K(t, e) {
     var n = J(t), r = J(e);
-    if (n !== r) return Ue(n, r);
+    if (n !== r) return Oe(n, r);
     switch (n) {
       case 0 /* NullValue */ :
         return 0;
 
       case 1 /* BooleanValue */ :
-        return Ue(t.booleanValue, e.booleanValue);
+        return Oe(t.booleanValue, e.booleanValue);
 
       case 2 /* NumberValue */ :
         return function(t, e) {
@@ -1243,7 +1243,7 @@ function Z(t, e) {
         return $(Y(t), Y(e));
 
       case 5 /* StringValue */ :
-        return Ue(t.stringValue, e.stringValue);
+        return Oe(t.stringValue, e.stringValue);
 
       case 6 /* BlobValue */ :
         return function(t, e) {
@@ -1254,25 +1254,25 @@ function Z(t, e) {
       case 7 /* RefValue */ :
         return function(t, e) {
             for (var n = t.split("/"), r = e.split("/"), i = 0; i < n.length && i < r.length; i++) {
-                var o = Ue(n[i], r[i]);
+                var o = Oe(n[i], r[i]);
                 if (0 !== o) return o;
             }
-            return Ue(n.length, r.length);
+            return Oe(n.length, r.length);
         }(t.referenceValue, e.referenceValue);
 
       case 8 /* GeoPointValue */ :
         return function(t, e) {
-            var n = Ue(nt(t.latitude), nt(e.latitude));
-            return 0 !== n ? n : Ue(nt(t.longitude), nt(e.longitude));
+            var n = Oe(nt(t.latitude), nt(e.latitude));
+            return 0 !== n ? n : Oe(nt(t.longitude), nt(e.longitude));
         }(t.geoPointValue, e.geoPointValue);
 
       case 9 /* ArrayValue */ :
         return function(t, e) {
             for (var n = t.values || [], r = e.values || [], i = 0; i < n.length && i < r.length; ++i) {
-                var o = Z(n[i], r[i]);
+                var o = K(n[i], r[i]);
                 if (o) return o;
             }
-            return Ue(n.length, r.length);
+            return Oe(n.length, r.length);
         }(t.arrayValue, e.arrayValue);
 
       case 10 /* ObjectValue */ :
@@ -1284,23 +1284,23 @@ function Z(t, e) {
             // canonical IDs are independent of insertion order.
                         r.sort(), o.sort();
             for (var s = 0; s < r.length && s < o.length; ++s) {
-                var u = Ue(r[s], o[s]);
+                var u = Oe(r[s], o[s]);
                 if (0 !== u) return u;
-                var a = Z(n[r[s]], i[o[s]]);
+                var a = K(n[r[s]], i[o[s]]);
                 if (0 !== a) return a;
             }
-            return Ue(r.length, o.length);
+            return Oe(r.length, o.length);
         }(t.mapValue, e.mapValue);
 
       default:
-        throw Ve("Invalid value type: " + n);
+        throw Le("Invalid value type: " + n);
     }
 }
 
 function $(t, e) {
-    if ("string" == typeof t && "string" == typeof e && t.length === e.length) return Ue(t, e);
-    var n = et(t), r = et(e), i = Ue(n.seconds, r.seconds);
-    return 0 !== i ? i : Ue(n.nanos, r.nanos);
+    if ("string" == typeof t && "string" == typeof e && t.length === e.length) return Oe(t, e);
+    var n = et(t), r = et(e), i = Oe(n.seconds, r.seconds);
+    return 0 !== i ? i : Oe(n.nanos, r.nanos);
 }
 
 function tt(t) {
@@ -1309,7 +1309,7 @@ function tt(t) {
             var e = et(t);
             return "time(" + e.seconds + "," + e.nanos + ")";
         }(e.timestampValue) : "stringValue" in e ? e.stringValue : "bytesValue" in e ? rt(e.bytesValue).toBase64() : "referenceValue" in e ? (r = e.referenceValue, 
-        U.tt(r).toString()) : "geoPointValue" in e ? "geo(" + (n = e.geoPointValue).latitude + "," + n.longitude + ")" : "arrayValue" in e ? function(e) {
+        O.tt(r).toString()) : "geoPointValue" in e ? "geo(" + (n = e.geoPointValue).latitude + "," + n.longitude + ")" : "arrayValue" in e ? function(e) {
             for (var n = "[", r = !0, i = 0, o = e.values || []; i < o.length; i++) {
                 var s = o[i];
                 r ? r = !1 : n += ",", n += t(s);
@@ -1324,7 +1324,7 @@ function tt(t) {
                 r ? r = !1 : n += ",", n += s + ":" + t(e.fields[s]);
             }
             return n + "}";
-        }(e.mapValue) : Ve("Invalid value type: " + JSON.stringify(e));
+        }(e.mapValue) : Le("Invalid value type: " + JSON.stringify(e));
         var n, r;
     }(t);
 }
@@ -1333,12 +1333,12 @@ function et(t) {
     // The json interface (for the browser) will return an iso timestamp string,
     // while the proto js library (for node) will return a
     // google.protobuf.Timestamp instance.
-    if (Le(!!t, "Cannot normalize null or undefined timestamp."), "string" == typeof t) {
+    if (Ve(!!t, "Cannot normalize null or undefined timestamp."), "string" == typeof t) {
         // The date string can have higher precision (nanos) than the Date class
         // (millis), so we do some custom parsing here.
         // Parse the nanos right out of the string.
         var e = 0, n = W.exec(t);
-        if (Le(!!n, "invalid timestamp: " + t), n[1]) {
+        if (Ve(!!n, "invalid timestamp: " + t), n[1]) {
             // Pad the fraction out to 9 digits (nanos).
             var r = n[1];
             r = (r + "000000000").substr(0, 9), e = Number(r);
@@ -1365,7 +1365,7 @@ function et(t) {
 }
 
 /** Converts the possible Proto types for Blobs into a ByteString. */ function rt(t) {
-    return "string" == typeof t ? B.fromBase64String(t) : B.fromUint8Array(t);
+    return "string" == typeof t ? Q.fromBase64String(t) : Q.fromUint8Array(t);
 }
 
 /** Returns a reference value for the provided database and key. */ function it(t, e) {
@@ -1459,7 +1459,7 @@ var ft = /** @class */ function() {
     }, t.prototype.apply = function(t) {
         for (var e = dt(t), n = function(t) {
             e.some((function(e) {
-                return X(e, t);
+                return Z(e, t);
             })) || e.push(t);
         }, r = 0, i = this.elements; r < i.length; r++) {
             n(i[r]);
@@ -1473,7 +1473,7 @@ var ft = /** @class */ function() {
         return null;
         // Array transforms are idempotent and don't require a base value.
         }, t.prototype.isEqual = function(e) {
-        return e instanceof t && Ce(this.elements, e.elements, X);
+        return e instanceof t && Ce(this.elements, e.elements, Z);
     }, t;
 }(), lt = /** @class */ function() {
     function t(t) {
@@ -1489,7 +1489,7 @@ var ft = /** @class */ function() {
     }, t.prototype.apply = function(t) {
         for (var e = dt(t), n = function(t) {
             e = e.filter((function(e) {
-                return !X(e, t);
+                return !Z(e, t);
             }));
         }, r = 0, i = this.elements; r < i.length; r++) {
             n(i[r]);
@@ -1503,7 +1503,7 @@ var ft = /** @class */ function() {
         return null;
         // Array transforms are idempotent and don't require a base value.
         }, t.prototype.isEqual = function(e) {
-        return e instanceof t && Ce(this.elements, e.elements, X);
+        return e instanceof t && Ce(this.elements, e.elements, Z);
     }, t;
 }(), pt = /** @class */ function() {
     function t(t, e) {
@@ -1530,7 +1530,7 @@ var ft = /** @class */ function() {
         };
         var e;
     }, t.prototype.isEqual = function(e) {
-        return e instanceof t && X(this.Qt, e.Qt);
+        return e instanceof t && Z(this.Qt, e.Qt);
     }, t.prototype.asNumber = function(t) {
         return nt(t.integerValue || t.doubleValue);
     }, t;
@@ -1573,7 +1573,7 @@ var ft = /** @class */ function() {
     return t.Gt = function(e) {
         return new t(e);
     }, t.zt = function(e) {
-        var n = new P(O.k);
+        var n = new q(U.k);
         return e.forEach((function(t) {
             return n = n.add(t);
         })), new t(n);
@@ -1792,7 +1792,7 @@ var wt = /** @class */ function() {
         r.Zt = gt.exists(!0), r;
     }
     return t(n, e), n.prototype.Bt = function(t, e) {
-        if (this.Yt(t), Le(null != e.transformResults, "Transform results missing for TransformMutation."), 
+        if (this.Yt(t), Ve(null != e.transformResults, "Transform results missing for TransformMutation."), 
         !this.Zt.Jt(t)) 
         // Since the mutation was not rejected, we know that the  precondition
         // matched on the backend. We therefore must not have the expected version
@@ -1840,7 +1840,7 @@ var wt = /** @class */ function() {
      */
     n.prototype.ae = function(t, e) {
         var n = [];
-        Le(this.fieldTransforms.length === e.length, "server transform result count (" + e.length + ") should match field transform count (" + this.fieldTransforms.length + ")");
+        Ve(this.fieldTransforms.length === e.length, "server transform result count (" + e.length + ") should match field transform count (" + this.fieldTransforms.length + ")");
         for (var r = 0; r < e.length; r++) {
             var i = this.fieldTransforms[r], o = i.transform, s = null;
             t instanceof St && (s = t.field(i.field)), n.push(o.Bt(s, e[r]));
@@ -1902,11 +1902,11 @@ var wt = /** @class */ function() {
         return (r = e.call(this) || this).key = t, r.Zt = n, r.type = 4 /* Verify */ , r;
     }
     return t(n, e), n.prototype.Bt = function(t, e) {
-        Ve("VerifyMutation should only be used in Transactions.");
+        Le("VerifyMutation should only be used in Transactions.");
     }, n.prototype.qt = function(t, e, n) {
-        Ve("VerifyMutation should only be used in Transactions.");
+        Le("VerifyMutation should only be used in Transactions.");
     }, n.prototype.ee = function(t) {
-        Ve("VerifyMutation should only be used in Transactions.");
+        Le("VerifyMutation should only be used in Transactions.");
     }, n.prototype.isEqual = function(t) {
         return t instanceof n && this.key.isEqual(t.key) && this.Zt.isEqual(t.Zt);
     }, n;
@@ -1938,9 +1938,9 @@ var wt = /** @class */ function() {
     t.prototype.se = function() {
         return this._e(this.proto.mapValue);
     }, t.prototype._e = function(t) {
-        var e = this, n = new P(O.k);
-        return F(t.fields || {}, (function(t, r) {
-            var i = new O([ t ]);
+        var e = this, n = new q(U.k);
+        return x(t.fields || {}, (function(t, r) {
+            var i = new U([ t ]);
             if (10 /* ObjectValue */ === J(r)) {
                 var o = e._e(r.mapValue).fields;
                 o.q() ? 
@@ -1957,7 +1957,7 @@ var wt = /** @class */ function() {
             n = n.add(i);
         })), yt.Gt(n);
     }, t.prototype.isEqual = function(t) {
-        return X(this.proto, t.proto);
+        return Z(this.proto, t.proto);
     }, 
     /** Creates a ObjectValueBuilder instance that is based on the current value. */ t.prototype.re = function() {
         return new _t(this);
@@ -2022,7 +2022,7 @@ var _t = /** @class */ function() {
         n.set(t.U(), e);
     }, 
     /** Returns an ObjectValue with all mutations applied. */ t.prototype.he = function() {
-        var t = this.Te(O.H, this.fe);
+        var t = this.Te(U.H, this.fe);
         return null != t ? new Tt(t) : this.de;
     }, 
     /**
@@ -2056,7 +2056,7 @@ var _t = /** @class */ function() {
         this.key = t, this.version = e;
     }
     return t.me = function(t, e) {
-        return U.k(t.key, e.key);
+        return O.k(t.key, e.key);
     }, t;
 }(), St = /** @class */ function(e) {
     function n(t, n, r, i) {
@@ -2082,7 +2082,7 @@ var _t = /** @class */ function() {
         configurable: !0
     }), n.Ie = function(t, e, n) {
         var r = e.field(t), i = n.field(t);
-        return null !== r && null !== i ? Z(r, i) : Ve("Trying to compare documents on fields that don't exist");
+        return null !== r && null !== i ? K(r, i) : Le("Trying to compare documents on fields that don't exist");
     }, n;
 }(kt), Rt = /** @class */ function(e) {
     function n(t, n, r) {
@@ -2116,7 +2116,7 @@ var _t = /** @class */ function() {
     }), n.prototype.isEqual = function(t) {
         return t instanceof n && t.version.isEqual(this.version) && t.key.isEqual(this.key);
     }, n;
-}(kt), Vt = /** @class */ function() {
+}(kt), Lt = /** @class */ function() {
     /**
      * Initializes a Target with a path and optional additional query constraints.
      * Path must currently be empty if this is a collection group query.
@@ -2139,7 +2139,7 @@ var _t = /** @class */ function() {
                 return t.canonicalId();
             })).join(","), t += "|ob:", t += this.orderBy.map((function(t) {
                 return t.canonicalId();
-            })).join(","), z(this.limit) || (t += "|l:", t += this.limit), this.startAt && (t += "|lb:", 
+            })).join(","), B(this.limit) || (t += "|l:", t += this.limit), this.startAt && (t += "|lb:", 
             t += this.startAt.canonicalId()), this.endAt && (t += "|ub:", t += this.endAt.canonicalId()), 
             this.Ae = t;
         }
@@ -2148,7 +2148,7 @@ var _t = /** @class */ function() {
         var t = this.path.G();
         return null !== this.collectionGroup && (t += " collectionGroup=" + this.collectionGroup), 
         this.filters.length > 0 && (t += ", filters: [" + this.filters.join(", ") + "]"), 
-        z(this.limit) || (t += ", limit: " + this.limit), this.orderBy.length > 0 && (t += ", orderBy: [" + this.orderBy.join(", ") + "]"), 
+        B(this.limit) || (t += ", limit: " + this.limit), this.orderBy.length > 0 && (t += ", orderBy: [" + this.orderBy.join(", ") + "]"), 
         this.startAt && (t += ", startAt: " + this.startAt.canonicalId()), this.endAt && (t += ", endAt: " + this.endAt.canonicalId()), 
         "Target(" + t + ")";
     }, t.prototype.isEqual = function(t) {
@@ -2159,9 +2159,9 @@ var _t = /** @class */ function() {
         for (var n = 0; n < this.filters.length; n++) if (!this.filters[n].isEqual(t.filters[n])) return !1;
         return this.collectionGroup === t.collectionGroup && !!this.path.isEqual(t.path) && !!(null !== this.startAt ? this.startAt.isEqual(t.startAt) : null === t.startAt) && (null !== this.endAt ? this.endAt.isEqual(t.endAt) : null === t.endAt);
     }, t.prototype.Pe = function() {
-        return U.st(this.path) && null === this.collectionGroup && 0 === this.filters.length;
+        return O.st(this.path) && null === this.collectionGroup && 0 === this.filters.length;
     }, t;
-}(), Lt = /** @class */ function() {
+}(), Vt = /** @class */ function() {
     /**
      * Initializes a Query with a path and optional additional query constraints.
      * Path must currently be empty if this is a collection group query.
@@ -2185,7 +2185,7 @@ var _t = /** @class */ function() {
                 // In order to implicitly add key ordering, we must also add the
                 // inequality filter field for it to be a valid query.
                 // Note that the default inequality field and key ordering is ascending.
-                t.Y() ? this.ge = [ Qt ] : this.ge = [ new zt(t), Qt ]; else {
+                t.Y() ? this.ge = [ zt ] : this.ge = [ new Bt(t), zt ]; else {
                     this.ge = [];
                     for (var n = !1, r = 0, i = this.Ve; r < i.length; r++) {
                         var o = i[r];
@@ -2195,7 +2195,7 @@ var _t = /** @class */ function() {
                         // The order of the implicit key ordering always matches the last
                         // explicit order by
                         var s = this.Ve.length > 0 ? this.Ve[this.Ve.length - 1].dir : Gt.ASCENDING;
-                        this.ge.push(s === Gt.ASCENDING ? Qt : Ht);
+                        this.ge.push(s === Gt.ASCENDING ? zt : Ht);
                     }
                 }
             }
@@ -2255,15 +2255,15 @@ var _t = /** @class */ function() {
     }, t.prototype.matches = function(t) {
         return this.Be(t) && this.xe(t) && this.Qe(t) && this.We(t);
     }, t.prototype.je = function() {
-        return !z(this.limit) && "F" /* First */ === this.pe;
+        return !B(this.limit) && "F" /* First */ === this.pe;
     }, t.prototype.Ge = function() {
-        return !z(this.limit) && "L" /* Last */ === this.pe;
+        return !B(this.limit) && "L" /* Last */ === this.pe;
     }, t.prototype.Ce = function() {
         return this.Ve.length > 0 ? this.Ve[0].field : null;
     }, t.prototype.Se = function() {
         for (var t = 0, e = this.filters; t < e.length; t++) {
             var n = e[t];
-            if (n instanceof Ut && n.ze()) return n.field;
+            if (n instanceof Ot && n.ze()) return n.field;
         }
         return null;
     }, 
@@ -2272,7 +2272,7 @@ var _t = /** @class */ function() {
     t.prototype.Ke = function(t) {
         for (var e = 0, n = this.filters; e < n.length; e++) {
             var r = n[e];
-            if (r instanceof Ut && t.indexOf(r.op) >= 0) return r.op;
+            if (r instanceof Ot && t.indexOf(r.op) >= 0) return r.op;
         }
         return null;
     }, t.prototype.Pe = function() {
@@ -2285,22 +2285,22 @@ var _t = /** @class */ function() {
      * representation.
      */
     t.prototype.Ue = function() {
-        if (!this.ye) if ("F" /* First */ === this.pe) this.ye = new Vt(this.path, this.collectionGroup, this.orderBy, this.filters, this.limit, this.startAt, this.endAt); else {
+        if (!this.ye) if ("F" /* First */ === this.pe) this.ye = new Lt(this.path, this.collectionGroup, this.orderBy, this.filters, this.limit, this.startAt, this.endAt); else {
             for (
             // Flip the orderBy directions since we want the last results
             var t = [], e = 0, n = this.orderBy; e < n.length; e++) {
                 var r = n[e], i = r.dir === Gt.DESCENDING ? Gt.ASCENDING : Gt.DESCENDING;
-                t.push(new zt(r.field, i));
+                t.push(new Bt(r.field, i));
             }
             // We need to swap the cursors to match the now-flipped query ordering.
-                        var o = this.endAt ? new Bt(this.endAt.position, !this.endAt.before) : null, s = this.startAt ? new Bt(this.startAt.position, !this.startAt.before) : null;
+                        var o = this.endAt ? new Qt(this.endAt.position, !this.endAt.before) : null, s = this.startAt ? new Qt(this.startAt.position, !this.startAt.before) : null;
             // Now return as a LimitType.First query.
-                        this.ye = new Vt(this.path, this.collectionGroup, t, this.filters, this.limit, o, s);
+                        this.ye = new Lt(this.path, this.collectionGroup, t, this.filters, this.limit, o, s);
         }
         return this.ye;
     }, t.prototype.Be = function(t) {
         var e = t.key.path;
-        return null !== this.collectionGroup ? t.key.et(this.collectionGroup) && this.path.B(e) : U.st(this.path) ? this.path.isEqual(e) : this.path.W(e);
+        return null !== this.collectionGroup ? t.key.et(this.collectionGroup) && this.path.B(e) : O.st(this.path) ? this.path.isEqual(e) : this.path.W(e);
     }, 
     /**
      * A document must have a value for every ordering clause in order to show up
@@ -2325,7 +2325,7 @@ var _t = /** @class */ function() {
     t.prototype.We = function(t) {
         return !(this.startAt && !this.startAt.Je(this.orderBy, t) || this.endAt && this.endAt.Je(this.orderBy, t));
     }, t.prototype.be = function(t) {}, t;
-}(), Ot = /** @class */ function() {
+}(), Ut = /** @class */ function() {
     function t(t) {
         this.name = t;
     }
@@ -2356,7 +2356,7 @@ var _t = /** @class */ function() {
             return t.ARRAY_CONTAINS_ANY;
 
           default:
-            return Ve("Unknown FieldFilter operator: " + e);
+            return Le("Unknown FieldFilter operator: " + e);
         }
     }, t.prototype.toString = function() {
         return this.name;
@@ -2384,11 +2384,11 @@ var _t = /** @class */ function() {
 /**
  * The result of a lookup for a given path may be an existing document or a
  * marker that this document does not exist at a given version.
- */ Ot.LESS_THAN = new Ot("<"), Ot.LESS_THAN_OR_EQUAL = new Ot("<="), Ot.EQUAL = new Ot("=="), 
-Ot.GREATER_THAN = new Ot(">"), Ot.GREATER_THAN_OR_EQUAL = new Ot(">="), Ot.ARRAY_CONTAINS = new Ot("array-contains"), 
-Ot.IN = new Ot("in"), Ot.ARRAY_CONTAINS_ANY = new Ot("array-contains-any");
+ */ Ut.LESS_THAN = new Ut("<"), Ut.LESS_THAN_OR_EQUAL = new Ut("<="), Ut.EQUAL = new Ut("=="), 
+Ut.GREATER_THAN = new Ut(">"), Ut.GREATER_THAN_OR_EQUAL = new Ut(">="), Ut.ARRAY_CONTAINS = new Ut("array-contains"), 
+Ut.IN = new Ut("in"), Ut.ARRAY_CONTAINS_ANY = new Ut("array-contains-any");
 
-var Ut = /** @class */ function(e) {
+var Ot = /** @class */ function(e) {
     function n(t, n, r) {
         var i = this;
         return (i = e.call(this) || this).field = t, i.op = n, i.value = r, i;
@@ -2396,66 +2396,66 @@ var Ut = /** @class */ function(e) {
     /**
      * Creates a filter based on the provided arguments.
      */    return t(n, e), n.create = function(t, e, r) {
-        if (t.Y()) return e === Ot.IN ? new qt(t, r) : new Ct(t, e, r);
+        if (t.Y()) return e === Ut.IN ? new Pt(t, r) : new Ct(t, e, r);
         if (ut(r)) {
-            if (e !== Ot.EQUAL) throw new A(b.INVALID_ARGUMENT, "Invalid query. Null supports only equality comparisons.");
+            if (e !== Ut.EQUAL) throw new A(b.INVALID_ARGUMENT, "Invalid query. Null supports only equality comparisons.");
             return new n(t, e, r);
         }
         if (at(r)) {
-            if (e !== Ot.EQUAL) throw new A(b.INVALID_ARGUMENT, "Invalid query. NaN supports only equality comparisons.");
+            if (e !== Ut.EQUAL) throw new A(b.INVALID_ARGUMENT, "Invalid query. NaN supports only equality comparisons.");
             return new n(t, e, r);
         }
-        return e === Ot.ARRAY_CONTAINS ? new Mt(t, r) : e === Ot.IN ? new Pt(t, r) : e === Ot.ARRAY_CONTAINS_ANY ? new xt(t, r) : new n(t, e, r);
+        return e === Ut.ARRAY_CONTAINS ? new Mt(t, r) : e === Ut.IN ? new qt(t, r) : e === Ut.ARRAY_CONTAINS_ANY ? new Ft(t, r) : new n(t, e, r);
     }, n.prototype.matches = function(t) {
         var e = t.field(this.field);
         // Only compare types with matching backend order (such as double and int).
-                return null !== e && J(this.value) === J(e) && this.Ye(Z(e, this.value));
+                return null !== e && J(this.value) === J(e) && this.Ye(K(e, this.value));
     }, n.prototype.Ye = function(t) {
         switch (this.op) {
-          case Ot.LESS_THAN:
+          case Ut.LESS_THAN:
             return t < 0;
 
-          case Ot.LESS_THAN_OR_EQUAL:
+          case Ut.LESS_THAN_OR_EQUAL:
             return t <= 0;
 
-          case Ot.EQUAL:
+          case Ut.EQUAL:
             return 0 === t;
 
-          case Ot.GREATER_THAN:
+          case Ut.GREATER_THAN:
             return t > 0;
 
-          case Ot.GREATER_THAN_OR_EQUAL:
+          case Ut.GREATER_THAN_OR_EQUAL:
             return t >= 0;
 
           default:
-            return Ve("Unknown FieldFilter operator: " + this.op);
+            return Le("Unknown FieldFilter operator: " + this.op);
         }
     }, n.prototype.ze = function() {
-        return [ Ot.LESS_THAN, Ot.LESS_THAN_OR_EQUAL, Ot.GREATER_THAN, Ot.GREATER_THAN_OR_EQUAL ].indexOf(this.op) >= 0;
+        return [ Ut.LESS_THAN, Ut.LESS_THAN_OR_EQUAL, Ut.GREATER_THAN, Ut.GREATER_THAN_OR_EQUAL ].indexOf(this.op) >= 0;
     }, n.prototype.canonicalId = function() {
         // TODO(b/29183165): Technically, this won't be unique if two values have
         // the same description, such as the int 3 and the string "3". So we should
         // add the types in here somehow, too.
         return this.field.G() + this.op.toString() + tt(this.value);
     }, n.prototype.isEqual = function(t) {
-        return t instanceof n && this.op.isEqual(t.op) && this.field.isEqual(t.field) && X(this.value, t.value);
+        return t instanceof n && this.op.isEqual(t.op) && this.field.isEqual(t.field) && Z(this.value, t.value);
     }, n.prototype.toString = function() {
         return this.field.G() + " " + this.op + " " + tt(this.value);
     }, n;
 }((function() {})), Ct = /** @class */ function(e) {
     function n(t, n, r) {
         var i = this;
-        return (i = e.call(this, t, n, r) || this).key = U.tt(r.referenceValue), i;
+        return (i = e.call(this, t, n, r) || this).key = O.tt(r.referenceValue), i;
     }
     return t(n, e), n.prototype.matches = function(t) {
-        var e = U.k(t.key, this.key);
+        var e = O.k(t.key, this.key);
         return this.Ye(e);
     }, n;
-}(Ut), qt = /** @class */ function(e) {
+}(Ot), Pt = /** @class */ function(e) {
     function n(t, n) {
         var r = this;
-        return (r = e.call(this, t, Ot.IN, n) || this).keys = (n.arrayValue.values || []).map((function(t) {
-            return U.tt(t.referenceValue);
+        return (r = e.call(this, t, Ut.IN, n) || this).keys = (n.arrayValue.values || []).map((function(t) {
+            return O.tt(t.referenceValue);
         })), r;
     }
     return t(n, e), n.prototype.matches = function(t) {
@@ -2463,33 +2463,33 @@ var Ut = /** @class */ function(e) {
             return e.isEqual(t.key);
         }));
     }, n;
-}(Ut), Mt = /** @class */ function(e) {
+}(Ot), Mt = /** @class */ function(e) {
     function n(t, n) {
-        return e.call(this, t, Ot.ARRAY_CONTAINS, n) || this;
+        return e.call(this, t, Ut.ARRAY_CONTAINS, n) || this;
     }
     return t(n, e), n.prototype.matches = function(t) {
         var e = t.field(this.field);
-        return st(e) && K(e.arrayValue, this.value);
+        return st(e) && X(e.arrayValue, this.value);
     }, n;
-}(Ut), Pt = /** @class */ function(e) {
+}(Ot), qt = /** @class */ function(e) {
     function n(t, n) {
-        return e.call(this, t, Ot.IN, n) || this;
+        return e.call(this, t, Ut.IN, n) || this;
     }
     return t(n, e), n.prototype.matches = function(t) {
         var e = t.field(this.field);
-        return null !== e && K(this.value.arrayValue, e);
+        return null !== e && X(this.value.arrayValue, e);
     }, n;
-}(Ut), xt = /** @class */ function(e) {
+}(Ot), Ft = /** @class */ function(e) {
     function n(t, n) {
-        return e.call(this, t, Ot.ARRAY_CONTAINS_ANY, n) || this;
+        return e.call(this, t, Ut.ARRAY_CONTAINS_ANY, n) || this;
     }
     return t(n, e), n.prototype.matches = function(t) {
         var e = this, n = t.field(this.field);
         return !(!st(n) || !n.arrayValue.values) && n.arrayValue.values.some((function(t) {
-            return K(e.value.arrayValue, t);
+            return X(e.value.arrayValue, t);
         }));
     }, n;
-}(Ut), Gt = /** @class */ function() {
+}(Ot), Gt = /** @class */ function() {
     function t(t) {
         this.name = t;
     }
@@ -2515,7 +2515,7 @@ Gt.DESCENDING = new Gt("desc");
  * after a bound. This is influenced by whether the position is just before or
  * just after the provided values.
  */
-var Ft, jt, Bt = /** @class */ function() {
+var xt, jt, Qt = /** @class */ function() {
     function t(t, e) {
         this.position = t, this.before = e;
     }
@@ -2532,17 +2532,17 @@ var Ft, jt, Bt = /** @class */ function() {
     t.prototype.Je = function(t, e) {
         for (var n = 0, r = 0; r < this.position.length; r++) {
             var i = t[r], o = this.position[r];
-            if (n = i.field.Y() ? U.k(U.tt(o.referenceValue), e.key) : Z(o, e.field(i.field)), 
+            if (n = i.field.Y() ? O.k(O.tt(o.referenceValue), e.key) : K(o, e.field(i.field)), 
             i.dir === Gt.DESCENDING && (n *= -1), 0 !== n) break;
         }
         return this.before ? n <= 0 : n < 0;
     }, t.prototype.isEqual = function(t) {
         if (null === t) return !1;
         if (this.before !== t.before || this.position.length !== t.position.length) return !1;
-        for (var e = 0; e < this.position.length; e++) if (!X(this.position[e], t.position[e])) return !1;
+        for (var e = 0; e < this.position.length; e++) if (!Z(this.position[e], t.position[e])) return !1;
         return !0;
     }, t;
-}(), zt = /** @class */ function() {
+}(), Bt = /** @class */ function() {
     function t(t, e) {
         this.field = t, void 0 === e && (e = Gt.ASCENDING), this.dir = e, this.Xe = t.Y();
     }
@@ -2556,7 +2556,7 @@ var Ft, jt, Bt = /** @class */ function() {
             return -1 * n;
 
           default:
-            return Ve("Unknown direction: " + this.dir);
+            return Le("Unknown direction: " + this.dir);
         }
     }, t.prototype.canonicalId = function() {
         // TODO(b/29183165): Make this collision robust.
@@ -2566,7 +2566,7 @@ var Ft, jt, Bt = /** @class */ function() {
     }, t.prototype.isEqual = function(t) {
         return this.dir === t.dir && this.field.isEqual(t.field);
     }, t;
-}(), Qt = new zt(O.X(), Gt.ASCENDING), Ht = new zt(O.X(), Gt.DESCENDING), Yt = /** @class */ function() {
+}(), zt = new Bt(U.X(), Gt.ASCENDING), Ht = new Bt(U.X(), Gt.DESCENDING), Yt = /** @class */ function() {
     function t(
     /** The target being listened to. */
     t, 
@@ -2594,7 +2594,7 @@ var Ft, jt, Bt = /** @class */ function() {
      * matches the target. The resume token essentially identifies a point in
      * time from which the server should resume sending results.
      */ , s) {
-        void 0 === i && (i = R.MIN), void 0 === o && (o = R.MIN), void 0 === s && (s = B.Ut), 
+        void 0 === i && (i = R.MIN), void 0 === o && (o = R.MIN), void 0 === s && (s = Q.Ut), 
         this.target = t, this.targetId = e, this.Ze = n, this.sequenceNumber = r, this.ts = i, 
         this.lastLimboFreeSnapshotVersion = o, this.resumeToken = s;
     }
@@ -2633,7 +2633,7 @@ function(t) {
 function Jt(t) {
     switch (t) {
       case b.OK:
-        return Ve("Treated status OK as error");
+        return Le("Treated status OK as error");
 
       case b.CANCELLED:
       case b.UNKNOWN:
@@ -2661,7 +2661,7 @@ function Jt(t) {
         return !0;
 
       default:
-        return Ve("Unknown status code: " + t);
+        return Le("Unknown status code: " + t);
     }
 }
 
@@ -2683,65 +2683,65 @@ function Jt(t) {
  *
  * @returns The Code equivalent to the given GRPC status code. Fails if there
  *     is no match.
- */ function Xt(t) {
+ */ function Zt(t) {
     if (void 0 === t) 
     // This shouldn't normally happen, but in certain error cases (like trying
     // to send invalid proto messages) we may get an error with no GRPC code.
     return Re("GRPC error has no .code"), b.UNKNOWN;
     switch (t) {
-      case Ft.OK:
+      case xt.OK:
         return b.OK;
 
-      case Ft.CANCELLED:
+      case xt.CANCELLED:
         return b.CANCELLED;
 
-      case Ft.UNKNOWN:
+      case xt.UNKNOWN:
         return b.UNKNOWN;
 
-      case Ft.DEADLINE_EXCEEDED:
+      case xt.DEADLINE_EXCEEDED:
         return b.DEADLINE_EXCEEDED;
 
-      case Ft.RESOURCE_EXHAUSTED:
+      case xt.RESOURCE_EXHAUSTED:
         return b.RESOURCE_EXHAUSTED;
 
-      case Ft.INTERNAL:
+      case xt.INTERNAL:
         return b.INTERNAL;
 
-      case Ft.UNAVAILABLE:
+      case xt.UNAVAILABLE:
         return b.UNAVAILABLE;
 
-      case Ft.UNAUTHENTICATED:
+      case xt.UNAUTHENTICATED:
         return b.UNAUTHENTICATED;
 
-      case Ft.INVALID_ARGUMENT:
+      case xt.INVALID_ARGUMENT:
         return b.INVALID_ARGUMENT;
 
-      case Ft.NOT_FOUND:
+      case xt.NOT_FOUND:
         return b.NOT_FOUND;
 
-      case Ft.ALREADY_EXISTS:
+      case xt.ALREADY_EXISTS:
         return b.ALREADY_EXISTS;
 
-      case Ft.PERMISSION_DENIED:
+      case xt.PERMISSION_DENIED:
         return b.PERMISSION_DENIED;
 
-      case Ft.FAILED_PRECONDITION:
+      case xt.FAILED_PRECONDITION:
         return b.FAILED_PRECONDITION;
 
-      case Ft.ABORTED:
+      case xt.ABORTED:
         return b.ABORTED;
 
-      case Ft.OUT_OF_RANGE:
+      case xt.OUT_OF_RANGE:
         return b.OUT_OF_RANGE;
 
-      case Ft.UNIMPLEMENTED:
+      case xt.UNIMPLEMENTED:
         return b.UNIMPLEMENTED;
 
-      case Ft.DATA_LOSS:
+      case xt.DATA_LOSS:
         return b.DATA_LOSS;
 
       default:
-        return Ve("Unknown status code: " + t);
+        return Le("Unknown status code: " + t);
     }
 }
 
@@ -2752,7 +2752,7 @@ function Jt(t) {
  * "UNKNOWN", etc.)
  * @returns The equivalent Code. Non-matching responses are mapped to
  *     Code.UNKNOWN.
- */ (jt = Ft || (Ft = {}))[jt.OK = 0] = "OK", jt[jt.CANCELLED = 1] = "CANCELLED", 
+ */ (jt = xt || (xt = {}))[jt.OK = 0] = "OK", jt[jt.CANCELLED = 1] = "CANCELLED", 
 jt[jt.UNKNOWN = 2] = "UNKNOWN", jt[jt.INVALID_ARGUMENT = 3] = "INVALID_ARGUMENT", 
 jt[jt.DEADLINE_EXCEEDED = 4] = "DEADLINE_EXCEEDED", jt[jt.NOT_FOUND = 5] = "NOT_FOUND", 
 jt[jt.ALREADY_EXISTS = 6] = "ALREADY_EXISTS", jt[jt.PERMISSION_DENIED = 7] = "PERMISSION_DENIED", 
@@ -2777,29 +2777,29 @@ jt[jt.INTERNAL = 13] = "INTERNAL", jt[jt.UNAVAILABLE = 14] = "UNAVAILABLE", jt[j
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var Kt = new C(U.k);
+var Xt = new C(O.k);
 
-function Zt() {
-    return Kt;
+function Kt() {
+    return Xt;
 }
 
 function $t() {
-    return Zt();
+    return Kt();
 }
 
-var te = new C(U.k);
+var te = new C(O.k);
 
 function ee() {
     return te;
 }
 
-var ne = new C(U.k);
+var ne = new C(O.k);
 
 function re() {
     return ne;
 }
 
-var ie = new P(U.k);
+var ie = new q(O.k);
 
 function oe() {
     for (var t = [], e = 0; e < arguments.length; e++) t[e] = arguments[e];
@@ -2810,7 +2810,7 @@ function oe() {
     return n;
 }
 
-var se = new P(Ue);
+var se = new q(Oe);
 
 function ue() {
     return se;
@@ -2843,9 +2843,9 @@ function ue() {
         // We are adding document key comparator to the end as it's the only
         // guaranteed unique property of a document.
         this.k = t ? function(e, n) {
-            return t(e, n) || U.k(e.key, n.key);
+            return t(e, n) || O.k(e.key, n.key);
         } : function(t, e) {
-            return U.k(t.key, e.key);
+            return O.k(t.key, e.key);
         }, this.rs = ee(), this.hs = new C(this.k)
         /**
      * Returns an empty copy of the existing DocumentSet, using the same
@@ -2911,7 +2911,7 @@ function ue() {
     }, t;
 }(), he = /** @class */ function() {
     function t() {
-        this.as = new C(U.k);
+        this.as = new C(O.k);
     }
     return t.prototype.track = function(t) {
         var e = t.doc.key, n = this.as.get(e);
@@ -2940,7 +2940,7 @@ function ue() {
         // Removed->Modified
         // Metadata->Added
         // Removed->Metadata
-        Ve("unsupported combination of changes: " + JSON.stringify(t) + " after " + JSON.stringify(n)) : this.as = this.as.nt(e, t);
+        Le("unsupported combination of changes: " + JSON.stringify(t) + " after " + JSON.stringify(n)) : this.as = this.as.nt(e, t);
     }, t.prototype.us = function() {
         var t = [];
         return this.as.ut((function(e, n) {
@@ -3011,7 +3011,7 @@ function ue() {
     // PORTING NOTE: Multi-tab only
         return t.Rs = function(e, n) {
         var r = new Map;
-        return r.set(e, le.Is(e, n)), new t(R.MIN, r, ue(), Zt(), oe());
+        return r.set(e, le.Is(e, n)), new t(R.MIN, r, ue(), Kt(), oe());
     }, t;
 }(), le = /** @class */ function() {
     function t(
@@ -3051,7 +3051,7 @@ function ue() {
      */;
     }
     return t.Is = function(e, n) {
-        return new t(B.Ut, n, oe(), oe(), oe());
+        return new t(Q.Ut, n, oe(), oe(), oe());
     }, t;
 }(), pe = function(
 /** The new document applies to all of these targets. */
@@ -3081,7 +3081,7 @@ e,
      */
 n
 /** An RPC error indicating why the watch failed. */ , r) {
-    void 0 === n && (n = B.Ut), void 0 === r && (r = null), this.state = t, this.targetIds = e, 
+    void 0 === n && (n = Q.Ut), void 0 === r && (r = null), this.state = t, this.targetIds = e, 
     this.resumeToken = n, this.cause = r;
 }, ve = /** @class */ function() {
     function t() {
@@ -3098,7 +3098,7 @@ n
              */
         this.Ss = we(), 
         /** See public getters for explanations of these fields. */
-        this.Cs = B.Ut, this.Ds = !1, 
+        this.Cs = Q.Ut, this.Ds = !1, 
         /**
              * Whether this target state should be included in the next snapshot. We
              * initialize to true so that newly-added targets are included in the next
@@ -3169,7 +3169,7 @@ n
                 break;
 
               default:
-                Ve("Encountered invalid change type: " + i);
+                Le("Encountered invalid change type: " + i);
             }
         })), new le(this.Cs, this.Ds, t, e, n);
     }, 
@@ -3195,7 +3195,7 @@ n
         /** The internal state of all tracked targets. */
         this.Ws = new Map, 
         /** Keeps track of the documents to update since the last raised snapshot. */
-        this.js = Zt(), 
+        this.js = Kt(), 
         /** A mapping of document keys to their set of target IDs. */
         this.Gs = ge(), 
         /**
@@ -3203,7 +3203,7 @@ n
              * known to be inconsistent and their listens needs to be re-established by
              * RemoteStore.
              */
-        this.zs = new P(Ue)
+        this.zs = new q(Oe)
         /**
      * Processes and adds the DocumentWatchChange to the current set of changes.
      */;
@@ -3258,7 +3258,7 @@ n
                 break;
 
               default:
-                Ve("Unknown target watch change state: " + t.state);
+                Le("Unknown target watch change state: " + t.state);
             }
         }));
     }, 
@@ -3289,9 +3289,9 @@ n
                 // another query that will raise this document as part of a snapshot
                 // until it is resolved, essentially exposing inconsistency between
                 // queries.
-                var o = new U(i.path);
+                var o = new O(i.path);
                 this.Js(e, o, new Rt(o, R.S()));
-            } else Le(1 === n, "Single document existence filter with count: " + n); else this.ni(e) !== n && (
+            } else Ve(1 === n, "Single document existence filter with count: " + n); else this.ni(e) !== n && (
             // Existence filter mismatch: We reset the mapping and raise a new
             // snapshot with `isFromCache:true`.
             this.ei(e), this.zs = this.zs.add(e));
@@ -3315,7 +3315,7 @@ n
                     // TODO(dimond): Ideally we would have an explicit lookup target
                     // instead resulting in an explicit delete message and we could
                     // remove this special logic.
-                    var s = new U(o.target.path);
+                    var s = new O(o.target.path);
                     null !== e.js.get(s) || e.hi(i, s) || e.Js(i, s, new Rt(s, t));
                 }
                 r.ks && (n.set(i, r.$s()), r.Os());
@@ -3334,7 +3334,7 @@ n
             })), i && (r = r.add(t));
         }));
         var i = new fe(t, n, this.zs, this.js, r);
-        return this.js = Zt(), this.Gs = ge(), this.zs = new P(Ue), i;
+        return this.js = Kt(), this.Gs = ge(), this.zs = new q(Oe), i;
     }, 
     /**
      * Adds the provided document to the internal list of document updates and
@@ -3386,7 +3386,7 @@ n
         return e || (e = new ve, this.Ws.set(t, e)), e;
     }, t.prototype.oi = function(t) {
         var e = this.Gs.get(t);
-        return e || (e = new P(Ue), this.Gs = this.Gs.nt(t, e)), e;
+        return e || (e = new q(Oe), this.Gs = this.Gs.nt(t, e)), e;
     }, 
     /**
      * Verifies that the user is still interested in this target (by calling
@@ -3445,11 +3445,11 @@ n
  * DocumentChangeSet keeps track of a set of changes to docs in a query, merging
  * duplicate events for the same doc.
  */ function ge() {
-    return new C(U.k);
+    return new C(O.k);
 }
 
 function we() {
-    return new C(U.k);
+    return new C(O.k);
 }
 
 /**
@@ -3473,16 +3473,16 @@ function we() {
     t;
 }(), be = function() {
     var t = {};
-    return t[Ot.LESS_THAN.name] = "LESS_THAN", t[Ot.LESS_THAN_OR_EQUAL.name] = "LESS_THAN_OR_EQUAL", 
-    t[Ot.GREATER_THAN.name] = "GREATER_THAN", t[Ot.GREATER_THAN_OR_EQUAL.name] = "GREATER_THAN_OR_EQUAL", 
-    t[Ot.EQUAL.name] = "EQUAL", t[Ot.ARRAY_CONTAINS.name] = "ARRAY_CONTAINS", t[Ot.IN.name] = "IN", 
-    t[Ot.ARRAY_CONTAINS_ANY.name] = "ARRAY_CONTAINS_ANY", t;
+    return t[Ut.LESS_THAN.name] = "LESS_THAN", t[Ut.LESS_THAN_OR_EQUAL.name] = "LESS_THAN_OR_EQUAL", 
+    t[Ut.GREATER_THAN.name] = "GREATER_THAN", t[Ut.GREATER_THAN_OR_EQUAL.name] = "GREATER_THAN_OR_EQUAL", 
+    t[Ut.EQUAL.name] = "EQUAL", t[Ut.ARRAY_CONTAINS.name] = "ARRAY_CONTAINS", t[Ut.IN.name] = "IN", 
+    t[Ut.ARRAY_CONTAINS_ANY.name] = "ARRAY_CONTAINS_ANY", t;
 }(), Ae = /** @class */ function() {
     function t(t, e) {
         this.ci = t, this.options = e;
     }
     return t.prototype.li = function(t) {
-        var e = void 0 === t.code ? b.UNKNOWN : Xt(t.code);
+        var e = void 0 === t.code ? b.UNKNOWN : Zt(t.code);
         return new A(e, t.message || "");
     }, 
     /**
@@ -3494,7 +3494,7 @@ function we() {
      * expects a { value: <number> } struct.
      */
     t.prototype._i = function(t) {
-        return this.options.di || z(t) ? t : {
+        return this.options.di || B(t) ? t : {
             value: t
         };
     }, 
@@ -3503,7 +3503,7 @@ function we() {
      */
     t.prototype.fi = function(t) {
         var e;
-        return z(e = "object" == typeof t ? t.value : t) ? null : e;
+        return B(e = "object" == typeof t ? t.value : t) ? null : e;
     }, 
     /**
      * Returns an IntegerValue for `value`.
@@ -3530,7 +3530,7 @@ function we() {
             };
         }
         return {
-            doubleValue: Q(t) ? "-0" : t
+            doubleValue: z(t) ? "-0" : t
         };
     }, 
     /**
@@ -3540,7 +3540,7 @@ function we() {
      */
     t.prototype.wi = function(t) {
         return function(t) {
-            return "number" == typeof t && Number.isInteger(t) && !Q(t) && t <= Number.MAX_SAFE_INTEGER && t >= Number.MIN_SAFE_INTEGER;
+            return "number" == typeof t && Number.isInteger(t) && !z(t) && t <= Number.MAX_SAFE_INTEGER && t >= Number.MIN_SAFE_INTEGER;
         }(t) ? this.Wt(t) : this.jt(t);
     }, 
     /**
@@ -3567,25 +3567,25 @@ function we() {
      * Returns a ByteString based on the proto string value.
      */
     t.prototype.mi = function(t) {
-        return this.options.di ? (Le(void 0 === t || "string" == typeof t, "value must be undefined or a string when using proto3 Json"), 
-        B.fromBase64String(t || "")) : (Le(void 0 === t || t instanceof Uint8Array, "value must be undefined or Uint8Array"), 
-        B.fromUint8Array(t || new Uint8Array));
+        return this.options.di ? (Ve(void 0 === t || "string" == typeof t, "value must be undefined or a string when using proto3 Json"), 
+        Q.fromBase64String(t || "")) : (Ve(void 0 === t || t instanceof Uint8Array, "value must be undefined or Uint8Array"), 
+        Q.fromUint8Array(t || new Uint8Array));
     }, t.prototype.toVersion = function(t) {
         return this.F(t.F());
     }, t.prototype.fromVersion = function(t) {
-        return Le(!!t, "Trying to deserialize version that isn't set"), R.v(this.v(t));
+        return Ve(!!t, "Trying to deserialize version that isn't set"), R.v(this.v(t));
     }, t.prototype.Ei = function(t, e) {
         return this.Ri(e || this.ci).child("documents").child(t).G();
     }, t.prototype.Ii = function(t) {
-        var e = V.K(t);
-        return Le(Ne(e), "Tried to deserialize invalid key " + e.toString()), e;
+        var e = L.K(t);
+        return Ve(Ne(e), "Tried to deserialize invalid key " + e.toString()), e;
     }, t.prototype.Ai = function(t) {
         return this.Ei(t.path);
     }, t.prototype.tt = function(t) {
         var e = this.Ii(t);
-        return Le(e.get(1) === this.ci.projectId, "Tried to deserialize key from different project: " + e.get(1) + " vs " + this.ci.projectId), 
-        Le(!e.get(3) && !this.ci.database || e.get(3) === this.ci.database, "Tried to deserialize key from different database: " + e.get(3) + " vs " + this.ci.database), 
-        new U(this.Pi(e));
+        return Ve(e.get(1) === this.ci.projectId, "Tried to deserialize key from different project: " + e.get(1) + " vs " + this.ci.projectId), 
+        Ve(!e.get(3) && !this.ci.database || e.get(3) === this.ci.database, "Tried to deserialize key from different database: " + e.get(3) + " vs " + this.ci.database), 
+        new O(this.Pi(e));
     }, t.prototype.Vi = function(t) {
         return this.Ei(t);
     }, t.prototype.pi = function(t) {
@@ -3594,17 +3594,17 @@ function we() {
         // "/documents". In v1 all resource paths contain "/documents". Preserve the
         // ability to read the v1beta1 form for compatibility with queries persisted
         // in the local target cache.
-                return 4 === e.length ? V.H : this.Pi(e);
+                return 4 === e.length ? L.H : this.Pi(e);
     }, Object.defineProperty(t.prototype, "gi", {
         get: function() {
-            return new V([ "projects", this.ci.projectId, "databases", this.ci.database ]).G();
+            return new L([ "projects", this.ci.projectId, "databases", this.ci.database ]).G();
         },
         enumerable: !0,
         configurable: !0
     }), t.prototype.Ri = function(t) {
-        return new V([ "projects", t.projectId, "databases", t.database ]);
+        return new L([ "projects", t.projectId, "databases", t.database ]);
     }, t.prototype.Pi = function(t) {
-        return Le(t.length > 4 && "documents" === t.get(4), "tried to deserialize invalid key " + t.toString()), 
+        return Ve(t.length > 4 && "documents" === t.get(4), "tried to deserialize invalid key " + t.toString()), 
         t.$(5);
     }, 
     /** Creates an api.Document from key and fields (but no create/update time) */ t.prototype.yi = function(t, e) {
@@ -3628,7 +3628,7 @@ function we() {
             hasCommittedMutations: !!e
         });
     }, t.prototype.Si = function(t) {
-        Le(!!t.found, "Tried to deserialize a found document from a missing document."), 
+        Ve(!!t.found, "Tried to deserialize a found document from a missing document."), 
         t.found.name, t.found.updateTime;
         var e = this.tt(t.found.name), n = this.fromVersion(t.found.updateTime), r = new Tt({
             mapValue: {
@@ -3637,12 +3637,12 @@ function we() {
         });
         return new St(e, n, r, {});
     }, t.prototype.Ci = function(t) {
-        Le(!!t.missing, "Tried to deserialize a missing document from a found document."), 
-        Le(!!t.readTime, "Tried to deserialize a missing document without a read time.");
+        Ve(!!t.missing, "Tried to deserialize a missing document from a found document."), 
+        Ve(!!t.readTime, "Tried to deserialize a missing document without a read time.");
         var e = this.tt(t.missing), n = this.fromVersion(t.readTime);
         return new Rt(e, n);
     }, t.prototype.Di = function(t) {
-        return "found" in t ? this.Si(t) : "missing" in t ? this.Ci(t) : Ve("invalid batch get response: " + JSON.stringify(t));
+        return "found" in t ? this.Si(t) : "missing" in t ? this.Ci(t) : Le("invalid batch get response: " + JSON.stringify(t));
     }, t.prototype.Fi = function(t) {
         var e;
         if ("targetChange" in t) {
@@ -3674,7 +3674,7 @@ function we() {
             var E = this.tt(w.document), b = w.removedTargetIds || [];
             e = new pe([], b, E, null);
         } else {
-            if (!("filter" in t)) return Ve("Unknown change type " + JSON.stringify(t));
+            if (!("filter" in t)) return Le("Unknown change type " + JSON.stringify(t));
             t.filter;
             var A = t.filter;
             A.targetId;
@@ -3683,7 +3683,7 @@ function we() {
         }
         return e;
     }, t.prototype.Ni = function(t) {
-        return "NO_CHANGE" === t ? 0 /* NoChange */ : "ADD" === t ? 1 /* Added */ : "REMOVE" === t ? 2 /* Removed */ : "CURRENT" === t ? 3 /* Current */ : "RESET" === t ? 4 /* Reset */ : Ve("Got unexpected TargetChange.state: " + t);
+        return "NO_CHANGE" === t ? 0 /* NoChange */ : "ADD" === t ? 1 /* Added */ : "REMOVE" === t ? 2 /* Removed */ : "CURRENT" === t ? 3 /* Current */ : "RESET" === t ? 4 /* Reset */ : Le("Got unexpected TargetChange.state: " + t);
     }, t.prototype.ki = 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
@@ -3708,7 +3708,7 @@ function we() {
                 }))
             }
         }; else {
-            if (!(t instanceof It)) return Ve("Unknown mutation type " + t.type);
+            if (!(t instanceof It)) return Le("Unknown mutation type " + t.type);
             e = {
                 verify: this.Ai(t.key)
             };
@@ -3737,20 +3737,20 @@ function we() {
             var u = this.tt(t.transform.document), a = t.transform.fieldTransforms.map((function(t) {
                 return e.xi(t);
             }));
-            return Le(!0 === n.exists, 'Transforms only support precondition "exists == true"'), 
+            return Ve(!0 === n.exists, 'Transforms only support precondition "exists == true"'), 
             new At(u, a);
         }
         if (t.verify) {
             var h = this.tt(t.verify);
             return new It(h, n);
         }
-        return Ve("unknown mutation proto: " + JSON.stringify(t));
+        return Le("unknown mutation proto: " + JSON.stringify(t));
     }, t.prototype.Mi = function(t) {
         return void 0 !== t.updateTime ? {
             updateTime: this.toVersion(t.updateTime)
         } : void 0 !== t.exists ? {
             exists: t.exists
-        } : Ve("Unknown precondition");
+        } : Le("Unknown precondition");
     }, t.prototype.qi = function(t) {
         return void 0 !== t.updateTime ? gt.updateTime(this.fromVersion(t.updateTime)) : void 0 !== t.exists ? gt.exists(t.exists) : gt.NONE;
     }, t.prototype.Qi = function(t, e) {
@@ -3768,7 +3768,7 @@ function we() {
         new mt(n, r);
     }, t.prototype.Wi = function(t, e) {
         var n = this;
-        return t && t.length > 0 ? (Le(void 0 !== e, "Received a write result without a commit time"), 
+        return t && t.length > 0 ? (Ve(void 0 !== e, "Received a write result without a commit time"), 
         t.map((function(t) {
             return n.Qi(t, e);
         }))) : [];
@@ -3794,18 +3794,18 @@ function we() {
             fieldPath: t.field.G(),
             increment: e.Qt
         };
-        throw Ve("Unknown transform: " + t.transform);
+        throw Le("Unknown transform: " + t.transform);
     }, t.prototype.xi = function(t) {
         var e = null;
-        if ("setToServerValue" in t) Le("REQUEST_TIME" === t.setToServerValue, "Unknown server value transform proto: " + JSON.stringify(t)), 
+        if ("setToServerValue" in t) Ve("REQUEST_TIME" === t.setToServerValue, "Unknown server value transform proto: " + JSON.stringify(t)), 
         e = ct.instance; else if ("appendMissingElements" in t) {
             var n = t.appendMissingElements.values || [];
             e = new ft(n);
         } else if ("removeAllFromArray" in t) {
             var r = t.removeAllFromArray.values || [];
             e = new lt(r);
-        } else "increment" in t ? e = new pt(this, t.increment) : Ve("Unknown transform proto: " + JSON.stringify(t));
-        var i = O.Z(t.fieldPath);
+        } else "increment" in t ? e = new pt(this, t.increment) : Le("Unknown transform proto: " + JSON.stringify(t));
+        var i = U.Z(t.fieldPath);
         return new vt(i, e);
     }, t.prototype.ji = function(t) {
         return {
@@ -3813,9 +3813,9 @@ function we() {
         };
     }, t.prototype.Gi = function(t) {
         var e = t.documents.length;
-        Le(1 === e, "DocumentsTarget contained other than 1 document: " + e);
+        Ve(1 === e, "DocumentsTarget contained other than 1 document: " + e);
         var n = t.documents[0];
-        return Lt.ve(this.pi(n)).Ue();
+        return Vt.ve(this.pi(n)).Ue();
     }, t.prototype.zi = function(t) {
         // Dissect the path into parent, collectionId, and optional key filter.
         var e = {
@@ -3837,7 +3837,7 @@ function we() {
     }, t.prototype.Yi = function(t) {
         var e = this.pi(t.parent), n = t.structuredQuery, r = n.from ? n.from.length : 0, i = null;
         if (r > 0) {
-            Le(1 === r, "StructuredQuery.from with more than one collection is not supported.");
+            Ve(1 === r, "StructuredQuery.from with more than one collection is not supported.");
             var o = n.from[0];
             o.allDescendants ? i = o.collectionId : e = e.child(o.collectionId);
         }
@@ -3850,7 +3850,7 @@ function we() {
         var h = null;
         n.startAt && (h = this.tn(n.startAt));
         var c = null;
-        return n.endAt && (c = this.tn(n.endAt)), new Lt(e, i, u, s, a, "F" /* First */ , h, c).Ue();
+        return n.endAt && (c = this.tn(n.endAt)), new Vt(e, i, u, s, a, "F" /* First */ , h, c).Ue();
     }, t.prototype.en = function(t) {
         var e = this.sn(t.Ze);
         return null == e ? null : {
@@ -3868,7 +3868,7 @@ function we() {
             return "limbo-document";
 
           default:
-            return Ve("Unrecognized query purpose: " + t);
+            return Le("Unrecognized query purpose: " + t);
         }
     }, t.prototype.Ue = function(t) {
         var e, n = t.target;
@@ -3882,7 +3882,7 @@ function we() {
         var e = this;
         if (0 !== t.length) {
             var n = t.map((function(t) {
-                return t instanceof Ut ? e.in(t) : Ve("Unrecognized filter: " + JSON.stringify(t));
+                return t instanceof Ot ? e.in(t) : Le("Unrecognized filter: " + JSON.stringify(t));
             }));
             return 1 === n.length ? n[0] : {
                 compositeFilter: {
@@ -3897,7 +3897,7 @@ function we() {
             return e.Xi(t);
         })).reduce((function(t, e) {
             return t.concat(e);
-        })) : Ve("Unknown filter: " + JSON.stringify(t)) : [];
+        })) : Le("Unknown filter: " + JSON.stringify(t)) : [];
     }, t.prototype.Hi = function(t) {
         var e = this;
         if (0 !== t.length) return t.map((function(t) {
@@ -3915,7 +3915,7 @@ function we() {
         };
     }, t.prototype.tn = function(t) {
         var e = !!t.before, n = t.values || [];
-        return new Bt(n, e);
+        return new Qt(n, e);
     }, 
     // visible for testing
     t.prototype.an = function(t) {
@@ -3940,41 +3940,41 @@ function we() {
     }, t.prototype.ln = function(t) {
         switch (t) {
           case "EQUAL":
-            return Ot.EQUAL;
+            return Ut.EQUAL;
 
           case "GREATER_THAN":
-            return Ot.GREATER_THAN;
+            return Ut.GREATER_THAN;
 
           case "GREATER_THAN_OR_EQUAL":
-            return Ot.GREATER_THAN_OR_EQUAL;
+            return Ut.GREATER_THAN_OR_EQUAL;
 
           case "LESS_THAN":
-            return Ot.LESS_THAN;
+            return Ut.LESS_THAN;
 
           case "LESS_THAN_OR_EQUAL":
-            return Ot.LESS_THAN_OR_EQUAL;
+            return Ut.LESS_THAN_OR_EQUAL;
 
           case "ARRAY_CONTAINS":
-            return Ot.ARRAY_CONTAINS;
+            return Ut.ARRAY_CONTAINS;
 
           case "IN":
-            return Ot.IN;
+            return Ut.IN;
 
           case "ARRAY_CONTAINS_ANY":
-            return Ot.ARRAY_CONTAINS_ANY;
+            return Ut.ARRAY_CONTAINS_ANY;
 
           case "OPERATOR_UNSPECIFIED":
-            return Ve("Unspecified operator");
+            return Le("Unspecified operator");
 
           default:
-            return Ve("Unknown operator");
+            return Le("Unknown operator");
         }
     }, t.prototype._n = function(t) {
         return {
             fieldPath: t.G()
         };
     }, t.prototype.dn = function(t) {
-        return O.Z(t.fieldPath);
+        return U.Z(t.fieldPath);
     }, 
     // visible for testing
     t.prototype.hn = function(t) {
@@ -3983,13 +3983,13 @@ function we() {
             direction: this.an(t.dir)
         };
     }, t.prototype.on = function(t) {
-        return new zt(this.dn(t.field), this.un(t.direction));
+        return new Bt(this.dn(t.field), this.un(t.direction));
     }, t.prototype.rn = function(t) {
-        return Ut.create(this.dn(t.fieldFilter.field), this.ln(t.fieldFilter.op), t.fieldFilter.value);
+        return Ot.create(this.dn(t.fieldFilter.field), this.ln(t.fieldFilter.op), t.fieldFilter.value);
     }, 
     // visible for testing
     t.prototype.in = function(t) {
-        if (t.op === Ot.EQUAL) {
+        if (t.op === Ut.EQUAL) {
             if (at(t.value)) return {
                 unaryFilter: {
                     field: this._n(t.field),
@@ -4014,21 +4014,21 @@ function we() {
         switch (t.unaryFilter.op) {
           case "IS_NAN":
             var e = this.dn(t.unaryFilter.field);
-            return Ut.create(e, Ot.EQUAL, {
+            return Ot.create(e, Ut.EQUAL, {
                 doubleValue: NaN
             });
 
           case "IS_NULL":
             var n = this.dn(t.unaryFilter.field);
-            return Ut.create(n, Ot.EQUAL, {
+            return Ot.create(n, Ut.EQUAL, {
                 nullValue: "NULL_VALUE"
             });
 
           case "OPERATOR_UNSPECIFIED":
-            return Ve("Unspecified filter");
+            return Le("Unspecified filter");
 
           default:
-            return Ve("Unknown filter");
+            return Le("Unknown filter");
         }
     }, t.prototype.$i = function(t) {
         var e = [];
@@ -4039,7 +4039,7 @@ function we() {
         };
     }, t.prototype.Bi = function(t) {
         var e = (t.fieldPaths || []).map((function(t) {
-            return O.Z(t);
+            return U.Z(t);
         }));
         return yt.zt(e);
     }, t;
@@ -4078,9 +4078,9 @@ function we() {
  */ var Ie = /** @class */ function() {
     function t() {}
     return t.fn = function(e) {
-        t.platform && Ve("Platform already defined"), t.platform = e;
+        t.platform && Le("Platform already defined"), t.platform = e;
     }, t.Ot = function() {
-        return t.platform || Ve("Platform not set"), t.platform;
+        return t.platform || Le("Platform not set"), t.platform;
     }, t;
 }(), Te = new o("@firebase/firestore");
 
@@ -4160,7 +4160,7 @@ function Re(t) {
  * Returns `never` and can be used in expressions:
  * @example
  * let futureVar = fail('not implemented yet');
- */ function Ve(t) {
+ */ function Le(t) {
     // Log the failure in addition to throw an exception, just in case the
     // exception is swallowed.
     var e = "FIRESTORE (" + w + ") INTERNAL ASSERTION FAILED: " + t;
@@ -4174,8 +4174,8 @@ function Re(t) {
  */;
 }
 
-function Le(t, e) {
-    t || Ve(e);
+function Ve(t, e) {
+    t || Le(e);
 }
 
 /**
@@ -4193,7 +4193,7 @@ function Le(t, 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.
- */ var Oe = /** @class */ function() {
+ */ var Ue = /** @class */ function() {
     function t() {}
     return t.Tn = function() {
         for (
@@ -4203,7 +4203,7 @@ function Le(t, e) {
     }, t;
 }();
 
-function Ue(t, e) {
+function Oe(t, e) {
     return t < e ? -1 : t > e ? 1 : 0;
 }
 
@@ -4228,7 +4228,7 @@ function Ue(t, 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.
- */ var qe = 
+ */ var Pe = 
 /**
      * Constructs a DatabaseInfo using the provided host, databaseId and
      * persistenceKey.
@@ -4256,9 +4256,9 @@ function(t, e, n, r, i) {
     }), t.prototype.isEqual = function(e) {
         return e instanceof t && e.projectId === this.projectId && e.database === this.database;
     }, t.prototype.C = function(t) {
-        return Ue(this.projectId, t.projectId) || Ue(this.database, t.database);
+        return Oe(this.projectId, t.projectId) || Oe(this.database, t.database);
     }, t;
-}(), Pe = /** @class */ function() {
+}(), qe = /** @class */ function() {
     function t(t) {
         this.En = t, 
         /**
@@ -4296,7 +4296,7 @@ function(t, e, n, r, i) {
         !0;
         return !1;
     }, t.prototype.forEach = function(t) {
-        F(this.Rn, (function(e, n) {
+        x(this.Rn, (function(e, n) {
             for (var r = 0, i = n; r < i.length; r++) {
                 var o = i[r], s = o[0], u = o[1];
                 t(s, u);
@@ -4305,7 +4305,7 @@ function(t, e, n, r, i) {
     }, t.prototype.q = function() {
         return j(this.Rn);
     }, t;
-}(), xe = /** @class */ function() {
+}(), Fe = /** @class */ function() {
     /**
      * @param batchId The unique ID of this mutation batch.
      * @param localWriteTime The original write time of this mutation.
@@ -4399,16 +4399,16 @@ function(t, e, n, r, i) {
      */;
     }
     return t.from = function(e, n, r, i) {
-        Le(e.mutations.length === r.length, "Mutations sent " + e.mutations.length + " must equal results received " + r.length);
+        Ve(e.mutations.length === r.length, "Mutations sent " + e.mutations.length + " must equal results received " + r.length);
         for (var o = re(), s = e.mutations, u = 0; u < s.length; u++) o = o.nt(s[u].key, r[u].version);
         return new t(e, n, r, i, o);
     }, t;
-}(), Fe = /** @class */ function() {
+}(), xe = /** @class */ function() {
     function t() {
         // A set of outstanding references to a document sorted by key.
-        this.gn = new P(je.me), 
+        this.gn = new q(je.me), 
         // A set of outstanding references to a document sorted by target id.
-        this.yn = new P(je.bn)
+        this.yn = new q(je.bn)
         /** Returns true if the reference set contains no references. */;
     }
     return t.prototype.q = function() {
@@ -4441,7 +4441,7 @@ function(t, e, n, r, i) {
      * removed.
      */
     t.prototype.Nn = function(t) {
-        var e = this, n = U.EMPTY, r = new je(n, t), i = new je(n, t + 1), o = [];
+        var e = this, n = O.EMPTY, r = new je(n, t), i = new je(n, t + 1), o = [];
         return this.yn.Dt([ r, i ], (function(t) {
             e.Dn(t), o.push(t.key);
         })), o;
@@ -4453,7 +4453,7 @@ function(t, e, n, r, i) {
     }, t.prototype.Dn = function(t) {
         this.gn = this.gn.delete(t), this.yn = this.yn.delete(t);
     }, t.prototype.Ln = function(t) {
-        var e = U.EMPTY, n = new je(e, t), r = new je(e, t + 1), i = oe();
+        var e = O.EMPTY, n = new je(e, t), r = new je(e, t + 1), i = oe();
         return this.yn.Dt([ n, r ], (function(t) {
             i = i.add(t.key);
         })), i;
@@ -4467,12 +4467,12 @@ function(t, e, n, r, i) {
         /** Compare by key then by ID */;
     }
     return t.me = function(t, e) {
-        return U.k(t.key, e.key) || Ue(t.On, e.On);
+        return O.k(t.key, e.key) || Oe(t.On, e.On);
     }, 
     /** Compare by ID then by key */ t.bn = function(t, e) {
-        return Ue(t.On, e.On) || U.k(t.key, e.key);
+        return Oe(t.On, e.On) || O.k(t.key, e.key);
     }, t;
-}(), Be = /** @class */ function() {
+}(), Qe = /** @class */ function() {
     function t(t) {
         var e = this;
         // NOTE: next/catchCallback will always point to our own wrapper functions,
@@ -4495,7 +4495,7 @@ function(t, e, n, r, i) {
         return this.next(void 0, t);
     }, t.prototype.next = function(e, n) {
         var r = this;
-        return this.Bn && Ve("Called next() or catch() twice for PersistencePromise"), this.Bn = !0, 
+        return this.Bn && Le("Called next() or catch() twice for PersistencePromise"), this.Bn = !0, 
         this.qn ? this.error ? this.xn(n, this.error) : this.Qn(e, this.result) : new t((function(t, i) {
             r.Mn = function(n) {
                 r.Qn(e, n).next(t, i);
@@ -4567,7 +4567,7 @@ function(t, e, n, r, i) {
             r.push(e.call(n, t, i));
         })), this.Gn(r);
     }, t;
-}(), ze = /** @class */ function() {
+}(), Be = /** @class */ function() {
     function t(t, e, n) {
         this.Kn = t, this.Hn = e, this.Jn = n
         /**
@@ -4621,7 +4621,7 @@ function(t, e, n, r, i) {
     t.prototype.ir = function(t, e) {
         var n = this;
         return this.Hn.nr(t, e).next((function(r) {
-            var i = n.er(t, e, r), o = Zt();
+            var i = n.er(t, e, r), o = Kt();
             return i.forEach((function(t, e) {
                 // TODO(http://b/32275378): Don't conflate missing / deleted.
                 e || (e = new Rt(t, R.S())), o = o.nt(t, e);
@@ -4640,14 +4640,14 @@ function(t, e, n, r, i) {
         return e.Pe() ? this.hr(t, e.path) : e.He() ? this.or(t, e, n) : this.ar(t, e, n);
     }, t.prototype.hr = function(t, e) {
         // Just do a simple document lookup.
-        return this.Yn(t, new U(e)).next((function(t) {
+        return this.Yn(t, new O(e)).next((function(t) {
             var e = ee();
             return t instanceof St && (e = e.nt(t.key, t)), e;
         }));
     }, t.prototype.or = function(t, e, n) {
         var r = this, i = e.collectionGroup, o = ee();
         return this.Jn.ur(t, i).next((function(s) {
-            return Be.forEach(s, (function(s) {
+            return Qe.forEach(s, (function(s) {
                 var u = e.Oe(s.child(i));
                 return r.ar(t, u, n).next((function(t) {
                     t.forEach((function(t, e) {
@@ -4690,7 +4690,7 @@ function(t, e, n, r, i) {
             })), h;
         }));
     }, t;
-}(), Qe = /** @class */ function() {
+}(), ze = /** @class */ function() {
     function t(t, e, n, r) {
         this.targetId = t, this.fromCache = e, this._r = n, this.dr = r;
     }
@@ -4922,7 +4922,7 @@ var Ye = function() {
         }));
         return this.Nr.push(i), i;
     }, t.prototype.Ur = function() {
-        this.kr && Ve("AsyncQueue is already failed: " + (this.kr.stack || this.kr.message));
+        this.kr && Le("AsyncQueue is already failed: " + (this.kr.stack || this.kr.message));
     }, 
     /**
      * Verifies there's an operation currently in-progress on the AsyncQueue.
@@ -5000,7 +5000,7 @@ var Ye = function() {
         var e = this.Nr.indexOf(t);
         this.Nr.splice(e, 1);
     }, t;
-}(), Xe = /** @class */ function() {
+}(), Ze = /** @class */ function() {
     function t(
     // When we attempt to collect, we will only do so if the cache size is greater than this
     // threshold. Passing `COLLECTION_DISABLED` here will cause collection to always be skipped.
@@ -5039,8 +5039,8 @@ var Ye = function() {
  * It is created via DelayedOperation.createAndSchedule().
  *
  * Supports cancellation (via cancel()) and early execution (via skipDelay()).
- */ Xe.sh = -1, Xe.ih = 1048576, Xe.nh = 41943040, Xe.th = 10, Xe.eh = 1e3, Xe.rh = new Xe(Xe.nh, Xe.th, Xe.eh), 
-Xe.DISABLED = new Xe(Xe.sh, 0, 0);
+ */ Ze.sh = -1, Ze.ih = 1048576, Ze.nh = 41943040, Ze.th = 10, Ze.eh = 1e3, Ze.rh = new Ze(Ze.nh, Ze.th, Ze.eh), 
+Ze.DISABLED = new Ze(Ze.sh, 0, 0);
 
 /**
  * Local storage in the Firestore client. Coordinates persistence components
@@ -5093,7 +5093,7 @@ Xe.DISABLED = new Xe(Xe.sh, 0, 0);
  * (unexpected) failure (e.g. failed assert) and always represent an
  * unrecoverable error (should be caught / reported by the async_queue).
  */
-var Ke = /** @class */ function() {
+var Xe = /** @class */ function() {
     function t(
     /** Manages our in-memory or durable persistence. */
     t, e, n) {
@@ -5101,17 +5101,17 @@ var Ke = /** @class */ function() {
         /**
              * The set of document references maintained by any local views.
              */
-        this.oh = new Fe, 
+        this.oh = new xe, 
         /**
              * Maps a targetID to data about its target.
              *
              * PORTING NOTE: We are using an immutable data structure on Web to make re-runs
              * of `applyRemoteEvent()` idempotent.
              */
-        this.ah = new C(Ue), 
+        this.ah = new C(Oe), 
         /** Maps a target to its targetID. */
         // TODO(wuandy): Evaluate if TargetId can be part of Target.
-        this.uh = new Pe((function(t) {
+        this.uh = new qe((function(t) {
             return t.canonicalId();
         })), 
         /**
@@ -5120,7 +5120,7 @@ var Ke = /** @class */ function() {
              * PORTING NOTE: This is only used for multi-tab synchronization.
              */
         this.lh = R.MIN, this.persistence.dh._h(this.oh), this.Hn = t.fh(n), this.wh = t.Th(), 
-        this.mh = t.Eh(), this.Rh = new ze(this.wh, this.Hn, this.persistence.Ih()), this.hh.Ah(this.Rh)
+        this.mh = t.Eh(), this.Rh = new Be(this.wh, this.Hn, this.persistence.Ih()), this.hh.Ah(this.Rh)
         /** Starts the LocalStore. */;
     }
     return t.prototype.start = function() {
@@ -5148,7 +5148,7 @@ var Ke = /** @class */ function() {
                             return i = s, e = o.persistence.fh(t), 
                             // Recreate our LocalDocumentsView using the new
                             // MutationQueue.
-                            r = new ze(o.wh, e, o.persistence.Ih()), e.ph(n);
+                            r = new Be(o.wh, e, o.persistence.Ih()), e.ph(n);
                         })).next((function(t) {
                             for (var e = [], o = [], s = oe(), u = 0, a = i
                             // Union the old/new changed keys.
@@ -5224,7 +5224,7 @@ var Ke = /** @class */ function() {
         var e = this;
         return this.persistence.runTransaction("Lookup mutation documents", "readonly", (function(n) {
             return e.Hn.Fh(n, t).next((function(t) {
-                return t ? e.Rh.sr(n, t) : Be.resolve(null);
+                return t ? e.Rh.sr(n, t) : Qe.resolve(null);
             }));
         }));
     }, 
@@ -5270,7 +5270,7 @@ var Ke = /** @class */ function() {
         return this.persistence.runTransaction("Reject batch", "readwrite-primary", (function(n) {
             var r;
             return e.Hn.Uh(n, t).next((function(t) {
-                return Le(null !== t, "Attempt to reject nonexistent batch!"), r = t.keys(), e.Hn.qh(n, t);
+                return Ve(null !== t, "Attempt to reject nonexistent batch!"), r = t.keys(), e.Hn.qh(n, t);
             })).next((function() {
                 return e.Hn.Oh(n);
             })).next((function() {
@@ -5352,7 +5352,7 @@ var Ke = /** @class */ function() {
                     }
                 }
             }));
-            var a = Zt(), h = oe();
+            var a = Kt(), h = oe();
             // 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
@@ -5383,7 +5383,7 @@ var Ke = /** @class */ function() {
                 }));
                 u.push(c);
             }
-            return Be.Gn(u).next((function() {
+            return Qe.Gn(u).next((function() {
                 return s.apply(o);
             })).next((function() {
                 return n.Rh.ir(o, a);
@@ -5405,7 +5405,7 @@ var Ke = /** @class */ function() {
      */
     t.Hh = function(t, e, n) {
         // Always persist target data if we don't already have a resume token.
-        return Le(e.resumeToken.Mt() > 0, "Attempted to persist target data with no resume token"), 
+        return Ve(e.resumeToken.Mt() > 0, "Attempted to persist target data with no resume token"), 
         0 === t.resumeToken.Mt() || (e.ts.D() - t.ts.D() >= this.eo || n.Ps.size + n.Vs.size + n.ps.size > 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
@@ -5426,8 +5426,8 @@ var Ke = /** @class */ function() {
             }
         }
         return this.persistence.runTransaction("notifyLocalViewChanges", "readwrite", (function(n) {
-            return Be.forEach(t, (function(t) {
-                return Be.forEach(t.dr, (function(t) {
+            return Qe.forEach(t, (function(t) {
+                return Qe.forEach(t.dr, (function(t) {
                     return e.persistence.dh.Cn(n, t);
                 }));
             }));
@@ -5472,7 +5472,7 @@ var Ke = /** @class */ function() {
                 // This target has been listened to previously, so reuse the
                 // previous targetID.
                 // TODO(mcg): freshen last accessed date?
-                r = i, Be.resolve(r)) : e.mh.ao(n).next((function(i) {
+                r = i, Qe.resolve(r)) : e.mh.ao(n).next((function(i) {
                     return r = new Yt(t, i, 0 /* Listen */ , n.Kh), e.mh.uo(n, r).next((function() {
                         return r;
                     }));
@@ -5490,7 +5490,7 @@ var Ke = /** @class */ function() {
     // Visible for testing.
     t.prototype.oo = function(t, e) {
         var n = this.uh.get(e);
-        return void 0 !== n ? Be.resolve(this.ah.get(n)) : this.mh.oo(t, e);
+        return void 0 !== n ? Qe.resolve(this.ah.get(n)) : this.mh.oo(t, e);
     }, 
     /**
      * Unpin all the documents associated with the given target. If
@@ -5514,7 +5514,7 @@ var Ke = /** @class */ function() {
             // transaction fails since there are no side effects if the target has
             // already been removed.
             var o = n.oh.Nn(t);
-            return e ? Be.resolve() : Be.forEach(o, (function(t) {
+            return e ? Qe.resolve() : Qe.forEach(o, (function(t) {
                 return n.persistence.dh.Cn(i, t);
             })).next((function() {
                 n.persistence.dh.removeTarget(i, r);
@@ -5570,13 +5570,13 @@ var Ke = /** @class */ function() {
     t.prototype.Eo = function(t) {
         this.persistence.Eo(t);
     }, t.prototype.$h = function(t, e, n) {
-        var r = this, i = e.batch, o = i.keys(), s = Be.resolve();
+        var r = this, i = e.batch, o = i.keys(), s = Qe.resolve();
         return o.forEach((function(r) {
             s = s.next((function() {
                 return n.tr(t, r);
             })).next((function(t) {
                 var o = t, s = e.pn.get(r);
-                Le(null !== s, "ackVersions should contain every doc in the write."), (!o || o.version.C(s) < 0) && ((o = i.Bt(r, o, e)) && 
+                Ve(null !== s, "ackVersions should contain every doc in the write."), (!o || o.version.C(s) < 0) && ((o = i.Bt(r, o, e)) && 
                 // We use the commitVersion as the readTime rather than the
                 // document's updateTime since the updateTime is not advanced
                 // for updates that do not modify the underlying document.
@@ -5656,7 +5656,7 @@ var Ke = /** @class */ function() {
  *
  * @param err An error returned by a LocalStore operation.
  * @return A Promise that resolves after we recovered, or the original error.
- */ function Ze(t) {
+ */ function Ke(t) {
     return e(this, void 0, void 0, (function() {
         return n(this, (function(e) {
             if (t.code !== b.FAILED_PRECONDITION || "The current tab is not in the required state to perform this operation. It might be necessary to refresh the browser tab." !== t.message) throw t;
@@ -5815,7 +5815,7 @@ function an(t, e, n, r, i) {
         }(t);
         return e ? "a custom " + e + " object" : "an object";
     }
-    return "function" == typeof t ? "a function" : Ve("Unknown wrong type: " + typeof t);
+    return "function" == typeof t ? "a function" : Le("Unknown wrong type: " + typeof t);
 }
 
 function ln(t, e, n) {
@@ -5826,7 +5826,7 @@ function ln(t, e, n) {
  * Validates the provided positional argument is an object, and its keys and
  * values match the expected keys and types provided in optionTypes.
  */ function pn(t, e, n) {
-    F(e, (function(e, r) {
+    x(e, (function(e, r) {
         if (n.indexOf(e) < 0) throw new A(b.INVALID_ARGUMENT, "Unknown option '" + e + "' passed to function " + t + "(). Available options: " + n.join(", "));
     }));
 }
@@ -5935,7 +5935,7 @@ function wn() {
  *
  * Note that while you can't hide the constructor in JavaScript code, we are
  * using the hack above to make sure no-one outside this module can call it.
- */ Ke.eo = 3e8;
+ */ Xe.eo = 3e8;
 
 var bn = /** @class */ function() {
     function t(t) {
@@ -5945,13 +5945,13 @@ var bn = /** @class */ function() {
         tn("Blob.fromBase64String", arguments, 1), rn("Blob.fromBase64String", "string", 1, e), 
         En();
         try {
-            return new t(B.fromBase64String(e));
+            return new t(Q.fromBase64String(e));
         } catch (e) {
             throw new A(b.INVALID_ARGUMENT, "Failed to construct Blob from Base64 string: " + e);
         }
     }, t.fromUint8Array = function(e) {
         if (tn("Blob.fromUint8Array", arguments, 1), wn(), !(e instanceof Uint8Array)) throw dn("Blob.fromUint8Array", "Uint8Array", 1, e);
-        return new t(B.fromUint8Array(e));
+        return new t(Q.fromUint8Array(e));
     }, t.prototype.toBase64 = function() {
         return tn("Blob.toBase64", arguments, 0), En(), this.bo.toBase64();
     }, t.prototype.toUint8Array = function() {
@@ -5974,7 +5974,7 @@ var bn = /** @class */ function() {
             if (!(e instanceof Array) || e.length < 1) throw new A(b.INVALID_ARGUMENT, "Function FieldPath() requires its fieldNames argument to be an array with at least " + mn(1, "element") + ".");
         }(0, t);
         for (var n = 0; n < t.length; ++n) if (rn("FieldPath", "string", n, t[n]), 0 === t[n].length) throw new A(b.INVALID_ARGUMENT, "Invalid field name at argument $(i + 1). Field names must not be empty.");
-        this.vo = new O(t);
+        this.vo = new U(t);
     }
     return t.documentId = function() {
         return t.So;
@@ -5997,7 +5997,7 @@ var bn = /** @class */ function() {
  * included), but in the cases we currently support documentId(), the net
  * effect is the same.
  */
-Nn.So = new Nn(O.X().G());
+Nn.So = new Nn(U.X().G());
 
 /**
  * Matches any characters in a field path string that are reserved.
@@ -6085,7 +6085,7 @@ var Sn = /** @class */ function(e) {
         return (n = e.call(this, "FieldValue.increment") || this).Fo = t, n;
     }
     return t(n, e), n;
-}(Tn), Vn = gn(Tn, "Use FieldValue.<field>() instead."), Ln = /** @class */ function() {
+}(Tn), Ln = gn(Tn, "Use FieldValue.<field>() instead."), Vn = /** @class */ function() {
     function t(t, e) {
         if (tn("GeoPoint", arguments, 2), rn("GeoPoint", "number", 1, t), rn("GeoPoint", "number", 2, e), 
         !isFinite(t) || t < -90 || t > 90) throw new A(b.INVALID_ARGUMENT, "Latitude must be a number between -90 and 90, but was: " + t);
@@ -6118,9 +6118,9 @@ var Sn = /** @class */ function(e) {
      * with an underscore.
      */
     t.prototype.g = function(t) {
-        return Ue(this.No, t.No) || Ue(this.ko, t.ko);
+        return Oe(this.No, t.No) || Oe(this.ko, t.ko);
     }, t;
-}(), On = /^__.*__$/, Un = /** @class */ function() {
+}(), Un = /^__.*__$/, On = /** @class */ function() {
     function t(t, e, n) {
         this.data = t, this.se = e, this.fieldTransforms = n;
     }
@@ -6140,7 +6140,7 @@ var Sn = /** @class */ function(e) {
     }, t;
 }();
 
-function qn(t) {
+function Pn(t) {
     switch (t) {
       case 0 /* Set */ :
  // fall through
@@ -6154,7 +6154,7 @@ function qn(t) {
         return !1;
 
       default:
-        throw Ve("Unexpected case for UserDataSource: " + t);
+        throw Le("Unexpected case for UserDataSource: " + t);
     }
 }
 
@@ -6218,32 +6218,32 @@ function qn(t) {
         if (null !== this.path) for (var t = 0; t < this.path.length; t++) this.qo(this.path.get(t));
     }, t.prototype.qo = function(t) {
         if (0 === t.length) throw this.Qo("Document fields must not be empty");
-        if (qn(this.$o) && On.test(t)) throw this.Qo('Document fields cannot begin and end with "__"');
+        if (Pn(this.$o) && Un.test(t)) throw this.Qo('Document fields cannot begin and end with "__"');
     }, t;
-}(), Pn = function(t, e) {
+}(), qn = function(t, e) {
     this.ci = t, this.key = e;
-}, xn = /** @class */ function() {
+}, Fn = /** @class */ function() {
     function t(t, e) {
         this.serializer = t, this.Wo = e
         /** Parse document data from a non-merge set() call. */;
     }
     return t.prototype.jo = function(t, e) {
-        var n = new Mn(0 /* Set */ , t, O.H);
-        Fn("Data must be an object, but it was:", n, e);
+        var n = new Mn(0 /* Set */ , t, U.H);
+        xn("Data must be an object, but it was:", n, e);
         var r = this.Go(e, n);
-        return new Un(new Tt(r), 
+        return new On(new Tt(r), 
         /* fieldMask= */ null, n.fieldTransforms);
     }, 
     /** Parse document data from a set() call with '{merge:true}'. */ t.prototype.zo = function(t, e, n) {
-        var r = new Mn(2 /* MergeSet */ , t, O.H);
-        Fn("Data must be an object, but it was:", r, e);
+        var r = new Mn(2 /* MergeSet */ , t, U.H);
+        xn("Data must be an object, but it was:", r, e);
         var i, o, s = this.Go(e, r);
         if (n) {
-            for (var u = new P(O.k), a = 0, h = n; a < h.length; a++) {
+            for (var u = new q(U.k), a = 0, h = n; a < h.length; a++) {
                 var c = h[a], f = void 0;
                 if (c instanceof Nn) f = c.vo; else {
-                    if ("string" != typeof c) throw Ve("Expected stringOrFieldPath to be a string or a FieldPath");
-                    f = Bn(t, c);
+                    if ("string" != typeof c) throw Le("Expected stringOrFieldPath to be a string or a FieldPath");
+                    f = Qn(t, c);
                 }
                 if (!r.contains(f)) throw new A(b.INVALID_ARGUMENT, "Field '" + f + "' is specified in your field mask but missing from your input data.");
                 u = u.add(f);
@@ -6252,14 +6252,14 @@ function qn(t) {
                 return i.Kt(t.field);
             }));
         } else i = yt.zt(r.se), o = r.fieldTransforms;
-        return new Un(new Tt(s), i, o);
+        return new On(new Tt(s), i, o);
     }, 
     /** Parse update data from an update() call. */ t.prototype.Ko = function(t, e) {
-        var n = this, r = new Mn(1 /* Update */ , t, O.H);
-        Fn("Data must be an object, but it was:", r, e);
-        var i = new P(O.k), o = Tt.le();
-        F(e, (function(e, s) {
-            var u = Bn(t, e), a = r.Bo(u);
+        var n = this, r = new Mn(1 /* Update */ , t, U.H);
+        xn("Data must be an object, but it was:", r, e);
+        var i = new q(U.k), o = Tt.le();
+        x(e, (function(e, s) {
+            var u = Qn(t, e), a = r.Bo(u);
             if ((s = n.Ho(s, a)) instanceof _n) 
             // Add it to the field mask, but don't add anything to updateData.
             i = i.add(u); else {
@@ -6271,10 +6271,10 @@ function qn(t) {
         return new Cn(o.he(), s, r.fieldTransforms);
     }, 
     /** Parse update data from a list of field/value arguments. */ t.prototype.Yo = function(t, e, n, r) {
-        var i = new Mn(1 /* Update */ , t, O.H), o = [ jn(t, e) ], s = [ n ];
+        var i = new Mn(1 /* Update */ , t, U.H), o = [ jn(t, e) ], s = [ n ];
         if (r.length % 2 != 0) throw new A(b.INVALID_ARGUMENT, "Function " + t + "() needs to be called with an even number of arguments that alternate between field names and values.");
         for (var u = 0; u < r.length; u += 2) o.push(jn(t, r[u])), s.push(r[u + 1]);
-        for (var a = new P(O.k), h = Tt.le(), c = 0; c < o.length; ++c) {
+        for (var a = new q(U.k), h = Tt.le(), c = 0; c < o.length; ++c) {
             var f = o[c], l = i.Bo(f), p = this.Ho(s[c], l);
             if (p instanceof _n) 
             // Add it to the field mask, but don't add anything to updateData.
@@ -6295,14 +6295,14 @@ function qn(t) {
      */
     t.prototype.Xo = function(t, e, n) {
         void 0 === n && (n = !1);
-        var r = new Mn(n ? 4 /* ArrayArgument */ : 3 /* Argument */ , t, O.H);
+        var r = new Mn(n ? 4 /* ArrayArgument */ : 3 /* Argument */ , t, U.H);
         return this.Jo(e, r);
     }, 
     /** Sends data through this.preConverter, handling any thrown errors. */ t.prototype.Ho = function(t, e) {
         try {
             return this.Wo(t);
         } catch (t) {
-            var n = zn(t);
+            var n = Bn(t);
             throw e.Qo(n);
         }
     }, 
@@ -6316,7 +6316,7 @@ function qn(t) {
      * that should not be included in the resulting parsed data.
      */
     t.prototype.Jo = function(t, e) {
-        if (Gn(t = this.Ho(t, e))) return Fn("Unsupported field value:", e, t), this.Go(t, e);
+        if (Gn(t = this.Ho(t, e))) return xn("Unsupported field value:", e, t), this.Go(t, e);
         if (t instanceof Tn) 
         // FieldValues usually parse into transforms (except FieldValue.delete())
         // in which case we do not want to include this field in our parsed data
@@ -6343,7 +6343,7 @@ function qn(t) {
         return j(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.se.push(e.path) : F(t, (function(t, i) {
+        e.path && e.path.length > 0 && e.se.push(e.path) : x(t, (function(t, i) {
             var o = n.Jo(i, e.Uo(t));
             null != o && (r[t] = o);
         })), {
@@ -6373,7 +6373,7 @@ function qn(t) {
      */
     t.prototype.Zo = function(t, e) {
         // Sentinels are only supported with writes, and not within arrays.
-        if (!qn(e.$o)) throw e.Qo(t.Co + "() can only be used with update() and set()");
+        if (!Pn(e.$o)) throw e.Qo(t.Co + "() can only be used with update() and set()");
         if (null === e.path) throw e.Qo(t.Co + "() is not currently supported inside arrays");
         if (t instanceof _n) {
             if (2 /* MergeSet */ !== e.$o) throw 1 /* Update */ === e.$o ? e.Qo("FieldValue.delete() can only appear at the top level of your update data") : e.Qo("FieldValue.delete() cannot be used with set() unless you pass {merge:true}");
@@ -6389,7 +6389,7 @@ function qn(t) {
         } else if (t instanceof Dn) {
             var s = this.Xo("FieldValue.increment", t.Fo), u = new pt(this.serializer, s);
             e.fieldTransforms.push(new vt(e.path, u));
-        } else Ve("Unknown FieldValue type: " + t);
+        } else Le("Unknown FieldValue type: " + t);
     }, 
     /**
      * Helper to parse a scalar value (i.e. not an Object, Array, or FieldValue)
@@ -6422,7 +6422,7 @@ function qn(t) {
                 timestampValue: this.serializer.F(r)
             };
         }
-        if (t instanceof Ln) return {
+        if (t instanceof Vn) return {
             geoPointValue: {
                 latitude: t.latitude,
                 longitude: t.longitude
@@ -6431,7 +6431,7 @@ function qn(t) {
         if (t instanceof bn) return {
             bytesValue: this.serializer.Ti(t)
         };
-        if (t instanceof Pn) return {
+        if (t instanceof qn) return {
             referenceValue: this.serializer.Ei(t.key.path, t.ci)
         };
         throw e.Qo("Unsupported field value: " + fn(t));
@@ -6441,7 +6441,7 @@ function qn(t) {
             // Although array transforms are used with writes, the actual elements
             // being unioned or removed are not considered writes since they cannot
             // contain any FieldValue sentinels, etc.
-            var i = new Mn(3 /* Argument */ , t, O.H);
+            var i = new Mn(3 /* Argument */ , t, U.H);
             return n.Jo(e, i.xo(r));
         }));
     }, t;
@@ -6460,10 +6460,10 @@ function qn(t) {
  * to specific FieldValue types other than ObjectValue.
  */
 function Gn(t) {
-    return !("object" != typeof t || null === t || t instanceof Array || t instanceof Date || t instanceof S || t instanceof Ln || t instanceof bn || t instanceof Pn || t instanceof Tn);
+    return !("object" != typeof t || null === t || t instanceof Array || t instanceof Date || t instanceof S || t instanceof Vn || t instanceof bn || t instanceof qn || t instanceof Tn);
 }
 
-function Fn(t, e, n) {
+function xn(t, e, n) {
     if (!Gn(n) || !cn(n)) {
         var r = fn(n);
         throw "an object" === r ? e.Qo(t + " a custom object") : e.Qo(t + " " + r);
@@ -6474,7 +6474,7 @@ function Fn(t, e, n) {
  * Helper that calls fromDotSeparatedString() but wraps any error thrown.
  */ function jn(t, e) {
     if (e instanceof Nn) return e.vo;
-    if ("string" == typeof e) return Bn(t, e);
+    if ("string" == typeof e) return Qn(t, e);
     throw new A(b.INVALID_ARGUMENT, "Function " + t + "() called with invalid data. Field path arguments must be of type string or FieldPath.");
 }
 
@@ -6484,7 +6484,7 @@ function Fn(t, e, n) {
  * @param methodName The publicly visible method name
  * @param path The dot-separated string form of a field path which will be split
  * on dots.
- */ function Bn(t, e) {
+ */ function Qn(t, e) {
     try {
         return function(t) {
             if (t.search(In) >= 0) throw new A(b.INVALID_ARGUMENT, "Invalid field path (" + t + "). Paths must not contain '~', '*', '/', '[', or ']'");
@@ -6495,7 +6495,7 @@ function Fn(t, e, n) {
             }
         }(e).vo;
     } catch (e) {
-        var n = zn(e);
+        var n = Bn(e);
         throw new A(b.INVALID_ARGUMENT, "Function " + t + "() called with invalid data. " + n);
     }
 }
@@ -6503,7 +6503,7 @@ function Fn(t, e, n) {
 /**
  * Extracts the message from a caught exception, which should be an Error object
  * though JS doesn't guarantee that.
- */ function zn(t) {
+ */ function Bn(t) {
     return t instanceof Error ? t.message : t.toString();
 }
 
@@ -6531,7 +6531,7 @@ function Fn(t, e, n) {
  * backoff curve, and a +/- 50% "jitter" that is calculated and added to the
  * base delay. This prevents clients from accidentally synchronizing their
  * delays causing spikes of load to the backend.
- */ var Qn = /** @class */ function() {
+ */ var zn = /** @class */ function() {
     function t(
     /**
      * The AsyncQueue to run backoff operations on.
@@ -6611,7 +6611,7 @@ function Fn(t, e, n) {
              * getCloseGuardedDispatcher() to invalidate callbacks that happen after
              * close.
              */
-        this.Ta = 0, this.ma = null, this.stream = null, this.Ea = new Qn(t, e)
+        this.Ta = 0, this.ma = null, this.stream = null, this.Ea = new zn(t, e)
         /**
      * Returns true if start() has been called and no error has occurred. True
      * indicates the stream is open or in the process of opening (which
@@ -6870,7 +6870,7 @@ function Fn(t, e, n) {
              * PersistentWriteStream manages propagating this value from responses to the
              * next request.
              */
-        s.lastStreamToken = B.Ut, s;
+        s.lastStreamToken = Q.Ut, s;
     }
     return t(n, e), Object.defineProperty(n.prototype, "Ua", {
         /**
@@ -6893,7 +6893,7 @@ function Fn(t, e, n) {
     }, n.prototype.onMessage = function(t) {
         if (
         // Always capture the last stream token.
-        Le(!!t.streamToken, "Got a write response without a stream token"), this.lastStreamToken = this.serializer.mi(t.streamToken), 
+        Ve(!!t.streamToken, "Got a write response without a stream token"), this.lastStreamToken = this.serializer.mi(t.streamToken), 
         this.Ma) {
             // A successful first write response means the stream is healthy,
             // Note, that we could consider a successful handshake healthy, however,
@@ -6903,7 +6903,7 @@ function Fn(t, e, n) {
             return this.listener.Ba(n, e);
         }
         // The first response is always the handshake response
-                return Le(!t.writeResults || 0 === t.writeResults.length, "Got mutation results for handshake"), 
+                return Ve(!t.writeResults || 0 === t.writeResults.length, "Got mutation results for handshake"), 
         this.Ma = !0, this.listener.xa();
     }, 
     /**
@@ -6952,7 +6952,7 @@ function Fn(t, e, n) {
             }))
         };
         return this.Ka("BatchGetDocuments", n).then((function(n) {
-            var r = Zt();
+            var r = Kt();
             n.forEach((function(t) {
                 var n = e.serializer.Di(t);
                 r = r.nt(n.key, n);
@@ -6960,7 +6960,7 @@ function Fn(t, e, n) {
             var i = [];
             return t.forEach((function(t) {
                 var e = r.get(t);
-                Le(!!e, "Missing entity in write response for " + t), i.push(e);
+                Ve(!!e, "Missing entity in write response for " + t), i.push(e);
             })), i;
         }));
     }, 
@@ -6980,7 +6980,7 @@ function Fn(t, e, n) {
             throw t.code === b.UNAUTHENTICATED && n.credentials.l(), t;
         }));
     }, t;
-}(), Xn = /** @class */ function() {
+}(), Zn = /** @class */ function() {
     function t(t) {
         this.Ha = t, 
         // The version of each document that was read during this transaction.
@@ -7009,7 +7009,7 @@ function Fn(t, e, n) {
 
                   case 1:
                     return [ 2 /*return*/ , ((e = n.sent()).forEach((function(t) {
-                        t instanceof Rt || t instanceof St ? r.eu(t) : Ve("Document in a transaction was a " + t.constructor.name);
+                        t instanceof Rt || t instanceof St ? r.eu(t) : Le("Document in a transaction was a " + t.constructor.name);
                     })), e) ];
                 }
             }));
@@ -7052,7 +7052,7 @@ function Fn(t, e, n) {
     }, t.prototype.eu = function(t) {
         var e;
         if (t instanceof St) e = t.version; else {
-            if (!(t instanceof Rt)) throw Ve("Document in a transaction was a " + t.constructor.name);
+            if (!(t instanceof Rt)) throw Le("Document in a transaction was a " + t.constructor.name);
             // For deleted docs, we must use baseVersion 0 when we overwrite them.
                         e = R.S();
         }
@@ -7099,7 +7099,7 @@ function Fn(t, e, n) {
     }, t.prototype.write = function(t) {
         this.tu(), this.mutations = this.mutations.concat(t);
     }, t.prototype.tu = function() {}, t;
-}(), Kn = /** @class */ function() {
+}(), Xn = /** @class */ function() {
     function t(t, e) {
         this.Ar = t, this.iu = e, 
         /** The current OnlineState. */
@@ -7168,7 +7168,7 @@ function Fn(t, e, n) {
     }, t.prototype.lu = function() {
         null !== this.ru && (this.ru.cancel(), this.ru = null);
     }, t;
-}(), Zn = /** @class */ function() {
+}(), Kn = /** @class */ function() {
     function t(
     /**
      * The local store, used to fill the write pipeline with outbound mutations.
@@ -7228,7 +7228,7 @@ function Fn(t, e, n) {
                     }));
                 }));
             }));
-        })), this.Iu = new Kn(i, o), 
+        })), this.Iu = new Xn(i, o), 
         // Create streams (but note they're not started yet).
         this.Au = this.Ha.ja({
             Na: this.Pu.bind(this),
@@ -7450,7 +7450,7 @@ function Fn(t, e, n) {
             if (n) {
                 // Clear the resume token for the target, since we're in a known mismatch
                 // state.
-                e.fu.set(t, n.ss(B.Ut, n.ts)), 
+                e.fu.set(t, n.ss(Q.Ut, n.ts)), 
                 // Cause a hard reset by unwatching and rewatching immediately, but
                 // deliberately don't send a resume token so that we get a full update.
                 e.Ou(t);
@@ -7549,7 +7549,7 @@ function Fn(t, e, n) {
                 var r = n[e];
                 t.gu.qa(r.mutations);
             }
-        })).catch(Ze);
+        })).catch(Ke);
     }, t.prototype.Ba = function(t, e) {
         var n = this, r = this.du.shift(), i = Ge.from(r, t, e, this.gu.lastStreamToken);
         return this.Mu.zu(i).then((function() {
@@ -7576,7 +7576,7 @@ function Fn(t, e, n) {
                 // no longer valid. Note that the handshake does not count as a write: see
                 // comments on isPermanentWriteError for details.
                 return Jt(t.code) ? [ 2 /*return*/ , (Se("RemoteStore", "RemoteStore error before completed handshake; resetting stream token: ", this.gu.lastStreamToken), 
-                this.gu.lastStreamToken = B.Ut, this._u.Qh(B.Ut).catch(Ze)) ] : [ 2 /*return*/ ];
+                this.gu.lastStreamToken = Q.Ut, this._u.Qh(Q.Ut).catch(Ke)) ] : [ 2 /*return*/ ];
             }));
         }));
     }, t.prototype.Ku = function(t) {
@@ -7592,7 +7592,7 @@ function Fn(t, e, n) {
             }));
         }));
     }, t.prototype.Yu = function() {
-        return new Xn(this.Ha);
+        return new Zn(this.Ha);
     }, t.prototype.Ru = function() {
         return e(this, void 0, void 0, (function() {
             return n(this, (function(t) {
@@ -7854,7 +7854,7 @@ function Fn(t, e, n) {
                         return 0;
 
                       default:
-                        return Ve("Unknown ChangeType: " + t);
+                        return Le("Unknown ChangeType: " + t);
                     }
                 };
                 return n(t) - n(e);
@@ -7964,7 +7964,7 @@ function Fn(t, e, n) {
     }, t;
 }(), or = /** @class */ function() {
     function t(t, e, n, r) {
-        this.Ar = t, this.Lc = e, this.updateFunction = n, this.gr = r, this.$c = 5, this.Ea = new Qn(this.Ar, "retry_transaction" /* RetryTransaction */)
+        this.Ar = t, this.Lc = e, this.updateFunction = n, this.gr = r, this.$c = 5, this.Ea = new zn(this.Ar, "retry_transaction" /* RetryTransaction */)
         /** Runs the transaction and sets the result on deferred. */;
     }
     return t.prototype.Oc = function() {
@@ -7992,7 +7992,7 @@ function Fn(t, e, n) {
     }, t.prototype.Uc = function(t) {
         try {
             var e = this.updateFunction(t);
-            return !z(e) && e.catch && e.then ? e : (this.gr.reject(Error("Transaction callback must return a Promise")), 
+            return !B(e) && e.catch && e.then ? e : (this.gr.reject(Error("Transaction callback must return a Promise")), 
             null);
         } catch (t) {
             // Do not retry errors thrown by user provided updateFunction.
@@ -8044,7 +8044,7 @@ n) {
     // PORTING NOTE: Manages state synchronization in multi-tab environments.
     n, r, i) {
         this._u = t, this.Lc = e, this.Qc = n, this.currentUser = r, this.Wc = i, this.jc = null, 
-        this.Gc = new Pe((function(t) {
+        this.Gc = new qe((function(t) {
             return t.canonicalId();
         })), this.zc = new Map, 
         /**
@@ -8056,12 +8056,12 @@ n) {
              * Keeps track of the target ID for each document that is in limbo with an
              * active target.
              */
-        this.Hc = new C(U.k), 
+        this.Hc = new C(O.k), 
         /**
              * 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.Jc = new Map, this.Yc = new Fe, 
+        this.Jc = new Map, this.Yc = new xe, 
         /** Stores user completion handlers, indexed by User and BatchId. */
         this.Xc = {}, 
         /** Stores user callbacks waiting for all pending writes to be acknowledged. */
@@ -8175,7 +8175,7 @@ n) {
                     // whether any other client is still interested in this target.
                     this.Qc.uc(e.targetId), this.Qc.dc(e.targetId) ? [ 3 /*break*/ , 2 ] : [ 4 /*yield*/ , this._u.co(e.targetId, /*keepPersistedTargetData=*/ !1).then((function() {
                         i.Qc.lc(e.targetId), i.Lc.$u(e.targetId), i.hl(e.targetId);
-                    })).catch(Ze) ]) : [ 3 /*break*/ , 3 ];
+                    })).catch(Ke) ]) : [ 3 /*break*/ , 3 ];
 
                   case 1:
                     n.sent(), n.label = 2;
@@ -8264,8 +8264,8 @@ n) {
                         n && (
                         // 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.
-                        Le(t.Ps.size + t.Vs.size + t.ps.size <= 1, "Limbo resolution for single document contains multiple changes."), 
-                        t.Ps.size > 0 ? n.xc = !0 : t.Vs.size > 0 ? Le(n.xc, "Received change for limbo target document without add.") : t.ps.size > 0 && (Le(n.xc, "Received remove for limbo target document without add."), 
+                        Ve(t.Ps.size + t.Vs.size + t.ps.size <= 1, "Limbo resolution for single document contains multiple changes."), 
+                        t.Ps.size > 0 ? n.xc = !0 : t.Vs.size > 0 ? Ve(n.xc, "Received change for limbo target document without add.") : t.ps.size > 0 && (Ve(n.xc, "Received remove for limbo target document without add."), 
                         n.xc = !1));
                     })), [ 4 /*yield*/ , this.al(e, t) ];
 
@@ -8274,7 +8274,7 @@ n) {
                     return n.sent(), [ 3 /*break*/ , 6 ];
 
                   case 4:
-                    return [ 4 /*yield*/ , Ze(n.sent()) ];
+                    return [ 4 /*yield*/ , Ke(n.sent()) ];
 
                   case 5:
                     return n.sent(), [ 3 /*break*/ , 6 ];
@@ -8313,12 +8313,12 @@ n) {
                     this.Qc.ac(t, "rejected", r), e = this.Jc.get(t), (i = e && e.key) ? (
                     // Since this query failed, we won't want to manually unlisten to it.
                     // So go ahead and remove it from bookkeeping.
-                    this.Hc = this.Hc.remove(i), this.Jc.delete(t), this.cl(), o = (o = new C(U.k)).nt(i, new Rt(i, R.S())), 
+                    this.Hc = this.Hc.remove(i), this.Jc.delete(t), this.cl(), o = (o = new C(O.k)).nt(i, new Rt(i, R.S())), 
                     s = oe().add(i), u = new fe(R.MIN, 
                     /* targetChanges= */ new Map, 
-                    /* targetMismatches= */ new P(Ue), o, s), [ 2 /*return*/ , this.jh(u) ]) : [ 4 /*yield*/ , this._u.co(t, /* keepPersistedTargetData */ !1).then((function() {
+                    /* targetMismatches= */ new q(Oe), o, s), [ 2 /*return*/ , this.jh(u) ]) : [ 4 /*yield*/ , this._u.co(t, /* keepPersistedTargetData */ !1).then((function() {
                         return a.hl(t, r);
-                    })).catch(Ze) ];
+                    })).catch(Ke) ];
 
                   case 1:
                     return n.sent(), [ 2 /*return*/ ];
@@ -8348,7 +8348,7 @@ n) {
                     "acknowledged" === r || "rejected" === r ? (
                     // NOTE: Both these methods are no-ops for batches that originated from
                     // other clients.
-                    this._l(t, i || null), this._u.To(t)) : Ve("Unknown batchState: " + r), n.label = 4;
+                    this._l(t, i || null), this._u.To(t)) : Le("Unknown batchState: " + r), n.label = 4;
 
                   case 4:
                     return [ 4 /*yield*/ , this.al(e) ];
@@ -8394,7 +8394,7 @@ n) {
                     return n.sent(), [ 3 /*break*/ , 6 ];
 
                   case 4:
-                    return [ 4 /*yield*/ , Ze(n.sent()) ];
+                    return [ 4 /*yield*/ , Ke(n.sent()) ];
 
                   case 5:
                     return n.sent(), [ 3 /*break*/ , 6 ];
@@ -8427,7 +8427,7 @@ n) {
                     return n.sent(), [ 3 /*break*/ , 6 ];
 
                   case 4:
-                    return [ 4 /*yield*/ , Ze(n.sent()) ];
+                    return [ 4 /*yield*/ , Ke(n.sent()) ];
 
                   case 5:
                     return n.sent(), [ 3 /*break*/ , 6 ];
@@ -8475,7 +8475,7 @@ n) {
         })), this.Zc.clear();
     }, t.prototype.ol = function(t, e) {
         var n = this.Xc[this.currentUser.s()];
-        n || (n = new C(Ue)), n = n.nt(t, e), this.Xc[this.currentUser.s()] = n;
+        n || (n = new C(Oe)), n = n.nt(t, e), this.Xc[this.currentUser.s()] = n;
     }, 
     /**
      * Resolves or rejects the user callback for the given batch and then discards
@@ -8515,7 +8515,7 @@ n) {
             i instanceof nr ? (this.Yc.vn(i.key, t), this.El(i)) : i instanceof rr ? (Se("SyncEngine", "Document no longer in limbo: " + i.key), 
             this.Yc.Cn(i.key, t), this.Yc.$n(i.key) || 
             // We removed the last reference for this key
-            this.ml(i.key)) : Ve("Unknown limbo change: " + JSON.stringify(i));
+            this.ml(i.key)) : Le("Unknown limbo change: " + JSON.stringify(i));
         }
     }, t.prototype.El = function(t) {
         var e = t.key;
@@ -8533,7 +8533,7 @@ n) {
     t.prototype.cl = function() {
         for (;this.Kc.length > 0 && this.Hc.size < this.Wc; ) {
             var t = this.Kc.shift(), e = this.tl.next();
-            this.Jc.set(e, new ur(t)), this.Hc = this.Hc.nt(t, e), this.Lc.listen(new Yt(Lt.ve(t.path).Ue(), e, 2 /* LimboResolution */ , He.Ir));
+            this.Jc.set(e, new ur(t)), this.Hc = this.Hc.nt(t, e), this.Lc.listen(new Yt(Vt.ve(t.path).Ue(), e, 2 /* LimboResolution */ , He.Ir));
         }
     }, 
     // Visible for testing
@@ -8565,7 +8565,7 @@ n) {
                             if (s.rl(u.targetId, o.Cc), o.snapshot) {
                                 s.isPrimary && s.Qc.ac(u.targetId, o.snapshot.fromCache ? "not-current" : "current"), 
                                 e.push(o.snapshot);
-                                var a = Qe.wr(u.targetId, o.snapshot);
+                                var a = ze.wr(u.targetId, o.snapshot);
                                 i.push(a);
                             }
                         })));
@@ -8653,7 +8653,7 @@ n) {
         var t = this;
         this.Jc.forEach((function(e, n) {
             t.Lc.$u(n);
-        })), this.Yc.kn(), this.Jc = new Map, this.Hc = new C(U.k);
+        })), this.Yc.kn(), this.Jc = new Map, this.Hc = new C(O.k);
     }, 
     /**
      * Reconcile the query views of the provided query targets with the state from
@@ -8736,7 +8736,7 @@ n) {
      */
     // PORTING NOTE: Multi-tab only
     t.prototype.Vl = function(t) {
-        return new Lt(t.path, t.collectionGroup, t.orderBy, t.filters, t.limit, "F" /* First */ , t.startAt, t.endAt);
+        return new Vt(t.path, t.collectionGroup, t.orderBy, t.filters, t.limit, "F" /* First */ , t.startAt, t.endAt);
     }, 
     // PORTING NOTE: Multi-tab only
     t.prototype.wo = function() {
@@ -8783,7 +8783,7 @@ n) {
                     return n.sent(), this.hl(t, i), [ 3 /*break*/ , 8 ];
 
                   case 7:
-                    Ve("Unexpected target state: " + r), n.label = 8;
+                    Le("Unexpected target state: " + r), n.label = 8;
 
                   case 8:
                     return [ 2 /*return*/ ];
@@ -8824,7 +8824,7 @@ n) {
                               case 0:
                                 return h.zc.has(t) ? [ 4 /*yield*/ , h._u.co(t, /* keepPersistedTargetData */ !1).then((function() {
                                     p.Lc.$u(t), p.hl(t);
-                                })).catch(Ze) ] : [ 3 /*break*/ , 2 ];
+                                })).catch(Ke) ] : [ 3 /*break*/ , 2 ];
 
                                 // Release queries that are still active.
                                                               case 1:
@@ -8876,7 +8876,7 @@ n) {
     this.yl = null, this.targetId = 0, this.bl = [];
 }, cr = /** @class */ function() {
     function t(t) {
-        this.Mu = t, this.vl = new Pe((function(t) {
+        this.Mu = t, this.vl = new qe((function(t) {
             return t.canonicalId();
         })), this.onlineState = "Unknown" /* Unknown */ , this.Sl = new Set, this.Mu.subscribe(this);
     }
@@ -9025,7 +9025,7 @@ n) {
     /** Applies the query filter and sorting to the provided documents.  */ t.prototype.Ql = function(t, e) {
         // Sort the documents and re-apply the query filter since previously
         // matching documents do not necessarily still match the query.
-        var n = new P((function(e, n) {
+        var n = new q((function(e, n) {
             return t.qe(e, n);
         }));
         return e.forEach((function(e, r) {
@@ -9066,9 +9066,9 @@ n) {
         this.Wl = new dr;
     }
     return t.prototype.jl = function(t, e) {
-        return this.Wl.add(e), Be.resolve();
+        return this.Wl.add(e), Qe.resolve();
     }, t.prototype.ur = function(t, e) {
-        return Be.resolve(this.Wl.getEntries(e));
+        return Qe.resolve(this.Wl.getEntries(e));
     }, t;
 }(), dr = /** @class */ function() {
     function t() {
@@ -9076,13 +9076,13 @@ n) {
     }
     // Returns false if the entry already existed.
         return t.prototype.add = function(t) {
-        var e = t.U(), n = t.O(), r = this.index[e] || new P(V.k), i = !r.has(n);
+        var e = t.U(), n = t.O(), r = this.index[e] || new q(L.k), i = !r.has(n);
         return this.index[e] = r.add(n), i;
     }, t.prototype.has = function(t) {
         var e = t.U(), n = t.O(), r = this.index[e];
         return r && r.has(n);
     }, t.prototype.getEntries = function(t) {
-        return (this.index[t] || new P(V.k)).j();
+        return (this.index[t] || new q(L.k)).j();
     }, t;
 }(), yr = /** @class */ function() {
     function t(t, e) {
@@ -9098,60 +9098,60 @@ n) {
              * responses the client has processed. Stream tokens are opaque checkpoint
              * markers whose only real value is their inclusion in the next request.
              */
-        this.lastStreamToken = B.Ut, 
+        this.lastStreamToken = Q.Ut, 
         /** An ordered mapping between documents and the mutations batch IDs. */
-        this.zl = new P(je.me);
+        this.zl = new q(je.me);
     }
     return t.prototype.Kl = function(t) {
-        return Be.resolve(0 === this.Hn.length);
+        return Qe.resolve(0 === this.Hn.length);
     }, t.prototype.Nh = function(t, e, n) {
         var r = e.batchId, i = this.Hl(r, "acknowledged");
-        return Le(0 === i, "Can only acknowledge the first batch in the mutation queue"), 
+        return Ve(0 === i, "Can only acknowledge the first batch in the mutation queue"), 
         // Verify that the batch in the queue is the one to be acknowledged.
-        this.Hn[i], this.lastStreamToken = n, Be.resolve();
+        this.Hn[i], this.lastStreamToken = n, Qe.resolve();
     }, t.prototype.xh = function(t) {
-        return Be.resolve(this.lastStreamToken);
+        return Qe.resolve(this.lastStreamToken);
     }, t.prototype.Qh = function(t, e) {
-        return this.lastStreamToken = e, Be.resolve();
+        return this.lastStreamToken = e, Qe.resolve();
     }, t.prototype.Sh = function(t, e, n, r) {
         var i = this.Gl;
         this.Gl++, this.Hn.length > 0 && this.Hn[this.Hn.length - 1];
-        var o = new xe(i, e, n, r);
+        var o = new Fe(i, e, n, r);
         this.Hn.push(o);
         // Track references by document key and index collection parents.
         for (var s = 0, u = r; s < u.length; s++) {
             var a = u[s];
             this.zl = this.zl.add(new je(a.key, i)), this.Jn.jl(t, a.key.path.O());
         }
-        return Be.resolve(o);
+        return Qe.resolve(o);
     }, t.prototype.Uh = function(t, e) {
-        return Be.resolve(this.Jl(e));
+        return Qe.resolve(this.Jl(e));
     }, t.prototype.Fh = function(t, e) {
         var n = this.Jl(e);
-        return Be.resolve(n.keys());
+        return Qe.resolve(n.keys());
     }, t.prototype.no = function(t, e) {
         var n = e + 1, r = this.Yl(n), i = r < 0 ? 0 : r;
         // The requested batchId may still be out of range so normalize it to the
         // start of the queue.
-                return Be.resolve(this.Hn.length > i ? this.Hn[i] : null);
+                return Qe.resolve(this.Hn.length > i ? this.Hn[i] : null);
     }, t.prototype.Bh = function() {
-        return Be.resolve(0 === this.Hn.length ? -1 : this.Gl - 1);
+        return Qe.resolve(0 === this.Hn.length ? -1 : this.Gl - 1);
     }, t.prototype.ph = function(t) {
-        return Be.resolve(this.Hn.slice());
+        return Qe.resolve(this.Hn.slice());
     }, t.prototype.Xn = function(t, e) {
         var n = this, r = new je(e, 0), i = new je(e, Number.POSITIVE_INFINITY), o = [];
         return this.zl.Dt([ r, i ], (function(t) {
             var e = n.Jl(t.On);
             o.push(e);
-        })), Be.resolve(o);
+        })), Qe.resolve(o);
     }, t.prototype.nr = function(t, e) {
-        var n = this, r = new P(Ue);
+        var n = this, r = new q(Oe);
         return e.forEach((function(t) {
             var e = new je(t, 0), i = new je(t, Number.POSITIVE_INFINITY);
             n.zl.Dt([ e, i ], (function(t) {
                 r = r.add(t.On);
             }));
-        })), Be.resolve(this.Xl(r));
+        })), Qe.resolve(this.Xl(r));
     }, t.prototype.cr = function(t, e) {
         // Use the query path as a prefix for testing if a document matches the
         // query.
@@ -9160,8 +9160,8 @@ n) {
         // the prefix the document key in this reference must have an even number of
         // segments. The empty segment can be used a suffix of the query path
         // because it precedes all other segments in an ordered traversal.
-                U.st(i) || (i = i.child(""));
-        var o = new je(new U(i), 0), s = new P(Ue);
+                O.st(i) || (i = i.child(""));
+        var o = new je(new O(i), 0), s = new q(Oe);
         // Find unique batchIDs referenced by all documents potentially matching the
         // query.
                 return this.zl.Ft((function(t) {
@@ -9173,7 +9173,7 @@ n) {
             // TODO(mcg): we'll need a different scanner when we implement
             // ancestor queries.
             e.length === r && (s = s.add(t.On)), !0);
-        }), o), Be.resolve(this.Xl(s));
+        }), o), Qe.resolve(this.Xl(s));
     }, t.prototype.Xl = function(t) {
         var e = this, n = [];
         // Construct an array of matching batches, sorted by batchID to ensure that
@@ -9184,10 +9184,10 @@ n) {
         })), n;
     }, t.prototype.qh = function(t, e) {
         var n = this;
-        Le(0 === this.Hl(e.batchId, "removed"), "Can only remove the first entry of the mutation queue"), 
+        Ve(0 === this.Hl(e.batchId, "removed"), "Can only remove the first entry of the mutation queue"), 
         this.Hn.shift();
         var r = this.zl;
-        return Be.forEach(e.mutations, (function(i) {
+        return Qe.forEach(e.mutations, (function(i) {
             var o = new je(i.key, e.batchId);
             return r = r.delete(o), n.dh.Zl(t, i.key);
         })).next((function() {
@@ -9197,9 +9197,9 @@ n) {
         // No-op since the memory mutation queue does not maintain a separate cache.
     }, t.prototype.$n = function(t, e) {
         var n = new je(e, 0), r = this.zl.Nt(n);
-        return Be.resolve(e.isEqual(r && r.key));
+        return Qe.resolve(e.isEqual(r && r.key));
     }, t.prototype.Oh = function(t) {
-        return this.Hn.length, Be.resolve();
+        return this.Hn.length, Qe.resolve();
     }, 
     /**
      * Finds the index of the given batchId in the mutation queue and asserts that
@@ -9244,7 +9244,7 @@ n) {
     function t(t, e) {
         this.Jn = t, this.t_ = e, 
         /** Underlying cache of documents and their read times. */
-        this.docs = new C(U.k), 
+        this.docs = new C(O.k), 
         /** Size of all cached documents. */
         this.size = 0
         /**
@@ -9273,15 +9273,15 @@ n) {
         e && (this.docs = this.docs.remove(t), this.size -= e.size);
     }, t.prototype.tr = function(t, e) {
         var n = this.docs.get(e);
-        return Be.resolve(n ? n.e_ : null);
+        return Qe.resolve(n ? n.e_ : null);
     }, t.prototype.getEntries = function(t, e) {
         var n = this, r = $t();
         return e.forEach((function(t) {
             var e = n.docs.get(t);
             r = r.nt(t, e ? e.e_ : null);
-        })), Be.resolve(r);
+        })), Qe.resolve(r);
     }, t.prototype.rr = function(t, e, n) {
-        for (var r = ee(), i = new U(e.path.child("")), o = this.docs._t(i)
+        for (var r = ee(), i = new O(e.path.child("")), o = this.docs._t(i)
         // Documents are ordered by key, so we can use a prefix scan to narrow down
         // the documents we need to match the query against.
         ; o.Rt(); ) {
@@ -9289,21 +9289,21 @@ n) {
             if (!e.path.B(u.path)) break;
             c.C(n) <= 0 || h instanceof St && e.matches(h) && (r = r.nt(h.key, h));
         }
-        return Be.resolve(r);
+        return Qe.resolve(r);
     }, t.prototype.s_ = function(t, e) {
-        return Be.forEach(this.docs, (function(t) {
+        return Qe.forEach(this.docs, (function(t) {
             return e(t);
         }));
     }, t.prototype.Po = function(t, e) {
         throw new Error("getNewDocumentChanges() is not supported with MemoryPersistence");
     }, t.prototype.po = function(t) {
-        return Be.resolve(R.MIN);
+        return Qe.resolve(R.MIN);
     }, t.prototype.kh = function(e) {
         // `trackRemovals` is ignores since the MemoryRemoteDocumentCache keeps
         // a separate changelog and does not need special handling for removals.
         return new t.i_(this);
     }, t.prototype.n_ = function(t) {
-        return Be.resolve(this.size);
+        return Qe.resolve(this.size);
     }, t;
 }();
 
@@ -9367,7 +9367,7 @@ vr.i_ = /** @class */ function(e) {
         var e = this, n = [];
         return this.Ch.forEach((function(r, i) {
             i ? n.push(e.c_.Xh(t, i, e.readTime)) : e.c_.Yh(r);
-        })), Be.Gn(n);
+        })), Qe.Gn(n);
     }, n.prototype.a_ = function(t, e) {
         return this.c_.tr(t, e);
     }, n.prototype.u_ = function(t, e) {
@@ -9377,7 +9377,7 @@ vr.i_ = /** @class */ function(e) {
     function t() {
         // A mapping of document key to the new cache entry that should be written (or null if any
         // existing cache entry should be removed).
-        this.Ch = new Pe((function(t) {
+        this.Ch = new qe((function(t) {
             return t.toString();
         })), this.r_ = !1;
     }
@@ -9423,7 +9423,7 @@ vr.i_ = /** @class */ function(e) {
     t.prototype.tr = function(t, e) {
         this.o_();
         var n = this.Ch.get(e);
-        return void 0 !== n ? Be.resolve(n) : this.a_(t, e);
+        return void 0 !== n ? Qe.resolve(n) : this.a_(t, e);
     }, 
     /**
      * Looks up several entries in the cache, forwarding to
@@ -9472,7 +9472,7 @@ var mr = /** @class */ function() {
         /**
              * Maps a target to the data about that target
              */
-        this.l_ = new Pe((function(t) {
+        this.l_ = new qe((function(t) {
             return t.canonicalId();
         })), 
         /** The last received snapshot version. */
@@ -9485,68 +9485,68 @@ var mr = /** @class */ function() {
              * A ordered bidirectional mapping between documents and the remote target
              * IDs.
              */
-        this.d_ = new Fe, this.targetCount = 0, this.f_ = er.Tc();
+        this.d_ = new xe, this.targetCount = 0, this.f_ = er.Tc();
     }
     return t.prototype.Xs = function(t, e) {
         return this.l_.forEach((function(t, n) {
             return e(n);
-        })), Be.resolve();
+        })), Qe.resolve();
     }, t.prototype.Wh = function(t) {
-        return Be.resolve(this.lastRemoteSnapshotVersion);
+        return Qe.resolve(this.lastRemoteSnapshotVersion);
     }, t.prototype.w_ = function(t) {
-        return Be.resolve(this.__);
+        return Qe.resolve(this.__);
     }, t.prototype.ao = function(t) {
-        return this.highestTargetId = this.f_.next(), Be.resolve(this.highestTargetId);
+        return this.highestTargetId = this.f_.next(), Qe.resolve(this.highestTargetId);
     }, t.prototype.to = function(t, e, n) {
         return n && (this.lastRemoteSnapshotVersion = n), e > this.__ && (this.__ = e), 
-        Be.resolve();
+        Qe.resolve();
     }, t.prototype.T_ = function(t) {
         this.l_.set(t.target, t);
         var e = t.targetId;
         e > this.highestTargetId && (this.f_ = new er(e), this.highestTargetId = e), t.sequenceNumber > this.__ && (this.__ = t.sequenceNumber);
     }, t.prototype.uo = function(t, e) {
-        return this.T_(e), this.targetCount += 1, Be.resolve();
+        return this.T_(e), this.targetCount += 1, Qe.resolve();
     }, t.prototype.Jh = function(t, e) {
-        return this.T_(e), Be.resolve();
+        return this.T_(e), Qe.resolve();
     }, t.prototype.m_ = function(t, e) {
         return this.l_.delete(e.target), this.d_.Nn(e.targetId), this.targetCount -= 1, 
-        Be.resolve();
+        Qe.resolve();
     }, t.prototype.E_ = function(t, e, n) {
         var r = this, i = 0, o = [];
         return this.l_.forEach((function(s, u) {
             u.sequenceNumber <= e && null === n.get(u.targetId) && (r.l_.delete(s), o.push(r.R_(t, u.targetId)), 
             i++);
-        })), Be.Gn(o).next((function() {
+        })), Qe.Gn(o).next((function() {
             return i;
         }));
     }, t.prototype.I_ = function(t) {
-        return Be.resolve(this.targetCount);
+        return Qe.resolve(this.targetCount);
     }, t.prototype.oo = function(t, e) {
         var n = this.l_.get(e) || null;
-        return Be.resolve(n);
+        return Qe.resolve(n);
     }, t.prototype.ui = function(t, e) {
         // This method is only needed for multi-tab and we can't implement it
         // efficiently without additional data structures.
-        return Ve("Not yet implemented.");
+        return Le("Not yet implemented.");
     }, t.prototype.zh = function(t, e, n) {
         this.d_.Sn(e, n);
         var r = this.persistence.dh, i = [];
         return r && e.forEach((function(e) {
             i.push(r.vn(t, e));
-        })), Be.Gn(i);
+        })), Qe.Gn(i);
     }, t.prototype.Gh = function(t, e, n) {
         this.d_.Fn(e, n);
         var r = this.persistence.dh, i = [];
         return r && e.forEach((function(e) {
             i.push(r.Cn(t, e));
-        })), Be.Gn(i);
+        })), Qe.Gn(i);
     }, t.prototype.R_ = function(t, e) {
-        return this.d_.Nn(e), Be.resolve();
+        return this.d_.Nn(e), Qe.resolve();
     }, t.prototype._o = function(t, e) {
         var n = this.d_.Ln(e);
-        return Be.resolve(n);
+        return Qe.resolve(n);
     }, t.prototype.$n = function(t, e) {
-        return Be.resolve(this.d_.$n(e));
+        return Qe.resolve(this.d_.$n(e));
     }, t;
 }(), gr = /** @class */ function() {
     /**
@@ -9562,9 +9562,7 @@ var mr = /** @class */ function() {
             return n.dh.p_(t);
         }));
     }
-    return t.prototype.start = function() {
-        return Promise.resolve();
-    }, t.prototype.ku = function() {
+    return t.prototype.ku = function() {
         // No durable state to ensure is closed on shutdown.
         return this.V_ = !1, Promise.resolve();
     }, Object.defineProperty(t.prototype, "g_", {
@@ -9607,7 +9605,7 @@ var mr = /** @class */ function() {
             return i.C_(), t;
         }));
     }, t.prototype.D_ = function(t, e) {
-        return Be.zn(Object.values(this.A_).map((function(n) {
+        return Qe.zn(Object.values(this.A_).map((function(n) {
             return function() {
                 return n.$n(t, e);
             };
@@ -9647,18 +9645,18 @@ var mr = /** @class */ function() {
     }, Object.defineProperty(t.prototype, "M_", {
         get: function() {
             if (this.L_) return this.L_;
-            throw Ve("orphanedDocuments is only valid during a transaction.");
+            throw Le("orphanedDocuments is only valid during a transaction.");
         },
         enumerable: !0,
         configurable: !0
     }), t.prototype._h = function(t) {
         this.k_ = t;
     }, t.prototype.vn = function(t, e) {
-        return this.M_.delete(e), Be.resolve();
+        return this.M_.delete(e), Qe.resolve();
     }, t.prototype.Cn = function(t, e) {
-        return this.M_.add(e), Be.resolve();
+        return this.M_.add(e), Qe.resolve();
     }, t.prototype.Zl = function(t, e) {
-        return this.M_.add(e), Be.resolve();
+        return this.M_.add(e), Qe.resolve();
     }, t.prototype.removeTarget = function(t, e) {
         var n = this, r = this.persistence.Eh();
         return r._o(t, e.targetId).next((function(t) {
@@ -9673,7 +9671,7 @@ var mr = /** @class */ function() {
     }, t.prototype.S_ = function(t) {
         var e = this, n = this.persistence.Th().kh();
         // Remove newly orphaned documents.
-                return Be.forEach(this.M_, (function(r) {
+                return Qe.forEach(this.M_, (function(r) {
             return e.U_(t, r).next((function(t) {
                 t || n.Yh(r);
             }));
@@ -9690,82 +9688,46 @@ var mr = /** @class */ function() {
         return 0;
     }, t.prototype.U_ = function(t, e) {
         var n = this;
-        return Be.zn([ function() {
+        return Qe.zn([ function() {
             return n.persistence.Eh().$n(t, e);
         }, function() {
             return n.persistence.D_(t, e);
         }, function() {
-            return Be.resolve(n.k_.$n(e));
+            return Qe.resolve(n.k_.$n(e));
         } ]);
     }, t;
-}(), br = /** @class */ function() {
-    function t() {}
-    return t.prototype.initialize = function(t) {
+}(), br = "You are using the memory-only build of Firestore. Persistence support is only available via the @firebase/firestore bundle or the firebase-firestore.js build.", Ar = /** @class */ function() {
+    function t(t) {
+        void 0 === t && (t = Er.O_), this.q_ = t;
+    }
+    return t.prototype.initialize = function(t, r, i, o, s, u, a, h) {
         return e(this, void 0, void 0, (function() {
-            var r = this;
-            return n(this, (function(i) {
-                switch (i.label) {
+            var e = this;
+            return n(this, (function(n) {
+                switch (n.label) {
                   case 0:
-                    return this.Qc = this.q_(t), this.persistence = this.B_(t), [ 4 /*yield*/ , this.persistence.start() ];
+                    if (h.B_) throw new A(b.FAILED_PRECONDITION, br);
+                    return this.persistence = new gr(s, this.q_), this.x_ = null, this.Qc = new tr, 
+                    this._u = new Xe(this.persistence, new lr, u), this.Lc = new Kn(this._u, o, t, (function(t) {
+                        return e.Mu.Dc(t, 0 /* RemoteStore */);
+                    }), i.Q_()), this.Mu = new ar(this._u, this.Lc, this.Qc, u, a), this.W_ = new cr(this.Mu), 
+                    this.Lc.Mu = this.Mu, [ 4 /*yield*/ , this.Lc.start() ];
 
                   case 1:
-                    return i.sent(), this.x_ = this.Q_(t), this._u = this.W_(t), this.Lc = this.j_(t), 
-                    this.Mu = this.G_(t), this.z_ = this.K_(t), this.Qc.iu = function(t) {
-                        return r.Mu.Dc(t, 1 /* SharedClientState */);
-                    }, this.Lc.Mu = this.Mu, this.Qc.Mu = this.Mu, [ 4 /*yield*/ , this.Qc.start() ];
+                    return n.sent(), [ 4 /*yield*/ , this.Lc.Zu(!0) ];
 
                   case 2:
-                    return i.sent(), [ 4 /*yield*/ , this.Lc.start() ];
+                    return n.sent(), [ 4 /*yield*/ , this.Mu.Zu(!0) ];
 
                   case 3:
-                    return i.sent(), [ 4 /*yield*/ , this._u.start() ];
-
-                  case 4:
-                    // NOTE: This will immediately call the listener, so we make sure to
-                    // set it after localStore / remoteStore are started.
-                    return i.sent(), [ 4 /*yield*/ , this.persistence.y_((function(t) {
-                        return e(r, void 0, void 0, (function() {
-                            return n(this, (function(e) {
-                                switch (e.label) {
-                                  case 0:
-                                    return [ 4 /*yield*/ , this.Mu.Zu(t) ];
-
-                                  case 1:
-                                    return e.sent(), this.x_ && (t && !this.x_.g_ ? this.x_.start(this._u) : t || this.x_.stop()), 
-                                    [ 2 /*return*/ ];
-                                }
-                            }));
-                        }));
-                    })) ];
-
-                  case 5:
-                    // NOTE: This will immediately call the listener, so we make sure to
-                    // set it after localStore / remoteStore are started.
-                    return i.sent(), [ 2 /*return*/ ];
+                    return n.sent(), [ 2 /*return*/ ];
                 }
             }));
         }));
-    }, t.prototype.K_ = function(t) {
-        return new cr(this.Mu);
-    }, t.prototype.Q_ = function(t) {
-        return null;
-    }, t.prototype.W_ = function(t) {
-        return new Ke(this.persistence, new lr, t.H_);
-    }, t.prototype.B_ = function(t) {
-        return new gr(t.clientId, Er.O_);
-    }, t.prototype.j_ = function(t) {
-        var e = this;
-        return new Zn(this._u, t.Ha, t.Ar, (function(t) {
-            return e.Mu.Dc(t, 0 /* RemoteStore */);
-        }), t.platform.J_());
-    }, t.prototype.q_ = function(t) {
-        return new tr;
-    }, t.prototype.G_ = function(t) {
-        return new ar(this._u, this.Lc, this.Qc, t.H_, t.Wc);
-    }, t.prototype.clearPersistence = function(t) {
-        throw new A(b.FAILED_PRECONDITION, "You are using the memory-only build of Firestore. Persistence support is only available via the @firebase/firestore bundle or the firebase-firestore.js build.");
+    }, t.prototype.clearPersistence = function() {
+        throw new A(b.FAILED_PRECONDITION, br);
     }, t;
-}(), Ar = /** @class */ function() {
+}(), Nr = /** @class */ function() {
     function t(t, e, n, 
     /**
      * Asynchronous queue responsible for all of our internal processing. When
@@ -9776,7 +9738,7 @@ var mr = /** @class */ function() {
      * an async I/O to complete).
      */
     r) {
-        this.platform = t, this.Y_ = e, this.credentials = n, this.Ar = r, this.clientId = Oe.Tn()
+        this.platform = t, this.j_ = e, this.credentials = n, this.Ar = r, this.clientId = Ue.Tn()
         /**
      * Starts up the FirestoreClient, returning only whether or not enabling
      * persistence succeeded.
@@ -9816,7 +9778,7 @@ var mr = /** @class */ function() {
     }
     return t.prototype.start = function(t, e) {
         var n = this;
-        this.X_();
+        this.G_();
         // We defer our initialization until we get the current user from
         // setChangeListener(). We block the async queue until we got the initial
         // user and the initialization is completed. This will prevent any scheduled
@@ -9833,7 +9795,7 @@ var mr = /** @class */ function() {
         // need to await the completion of initializationDone because the result of
         // this method should not reflect any other kind of failure to start.
         return this.credentials._((function(s) {
-            if (!o) return o = !0, Se("FirestoreClient", "Initializing. user=", s.uid), n.Z_(t, e, s, i).then(r.resolve, r.reject);
+            if (!o) return o = !0, Se("FirestoreClient", "Initializing. user=", s.uid), n.z_(t, e, s, i).then(r.resolve, r.reject);
             n.Ar.Cr((function() {
                 return n.Xu(s);
             }));
@@ -9845,7 +9807,7 @@ var mr = /** @class */ function() {
     }, 
     /** Enables the network connection and requeues all pending operations. */ t.prototype.enableNetwork = function() {
         var t = this;
-        return this.X_(), this.Ar.enqueue((function() {
+        return this.G_(), this.Ar.enqueue((function() {
             return t.Mu.enableNetwork();
         }));
     }, 
@@ -9869,30 +9831,21 @@ var mr = /** @class */ function() {
      *     continue, i.e. that one of the persistence implementations actually
      *     succeeded.
      */
-    t.prototype.Z_ = function(t, r, i, o) {
+    t.prototype.z_ = function(t, r, i, o) {
         return e(this, void 0, void 0, (function() {
             var s, u, a, h, c = this;
             return n(this, (function(f) {
                 switch (f.label) {
                   case 0:
-                    return f.trys.push([ 0, 3, , 4 ]), [ 4 /*yield*/ , this.platform.td(this.Y_) ];
+                    return f.trys.push([ 0, 3, , 4 ]), [ 4 /*yield*/ , this.platform.K_(this.j_) ];
 
                   case 1:
-                    return s = f.sent(), u = this.platform.ed(this.Y_.ci), a = new Jn(this.Ar, s, this.credentials, u), 
-                    [ 4 /*yield*/ , t.initialize({
-                        Ar: this.Ar,
-                        Y_: this.Y_,
-                        platform: this.platform,
-                        Ha: a,
-                        clientId: this.clientId,
-                        H_: i,
-                        Wc: 100,
-                        sd: r
-                    }) ];
+                    return s = f.sent(), u = this.platform.H_(this.j_.ci), a = new Jn(this.Ar, s, this.credentials, u), 
+                    [ 4 /*yield*/ , t.initialize(this.Ar, this.j_, this.platform, a, this.clientId, i, 100, r) ];
 
                   case 2:
                     return f.sent(), this.persistence = t.persistence, this.Qc = t.Qc, this._u = t._u, 
-                    this.Lc = t.Lc, this.Mu = t.Mu, this.x_ = t.x_, this.nd = t.z_, 
+                    this.Lc = t.Lc, this.Mu = t.Mu, this.x_ = t.x_, this.J_ = t.W_, 
                     // When a user calls clearPersistence() in one client, all other clients
                     // need to be terminated to allow the delete to succeed.
                     this.persistence.b_((function() {
@@ -9914,10 +9867,10 @@ var mr = /** @class */ function() {
                     if (h = f.sent(), 
                     // Regardless of whether or not the retry succeeds, from an user
                     // perspective, offline persistence has failed.
-                    o.reject(h), !this.rd(h)) throw h;
+                    o.reject(h), !this.Y_(h)) throw h;
                     return [ 2 /*return*/ , (console.warn("Error enabling offline persistence. Falling back to persistence disabled: " + h), 
-                    this.Z_(new br, {
-                        hd: !1
+                    this.z_(new Ar, {
+                        B_: !1
                     }, i, o)) ];
 
                   case 4:
@@ -9930,7 +9883,7 @@ var mr = /** @class */ function() {
      * Decides whether the provided error allows us to gracefully disable
      * persistence (as opposed to crashing the client).
      */
-    t.prototype.rd = function(t) {
+    t.prototype.Y_ = function(t) {
         return "FirebaseError" === t.name ? t.code === b.FAILED_PRECONDITION || t.code === b.UNIMPLEMENTED : !("undefined" != typeof DOMException && t instanceof DOMException) || 
         // When the browser is out of quota we could get either quota exceeded
         // or an aborted error depending on whether the error happened during
@@ -9944,7 +9897,7 @@ var mr = /** @class */ function() {
      * Checks that the client has not been terminated. Ensures that other methods on
      * this class cannot be called after the client is terminated.
      */
-    t.prototype.X_ = function() {
+    t.prototype.G_ = function() {
         if (this.Ar.Or) throw new A(b.FAILED_PRECONDITION, "The client has already been terminated.");
     }, t.prototype.Xu = function(t) {
         return this.Ar.jr(), Se("FirestoreClient", "Credential Changed. Current user: " + t.uid), 
@@ -9952,7 +9905,7 @@ var mr = /** @class */ function() {
     }, 
     /** Disables the network connection. Pending operations will not complete. */ t.prototype.disableNetwork = function() {
         var t = this;
-        return this.X_(), this.Ar.enqueue((function() {
+        return this.G_(), this.Ar.enqueue((function() {
             return t.Mu.disableNetwork();
         }));
     }, t.prototype.terminate = function() {
@@ -9990,37 +9943,37 @@ var mr = /** @class */ function() {
      */
     t.prototype.waitForPendingWrites = function() {
         var t = this;
-        this.X_();
+        this.G_();
         var e = new Ye;
         return this.Ar.Cr((function() {
             return t.Mu.fl(e);
         })), e.promise;
     }, t.prototype.listen = function(t, e, n) {
         var r = this;
-        this.X_();
+        this.G_();
         var i = new fr(t, e, n);
         return this.Ar.Cr((function() {
-            return r.nd.listen(i);
+            return r.J_.listen(i);
         })), i;
     }, t.prototype.$u = function(t) {
         var e = this;
         // Checks for termination but does not raise error, allowing unlisten after
         // termination to be a no-op.
-                this.od || this.Ar.Cr((function() {
-            return e.nd.$u(t);
+                this.X_ || this.Ar.Cr((function() {
+            return e.J_.$u(t);
         }));
-    }, t.prototype.ad = function(t) {
+    }, t.prototype.Z_ = function(t) {
         var e = this;
-        return this.X_(), this.Ar.enqueue((function() {
+        return this.G_(), this.Ar.enqueue((function() {
             return e._u.ro(t);
         })).then((function(t) {
             if (t instanceof St) return t;
             if (t instanceof Rt) return null;
             throw new A(b.UNAVAILABLE, "Failed to get document from cache. (However, this document may exist on the server. Run again without setting 'source' in the GetOptions to attempt to retrieve the document from the server.)");
         }));
-    }, t.prototype.ud = function(t) {
+    }, t.prototype.td = function(t) {
         var r = this;
-        return this.X_(), this.Ar.enqueue((function() {
+        return this.G_(), this.Ar.enqueue((function() {
             return e(r, void 0, void 0, (function() {
                 var e, r, i;
                 return n(this, (function(n) {
@@ -10038,23 +9991,23 @@ var mr = /** @class */ function() {
         }));
     }, t.prototype.write = function(t) {
         var e = this;
-        this.X_();
+        this.G_();
         var n = new Ye;
         return this.Ar.Cr((function() {
             return e.Mu.write(t, n);
         })), n.promise;
     }, t.prototype.ci = function() {
-        return this.Y_.ci;
+        return this.j_.ci;
     }, t.prototype.Fl = function(t) {
         var e = this;
-        this.X_(), this.Ar.Cr((function() {
-            return e.nd.Fl(t), Promise.resolve();
+        this.G_(), this.Ar.Cr((function() {
+            return e.J_.Fl(t), Promise.resolve();
         }));
     }, t.prototype.Nl = function(t) {
         // Checks for shutdown but does not raise error, allowing remove after
         // shutdown to be a no-op.
-        this.od || this.nd.Nl(t);
-    }, Object.defineProperty(t.prototype, "od", {
+        this.X_ || this.J_.Nl(t);
+    }, Object.defineProperty(t.prototype, "X_", {
         get: function() {
             // Technically, the asyncQueue is still running, but only accepting operations
             // related to termination or supposed to be run after termination. It is effectively
@@ -10065,13 +10018,13 @@ var mr = /** @class */ function() {
         configurable: !0
     }), t.prototype.transaction = function(t) {
         var e = this;
-        this.X_();
+        this.G_();
         var n = new Ye;
         return this.Ar.Cr((function() {
             return e.Mu.runTransaction(e.Ar, t, n), Promise.resolve();
         })), n.promise;
     }, t;
-}(), Nr = /** @class */ function() {
+}(), Ir = /** @class */ function() {
     function t(t) {
         this.observer = t, 
         /**
@@ -10081,12 +10034,12 @@ var mr = /** @class */ function() {
         this.muted = !1;
     }
     return t.prototype.next = function(t) {
-        this.ld(this.observer.next, t);
+        this.ed(this.observer.next, t);
     }, t.prototype.error = function(t) {
-        this.ld(this.observer.error, t);
-    }, t.prototype._d = function() {
+        this.ed(this.observer.error, t);
+    }, t.prototype.sd = function() {
         this.muted = !0;
-    }, t.prototype.ld = function(t, e) {
+    }, t.prototype.ed = function(t, e) {
         var n = this;
         this.muted || setTimeout((function() {
             n.muted || t(e);
@@ -10130,7 +10083,7 @@ var mr = /** @class */ function() {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-function Ir(t) {
+function Tr(t) {
     /**
  * Returns true if obj is an object and contains at least one of the specified
  * methods.
@@ -10145,11 +10098,11 @@ function Ir(t) {
     }(t);
 }
 
-var Tr = /** @class */ function() {
+var _r = /** @class */ function() {
     function t(t, e, n, r) {
-        this.firestore = t, this.timestampsInSnapshots = e, this.dd = n, this.converter = r;
+        this.firestore = t, this.timestampsInSnapshots = e, this.nd = n, this.converter = r;
     }
-    return t.prototype.fd = function(t) {
+    return t.prototype.rd = function(t) {
         switch (J(t)) {
           case 0 /* NullValue */ :
             return null;
@@ -10161,10 +10114,10 @@ var Tr = /** @class */ function() {
             return nt(t.integerValue || t.doubleValue);
 
           case 3 /* TimestampValue */ :
-            return this.wd(t.timestampValue);
+            return this.hd(t.timestampValue);
 
           case 4 /* ServerTimestampValue */ :
-            return this.Td(t);
+            return this.od(t);
 
           case 5 /* StringValue */ :
             return t.stringValue;
@@ -10173,58 +10126,58 @@ var Tr = /** @class */ function() {
             return new bn(rt(t.bytesValue));
 
           case 7 /* RefValue */ :
-            return this.md(t.referenceValue);
+            return this.ad(t.referenceValue);
 
           case 8 /* GeoPointValue */ :
-            return new Ln(t.geoPointValue.latitude, t.geoPointValue.longitude);
+            return new Vn(t.geoPointValue.latitude, t.geoPointValue.longitude);
 
           case 9 /* ArrayValue */ :
-            return this.Ed(t.arrayValue);
+            return this.ud(t.arrayValue);
 
           case 10 /* ObjectValue */ :
-            return this.Rd(t.mapValue);
+            return this.ld(t.mapValue);
 
           default:
-            throw Ve("Invalid value type: " + JSON.stringify(t));
+            throw Le("Invalid value type: " + JSON.stringify(t));
         }
-    }, t.prototype.Rd = function(t) {
+    }, t.prototype.ld = function(t) {
         var e = this, n = {};
-        return F(t.fields || {}, (function(t, r) {
-            n[t] = e.fd(r);
+        return x(t.fields || {}, (function(t, r) {
+            n[t] = e.rd(r);
         })), n;
-    }, t.prototype.Ed = function(t) {
+    }, t.prototype.ud = function(t) {
         var e = this;
         return (t.values || []).map((function(t) {
-            return e.fd(t);
+            return e.rd(t);
         }));
-    }, t.prototype.Td = function(t) {
-        switch (this.dd) {
+    }, t.prototype.od = function(t) {
+        switch (this.nd) {
           case "previous":
             var e = function t(e) {
                 var n = e.mapValue.fields.__previous_value__;
                 return H(n) ? t(n) : n;
             }(t);
-            return null == e ? null : this.fd(e);
+            return null == e ? null : this.rd(e);
 
           case "estimate":
-            return this.wd(Y(t));
+            return this.hd(Y(t));
 
           default:
             return null;
         }
-    }, t.prototype.wd = function(t) {
+    }, t.prototype.hd = function(t) {
         var e = et(t), n = new S(e.seconds, e.nanos);
         return this.timestampsInSnapshots ? n : n.toDate();
-    }, t.prototype.md = function(t) {
-        var e = V.K(t);
-        Le(Ne(e), "ReferenceValue is not valid " + t);
-        var n = new Me(e.get(1), e.get(3)), r = new U(e.$(5));
-        return n.isEqual(this.firestore.Id) || 
+    }, t.prototype.ad = function(t) {
+        var e = L.K(t);
+        Ve(Ne(e), "ReferenceValue is not valid " + t);
+        var n = new Me(e.get(1), e.get(3)), r = new O(e.$(5));
+        return n.isEqual(this.firestore._d) || 
         // TODO(b/64130202): Somehow support foreign references.
-        Re("Document " + r + " contains a document reference within a different database (" + n.projectId + "/" + n.database + ") which is not supported. It will be treated as a reference in the current database (" + this.firestore.Id.projectId + "/" + this.firestore.Id.database + ") instead."), 
+        Re("Document " + r + " contains a document reference within a different database (" + n.projectId + "/" + n.database + ") which is not supported. It will be treated as a reference in the current database (" + this.firestore._d.projectId + "/" + this.firestore._d.database + ") instead."), 
         new Vr(r, this.firestore, this.converter);
     }, t;
-}(), _r = Xe.sh, kr = /** @class */ function() {
+}(), kr = Ze.sh, Sr = /** @class */ function() {
     function t(t) {
         var e, n;
         if (void 0 === t.host) {
@@ -10239,8 +10192,8 @@ var Tr = /** @class */ function() {
         // whether they set it to true or false...
         !0 === t.timestampsInSnapshots ? Re("The setting 'timestampsInSnapshots: true' is no longer required and should be removed.") : !1 === t.timestampsInSnapshots && Re("Support for 'timestampsInSnapshots: false' will be removed soon. You must update your code to handle Timestamp objects."), 
         this.timestampsInSnapshots = null === (n = t.timestampsInSnapshots) || void 0 === n || n, 
-        un("settings", "number", "cacheSizeBytes", t.cacheSizeBytes), void 0 === t.cacheSizeBytes) this.cacheSizeBytes = Xe.nh; else {
-            if (t.cacheSizeBytes !== _r && t.cacheSizeBytes < Xe.ih) throw new A(b.INVALID_ARGUMENT, "cacheSizeBytes must be at least " + Xe.ih);
+        un("settings", "number", "cacheSizeBytes", t.cacheSizeBytes), void 0 === t.cacheSizeBytes) this.cacheSizeBytes = Ze.nh; else {
+            if (t.cacheSizeBytes !== kr && t.cacheSizeBytes < Ze.ih) throw new A(b.INVALID_ARGUMENT, "cacheSizeBytes must be at least " + Ze.ih);
             this.cacheSizeBytes = t.cacheSizeBytes;
         }
         un("settings", "boolean", "experimentalForceLongPolling", t.experimentalForceLongPolling), 
@@ -10249,16 +10202,16 @@ var Tr = /** @class */ function() {
     return t.prototype.isEqual = function(t) {
         return this.host === t.host && this.ssl === t.ssl && this.timestampsInSnapshots === t.timestampsInSnapshots && this.credentials === t.credentials && this.cacheSizeBytes === t.cacheSizeBytes && this.forceLongPolling === t.forceLongPolling;
     }, t;
-}(), Sr = /** @class */ function() {
+}(), Rr = /** @class */ function() {
     // Note: We are using `MemoryComponentProvider` as a default
     // ComponentProvider to ensure backwards compatibility with the format
     // expected by the console build.
     function t(r, i, o) {
         var s = this;
-        if (void 0 === o && (o = new br), this.Ad = null, 
+        if (void 0 === o && (o = new Ar), this.dd = null, 
         // Public for use in tests.
         // TODO(mikelehen): Use modularized initialization instead.
-        this.Pd = new Je, this.INTERNAL = {
+        this.fd = new Je, this.INTERNAL = {
             delete: function() {
                 return e(s, void 0, void 0, (function() {
                     return n(this, (function(t) {
@@ -10266,7 +10219,7 @@ var Tr = /** @class */ function() {
                           case 0:
                             // The client must be initalized to ensure that all subsequent API usage
                             // throws an exception.
-                            return this.Vd(), [ 4 /*yield*/ , this.pd.terminate() ];
+                            return this.wd(), [ 4 /*yield*/ , this.Td.terminate() ];
 
                           case 1:
                             // The client must be initalized to ensure that all subsequent API usage
@@ -10280,63 +10233,63 @@ var Tr = /** @class */ function() {
             // This is very likely a Firebase app object
             // TODO(b/34177605): Can we somehow use instanceof?
             var u = r;
-            this.Ad = u, this.Id = t.gd(u), this.yd = u.name, this.bd = new T(i);
+            this.dd = u, this._d = t.md(u), this.Ed = u.name, this.Rd = new T(i);
         } else {
             var a = r;
             if (!a.projectId) throw new A(b.INVALID_ARGUMENT, "Must provide projectId");
-            this.Id = new Me(a.projectId, a.database), 
+            this._d = new Me(a.projectId, a.database), 
             // Use a default persistenceKey that lines up with FirebaseApp.
-            this.yd = "[DEFAULT]", this.bd = new I;
+            this.Ed = "[DEFAULT]", this.Rd = new I;
         }
-        this.vd = o, this.Sd = new kr({}), this.Cd = this.Dd(this.Id);
+        this.Id = o, this.Ad = new Sr({}), this.Pd = this.Vd(this._d);
     }
     return t.prototype.settings = function(t) {
         tn("Firestore.settings", arguments, 1), rn("Firestore.settings", "object", 1, t);
-        var e = new kr(t);
-        if (this.pd && !this.Sd.isEqual(e)) throw new A(b.FAILED_PRECONDITION, "Firestore has already been started and its settings can no longer be changed. You can only call settings() before calling any other methods on a Firestore object.");
-        this.Sd = e, void 0 !== e.credentials && (this.bd = function(t) {
+        var e = new Sr(t);
+        if (this.Td && !this.Ad.isEqual(e)) throw new A(b.FAILED_PRECONDITION, "Firestore has already been started and its settings can no longer be changed. You can only call settings() before calling any other methods on a Firestore object.");
+        this.Ad = e, void 0 !== e.credentials && (this.Rd = function(t) {
             if (!t) return new I;
             switch (t.type) {
               case "gapi":
-                var e = t.Fd;
+                var e = t.pd;
                 // Make sure this really is a Gapi client.
-                                return Le(!("object" != typeof e || null === e || !e.auth || !e.auth.getAuthHeaderValueForFirstParty), "unexpected gapi interface"), 
+                                return Ve(!("object" != typeof e || null === e || !e.auth || !e.auth.getAuthHeaderValueForFirstParty), "unexpected gapi interface"), 
                 new k(e, t.V || "0");
 
               case "provider":
-                return t.Fd;
+                return t.pd;
 
               default:
                 throw new A(b.INVALID_ARGUMENT, "makeCredentialsProvider failed due to invalid credential type");
             }
         }(e.credentials));
     }, t.prototype.enableNetwork = function() {
-        return this.Vd(), this.pd.enableNetwork();
+        return this.wd(), this.Td.enableNetwork();
     }, t.prototype.disableNetwork = function() {
-        return this.Vd(), this.pd.disableNetwork();
+        return this.wd(), this.Td.disableNetwork();
     }, t.prototype.enablePersistence = function(t) {
         var e, n;
-        if (this.pd) throw new A(b.FAILED_PRECONDITION, "Firestore has already been started and persistence can no longer be enabled. You can only call enablePersistence() before calling any other methods on a Firestore object.");
+        if (this.Td) throw new A(b.FAILED_PRECONDITION, "Firestore has already been started and persistence can no longer be enabled. You can only call enablePersistence() before calling any other methods on a Firestore object.");
         var r = !1;
         return t && (void 0 !== t.experimentalTabSynchronization && Re("The 'experimentalTabSynchronization' setting will be removed. Use 'synchronizeTabs' instead."), 
         r = null !== (n = null !== (e = t.synchronizeTabs) && void 0 !== e ? e : t.experimentalTabSynchronization) && void 0 !== n && n), 
-        this.Nd(this.vd, {
-            hd: !0,
-            cacheSizeBytes: this.Sd.cacheSizeBytes,
+        this.gd(this.Id, {
+            B_: !0,
+            cacheSizeBytes: this.Ad.cacheSizeBytes,
             synchronizeTabs: r
         });
     }, t.prototype.clearPersistence = function() {
         return e(this, void 0, void 0, (function() {
             var t, r = this;
             return n(this, (function(i) {
-                if (void 0 !== this.pd && !this.pd.od) throw new A(b.FAILED_PRECONDITION, "Persistence cannot be cleared after this Firestore instance is initialized.");
-                return t = new Ye, [ 2 /*return*/ , (this.Pd.Mr((function() {
+                if (void 0 !== this.Td && !this.Td.X_) throw new A(b.FAILED_PRECONDITION, "Persistence cannot be cleared after this Firestore instance is initialized.");
+                return t = new Ye, [ 2 /*return*/ , (this.fd.Mr((function() {
                     return e(r, void 0, void 0, (function() {
                         var e, r;
                         return n(this, (function(n) {
                             switch (n.label) {
                               case 0:
-                                return n.trys.push([ 0, 2, , 3 ]), e = this.kd(), [ 4 /*yield*/ , this.vd.clearPersistence(e) ];
+                                return n.trys.push([ 0, 2, , 3 ]), e = this.yd(), [ 4 /*yield*/ , this.Id.clearPersistence(e) ];
 
                               case 1:
                                 return n.sent(), t.resolve(), [ 3 /*break*/ , 3 ];
@@ -10354,58 +10307,58 @@ var Tr = /** @class */ function() {
         }));
     }, t.prototype.terminate = function() {
         return this.app._removeServiceInstance("firestore"), this.INTERNAL.delete();
-    }, Object.defineProperty(t.prototype, "Ld", {
+    }, Object.defineProperty(t.prototype, "bd", {
         get: function() {
-            return this.Vd(), this.pd.od;
+            return this.wd(), this.Td.X_;
         },
         enumerable: !0,
         configurable: !0
     }), t.prototype.waitForPendingWrites = function() {
-        return this.Vd(), this.pd.waitForPendingWrites();
+        return this.wd(), this.Td.waitForPendingWrites();
     }, t.prototype.onSnapshotsInSync = function(t) {
-        if (this.Vd(), Ir(t)) return this.$d(t);
+        if (this.wd(), Tr(t)) return this.vd(t);
         rn("Firestore.onSnapshotsInSync", "function", 1, t);
         var e = {
             next: t
         };
-        return this.$d(e);
-    }, t.prototype.$d = function(t) {
-        var e = this, n = new Nr({
+        return this.vd(e);
+    }, t.prototype.vd = function(t) {
+        var e = this, n = new Ir({
             next: function() {
                 t.next && t.next();
             },
             error: function(t) {
-                throw Ve("Uncaught Error in onSnapshotsInSync");
+                throw Le("Uncaught Error in onSnapshotsInSync");
             }
         });
-        return this.pd.Fl(n), function() {
-            n._d(), e.pd.Nl(n);
+        return this.Td.Fl(n), function() {
+            n.sd(), e.Td.Nl(n);
         };
-    }, t.prototype.Vd = function() {
-        return this.pd || 
+    }, t.prototype.wd = function() {
+        return this.Td || 
         // Kick off starting the client but don't actually wait for it.
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        this.Nd(new br, {
-            hd: !1
-        }), this.pd;
-    }, t.prototype.kd = function() {
-        return new qe(this.Id, this.yd, this.Sd.host, this.Sd.ssl, this.Sd.forceLongPolling);
-    }, t.prototype.Nd = function(t, e) {
-        var n = this.kd();
-        return this.pd = new Ar(Ie.Ot(), n, this.bd, this.Pd), this.pd.start(t, e);
-    }, t.prototype.Dd = function(t) {
+        this.gd(new Ar, {
+            B_: !1
+        }), this.Td;
+    }, t.prototype.yd = function() {
+        return new Pe(this._d, this.Ed, this.Ad.host, this.Ad.ssl, this.Ad.forceLongPolling);
+    }, t.prototype.gd = function(t, e) {
+        var n = this.yd();
+        return this.Td = new Nr(Ie.Ot(), n, this.Rd, this.fd), this.Td.start(t, e);
+    }, t.prototype.Vd = function(t) {
         var e = new Ae(t, {
             di: Ie.Ot().di
         });
-        return new xn(e, (function(e) {
+        return new Fn(e, (function(e) {
             if (e instanceof Vr) {
-                var n = t, r = e.firestore.Id;
+                var n = t, r = e.firestore._d;
                 if (!r.isEqual(n)) throw new A(b.INVALID_ARGUMENT, "Document reference is for database " + r.projectId + "/" + r.database + " but should be for database " + n.projectId + "/" + n.database);
-                return new Pn(t, e.Od);
+                return new qn(t, e.Sd);
             }
             return e;
         }));
-    }, t.gd = function(t) {
+    }, t.md = function(t) {
         if (e = t.options, "projectId", !Object.prototype.hasOwnProperty.call(e, "projectId")) throw new A(b.INVALID_ARGUMENT, '"projectId" not provided in firebase.initializeApp.');
         var e, n = t.options.projectId;
         // Export the classes with a private constructor (it will fail if invoked
@@ -10416,29 +10369,29 @@ var Tr = /** @class */ function() {
         return new Me(n);
     }, Object.defineProperty(t.prototype, "app", {
         get: function() {
-            if (!this.Ad) throw new A(b.FAILED_PRECONDITION, "Firestore was not initialized using the Firebase SDK. 'app' is not available");
-            return this.Ad;
+            if (!this.dd) throw new A(b.FAILED_PRECONDITION, "Firestore was not initialized using the Firebase SDK. 'app' is not available");
+            return this.dd;
         },
         enumerable: !0,
         configurable: !0
     }), t.prototype.collection = function(t) {
         return tn("Firestore.collection", arguments, 1), rn("Firestore.collection", "non-empty string", 1, t), 
-        this.Vd(), new Mr(V.K(t), this);
+        this.wd(), new qr(L.K(t), this);
     }, t.prototype.doc = function(t) {
         return tn("Firestore.doc", arguments, 1), rn("Firestore.doc", "non-empty string", 1, t), 
-        this.Vd(), Vr.Md(V.K(t), this);
+        this.wd(), Vr.Cd(L.K(t), this);
     }, t.prototype.collectionGroup = function(t) {
         if (tn("Firestore.collectionGroup", arguments, 1), rn("Firestore.collectionGroup", "non-empty string", 1, t), 
         t.indexOf("/") >= 0) throw new A(b.INVALID_ARGUMENT, "Invalid collection ID '" + t + "' passed to function Firestore.collectionGroup(). Collection IDs must not contain '/'.");
-        return this.Vd(), new Cr(new Lt(V.H, t), this);
+        return this.wd(), new Pr(new Vt(L.H, t), this);
     }, t.prototype.runTransaction = function(t) {
         var e = this;
         return tn("Firestore.runTransaction", arguments, 1), rn("Firestore.runTransaction", "function", 1, t), 
-        this.Vd().transaction((function(n) {
-            return t(new Rr(e, n));
+        this.wd().transaction((function(n) {
+            return t(new Dr(e, n));
         }));
     }, t.prototype.batch = function() {
-        return this.Vd(), new Dr(this);
+        return this.wd(), new Lr(this);
     }, Object.defineProperty(t, "logLevel", {
         get: function() {
             switch (_e()) {
@@ -10476,161 +10429,161 @@ var Tr = /** @class */ function() {
     }, 
     // Note: this is not a property because the minifier can't work correctly with
     // the way TypeScript compiler outputs properties.
-    t.prototype.Ud = function() {
-        return this.Sd.timestampsInSnapshots;
+    t.prototype.Dd = function() {
+        return this.Ad.timestampsInSnapshots;
     }, t;
-}(), Rr = /** @class */ function() {
+}(), Dr = /** @class */ function() {
     function t(t, e) {
-        this.qd = t, this.Bd = e;
+        this.Fd = t, this.Nd = e;
     }
     return t.prototype.get = function(t) {
         var e = this;
         tn("Transaction.get", arguments, 1);
-        var n = Fr("Transaction.get", t, this.qd);
-        return this.Bd.za([ n.Od ]).then((function(t) {
-            if (!t || 1 !== t.length) return Ve("Mismatch in docs returned from document lookup.");
+        var n = jr("Transaction.get", t, this.Fd);
+        return this.Nd.za([ n.Sd ]).then((function(t) {
+            if (!t || 1 !== t.length) return Le("Mismatch in docs returned from document lookup.");
             var r = t[0];
-            if (r instanceof Rt) return new Or(e.qd, n.Od, null, 
+            if (r instanceof Rt) return new Or(e.Fd, n.Sd, null, 
             /* fromCache= */ !1, 
-            /* hasPendingWrites= */ !1, n.xd);
-            if (r instanceof St) return new Or(e.qd, n.Od, r, 
+            /* hasPendingWrites= */ !1, n.kd);
+            if (r instanceof St) return new Or(e.Fd, n.Sd, r, 
             /* fromCache= */ !1, 
-            /* hasPendingWrites= */ !1, n.xd);
-            throw Ve("BatchGetDocumentsRequest returned unexpected document type: " + r.constructor.name);
+            /* hasPendingWrites= */ !1, n.kd);
+            throw Le("BatchGetDocumentsRequest returned unexpected document type: " + r.constructor.name);
         }));
     }, t.prototype.set = function(t, e, n) {
         nn("Transaction.set", arguments, 2, 3);
-        var r = Fr("Transaction.set", t, this.qd);
-        n = Pr("Transaction.set", n);
-        var i = Br(r.xd, e, "Transaction.set"), o = i[0], s = i[1], u = n.merge || n.mergeFields ? this.qd.Cd.zo(s, o, n.mergeFields) : this.qd.Cd.jo(s, o);
-        return this.Bd.set(r.Od, u), this;
+        var r = jr("Transaction.set", t, this.Fd);
+        n = Fr("Transaction.set", n);
+        var i = Br(r.kd, e, "Transaction.set"), o = i[0], s = i[1], u = n.merge || n.mergeFields ? this.Fd.Pd.zo(s, o, n.mergeFields) : this.Fd.Pd.jo(s, o);
+        return this.Nd.set(r.Sd, u), this;
     }, t.prototype.update = function(t, e, n) {
         for (var r, i, o = [], s = 3; s < arguments.length; s++) o[s - 3] = arguments[s];
         return "string" == typeof e || e instanceof Nn ? (en("Transaction.update", arguments, 3), 
-        r = Fr("Transaction.update", t, this.qd), i = this.qd.Cd.Yo("Transaction.update", e, n, o)) : (tn("Transaction.update", arguments, 2), 
-        r = Fr("Transaction.update", t, this.qd), i = this.qd.Cd.Ko("Transaction.update", e)), 
-        this.Bd.update(r.Od, i), this;
+        r = jr("Transaction.update", t, this.Fd), i = this.Fd.Pd.Yo("Transaction.update", e, n, o)) : (tn("Transaction.update", arguments, 2), 
+        r = jr("Transaction.update", t, this.Fd), i = this.Fd.Pd.Ko("Transaction.update", e)), 
+        this.Nd.update(r.Sd, i), this;
     }, t.prototype.delete = function(t) {
         tn("Transaction.delete", arguments, 1);
-        var e = Fr("Transaction.delete", t, this.qd);
-        return this.Bd.delete(e.Od), this;
+        var e = jr("Transaction.delete", t, this.Fd);
+        return this.Nd.delete(e.Sd), this;
     }, t;
-}(), Dr = /** @class */ function() {
+}(), Lr = /** @class */ function() {
     function t(t) {
-        this.qd = t, this.Qd = [], this.Wd = !1;
+        this.Fd = t, this.Ld = [], this.$d = !1;
     }
     return t.prototype.set = function(t, e, n) {
-        nn("WriteBatch.set", arguments, 2, 3), this.jd();
-        var r = Fr("WriteBatch.set", t, this.qd);
-        n = Pr("WriteBatch.set", n);
-        var i = Br(r.xd, e, "WriteBatch.set"), o = i[0], s = i[1], u = n.merge || n.mergeFields ? this.qd.Cd.zo(s, o, n.mergeFields) : this.qd.Cd.jo(s, o);
-        return this.Qd = this.Qd.concat(u.Lo(r.Od, gt.NONE)), this;
+        nn("WriteBatch.set", arguments, 2, 3), this.Od();
+        var r = jr("WriteBatch.set", t, this.Fd);
+        n = Fr("WriteBatch.set", n);
+        var i = Br(r.kd, e, "WriteBatch.set"), o = i[0], s = i[1], u = n.merge || n.mergeFields ? this.Fd.Pd.zo(s, o, n.mergeFields) : this.Fd.Pd.jo(s, o);
+        return this.Ld = this.Ld.concat(u.Lo(r.Sd, gt.NONE)), this;
     }, t.prototype.update = function(t, e, n) {
         for (var r, i, o = [], s = 3; s < arguments.length; s++) o[s - 3] = arguments[s];
-        return this.jd(), "string" == typeof e || e instanceof Nn ? (en("WriteBatch.update", arguments, 3), 
-        r = Fr("WriteBatch.update", t, this.qd), i = this.qd.Cd.Yo("WriteBatch.update", e, n, o)) : (tn("WriteBatch.update", arguments, 2), 
-        r = Fr("WriteBatch.update", t, this.qd), i = this.qd.Cd.Ko("WriteBatch.update", e)), 
-        this.Qd = this.Qd.concat(i.Lo(r.Od, gt.exists(!0))), this;
+        return this.Od(), "string" == typeof e || e instanceof Nn ? (en("WriteBatch.update", arguments, 3), 
+        r = jr("WriteBatch.update", t, this.Fd), i = this.Fd.Pd.Yo("WriteBatch.update", e, n, o)) : (tn("WriteBatch.update", arguments, 2), 
+        r = jr("WriteBatch.update", t, this.Fd), i = this.Fd.Pd.Ko("WriteBatch.update", e)), 
+        this.Ld = this.Ld.concat(i.Lo(r.Sd, gt.exists(!0))), this;
     }, t.prototype.delete = function(t) {
-        tn("WriteBatch.delete", arguments, 1), this.jd();
-        var e = Fr("WriteBatch.delete", t, this.qd);
-        return this.Qd = this.Qd.concat(new Nt(e.Od, gt.NONE)), this;
+        tn("WriteBatch.delete", arguments, 1), this.Od();
+        var e = jr("WriteBatch.delete", t, this.Fd);
+        return this.Ld = this.Ld.concat(new Nt(e.Sd, gt.NONE)), this;
     }, t.prototype.commit = function() {
-        return this.jd(), this.Wd = !0, this.Qd.length > 0 ? this.qd.Vd().write(this.Qd) : Promise.resolve();
-    }, t.prototype.jd = function() {
-        if (this.Wd) throw new A(b.FAILED_PRECONDITION, "A write batch can no longer be used after commit() has been called.");
+        return this.Od(), this.$d = !0, this.Ld.length > 0 ? this.Fd.wd().write(this.Ld) : Promise.resolve();
+    }, t.prototype.Od = function() {
+        if (this.$d) throw new A(b.FAILED_PRECONDITION, "A write batch can no longer be used after commit() has been called.");
     }, t;
 }(), Vr = /** @class */ function() {
     function t(t, e, n) {
-        this.Od = t, this.firestore = e, this.xd = n, this.pd = this.firestore.Vd();
+        this.Sd = t, this.firestore = e, this.kd = n, this.Td = this.firestore.wd();
     }
-    return t.Md = function(e, n, r) {
+    return t.Cd = function(e, n, r) {
         if (e.length % 2 != 0) throw new A(b.INVALID_ARGUMENT, "Invalid document reference. Document references must have an even number of segments, but " + e.G() + " has " + e.length);
-        return new t(new U(e), n, r);
+        return new t(new O(e), n, r);
     }, Object.defineProperty(t.prototype, "id", {
         get: function() {
-            return this.Od.path.U();
+            return this.Sd.path.U();
         },
         enumerable: !0,
         configurable: !0
     }), Object.defineProperty(t.prototype, "parent", {
         get: function() {
-            return new Mr(this.Od.path.O(), this.firestore, this.xd);
+            return new qr(this.Sd.path.O(), this.firestore, this.kd);
         },
         enumerable: !0,
         configurable: !0
     }), Object.defineProperty(t.prototype, "path", {
         get: function() {
-            return this.Od.path.G();
+            return this.Sd.path.G();
         },
         enumerable: !0,
         configurable: !0
     }), t.prototype.collection = function(t) {
         if (tn("DocumentReference.collection", arguments, 1), rn("DocumentReference.collection", "non-empty string", 1, t), 
         !t) throw new A(b.INVALID_ARGUMENT, "Must provide a non-empty collection name to collection()");
-        var e = V.K(t);
-        return new Mr(this.Od.path.child(e), this.firestore);
+        var e = L.K(t);
+        return new qr(this.Sd.path.child(e), this.firestore);
     }, t.prototype.isEqual = function(e) {
         if (!(e instanceof t)) throw dn("isEqual", "DocumentReference", 1, e);
-        return this.firestore === e.firestore && this.Od.isEqual(e.Od) && this.xd === e.xd;
+        return this.firestore === e.firestore && this.Sd.isEqual(e.Sd) && this.kd === e.kd;
     }, t.prototype.set = function(t, e) {
-        nn("DocumentReference.set", arguments, 1, 2), e = Pr("DocumentReference.set", e);
-        var n = Br(this.xd, t, "DocumentReference.set"), r = n[0], i = n[1], o = e.merge || e.mergeFields ? this.firestore.Cd.zo(i, r, e.mergeFields) : this.firestore.Cd.jo(i, r);
-        return this.pd.write(o.Lo(this.Od, gt.NONE));
+        nn("DocumentReference.set", arguments, 1, 2), e = Fr("DocumentReference.set", e);
+        var n = Br(this.kd, t, "DocumentReference.set"), r = n[0], i = n[1], o = e.merge || e.mergeFields ? this.firestore.Pd.zo(i, r, e.mergeFields) : this.firestore.Pd.jo(i, r);
+        return this.Td.write(o.Lo(this.Sd, gt.NONE));
     }, t.prototype.update = function(t, e) {
         for (var n, r = [], i = 2; i < arguments.length; i++) r[i - 2] = arguments[i];
         return "string" == typeof t || t instanceof Nn ? (en("DocumentReference.update", arguments, 2), 
-        n = this.firestore.Cd.Yo("DocumentReference.update", t, e, r)) : (tn("DocumentReference.update", arguments, 1), 
-        n = this.firestore.Cd.Ko("DocumentReference.update", t)), this.pd.write(n.Lo(this.Od, gt.exists(!0)));
+        n = this.firestore.Pd.Yo("DocumentReference.update", t, e, r)) : (tn("DocumentReference.update", arguments, 1), 
+        n = this.firestore.Pd.Ko("DocumentReference.update", t)), this.Td.write(n.Lo(this.Sd, gt.exists(!0)));
     }, t.prototype.delete = function() {
-        return tn("DocumentReference.delete", arguments, 0), this.pd.write([ new Nt(this.Od, gt.NONE) ]);
+        return tn("DocumentReference.delete", arguments, 0), this.Td.write([ new Nt(this.Sd, gt.NONE) ]);
     }, t.prototype.onSnapshot = function() {
         for (var t = [], e = 0; e < arguments.length; e++) t[e] = arguments[e];
         nn("DocumentReference.onSnapshot", arguments, 1, 4);
         var n, r = {
             includeMetadataChanges: !1
         }, i = 0;
-        "object" != typeof t[i] || Ir(t[i]) || (pn("DocumentReference.onSnapshot", r = t[i], [ "includeMetadataChanges" ]), 
+        "object" != typeof t[i] || Tr(t[i]) || (pn("DocumentReference.onSnapshot", r = t[i], [ "includeMetadataChanges" ]), 
         un("DocumentReference.onSnapshot", "boolean", "includeMetadataChanges", r.includeMetadataChanges), 
         i++);
         var o = {
             includeMetadataChanges: r.includeMetadataChanges
         };
-        return Ir(t[i]) ? n = t[i] : (rn("DocumentReference.onSnapshot", "function", i, t[i]), 
+        return Tr(t[i]) ? n = t[i] : (rn("DocumentReference.onSnapshot", "function", i, t[i]), 
         on("DocumentReference.onSnapshot", "function", i + 1, t[i + 1]), on("DocumentReference.onSnapshot", "function", i + 2, t[i + 2]), 
         n = {
             next: t[i],
             error: t[i + 1],
             complete: t[i + 2]
-        }), this.Gd(o, n);
-    }, t.prototype.Gd = function(t, e) {
+        }), this.Md(o, n);
+    }, t.prototype.Md = function(t, e) {
         var n = this, r = function(t) {
             console.error("Uncaught Error in onSnapshot:", t);
         };
         e.error && (r = e.error.bind(e));
-        var i = new Nr({
+        var i = new Ir({
             next: function(t) {
                 if (e.next) {
-                    var r = t.docs.get(n.Od);
-                    e.next(new Or(n.firestore, n.Od, r, t.fromCache, t.hasPendingWrites, n.xd));
+                    var r = t.docs.get(n.Sd);
+                    e.next(new Or(n.firestore, n.Sd, r, t.fromCache, t.hasPendingWrites, n.kd));
                 }
             },
             error: r
-        }), o = this.pd.listen(Lt.ve(this.Od.path), i, t);
+        }), o = this.Td.listen(Vt.ve(this.Sd.path), i, t);
         return function() {
-            i._d(), n.pd.$u(o);
+            i.sd(), n.Td.$u(o);
         };
     }, t.prototype.get = function(t) {
         var e = this;
-        return nn("DocumentReference.get", arguments, 0, 1), Gr("DocumentReference.get", t), 
+        return nn("DocumentReference.get", arguments, 0, 1), xr("DocumentReference.get", t), 
         new Promise((function(n, r) {
-            t && "cache" === t.source ? e.firestore.Vd().ad(e.Od).then((function(t) {
-                n(new Or(e.firestore, e.Od, t, 
-                /*fromCache=*/ !0, t instanceof St && t.te, e.xd));
-            }), r) : e.zd(n, r, t);
+            t && "cache" === t.source ? e.firestore.wd().Z_(e.Sd).then((function(t) {
+                n(new Or(e.firestore, e.Sd, t, 
+                /*fromCache=*/ !0, t instanceof St && t.te, e.kd));
+            }), r) : e.Ud(n, r, t);
         }));
-    }, t.prototype.zd = function(t, e, n) {
-        var r = this.Gd({
+    }, t.prototype.Ud = function(t, e, n) {
+        var r = this.Md({
             includeMetadataChanges: !0,
             ql: !0
         }, {
@@ -10650,9 +10603,9 @@ var Tr = /** @class */ function() {
             error: e
         });
     }, t.prototype.withConverter = function(e) {
-        return new t(this.Od, this.firestore, e);
+        return new t(this.Sd, this.firestore, e);
     }, t;
-}(), Lr = /** @class */ function() {
+}(), Ur = /** @class */ function() {
     function t(t, e) {
         this.hasPendingWrites = t, this.fromCache = e;
     }
@@ -10661,64 +10614,64 @@ var Tr = /** @class */ function() {
     }, t;
 }(), Or = /** @class */ function() {
     function t(t, e, n, r, i, o) {
-        this.qd = t, this.Od = e, this.Kd = n, this.Hd = r, this.Jd = i, this.xd = o;
+        this.Fd = t, this.Sd = e, this.qd = n, this.Bd = r, this.xd = i, this.kd = o;
     }
     return t.prototype.data = function(t) {
-        if (nn("DocumentSnapshot.data", arguments, 0, 1), t = xr("DocumentSnapshot.data", t), 
-        this.Kd) {
+        if (nn("DocumentSnapshot.data", arguments, 0, 1), t = Gr("DocumentSnapshot.data", t), 
+        this.qd) {
             // We only want to use the converter and create a new DocumentSnapshot
             // if a converter has been provided.
-            if (this.xd) {
-                var e = new Ur(this.qd, this.Od, this.Kd, this.Hd, this.Jd);
-                return this.xd.fromFirestore(e, t);
+            if (this.kd) {
+                var e = new Cr(this.Fd, this.Sd, this.qd, this.Bd, this.xd);
+                return this.kd.fromFirestore(e, t);
             }
-            return new Tr(this.qd, this.qd.Ud(), t.serverTimestamps, 
-            /* converter= */ void 0).fd(this.Kd.Re());
+            return new _r(this.Fd, this.Fd.Dd(), t.serverTimestamps, 
+            /* converter= */ void 0).rd(this.qd.Re());
         }
     }, t.prototype.get = function(t, e) {
-        if (nn("DocumentSnapshot.get", arguments, 1, 2), e = xr("DocumentSnapshot.get", e), 
-        this.Kd) {
-            var n = this.Kd.data().field(jn("DocumentSnapshot.get", t));
-            if (null !== n) return new Tr(this.qd, this.qd.Ud(), e.serverTimestamps, this.xd).fd(n);
+        if (nn("DocumentSnapshot.get", arguments, 1, 2), e = Gr("DocumentSnapshot.get", e), 
+        this.qd) {
+            var n = this.qd.data().field(jn("DocumentSnapshot.get", t));
+            if (null !== n) return new _r(this.Fd, this.Fd.Dd(), e.serverTimestamps, this.kd).rd(n);
         }
     }, Object.defineProperty(t.prototype, "id", {
         get: function() {
-            return this.Od.path.U();
+            return this.Sd.path.U();
         },
         enumerable: !0,
         configurable: !0
     }), Object.defineProperty(t.prototype, "ref", {
         get: function() {
-            return new Vr(this.Od, this.qd, this.xd);
+            return new Vr(this.Sd, this.Fd, this.kd);
         },
         enumerable: !0,
         configurable: !0
     }), Object.defineProperty(t.prototype, "exists", {
         get: function() {
-            return null !== this.Kd;
+            return null !== this.qd;
         },
         enumerable: !0,
         configurable: !0
     }), Object.defineProperty(t.prototype, "metadata", {
         get: function() {
-            return new Lr(this.Jd, this.Hd);
+            return new Ur(this.xd, this.Bd);
         },
         enumerable: !0,
         configurable: !0
     }), t.prototype.isEqual = function(e) {
         if (!(e instanceof t)) throw dn("isEqual", "DocumentSnapshot", 1, e);
-        return this.qd === e.qd && this.Hd === e.Hd && this.Od.isEqual(e.Od) && (null === this.Kd ? null === e.Kd : this.Kd.isEqual(e.Kd)) && this.xd === e.xd;
+        return this.Fd === e.Fd && this.Bd === e.Bd && this.Sd.isEqual(e.Sd) && (null === this.qd ? null === e.qd : this.qd.isEqual(e.qd)) && this.kd === e.kd;
     }, t;
-}(), Ur = /** @class */ function(e) {
+}(), Cr = /** @class */ function(e) {
     function n() {
         return null !== e && e.apply(this, arguments) || this;
     }
     return t(n, e), n.prototype.data = function(t) {
         return e.prototype.data.call(this, t);
     }, n;
-}(Or), Cr = /** @class */ function() {
+}(Or), Pr = /** @class */ function() {
     function t(t, e, n) {
-        this.Yd = t, this.firestore = e, this.xd = n;
+        this.Qd = t, this.firestore = e, this.kd = n;
     }
     return t.prototype.where = function(e, n, r) {
         var i;
@@ -10727,26 +10680,26 @@ var Tr = /** @class */ function() {
                 return t === r;
             }))) throw new A(b.INVALID_ARGUMENT, "Invalid value " + fn(r) + " provided to function Query.where() for its " + vn(2) + " argument. Acceptable values: " + e.join(", "));
         }(0, [ "<", "<=", "==", ">=", ">", "array-contains", "in", "array-contains-any" ], 0, n);
-        var o = jn("Query.where", e), s = Ot.K(n);
+        var o = jn("Query.where", e), s = Ut.K(n);
         if (o.Y()) {
-            if (s === Ot.ARRAY_CONTAINS || s === Ot.ARRAY_CONTAINS_ANY) throw new A(b.INVALID_ARGUMENT, "Invalid Query. You can't perform '" + s.toString() + "' queries on FieldPath.documentId().");
-            if (s === Ot.IN) {
-                this.Xd(r, s);
+            if (s === Ut.ARRAY_CONTAINS || s === Ut.ARRAY_CONTAINS_ANY) throw new A(b.INVALID_ARGUMENT, "Invalid Query. You can't perform '" + s.toString() + "' queries on FieldPath.documentId().");
+            if (s === Ut.IN) {
+                this.Wd(r, s);
                 for (var u = [], a = 0, h = r; a < h.length; a++) {
                     var c = h[a];
-                    u.push(this.Zd(c));
+                    u.push(this.jd(c));
                 }
                 i = {
                     arrayValue: {
                         values: u
                     }
                 };
-            } else i = this.Zd(r);
-        } else s !== Ot.IN && s !== Ot.ARRAY_CONTAINS_ANY || this.Xd(r, s), i = this.firestore.Cd.Xo("Query.where", r, 
+            } else i = this.jd(r);
+        } else s !== Ut.IN && s !== Ut.ARRAY_CONTAINS_ANY || this.Wd(r, s), i = this.firestore.Pd.Xo("Query.where", r, 
         // We only allow nested arrays for IN queries.
-        /** allowArrays = */ s === Ot.IN);
-        var f = Ut.create(o, s, i);
-        return this.tf(f), new t(this.Yd.De(f), this.firestore, this.xd);
+        /** allowArrays = */ s === Ut.IN);
+        var f = Ot.create(o, s, i);
+        return this.Gd(f), new t(this.Qd.De(f), this.firestore, this.kd);
     }, t.prototype.orderBy = function(e, n) {
         var r;
         if (nn("Query.orderBy", arguments, 1, 2), on("Query.orderBy", "non-empty string", 2, n), 
@@ -10754,55 +10707,55 @@ var Tr = /** @class */ function() {
             if ("desc" !== n) throw new A(b.INVALID_ARGUMENT, "Function Query.orderBy() has unknown direction '" + n + "', expected 'asc' or 'desc'.");
             r = Gt.DESCENDING;
         }
-        if (null !== this.Yd.startAt) throw new A(b.INVALID_ARGUMENT, "Invalid query. You must not call Query.startAt() or Query.startAfter() before calling Query.orderBy().");
-        if (null !== this.Yd.endAt) throw new A(b.INVALID_ARGUMENT, "Invalid query. You must not call Query.endAt() or Query.endBefore() before calling Query.orderBy().");
-        var i = jn("Query.orderBy", e), o = new zt(i, r);
-        return this.ef(o), new t(this.Yd.Fe(o), this.firestore, this.xd);
+        if (null !== this.Qd.startAt) throw new A(b.INVALID_ARGUMENT, "Invalid query. You must not call Query.startAt() or Query.startAfter() before calling Query.orderBy().");
+        if (null !== this.Qd.endAt) throw new A(b.INVALID_ARGUMENT, "Invalid query. You must not call Query.endAt() or Query.endBefore() before calling Query.orderBy().");
+        var i = jn("Query.orderBy", e), o = new Bt(i, r);
+        return this.zd(o), new t(this.Qd.Fe(o), this.firestore, this.kd);
     }, t.prototype.limit = function(e) {
         return tn("Query.limit", arguments, 1), rn("Query.limit", "number", 1, e), yn("Query.limit", 1, e), 
-        new t(this.Yd.Ne(e), this.firestore, this.xd);
+        new t(this.Qd.Ne(e), this.firestore, this.kd);
     }, t.prototype.limitToLast = function(e) {
         return tn("Query.limitToLast", arguments, 1), rn("Query.limitToLast", "number", 1, e), 
-        yn("Query.limitToLast", 1, e), new t(this.Yd.ke(e), this.firestore, this.xd);
+        yn("Query.limitToLast", 1, e), new t(this.Qd.ke(e), this.firestore, this.kd);
     }, t.prototype.startAt = function(e) {
         for (var n = [], r = 1; r < arguments.length; r++) n[r - 1] = arguments[r];
         en("Query.startAt", arguments, 1);
-        var i = this.sf("Query.startAt", e, n, 
+        var i = this.Kd("Query.startAt", e, n, 
         /*before=*/ !0);
-        return new t(this.Yd.Le(i), this.firestore, this.xd);
+        return new t(this.Qd.Le(i), this.firestore, this.kd);
     }, t.prototype.startAfter = function(e) {
         for (var n = [], r = 1; r < arguments.length; r++) n[r - 1] = arguments[r];
         en("Query.startAfter", arguments, 1);
-        var i = this.sf("Query.startAfter", e, n, 
+        var i = this.Kd("Query.startAfter", e, n, 
         /*before=*/ !1);
-        return new t(this.Yd.Le(i), this.firestore, this.xd);
+        return new t(this.Qd.Le(i), this.firestore, this.kd);
     }, t.prototype.endBefore = function(e) {
         for (var n = [], r = 1; r < arguments.length; r++) n[r - 1] = arguments[r];
         en("Query.endBefore", arguments, 1);
-        var i = this.sf("Query.endBefore", e, n, 
+        var i = this.Kd("Query.endBefore", e, n, 
         /*before=*/ !0);
-        return new t(this.Yd.$e(i), this.firestore, this.xd);
+        return new t(this.Qd.$e(i), this.firestore, this.kd);
     }, t.prototype.endAt = function(e) {
         for (var n = [], r = 1; r < arguments.length; r++) n[r - 1] = arguments[r];
         en("Query.endAt", arguments, 1);
-        var i = this.sf("Query.endAt", e, n, 
+        var i = this.Kd("Query.endAt", e, n, 
         /*before=*/ !1);
-        return new t(this.Yd.$e(i), this.firestore, this.xd);
+        return new t(this.Qd.$e(i), this.firestore, this.kd);
     }, t.prototype.isEqual = function(e) {
         if (!(e instanceof t)) throw dn("isEqual", "Query", 1, e);
-        return this.firestore === e.firestore && this.Yd.isEqual(e.Yd);
+        return this.firestore === e.firestore && this.Qd.isEqual(e.Qd);
     }, t.prototype.withConverter = function(e) {
-        return new t(this.Yd, this.firestore, e);
+        return new t(this.Qd, this.firestore, e);
     }, 
-    /** Helper function to create a bound from a document or fields */ t.prototype.sf = function(t, e, n, r) {
+    /** Helper function to create a bound from a document or fields */ t.prototype.Kd = function(t, e, n, r) {
         if (ln(t, 1, e), e instanceof Or) {
             if (n.length > 0) throw new A(b.INVALID_ARGUMENT, "Too many arguments provided to " + t + "().");
             var i = e;
             if (!i.exists) throw new A(b.NOT_FOUND, "Can't use a DocumentSnapshot that doesn't exist for " + t + "().");
-            return this.if(i.Kd, r);
+            return this.Hd(i.qd, r);
         }
         var o = [ e ].concat(n);
-        return this.nf(t, o, r);
+        return this.Jd(t, o, r);
     }, 
     /**
      * Create a Bound from a query and a document.
@@ -10815,7 +10768,7 @@ var Tr = /** @class */ function() {
      * of the query or if any of the fields in the order by are an uncommitted
      * server timestamp.
      */
-    t.prototype.if = function(t, e) {
+    t.prototype.Hd = function(t, e) {
         // Because people expect to continue/end a query at the exact document
         // provided, we need to use the implicit sort order rather than the explicit
         // sort order, because it's guaranteed to contain the document key. That way
@@ -10823,9 +10776,9 @@ var Tr = /** @class */ function() {
         // the provided document. Without the key (by using the explicit sort
         // orders), multiple documents could match the position, yielding duplicate
         // results.
-        for (var n = [], r = 0, i = this.Yd.orderBy; r < i.length; r++) {
+        for (var n = [], r = 0, i = this.Qd.orderBy; r < i.length; r++) {
             var o = i[r];
-            if (o.field.Y()) n.push(it(this.firestore.Id, t.key)); else {
+            if (o.field.Y()) n.push(it(this.firestore._d, t.key)); else {
                 var s = t.field(o.field);
                 if (H(s)) throw new A(b.INVALID_ARGUMENT, 'Invalid query. You are trying to start or end a query using a document for which the field "' + o.field + '" is an uncommitted server timestamp. (Since the value of this field is unknown, you cannot start/end a query with it.)');
                 if (null === s) {
@@ -10835,67 +10788,67 @@ var Tr = /** @class */ function() {
                 n.push(s);
             }
         }
-        return new Bt(n, e);
+        return new Qt(n, e);
     }, 
     /**
      * Converts a list of field values to a Bound for the given query.
      */
-    t.prototype.nf = function(t, e, n) {
+    t.prototype.Jd = function(t, e, n) {
         // Use explicit order by's because it has to match the query the user made
-        var r = this.Yd.Ve;
+        var r = this.Qd.Ve;
         if (e.length > r.length) throw new A(b.INVALID_ARGUMENT, "Too many arguments provided to " + t + "(). The number of arguments must be less than or equal to the number of Query.orderBy() clauses");
         for (var i = [], o = 0; o < e.length; o++) {
             var s = e[o];
             if (r[o].field.Y()) {
                 if ("string" != typeof s) throw new A(b.INVALID_ARGUMENT, "Invalid query. Expected a string for document ID in " + t + "(), but got a " + typeof s);
-                if (!this.Yd.He() && -1 !== s.indexOf("/")) throw new A(b.INVALID_ARGUMENT, "Invalid query. When querying a collection and ordering by FieldPath.documentId(), the value passed to " + t + "() must be a plain document ID, but '" + s + "' contains a slash.");
-                var u = this.Yd.path.child(V.K(s));
-                if (!U.st(u)) throw new A(b.INVALID_ARGUMENT, "Invalid query. When querying a collection group and ordering by FieldPath.documentId(), the value passed to " + t + "() must result in a valid document path, but '" + u + "' is not because it contains an odd number of segments.");
-                var a = new U(u);
-                i.push(it(this.firestore.Id, a));
+                if (!this.Qd.He() && -1 !== s.indexOf("/")) throw new A(b.INVALID_ARGUMENT, "Invalid query. When querying a collection and ordering by FieldPath.documentId(), the value passed to " + t + "() must be a plain document ID, but '" + s + "' contains a slash.");
+                var u = this.Qd.path.child(L.K(s));
+                if (!O.st(u)) throw new A(b.INVALID_ARGUMENT, "Invalid query. When querying a collection group and ordering by FieldPath.documentId(), the value passed to " + t + "() must result in a valid document path, but '" + u + "' is not because it contains an odd number of segments.");
+                var a = new O(u);
+                i.push(it(this.firestore._d, a));
             } else {
-                var h = this.firestore.Cd.Xo(t, s);
+                var h = this.firestore.Pd.Xo(t, s);
                 i.push(h);
             }
         }
-        return new Bt(i, n);
+        return new Qt(i, n);
     }, t.prototype.onSnapshot = function() {
         for (var t = [], e = 0; e < arguments.length; e++) t[e] = arguments[e];
         nn("Query.onSnapshot", arguments, 1, 4);
         var n, r = {}, i = 0;
-        return "object" != typeof t[i] || Ir(t[i]) || (pn("Query.onSnapshot", r = t[i], [ "includeMetadataChanges" ]), 
+        return "object" != typeof t[i] || Tr(t[i]) || (pn("Query.onSnapshot", r = t[i], [ "includeMetadataChanges" ]), 
         un("Query.onSnapshot", "boolean", "includeMetadataChanges", r.includeMetadataChanges), 
-        i++), Ir(t[i]) ? n = t[i] : (rn("Query.onSnapshot", "function", i, t[i]), on("Query.onSnapshot", "function", i + 1, t[i + 1]), 
+        i++), Tr(t[i]) ? n = t[i] : (rn("Query.onSnapshot", "function", i, t[i]), on("Query.onSnapshot", "function", i + 1, t[i + 1]), 
         on("Query.onSnapshot", "function", i + 2, t[i + 2]), n = {
             next: t[i],
             error: t[i + 1],
             complete: t[i + 2]
-        }), this.rf(this.Yd), this.Gd(r, n);
-    }, t.prototype.Gd = function(t, e) {
+        }), this.Yd(this.Qd), this.Md(r, n);
+    }, t.prototype.Md = function(t, e) {
         var n = this, r = function(t) {
             console.error("Uncaught Error in onSnapshot:", t);
         };
         e.error && (r = e.error.bind(e));
-        var i = new Nr({
+        var i = new Ir({
             next: function(t) {
-                e.next && e.next(new qr(n.firestore, n.Yd, t, n.xd));
+                e.next && e.next(new Mr(n.firestore, n.Qd, t, n.kd));
             },
             error: r
-        }), o = this.firestore.Vd(), s = o.listen(this.Yd, i, t);
+        }), o = this.firestore.wd(), s = o.listen(this.Qd, i, t);
         return function() {
-            i._d(), o.$u(s);
+            i.sd(), o.$u(s);
         };
-    }, t.prototype.rf = function(t) {
+    }, t.prototype.Yd = function(t) {
         if (t.Ge() && 0 === t.Ve.length) throw new A(b.UNIMPLEMENTED, "limitToLast() queries require specifying at least one orderBy() clause");
     }, t.prototype.get = function(t) {
         var e = this;
-        return nn("Query.get", arguments, 0, 1), Gr("Query.get", t), this.rf(this.Yd), new Promise((function(n, r) {
-            t && "cache" === t.source ? e.firestore.Vd().ud(e.Yd).then((function(t) {
-                n(new qr(e.firestore, e.Yd, t, e.xd));
-            }), r) : e.zd(n, r, t);
+        return nn("Query.get", arguments, 0, 1), xr("Query.get", t), this.Yd(this.Qd), new Promise((function(n, r) {
+            t && "cache" === t.source ? e.firestore.wd().td(e.Qd).then((function(t) {
+                n(new Mr(e.firestore, e.Qd, t, e.kd));
+            }), r) : e.Ud(n, r, t);
         }));
-    }, t.prototype.zd = function(t, e, n) {
-        var r = this.Gd({
+    }, t.prototype.Ud = function(t, e, n) {
+        var r = this.Md({
             includeMetadataChanges: !0,
             ql: !0
         }, {
@@ -10912,17 +10865,17 @@ var Tr = /** @class */ function() {
      * appropriate errors if the value is anything other than a DocumentReference
      * or String, or if the string is malformed.
      */
-    t.prototype.Zd = function(t) {
+    t.prototype.jd = function(t) {
         if ("string" == typeof t) {
             if ("" === t) throw new A(b.INVALID_ARGUMENT, "Invalid query. When querying with FieldPath.documentId(), you must provide a valid document ID, but it was an empty string.");
-            if (!this.Yd.He() && -1 !== t.indexOf("/")) throw new A(b.INVALID_ARGUMENT, "Invalid query. When querying a collection by FieldPath.documentId(), you must provide a plain document ID, but '" + t + "' contains a '/' character.");
-            var e = this.Yd.path.child(V.K(t));
-            if (!U.st(e)) throw new A(b.INVALID_ARGUMENT, "Invalid query. When querying a collection group by FieldPath.documentId(), the value provided must result in a valid document path, but '" + e + "' is not because it has an odd number of segments (" + e.length + ").");
-            return it(this.firestore.Id, new U(e));
+            if (!this.Qd.He() && -1 !== t.indexOf("/")) throw new A(b.INVALID_ARGUMENT, "Invalid query. When querying a collection by FieldPath.documentId(), you must provide a plain document ID, but '" + t + "' contains a '/' character.");
+            var e = this.Qd.path.child(L.K(t));
+            if (!O.st(e)) throw new A(b.INVALID_ARGUMENT, "Invalid query. When querying a collection group by FieldPath.documentId(), the value provided must result in a valid document path, but '" + e + "' is not because it has an odd number of segments (" + e.length + ").");
+            return it(this.firestore._d, new O(e));
         }
         if (t instanceof Vr) {
             var n = t;
-            return it(this.firestore.Id, n.Od);
+            return it(this.firestore._d, n.Sd);
         }
         throw new A(b.INVALID_ARGUMENT, "Invalid query. When querying with FieldPath.documentId(), you must provide a valid string or a DocumentReference, but it was: " + fn(t) + ".");
     }, 
@@ -10930,43 +10883,43 @@ var Tr = /** @class */ function() {
      * Validates that the value passed into a disjunctrive filter satisfies all
      * array requirements.
      */
-    t.prototype.Xd = function(t, e) {
+    t.prototype.Wd = function(t, e) {
         if (!Array.isArray(t) || 0 === t.length) throw new A(b.INVALID_ARGUMENT, "Invalid Query. A non-empty array is required for '" + e.toString() + "' filters.");
         if (t.length > 10) throw new A(b.INVALID_ARGUMENT, "Invalid Query. '" + e.toString() + "' filters support a maximum of 10 elements in the value array.");
         if (t.indexOf(null) >= 0) throw new A(b.INVALID_ARGUMENT, "Invalid Query. '" + e.toString() + "' filters cannot contain 'null' in the value array.");
         if (t.filter((function(t) {
             return Number.isNaN(t);
         })).length > 0) throw new A(b.INVALID_ARGUMENT, "Invalid Query. '" + e.toString() + "' filters cannot contain 'NaN' in the value array.");
-    }, t.prototype.tf = function(t) {
-        if (t instanceof Ut) {
-            var e = [ Ot.ARRAY_CONTAINS, Ot.ARRAY_CONTAINS_ANY ], n = [ Ot.IN, Ot.ARRAY_CONTAINS_ANY ], r = e.indexOf(t.op) >= 0, i = n.indexOf(t.op) >= 0;
+    }, t.prototype.Gd = function(t) {
+        if (t instanceof Ot) {
+            var e = [ Ut.ARRAY_CONTAINS, Ut.ARRAY_CONTAINS_ANY ], n = [ Ut.IN, Ut.ARRAY_CONTAINS_ANY ], r = e.indexOf(t.op) >= 0, i = n.indexOf(t.op) >= 0;
             if (t.ze()) {
-                var o = this.Yd.Se();
+                var o = this.Qd.Se();
                 if (null !== o && !o.isEqual(t.field)) throw new A(b.INVALID_ARGUMENT, "Invalid query. All where filters with an inequality (<, <=, >, or >=) must be on the same field. But you have inequality filters on '" + o.toString() + "' and '" + t.field.toString() + "'");
-                var s = this.Yd.Ce();
-                null !== s && this.hf(t.field, s);
+                var s = this.Qd.Ce();
+                null !== s && this.Xd(t.field, s);
             } else if (i || r) {
                 // You can have at most 1 disjunctive filter and 1 array filter. Check if
                 // the new filter conflicts with an existing one.
                 var u = null;
-                if (i && (u = this.Yd.Ke(n)), null === u && r && (u = this.Yd.Ke(e)), null != u) 
+                if (i && (u = this.Qd.Ke(n)), null === u && r && (u = this.Qd.Ke(e)), null != u) 
                 // We special case when it's a duplicate op to give a slightly clearer error message.
                 throw u === t.op ? new A(b.INVALID_ARGUMENT, "Invalid query. You cannot use more than one '" + t.op.toString() + "' filter.") : new A(b.INVALID_ARGUMENT, "Invalid query. You cannot use '" + t.op.toString() + "' filters with '" + u.toString() + "' filters.");
             }
         }
-    }, t.prototype.ef = function(t) {
-        if (null === this.Yd.Ce()) {
+    }, t.prototype.zd = function(t) {
+        if (null === this.Qd.Ce()) {
             // This is the first order by. It must match any inequality.
-            var e = this.Yd.Se();
-            null !== e && this.hf(e, t.field);
+            var e = this.Qd.Se();
+            null !== e && this.Xd(e, t.field);
         }
-    }, t.prototype.hf = function(t, e) {
+    }, t.prototype.Xd = function(t, e) {
         if (!e.isEqual(t)) throw new A(b.INVALID_ARGUMENT, "Invalid query. You have a where filter with an inequality (<, <=, >, or >=) on field '" + t.toString() + "' and so you must also use '" + t.toString() + "' as your first Query.orderBy(), but your first Query.orderBy() is on field '" + e.toString() + "' instead.");
     }, t;
-}(), qr = /** @class */ function() {
+}(), Mr = /** @class */ function() {
     function t(t, e, n, r) {
-        this.qd = t, this.af = e, this.uf = n, this.xd = r, this.cf = null, this.lf = null, 
-        this.metadata = new Lr(n.hasPendingWrites, n.fromCache);
+        this.Fd = t, this.Zd = e, this.tf = n, this.kd = r, this.ef = null, this.sf = null, 
+        this.metadata = new Ur(n.hasPendingWrites, n.fromCache);
     }
     return Object.defineProperty(t.prototype, "docs", {
         get: function() {
@@ -10979,33 +10932,33 @@ var Tr = /** @class */ function() {
         configurable: !0
     }), Object.defineProperty(t.prototype, "empty", {
         get: function() {
-            return this.uf.docs.q();
+            return this.tf.docs.q();
         },
         enumerable: !0,
         configurable: !0
     }), Object.defineProperty(t.prototype, "size", {
         get: function() {
-            return this.uf.docs.size;
+            return this.tf.docs.size;
         },
         enumerable: !0,
         configurable: !0
     }), t.prototype.forEach = function(t, e) {
         var n = this;
         nn("QuerySnapshot.forEach", arguments, 1, 2), rn("QuerySnapshot.forEach", "function", 1, t), 
-        this.uf.docs.forEach((function(r) {
-            t.call(e, n._f(r));
+        this.tf.docs.forEach((function(r) {
+            t.call(e, n.if(r));
         }));
     }, Object.defineProperty(t.prototype, "query", {
         get: function() {
-            return new Cr(this.af, this.qd, this.xd);
+            return new Pr(this.Zd, this.Fd, this.kd);
         },
         enumerable: !0,
         configurable: !0
     }), t.prototype.docChanges = function(t) {
         t && (pn("QuerySnapshot.docChanges", t, [ "includeMetadataChanges" ]), un("QuerySnapshot.docChanges", "boolean", "includeMetadataChanges", t.includeMetadataChanges));
         var e = !(!t || !t.includeMetadataChanges);
-        if (e && this.uf.ds) throw new A(b.INVALID_ARGUMENT, "To include metadata changes with your document changes, you must also pass { includeMetadataChanges:true } to onSnapshot().");
-        return this.cf && this.lf === e || (this.cf = 
+        if (e && this.tf.ds) throw new A(b.INVALID_ARGUMENT, "To include metadata changes with your document changes, you must also pass { includeMetadataChanges:true } to onSnapshot().");
+        return this.ef && this.sf === e || (this.ef = 
         /**
      * Calculates the array of firestore.DocumentChange's for a given ViewSnapshot.
      *
@@ -11017,7 +10970,7 @@ var Tr = /** @class */ function() {
                 // fast
                 var i = 0;
                 return n.docChanges.map((function(e) {
-                    var o = new Ur(t, e.doc.key, e.doc, n.fromCache, n.ls.has(e.doc.key), r);
+                    var o = new Cr(t, e.doc.key, e.doc, n.fromCache, n.ls.has(e.doc.key), r);
                     return e.doc, {
                         type: "added",
                         doc: o,
@@ -11032,45 +10985,45 @@ var Tr = /** @class */ function() {
             return n.docChanges.filter((function(t) {
                 return e || 3 /* Metadata */ !== t.type;
             })).map((function(e) {
-                var i = new Ur(t, e.doc.key, e.doc, n.fromCache, n.ls.has(e.doc.key), r), s = -1, u = -1;
+                var i = new Cr(t, e.doc.key, e.doc, n.fromCache, n.ls.has(e.doc.key), r), s = -1, u = -1;
                 return 0 /* Added */ !== e.type && (s = o.indexOf(e.doc.key), o = o.delete(e.doc.key)), 
                 1 /* Removed */ !== e.type && (u = (o = o.add(e.doc)).indexOf(e.doc.key)), {
-                    type: jr(e.type),
+                    type: Qr(e.type),
                     doc: i,
                     oldIndex: s,
                     newIndex: u
                 };
             }));
-        }(this.qd, e, this.uf, this.xd), this.lf = e), this.cf;
+        }(this.Fd, e, this.tf, this.kd), this.sf = e), this.ef;
     }, 
     /** Check the equality. The call can be very expensive. */ t.prototype.isEqual = function(e) {
         if (!(e instanceof t)) throw dn("isEqual", "QuerySnapshot", 1, e);
-        return this.qd === e.qd && this.af.isEqual(e.af) && this.uf.isEqual(e.uf) && this.xd === e.xd;
-    }, t.prototype._f = function(t) {
-        return new Ur(this.qd, t.key, t, this.metadata.fromCache, this.uf.ls.has(t.key), this.xd);
+        return this.Fd === e.Fd && this.Zd.isEqual(e.Zd) && this.tf.isEqual(e.tf) && this.kd === e.kd;
+    }, t.prototype.if = function(t) {
+        return new Cr(this.Fd, t.key, t, this.metadata.fromCache, this.tf.ls.has(t.key), this.kd);
     }, t;
-}(), Mr = /** @class */ function(e) {
+}(), qr = /** @class */ function(e) {
     function n(t, n, r) {
         var i = this;
-        if ((i = e.call(this, Lt.ve(t), n, r) || this).df = t, t.length % 2 != 1) throw new A(b.INVALID_ARGUMENT, "Invalid collection reference. Collection references must have an odd number of segments, but " + t.G() + " has " + t.length);
+        if ((i = e.call(this, Vt.ve(t), n, r) || this).nf = t, t.length % 2 != 1) throw new A(b.INVALID_ARGUMENT, "Invalid collection reference. Collection references must have an odd number of segments, but " + t.G() + " has " + t.length);
         return i;
     }
     return t(n, e), Object.defineProperty(n.prototype, "id", {
         get: function() {
-            return this.Yd.path.U();
+            return this.Qd.path.U();
         },
         enumerable: !0,
         configurable: !0
     }), Object.defineProperty(n.prototype, "parent", {
         get: function() {
-            var t = this.Yd.path.O();
-            return t.q() ? null : new Vr(new U(t), this.firestore);
+            var t = this.Qd.path.O();
+            return t.q() ? null : new Vr(new O(t), this.firestore);
         },
         enumerable: !0,
         configurable: !0
     }), Object.defineProperty(n.prototype, "path", {
         get: function() {
-            return this.Yd.path.G();
+            return this.Qd.path.G();
         },
         enumerable: !0,
         configurable: !0
@@ -11078,20 +11031,20 @@ var Tr = /** @class */ function() {
         if (nn("CollectionReference.doc", arguments, 0, 1), 
         // We allow omission of 'pathString' but explicitly prohibit passing in both
         // 'undefined' and 'null'.
-        0 === arguments.length && (t = Oe.Tn()), rn("CollectionReference.doc", "non-empty string", 1, t), 
+        0 === arguments.length && (t = Ue.Tn()), rn("CollectionReference.doc", "non-empty string", 1, t), 
         "" === t) throw new A(b.INVALID_ARGUMENT, "Document path must be a non-empty string");
-        var e = V.K(t);
-        return Vr.Md(this.Yd.path.child(e), this.firestore, this.xd);
+        var e = L.K(t);
+        return Vr.Cd(this.Qd.path.child(e), this.firestore, this.kd);
     }, n.prototype.add = function(t) {
-        tn("CollectionReference.add", arguments, 1), rn("CollectionReference.add", "object", 1, this.xd ? this.xd.toFirestore(t) : t);
+        tn("CollectionReference.add", arguments, 1), rn("CollectionReference.add", "object", 1, this.kd ? this.kd.toFirestore(t) : t);
         var e = this.doc();
         return e.set(t).then((function() {
             return e;
         }));
     }, n.prototype.withConverter = function(t) {
-        return new n(this.df, this.firestore, t);
+        return new n(this.nf, this.firestore, t);
     }, n;
-}(Cr);
+}(Pr);
 
 /**
  * @license
@@ -11110,7 +11063,7 @@ var Tr = /** @class */ function() {
  * limitations under the License.
  */
 // settings() defaults:
-function Pr(t, e) {
+function Fr(t, e) {
     if (void 0 === e) return {
         merge: !1
     };
@@ -11125,16 +11078,16 @@ function Pr(t, e) {
     return e;
 }
 
-function xr(t, e) {
+function Gr(t, e) {
     return void 0 === e ? {} : (pn(t, e, [ "serverTimestamps" ]), an(t, 0, "serverTimestamps", e.serverTimestamps, [ "estimate", "previous", "none" ]), 
     e);
 }
 
-function Gr(t, e) {
+function xr(t, e) {
     on(t, "object", 1, e), e && (pn(t, e, [ "source" ]), an(t, 0, "source", e.source, [ "default", "server", "cache" ]));
 }
 
-function Fr(t, e, n) {
+function jr(t, e, n) {
     if (e instanceof Vr) {
         if (e.firestore !== n) throw new A(b.INVALID_ARGUMENT, "Provided document reference is from a different Firestore instance.");
         return e;
@@ -11142,7 +11095,7 @@ function Fr(t, e, n) {
     throw dn(t, "DocumentReference", 1, e);
 }
 
-function jr(t) {
+function Qr(t) {
     switch (t) {
       case 0 /* Added */ :
         return "added";
@@ -11155,7 +11108,7 @@ function jr(t) {
         return "removed";
 
       default:
-        return Ve("Unknown change type: " + t);
+        return Le("Unknown change type: " + t);
     }
 }
 
@@ -11172,100 +11125,100 @@ function jr(t) {
     return t ? (r = t.toFirestore(e), n = "toFirestore() in " + n) : r = e, [ r, n ];
 }
 
-var zr = gn(Sr, "Use firebase.firestore() instead."), Qr = gn(Rr, "Use firebase.firestore().runTransaction() instead."), Hr = gn(Dr, "Use firebase.firestore().batch() instead."), Yr = gn(Vr, "Use firebase.firestore().doc() instead."), Wr = gn(Or), Jr = gn(Ur), Xr = gn(Cr), Kr = gn(qr), Zr = gn(Mr, "Use firebase.firestore().collection() instead."), $r = {
+var zr = gn(Rr, "Use firebase.firestore() instead."), Hr = gn(Dr, "Use firebase.firestore().runTransaction() instead."), Yr = gn(Lr, "Use firebase.firestore().batch() instead."), Wr = gn(Vr, "Use firebase.firestore().doc() instead."), Jr = gn(Or), Zr = gn(Cr), Xr = gn(Pr), Kr = gn(Mr), $r = gn(qr, "Use firebase.firestore().collection() instead."), ti = {
     Firestore: zr,
-    GeoPoint: Ln,
+    GeoPoint: Vn,
     Timestamp: S,
     Blob: An,
-    Transaction: Qr,
-    WriteBatch: Hr,
-    DocumentReference: Yr,
-    DocumentSnapshot: Wr,
+    Transaction: Hr,
+    WriteBatch: Yr,
+    DocumentReference: Wr,
+    DocumentSnapshot: Jr,
     Query: Xr,
-    QueryDocumentSnapshot: Jr,
+    QueryDocumentSnapshot: Zr,
     QuerySnapshot: Kr,
-    CollectionReference: Zr,
+    CollectionReference: $r,
     FieldPath: Nn,
-    FieldValue: Vn,
-    setLogLevel: Sr.setLogLevel,
-    CACHE_SIZE_UNLIMITED: _r
-}, ti = /** @class */ function() {
+    FieldValue: Ln,
+    setLogLevel: Rr.setLogLevel,
+    CACHE_SIZE_UNLIMITED: kr
+}, ei = /** @class */ function() {
     function t() {}
     return t.prototype.mu = function(t) {
         // No-op.
     }, t.prototype.ku = function() {
         // No-op.
     }, t;
-}(), ei = /** @class */ function() {
+}(), ni = /** @class */ function() {
     function t() {
         var t = this;
-        this.ff = function() {
-            return t.wf();
-        }, this.Tf = function() {
-            return t.mf();
-        }, this.Ef = [], this.Rf();
+        this.rf = function() {
+            return t.hf();
+        }, this.af = function() {
+            return t.uf();
+        }, this.cf = [], this.lf();
     }
     return t.prototype.mu = function(t) {
-        this.Ef.push(t);
+        this.cf.push(t);
     }, t.prototype.ku = function() {
-        window.removeEventListener("online", this.ff), window.removeEventListener("offline", this.Tf);
-    }, t.prototype.Rf = function() {
-        window.addEventListener("online", this.ff), window.addEventListener("offline", this.Tf);
-    }, t.prototype.wf = function() {
+        window.removeEventListener("online", this.rf), window.removeEventListener("offline", this.af);
+    }, t.prototype.lf = function() {
+        window.addEventListener("online", this.rf), window.addEventListener("offline", this.af);
+    }, t.prototype.hf = function() {
         Se("ConnectivityMonitor", "Network connectivity changed: AVAILABLE");
-        for (var t = 0, e = this.Ef; t < e.length; t++) {
+        for (var t = 0, e = this.cf; t < e.length; t++) {
             (0, e[t])(0 /* AVAILABLE */);
         }
-    }, t.prototype.mf = function() {
+    }, t.prototype.uf = function() {
         Se("ConnectivityMonitor", "Network connectivity changed: UNAVAILABLE");
-        for (var t = 0, e = this.Ef; t < e.length; t++) {
+        for (var t = 0, e = this.cf; t < e.length; t++) {
             (0, e[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. */
-    t.If = function() {
+    t._f = function() {
         return "undefined" != typeof window && void 0 !== window.addEventListener && void 0 !== window.removeEventListener;
     }, t;
-}(), ni = /** @class */ function() {
+}(), ri = /** @class */ function() {
     function t(t) {
-        this.Af = t.Af, this.Pf = t.Pf;
+        this.df = t.df, this.ff = t.ff;
     }
     return t.prototype.Na = function(t) {
-        this.Vf = t;
+        this.wf = t;
     }, t.prototype.va = function(t) {
-        this.pf = t;
+        this.Tf = t;
     }, t.prototype.onMessage = function(t) {
-        this.gf = t;
+        this.mf = t;
     }, t.prototype.close = function() {
-        this.Pf();
+        this.ff();
     }, t.prototype.send = function(t) {
-        this.Af(t);
-    }, t.prototype.yf = function() {
-        this.Vf();
-    }, t.prototype.bf = function(t) {
-        this.pf(t);
-    }, t.prototype.vf = function(t) {
-        this.gf(t);
+        this.df(t);
+    }, t.prototype.Ef = function() {
+        this.wf();
+    }, t.prototype.Rf = function(t) {
+        this.Tf(t);
+    }, t.prototype.If = function(t) {
+        this.mf(t);
     }, t;
-}(), ri = {
+}(), ii = {
     BatchGetDocuments: "batchGet",
     Commit: "commit"
-}, ii = "gl-js/ fire/" + w, oi = /** @class */ function() {
+}, oi = "gl-js/ fire/" + w, si = /** @class */ function() {
     function t(t) {
         this.ci = t.ci;
         var e = t.ssl ? "https" : "http";
-        this.Sf = e + "://" + t.host, this.forceLongPolling = t.forceLongPolling;
+        this.Af = e + "://" + t.host, this.forceLongPolling = t.forceLongPolling;
     }
     /**
      * Modifies the headers for a request, adding any authorization token if
      * present and any additional headers for the request.
-     */    return t.prototype.Cf = function(t, e) {
+     */    return t.prototype.Pf = function(t, e) {
         if (e) for (var n in e.o) e.o.hasOwnProperty(n) && (t[n] = e.o[n]);
-        t["X-Goog-Api-Client"] = ii;
+        t["X-Goog-Api-Client"] = oi;
     }, t.prototype.Ga = function(t, e, n) {
-        var r = this, i = this.Df(t);
+        var r = this, i = this.Vf(t);
         return new Promise((function(o, s) {
             var u = new d;
             u.listenOnce(y.COMPLETE, (function() {
@@ -11299,7 +11252,7 @@ var zr = gn(Sr, "Use firebase.firestore() instead."), Qr = gn(Rr, "Use firebase.
                         break;
 
                       default:
-                        Ve('RPC "' + t + '" failed with unanticipated webchannel error ' + u.getLastErrorCode() + ": " + u.getLastError() + ", giving up.");
+                        Le('RPC "' + t + '" failed with unanticipated webchannel error ' + u.getLastErrorCode() + ": " + u.getLastError() + ", giving up.");
                     }
                 } finally {
                     Se("Connection", 'RPC "' + t + '" completed.');
@@ -11320,14 +11273,14 @@ var zr = gn(Sr, "Use firebase.firestore() instead."), Qr = gn(Rr, "Use firebase.
             var c = {
                 "Content-Type": "text/plain"
             };
-            r.Cf(c, n), u.send(i, "POST", h, c, 15);
+            r.Pf(c, n), u.send(i, "POST", h, c, 15);
         }));
     }, t.prototype.Ka = function(t, e, n) {
         // The REST API automatically aggregates all of the streamed results, so we
         // can just use the normal invoke() method.
         return this.Ga(t, e, n);
     }, t.prototype.ka = function(t, e) {
-        var n = [ this.Sf, "/", "google.firestore.v1.Firestore", "/", t, "/channel" ], r = m(), i = {
+        var n = [ this.Af, "/", "google.firestore.v1.Firestore", "/", t, "/channel" ], r = m(), i = {
             // Required for backend stickiness, routing behavior is based on this
             // parameter.
             httpSessionIdParam: "gsessionid",
@@ -11350,7 +11303,7 @@ var zr = gn(Sr, "Use firebase.firestore() instead."), Qr = gn(Rr, "Use firebase.
             },
             forceLongPolling: this.forceLongPolling
         };
-        this.Cf(i.initMessageHeaders, e), 
+        this.Pf(i.initMessageHeaders, e), 
         // Sending the custom headers we just added to request.initMessageHeaders
         // (Authorization, etc.) will trigger the browser to make a CORS preflight
         // request because the XHR will no longer meet the criteria for a "simple"
@@ -11369,12 +11322,12 @@ var zr = gn(Sr, "Use firebase.firestore() instead."), Qr = gn(Rr, "Use firebase.
         u() || a() || h() || c() || f() || l() || (i.httpHeadersOverwriteParam = "$httpHeaders");
         var o = n.join("");
         Se("Connection", "Creating WebChannel: " + o + " " + i);
-        var s = r.createWebChannel(o, i), p = !1, d = !1, y = new ni({
-            Af: function(t) {
+        var s = r.createWebChannel(o, i), p = !1, d = !1, y = new ri({
+            df: function(t) {
                 d ? Se("Connection", "Not sending because WebChannel is closed:", t) : (p || (Se("Connection", "Opening WebChannel transport."), 
                 s.open(), p = !0), Se("Connection", "WebChannel sending:", t), s.send(t));
             },
-            Pf: function() {
+            ff: function() {
                 return s.close();
             }
         }), v = function(t, e) {
@@ -11402,14 +11355,14 @@ var zr = gn(Sr, "Use firebase.firestore() instead."), Qr = gn(Rr, "Use firebase.
         return v(g.EventType.OPEN, (function() {
             d || Se("Connection", "WebChannel transport opened.");
         })), v(g.EventType.CLOSE, (function() {
-            d || (d = !0, Se("Connection", "WebChannel transport closed"), y.bf());
+            d || (d = !0, Se("Connection", "WebChannel transport closed"), y.Rf());
         })), v(g.EventType.ERROR, (function(t) {
-            d || (d = !0, Se("Connection", "WebChannel transport errored:", t), y.bf(new A(b.UNAVAILABLE, "The operation could not be completed")));
+            d || (d = !0, Se("Connection", "WebChannel transport errored:", t), y.Rf(new A(b.UNAVAILABLE, "The operation could not be completed")));
         })), v(g.EventType.MESSAGE, (function(t) {
             var e;
             if (!d) {
                 var n = t.data[0];
-                Le(!!n, "Got a webchannel message without data.");
+                Ve(!!n, "Got a webchannel message without data.");
                 // TODO(b/35143891): There is a bug in One Platform that caused errors
                 // (and only errors) to be wrapped in an extra array. To be forward
                 // compatible with the bug we need to check either condition. The latter
@@ -11422,26 +11375,26 @@ var zr = gn(Sr, "Use firebase.firestore() instead."), Qr = gn(Rr, "Use firebase.
                     var o = i.status, u = function(t) {
                         // lookup by string
                         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                        var e = Ft[t];
-                        if (void 0 !== e) return Xt(e);
+                        var e = xt[t];
+                        if (void 0 !== e) return Zt(e);
                     }(o), a = i.message;
                     void 0 === u && (u = b.INTERNAL, a = "Unknown error status: " + o + " with message " + i.message), 
                     // Mark closed so no further events are propagated
-                    d = !0, y.bf(new A(u, a)), s.close();
-                } else Se("Connection", "WebChannel received:", n), y.vf(n);
+                    d = !0, y.Rf(new A(u, a)), s.close();
+                } else Se("Connection", "WebChannel received:", n), y.If(n);
             }
         })), setTimeout((function() {
             // Technically we could/should wait for the WebChannel opened event,
             // but because we want to send the first message with the WebChannel
             // handshake we pretend the channel opened here (asynchronously), and
             // then delay the actual open until the first message is sent.
-            y.yf();
+            y.Ef();
         }), 0), y;
     }, 
     // visible for testing
-    t.prototype.Df = function(t) {
-        var e = ri[t];
-        return this.Sf + "/v1/projects/" + this.ci.projectId + "/databases/" + this.ci.database + "/documents:" + e;
+    t.prototype.Vf = function(t) {
+        var e = ii[t];
+        return this.Af + "/v1/projects/" + this.ci.projectId + "/databases/" + this.ci.database + "/documents:" + e;
     }, t;
 }();
 
@@ -11480,7 +11433,7 @@ var zr = gn(Sr, "Use firebase.firestore() instead."), Qr = gn(Rr, "Use firebase.
 /**
  * Registers the memory-only Firestore build with the components framework.
  */
-function si(t) {
+function ui(t) {
     /**
  * Configures Firestore as part of the Firebase SDK by calling registerService.
  *
@@ -11491,10 +11444,10 @@ function si(t) {
     !function(t, e) {
         t.INTERNAL.registerComponent(new p("firestore", (function(t) {
             return function(t, e) {
-                return new Sr(t, e, new br);
+                return new Rr(t, e, new Ar);
             }(t.getProvider("app").getImmediate(), t.getProvider("auth-internal"));
-        }), "PUBLIC" /* PUBLIC */).setServiceProps(Object.assign({}, $r)));
-    }(t), t.registerVersion("@firebase/firestore", "1.14.0-canary.daf63c2c");
+        }), "PUBLIC" /* PUBLIC */).setServiceProps(Object.assign({}, ti)));
+    }(t), t.registerVersion("@firebase/firestore", "1.14.0");
 }
 
 /**
@@ -11552,11 +11505,11 @@ Ie.fn(new (/** @class */ function() {
         },
         enumerable: !0,
         configurable: !0
-    }), t.prototype.td = function(t) {
-        return Promise.resolve(new oi(t));
-    }, t.prototype.J_ = function() {
-        return ei.If() ? new ei : new ti;
-    }, t.prototype.ed = function(t) {
+    }), t.prototype.K_ = function(t) {
+        return Promise.resolve(new si(t));
+    }, t.prototype.Q_ = function() {
+        return ni._f() ? new ni : new ei;
+    }, t.prototype.H_ = function(t) {
         return new Ae(t, {
             di: !0
         });
@@ -11567,7 +11520,7 @@ Ie.fn(new (/** @class */ function() {
     }, t.prototype.btoa = function(t) {
         return btoa(t);
     }, t;
-}())), si(i);
+}())), ui(i);
 
-export { si as __PRIVATE_registerFirestore };
+export { ui as __PRIVATE_registerFirestore };
 //# sourceMappingURL=index.memory.esm.js.map