@hortiview/modulebase 0.0.13075 → 0.0.13179

package/dist/components/ModuleBase.js

@@ -1,29 +1,29 @@
-import { jsx as y } from "react/jsx-runtime";
-import { S as R, g as k, n as u, m as q, j as A, a as h, e as H, k as K, l as B, o as j, p as D, q as S, v as L, h as I, w as F, s as U, Q as V } from "../QueryClientProvider-Q_mWQTzQ.js";
-import { Q as W } from "../query-CRIVoEP7.js";
-import { M as X } from "../mutation-X73nm7Df.js";
-import { useState as $, useEffect as b } from "react";
-import { Y as z, h as Y, O as G, aU as J } from "../chunk-IR6S3I6Y-BmDdD3SP.js";
-import { REQUIRED_PROPS as Z } from "../constants.js";
-import { SignalRProvider as x } from "../provider/SignalR/SignalRProvider.js";
+import { jsx as f } from "react/jsx-runtime";
+import { S as N, g as H, n as u, m as q, j as D, a as h, e as R, k as j, l as V, o as L, p as A, q as S, v as W, h as C, w as F, s as _, Q as U } from "../QueryClientProvider-Q_mWQTzQ.js";
+import { Q as z } from "../query-CRIVoEP7.js";
+import { M as Y } from "../mutation-X73nm7Df.js";
+import { useState as T, useEffect as b } from "react";
+import { Y as G, h as J, O as X, aU as Z } from "../chunk-IR6S3I6Y-BmDdD3SP.js";
+import { SignalRProvider as $ } from "../provider/SignalR/SignalRProvider.js";
 import { useBasePropsStore as M } from "../stores/BasePropsStore.js";
-import { useEnvironmentStore as T } from "../stores/EnvironmentStore.js";
-var ee = class extends R {
+import { useEnvironmentStore as k } from "../stores/EnvironmentStore.js";
+import { getEnvironmentVariables as x, checkVersion as ee, arePropsValid as te } from "../utils/helper.js";
+var se = class extends N {
   constructor(e = {}) {
     super(), this.config = e, this.#e = /* @__PURE__ */ new Map();
   }
   #e;
   build(e, t, s) {
-    const r = t.queryKey, n = t.queryHash ?? k(r, t);
-    let i = this.get(n);
-    return i || (i = new W({
+    const r = t.queryKey, i = t.queryHash ?? H(r, t);
+    let a = this.get(i);
+    return a || (a = new z({
       client: e,
       queryKey: r,
-      queryHash: n,
+      queryHash: i,
       options: e.defaultQueryOptions(t),
       state: s,
       defaultOptions: e.getQueryDefaults(r)
-    }), this.add(i)), i;
+    }), this.add(a)), a;
   }
   add(e) {
     this.#e.has(e.queryHash) || (this.#e.set(e.queryHash, e), this.notify({
@@ -79,7 +79,7 @@ var ee = class extends R {
       });
     });
   }
-}, te = class extends R {
+}, re = class extends N {
   constructor(e = {}) {
     super(), this.config = e, this.#e = /* @__PURE__ */ new Set(), this.#t = /* @__PURE__ */ new Map(), this.#s = 0;
   }
@@ -87,7 +87,7 @@ var ee = class extends R {
   #t;
   #s;
   build(e, t, s) {
-    const r = new X({
+    const r = new Y({
       mutationCache: this,
       mutationId: ++this.#s,
       options: e.defaultMutationOptions(t),
@@ -122,7 +122,7 @@ var ee = class extends R {
     const t = O(e);
     if (typeof t == "string") {
       const r = this.#t.get(t)?.find(
-        (n) => n.state.status === "pending"
+        (i) => i.state.status === "pending"
       );
       return !r || r === e;
     } else
@@ -145,11 +145,11 @@ var ee = class extends R {
   find(e) {
     const t = { exact: !0, ...e };
     return this.getAll().find(
-      (s) => A(t, s)
+      (s) => D(t, s)
     );
   }
   findAll(e = {}) {
-    return this.getAll().filter((t) => A(e, t));
+    return this.getAll().filter((t) => D(e, t));
   }
   notify(e) {
     u.batch(() => {
@@ -170,60 +170,60 @@ var ee = class extends R {
 function O(e) {
   return e.options.scope?.id;
 }
-function C(e) {
+function I(e) {
   return {
     onFetch: (t, s) => {
-      const r = t.options, n = t.fetchOptions?.meta?.fetchMore?.direction, i = t.state.data?.pages || [], f = t.state.data?.pageParams || [];
-      let c = { pages: [], pageParams: [] }, d = 0;
-      const P = async () => {
+      const r = t.options, i = t.fetchOptions?.meta?.fetchMore?.direction, a = t.state.data?.pages || [], d = t.state.data?.pageParams || [];
+      let c = { pages: [], pageParams: [] }, y = 0;
+      const m = async () => {
         let g = !1;
-        const Q = (o) => {
-          Object.defineProperty(o, "signal", {
+        const p = (n) => {
+          Object.defineProperty(n, "signal", {
             enumerable: !0,
             get: () => (t.signal.aborted ? g = !0 : t.signal.addEventListener("abort", () => {
               g = !0;
             }), t.signal)
           });
-        }, a = H(t.options, t.fetchOptions), m = async (o, l, p) => {
+        }, Q = R(t.options, t.fetchOptions), P = async (n, o, l) => {
           if (g)
             return Promise.reject();
-          if (l == null && o.pages.length)
-            return Promise.resolve(o);
+          if (o == null && n.pages.length)
+            return Promise.resolve(n);
           const v = {
             client: t.client,
             queryKey: t.queryKey,
-            pageParam: l,
-            direction: p ? "backward" : "forward",
+            pageParam: o,
+            direction: l ? "backward" : "forward",
             meta: t.options.meta
           };
-          Q(v);
-          const _ = await a(
+          p(v);
+          const B = await Q(
             v
-          ), { maxPages: w } = t.options, E = p ? K : B;
+          ), { maxPages: w } = t.options, E = l ? j : V;
           return {
-            pages: E(o.pages, _, w),
-            pageParams: E(o.pageParams, l, w)
+            pages: E(n.pages, B, w),
+            pageParams: E(n.pageParams, o, w)
           };
         };
-        if (n && i.length) {
-          const o = n === "backward", l = o ? se : N, p = {
-            pages: i,
-            pageParams: f
-          }, v = l(r, p);
-          c = await m(p, v, o);
+        if (i && a.length) {
+          const n = i === "backward", o = n ? ne : K, l = {
+            pages: a,
+            pageParams: d
+          }, v = o(r, l);
+          c = await P(l, v, n);
         } else {
-          const o = e ?? i.length;
+          const n = e ?? a.length;
           do {
-            const l = d === 0 ? f[0] ?? r.initialPageParam : N(r, c);
-            if (d > 0 && l == null)
+            const o = y === 0 ? d[0] ?? r.initialPageParam : K(r, c);
+            if (y > 0 && o == null)
               break;
-            c = await m(c, l), d++;
-          } while (d < o);
+            c = await P(c, o), y++;
+          } while (y < n);
         }
         return c;
       };
       t.options.persister ? t.fetchFn = () => t.options.persister?.(
-        P,
+        m,
         {
           client: t.client,
           queryKey: t.queryKey,
@@ -231,11 +231,11 @@ function C(e) {
           signal: t.signal
         },
         s
-      ) : t.fetchFn = P;
+      ) : t.fetchFn = m;
     }
   };
 }
-function N(e, { pages: t, pageParams: s }) {
+function K(e, { pages: t, pageParams: s }) {
   const r = t.length - 1;
   return t.length > 0 ? e.getNextPageParam(
     t[r],
@@ -244,10 +244,10 @@ function N(e, { pages: t, pageParams: s }) {
     s
   ) : void 0;
 }
-function se(e, { pages: t, pageParams: s }) {
+function ne(e, { pages: t, pageParams: s }) {
   return t.length > 0 ? e.getPreviousPageParam?.(t[0], t, s[0], s) : void 0;
 }
-var re = class {
+var ie = class {
   #e;
   #t;
   #s;
@@ -257,12 +257,12 @@ var re = class {
   #a;
   #u;
   constructor(e = {}) {
-    this.#e = e.queryCache || new ee(), this.#t = e.mutationCache || new te(), this.#s = e.defaultOptions || {}, this.#n = /* @__PURE__ */ new Map(), this.#i = /* @__PURE__ */ new Map(), this.#r = 0;
+    this.#e = e.queryCache || new se(), this.#t = e.mutationCache || new re(), this.#s = e.defaultOptions || {}, this.#n = /* @__PURE__ */ new Map(), this.#i = /* @__PURE__ */ new Map(), this.#r = 0;
   }
   mount() {
-    this.#r++, this.#r === 1 && (this.#a = j.subscribe(async (e) => {
+    this.#r++, this.#r === 1 && (this.#a = L.subscribe(async (e) => {
       e && (await this.resumePausedMutations(), this.#e.onFocus());
-    }), this.#u = D.subscribe(async (e) => {
+    }), this.#u = A.subscribe(async (e) => {
       e && (await this.resumePausedMutations(), this.#e.onOnline());
     }));
   }
@@ -290,11 +290,11 @@ var re = class {
     });
   }
   setQueryData(e, t, s) {
-    const r = this.defaultQueryOptions({ queryKey: e }), i = this.#e.get(
+    const r = this.defaultQueryOptions({ queryKey: e }), a = this.#e.get(
       r.queryHash
-    )?.state.data, f = L(t, i);
-    if (f !== void 0)
-      return this.#e.build(this, r).setData(f, { ...s, manual: !0 });
+    )?.state.data, d = W(t, a);
+    if (d !== void 0)
+      return this.#e.build(this, r).setData(d, { ...s, manual: !0 });
   }
   setQueriesData(e, t, s) {
     return u.batch(
@@ -332,7 +332,7 @@ var re = class {
   }
   cancelQueries(e, t = {}) {
     const s = { revert: !0, ...t }, r = u.batch(
-      () => this.#e.findAll(e).map((n) => n.cancel(s))
+      () => this.#e.findAll(e).map((i) => i.cancel(s))
     );
     return Promise.all(r).then(h).catch(h);
   }
@@ -352,9 +352,9 @@ var re = class {
       ...t,
       cancelRefetch: t.cancelRefetch ?? !0
     }, r = u.batch(
-      () => this.#e.findAll(e).filter((n) => !n.isDisabled()).map((n) => {
-        let i = n.fetch(void 0, s);
-        return s.throwOnError || (i = i.catch(h)), n.state.fetchStatus === "paused" ? Promise.resolve() : i;
+      () => this.#e.findAll(e).filter((i) => !i.isDisabled()).map((i) => {
+        let a = i.fetch(void 0, s);
+        return s.throwOnError || (a = a.catch(h)), i.state.fetchStatus === "paused" ? Promise.resolve() : a;
       })
     );
     return Promise.all(r).then(h);
@@ -371,16 +371,16 @@ var re = class {
     return this.fetchQuery(e).then(h).catch(h);
   }
   fetchInfiniteQuery(e) {
-    return e.behavior = C(e.pages), this.fetchQuery(e);
+    return e.behavior = I(e.pages), this.fetchQuery(e);
   }
   prefetchInfiniteQuery(e) {
     return this.fetchInfiniteQuery(e).then(h).catch(h);
   }
   ensureInfiniteQueryData(e) {
-    return e.behavior = C(e.pages), this.ensureQueryData(e);
+    return e.behavior = I(e.pages), this.ensureQueryData(e);
   }
   resumePausedMutations() {
-    return D.isOnline() ? this.#t.resumePausedMutations() : Promise.resolve();
+    return A.isOnline() ? this.#t.resumePausedMutations() : Promise.resolve();
   }
   getQueryCache() {
     return this.#e;
@@ -395,7 +395,7 @@ var re = class {
     this.#s = e;
   }
   setQueryDefaults(e, t) {
-    this.#n.set(I(e), {
+    this.#n.set(C(e), {
       queryKey: e,
       defaultOptions: t
     });
@@ -407,7 +407,7 @@ var re = class {
     }), s;
   }
   setMutationDefaults(e, t) {
-    this.#i.set(I(e), {
+    this.#i.set(C(e), {
       mutationKey: e,
       defaultOptions: t
     });
@@ -427,10 +427,10 @@ var re = class {
       ...e,
       _defaulted: !0
     };
-    return t.queryHash || (t.queryHash = k(
+    return t.queryHash || (t.queryHash = H(
       t.queryKey,
       t
-    )), t.refetchOnReconnect === void 0 && (t.refetchOnReconnect = t.networkMode !== "always"), t.throwOnError === void 0 && (t.throwOnError = !!t.suspense), !t.networkMode && t.persister && (t.networkMode = "offlineFirst"), t.queryFn === U && (t.enabled = !1), t;
+    )), t.refetchOnReconnect === void 0 && (t.refetchOnReconnect = t.networkMode !== "always"), t.throwOnError === void 0 && (t.throwOnError = !!t.suspense), !t.networkMode && t.persister && (t.networkMode = "offlineFirst"), t.queryFn === _ && (t.enabled = !1), t;
   }
   defaultMutationOptions(e) {
     return e?._defaulted ? e : {
@@ -444,7 +444,7 @@ var re = class {
     this.#e.clear(), this.#t.clear();
   }
 };
-const ne = new re({
+const ae = new ie({
   defaultOptions: {
     mutations: {
       retry: !1
@@ -458,26 +458,28 @@ const ne = new re({
       retry: !1
     }
   }
-}), ie = () => {
-  const e = M((s) => s.currentNavigationPath), t = J();
+}), ue = () => {
+  const e = M((s) => s.currentNavigationPath), t = Z();
   b(() => {
     e && t(e, { replace: !0 });
   }, [e, t]);
-}, ae = () => (ie(), /* @__PURE__ */ y(G, {})), Oe = ({
+}, oe = () => (ue(), /* @__PURE__ */ f(X, {})), ve = ({
   props: e,
   routes: t,
   env: s = void 0,
   useSignalR: r = !1,
-  queryClient: n = ne
+  queryClient: i = ae
 }) => {
-  const i = M((a) => a.setBaseProps), f = M((a) => a.modulePermissionToken), c = T((a) => a.setEnvironment), d = T((a) => a.addEnvironment), [P, g] = $(!1);
+  const a = M((n) => n.setBaseProps), d = M((n) => n.modulePermissionToken), c = k((n) => n.setEnvironment), y = k((n) => n.addEnvironment), [m, g] = T(!1), [p, Q] = T(null);
   b(() => {
-    const a = he();
-    if (g(!a), a && c(a), !s) return;
-    const m = s[a?.ENVIRONMENT];
-    m && d(m);
-  }, [d, s, c]), b(() => {
-    g(!ue(e)), i(e);
+    const n = x();
+    if (g(!n), n && c(n), !s) return;
+    const o = ee(n);
+    o && Q(o);
+    const l = s[n?.ENVIRONMENT];
+    l && y(l);
+  }, [y, s, c]), b(() => {
+    g(!te(e)), a(e);
   }, [
     e.currentLanguage,
     e.currentLanguageId,
@@ -486,26 +488,15 @@ const ne = new re({
     e.currentNavigationPath,
     e.sourcePath
   ]);
-  const Q = z([
+  const P = G([
     {
       path: e.basePath,
       children: t,
-      element: /* @__PURE__ */ y(ae, {})
+      element: /* @__PURE__ */ f(oe, {})
     }
   ]);
-  return P ? /* @__PURE__ */ y("div", { children: "TODO: Show fancy error" }) : f ? /* @__PURE__ */ y(V, { client: n, children: /* @__PURE__ */ y(x, { enabled: r, children: /* @__PURE__ */ y(Y, { router: Q }) }) }) : /* @__PURE__ */ y("div", { children: "TODO: Show fancy Loadingspinner" });
-}, ue = (e) => Z.every((t) => oe(t, e)), oe = (e, t) => {
-  if (!t[e]) {
-    if (t.throwError)
-      return t.throwError(`Missing required prop: ${e}`, 404), !1;
-    throw new Error(`Missing required prop: ${e}`);
-  }
-  return !0;
-}, he = () => {
-  const e = window.__env__;
-  if (e && (e.API_PREFIX = "/api/v8.0", !!e.COMMON_API && e.MODULE_AUTH_API && e.API_PREFIX && e.ENVIRONMENT))
-    return e;
+  return m ? /* @__PURE__ */ f("div", { children: "TODO: Show fancy Error" }) : p ? /* @__PURE__ */ f("div", { children: p }) : d ? /* @__PURE__ */ f(U, { client: i, children: /* @__PURE__ */ f($, { enabled: r, children: /* @__PURE__ */ f(J, { router: P }) }) }) : /* @__PURE__ */ f("div", { children: "TODO: Show fancy Loadingspinner" });
 };
 export {
-  Oe as ModuleBase
+  ve as ModuleBase
 };

package/dist/{types → lib/types}/Environment.d.ts

@@ -3,6 +3,7 @@ export interface HortiViewEnvironments {
     MODULE_AUTH_API: string;
     API_PREFIX: string;
     ENVIRONMENT: string;
+    REQ_VERSION: string;
     [customkey: string]: string;
 }
 export interface CustomWindow extends Window {

package/dist/lib/utils/helper.d.ts

@@ -0,0 +1,20 @@
+import { BaseProps } from '../main';
+import { HortiViewEnvironments } from '../types/Environment';
+/**
+ * Validates the props and checks if the required props are set
+ * @param props props to be validated
+ * @param requiredProps props that will be validated/checked if they exist
+ */
+export declare const arePropsValid: (props: BaseProps) => boolean;
+/**
+ * Checks if a prop exists and throws an error if it does not
+ * @param prop prop to be checked
+ * @param props props to be checked against
+ */
+export declare const checkIfPropExists: (prop: keyof BaseProps, props: BaseProps) => boolean;
+/**
+ * check if hortiview return the __env__ object correctly
+ * @returns the environment variables from the window object
+ */
+export declare const getEnvironmentVariables: () => HortiViewEnvironments | undefined;
+export declare const checkVersion: (environmentVariables?: HortiViewEnvironments) => string | null;

package/dist/stores/EnvironmentStore.js

@@ -1,8 +1,9 @@
 import { c as r } from "../react-QiIgv49H.js";
-const m = r((e) => ({
+const E = r((e) => ({
   environment: {
     ENVIRONMENT: "DEV",
     COMMON_API: "",
+    REQ_VERSION: "",
     MODULE_AUTH_API: "",
     API_PREFIX: ""
   },
@@ -10,5 +11,5 @@ const m = r((e) => ({
   addEnvironment: (n) => e((o) => ({ environment: { ...n, ...o.environment } }))
 }));
 export {
-  m as useEnvironmentStore
+  E as useEnvironmentStore
 };

package/dist/utils/helper.js

@@ -0,0 +1,48 @@
+import { REQUIRED_PROPS as p } from "../constants.js";
+const l = /^[v^~<>=]*?(\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+))?(?:-([\da-z\-]+(?:\.[\da-z\-]+)*))?(?:\+[\da-z\-]+(?:\.[\da-z\-]+)*)?)?)?$/i, u = (r) => {
+  if (typeof r != "string")
+    throw new TypeError("Invalid argument expected string");
+  const e = r.match(l);
+  if (!e)
+    throw new Error(`Invalid argument not valid semver ('${r}' received)`);
+  return e.shift(), e;
+}, c = (r) => r === "*" || r === "x" || r === "X", d = (r) => {
+  const e = parseInt(r, 10);
+  return isNaN(e) ? r : e;
+}, E = (r, e) => typeof r != typeof e ? [String(r), String(e)] : [r, e], h = (r, e) => {
+  if (c(r) || c(e))
+    return 0;
+  const [t, n] = E(d(r), d(e));
+  return t > n ? 1 : t < n ? -1 : 0;
+}, a = (r, e) => {
+  for (let t = 0; t < Math.max(r.length, e.length); t++) {
+    const n = h(r[t] || "0", e[t] || "0");
+    if (n !== 0)
+      return n;
+  }
+  return 0;
+}, m = (r, e) => {
+  const t = u(r), n = u(e), i = t.pop(), o = n.pop(), s = a(t, n);
+  return s !== 0 ? s : i && o ? a(i.split("."), o.split(".")) : i || o ? i ? -1 : 1 : 0;
+}, f = "0.0.13179", v = (r) => p.every((e) => I(e, r)), I = (r, e) => {
+  if (!e[r]) {
+    if (e.throwError)
+      return e.throwError(`Missing required prop: ${r}`, 404), !1;
+    throw new Error(`Missing required prop: ${r}`);
+  }
+  return !0;
+}, w = () => {
+  const r = window.__env__;
+  if (r && (r.API_PREFIX = "/api/v8.0", !!r.COMMON_API && r.MODULE_AUTH_API && r.API_PREFIX && r.ENVIRONMENT))
+    return r;
+}, P = (r) => {
+  if (!r?.REQ_VERSION) return null;
+  const e = r.REQ_VERSION;
+  return m(f, e) < 0 ? `ModuleBase version ${f} is probably not compatible with the current HortiView version ${e}. Please update the modulebase to be at least ${e}` : null;
+};
+export {
+  v as arePropsValid,
+  I as checkIfPropExists,
+  P as checkVersion,
+  w as getEnvironmentVariables
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hortiview/modulebase",
   "description": "This is a base module for hortiview",
-  "version": "0.0.13075",
+  "version": "0.0.13179",
   "type": "module",
   "author": "Falk Menge <falk.menge.ext@bayer.com>",
   "contributors": [
@@ -25,6 +25,7 @@
   "dependencies": {
     "@microsoft/signalr": "^8.0.7",
     "@tanstack/react-query": "^5.67.3",
+    "compare-versions": "^6.1.1",
     "lodash": "^4.17.21",
     "odata-query": "^7.0.9",
     "react": "^18.3.1",