@hortiview/modulebase 0.0.20524 → 1.0.1

package/dist/{useQuery-DEU_AUtf.js → useQuery-jyZ1SNKl.js}

@@ -1,8 +1,8 @@
-import { S as z, p as L, d as l, s as M, f as v, a as Q, j as _, k as j, t as K, l as w, m as $, r as A, n as W, b as q, u as G } from "./QueryClientProvider-DyiNrPkn.js";
-import { f as J, u as X } from "./IsRestoringProvider-CBSZo7ur.js";
+import { S as q, p as L, d as u, s as M, f as y, a as Q, j as _, k as j, t as K, l as w, m as $, r as B, n as W, b as z, u as G } from "./QueryClientProvider-CTj9TWgb.js";
+import { f as J, u as X } from "./IsRestoringProvider-D5gAh2bq.js";
 import * as m from "react";
 import "react/jsx-runtime";
-var Y = class extends z {
+var Y = class extends q {
   constructor(t, e) {
     super(), this.options = e, this.#s = t, this.#i = null, this.#r = L(), this.bindMethods(), this.setOptions(e);
   }
@@ -10,7 +10,7 @@ var Y = class extends z {
   #t = void 0;
   #p = void 0;
   #e = void 0;
-  #n;
+  #a;
   #u;
   #r;
   #i;
@@ -21,13 +21,13 @@ var Y = class extends z {
   #d;
   #o;
   #h;
-  #a;
+  #n;
   #f = /* @__PURE__ */ new Set();
   bindMethods() {
     this.refetch = this.refetch.bind(this);
   }
   onSubscribe() {
-    this.listeners.size === 1 && (this.#t.addObserver(this), B(this.#t, this.options) ? this.#c() : this.updateResult(), this.#v());
+    this.listeners.size === 1 && (this.#t.addObserver(this), A(this.#t, this.options) ? this.#c() : this.updateResult(), this.#y());
   }
   onUnsubscribe() {
     this.hasListeners() || this.destroy();
@@ -51,11 +51,11 @@ var Y = class extends z {
   }
   setOptions(t) {
     const e = this.options, s = this.#t;
-    if (this.options = this.#s.defaultQueryOptions(t), this.options.enabled !== void 0 && typeof this.options.enabled != "boolean" && typeof this.options.enabled != "function" && typeof l(this.options.enabled, this.#t) != "boolean")
+    if (this.options = this.#s.defaultQueryOptions(t), this.options.enabled !== void 0 && typeof this.options.enabled != "boolean" && typeof this.options.enabled != "function" && typeof u(this.options.enabled, this.#t) != "boolean")
       throw new Error(
         "Expected enabled to be a boolean or a callback that returns a boolean"
       );
-    this.#E(), this.#t.setOptions(this.options), e._defaulted && !M(this.options, e) && this.#s.getQueryCache().notify({
+    this.#O(), this.#t.setOptions(this.options), e._defaulted && !M(this.options, e) && this.#s.getQueryCache().notify({
       type: "observerOptionsUpdated",
       query: this.#t,
       observer: this
@@ -66,13 +66,13 @@ var Y = class extends z {
       s,
       this.options,
       e
-    ) && this.#c(), this.updateResult(), r && (this.#t !== s || l(this.options.enabled, this.#t) !== l(e.enabled, this.#t) || v(this.options.staleTime, this.#t) !== v(e.staleTime, this.#t)) && this.#b();
-    const i = this.#y();
-    r && (this.#t !== s || l(this.options.enabled, this.#t) !== l(e.enabled, this.#t) || i !== this.#a) && this.#g(i);
+    ) && this.#c(), this.updateResult(), r && (this.#t !== s || u(this.options.enabled, this.#t) !== u(e.enabled, this.#t) || y(this.options.staleTime, this.#t) !== y(e.staleTime, this.#t)) && this.#v();
+    const i = this.#b();
+    r && (this.#t !== s || u(this.options.enabled, this.#t) !== u(e.enabled, this.#t) || i !== this.#n) && this.#g(i);
   }
   getOptimisticResult(t) {
     const e = this.#s.getQueryCache().build(this.#s, t), s = this.createResult(e, t);
-    return tt(this, s) && (this.#e = s, this.#u = this.options, this.#n = this.#t.state), s;
+    return tt(this, s) && (this.#e = s, this.#u = this.options, this.#a = this.#t.state), s;
   }
   getCurrentResult() {
     return this.#e;
@@ -108,121 +108,121 @@ var Y = class extends z {
     }).then(() => (this.updateResult(), this.#e));
   }
   #c(t) {
-    this.#E();
+    this.#O();
     let e = this.#t.fetch(
       this.options,
       t
     );
     return t?.throwOnError || (e = e.catch(Q)), e;
   }
-  #b() {
+  #v() {
     this.#R();
-    const t = v(
+    const t = y(
       this.options.staleTime,
       this.#t
     );
-    if (_ || this.#e.isStale || !j(t))
+    if (_.isServer() || this.#e.isStale || !j(t))
       return;
     const s = K(this.#e.dataUpdatedAt, t) + 1;
     this.#o = w.setTimeout(() => {
       this.#e.isStale || this.updateResult();
     }, s);
   }
-  #y() {
+  #b() {
     return (typeof this.options.refetchInterval == "function" ? this.options.refetchInterval(this.#t) : this.options.refetchInterval) ?? !1;
   }
   #g(t) {
-    this.#S(), this.#a = t, !(_ || l(this.options.enabled, this.#t) === !1 || !j(this.#a) || this.#a === 0) && (this.#h = w.setInterval(() => {
+    this.#S(), this.#n = t, !(_.isServer() || u(this.options.enabled, this.#t) === !1 || !j(this.#n) || this.#n === 0) && (this.#h = w.setInterval(() => {
       (this.options.refetchIntervalInBackground || $.isFocused()) && this.#c();
-    }, this.#a));
+    }, this.#n));
   }
-  #v() {
-    this.#b(), this.#g(this.#y());
+  #y() {
+    this.#v(), this.#g(this.#b());
   }
   #R() {
-    this.#o && (w.clearTimeout(this.#o), this.#o = void 0);
+    this.#o !== void 0 && (w.clearTimeout(this.#o), this.#o = void 0);
   }
   #S() {
-    this.#h && (w.clearInterval(this.#h), this.#h = void 0);
+    this.#h !== void 0 && (w.clearInterval(this.#h), this.#h = void 0);
   }
   createResult(t, e) {
-    const s = this.#t, r = this.options, i = this.#e, u = this.#n, a = this.#u, b = t !== s ? t.state : this.#p, { state: h } = t;
-    let n = { ...h }, y = !1, o;
+    const s = this.#t, r = this.options, i = this.#e, l = this.#a, n = this.#u, v = t !== s ? t.state : this.#p, { state: h } = t;
+    let a = { ...h }, b = !1, o;
     if (e._optimisticResults) {
-      const c = this.hasListeners(), g = !c && B(t, e), S = c && H(t, s, e, r);
-      (g || S) && (n = {
-        ...n,
+      const c = this.hasListeners(), g = !c && A(t, e), S = c && H(t, s, e, r);
+      (g || S) && (a = {
+        ...a,
         ...J(h.data, t.options)
-      }), e._optimisticResults === "isRestoring" && (n.fetchStatus = "idle");
+      }), e._optimisticResults === "isRestoring" && (a.fetchStatus = "idle");
     }
-    let { error: R, errorUpdatedAt: x, status: p } = n;
-    o = n.data;
-    let U = !1;
+    let { error: R, errorUpdatedAt: x, status: p } = a;
+    o = a.data;
+    let D = !1;
     if (e.placeholderData !== void 0 && o === void 0 && p === "pending") {
       let c;
-      i?.isPlaceholderData && e.placeholderData === a?.placeholderData ? (c = i.data, U = !0) : c = typeof e.placeholderData == "function" ? e.placeholderData(
+      i?.isPlaceholderData && e.placeholderData === n?.placeholderData ? (c = i.data, D = !0) : c = typeof e.placeholderData == "function" ? e.placeholderData(
         this.#d?.state.data,
         this.#d
-      ) : e.placeholderData, c !== void 0 && (p = "success", o = A(
+      ) : e.placeholderData, c !== void 0 && (p = "success", o = B(
         i?.data,
         c,
         e
-      ), y = !0);
+      ), b = !0);
     }
-    if (e.select && o !== void 0 && !U)
-      if (i && o === u?.data && e.select === this.#m)
+    if (e.select && o !== void 0 && !D)
+      if (i && o === l?.data && e.select === this.#m)
         o = this.#l;
       else
         try {
-          this.#m = e.select, o = e.select(o), o = A(i?.data, o, e), this.#l = o, this.#i = null;
+          this.#m = e.select, o = e.select(o), o = B(i?.data, o, e), this.#l = o, this.#i = null;
         } catch (c) {
           this.#i = c;
         }
     this.#i && (R = this.#i, o = this.#l, x = Date.now(), p = "error");
-    const C = n.fetchStatus === "fetching", I = p === "pending", T = p === "error", D = I && C, k = o !== void 0, f = {
+    const C = a.fetchStatus === "fetching", I = p === "pending", T = p === "error", U = I && C, k = o !== void 0, f = {
       status: p,
-      fetchStatus: n.fetchStatus,
+      fetchStatus: a.fetchStatus,
       isPending: I,
       isSuccess: p === "success",
       isError: T,
-      isInitialLoading: D,
-      isLoading: D,
+      isInitialLoading: U,
+      isLoading: U,
       data: o,
-      dataUpdatedAt: n.dataUpdatedAt,
+      dataUpdatedAt: a.dataUpdatedAt,
       error: R,
       errorUpdatedAt: x,
-      failureCount: n.fetchFailureCount,
-      failureReason: n.fetchFailureReason,
-      errorUpdateCount: n.errorUpdateCount,
-      isFetched: n.dataUpdateCount > 0 || n.errorUpdateCount > 0,
-      isFetchedAfterMount: n.dataUpdateCount > b.dataUpdateCount || n.errorUpdateCount > b.errorUpdateCount,
+      failureCount: a.fetchFailureCount,
+      failureReason: a.fetchFailureReason,
+      errorUpdateCount: a.errorUpdateCount,
+      isFetched: t.isFetched(),
+      isFetchedAfterMount: a.dataUpdateCount > v.dataUpdateCount || a.errorUpdateCount > v.errorUpdateCount,
       isFetching: C,
       isRefetching: C && !I,
       isLoadingError: T && !k,
-      isPaused: n.fetchStatus === "paused",
-      isPlaceholderData: y,
+      isPaused: a.fetchStatus === "paused",
+      isPlaceholderData: b,
       isRefetchError: T && k,
       isStale: P(t, e),
       refetch: this.refetch,
       promise: this.#r,
-      isEnabled: l(e.enabled, t) !== !1
+      isEnabled: u(e.enabled, t) !== !1
     };
     if (this.options.experimental_prefetchInRender) {
-      const c = f.data !== void 0, g = f.status === "error" && !c, S = (O) => {
-        g ? O.reject(f.error) : c && O.resolve(f.data);
+      const c = f.data !== void 0, g = f.status === "error" && !c, S = (E) => {
+        g ? E.reject(f.error) : c && E.resolve(f.data);
       }, N = () => {
-        const O = this.#r = f.promise = L();
-        S(O);
-      }, E = this.#r;
-      switch (E.status) {
+        const E = this.#r = f.promise = L();
+        S(E);
+      }, O = this.#r;
+      switch (O.status) {
         case "pending":
-          t.queryHash === s.queryHash && S(E);
+          t.queryHash === s.queryHash && S(O);
           break;
         case "fulfilled":
-          (g || f.data !== E.value) && N();
+          (g || f.data !== O.value) && N();
           break;
         case "rejected":
-          (!g || f.error !== E.reason) && N();
+          (!g || f.error !== O.reason) && N();
           break;
       }
     }
@@ -230,7 +230,7 @@ var Y = class extends z {
   }
   updateResult() {
     const t = this.#e, e = this.createResult(this.#t, this.options);
-    if (this.#n = this.#t.state, this.#u = this.options, this.#n.data !== void 0 && (this.#d = this.#t), M(e, t))
+    if (this.#a = this.#t.state, this.#u = this.options, this.#a.data !== void 0 && (this.#d = this.#t), M(e, t))
       return;
     this.#e = e;
     const s = () => {
@@ -239,17 +239,17 @@ var Y = class extends z {
       const { notifyOnChangeProps: r } = this.options, i = typeof r == "function" ? r() : r;
       if (i === "all" || !i && !this.#f.size)
         return !0;
-      const u = new Set(
+      const l = new Set(
         i ?? this.#f
       );
-      return this.options.throwOnError && u.add("error"), Object.keys(this.#e).some((a) => {
-        const d = a;
-        return this.#e[d] !== t[d] && u.has(d);
+      return this.options.throwOnError && l.add("error"), Object.keys(this.#e).some((n) => {
+        const d = n;
+        return this.#e[d] !== t[d] && l.has(d);
       });
     };
-    this.#O({ listeners: s() });
+    this.#E({ listeners: s() });
   }
-  #E() {
+  #O() {
     const t = this.#s.getQueryCache().build(this.#s, this.options);
     if (t === this.#t)
       return;
@@ -257,9 +257,9 @@ var Y = class extends z {
     this.#t = t, this.#p = t.state, this.hasListeners() && (e?.removeObserver(this), t.addObserver(this));
   }
   onQueryUpdate() {
-    this.updateResult(), this.hasListeners() && this.#v();
+    this.updateResult(), this.hasListeners() && this.#y();
   }
-  #O(t) {
+  #E(t) {
     W.batch(() => {
       t.listeners && this.listeners.forEach((e) => {
         e(this.#e);
@@ -271,23 +271,23 @@ var Y = class extends z {
   }
 };
 function Z(t, e) {
-  return l(e.enabled, t) !== !1 && t.state.data === void 0 && !(t.state.status === "error" && e.retryOnMount === !1);
+  return u(e.enabled, t) !== !1 && t.state.data === void 0 && !(t.state.status === "error" && u(e.retryOnMount, t) === !1);
 }
-function B(t, e) {
+function A(t, e) {
   return Z(t, e) || t.state.data !== void 0 && F(t, e, e.refetchOnMount);
 }
 function F(t, e, s) {
-  if (l(e.enabled, t) !== !1 && v(e.staleTime, t) !== "static") {
+  if (u(e.enabled, t) !== !1 && y(e.staleTime, t) !== "static") {
     const r = typeof s == "function" ? s(t) : s;
     return r === "always" || r !== !1 && P(t, e);
   }
   return !1;
 }
 function H(t, e, s, r) {
-  return (t !== e || l(r.enabled, t) === !1) && (!s.suspense || t.state.status !== "error") && P(t, s);
+  return (t !== e || u(r.enabled, t) === !1) && (!s.suspense || t.state.status !== "error") && P(t, s);
 }
 function P(t, e) {
-  return l(e.enabled, t) !== !1 && t.isStaleByTime(v(e.staleTime, t));
+  return u(e.enabled, t) !== !1 && t.isStaleByTime(y(e.staleTime, t));
 }
 function tt(t, e) {
   return !M(t.getCurrentResult(), e);
@@ -305,19 +305,19 @@ function et() {
   };
 }
 var st = m.createContext(et()), rt = () => m.useContext(st), it = (t, e, s) => {
-  const r = s?.state.error && typeof t.throwOnError == "function" ? q(t.throwOnError, [s.state.error, s]) : t.throwOnError;
+  const r = s?.state.error && typeof t.throwOnError == "function" ? z(t.throwOnError, [s.state.error, s]) : t.throwOnError;
   (t.suspense || t.experimental_prefetchInRender || r) && (e.isReset() || (t.retryOnMount = !1));
-}, at = (t) => {
+}, nt = (t) => {
   m.useEffect(() => {
     t.clearReset();
   }, [t]);
-}, nt = ({
+}, at = ({
   result: t,
   errorResetBoundary: e,
   throwOnError: s,
   query: r,
   suspense: i
-}) => t.isError && !e.isReset() && !t.isFetching && r && (i && t.data === void 0 || q(s, [t.error, r])), ot = (t) => {
+}) => t.isError && !e.isReset() && !t.isFetching && r && (i && t.data === void 0 || z(s, [t.error, r])), ot = (t) => {
   if (t.suspense) {
     const s = (i) => i === "static" ? i : Math.max(i ?? 1e3, 1e3), r = t.staleTime;
     t.staleTime = typeof r == "function" ? (...i) => s(r(...i)) : s(r), typeof t.gcTime == "number" && (t.gcTime = Math.max(
@@ -333,54 +333,54 @@ function ut(t, e, 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 = X(), i = rt(), u = G(s), a = u.defaultQueryOptions(t);
-  u.getDefaultOptions().queries?._experimental_beforeQuery?.(
-    a
+  const r = X(), i = rt(), l = G(s), n = l.defaultQueryOptions(t);
+  l.getDefaultOptions().queries?._experimental_beforeQuery?.(
+    n
   );
-  const d = u.getQueryCache().get(a.queryHash);
-  process.env.NODE_ENV !== "production" && (a.queryFn || console.error(
-    `[${a.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`
-  )), a._optimisticResults = r ? "isRestoring" : "optimistic", ot(a), it(a, i, d), at(i);
-  const b = !u.getQueryCache().get(a.queryHash), [h] = m.useState(
+  const d = l.getQueryCache().get(n.queryHash);
+  process.env.NODE_ENV !== "production" && (n.queryFn || console.error(
+    `[${n.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`
+  )), n._optimisticResults = r ? "isRestoring" : "optimistic", ot(n), it(n, i, d), nt(i);
+  const v = !l.getQueryCache().get(n.queryHash), [h] = m.useState(
     () => new e(
-      u,
-      a
+      l,
+      n
     )
-  ), n = h.getOptimisticResult(a), y = !r && t.subscribed !== !1;
+  ), a = h.getOptimisticResult(n), b = !r && t.subscribed !== !1;
   if (m.useSyncExternalStore(
     m.useCallback(
       (o) => {
-        const R = y ? h.subscribe(W.batchCalls(o)) : Q;
+        const R = b ? h.subscribe(W.batchCalls(o)) : Q;
         return h.updateResult(), R;
       },
-      [h, y]
+      [h, b]
     ),
     () => h.getCurrentResult(),
     () => h.getCurrentResult()
   ), m.useEffect(() => {
-    h.setOptions(a);
-  }, [a, h]), ct(a, n))
-    throw V(a, h, i);
-  if (nt({
-    result: n,
+    h.setOptions(n);
+  }, [n, h]), ct(n, a))
+    throw V(n, h, i);
+  if (at({
+    result: a,
     errorResetBoundary: i,
-    throwOnError: a.throwOnError,
+    throwOnError: n.throwOnError,
     query: d,
-    suspense: a.suspense
+    suspense: n.suspense
   }))
-    throw n.error;
-  return u.getDefaultOptions().queries?._experimental_afterQuery?.(
-    a,
-    n
-  ), a.experimental_prefetchInRender && !_ && ht(n, r) && (b ? (
+    throw a.error;
+  return l.getDefaultOptions().queries?._experimental_afterQuery?.(
+    n,
+    a
+  ), n.experimental_prefetchInRender && !_.isServer() && ht(a, r) && (v ? (
     // Fetch immediately on render in order to ensure `.promise` is resolved even if the component is unmounted
-    V(a, h, i)
+    V(n, h, i)
   ) : (
     // subscribe to the "cache promise" so that we can finalize the currentThenable once data comes in
     d?.promise
   ))?.catch(Q).finally(() => {
     h.updateResult();
-  }), a.notifyOnChangeProps ? n : h.trackResult(n);
+  }), n.notifyOnChangeProps ? a : h.trackResult(a);
 }
 function mt(t, e) {
   return ut(t, Y, e);

package/dist/utils/helper.js

@@ -25,7 +25,7 @@ const g = /^[v^~<>=]*?(\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+))?(?:-([
 }, E = (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.20524", w = (r) => m.every((e) => y(e, r)), y = (r, e) => {
+}, d = "1.0.0", 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.20524",
+  "version": "1.0.1",
   "type": "module",
   "author": "Falk Menge <falk.menge.ext@bayer.com>",
   "contributors": [
@@ -25,41 +25,42 @@
     "tsCheck": "tsc --build --pretty --watch"
   },
   "dependencies": {
-    "@hortiview/default-components": "^1.2.1",
-    "@hortiview/shared-components": "^2.0.0",
-    "@microsoft/signalr": "^8.0.7",
-    "@tanstack/query-async-storage-persister": "^5.85.5",
-    "@tanstack/react-query": "^5.67.3",
-    "@tanstack/react-query-persist-client": "^5.85.5",
+    "@hortiview/default-components": "^1.5.3",
+    "@hortiview/shared-components": "^2.23.4",
+    "@microsoft/signalr": "^8.0.17",
+    "@tanstack/query-async-storage-persister": "^5.100.1",
+    "@tanstack/react-query": "^5.100.1",
+    "@tanstack/react-query-persist-client": "^5.100.1",
     "compare-versions": "^6.1.1",
     "idb-keyval": "^6.2.2",
-    "lodash": "^4.17.21",
+    "lodash": "^4.18.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router": "^7.1.5",
+    "react-router": "^7.14.2",
     "react-signalr": "^0.2.24",
-    "socket.io-client": "^4.8.1",
-    "vite-plugin-dts": "^4.5.0",
-    "vite-plugin-lib-inject-css": "^2.2.1",
-    "zustand": "^5.0.3"
+    "socket.io-client": "^4.8.3",
+    "vite-plugin-dts": "^4.5.4",
+    "vite-plugin-lib-inject-css": "^2.2.2",
+    "zustand": "^5.0.12"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/exec": "^7.1.0",
     "@semantic-release/git": "^10.0.1",
-    "@types/lodash": "^4.17.15",
-    "@types/node": "^22.10.7",
-    "@types/react": "^18.3.18",
-    "@types/react-dom": "^18.3.5",
-    "@vitejs/plugin-react": "^5.1.4",
-    "eslint": "^10.0.3",
-    "eslint-plugin-react-hooks": "^7.0.1",
+    "@types/lodash": "^4.17.24",
+    "@types/node": "^22.19.17",
+    "@types/react": "^18.3.28",
+    "@types/react-dom": "^18.3.7",
+    "@vitejs/plugin-react": "^5.2.0",
+    "conventional-changelog-conventionalcommits": "^9.3.1",
+    "eslint": "^10.2.1",
+    "eslint-plugin-react-hooks": "^7.1.1",
     "eslint-plugin-react-refresh": "^0.5.2",
     "glob": "^13.0.6",
-    "globals": "^17.4.0",
+    "globals": "^17.5.0",
     "typescript": "~5.9.3",
-    "typescript-eslint": "^8.18.2",
-    "vite": "^7.3.1"
+    "typescript-eslint": "^8.59.0",
+    "vite": "^7.3.2"
   }
 }