@firebase/firestore 3.1.0 → 3.1.1-canary.4594d3fd6

package/dist/lite/index.browser.esm2017.js

@@ -1,10 +1,7 @@
-import { _getProvider, getApp as t, _removeServiceInstance as e, _registerComponent as n, registerVersion as r, SDK_VERSION as s } from "@firebase/app";
-
-import { Component as i } from "@firebase/component";
-
-import { Logger as o, LogLevel as u } from "@firebase/logger";
-
-import { createMockUserToken as c, getModularInstance as a } from "@firebase/util";
+import { _registerComponent, registerVersion, _getProvider, getApp, _removeServiceInstance, SDK_VERSION } from '@firebase/app';
+import { Component } from '@firebase/component';
+import { Logger, LogLevel } from '@firebase/logger';
+import { createMockUserToken, getModularInstance } from '@firebase/util';
 
 /**
  * @license
@@ -66,7 +63,7 @@ h.MOCK_USER = new h("mock-user");
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-let l = "9.1.0";
+let l = "9.1.3-canary.4594d3fd6";
 
 /**
  * @license
@@ -84,7 +81,7 @@ let l = "9.1.0";
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const f = new o("@firebase/firestore");
+const f = new Logger("@firebase/firestore");
 
 /**
  * Sets the verbosity of Cloud Firestore logs (debug, error, or silent).
@@ -102,26 +99,26 @@ const f = new o("@firebase/firestore");
     f.setLogLevel(t);
 }
 
-function w(t, ...e) {
-    if (f.logLevel <= u.DEBUG) {
-        const n = e.map(y);
-        f.debug(`Firestore (${l}): ${t}`, ...n);
+function w(t, ...n) {
+    if (f.logLevel <= LogLevel.DEBUG) {
+        const e = n.map(y);
+        f.debug(`Firestore (${l}): ${t}`, ...e);
     }
 }
 
-function m(t, ...e) {
-    if (f.logLevel <= u.ERROR) {
-        const n = e.map(y);
-        f.error(`Firestore (${l}): ${t}`, ...n);
+function m(t, ...n) {
+    if (f.logLevel <= LogLevel.ERROR) {
+        const e = n.map(y);
+        f.error(`Firestore (${l}): ${t}`, ...e);
     }
 }
 
 /**
  * @internal
- */ function p(t, ...e) {
-    if (f.logLevel <= u.WARN) {
-        const n = e.map(y);
-        f.warn(`Firestore (${l}): ${t}`, ...n);
+ */ function p(t, ...n) {
+    if (f.logLevel <= LogLevel.WARN) {
+        const e = n.map(y);
+        f.warn(`Firestore (${l}): ${t}`, ...e);
     }
 }
 
@@ -130,8 +127,8 @@ function m(t, ...e) {
  */ function y(t) {
     if ("string" == typeof t) return t;
     try {
-        return e = t, JSON.stringify(e);
-    } catch (e) {
+        return n = t, JSON.stringify(n);
+    } catch (n) {
         // Converting to JSON failed, just log the object directly
         return t;
     }
@@ -152,7 +149,7 @@ function m(t, ...e) {
  * limitations under the License.
  */
     /** Formats an object as a JSON string, suitable for logging. */
-    var e;
+    var n;
 }
 
 /**
@@ -181,11 +178,11 @@ function m(t, ...e) {
  */ function _(t = "Unexpected state") {
     // Log the failure in addition to throw an exception, just in case the
     // exception is swallowed.
-    const e = `FIRESTORE (${l}) INTERNAL ASSERTION FAILED: ` + t;
+    const n = `FIRESTORE (${l}) INTERNAL ASSERTION FAILED: ` + t;
     // NOTE: We don't use FirestoreError here because these are internal failures
     // that cannot be handled by the user. (Also it would create a circular
     // dependency between the error and assert modules which doesn't work.)
-    throw m(e), new Error(e);
+    throw m(n), new Error(n);
 }
 
 /**
@@ -193,7 +190,7 @@ function m(t, ...e) {
  * given message if it did.
  *
  * Messages are stripped in production builds.
- */ function g(t, e) {
+ */ function g(t, n) {
     t || _();
 }
 
@@ -202,7 +199,7 @@ function m(t, ...e) {
  * instance of `T` before casting.
  */ function b(t, 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-e) {
+n) {
     return t;
 }
 
@@ -221,7 +218,7 @@ e) {
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */ const v = "ok", E = "cancelled", I = "unknown", T = "invalid-argument", A = "deadline-exceeded", P = "not-found", R = "already-exists", V = "permission-denied", N = "unauthenticated", D = "resource-exhausted", $ = "failed-precondition", F = "aborted", S = "out-of-range", q = "unimplemented", x = "internal", O = "unavailable", C = "data-loss";
+ */ const v = "ok", E = "cancelled", T = "unknown", I = "invalid-argument", A = "deadline-exceeded", P = "not-found", R = "already-exists", V = "permission-denied", D = "unauthenticated", N = "resource-exhausted", $ = "failed-precondition", F = "aborted", S = "out-of-range", q = "unimplemented", x = "internal", O = "unavailable", C = "data-loss";
 
 /** An error returned by a Firestore operation. */ class L extends Error {
     /** @hideconstructor */
@@ -233,8 +230,8 @@ e) {
     /**
      * A custom error description.
      */
-    e) {
-        super(e), this.code = t, this.message = e, 
+    n) {
+        super(n), this.code = t, this.message = n, 
         /** The custom name for all FirestoreErrors. */
         this.name = "FirebaseError", 
         // HACK: We write a toString property directly because Error is not a real
@@ -261,8 +258,8 @@ e) {
  * limitations under the License.
  */ class U {
     constructor() {
-        this.promise = new Promise(((t, e) => {
-            this.resolve = t, this.reject = e;
+        this.promise = new Promise(((t, n) => {
+            this.resolve = t, this.reject = n;
         }));
     }
 }
@@ -283,8 +280,8 @@ e) {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ class j {
-    constructor(t, e) {
-        this.user = e, this.type = "OAuth", this.authHeaders = {}, 
+    constructor(t, n) {
+        this.user = n, this.type = "OAuth", this.authHeaders = {}, 
         // Set the headers using Object Literal notation to avoid minification
         this.authHeaders.Authorization = `Bearer ${t}`;
     }
@@ -298,9 +295,9 @@ e) {
         return Promise.resolve(null);
     }
     invalidateToken() {}
-    start(t, e) {
+    start(t, n) {
         // Fire with initial user.
-        t.enqueueRetryable((() => e(h.UNAUTHENTICATED)));
+        t.enqueueRetryable((() => n(h.UNAUTHENTICATED)));
     }
     shutdown() {}
 }
@@ -308,7 +305,7 @@ e) {
 /**
  * A CredentialsProvider that always returns a constant token. Used for
  * emulator token mocking.
- */ class M {
+ */ class B {
     constructor(t) {
         this.token = t, 
         /**
@@ -322,17 +319,17 @@ e) {
         return Promise.resolve(this.token);
     }
     invalidateToken() {}
-    start(t, e) {
-        this.changeListener = e, 
+    start(t, n) {
+        this.changeListener = n, 
         // Fire with initial user.
-        t.enqueueRetryable((() => e(this.token.user)));
+        t.enqueueRetryable((() => n(this.token.user)));
     }
     shutdown() {
         this.changeListener = null;
     }
 }
 
-/** Credential provider for the Lite SDK. */ class B {
+/** Credential provider for the Lite SDK. */ class M {
     constructor(t) {
         this.auth = null, t.onInit((t => {
             this.auth = t;
@@ -343,7 +340,7 @@ e) {
         new j(t.accessToken, new h(this.auth.getUid()))) : null)) : Promise.resolve(null);
     }
     invalidateToken() {}
-    start(t, e) {}
+    start(t, n) {}
     shutdown() {}
 }
 
@@ -354,15 +351,15 @@ e) {
  * recover from unauthenticated errors (see b/33147818 for context), but it's
  * safer to keep the implementation as-is.
  */ class Q {
-    constructor(t, e, n) {
-        this.t = t, this.i = e, this.o = n, this.type = "FirstParty", this.user = h.FIRST_PARTY;
+    constructor(t, n, e) {
+        this.t = t, this.i = n, this.o = e, this.type = "FirstParty", this.user = h.FIRST_PARTY;
     }
     get authHeaders() {
         const t = {
             "X-Goog-AuthUser": this.i
-        }, e = this.t.auth.getAuthHeaderValueForFirstParty([]);
+        }, n = this.t.auth.getAuthHeaderValueForFirstParty([]);
         // Use array notation to prevent minification
-                return e && (t.Authorization = e), this.o && (t["X-Goog-Iam-Authorization-Token"] = this.o), 
+                return n && (t.Authorization = n), this.o && (t["X-Goog-Iam-Authorization-Token"] = this.o), 
         t;
     }
 }
@@ -372,15 +369,15 @@ e) {
  * to authenticate the user, using technique that is only available
  * to applications hosted by Google.
  */ class z {
-    constructor(t, e, n) {
-        this.t = t, this.i = e, this.o = n;
+    constructor(t, n, e) {
+        this.t = t, this.i = n, this.o = e;
     }
     getToken() {
         return Promise.resolve(new Q(this.t, this.i, this.o));
     }
-    start(t, e) {
+    start(t, n) {
         // Fire with initial uid.
-        t.enqueueRetryable((() => e(h.FIRST_PARTY)));
+        t.enqueueRetryable((() => n(h.FIRST_PARTY)));
     }
     shutdown() {}
     invalidateToken() {}
@@ -406,7 +403,7 @@ e) {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-class W {
+class G {
     /**
      * Constructs a DatabaseInfo using the provided host, databaseId and
      * persistenceKey.
@@ -424,8 +421,8 @@ class W {
      * @param useFetchStreams Whether to use the Fetch API instead of
      * XMLHTTPRequest
      */
-    constructor(t, e, n, r, s, i, o, u) {
-        this.databaseId = t, this.appId = e, this.persistenceKey = n, this.host = r, this.ssl = s, 
+    constructor(t, n, e, r, s, i, o, u) {
+        this.databaseId = t, this.appId = n, this.persistenceKey = e, this.host = r, this.ssl = s, 
         this.forceLongPolling = i, this.autoDetectLongPolling = o, this.useFetchStreams = u;
     }
 }
@@ -435,15 +432,15 @@ class W {
  * Represents the database ID a Firestore client is associated with.
  * @internal
  */
-class G {
-    constructor(t, e) {
-        this.projectId = t, this.database = e || "(default)";
+class W {
+    constructor(t, n) {
+        this.projectId = t, this.database = n || "(default)";
     }
     get isDefaultDatabase() {
         return "(default)" === this.database;
     }
     isEqual(t) {
-        return t instanceof G && t.projectId === this.projectId && t.database === this.database;
+        return t instanceof W && t.projectId === this.projectId && t.database === this.database;
     }
 }
 
@@ -467,9 +464,9 @@ class G {
  * Path represents an ordered sequence of string segments.
  */
 class H {
-    constructor(t, e, n) {
-        void 0 === e ? e = 0 : e > t.length && _(), void 0 === n ? n = t.length - e : n > t.length - e && _(), 
-        this.segments = t, this.offset = e, this.len = n;
+    constructor(t, n, e) {
+        void 0 === n ? n = 0 : n > t.length && _(), void 0 === e ? e = t.length - n : e > t.length - n && _(), 
+        this.segments = t, this.offset = n, this.len = e;
     }
     get length() {
         return this.len;
@@ -478,10 +475,10 @@ class H {
         return 0 === H.comparator(this, t);
     }
     child(t) {
-        const e = this.segments.slice(this.offset, this.limit());
+        const n = this.segments.slice(this.offset, this.limit());
         return t instanceof H ? t.forEach((t => {
-            e.push(t);
-        })) : e.push(t), this.construct(e);
+            n.push(t);
+        })) : n.push(t), this.construct(n);
     }
     /** The index of one past the last segment of the path. */    limit() {
         return this.offset + this.length;
@@ -506,28 +503,28 @@ class H {
     }
     isPrefixOf(t) {
         if (t.length < this.length) return !1;
-        for (let e = 0; e < this.length; e++) if (this.get(e) !== t.get(e)) return !1;
+        for (let n = 0; n < this.length; n++) if (this.get(n) !== t.get(n)) return !1;
         return !0;
     }
     isImmediateParentOf(t) {
         if (this.length + 1 !== t.length) return !1;
-        for (let e = 0; e < this.length; e++) if (this.get(e) !== t.get(e)) return !1;
+        for (let n = 0; n < this.length; n++) if (this.get(n) !== t.get(n)) return !1;
         return !0;
     }
     forEach(t) {
-        for (let e = this.offset, n = this.limit(); e < n; e++) t(this.segments[e]);
+        for (let n = this.offset, e = this.limit(); n < e; n++) t(this.segments[n]);
     }
     toArray() {
         return this.segments.slice(this.offset, this.limit());
     }
-    static comparator(t, e) {
-        const n = Math.min(t.length, e.length);
-        for (let r = 0; r < n; r++) {
-            const n = t.get(r), s = e.get(r);
-            if (n < s) return -1;
-            if (n > s) return 1;
+    static comparator(t, n) {
+        const e = Math.min(t.length, n.length);
+        for (let r = 0; r < e; r++) {
+            const e = t.get(r), s = n.get(r);
+            if (e < s) return -1;
+            if (e > s) return 1;
         }
-        return t.length < e.length ? -1 : t.length > e.length ? 1 : 0;
+        return t.length < n.length ? -1 : t.length > n.length ? 1 : 0;
     }
 }
 
@@ -537,8 +534,8 @@ class H {
  *
  * @internal
  */ class Y extends H {
-    construct(t, e, n) {
-        return new Y(t, e, n);
+    construct(t, n, e) {
+        return new Y(t, n, e);
     }
     canonicalString() {
         // NOTE: The client is ignorant of any path segments containing escape
@@ -557,13 +554,13 @@ class H {
         // NOTE: The client is ignorant of any path segments containing escape
         // sequences (e.g. __id123__) and just passes them through raw (they exist
         // for legacy reasons and should not be used frequently).
-        const e = [];
-        for (const n of t) {
-            if (n.indexOf("//") >= 0) throw new L(T, `Invalid segment (${n}). Paths must not contain // in them.`);
+        const n = [];
+        for (const e of t) {
+            if (e.indexOf("//") >= 0) throw new L(I, `Invalid segment (${e}). Paths must not contain // in them.`);
             // Strip leading and traling slashed.
-                        e.push(...n.split("/").filter((t => t.length > 0)));
+                        n.push(...e.split("/").filter((t => t.length > 0)));
         }
-        return new Y(e);
+        return new Y(n);
     }
     static emptyPath() {
         return new Y([]);
@@ -576,8 +573,8 @@ const K = /^[_a-zA-Z][_a-zA-Z0-9]*$/;
  * A dot-separated path for navigating sub-objects within a document.
  * @internal
  */ class J extends H {
-    construct(t, e, n) {
-        return new J(t, e, n);
+    construct(t, n, e) {
+        return new J(t, n, e);
     }
     /**
      * Returns true if the string could be used as a segment in a field path
@@ -612,24 +609,24 @@ const K = /^[_a-zA-Z][_a-zA-Z0-9]*$/;
      * TODO(b/37244157): we should make this more strict. Right now, it allows
      * non-identifier path components, even if they aren't escaped.
      */    static fromServerFormat(t) {
-        const e = [];
-        let n = "", r = 0;
+        const n = [];
+        let e = "", r = 0;
         const s = () => {
-            if (0 === n.length) throw new L(T, `Invalid field path (${t}). Paths must not be empty, begin with '.', end with '.', or contain '..'`);
-            e.push(n), n = "";
+            if (0 === e.length) throw new L(I, `Invalid field path (${t}). Paths must not be empty, begin with '.', end with '.', or contain '..'`);
+            n.push(e), e = "";
         };
         let i = !1;
         for (;r < t.length; ) {
-            const e = t[r];
-            if ("\\" === e) {
-                if (r + 1 === t.length) throw new L(T, "Path has trailing escape character: " + t);
-                const e = t[r + 1];
-                if ("\\" !== e && "." !== e && "`" !== e) throw new L(T, "Path has invalid escape sequence: " + t);
-                n += e, r += 2;
-            } else "`" === e ? (i = !i, r++) : "." !== e || i ? (n += e, r++) : (s(), r++);
+            const n = t[r];
+            if ("\\" === n) {
+                if (r + 1 === t.length) throw new L(I, "Path has trailing escape character: " + t);
+                const n = t[r + 1];
+                if ("\\" !== n && "." !== n && "`" !== n) throw new L(I, "Path has invalid escape sequence: " + t);
+                e += n, r += 2;
+            } else "`" === n ? (i = !i, r++) : "." !== n || i ? (e += n, r++) : (s(), r++);
         }
-        if (s(), i) throw new L(T, "Unterminated ` in path: " + t);
-        return new J(e);
+        if (s(), i) throw new L(I, "Unterminated ` in path: " + t);
+        return new J(n);
     }
     static emptyPath() {
         return new J([]);
@@ -673,8 +670,8 @@ const K = /^[_a-zA-Z][_a-zA-Z0-9]*$/;
     toString() {
         return this.path.toString();
     }
-    static comparator(t, e) {
-        return Y.comparator(t.path, e.path);
+    static comparator(t, n) {
+        return Y.comparator(t.path, n.path);
     }
     static isDocumentKey(t) {
         return t.length % 2 == 0;
@@ -704,8 +701,8 @@ const K = /^[_a-zA-Z][_a-zA-Z0-9]*$/;
  * 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.
- */ function X(t, e, n) {
-    if (!n) throw new L(T, `Function ${t}() cannot be called with an empty ${e}.`);
+ */ function X(t, n, e) {
+    if (!e) throw new L(I, `Function ${t}() cannot be called with an empty ${n}.`);
 }
 
 /**
@@ -717,14 +714,14 @@ const K = /^[_a-zA-Z][_a-zA-Z0-9]*$/;
  * an even numbers of segments).
  */
 function tt(t) {
-    if (!Z.isDocumentKey(t)) throw new L(T, `Invalid document reference. Document references must have an even number of segments, but ${t} has ${t.length}.`);
+    if (!Z.isDocumentKey(t)) throw new L(I, `Invalid document reference. Document references must have an even number of segments, but ${t} has ${t.length}.`);
 }
 
 /**
  * Validates that `path` refers to a collection (indicated by the fact it
  * contains an odd numbers of segments).
- */ function et(t) {
-    if (Z.isDocumentKey(t)) throw new L(T, `Invalid collection reference. Collection references must have an odd number of segments, but ${t} has ${t.length}.`);
+ */ function nt(t) {
+    if (Z.isDocumentKey(t)) throw new L(I, `Invalid collection reference. Collection references must have an odd number of segments, but ${t} has ${t.length}.`);
 }
 
 /**
@@ -732,7 +729,7 @@ function tt(t) {
  * (i.e. excludes Array, Date, etc.).
  */
 /** Returns a string describing the type / value of the provided input. */
-function nt(t) {
+function et(t) {
     if (void 0 === t) return "undefined";
     if (null === t) return "null";
     if ("string" == typeof t) return t.length > 20 && (t = `${t.substring(0, 20)}...`), 
@@ -741,7 +738,7 @@ function nt(t) {
     if ("object" == typeof t) {
         if (t instanceof Array) return "an array";
         {
-            const e = 
+            const n = 
             /** try to get the constructor name for an object. */
             function(t) {
                 if (t.constructor) return t.constructor.name;
@@ -755,7 +752,7 @@ function nt(t) {
  * arguments passed to the public API.
  * @internal
  */ (t);
-            return e ? `a custom ${e} object` : "an object";
+            return n ? `a custom ${n} object` : "an object";
         }
     }
     return "function" == typeof t ? "a function" : _();
@@ -763,22 +760,22 @@ function nt(t) {
 
 function rt(t, 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-e) {
+n) {
     if ("_delegate" in t && (
     // Unwrap Compat types
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    t = t._delegate), !(t instanceof e)) {
-        if (e.name === t.constructor.name) throw new L(T, "Type does not match the expected instance. Did you pass a reference from a different Firestore SDK?");
+    t = t._delegate), !(t instanceof n)) {
+        if (n.name === t.constructor.name) throw new L(I, "Type does not match the expected instance. Did you pass a reference from a different Firestore SDK?");
         {
-            const n = nt(t);
-            throw new L(T, `Expected type '${e.name}', but it was: ${n}`);
+            const e = et(t);
+            throw new L(I, `Expected type '${n.name}', but it was: ${e}`);
         }
     }
     return t;
 }
 
-function st(t, e) {
-    if (e <= 0) throw new L(T, `Function ${t}() requires a positive number, but it was: ${e}.`);
+function st(t, n) {
+    if (n <= 0) throw new L(I, `Function ${t}() requires a positive number, but it was: ${n}.`);
 }
 
 /**
@@ -876,7 +873,7 @@ var ct, at;
  *     Code.UNKNOWN.
  */
 function ht(t) {
-    if (void 0 === t) return m("RPC_ERROR", "HTTP error has no status"), I;
+    if (void 0 === t) return m("RPC_ERROR", "HTTP error has no status"), T;
     // The canonical error codes for Google APIs [1] specify mapping onto HTTP
     // status codes but the mapping is not bijective. In each case of ambiguity
     // this function chooses a primary error.
@@ -897,7 +894,7 @@ function ht(t) {
         // return Code.OUT_OF_RANGE;
               case 401:
         // Unauthorized
-        return N;
+        return D;
 
       case 403:
         // Forbidden
@@ -919,7 +916,7 @@ function ht(t) {
 
       case 429:
         // Too Many Requests
-        return D;
+        return N;
 
       case 499:
         // Client Closed Request
@@ -927,7 +924,7 @@ function ht(t) {
 
       case 500:
         // Internal Server Error
-        return I;
+        return T;
 
         // Other possibilities:
         // return Code.INTERNAL;
@@ -945,7 +942,7 @@ function ht(t) {
         return A;
 
       default:
-        return t >= 200 && t < 300 ? v : t >= 400 && t < 500 ? $ : t >= 500 && t < 600 ? x : I;
+        return t >= 200 && t < 300 ? v : t >= 400 && t < 500 ? $ : t >= 500 && t < 600 ? x : T;
     }
 }
 
@@ -985,58 +982,58 @@ class lt extends
 class {
     constructor(t) {
         this.databaseInfo = t, this.databaseId = t.databaseId;
-        const e = t.ssl ? "https" : "http";
-        this.u = e + "://" + t.host, this.h = "projects/" + this.databaseId.projectId + "/databases/" + this.databaseId.database + "/documents";
+        const n = t.ssl ? "https" : "http";
+        this.u = n + "://" + t.host, this.h = "projects/" + this.databaseId.projectId + "/databases/" + this.databaseId.database + "/documents";
     }
-    l(t, e, n, r) {
-        const s = this.m(t, e);
-        w("RestConnection", "Sending: ", s, n);
+    l(t, n, e, r) {
+        const s = this.m(t, n);
+        w("RestConnection", "Sending: ", s, e);
         const i = {};
-        return this.p(i, r), this.g(t, s, i, n).then((t => (w("RestConnection", "Received: ", t), 
-        t)), (e => {
-            throw p("RestConnection", `${t} failed with error: `, e, "url: ", s, "request:", n), 
-            e;
+        return this.p(i, r), this.g(t, s, i, e).then((t => (w("RestConnection", "Received: ", t), 
+        t)), (n => {
+            throw p("RestConnection", `${t} failed with error: `, n, "url: ", s, "request:", e), 
+            n;
         }));
     }
-    v(t, e, n, r) {
+    v(t, n, e, r) {
         // The REST API automatically aggregates all of the streamed results, so we
         // can just use the normal invoke() method.
-        return this.l(t, e, n, r);
+        return this.l(t, n, e, r);
     }
     /**
      * Modifies the headers for a request, adding any authorization token if
      * present and any additional headers for the request.
-     */    p(t, e) {
+     */    p(t, n) {
         if (t["X-Goog-Api-Client"] = "gl-js/ fire/" + l, 
         // Content-Type: text/plain will avoid preflight requests which might
         // mess with CORS and redirects by proxies. If we add custom headers
         // we will need to change this code to potentially use the $httpOverwrite
         // parameter supported by ESF to avoid triggering preflight requests.
         t["Content-Type"] = "text/plain", this.databaseInfo.appId && (t["X-Firebase-GMPID"] = this.databaseInfo.appId), 
-        e) for (const n in e.authHeaders) e.authHeaders.hasOwnProperty(n) && (t[n] = e.authHeaders[n]);
+        n) for (const e in n.authHeaders) n.authHeaders.hasOwnProperty(e) && (t[e] = n.authHeaders[e]);
     }
-    m(t, e) {
-        const n = ut[t];
-        return `${this.u}/v1/${e}:${n}`;
+    m(t, n) {
+        const e = ut[t];
+        return `${this.u}/v1/${n}:${e}`;
     }
 } {
     /**
      * @param databaseInfo - The connection info.
      * @param fetchImpl - `fetch` or a Polyfill that implements the fetch API.
      */
-    constructor(t, e) {
-        super(t), this.I = e;
+    constructor(t, n) {
+        super(t), this.T = n;
     }
-    T(t, e) {
+    I(t, n) {
         throw new Error("Not supported by FetchConnection");
     }
-    async g(t, e, n, r) {
+    async g(t, n, e, r) {
         const s = JSON.stringify(r);
         let i;
         try {
-            i = await this.I(e, {
+            i = await this.T(n, {
                 method: "POST",
-                headers: n,
+                headers: e,
                 body: s
             });
         } catch (t) {
@@ -1087,13 +1084,13 @@ class {
  */
 function ft(t) {
     // Polyfills for IE and WebWorker by using `self` and `msCrypto` when `crypto` is not available.
-    const e = 
+    const n = 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    "undefined" != typeof self && (self.crypto || self.msCrypto), n = new Uint8Array(t);
-    if (e && "function" == typeof e.getRandomValues) e.getRandomValues(n); else 
+    "undefined" != typeof self && (self.crypto || self.msCrypto), e = new Uint8Array(t);
+    if (n && "function" == typeof n.getRandomValues) n.getRandomValues(e); else 
     // Falls back to Math.random
-    for (let e = 0; e < t; e++) n[e] = Math.floor(256 * Math.random());
-    return n;
+    for (let n = 0; n < t; n++) e[n] = Math.floor(256 * Math.random());
+    return e;
 }
 
 /**
@@ -1114,26 +1111,26 @@ function ft(t) {
  */ class dt {
     static A() {
         // Alphanumeric characters
-        const t = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", e = Math.floor(256 / t.length) * t.length;
+        const t = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", n = Math.floor(256 / t.length) * t.length;
         // The largest byte value that is a multiple of `char.length`.
-                let n = "";
-        for (;n.length < 20; ) {
+                let e = "";
+        for (;e.length < 20; ) {
             const r = ft(40);
             for (let s = 0; s < r.length; ++s) 
             // Only accept values that are [0, maxMultiple), this ensures they can
             // be evenly mapped to indices of `chars` via a modulo operation.
-            n.length < 20 && r[s] < e && (n += t.charAt(r[s] % t.length));
+            e.length < 20 && r[s] < n && (e += t.charAt(r[s] % t.length));
         }
-        return n;
+        return e;
     }
 }
 
-function wt(t, e) {
-    return t < e ? -1 : t > e ? 1 : 0;
+function wt(t, n) {
+    return t < n ? -1 : t > n ? 1 : 0;
 }
 
-/** Helper to compare arrays using isEqual(). */ function mt(t, e, n) {
-    return t.length === e.length && t.every(((t, r) => n(t, e[r])));
+/** Helper to compare arrays using isEqual(). */ function mt(t, n, e) {
+    return t.length === n.length && t.every(((t, r) => e(t, n[r])));
 }
 
 /**
@@ -1187,12 +1184,12 @@ class pt {
     /**
      * The fractions of a second at nanosecond resolution.*
      */
-    e) {
-        if (this.seconds = t, this.nanoseconds = e, e < 0) throw new L(T, "Timestamp nanoseconds out of range: " + e);
-        if (e >= 1e9) throw new L(T, "Timestamp nanoseconds out of range: " + e);
-        if (t < -62135596800) throw new L(T, "Timestamp seconds out of range: " + t);
+    n) {
+        if (this.seconds = t, this.nanoseconds = n, n < 0) throw new L(I, "Timestamp nanoseconds out of range: " + n);
+        if (n >= 1e9) throw new L(I, "Timestamp nanoseconds out of range: " + n);
+        if (t < -62135596800) throw new L(I, "Timestamp seconds out of range: " + t);
         // This will break in the year 10,000.
-                if (t >= 253402300800) throw new L(T, "Timestamp seconds out of range: " + t);
+                if (t >= 253402300800) throw new L(I, "Timestamp seconds out of range: " + t);
     }
     /**
      * Creates a new timestamp with the current date, with millisecond precision.
@@ -1218,8 +1215,8 @@ class pt {
      * @returns A new `Timestamp` representing the same point in time as the given
      *     number of milliseconds.
      */    static fromMillis(t) {
-        const e = Math.floor(t / 1e3), n = Math.floor(1e6 * (t - 1e3 * e));
-        return new pt(e, n);
+        const n = Math.floor(t / 1e3), e = Math.floor(1e6 * (t - 1e3 * n));
+        return new pt(n, e);
     }
     /**
      * Converts a `Timestamp` to a JavaScript `Date` object. This conversion
@@ -1341,13 +1338,13 @@ class pt {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ function _t(t) {
-    let e = 0;
-    for (const n in t) Object.prototype.hasOwnProperty.call(t, n) && e++;
-    return e;
+    let n = 0;
+    for (const e in t) Object.prototype.hasOwnProperty.call(t, e) && n++;
+    return n;
 }
 
-function gt(t, e) {
-    for (const n in t) Object.prototype.hasOwnProperty.call(t, n) && e(n, t[n]);
+function gt(t, n) {
+    for (const e in t) Object.prototype.hasOwnProperty.call(t, e) && n(e, t[e]);
 }
 
 /**
@@ -1389,11 +1386,11 @@ class bt {
      *
      * This is an O(n) operation, where `n` is the size of the field mask.
      */    covers(t) {
-        for (const e of this.fields) if (e.isPrefixOf(t)) return !0;
+        for (const n of this.fields) if (n.isPrefixOf(t)) return !0;
         return !1;
     }
     isEqual(t) {
-        return mt(this.fields, t.fields, ((t, e) => t.isEqual(e)));
+        return mt(this.fields, t.fields, ((t, n) => t.isEqual(n)));
     }
 }
 
@@ -1444,23 +1441,23 @@ class vt {
         this.binaryString = t;
     }
     static fromBase64String(t) {
-        const e = atob(t);
-        return new vt(e);
+        const n = atob(t);
+        return new vt(n);
     }
     static fromUint8Array(t) {
-        const e = 
+        const n = 
         /**
  * Helper function to convert an Uint8array to a binary string.
  */
         function(t) {
-            let e = "";
-            for (let n = 0; n < t.length; ++n) e += String.fromCharCode(t[n]);
-            return e;
+            let n = "";
+            for (let e = 0; e < t.length; ++e) n += String.fromCharCode(t[e]);
+            return n;
         }
         /**
  * Helper function to convert a binary string to an Uint8Array.
  */ (t);
-        return new vt(e);
+        return new vt(n);
     }
     toBase64() {
         return t = this.binaryString, btoa(t);
@@ -1469,9 +1466,9 @@ class vt {
     }
     toUint8Array() {
         return function(t) {
-            const e = new Uint8Array(t.length);
-            for (let n = 0; n < t.length; n++) e[n] = t.charCodeAt(n);
-            return e;
+            const n = new Uint8Array(t.length);
+            for (let e = 0; e < t.length; e++) n[e] = t.charCodeAt(e);
+            return n;
         }
         /**
  * @license
@@ -1510,7 +1507,7 @@ const Et = new RegExp(/^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d(?:\.(\d+))?Z$/);
 /**
  * Converts the possible Proto values for a timestamp value into a "seconds and
  * nanos" representation.
- */ function It(t) {
+ */ function Tt(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.
@@ -1518,30 +1515,30 @@ const Et = new RegExp(/^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d(?:\.(\d+))?Z$/);
         // 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.
-        let e = 0;
-        const n = Et.exec(t);
-        if (g(!!n), n[1]) {
+        let n = 0;
+        const e = Et.exec(t);
+        if (g(!!e), e[1]) {
             // Pad the fraction out to 9 digits (nanos).
-            let t = n[1];
-            t = (t + "000000000").substr(0, 9), e = Number(t);
+            let t = e[1];
+            t = (t + "000000000").substr(0, 9), n = Number(t);
         }
         // Parse the date to get the seconds.
                 const r = new Date(t);
         return {
             seconds: Math.floor(r.getTime() / 1e3),
-            nanos: e
+            nanos: n
         };
     }
     return {
-        seconds: Tt(t.seconds),
-        nanos: Tt(t.nanos)
+        seconds: It(t.seconds),
+        nanos: It(t.nanos)
     };
 }
 
 /**
  * Converts the possible Proto types for numbers into a JavaScript number.
  * Returns 0 if the value is not numeric.
- */ function Tt(t) {
+ */ function It(t) {
     // TODO(bjornick): Handle int64 greater than 53 bits.
     return "number" == typeof t ? t : "string" == typeof t ? Number(t) : 0;
 }
@@ -1584,8 +1581,8 @@ const Et = new RegExp(/^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d(?:\.(\d+))?Z$/);
  * - With respect to other ServerTimestampValues, they sort by their
  *   localWriteTime.
  */ function Pt(t) {
-    var e, n;
-    return "server_timestamp" === (null === (n = ((null === (e = null == t ? void 0 : t.mapValue) || void 0 === e ? void 0 : e.fields) || {}).__type__) || void 0 === n ? void 0 : n.stringValue);
+    var n, e;
+    return "server_timestamp" === (null === (e = ((null === (n = null == t ? void 0 : t.mapValue) || void 0 === n ? void 0 : n.fields) || {}).__type__) || void 0 === e ? void 0 : e.stringValue);
 }
 
 /**
@@ -1594,15 +1591,15 @@ const Et = new RegExp(/^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d(?:\.(\d+))?Z$/);
  * Preserving the previous values allows the user to display the last resoled
  * value until the backend responds with the timestamp.
  */ function Rt(t) {
-    const e = t.mapValue.fields.__previous_value__;
-    return Pt(e) ? Rt(e) : e;
+    const n = t.mapValue.fields.__previous_value__;
+    return Pt(n) ? Rt(n) : n;
 }
 
 /**
  * Returns the local time at which this timestamp was first set.
  */ function Vt(t) {
-    const e = It(t.mapValue.fields.__local_write_time__.timestampValue);
-    return new pt(e.seconds, e.nanos);
+    const n = Tt(t.mapValue.fields.__local_write_time__.timestampValue);
+    return new pt(n.seconds, n.nanos);
 }
 
 /**
@@ -1621,171 +1618,171 @@ const Et = new RegExp(/^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d(?:\.(\d+))?Z$/);
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/** Extracts the backend's type order for the provided value. */ function Nt(t) {
+/** Extracts the backend's type order for the provided value. */ function Dt(t) {
     return "nullValue" in t ? 0 /* NullValue */ : "booleanValue" in t ? 1 /* BooleanValue */ : "integerValue" in t || "doubleValue" in t ? 2 /* NumberValue */ : "timestampValue" in t ? 3 /* TimestampValue */ : "stringValue" in t ? 5 /* StringValue */ : "bytesValue" in t ? 6 /* BlobValue */ : "referenceValue" in t ? 7 /* RefValue */ : "geoPointValue" in t ? 8 /* GeoPointValue */ : "arrayValue" in t ? 9 /* ArrayValue */ : "mapValue" in t ? Pt(t) ? 4 /* ServerTimestampValue */ : 10 /* ObjectValue */ : _();
 }
 
-/** Tests `left` and `right` for equality based on the backend semantics. */ function Dt(t, e) {
-    const n = Nt(t);
-    if (n !== Nt(e)) return !1;
-    switch (n) {
+/** Tests `left` and `right` for equality based on the backend semantics. */ function Nt(t, n) {
+    const e = Dt(t);
+    if (e !== Dt(n)) return !1;
+    switch (e) {
       case 0 /* NullValue */ :
         return !0;
 
       case 1 /* BooleanValue */ :
-        return t.booleanValue === e.booleanValue;
+        return t.booleanValue === n.booleanValue;
 
       case 4 /* ServerTimestampValue */ :
-        return Vt(t).isEqual(Vt(e));
+        return Vt(t).isEqual(Vt(n));
 
       case 3 /* TimestampValue */ :
-        return function(t, e) {
-            if ("string" == typeof t.timestampValue && "string" == typeof e.timestampValue && t.timestampValue.length === e.timestampValue.length) 
+        return function(t, n) {
+            if ("string" == typeof t.timestampValue && "string" == typeof n.timestampValue && t.timestampValue.length === n.timestampValue.length) 
             // Use string equality for ISO 8601 timestamps
-            return t.timestampValue === e.timestampValue;
-            const n = It(t.timestampValue), r = It(e.timestampValue);
-            return n.seconds === r.seconds && n.nanos === r.nanos;
-        }(t, e);
+            return t.timestampValue === n.timestampValue;
+            const e = Tt(t.timestampValue), r = Tt(n.timestampValue);
+            return e.seconds === r.seconds && e.nanos === r.nanos;
+        }(t, n);
 
       case 5 /* StringValue */ :
-        return t.stringValue === e.stringValue;
+        return t.stringValue === n.stringValue;
 
       case 6 /* BlobValue */ :
-        return function(t, e) {
-            return At(t.bytesValue).isEqual(At(e.bytesValue));
-        }(t, e);
+        return function(t, n) {
+            return At(t.bytesValue).isEqual(At(n.bytesValue));
+        }(t, n);
 
       case 7 /* RefValue */ :
-        return t.referenceValue === e.referenceValue;
+        return t.referenceValue === n.referenceValue;
 
       case 8 /* GeoPointValue */ :
-        return function(t, e) {
-            return Tt(t.geoPointValue.latitude) === Tt(e.geoPointValue.latitude) && Tt(t.geoPointValue.longitude) === Tt(e.geoPointValue.longitude);
-        }(t, e);
+        return function(t, n) {
+            return It(t.geoPointValue.latitude) === It(n.geoPointValue.latitude) && It(t.geoPointValue.longitude) === It(n.geoPointValue.longitude);
+        }(t, n);
 
       case 2 /* NumberValue */ :
-        return function(t, e) {
-            if ("integerValue" in t && "integerValue" in e) return Tt(t.integerValue) === Tt(e.integerValue);
-            if ("doubleValue" in t && "doubleValue" in e) {
-                const n = Tt(t.doubleValue), r = Tt(e.doubleValue);
-                return n === r ? ot(n) === ot(r) : isNaN(n) && isNaN(r);
+        return function(t, n) {
+            if ("integerValue" in t && "integerValue" in n) return It(t.integerValue) === It(n.integerValue);
+            if ("doubleValue" in t && "doubleValue" in n) {
+                const e = It(t.doubleValue), r = It(n.doubleValue);
+                return e === r ? ot(e) === ot(r) : isNaN(e) && isNaN(r);
             }
             return !1;
-        }(t, e);
+        }(t, n);
 
       case 9 /* ArrayValue */ :
-        return mt(t.arrayValue.values || [], e.arrayValue.values || [], Dt);
+        return mt(t.arrayValue.values || [], n.arrayValue.values || [], Nt);
 
       case 10 /* ObjectValue */ :
-        return function(t, e) {
-            const n = t.mapValue.fields || {}, r = e.mapValue.fields || {};
-            if (_t(n) !== _t(r)) return !1;
-            for (const t in n) if (n.hasOwnProperty(t) && (void 0 === r[t] || !Dt(n[t], r[t]))) return !1;
+        return function(t, n) {
+            const e = t.mapValue.fields || {}, r = n.mapValue.fields || {};
+            if (_t(e) !== _t(r)) return !1;
+            for (const t in e) if (e.hasOwnProperty(t) && (void 0 === r[t] || !Nt(e[t], r[t]))) return !1;
             return !0;
         }
-        /** Returns true if the ArrayValue contains the specified element. */ (t, e);
+        /** Returns true if the ArrayValue contains the specified element. */ (t, n);
 
       default:
         return _();
     }
 }
 
-function $t(t, e) {
-    return void 0 !== (t.values || []).find((t => Dt(t, e)));
+function $t(t, n) {
+    return void 0 !== (t.values || []).find((t => Nt(t, n)));
 }
 
-function Ft(t, e) {
-    const n = Nt(t), r = Nt(e);
-    if (n !== r) return wt(n, r);
-    switch (n) {
+function Ft(t, n) {
+    const e = Dt(t), r = Dt(n);
+    if (e !== r) return wt(e, r);
+    switch (e) {
       case 0 /* NullValue */ :
         return 0;
 
       case 1 /* BooleanValue */ :
-        return wt(t.booleanValue, e.booleanValue);
+        return wt(t.booleanValue, n.booleanValue);
 
       case 2 /* NumberValue */ :
-        return function(t, e) {
-            const n = Tt(t.integerValue || t.doubleValue), r = Tt(e.integerValue || e.doubleValue);
-            return n < r ? -1 : n > r ? 1 : n === r ? 0 : 
+        return function(t, n) {
+            const e = It(t.integerValue || t.doubleValue), r = It(n.integerValue || n.doubleValue);
+            return e < r ? -1 : e > r ? 1 : e === r ? 0 : 
             // one or both are NaN.
-            isNaN(n) ? isNaN(r) ? 0 : -1 : 1;
-        }(t, e);
+            isNaN(e) ? isNaN(r) ? 0 : -1 : 1;
+        }(t, n);
 
       case 3 /* TimestampValue */ :
-        return St(t.timestampValue, e.timestampValue);
+        return St(t.timestampValue, n.timestampValue);
 
       case 4 /* ServerTimestampValue */ :
-        return St(Vt(t), Vt(e));
+        return St(Vt(t), Vt(n));
 
       case 5 /* StringValue */ :
-        return wt(t.stringValue, e.stringValue);
+        return wt(t.stringValue, n.stringValue);
 
       case 6 /* BlobValue */ :
-        return function(t, e) {
-            const n = At(t), r = At(e);
-            return n.compareTo(r);
-        }(t.bytesValue, e.bytesValue);
+        return function(t, n) {
+            const e = At(t), r = At(n);
+            return e.compareTo(r);
+        }(t.bytesValue, n.bytesValue);
 
       case 7 /* RefValue */ :
-        return function(t, e) {
-            const n = t.split("/"), r = e.split("/");
-            for (let t = 0; t < n.length && t < r.length; t++) {
-                const e = wt(n[t], r[t]);
-                if (0 !== e) return e;
+        return function(t, n) {
+            const e = t.split("/"), r = n.split("/");
+            for (let t = 0; t < e.length && t < r.length; t++) {
+                const n = wt(e[t], r[t]);
+                if (0 !== n) return n;
             }
-            return wt(n.length, r.length);
-        }(t.referenceValue, e.referenceValue);
+            return wt(e.length, r.length);
+        }(t.referenceValue, n.referenceValue);
 
       case 8 /* GeoPointValue */ :
-        return function(t, e) {
-            const n = wt(Tt(t.latitude), Tt(e.latitude));
-            if (0 !== n) return n;
-            return wt(Tt(t.longitude), Tt(e.longitude));
-        }(t.geoPointValue, e.geoPointValue);
+        return function(t, n) {
+            const e = wt(It(t.latitude), It(n.latitude));
+            if (0 !== e) return e;
+            return wt(It(t.longitude), It(n.longitude));
+        }(t.geoPointValue, n.geoPointValue);
 
       case 9 /* ArrayValue */ :
-        return function(t, e) {
-            const n = t.values || [], r = e.values || [];
-            for (let t = 0; t < n.length && t < r.length; ++t) {
-                const e = Ft(n[t], r[t]);
-                if (e) return e;
+        return function(t, n) {
+            const e = t.values || [], r = n.values || [];
+            for (let t = 0; t < e.length && t < r.length; ++t) {
+                const n = Ft(e[t], r[t]);
+                if (n) return n;
             }
-            return wt(n.length, r.length);
-        }(t.arrayValue, e.arrayValue);
+            return wt(e.length, r.length);
+        }(t.arrayValue, n.arrayValue);
 
       case 10 /* ObjectValue */ :
-        return function(t, e) {
-            const n = t.fields || {}, r = Object.keys(n), s = e.fields || {}, i = Object.keys(s);
+        return function(t, n) {
+            const e = t.fields || {}, r = Object.keys(e), s = n.fields || {}, i = Object.keys(s);
             // Even though MapValues are likely sorted correctly based on their insertion
             // order (e.g. when received from the backend), local modifications can bring
             // elements out of order. We need to re-sort the elements to ensure that
             // canonical IDs are independent of insertion order.
             r.sort(), i.sort();
             for (let t = 0; t < r.length && t < i.length; ++t) {
-                const e = wt(r[t], i[t]);
-                if (0 !== e) return e;
-                const o = Ft(n[r[t]], s[i[t]]);
+                const n = wt(r[t], i[t]);
+                if (0 !== n) return n;
+                const o = Ft(e[r[t]], s[i[t]]);
                 if (0 !== o) return o;
             }
             return wt(r.length, i.length);
         }
-        /** Returns a reference value for the provided database and key. */ (t.mapValue, e.mapValue);
+        /** Returns a reference value for the provided database and key. */ (t.mapValue, n.mapValue);
 
       default:
         throw _();
     }
 }
 
-function St(t, e) {
-    if ("string" == typeof t && "string" == typeof e && t.length === e.length) return wt(t, e);
-    const n = It(t), r = It(e), s = wt(n.seconds, r.seconds);
-    return 0 !== s ? s : wt(n.nanos, r.nanos);
+function St(t, n) {
+    if ("string" == typeof t && "string" == typeof n && t.length === n.length) return wt(t, n);
+    const e = Tt(t), r = Tt(n), s = wt(e.seconds, r.seconds);
+    return 0 !== s ? s : wt(e.nanos, r.nanos);
 }
 
-function qt(t, e) {
+function qt(t, n) {
     return {
-        referenceValue: `projects/${t.projectId}/databases/${t.database}/documents/${e.path.canonicalString()}`
+        referenceValue: `projects/${t.projectId}/databases/${t.database}/documents/${n.path.canonicalString()}`
     };
 }
 
@@ -1813,21 +1810,21 @@ function qt(t, e) {
         timestampValue: Object.assign({}, t.timestampValue)
     };
     if (t.mapValue) {
-        const e = {
+        const n = {
             mapValue: {
                 fields: {}
             }
         };
-        return gt(t.mapValue.fields, ((t, n) => e.mapValue.fields[t] = Ut(n))), e;
+        return gt(t.mapValue.fields, ((t, e) => n.mapValue.fields[t] = Ut(e))), n;
     }
     if (t.arrayValue) {
-        const e = {
+        const n = {
             arrayValue: {
                 values: []
             }
         };
-        for (let n = 0; n < (t.arrayValue.values || []).length; ++n) e.arrayValue.values[n] = Ut(t.arrayValue.values[n]);
-        return e;
+        for (let e = 0; e < (t.arrayValue.values || []).length; ++e) n.arrayValue.values[e] = Ut(t.arrayValue.values[e]);
+        return n;
     }
     return Object.assign({}, t);
 }
@@ -1868,10 +1865,10 @@ function qt(t, e) {
      */    field(t) {
         if (t.isEmpty()) return this.value;
         {
-            let e = this.value;
-            for (let n = 0; n < t.length - 1; ++n) if (e = (e.mapValue.fields || {})[t.get(n)], 
-            !Lt(e)) return null;
-            return e = (e.mapValue.fields || {})[t.lastSegment()], e || null;
+            let n = this.value;
+            for (let e = 0; e < t.length - 1; ++e) if (n = (n.mapValue.fields || {})[t.get(e)], 
+            !Lt(n)) return null;
+            return n = (n.mapValue.fields || {})[t.lastSegment()], n || null;
         }
     }
     /**
@@ -1879,25 +1876,25 @@ function qt(t, e) {
      *
      * @param path - The field path to set.
      * @param value - The value to set.
-     */    set(t, e) {
-        this.getFieldsMap(t.popLast())[t.lastSegment()] = Ut(e);
+     */    set(t, n) {
+        this.getFieldsMap(t.popLast())[t.lastSegment()] = Ut(n);
     }
     /**
      * Sets the provided fields to the provided values.
      *
      * @param data - A map of fields to values (or null for deletes).
      */    setAll(t) {
-        let e = J.emptyPath(), n = {}, r = [];
+        let n = J.emptyPath(), e = {}, r = [];
         t.forEach(((t, s) => {
-            if (!e.isImmediateParentOf(s)) {
+            if (!n.isImmediateParentOf(s)) {
                 // Insert the accumulated changes at this parent location
-                const t = this.getFieldsMap(e);
-                this.applyChanges(t, n, r), n = {}, r = [], e = s.popLast();
+                const t = this.getFieldsMap(n);
+                this.applyChanges(t, e, r), e = {}, r = [], n = s.popLast();
             }
-            t ? n[s.lastSegment()] = Ut(t) : r.push(s.lastSegment());
+            t ? e[s.lastSegment()] = Ut(t) : r.push(s.lastSegment());
         }));
-        const s = this.getFieldsMap(e);
-        this.applyChanges(s, n, r);
+        const s = this.getFieldsMap(n);
+        this.applyChanges(s, e, r);
     }
     /**
      * Removes the field at the specified path. If there is no field at the
@@ -1905,36 +1902,36 @@ function qt(t, e) {
      *
      * @param path - The field path to remove.
      */    delete(t) {
-        const e = this.field(t.popLast());
-        Lt(e) && e.mapValue.fields && delete e.mapValue.fields[t.lastSegment()];
+        const n = this.field(t.popLast());
+        Lt(n) && n.mapValue.fields && delete n.mapValue.fields[t.lastSegment()];
     }
     isEqual(t) {
-        return Dt(this.value, t.value);
+        return Nt(this.value, t.value);
     }
     /**
      * Returns the map that contains the leaf element of `path`. If the parent
      * entry does not yet exist, or if it is not a map, a new map will be created.
      */    getFieldsMap(t) {
-        let e = this.value;
-        e.mapValue.fields || (e.mapValue = {
+        let n = this.value;
+        n.mapValue.fields || (n.mapValue = {
             fields: {}
         });
-        for (let n = 0; n < t.length; ++n) {
-            let r = e.mapValue.fields[t.get(n)];
+        for (let e = 0; e < t.length; ++e) {
+            let r = n.mapValue.fields[t.get(e)];
             Lt(r) && r.mapValue.fields || (r = {
                 mapValue: {
                     fields: {}
                 }
-            }, e.mapValue.fields[t.get(n)] = r), e = r;
+            }, n.mapValue.fields[t.get(e)] = r), n = r;
         }
-        return e.mapValue.fields;
+        return n.mapValue.fields;
     }
     /**
      * Modifies `fieldsMap` by adding, replacing or deleting the specified
      * entries.
-     */    applyChanges(t, e, n) {
-        gt(e, ((e, n) => t[e] = n));
-        for (const e of n) delete t[e];
+     */    applyChanges(t, n, e) {
+        gt(n, ((n, e) => t[n] = e));
+        for (const n of e) delete t[n];
     }
     clone() {
         return new jt(Ut(this.value));
@@ -1967,8 +1964,8 @@ function qt(t, e) {
  * applied, `isValidDocument()` returns false and the document should be removed
  * from all views.
  */ class kt {
-    constructor(t, e, n, r, s) {
-        this.key = t, this.documentType = e, this.version = n, this.data = r, this.documentState = s;
+    constructor(t, n, e, r, s) {
+        this.key = t, this.documentType = n, this.version = e, this.data = r, this.documentState = s;
     }
     /**
      * Creates a document with no known version or data, but which can serve as
@@ -1979,24 +1976,24 @@ function qt(t, e) {
     /**
      * Creates a new document that is known to exist with the given data at the
      * given version.
-     */    static newFoundDocument(t, e, n) {
-        return new kt(t, 1 /* FOUND_DOCUMENT */ , e, n, 0 /* SYNCED */);
+     */    static newFoundDocument(t, n, e) {
+        return new kt(t, 1 /* FOUND_DOCUMENT */ , n, e, 0 /* SYNCED */);
     }
-    /** Creates a new document that is known to not exist at the given version. */    static newNoDocument(t, e) {
-        return new kt(t, 2 /* NO_DOCUMENT */ , e, jt.empty(), 0 /* SYNCED */);
+    /** Creates a new document that is known to not exist at the given version. */    static newNoDocument(t, n) {
+        return new kt(t, 2 /* NO_DOCUMENT */ , n, jt.empty(), 0 /* SYNCED */);
     }
     /**
      * Creates a new document that is known to exist at the given version but
      * whose data is not known (e.g. a document that was updated without a known
      * base document).
-     */    static newUnknownDocument(t, e) {
-        return new kt(t, 3 /* UNKNOWN_DOCUMENT */ , e, jt.empty(), 2 /* HAS_COMMITTED_MUTATIONS */);
+     */    static newUnknownDocument(t, n) {
+        return new kt(t, 3 /* UNKNOWN_DOCUMENT */ , n, jt.empty(), 2 /* HAS_COMMITTED_MUTATIONS */);
     }
     /**
      * Changes the document type to indicate that it exists and that its version
      * and data are known.
-     */    convertToFoundDocument(t, e) {
-        return this.version = t, this.documentType = 1 /* FOUND_DOCUMENT */ , this.data = e, 
+     */    convertToFoundDocument(t, n) {
+        return this.version = t, this.documentType = 1 /* FOUND_DOCUMENT */ , this.data = n, 
         this.documentState = 0 /* SYNCED */ , this;
     }
     /**
@@ -2069,9 +2066,9 @@ function qt(t, e) {
  * limitations under the License.
  */
 // Visible for testing
-class Mt {
-    constructor(t, e = null, n = [], r = [], s = null, i = null, o = null) {
-        this.path = t, this.collectionGroup = e, this.orderBy = n, this.filters = r, this.limit = s, 
+class Bt {
+    constructor(t, n = null, e = [], r = [], s = null, i = null, o = null) {
+        this.path = t, this.collectionGroup = n, this.orderBy = e, this.filters = r, this.limit = s, 
         this.startAt = i, this.endAt = o, this.P = null;
     }
 }
@@ -2083,26 +2080,26 @@ class Mt {
  * NOTE: you should always construct `Target` from `Query.toTarget` instead of
  * using this factory method, because `Query` provides an implicit `orderBy`
  * property.
- */ function Bt(t, e = null, n = [], r = [], s = null, i = null, o = null) {
-    return new Mt(t, e, n, r, s, i, o);
+ */ function Mt(t, n = null, e = [], r = [], s = null, i = null, o = null) {
+    return new Bt(t, n, e, r, s, i, o);
 }
 
 class Qt extends class {} {
-    constructor(t, e, n) {
-        super(), this.field = t, this.op = e, this.value = n;
+    constructor(t, n, e) {
+        super(), this.field = t, this.op = n, this.value = e;
     }
     /**
      * Creates a filter based on the provided arguments.
-     */    static create(t, e, n) {
-        return t.isKeyField() ? "in" /* IN */ === e || "not-in" /* NOT_IN */ === e ? this.R(t, e, n) : new zt(t, e, n) : "array-contains" /* ARRAY_CONTAINS */ === e ? new Yt(t, n) : "in" /* IN */ === e ? new Kt(t, n) : "not-in" /* NOT_IN */ === e ? new Jt(t, n) : "array-contains-any" /* ARRAY_CONTAINS_ANY */ === e ? new Zt(t, n) : new Qt(t, e, n);
+     */    static create(t, n, e) {
+        return t.isKeyField() ? "in" /* IN */ === n || "not-in" /* NOT_IN */ === n ? this.R(t, n, e) : new zt(t, n, e) : "array-contains" /* ARRAY_CONTAINS */ === n ? new Yt(t, e) : "in" /* IN */ === n ? new Kt(t, e) : "not-in" /* NOT_IN */ === n ? new Jt(t, e) : "array-contains-any" /* ARRAY_CONTAINS_ANY */ === n ? new Zt(t, e) : new Qt(t, n, e);
     }
-    static R(t, e, n) {
-        return "in" /* IN */ === e ? new Wt(t, n) : new Gt(t, n);
+    static R(t, n, e) {
+        return "in" /* IN */ === n ? new Gt(t, e) : new Wt(t, e);
     }
     matches(t) {
-        const e = t.data.field(this.field);
+        const n = t.data.field(this.field);
         // Types do not have to match in NOT_EQUAL filters.
-                return "!=" /* NOT_EQUAL */ === this.op ? null !== e && this.V(Ft(e, this.value)) : null !== e && Nt(this.value) === Nt(e) && this.V(Ft(e, this.value));
+                return "!=" /* NOT_EQUAL */ === this.op ? null !== n && this.V(Ft(n, this.value)) : null !== n && Dt(this.value) === Dt(n) && this.V(Ft(n, this.value));
         // Only compare types with matching backend order (such as double and int).
         }
     V(t) {
@@ -2129,85 +2126,85 @@ class Qt extends class {} {
             return _();
         }
     }
-    N() {
+    D() {
         return [ "<" /* LESS_THAN */ , "<=" /* LESS_THAN_OR_EQUAL */ , ">" /* GREATER_THAN */ , ">=" /* GREATER_THAN_OR_EQUAL */ , "!=" /* NOT_EQUAL */ , "not-in" /* NOT_IN */ ].indexOf(this.op) >= 0;
     }
 }
 
 /** Filter that matches on key fields (i.e. '__name__'). */
 class zt extends Qt {
-    constructor(t, e, n) {
-        super(t, e, n), this.key = Z.fromName(n.referenceValue);
+    constructor(t, n, e) {
+        super(t, n, e), this.key = Z.fromName(e.referenceValue);
     }
     matches(t) {
-        const e = Z.comparator(t.key, this.key);
-        return this.V(e);
+        const n = Z.comparator(t.key, this.key);
+        return this.V(n);
     }
 }
 
-/** Filter that matches on key fields within an array. */ class Wt extends Qt {
-    constructor(t, e) {
-        super(t, "in" /* IN */ , e), this.keys = Ht("in" /* IN */ , e);
+/** Filter that matches on key fields within an array. */ class Gt extends Qt {
+    constructor(t, n) {
+        super(t, "in" /* IN */ , n), this.keys = Ht("in" /* IN */ , n);
     }
     matches(t) {
-        return this.keys.some((e => e.isEqual(t.key)));
+        return this.keys.some((n => n.isEqual(t.key)));
     }
 }
 
-/** Filter that matches on key fields not present within an array. */ class Gt extends Qt {
-    constructor(t, e) {
-        super(t, "not-in" /* NOT_IN */ , e), this.keys = Ht("not-in" /* NOT_IN */ , e);
+/** Filter that matches on key fields not present within an array. */ class Wt extends Qt {
+    constructor(t, n) {
+        super(t, "not-in" /* NOT_IN */ , n), this.keys = Ht("not-in" /* NOT_IN */ , n);
     }
     matches(t) {
-        return !this.keys.some((e => e.isEqual(t.key)));
+        return !this.keys.some((n => n.isEqual(t.key)));
     }
 }
 
-function Ht(t, e) {
-    var n;
-    return ((null === (n = e.arrayValue) || void 0 === n ? void 0 : n.values) || []).map((t => Z.fromName(t.referenceValue)));
+function Ht(t, n) {
+    var e;
+    return ((null === (e = n.arrayValue) || void 0 === e ? void 0 : e.values) || []).map((t => Z.fromName(t.referenceValue)));
 }
 
 /** A Filter that implements the array-contains operator. */ class Yt extends Qt {
-    constructor(t, e) {
-        super(t, "array-contains" /* ARRAY_CONTAINS */ , e);
+    constructor(t, n) {
+        super(t, "array-contains" /* ARRAY_CONTAINS */ , n);
     }
     matches(t) {
-        const e = t.data.field(this.field);
-        return xt(e) && $t(e.arrayValue, this.value);
+        const n = t.data.field(this.field);
+        return xt(n) && $t(n.arrayValue, this.value);
     }
 }
 
 /** A Filter that implements the IN operator. */ class Kt extends Qt {
-    constructor(t, e) {
-        super(t, "in" /* IN */ , e);
+    constructor(t, n) {
+        super(t, "in" /* IN */ , n);
     }
     matches(t) {
-        const e = t.data.field(this.field);
-        return null !== e && $t(this.value.arrayValue, e);
+        const n = t.data.field(this.field);
+        return null !== n && $t(this.value.arrayValue, n);
     }
 }
 
 /** A Filter that implements the not-in operator. */ class Jt extends Qt {
-    constructor(t, e) {
-        super(t, "not-in" /* NOT_IN */ , e);
+    constructor(t, n) {
+        super(t, "not-in" /* NOT_IN */ , n);
     }
     matches(t) {
         if ($t(this.value.arrayValue, {
             nullValue: "NULL_VALUE"
         })) return !1;
-        const e = t.data.field(this.field);
-        return null !== e && !$t(this.value.arrayValue, e);
+        const n = t.data.field(this.field);
+        return null !== n && !$t(this.value.arrayValue, n);
     }
 }
 
 /** A Filter that implements the array-contains-any operator. */ class Zt extends Qt {
-    constructor(t, e) {
-        super(t, "array-contains-any" /* ARRAY_CONTAINS_ANY */ , e);
+    constructor(t, n) {
+        super(t, "array-contains-any" /* ARRAY_CONTAINS_ANY */ , n);
     }
     matches(t) {
-        const e = t.data.field(this.field);
-        return !(!xt(e) || !e.arrayValue.values) && e.arrayValue.values.some((t => $t(this.value.arrayValue, t)));
+        const n = t.data.field(this.field);
+        return !(!xt(n) || !n.arrayValue.values) && n.arrayValue.values.some((t => $t(this.value.arrayValue, t)));
     }
 }
 
@@ -2225,29 +2222,29 @@ function Ht(t, e) {
  * after a bound. This is influenced by whether the position is just before or
  * just after the provided values.
  */ class Xt {
-    constructor(t, e) {
-        this.position = t, this.before = e;
+    constructor(t, n) {
+        this.position = t, this.before = n;
     }
 }
 
 /**
  * An ordering on a field, in some Direction. Direction defaults to ASCENDING.
- */ class te {
-    constructor(t, e = "asc" /* ASCENDING */) {
-        this.field = t, this.dir = e;
+ */ class tn {
+    constructor(t, n = "asc" /* ASCENDING */) {
+        this.field = t, this.dir = n;
     }
 }
 
-function ee(t, e) {
-    return t.dir === e.dir && t.field.isEqual(e.field);
+function nn(t, n) {
+    return t.dir === n.dir && t.field.isEqual(n.field);
 }
 
-function ne(t, e) {
-    if (null === t) return null === e;
-    if (null === e) return !1;
-    if (t.before !== e.before || t.position.length !== e.position.length) return !1;
-    for (let n = 0; n < t.position.length; n++) {
-        if (!Dt(t.position[n], e.position[n])) return !1;
+function en(t, n) {
+    if (null === t) return null === n;
+    if (null === n) return !1;
+    if (t.before !== n.before || t.position.length !== n.position.length) return !1;
+    for (let e = 0; e < t.position.length; e++) {
+        if (!Nt(t.position[e], n.position[e])) return !1;
     }
     return !0;
 }
@@ -2274,29 +2271,29 @@ function ne(t, e) {
  * query the RemoteStore results.
  *
  * Visible for testing.
- */ class re {
+ */ class rn {
     /**
      * Initializes a Query with a path and optional additional query constraints.
      * Path must currently be empty if this is a collection group query.
      */
-    constructor(t, e = null, n = [], r = [], s = null, i = "F" /* First */ , o = null, u = null) {
-        this.path = t, this.collectionGroup = e, this.explicitOrderBy = n, this.filters = r, 
-        this.limit = s, this.limitType = i, this.startAt = o, this.endAt = u, this.D = null, 
+    constructor(t, n = null, e = [], r = [], s = null, i = "F" /* First */ , o = null, u = null) {
+        this.path = t, this.collectionGroup = n, this.explicitOrderBy = e, this.filters = r, 
+        this.limit = s, this.limitType = i, this.startAt = o, this.endAt = u, this.N = null, 
         // The corresponding `Target` of this `Query` instance.
         this.$ = null, this.startAt, this.endAt;
     }
 }
 
-/** Creates a new Query for a query that matches all documents at `path` */ function se(t) {
+/** Creates a new Query for a query that matches all documents at `path` */ function sn(t) {
     return !it(t.limit) && "L" /* Last */ === t.limitType;
 }
 
-function ie(t) {
+function on(t) {
     return t.explicitOrderBy.length > 0 ? t.explicitOrderBy[0].field : null;
 }
 
-function oe(t) {
-    for (const e of t.filters) if (e.N()) return e.field;
+function un(t) {
+    for (const n of t.filters) if (n.D()) return n.field;
     return null;
 }
 
@@ -2308,7 +2305,7 @@ function oe(t) {
  * Returns whether the query matches a collection group rather than a specific
  * collection.
  */
-function ue(t) {
+function cn(t) {
     return null !== t.collectionGroup;
 }
 
@@ -2316,59 +2313,59 @@ function ue(t) {
  * Returns the implicit order by constraint that is used to execute the Query,
  * which can be different from the order by constraints the user provided (e.g.
  * the SDK and backend always orders by `__name__`).
- */ function ce(t) {
-    const e = b(t);
-    if (null === e.D) {
-        e.D = [];
-        const t = oe(e), n = ie(e);
-        if (null !== t && null === n) 
+ */ function an(t) {
+    const n = b(t);
+    if (null === n.N) {
+        n.N = [];
+        const t = un(n), e = on(n);
+        if (null !== t && null === e) 
         // 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.isKeyField() || e.D.push(new te(t)), e.D.push(new te(J.keyField(), "asc" /* ASCENDING */)); else {
+        t.isKeyField() || n.N.push(new tn(t)), n.N.push(new tn(J.keyField(), "asc" /* ASCENDING */)); else {
             let t = !1;
-            for (const n of e.explicitOrderBy) e.D.push(n), n.field.isKeyField() && (t = !0);
+            for (const e of n.explicitOrderBy) n.N.push(e), e.field.isKeyField() && (t = !0);
             if (!t) {
                 // The order of the implicit key ordering always matches the last
                 // explicit order by
-                const t = e.explicitOrderBy.length > 0 ? e.explicitOrderBy[e.explicitOrderBy.length - 1].dir : "asc" /* ASCENDING */;
-                e.D.push(new te(J.keyField(), t));
+                const t = n.explicitOrderBy.length > 0 ? n.explicitOrderBy[n.explicitOrderBy.length - 1].dir : "asc" /* ASCENDING */;
+                n.N.push(new tn(J.keyField(), t));
             }
         }
     }
-    return e.D;
+    return n.N;
 }
 
 /**
  * Converts this `Query` instance to it's corresponding `Target` representation.
- */ function ae(t) {
-    const e = b(t);
-    if (!e.$) if ("F" /* First */ === e.limitType) e.$ = Bt(e.path, e.collectionGroup, ce(e), e.filters, e.limit, e.startAt, e.endAt); else {
+ */ function hn(t) {
+    const n = b(t);
+    if (!n.$) if ("F" /* First */ === n.limitType) n.$ = Mt(n.path, n.collectionGroup, an(n), n.filters, n.limit, n.startAt, n.endAt); else {
         // Flip the orderBy directions since we want the last results
         const t = [];
-        for (const n of ce(e)) {
-            const e = "desc" /* DESCENDING */ === n.dir ? "asc" /* ASCENDING */ : "desc" /* DESCENDING */;
-            t.push(new te(n.field, e));
+        for (const e of an(n)) {
+            const n = "desc" /* DESCENDING */ === e.dir ? "asc" /* ASCENDING */ : "desc" /* DESCENDING */;
+            t.push(new tn(e.field, n));
         }
         // We need to swap the cursors to match the now-flipped query ordering.
-                const n = e.endAt ? new Xt(e.endAt.position, !e.endAt.before) : null, r = e.startAt ? new Xt(e.startAt.position, !e.startAt.before) : null;
+                const e = n.endAt ? new Xt(n.endAt.position, !n.endAt.before) : null, r = n.startAt ? new Xt(n.startAt.position, !n.startAt.before) : null;
         // Now return as a LimitType.First query.
-        e.$ = Bt(e.path, e.collectionGroup, t, e.filters, e.limit, n, r);
+        n.$ = Mt(n.path, n.collectionGroup, t, n.filters, n.limit, e, r);
     }
-    return e.$;
+    return n.$;
 }
 
-function he(t, e) {
-    return function(t, e) {
-        if (t.limit !== e.limit) return !1;
-        if (t.orderBy.length !== e.orderBy.length) return !1;
-        for (let n = 0; n < t.orderBy.length; n++) if (!ee(t.orderBy[n], e.orderBy[n])) return !1;
-        if (t.filters.length !== e.filters.length) return !1;
-        for (let s = 0; s < t.filters.length; s++) if (n = t.filters[s], r = e.filters[s], 
-        n.op !== r.op || !n.field.isEqual(r.field) || !Dt(n.value, r.value)) return !1;
-        var n, r;
-        return t.collectionGroup === e.collectionGroup && !!t.path.isEqual(e.path) && !!ne(t.startAt, e.startAt) && ne(t.endAt, e.endAt);
-    }(ae(t), ae(e)) && t.limitType === e.limitType;
+function ln(t, n) {
+    return function(t, n) {
+        if (t.limit !== n.limit) return !1;
+        if (t.orderBy.length !== n.orderBy.length) return !1;
+        for (let e = 0; e < t.orderBy.length; e++) if (!nn(t.orderBy[e], n.orderBy[e])) return !1;
+        if (t.filters.length !== n.filters.length) return !1;
+        for (let s = 0; s < t.filters.length; s++) if (e = t.filters[s], r = n.filters[s], 
+        e.op !== r.op || !e.field.isEqual(r.field) || !Nt(e.value, r.value)) return !1;
+        var e, r;
+        return t.collectionGroup === n.collectionGroup && !!t.path.isEqual(n.path) && !!en(t.startAt, n.startAt) && en(t.endAt, n.endAt);
+    }(hn(t), hn(n)) && t.limitType === n.limitType;
 }
 
 /**
@@ -2396,10 +2393,10 @@ function he(t, e) {
  * The return value is an IntegerValue if it can safely represent the value,
  * otherwise a DoubleValue is returned.
  */
-function le(t, e) {
+function fn(t, n) {
     return function(t) {
         return "number" == typeof t && Number.isInteger(t) && !ot(t) && t <= Number.MAX_SAFE_INTEGER && t >= Number.MIN_SAFE_INTEGER;
-    }(e) ? 
+    }(n) ? 
     /**
  * Returns an IntegerValue for `value`.
  */
@@ -2407,22 +2404,22 @@ function le(t, e) {
         return {
             integerValue: "" + t
         };
-    }(e) : function(t, e) {
+    }(n) : function(t, n) {
         if (t.F) {
-            if (isNaN(e)) return {
+            if (isNaN(n)) return {
                 doubleValue: "NaN"
             };
-            if (e === 1 / 0) return {
+            if (n === 1 / 0) return {
                 doubleValue: "Infinity"
             };
-            if (e === -1 / 0) return {
+            if (n === -1 / 0) return {
                 doubleValue: "-Infinity"
             };
         }
         return {
-            doubleValue: ot(e) ? "-0" : e
+            doubleValue: ot(n) ? "-0" : n
         };
-    }(t, e);
+    }(t, n);
 }
 
 /**
@@ -2441,7 +2438,7 @@ function le(t, e) {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/** Used to represent a field transform on a mutation. */ class fe {
+/** Used to represent a field transform on a mutation. */ class dn {
     constructor() {
         // Make sure that the structural type of `TransformOperation` is unique.
         // See https://github.com/microsoft/TypeScript/issues/5451
@@ -2449,15 +2446,15 @@ function le(t, e) {
     }
 }
 
-/** Transforms a value into a server-generated timestamp. */ class de extends fe {}
+/** Transforms a value into a server-generated timestamp. */ class wn extends dn {}
 
-/** Transforms an array value via a union operation. */ class we extends fe {
+/** Transforms an array value via a union operation. */ class mn extends dn {
     constructor(t) {
         super(), this.elements = t;
     }
 }
 
-/** Transforms an array value via a remove operation. */ class me extends fe {
+/** Transforms an array value via a remove operation. */ class pn extends dn {
     constructor(t) {
         super(), this.elements = t;
     }
@@ -2468,9 +2465,9 @@ function le(t, e) {
  * transforms. Converts all field values to integers or doubles, but unlike the
  * backend does not cap integer values at 2^63. Instead, JavaScript number
  * arithmetic is used and precision loss can occur for values greater than 2^53.
- */ class pe extends fe {
-    constructor(t, e) {
-        super(), this.S = t, this.q = e;
+ */ class yn extends dn {
+    constructor(t, n) {
+        super(), this.S = t, this.q = n;
     }
 }
 
@@ -2490,9 +2487,9 @@ function le(t, e) {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/** A field path and the TransformOperation to perform upon it. */ class ye {
-    constructor(t, e) {
-        this.field = t, this.transform = e;
+/** A field path and the TransformOperation to perform upon it. */ class _n {
+    constructor(t, n) {
+        this.field = t, this.transform = n;
     }
 }
 
@@ -2500,18 +2497,18 @@ function le(t, e) {
  * Encodes a precondition for a mutation. This follows the model that the
  * backend accepts with the special case of an explicit "empty" precondition
  * (meaning no precondition).
- */ class _e {
-    constructor(t, e) {
-        this.updateTime = t, this.exists = e;
+ */ class gn {
+    constructor(t, n) {
+        this.updateTime = t, this.exists = n;
     }
     /** Creates a new empty Precondition. */    static none() {
-        return new _e;
+        return new gn;
     }
     /** Creates a new Precondition with an exists flag. */    static exists(t) {
-        return new _e(void 0, t);
+        return new gn(void 0, t);
     }
     /** Creates a new Precondition based on a version a document exists at. */    static updateTime(t) {
-        return new _e(t);
+        return new gn(t);
     }
     /** Returns whether this Precondition is empty. */    get isNone() {
         return void 0 === this.updateTime && void 0 === this.exists;
@@ -2564,14 +2561,14 @@ function le(t, e) {
  * applyToLocalView() to implement the actual behavior of applying the mutation
  * to some source document (see `setMutationApplyToRemoteDocument()` for an
  * example).
- */ class ge {}
+ */ class bn {}
 
 /**
  * A mutation that creates or replaces the document at the given key with the
  * object value contents.
- */ class be extends ge {
-    constructor(t, e, n, r = []) {
-        super(), this.key = t, this.value = e, this.precondition = n, this.fieldTransforms = r, 
+ */ class vn extends bn {
+    constructor(t, n, e, r = []) {
+        super(), this.key = t, this.value = n, this.precondition = e, this.fieldTransforms = r, 
         this.type = 0 /* Set */;
     }
 }
@@ -2588,16 +2585,16 @@ function le(t, e) {
  *    is deleted.
  *  * When a field is not in the mask but is in the values, the values map is
  *    ignored.
- */ class ve extends ge {
-    constructor(t, e, n, r, s = []) {
-        super(), this.key = t, this.data = e, this.fieldMask = n, this.precondition = r, 
+ */ class En extends bn {
+    constructor(t, n, e, r, s = []) {
+        super(), this.key = t, this.data = n, this.fieldMask = e, this.precondition = r, 
         this.fieldTransforms = s, this.type = 1 /* Patch */;
     }
 }
 
-/** A mutation that deletes the document at the given key. */ class Ee extends ge {
-    constructor(t, e) {
-        super(), this.key = t, this.precondition = e, this.type = 2 /* Delete */ , this.fieldTransforms = [];
+/** A mutation that deletes the document at the given key. */ class Tn extends bn {
+    constructor(t, n) {
+        super(), this.key = t, this.precondition = n, this.type = 2 /* Delete */ , this.fieldTransforms = [];
     }
 }
 
@@ -2607,9 +2604,9 @@ function le(t, e) {
  *
  * The `verify` operation is only used in Transactions, and this class serves
  * primarily to facilitate serialization into protos.
- */ class Ie extends ge {
-    constructor(t, e) {
-        super(), this.key = t, this.precondition = e, this.type = 3 /* Verify */ , this.fieldTransforms = [];
+ */ class In extends bn {
+    constructor(t, n) {
+        super(), this.key = t, this.precondition = n, this.type = 3 /* Verify */ , this.fieldTransforms = [];
     }
 }
 
@@ -2628,13 +2625,13 @@ 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.
- */ const Te = (() => {
+ */ const An = (() => {
     const t = {
         asc: "ASCENDING",
         desc: "DESCENDING"
     };
     return t;
-})(), Ae = (() => {
+})(), Pn = (() => {
     const t = {
         "<": "LESS_THAN",
         "<=": "LESS_THAN_OR_EQUAL",
@@ -2664,9 +2661,9 @@ function le(t, e) {
  * TODO(klimt): We can remove the databaseId argument if we keep the full
  * resource name in documents.
  */
-class Pe {
-    constructor(t, e) {
-        this.databaseId = t, this.F = e;
+class Rn {
+    constructor(t, n) {
+        this.databaseId = t, this.F = n;
     }
 }
 
@@ -2681,13 +2678,13 @@ class Pe {
 /**
  * Returns a value for a Date that's appropriate to put into a proto.
  */
-function Re(t, e) {
+function Vn(t, n) {
     if (t.F) {
-        return `${new Date(1e3 * e.seconds).toISOString().replace(/\.\d*/, "").replace("Z", "")}.${("000000000" + e.nanoseconds).slice(-9)}Z`;
+        return `${new Date(1e3 * n.seconds).toISOString().replace(/\.\d*/, "").replace("Z", "")}.${("000000000" + n.nanoseconds).slice(-9)}Z`;
     }
     return {
-        seconds: "" + e.seconds,
-        nanos: e.nanoseconds
+        seconds: "" + n.seconds,
+        nanos: n.nanoseconds
     };
 }
 
@@ -2696,202 +2693,202 @@ function Re(t, e) {
  *
  * Visible for testing.
  */
-function Ve(t, e) {
-    return t.F ? e.toBase64() : e.toUint8Array();
+function Dn(t, n) {
+    return t.F ? n.toBase64() : n.toUint8Array();
 }
 
-function Ne(t, e) {
-    return Re(t, e.toTimestamp());
+function Nn(t, n) {
+    return Vn(t, n.toTimestamp());
 }
 
-function De(t) {
+function $n(t) {
     return g(!!t), yt.fromTimestamp(function(t) {
-        const e = It(t);
-        return new pt(e.seconds, e.nanos);
+        const n = Tt(t);
+        return new pt(n.seconds, n.nanos);
     }(t));
 }
 
-function $e(t, e) {
+function Fn(t, n) {
     return function(t) {
         return new Y([ "projects", t.projectId, "databases", t.database ]);
-    }(t).child("documents").child(e).canonicalString();
+    }(t).child("documents").child(n).canonicalString();
 }
 
-function Fe(t, e) {
-    return $e(t.databaseId, e.path);
+function Sn(t, n) {
+    return Fn(t.databaseId, n.path);
 }
 
-function Se(t, e) {
-    const n = function(t) {
-        const e = Y.fromString(t);
-        return g(ze(e)), e;
-    }(e);
-    if (n.get(1) !== t.databaseId.projectId) throw new L(T, "Tried to deserialize key from different project: " + n.get(1) + " vs " + t.databaseId.projectId);
-    if (n.get(3) !== t.databaseId.database) throw new L(T, "Tried to deserialize key from different database: " + n.get(3) + " vs " + t.databaseId.database);
-    return new Z((g((r = n).length > 4 && "documents" === r.get(4)), r.popFirst(5)));
+function qn(t, n) {
+    const e = function(t) {
+        const n = Y.fromString(t);
+        return g(Gn(n)), n;
+    }(n);
+    if (e.get(1) !== t.databaseId.projectId) throw new L(I, "Tried to deserialize key from different project: " + e.get(1) + " vs " + t.databaseId.projectId);
+    if (e.get(3) !== t.databaseId.database) throw new L(I, "Tried to deserialize key from different database: " + e.get(3) + " vs " + t.databaseId.database);
+    return new Z((g((r = e).length > 4 && "documents" === r.get(4)), r.popFirst(5)));
     var r;
     /** Creates a Document proto from key and fields (but no create/update time) */}
 
-function qe(t, e) {
-    return $e(t.databaseId, e);
+function xn(t, n) {
+    return Fn(t.databaseId, n);
 }
 
-function xe(t) {
+function On(t) {
     return new Y([ "projects", t.databaseId.projectId, "databases", t.databaseId.database ]).canonicalString();
 }
 
-function Oe(t, e, n) {
+function Cn(t, n, e) {
     return {
-        name: Fe(t, e),
-        fields: n.value.mapValue.fields
+        name: Sn(t, n),
+        fields: e.value.mapValue.fields
     };
 }
 
-function Ce(t, e) {
-    return "found" in e ? function(t, e) {
-        g(!!e.found), e.found.name, e.found.updateTime;
-        const n = Se(t, e.found.name), r = De(e.found.updateTime), s = new jt({
+function Ln(t, n) {
+    return "found" in n ? function(t, n) {
+        g(!!n.found), n.found.name, n.found.updateTime;
+        const e = qn(t, n.found.name), r = $n(n.found.updateTime), s = new jt({
             mapValue: {
-                fields: e.found.fields
+                fields: n.found.fields
             }
         });
-        return kt.newFoundDocument(n, r, s);
-    }(t, e) : "missing" in e ? function(t, e) {
-        g(!!e.missing), g(!!e.readTime);
-        const n = Se(t, e.missing), r = De(e.readTime);
-        return kt.newNoDocument(n, r);
-    }(t, e) : _();
-}
-
-function Le(t, e) {
-    let n;
-    if (e instanceof be) n = {
-        update: Oe(t, e.key, e.value)
-    }; else if (e instanceof Ee) n = {
-        delete: Fe(t, e.key)
-    }; else if (e instanceof ve) n = {
-        update: Oe(t, e.key, e.data),
-        updateMask: Qe(e.fieldMask)
+        return kt.newFoundDocument(e, r, s);
+    }(t, n) : "missing" in n ? function(t, n) {
+        g(!!n.missing), g(!!n.readTime);
+        const e = qn(t, n.missing), r = $n(n.readTime);
+        return kt.newNoDocument(e, r);
+    }(t, n) : _();
+}
+
+function Un(t, n) {
+    let e;
+    if (n instanceof vn) e = {
+        update: Cn(t, n.key, n.value)
+    }; else if (n instanceof Tn) e = {
+        delete: Sn(t, n.key)
+    }; else if (n instanceof En) e = {
+        update: Cn(t, n.key, n.data),
+        updateMask: zn(n.fieldMask)
     }; else {
-        if (!(e instanceof Ie)) return _();
-        n = {
-            verify: Fe(t, e.key)
+        if (!(n instanceof In)) return _();
+        e = {
+            verify: Sn(t, n.key)
         };
     }
-    return e.fieldTransforms.length > 0 && (n.updateTransforms = e.fieldTransforms.map((t => function(t, e) {
-        const n = e.transform;
-        if (n instanceof de) return {
-            fieldPath: e.field.canonicalString(),
+    return n.fieldTransforms.length > 0 && (e.updateTransforms = n.fieldTransforms.map((t => function(t, n) {
+        const e = n.transform;
+        if (e instanceof wn) return {
+            fieldPath: n.field.canonicalString(),
             setToServerValue: "REQUEST_TIME"
         };
-        if (n instanceof we) return {
-            fieldPath: e.field.canonicalString(),
+        if (e instanceof mn) return {
+            fieldPath: n.field.canonicalString(),
             appendMissingElements: {
-                values: n.elements
+                values: e.elements
             }
         };
-        if (n instanceof me) return {
-            fieldPath: e.field.canonicalString(),
+        if (e instanceof pn) return {
+            fieldPath: n.field.canonicalString(),
             removeAllFromArray: {
-                values: n.elements
+                values: e.elements
             }
         };
-        if (n instanceof pe) return {
-            fieldPath: e.field.canonicalString(),
-            increment: n.q
+        if (e instanceof yn) return {
+            fieldPath: n.field.canonicalString(),
+            increment: e.q
         };
         throw _();
-    }(0, t)))), e.precondition.isNone || (n.currentDocument = function(t, e) {
-        return void 0 !== e.updateTime ? {
-            updateTime: Ne(t, e.updateTime)
-        } : void 0 !== e.exists ? {
-            exists: e.exists
+    }(0, t)))), n.precondition.isNone || (e.currentDocument = function(t, n) {
+        return void 0 !== n.updateTime ? {
+            updateTime: Nn(t, n.updateTime)
+        } : void 0 !== n.exists ? {
+            exists: n.exists
         } : _();
-    }(t, e.precondition)), n;
+    }(t, n.precondition)), e;
 }
 
-function Ue(t, e) {
+function jn(t, n) {
     // Dissect the path into parent, collectionId, and optional key filter.
-    const n = {
+    const e = {
         structuredQuery: {}
-    }, r = e.path;
-    null !== e.collectionGroup ? (n.parent = qe(t, r), n.structuredQuery.from = [ {
-        collectionId: e.collectionGroup,
+    }, r = n.path;
+    null !== n.collectionGroup ? (e.parent = xn(t, r), e.structuredQuery.from = [ {
+        collectionId: n.collectionGroup,
         allDescendants: !0
-    } ]) : (n.parent = qe(t, r.popLast()), n.structuredQuery.from = [ {
+    } ]) : (e.parent = xn(t, r.popLast()), e.structuredQuery.from = [ {
         collectionId: r.lastSegment()
     } ]);
     const s = function(t) {
         if (0 === t.length) return;
-        const e = t.map((t => 
+        const n = t.map((t => 
         // visible for testing
         function(t) {
             if ("==" /* EQUAL */ === t.op) {
                 if (Ct(t.value)) return {
                     unaryFilter: {
-                        field: Be(t.field),
+                        field: Qn(t.field),
                         op: "IS_NAN"
                     }
                 };
                 if (Ot(t.value)) return {
                     unaryFilter: {
-                        field: Be(t.field),
+                        field: Qn(t.field),
                         op: "IS_NULL"
                     }
                 };
             } else if ("!=" /* NOT_EQUAL */ === t.op) {
                 if (Ct(t.value)) return {
                     unaryFilter: {
-                        field: Be(t.field),
+                        field: Qn(t.field),
                         op: "IS_NOT_NAN"
                     }
                 };
                 if (Ot(t.value)) return {
                     unaryFilter: {
-                        field: Be(t.field),
+                        field: Qn(t.field),
                         op: "IS_NOT_NULL"
                     }
                 };
             }
             return {
                 fieldFilter: {
-                    field: Be(t.field),
-                    op: Me(t.op),
+                    field: Qn(t.field),
+                    op: Mn(t.op),
                     value: t.value
                 }
             };
         }(t)));
-        if (1 === e.length) return e[0];
+        if (1 === n.length) return n[0];
         return {
             compositeFilter: {
                 op: "AND",
-                filters: e
+                filters: n
             }
         };
-    }(e.filters);
-    s && (n.structuredQuery.where = s);
+    }(n.filters);
+    s && (e.structuredQuery.where = s);
     const i = function(t) {
         if (0 === t.length) return;
         return t.map((t => 
         // visible for testing
         function(t) {
             return {
-                field: Be(t.field),
-                direction: ke(t.dir)
+                field: Qn(t.field),
+                direction: Bn(t.dir)
             };
         }(t)));
-    }(e.orderBy);
-    i && (n.structuredQuery.orderBy = i);
-    const o = function(t, e) {
-        return t.F || it(e) ? e : {
-            value: e
+    }(n.orderBy);
+    i && (e.structuredQuery.orderBy = i);
+    const o = function(t, n) {
+        return t.F || it(n) ? n : {
+            value: n
         };
-    }(t, e.limit);
-    return null !== o && (n.structuredQuery.limit = o), e.startAt && (n.structuredQuery.startAt = je(e.startAt)), 
-    e.endAt && (n.structuredQuery.endAt = je(e.endAt)), n;
+    }(t, n.limit);
+    return null !== o && (e.structuredQuery.limit = o), n.startAt && (e.structuredQuery.startAt = kn(n.startAt)), 
+    n.endAt && (e.structuredQuery.endAt = kn(n.endAt)), e;
 }
 
-function je(t) {
+function kn(t) {
     return {
         before: t.before,
         values: t.position
@@ -2899,29 +2896,29 @@ function je(t) {
 }
 
 // visible for testing
-function ke(t) {
-    return Te[t];
+function Bn(t) {
+    return An[t];
 }
 
 // visible for testing
-function Me(t) {
-    return Ae[t];
+function Mn(t) {
+    return Pn[t];
 }
 
-function Be(t) {
+function Qn(t) {
     return {
         fieldPath: t.canonicalString()
     };
 }
 
-function Qe(t) {
-    const e = [];
-    return t.fields.forEach((t => e.push(t.canonicalString()))), {
-        fieldPaths: e
+function zn(t) {
+    const n = [];
+    return t.fields.forEach((t => n.push(t.canonicalString()))), {
+        fieldPaths: n
     };
 }
 
-function ze(t) {
+function Gn(t) {
     // Resource names have at least 4 components (project ID, database ID)
     return t.length >= 4 && "projects" === t.get(0) && "databases" === t.get(2);
 }
@@ -2941,8 +2938,8 @@ function ze(t) {
  * 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.
- */ function We(t) {
-    return new Pe(t, /* useProto3Json= */ !0);
+ */ function Wn(t) {
+    return new Rn(t, /* useProto3Json= */ !0);
 }
 
 /**
@@ -2970,7 +2967,7 @@ function ze(t) {
  * base delay. This prevents clients from accidentally synchronizing their
  * delays causing spikes of load to the backend.
  */
-class Ge {
+class Hn {
     constructor(
     /**
      * The AsyncQueue to run backoff operations on.
@@ -2979,13 +2976,13 @@ class Ge {
     /**
      * The ID to use when scheduling backoff operations on the AsyncQueue.
      */
-    e, 
+    n, 
     /**
      * The initial delay (used as the base delay on the first retry attempt).
      * Note that jitter will still be applied, so the actual delay could be as
      * little as 0.5*initialDelayMs.
      */
-    n = 1e3
+    e = 1e3
     /**
      * The multiplier to use to determine the extended base delay after each
      * attempt.
@@ -2995,9 +2992,9 @@ class Ge {
      * Note that jitter will still be applied, so the actual delay could be as
      * much as 1.5*maxDelayMs.
      */ , s = 6e4) {
-        this.O = t, this.timerId = e, this.C = n, this.L = r, this.U = s, this.j = 0, this.k = null, 
+        this.O = t, this.timerId = n, this.C = e, this.L = r, this.U = s, this.j = 0, this.k = null, 
         /** The last backoff attempt, as epoch milliseconds. */
-        this.M = Date.now(), this.reset();
+        this.B = Date.now(), this.reset();
     }
     /**
      * Resets the backoff delay.
@@ -3011,22 +3008,22 @@ class Ge {
     /**
      * Resets the backoff delay to the maximum delay (e.g. for use after a
      * RESOURCE_EXHAUSTED error).
-     */    B() {
+     */    M() {
         this.j = this.U;
     }
     /**
      * Returns a promise that resolves after currentDelayMs, and increases the
      * delay for any subsequent attempts. If there was a pending backoff operation
      * already, it will be canceled.
-     */    W(t) {
+     */    G(t) {
         // Cancel any pending backoff operation.
         this.cancel();
         // First schedule using the current base (which may be 0 and should be
         // honored as such).
-        const e = Math.floor(this.j + this.G()), n = Math.max(0, Date.now() - this.M), r = Math.max(0, e - n);
+        const n = Math.floor(this.j + this.W()), e = Math.max(0, Date.now() - this.B), r = Math.max(0, n - e);
         // Guard against lastAttemptTime being in the future due to a clock change.
-                r > 0 && w("ExponentialBackoff", `Backing off for ${r} ms (base delay: ${this.j} ms, delay with jitter: ${e} ms, last attempt: ${n} ms ago)`), 
-        this.k = this.O.enqueueAfterDelay(this.timerId, r, (() => (this.M = Date.now(), 
+                r > 0 && w("ExponentialBackoff", `Backing off for ${r} ms (base delay: ${this.j} ms, delay with jitter: ${n} ms, last attempt: ${e} ms ago)`), 
+        this.k = this.O.enqueueAfterDelay(this.timerId, r, (() => (this.B = Date.now(), 
         t()))), 
         // Apply backoff factor to determine next delay and ensure it is within
         // bounds.
@@ -3038,7 +3035,7 @@ class Ge {
     cancel() {
         null !== this.k && (this.k.cancel(), this.k = null);
     }
-    /** Returns a random value in the range [-currentBaseMs/2, currentBaseMs/2] */    G() {
+    /** Returns a random value in the range [-currentBaseMs/2, currentBaseMs/2] */    W() {
         return (Math.random() - .5) * this.j;
     }
 }
@@ -3068,23 +3065,23 @@ class Ge {
  * An implementation of Datastore that exposes additional state for internal
  * consumption.
  */
-class He extends class {} {
-    constructor(t, e, n) {
-        super(), this.credentials = t, this.Y = e, this.S = n, this.K = !1;
+class Yn extends class {} {
+    constructor(t, n, e) {
+        super(), this.credentials = t, this.Y = n, this.S = e, this.K = !1;
     }
     J() {
         if (this.K) throw new L($, "The client has already been terminated.");
     }
-    /** Gets an auth token and invokes the provided RPC. */    l(t, e, n) {
-        return this.J(), this.credentials.getToken().then((r => this.Y.l(t, e, n, r))).catch((t => {
-            throw "FirebaseError" === t.name ? (t.code === N && this.credentials.invalidateToken(), 
-            t) : new L(I, t.toString());
+    /** Gets an auth token and invokes the provided RPC. */    l(t, n, e) {
+        return this.J(), this.credentials.getToken().then((r => this.Y.l(t, n, e, r))).catch((t => {
+            throw "FirebaseError" === t.name ? (t.code === D && this.credentials.invalidateToken(), 
+            t) : new L(T, t.toString());
         }));
     }
-    /** Gets an auth token and invokes the provided RPC with streamed results. */    v(t, e, n) {
-        return this.J(), this.credentials.getToken().then((r => this.Y.v(t, e, n, r))).catch((t => {
-            throw "FirebaseError" === t.name ? (t.code === N && this.credentials.invalidateToken(), 
-            t) : new L(I, t.toString());
+    /** Gets an auth token and invokes the provided RPC with streamed results. */    v(t, n, e) {
+        return this.J(), this.credentials.getToken().then((r => this.Y.v(t, n, e, r))).catch((t => {
+            throw "FirebaseError" === t.name ? (t.code === D && this.credentials.invalidateToken(), 
+            t) : new L(T, t.toString());
         }));
     }
     terminate() {
@@ -3094,40 +3091,40 @@ class He extends class {} {
 
 // TODO(firestorexp): Make sure there is only one Datastore instance per
 // firestore-exp client.
-async function Ye(t, e) {
-    const n = b(t), r = xe(n.S) + "/documents", s = {
-        writes: e.map((t => Le(n.S, t)))
+async function Kn(t, n) {
+    const e = b(t), r = On(e.S) + "/documents", s = {
+        writes: n.map((t => Un(e.S, t)))
     };
-    await n.l("Commit", r, s);
+    await e.l("Commit", r, s);
 }
 
-async function Ke(t, e) {
-    const n = b(t), r = xe(n.S) + "/documents", s = {
-        documents: e.map((t => Fe(n.S, t)))
-    }, i = await n.v("BatchGetDocuments", r, s), o = new Map;
+async function Jn(t, n) {
+    const e = b(t), r = On(e.S) + "/documents", s = {
+        documents: n.map((t => Sn(e.S, t)))
+    }, i = await e.v("BatchGetDocuments", r, s), o = new Map;
     i.forEach((t => {
-        const e = Ce(n.S, t);
-        o.set(e.key.toString(), e);
+        const n = Ln(e.S, t);
+        o.set(n.key.toString(), n);
     }));
     const u = [];
-    return e.forEach((t => {
-        const e = o.get(t.toString());
-        g(!!e), u.push(e);
+    return n.forEach((t => {
+        const n = o.get(t.toString());
+        g(!!n), u.push(n);
     })), u;
 }
 
-async function Je(t, e) {
-    const n = b(t), r = Ue(n.S, ae(e));
-    return (await n.v("RunQuery", r.parent, {
+async function Zn(t, n) {
+    const e = b(t), r = jn(e.S, hn(n));
+    return (await e.v("RunQuery", r.parent, {
         structuredQuery: r.structuredQuery
-    })).filter((t => !!t.document)).map((t => function(t, e, n) {
-        const r = Se(t, e.name), s = De(e.updateTime), i = new jt({
+    })).filter((t => !!t.document)).map((t => function(t, n, e) {
+        const r = qn(t, n.name), s = $n(n.updateTime), i = new jt({
             mapValue: {
-                fields: e.fields
+                fields: n.fields
             }
         }), o = kt.newFoundDocument(r, s, i);
-        return n && o.setHasCommittedMutations(), n ? o.setHasCommittedMutations() : o;
-    }(n.S, t.document, void 0)));
+        return e && o.setHasCommittedMutations(), e ? o.setHasCommittedMutations() : o;
+    }(e.S, t.document, void 0)));
 }
 
 /**
@@ -3145,7 +3142,7 @@ async function Je(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.
- */ const Ze = new Map;
+ */ const Xn = new Map;
 
 /**
  * An instance map that ensures only one Datastore exists per Firestore
@@ -3156,19 +3153,19 @@ async function Je(t, e) {
  * instance. Callers must invoke removeComponents() when the Firestore
  * instance is terminated.
  */
-function Xe(t) {
+function te(t) {
     if (t._terminated) throw new L($, "The client has already been terminated.");
-    if (!Ze.has(t)) {
+    if (!Xn.has(t)) {
         w("ComponentProvider", "Initializing Datastore");
         const i = function(t) {
             return new lt(t, fetch.bind(null));
-        }((e = t._databaseId, n = t.app.options.appId || "", r = t._persistenceKey, s = t._freezeSettings(), 
-        new W(e, n, r, s.host, s.ssl, s.experimentalForceLongPolling, s.experimentalAutoDetectLongPolling, s.useFetchStreams))), o = We(t._databaseId), u = function(t, e, n) {
-            return new He(t, e, n);
+        }((n = t._databaseId, e = t.app.options.appId || "", r = t._persistenceKey, s = t._freezeSettings(), 
+        new G(n, e, r, s.host, s.ssl, s.experimentalForceLongPolling, s.experimentalAutoDetectLongPolling, s.useFetchStreams))), o = Wn(t._databaseId), u = function(t, n, e) {
+            return new Yn(t, n, e);
         }(t._credentials, i, o);
-        Ze.set(t, u);
+        Xn.set(t, u);
     }
-    var e, n, r, s;
+    var n, e, r, s;
     /**
  * @license
  * Copyright 2018 Google LLC
@@ -3184,7 +3181,7 @@ function Xe(t) {
  * 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.
- */    return Ze.get(t);
+ */    return Xn.get(t);
 }
 
 /**
@@ -3196,21 +3193,21 @@ function Xe(t) {
  * user-supplied `FirestoreSettings` object. This is a separate type so that
  * defaults can be supplied and the value can be checked for equality.
  */
-class tn {
+class ne {
     constructor(t) {
-        var e;
+        var n;
         if (void 0 === t.host) {
-            if (void 0 !== t.ssl) throw new L(T, "Can't provide ssl option if host option is not set");
+            if (void 0 !== t.ssl) throw new L(I, "Can't provide ssl option if host option is not set");
             this.host = "firestore.googleapis.com", this.ssl = true;
-        } else this.host = t.host, this.ssl = null === (e = t.ssl) || void 0 === e || e;
+        } else this.host = t.host, this.ssl = null === (n = t.ssl) || void 0 === n || n;
         if (this.credentials = t.credentials, this.ignoreUndefinedProperties = !!t.ignoreUndefinedProperties, 
         void 0 === t.cacheSizeBytes) this.cacheSizeBytes = 41943040; else {
-            if (-1 !== t.cacheSizeBytes && t.cacheSizeBytes < 1048576) throw new L(T, "cacheSizeBytes must be at least 1048576");
+            if (-1 !== t.cacheSizeBytes && t.cacheSizeBytes < 1048576) throw new L(I, "cacheSizeBytes must be at least 1048576");
             this.cacheSizeBytes = t.cacheSizeBytes;
         }
         this.experimentalForceLongPolling = !!t.experimentalForceLongPolling, this.experimentalAutoDetectLongPolling = !!t.experimentalAutoDetectLongPolling, 
-        this.useFetchStreams = !!t.useFetchStreams, function(t, e, n, r) {
-            if (!0 === e && !0 === r) throw new L(T, `${t} and ${n} cannot be used together.`);
+        this.useFetchStreams = !!t.useFetchStreams, function(t, n, e, r) {
+            if (!0 === n && !0 === r) throw new L(I, `${t} and ${e} cannot be used together.`);
         }("experimentalForceLongPolling", t.experimentalForceLongPolling, "experimentalAutoDetectLongPolling", t.experimentalAutoDetectLongPolling);
     }
     isEqual(t) {
@@ -3238,18 +3235,18 @@ class tn {
  * The Cloud Firestore service interface.
  *
  * Do not call this constructor directly. Instead, use {@link getFirestore}.
- */ class en {
+ */ class ee {
     /** @hideconstructor */
-    constructor(t, e) {
-        this._credentials = e, 
+    constructor(t, n) {
+        this._credentials = n, 
         /**
          * Whether it's a Firestore or Firestore Lite instance.
          */
-        this.type = "firestore-lite", this._persistenceKey = "(lite)", this._settings = new tn({}), 
-        this._settingsFrozen = !1, t instanceof G ? this._databaseId = t : (this._app = t, 
+        this.type = "firestore-lite", this._persistenceKey = "(lite)", this._settings = new ne({}), 
+        this._settingsFrozen = !1, t instanceof W ? this._databaseId = t : (this._app = t, 
         this._databaseId = function(t) {
-            if (!Object.prototype.hasOwnProperty.apply(t.options, [ "projectId" ])) throw new L(T, '"projectId" not provided in firebase.initializeApp.');
-            return new G(t.options.projectId);
+            if (!Object.prototype.hasOwnProperty.apply(t.options, [ "projectId" ])) throw new L(I, '"projectId" not provided in firebase.initializeApp.');
+            return new W(t.options.projectId);
         }
         /**
  * Initializes a new instance of Cloud Firestore with the provided settings.
@@ -3278,20 +3275,20 @@ class tn {
     }
     _setSettings(t) {
         if (this._settingsFrozen) throw new L($, "Firestore has already been started and its settings can no longer be changed. You can only modify settings before calling any other methods on a Firestore object.");
-        this._settings = new tn(t), void 0 !== t.credentials && (this._credentials = function(t) {
+        this._settings = new ne(t), void 0 !== t.credentials && (this._credentials = function(t) {
             if (!t) return new k;
             switch (t.type) {
               case "gapi":
-                const e = t.client;
+                const n = t.client;
                 // Make sure this really is a Gapi client.
-                                return g(!("object" != typeof e || null === e || !e.auth || !e.auth.getAuthHeaderValueForFirstParty)), 
-                new z(e, t.sessionIndex || "0", t.iamToken || null);
+                                return g(!("object" != typeof n || null === n || !n.auth || !n.auth.getAuthHeaderValueForFirstParty)), 
+                new z(n, t.sessionIndex || "0", t.iamToken || null);
 
               case "provider":
                 return t.client;
 
               default:
-                throw new L(T, "makeCredentialsProvider failed due to invalid credential type");
+                throw new L(I, "makeCredentialsProvider failed due to invalid credential type");
             }
         }(t.credentials));
     }
@@ -3319,17 +3316,17 @@ class tn {
      * Only ever called once.
      */    _terminate() {
         return function(t) {
-            const e = Ze.get(t);
-            e && (w("ComponentProvider", "Removing Datastore"), Ze.delete(t), e.terminate());
+            const n = Xn.get(t);
+            n && (w("ComponentProvider", "Removing Datastore"), Xn.delete(t), n.terminate());
         }(this), Promise.resolve();
     }
 }
 
-function nn(t, e) {
-    const n = _getProvider(t, "firestore/lite");
-    if (n.isInitialized()) throw new L($, "Firestore can only be initialized once per app.");
-    return n.initialize({
-        options: e
+function re(t, n) {
+    const e = _getProvider(t, "firestore/lite");
+    if (e.isInitialized()) throw new L($, "Firestore can only be initialized once per app.");
+    return e.initialize({
+        options: n
     });
 }
 
@@ -3341,8 +3338,8 @@ function nn(t, e) {
  * @param app - The {@link @firebase/app#FirebaseApp} instance that the returned `Firestore`
  * instance is associated with.
  * @returns The `Firestore` instance of the provided app.
- */ function rn(e = t()) {
-    return _getProvider(e, "firestore/lite").getImmediate();
+ */ function se(n = getApp()) {
+    return _getProvider(n, "firestore/lite").getImmediate();
 }
 
 /**
@@ -3357,24 +3354,24 @@ function nn(t, e) {
  * @param port - the emulator port (ex: 9000).
  * @param options.mockUserToken - the mock auth token to use for unit testing
  * Security Rules.
- */ function sn(t, e, n, r = {}) {
+ */ function ie(t, n, e, r = {}) {
     var s;
-    const i = (t = rt(t, en))._getSettings();
-    if ("firestore.googleapis.com" !== i.host && i.host !== e && p("Host has been set in both settings() and useEmulator(), emulator host will be used"), 
+    const i = (t = rt(t, ee))._getSettings();
+    if ("firestore.googleapis.com" !== i.host && i.host !== n && p("Host has been set in both settings() and useEmulator(), emulator host will be used"), 
     t._setSettings(Object.assign(Object.assign({}, i), {
-        host: `${e}:${n}`,
+        host: `${n}:${e}`,
         ssl: !1
     })), r.mockUserToken) {
-        let e, n;
-        if ("string" == typeof r.mockUserToken) e = r.mockUserToken, n = h.MOCK_USER; else {
+        let n, e;
+        if ("string" == typeof r.mockUserToken) n = r.mockUserToken, e = h.MOCK_USER; else {
             // Let createMockUserToken validate first (catches common mistakes like
             // invalid field "uid" and missing field "sub" / "user_id".)
-            e = c(r.mockUserToken, null === (s = t._app) || void 0 === s ? void 0 : s.options.projectId);
+            n = createMockUserToken(r.mockUserToken, null === (s = t._app) || void 0 === s ? void 0 : s.options.projectId);
             const i = r.mockUserToken.sub || r.mockUserToken.user_id;
-            if (!i) throw new L(T, "mockUserToken must contain 'sub' or 'user_id' field!");
-            n = new h(i);
+            if (!i) throw new L(I, "mockUserToken must contain 'sub' or 'user_id' field!");
+            e = new h(i);
         }
-        t._credentials = new M(new j(e, n));
+        t._credentials = new B(new j(n, e));
     }
 }
 
@@ -3397,8 +3394,8 @@ function nn(t, e) {
  * @param firestore - The `Firestore` instance to terminate.
  * @returns A `Promise` that is resolved when the instance has been successfully
  * terminated.
- */ function on(t) {
-    return t = rt(t, en), e(t.app, "firestore/lite"), t._delete();
+ */ function oe(t) {
+    return t = rt(t, ee), _removeServiceInstance(t.app, "firestore/lite"), t._delete();
 }
 
 /**
@@ -3438,14 +3435,14 @@ function nn(t, e) {
  * and can be used to write, read, or listen to the location. The document at
  * the referenced location may or may not exist.
  */
-class un {
+class ue {
     /** @hideconstructor */
     constructor(t, 
     /**
      * If provided, the `FirestoreDataConverter` associated with this instance.
      */
-    e, n) {
-        this.converter = e, this._key = n, 
+    n, e) {
+        this.converter = n, this._key = e, 
         /** The type of this Firestore reference. */
         this.type = "document", this.firestore = t;
     }
@@ -3466,40 +3463,40 @@ class un {
     /**
      * The collection this `DocumentReference` belongs to.
      */    get parent() {
-        return new an(this.firestore, this.converter, this._key.path.popLast());
+        return new ae(this.firestore, this.converter, this._key.path.popLast());
     }
     withConverter(t) {
-        return new un(this.firestore, t, this._key);
+        return new ue(this.firestore, t, this._key);
     }
 }
 
 /**
  * A `Query` refers to a query which you can read or listen to. You can also
  * construct refined `Query` objects by adding filters and ordering.
- */ class cn {
+ */ class ce {
     // This is the lite version of the Query class in the main SDK.
     /** @hideconstructor protected */
     constructor(t, 
     /**
      * If provided, the `FirestoreDataConverter` associated with this instance.
      */
-    e, n) {
-        this.converter = e, this._query = n, 
+    n, e) {
+        this.converter = n, this._query = e, 
         /** The type of this Firestore reference. */
         this.type = "query", this.firestore = t;
     }
     withConverter(t) {
-        return new cn(this.firestore, t, this._query);
+        return new ce(this.firestore, t, this._query);
     }
 }
 
 /**
  * A `CollectionReference` object can be used for adding documents, getting
  * document references, and querying for documents (using {@link query}).
- */ class an extends cn {
+ */ class ae extends ce {
     /** @hideconstructor */
-    constructor(t, e, n) {
-        super(t, e, new re(n)), this._path = n, 
+    constructor(t, n, e) {
+        super(t, n, new rn(e)), this._path = e, 
         /** The type of this Firestore reference. */
         this.type = "collection";
     }
@@ -3517,23 +3514,23 @@ class un {
      * subcollection. If this isn't a subcollection, the reference is null.
      */    get parent() {
         const t = this._path.popLast();
-        return t.isEmpty() ? null : new un(this.firestore, 
+        return t.isEmpty() ? null : new ue(this.firestore, 
         /* converter= */ null, new Z(t));
     }
     withConverter(t) {
-        return new an(this.firestore, t, this._path);
+        return new ae(this.firestore, t, this._path);
     }
 }
 
-function hn(t, e, ...n) {
-    if (t = a(t), X("collection", "path", e), t instanceof en) {
-        const r = Y.fromString(e, ...n);
-        return et(r), new an(t, /* converter= */ null, r);
+function he(t, n, ...e) {
+    if (t = getModularInstance(t), X("collection", "path", n), t instanceof ee) {
+        const r = Y.fromString(n, ...e);
+        return nt(r), new ae(t, /* converter= */ null, r);
     }
     {
-        if (!(t instanceof un || t instanceof an)) throw new L(T, "Expected first argument to collection() to be a CollectionReference, a DocumentReference or FirebaseFirestore");
-        const r = t._path.child(Y.fromString(e, ...n));
-        return et(r), new an(t.firestore, 
+        if (!(t instanceof ue || t instanceof ae)) throw new L(I, "Expected first argument to collection() to be a CollectionReference, a DocumentReference or FirebaseFirestore");
+        const r = t._path.child(Y.fromString(n, ...e));
+        return nt(r), new ae(t.firestore, 
         /* converter= */ null, r);
     }
 }
@@ -3550,32 +3547,32 @@ function hn(t, e, ...n) {
  * collection or subcollection with this ID as the last segment of its path
  * will be included. Cannot contain a slash.
  * @returns The created `Query`.
- */ function ln(t, e) {
-    if (t = rt(t, en), X("collectionGroup", "collection id", e), e.indexOf("/") >= 0) throw new L(T, `Invalid collection ID '${e}' passed to function collectionGroup(). Collection IDs must not contain '/'.`);
-    return new cn(t, 
+ */ function le(t, n) {
+    if (t = rt(t, ee), X("collectionGroup", "collection id", n), n.indexOf("/") >= 0) throw new L(I, `Invalid collection ID '${n}' passed to function collectionGroup(). Collection IDs must not contain '/'.`);
+    return new ce(t, 
     /* converter= */ null, 
     /**
  * Creates a new Query for a collection group query that matches all documents
  * within the provided collection group.
  */
     function(t) {
-        return new re(Y.emptyPath(), t);
-    }(e));
+        return new rn(Y.emptyPath(), t);
+    }(n));
 }
 
-function fn(t, e, ...n) {
-    if (t = a(t), 
+function fe(t, n, ...e) {
+    if (t = getModularInstance(t), 
     // We allow omission of 'pathString' but explicitly prohibit passing in both
     // 'undefined' and 'null'.
-    1 === arguments.length && (e = dt.A()), X("doc", "path", e), t instanceof en) {
-        const r = Y.fromString(e, ...n);
-        return tt(r), new un(t, 
+    1 === arguments.length && (n = dt.A()), X("doc", "path", n), t instanceof ee) {
+        const r = Y.fromString(n, ...e);
+        return tt(r), new ue(t, 
         /* converter= */ null, new Z(r));
     }
     {
-        if (!(t instanceof un || t instanceof an)) throw new L(T, "Expected first argument to collection() to be a CollectionReference, a DocumentReference or FirebaseFirestore");
-        const r = t._path.child(Y.fromString(e, ...n));
-        return tt(r), new un(t.firestore, t instanceof an ? t.converter : null, new Z(r));
+        if (!(t instanceof ue || t instanceof ae)) throw new L(I, "Expected first argument to collection() to be a CollectionReference, a DocumentReference or FirebaseFirestore");
+        const r = t._path.child(Y.fromString(n, ...e));
+        return tt(r), new ue(t.firestore, t instanceof ae ? t.converter : null, new Z(r));
     }
 }
 
@@ -3586,8 +3583,8 @@ function fn(t, e, ...n) {
  * @param right - A reference to compare.
  * @returns true if the references point to the same location in the same
  * Firestore database.
- */ function dn(t, e) {
-    return t = a(t), e = a(e), (t instanceof un || t instanceof an) && (e instanceof un || e instanceof an) && (t.firestore === e.firestore && t.path === e.path && t.converter === e.converter);
+ */ function de(t, n) {
+    return t = getModularInstance(t), n = getModularInstance(n), (t instanceof ue || t instanceof ae) && (n instanceof ue || n instanceof ae) && (t.firestore === n.firestore && t.path === n.path && t.converter === n.converter);
 }
 
 /**
@@ -3598,8 +3595,8 @@ function fn(t, e, ...n) {
  * @param right - A `Query` to compare.
  * @returns true if the references point to the same location in the same
  * Firestore database.
- */ function wn(t, e) {
-    return t = a(t), e = a(e), t instanceof cn && e instanceof cn && (t.firestore === e.firestore && he(t._query, e._query) && t.converter === e.converter);
+ */ function we(t, n) {
+    return t = getModularInstance(t), n = getModularInstance(n), t instanceof ce && n instanceof ce && (t.firestore === n.firestore && ln(t._query, n._query) && t.converter === n.converter);
 }
 
 /**
@@ -3625,7 +3622,7 @@ function fn(t, e, ...n) {
  *
  * Create a `FieldPath` by providing field names. If more than one field
  * name is provided, the path will point to a nested field in a document.
- */ class mn {
+ */ class me {
     /**
      * Creates a `FieldPath` from the provided field names. If more than one field
      * name is provided, the path will point to a nested field in a document.
@@ -3633,7 +3630,7 @@ function fn(t, e, ...n) {
      * @param fieldNames - A list of field names.
      */
     constructor(...t) {
-        for (let e = 0; e < t.length; ++e) if (0 === t[e].length) throw new L(T, "Invalid field name at argument $(i + 1). Field names must not be empty.");
+        for (let n = 0; n < t.length; ++n) if (0 === t[n].length) throw new L(I, "Invalid field name at argument $(i + 1). Field names must not be empty.");
         this._internalPath = new J(t);
     }
     /**
@@ -3649,8 +3646,8 @@ function fn(t, e, ...n) {
 /**
  * Returns a special sentinel `FieldPath` to refer to the ID of a document.
  * It can be used in queries to sort or filter by the document ID.
- */ function pn() {
-    return new mn("__name__");
+ */ function pe() {
+    return new me("__name__");
 }
 
 /**
@@ -3671,7 +3668,7 @@ function fn(t, e, ...n) {
  */
 /**
  * An immutable object representing an array of bytes.
- */ class yn {
+ */ class ye {
     /** @hideconstructor */
     constructor(t) {
         this._byteString = t;
@@ -3683,9 +3680,9 @@ function fn(t, e, ...n) {
      * @param base64 - The Base64 string used to create the `Bytes` object.
      */    static fromBase64String(t) {
         try {
-            return new yn(vt.fromBase64String(t));
+            return new ye(vt.fromBase64String(t));
         } catch (t) {
-            throw new L(T, "Failed to construct data from Base64 string: " + t);
+            throw new L(I, "Failed to construct data from Base64 string: " + t);
         }
     }
     /**
@@ -3693,7 +3690,7 @@ function fn(t, e, ...n) {
      *
      * @param array - The Uint8Array used to create the `Bytes` object.
      */    static fromUint8Array(t) {
-        return new yn(vt.fromUint8Array(t));
+        return new ye(vt.fromUint8Array(t));
     }
     /**
      * Returns the underlying bytes as a Base64-encoded string.
@@ -3745,7 +3742,7 @@ function fn(t, e, ...n) {
 /**
  * Sentinel values that can be used when writing document fields with `set()`
  * or `update()`.
- */ class _n {
+ */ class _e {
     /**
      * @param _methodName - The public API endpoint that returns this class.
      * @hideconstructor
@@ -3777,17 +3774,17 @@ function fn(t, e, ...n) {
  *
  * Latitude values are in the range of [-90, 90].
  * Longitude values are in the range of [-180, 180].
- */ class gn {
+ */ class ge {
     /**
      * Creates a new immutable `GeoPoint` object with the provided latitude and
      * longitude values.
      * @param latitude - The latitude as number between -90 and 90.
      * @param longitude - The longitude as number between -180 and 180.
      */
-    constructor(t, e) {
-        if (!isFinite(t) || t < -90 || t > 90) throw new L(T, "Latitude must be a number between -90 and 90, but was: " + t);
-        if (!isFinite(e) || e < -180 || e > 180) throw new L(T, "Longitude must be a number between -180 and 180, but was: " + e);
-        this._lat = t, this._long = e;
+    constructor(t, n) {
+        if (!isFinite(t) || t < -90 || t > 90) throw new L(I, "Latitude must be a number between -90 and 90, but was: " + t);
+        if (!isFinite(n) || n < -180 || n > 180) throw new L(I, "Longitude must be a number between -180 and 180, but was: " + n);
+        this._lat = t, this._long = n;
     }
     /**
      * The latitude of this `GeoPoint` instance.
@@ -3836,29 +3833,29 @@ function fn(t, e, ...n) {
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */ const bn = /^__.*__$/;
+ */ const be = /^__.*__$/;
 
-/** The result of parsing document data (e.g. for a setData call). */ class vn {
-    constructor(t, e, n) {
-        this.data = t, this.fieldMask = e, this.fieldTransforms = n;
+/** The result of parsing document data (e.g. for a setData call). */ class ve {
+    constructor(t, n, e) {
+        this.data = t, this.fieldMask = n, this.fieldTransforms = e;
     }
-    toMutation(t, e) {
-        return null !== this.fieldMask ? new ve(t, this.data, this.fieldMask, e, this.fieldTransforms) : new be(t, this.data, e, this.fieldTransforms);
+    toMutation(t, n) {
+        return null !== this.fieldMask ? new En(t, this.data, this.fieldMask, n, this.fieldTransforms) : new vn(t, this.data, n, this.fieldTransforms);
     }
 }
 
-/** The result of parsing "update" data (i.e. for an updateData call). */ class En {
+/** The result of parsing "update" data (i.e. for an updateData call). */ class Ee {
     constructor(t, 
     // The fieldMask does not include document transforms.
-    e, n) {
-        this.data = t, this.fieldMask = e, this.fieldTransforms = n;
+    n, e) {
+        this.data = t, this.fieldMask = n, this.fieldTransforms = e;
     }
-    toMutation(t, e) {
-        return new ve(t, this.data, this.fieldMask, e, this.fieldTransforms);
+    toMutation(t, n) {
+        return new En(t, this.data, this.fieldMask, n, this.fieldTransforms);
     }
 }
 
-function In(t) {
+function Te(t) {
     switch (t) {
       case 0 /* Set */ :
  // fall through
@@ -3876,7 +3873,7 @@ function In(t) {
     }
 }
 
-/** A "context" object passed around while parsing user data. */ class Tn {
+/** A "context" object passed around while parsing user data. */ class Ie {
     /**
      * Initializes a ParseContext with the given source and path.
      *
@@ -3895,8 +3892,8 @@ function In(t) {
      * which case certain features will not work and errors will be somewhat
      * compromised).
      */
-    constructor(t, e, n, r, s, i) {
-        this.settings = t, this.databaseId = e, this.S = n, this.ignoreUndefinedProperties = r, 
+    constructor(t, n, e, r, s, i) {
+        this.settings = t, this.databaseId = n, this.S = e, this.ignoreUndefinedProperties = r, 
         // Minor hack: If fieldTransforms is undefined, we assume this is an
         // external call and we need to validate the entire path.
         void 0 === s && this.Z(), this.fieldTransforms = s || [], this.fieldMask = i || [];
@@ -3908,21 +3905,21 @@ function In(t) {
         return this.settings.X;
     }
     /** Returns a new context with the specified settings overwritten. */    tt(t) {
-        return new Tn(Object.assign(Object.assign({}, this.settings), t), this.databaseId, this.S, this.ignoreUndefinedProperties, this.fieldTransforms, this.fieldMask);
+        return new Ie(Object.assign(Object.assign({}, this.settings), t), this.databaseId, this.S, this.ignoreUndefinedProperties, this.fieldTransforms, this.fieldMask);
     }
-    et(t) {
-        var e;
-        const n = null === (e = this.path) || void 0 === e ? void 0 : e.child(t), r = this.tt({
-            path: n,
-            nt: !1
+    nt(t) {
+        var n;
+        const e = null === (n = this.path) || void 0 === n ? void 0 : n.child(t), r = this.tt({
+            path: e,
+            et: !1
         });
         return r.rt(t), r;
     }
     st(t) {
-        var e;
-        const n = null === (e = this.path) || void 0 === e ? void 0 : e.child(t), r = this.tt({
-            path: n,
-            nt: !1
+        var n;
+        const e = null === (n = this.path) || void 0 === n ? void 0 : n.child(t), r = this.tt({
+            path: e,
+            et: !1
         });
         return r.Z(), r;
     }
@@ -3931,14 +3928,14 @@ function In(t) {
         // undefined.
         return this.tt({
             path: void 0,
-            nt: !0
+            et: !0
         });
     }
     ot(t) {
-        return Qn(t, this.settings.methodName, this.settings.ut || !1, this.path, this.settings.ct);
+        return Qe(t, this.settings.methodName, this.settings.ut || !1, this.path, this.settings.ct);
     }
     /** Returns 'true' if 'fieldPath' was traversed when creating this context. */    contains(t) {
-        return void 0 !== this.fieldMask.find((e => t.isPrefixOf(e))) || void 0 !== this.fieldTransforms.find((e => t.isPrefixOf(e.field)));
+        return void 0 !== this.fieldMask.find((n => t.isPrefixOf(n))) || void 0 !== this.fieldTransforms.find((n => t.isPrefixOf(n.field)));
     }
     Z() {
         // TODO(b/34871131): Remove null check once we have proper paths for fields
@@ -3947,52 +3944,52 @@ function In(t) {
     }
     rt(t) {
         if (0 === t.length) throw this.ot("Document fields must not be empty");
-        if (In(this.X) && bn.test(t)) throw this.ot('Document fields cannot begin and end with "__"');
+        if (Te(this.X) && be.test(t)) throw this.ot('Document fields cannot begin and end with "__"');
     }
 }
 
 /**
  * Helper for parsing raw user input (provided via the API) into internal model
  * classes.
- */ class An {
-    constructor(t, e, n) {
-        this.databaseId = t, this.ignoreUndefinedProperties = e, this.S = n || We(t);
+ */ class Ae {
+    constructor(t, n, e) {
+        this.databaseId = t, this.ignoreUndefinedProperties = n, this.S = e || Wn(t);
     }
-    /** Creates a new top-level parse context. */    at(t, e, n, r = !1) {
-        return new Tn({
+    /** Creates a new top-level parse context. */    at(t, n, e, r = !1) {
+        return new Ie({
             X: t,
-            methodName: e,
-            ct: n,
+            methodName: n,
+            ct: e,
             path: J.emptyPath(),
-            nt: !1,
+            et: !1,
             ut: r
         }, this.databaseId, this.S, this.ignoreUndefinedProperties);
     }
 }
 
-function Pn(t) {
-    const e = t._freezeSettings(), n = We(t._databaseId);
-    return new An(t._databaseId, !!e.ignoreUndefinedProperties, n);
+function Pe(t) {
+    const n = t._freezeSettings(), e = Wn(t._databaseId);
+    return new Ae(t._databaseId, !!n.ignoreUndefinedProperties, e);
 }
 
-/** Parse document data from a set() call. */ function Rn(t, e, n, r, s, i = {}) {
-    const o = t.at(i.merge || i.mergeFields ? 2 /* MergeSet */ : 0 /* Set */ , e, n, s);
-    jn("Data must be an object, but it was:", o, r);
-    const u = Ln(r, o);
+/** Parse document data from a set() call. */ function Re(t, n, e, r, s, i = {}) {
+    const o = t.at(i.merge || i.mergeFields ? 2 /* MergeSet */ : 0 /* Set */ , n, e, s);
+    je("Data must be an object, but it was:", o, r);
+    const u = Le(r, o);
     let c, a;
     if (i.merge) c = new bt(o.fieldMask), a = o.fieldTransforms; else if (i.mergeFields) {
         const t = [];
         for (const r of i.mergeFields) {
-            const s = kn(e, r, n);
-            if (!o.contains(s)) throw new L(T, `Field '${s}' is specified in your field mask but missing from your input data.`);
-            zn(t, s) || t.push(s);
+            const s = ke(n, r, e);
+            if (!o.contains(s)) throw new L(I, `Field '${s}' is specified in your field mask but missing from your input data.`);
+            ze(t, s) || t.push(s);
         }
         c = new bt(t), a = o.fieldTransforms.filter((t => c.covers(t.field)));
     } else c = null, a = o.fieldTransforms;
-    return new vn(new jt(u), c, a);
+    return new ve(new jt(u), c, a);
 }
 
-class Vn extends _n {
+class Ve extends _e {
     _toFieldTransform(t) {
         if (2 /* MergeSet */ !== t.X) throw 1 /* Update */ === t.X ? t.ot(`${this._methodName}() can only appear at the top level of your update data`) : t.ot(`${this._methodName}() cannot be used with set() unless you pass {merge:true}`);
         // No transform to add for a delete, but we need to add it to our
@@ -4000,7 +3997,7 @@ class Vn extends _n {
         return t.fieldMask.push(t.path), null;
     }
     isEqual(t) {
-        return t instanceof Vn;
+        return t instanceof Ve;
     }
 }
 
@@ -4019,32 +4016,32 @@ class Vn extends _n {
  *     context.
  * @param context - The parent context.
  * @param arrayElement - Whether or not the FieldValue has an array.
- */ function Nn(t, e, n) {
-    return new Tn({
+ */ function De(t, n, e) {
+    return new Ie({
         X: 3 /* Argument */ ,
-        ct: e.settings.ct,
+        ct: n.settings.ct,
         methodName: t._methodName,
-        nt: n
-    }, e.databaseId, e.S, e.ignoreUndefinedProperties);
+        et: e
+    }, n.databaseId, n.S, n.ignoreUndefinedProperties);
 }
 
-class Dn extends _n {
+class Ne extends _e {
     _toFieldTransform(t) {
-        return new ye(t.path, new de);
+        return new _n(t.path, new wn);
     }
     isEqual(t) {
-        return t instanceof Dn;
+        return t instanceof Ne;
     }
 }
 
-class $n extends _n {
-    constructor(t, e) {
-        super(t), this.ht = e;
+class $e extends _e {
+    constructor(t, n) {
+        super(t), this.ht = n;
     }
     _toFieldTransform(t) {
-        const e = Nn(this, t, 
-        /*array=*/ !0), n = this.ht.map((t => Cn(t, e))), r = new we(n);
-        return new ye(t.path, r);
+        const n = De(this, t, 
+        /*array=*/ !0), e = this.ht.map((t => Ce(t, n))), r = new mn(e);
+        return new _n(t.path, r);
     }
     isEqual(t) {
         // TODO(mrschmidt): Implement isEquals
@@ -4052,14 +4049,14 @@ class $n extends _n {
     }
 }
 
-class Fn extends _n {
-    constructor(t, e) {
-        super(t), this.ht = e;
+class Fe extends _e {
+    constructor(t, n) {
+        super(t), this.ht = n;
     }
     _toFieldTransform(t) {
-        const e = Nn(this, t, 
-        /*array=*/ !0), n = this.ht.map((t => Cn(t, e))), r = new me(n);
-        return new ye(t.path, r);
+        const n = De(this, t, 
+        /*array=*/ !0), e = this.ht.map((t => Ce(t, n))), r = new pn(e);
+        return new _n(t.path, r);
     }
     isEqual(t) {
         // TODO(mrschmidt): Implement isEquals
@@ -4067,13 +4064,13 @@ class Fn extends _n {
     }
 }
 
-class Sn extends _n {
-    constructor(t, e) {
-        super(t), this.lt = e;
+class Se extends _e {
+    constructor(t, n) {
+        super(t), this.lt = n;
     }
     _toFieldTransform(t) {
-        const e = new pe(t.S, le(t.S, this.lt));
-        return new ye(t.path, e);
+        const n = new yn(t.S, fn(t.S, this.lt));
+        return new _n(t.path, n);
     }
     isEqual(t) {
         // TODO(mrschmidt): Implement isEquals
@@ -4081,50 +4078,50 @@ class Sn extends _n {
     }
 }
 
-/** Parse update data from an update() call. */ function qn(t, e, n, r) {
-    const s = t.at(1 /* Update */ , e, n);
-    jn("Data must be an object, but it was:", s, r);
+/** Parse update data from an update() call. */ function qe(t, n, e, r) {
+    const s = t.at(1 /* Update */ , n, e);
+    je("Data must be an object, but it was:", s, r);
     const i = [], o = jt.empty();
     gt(r, ((t, r) => {
-        const u = Bn(e, t, n);
+        const u = Me(n, t, e);
         // For Compat types, we have to "extract" the underlying types before
         // performing validation.
-                r = a(r);
+                r = getModularInstance(r);
         const c = s.st(u);
-        if (r instanceof Vn) 
+        if (r instanceof Ve) 
         // Add it to the field mask, but don't add anything to updateData.
         i.push(u); else {
-            const t = Cn(r, c);
+            const t = Ce(r, c);
             null != t && (i.push(u), o.set(u, t));
         }
     }));
     const u = new bt(i);
-    return new En(o, u, s.fieldTransforms);
+    return new Ee(o, u, s.fieldTransforms);
 }
 
-/** Parse update data from a list of field/value arguments. */ function xn(t, e, n, r, s, i) {
-    const o = t.at(1 /* Update */ , e, n), u = [ kn(e, r, n) ], c = [ s ];
-    if (i.length % 2 != 0) throw new L(T, `Function ${e}() needs to be called with an even number of arguments that alternate between field names and values.`);
-    for (let t = 0; t < i.length; t += 2) u.push(kn(e, i[t])), c.push(i[t + 1]);
+/** Parse update data from a list of field/value arguments. */ function xe(t, n, e, r, s, i) {
+    const o = t.at(1 /* Update */ , n, e), u = [ ke(n, r, e) ], c = [ s ];
+    if (i.length % 2 != 0) throw new L(I, `Function ${n}() needs to be called with an even number of arguments that alternate between field names and values.`);
+    for (let t = 0; t < i.length; t += 2) u.push(ke(n, i[t])), c.push(i[t + 1]);
     const h = [], l = jt.empty();
     // We iterate in reverse order to pick the last value for a field if the
     // user specified the field multiple times.
-    for (let t = u.length - 1; t >= 0; --t) if (!zn(h, u[t])) {
-        const e = u[t];
-        let n = c[t];
+    for (let t = u.length - 1; t >= 0; --t) if (!ze(h, u[t])) {
+        const n = u[t];
+        let e = c[t];
         // For Compat types, we have to "extract" the underlying types before
         // performing validation.
-                n = a(n);
-        const r = o.st(e);
-        if (n instanceof Vn) 
+                e = getModularInstance(e);
+        const r = o.st(n);
+        if (e instanceof Ve) 
         // Add it to the field mask, but don't add anything to updateData.
-        h.push(e); else {
-            const t = Cn(n, r);
-            null != t && (h.push(e), l.set(e, t));
+        h.push(n); else {
+            const t = Ce(e, r);
+            null != t && (h.push(n), l.set(n, t));
         }
     }
     const f = new bt(h);
-    return new En(l, f, o.fieldTransforms);
+    return new Ee(l, f, o.fieldTransforms);
 }
 
 /**
@@ -4133,8 +4130,8 @@ class Sn extends _n {
  *
  * @param allowArrays - Whether the query value is an array that may directly
  * contain additional arrays (e.g. the operand of an `in` query).
- */ function On(t, e, n, r = !1) {
-    return Cn(n, t.at(r ? 4 /* ArrayArgument */ : 3 /* Argument */ , e));
+ */ function Oe(t, n, e, r = !1) {
+    return Ce(e, t.at(r ? 4 /* ArrayArgument */ : 3 /* Argument */ , n));
 }
 
 /**
@@ -4145,12 +4142,12 @@ class Sn extends _n {
  * the source of the data being parsed, etc.
  * @returns The parsed value, or null if the value was a FieldValue sentinel
  * that should not be included in the resulting parsed data.
- */ function Cn(t, e) {
-    if (Un(
+ */ function Ce(t, n) {
+    if (Ue(
     // Unwrap the API type from the Compat SDK. This will return the API type
     // from firestore-exp.
-    t = a(t))) return jn("Unsupported field value:", e, t), Ln(t, e);
-    if (t instanceof _n) 
+    t = getModularInstance(t))) return je("Unsupported field value:", n, t), Le(t, n);
+    if (t instanceof _e) 
     // FieldValues usually parse into transforms (except FieldValue.delete())
     // in which case we do not want to include this field in our parsed data
     // (as doing so will overwrite the field directly prior to the transform
@@ -4160,19 +4157,19 @@ class Sn extends _n {
  * "Parses" the provided FieldValueImpl, adding any necessary transforms to
  * context.fieldTransforms.
  */
-    return function(t, e) {
+    return function(t, n) {
         // Sentinels are only supported with writes, and not within arrays.
-        if (!In(e.X)) throw e.ot(`${t._methodName}() can only be used with update() and set()`);
-        if (!e.path) throw e.ot(`${t._methodName}() is not currently supported inside arrays`);
-        const n = t._toFieldTransform(e);
-        n && e.fieldTransforms.push(n);
+        if (!Te(n.X)) throw n.ot(`${t._methodName}() can only be used with update() and set()`);
+        if (!n.path) throw n.ot(`${t._methodName}() is not currently supported inside arrays`);
+        const e = t._toFieldTransform(n);
+        e && n.fieldTransforms.push(e);
     }
     /**
  * Helper to parse a scalar value (i.e. not an Object, Array, or FieldValue)
  *
  * @returns The parsed value
- */ (t, e), null;
-    if (void 0 === t && e.ignoreUndefinedProperties) 
+ */ (t, n), null;
+    if (void 0 === t && n.ignoreUndefinedProperties) 
     // If the input is undefined it can never participate in the fieldMask, so
     // don't handle this below. If `ignoreUndefinedProperties` is false,
     // `parseScalarValue` will reject an undefined value.
@@ -4180,38 +4177,38 @@ class Sn extends _n {
     if (
     // If context.path is null we are inside an array and we don't support
     // field mask paths more granular than the top-level array.
-    e.path && e.fieldMask.push(e.path), t instanceof Array) {
+    n.path && n.fieldMask.push(n.path), t instanceof Array) {
         // TODO(b/34871131): Include the path containing the array in the error
         // message.
         // In the case of IN queries, the parsed data is an array (representing
         // the set of values to be included for the IN query) that may directly
         // contain additional arrays (each representing an individual field
         // value), so we disable this validation.
-        if (e.settings.nt && 4 /* ArrayArgument */ !== e.X) throw e.ot("Nested arrays are not supported");
-        return function(t, e) {
-            const n = [];
+        if (n.settings.et && 4 /* ArrayArgument */ !== n.X) throw n.ot("Nested arrays are not supported");
+        return function(t, n) {
+            const e = [];
             let r = 0;
             for (const s of t) {
-                let t = Cn(s, e.it(r));
+                let t = Ce(s, n.it(r));
                 null == t && (
                 // Just include nulls in the array for fields being replaced with a
                 // sentinel.
                 t = {
                     nullValue: "NULL_VALUE"
-                }), n.push(t), r++;
+                }), e.push(t), r++;
             }
             return {
                 arrayValue: {
-                    values: n
+                    values: e
                 }
             };
-        }(t, e);
+        }(t, n);
     }
-    return function(t, e) {
-        if (null === (t = a(t))) return {
+    return function(t, n) {
+        if (null === (t = getModularInstance(t))) return {
             nullValue: "NULL_VALUE"
         };
-        if ("number" == typeof t) return le(e.S, t);
+        if ("number" == typeof t) return fn(n.S, t);
         if ("boolean" == typeof t) return {
             booleanValue: t
         };
@@ -4219,37 +4216,37 @@ class Sn extends _n {
             stringValue: t
         };
         if (t instanceof Date) {
-            const n = pt.fromDate(t);
+            const e = pt.fromDate(t);
             return {
-                timestampValue: Re(e.S, n)
+                timestampValue: Vn(n.S, e)
             };
         }
         if (t instanceof pt) {
             // Firestore backend truncates precision down to microseconds. To ensure
             // offline mode works the same with regards to truncation, perform the
             // truncation immediately without waiting for the backend to do that.
-            const n = new pt(t.seconds, 1e3 * Math.floor(t.nanoseconds / 1e3));
+            const e = new pt(t.seconds, 1e3 * Math.floor(t.nanoseconds / 1e3));
             return {
-                timestampValue: Re(e.S, n)
+                timestampValue: Vn(n.S, e)
             };
         }
-        if (t instanceof gn) return {
+        if (t instanceof ge) return {
             geoPointValue: {
                 latitude: t.latitude,
                 longitude: t.longitude
             }
         };
-        if (t instanceof yn) return {
-            bytesValue: Ve(e.S, t._byteString)
+        if (t instanceof ye) return {
+            bytesValue: Dn(n.S, t._byteString)
         };
-        if (t instanceof un) {
-            const n = e.databaseId, r = t.firestore._databaseId;
-            if (!r.isEqual(n)) throw e.ot(`Document reference is for database ${r.projectId}/${r.database} but should be for database ${n.projectId}/${n.database}`);
+        if (t instanceof ue) {
+            const e = n.databaseId, r = t.firestore._databaseId;
+            if (!r.isEqual(e)) throw n.ot(`Document reference is for database ${r.projectId}/${r.database} but should be for database ${e.projectId}/${e.database}`);
             return {
-                referenceValue: $e(t.firestore._databaseId || e.databaseId, t._key.path)
+                referenceValue: Fn(t.firestore._databaseId || n.databaseId, t._key.path)
             };
         }
-        throw e.ot(`Unsupported field value: ${nt(t)}`);
+        throw n.ot(`Unsupported field value: ${et(t)}`);
     }
     /**
  * Checks whether an object looks like a JSON object that should be converted
@@ -4257,56 +4254,56 @@ class Sn extends _n {
  * JSON objects since they should be converted to a struct value. Arrays, Dates,
  * GeoPoints, etc. are not considered to look like JSON objects since they map
  * to specific FieldValue types other than ObjectValue.
- */ (t, e);
+ */ (t, n);
 }
 
-function Ln(t, e) {
-    const n = {};
+function Le(t, n) {
+    const e = {};
     return !function(t) {
-        for (const e in t) if (Object.prototype.hasOwnProperty.call(t, e)) return !1;
+        for (const n in t) if (Object.prototype.hasOwnProperty.call(t, n)) return !1;
         return !0;
     }(t) ? gt(t, ((t, r) => {
-        const s = Cn(r, e.et(t));
-        null != s && (n[t] = s);
+        const s = Ce(r, n.nt(t));
+        null != s && (e[t] = s);
     })) : 
     // If we encounter an empty object, we explicitly add it to the update
     // mask to ensure that the server creates a map entry.
-    e.path && e.path.length > 0 && e.fieldMask.push(e.path), {
+    n.path && n.path.length > 0 && n.fieldMask.push(n.path), {
         mapValue: {
-            fields: n
+            fields: e
         }
     };
 }
 
-function Un(t) {
-    return !("object" != typeof t || null === t || t instanceof Array || t instanceof Date || t instanceof pt || t instanceof gn || t instanceof yn || t instanceof un || t instanceof _n);
+function Ue(t) {
+    return !("object" != typeof t || null === t || t instanceof Array || t instanceof Date || t instanceof pt || t instanceof ge || t instanceof ye || t instanceof ue || t instanceof _e);
 }
 
-function jn(t, e, n) {
-    if (!Un(n) || !function(t) {
+function je(t, n, e) {
+    if (!Ue(e) || !function(t) {
         return "object" == typeof t && null !== t && (Object.getPrototypeOf(t) === Object.prototype || null === Object.getPrototypeOf(t));
-    }(n)) {
-        const r = nt(n);
-        throw "an object" === r ? e.ot(t + " a custom object") : e.ot(t + " " + r);
+    }(e)) {
+        const r = et(e);
+        throw "an object" === r ? n.ot(t + " a custom object") : n.ot(t + " " + r);
     }
 }
 
 /**
  * Helper that calls fromDotSeparatedString() but wraps any error thrown.
- */ function kn(t, e, n) {
+ */ function ke(t, n, e) {
     if ((
     // If required, replace the FieldPath Compat class with with the firestore-exp
     // FieldPath.
-    e = a(e)) instanceof mn) return e._internalPath;
-    if ("string" == typeof e) return Bn(t, e);
-    throw Qn("Field path arguments must be of type string or FieldPath.", t, 
+    n = getModularInstance(n)) instanceof me) return n._internalPath;
+    if ("string" == typeof n) return Me(t, n);
+    throw Qe("Field path arguments must be of type string or FieldPath.", t, 
     /* hasConverter= */ !1, 
-    /* path= */ void 0, n);
+    /* path= */ void 0, e);
 }
 
 /**
  * Matches any characters in a field path string that are reserved.
- */ const Mn = new RegExp("[~\\*/\\[\\]]");
+ */ const Be = new RegExp("[~\\*/\\[\\]]");
 
 /**
  * Wraps fromDotSeparatedString with an error message about the method that
@@ -4316,30 +4313,30 @@ function jn(t, e, n) {
  * split on dots.
  * @param targetDoc - The document against which the field path will be
  * evaluated.
- */ function Bn(t, e, n) {
-    if (e.search(Mn) >= 0) throw Qn(`Invalid field path (${e}). Paths must not contain '~', '*', '/', '[', or ']'`, t, 
+ */ function Me(t, n, e) {
+    if (n.search(Be) >= 0) throw Qe(`Invalid field path (${n}). Paths must not contain '~', '*', '/', '[', or ']'`, t, 
     /* hasConverter= */ !1, 
-    /* path= */ void 0, n);
+    /* path= */ void 0, e);
     try {
-        return new mn(...e.split("."))._internalPath;
+        return new me(...n.split("."))._internalPath;
     } catch (r) {
-        throw Qn(`Invalid field path (${e}). Paths must not be empty, begin with '.', end with '.', or contain '..'`, t, 
+        throw Qe(`Invalid field path (${n}). Paths must not be empty, begin with '.', end with '.', or contain '..'`, t, 
         /* hasConverter= */ !1, 
-        /* path= */ void 0, n);
+        /* path= */ void 0, e);
     }
 }
 
-function Qn(t, e, n, r, s) {
+function Qe(t, n, e, r, s) {
     const i = r && !r.isEmpty(), o = void 0 !== s;
-    let u = `Function ${e}() called with invalid data`;
-    n && (u += " (via `toFirestore()`)"), u += ". ";
+    let u = `Function ${n}() called with invalid data`;
+    e && (u += " (via `toFirestore()`)"), u += ". ";
     let c = "";
     return (i || o) && (c += " (found", i && (c += ` in field ${r}`), o && (c += ` in document ${s}`), 
-    c += ")"), new L(T, u + t + c);
+    c += ")"), new L(I, u + t + c);
 }
 
-/** Checks `haystack` if FieldPath `needle` is present. Runs in O(n). */ function zn(t, e) {
-    return t.some((t => t.isEqual(e)));
+/** Checks `haystack` if FieldPath `needle` is present. Runs in O(n). */ function ze(t, n) {
+    return t.some((t => t.isEqual(n)));
 }
 
 /**
@@ -4366,14 +4363,14 @@ function Qn(t, e, n, r, s) {
  * For a `DocumentSnapshot` that points to a non-existing document, any data
  * access will return 'undefined'. You can use the `exists()` method to
  * explicitly verify a document's existence.
- */ class Wn {
+ */ class Ge {
     // Note: This class is stripped down version of the DocumentSnapshot in
     // the legacy SDK. The changes are:
     // - No support for SnapshotMetadata.
     // - No support for SnapshotOptions.
     /** @hideconstructor protected */
-    constructor(t, e, n, r, s) {
-        this._firestore = t, this._userDataWriter = e, this._key = n, this._document = r, 
+    constructor(t, n, e, r, s) {
+        this._firestore = t, this._userDataWriter = n, this._key = e, this._document = r, 
         this._converter = s;
     }
     /** Property of the `DocumentSnapshot` that provides the document's ID. */    get id() {
@@ -4382,7 +4379,7 @@ function Qn(t, e, n, r, s) {
     /**
      * The `DocumentReference` for the document included in the `DocumentSnapshot`.
      */    get ref() {
-        return new un(this._firestore, this._converter, this._key);
+        return new ue(this._firestore, this._converter, this._key);
     }
     /**
      * Signals whether or not the document at the snapshot's location exists.
@@ -4402,7 +4399,7 @@ function Qn(t, e, n, r, s) {
             if (this._converter) {
                 // We only want to use the converter and create a new DocumentSnapshot
                 // if a converter has been provided.
-                const t = new Gn(this._firestore, this._userDataWriter, this._key, this._document, 
+                const t = new We(this._firestore, this._userDataWriter, this._key, this._document, 
                 /* converter= */ null);
                 return this._converter.fromFirestore(t);
             }
@@ -4422,8 +4419,8 @@ function Qn(t, e, n, r, s) {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     get(t) {
         if (this._document) {
-            const e = this._document.data.field(Kn("DocumentSnapshot.get", t));
-            if (null !== e) return this._userDataWriter.convertValue(e);
+            const n = this._document.data.field(Ke("DocumentSnapshot.get", t));
+            if (null !== n) return this._userDataWriter.convertValue(n);
         }
     }
 }
@@ -4438,7 +4435,7 @@ function Qn(t, e, n, r, s) {
  * `DocumentSnapshot`. Since query results contain only existing documents, the
  * `exists` property will always be true and `data()` will never return
  * 'undefined'.
- */ class Gn extends Wn {
+ */ class We extends Ge {
     /**
      * Retrieves all fields in the document as an `Object`.
      *
@@ -4456,10 +4453,10 @@ function Qn(t, e, n, r, s) {
  * array via the `docs` property or enumerated using the `forEach` method. The
  * number of documents can be determined via the `empty` and `size`
  * properties.
- */ class Hn {
+ */ class He {
     /** @hideconstructor */
-    constructor(t, e) {
-        this._docs = e, this.query = t;
+    constructor(t, n) {
+        this._docs = n, this.query = t;
     }
     /** An array of all the documents in the `QuerySnapshot`. */    get docs() {
         return [ ...this._docs ];
@@ -4476,8 +4473,8 @@ function Qn(t, e, n, r, s) {
      * @param callback - A callback to be called with a `QueryDocumentSnapshot` for
      * each document in the snapshot.
      * @param thisArg - The `this` binding for the callback.
-     */    forEach(t, e) {
-        this._docs.forEach(t, e);
+     */    forEach(t, n) {
+        this._docs.forEach(t, n);
     }
 }
 
@@ -4487,14 +4484,14 @@ function Qn(t, e, n, r, s) {
  * @param left - A snapshot to compare.
  * @param right - A snapshot to compare.
  * @returns true if the snapshots are equal.
- */ function Yn(t, e) {
-    return t = a(t), e = a(e), t instanceof Wn && e instanceof Wn ? t._firestore === e._firestore && t._key.isEqual(e._key) && (null === t._document ? null === e._document : t._document.isEqual(e._document)) && t._converter === e._converter : t instanceof Hn && e instanceof Hn && (wn(t.query, e.query) && mt(t.docs, e.docs, Yn));
+ */ function Ye(t, n) {
+    return t = getModularInstance(t), n = getModularInstance(n), t instanceof Ge && n instanceof Ge ? t._firestore === n._firestore && t._key.isEqual(n._key) && (null === t._document ? null === n._document : t._document.isEqual(n._document)) && t._converter === n._converter : t instanceof He && n instanceof He && (we(t.query, n.query) && mt(t.docs, n.docs, Ye));
 }
 
 /**
  * Helper that calls `fromDotSeparatedString()` but wraps any error thrown.
- */ function Kn(t, e) {
-    return "string" == typeof e ? Bn(t, e) : e instanceof mn ? e._internalPath : e._delegate._internalPath;
+ */ function Ke(t, n) {
+    return "string" == typeof n ? Me(t, n) : n instanceof me ? n._internalPath : n._delegate._internalPath;
 }
 
 /**
@@ -4521,7 +4518,7 @@ function Qn(t, e, n, r, s) {
  * can then be passed to {@link query} to create a new query instance that
  * also contains this `QueryConstraint`.
  */
-class Jn {}
+class Je {}
 
 /**
  * Creates a new immutable instance of {@link Query} that is extended to also include
@@ -4531,43 +4528,43 @@ class Jn {}
  * @param queryConstraints - The list of {@link QueryConstraint}s to apply.
  * @throws if any of the provided query constraints cannot be combined with the
  * existing or new constraints.
- */ function Zn(t, ...e) {
-    for (const n of e) t = n._apply(t);
+ */ function Ze(t, ...n) {
+    for (const e of n) t = e._apply(t);
     return t;
 }
 
-class Xn extends Jn {
-    constructor(t, e, n) {
-        super(), this.ft = t, this.dt = e, this.wt = n, this.type = "where";
+class Xe extends Je {
+    constructor(t, n, e) {
+        super(), this.ft = t, this.dt = n, this.wt = e, this.type = "where";
     }
     _apply(t) {
-        const e = Pn(t.firestore), n = function(t, e, n, r, s, i, o) {
+        const n = Pe(t.firestore), e = function(t, n, e, r, s, i, o) {
             let u;
             if (s.isKeyField()) {
-                if ("array-contains" /* ARRAY_CONTAINS */ === i || "array-contains-any" /* ARRAY_CONTAINS_ANY */ === i) throw new L(T, `Invalid Query. You can't perform '${i}' queries on FieldPath.documentId().`);
+                if ("array-contains" /* ARRAY_CONTAINS */ === i || "array-contains-any" /* ARRAY_CONTAINS_ANY */ === i) throw new L(I, `Invalid Query. You can't perform '${i}' queries on FieldPath.documentId().`);
                 if ("in" /* IN */ === i || "not-in" /* NOT_IN */ === i) {
                     wr(o, i);
-                    const e = [];
-                    for (const n of o) e.push(dr(r, t, n));
+                    const n = [];
+                    for (const e of o) n.push(dr(r, t, e));
                     u = {
                         arrayValue: {
-                            values: e
+                            values: n
                         }
                     };
                 } else u = dr(r, t, o);
             } else "in" /* IN */ !== i && "not-in" /* NOT_IN */ !== i && "array-contains-any" /* ARRAY_CONTAINS_ANY */ !== i || wr(o, i), 
-            u = On(n, e, o, 
+            u = Oe(e, n, o, 
             /* allowArrays= */ "in" /* IN */ === i || "not-in" /* NOT_IN */ === i);
             const c = Qt.create(s, i, u);
-            return function(t, e) {
-                if (e.N()) {
-                    const n = oe(t);
-                    if (null !== n && !n.isEqual(e.field)) throw new L(T, `Invalid query. All where filters with an inequality (<, <=, !=, not-in, >, or >=) must be on the same field. But you have inequality filters on '${n.toString()}' and '${e.field.toString()}'`);
-                    const r = ie(t);
-                    null !== r && mr(t, e.field, r);
+            return function(t, n) {
+                if (n.D()) {
+                    const e = un(t);
+                    if (null !== e && !e.isEqual(n.field)) throw new L(I, `Invalid query. All where filters with an inequality (<, <=, !=, not-in, >, or >=) must be on the same field. But you have inequality filters on '${e.toString()}' and '${n.field.toString()}'`);
+                    const r = on(t);
+                    null !== r && mr(t, n.field, r);
                 }
-                const n = function(t, e) {
-                    for (const n of t.filters) if (e.indexOf(n.op) >= 0) return n.op;
+                const e = function(t, n) {
+                    for (const e of t.filters) if (n.indexOf(e.op) >= 0) return e.op;
                     return null;
                 }(t, 
                 /**
@@ -4602,16 +4599,16 @@ class Xn extends Jn {
                       default:
                         return [];
                     }
-                }(e.op));
-                if (null !== n) 
+                }(n.op));
+                if (null !== e) 
                 // Special case when it's a duplicate op to give a slightly clearer error message.
-                throw n === e.op ? new L(T, `Invalid query. You cannot use more than one '${e.op.toString()}' filter.`) : new L(T, `Invalid query. You cannot use '${e.op.toString()}' filters with '${n.toString()}' filters.`);
+                throw e === n.op ? new L(I, `Invalid query. You cannot use more than one '${n.op.toString()}' filter.`) : new L(I, `Invalid query. You cannot use '${n.op.toString()}' filters with '${e.toString()}' filters.`);
             }(t, c), c;
-        }(t._query, "where", e, t.firestore._databaseId, this.ft, this.dt, this.wt);
-        return new cn(t.firestore, t.converter, function(t, e) {
-            const n = t.filters.concat([ e ]);
-            return new re(t.path, t.collectionGroup, t.explicitOrderBy.slice(), n, t.limit, t.limitType, t.startAt, t.endAt);
-        }(t._query, n));
+        }(t._query, "where", n, t.firestore._databaseId, this.ft, this.dt, this.wt);
+        return new ce(t.firestore, t.converter, function(t, n) {
+            const e = t.filters.concat([ n ]);
+            return new rn(t.path, t.collectionGroup, t.explicitOrderBy.slice(), e, t.limit, t.limitType, t.startAt, t.endAt);
+        }(t._query, e));
     }
 }
 
@@ -4625,25 +4622,25 @@ class Xn extends Jn {
  *   "&lt;=", "!=").
  * @param value - The value for comparison
  * @returns The created {@link Query}.
- */ function tr(t, e, n) {
-    const r = e, s = Kn("where", t);
-    return new Xn(s, r, n);
+ */ function tr(t, n, e) {
+    const r = n, s = Ke("where", t);
+    return new Xe(s, r, e);
 }
 
-class er extends Jn {
-    constructor(t, e) {
-        super(), this.ft = t, this.yt = e, this.type = "orderBy";
+class nr extends Je {
+    constructor(t, n) {
+        super(), this.ft = t, this.yt = n, this.type = "orderBy";
     }
     _apply(t) {
-        const e = function(t, e, n) {
-            if (null !== t.startAt) throw new L(T, "Invalid query. You must not call startAt() or startAfter() before calling orderBy().");
-            if (null !== t.endAt) throw new L(T, "Invalid query. You must not call endAt() or endBefore() before calling orderBy().");
-            const r = new te(e, n);
-            return function(t, e) {
-                if (null === ie(t)) {
+        const n = function(t, n, e) {
+            if (null !== t.startAt) throw new L(I, "Invalid query. You must not call startAt() or startAfter() before calling orderBy().");
+            if (null !== t.endAt) throw new L(I, "Invalid query. You must not call endAt() or endBefore() before calling orderBy().");
+            const r = new tn(n, e);
+            return function(t, n) {
+                if (null === on(t)) {
                     // This is the first order by. It must match any inequality.
-                    const n = oe(t);
-                    null !== n && mr(t, n, e.field);
+                    const e = un(t);
+                    null !== e && mr(t, e, n.field);
                 }
             }(t, r), r;
         }
@@ -4658,11 +4655,11 @@ class er extends Jn {
  * of the query or if any of the fields in the order by are an uncommitted
  * server timestamp.
  */ (t._query, this.ft, this.yt);
-        return new cn(t.firestore, t.converter, function(t, e) {
+        return new ce(t.firestore, t.converter, function(t, n) {
             // TODO(dimond): validate that orderBy does not list the same key twice.
-            const n = t.explicitOrderBy.concat([ e ]);
-            return new re(t.path, t.collectionGroup, n, t.filters.slice(), t.limit, t.limitType, t.startAt, t.endAt);
-        }(t._query, e));
+            const e = t.explicitOrderBy.concat([ n ]);
+            return new rn(t.path, t.collectionGroup, e, t.filters.slice(), t.limit, t.limitType, t.startAt, t.endAt);
+        }(t._query, n));
     }
 }
 
@@ -4674,18 +4671,18 @@ class er extends Jn {
  * @param directionStr - Optional direction to sort by ('asc' or 'desc'). If
  * not specified, order will be ascending.
  * @returns The created {@link Query}.
- */ function nr(t, e = "asc") {
-    const n = e, r = Kn("orderBy", t);
-    return new er(r, n);
+ */ function er(t, n = "asc") {
+    const e = n, r = Ke("orderBy", t);
+    return new nr(r, e);
 }
 
-class rr extends Jn {
-    constructor(t, e, n) {
-        super(), this.type = t, this._t = e, this.gt = n;
+class rr extends Je {
+    constructor(t, n, e) {
+        super(), this.type = t, this._t = n, this.gt = e;
     }
     _apply(t) {
-        return new cn(t.firestore, t.converter, function(t, e, n) {
-            return new re(t.path, t.collectionGroup, t.explicitOrderBy.slice(), t.filters.slice(), e, n, t.startAt, t.endAt);
+        return new ce(t.firestore, t.converter, function(t, n, e) {
+            return new rn(t.path, t.collectionGroup, t.explicitOrderBy.slice(), t.filters.slice(), n, e, t.startAt, t.endAt);
         }(t._query, this._t, this.gt));
     }
 }
@@ -4711,15 +4708,15 @@ class rr extends Jn {
     return st("limitToLast", t), new rr("limitToLast", t, "L" /* Last */);
 }
 
-class or extends Jn {
-    constructor(t, e, n) {
-        super(), this.type = t, this.bt = e, this.vt = n;
+class or extends Je {
+    constructor(t, n, e) {
+        super(), this.type = t, this.bt = n, this.vt = e;
     }
     _apply(t) {
-        const e = fr(t, this.type, this.bt, this.vt);
-        return new cn(t.firestore, t.converter, function(t, e) {
-            return new re(t.path, t.collectionGroup, t.explicitOrderBy.slice(), t.filters.slice(), t.limit, t.limitType, e, t.endAt);
-        }(t._query, e));
+        const n = fr(t, this.type, this.bt, this.vt);
+        return new ce(t.firestore, t.converter, function(t, n) {
+            return new rn(t.path, t.collectionGroup, t.explicitOrderBy.slice(), t.filters.slice(), t.limit, t.limitType, n, t.endAt);
+        }(t._query, n));
     }
 }
 
@@ -4732,15 +4729,15 @@ function cr(...t) {
     /*before=*/ !1);
 }
 
-class ar extends Jn {
-    constructor(t, e, n) {
-        super(), this.type = t, this.bt = e, this.vt = n;
+class ar extends Je {
+    constructor(t, n, e) {
+        super(), this.type = t, this.bt = n, this.vt = e;
     }
     _apply(t) {
-        const e = fr(t, this.type, this.bt, this.vt);
-        return new cn(t.firestore, t.converter, function(t, e) {
-            return new re(t.path, t.collectionGroup, t.explicitOrderBy.slice(), t.filters.slice(), t.limit, t.limitType, t.startAt, e);
-        }(t._query, e));
+        const n = fr(t, this.type, this.bt, this.vt);
+        return new ce(t.firestore, t.converter, function(t, n) {
+            return new rn(t.path, t.collectionGroup, t.explicitOrderBy.slice(), t.filters.slice(), t.limit, t.limitType, t.startAt, n);
+        }(t._query, n));
     }
 }
 
@@ -4752,9 +4749,9 @@ function lr(...t) {
     return new ar("endAt", t, /*before=*/ !1);
 }
 
-/** Helper function to create a bound from a document or fields */ function fr(t, e, n, r) {
-    if (n[0] = a(n[0]), n[0] instanceof Wn) return function(t, e, n, r, s) {
-        if (!r) throw new L(P, `Can't use a DocumentSnapshot that doesn't exist for ${n}().`);
+/** Helper function to create a bound from a document or fields */ function fr(t, n, e, r) {
+    if (e[0] = getModularInstance(e[0]), e[0] instanceof Ge) return function(t, n, e, r, s) {
+        if (!r) throw new L(P, `Can't use a DocumentSnapshot that doesn't exist for ${e}().`);
         const i = [];
         // 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
@@ -4763,12 +4760,12 @@ function lr(...t) {
         // the provided document. Without the key (by using the explicit sort
         // orders), multiple documents could match the position, yielding duplicate
         // results.
-                for (const n of ce(t)) if (n.field.isKeyField()) i.push(qt(e, r.key)); else {
-            const t = r.data.field(n.field);
-            if (Pt(t)) throw new L(T, 'Invalid query. You are trying to start or end a query using a document for which the field "' + n.field + '" is an uncommitted server timestamp. (Since the value of this field is unknown, you cannot start/end a query with it.)');
+                for (const e of an(t)) if (e.field.isKeyField()) i.push(qt(n, r.key)); else {
+            const t = r.data.field(e.field);
+            if (Pt(t)) throw new L(I, 'Invalid query. You are trying to start or end a query using a document for which the field "' + e.field + '" is an uncommitted server timestamp. (Since the value of this field is unknown, you cannot start/end a query with it.)');
             if (null === t) {
-                const t = n.field.canonicalString();
-                throw new L(T, `Invalid query. You are trying to start or end a query using a document for which the field '${t}' (used as the orderBy) does not exist.`);
+                const t = e.field.canonicalString();
+                throw new L(I, `Invalid query. You are trying to start or end a query using a document for which the field '${t}' (used as the orderBy) does not exist.`);
             }
             i.push(t);
         }
@@ -4776,25 +4773,25 @@ function lr(...t) {
     }
     /**
  * Converts a list of field values to a `Bound` for the given query.
- */ (t._query, t.firestore._databaseId, e, n[0]._document, r);
+ */ (t._query, t.firestore._databaseId, n, e[0]._document, r);
     {
-        const s = Pn(t.firestore);
-        return function(t, e, n, r, s, i) {
+        const s = Pe(t.firestore);
+        return function(t, n, e, r, s, i) {
             // Use explicit order by's because it has to match the query the user made
             const o = t.explicitOrderBy;
-            if (s.length > o.length) throw new L(T, `Too many arguments provided to ${r}(). The number of arguments must be less than or equal to the number of orderBy() clauses`);
+            if (s.length > o.length) throw new L(I, `Too many arguments provided to ${r}(). The number of arguments must be less than or equal to the number of orderBy() clauses`);
             const u = [];
             for (let i = 0; i < s.length; i++) {
                 const c = s[i];
                 if (o[i].field.isKeyField()) {
-                    if ("string" != typeof c) throw new L(T, `Invalid query. Expected a string for document ID in ${r}(), but got a ${typeof c}`);
-                    if (!ue(t) && -1 !== c.indexOf("/")) throw new L(T, `Invalid query. When querying a collection and ordering by FieldPath.documentId(), the value passed to ${r}() must be a plain document ID, but '${c}' contains a slash.`);
-                    const n = t.path.child(Y.fromString(c));
-                    if (!Z.isDocumentKey(n)) throw new L(T, `Invalid query. When querying a collection group and ordering by FieldPath.documentId(), the value passed to ${r}() must result in a valid document path, but '${n}' is not because it contains an odd number of segments.`);
-                    const s = new Z(n);
-                    u.push(qt(e, s));
+                    if ("string" != typeof c) throw new L(I, `Invalid query. Expected a string for document ID in ${r}(), but got a ${typeof c}`);
+                    if (!cn(t) && -1 !== c.indexOf("/")) throw new L(I, `Invalid query. When querying a collection and ordering by FieldPath.documentId(), the value passed to ${r}() must be a plain document ID, but '${c}' contains a slash.`);
+                    const e = t.path.child(Y.fromString(c));
+                    if (!Z.isDocumentKey(e)) throw new L(I, `Invalid query. When querying a collection group and ordering by FieldPath.documentId(), the value passed to ${r}() must result in a valid document path, but '${e}' is not because it contains an odd number of segments.`);
+                    const s = new Z(e);
+                    u.push(qt(n, s));
                 } else {
-                    const t = On(n, r, c);
+                    const t = Oe(e, r, c);
                     u.push(t);
                 }
             }
@@ -4804,32 +4801,32 @@ function lr(...t) {
  * Parses the given `documentIdValue` into a `ReferenceValue`, throwing
  * appropriate errors if the value is anything other than a `DocumentReference`
  * or `string`, or if the string is malformed.
- */ (t._query, t.firestore._databaseId, s, e, n, r);
+ */ (t._query, t.firestore._databaseId, s, n, e, r);
     }
 }
 
-function dr(t, e, n) {
-    if ("string" == typeof (n = a(n))) {
-        if ("" === n) throw new L(T, "Invalid query. When querying with FieldPath.documentId(), you must provide a valid document ID, but it was an empty string.");
-        if (!ue(e) && -1 !== n.indexOf("/")) throw new L(T, `Invalid query. When querying a collection by FieldPath.documentId(), you must provide a plain document ID, but '${n}' contains a '/' character.`);
-        const r = e.path.child(Y.fromString(n));
-        if (!Z.isDocumentKey(r)) throw new L(T, `Invalid query. When querying a collection group by FieldPath.documentId(), the value provided must result in a valid document path, but '${r}' is not because it has an odd number of segments (${r.length}).`);
+function dr(t, n, e) {
+    if ("string" == typeof (e = getModularInstance(e))) {
+        if ("" === e) throw new L(I, "Invalid query. When querying with FieldPath.documentId(), you must provide a valid document ID, but it was an empty string.");
+        if (!cn(n) && -1 !== e.indexOf("/")) throw new L(I, `Invalid query. When querying a collection by FieldPath.documentId(), you must provide a plain document ID, but '${e}' contains a '/' character.`);
+        const r = n.path.child(Y.fromString(e));
+        if (!Z.isDocumentKey(r)) throw new L(I, `Invalid query. When querying a collection group by FieldPath.documentId(), the value provided must result in a valid document path, but '${r}' is not because it has an odd number of segments (${r.length}).`);
         return qt(t, new Z(r));
     }
-    if (n instanceof un) return qt(t, n._key);
-    throw new L(T, `Invalid query. When querying with FieldPath.documentId(), you must provide a valid string or a DocumentReference, but it was: ${nt(n)}.`);
+    if (e instanceof ue) return qt(t, e._key);
+    throw new L(I, `Invalid query. When querying with FieldPath.documentId(), you must provide a valid string or a DocumentReference, but it was: ${et(e)}.`);
 }
 
 /**
  * Validates that the value passed into a disjunctive filter satisfies all
  * array requirements.
- */ function wr(t, e) {
-    if (!Array.isArray(t) || 0 === t.length) throw new L(T, `Invalid Query. A non-empty array is required for '${e.toString()}' filters.`);
-    if (t.length > 10) throw new L(T, `Invalid Query. '${e.toString()}' filters support a maximum of 10 elements in the value array.`);
+ */ function wr(t, n) {
+    if (!Array.isArray(t) || 0 === t.length) throw new L(I, `Invalid Query. A non-empty array is required for '${n.toString()}' filters.`);
+    if (t.length > 10) throw new L(I, `Invalid Query. '${n.toString()}' filters support a maximum of 10 elements in the value array.`);
 }
 
-function mr(t, e, n) {
-    if (!n.isEqual(e)) throw new L(T, `Invalid query. You have a where filter with an inequality (<, <=, !=, not-in, >, or >=) on field '${e.toString()}' and so you must also use '${e.toString()}' as your first argument to orderBy(), but your first orderBy() is on field '${n.toString()}' instead.`);
+function mr(t, n, e) {
+    if (!e.isEqual(n)) throw new L(I, `Invalid query. You have a where filter with an inequality (<, <=, !=, not-in, >, or >=) on field '${n.toString()}' and so you must also use '${n.toString()}' as your first argument to orderBy(), but your first orderBy() is on field '${e.toString()}' instead.`);
 }
 
 /**
@@ -4879,18 +4876,18 @@ function mr(t, e, n) {
  * their `set()` or fails due to invalid data originating from a `toFirestore()`
  * call.
  */
-function pr(t, e, n) {
+function pr(t, n, e) {
     let r;
     // Cast to `any` in order to satisfy the union type constraint on
     // toFirestore().
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    return r = t ? n && (n.merge || n.mergeFields) ? t.toFirestore(e, n) : t.toFirestore(e) : e, 
+    return r = t ? e && (e.merge || e.mergeFields) ? t.toFirestore(n, e) : t.toFirestore(n) : n, 
     r;
 }
 
 class yr extends class {
-    convertValue(t, e = "none") {
-        switch (Nt(t)) {
+    convertValue(t, n = "none") {
+        switch (Dt(t)) {
           case 0 /* NullValue */ :
             return null;
 
@@ -4898,13 +4895,13 @@ class yr extends class {
             return t.booleanValue;
 
           case 2 /* NumberValue */ :
-            return Tt(t.integerValue || t.doubleValue);
+            return It(t.integerValue || t.doubleValue);
 
           case 3 /* TimestampValue */ :
             return this.convertTimestamp(t.timestampValue);
 
           case 4 /* ServerTimestampValue */ :
-            return this.convertServerTimestamp(t, e);
+            return this.convertServerTimestamp(t, n);
 
           case 5 /* StringValue */ :
             return t.stringValue;
@@ -4919,32 +4916,32 @@ class yr extends class {
             return this.convertGeoPoint(t.geoPointValue);
 
           case 9 /* ArrayValue */ :
-            return this.convertArray(t.arrayValue, e);
+            return this.convertArray(t.arrayValue, n);
 
           case 10 /* ObjectValue */ :
-            return this.convertObject(t.mapValue, e);
+            return this.convertObject(t.mapValue, n);
 
           default:
             throw _();
         }
     }
-    convertObject(t, e) {
-        const n = {};
+    convertObject(t, n) {
+        const e = {};
         return gt(t.fields, ((t, r) => {
-            n[t] = this.convertValue(r, e);
-        })), n;
+            e[t] = this.convertValue(r, n);
+        })), e;
     }
     convertGeoPoint(t) {
-        return new gn(Tt(t.latitude), Tt(t.longitude));
+        return new ge(It(t.latitude), It(t.longitude));
     }
-    convertArray(t, e) {
-        return (t.values || []).map((t => this.convertValue(t, e)));
+    convertArray(t, n) {
+        return (t.values || []).map((t => this.convertValue(t, n)));
     }
-    convertServerTimestamp(t, e) {
-        switch (e) {
+    convertServerTimestamp(t, n) {
+        switch (n) {
           case "previous":
-            const n = Rt(t);
-            return null == n ? null : this.convertValue(n, e);
+            const e = Rt(t);
+            return null == e ? null : this.convertValue(e, n);
 
           case "estimate":
             return this.convertTimestamp(Vt(t));
@@ -4954,16 +4951,16 @@ class yr extends class {
         }
     }
     convertTimestamp(t) {
-        const e = It(t);
-        return new pt(e.seconds, e.nanos);
+        const n = Tt(t);
+        return new pt(n.seconds, n.nanos);
     }
-    convertDocumentKey(t, e) {
-        const n = Y.fromString(t);
-        g(ze(n));
-        const r = new G(n.get(1), n.get(3)), s = new Z(n.popFirst(5));
-        return r.isEqual(e) || 
+    convertDocumentKey(t, n) {
+        const e = Y.fromString(t);
+        g(Gn(e));
+        const r = new W(e.get(1), e.get(3)), s = new Z(e.popFirst(5));
+        return r.isEqual(n) || 
         // TODO(b/64130202): Somehow support foreign references.
-        m(`Document ${s} contains a document reference within a different database (${r.projectId}/${r.database}) which is not supported. It will be treated as a reference in the current database (${e.projectId}/${e.database}) instead.`), 
+        m(`Document ${s} contains a document reference within a different database (${r.projectId}/${r.database}) which is not supported. It will be treated as a reference in the current database (${n.projectId}/${n.database}) instead.`), 
         s;
     }
 } {
@@ -4971,11 +4968,11 @@ class yr extends class {
         super(), this.firestore = t;
     }
     convertBytes(t) {
-        return new yn(t);
+        return new ye(t);
     }
     convertReference(t) {
-        const e = this.convertDocumentKey(t, this.firestore._databaseId);
-        return new un(this.firestore, /* converter= */ null, e);
+        const n = this.convertDocumentKey(t, this.firestore._databaseId);
+        return new ue(this.firestore, /* converter= */ null, n);
     }
 }
 
@@ -4992,11 +4989,11 @@ class yr extends class {
  * @returns A Promise resolved with a `DocumentSnapshot` containing the current
  * document contents.
  */ function _r(t) {
-    const e = Xe((t = rt(t, un)).firestore), n = new yr(t.firestore);
-    return Ke(e, [ t._key ]).then((e => {
-        g(1 === e.length);
-        const r = e[0];
-        return new Wn(t.firestore, n, t._key, r.isFoundDocument() ? r : null, t.converter);
+    const n = te((t = rt(t, ue)).firestore), e = new yr(t.firestore);
+    return Jn(n, [ t._key ]).then((n => {
+        g(1 === n.length);
+        const r = n[0];
+        return new Ge(t.firestore, e, t._key, r.isFoundDocument() ? r : null, t.converter);
     }));
 }
 
@@ -5013,31 +5010,31 @@ class yr extends class {
  * @returns A Promise that will be resolved with the results of the query.
  */ function gr(t) {
     !function(t) {
-        if (se(t) && 0 === t.explicitOrderBy.length) throw new L(q, "limitToLast() queries require specifying at least one orderBy() clause");
-    }((t = rt(t, cn))._query);
-    const e = Xe(t.firestore), n = new yr(t.firestore);
-    return Je(e, t._query).then((e => {
-        const r = e.map((e => new Gn(t.firestore, n, e.key, e, t.converter)));
-        return se(t._query) && 
+        if (sn(t) && 0 === t.explicitOrderBy.length) throw new L(q, "limitToLast() queries require specifying at least one orderBy() clause");
+    }((t = rt(t, ce))._query);
+    const n = te(t.firestore), e = new yr(t.firestore);
+    return Zn(n, t._query).then((n => {
+        const r = n.map((n => new We(t.firestore, e, n.key, n, t.converter)));
+        return sn(t._query) && 
         // Limit to last queries reverse the orderBy constraint that was
         // specified by the user. As such, we need to reverse the order of the
         // results to return the documents in the expected order.
-        r.reverse(), new Hn(t, r);
+        r.reverse(), new He(t, r);
     }));
 }
 
-function br(t, e, n) {
-    const r = pr((t = rt(t, un)).converter, e, n), s = Rn(Pn(t.firestore), "setDoc", t._key, r, null !== t.converter, n);
-    return Ye(Xe(t.firestore), [ s.toMutation(t._key, _e.none()) ]);
+function br(t, n, e) {
+    const r = pr((t = rt(t, ue)).converter, n, e), s = Re(Pe(t.firestore), "setDoc", t._key, r, null !== t.converter, e);
+    return Kn(te(t.firestore), [ s.toMutation(t._key, gn.none()) ]);
 }
 
-function vr(t, e, n, ...r) {
-    const s = Pn((t = rt(t, un)).firestore);
+function vr(t, n, e, ...r) {
+    const s = Pe((t = rt(t, ue)).firestore);
     // For Compat types, we have to "extract" the underlying types before
     // performing validation.
         let i;
-    i = "string" == typeof (e = a(e)) || e instanceof mn ? xn(s, "updateDoc", t._key, e, n, r) : qn(s, "updateDoc", t._key, e);
-    return Ye(Xe(t.firestore), [ i.toMutation(t._key, _e.exists(!0)) ]);
+    i = "string" == typeof (n = getModularInstance(n)) || n instanceof me ? xe(s, "updateDoc", t._key, n, e, r) : qe(s, "updateDoc", t._key, n);
+    return Kn(te(t.firestore), [ i.toMutation(t._key, gn.exists(!0)) ]);
 }
 
 /**
@@ -5052,7 +5049,7 @@ function vr(t, e, n, ...r) {
  * @returns A `Promise` resolved once the document has been successfully
  * deleted from the backend.
  */ function Er(t) {
-    return Ye(Xe((t = rt(t, un)).firestore), [ new Ee(t._key, _e.none()) ]);
+    return Kn(te((t = rt(t, ue)).firestore), [ new Tn(t._key, gn.none()) ]);
 }
 
 /**
@@ -5068,9 +5065,9 @@ function vr(t, e, n, ...r) {
  * @param data - An Object containing the data for the new document.
  * @returns A `Promise` resolved with a `DocumentReference` pointing to the
  * newly created document after it has been written to the backend.
- */ function Ir(t, e) {
-    const n = fn(t = rt(t, an)), r = pr(t.converter, e), s = Rn(Pn(t.firestore), "addDoc", n._key, r, null !== n.converter, {});
-    return Ye(Xe(t.firestore), [ s.toMutation(n._key, _e.exists(!1)) ]).then((() => n));
+ */ function Tr(t, n) {
+    const e = fe(t = rt(t, ae)), r = pr(t.converter, n), s = Re(Pe(t.firestore), "addDoc", e._key, r, null !== e.converter, {});
+    return Kn(te(t.firestore), [ s.toMutation(e._key, gn.exists(!1)) ]).then((() => e));
 }
 
 /**
@@ -5092,15 +5089,15 @@ function vr(t, e, n, ...r) {
 /**
  * Returns a sentinel for use with {@link @firebase/firestore/lite#(updateDoc:1)} or
  * {@link @firebase/firestore/lite#(setDoc:1)} with `{merge: true}` to mark a field for deletion.
- */ function Tr() {
-    return new Vn("deleteField");
+ */ function Ir() {
+    return new Ve("deleteField");
 }
 
 /**
  * Returns a sentinel used with {@link @firebase/firestore/lite#(setDoc:1)} or {@link @firebase/firestore/lite#(updateDoc:1)} to
  * include a server-generated timestamp in the written data.
  */ function Ar() {
-    return new Dn("serverTimestamp");
+    return new Ne("serverTimestamp");
 }
 
 /**
@@ -5117,7 +5114,7 @@ function vr(t, e, n, ...r) {
  */ function Pr(...t) {
     // NOTE: We don't actually parse the data until it's used in set() or
     // update() since we'd need the Firestore instance to do this.
-    return new $n("arrayUnion", t);
+    return new $e("arrayUnion", t);
 }
 
 /**
@@ -5133,7 +5130,7 @@ function vr(t, e, n, ...r) {
  */ function Rr(...t) {
     // NOTE: We don't actually parse the data until it's used in set() or
     // update() since we'd need the Firestore instance to do this.
-    return new Fn("arrayRemove", t);
+    return new Fe("arrayRemove", t);
 }
 
 /**
@@ -5155,7 +5152,7 @@ function vr(t, e, n, ...r) {
  * @returns The `FieldValue` sentinel for use in a call to `setDoc()` or
  * `updateDoc()`
  */ function Vr(t) {
-    return new Sn("increment", t);
+    return new Se("increment", t);
 }
 
 /**
@@ -5181,25 +5178,25 @@ function vr(t, e, n, ...r) {
  * provides methods for adding writes to the write batch. None of the writes
  * will be committed (or visible locally) until {@link WriteBatch.commit} is
  * called.
- */ class Nr {
+ */ class Dr {
     /** @hideconstructor */
-    constructor(t, e) {
-        this._firestore = t, this._commitHandler = e, this._mutations = [], this._committed = !1, 
-        this._dataReader = Pn(t);
+    constructor(t, n) {
+        this._firestore = t, this._commitHandler = n, this._mutations = [], this._committed = !1, 
+        this._dataReader = Pe(t);
     }
-    set(t, e, n) {
+    set(t, n, e) {
         this._verifyNotCommitted();
-        const r = Dr(t, this._firestore), s = pr(r.converter, e, n), i = Rn(this._dataReader, "WriteBatch.set", r._key, s, null !== r.converter, n);
-        return this._mutations.push(i.toMutation(r._key, _e.none())), this;
+        const r = Nr(t, this._firestore), s = pr(r.converter, n, e), i = Re(this._dataReader, "WriteBatch.set", r._key, s, null !== r.converter, e);
+        return this._mutations.push(i.toMutation(r._key, gn.none())), this;
     }
-    update(t, e, n, ...r) {
+    update(t, n, e, ...r) {
         this._verifyNotCommitted();
-        const s = Dr(t, this._firestore);
+        const s = Nr(t, this._firestore);
         // For Compat types, we have to "extract" the underlying types before
         // performing validation.
                 let i;
-        return i = "string" == typeof (e = a(e)) || e instanceof mn ? xn(this._dataReader, "WriteBatch.update", s._key, e, n, r) : qn(this._dataReader, "WriteBatch.update", s._key, e), 
-        this._mutations.push(i.toMutation(s._key, _e.exists(!0))), this;
+        return i = "string" == typeof (n = getModularInstance(n)) || n instanceof me ? xe(this._dataReader, "WriteBatch.update", s._key, n, e, r) : qe(this._dataReader, "WriteBatch.update", s._key, n), 
+        this._mutations.push(i.toMutation(s._key, gn.exists(!0))), this;
     }
     /**
      * Deletes the document referred to by the provided {@link DocumentReference}.
@@ -5208,8 +5205,8 @@ function vr(t, e, n, ...r) {
      * @returns This `WriteBatch` instance. Used for chaining method calls.
      */    delete(t) {
         this._verifyNotCommitted();
-        const e = Dr(t, this._firestore);
-        return this._mutations = this._mutations.concat(new Ee(e._key, _e.none())), this;
+        const n = Nr(t, this._firestore);
+        return this._mutations = this._mutations.concat(new Tn(n._key, gn.none())), this;
     }
     /**
      * Commits all of the writes in this write batch as a single atomic unit.
@@ -5230,8 +5227,8 @@ function vr(t, e, n, ...r) {
     }
 }
 
-function Dr(t, e) {
-    if ((t = a(t)).firestore !== e) throw new L(T, "Provided document reference is from a different Firestore instance.");
+function Nr(t, n) {
+    if ((t = getModularInstance(t)).firestore !== n) throw new L(I, "Provided document reference is from a different Firestore instance.");
     return t;
 }
 
@@ -5248,8 +5245,8 @@ function Dr(t, e) {
  * @returns A `WriteBatch` that can be used to atomically execute multiple
  * writes.
  */ function $r(t) {
-    const e = Xe(t = rt(t, en));
-    return new Nr(t, (t => Ye(e, t)));
+    const n = te(t = rt(t, ee));
+    return new Dr(t, (t => Kn(n, t)));
 }
 
 /**
@@ -5290,67 +5287,67 @@ function Dr(t, e) {
         this.writtenDocs = new Set;
     }
     async lookup(t) {
-        if (this.ensureCommitNotCalled(), this.mutations.length > 0) throw new L(T, "Firestore transactions require all reads to be executed before all writes.");
-        const e = await Ke(this.datastore, t);
-        return e.forEach((t => this.recordVersion(t))), e;
+        if (this.ensureCommitNotCalled(), this.mutations.length > 0) throw new L(I, "Firestore transactions require all reads to be executed before all writes.");
+        const n = await Jn(this.datastore, t);
+        return n.forEach((t => this.recordVersion(t))), n;
     }
-    set(t, e) {
-        this.write(e.toMutation(t, this.precondition(t))), this.writtenDocs.add(t.toString());
+    set(t, n) {
+        this.write(n.toMutation(t, this.precondition(t))), this.writtenDocs.add(t.toString());
     }
-    update(t, e) {
+    update(t, n) {
         try {
-            this.write(e.toMutation(t, this.preconditionForUpdate(t)));
+            this.write(n.toMutation(t, this.preconditionForUpdate(t)));
         } catch (t) {
             this.lastWriteError = t;
         }
         this.writtenDocs.add(t.toString());
     }
     delete(t) {
-        this.write(new Ee(t, this.precondition(t))), this.writtenDocs.add(t.toString());
+        this.write(new Tn(t, this.precondition(t))), this.writtenDocs.add(t.toString());
     }
     async commit() {
         if (this.ensureCommitNotCalled(), this.lastWriteError) throw this.lastWriteError;
         const t = this.readVersions;
         // For each mutation, note that the doc was written.
-                this.mutations.forEach((e => {
-            t.delete(e.key.toString());
+                this.mutations.forEach((n => {
+            t.delete(n.key.toString());
         })), 
         // For each document that was read but not written to, we want to perform
         // a `verify` operation.
-        t.forEach(((t, e) => {
-            const n = Z.fromPath(e);
-            this.mutations.push(new Ie(n, this.precondition(n)));
-        })), await Ye(this.datastore, this.mutations), this.committed = !0;
+        t.forEach(((t, n) => {
+            const e = Z.fromPath(n);
+            this.mutations.push(new In(e, this.precondition(e)));
+        })), await Kn(this.datastore, this.mutations), this.committed = !0;
     }
     recordVersion(t) {
-        let e;
-        if (t.isFoundDocument()) e = t.version; else {
+        let n;
+        if (t.isFoundDocument()) n = t.version; else {
             if (!t.isNoDocument()) throw _();
             // For deleted docs, we must use baseVersion 0 when we overwrite them.
-            e = yt.min();
+            n = yt.min();
         }
-        const n = this.readVersions.get(t.key.toString());
-        if (n) {
-            if (!e.isEqual(n)) 
+        const e = this.readVersions.get(t.key.toString());
+        if (e) {
+            if (!n.isEqual(e)) 
             // This transaction will fail no matter what.
             throw new L(F, "Document version changed between two reads.");
-        } else this.readVersions.set(t.key.toString(), e);
+        } else this.readVersions.set(t.key.toString(), n);
     }
     /**
      * Returns the version of this document when it was read in this transaction,
      * as a precondition, or no precondition if it was not read.
      */    precondition(t) {
-        const e = this.readVersions.get(t.toString());
-        return !this.writtenDocs.has(t.toString()) && e ? _e.updateTime(e) : _e.none();
+        const n = this.readVersions.get(t.toString());
+        return !this.writtenDocs.has(t.toString()) && n ? gn.updateTime(n) : gn.none();
     }
     /**
      * Returns the precondition for a document if the operation is an update.
      */    preconditionForUpdate(t) {
-        const e = this.readVersions.get(t.toString());
+        const n = this.readVersions.get(t.toString());
         // The first time a document is written, we want to take into account the
         // read time and existence
-                if (!this.writtenDocs.has(t.toString()) && e) {
-            if (e.isEqual(yt.min())) 
+                if (!this.writtenDocs.has(t.toString()) && n) {
+            if (n.isEqual(yt.min())) 
             // The document doesn't exist, so fail the transaction.
             // This has to be validated locally because you can't send a
             // precondition that a document does not exist without changing the
@@ -5360,13 +5357,13 @@ function Dr(t, e) {
             // express that to the backend, we have to validate locally.
             // Note: this can change once we can send separate verify writes in the
             // transaction.
-            throw new L(T, "Can't update a document that doesn't exist.");
+            throw new L(I, "Can't update a document that doesn't exist.");
             // Document exists, base precondition on document update time.
-                        return _e.updateTime(e);
+                        return gn.updateTime(n);
         }
         // Document was not read, so we just use the preconditions for a blind
         // update.
-        return _e.exists(!0);
+        return gn.exists(!0);
     }
     write(t) {
         this.ensureCommitNotCalled(), this.mutations.push(t);
@@ -5395,19 +5392,19 @@ function Dr(t, e) {
  * with backoff.
  */
 class Sr {
-    constructor(t, e, n, r) {
-        this.asyncQueue = t, this.datastore = e, this.updateFunction = n, this.deferred = r, 
-        this.Et = 5, this.It = new Ge(this.asyncQueue, "transaction_retry" /* TransactionRetry */);
+    constructor(t, n, e, r) {
+        this.asyncQueue = t, this.datastore = n, this.updateFunction = e, this.deferred = r, 
+        this.Et = 5, this.Tt = new Hn(this.asyncQueue, "transaction_retry" /* TransactionRetry */);
     }
     /** Runs the transaction and sets the result on deferred. */    run() {
-        this.Et -= 1, this.Tt();
+        this.Et -= 1, this.It();
     }
-    Tt() {
-        this.It.W((async () => {
-            const t = new Fr(this.datastore), e = this.At(t);
-            e && e.then((e => {
+    It() {
+        this.Tt.G((async () => {
+            const t = new Fr(this.datastore), n = this.At(t);
+            n && n.then((n => {
                 this.asyncQueue.enqueueAndForget((() => t.commit().then((() => {
-                    this.deferred.resolve(e);
+                    this.deferred.resolve(n);
                 })).catch((t => {
                     this.Pt(t);
                 }))));
@@ -5418,8 +5415,8 @@ class Sr {
     }
     At(t) {
         try {
-            const e = this.updateFunction(t);
-            return !it(e) && e.catch && e.then ? e : (this.deferred.reject(Error("Transaction callback must return a Promise")), 
+            const n = this.updateFunction(t);
+            return !it(n) && n.catch && n.then ? n : (this.deferred.reject(Error("Transaction callback must return a Promise")), 
             null);
         } catch (t) {
             // Do not retry errors thrown by user provided updateFunction.
@@ -5427,15 +5424,15 @@ class Sr {
         }
     }
     Pt(t) {
-        this.Et > 0 && this.Rt(t) ? (this.Et -= 1, this.asyncQueue.enqueueAndForget((() => (this.Tt(), 
+        this.Et > 0 && this.Rt(t) ? (this.Et -= 1, this.asyncQueue.enqueueAndForget((() => (this.It(), 
         Promise.resolve())))) : this.deferred.reject(t);
     }
     Rt(t) {
         if ("FirebaseError" === t.name) {
             // In transactions, the backend will fail outdated reads with FAILED_PRECONDITION and
             // non-matching document versions with ABORTED. These errors should be retried.
-            const e = t.code;
-            return "aborted" === e || "failed-precondition" === e || !
+            const n = t.code;
+            return "aborted" === n || "failed-precondition" === n || !
             /**
  * Determines whether an error code represents a permanent error when received
  * in response to a non-write operation.
@@ -5444,21 +5441,21 @@ class Sr {
  */
             function(t) {
                 switch (t) {
-                  case v:
+                  default:
                     return _();
 
                   case E:
-                  case I:
+                  case T:
                   case A:
-                  case D:
+                  case N:
                   case x:
                   case O:
  // Unauthenticated means something went wrong with our token and we need
                     // to retry with new credentials which will happen automatically.
-                                      case N:
+                                      case D:
                     return !1;
 
-                  case T:
+                  case I:
                   case P:
                   case R:
                   case V:
@@ -5471,11 +5468,8 @@ class Sr {
                   case q:
                   case C:
                     return !0;
-
-                  default:
-                    return _();
                 }
-            }(e);
+            }(n);
         }
         return !1;
     }
@@ -5530,8 +5524,8 @@ class Sr {
  * in newer versions of TypeScript defines `finally`, which is not available in
  * IE.
  */ class xr {
-    constructor(t, e, n, r, s) {
-        this.asyncQueue = t, this.timerId = e, this.targetTimeMs = n, this.op = r, this.removalCallback = s, 
+    constructor(t, n, e, r, s) {
+        this.asyncQueue = t, this.timerId = n, this.targetTimeMs = e, this.op = r, this.removalCallback = s, 
         this.deferred = new U, this.then = this.deferred.promise.then.bind(this.deferred.promise), 
         // It's normal for the deferred promise to be canceled (due to cancellation)
         // and so we attach a dummy catch callback to avoid
@@ -5551,9 +5545,9 @@ class Sr {
      *   from its delayedOperations list.
      *   PORTING NOTE: This exists to prevent making removeDelayedOperation() and
      *   the DelayedOperation class public.
-     */    static createAndSchedule(t, e, n, r, s) {
-        const i = Date.now() + n, o = new xr(t, e, i, r, s);
-        return o.start(n), o;
+     */    static createAndSchedule(t, n, e, r, s) {
+        const i = Date.now() + e, o = new xr(t, n, i, r, s);
+        return o.start(e), o;
     }
     /**
      * Starts the timer. This is called immediately after construction by
@@ -5607,10 +5601,10 @@ class Sr {
         this.Vt = Promise.resolve(), 
         // A list of retryable operations. Retryable operations are run in order and
         // retried with backoff.
-        this.Nt = [], 
+        this.Dt = [], 
         // Is this AsyncQueue being shut down? Once it is set to true, it will not
         // be changed again.
-        this.Dt = !1, 
+        this.Nt = !1, 
         // Operations scheduled to be queued in the future. Operations are
         // automatically removed after they are run or canceled.
         this.$t = [], 
@@ -5624,19 +5618,19 @@ class Sr {
         // List of TimerIds to fast-forward delays for.
         this.xt = [], 
         // Backoff timer used to schedule retries for retryable operations
-        this.It = new Ge(this, "async_queue_retry" /* AsyncQueueRetry */), 
+        this.Tt = new Hn(this, "async_queue_retry" /* AsyncQueueRetry */), 
         // Visibility handler that triggers an immediate retry of all retryable
         // operations. Meant to speed up recovery when we regain file system access
         // after page comes into foreground.
         this.Ot = () => {
             const t = qr();
-            t && w("AsyncQueue", "Visibility state changed to " + t.visibilityState), this.It.H();
+            t && w("AsyncQueue", "Visibility state changed to " + t.visibilityState), this.Tt.H();
         };
         const t = qr();
         t && "function" == typeof t.addEventListener && t.addEventListener("visibilitychange", this.Ot);
     }
     get isShuttingDown() {
-        return this.Dt;
+        return this.Nt;
     }
     /**
      * Adds a new operation to the queue without waiting for it to complete (i.e.
@@ -5651,33 +5645,33 @@ class Sr {
         this.Lt(t);
     }
     enterRestrictedMode(t) {
-        if (!this.Dt) {
-            this.Dt = !0, this.qt = t || !1;
-            const e = qr();
-            e && "function" == typeof e.removeEventListener && e.removeEventListener("visibilitychange", this.Ot);
+        if (!this.Nt) {
+            this.Nt = !0, this.qt = t || !1;
+            const n = qr();
+            n && "function" == typeof n.removeEventListener && n.removeEventListener("visibilitychange", this.Ot);
         }
     }
     enqueue(t) {
-        if (this.Ct(), this.Dt) 
+        if (this.Ct(), this.Nt) 
         // Return a Promise which never resolves.
         return new Promise((() => {}));
         // Create a deferred Promise that we can return to the callee. This
         // allows us to return a "hanging Promise" only to the callee and still
         // advance the queue even when the operation is not run.
-                const e = new U;
-        return this.Lt((() => this.Dt && this.qt ? Promise.resolve() : (t().then(e.resolve, e.reject), 
-        e.promise))).then((() => e.promise));
+                const n = new U;
+        return this.Lt((() => this.Nt && this.qt ? Promise.resolve() : (t().then(n.resolve, n.reject), 
+        n.promise))).then((() => n.promise));
     }
     enqueueRetryable(t) {
-        this.enqueueAndForget((() => (this.Nt.push(t), this.Ut())));
+        this.enqueueAndForget((() => (this.Dt.push(t), this.Ut())));
     }
     /**
      * Runs the next operation from the retryable queue. If the operation fails,
      * reschedules with backoff.
      */    async Ut() {
-        if (0 !== this.Nt.length) {
+        if (0 !== this.Dt.length) {
             try {
-                await this.Nt[0](), this.Nt.shift(), this.It.reset();
+                await this.Dt[0](), this.Dt.shift(), this.Tt.reset();
             } catch (t) {
                 if (!
                 /**
@@ -5721,7 +5715,7 @@ class Sr {
  // Failure will be handled by AsyncQueue
                                 w("AsyncQueue", "Operation failed with retryable error: " + t);
             }
-            this.Nt.length > 0 && 
+            this.Dt.length > 0 && 
             // If there are additional operations, we re-schedule `retryNextOp()`.
             // This is necessary to run retryable operations that failed during
             // their initial attempt since we don't know whether they are already
@@ -5732,25 +5726,22 @@ class Sr {
             // Since `backoffAndRun()` cancels an existing backoff and schedules a
             // new backoff on every call, there is only ever a single additional
             // operation in the queue.
-            this.It.W((() => this.Ut()));
+            this.Tt.G((() => this.Ut()));
         }
     }
     Lt(t) {
-        const e = this.Vt.then((() => (this.St = !0, t().catch((t => {
+        const n = this.Vt.then((() => (this.St = !0, t().catch((t => {
             this.Ft = t, this.St = !1;
-            // Re-throw the error so that this.tail becomes a rejected Promise and
-            // all further attempts to chain (via .then) will just short-circuit
-            // and return the rejected Promise.
-            throw m("INTERNAL UNHANDLED ERROR: ", 
+            const n = 
             /**
  * Chrome includes Error.message in Error.stack. Other browsers do not.
  * This returns expected output of message + stack when available.
  * @param error - Error or FirestoreError
  */
             function(t) {
-                let e = t.message || "";
-                t.stack && (e = t.stack.includes(t.message) ? t.stack : t.message + "\n" + t.stack);
-                return e;
+                let n = t.message || "";
+                t.stack && (n = t.stack.includes(t.message) ? t.stack : t.message + "\n" + t.stack);
+                return n;
             }
             /**
  * @license
@@ -5776,15 +5767,19 @@ class Sr {
  * The `Transaction` object passed to a transaction's `updateFunction` provides
  * the methods to read and write data within the transaction context. See
  * {@link runTransaction}.
- */ (t)), t;
+ */ (t);
+            // Re-throw the error so that this.tail becomes a rejected Promise and
+            // all further attempts to chain (via .then) will just short-circuit
+            // and return the rejected Promise.
+            throw m("INTERNAL UNHANDLED ERROR: ", n), t;
         })).then((t => (this.St = !1, t))))));
-        return this.Vt = e, e;
+        return this.Vt = n, n;
     }
-    enqueueAfterDelay(t, e, n) {
+    enqueueAfterDelay(t, n, e) {
         this.Ct(), 
         // Fast-forward delays for timerIds that have been overriden.
-        this.xt.indexOf(t) > -1 && (e = 0);
-        const r = xr.createAndSchedule(this, t, e, n, (t => this.jt(t)));
+        this.xt.indexOf(t) > -1 && (n = 0);
+        const r = xr.createAndSchedule(this, t, n, e, (t => this.jt(t)));
         return this.$t.push(r), r;
     }
     Ct() {
@@ -5807,8 +5802,8 @@ class Sr {
     /**
      * For Tests: Determine if a delayed operation with a particular TimerId
      * exists.
-     */    Mt(t) {
-        for (const e of this.$t) if (e.timerId === t) return !0;
+     */    Bt(t) {
+        for (const n of this.$t) if (n.timerId === t) return !0;
         return !1;
     }
     /**
@@ -5817,12 +5812,12 @@ class Sr {
      * @param lastTimerId - Delayed operations up to and including this TimerId
      * will be drained. Pass TimerId.All to run all delayed operations.
      * @returns a Promise that resolves once all operations have been run.
-     */    Bt(t) {
+     */    Mt(t) {
         // Note that draining may generate more delayed ops, so we do that first.
         return this.kt().then((() => {
             // Run ops in the same order they'd run if they ran naturally.
-            this.$t.sort(((t, e) => t.targetTimeMs - e.targetTimeMs));
-            for (const e of this.$t) if (e.skipDelay(), "all" /* All */ !== t && e.timerId === t) break;
+            this.$t.sort(((t, n) => t.targetTimeMs - n.targetTimeMs));
+            for (const n of this.$t) if (n.skipDelay(), "all" /* All */ !== t && n.timerId === t) break;
             return this.kt();
         }));
     }
@@ -5833,15 +5828,15 @@ class Sr {
     }
     /** Called once a DelayedOperation is run or canceled. */    jt(t) {
         // NOTE: indexOf / slice are O(n), but delayedOperations is expected to be small.
-        const e = this.$t.indexOf(t);
-        this.$t.splice(e, 1);
+        const n = this.$t.indexOf(t);
+        this.$t.splice(n, 1);
     }
 }
 
 class Cr {
     /** @hideconstructor */
-    constructor(t, e) {
-        this._firestore = t, this._transaction = e, this._dataReader = Pn(t);
+    constructor(t, n) {
+        this._firestore = t, this._transaction = n, this._dataReader = Pe(t);
     }
     /**
      * Reads the document referenced by the provided {@link DocumentReference}.
@@ -5849,25 +5844,25 @@ class Cr {
      * @param documentRef - A reference to the document to be read.
      * @returns A `DocumentSnapshot` with the read data.
      */    get(t) {
-        const e = Dr(t, this._firestore), n = new yr(this._firestore);
-        return this._transaction.lookup([ e._key ]).then((t => {
+        const n = Nr(t, this._firestore), e = new yr(this._firestore);
+        return this._transaction.lookup([ n._key ]).then((t => {
             if (!t || 1 !== t.length) return _();
             const r = t[0];
-            if (r.isFoundDocument()) return new Wn(this._firestore, n, r.key, r, e.converter);
-            if (r.isNoDocument()) return new Wn(this._firestore, n, e._key, null, e.converter);
+            if (r.isFoundDocument()) return new Ge(this._firestore, e, r.key, r, n.converter);
+            if (r.isNoDocument()) return new Ge(this._firestore, e, n._key, null, n.converter);
             throw _();
         }));
     }
-    set(t, e, n) {
-        const r = Dr(t, this._firestore), s = pr(r.converter, e, n), i = Rn(this._dataReader, "Transaction.set", r._key, s, null !== r.converter, n);
+    set(t, n, e) {
+        const r = Nr(t, this._firestore), s = pr(r.converter, n, e), i = Re(this._dataReader, "Transaction.set", r._key, s, null !== r.converter, e);
         return this._transaction.set(r._key, i), this;
     }
-    update(t, e, n, ...r) {
-        const s = Dr(t, this._firestore);
+    update(t, n, e, ...r) {
+        const s = Nr(t, this._firestore);
         // For Compat types, we have to "extract" the underlying types before
         // performing validation.
                 let i;
-        return i = "string" == typeof (e = a(e)) || e instanceof mn ? xn(this._dataReader, "Transaction.update", s._key, e, n, r) : qn(this._dataReader, "Transaction.update", s._key, e), 
+        return i = "string" == typeof (n = getModularInstance(n)) || n instanceof me ? xe(this._dataReader, "Transaction.update", s._key, n, e, r) : qe(this._dataReader, "Transaction.update", s._key, n), 
         this._transaction.update(s._key, i), this;
     }
     /**
@@ -5876,8 +5871,8 @@ class Cr {
      * @param documentRef - A reference to the document to be deleted.
      * @returns This `Transaction` instance. Used for chaining method calls.
      */    delete(t) {
-        const e = Dr(t, this._firestore);
-        return this._transaction.delete(e._key), this;
+        const n = Nr(t, this._firestore);
+        return this._transaction.delete(n._key), this;
     }
 }
 
@@ -5897,9 +5892,9 @@ class Cr {
  * (the `updateFunction` returned a failed promise), the promise returned by the
  * `updateFunction `is returned here. Otherwise, if the transaction failed, a
  * rejected promise with the corresponding failure error is returned.
- */ function Lr(t, e) {
-    const n = Xe(t = rt(t, en)), r = new U;
-    return new Sr(new Or, n, (n => e(new Cr(t, n))), r).run(), r.promise;
+ */ function Lr(t, n) {
+    const e = te(t = rt(t, ee)), r = new U;
+    return new Sr(new Or, e, (e => n(new Cr(t, e))), r).run(), r.promise;
 }
 
 /**
@@ -5911,10 +5906,12 @@ class Cr {
  * @packageDocumentation
  */ !function(t) {
     l = t;
-}(`${s}_lite`), n(new i("firestore/lite", ((t, {options: e}) => {
-    const n = t.getProvider("app").getImmediate(), r = new en(n, new B(t.getProvider("auth-internal")));
-    return e && r._setSettings(e), r;
-}), "PUBLIC" /* PUBLIC */)), r("firestore-lite", "3.1.0", "node");
-
-export { yn as Bytes, an as CollectionReference, un as DocumentReference, Wn as DocumentSnapshot, mn as FieldPath, _n as FieldValue, en as Firestore, L as FirestoreError, gn as GeoPoint, cn as Query, Jn as QueryConstraint, Gn as QueryDocumentSnapshot, Hn as QuerySnapshot, pt as Timestamp, Cr as Transaction, Nr as WriteBatch, Ir as addDoc, Rr as arrayRemove, Pr as arrayUnion, hn as collection, ln as collectionGroup, sn as connectFirestoreEmulator, Er as deleteDoc, Tr as deleteField, fn as doc, pn as documentId, lr as endAt, hr as endBefore, _r as getDoc, gr as getDocs, rn as getFirestore, Vr as increment, nn as initializeFirestore, sr as limit, ir as limitToLast, nr as orderBy, Zn as query, wn as queryEqual, dn as refEqual, Lr as runTransaction, Ar as serverTimestamp, br as setDoc, d as setLogLevel, Yn as snapshotEqual, cr as startAfter, ur as startAt, on as terminate, vr as updateDoc, tr as where, $r as writeBatch };
+}(`${SDK_VERSION}_lite`), _registerComponent(new Component("firestore/lite", ((t, {options: n}) => {
+    const e = t.getProvider("app").getImmediate(), r = new ee(e, new M(t.getProvider("auth-internal")));
+    return n && r._setSettings(n), r;
+}), "PUBLIC" /* PUBLIC */)), 
+// RUNTIME_ENV and BUILD_TARGET are replaced by real values during the compilation
+registerVersion("firestore-lite", "3.1.1-canary.4594d3fd6", ""), registerVersion("firestore-lite", "3.1.1-canary.4594d3fd6", "esm2017");
+
+export { ye as Bytes, ae as CollectionReference, ue as DocumentReference, Ge as DocumentSnapshot, me as FieldPath, _e as FieldValue, ee as Firestore, L as FirestoreError, ge as GeoPoint, ce as Query, Je as QueryConstraint, We as QueryDocumentSnapshot, He as QuerySnapshot, pt as Timestamp, Cr as Transaction, Dr as WriteBatch, Tr as addDoc, Rr as arrayRemove, Pr as arrayUnion, he as collection, le as collectionGroup, ie as connectFirestoreEmulator, Er as deleteDoc, Ir as deleteField, fe as doc, pe as documentId, lr as endAt, hr as endBefore, _r as getDoc, gr as getDocs, se as getFirestore, Vr as increment, re as initializeFirestore, sr as limit, ir as limitToLast, er as orderBy, Ze as query, we as queryEqual, de as refEqual, Lr as runTransaction, Ar as serverTimestamp, br as setDoc, d as setLogLevel, Ye as snapshotEqual, cr as startAfter, ur as startAt, oe as terminate, vr as updateDoc, tr as where, $r as writeBatch };
 //# sourceMappingURL=index.browser.esm2017.js.map