@ahoo-wang/fetcher-react 3.6.2 → 3.6.5

package/dist/index.es.js

@@ -1,138 +1,138 @@
-var B = Object.defineProperty;
-var s = (r, e) => B(r, "name", { value: e, configurable: !0 });
-import { c as _ } from "react/compiler-runtime";
-import { useRef as $, useEffect as I, useState as A, useCallback as w, useMemo as M, useReducer as H, useSyncExternalStore as X, createContext as Z, useContext as ee } from "react";
-import { jsx as N, Fragment as te } from "react/jsx-runtime";
-import { nameGenerator as re } from "@ahoo-wang/fetcher-eventbus";
-import { produce as ne } from "immer";
-import { fetcherRegistrar as ce, getFetcher as se, JsonResultExtractor as ue } from "@ahoo-wang/fetcher";
-import { JsonEventStreamResultExtractor as oe } from "@ahoo-wang/fetcher-eventstream";
-function q(r) {
-  const e = $(r);
+var H = Object.defineProperty;
+var s = (r, e) => H(r, "name", { value: e, configurable: !0 });
+import { c as w } from "react/compiler-runtime";
+import { useRef as C, useEffect as I, useState as A, useCallback as _, useMemo as T, useReducer as X, useSyncExternalStore as Z, createContext as ee, useContext as te } from "react";
+import { jsx as V, Fragment as re } from "react/jsx-runtime";
+import { nameGenerator as ne } from "@ahoo-wang/fetcher-eventbus";
+import { produce as ce } from "immer";
+import { fetcherRegistrar as se, getFetcher as ue, JsonResultExtractor as oe } from "@ahoo-wang/fetcher";
+import { JsonEventStreamResultExtractor as ie } from "@ahoo-wang/fetcher-eventstream";
+function $(r) {
+  const e = C(r);
   return e.current = r, e;
 }
-s(q, "useLatest");
-function D(r, e) {
-  const t = _(19);
+s($, "useLatest");
+function M(r, e) {
+  const t = w(19);
   if (e.leading === !1 && e.trailing === !1)
     throw new Error("useDebouncedCallback: at least one of leading or trailing must be true");
-  const n = $(void 0), a = $(null), u = $(null), c = q(r), o = q(e);
-  let l;
-  t[0] === Symbol.for("react.memo_cache_sentinel") ? (l = /* @__PURE__ */ s(() => {
+  const n = C(void 0), l = C(null), u = C(null), c = $(r), a = $(e);
+  let o;
+  t[0] === Symbol.for("react.memo_cache_sentinel") ? (o = /* @__PURE__ */ s(() => {
     n.current !== void 0 && (clearTimeout(n.current), n.current = void 0);
-  }, "t0"), t[0] = l) : l = t[0];
-  const y = l;
+  }, "t0"), t[0] = o) : o = t[0];
+  const y = o;
   let f;
-  t[1] !== o ? (f = /* @__PURE__ */ s((F) => u.current ? F - u.current >= o.current.delay : !0, "t1"), t[1] = o, t[2] = f) : f = t[2];
+  t[1] !== a ? (f = /* @__PURE__ */ s((F) => u.current ? F - u.current >= a.current.delay : !0, "t1"), t[1] = a, t[2] = f) : f = t[2];
   const i = f;
   let d;
-  t[3] !== c ? (d = /* @__PURE__ */ s((F, C) => {
-    u.current = F, c.current(...C);
+  t[3] !== c ? (d = /* @__PURE__ */ s((F, O) => {
+    u.current = F, c.current(...O);
   }, "t2"), t[3] = c, t[4] = d) : d = t[4];
   const m = d;
   let b;
-  t[5] !== m || t[6] !== o ? (b = /* @__PURE__ */ s(() => {
+  t[5] !== m || t[6] !== a ? (b = /* @__PURE__ */ s(() => {
     n.current = setTimeout(() => {
-      if (a.current) {
+      if (l.current) {
         const F = Date.now();
-        m(F, a.current);
+        m(F, l.current);
       }
       n.current = void 0;
-    }, o.current.delay);
-  }, "t3"), t[5] = m, t[6] = o, t[7] = b) : b = t[7];
-  const h = b;
+    }, a.current.delay);
+  }, "t3"), t[5] = m, t[6] = a, t[7] = b) : b = t[7];
+  const x = b;
   let g;
-  t[8] !== m || t[9] !== o || t[10] !== h || t[11] !== i ? (g = /* @__PURE__ */ s((...F) => {
-    const C = F;
+  t[8] !== m || t[9] !== a || t[10] !== x || t[11] !== i ? (g = /* @__PURE__ */ s((...F) => {
+    const O = F;
     y();
     const {
-      leading: U,
-      trailing: k
-    } = o.current, z = U === void 0 ? !1 : U, G = k === void 0 ? !0 : k;
-    if (a.current = C, G && !z) {
-      h();
+      leading: k,
+      trailing: z
+    } = a.current, G = k === void 0 ? !1 : k, K = z === void 0 ? !0 : z;
+    if (l.current = O, K && !G) {
+      x();
       return;
     }
-    const K = Date.now();
-    if (z && i(K)) {
-      m(K, C);
+    const N = Date.now();
+    if (G && i(N)) {
+      m(N, O);
       return;
     }
-    G && h();
-  }, "t4"), t[8] = m, t[9] = o, t[10] = h, t[11] = i, t[12] = g) : g = t[12];
-  const x = g;
+    K && x();
+  }, "t4"), t[8] = m, t[9] = a, t[10] = x, t[11] = i, t[12] = g) : g = t[12];
+  const h = g;
   let E;
   t[13] === Symbol.for("react.memo_cache_sentinel") ? (E = /* @__PURE__ */ s(() => {
-    y(), a.current = null;
+    y(), l.current = null;
   }, "t5"), t[13] = E) : E = t[13];
   const v = E;
   let Q;
   t[14] === Symbol.for("react.memo_cache_sentinel") ? (Q = /* @__PURE__ */ s(() => n.current !== void 0, "t6"), t[14] = Q) : Q = t[14];
   const S = Q;
-  let R, O;
+  let R, q;
   t[15] === Symbol.for("react.memo_cache_sentinel") ? (R = /* @__PURE__ */ s(() => () => {
     v();
-  }, "t7"), O = [v], t[15] = R, t[16] = O) : (R = t[15], O = t[16]), I(R, O);
+  }, "t7"), q = [v], t[15] = R, t[16] = q) : (R = t[15], q = t[16]), I(R, q);
   let L;
-  return t[17] !== x ? (L = {
-    run: x,
+  return t[17] !== h ? (L = {
+    run: h,
     cancel: v,
     isPending: S
-  }, t[17] = x, t[18] = L) : L = t[18], L;
+  }, t[17] = h, t[18] = L) : L = t[18], L;
 }
-s(D, "useDebouncedCallback");
+s(M, "useDebouncedCallback");
 function W() {
-  const r = _(3), e = $(!1);
+  const r = w(3), e = C(!1);
   let t;
   r[0] === Symbol.for("react.memo_cache_sentinel") ? (t = /* @__PURE__ */ s(() => e.current, "t0"), r[0] = t) : t = r[0];
   const n = t;
-  let a, u;
-  return r[1] === Symbol.for("react.memo_cache_sentinel") ? (a = /* @__PURE__ */ s(() => (e.current = !0, () => {
+  let l, u;
+  return r[1] === Symbol.for("react.memo_cache_sentinel") ? (l = /* @__PURE__ */ s(() => (e.current = !0, () => {
     e.current = !1;
-  }), "t1"), u = [], r[1] = a, r[2] = u) : (a = r[1], u = r[2]), I(a, u), n;
+  }), "t1"), u = [], r[1] = l, r[2] = u) : (l = r[1], u = r[2]), I(l, u), n;
 }
 s(W, "useMounted");
 var le = /* @__PURE__ */ ((r) => (r.IDLE = "idle", r.LOADING = "loading", r.SUCCESS = "success", r.ERROR = "error", r))(le || {});
-function ie(r) {
+function ae(r) {
   const [e, t] = A(
     r?.initialStatus ?? "idle"
     /* IDLE */
-  ), [n, a] = A(void 0), [u, c] = A(void 0), o = W(), l = q(r), y = w(() => {
-    o() && (t(
+  ), [n, l] = A(void 0), [u, c] = A(void 0), a = W(), o = $(r), y = _(() => {
+    a() && (t(
       "loading"
       /* LOADING */
     ), c(void 0));
-  }, [o]), f = w(async (m) => {
-    if (o()) {
-      a(m), t(
+  }, [a]), f = _(async (m) => {
+    if (a()) {
+      l(m), t(
         "success"
         /* SUCCESS */
       ), c(void 0);
       try {
-        await l.current?.onSuccess?.(m);
+        await o.current?.onSuccess?.(m);
       } catch (b) {
         console.warn("PromiseState onSuccess callback error:", b);
       }
     }
-  }, [o, l]), i = w(async (m) => {
-    if (o()) {
+  }, [a, o]), i = _(async (m) => {
+    if (a()) {
       c(m), t(
         "error"
         /* ERROR */
-      ), a(void 0);
+      ), l(void 0);
       try {
-        await l.current?.onError?.(m);
+        await o.current?.onError?.(m);
       } catch (b) {
         console.warn("PromiseState onError callback error:", b);
       }
     }
-  }, [o, l]), d = w(() => {
-    o() && (t(
+  }, [a, o]), d = _(() => {
+    a() && (t(
       "idle"
       /* IDLE */
-    ), c(void 0), a(void 0));
-  }, [o]);
-  return M(() => ({
+    ), c(void 0), l(void 0));
+  }, [a]);
+  return T(() => ({
     status: e,
     loading: e === "loading",
     result: n,
@@ -143,23 +143,23 @@ function ie(r) {
     setIdle: d
   }), [e, n, u, y, f, i, d]);
 }
-s(ie, "usePromiseState");
-function ae() {
-  const r = _(6), e = $(0);
+s(ae, "usePromiseState");
+function fe() {
+  const r = w(6), e = C(0);
   let t;
   r[0] === Symbol.for("react.memo_cache_sentinel") ? (t = /* @__PURE__ */ s(() => e.current = e.current + 1, "t0"), r[0] = t) : t = r[0];
   const n = t;
-  let a;
-  r[1] === Symbol.for("react.memo_cache_sentinel") ? (a = /* @__PURE__ */ s(() => e.current, "t1"), r[1] = a) : a = r[1];
-  const u = a;
+  let l;
+  r[1] === Symbol.for("react.memo_cache_sentinel") ? (l = /* @__PURE__ */ s(() => e.current, "t1"), r[1] = l) : l = r[1];
+  const u = l;
   let c;
   r[2] === Symbol.for("react.memo_cache_sentinel") ? (c = /* @__PURE__ */ s((m) => m === e.current, "t2"), r[2] = c) : c = r[2];
-  const o = c;
-  let l;
-  r[3] === Symbol.for("react.memo_cache_sentinel") ? (l = /* @__PURE__ */ s(() => {
+  const a = c;
+  let o;
+  r[3] === Symbol.for("react.memo_cache_sentinel") ? (o = /* @__PURE__ */ s(() => {
     e.current = e.current + 1;
-  }, "t3"), r[3] = l) : l = r[3];
-  const y = l;
+  }, "t3"), r[3] = o) : o = r[3];
+  const y = o;
   let f;
   r[4] === Symbol.for("react.memo_cache_sentinel") ? (f = /* @__PURE__ */ s(() => {
     e.current = 0;
@@ -169,29 +169,29 @@ function ae() {
   return r[5] === Symbol.for("react.memo_cache_sentinel") ? (d = {
     generate: n,
     current: u,
-    isLatest: o,
+    isLatest: a,
     invalidate: y,
     reset: i
   }, r[5] = d) : d = r[5], d;
 }
-s(ae, "useRequestId");
-function T(r) {
+s(fe, "useRequestId");
+function U(r) {
   const {
     loading: e,
     result: t,
     error: n,
-    status: a,
+    status: l,
     setLoading: u,
     setSuccess: c,
-    setError: o,
-    setIdle: l
-  } = ie(r), y = W(), f = ae(), i = $(void 0), d = r?.propagateError, m = q(r?.onAbort), b = w(async () => {
+    setError: a,
+    setIdle: o
+  } = ae(r), y = W(), f = fe(), i = C(void 0), d = r?.propagateError, m = $(r?.onAbort), b = _(async () => {
     try {
       await m.current?.();
     } catch (E) {
       console.warn("useExecutePromise onAbort callback error:", E);
     }
-  }, [m]), h = w(async (E) => {
+  }, [m]), x = _(async (E) => {
     i.current && (i.current.abort(), await b());
     const v = new AbortController();
     i.current = v;
@@ -202,185 +202,187 @@ function T(r) {
       y() && f.isLatest(Q) && await c(S);
     } catch (S) {
       if (S instanceof Error && S.name === "AbortError") {
-        y() && l();
+        y() && o();
         return;
       }
-      if (y() && f.isLatest(Q) && await o(S), d)
+      if (y() && f.isLatest(Q) && await a(S), d)
         throw S;
     } finally {
       i.current === v && (i.current = void 0);
     }
-  }, [u, c, o, l, y, f, d, b]), g = w(() => {
-    y() && l();
-  }, [l, y]), x = w(async () => {
+  }, [u, c, a, o, y, f, d, b]), g = _(() => {
+    y() && o();
+  }, [o, y]), h = _(async () => {
     g(), i.current && (i.current.abort(), i.current = void 0, await b());
   }, [g, b]);
   return I(() => () => {
-    x();
-  }, [x]), M(() => ({
+    h();
+  }, [h]), T(() => ({
     loading: e,
     result: t,
     error: n,
-    status: a,
-    execute: h,
+    status: l,
+    execute: x,
     reset: g,
-    abort: x
-  }), [e, t, n, a, h, g, x]);
+    abort: h
+  }), [e, t, n, l, x, g, h]);
 }
-s(T, "useExecutePromise");
-function _e(r) {
-  const e = _(10), {
+s(U, "useExecutePromise");
+function Re(r) {
+  const e = w(10), {
     loading: t,
     result: n,
-    error: a,
+    error: l,
     execute: u,
     reset: c,
-    abort: o,
-    status: l
-  } = T(r), {
+    abort: a,
+    status: o
+  } = U(r), {
     run: y,
     cancel: f,
     isPending: i
-  } = D(u, r.debounce);
+  } = M(u, r.debounce);
   let d;
-  return e[0] !== o || e[1] !== f || e[2] !== a || e[3] !== i || e[4] !== t || e[5] !== c || e[6] !== n || e[7] !== y || e[8] !== l ? (d = {
+  return e[0] !== a || e[1] !== f || e[2] !== l || e[3] !== i || e[4] !== t || e[5] !== c || e[6] !== n || e[7] !== y || e[8] !== o ? (d = {
     loading: t,
     result: n,
-    error: a,
-    status: l,
+    error: l,
+    status: o,
     reset: c,
-    abort: o,
+    abort: a,
     run: y,
     cancel: f,
     isPending: i
-  }, e[0] = o, e[1] = f, e[2] = a, e[3] = i, e[4] = t, e[5] = c, e[6] = n, e[7] = y, e[8] = l, e[9] = d) : d = e[9], d;
+  }, e[0] = a, e[1] = f, e[2] = l, e[3] = i, e[4] = t, e[5] = c, e[6] = n, e[7] = y, e[8] = o, e[9] = d) : d = e[9], d;
 }
-s(_e, "useDebouncedExecutePromise");
-function Re(r) {
-  const e = _(22), t = r.autoExecute;
+s(Re, "useDebouncedExecutePromise");
+function Fe(r) {
+  const e = w(22), t = r.autoExecute;
   let n;
   e[0] !== r ? (n = {
     ...r,
     autoExecute: !1
   }, e[0] = r, e[1] = n) : n = e[1];
-  const a = n, {
+  const l = n, {
     loading: u,
     result: c,
-    error: o,
-    status: l,
+    error: a,
+    status: o,
     execute: y,
     reset: f,
     abort: i,
     getQuery: d,
     setQuery: m
-  } = p(a), {
+  } = p(l), {
     run: b,
-    cancel: h,
+    cancel: x,
     isPending: g
-  } = D(y, r.debounce);
-  let x;
-  e[2] !== t || e[3] !== b || e[4] !== m ? (x = /* @__PURE__ */ s((R) => {
+  } = M(y, r.debounce);
+  let h;
+  e[2] !== t || e[3] !== b || e[4] !== m ? (h = /* @__PURE__ */ s((R) => {
     m(R), t && b();
-  }, "t1"), e[2] = t, e[3] = b, e[4] = m, e[5] = x) : x = e[5];
-  const E = x;
+  }, "t1"), e[2] = t, e[3] = b, e[4] = m, e[5] = h) : h = e[5];
+  const E = h;
   let v, Q;
   e[6] !== t || e[7] !== b ? (v = /* @__PURE__ */ s(() => {
     t && b();
   }, "t2"), Q = [b, t], e[6] = t, e[7] = b, e[8] = v, e[9] = Q) : (v = e[8], Q = e[9]), I(v, Q);
   let S;
-  return e[10] !== i || e[11] !== h || e[12] !== o || e[13] !== d || e[14] !== g || e[15] !== u || e[16] !== f || e[17] !== c || e[18] !== b || e[19] !== E || e[20] !== l ? (S = {
+  return e[10] !== i || e[11] !== x || e[12] !== a || e[13] !== d || e[14] !== g || e[15] !== u || e[16] !== f || e[17] !== c || e[18] !== b || e[19] !== E || e[20] !== o ? (S = {
     loading: u,
     result: c,
-    error: o,
-    status: l,
+    error: a,
+    status: o,
     reset: f,
     abort: i,
     getQuery: d,
     setQuery: E,
     run: b,
-    cancel: h,
+    cancel: x,
     isPending: g
-  }, e[10] = i, e[11] = h, e[12] = o, e[13] = d, e[14] = g, e[15] = u, e[16] = f, e[17] = c, e[18] = b, e[19] = E, e[20] = l, e[21] = S) : S = e[21], S;
+  }, e[10] = i, e[11] = x, e[12] = a, e[13] = d, e[14] = g, e[15] = u, e[16] = f, e[17] = c, e[18] = b, e[19] = E, e[20] = o, e[21] = S) : S = e[21], S;
 }
-s(Re, "useDebouncedQuery");
-function Fe() {
-  const r = $(/* @__PURE__ */ new Map()), e = w((i) => r.current.get(i), []), t = w((i, d) => r.current.set(i, d), []), n = w((i) => r.current.has(i), []), a = w((i) => r.current.delete(i), []), u = w(() => r.current.clear(), []), c = w(() => r.current.keys(), []), o = w(() => r.current.values(), []), l = w(() => r.current.entries(), []), y = w(() => r.current[Symbol.iterator](), []), f = w((i) => (d) => {
+s(Fe, "useDebouncedQuery");
+function Oe() {
+  const r = C(/* @__PURE__ */ new Map()), e = _((i) => r.current.get(i), []), t = _((i, d) => r.current.set(i, d), []), n = _((i) => r.current.has(i), []), l = _((i) => r.current.delete(i), []), u = _(() => r.current.clear(), []), c = _(() => r.current.keys(), []), a = _(() => r.current.values(), []), o = _(() => r.current.entries(), []), y = _(() => r.current[Symbol.iterator](), []), f = _((i) => (d) => {
     d ? r.current.set(i, d) : r.current.delete(i);
   }, []);
   return I(() => () => {
     r.current.clear();
-  }, []), M(() => ({
+  }, []), T(() => ({
     register: f,
     get: e,
     set: t,
     has: n,
-    delete: a,
+    delete: l,
     clear: u,
     keys: c,
-    values: o,
-    entries: l,
+    values: a,
+    entries: o,
     get size() {
       return r.current.size;
     },
     [Symbol.iterator]: y
-  }), [f, e, t, n, a, u, c, o, l, y]);
+  }), [f, e, t, n, l, u, c, a, o, y]);
 }
-s(Fe, "useRefs");
-function Ce() {
-  const [, r] = H(fe, 0);
+s(Oe, "useRefs");
+function qe() {
+  const [, r] = X(de, 0);
   return r;
 }
-s(Ce, "useForceUpdate");
-function fe(r) {
+s(qe, "useForceUpdate");
+function de(r) {
   return r + 1;
 }
-s(fe, "_temp");
+s(de, "_temp");
 function j(r) {
-  const e = _(12), {
+  const e = w(12), {
     initialQuery: t,
     query: n,
-    autoExecute: a,
+    autoExecute: l,
     execute: u
-  } = r, c = a === void 0 ? !0 : a, o = n ?? t;
-  if (o === void 0)
-    throw new Error("Either initialQuery or query must be provided.");
-  const l = $(o);
+  } = r, c = l === void 0 ? !0 : l, o = C(n ?? t);
   let y;
-  e[0] === Symbol.for("react.memo_cache_sentinel") ? (y = /* @__PURE__ */ s(() => l.current, "t1"), e[0] = y) : y = e[0];
+  e[0] === Symbol.for("react.memo_cache_sentinel") ? (y = /* @__PURE__ */ s(() => o.current, "t1"), e[0] = y) : y = e[0];
   const f = y;
   let i;
   e[1] !== c || e[2] !== u ? (i = /* @__PURE__ */ s(() => {
-    c && u(f());
+    const E = f();
+    c && D(E) && u(E);
   }, "t2"), e[1] = c, e[2] = u, e[3] = i) : i = e[3];
   const d = i;
   let m;
   e[4] !== d ? (m = /* @__PURE__ */ s((E) => {
-    l.current = E, d();
+    o.current = E, d();
   }, "t3"), e[4] = d, e[5] = m) : m = e[5];
   const b = m;
-  let h, g;
-  e[6] !== d || e[7] !== n ? (h = /* @__PURE__ */ s(() => {
-    n && (l.current = n), d();
-  }, "t4"), g = [d, n], e[6] = d, e[7] = n, e[8] = h, e[9] = g) : (h = e[8], g = e[9]), I(h, g);
-  let x;
-  return e[10] !== b ? (x = {
+  let x, g;
+  e[6] !== d || e[7] !== n ? (x = /* @__PURE__ */ s(() => {
+    D(n) && (o.current = n), d();
+  }, "t4"), g = [d, n], e[6] = d, e[7] = n, e[8] = x, e[9] = g) : (x = e[8], g = e[9]), I(x, g);
+  let h;
+  return e[10] !== b ? (h = {
     getQuery: f,
     setQuery: b
-  }, e[10] = b, e[11] = x) : x = e[11], x;
+  }, e[10] = b, e[11] = h) : h = e[11], h;
 }
 s(j, "useQueryState");
+function D(r) {
+  return r !== void 0;
+}
+s(D, "isValidateQuery");
 function p(r) {
-  const e = _(21), t = q(r), {
+  const e = w(21), t = $(r), {
     loading: n,
-    result: a,
+    result: l,
     error: u,
     status: c,
-    execute: o,
-    reset: l,
+    execute: a,
+    reset: o,
     abort: y
-  } = T(r);
+  } = U(r);
   let f;
-  e[0] !== t || e[1] !== o ? (f = /* @__PURE__ */ s((E) => o(/* @__PURE__ */ s(async (Q) => t.current.execute(E, t.current.attributes, Q), "queryExecutor")), "t0"), e[0] = t, e[1] = o, e[2] = f) : f = e[2];
+  e[0] !== t || e[1] !== a ? (f = /* @__PURE__ */ s((E) => a(/* @__PURE__ */ s(async (Q) => t.current.execute(E, t.current.attributes, Q), "queryExecutor")), "t0"), e[0] = t, e[1] = a, e[2] = f) : f = e[2];
   const i = f;
   let d;
   e[3] !== i || e[4] !== r.autoExecute || e[5] !== r.initialQuery || e[6] !== r.query ? (d = {
@@ -393,85 +395,89 @@ function p(r) {
     getQuery: m,
     setQuery: b
   } = j(d);
-  let h;
-  e[8] !== i || e[9] !== m ? (h = /* @__PURE__ */ s(() => i(m()), "t2"), e[8] = i, e[9] = m, e[10] = h) : h = e[10];
-  const g = h;
   let x;
-  return e[11] !== y || e[12] !== u || e[13] !== g || e[14] !== m || e[15] !== n || e[16] !== l || e[17] !== a || e[18] !== b || e[19] !== c ? (x = {
+  e[8] !== i || e[9] !== m ? (x = /* @__PURE__ */ s(async () => {
+    const E = m();
+    if (D(E))
+      return await i(E);
+  }, "t2"), e[8] = i, e[9] = m, e[10] = x) : x = e[10];
+  const g = x;
+  let h;
+  return e[11] !== y || e[12] !== u || e[13] !== g || e[14] !== m || e[15] !== n || e[16] !== o || e[17] !== l || e[18] !== b || e[19] !== c ? (h = {
     loading: n,
-    result: a,
+    result: l,
     error: u,
     status: c,
     execute: g,
-    reset: l,
+    reset: o,
     abort: y,
     getQuery: m,
     setQuery: b
-  }, e[11] = y, e[12] = u, e[13] = g, e[14] = m, e[15] = n, e[16] = l, e[17] = a, e[18] = b, e[19] = c, e[20] = x) : x = e[20], x;
+  }, e[11] = y, e[12] = u, e[13] = g, e[14] = m, e[15] = n, e[16] = o, e[17] = l, e[18] = b, e[19] = c, e[20] = h) : h = e[20], h;
 }
 s(p, "useQuery");
 function J(r, e) {
-  const t = _(13);
+  const t = w(13);
   let n;
   t[0] !== r ? (n = /* @__PURE__ */ s((m) => r.addListener({
-    name: re.generate("useKeyStorage"),
+    name: ne.generate("useKeyStorage"),
     handle: m
   }), "t0"), t[0] = r, t[1] = n) : n = t[1];
-  const a = n;
+  const l = n;
   let u;
   t[2] !== e || t[3] !== r ? (u = /* @__PURE__ */ s(() => {
     const m = r.get();
     return m !== null ? m : e ?? null;
   }, "t1"), t[2] = e, t[3] = r, t[4] = u) : u = t[4];
-  const c = u, o = X(a, c, c);
-  let l;
-  t[5] !== r ? (l = /* @__PURE__ */ s((m) => r.set(m), "t2"), t[5] = r, t[6] = l) : l = t[6];
-  const y = l;
+  const c = u, a = Z(l, c, c);
+  let o;
+  t[5] !== r ? (o = /* @__PURE__ */ s((m) => r.set(m), "t2"), t[5] = r, t[6] = o) : o = t[6];
+  const y = o;
   let f;
   t[7] !== r ? (f = /* @__PURE__ */ s(() => r.remove(), "t3"), t[7] = r, t[8] = f) : f = t[8];
   const i = f;
   let d;
-  return t[9] !== i || t[10] !== y || t[11] !== o ? (d = [o, y, i], t[9] = i, t[10] = y, t[11] = o, t[12] = d) : d = t[12], d;
+  return t[9] !== i || t[10] !== y || t[11] !== a ? (d = [a, y, i], t[9] = i, t[10] = y, t[11] = a, t[12] = d) : d = t[12], d;
 }
 s(J, "useKeyStorage");
-function Oe(r, e) {
-  const t = _(8), [n, a, u] = J(r, e);
+function Ce(r, e) {
+  const t = w(8), [n, l, u] = J(r, e);
   let c;
-  t[0] !== u || t[1] !== a || t[2] !== n ? (c = /* @__PURE__ */ s((y) => {
-    const f = ne(n, y);
+  t[0] !== u || t[1] !== l || t[2] !== n ? (c = /* @__PURE__ */ s((y) => {
+    const f = ce(n, y);
     if (f === null) {
       u();
       return;
     }
-    return a(f);
-  }, "t0"), t[0] = u, t[1] = a, t[2] = n, t[3] = c) : c = t[3];
-  const o = c;
-  let l;
-  return t[4] !== u || t[5] !== o || t[6] !== n ? (l = [n, o, u], t[4] = u, t[5] = o, t[6] = n, t[7] = l) : l = t[7], l;
-}
-s(Oe, "useImmerKeyStorage");
-const de = {
+    return l(f);
+  }, "t0"), t[0] = u, t[1] = l, t[2] = n, t[3] = c) : c = t[3];
+  const a = c;
+  let o;
+  return t[4] !== u || t[5] !== a || t[6] !== n ? (o = [n, a, u], t[4] = u, t[5] = a, t[6] = n, t[7] = o) : o = t[7], o;
+}
+s(Ce, "useImmerKeyStorage");
+const me = {
   jti: "",
   sub: "anonymous",
   iat: 0,
   exp: 0
 };
-function me(r, e) {
-  const t = _(13);
+function ye(r, e) {
+  const t = w(13);
   let n;
   t[0] !== e ? (n = e === void 0 ? {} : e, t[0] = e, t[1] = n) : n = t[1];
-  const a = n, [u, , c] = J(r), o = q(a);
-  let l;
-  t[2] !== o || t[3] !== r ? (l = /* @__PURE__ */ s(async (h) => {
-    const g = typeof h == "function" ? await h() : h;
-    r.signIn(g), o.current.onSignIn?.();
-  }, "t2"), t[2] = o, t[3] = r, t[4] = l) : l = t[4];
-  const y = l;
+  const l = n, [u, , c] = J(r), a = $(l);
+  let o;
+  t[2] !== a || t[3] !== r ? (o = /* @__PURE__ */ s(async (x) => {
+    const g = typeof x == "function" ? await x() : x;
+    r.signIn(g), a.current.onSignIn?.();
+  }, "t2"), t[2] = a, t[3] = r, t[4] = o) : o = t[4];
+  const y = o;
   let f;
-  t[5] !== o || t[6] !== c ? (f = /* @__PURE__ */ s(() => {
-    c(), o.current.onSignOut?.();
-  }, "t3"), t[5] = o, t[6] = c, t[7] = f) : f = t[7];
-  const i = f, d = u?.access?.payload ?? de, m = u?.authenticated ?? !1;
+  t[5] !== a || t[6] !== c ? (f = /* @__PURE__ */ s(() => {
+    c(), a.current.onSignOut?.();
+  }, "t3"), t[5] = a, t[6] = c, t[7] = f) : f = t[7];
+  const i = f, d = u?.access?.payload ?? me, m = u?.authenticated ?? !1;
   let b;
   return t[8] !== y || t[9] !== i || t[10] !== d || t[11] !== m ? (b = {
     currentUser: d,
@@ -480,75 +486,75 @@ function me(r, e) {
     signOut: i
   }, t[8] = y, t[9] = i, t[10] = d, t[11] = m, t[12] = b) : b = t[12], b;
 }
-s(me, "useSecurity");
-const V = Z(void 0);
+s(ye, "useSecurity");
+const Y = ee(void 0);
 function $e(r) {
-  const e = _(7);
-  let t, n, a;
+  const e = w(7);
+  let t, n, l;
   e[0] !== r ? ({
     tokenStorage: n,
     children: t,
-    ...a
-  } = r, e[0] = r, e[1] = t, e[2] = n, e[3] = a) : (t = e[1], n = e[2], a = e[3]);
-  const u = me(n, a);
+    ...l
+  } = r, e[0] = r, e[1] = t, e[2] = n, e[3] = l) : (t = e[1], n = e[2], l = e[3]);
+  const u = ye(n, l);
   let c;
-  return e[4] !== t || e[5] !== u ? (c = /* @__PURE__ */ N(V.Provider, { value: u, children: t }), e[4] = t, e[5] = u, e[6] = c) : c = e[6], c;
+  return e[4] !== t || e[5] !== u ? (c = /* @__PURE__ */ V(Y.Provider, { value: u, children: t }), e[4] = t, e[5] = u, e[6] = c) : c = e[6], c;
 }
 s($e, "SecurityProvider");
-function ye() {
-  const r = ee(V);
+function be() {
+  const r = te(Y);
   if (!r)
     throw new Error("useSecurityContext must be used within a SecurityProvider");
   return r;
 }
-s(ye, "useSecurityContext");
-function qe(r) {
-  const e = _(2), {
+s(be, "useSecurityContext");
+function Ie(r) {
+  const e = w(2), {
     children: t,
     fallback: n,
-    onUnauthorized: a
+    onUnauthorized: l
   } = r, {
     authenticated: u
-  } = ye();
+  } = be();
   if (u) {
     let c;
-    return e[0] !== t ? (c = /* @__PURE__ */ N(te, { children: t }), e[0] = t, e[1] = c) : c = e[1], c;
+    return e[0] !== t ? (c = /* @__PURE__ */ V(re, { children: t }), e[0] = t, e[1] = c) : c = e[1], c;
   }
-  return a && a(), n;
+  return l && l(), n;
 }
-s(qe, "RouteGuard");
-function Y(r) {
-  const e = _(21);
+s(Ie, "RouteGuard");
+function B(r) {
+  const e = w(21);
   let t;
   e[0] !== r ? (t = r || {}, e[0] = r, e[1] = t) : t = e[1];
   const {
     fetcher: n
-  } = t, a = n === void 0 ? ce.default : n, {
+  } = t, l = n === void 0 ? se.default : n, {
     loading: u,
     result: c,
-    error: o,
-    status: l,
+    error: a,
+    status: o,
     execute: y,
     reset: f,
     abort: i
-  } = T(r), [d, m] = A(void 0), b = q(r);
-  let h;
-  e[2] !== a ? (h = se(a), e[2] = a, e[3] = h) : h = e[3];
-  const g = h;
+  } = U(r), [d, m] = A(void 0), b = $(r);
   let x;
-  e[4] !== g || e[5] !== b || e[6] !== y ? (x = /* @__PURE__ */ s(async (L) => {
+  e[2] !== l ? (x = ue(l), e[2] = l, e[3] = x) : x = e[3];
+  const g = x;
+  let h;
+  e[4] !== g || e[5] !== b || e[6] !== y ? (h = /* @__PURE__ */ s(async (L) => {
     try {
       await y(async (F) => {
         L.abortController = F;
-        const C = await g.exchange(L, b.current);
-        return m(C), await C.extractResult();
+        const O = await g.exchange(L, b.current);
+        return m(O), await O.extractResult();
       });
     } catch (F) {
-      const C = F;
-      throw m(void 0), C;
+      const O = F;
+      throw m(void 0), O;
     }
-  }, "t3"), e[4] = g, e[5] = b, e[6] = y, e[7] = x) : x = e[7];
-  const E = x;
+  }, "t3"), e[4] = g, e[5] = b, e[6] = y, e[7] = h) : h = e[7];
+  const E = h;
   let v;
   e[8] !== f ? (v = /* @__PURE__ */ s(() => {
     f(), m(void 0);
@@ -559,121 +565,121 @@ function Y(r) {
     i(), m(void 0);
   }, "t5"), e[10] = i, e[11] = S) : S = e[11];
   const R = S;
-  let O;
-  return e[12] !== R || e[13] !== o || e[14] !== d || e[15] !== E || e[16] !== u || e[17] !== Q || e[18] !== c || e[19] !== l ? (O = {
+  let q;
+  return e[12] !== R || e[13] !== a || e[14] !== d || e[15] !== E || e[16] !== u || e[17] !== Q || e[18] !== c || e[19] !== o ? (q = {
     loading: u,
     result: c,
-    error: o,
-    status: l,
+    error: a,
+    status: o,
     exchange: d,
     execute: E,
     reset: Q,
     abort: R
-  }, e[12] = R, e[13] = o, e[14] = d, e[15] = E, e[16] = u, e[17] = Q, e[18] = c, e[19] = l, e[20] = O) : O = e[20], O;
+  }, e[12] = R, e[13] = a, e[14] = d, e[15] = E, e[16] = u, e[17] = Q, e[18] = c, e[19] = o, e[20] = q) : q = e[20], q;
 }
-s(Y, "useFetcher");
-function Ie(r) {
-  const e = _(11), {
+s(B, "useFetcher");
+function Le(r) {
+  const e = w(11), {
     loading: t,
     result: n,
-    error: a,
+    error: l,
     status: u,
     exchange: c,
-    execute: o,
-    reset: l,
+    execute: a,
+    reset: o,
     abort: y
-  } = Y(r), {
+  } = B(r), {
     run: f,
     cancel: i,
     isPending: d
-  } = D(o, r.debounce);
+  } = M(a, r.debounce);
   let m;
-  return e[0] !== y || e[1] !== i || e[2] !== a || e[3] !== c || e[4] !== d || e[5] !== t || e[6] !== l || e[7] !== n || e[8] !== f || e[9] !== u ? (m = {
+  return e[0] !== y || e[1] !== i || e[2] !== l || e[3] !== c || e[4] !== d || e[5] !== t || e[6] !== o || e[7] !== n || e[8] !== f || e[9] !== u ? (m = {
     loading: t,
     result: n,
-    error: a,
+    error: l,
     status: u,
     exchange: c,
-    reset: l,
+    reset: o,
     abort: y,
     run: f,
     cancel: i,
     isPending: d
-  }, e[0] = y, e[1] = i, e[2] = a, e[3] = c, e[4] = d, e[5] = t, e[6] = l, e[7] = n, e[8] = f, e[9] = u, e[10] = m) : m = e[10], m;
+  }, e[0] = y, e[1] = i, e[2] = l, e[3] = c, e[4] = d, e[5] = t, e[6] = o, e[7] = n, e[8] = f, e[9] = u, e[10] = m) : m = e[10], m;
 }
-s(Ie, "useDebouncedFetcher");
-function Le(r) {
-  const e = _(22), t = r.autoExecute;
+s(Le, "useDebouncedFetcher");
+function pe(r) {
+  const e = w(22), t = r.autoExecute;
   let n;
   e[0] !== r ? (n = {
     ...r,
     autoExecute: !1
   }, e[0] = r, e[1] = n) : n = e[1];
-  const a = n, {
+  const l = n, {
     loading: u,
     result: c,
-    error: o,
-    status: l,
+    error: a,
+    status: o,
     execute: y,
     reset: f,
     abort: i,
     getQuery: d,
     setQuery: m
-  } = P(a), {
+  } = P(l), {
     run: b,
-    cancel: h,
+    cancel: x,
     isPending: g
-  } = D(y, r.debounce);
-  let x;
-  e[2] !== t || e[3] !== b || e[4] !== m ? (x = /* @__PURE__ */ s((R) => {
+  } = M(y, r.debounce);
+  let h;
+  e[2] !== t || e[3] !== b || e[4] !== m ? (h = /* @__PURE__ */ s((R) => {
     m(R), t && b();
-  }, "t1"), e[2] = t, e[3] = b, e[4] = m, e[5] = x) : x = e[5];
-  const E = x;
+  }, "t1"), e[2] = t, e[3] = b, e[4] = m, e[5] = h) : h = e[5];
+  const E = h;
   let v, Q;
   e[6] !== t || e[7] !== b ? (v = /* @__PURE__ */ s(() => {
     t && b();
   }, "t2"), Q = [b, t], e[6] = t, e[7] = b, e[8] = v, e[9] = Q) : (v = e[8], Q = e[9]), I(v, Q);
   let S;
-  return e[10] !== i || e[11] !== h || e[12] !== o || e[13] !== d || e[14] !== g || e[15] !== u || e[16] !== f || e[17] !== c || e[18] !== b || e[19] !== E || e[20] !== l ? (S = {
+  return e[10] !== i || e[11] !== x || e[12] !== a || e[13] !== d || e[14] !== g || e[15] !== u || e[16] !== f || e[17] !== c || e[18] !== b || e[19] !== E || e[20] !== o ? (S = {
     loading: u,
     result: c,
-    error: o,
-    status: l,
+    error: a,
+    status: o,
     reset: f,
     abort: i,
     getQuery: d,
     setQuery: E,
     run: b,
-    cancel: h,
+    cancel: x,
     isPending: g
-  }, e[10] = i, e[11] = h, e[12] = o, e[13] = d, e[14] = g, e[15] = u, e[16] = f, e[17] = c, e[18] = b, e[19] = E, e[20] = l, e[21] = S) : S = e[21], S;
+  }, e[10] = i, e[11] = x, e[12] = a, e[13] = d, e[14] = g, e[15] = u, e[16] = f, e[17] = c, e[18] = b, e[19] = E, e[20] = o, e[21] = S) : S = e[21], S;
 }
-s(Le, "useDebouncedFetcherQuery");
+s(pe, "useDebouncedFetcherQuery");
 function P(r) {
-  const e = _(23);
+  const e = w(23);
   let t;
   e[0] !== r ? (t = {
-    resultExtractor: ue,
+    resultExtractor: oe,
     ...r
   }, e[0] = r, e[1] = t) : t = e[1];
-  const n = t, a = q(n), {
+  const n = t, l = $(n), {
     loading: u,
     result: c,
-    error: o,
-    status: l,
+    error: a,
+    status: o,
     execute: y,
     reset: f,
     abort: i
-  } = Y(n);
+  } = B(n);
   let d;
-  e[2] !== y || e[3] !== a ? (d = /* @__PURE__ */ s((Q) => {
+  e[2] !== y || e[3] !== l ? (d = /* @__PURE__ */ s((Q) => {
     const S = {
-      url: a.current.url,
+      url: l.current.url,
       method: "POST",
       body: Q
     };
     return y(S);
-  }, "t1"), e[2] = y, e[3] = a, e[4] = d) : d = e[4];
+  }, "t1"), e[2] = y, e[3] = l, e[4] = d) : d = e[4];
   const m = d;
   let b;
   e[5] !== m || e[6] !== n.autoExecute || e[7] !== n.initialQuery || e[8] !== n.query ? (b = {
@@ -683,129 +689,134 @@ function P(r) {
     execute: m
   }, e[5] = m, e[6] = n.autoExecute, e[7] = n.initialQuery, e[8] = n.query, e[9] = b) : b = e[9];
   const {
-    getQuery: h,
+    getQuery: x,
     setQuery: g
   } = j(b);
-  let x;
-  e[10] !== m || e[11] !== h ? (x = /* @__PURE__ */ s(() => m(h()), "t3"), e[10] = m, e[11] = h, e[12] = x) : x = e[12];
-  const E = x;
+  let h;
+  e[10] !== m || e[11] !== x ? (h = /* @__PURE__ */ s(async () => {
+    const Q = x();
+    if (D(Q))
+      return await m(Q);
+  }, "t3"), e[10] = m, e[11] = x, e[12] = h) : h = e[12];
+  const E = h;
   let v;
-  return e[13] !== i || e[14] !== o || e[15] !== E || e[16] !== h || e[17] !== u || e[18] !== f || e[19] !== c || e[20] !== g || e[21] !== l ? (v = {
+  return e[13] !== i || e[14] !== a || e[15] !== E || e[16] !== x || e[17] !== u || e[18] !== f || e[19] !== c || e[20] !== g || e[21] !== o ? (v = {
     loading: u,
     result: c,
-    error: o,
-    status: l,
+    error: a,
+    status: o,
     execute: E,
     reset: f,
     abort: i,
-    getQuery: h,
+    getQuery: x,
     setQuery: g
-  }, e[13] = i, e[14] = o, e[15] = E, e[16] = h, e[17] = u, e[18] = f, e[19] = c, e[20] = g, e[21] = l, e[22] = v) : v = e[22], v;
+  }, e[13] = i, e[14] = a, e[15] = E, e[16] = x, e[17] = u, e[18] = f, e[19] = c, e[20] = g, e[21] = o, e[22] = v) : v = e[22], v;
 }
 s(P, "useFetcherQuery");
-function pe(r) {
-  return P(r);
-}
-s(pe, "useFetcherCountQuery");
 function Pe(r) {
   return P(r);
 }
-s(Pe, "useFetcherListQuery");
+s(Pe, "useFetcherCountQuery");
 function Ae(r) {
-  const e = _(2);
+  return P(r);
+}
+s(Ae, "useFetcherListQuery");
+function De(r) {
+  const e = w(2);
   let t;
   return e[0] !== r ? (t = {
     ...r,
-    resultExtractor: oe
+    resultExtractor: ie
   }, e[0] = r, e[1] = t) : t = e[1], P(t);
 }
-s(Ae, "useFetcherListStreamQuery");
-function De(r) {
-  return P(r);
-}
-s(De, "useFetcherPagedQuery");
+s(De, "useFetcherListStreamQuery");
 function Me(r) {
   return P(r);
 }
-s(Me, "useFetcherSingleQuery");
+s(Me, "useFetcherPagedQuery");
 function Te(r) {
-  return p(r);
+  return P(r);
 }
-s(Te, "useCountQuery");
+s(Te, "useFetcherSingleQuery");
 function Ue(r) {
   return p(r);
 }
-s(Ue, "useListQuery");
+s(Ue, "useCountQuery");
 function ke(r) {
   return p(r);
 }
-s(ke, "useListStreamQuery");
+s(ke, "useListQuery");
 function ze(r) {
   return p(r);
 }
-s(ze, "usePagedQuery");
+s(ze, "useListStreamQuery");
 function Ge(r) {
   return p(r);
 }
-s(Ge, "useSingleQuery");
+s(Ge, "usePagedQuery");
 function Ke(r) {
-  const e = _(13), {
+  return p(r);
+}
+s(Ke, "useSingleQuery");
+function Ne(r) {
+  const e = w(13), {
     bus: t,
     handler: n
   } = r;
-  let a;
-  e[0] !== t || e[1] !== n ? (a = /* @__PURE__ */ s(() => t.on(n), "t0"), e[0] = t, e[1] = n, e[2] = a) : a = e[2];
-  const u = a;
+  let l;
+  e[0] !== t || e[1] !== n ? (l = /* @__PURE__ */ s(() => t.on(n), "t0"), e[0] = t, e[1] = n, e[2] = l) : l = e[2];
+  const u = l;
   let c;
   e[3] !== t || e[4] !== n.name ? (c = /* @__PURE__ */ s(() => t.off(n.name), "t1"), e[3] = t, e[4] = n.name, e[5] = c) : c = e[5];
-  const o = c;
-  let l, y;
-  e[6] !== t || e[7] !== n ? (l = /* @__PURE__ */ s(() => (t.on(n) || console.warn(`Failed to subscribe to event bus with handler: ${n.name}`), () => {
+  const a = c;
+  let o, y;
+  e[6] !== t || e[7] !== n ? (o = /* @__PURE__ */ s(() => (t.on(n) || console.warn(`Failed to subscribe to event bus with handler: ${n.name}`), () => {
     t.off(n.name);
-  }), "t2"), y = [t, n], e[6] = t, e[7] = n, e[8] = l, e[9] = y) : (l = e[8], y = e[9]), I(l, y);
+  }), "t2"), y = [t, n], e[6] = t, e[7] = n, e[8] = o, e[9] = y) : (o = e[8], y = e[9]), I(o, y);
   let f;
-  return e[10] !== u || e[11] !== o ? (f = {
+  return e[10] !== u || e[11] !== a ? (f = {
     subscribe: u,
-    unsubscribe: o
-  }, e[10] = u, e[11] = o, e[12] = f) : f = e[12], f;
+    unsubscribe: a
+  }, e[10] = u, e[11] = a, e[12] = f) : f = e[12], f;
 }
-s(Ke, "useEventSubscription");
+s(Ne, "useEventSubscription");
 export {
-  de as ANONYMOUS_USER,
+  me as ANONYMOUS_USER,
   le as PromiseStatus,
-  qe as RouteGuard,
-  V as SecurityContext,
+  Ie as RouteGuard,
+  Y as SecurityContext,
   $e as SecurityProvider,
-  Te as useCountQuery,
-  D as useDebouncedCallback,
-  _e as useDebouncedExecutePromise,
-  Ie as useDebouncedFetcher,
-  Le as useDebouncedFetcherQuery,
-  Re as useDebouncedQuery,
-  Ke as useEventSubscription,
-  T as useExecutePromise,
-  Y as useFetcher,
-  pe as useFetcherCountQuery,
-  Pe as useFetcherListQuery,
-  Ae as useFetcherListStreamQuery,
-  De as useFetcherPagedQuery,
+  D as isValidateQuery,
+  Ue as useCountQuery,
+  M as useDebouncedCallback,
+  Re as useDebouncedExecutePromise,
+  Le as useDebouncedFetcher,
+  pe as useDebouncedFetcherQuery,
+  Fe as useDebouncedQuery,
+  Ne as useEventSubscription,
+  U as useExecutePromise,
+  B as useFetcher,
+  Pe as useFetcherCountQuery,
+  Ae as useFetcherListQuery,
+  De as useFetcherListStreamQuery,
+  Me as useFetcherPagedQuery,
   P as useFetcherQuery,
-  Me as useFetcherSingleQuery,
-  Ce as useForceUpdate,
-  Oe as useImmerKeyStorage,
+  Te as useFetcherSingleQuery,
+  qe as useForceUpdate,
+  Ce as useImmerKeyStorage,
   J as useKeyStorage,
-  q as useLatest,
-  Ue as useListQuery,
-  ke as useListStreamQuery,
+  $ as useLatest,
+  ke as useListQuery,
+  ze as useListStreamQuery,
   W as useMounted,
-  ze as usePagedQuery,
-  ie as usePromiseState,
+  Ge as usePagedQuery,
+  ae as usePromiseState,
   p as useQuery,
   j as useQueryState,
-  Fe as useRefs,
-  ae as useRequestId,
-  me as useSecurity,
-  ye as useSecurityContext,
-  Ge as useSingleQuery
+  Oe as useRefs,
+  fe as useRequestId,
+  ye as useSecurity,
+  be as useSecurityContext,
+  Ke as useSingleQuery
 };
 //# sourceMappingURL=index.es.js.map