md-components-mdigial-azamat 0.0.290 → 0.0.291

package/dist/CustomCalculator/hooks/useCalculator.js

@@ -1,32 +1,36 @@
-import { useState as q, useRef as w, useCallback as F, useEffect as D, useMemo as O } from "react";
-const m = (c, o = 0) => {
+import { useState as I, useRef as $, useEffect as h, useCallback as F, useMemo as k } from "react";
+const m = (c, l = 0) => {
   const v = Number(c);
-  return Number.isFinite(v) ? v : o;
-}, I = (c, o) => o === void 0 || o === "" ? !0 : typeof o == "boolean" ? !!Number(c) === o : String(c) === String(o), x = (c, o) => c.find((v) => v.key === o), N = (c) => {
+  return Number.isFinite(v) ? v : l;
+}, j = (c, l) => l === void 0 || l === "" ? !0 : typeof l == "boolean" ? !!Number(c) === l : String(c) === String(l), N = (c, l) => c.find((v) => v.key === l), R = (c) => {
   if (c) {
     if (c.type === "select")
       return c.source;
     if (c.type === "range")
       return c.discreteOptionsSource;
   }
-}, z = (c) => {
-  const [o, v] = q({}), R = w({}), K = c.datasets ?? [], i = c.fields ?? [], g = c.derivedVariables ?? [], E = c.formulas ?? [], b = F(
+}, A = (c) => {
+  const [l, v] = I({}), f = $({}), E = $({}), K = c.datasets ?? [], i = c.fields ?? [], g = c.derivedVariables ?? [], M = c.formulas ?? [];
+  h(() => {
+    f.current = l;
+  }, [l]);
+  const b = F(
     (e, r) => {
       var y;
       if (!e)
         return null;
-      const t = r ?? o, a = i.find(
+      const t = r ?? f.current, a = i.find(
         (V) => V.variable === e
-      ), n = N(a);
+      ), n = R(a);
       if (!a || (n == null ? void 0 : n.mode) !== "dataset")
         return null;
-      const u = x(K, n.datasetKey);
+      const u = N(K, n.datasetKey);
       if (!u || !n.valueFieldKey)
         return null;
       if (!n.collectionKey) {
         const V = t[e] ?? a.defaultValue;
         return u.items.find(
-          (P) => P.values[n.valueFieldKey] == V
+          (w) => w.values[n.valueFieldKey] == V
         ) ?? null;
       }
       const s = b(
@@ -35,24 +39,24 @@ const m = (c, o = 0) => {
       );
       if (!s)
         return null;
-      const l = t[e] ?? a.defaultValue;
+      const o = t[e] ?? a.defaultValue;
       return (((y = s.children) == null ? void 0 : y[n.collectionKey]) ?? []).find(
-        (V) => V.values[n.valueFieldKey] == l
+        (V) => V.values[n.valueFieldKey] == o
       ) ?? null;
     },
-    [K, i, o]
+    [K, i]
   ), p = F(
     (e, r) => {
       var n, u;
       if (((n = e.source) == null ? void 0 : n.mode) !== "dataset")
         return e.options || [];
-      const t = x(K, e.source.datasetKey);
+      const t = N(K, e.source.datasetKey);
       if (!t || !e.source.labelFieldKey || !e.source.valueFieldKey)
         return [];
       if (!e.source.collectionKey)
-        return t.items.map((s, l) => ({
+        return t.items.map((s, o) => ({
           id: s.id,
-          label: String(s.values[e.source.labelFieldKey] ?? `Опция ${l + 1}`),
+          label: String(s.values[e.source.labelFieldKey] ?? `Опция ${o + 1}`),
           value: s.values[e.source.valueFieldKey] ?? ""
         }));
       const a = b(
@@ -60,9 +64,9 @@ const m = (c, o = 0) => {
         r
       );
       return a ? (((u = a.children) == null ? void 0 : u[e.source.collectionKey]) ?? []).map(
-        (s, l) => ({
+        (s, o) => ({
           id: s.id,
-          label: String(s.values[e.source.labelFieldKey] ?? `Опция ${l + 1}`),
+          label: String(s.values[e.source.labelFieldKey] ?? `Опция ${o + 1}`),
           value: s.values[e.source.valueFieldKey] ?? ""
         })
       ) : [];
@@ -74,13 +78,13 @@ const m = (c, o = 0) => {
       const t = e.discreteOptionsSource;
       if ((t == null ? void 0 : t.mode) !== "dataset")
         return [];
-      const a = x(K, t.datasetKey);
+      const a = N(K, t.datasetKey);
       if (!a || !t.labelFieldKey || !t.valueFieldKey)
         return [];
       if (!t.collectionKey)
-        return a.items.map((s, l) => ({
+        return a.items.map((s, o) => ({
           id: s.id,
-          label: String(s.values[t.labelFieldKey] ?? `Опция ${l + 1}`),
+          label: String(s.values[t.labelFieldKey] ?? `Опция ${o + 1}`),
           value: s.values[t.valueFieldKey] ?? ""
         }));
       const n = b(
@@ -88,9 +92,9 @@ const m = (c, o = 0) => {
         r
       );
       return n ? (((u = n.children) == null ? void 0 : u[t.collectionKey]) ?? []).map(
-        (s, l) => ({
+        (s, o) => ({
           id: s.id,
-          label: String(s.values[t.labelFieldKey] ?? `Опция ${l + 1}`),
+          label: String(s.values[t.labelFieldKey] ?? `Опция ${o + 1}`),
           value: s.values[t.valueFieldKey] ?? ""
         })
       ) : [];
@@ -105,26 +109,26 @@ const m = (c, o = 0) => {
       return (n = a == null ? void 0 : a.values) == null ? void 0 : n[r];
     },
     [b]
-  ), h = F(
+  ), D = F(
     (e, r) => {
       const t = e.visibleIf;
       if (!(t != null && t.sourceField))
         return !0;
-      const a = r ?? o, n = t.datasetFieldKey ? d(
+      const a = r ?? f.current, n = t.datasetFieldKey ? d(
         t.sourceField,
         t.datasetFieldKey,
         a
       ) : a[t.sourceField];
-      return I(n, t.equals);
+      return j(n, t.equals);
     },
-    [d, o]
+    [d]
   );
-  D(() => {
+  h(() => {
     v((e) => {
       const r = { ...e };
       let t = !1;
       return i.forEach((a) => {
-        var u, s, l;
+        var u, s, o;
         if (r[a.variable] !== void 0)
           return;
         if (a.type === "select") {
@@ -138,7 +142,7 @@ const m = (c, o = 0) => {
         }
         if (a.type === "range" && ((s = a.discreteOptionsSource) == null ? void 0 : s.mode) === "dataset") {
           const y = S(a, r);
-          r[a.variable] = a.defaultValue !== "" ? a.defaultValue : ((l = y[0]) == null ? void 0 : l.value) ?? "", t = !0;
+          r[a.variable] = a.defaultValue !== "" ? a.defaultValue : ((o = y[0]) == null ? void 0 : o.value) ?? "", t = !0;
           return;
         }
         const n = d(
@@ -149,76 +153,76 @@ const m = (c, o = 0) => {
         r[a.variable] = n !== void 0 ? n : a.defaultValue, t = !0;
       }), t ? r : e;
     });
-  }, [i, d, S, p]), D(() => {
+  }, [i, d, S, p]), h(() => {
     v((e) => {
       const r = { ...e };
       let t = !1;
       return i.forEach((a) => {
         var y;
-        const n = N(a);
+        const n = R(a);
         if ((n == null ? void 0 : n.mode) !== "dataset")
           return;
         const u = a.type === "select" ? p(a, r) : a.type === "range" ? S(a, r) : [], s = r[a.variable];
         u.some((V) => V.value == s) || (r[a.variable] = a.defaultValue !== "" ? a.defaultValue : ((y = u[0]) == null ? void 0 : y.value) ?? "", t = !0);
       }), t ? r : e;
     });
-  }, [i, p]), D(() => {
+  }, [i, p]), h(() => {
     v((e) => {
       const r = { ...e };
       let t = !1;
       return i.forEach((a) => {
-        const n = N(a);
+        const n = R(a);
         if ((n == null ? void 0 : n.mode) !== "dataset" || !n.collectionKey || !n.parentFieldVariable)
           return;
-        const u = R.current[n.parentFieldVariable], s = e[n.parentFieldVariable];
+        const u = E.current[n.parentFieldVariable], s = e[n.parentFieldVariable];
         u !== s && (r[a.variable] = "", t = !0);
-      }), R.current = r, t ? r : e;
+      }), E.current = r, t ? r : e;
     });
-  }, [i, o]);
-  const f = O(
+  }, [i]);
+  const x = k(
     () => g.reduce((e, r) => {
       const t = d(r.sourceField, r.datasetFieldKey);
       return e[r.variable] = t === void 0 ? "" : t, e;
     }, {}),
     [g, d]
-  ), $ = F((e, r) => {
+  ), B = F((e, r) => {
     v((t) => ({
       ...t,
       [e]: r === "" ? "" : r
     }));
-  }, []), M = O(() => {
+  }, []), O = k(() => {
     const e = {}, r = [
       ...i.map((t) => t.variable),
       ...g.map((t) => t.variable)
     ];
-    return E.forEach((t) => {
+    return M.forEach((t) => {
       try {
         e[t.id] = new Function(...r, `return ${t.expression}`);
       } catch {
         e[t.id] = () => 0;
       }
     }), { keys: r, fns: e };
-  }, [g, i, E]), k = F(
+  }, [g, i, M]), C = F(
     (e) => {
       try {
-        const { keys: r, fns: t } = M, a = t[e];
+        const { keys: r, fns: t } = O, a = t[e];
         if (!a)
           return 0;
         const n = {
-          ...o,
-          ...f
+          ...l,
+          ...x
         };
-        i.forEach((l) => {
-          h(l) || (n[l.variable] = 0);
+        i.forEach((o) => {
+          D(o) || (n[o.variable] = 0);
         });
-        const u = r.map((l) => m(n[l], 0)), s = a(...u);
+        const u = r.map((o) => m(n[o], 0)), s = a(...u);
         return isNaN(s) || !isFinite(s) ? 0 : s;
       } catch {
         return 0;
       }
     },
-    [M, f, i, h, o]
-  ), B = F(
+    [O, x, i, D, l]
+  ), P = F(
     (e) => {
       if (!e)
         return "";
@@ -226,15 +230,15 @@ const m = (c, o = 0) => {
       if (r) {
         const t = r[1], a = i.find((n) => n.variable === t);
         if (a && a.type === "select") {
-          const n = p(a), u = o[t] ?? a.defaultValue, s = n.find((l) => l.value == u);
+          const n = p(a), u = l[t] ?? a.defaultValue, s = n.find((o) => o.value == u);
           return s ? s.label : "";
         }
-        return String(o[t] || "");
+        return String(l[t] || "");
       }
       return e;
     },
-    [i, p, o]
-  ), C = F(
+    [i, p, l]
+  ), q = F(
     (e) => {
       const r = !!e.bindingSourceField, t = d(e.bindingSourceField, e.minDatasetFieldKey), a = d(e.bindingSourceField, e.maxDatasetFieldKey), n = d(e.bindingSourceField, e.stepDatasetFieldKey), u = d(
         e.bindingSourceField,
@@ -254,17 +258,17 @@ const m = (c, o = 0) => {
     [d]
   );
   return {
-    values: o,
-    handleValueChange: $,
-    evaluateFormula: k,
-    derivedValues: f,
-    getDynamicSuffix: B,
+    values: l,
+    handleValueChange: B,
+    evaluateFormula: C,
+    derivedValues: x,
+    getDynamicSuffix: P,
     resolveRangeOptions: S,
     resolveSelectOptions: p,
-    resolveNumericFieldProps: C,
-    isFieldVisible: h
+    resolveNumericFieldProps: q,
+    isFieldVisible: D
   };
 };
 export {
-  z as useCalculator
+  A as useCalculator
 };

package/package.json

@@ -2,7 +2,7 @@
   "name": "md-components-mdigial-azamat",
   "author": "Azamat Raimbekov",
   "private": false,
-  "version": "0.0.290",
+  "version": "0.0.291",
   "type": "module",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",