reactjrx 1.117.1 → 1.120.1

package/dist/index.js

@@ -1,133 +1,111 @@
-var pe = Object.defineProperty;
-var ge = (e, t, r) => t in e ? pe(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
-var w = (e, t, r) => ge(e, typeof t != "symbol" ? t + "" : t, r);
-import { useRef as E, useMemo as W, useCallback as h, useSyncExternalStore as he, useEffect as b, createContext as X, memo as Z, useContext as B, useState as Se } from "react";
-import { isObservable as K, from as x, of as p, defer as Q, startWith as ve, identity as ee, distinctUntilChanged as te, tap as re, catchError as $, EMPTY as T, Subject as z, BehaviorSubject as F, retry as be, merge as M, throwError as R, timer as Ie, map as N, switchMap as C, zip as we, share as ne, throttleTime as Ee, asyncScheduler as Ve, concatMap as xe, scan as Fe, takeUntil as se, fromEvent as Ce, take as ue, delay as $e, defaultIfEmpty as Me, filter as Ne, first as Pe, noop as L } from "rxjs";
-import { catchError as J, mergeMap as O, retryWhen as Re, concatMap as Oe, first as qe, tap as Ae } from "rxjs/operators";
-import { jsx as ce } from "react/jsx-runtime";
-import { hashKey as ae, useQueryClient as oe, useQuery as Qe, useMutation as Te } from "@tanstack/react-query";
-function Y(e) {
+var Se = Object.defineProperty;
+var he = (e, t, r) => t in e ? Se(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
+var I = (e, t, r) => he(e, typeof t != "symbol" ? t + "" : t, r);
+import { useRef as $, useMemo as B, useCallback as h, useSyncExternalStore as ve, useEffect as v, useState as Q, createContext as ee, memo as te, useContext as re } from "react";
+import { isObservable as J, from as V, of as g, defer as D, startWith as be, identity as ne, distinctUntilChanged as se, tap as T, catchError as F, EMPTY as _, BehaviorSubject as E, retry as we, ReplaySubject as Y, merge as C, throwError as P, timer as Ie, map as N, switchMap as M, zip as Ee, share as ue, throttleTime as xe, asyncScheduler as Ve, concatMap as Ce, scan as Me, takeUntil as Fe, fromEvent as ae, take as ce, delay as Ne, ignoreElements as $e, first as oe, defaultIfEmpty as Re, filter as Pe, noop as j } from "rxjs";
+import { catchError as U, mergeMap as A, retryWhen as Ae, concatMap as Oe, first as qe, tap as Qe } from "rxjs/operators";
+import { jsx as ie } from "react/jsx-runtime";
+import { hashKey as le, useQueryClient as fe, useQuery as De, useMutation as Te } from "@tanstack/react-query";
+function G(e) {
   return e instanceof Promise || e && typeof e == "object" && "then" in e && typeof e.then == "function" && "catch" in e && e.catch === "function";
 }
-function D(e) {
-  if (K(e)) return () => e;
-  if (Y(e)) return () => x(e);
-  if (typeof e != "function") return () => p(e);
+function k(e) {
+  if (J(e)) return () => e;
+  if (G(e)) return () => V(e);
+  if (typeof e != "function") return () => g(e);
   const t = e;
-  return (r) => Q(() => {
+  return (r) => D(() => {
     const n = t(r);
-    return Y(n) ? x(n) : K(n) ? n : p(n);
+    return G(n) ? V(n) : J(n) ? n : g(n);
   });
 }
-const v = (e) => {
-  const t = E(e);
-  return W(() => {
+const b = (e) => {
+  const t = $(e);
+  return B(() => {
     t.current = e;
   }, [e]), t;
 };
-function k(e, t, r) {
+function H(e, t, r) {
   const n = t != null && !Array.isArray(t) ? t : {
     defaultValue: void 0,
     unsubscribeOnUnmount: !0,
     compareFn: void 0
-  }, s = !r && Array.isArray(t) ? t : typeof e == "function" ? r ?? [] : [e], c = E(
+  }, u = !r && Array.isArray(t) ? t : typeof e == "function" ? r ?? [] : [e], c = $(
     "getValue" in e && typeof e.getValue == "function" ? e.getValue() : n.defaultValue
-  ), u = v(e), l = v(n), a = h(() => c.current, []), o = h(
+  ), a = b(e), l = b(n), s = h(() => c.current, []), o = h(
     (i) => {
-      const m = u.current, g = D(m)().pipe(
-        l.current.defaultValue ? ve(l.current.defaultValue) : ee,
+      const d = a.current, p = k(d)().pipe(
+        l.current.defaultValue ? be(l.current.defaultValue) : ne,
         /**
          * @important there is already a Object.is comparison in place from react
          * so we only add a custom compareFn if provided
          */
-        te((d, y) => l.current.compareFn ? d === void 0 || y === void 0 ? !1 : l.current.compareFn(d, y) : !1),
-        re((d) => {
-          c.current = d;
+        se((m, y) => l.current.compareFn ? m === void 0 || y === void 0 ? !1 : l.current.compareFn(m, y) : !1),
+        T((m) => {
+          c.current = m;
         }),
-        $((d) => (console.error(d), T))
+        F((m) => (console.error(m), _))
       ).subscribe(i);
       return () => {
-        l.current.unsubscribeOnUnmount !== !1 && g.unsubscribe();
+        l.current.unsubscribeOnUnmount !== !1 && p.unsubscribe();
       };
     },
-    [...s]
+    [...u]
   );
-  return he(o, a, a);
+  return ve(o, s, s);
 }
-function De(e, t = []) {
-  const r = v(e);
-  b(() => {
-    const n = D(r.current)().pipe(
-      $((s) => (console.error(s), T))
+function _e(e, t = []) {
+  const r = b(e);
+  v(() => {
+    const n = k(r.current)().pipe(
+      F((u) => (console.error(u), _))
     ).subscribe();
     return () => {
       n.unsubscribe();
     };
   }, [...t, r]);
 }
-const _ = (e) => {
-  const t = E(void 0);
-  return t.current || (t.current = e()), b(() => {
+const K = (e) => {
+  const t = $(void 0);
+  return t.current || (t.current = e()), v(() => {
     process.env.NODE_ENV;
   }, []), t;
-}, ie = ({
-  onBeforeComplete: e,
-  completeOnUnmount: t = !0
-} = {}) => {
-  const r = _(() => new z()), n = E(!1), s = v(e), c = v(t);
-  return b(() => (n.current && (r.current = new z(), n.current = !1), () => {
-    if (!c.current) {
-      n.current = !0;
-      return;
-    }
-    n.current || (s.current != null && s.current(), r.current.complete(), n.current = !0);
-  }), [c, s, r]), r;
-}, ke = () => {
-  const e = ie(), t = h((r) => {
-    e.current.next(r);
-  }, []);
-  return [e.current, t];
-}, j = (e) => {
-  const t = _(() => new F(e)), r = E(!1), n = E(e);
-  return r.current && (t.current = new F(n.current), r.current = !1), b(() => () => {
-    r.current || (t.current.complete(), r.current = !0);
-  }, [t]), t.current;
-}, ot = (e) => {
-  const t = j(e), r = v(t), n = h(
-    (s) => {
-      t.next(s);
+}, z = (e) => K(e).current, ot = (e) => {
+  const t = z(() => new E(e)), r = b(t), n = h(
+    (u) => {
+      t.next(u);
     },
     [t]
   );
   return [r.current, n, t.getValue()];
-}, U = (e) => {
-  const t = j(e);
-  return b(() => {
+}, W = (e) => {
+  const t = z(() => new E(e));
+  return v(() => {
     t.next(e);
   }, [e, t]), t;
 };
 function it(e, t, r = []) {
-  const n = t != null && !Array.isArray(t) ? t : {}, s = n.retry ?? !0, c = v(
-    n.onError ?? ((a) => {
-      console.error(a);
+  const n = t != null && !Array.isArray(t) ? t : {}, u = n.retry ?? !0, c = b(
+    n.onError ?? ((s) => {
+      console.error(s);
     })
-  ), u = h(() => D(e)(), r), l = h(
-    () => u().pipe(
-      $((a) => {
-        throw c.current(a), a;
+  ), a = h(() => k(e)(), r), l = h(
+    () => a().pipe(
+      F((s) => {
+        throw c.current(s), s;
       }),
-      s ? be() : ee
+      u ? we() : ne
     ),
-    [u, s, c]
+    [a, u, c]
   );
-  De(l, r);
+  _e(l, r);
 }
-const _e = Symbol("SIGNAL_RESET");
-class le extends F {
+const ke = Symbol("SIGNAL_RESET");
+class ye extends E {
   constructor(r) {
     super(r.default);
-    w(this, "update", (r) => {
-      if (r === _e)
+    I(this, "update", (r) => {
+      if (r === ke)
         super.next(this.config.default);
       else if (typeof r == "function") {
         const n = r;
@@ -138,7 +116,7 @@ class le extends F {
     /**
      * @deprecated Use `next` instead
      */
-    w(this, "setValue", this.update.bind(this));
+    I(this, "setValue", this.update.bind(this));
     this.config = r;
   }
   /**
@@ -151,39 +129,37 @@ class le extends F {
     return this.config.key;
   }
 }
-class A {
+class q {
   constructor(t) {
     this.config = t;
   }
 }
 function lt(e = {}) {
-  return new le({
+  return new ye({
     key: void 0,
     ...e,
     default: e.default ?? void 0
   });
 }
 function ft(e) {
-  return new A(e);
+  return new q(e);
 }
 const yt = () => {
-  const e = ie({
-    onBeforeComplete: () => {
-      e.current.next();
-    }
-  });
-  return e;
-}, je = (e) => {
-  b(e, []);
+  const e = K(() => new Y(1)), [t, r] = Q(!1);
+  return t && (e.current = new Y(1), r(!1)), v(() => () => {
+    e.current.next(void 0), r(!0);
+  }, [e]), e.current;
+}, He = (e) => {
+  v(e, []);
 }, dt = (e) => {
-  je(() => {
+  He(() => {
     e();
   });
 };
-function He(e, t) {
+function Ke(e, t) {
   return Math.min(e, t);
 }
-function Ke(e, t) {
+function ze(e, t) {
   return 2 ** e * t;
 }
 function mt(e) {
@@ -191,79 +167,84 @@ function mt(e) {
     retry: t,
     retryDelay: r,
     retryAfterDelay: n,
-    retryAfter: s = () => p(!0)
-  } = e, c = typeof t != "function" ? t === !1 ? 0 : t === !0 ? Number.POSITIVE_INFINITY : t ?? Number.POSITIVE_INFINITY : Number.POSITIVE_INFINITY, u = typeof t == "function" ? (
+    retryAfter: u = () => g(!0)
+  } = e, c = typeof t != "function" ? t === !1 ? 0 : t === !0 ? Number.POSITIVE_INFINITY : t ?? Number.POSITIVE_INFINITY : Number.POSITIVE_INFINITY, a = typeof t == "function" ? (
     // ? (attempt: number, error: TError) => of(retry(attempt, error))
     t
-  ) : () => !0, l = typeof r == "number" ? r : 100, a = {
+  ) : () => !0, l = typeof r == "number" ? r : 100, s = {
     ...e
   }, {
     maxInterval: o = Number.POSITIVE_INFINITY,
     resetOnSuccess: f = !1,
-    backoffDelay: i = Ke
-  } = a;
-  return (m) => Q(() => {
-    let g = 0;
-    const d = (y, S) => y < c ? u(y, S) : !1;
-    return m.pipe(
-      J((y) => {
-        var I;
-        if (g++, !d(g - 1, y)) throw y;
-        const S = (I = e.caughtError) == null ? void 0 : I.call(e, g, y);
+    backoffDelay: i = ze
+  } = s;
+  return (d) => D(() => {
+    let p = 0;
+    const m = (y, S) => y < c ? a(y, S) : !1;
+    return d.pipe(
+      U((y) => {
+        var w;
+        if (p++, !m(p - 1, y)) throw y;
+        const S = (w = e.caughtError) == null ? void 0 : w.call(e, p, y);
         if (!S) throw y;
         return S.pipe(
-          O(
-            (P) => M(
-              p(P),
-              R(() => y)
+          A(
+            (R) => C(
+              g(R),
+              P(() => y)
             )
           )
         );
       }),
-      Re((y) => y.pipe(
+      Ae((y) => y.pipe(
         Oe((S) => {
-          const I = g - 1;
-          return s().pipe(
+          const w = p - 1;
+          return u().pipe(
             qe(),
-            O(
-              () => d(I, S) ? Ie(
-                He(
-                  i(I, l),
+            A(
+              () => m(w, S) ? Ie(
+                Ke(
+                  i(w, l),
                   o
                 )
               ).pipe(
-                O((P) => n && !n(I, S) ? R(() => S) : p(P))
-              ) : R(() => S)
+                A((R) => n && !n(w, S) ? P(() => S) : g(R))
+              ) : P(() => S)
             )
           );
         })
       )),
-      J((y) => {
+      U((y) => {
         if (e.catchError)
-          return e.catchError(g, y);
+          return e.catchError(p, y);
         throw y;
       }),
-      Ae(() => {
-        f && (g = 0);
+      Qe(() => {
+        f && (p = 0);
       })
     );
   });
 }
-function pt(e) {
+function gt(e) {
   return e != null;
 }
-const gt = (e, t) => e.length === t.length && e.every((r, n) => r === t[n]), ht = typeof window > "u" || "Deno" in window;
-class G {
+const pt = (e, t) => e.length === t.length && e.every((r, n) => r === t[n]), St = typeof window > "u" || "Deno" in window;
+class X {
   constructor() {
+    /**
+     * items only get added as they are created. The only time we should cleanup
+     * are on context destroy. This is to ensure later re-use of virtual signals
+     * return the same persisted state.
+     */
     // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-    w(this, "signals", new F(/* @__PURE__ */ new Map()));
-    w(this, "isDestroyed", !1);
+    I(this, "signals", new E(/* @__PURE__ */ new Map()));
+    I(this, "isDestroyed", !1);
   }
   getOrCreateSignal(t) {
     const r = this.signals.value.get(t);
     if (r)
       return r;
-    const n = new le({ ...t.config, key: void 0 });
+    const n = new ye({ ...t.config, key: void 0 });
     return this.signals.value.set(t, n), this.signals.next(this.signals.value), n;
   }
   destroy() {
@@ -272,17 +253,20 @@ class G {
     }), this.signals.value.clear(), this.signals.complete(), this.isDestroyed = !0;
   }
 }
-const fe = X(void 0), St = Z(
+const de = ee(void 0), ht = te(
   ({ children: e }) => {
-    const t = _(() => new G());
-    t.current.isDestroyed && (t.current = new G());
-    const r = W(() => t.current, [t]);
-    return b(() => () => {
-      t.current.destroy();
-    }, [t]), /* @__PURE__ */ ce(fe.Provider, { value: r, children: e });
+    const t = K(
+      () => new X()
+    ), r = t.current, [n, u] = Q(!1);
+    n && (t.current = new X(), u(!1));
+    const c = B(() => r, [r]);
+    return v(() => () => {
+      var a;
+      (a = t.current) == null || a.destroy(), u(!0);
+    }, [t]), /* @__PURE__ */ ie(de.Provider, { value: c, children: e });
   }
-), ye = () => B(fe), ze = (e) => {
-  const t = ye();
+), me = () => re(de), Le = (e) => {
+  const t = me();
   if (!t) {
     if (e)
       throw new Error(
@@ -291,7 +275,7 @@ const fe = X(void 0), St = Z(
     return;
   }
   const r = t.signals;
-  return k(
+  return H(
     () => r.pipe(
       N(
         () => e ? t.getOrCreateSignal(e) : void 0
@@ -303,24 +287,24 @@ const fe = X(void 0), St = Z(
     [r]
   );
 };
-function H(e) {
-  const t = ye();
-  if (e instanceof A && !t)
+function L(e) {
+  const t = me();
+  if (e instanceof q && !t)
     throw new Error(
       "useSignalValue must be used within a SignalContextProvider"
     );
-  return ze(
-    e instanceof A ? e : void 0
+  return Le(
+    e instanceof q ? e : void 0
   ) ?? e;
 }
-function Le(e, t) {
-  const r = v(t), n = H(e);
-  return k(
+function Je(e, t) {
+  const r = b(t), n = L(e);
+  return H(
     () => {
-      const s = r.current ?? ((u) => u);
+      const u = r.current ?? ((a) => a);
       return n.pipe(
-        N(s),
-        te()
+        N(u),
+        se()
       );
     },
     {
@@ -329,11 +313,11 @@ function Le(e, t) {
     [n]
   );
 }
-function Je(e) {
-  return H(e).update;
+function Ye(e) {
+  return L(e).update;
 }
 function vt(e) {
-  const t = H(e), r = Le(e), n = Je(e);
+  const t = L(e), r = Je(e), n = Ye(e);
   return [r, n, t];
 }
 const bt = (e) => ({
@@ -349,33 +333,33 @@ const bt = (e) => ({
   },
   clear: async () => {
   }
-}), q = (e) => {
+}), O = (e) => {
   if (!(!e || typeof e != "object"))
     return e;
-}, Ye = ({
+}, je = ({
   adapter: e,
   key: t
 }) => ({
   clear: async () => await e.removeItem(t),
   removeItem: async (r) => {
-    const n = await e.getItem(t), { [r]: s, ...c } = (
+    const n = await e.getItem(t), { [r]: u, ...c } = (
       // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-      q(n) ?? {}
+      O(n) ?? {}
     );
     await e.setItem(t, c);
   },
   getItem: async (r) => {
-    const n = await e.getItem(t), s = q(n) ?? {};
-    if (r in s)
-      return s[r];
+    const n = await e.getItem(t), u = O(n) ?? {};
+    if (r in u)
+      return u[r];
   },
   setItem: async (r, n) => {
-    const s = await e.getItem(t), c = q(s) ?? {};
+    const u = await e.getItem(t), c = O(u) ?? {};
     await e.setItem(t, { ...c, [r]: n });
   }
 }), Ue = ({
   key: e
-} = {}) => e ? Ye({
+} = {}) => e ? je({
   adapter: Ue(),
   key: e
 }) : {
@@ -402,13 +386,13 @@ function Ge(e, t) {
   const r = Object.keys(e), n = Object.keys(t);
   if (r.length !== n.length)
     return !1;
-  for (const s of r)
-    if (!t.hasOwnProperty(s) || e[s] !== t[s])
+  for (const u of r)
+    if (!t.hasOwnProperty(u) || e[u] !== t[u])
       return !1;
   return !0;
 }
-const V = "__reactjrx", We = (e) => {
-  if (typeof e == "object" && e !== null && V in e && e[V] === V)
+const x = "__reactjrx", We = (e) => {
+  if (typeof e == "object" && e !== null && x in e && e[x] === x)
     return e;
 }, Xe = ({
   adapter: e,
@@ -416,7 +400,7 @@ const V = "__reactjrx", We = (e) => {
 }) => {
   const { signal: r, version: n } = t, c = {
     value: r.getValue(),
-    [V]: V,
+    [x]: x,
     migrationVersion: n
   };
   return process.env.NODE_ENV === "development" && console.log(
@@ -424,29 +408,29 @@ const V = "__reactjrx", We = (e) => {
     "Persist value",
     c,
     `for signal ${r.config.key}`
-  ), x(e.setItem(r.config.key, c)).pipe(
-    $((u) => (console.error(u), p(null)))
+  ), V(e.setItem(r.config.key, c)).pipe(
+    F((a) => (console.error(a), g(null)))
   );
 };
 function Ze({
   adapter: e,
   config: t
 }) {
-  const { hydrate: r = ({ value: c }) => c, signal: n, version: s } = t;
-  return x(e.getItem(n.config.key)).pipe(
-    C((c) => {
-      const u = We(c);
-      if (!u) return p(c);
-      const l = typeof u.migrationVersion != "number", a = u.migrationVersion !== void 0 && s > u.migrationVersion;
-      if (l || a || u.value === void 0)
-        return p(c);
-      const o = u.value;
+  const { hydrate: r = ({ value: c }) => c, signal: n, version: u } = t;
+  return V(e.getItem(n.config.key)).pipe(
+    M((c) => {
+      const a = We(c);
+      if (!a) return g(c);
+      const l = typeof a.migrationVersion != "number", s = a.migrationVersion !== void 0 && u > a.migrationVersion;
+      if (l || s || a.value === void 0)
+        return g(c);
+      const o = a.value;
       return process.env.NODE_ENV === "development" && console.log(
         "[reactjrx][state][persistance]:",
         "Hydrate value",
-        u,
+        a,
         `for signal ${n.config.key}`
-      ), n.setValue(r({ value: o, version: s })), p(c);
+      ), n.setValue(r({ value: o, version: u })), g(c);
     })
   );
 }
@@ -455,30 +439,30 @@ function Be({
   onHydrated: t,
   adapter: r
 }) {
-  const s = (e.length === 0 ? p([]) : we(
+  const u = (e.length === 0 ? g([]) : Ee(
     ...e.map(
-      (u) => Ze({
+      (a) => Ze({
         adapter: r,
-        config: u
+        config: a
       })
     )
   )).pipe(
-    re(t),
-    $((u) => (console.error("Unable to hydrate", u), T)),
-    ne()
-  ), c = s.pipe(
-    C(
-      () => M(
+    T(t),
+    F((a) => (console.error("Unable to hydrate", a), _)),
+    ue()
+  ), c = u.pipe(
+    M(
+      () => C(
         ...e.map(
-          (u) => u.signal.pipe(
-            Ee(500, Ve, {
+          (a) => a.signal.pipe(
+            xe(500, Ve, {
               trailing: !0
             }),
-            C(
-              () => x(
+            M(
+              () => V(
                 Xe({
                   adapter: r,
-                  config: u
+                  config: a
                 })
               )
             )
@@ -487,8 +471,8 @@ function Be({
       )
     )
   );
-  return M(
-    s.pipe(
+  return C(
+    u.pipe(
       N(() => ({
         type: "hydrated"
       }))
@@ -500,21 +484,21 @@ function Be({
     )
   );
 }
-function It({
+function wt({
   entries: e = [],
   onHydrated: t,
   adapter: r
 }) {
-  const n = v(t), s = U(r), c = U(e);
-  return k(
-    () => s.pipe(
-      C((l) => l ? M(
-        p({ type: "reset" }),
+  const n = b(t), u = W(r), c = W(e);
+  return H(
+    () => u.pipe(
+      M((l) => l ? C(
+        g({ type: "reset" }),
         c.pipe(
-          xe(
-            (a) => Be({
+          Ce(
+            (s) => Be({
               adapter: l,
-              entries: a,
+              entries: s,
               onHydrated: () => {
                 var o;
                 (o = n.current) == null || o.call(n);
@@ -522,52 +506,52 @@ function It({
             })
           )
         )
-      ) : p({ type: "reset" }))
+      ) : g({ type: "reset" }))
     ).pipe(
-      Fe(
-        (l, a) => a.type === "reset" ? { isHydrated: !1 } : a.type === "hydrated" ? { isHydrated: !0 } : l,
+      Me(
+        (l, s) => s.type === "reset" ? { isHydrated: !1 } : s.type === "hydrated" ? { isHydrated: !0 } : l,
         { isHydrated: !1 }
       )
     ),
     { defaultValue: { isHydrated: !1 }, compareFn: Ge },
-    [s, c]
+    [u, c]
   );
 }
 class et {
   constructor() {
-    w(this, "queryMap", /* @__PURE__ */ new Map());
+    I(this, "queryMap", /* @__PURE__ */ new Map());
   }
   getQuery(t) {
     return this.queryMap.get(t);
   }
   setQuery(t, r, n) {
-    const s = ae(t), c = r.pipe(
+    const u = le(t), c = r.pipe(
       /**
        * abort signal is triggered on:
        * - manual cancellation from user
        * - unmounting the component
        * @see https://tanstack.com/query/latest/docs/framework/react/guides/query-cancellation
        */
-      se(Ce(n, "abort")),
-      ne()
-    ), u = {
+      Fe(ae(n, "abort")),
+      ue()
+    ), a = {
       query$: c,
       signal: n,
       sub: void 0,
       isCompleted: !1,
       lastData: void 0
     };
-    this.queryMap.set(s, u);
+    this.queryMap.set(u, a);
     const l = c.subscribe({
-      next: (a) => {
-        const o = this.queryMap.get(s);
-        o && (o.lastData = { value: a });
+      next: (s) => {
+        const o = this.queryMap.get(u);
+        o && (o.lastData = { value: s });
       },
       complete: () => {
-        this.deleteQuery(s);
+        this.deleteQuery(u);
       }
     });
-    return u.sub = l, u;
+    return a.sub = l, a;
   }
   deleteQuery(t) {
     const r = this.queryMap.get(t);
@@ -579,18 +563,18 @@ class et {
     });
   }
 }
-const de = X(void 0), wt = Z(
+const ge = ee(void 0), It = te(
   ({
     children: e,
     client: t
   }) => {
-    const [r] = Se(() => t ?? new et());
-    return b(() => () => {
+    const [r] = Q(() => t ?? new et());
+    return v(() => () => {
       r.destroy();
-    }, [r]), /* @__PURE__ */ ce(de.Provider, { value: r, children: e });
+    }, [r]), /* @__PURE__ */ ie(ge.Provider, { value: r, children: e });
   }
 ), tt = () => {
-  const e = B(de);
+  const e = re(ge);
   if (!e)
     throw new Error(
       "useReactJrxQueryClient must be used within a ReactJrxQueryProvider"
@@ -598,36 +582,36 @@ const de = X(void 0), wt = Z(
   return e;
 };
 function Et(e, t) {
-  const r = oe(t), n = tt();
-  return Qe(
+  const r = fe(t), n = tt();
+  return De(
     {
       ...e,
-      queryFn: (u) => new Promise((l, a) => {
-        const o = () => Q(
-          () => typeof e.queryFn == "function" ? e.queryFn(u) : e.queryFn
-        ), f = ae(u.queryKey), i = n.getQuery(f) ?? n.setQuery(u.queryKey, o(), u.signal);
+      queryFn: (a) => new Promise((l, s) => {
+        const o = () => D(
+          () => typeof e.queryFn == "function" ? e.queryFn(a) : e.queryFn
+        ), f = le(a.queryKey), i = n.getQuery(f) ?? n.setQuery(a.queryKey, o(), a.signal);
         i.query$.pipe(
-          ue(1),
+          ce(1),
           /**
            * If several values are emitted during this delay, we will only
            * keep the last value. This is unfortunate but it's the best we can do
            * for now.
            */
-          $e(1)
+          Ne(1)
         ).subscribe({
-          error: (g) => a(g),
+          error: (p) => s(p),
           complete: () => {
             if ((i == null ? void 0 : i.lastData) === void 0)
               return i.signal.aborted || (console.log(
                 `cancelled due to stream completing without data for query ${f}`,
                 i == null ? void 0 : i.lastData
               ), r.cancelQueries({
-                queryKey: u.queryKey,
+                queryKey: a.queryKey,
                 exact: !0
               })), l(void 0);
             l(i.lastData.value), (i == null ? void 0 : i.isCompleted) === !1 && setTimeout(() => {
               r == null || r.refetchQueries({
-                queryKey: u.queryKey,
+                queryKey: a.queryKey,
                 exact: !0
               });
             });
@@ -638,29 +622,31 @@ function Et(e, t) {
     t
   );
 }
-function me(e, t) {
-  const r = j({
-    status: "idle",
-    isPending: !1,
-    isError: !1,
-    isSuccess: !1,
-    isIdle: !0
-  }), n = Te(
+function pe(e, t) {
+  const r = z(
+    () => new E({
+      status: "idle",
+      isPending: !1,
+      isError: !1,
+      isSuccess: !1,
+      isIdle: !0
+    })
+  ), n = Te(
     {
       ...e,
       mutationFn: (o) => {
         let f;
-        return new Promise((i, m) => {
-          (typeof e.mutationFn == "function" ? e.mutationFn(o) : e.mutationFn).pipe(ue(1)).subscribe({
-            next: (d) => {
-              f = { value: d };
+        return new Promise((i, d) => {
+          (typeof e.mutationFn == "function" ? e.mutationFn(o) : e.mutationFn).pipe(ce(1)).subscribe({
+            next: (m) => {
+              f = { value: m };
             },
-            error: (d) => {
-              m(d);
+            error: (m) => {
+              d(m);
             },
             complete: () => {
               if (f === void 0)
-                return m(new Error("Stream completed without any data"));
+                return d(new Error("Stream completed without any data"));
               i(f.value);
             }
           });
@@ -668,125 +654,163 @@ function me(e, t) {
       }
     },
     t
-  ), { status: s, isPending: c, isError: u, isSuccess: l, isIdle: a } = n;
-  return b(() => {
+  ), { status: u, isPending: c, isError: a, isSuccess: l, isIdle: s } = n;
+  return v(() => {
     r.next({
-      status: s,
+      status: u,
       isPending: c,
-      isError: u,
+      isError: a,
       isSuccess: l,
-      isIdle: a
+      isIdle: s
     });
-  }, [s, c, u, l, a, r]), { ...n, state$: r };
+  }, [u, c, a, l, s, r]), { ...n, state$: r };
 }
-function Vt(e, t) {
-  const [r, n] = ke(), { mutate: s, mutateAsync: c, ...u } = me(
+class Z extends Error {
+  constructor(t = "Mutation canceled") {
+    super(t), this.name = "SwitchMutationCancelError";
+  }
+}
+function xt(e, t) {
+  const r = $(new AbortController()), { mutate: n, mutateAsync: u, ...c } = pe(
     {
       ...e,
-      mutationFn: (o) => (typeof e.mutationFn == "function" ? e.mutationFn(o) : e.mutationFn).pipe(se(r), Me(null))
+      mutationFn: ({ variables: s, abort: o }) => {
+        if (o.aborted)
+          throw new Z();
+        const f = typeof e.mutationFn == "function" ? e.mutationFn(s) : e.mutationFn;
+        return C(
+          f,
+          ae(o, "abort").pipe(
+            T(() => {
+              throw new Z();
+            }),
+            $e()
+          )
+        ).pipe(oe(), Re(null));
+      },
+      onMutate: ({ variables: s }) => {
+        var o;
+        return (o = e.onMutate) == null ? void 0 : o.call(e, s);
+      },
+      onSuccess: (s, { variables: o }, f) => {
+        var i;
+        return (i = e.onSuccess) == null ? void 0 : i.call(e, s, o, f);
+      },
+      onError: (s, { variables: o }, ...f) => {
+        var i;
+        return (i = e.onError) == null ? void 0 : i.call(e, s, o, ...f);
+      },
+      onSettled: (s, o, { variables: f }, i) => {
+        var d;
+        return (d = e.onSettled) == null ? void 0 : d.call(e, s, o, f, i);
+      }
     },
     t
-  ), l = h(
-    (o) => (n(), s(o)),
-    [s, n]
   ), a = h(
-    (o) => (n(), c(o)),
-    [c, n]
+    (s) => (r.current.abort(), r.current = new AbortController(), n({
+      variables: s,
+      abort: r.current.signal
+    })),
+    [n]
+  ), l = h(
+    (s) => (r.current.abort(), r.current = new AbortController(), u({
+      variables: s,
+      abort: r.current.signal
+    })),
+    [u]
   );
-  return { ...u, mutate: l, mutateAsync: a };
+  return { ...c, mutate: a, mutateAsync: l };
 }
-function xt(e, t) {
-  const r = oe(t), n = e.mutationKey, { mutateAsync: s, ...c } = me(
+function Vt(e, t) {
+  const r = fe(t), n = e.mutationKey, { mutateAsync: u, ...c } = pe(
     {
       ...e,
-      onMutate({ variables: a }) {
+      onMutate({ variables: s }) {
         var o;
-        return (o = e.onMutate) == null ? void 0 : o.call(e, a);
+        return (o = e.onMutate) == null ? void 0 : o.call(e, s);
       },
-      onSuccess(a, o, f) {
+      onSuccess(s, o, f) {
         var i;
-        return (i = e.onSuccess) == null ? void 0 : i.call(e, a, o.variables, f);
+        return (i = e.onSuccess) == null ? void 0 : i.call(e, s, o.variables, f);
       },
-      onError(a, o, f) {
+      onError(s, o, f) {
         var i;
-        return (i = e.onError) == null ? void 0 : i.call(e, a, o.variables, f);
+        return (i = e.onError) == null ? void 0 : i.call(e, s, o.variables, f);
       },
-      onSettled(a, o, f, i) {
-        var m;
-        return (m = e.onSettled) == null ? void 0 : m.call(e, a, o, f.variables, i);
+      onSettled(s, o, f, i) {
+        var d;
+        return (d = e.onSettled) == null ? void 0 : d.call(e, s, o, f.variables, i);
       },
-      mutationFn: ({ ready$: a, variables: o }) => {
+      mutationFn: ({ ready$: s, variables: o }) => {
         const f = typeof e.mutationFn == "function" ? e.mutationFn(o) : e.mutationFn;
-        return a.pipe(
-          Ne((i) => i),
-          Pe(),
-          C(() => f)
+        return s.pipe(
+          Pe((i) => i),
+          oe(),
+          M(() => f)
         );
       }
     },
     t
-  ), u = h(
-    async (a) => {
+  ), a = h(
+    async (s) => {
       const o = r.getMutationCache().findAll({
         mutationKey: n,
         exact: !0
-      }), f = new F(!1), i = s({ variables: a, ready$: f });
+      }), f = new E(!1), i = u({ variables: s, ready$: f });
       return await Promise.all(
-        o.map((m) => m.continue().catch(L))
+        o.map((d) => d.continue().catch(j))
       ), f.next(!0), await i.finally(() => {
         f.complete();
       });
     },
-    [s, r, n]
+    [u, r, n]
   ), l = h(
-    (a) => {
-      u(a).catch(L);
+    (s) => {
+      a(s).catch(j);
     },
-    [u]
+    [a]
   );
-  return { ...c, mutate: l, mutateAsync: u };
+  return { ...c, mutate: l, mutateAsync: a };
 }
 export {
-  de as Context,
+  ge as Context,
   et as QueryClient$,
-  wt as QueryClientProvider$,
-  _e as SIGNAL_RESET,
-  le as Signal,
-  St as SignalContextProvider,
-  fe as SignalReactContext,
-  A as VirtualSignal,
-  gt as arrayEqual,
+  It as QueryClientProvider$,
+  ke as SIGNAL_RESET,
+  ye as Signal,
+  ht as SignalContextProvider,
+  de as SignalReactContext,
+  Z as SwitchMutationCancelError,
+  q as VirtualSignal,
+  pt as arrayEqual,
   Ue as createLocalStorageAdapter,
   bt as createLocalforageAdapter,
-  Ke as exponentialBackoffDelay,
-  He as getDelay,
-  pt as isDefined,
-  Y as isPromiseLike,
-  ht as isServer,
+  ze as exponentialBackoffDelay,
+  Ke as getDelay,
+  gt as isDefined,
+  G as isPromiseLike,
+  St as isServer,
   mt as retryBackoff,
   lt as signal,
-  j as useBehaviorSubject,
-  xt as useContactMutation$,
-  je as useEffectOnce,
-  U as useLiveBehaviorSubject,
-  v as useLiveRef,
-  ze as useMakeOrRetrieveSignal,
+  Vt as useContactMutation$,
+  He as useEffectOnce,
+  W as useLiveBehaviorSubject,
+  b as useLiveRef,
+  Le as useMakeOrRetrieveSignal,
   dt as useMount,
-  me as useMutation$,
-  ke as useObservableCallback,
+  pe as useMutation$,
   ot as useObservableState,
-  k as useObserve,
-  It as usePersistSignals,
+  H as useObserve,
+  wt as usePersistSignals,
   Et as useQuery$,
   tt as useQueryClient$,
-  Je as useSetSignal,
+  Ye as useSetSignal,
   vt as useSignal,
-  ye as useSignalContext,
-  Le as useSignalValue,
-  ie as useSubject,
-  De as useSubscribe,
+  me as useSignalContext,
+  Je as useSignalValue,
+  _e as useSubscribe,
   it as useSubscribeEffect,
-  Vt as useSwitchMutation$,
+  xt as useSwitchMutation$,
   yt as useUnmountObservable,
   ft as virtualSignal
 };