@hortiview/modulebase 0.0.13101-beta → 0.0.13102-beta

package/dist/{useQuery-Jx956wwH.js → useQuery-B23OSvXW.js}

@@ -1,11 +1,10 @@
-import { S as B, p as U, b as f, s as w, g as O, a as H, j as Q, k, t as N, l as V, r as M, n as A, u as z } from "./QueryClientProvider-BSM1ol7r.js";
-import { f as W, u as $ } from "./isRestoring-LSIsLTaI.js";
+import { S as H, p as M, d as f, s as E, f as R, a as Q, k as T, l as _, t as N, m as V, r as L, n as q, b as z, u as W } from "./QueryClientProvider-C7EHlqBQ.js";
+import { f as K, u as $ } from "./IsRestoringProvider-B1U_sG8s.js";
 import * as y from "react";
 import "react/jsx-runtime";
-import { s as K, n as _ } from "./utils-DxRR_XLb.js";
-var G = class extends B {
+var G = class extends H {
   constructor(e, t) {
-    super(), this.options = t, this.#s = e, this.#r = null, this.#i = U(), this.options.experimental_prefetchInRender || this.#i.reject(
+    super(), this.options = t, this.#s = e, this.#i = null, this.#r = M(), this.options.experimental_prefetchInRender || this.#r.reject(
       new Error("experimental_prefetchInRender feature flag is not enabled")
     ), this.bindMethods(), this.setOptions(t);
   }
@@ -15,8 +14,8 @@ var G = class extends B {
   #t = void 0;
   #a;
   #c;
-  #i;
   #r;
+  #i;
   #y;
   #l;
   // This property keeps track of the last query with defined data.
@@ -36,14 +35,14 @@ var G = class extends B {
     this.hasListeners() || this.destroy();
   }
   shouldFetchOnReconnect() {
-    return T(
+    return I(
       this.#e,
       this.options,
       this.options.refetchOnReconnect
     );
   }
   shouldFetchOnWindowFocus() {
-    return T(
+    return I(
       this.#e,
       this.options,
       this.options.refetchOnWindowFocus
@@ -58,20 +57,20 @@ var G = class extends B {
       throw new Error(
         "Expected enabled to be a boolean or a callback that returns a boolean"
       );
-    this.#C(), this.#e.setOptions(this.options), t._defaulted && !w(this.options, t) && this.#s.getQueryCache().notify({
+    this.#C(), this.#e.setOptions(this.options), t._defaulted && !E(this.options, t) && this.#s.getQueryCache().notify({
       type: "observerOptionsUpdated",
       query: this.#e,
       observer: this
     });
     const r = this.hasListeners();
-    r && L(
+    r && A(
       this.#e,
       s,
       this.options,
       t
-    ) && this.#u(), this.updateResult(), r && (this.#e !== s || f(this.options.enabled, this.#e) !== f(t.enabled, this.#e) || O(this.options.staleTime, this.#e) !== O(t.staleTime, this.#e)) && this.#b();
-    const a = this.#m();
-    r && (this.#e !== s || f(this.options.enabled, this.#e) !== f(t.enabled, this.#e) || a !== this.#n) && this.#g(a);
+    ) && this.#u(), this.updateResult(), r && (this.#e !== s || f(this.options.enabled, this.#e) !== f(t.enabled, this.#e) || R(this.options.staleTime, this.#e) !== R(t.staleTime, this.#e)) && this.#m();
+    const n = this.#b();
+    r && (this.#e !== s || f(this.options.enabled, this.#e) !== f(t.enabled, this.#e) || n !== this.#n) && this.#g(n);
   }
   getOptimisticResult(e) {
     const t = this.#s.getQueryCache().build(this.#s, e), s = this.createResult(t, e);
@@ -81,14 +80,9 @@ var G = class extends B {
     return this.#t;
   }
   trackResult(e, t) {
-    const s = {};
-    return Object.keys(e).forEach((r) => {
-      Object.defineProperty(s, r, {
-        configurable: !1,
-        enumerable: !0,
-        get: () => (this.trackProp(r), t?.(r), e[r])
-      });
-    }), s;
+    return new Proxy(e, {
+      get: (s, r) => (this.trackProp(r), t?.(r), Reflect.get(s, r))
+    });
   }
   trackProp(e) {
     this.#f.add(e);
@@ -117,31 +111,31 @@ var G = class extends B {
       this.options,
       e
     );
-    return e?.throwOnError || (t = t.catch(H)), t;
+    return e?.throwOnError || (t = t.catch(Q)), t;
   }
-  #b() {
+  #m() {
     this.#v();
-    const e = O(
+    const e = R(
       this.options.staleTime,
       this.#e
     );
-    if (Q || this.#t.isStale || !k(e))
+    if (T || this.#t.isStale || !_(e))
       return;
     const s = N(this.#t.dataUpdatedAt, e) + 1;
     this.#o = setTimeout(() => {
       this.#t.isStale || this.updateResult();
     }, s);
   }
-  #m() {
+  #b() {
     return (typeof this.options.refetchInterval == "function" ? this.options.refetchInterval(this.#e) : this.options.refetchInterval) ?? !1;
   }
   #g(e) {
-    this.#O(), this.#n = e, !(Q || f(this.options.enabled, this.#e) === !1 || !k(this.#n) || this.#n === 0) && (this.#h = setInterval(() => {
+    this.#O(), this.#n = e, !(T || f(this.options.enabled, this.#e) === !1 || !_(this.#n) || this.#n === 0) && (this.#h = setInterval(() => {
       (this.options.refetchIntervalInBackground || V.isFocused()) && this.#u();
     }, this.#n));
   }
   #R() {
-    this.#b(), this.#g(this.#m());
+    this.#m(), this.#g(this.#b());
   }
   #v() {
     this.#o && (clearTimeout(this.#o), this.#o = void 0);
@@ -150,90 +144,82 @@ var G = class extends B {
     this.#h && (clearInterval(this.#h), this.#h = void 0);
   }
   createResult(e, t) {
-    const s = this.#e, r = this.options, a = this.#t, c = this.#a, i = this.#c, o = e !== s ? e.state : this.#p, { state: l } = e;
-    let n = { ...l }, R = !1, u;
+    const s = this.#e, r = this.options, n = this.#t, u = this.#a, i = this.#c, o = e !== s ? e.state : this.#p, { state: l } = e;
+    let a = { ...l }, g = !1, h;
     if (t._optimisticResults) {
-      const h = this.hasListeners(), m = !h && j(e, t), g = h && L(e, s, t, r);
-      (m || g) && (n = {
-        ...n,
-        ...W(l.data, e.options)
-      }), t._optimisticResults === "isRestoring" && (n.fetchStatus = "idle");
+      const c = this.hasListeners(), v = !c && j(e, t), b = c && A(e, s, t, r);
+      (v || b) && (a = {
+        ...a,
+        ...K(l.data, e.options)
+      }), t._optimisticResults === "isRestoring" && (a.fetchStatus = "idle");
     }
-    let { error: F, errorUpdatedAt: x, status: p } = n;
-    if (t.select && n.data !== void 0)
-      if (a && n.data === c?.data && t.select === this.#y)
-        u = this.#l;
-      else
-        try {
-          this.#y = t.select, u = t.select(n.data), u = M(a?.data, u, t), this.#l = u, this.#r = null;
-        } catch (h) {
-          this.#r = h;
-        }
-    else
-      u = n.data;
-    if (t.placeholderData !== void 0 && u === void 0 && p === "pending") {
-      let h;
-      if (a?.isPlaceholderData && t.placeholderData === i?.placeholderData)
-        h = a.data;
-      else if (h = typeof t.placeholderData == "function" ? t.placeholderData(
+    let { error: x, errorUpdatedAt: D, status: p } = a;
+    h = a.data;
+    let P = !1;
+    if (t.placeholderData !== void 0 && h === void 0 && p === "pending") {
+      let c;
+      n?.isPlaceholderData && t.placeholderData === i?.placeholderData ? (c = n.data, P = !0) : c = typeof t.placeholderData == "function" ? t.placeholderData(
         this.#d?.state.data,
         this.#d
-      ) : t.placeholderData, t.select && h !== void 0)
-        try {
-          h = t.select(h), this.#r = null;
-        } catch (m) {
-          this.#r = m;
-        }
-      h !== void 0 && (p = "success", u = M(
-        a?.data,
-        h,
+      ) : t.placeholderData, c !== void 0 && (p = "success", h = L(
+        n?.data,
+        c,
         t
-      ), R = !0);
+      ), g = !0);
     }
-    this.#r && (F = this.#r, u = this.#l, x = Date.now(), p = "error");
-    const C = n.fetchStatus === "fetching", S = p === "pending", E = p === "error", D = S && C, P = u !== void 0, d = {
+    if (t.select && h !== void 0 && !P)
+      if (n && h === u?.data && t.select === this.#y)
+        h = this.#l;
+      else
+        try {
+          this.#y = t.select, h = t.select(h), h = L(n?.data, h, t), this.#l = h, this.#i = null;
+        } catch (c) {
+          this.#i = c;
+        }
+    this.#i && (x = this.#i, h = this.#l, D = Date.now(), p = "error");
+    const C = a.fetchStatus === "fetching", S = p === "pending", w = p === "error", U = S && C, k = h !== void 0, d = {
       status: p,
-      fetchStatus: n.fetchStatus,
+      fetchStatus: a.fetchStatus,
       isPending: S,
       isSuccess: p === "success",
-      isError: E,
-      isInitialLoading: D,
-      isLoading: D,
-      data: u,
-      dataUpdatedAt: n.dataUpdatedAt,
-      error: F,
-      errorUpdatedAt: x,
-      failureCount: n.fetchFailureCount,
-      failureReason: n.fetchFailureReason,
-      errorUpdateCount: n.errorUpdateCount,
-      isFetched: n.dataUpdateCount > 0 || n.errorUpdateCount > 0,
-      isFetchedAfterMount: n.dataUpdateCount > o.dataUpdateCount || n.errorUpdateCount > o.errorUpdateCount,
+      isError: w,
+      isInitialLoading: U,
+      isLoading: U,
+      data: h,
+      dataUpdatedAt: a.dataUpdatedAt,
+      error: x,
+      errorUpdatedAt: D,
+      failureCount: a.fetchFailureCount,
+      failureReason: a.fetchFailureReason,
+      errorUpdateCount: a.errorUpdateCount,
+      isFetched: a.dataUpdateCount > 0 || a.errorUpdateCount > 0,
+      isFetchedAfterMount: a.dataUpdateCount > o.dataUpdateCount || a.errorUpdateCount > o.errorUpdateCount,
       isFetching: C,
       isRefetching: C && !S,
-      isLoadingError: E && !P,
-      isPaused: n.fetchStatus === "paused",
-      isPlaceholderData: R,
-      isRefetchError: E && P,
-      isStale: I(e, t),
+      isLoadingError: w && !k,
+      isPaused: a.fetchStatus === "paused",
+      isPlaceholderData: g,
+      isRefetchError: w && k,
+      isStale: F(e, t),
       refetch: this.refetch,
-      promise: this.#i
+      promise: this.#r
     };
     if (this.options.experimental_prefetchInRender) {
-      const h = (v) => {
-        d.status === "error" ? v.reject(d.error) : d.data !== void 0 && v.resolve(d.data);
-      }, m = () => {
-        const v = this.#i = d.promise = U();
-        h(v);
-      }, g = this.#i;
-      switch (g.status) {
+      const c = (O) => {
+        d.status === "error" ? O.reject(d.error) : d.data !== void 0 && O.resolve(d.data);
+      }, v = () => {
+        const O = this.#r = d.promise = M();
+        c(O);
+      }, b = this.#r;
+      switch (b.status) {
         case "pending":
-          e.queryHash === s.queryHash && h(g);
+          e.queryHash === s.queryHash && c(b);
           break;
         case "fulfilled":
-          (d.status === "error" || d.data !== g.value) && m();
+          (d.status === "error" || d.data !== b.value) && v();
           break;
         case "rejected":
-          (d.status !== "error" || d.error !== g.reason) && m();
+          (d.status !== "error" || d.error !== b.reason) && v();
           break;
       }
     }
@@ -241,21 +227,21 @@ var G = class extends B {
   }
   updateResult() {
     const e = this.#t, t = this.createResult(this.#e, this.options);
-    if (this.#a = this.#e.state, this.#c = this.options, this.#a.data !== void 0 && (this.#d = this.#e), w(t, e))
+    if (this.#a = this.#e.state, this.#c = this.options, this.#a.data !== void 0 && (this.#d = this.#e), E(t, e))
       return;
     this.#t = t;
     const s = () => {
       if (!e)
         return !0;
-      const { notifyOnChangeProps: r } = this.options, a = typeof r == "function" ? r() : r;
-      if (a === "all" || !a && !this.#f.size)
+      const { notifyOnChangeProps: r } = this.options, n = typeof r == "function" ? r() : r;
+      if (n === "all" || !n && !this.#f.size)
         return !0;
-      const c = new Set(
-        a ?? this.#f
+      const u = new Set(
+        n ?? this.#f
       );
-      return this.options.throwOnError && c.add("error"), Object.keys(this.#t).some((i) => {
-        const b = i;
-        return this.#t[b] !== e[b] && c.has(b);
+      return this.options.throwOnError && u.add("error"), Object.keys(this.#t).some((i) => {
+        const m = i;
+        return this.#t[m] !== e[m] && u.has(m);
       });
     };
     this.#S({ listeners: s() });
@@ -271,7 +257,7 @@ var G = class extends B {
     this.updateResult(), this.hasListeners() && this.#R();
   }
   #S(e) {
-    A.batch(() => {
+    q.batch(() => {
       e.listeners && this.listeners.forEach((t) => {
         t(this.#t);
       }), this.#s.getQueryCache().notify({
@@ -285,23 +271,23 @@ function J(e, t) {
   return f(t.enabled, e) !== !1 && e.state.data === void 0 && !(e.state.status === "error" && t.retryOnMount === !1);
 }
 function j(e, t) {
-  return J(e, t) || e.state.data !== void 0 && T(e, t, t.refetchOnMount);
+  return J(e, t) || e.state.data !== void 0 && I(e, t, t.refetchOnMount);
 }
-function T(e, t, s) {
-  if (f(t.enabled, e) !== !1) {
+function I(e, t, s) {
+  if (f(t.enabled, e) !== !1 && R(t.staleTime, e) !== "static") {
     const r = typeof s == "function" ? s(e) : s;
-    return r === "always" || r !== !1 && I(e, t);
+    return r === "always" || r !== !1 && F(e, t);
   }
   return !1;
 }
-function L(e, t, s, r) {
-  return (e !== t || f(r.enabled, e) === !1) && (!s.suspense || e.state.status !== "error") && I(e, s);
+function A(e, t, s, r) {
+  return (e !== t || f(r.enabled, e) === !1) && (!s.suspense || e.state.status !== "error") && F(e, s);
 }
-function I(e, t) {
-  return f(t.enabled, e) !== !1 && e.isStaleByTime(O(t.staleTime, e));
+function F(e, t) {
+  return f(t.enabled, e) !== !1 && e.isStaleByTime(R(t.staleTime, e));
 }
 function X(e, t) {
-  return !w(e.getCurrentResult(), t);
+  return !E(e.getCurrentResult(), t);
 }
 function Y() {
   let e = !1;
@@ -326,11 +312,13 @@ var Z = y.createContext(Y()), ee = () => y.useContext(Z), te = (e, t) => {
   errorResetBoundary: t,
   throwOnError: s,
   query: r,
-  suspense: a
-}) => e.isError && !t.isReset() && !e.isFetching && r && (a && e.data === void 0 || K(s, [e.error, r])), ie = (e) => {
-  const t = e.staleTime;
-  e.suspense && (e.staleTime = typeof t == "function" ? (...s) => Math.max(t(...s), 1e3) : Math.max(t ?? 1e3, 1e3), typeof e.gcTime == "number" && (e.gcTime = Math.max(e.gcTime, 1e3)));
-}, ne = (e, t) => e.isLoading && e.isFetching && !t, ae = (e, t) => e?.suspense && t.isPending, q = (e, t, s) => t.fetchOptimistic(e).catch(() => {
+  suspense: n
+}) => e.isError && !t.isReset() && !e.isFetching && r && (n && e.data === void 0 || z(s, [e.error, r])), ie = (e) => {
+  if (e.suspense) {
+    const t = (r) => r === "static" ? r : Math.max(r ?? 1e3, 1e3), s = e.staleTime;
+    e.staleTime = typeof s == "function" ? (...r) => t(s(...r)) : t(s), typeof e.gcTime == "number" && (e.gcTime = Math.max(e.gcTime, 1e3));
+  }
+}, ne = (e, t) => e.isLoading && e.isFetching && !t, ae = (e, t) => e?.suspense && t.isPending, B = (e, t, s) => t.fetchOptimistic(e).catch(() => {
   s.clearReset();
 });
 function oe(e, t, s) {
@@ -338,58 +326,58 @@ function oe(e, t, s) {
     throw new Error(
       'Bad argument type. Starting with v5, only the "Object" form is allowed when calling query related functions. Please use the error stack to find the culprit call. More info here: https://tanstack.com/query/latest/docs/react/guides/migrating-to-v5#supports-a-single-signature-one-object'
     );
-  const r = z(s), a = $(), c = ee(), i = r.defaultQueryOptions(e);
-  r.getDefaultOptions().queries?._experimental_beforeQuery?.(
+  const r = $(), n = ee(), u = W(s), i = u.defaultQueryOptions(e);
+  u.getDefaultOptions().queries?._experimental_beforeQuery?.(
     i
   ), process.env.NODE_ENV !== "production" && (i.queryFn || console.error(
     `[${i.queryHash}]: No queryFn was passed as an option, and no default queryFn was found. The queryFn parameter is only optional when using a default queryFn. More info here: https://tanstack.com/query/latest/docs/framework/react/guides/default-query-function`
-  )), i._optimisticResults = a ? "isRestoring" : "optimistic", ie(i), te(i, c), se(c);
-  const b = !r.getQueryCache().get(i.queryHash), [o] = y.useState(
+  )), i._optimisticResults = r ? "isRestoring" : "optimistic", ie(i), te(i, n), se(n);
+  const m = !u.getQueryCache().get(i.queryHash), [o] = y.useState(
     () => new t(
-      r,
+      u,
       i
     )
-  ), l = o.getOptimisticResult(i), n = !a && e.subscribed !== !1;
+  ), l = o.getOptimisticResult(i), a = !r && e.subscribed !== !1;
   if (y.useSyncExternalStore(
     y.useCallback(
-      (R) => {
-        const u = n ? o.subscribe(A.batchCalls(R)) : _;
-        return o.updateResult(), u;
+      (g) => {
+        const h = a ? o.subscribe(q.batchCalls(g)) : Q;
+        return o.updateResult(), h;
       },
-      [o, n]
+      [o, a]
     ),
     () => o.getCurrentResult(),
     () => o.getCurrentResult()
   ), y.useEffect(() => {
     o.setOptions(i);
   }, [i, o]), ae(i, l))
-    throw q(i, o, c);
+    throw B(i, o, n);
   if (re({
     result: l,
-    errorResetBoundary: c,
+    errorResetBoundary: n,
     throwOnError: i.throwOnError,
-    query: r.getQueryCache().get(i.queryHash),
+    query: u.getQueryCache().get(i.queryHash),
     suspense: i.suspense
   }))
     throw l.error;
-  return r.getDefaultOptions().queries?._experimental_afterQuery?.(
+  return u.getDefaultOptions().queries?._experimental_afterQuery?.(
     i,
     l
-  ), i.experimental_prefetchInRender && !Q && ne(l, a) && (b ? (
+  ), i.experimental_prefetchInRender && !T && ne(l, r) && (m ? (
     // Fetch immediately on render in order to ensure `.promise` is resolved even if the component is unmounted
-    q(i, o, c)
+    B(i, o, n)
   ) : (
     // subscribe to the "cache promise" so that we can finalize the currentThenable once data comes in
-    r.getQueryCache().get(i.queryHash)?.promise
-  ))?.catch(_).finally(() => {
+    u.getQueryCache().get(i.queryHash)?.promise
+  ))?.catch(Q).finally(() => {
     o.updateResult();
   }), i.notifyOnChangeProps ? l : o.trackResult(l);
 }
-function fe(e, t) {
+function de(e, t) {
   return oe(e, G, t);
 }
 export {
   G as Q,
   oe as a,
-  fe as u
+  de as u
 };

package/dist/utils/helper.js

@@ -25,7 +25,7 @@ const g = /^[v^~<>=]*?(\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+))?(?:-([
 }, a = (r, e) => {
   const t = c(r), n = c(e), o = t.pop(), i = n.pop(), s = p(t, n);
   return s !== 0 ? s : o && i ? p(o.split("."), i.split(".")) : o || i ? o ? -1 : 1 : 0;
-}, d = "0.0.13100-beta", w = (r) => m.every((e) => y(e, r)), y = (r, e) => {
+}, d = "0.0.13101-beta", w = (r) => m.every((e) => y(e, r)), y = (r, e) => {
   if (!e[r]) {
     if (e.throwError)
       return e.throwError(`Missing required prop: ${r}`, 404), !1;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hortiview/modulebase",
   "description": "This is a base module for hortiview",
-  "version": "0.0.13101-beta",
+  "version": "0.0.13102-beta",
   "type": "module",
   "author": "Falk Menge <falk.menge.ext@bayer.com>",
   "contributors": [