reactjrx 1.96.1 → 1.98.0

package/dist/index.js

@@ -3,11 +3,11 @@ var bt = (s) => {
   throw TypeError(s);
 };
 var Bt = (s, e, t) => e in s ? Yt(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t;
-var g = (s, e, t) => Bt(s, typeof e != "symbol" ? e + "" : e, t), gt = (s, e, t) => e.has(s) || bt("Cannot " + t);
+var b = (s, e, t) => Bt(s, typeof e != "symbol" ? e + "" : e, t), gt = (s, e, t) => e.has(s) || bt("Cannot " + t);
 var a = (s, e, t) => (gt(s, e, "read from private field"), t ? t.call(s) : e.get(s)), w = (s, e, t) => e.has(s) ? bt("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(s) : e.set(s, t), A = (s, e, t, r) => (gt(s, e, "write to private field"), r ? r.call(s, t) : e.set(s, t), t);
 import * as Ge from "react";
 import { useRef as me, useMemo as ut, useCallback as de, useSyncExternalStore as Xt, useEffect as Y, useState as at, createContext as Zt, memo as es, useContext as ts } from "react";
-import { distinctUntilChanged as U, tap as R, catchError as J, EMPTY as B, isObservable as mt, from as Se, of as v, defer as Ae, Subject as I, BehaviorSubject as X, skip as ot, first as Je, map as b, switchMap as j, zip as ss, filter as O, merge as C, throttleTime as rs, asyncScheduler as ns, throwError as Oe, timer as Qe, Observable as is, takeWhile as Ye, concatMap as us, last as Ke, mergeMap as q, takeUntil as ne, identity as Mt, shareReplay as Ue, ignoreElements as ie, scan as Be, fromEvent as Ne, noop as N, startWith as he, pairwise as At, NEVER as qe, delay as ct, interval as as, withLatestFrom as St, retry as os, iif as cs, share as ue, isEmpty as ls, concat as Te, toArray as ke, take as He, combineLatest as hs, endWith as ds, lastValueFrom as fs } from "rxjs";
+import { isObservable as mt, from as Se, of as v, defer as Ae, distinctUntilChanged as V, tap as R, catchError as J, EMPTY as B, Subject as I, BehaviorSubject as X, skip as ot, first as Je, map as y, switchMap as j, zip as ss, filter as O, merge as C, throttleTime as rs, asyncScheduler as ns, throwError as Oe, timer as Qe, Observable as is, takeWhile as Ye, concatMap as us, last as Ke, mergeMap as q, takeUntil as ne, identity as Mt, shareReplay as Ue, ignoreElements as ie, scan as Be, fromEvent as Ne, noop as N, startWith as he, pairwise as At, NEVER as qe, delay as ct, interval as as, withLatestFrom as St, retry as os, iif as cs, share as ue, isEmpty as ls, concat as Te, toArray as ke, take as He, combineLatest as hs, endWith as ds, lastValueFrom as fs } from "rxjs";
 import { catchError as vt, mergeMap as tt, retryWhen as ps, concatMap as ys, first as bs, tap as Qt } from "rxjs/operators";
 import { jsxs as gs, jsx as ms } from "react/jsx-runtime";
 const H = (s) => {
@@ -19,6 +19,19 @@ const H = (s) => {
 function Ss(s, e) {
   return typeof s == "string" && s === e || typeof s == "number" && s === e || typeof s == "boolean" && s === e || typeof s == "symbol" && s === e || typeof s == "bigint" && s === e || typeof s > "u" && s === e || s === null && s === e;
 }
+function Ot(s) {
+  return s instanceof Promise || s && typeof s.then == "function" && typeof s.catch == "function";
+}
+function U(s) {
+  if (mt(s)) return s;
+  if (Ot(s)) return Se(s);
+  if (typeof s != "function") return v(s);
+  const e = s;
+  return Ae(() => {
+    const t = e();
+    return Ot(t) ? Se(t) : mt(t) ? t : v(t);
+  });
+}
 function Xe(s, e, t) {
   const r = e != null && !Array.isArray(e) ? e : {
     defaultValue: void 0,
@@ -27,21 +40,21 @@ function Xe(s, e, t) {
     "getValue" in s && typeof s.getValue == "function" ? s.getValue() : r.defaultValue
   ), i = H(s), c = H(r), l = de(
     (p) => {
-      const F = i.current, f = (typeof F == "function" ? F : () => F)().pipe(
+      const E = i.current, d = U(E).pipe(
         /**
          * @important
          * We only check primitives because underlying subscription might
          * be using objects and keeping same reference but pushing new
          * properties values
          */
-        U(Ss),
-        R((y) => {
-          u.current = y;
+        V(Ss),
+        R((f) => {
+          u.current = f;
         }),
-        J((y) => (console.error(y), B))
+        J((f) => (console.error(f), B))
       ).subscribe(p);
       return () => {
-        c.current.unsubscribeOnUnmount !== !1 && f.unsubscribe();
+        c.current.unsubscribeOnUnmount !== !1 && d.unsubscribe();
       };
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -49,23 +62,10 @@ function Xe(s, e, t) {
   ), h = de(() => u.current, []);
   return Xt(l, h, h);
 }
-function Ot(s) {
-  return s instanceof Promise || s && typeof s.then == "function" && typeof s.catch == "function";
-}
-function V(s) {
-  if (mt(s)) return s;
-  if (Ot(s)) return Se(s);
-  if (typeof s != "function") return v(s);
-  const e = s;
-  return Ae(() => {
-    const t = e();
-    return Ot(t) ? Se(t) : mt(t) ? t : v(t);
-  });
-}
 function Ut(s, e = []) {
   const t = H(s);
   Y(() => {
-    const r = V(t.current).pipe(
+    const r = U(t.current).pipe(
       J((n) => (console.error(n), B))
     ).subscribe();
     return () => {
@@ -158,8 +158,8 @@ function $s(s, e) {
   const r = e ?? (() => s.getValue());
   return Xe(
     () => s.subject.pipe(
-      b((u) => r(u)),
-      U()
+      y((u) => r(u)),
+      V()
     ),
     {
       defaultValue: r(s.getValue())
@@ -179,6 +179,7 @@ const vr = (s) => {
   setItem: async (e, t) => {
     await s.setItem(e, JSON.stringify(t));
   },
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   removeItem: async (e) => {
   },
   clear: async () => {
@@ -281,7 +282,7 @@ function $r({
               config: p
             })
           )
-        ).pipe(b(() => !0))).pipe(
+        ).pipe(y(() => !0))).pipe(
           R(() => {
             n.current != null && n.current();
           }),
@@ -351,46 +352,46 @@ function Pt(s) {
     resetOnSuccess: o = !1,
     backoffDelay: p = js
   } = l;
-  return (F) => Ae(() => {
+  return (E) => Ae(() => {
     let d = 0;
-    const f = (y, x) => y < u ? i(y, x) : !1;
-    return F.pipe(
-      vt((y) => {
-        var E;
-        if (d++, !f(d - 1, y)) throw y;
-        const x = (E = s.caughtError) == null ? void 0 : E.call(s, d, y);
-        if (!x) throw y;
+    const f = (g, x) => g < u ? i(g, x) : !1;
+    return E.pipe(
+      vt((g) => {
+        var F;
+        if (d++, !f(d - 1, g)) throw g;
+        const x = (F = s.caughtError) == null ? void 0 : F.call(s, d, g);
+        if (!x) throw g;
         return x.pipe(
           tt(
             ($) => C(
               v($),
-              Oe(() => y)
+              Oe(() => g)
             )
           )
         );
       }),
-      ps((y) => y.pipe(
+      ps((g) => g.pipe(
         ys((x) => {
-          const E = d - 1;
+          const F = d - 1;
           return n().pipe(
             bs(),
             tt(
-              () => f(E, x) ? Qe(
+              () => f(F, x) ? Qe(
                 Rs(
-                  p(E, c),
+                  p(F, c),
                   h
                 )
               ).pipe(
-                tt(($) => r && !r(E, x) ? Oe(() => x) : v($))
+                tt(($) => r && !r(F, x) ? Oe(() => x) : v($))
               ) : Oe(() => x)
             )
           );
         })
       )),
-      vt((y) => {
+      vt((g) => {
         if (s.catchError)
-          return s.catchError(d, y);
-        throw y;
+          return s.catchError(d, g);
+        throw g;
       }),
       Qt(() => {
         o && (d = 0);
@@ -455,7 +456,7 @@ class As {
     __queryFinalizeHook: e
   } = {}) {
     w(this, ee, new I());
-    g(this, "state$");
+    b(this, "state$");
     const t = new X(0), r = t.pipe(
       O((n) => n === 0)
     );
@@ -473,7 +474,7 @@ class As {
           Ke(),
           q(() => u.state$),
           ne(a(this, ee))
-        ), F = u.state$.pipe(
+        ), E = u.state$.pipe(
           we,
           ot(1)
         ), d = C(
@@ -483,7 +484,7 @@ class As {
           u.cancelled$
         );
         return C(
-          F,
+          E,
           p,
           /**
            * We defer execution so that we return at least
@@ -491,7 +492,7 @@ class As {
            */
           o
         ).pipe(
-          b((f) => ({ state: f, mutation: u })),
+          y((f) => ({ state: f, mutation: u })),
           e ?? Mt,
           ne(d)
         );
@@ -532,7 +533,7 @@ function P(s, e) {
   return !0;
 }
 const Dt = (s) => s.pipe(
-  U(
+  V(
     ({ data: e, ...t }, { data: r, ...n }) => P(t, n) && P(e, r)
   )
 );
@@ -547,8 +548,8 @@ class Qs {
      * - mutation does not get garbage collected
      * - mutation mutate options are run on finish
      */
-    g(this, "observed$");
-    g(this, "getObserverResultFromState", (e) => ({
+    b(this, "observed$");
+    b(this, "getObserverResultFromState", (e) => ({
       ...fe(),
       ...e,
       isSuccess: e.status === "success",
@@ -573,7 +574,7 @@ class Qs {
     ).subscribe(), this.observed$ = a(this, L).pipe(
       j((u) => (u == null ? void 0 : u.mutation.state$.pipe(
         // last(),
-        b((i) => ({
+        y((i) => ({
           state: i,
           options: u.options
         }))
@@ -619,10 +620,10 @@ class Qs {
     const e = this.getObserverResultFromState(
       ((u = a(this, L).getValue()) == null ? void 0 : u.mutation.state) ?? fe()
     ), t = a(this, ae).state$.pipe(
-      U(
+      V(
         ({ mutation: i, state: { data: c, ...l } }, { mutation: h, state: { data: o, ...p } }) => i === h && P(l, p) && P(c, o)
       ),
-      b(({ state: i }) => i),
+      y(({ state: i }) => i),
       Be((i, c) => ({
         ...i,
         ...c,
@@ -633,11 +634,11 @@ class Qs {
           error: c.error ?? i.error
         }
       })),
-      b((i) => this.getObserverResultFromState(i))
+      y((i) => this.getObserverResultFromState(i))
     ), r = a(this, L).pipe(
       O(rt),
       j((i) => i.mutation.cancelled$),
-      b(() => this.getObserverResultFromState(fe()))
+      y(() => this.getObserverResultFromState(fe()))
     );
     return { result$: C(
       this.observed$,
@@ -737,15 +738,15 @@ function Is(s) {
 const pe = typeof window > "u" || "Deno" in window;
 class Ps {
   constructor() {
-    g(this, "isOnlineSubject", new X(!0));
-    g(this, "online$", this.isOnlineSubject.pipe(U()));
-    g(this, "backToOnline$", this.online$.pipe(
+    b(this, "isOnlineSubject", new X(!0));
+    b(this, "online$", this.isOnlineSubject.pipe(V()));
+    b(this, "backToOnline$", this.online$.pipe(
       O((e) => e),
       Je()
     ));
     C(
-      pe ? B : Ne(window, "offline").pipe(b(() => !1)),
-      pe ? B : Ne(window, "online").pipe(b(() => !0))
+      pe ? B : Ne(window, "offline").pipe(y(() => !1)),
+      pe ? B : Ne(window, "online").pipe(y(() => !0))
     ).pipe(Is(this.isOnlineSubject)).subscribe();
   }
   isOnline() {
@@ -851,8 +852,8 @@ const it = Symbol(), qs = ({
       const S = n.status === "pending" ? "pending" : i.status ?? n.status;
       return { ...n, ...i, status: S };
     }
-    const c = i.data, l = c !== void 0 && c !== n.data, h = "data" in i, o = i.status === "success", p = n.data !== void 0, F = n.error !== void 0 || n.error !== null, d = i.status ?? n.status, f = l ? Le(e().data, c, s()) : h ? i.data : n.data, y = n.status === "error" || n.status === "success", x = i.status === "error" && (n.status === "error" && n.fetchStatus === "fetching" || n.status !== "error") ? n.errorUpdateCount + 1 : n.errorUpdateCount, E = l ? n.dataUpdateCount + 1 : i.dataUpdateCount ?? n.dataUpdateCount, $ = i.status === "pending" && y && // (dataUpdateCount !== 0 || errorUpdateCount !== 0)
-    (p || F), D = d === "pending" ? null : i.error ?? n.error;
+    const c = i.data, l = c !== void 0 && c !== n.data, h = "data" in i, o = i.status === "success", p = n.data !== void 0, E = n.error !== void 0 || n.error !== null, d = i.status ?? n.status, f = l ? Le(e().data, c, s()) : h ? i.data : n.data, g = n.status === "error" || n.status === "success", x = i.status === "error" && (n.status === "error" && n.fetchStatus === "fetching" || n.status !== "error") ? n.errorUpdateCount + 1 : n.errorUpdateCount, F = l ? n.dataUpdateCount + 1 : i.dataUpdateCount ?? n.dataUpdateCount, $ = i.status === "pending" && g && // (dataUpdateCount !== 0 || errorUpdateCount !== 0)
+    (p || E), D = d === "pending" ? null : i.error ?? n.error;
     return {
       ...n,
       ...i,
@@ -863,14 +864,14 @@ const it = Symbol(), qs = ({
         isInvalidated: !1
       },
       data: f,
-      dataUpdateCount: E,
+      dataUpdateCount: F,
       ...$ && {
         status: n.status
       }
     };
   }, t)
 ), Hs = (s) => s.pipe(
-  b(
+  y(
     ({ status: e, fetchStatus: t }) => t === "idle" && (e === "success" || e === "error")
   )
 ), qt = (s) => s.pipe(
@@ -882,13 +883,13 @@ class _s {
     w(this, We, C(
       pe ? B : Ne(document, "visibilitychange"),
       pe ? B : Ne(window, "visibilitychange")
-    ).pipe(b(() => document.visibilityState)));
+    ).pipe(y(() => document.visibilityState)));
     w(this, te, new X(
       pe ? !0 : document.visibilityState === "visible"
     ));
     // public readonly focused$ = this.#focusedSubject.pipe(distinctUntilChanged())
-    g(this, "focused$", a(this, te));
-    g(this, "focusRegained$", this.focused$.pipe(
+    b(this, "focused$", a(this, te));
+    b(this, "focusRegained$", this.focused$.pipe(
       ot(1),
       O((e) => e)
     ));
@@ -924,12 +925,12 @@ class _s {
 We = new WeakMap(), te = new WeakMap();
 const ze = new _s(), Ls = (s) => s.pipe(
   O((e) => e.status === "success"),
-  b((e) => ({
+  y((e) => ({
     data: e.data,
     status: e.status,
     dataUpdatedAt: e.dataUpdatedAt
   })),
-  U(P)
+  V(P)
 );
 var Z, M, Ce, oe, T, ye, Fe;
 class Ht {
@@ -942,7 +943,7 @@ class Ht {
      * 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)
      */
-    g(this, "queryUpdateSubject", new I());
+    b(this, "queryUpdateSubject", new I());
     /**
      * Mostly used to compare the state before and after mount
      */
@@ -956,7 +957,7 @@ class Ht {
     // It will be used to pass the previous data and query to the placeholder function between renders.
     w(this, ye);
     w(this, Fe, 0);
-    g(this, "getObserverResultFromQuery", ({
+    b(this, "getObserverResultFromQuery", ({
       options: e,
       query: t,
       optimisticResult: r,
@@ -970,13 +971,13 @@ class Ht {
       }
     }) => {
       var De;
-      const o = t.state, p = t.state.status === "pending", F = a(this, M), d = this.options, y = t !== F ? t.state : a(this, oe);
-      let { errorUpdatedAt: x, fetchStatus: E, error: $ } = o;
+      const o = t.state, p = t.state.status === "pending", E = a(this, M), d = this.options, g = t !== E ? t.state : a(this, oe);
+      let { errorUpdatedAt: x, fetchStatus: F, error: $ } = o;
       if (r) {
-        const k = !!a(this, Fe), yt = !k && Ct(t, e), Jt = k && Ft(t, F, e, d);
-        (yt || Jt) && (E = ks(t.options.networkMode) ? "fetching" : "paused");
+        const k = !!a(this, Fe), yt = !k && Ct(t, e), Jt = k && Ft(t, E, e, d);
+        (yt || Jt) && (F = ks(t.options.networkMode) ? "fetching" : "paused");
       }
-      const D = p && E === "fetching";
+      const D = p && F === "fetching";
       let S, m = l, z = c ?? null, W = h;
       if (e.select && typeof o.data < "u")
         if (n && o.data === (i == null ? void 0 : i.data) && e.select === c)
@@ -989,7 +990,7 @@ class Ht {
           }
       else
         S = o.data, m = null;
-      let _ = E !== "idle" && !o.dataUpdatedAt ? "pending" : o.status;
+      let _ = F !== "idle" && !o.dataUpdatedAt ? "pending" : o.status;
       m && ($ = m, S = h, x = (n == null ? void 0 : n.errorUpdatedAt) ?? x, _ = "error");
       const Ve = _ === "error";
       let Ie = !1;
@@ -1011,11 +1012,11 @@ class Ht {
           e
         ), Ie = !0);
       }
-      const Pe = E === "fetching";
+      const Pe = F === "fetching";
       return {
         result: {
           status: _,
-          fetchStatus: E,
+          fetchStatus: F,
           isPending: p,
           isSuccess: _ === "success",
           isError: Ve,
@@ -1029,11 +1030,11 @@ class Ht {
           failureReason: o.fetchFailureReason,
           errorUpdateCount: o.errorUpdateCount,
           isFetched: o.dataUpdateCount > 0 || o.errorUpdateCount > 0,
-          isFetchedAfterMount: o.dataUpdateCount > y.dataUpdateCount || o.errorUpdateCount > y.errorUpdateCount,
+          isFetchedAfterMount: o.dataUpdateCount > g.dataUpdateCount || o.errorUpdateCount > g.errorUpdateCount,
           isFetching: Pe,
           isRefetching: Pe && !p,
           isLoadingError: Ve && o.dataUpdatedAt === 0,
-          isPaused: E === "paused",
+          isPaused: F === "paused",
           isPlaceholderData: Ie,
           isRefetchError: Ve && o.dataUpdatedAt !== 0,
           isStale: dt(t, e),
@@ -1152,9 +1153,9 @@ class Ht {
   }
   observe() {
     const e = a(this, M), t = this.queryUpdateSubject.pipe(
-      b(({ query: i }) => i),
+      y(({ query: i }) => i),
       he(a(this, M)),
-      U()
+      V()
     ), r = this.queryUpdateSubject.pipe(
       he({
         query: a(this, M),
@@ -1183,8 +1184,8 @@ class Ht {
           const c = this.options, l = this.queryUpdateSubject.pipe(
             he({ query: i, options: c }),
             O((m) => m.query === i),
-            b((m) => m.options),
-            U(),
+            y((m) => m.options),
+            V(),
             Ue(1)
           ), h = a(this, Ce).pipe(
             O((m) => m.query === i)
@@ -1206,15 +1207,15 @@ class Ht {
               );
               return P(pt, De);
             } : P)(m, z);
-          }, F = h.pipe(
+          }, E = h.pipe(
             j(() => i.state$),
             qt
           ), d = l.pipe(
-            b(({ refetchInterval: m, refetchIntervalInBackground: z }) => ({
+            y(({ refetchInterval: m, refetchIntervalInBackground: z }) => ({
               refetchInterval: (typeof m == "function" ? m(a(this, M)) : m) ?? !1,
               refetchIntervalInBackground: z
             })),
-            U(P),
+            V(P),
             j(({ refetchInterval: m, refetchIntervalInBackground: z }) => m ? as(m).pipe(
               R(() => {
                 // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
@@ -1223,11 +1224,11 @@ class Ht {
             ) : qe),
             ie()
           ), f = l.pipe(
-            b(({ enabled: m }) => m ?? !0),
-            U()
-          ), y = f.pipe(
+            y(({ enabled: m }) => m ?? !0),
+            V()
+          ), g = f.pipe(
             O((m) => !m),
-            b(() => i.state)
+            y(() => i.state)
           ), x = f.pipe(
             O((m) => m),
             j(() => ze.focusRegained$),
@@ -1236,11 +1237,11 @@ class Ht {
               Ts(i, m) && this.fetch({ cancelRefetch: !1 }).catch(N);
             }),
             ie()
-          ), E = y.pipe(
-            b(() => i.state)
+          ), F = g.pipe(
+            y(() => i.state)
           ), $ = (m) => m.pipe(
             St(l),
-            b(([, z]) => {
+            y(([, z]) => {
               const W = this.getObserverResultFromQuery({
                 query: i,
                 options: z,
@@ -1249,17 +1250,17 @@ class Ht {
               return this.updateResult({ query: i, ...W }), W.result;
             })
           ), S = C(
-            E,
             F,
+            E,
             i.state$,
             // options$,
             o
           ).pipe(
             $,
             // This one ensure we don't re-trigger same state
-            U(P),
+            V(P),
             // This one make sure we dispatch based on user preference
-            U(p)
+            V(p)
           );
           return C(d, x, S);
         })
@@ -1326,7 +1327,7 @@ function Lt(s, e, t) {
        * 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.
        */
-      O((F) => !P(F, h.current))
+      O((E) => !P(E, h.current))
     ),
     []
   ), Y(() => {
@@ -1363,7 +1364,7 @@ function Mr(s, e, t = []) {
     r.onError ?? ((l) => {
       console.error(l);
     })
-  ), i = de(() => V(s), t), c = de(
+  ), i = de(() => U(s), t), c = de(
     () => i().pipe(
       J((l) => {
         throw u.current(l), l;
@@ -1409,7 +1410,7 @@ const zt = () => (s) => C(
   state: e,
   options: t
 }) => {
-  const r = e.isPaused, n = async () => await Promise.reject(new Error("No mutationFn found")), u = t.mutationFn ?? n, i = V(
+  const r = e.isPaused, n = async () => await Promise.reject(new Error("No mutationFn found")), u = t.mutationFn ?? n, i = U(
     // eslint-disable-next-line @typescript-eslint/promise-function-async
     () => {
       var d;
@@ -1417,16 +1418,16 @@ const zt = () => (s) => C(
     }
   ), c = v(e.context), l = cs(() => r, c, i).pipe(
     Ue(1)
-  ), h = (d, f, y) => V(
+  ), h = (d, f, g) => U(
     () => {
-      var E;
-      return (E = t.onError) == null ? void 0 : E.call(t, d, s, f);
+      var F;
+      return (F = t.onError) == null ? void 0 : F.call(t, d, s, f);
     }
   ).pipe(
     J(() => v(d)),
-    b(
+    y(
       () => ({
-        failureCount: y,
+        failureCount: g,
         error: d,
         failureReason: d,
         context: f,
@@ -1435,18 +1436,18 @@ const zt = () => (s) => C(
     )
   ), o = l.pipe(
     j((d) => {
-      const y = (typeof u == "function" ? (
+      const g = (typeof u == "function" ? (
         // eslint-disable-next-line @typescript-eslint/promise-function-async
-        V(() => u(s))
-      ) : u).pipe(ue()), x = y.pipe(
+        U(() => u(s))
+      ) : u).pipe(ue()), x = g.pipe(
         ls(),
         R(($) => {
           if ($)
             throw new Error("Mutation completed without any emission (EMPTY)");
         }),
         ie()
-      ), E = C(y, x).pipe(
-        b(
+      ), F = C(g, x).pipe(
+        y(
           ($) => ({
             result: {
               data: $
@@ -1470,7 +1471,7 @@ const zt = () => (s) => C(
             })
           ),
           catchError: ($, D) => h(D, d, $).pipe(
-            b((S) => ({
+            y((S) => ({
               ...S,
               result: void 0
             }))
@@ -1481,7 +1482,7 @@ const zt = () => (s) => C(
           !0
         )
       );
-      return re.isOnline() || t.networkMode === "offlineFirst" || t.networkMode === "always" ? E : E.pipe(zt());
+      return re.isOnline() || t.networkMode === "offlineFirst" || t.networkMode === "always" ? F : F.pipe(zt());
     })
   ), p = v({
     ...e,
@@ -1495,24 +1496,24 @@ const zt = () => (s) => C(
   return C(
     p,
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    l.pipe(b((d) => ({ context: d }))),
+    l.pipe(y((d) => ({ context: d }))),
     o.pipe(
-      j(({ result: d, error: f, ...y }) => {
+      j(({ result: d, error: f, ...g }) => {
         if (!d && !f)
           return v({
-            ...y
+            ...g
           });
-        const x = f ? v(null) : V(
+        const x = f ? v(null) : U(
           () => {
             var S;
             return (S = t.onSuccess) == null ? void 0 : S.call(
               t,
               d == null ? void 0 : d.data,
               s,
-              y.context
+              g.context
             );
           }
-        ), $ = V(
+        ), $ = U(
           () => {
             var S;
             return (S = t.onSettled) == null ? void 0 : S.call(
@@ -1520,7 +1521,7 @@ const zt = () => (s) => C(
               d == null ? void 0 : d.data,
               f,
               s,
-              y.context
+              g.context
             );
           }
         ).pipe(
@@ -1528,12 +1529,12 @@ const zt = () => (s) => C(
         );
         return Te(x, $).pipe(
           ke(),
-          b(
+          y(
             () => f ? {
               error: f,
               data: void 0,
               variables: s,
-              ...y
+              ...g
             } : {
               status: "success",
               error: f,
@@ -1541,12 +1542,12 @@ const zt = () => (s) => C(
               variables: s,
               failureCount: 0,
               failureReason: null,
-              ...y
+              ...g
             }
           ),
           J(
-            (S) => h(S, y.context, 0).pipe(
-              b((m) => ({
+            (S) => h(S, g.context, 0).pipe(
+              y((m) => ({
                 ...m,
                 data: void 0
               }))
@@ -1574,15 +1575,15 @@ class tr {
     w(this, Ee, new X(0));
     w(this, se, new I());
     w(this, be, new I());
-    g(this, "state", fe());
-    g(this, "state$");
-    g(this, "options");
-    g(this, "observerCount$", a(this, Ee).asObservable());
-    g(this, "cancelled$", a(this, se).asObservable());
+    b(this, "state", fe());
+    b(this, "state$");
+    b(this, "options");
+    b(this, "observerCount$", a(this, Ee).asObservable());
+    b(this, "cancelled$", a(this, se).asObservable());
     this.options = e, this.state = r ?? this.state;
     const n = a(this, se).pipe(
       O(() => this.state.status === "pending"),
-      b(() => ({
+      y(() => ({
         status: "idle"
       }))
     ), u = a(this, be).pipe(
@@ -1591,7 +1592,7 @@ class tr {
           options: {
             ...this.options,
             onMutate: (l) => {
-              const h = V(
+              const h = U(
                 () => {
                   var d, f;
                   return (f = (d = t.config).onMutate) == null ? void 0 : f.call(
@@ -1600,7 +1601,7 @@ class tr {
                     this
                   );
                 }
-              ), p = V(() => {
+              ), p = U(() => {
                 var d, f;
                 return (f = (d = this.options).onMutate) == null ? void 0 : f.call(d, l);
               });
@@ -1609,7 +1610,7 @@ class tr {
               );
             },
             onError: (l, h, o) => {
-              const p = V(
+              const p = U(
                 () => {
                   var d, f;
                   return (f = (d = t.config).onError) == null ? void 0 : f.call(
@@ -1620,19 +1621,19 @@ class tr {
                     this
                   );
                 }
-              ), F = V(
+              ), E = U(
                 () => {
                   var d, f;
                   return (f = (d = this.options).onError) == null ? void 0 : f.call(d, l, h, o);
                 }
               );
-              return Te(p, F).pipe(ke());
+              return Te(p, E).pipe(ke());
             },
             onSettled: (l, h, o, p) => {
-              const F = V(
+              const E = U(
                 () => {
-                  var f, y;
-                  return (y = (f = t.config).onSettled) == null ? void 0 : y.call(
+                  var f, g;
+                  return (g = (f = t.config).onSettled) == null ? void 0 : g.call(
                     f,
                     l,
                     h,
@@ -1641,16 +1642,16 @@ class tr {
                     this
                   );
                 }
-              ), d = V(
+              ), d = U(
                 () => {
-                  var f, y;
-                  return (y = (f = this.options).onSettled) == null ? void 0 : y.call(f, l, h, o, p);
+                  var f, g;
+                  return (g = (f = this.options).onSettled) == null ? void 0 : g.call(f, l, h, o, p);
                 }
               );
-              return Te(F, d).pipe(ke());
+              return Te(E, d).pipe(ke());
             },
             onSuccess: (l, h, o) => {
-              const p = V(
+              const p = U(
                 () => {
                   var d, f;
                   return (f = (d = t.config).onSuccess) == null ? void 0 : f.call(
@@ -1661,13 +1662,13 @@ class tr {
                     this
                   );
                 }
-              ), F = V(
+              ), E = U(
                 () => {
                   var d, f;
                   return (f = (d = this.options).onSuccess) == null ? void 0 : f.call(d, l, h, o);
                 }
               );
-              return Te(p, F).pipe(ke());
+              return Te(p, E).pipe(ke());
             }
           },
           state: this.state,
@@ -1733,20 +1734,20 @@ class Wt {
      * @important
      * Query store. Could be turned into a map for more performance.
      */
-    g(this, "entriesSubject", new X([]));
-    g(this, "changeSubject", new I());
-    g(this, "entries$", this.entriesSubject.pipe(ue()));
-    g(this, "added$", this.changeSubject.pipe(
+    b(this, "entriesSubject", new X([]));
+    b(this, "changeSubject", new I());
+    b(this, "entries$", this.entriesSubject.pipe(ue()));
+    b(this, "added$", this.changeSubject.pipe(
       O(({ type: e }) => e === "added"),
-      b(({ entity: e }) => e),
+      y(({ entity: e }) => e),
       ue()
     ));
-    g(this, "removed$", this.changeSubject.pipe(
+    b(this, "removed$", this.changeSubject.pipe(
       O(({ type: e }) => e === "removed"),
-      b(({ entity: e }) => e),
+      y(({ entity: e }) => e),
       ue()
     ));
-    g(this, "stateChange$", C(
+    b(this, "stateChange$", C(
       this.entriesSubject.pipe(
         Je(),
         q((e) => Se(e))
@@ -1755,7 +1756,7 @@ class Wt {
     ).pipe(
       q(
         (e) => e.state$.pipe(
-          b(() => e),
+          y(() => e),
           ne(
             this.removed$.pipe(
               O((t) => t === e)
@@ -1956,7 +1957,7 @@ const nr = (s) => Ae(() => ze.isFocused() ? s : ze.focusRegained$.pipe(q(() => s
   })(u);
   const l = (typeof r == "function" ? (
     // eslint-disable-next-line @typescript-eslint/promise-function-async
-    V(
+    U(
       () => r(u)
     )
   ) : r).pipe(
@@ -1966,7 +1967,7 @@ const nr = (s) => Ae(() => ze.isFocused() ? s : ze.focusRegained$.pipe(q(() => s
         t = !0;
       }
     }),
-    b(
+    y(
       (o) => ({
         data: o
       })
@@ -2015,7 +2016,7 @@ const nr = (s) => Ae(() => ze.isFocused() ? s : ze.focusRegained$.pipe(q(() => s
        * There is in theory no problem associated to that.
        */
       ct(1),
-      b(
+      y(
         (p) => t ? p : { ...p, fetchStatus: "fetching" }
       )
     ) : v(o)),
@@ -2041,8 +2042,8 @@ const nr = (s) => Ae(() => ze.isFocused() ? s : ze.focusRegained$.pipe(q(() => s
 };
 class or {
   constructor(e) {
-    g(this, "revert");
-    g(this, "silent");
+    b(this, "revert");
+    b(this, "silent");
     this.revert = e == null ? void 0 : e.revert, this.silent = e == null ? void 0 : e.silent;
   }
 }
@@ -2098,32 +2099,32 @@ const lr = Gt();
 var xe, ce;
 class hr {
   constructor(e) {
-    g(this, "queryKey");
-    g(this, "queryHash");
-    g(this, "gcTime");
-    g(this, "options");
+    b(this, "queryKey");
+    b(this, "queryHash");
+    b(this, "gcTime");
+    b(this, "options");
     w(this, xe);
     w(this, ce);
-    g(this, "state");
+    b(this, "state");
     // @todo to share with mutation
-    g(this, "executeSubject", new I());
-    g(this, "cancelSubject", new I());
-    g(this, "setDataSubject", new I());
-    g(this, "invalidatedSubject", new I());
-    g(this, "resetSubject", new I());
-    g(this, "destroySubject", new I());
-    g(this, "observersSubject", new X([]));
-    g(this, "abortSignalConsumed", !1);
-    g(this, "observerCount$", this.observersSubject.asObservable().pipe(b((e) => e.length)));
-    g(this, "observers$", this.observersSubject.asObservable());
-    g(this, "state$");
+    b(this, "executeSubject", new I());
+    b(this, "cancelSubject", new I());
+    b(this, "setDataSubject", new I());
+    b(this, "invalidatedSubject", new I());
+    b(this, "resetSubject", new I());
+    b(this, "destroySubject", new I());
+    b(this, "observersSubject", new X([]));
+    b(this, "abortSignalConsumed", !1);
+    b(this, "observerCount$", this.observersSubject.asObservable().pipe(y((e) => e.length)));
+    b(this, "observers$", this.observersSubject.asObservable());
+    b(this, "state$");
     A(this, xe, e.defaultOptions), this.options = this.setOptions(e.options), this.queryKey = e.queryKey, this.queryHash = e.queryHash, A(this, ce, e.state ?? rr(this.options)), this.state = a(this, ce), this.gcTime = this.updateGcTime(this.options.gcTime), this.state$ = C(
       this.resetSubject.pipe(
-        b(() => ({ command: "reset", state: a(this, ce) }))
+        y(() => ({ command: "reset", state: a(this, ce) }))
       ),
       this.invalidatedSubject.pipe(
         O(() => !this.state.isInvalidated),
-        b(() => ({
+        y(() => ({
           command: "invalidate",
           state: {
             isInvalidated: !0
@@ -2132,7 +2133,7 @@ class hr {
       ),
       this.cancelSubject.pipe(
         O(() => !(this.state.error && this.state.status === "error")),
-        b((t) => ({
+        y((t) => ({
           command: "cancel",
           state: {
             status: t != null && t.revert ? this.state.status : "error",
@@ -2182,7 +2183,7 @@ class hr {
             })
           );
           return C(u, n).pipe(
-            b((h) => ({
+            y((h) => ({
               command: "execute",
               state: h
             })),
@@ -2191,7 +2192,7 @@ class hr {
         })
       ),
       this.setDataSubject.pipe(
-        b(({ data: t, options: r }) => ({
+        y(({ data: t, options: r }) => ({
           command: "setData",
           state: {
             status: "success",
@@ -2207,7 +2208,7 @@ class hr {
         getState: () => this.state
       }),
       he(a(this, ce)),
-      U(P),
+      V(P),
       R((t) => {
         this.state = t;
       }),
@@ -2226,22 +2227,22 @@ class hr {
   }
   get success$() {
     return this.state$.pipe(
-      b(({ data: e, status: t }) => ({ data: e, status: t })),
-      U(P),
+      y(({ data: e, status: t }) => ({ data: e, status: t })),
+      V(P),
       O(({ status: e }) => e === "success")
     );
   }
   get error$() {
     return this.state$.pipe(
-      b(({ error: e, status: t }) => ({ error: e, status: t })),
-      U(P),
+      y(({ error: e, status: t }) => ({ error: e, status: t })),
+      V(P),
       O(({ status: e }) => e === "error")
     );
   }
   get settled$() {
     return this.state$.pipe(
-      b(({ status: e }) => ({ status: e })),
-      U(P),
+      y(({ status: e }) => ({ status: e })),
+      V(P),
       O(({ status: e }) => e === "success" || e === "error")
     );
   }
@@ -2338,11 +2339,11 @@ class dr {
     return a(this, G).stateChange$.pipe(
       // we force a first result
       he(),
-      b(() => this.findAll({
+      y(() => this.findAll({
         ...e,
         fetchStatus: "fetching"
       }).length),
-      U()
+      V()
     );
   }
   getAll() {