reactjrx 1.71.0 → 1.73.0

package/dist/index.js

@@ -1,21 +1,21 @@
-var Nt = Object.defineProperty;
-var Ht = (s, e, t) => e in s ? Nt(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t;
-var y = (s, e, t) => (Ht(s, typeof e != "symbol" ? e + "" : e, t), t), ct = (s, e, t) => {
+var Ht = Object.defineProperty;
+var qt = (s, e, t) => e in s ? Ht(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t;
+var y = (s, e, t) => (qt(s, typeof e != "symbol" ? e + "" : e, t), t), ot = (s, e, t) => {
   if (!e.has(s))
     throw TypeError("Cannot " + t);
 };
-var a = (s, e, t) => (ct(s, e, "read from private field"), t ? t.call(s) : e.get(s)), $ = (s, e, t) => {
+var a = (s, e, t) => (ot(s, e, "read from private field"), t ? t.call(s) : e.get(s)), w = (s, e, t) => {
   if (e.has(s))
     throw TypeError("Cannot add the same private member more than once");
   e instanceof WeakSet ? e.add(s) : e.set(s, t);
-}, M = (s, e, t, r) => (ct(s, e, "write to private field"), r ? r.call(s, t) : e.set(s, t), t);
+}, M = (s, e, t, r) => (ot(s, e, "write to private field"), r ? r.call(s, t) : e.set(s, t), t);
 import * as We from "react";
-import { useRef as pe, useMemo as et, useCallback as he, useSyncExternalStore as qt, useEffect as se, createContext as zt, memo as Lt, useContext as _t, useState as $t } from "react";
-import { distinctUntilChanged as P, tap as F, finalize as Wt, catchError as ee, EMPTY as ye, isObservable as ot, from as ve, of as v, defer as Qe, Subject as I, BehaviorSubject as G, map as g, zip as Gt, merge as C, throttleTime as Jt, asyncScheduler as Yt, switchMap as Q, throwError as me, timer as Ae, Observable as Bt, takeWhile as Ge, filter as w, concatMap as Xt, last as Ke, mergeMap as _, takeUntil as re, skip as wt, identity as Ct, scan as tt, shareReplay as Ue, ignoreElements as ne, first as Et, fromEvent as Ne, noop as H, startWith as le, pairwise as Ft, NEVER as Oe, interval as Zt, withLatestFrom as lt, retry as es, iif as ts, concat as ke, toArray as Te, share as ge, take as He, combineLatest as ss, delay as rs, endWith as ns, lastValueFrom as is } from "rxjs";
-import { catchError as ht, mergeMap as Xe, retryWhen as us, concatMap as as, first as cs, tap as xt } from "rxjs/operators";
+import { useRef as ye, useMemo as et, useCallback as le, useSyncExternalStore as zt, useEffect as re, createContext as Lt, memo as _t, useContext as Wt, useState as wt } from "react";
+import { distinctUntilChanged as P, tap as F, finalize as Gt, catchError as te, EMPTY as be, isObservable as lt, from as ve, of as v, defer as Qe, Subject as U, BehaviorSubject as G, map as g, zip as Jt, merge as C, throttleTime as Yt, asyncScheduler as Bt, switchMap as Q, throwError as me, timer as Ae, Observable as Xt, takeWhile as Ge, filter as $, concatMap as Zt, last as Ke, mergeMap as q, takeUntil as Y, skip as Ct, identity as Et, scan as tt, shareReplay as Ue, ignoreElements as he, first as st, fromEvent as Ne, noop as H, startWith as oe, pairwise as Ft, NEVER as Oe, interval as es, withLatestFrom as ht, retry as ts, iif as ss, concat as ke, toArray as Te, share as fe, take as He, combineLatest as rs, delay as xt, endWith as ns, lastValueFrom as is } from "rxjs";
+import { catchError as ft, mergeMap as Xe, retryWhen as us, concatMap as as, first as cs, tap as Rt } from "rxjs/operators";
 import { jsxs as os, jsx as ls } from "react/jsx-runtime";
 const k = (s) => {
-  const e = pe(s);
+  const e = ye(s);
   return et(() => {
     e.current = s;
   }, [s]), e;
@@ -28,10 +28,10 @@ function Je(s, e, t) {
     defaultValue: void 0,
     key: "",
     unsubscribeOnUnmount: !0
-  }, n = t == null && Array.isArray(e) ? e : typeof s == "function" ? t ?? [] : [s], u = pe(
+  }, n = t == null && Array.isArray(e) ? e : typeof s == "function" ? t ?? [] : [s], u = ye(
     "getValue" in s && typeof s.getValue == "function" ? s.getValue() : r.defaultValue
-  ), i = k(s), o = k(r), d = he(
-    (f) => {
+  ), i = k(s), l = k(r), f = le(
+    (d) => {
       const c = i.current, E = (typeof c == "function" ? c : () => c)().pipe(
         /**
          * @important
@@ -43,37 +43,37 @@ function Je(s, e, t) {
         F((p) => {
           u.current = p;
         }),
-        Wt(f),
-        ee((p) => (console.error(p), u.current = void 0, ye))
-      ).subscribe(f);
+        Gt(d),
+        te((p) => (console.error(p), u.current = void 0, be))
+      ).subscribe(d);
       return () => {
-        o.current.unsubscribeOnUnmount !== !1 && E.unsubscribe();
+        l.current.unsubscribeOnUnmount !== !1 && E.unsubscribe();
       };
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [...n]
-  ), h = he(() => u.current, []);
-  return qt(d, h, h);
+  ), h = le(() => u.current, []);
+  return zt(f, h, h);
 }
-function ft(s) {
+function dt(s) {
   return s instanceof Promise || s && typeof s.then == "function" && typeof s.catch == "function";
 }
 function A(s) {
-  if (ot(s))
+  if (lt(s))
     return s;
-  if (ft(s))
+  if (dt(s))
     return ve(s);
   if (typeof s != "function")
     return v(s);
   const e = s;
   return Qe(() => {
     const t = e();
-    return ft(t) ? ve(t) : ot(t) ? t : v(t);
+    return dt(t) ? ve(t) : lt(t) ? t : v(t);
   });
 }
-function Rt(s, e = []) {
+function Mt(s, e = []) {
   const t = k(s);
-  se(() => {
+  re(() => {
     const r = A(t.current).subscribe();
     return () => {
       r.unsubscribe();
@@ -85,24 +85,24 @@ function Rt(s, e = []) {
   ]);
 }
 const Ye = (s) => {
-  const e = pe();
-  return e.current || (e.current = s()), se(() => {
+  const e = ye();
+  return e.current || (e.current = s()), re(() => {
     process.env.NODE_ENV;
   }, []), e;
-}, Mt = ({
+}, jt = ({
   onBeforeComplete: s,
   completeOnUnmount: e = !0
 } = {}) => {
-  const t = Ye(() => new I()), r = pe(!1), n = k(s), u = k(e);
-  return se(() => (r.current && (t.current = new I(), r.current = !1), () => {
+  const t = Ye(() => new U()), r = ye(!1), n = k(s), u = k(e);
+  return re(() => (r.current && (t.current = new U(), r.current = !1), () => {
     if (!u.current) {
       r.current = !0;
       return;
     }
     r.current || (n.current != null && n.current(), t.current.complete(), r.current = !0);
   }), [u, n, t]), t;
-}, cr = () => {
-  const s = Mt(), e = k(s.current.asObservable()), t = he(
+}, or = () => {
+  const s = jt(), e = k(s.current.asObservable()), t = le(
     (r) => {
       s.current.next(r);
     },
@@ -111,12 +111,12 @@ const Ye = (s) => {
   );
   return [e, t];
 }, fs = (s) => {
-  const e = Ye(() => new G(s)), t = pe(!1), r = pe(s);
-  return se(() => (t.current && (e.current = new G(r.current), t.current = !1), () => {
+  const e = Ye(() => new G(s)), t = ye(!1), r = ye(s);
+  return re(() => (t.current && (e.current = new G(r.current), t.current = !1), () => {
     t.current || (e.current.complete(), t.current = !0);
   }), [e]), e;
-}, or = (s) => {
-  const e = fs(s), t = k(e.current.asObservable()), r = he(
+}, lr = (s) => {
+  const e = fs(s), t = k(e.current.asObservable()), r = le(
     (n) => {
       e.current.next(n);
     },
@@ -125,7 +125,7 @@ const Ye = (s) => {
   );
   return [t.current, r, e.current.getValue()];
 }, ds = Symbol("SIGNAL_RESET");
-function lr(s) {
+function hr(s) {
   const { default: e } = s ?? {}, t = new G(e);
   return {
     setValue: (u) => {
@@ -147,7 +147,7 @@ function lr(s) {
     subject: t
   };
 }
-function hr(s, e) {
+function fr(s, e) {
   const t = e ?? ((r) => r);
   return Je(
     () => s.subject.pipe(
@@ -160,23 +160,23 @@ function hr(s, e) {
     []
   );
 }
-const dt = (s) => {
+const pt = (s) => {
   if (!(!s || typeof s != "object"))
     return s;
-}, fr = ({
+}, dr = ({
   adapter: s,
   key: e
 }) => ({
   getItem: async (t) => {
-    const r = await s.getItem(e), n = dt(r) ?? {};
+    const r = await s.getItem(e), n = pt(r) ?? {};
     if (t in n)
       return n[t];
   },
   setItem: async (t, r) => {
-    const n = await s.getItem(e), u = dt(n) ?? {};
+    const n = await s.getItem(e), u = pt(n) ?? {};
     await s.setItem(e, { ...u, [t]: r });
   }
-}), dr = (s) => ({
+}), pr = (s) => ({
   getItem: async (e) => {
     const t = await s.getItem(e);
     if (t)
@@ -217,48 +217,48 @@ const dt = (s) => {
     const n = ys(r);
     return n ? n.migrationVersion !== void 0 && e > n.migrationVersion ? v(r) : (t.setValue(r.value), v(r)) : v(r);
   })
-), pr = ({
+), yr = ({
   entries: s = [],
   onReady: e,
   adapter: t = ps(localStorage)
 }) => {
   const r = k(s), n = k(e), u = k(t), i = Je(
     () => {
-      const o = r.current;
-      return (o.length === 0 ? v(!0) : Gt(
-        ...o.map(
-          ({ signal: h, version: l }) => gs({
+      const l = r.current;
+      return (l.length === 0 ? v(!0) : Jt(
+        ...l.map(
+          ({ signal: h, version: o }) => gs({
             adapter: u.current,
             signal: h,
-            version: l
+            version: o
           })
         )
       ).pipe(g(() => !0))).pipe(
         F(() => {
           n.current != null && n.current();
         }),
-        ee((h) => (console.error("Unable to hydrate", h), ye))
+        te((h) => (console.error("Unable to hydrate", h), be))
       );
     },
     { defaultValue: !1 },
     []
   );
-  return Rt(() => i ? C(
+  return Mt(() => i ? C(
     ...r.current.map(
-      ({ signal: o, version: d }) => o.subject.pipe(
-        Jt(500, Yt, {
+      ({ signal: l, version: f }) => l.subject.pipe(
+        Yt(500, Bt, {
           trailing: !0
         }),
         Q(
           () => ve(
-            bs({ adapter: u.current, signal: o, version: d })
+            bs({ adapter: u.current, signal: l, version: f })
           )
         )
       )
     )
-  ) : ye, [i, u]), { isHydrated: i };
-}, yr = () => {
-  const s = Mt({
+  ) : be, [i, u]), { isHydrated: i };
+}, br = () => {
+  const s = jt({
     onBeforeComplete: () => {
       s.current.next();
     }
@@ -271,7 +271,7 @@ function ms(s, e) {
 function Ss(s, e) {
   return Math.pow(2, s) * e;
 }
-function jt(s) {
+function Qt(s) {
   const {
     retry: e,
     retryDelay: t,
@@ -280,19 +280,19 @@ function jt(s) {
   } = s, u = typeof e != "function" ? e === !1 ? 0 : e === !0 ? 1 / 0 : e ?? 1 / 0 : 1 / 0, i = typeof e == "function" ? (
     // ? (attempt: number, error: TError) => of(retry(attempt, error))
     e
-  ) : () => !0, o = typeof t == "number" ? t : 100, d = {
+  ) : () => !0, l = typeof t == "number" ? t : 100, f = {
     shouldRetry: i,
     ...s
   }, {
     maxInterval: h = 1 / 0,
-    resetOnSuccess: l = !1,
-    backoffDelay: f = Ss
-  } = d;
+    resetOnSuccess: o = !1,
+    backoffDelay: d = Ss
+  } = f;
   return (c) => Qe(() => {
     let b = 0;
     const E = (p, S) => p < u ? i(p, S) : !1;
     return c.pipe(
-      ht((p) => {
+      ft((p) => {
         var O;
         if (b++, !E(b - 1, p))
           throw p;
@@ -301,8 +301,8 @@ function jt(s) {
           throw p;
         return S.pipe(
           Xe(
-            (q) => C(
-              v(q),
+            (z) => C(
+              v(z),
               me(() => p)
             )
           )
@@ -316,46 +316,46 @@ function jt(s) {
             Xe(
               () => E(O, S) ? Ae(
                 ms(
-                  f(O, o),
+                  d(O, l),
                   h
                 )
               ).pipe(
-                Xe((q) => r && !r(O, S) ? me(() => S) : v(q))
+                Xe((z) => r && !r(O, S) ? me(() => S) : v(z))
               ) : me(() => S)
             )
           );
         })
       )),
-      ht((p) => {
+      ft((p) => {
         if (s.catchError)
           return s.catchError(b, p);
         throw p;
       }),
-      xt(() => {
-        l && (b = 0);
+      Rt(() => {
+        o && (b = 0);
       })
     );
   });
 }
-function pt(s) {
+function yt(s) {
   return s != null;
 }
-function yt(s) {
+function bt(s) {
   return Object.prototype.toString.call(s) === "[object Object]";
 }
 function Ze(s) {
-  if (!yt(s))
+  if (!bt(s))
     return !1;
   const e = s.constructor;
   if (typeof e > "u")
     return !0;
   const t = e.prototype;
-  return !(!yt(t) || !t.hasOwnProperty("isPrototypeOf"));
+  return !(!bt(t) || !t.hasOwnProperty("isPrototypeOf"));
 }
-const be = (s) => JSON.stringify(
+const ge = (s) => JSON.stringify(
   s,
   (e, t) => Ze(t) ? Object.keys(t).sort().reduce((r, n) => (r[n] = t[n], r), {}) : t
-), st = (s = 21) => crypto.getRandomValues(new Uint8Array(s)).reduce((e, t) => (t &= 63, t < 36 ? e += t.toString(36) : t < 62 ? e += (t - 26).toString(36).toUpperCase() : t > 62 ? e += "-" : e += "_", e), ""), ie = () => ({
+), rt = (s = 21) => crypto.getRandomValues(new Uint8Array(s)).reduce((e, t) => (t &= 63, t < 36 ? e += t.toString(36) : t < 62 ? e += (t - 26).toString(36).toUpperCase() : t > 62 ? e += "-" : e += "_", e), ""), ne = () => ({
   context: void 0,
   data: void 0,
   error: null,
@@ -379,10 +379,10 @@ function D(s, e) {
       return !1;
   return !0;
 }
-function rt(s) {
+function nt(s) {
   let e = 0;
   return function(r) {
-    return new Bt((n) => {
+    return new Xt((n) => {
       e++;
       const u = r.subscribe(n);
       return s(e), () => {
@@ -397,50 +397,50 @@ const $e = (s) => s.pipe(
     !0
   )
 );
-var B;
+var X;
 class vs {
   constructor({
     __queryFinalizeHook: e
   } = {}) {
-    $(this, B, new I());
+    w(this, X, new U());
     y(this, "state$");
     const t = new G(0), r = t.pipe(
-      w((n) => n === 0)
+      $((n) => n === 0)
     );
-    this.state$ = a(this, B).pipe(
-      Xt(({ args: n, mutation: u, options: i }) => {
-        const o = i.mapOperator ?? "merge", d = a(this, B).pipe(
-          w(() => o === "merge")
-        ), h = a(this, B).pipe(
-          w(() => o === "switch"),
+    this.state$ = a(this, X).pipe(
+      Zt(({ args: n, mutation: u, options: i }) => {
+        const l = i.mapOperator ?? "merge", f = a(this, X).pipe(
+          $(() => l === "merge")
+        ), h = a(this, X).pipe(
+          $(() => l === "switch"),
           F(() => {
             u.cancel();
           })
-        ), l = Qe(() => (u.execute(n), ye)), f = u.state$.pipe(
+        ), o = Qe(() => (u.execute(n), be)), d = u.state$.pipe(
           $e,
           Ke(),
-          _(() => u.state$),
-          re(a(this, B))
+          q(() => u.state$),
+          Y(a(this, X))
         ), c = u.state$.pipe(
           $e,
-          wt(1)
+          Ct(1)
         ), b = C(
           r,
-          d,
+          f,
           h,
           u.cancelled$
         );
         return C(
           c,
-          f,
+          d,
           /**
            * We defer execution so that we return at least
            * the current state first (same mechanism is used for query)
            */
-          l
+          o
         ).pipe(
-          e ?? Ct,
-          re(b)
+          e ?? Et,
+          Y(b)
         );
       }),
       tt((n, u) => ({
@@ -452,15 +452,15 @@ class vs {
         ...u.status === "pending" && {
           error: u.error ?? n.error
         }
-      }), ie()),
+      }), ne()),
       P(
-        ({ data: n, ...u }, { data: i, ...o }) => D(u, o) && D(n, i)
+        ({ data: n, ...u }, { data: i, ...l }) => D(u, l) && D(n, i)
       ),
       Ue({
         refCount: !0,
         bufferSize: 1
       }),
-      rt((n) => {
+      nt((n) => {
         t.next(n);
       })
     );
@@ -470,19 +470,19 @@ class vs {
     options: t,
     mutation: r
   }) {
-    a(this, B).next({ args: e, options: t, mutation: r });
+    a(this, X).next({ args: e, options: t, mutation: r });
   }
 }
-B = new WeakMap();
+X = new WeakMap();
 function Be(s, e) {
   return s === e ? !0 : typeof s != typeof e ? !1 : s && e && typeof s == "object" && typeof e == "object" ? !Object.keys(e).some((t) => !Be(s[t], e[t])) : !1;
 }
-const qe = (s, e, { exact: t = !1 } = {}) => t ? be(s) === be(e) : Be(s, e);
-var ue, L;
+const qe = (s, e, { exact: t = !1 } = {}) => t ? ge(s) === ge(e) : Be(s, e);
+var ie, _;
 class Os {
   constructor(e, t = {}, r) {
-    $(this, ue, void 0);
-    $(this, L, new G(void 0));
+    w(this, ie, void 0);
+    w(this, _, new G(void 0));
     /**
      * @important
      * Used to maintain persistance to latest mutation. This ensure
@@ -491,7 +491,7 @@ class Os {
      */
     y(this, "observed$");
     y(this, "getObserverResultFromState", (e) => ({
-      ...ie(),
+      ...ne(),
       ...e,
       isSuccess: e.status === "success",
       isPending: e.status === "pending",
@@ -503,23 +503,23 @@ class Os {
       reset: this.reset
     }));
     var n;
-    this.client = e, this.options = t, this.options.mutationKey = ((n = this.options) == null ? void 0 : n.mutationKey) ?? [st()], M(this, ue, r ?? new vs(this.options)), this.mutate = this.mutate.bind(this), this.reset = this.reset.bind(this), a(this, L).pipe(
-      w(pt),
-      _(
-        (u) => a(this, ue).state$.pipe(
-          re(
+    this.client = e, this.options = t, this.options.mutationKey = ((n = this.options) == null ? void 0 : n.mutationKey) ?? [rt()], M(this, ie, r ?? new vs(this.options)), this.mutate = this.mutate.bind(this), this.reset = this.reset.bind(this), a(this, _).pipe(
+      $(yt),
+      q(
+        (u) => a(this, ie).state$.pipe(
+          Y(
             u.mutation.state$.pipe($e, Ke())
           )
         )
       )
-    ).subscribe(), this.observed$ = a(this, L).pipe(
+    ).subscribe(), this.observed$ = a(this, _).pipe(
       Q((u) => (u == null ? void 0 : u.mutation.state$.pipe(
         // last(),
         g((i) => ({
           state: i,
           options: u.options
         }))
-      )) ?? ye),
+      )) ?? be),
       F(({ state: u, options: i }) => {
         u.status === "error" && (i != null && i.onError && (i == null || i.onError(
           u.error,
@@ -541,7 +541,7 @@ class Os {
           u.context
         )));
       }),
-      ne()
+      he()
     );
   }
   setOptions(e) {
@@ -551,7 +551,7 @@ class Os {
       mutationKey: this.options.mutationKey,
       ...e
     });
-    const r = (n = a(this, L).getValue()) == null ? void 0 : n.mutation;
+    const r = (n = a(this, _).getValue()) == null ? void 0 : n.mutation;
     this.options.mutationKey && t.mutationKey && !qe(this.options.mutationKey, t.mutationKey, {
       exact: !0
     }) ? this.reset() : r == null || r.setOptions(this.options);
@@ -559,13 +559,13 @@ class Os {
   observe() {
     var u;
     const e = this.getObserverResultFromState(
-      ((u = a(this, L).getValue()) == null ? void 0 : u.mutation.state) ?? ie()
-    ), t = a(this, ue).state$.pipe(
+      ((u = a(this, _).getValue()) == null ? void 0 : u.mutation.state) ?? ne()
+    ), t = a(this, ie).state$.pipe(
       g((i) => this.getObserverResultFromState(i))
-    ), r = a(this, L).pipe(
-      w(pt),
+    ), r = a(this, _).pipe(
+      $(yt),
       Q((i) => i.mutation.cancelled$),
-      g(() => this.getObserverResultFromState(ie()))
+      g(() => this.getObserverResultFromState(ne()))
     );
     return { result$: C(
       this.observed$,
@@ -587,7 +587,7 @@ class Os {
   }
   async mutate(e, t = {}) {
     const r = this.client.getMutationCache().build(this.client, this.options);
-    return a(this, L).next({ mutation: r, options: t }), a(this, ue).trigger({
+    return a(this, _).next({ mutation: r, options: t }), a(this, ie).trigger({
       args: e,
       options: this.options,
       mutation: r
@@ -606,27 +606,27 @@ class Os {
     var t;
     const e = this.client.getMutationCache().find({ exact: !0, mutationKey: (t = this.options) == null ? void 0 : t.mutationKey });
     return this.getObserverResultFromState(
-      (e == null ? void 0 : e.state) ?? ie()
+      (e == null ? void 0 : e.state) ?? ne()
     );
   }
   reset() {
-    const { mutation: e } = a(this, L).getValue() ?? {};
-    a(this, L).next(void 0), e == null || e.cancel();
+    const { mutation: e } = a(this, _).getValue() ?? {};
+    a(this, _).next(void 0), e == null || e.cancel();
   }
 }
-ue = new WeakMap(), L = new WeakMap();
-const Qt = zt(void 0), $s = ({ client: s }) => (se(() => (s.mount(), () => {
+ie = new WeakMap(), _ = new WeakMap();
+const At = Lt(void 0), $s = ({ client: s }) => (re(() => (s.mount(), () => {
   s.unmount();
-}), [s]), null), br = Lt(
+}), [s]), null), gr = _t(
   ({ children: s, client: e }) => {
     const t = et(() => e, [e]);
-    return /* @__PURE__ */ os(Qt.Provider, { value: t, children: [
+    return /* @__PURE__ */ os(At.Provider, { value: t, children: [
       /* @__PURE__ */ ls($s, { client: e }),
       s
     ] });
   }
-), At = (s) => {
-  const e = _t(Qt);
+), Ut = (s) => {
+  const e = Wt(At);
   if (s)
     return s;
   if (!e)
@@ -635,29 +635,29 @@ const Qt = zt(void 0), $s = ({ client: s }) => (se(() => (s.mount(), () => {
 };
 function ws() {
 }
-function gr(s, e) {
-  const t = At(e), r = k(s), n = Ye(() => [st()]), u = be(s.mutationKey ?? n.current), [i] = $t(
+function mr(s, e) {
+  const t = Ut(e), r = k(s), n = Ye(() => [rt()]), u = ge(s.mutationKey ?? n.current), [i] = wt(
     () => new Os(
       t,
       s
     )
   );
-  se(() => {
+  re(() => {
     i.setOptions(s);
   }, [i, s]);
-  const o = et(() => i.observe(), [u, i]), d = Je(o.result$) ?? o.lastValue, h = he(
-    (l, f) => {
-      i.mutate(l, f).catch(ws);
+  const l = et(() => i.observe(), [u, i]), f = Je(l.result$) ?? l.lastValue, h = le(
+    (o, d) => {
+      i.mutate(o, d).catch(ws);
     },
     [i]
   );
-  return se(() => () => {
+  return re(() => () => {
     r.current.cancelOnUnMount && i.reset();
-  }, [i, r]), { ...d, mutate: h, mutateAsync: d.mutate };
+  }, [i, r]), { ...f, mutate: h, mutateAsync: f.mutate };
 }
 function Cs(s) {
   return (e) => e.pipe(
-    xt((t) => {
+    Rt((t) => {
       s.next(t);
     })
   );
@@ -667,8 +667,8 @@ class Es {
     y(this, "isOnlineSubject", new G(!0));
     y(this, "online$", this.isOnlineSubject.pipe(P()));
     y(this, "backToOnline$", this.online$.pipe(
-      w((e) => e),
-      Et()
+      $((e) => e),
+      st()
     ));
     C(
       Ne(window, "offline").pipe(g(() => !1)),
@@ -682,81 +682,81 @@ class Es {
     this.isOnlineSubject.getValue() !== e && this.isOnlineSubject.next(e);
   }
 }
-const te = new Es();
-function nt(s, e) {
+const se = new Es();
+function it(s, e) {
   return s.isStaleByTime(e.staleTime);
 }
 function Fs(s, e) {
   return e.enabled !== !1 && !s.state.dataUpdatedAt && !(s.state.status === "error" && e.retryOnMount === !1);
 }
-function bt(s, e) {
-  return Fs(s, e) || s.state.dataUpdatedAt > 0 && Ut(s, e, e.refetchOnMount);
+function gt(s, e) {
+  return Fs(s, e) || s.state.dataUpdatedAt > 0 && It(s, e, e.refetchOnMount);
 }
-function gt(s, e, t, r) {
-  return s.state.fetchStatus !== "fetching" && t.enabled !== !1 && (s !== e || r.enabled === !1) && (!t.suspense || s.state.status !== "error") && nt(s, t);
+function mt(s, e, t, r) {
+  return s.state.fetchStatus !== "fetching" && t.enabled !== !1 && (s !== e || r.enabled === !1) && (!t.suspense || s.state.status !== "error") && it(s, t);
 }
 function xs(s, e) {
-  return Ut(s, e, e.refetchOnWindowFocus);
+  return It(s, e, e.refetchOnWindowFocus);
 }
-function Ut(s, e, t) {
+function It(s, e, t) {
   if (e.enabled !== !1) {
     const r = typeof t == "function" ? t(s) : t;
-    return r === "always" || r !== !1 && nt(s, e);
+    return r === "always" || r !== !1 && it(s, e);
   }
   return !1;
 }
 function Rs(s) {
-  return (s ?? "online") === "online" ? te.isOnline() : !0;
+  return (s ?? "online") === "online" ? se.isOnline() : !0;
 }
-function mt(s, e) {
+function St(s, e) {
   return e.reduce(
     (t, r) => r in s ? { ...t, [r]: s[r] } : t,
     {}
   );
 }
-function St(s) {
+function vt(s) {
   return Array.isArray(s) && s.length === Object.keys(s).length;
 }
-function It(s, e) {
+function Pt(s, e) {
   if (s === e)
     return s;
-  const t = St(s) && St(e);
+  const t = vt(s) && vt(e);
   if (t || Ze(s) && Ze(e)) {
-    const r = t ? s : Object.keys(s), n = r.length, u = t ? e : Object.keys(e), i = u.length, o = t ? [] : {};
-    let d = 0;
+    const r = t ? s : Object.keys(s), n = r.length, u = t ? e : Object.keys(e), i = u.length, l = t ? [] : {};
+    let f = 0;
     for (let h = 0; h < i; h++) {
-      const l = t ? h : u[h];
-      !t && s[l] === void 0 && e[l] === void 0 && r.includes(l) ? (o[l] = void 0, d++) : (o[l] = It(s[l], e[l]), o[l] === s[l] && s[l] !== void 0 && d++);
+      const o = t ? h : u[h];
+      !t && s[o] === void 0 && e[o] === void 0 && r.includes(o) ? (l[o] = void 0, f++) : (l[o] = Pt(s[o], e[o]), l[o] === s[o] && s[o] !== void 0 && f++);
     }
-    return n === i && d === n ? s : o;
+    return n === i && f === n ? s : l;
   }
   return e;
 }
-function it(s, e) {
-  return ((e == null ? void 0 : e.queryKeyHashFn) ?? be)(s);
+function ut(s, e) {
+  return ((e == null ? void 0 : e.queryKeyHashFn) ?? ge)(s);
 }
-function vt(s, e) {
+function Ot(s, e) {
   const {
     type: t = "all",
     exact: r,
     fetchStatus: n,
     predicate: u,
     queryKey: i,
-    stale: o
+    stale: l
   } = s;
   if (i) {
     if (r) {
-      if (e.queryHash !== it(i, e.options))
+      if (e.queryHash !== ut(i, e.options))
         return !1;
     } else if (!Be(e.queryKey, i))
       return !1;
   }
   if (t !== "all") {
-    const d = e.isActive();
-    if (t === "active" && !d || t === "inactive" && d)
+    const f = e.isActive();
+    if (t === "active" && !f || t === "inactive" && f)
       return !1;
   }
-  return !(typeof o == "boolean" && e.isStale() !== o || typeof n < "u" && n !== e.state.fetchStatus || u && !u(e));
+  return !(typeof l == "boolean" && e.isStale() !== l || typeof n < "u" && n !== e.state.fetchStatus || u && !u(e));
 }
 function Ms(s, e) {
   return Math.max(s + (e ?? 0) - Date.now(), 0);
@@ -765,7 +765,7 @@ function js(s, e) {
   return typeof s == "function" ? s(e) : s;
 }
 function ze(s, e, t) {
-  return typeof t.structuralSharing == "function" ? t.structuralSharing(s, e) : t.structuralSharing !== !1 ? It(s, e) : e;
+  return typeof t.structuralSharing == "function" ? t.structuralSharing(s, e) : t.structuralSharing !== !1 ? Pt(s, e) : e;
 }
 const Qs = ({
   getOptions: s,
@@ -779,20 +779,20 @@ const Qs = ({
       const R = n.status === "pending" ? "pending" : i.status ?? n.status;
       return { ...n, ...i, status: R };
     }
-    const o = i.data, d = o !== void 0 && o !== n.data, h = "data" in i, l = i.status === "success", f = n.data !== void 0, c = n.error !== void 0 || n.error !== null, b = i.status ?? n.status, E = d ? ze(e().data, o, s()) : h ? i.data : n.data, p = n.status === "error" || n.status === "success", S = i.status === "error" && (n.status === "error" && n.fetchStatus === "fetching" || n.status !== "error") ? n.errorUpdateCount + 1 : n.errorUpdateCount, O = d ? n.dataUpdateCount + 1 : i.dataUpdateCount ?? n.dataUpdateCount, q = i.status === "pending" && p && // (dataUpdateCount !== 0 || errorUpdateCount !== 0)
-    (f || c), U = b === "pending" ? null : i.error ?? n.error;
+    const l = i.data, f = l !== void 0 && l !== n.data, h = "data" in i, o = i.status === "success", d = n.data !== void 0, c = n.error !== void 0 || n.error !== null, b = i.status ?? n.status, E = f ? ze(e().data, l, s()) : h ? i.data : n.data, p = n.status === "error" || n.status === "success", S = i.status === "error" && (n.status === "error" && n.fetchStatus === "fetching" || n.status !== "error") ? n.errorUpdateCount + 1 : n.errorUpdateCount, O = f ? n.dataUpdateCount + 1 : i.dataUpdateCount ?? n.dataUpdateCount, z = i.status === "pending" && p && // (dataUpdateCount !== 0 || errorUpdateCount !== 0)
+    (d || c), I = b === "pending" ? null : i.error ?? n.error;
     return {
       ...n,
       ...i,
       status: b,
-      error: U,
+      error: I,
       errorUpdateCount: S,
-      ...l && {
+      ...o && {
         isInvalidated: !1
       },
       data: E,
       dataUpdateCount: O,
-      ...q && {
+      ...z && {
         status: n.status
       }
     };
@@ -801,36 +801,36 @@ const Qs = ({
   g(
     ({ status: e, fetchStatus: t }) => t === "idle" && (e === "success" || e === "error")
   )
-), Pt = (s) => s.pipe(
+), Vt = (s) => s.pipe(
   Ge((e) => e.fetchStatus !== "idle", !0)
 );
-var _e, X;
+var _e, Z;
 class Us {
   constructor() {
-    $(this, _e, C(
+    w(this, _e, C(
       Ne(document, "visibilitychange"),
       Ne(window, "visibilitychange")
     ).pipe(g(() => document.visibilityState)));
-    $(this, X, new G(
+    w(this, Z, new G(
       document.visibilityState === "visible"
     ));
     // public readonly focused$ = this.#focusedSubject.pipe(distinctUntilChanged())
-    y(this, "focused$", a(this, X));
+    y(this, "focused$", a(this, Z));
     y(this, "focusRegained$", this.focused$.pipe(
-      wt(1),
-      w((e) => e)
+      Ct(1),
+      $((e) => e)
     ));
     a(this, _e).pipe(
       F((e) => {
-        a(this, X).next(e === "visible");
+        a(this, Z).next(e === "visible");
       })
     ).subscribe();
   }
   isFocused() {
-    return a(this, X).getValue();
+    return a(this, Z).getValue();
   }
   setFocused(e) {
-    a(this, X).getValue() !== (e ?? !0) && a(this, X).next(e ?? !0);
+    a(this, Z).getValue() !== (e ?? !0) && a(this, Z).next(e ?? !0);
   }
   subscribe(e) {
     const t = this.focused$.subscribe(e);
@@ -849,33 +849,33 @@ class Us {
     document.dispatchEvent(new Event("visibilitychange"));
   }
 }
-_e = new WeakMap(), X = new WeakMap();
+_e = new WeakMap(), Z = new WeakMap();
 const Le = new Us();
-var J, x, we, ae, V, fe, Ce;
+var J, x, we, ue, V, de, Ce;
 class Is {
   constructor(e, t) {
-    $(this, J, void 0);
-    $(this, x, void 0);
-    $(this, we, new I());
+    w(this, J, void 0);
+    w(this, x, void 0);
+    w(this, we, new U());
     /**
      * Used to subscribe to changes in either query or options (or both).
      * We need to be able to track change to both of them at the same time
      * in order to react accordingly and in order (such as refetch on options change)
      */
-    y(this, "queryUpdateSubject", new I());
+    y(this, "queryUpdateSubject", new U());
     /**
      * Mostly used to compare the state before and after mount
      */
-    $(this, ae, void 0);
+    w(this, ue, void 0);
     /**
      * Mostly used for internal optimization such as not
      * running selectors twice, etc
      */
-    $(this, V, void 0);
+    w(this, V, void 0);
     // This property keeps track of the last query with defined data.
     // It will be used to pass the previous data and query to the placeholder function between renders.
-    $(this, fe, void 0);
-    $(this, Ce, 0);
+    w(this, de, void 0);
+    w(this, Ce, 0);
     y(this, "getObserverResultFromQuery", ({
       options: e,
       query: t,
@@ -884,48 +884,48 @@ class Is {
         result: n,
         options: u,
         state: i,
-        select: o,
-        selectError: d,
+        select: l,
+        selectError: f,
         selectResult: h
       }
     }) => {
       var De;
-      const l = t.state, f = t.state.status === "pending", c = a(this, x), b = this.options, p = t !== c ? t.state : a(this, ae);
-      let { errorUpdatedAt: S, fetchStatus: O, error: q } = l;
+      const o = t.state, d = t.state.status === "pending", c = a(this, x), b = this.options, p = t !== c ? t.state : a(this, ue);
+      let { errorUpdatedAt: S, fetchStatus: O, error: z } = o;
       if (r) {
-        const K = !!a(this, Ce), at = !K && bt(t, e), Kt = K && gt(t, c, e, b);
-        (at || Kt) && (O = Rs(t.options.networkMode) ? "fetching" : "paused");
+        const K = !!a(this, Ce), ct = !K && gt(t, e), Nt = K && mt(t, c, e, b);
+        (ct || Nt) && (O = Rs(t.options.networkMode) ? "fetching" : "paused");
       }
-      const U = f && O === "fetching";
-      let R, m = d, Y = o ?? null, T = h;
-      if (e.select && typeof l.data < "u")
-        if (n && l.data === (i == null ? void 0 : i.data) && e.select === o)
+      const I = d && O === "fetching";
+      let R, m = f, B = l ?? null, T = h;
+      if (e.select && typeof o.data < "u")
+        if (n && o.data === (i == null ? void 0 : i.data) && e.select === l)
           R = h;
         else
           try {
-            Y = e.select, R = e.select(l.data), R = ze(n == null ? void 0 : n.data, R, e), T = R, m = null;
+            B = e.select, R = e.select(o.data), R = ze(n == null ? void 0 : n.data, R, e), T = R, m = null;
           } catch (K) {
             R = h, m = K;
           }
       else
-        R = l.data, m = null;
-      let z = O !== "idle" && !l.dataUpdatedAt ? "pending" : l.status;
-      m && (q = m, R = h, S = (n == null ? void 0 : n.errorUpdatedAt) ?? S, z = "error");
-      const Ie = z === "error";
+        R = o.data, m = null;
+      let L = O !== "idle" && !o.dataUpdatedAt ? "pending" : o.status;
+      m && (z = m, R = h, S = (n == null ? void 0 : n.errorUpdatedAt) ?? S, L = "error");
+      const Ie = L === "error";
       let Pe = !1;
-      if (typeof e.placeholderData < "u" && typeof R > "u" && z === "pending") {
+      if (typeof e.placeholderData < "u" && typeof R > "u" && L === "pending") {
         let K;
         if (n != null && n.isPlaceholderData && e.placeholderData === (u == null ? void 0 : u.placeholderData))
           K = n.data;
         else if (K = typeof e.placeholderData == "function" ? e.placeholderData(
-          (De = a(this, fe)) == null ? void 0 : De.state.data,
-          a(this, fe)
+          (De = a(this, de)) == null ? void 0 : De.state.data,
+          a(this, de)
         ) : e.placeholderData, e.select && typeof K < "u")
           try {
             K = e.select(K);
           } catch {
           }
-        typeof K < "u" && (z = "success", R = ze(
+        typeof K < "u" && (L = "success", R = ze(
           n == null ? void 0 : n.data,
           K,
           e
@@ -934,40 +934,40 @@ class Is {
       const Ve = O === "fetching";
       return {
         result: {
-          status: z,
+          status: L,
           fetchStatus: O,
-          isPending: f,
-          isSuccess: z === "success",
+          isPending: d,
+          isSuccess: L === "success",
           isError: Ie,
-          isInitialLoading: U,
-          isLoading: U,
+          isInitialLoading: I,
+          isLoading: I,
           data: R,
-          dataUpdatedAt: l.dataUpdatedAt,
-          error: q,
+          dataUpdatedAt: o.dataUpdatedAt,
+          error: z,
           errorUpdatedAt: S,
-          failureCount: l.fetchFailureCount,
-          failureReason: l.fetchFailureReason,
-          errorUpdateCount: l.errorUpdateCount,
-          isFetched: l.dataUpdateCount > 0 || l.errorUpdateCount > 0,
-          isFetchedAfterMount: l.dataUpdateCount > p.dataUpdateCount || l.errorUpdateCount > p.errorUpdateCount,
+          failureCount: o.fetchFailureCount,
+          failureReason: o.fetchFailureReason,
+          errorUpdateCount: o.errorUpdateCount,
+          isFetched: o.dataUpdateCount > 0 || o.errorUpdateCount > 0,
+          isFetchedAfterMount: o.dataUpdateCount > p.dataUpdateCount || o.errorUpdateCount > p.errorUpdateCount,
           isFetching: Ve,
-          isRefetching: Ve && !f,
-          isLoadingError: Ie && l.dataUpdatedAt === 0,
+          isRefetching: Ve && !d,
+          isLoadingError: Ie && o.dataUpdatedAt === 0,
           isPaused: O === "paused",
           isPlaceholderData: Pe,
-          isRefetchError: Ie && l.dataUpdatedAt !== 0,
-          isStale: nt(t, e),
+          isRefetchError: Ie && o.dataUpdatedAt !== 0,
+          isStale: it(t, e),
           // eslint-disable-next-line @typescript-eslint/unbound-method
           refetch: this.refetch
         },
         selectError: m,
-        select: Y,
+        select: B,
         selectResult: T
       };
     });
     this.options = t, M(this, J, e), this.bindMethods(), M(this, x, this.setOptions(t));
     const r = a(this, x);
-    M(this, ae, r.state);
+    M(this, ue, r.state);
     const { result: n, select: u } = this.getObserverResultFromQuery({
       query: r,
       options: this.options,
@@ -995,7 +995,7 @@ class Is {
     }), typeof this.options.enabled < "u" && typeof this.options.enabled != "boolean")
       throw new Error("Expected enabled to be a boolean");
     const r = this.buildQuery(this.options);
-    return r !== a(this, x) && (M(this, ae, r.state), M(this, x, r)), this.queryUpdateSubject.next({
+    return r !== a(this, x) && (M(this, ue, r.state), M(this, x, r)), this.queryUpdateSubject.next({
       options: this.options,
       query: r
     }), r;
@@ -1030,7 +1030,7 @@ class Is {
     select: n,
     selectResult: u
   }) {
-    a(this, V).state = e.state, a(this, V).result = t, a(this, V).selectResult = u, r !== void 0 && (a(this, V).selectError = r), n !== void 0 && (a(this, V).select = n), a(this, V).options = this.options, e.state.data !== void 0 && M(this, fe, e), a(this, J).getQueryCache().notify({
+    a(this, V).state = e.state, a(this, V).result = t, a(this, V).selectResult = u, r !== void 0 && (a(this, V).selectError = r), n !== void 0 && (a(this, V).select = n), a(this, V).options = this.options, e.state.data !== void 0 && M(this, de, e), a(this, J).getQueryCache().notify({
       query: a(this, x),
       type: "observerResultsUpdated"
     });
@@ -1042,7 +1042,7 @@ class Is {
   }
   async fetch(e) {
     const t = this.buildQuery(this.options);
-    t !== a(this, x) && (M(this, x, t), M(this, ae, t.state), this.queryUpdateSubject.next({
+    t !== a(this, x) && (M(this, x, t), M(this, ue, t.state), this.queryUpdateSubject.next({
       options: this.options,
       query: t
     }));
@@ -1073,23 +1073,23 @@ class Is {
   observe() {
     const e = a(this, x), t = this.queryUpdateSubject.pipe(
       g(({ query: i }) => i),
-      le(a(this, x)),
+      oe(a(this, x)),
       P()
     ), r = this.queryUpdateSubject.pipe(
-      le({
+      oe({
         query: a(this, x),
         options: this.options
       }),
       Ft(),
       F(
-        ([{ options: i, query: o }, { options: d, query: h }]) => {
-          gt(h, o, d, i) && this.fetch().catch(H);
+        ([{ options: i, query: l }, { options: f, query: h }]) => {
+          mt(h, l, f, i) && this.fetch().catch(H);
         }
       ),
-      ne()
+      he()
     ), n = t.pipe(
       Q((i) => i.observe(this)),
-      ne()
+      he()
     );
     return C(
       /**
@@ -1100,68 +1100,68 @@ class Is {
       r,
       t.pipe(
         Q((i) => {
-          const o = this.options, d = this.queryUpdateSubject.pipe(
-            le({ query: i, options: o }),
-            w((m) => m.query === i),
+          const l = this.options, f = this.queryUpdateSubject.pipe(
+            oe({ query: i, options: l }),
+            $((m) => m.query === i),
             g((m) => m.options),
             P(),
             Ue(1)
           ), h = a(this, we).pipe(
-            w((m) => m.query === i)
-          ), l = i.state$.pipe(
-            w((m) => m.status === "success"),
+            $((m) => m.query === i)
+          ), o = i.state$.pipe(
+            $((m) => m.status === "success"),
             Q(
               (m) => this.options.staleTime === 1 / 0 ? Oe : Ae(this.options.staleTime ?? 1).pipe(g(() => m))
             ),
             Ge(() => this.options.enabled ?? !0)
-          ), f = (m, Y) => {
-            const T = o.notifyOnChangeProps, z = typeof T == "function" ? T() : T;
-            return (Array.isArray(z) ? z.length === 0 ? () => !0 : (Pe, Ve) => {
-              const ut = mt(
+          ), d = (m, B) => {
+            const T = l.notifyOnChangeProps, L = typeof T == "function" ? T() : T;
+            return (Array.isArray(L) ? L.length === 0 ? () => !0 : (Pe, Ve) => {
+              const at = St(
                 Pe,
-                z
-              ), De = mt(
+                L
+              ), De = St(
                 Ve,
-                z
+                L
               );
-              return D(ut, De);
-            } : D)(m, Y);
+              return D(at, De);
+            } : D)(m, B);
           }, c = h.pipe(
             Q(() => i.state$),
-            Pt
-          ), b = d.pipe(
+            Vt
+          ), b = f.pipe(
             Q(() => {
-              const { refetchInterval: m, refetchIntervalInBackground: Y } = this.options, T = (typeof m == "function" ? m(a(this, x)) : m) ?? !1;
-              return T ? Zt(T).pipe(
+              const { refetchInterval: m, refetchIntervalInBackground: B } = this.options, T = (typeof m == "function" ? m(a(this, x)) : m) ?? !1;
+              return T ? es(T).pipe(
                 F(() => {
                   // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                  (Y || Le.isFocused()) && this.fetch({ cancelRefetch: !1 }).catch(H);
+                  (B || Le.isFocused()) && this.fetch({ cancelRefetch: !1 }).catch(H);
                 })
               ) : Oe;
             }),
-            ne()
-          ), E = d.pipe(
+            he()
+          ), E = f.pipe(
             g(({ enabled: m }) => m ?? !0),
             P()
           ), p = E.pipe(
-            w((m) => !m),
+            $((m) => !m),
             g(() => i.state)
           ), S = E.pipe(
-            w((m) => m),
+            $((m) => m),
             Q(() => Le.focusRegained$),
-            lt(d),
+            ht(f),
             F(([, m]) => {
               xs(i, m) && this.fetch({ cancelRefetch: !1 }).catch(H);
             }),
-            ne()
+            he()
           ), O = p.pipe(
             g(() => i.state)
-          ), q = (m) => m.pipe(
-            lt(d),
-            g(([, Y]) => {
+          ), z = (m) => m.pipe(
+            ht(f),
+            g(([, B]) => {
               const T = this.getObserverResultFromQuery({
                 query: i,
-                options: Y,
+                options: B,
                 prevResult: a(this, V)
               });
               return this.updateResult({ query: i, ...T }), T.result;
@@ -1171,21 +1171,21 @@ class Is {
             c,
             i.state$,
             // options$,
-            l
+            o
           ).pipe(
-            q,
+            z,
             // This one ensure we don't re-trigger same state
             P(D),
             // This one make sure we dispatch based on user preference
-            P(f)
+            P(d)
           );
           return C(b, S, R);
         })
       ).pipe(
-        rt((i) => M(this, Ce, i)),
+        nt((i) => M(this, Ce, i)),
         F({
           subscribe: () => {
-            bt(e, this.options) && this.fetch().catch(H);
+            gt(e, this.options) && this.fetch().catch(H);
           }
         })
       )
@@ -1194,12 +1194,12 @@ class Is {
   destroy() {
   }
 }
-J = new WeakMap(), x = new WeakMap(), we = new WeakMap(), ae = new WeakMap(), V = new WeakMap(), fe = new WeakMap(), Ce = new WeakMap();
+J = new WeakMap(), x = new WeakMap(), we = new WeakMap(), ue = new WeakMap(), V = new WeakMap(), de = new WeakMap(), Ce = new WeakMap();
 function Ps(s, e) {
   return !D(s.getCurrentResult(), e);
 }
-const Vt = We.createContext(!1), Vs = () => We.useContext(Vt);
-Vt.Provider;
+const Dt = We.createContext(!1), Vs = () => We.useContext(Dt);
+Dt.Provider;
 function Ds() {
   let s = !1;
   return {
@@ -1227,65 +1227,65 @@ function Hs(s, e, t) {
     throw new Error(
       'Bad argument type. Starting with v5, only the "Object" form is allowed when calling query related functions. Please use the error stack to find the culprit call. More info here: https://tanstack.com/query/latest/docs/react/guides/migrating-to-v5#supports-a-single-signature-one-object'
     );
-  const r = At(t), n = Vs(), u = Ts(), i = r.defaultQueryOptions(s);
+  const r = Ut(t), n = Vs(), u = Ts(), i = r.defaultQueryOptions(s);
   i._optimisticResults = n ? "isRestoring" : "optimistic";
-  const [o] = $t(
+  const [l] = wt(
     () => new e(
       r,
       i
     )
-  ), d = Ye(() => o.observe()), h = k(
-    o.getOptimisticResult(i)
-  ), l = h.current;
+  ), f = Ye(() => l.observe()), h = k(
+    l.getOptimisticResult(i)
+  ), o = h.current;
   Je(
-    () => d.current.pipe(
+    () => f.current.pipe(
       /**
        * By the time this observer runs the result may have changed (eg: synchronous setData).
        * It's important to not skip the first result (even tho most of the time they are equal).
        * We only skip if they are the same.
        */
-      w((c) => !D(c, h.current))
+      $((c) => !D(c, h.current))
     ),
     []
-  ), se(() => {
-    o.setOptions(i);
-  }, [i, o]);
-  const f = l.error;
-  if (f && Ns({
-    result: l,
+  ), re(() => {
+    l.setOptions(i);
+  }, [i, l]);
+  const d = o.error;
+  if (d && Ns({
+    result: o,
     errorResetBoundary: u,
     throwOnError: i.throwOnError,
     query: r.getQueryCache().get(
       i.queryHash
     )
   }))
-    throw f;
+    throw d;
   return h.current;
 }
-function mr(s, e) {
+function Sr(s, e) {
   return Hs(s, Is, e);
 }
-function Sr(s, e, t = []) {
+function vr(s, e, t = []) {
   const r = e != null && !Array.isArray(e) ? e : {}, n = r.retry ?? !0, u = k(
-    r.onError ?? ((d) => {
-      console.error(d);
+    r.onError ?? ((f) => {
+      console.error(f);
     })
-  ), i = he(() => A(s), t), o = he(
+  ), i = le(() => A(s), t), l = le(
     () => i().pipe(
-      ee((d) => {
-        throw u.current(d), d;
+      te((f) => {
+        throw u.current(f), f;
       }),
-      n ? es() : Ct
+      n ? ts() : Et
     ),
     [i, n, u]
   );
-  Rt(o, t);
+  Mt(l, t);
 }
-const Dt = () => (s) => C(
+const kt = () => (s) => C(
   // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
   v({ isPaused: !0 }),
-  te.backToOnline$.pipe(
-    _(
+  se.backToOnline$.pipe(
+    q(
       () => (
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         C(v({ isPaused: !1 }), s)
@@ -1295,7 +1295,7 @@ const Dt = () => (s) => C(
 ), qs = (s) => {
   let e = 0;
   return s.pipe(
-    ee((t) => (e++, e <= 1 && !te.isOnline() ? C(
+    te((t) => (e++, e <= 1 && !se.isOnline() ? C(
       v({
         failureCount: e,
         failureReason: t
@@ -1305,7 +1305,7 @@ const Dt = () => (s) => C(
        * timer needed to be iso RQ, so the state returned by mutation include both previous and next one
        */
       Ae(1).pipe(
-        _(() => me(() => t).pipe(Dt()))
+        q(() => me(() => t).pipe(kt()))
       )
     ) : me(() => t)))
   );
@@ -1314,7 +1314,7 @@ const Dt = () => (s) => C(
   state: e,
   options: t
 }) => {
-  const r = e.isPaused, n = async () => await Promise.reject(new Error("No mutationFn found")), u = t.mutationFn ?? n, o = ts(
+  const r = e.isPaused, n = async () => await Promise.reject(new Error("No mutationFn found")), u = t.mutationFn ?? n, l = ss(
     () => r,
     v(e.context),
     A(
@@ -1324,13 +1324,13 @@ const Dt = () => (s) => C(
         return ((c = t.onMutate) == null ? void 0 : c.call(t, s)) ?? void 0;
       }
     )
-  ).pipe(Ue(1)), d = (c, b, E) => (console.error(c), A(
+  ).pipe(Ue(1)), f = (c, b, E) => (console.error(c), A(
     () => {
       var S;
       return (S = t.onError) == null ? void 0 : S.call(t, c, s, b);
     }
   ).pipe(
-    ee(() => v(c)),
+    te(() => v(c)),
     g(
       () => ({
         failureCount: E,
@@ -1340,7 +1340,7 @@ const Dt = () => (s) => C(
         status: "error"
       })
     )
-  )), h = o.pipe(
+  )), h = l.pipe(
     Q((c) => {
       const E = (typeof u == "function" ? (
         // eslint-disable-next-line @typescript-eslint/promise-function-async
@@ -1356,7 +1356,7 @@ const Dt = () => (s) => C(
           })
         ),
         qs,
-        jt({
+        Qt({
           ...t,
           retry: (p, S) => {
             const O = t.retry ?? 0;
@@ -1369,7 +1369,7 @@ const Dt = () => (s) => C(
               failureReason: S
             })
           ),
-          catchError: (p, S) => d(S, c, p).pipe(
+          catchError: (p, S) => f(S, c, p).pipe(
             g((O) => ({
               ...O,
               result: void 0
@@ -1381,9 +1381,9 @@ const Dt = () => (s) => C(
           !0
         )
       );
-      return te.isOnline() || t.networkMode === "offlineFirst" ? E : E.pipe(Dt());
+      return se.isOnline() || t.networkMode === "offlineFirst" ? E : E.pipe(kt());
     })
-  ), l = v({
+  ), o = v({
     ...e,
     variables: s,
     status: "pending",
@@ -1393,9 +1393,9 @@ const Dt = () => (s) => C(
     submittedAt: e.submittedAt ?? (/* @__PURE__ */ new Date()).getTime()
   });
   return C(
-    l,
+    o,
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    o.pipe(g((c) => ({ context: c }))),
+    l.pipe(g((c) => ({ context: c }))),
     h.pipe(
       Q(({ result: c, error: b, ...E }) => {
         if (!c && !b)
@@ -1404,8 +1404,8 @@ const Dt = () => (s) => C(
           });
         const p = b ? v(null) : A(
           () => {
-            var U;
-            return (U = t.onSuccess) == null ? void 0 : U.call(
+            var I;
+            return (I = t.onSuccess) == null ? void 0 : I.call(
               t,
               c == null ? void 0 : c.data,
               s,
@@ -1414,8 +1414,8 @@ const Dt = () => (s) => C(
           }
         ), O = A(
           () => {
-            var U;
-            return (U = t.onSettled) == null ? void 0 : U.call(
+            var I;
+            return (I = t.onSettled) == null ? void 0 : I.call(
               t,
               c == null ? void 0 : c.data,
               b,
@@ -1424,7 +1424,7 @@ const Dt = () => (s) => C(
             );
           }
         ).pipe(
-          ee((U) => c ? v(c) : v(U))
+          te((I) => c ? v(c) : v(I))
         );
         return ke(p, O).pipe(
           Te(),
@@ -1444,8 +1444,8 @@ const Dt = () => (s) => C(
               ...E
             }
           ),
-          ee(
-            (U) => d(U, E.context, 0).pipe(
+          te(
+            (I) => f(I, E.context, 0).pipe(
               g((R) => ({
                 ...R,
                 data: void 0
@@ -1461,116 +1461,116 @@ const Dt = () => (s) => C(
       ...b,
       data: b.data ?? c.data,
       error: b.error ?? c.error
-    }), ie()),
+    }), ne()),
     P(
       ({ data: c, ...b }, { data: E, ...p }) => D(b, p) && D(c, E)
     )
   );
 };
-var Ee, Z, de;
+var Ee, ee, pe;
 class Ls {
   constructor({
     options: e,
     mutationCache: t,
     state: r
   }) {
-    $(this, Ee, new G(0));
-    $(this, Z, new I());
-    $(this, de, new I());
-    y(this, "state", ie());
+    w(this, Ee, new G(0));
+    w(this, ee, new U());
+    w(this, pe, new U());
+    y(this, "state", ne());
     y(this, "state$");
     y(this, "options");
     y(this, "observerCount$", a(this, Ee).asObservable());
-    y(this, "cancelled$", a(this, Z).asObservable());
+    y(this, "cancelled$", a(this, ee).asObservable());
     this.options = e, this.state = r ?? this.state;
-    const n = a(this, de).pipe(
+    const n = a(this, pe).pipe(
       Q(
         (u) => zs({
           options: {
             ...this.options,
             onMutate: (i) => {
-              const o = A(
+              const l = A(
                 () => {
-                  var f, c;
-                  return (c = (f = t.config).onMutate) == null ? void 0 : c.call(
-                    f,
+                  var d, c;
+                  return (c = (d = t.config).onMutate) == null ? void 0 : c.call(
+                    d,
                     i,
                     this
                   );
                 }
               ), h = A(() => {
-                var f, c;
-                return (c = (f = this.options).onMutate) == null ? void 0 : c.call(f, i);
+                var d, c;
+                return (c = (d = this.options).onMutate) == null ? void 0 : c.call(d, i);
               });
-              return o.pipe(
-                _(() => h)
+              return l.pipe(
+                q(() => h)
               );
             },
-            onError: (i, o, d) => {
+            onError: (i, l, f) => {
               const h = A(
                 () => {
-                  var f, c;
-                  return (c = (f = t.config).onError) == null ? void 0 : c.call(
-                    f,
-                    i,
-                    o,
+                  var d, c;
+                  return (c = (d = t.config).onError) == null ? void 0 : c.call(
                     d,
+                    i,
+                    l,
+                    f,
                     this
                   );
                 }
-              ), l = A(
+              ), o = A(
                 () => {
-                  var f, c;
-                  return (c = (f = this.options).onError) == null ? void 0 : c.call(f, i, o, d);
+                  var d, c;
+                  return (c = (d = this.options).onError) == null ? void 0 : c.call(d, i, l, f);
                 }
               );
-              return ke(h, l).pipe(Te());
+              return ke(h, o).pipe(Te());
             },
-            onSettled: (i, o, d, h) => {
-              const l = A(
+            onSettled: (i, l, f, h) => {
+              const o = A(
                 () => {
                   var c, b;
                   return (b = (c = t.config).onSettled) == null ? void 0 : b.call(
                     c,
                     i,
-                    o,
-                    d,
+                    l,
+                    f,
                     h,
                     this
                   );
                 }
-              ), f = A(
+              ), d = A(
                 () => {
                   var c, b;
-                  return (b = (c = this.options).onSettled) == null ? void 0 : b.call(c, i, o, d, h);
+                  return (b = (c = this.options).onSettled) == null ? void 0 : b.call(c, i, l, f, h);
                 }
               );
-              return ke(l, f).pipe(Te());
+              return ke(o, d).pipe(Te());
             },
-            onSuccess: (i, o, d) => {
+            onSuccess: (i, l, f) => {
               const h = A(
                 () => {
-                  var f, c;
-                  return (c = (f = t.config).onSuccess) == null ? void 0 : c.call(
-                    f,
-                    i,
-                    o,
+                  var d, c;
+                  return (c = (d = t.config).onSuccess) == null ? void 0 : c.call(
                     d,
+                    i,
+                    l,
+                    f,
                     this
                   );
                 }
-              ), l = A(
+              ), o = A(
                 () => {
-                  var f, c;
-                  return (c = (f = this.options).onSuccess) == null ? void 0 : c.call(f, i, o, d);
+                  var d, c;
+                  return (c = (d = this.options).onSuccess) == null ? void 0 : c.call(d, i, l, f);
                 }
               );
-              return ke(h, l).pipe(Te());
+              return ke(h, o).pipe(Te());
             }
           },
           state: this.state,
           variables: u
-        }).pipe(re(a(this, Z)))
+        }).pipe(Y(a(this, ee)))
       )
     );
     this.state$ = C(
@@ -1581,18 +1581,18 @@ class Ls {
        */
       Oe
     ).pipe(
-      le(this.state),
+      oe(this.state),
       F((u) => {
         this.state = { ...this.state, ...u };
       }),
-      re(a(this, Z)),
+      Y(a(this, ee)),
       /**
        * refCount as true somewhat make NEVER complete when there are
        * no more observers. I thought I should have to complete manually (which is
        * why we still cancel the observable when we remove it from cache)
        */
       Ue({ bufferSize: 1, refCount: !1 }),
-      rt((u) => {
+      nt((u) => {
         a(this, Ee).next(u);
       })
     );
@@ -1609,60 +1609,60 @@ class Ls {
    * is over, unlike the state which can be re-subscribed later.
    */
   execute(e) {
-    return a(this, de).next(e), a(this, de).complete(), this.state$.pipe($e);
+    return a(this, pe).next(e), a(this, pe).complete(), this.state$.pipe($e);
   }
   continue() {
     return this.execute(this.state.variables);
   }
   // @todo merge with query
   cancel() {
-    a(this, Z).next(), a(this, Z).complete();
+    a(this, ee).next(), a(this, ee).complete();
   }
 }
-Ee = new WeakMap(), Z = new WeakMap(), de = new WeakMap();
-const Ot = ({
+Ee = new WeakMap(), ee = new WeakMap(), pe = new WeakMap();
+const $t = ({
   mutationKey: s,
   status: e,
   predicate: t,
   exact: r = !0
 } = {}) => (u) => r && s !== void 0 && u.options.mutationKey !== void 0 && !qe(u.options.mutationKey, s, { exact: r }) || !r && s !== void 0 && u.options.mutationKey !== void 0 && !qe(u.options.mutationKey, s, { exact: r }) || e && u.state.status !== e ? !1 : t ? t(u) : !0;
-class kt {
+class Tt {
   constructor() {
     /**
      * @important
      * Query store. Could be turned into a map for more performance.
      */
     y(this, "entriesSubject", new G([]));
-    y(this, "changeSubject", new I());
-    y(this, "entries$", this.entriesSubject.pipe(ge()));
+    y(this, "changeSubject", new U());
+    y(this, "entries$", this.entriesSubject.pipe(fe()));
     y(this, "added$", this.changeSubject.pipe(
-      w(({ type: e }) => e === "added"),
+      $(({ type: e }) => e === "added"),
       g(({ entity: e }) => e),
-      ge()
+      fe()
     ));
     y(this, "removed$", this.changeSubject.pipe(
-      w(({ type: e }) => e === "removed"),
+      $(({ type: e }) => e === "removed"),
       g(({ entity: e }) => e),
-      ge()
+      fe()
     ));
     y(this, "stateChange$", C(
       this.entriesSubject.pipe(
-        Et(),
-        _((e) => ve(e))
+        st(),
+        q((e) => ve(e))
       ),
       this.added$
     ).pipe(
-      _(
+      q(
         (e) => e.state$.pipe(
           g(() => e),
-          re(
+          Y(
             this.removed$.pipe(
-              w((t) => t === e)
+              $((t) => t === e)
             )
           )
         )
       ),
-      ge()
+      fe()
     ));
   }
   getValues() {
@@ -1683,7 +1683,7 @@ class kt {
 var N;
 class _s {
   constructor(e = {}) {
-    $(this, N, new kt());
+    w(this, N, new Tt());
     this.config = e;
   }
   build(e, t, r) {
@@ -1697,10 +1697,10 @@ class _s {
        * Once a mutation is finished and there are no more observers than us
        * we start the process of cleaning it up based on gc settings
        */
-      w(({ status: u }) => u === "success" || u === "error"),
+      $(({ status: u }) => u === "success" || u === "error"),
       Q(
         () => n.observerCount$.pipe(
-          w((u) => u <= 1),
+          $((u) => u <= 1),
           He(1)
         )
       ),
@@ -1721,15 +1721,15 @@ class _s {
     t == null || t.cancel(), a(this, N).remove(e);
   }
   find(e) {
-    const t = { exact: !0, ...e }, r = Ot(t);
+    const t = { exact: !0, ...e }, r = $t(t);
     return a(this, N).getValues().find((n) => r(n));
   }
   findAll(e = {}) {
-    const t = { exact: !0, ...e }, r = Ot(t);
+    const t = { exact: !0, ...e }, r = $t(t);
     return a(this, N).getValues().filter((n) => r(n)).map((n) => n);
   }
   observe() {
-    return a(this, N).stateChange$.pipe(le());
+    return a(this, N).stateChange$.pipe(oe());
   }
   /**
    * @important
@@ -1775,9 +1775,9 @@ class _s {
       predicate: (r) => r.state.isPaused
     });
     if (!e.length)
-      return ye;
+      return be;
     const t = e.map((r) => r.continue());
-    return ss(t);
+    return rs(t);
   }
   clear() {
     this.getAll().forEach((e) => {
@@ -1804,75 +1804,93 @@ function Gs(s) {
     fetchStatus: "idle"
   };
 }
-const Js = (s) => Qe(() => Le.isFocused() ? s : Le.focusRegained$.pipe(_(() => s))), Ys = (s) => {
+const Js = (s) => Qe(() => Le.isFocused() ? s : Le.focusRegained$.pipe(q(() => s))), Ys = (s) => {
   let e = 0;
   return (t) => {
-    const r = te.backToOnline$.pipe(
-      _(
+    const r = se.backToOnline$.pipe(
+      q(
         () => C(
           v({ fetchStatus: "fetching" }),
           t
         )
       )
     );
-    return Qe(() => (e++, !te.isOnline() && s.networkMode === "offlineFirst" && e > 1 ? C(
+    return Qe(() => (e++, !se.isOnline() && s.networkMode === "offlineFirst" && e > 1 ? C(
       v({ fetchStatus: "paused" }),
       r
-    ) : !te.isOnline() && s.networkMode !== "always" && s.networkMode !== "offlineFirst" ? C(
+    ) : !se.isOnline() && s.networkMode !== "always" && s.networkMode !== "offlineFirst" ? C(
       v({ fetchStatus: "paused" }),
       r
     ) : t));
   };
-}, Bs = (s) => {
+}, Bs = (s) => (e) => {
+  const t = new U(), r = t.pipe(
+    st(),
+    /**
+     * Since we set hasDataSubject synchronously, we need to wait
+     * for the next tick to make sure observable chain received this data at least
+     */
+    xt(1),
+    q(() => s.pipe($((n) => n === 0)))
+  );
+  return e.pipe(
+    F(() => {
+      t.next();
+    }),
+    Y(r)
+  );
+}, Xs = (s) => {
   const e = async () => await Promise.reject(new Error("No query found"));
   let t = !1;
   const r = s.queryFn ?? e, n = new AbortController(), u = {
     meta: s.meta,
     queryKey: s.queryKey
   };
-  ((f) => {
-    Object.defineProperty(f, "signal", {
+  ((o) => {
+    Object.defineProperty(o, "signal", {
       enumerable: !0,
       get: () => (s.onSignalConsumed(), n.signal)
     });
   })(u);
-  const d = (typeof r == "function" ? (
+  const f = (typeof r == "function" ? (
     // eslint-disable-next-line @typescript-eslint/promise-function-async
     A(
       () => r(u)
     )
   ) : r).pipe(
+    Bs(s.observers$),
     F({
       complete: () => {
-        t = !0;
+        console.log("Query.execution$.complete"), t = !0;
       }
     }),
     g(
-      (f) => ({
-        data: f
+      (o) => ({
+        data: o
       })
     ),
+    // takeUntil(hasDataAndNoObservers$),
     Ys(s),
-    jt({
+    Qt({
       ...s,
       retryAfter: () => v(!0).pipe(Js),
-      catchError: (f, c) => v({
+      catchError: (o, d) => v({
         status: "error",
         fetchStatus: "idle",
-        fetchFailureCount: f,
-        fetchFailureReason: c,
-        error: c
+        fetchFailureCount: o,
+        fetchFailureReason: d,
+        error: d
       }),
-      caughtError: (f, c) => (
+      caughtError: (o, d) => (
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         v({
-          fetchFailureCount: f,
-          fetchFailureReason: c
+          fetchFailureCount: o,
+          fetchFailureReason: d
         })
       )
     }),
-    _((f) => "data" in f ? v({
-      ...f,
+    q((o) => "data" in o ? v({
+      ...o,
       status: "success",
       fetchStatus: "idle",
       fetchFailureCount: 0,
@@ -1894,33 +1912,40 @@ const Js = (s) => Qe(() => Le.isFocused() ? s : Le.focusRegained$.pipe(_(() => s
        *
        * There is in theory no problem associated to that.
        */
-      rs(1),
+      xt(1),
       g(
-        (c) => t ? c : { ...c, fetchStatus: "fetching" }
+        (d) => t ? d : { ...d, fetchStatus: "fetching" }
       )
-    ) : v(f)),
-    ge()
-  ), h = d.pipe(
-    ne(),
-    ns({ fetchStatus: "idle" })
-  ), l = v({
+    ) : v(o)),
+    /**
+     * When the fn complete we can release the fetch status, if it was already released
+     * before shallow compare will not update the state, otherwise it's our chance to catch
+     * the end of observable fn.
+     */
+    ns({ fetchStatus: "idle" }),
+    fe()
+  ), h = v({
     status: "pending",
-    fetchStatus: te.isOnline() ? "fetching" : "paused"
+    fetchStatus: se.isOnline() ? "fetching" : "paused"
   });
   return {
-    state$: C(l, d, h),
+    state$: C(
+      h,
+      f
+      // emitOnComplete$
+    ).pipe(fe()),
     abortController: n
   };
 };
-class Xs {
+class Zs {
   constructor(e) {
     y(this, "revert");
     y(this, "silent");
     this.revert = e == null ? void 0 : e.revert, this.silent = e == null ? void 0 : e.silent;
   }
 }
-const Zs = { backgroundColor: "transparent", color: "inherit" };
-function Tt(s) {
+const er = { backgroundColor: "transparent", color: "inherit" };
+function Kt(s) {
   const e = {
     namespaces: [
       {
@@ -1929,10 +1954,10 @@ function Tt(s) {
       }
     ],
     namespace(t, r) {
-      const n = Tt(s);
+      const n = Kt(s);
       return n.namespaces.push({
         name: t,
-        style: r ?? Zs
+        style: r ?? er
       }), n;
     },
     printNamespaces() {
@@ -1971,35 +1996,35 @@ function Tt(s) {
   };
   return e;
 }
-const er = Tt("production");
-var Fe, ce;
-class tr {
+const tr = Kt("production");
+var Fe, ae;
+class sr {
   constructor(e) {
     y(this, "queryKey");
     y(this, "queryHash");
     y(this, "gcTime");
     y(this, "options");
-    $(this, Fe, void 0);
-    $(this, ce, void 0);
+    w(this, Fe, void 0);
+    w(this, ae, void 0);
     y(this, "state");
     // @todo to share with mutation
-    y(this, "executeSubject", new I());
-    y(this, "cancelSubject", new I());
-    y(this, "setDataSubject", new I());
-    y(this, "invalidatedSubject", new I());
-    y(this, "resetSubject", new I());
-    y(this, "destroySubject", new I());
+    y(this, "executeSubject", new U());
+    y(this, "cancelSubject", new U());
+    y(this, "setDataSubject", new U());
+    y(this, "invalidatedSubject", new U());
+    y(this, "resetSubject", new U());
+    y(this, "destroySubject", new U());
     y(this, "observersSubject", new G([]));
     y(this, "abortSignalConsumed", !1);
     y(this, "observerCount$", this.observersSubject.asObservable().pipe(g((e) => e.length)));
     y(this, "observers$", this.observersSubject.asObservable());
     y(this, "state$");
-    M(this, Fe, e.defaultOptions), this.options = this.setOptions(e.options), this.queryKey = e.queryKey, this.queryHash = e.queryHash, M(this, ce, e.state ?? Gs(this.options)), this.state = a(this, ce), this.gcTime = this.updateGcTime(this.options.gcTime), this.state$ = C(
+    M(this, Fe, e.defaultOptions), this.options = this.setOptions(e.options), this.queryKey = e.queryKey, this.queryHash = e.queryHash, M(this, ae, e.state ?? Gs(this.options)), this.state = a(this, ae), this.gcTime = this.updateGcTime(this.options.gcTime), this.state$ = C(
       this.resetSubject.pipe(
-        g(() => ({ command: "reset", state: a(this, ce) }))
+        g(() => ({ command: "reset", state: a(this, ae) }))
       ),
       this.invalidatedSubject.pipe(
-        w(() => !this.state.isInvalidated),
+        $(() => !this.state.isInvalidated),
         g(() => ({
           command: "invalidate",
           state: {
@@ -2008,50 +2033,51 @@ class tr {
         }))
       ),
       this.cancelSubject.pipe(
-        w(() => !(this.state.error && this.state.status === "error")),
+        $(() => !(this.state.error && this.state.status === "error")),
         g((t) => ({
           command: "cancel",
           state: {
             status: t != null && t.revert ? this.state.status : "error",
             fetchStatus: "idle",
-            error: new Xs(t)
+            error: new Zs(t)
           }
         }))
       ),
       this.executeSubject.pipe(
-        _(() => {
+        q(() => {
           let t = !1;
           const r = this.executeSubject.pipe(
             // should not be needed since the fetch return current promise
             // in case we don't cancel
-            w((h) => (h == null ? void 0 : h.cancelRefetch) !== !1)
+            $((h) => (h == null ? void 0 : h.cancelRefetch) !== !1)
           ), n = this.observers$.pipe(
             Ft(),
-            F(([h, l]) => {
-              l.length === 0 && h.length > 0 ? t = !0 : t = !1;
+            F(([h, o]) => {
+              o.length === 0 && h.length > 0 ? t = !0 : t = !1;
             }),
-            ne()
-          ), { state$: u, abortController: i } = Bs({
+            he()
+          ), { state$: u, abortController: i } = Xs({
             ...this.options,
+            observers$: this.observerCount$,
             queryKey: this.queryKey,
-            retry: (h, l) => {
-              const f = this.options.retry ?? !0;
-              return typeof f == "function" ? f(h, l) : typeof f == "boolean" ? f : h < f;
+            retry: (h, o) => {
+              const d = this.options.retry ?? !0;
+              return typeof d == "function" ? d(h, o) : typeof d == "boolean" ? d : h < d;
             },
             retryAfterDelay: () => !t,
             onSignalConsumed: () => {
               this.abortSignalConsumed = !0;
             }
-          }), o = this.observerCount$.pipe(
-            w((h) => h === 0 && this.abortSignalConsumed),
+          }), l = this.observerCount$.pipe(
+            $((h) => h === 0 && this.abortSignalConsumed),
             F(() => {
               this.cancelSubject.next({ revert: !0 });
             })
-          ), d = C(
+          ), f = C(
             this.cancelSubject,
             r,
             this.resetSubject,
-            o
+            l
           ).pipe(
             F(() => {
               this.abortSignalConsumed && i.abort();
@@ -2062,7 +2088,7 @@ class tr {
               command: "execute",
               state: h
             })),
-            re(d)
+            Y(f)
           );
         })
       ),
@@ -2082,16 +2108,16 @@ class tr {
         getOptions: () => this.options,
         getState: () => this.state
       }),
-      le(a(this, ce)),
+      oe(a(this, ae)),
       P(D),
       F((t) => {
         this.state = t;
       }),
-      re(this.destroySubject),
-      Ue({ bufferSize: 1, refCount: !1 }),
-      ee((t) => {
-        throw er.error(t), t;
-      })
+      te((t) => {
+        throw tr.error(t), t;
+      }),
+      Y(this.destroySubject),
+      Ue({ bufferSize: 1, refCount: !1 })
     );
   }
   setOptions(e) {
@@ -2104,21 +2130,21 @@ class tr {
     return this.state$.pipe(
       g(({ data: e, status: t }) => ({ data: e, status: t })),
       P(D),
-      w(({ status: e }) => e === "success")
+      $(({ status: e }) => e === "success")
     );
   }
   get error$() {
     return this.state$.pipe(
       g(({ error: e, status: t }) => ({ error: e, status: t })),
       P(D),
-      w(({ status: e }) => e === "error")
+      $(({ status: e }) => e === "error")
     );
   }
   get settled$() {
     return this.state$.pipe(
       g(({ status: e }) => ({ status: e })),
       P(D),
-      w(({ status: e }) => e === "success" || e === "error")
+      $(({ status: e }) => e === "success" || e === "error")
     );
   }
   observe(e) {
@@ -2162,7 +2188,7 @@ class tr {
   }
   async getFetchResultAsPromise() {
     return await new Promise((e, t) => {
-      this.state$.pipe(Pt, Ke()).subscribe({
+      this.state$.pipe(Vt, Ke()).subscribe({
         error: t,
         next: (r) => {
           r.error ? t(r.error) : e(r.data);
@@ -2193,14 +2219,14 @@ class tr {
     this.resetSubject.next();
   }
 }
-Fe = new WeakMap(), ce = new WeakMap();
+Fe = new WeakMap(), ae = new WeakMap();
 var xe, W;
-class sr {
+class rr {
   // protected mountSubscriptions: Subscription[]
   constructor(e = {}) {
     // readonly #queries: QueryStore = new Map<string, Query>()
-    $(this, xe, new I());
-    $(this, W, new kt());
+    w(this, xe, new U());
+    w(this, W, new Tt());
     this.config = e;
   }
   mount() {
@@ -2213,7 +2239,7 @@ class sr {
   observeIsFetching(e) {
     return a(this, W).stateChange$.pipe(
       // we force a first result
-      le(),
+      oe(),
       g(() => this.findAll({
         ...e,
         fetchStatus: "fetching"
@@ -2226,12 +2252,12 @@ class sr {
   }
   findAll(e = {}) {
     const t = this.getAll();
-    return Object.keys(e).length > 0 ? t.filter((r) => vt(e, r)) : t;
+    return Object.keys(e).length > 0 ? t.filter((r) => Ot(e, r)) : t;
   }
   build(e, t, r) {
-    const n = t.queryKey ?? [st()], u = t.queryHash ?? it(n, t);
+    const n = t.queryKey ?? [rt()], u = t.queryHash ?? ut(n, t);
     let i = this.get(u);
-    return i || (i = new tr({
+    return i || (i = new sr({
       cache: this,
       queryKey: n,
       queryHash: u,
@@ -2244,7 +2270,7 @@ class sr {
     if (!a(this, W).find((t) => t.queryHash === e.queryHash)) {
       a(this, W).add(e);
       const t = e.observerCount$.pipe(
-        w((r) => r < 1),
+        $((r) => r < 1),
         He(1)
       );
       e.success$.subscribe(() => {
@@ -2285,7 +2311,7 @@ class sr {
   find(e) {
     const t = { exact: !0, ...e };
     return this.getAll().find(
-      (r) => vt(t, r)
+      (r) => Ot(t, r)
     );
   }
   subscribe(e) {
@@ -2327,27 +2353,27 @@ class sr {
   }
 }
 xe = new WeakMap(), W = new WeakMap();
-var oe, j, Re, Me, je;
-class vr {
+var ce, j, Re, Me, je;
+class Or {
   // #destroy = () => {}
   constructor({
     mutationCache: e,
     queryCache: t,
     defaultOptions: r
   } = {}) {
-    $(this, oe, void 0);
-    $(this, j, void 0);
-    $(this, Re, /* @__PURE__ */ new Map());
-    $(this, Me, /* @__PURE__ */ new Map());
-    $(this, je, void 0);
-    M(this, oe, e ?? new _s()), M(this, j, t ?? new sr()), M(this, je, r ?? {});
+    w(this, ce, void 0);
+    w(this, j, void 0);
+    w(this, Re, /* @__PURE__ */ new Map());
+    w(this, Me, /* @__PURE__ */ new Map());
+    w(this, je, void 0);
+    M(this, ce, e ?? new _s()), M(this, j, t ?? new rr()), M(this, je, r ?? {});
   }
   mount() {
   }
   unmount() {
   }
   getMutationCache() {
-    return a(this, oe);
+    return a(this, ce);
   }
   getQueryCache() {
     return a(this, j);
@@ -2367,7 +2393,7 @@ class vr {
       ...e,
       _defaulted: !0
     };
-    return t.queryHash || (t.queryHash = it(
+    return t.queryHash || (t.queryHash = ut(
       t.queryKey,
       t
     )), typeof t.refetchOnReconnect > "u" && (t.refetchOnReconnect = t.networkMode !== "always"), typeof t.throwOnError > "u" && (t.throwOnError = !!t.suspense), typeof t.networkMode > "u" && t.persister && (t.networkMode = "offlineFirst"), t;
@@ -2409,8 +2435,8 @@ class vr {
     const n = a(this, j).find({ queryKey: e }), u = n == null ? void 0 : n.state.data, i = js(t, u);
     if (typeof i > "u")
       return;
-    const o = this.defaultQueryOptions({ queryKey: e });
-    return a(this, j).build(this, o).setData(i, { ...r, manual: !0 });
+    const l = this.defaultQueryOptions({ queryKey: e });
+    return a(this, j).build(this, l).setData(i, { ...r, manual: !0 });
   }
   getMutationDefaults(e) {
     const t = [...a(this, Re).values()];
@@ -2424,13 +2450,13 @@ class vr {
     return (t = a(this, j).find({ queryKey: e })) == null ? void 0 : t.state;
   }
   setMutationDefaults(e, t) {
-    a(this, Re).set(be(e), {
+    a(this, Re).set(ge(e), {
       mutationKey: e,
       defaultOptions: t
     });
   }
   setQueryDefaults(e, t) {
-    a(this, Me).set(be(e), {
+    a(this, Me).set(ge(e), {
       queryKey: e,
       defaultOptions: t
     });
@@ -2468,40 +2494,40 @@ class vr {
     await this.refetchQueries(r, t);
   }
   async resumePausedMutations() {
-    return await is(a(this, oe).resumePausedMutations());
+    return await is(a(this, ce).resumePausedMutations());
   }
   isFetching(e) {
     return a(this, j).findAll({ ...e, fetchStatus: "fetching" }).length;
   }
   clear() {
-    a(this, j).clear(), a(this, oe).clear();
+    a(this, j).clear(), a(this, ce).clear();
   }
 }
-oe = new WeakMap(), j = new WeakMap(), Re = new WeakMap(), Me = new WeakMap(), je = new WeakMap();
+ce = new WeakMap(), j = new WeakMap(), Re = new WeakMap(), Me = new WeakMap(), je = new WeakMap();
 export {
   _s as MutationCache,
-  sr as QueryCache,
-  vr as QueryClient,
-  br as QueryClientProvider,
+  rr as QueryCache,
+  Or as QueryClient,
+  gr as QueryClientProvider,
   ds as SIGNAL_RESET,
-  dr as createLocalforageAdapter,
-  fr as createSharedStoreAdapter,
+  pr as createLocalforageAdapter,
+  dr as createSharedStoreAdapter,
   Ss as exponentialBackoffDelay,
   ms as getDelay,
-  pt as isDefined,
-  jt as retryBackoff,
-  lr as signal,
+  yt as isDefined,
+  Qt as retryBackoff,
+  hr as signal,
   fs as useBehaviorSubject,
   k as useLiveRef,
-  gr as useMutation,
-  or as useObservableState,
+  mr as useMutation,
+  lr as useObservableState,
   Je as useObserve,
-  cr as useObserveCallback,
-  pr as usePersistSignals,
-  mr as useQuery,
-  hr as useSignalValue,
-  Mt as useSubject,
-  Rt as useSubscribe,
-  Sr as useSubscribeEffect,
-  yr as useUnmountObservable
+  or as useObserveCallback,
+  yr as usePersistSignals,
+  Sr as useQuery,
+  fr as useSignalValue,
+  jt as useSubject,
+  Mt as useSubscribe,
+  vr as useSubscribeEffect,
+  br as useUnmountObservable
 };