cogsbox-state 0.5.42 → 0.5.44

package/dist/CogsState.jsx

@@ -2,14 +2,14 @@
 import { jsx as it } from "react/jsx-runtime";
 import { useState as Y, useRef as z, useEffect as K, useLayoutEffect as vt, useMemo as It, createElement as H, useSyncExternalStore as Et, startTransition as J } from "react";
 import { transformStateFunc as _t, isFunction as ft, getNestedValue as L, isDeepEqual as G, debounce as pt } from "./utility.js";
-import { pushFunc as st, updateFn as q, cutFunc as ct, ValidationWrapper as wt, FormControlComponent as Vt } from "./Functions.jsx";
+import { pushFunc as st, updateFn as q, cutFunc as ct, ValidationWrapper as wt, FormControlComponent as Nt } from "./Functions.jsx";
 import "zod";
 import { getGlobalStore as o, formRefStore as lt } from "./store.js";
-import { useCogsConfig as Nt } from "./CogsStateClient.jsx";
+import { useCogsConfig as Vt } from "./CogsStateClient.jsx";
 import tt from "./node_modules/uuid/dist/esm-browser/v4.js";
 function dt(t, a) {
-  const u = o.getState().getInitialOptions, f = o.getState().setInitialStateOptions, d = u(t) || {};
-  return a.log && (console.log("setAndMergeOptions", t, a), console.log("setAndMergeOptions oldValue", d)), f(t, {
+  const f = o.getState().getInitialOptions, u = o.getState().setInitialStateOptions, d = f(t) || {};
+  return u(t, {
     ...d,
     ...a
   }), {
@@ -20,58 +20,59 @@ function dt(t, a) {
 function ut({
   stateKey: t,
   options: a,
-  initialOptionsPart: u
+  initialOptionsPart: f
 }) {
-  const f = et(t) || {}, E = { ...u?.[t] || {}, ...f };
-  let w = !1;
+  const u = et(t) || {}, d = f[t] || {}, _ = o.getState().setInitialStateOptions, w = { ...d, ...u };
+  let y = !1;
   if (a)
-    for (const m in a)
-      E.hasOwnProperty(m) || (w = !0, E[m] = a[m]);
-  w && o.getState().setInitialStateOptions(t, E);
+    for (const S in a)
+      w.hasOwnProperty(S) || (y = !0, w[S] = a[S]);
+  y && _(t, w);
 }
-function Wt(t, { formElements: a, validation: u }) {
-  return { initialState: t, formElements: a, validation: u };
+function Wt(t, { formElements: a, validation: f }) {
+  return { initialState: t, formElements: a, validation: f };
 }
 const qt = (t, a) => {
-  let u = t;
-  const [f, d] = _t(u);
-  (a?.formElements || a?.validation) && Object.keys(d).forEach((m) => {
-    d[m] = d[m] || {}, d[m].formElements = {
+  let f = t;
+  const [u, d] = _t(f);
+  (a?.formElements || a?.validation) && Object.keys(d).forEach((y) => {
+    d[y] = d[y] || {}, d[y].formElements = {
       ...a.formElements,
       // Global defaults first
       ...a?.validation,
-      ...d[m].formElements || {}
+      ...d[y].formElements || {}
       // State-specific overrides
     };
-  }), o.getState().setInitialStates(f);
-  const E = (m, I) => {
-    const [p] = Y(I?.componentId ?? tt());
+  }), o.getState().setInitialStates(u);
+  const _ = (y, S) => {
+    const [p] = Y(S?.componentId ?? tt());
     ut({
-      stateKey: m,
-      options: I
+      stateKey: y,
+      options: S,
+      initialOptionsPart: d
     });
-    const s = o.getState().cogsStateStore[m] || f[m], e = I?.modifyState ? I.modifyState(s) : s;
-    I?.log && console.log("useCogsState", m, I);
-    const [v, N] = Ot(
+    const s = o.getState().cogsStateStore[y] || u[y], e = S?.modifyState ? S.modifyState(s) : s;
+    S?.log && console.log("useCogsState", y, S);
+    const [I, V] = Ot(
       e,
       {
-        stateKey: m,
-        syncUpdate: I?.syncUpdate,
+        stateKey: y,
+        syncUpdate: S?.syncUpdate,
         componentId: p,
-        localStorage: I?.localStorage,
-        middleware: I?.middleware,
-        enabledSync: I?.enabledSync,
-        reactiveType: I?.reactiveType,
-        reactiveDeps: I?.reactiveDeps,
-        initState: I?.initState
+        localStorage: S?.localStorage,
+        middleware: S?.middleware,
+        enabledSync: S?.enabledSync,
+        reactiveType: S?.reactiveType,
+        reactiveDeps: S?.reactiveDeps,
+        initState: S?.initState
       }
     );
-    return N;
+    return V;
   };
-  function w(m, I) {
-    ut({ stateKey: m, options: I, initialOptionsPart: d });
+  function w(y, S) {
+    ut({ stateKey: y, options: S, initialOptionsPart: d });
   }
-  return { useCogsState: E, setCogsOptions: w };
+  return { useCogsState: _, setCogsOptions: w };
 }, {
   setUpdaterState: B,
   setState: x,
@@ -80,9 +81,9 @@ const qt = (t, a) => {
   getValidationErrors: $t,
   setStateLog: ht,
   updateInitialStateGlobal: nt,
-  addValidationError: At,
-  removeValidationError: b,
-  setServerSyncActions: Ct
+  addValidationError: Ct,
+  removeValidationError: M,
+  setServerSyncActions: At
 } = o.getState(), St = (t) => {
   if (!t) return null;
   try {
@@ -91,31 +92,31 @@ const qt = (t, a) => {
   } catch (a) {
     return console.error("Error loading from localStorage:", a), null;
   }
-}, Tt = (t, a, u, f) => {
-  if (u.log && console.log(
+}, Tt = (t, a, f, u) => {
+  if (f.log && console.log(
     "saving to localstorage",
     a,
-    u.localStorage?.key,
-    f
-  ), u.localStorage?.key && f) {
+    f.localStorage?.key,
+    u
+  ), f.localStorage?.key && u) {
     const d = {
       state: t,
       lastUpdated: Date.now(),
       lastSyncedWithServer: o.getState().serverSyncLog[a]?.[0]?.timeStamp,
       baseServerState: o.getState().serverState[a]
-    }, E = `${f}-${a}-${u.localStorage?.key}`;
-    window.localStorage.setItem(E, JSON.stringify(d));
+    }, _ = `${u}-${a}-${f.localStorage?.key}`;
+    window.localStorage.setItem(_, JSON.stringify(d));
   }
-}, Ft = (t, a, u, f, d, E) => {
+}, Ft = (t, a, f, u, d, _) => {
   const w = {
     initialState: a,
     updaterState: Z(
       t,
-      f,
+      u,
       d,
-      E
+      _
     ),
-    state: u
+    state: f
   };
   J(() => {
     nt(t, w.initialState), B(t, w.updaterState), x(t, w.state);
@@ -123,36 +124,36 @@ const qt = (t, a) => {
 }, mt = (t) => {
   const a = o.getState().stateComponents.get(t);
   if (!a) return;
-  const u = /* @__PURE__ */ new Set();
-  a.components.forEach((f) => {
-    u.add(() => f.forceUpdate());
+  const f = /* @__PURE__ */ new Set();
+  a.components.forEach((u) => {
+    f.add(() => u.forceUpdate());
   }), queueMicrotask(() => {
     J(() => {
-      u.forEach((f) => f());
+      f.forEach((u) => u());
     });
   });
 }, zt = (t, a) => {
-  const u = o.getState().stateComponents.get(t);
-  if (u) {
-    const f = `${t}////${a}`, d = u.components.get(f);
+  const f = o.getState().stateComponents.get(t);
+  if (f) {
+    const u = `${t}////${a}`, d = f.components.get(u);
     d && d.forceUpdate();
   }
 };
 function Ot(t, {
   stateKey: a,
-  serverSync: u,
-  localStorage: f,
+  serverSync: f,
+  localStorage: u,
   formElements: d,
-  middleware: E,
+  middleware: _,
   reactiveDeps: w,
-  reactiveType: m,
-  componentId: I,
+  reactiveType: y,
+  componentId: S,
   initState: p,
   syncUpdate: s
 } = {}) {
-  const [e, v] = Y({}), { sessionId: N } = Nt();
+  const [e, I] = Y({}), { sessionId: V } = Vt();
   let k = !a;
-  const [c] = Y(a ?? tt()), R = o.getState().stateLog[c], P = z(/* @__PURE__ */ new Set()), i = z(I ?? tt()), $ = z(null);
+  const [c] = Y(a ?? tt()), R = o.getState().stateLog[c], U = z(/* @__PURE__ */ new Set()), i = z(S ?? tt()), $ = z(null);
   $.current = et(c), K(() => {
     if (s && s.stateKey === c && s.path?.[0]) {
       x(c, (r) => ({
@@ -168,108 +169,110 @@ function Ot(t, {
   }, [s]), $.current.log && (console.log(
     "latestInitialOptionsRef.current ",
     $.current
-  ), console.log("latestInitialOptionsRef.current localStorage", f)), K(() => {
+  ), console.log("latestInitialOptionsRef.current localStorage", u)), K(() => {
     const n = dt(c, {
-      initState: p
+      initState: p,
+      localStorage: u
     });
+    $.current = n;
     let r = null;
-    n.log && console.log("newoptions", n), n.localStorage?.key && N && (r = St(
-      N + "-" + c + "-" + n.localStorage?.key
+    n.log && console.log("newoptions", n), n.localStorage?.key && V && (r = St(
+      V + "-" + c + "-" + n.localStorage?.key
     ));
     let l = null;
     p?.initialState && (l = p?.initialState, r && r.lastUpdated > (r.lastSyncedWithServer || 0) && (l = r.state), Ft(
       c,
       p?.initialState,
       l,
-      U,
+      P,
       i.current,
-      N
-    ), mt(c), v({}));
-  }, [...p?.dependencies || []]), vt(() => {
+      V
+    ), mt(c), I({}));
+  }, [u?.key, ...p?.dependencies || []]), vt(() => {
     k && dt(c, {
-      serverSync: u,
+      serverSync: f,
       formElements: d,
       initState: p,
-      localStorage: f,
-      middleware: E
+      localStorage: u,
+      middleware: _
     });
     const n = `${c}////${i.current}`, r = o.getState().stateComponents.get(c) || {
       components: /* @__PURE__ */ new Map()
     };
     return r.components.set(n, {
-      forceUpdate: () => v({}),
+      forceUpdate: () => I({}),
       paths: /* @__PURE__ */ new Set(),
       deps: [],
       depsFunction: w || void 0,
-      reactiveType: m ?? ["component", "deps"]
-    }), o.getState().stateComponents.set(c, r), v({}), () => {
+      reactiveType: y ?? ["component", "deps"]
+    }), o.getState().stateComponents.set(c, r), I({}), () => {
       const l = `${c}////${i.current}`;
       r && (r.components.delete(l), r.components.size === 0 && o.getState().stateComponents.delete(c));
     };
   }, []);
-  const U = (n, r, l, g) => {
+  const P = (n, r, l, g) => {
     if (Array.isArray(r)) {
-      const S = `${c}-${r.join(".")}`;
-      P.current.add(S);
+      const m = `${c}-${r.join(".")}`;
+      U.current.add(m);
     }
-    x(c, (S) => {
-      const _ = ft(n) ? n(S) : n, O = `${c}-${r.join(".")}`;
+    x(c, (m) => {
+      const E = ft(n) ? n(m) : n, O = `${c}-${r.join(".")}`;
       if (O) {
-        let M = !1, y = o.getState().signalDomElements.get(O);
-        if ((!y || y.size === 0) && (l.updateType === "insert" || l.updateType === "cut")) {
-          const h = r.slice(0, -1), C = L(_, h);
-          if (Array.isArray(C)) {
-            M = !0;
-            const V = `${c}-${h.join(".")}`;
-            y = o.getState().signalDomElements.get(V);
+        let b = !1, v = o.getState().signalDomElements.get(O);
+        if ((!v || v.size === 0) && (l.updateType === "insert" || l.updateType === "cut")) {
+          const h = r.slice(0, -1), A = L(E, h);
+          if (Array.isArray(A)) {
+            b = !0;
+            const N = `${c}-${h.join(".")}`;
+            v = o.getState().signalDomElements.get(N);
           }
         }
-        if (y) {
-          const h = M ? L(_, r.slice(0, -1)) : L(_, r);
-          y.forEach(({ parentId: C, position: V, effect: D }) => {
+        if (v) {
+          const h = b ? L(E, r.slice(0, -1)) : L(E, r);
+          v.forEach(({ parentId: A, position: N, effect: D }) => {
             const T = document.querySelector(
-              `[data-parent-id="${C}"]`
+              `[data-parent-id="${A}"]`
             );
             if (T) {
               const at = Array.from(T.childNodes);
-              if (at[V]) {
+              if (at[N]) {
                 const yt = D ? new Function("state", `return (${D})(state)`)(h) : h;
-                at[V].textContent = String(yt);
+                at[N].textContent = String(yt);
               }
             }
           });
         }
       }
-      l.updateType === "update" && (g || $.current?.validationKey) && r && b(
+      l.updateType === "update" && (g || $.current?.validationKey) && r && M(
         (g || $.current?.validationKey) + "." + r.join(".")
       );
-      const A = r.slice(0, r.length - 1);
-      l.updateType === "cut" && $.current?.validationKey && b(
-        $.current?.validationKey + "." + A.join(".")
+      const C = r.slice(0, r.length - 1);
+      l.updateType === "cut" && $.current?.validationKey && M(
+        $.current?.validationKey + "." + C.join(".")
       ), l.updateType === "insert" && $.current?.validationKey && $t(
-        $.current?.validationKey + "." + A.join(".")
-      ).filter(([y, h]) => {
-        let C = y?.split(".").length;
-        if (y == A.join(".") && C == A.length - 1) {
-          let V = y + "." + A;
-          b(y), At(V, h);
+        $.current?.validationKey + "." + C.join(".")
+      ).filter(([v, h]) => {
+        let A = v?.split(".").length;
+        if (v == C.join(".") && A == C.length - 1) {
+          let N = v + "." + C;
+          M(v), Ct(N, h);
         }
       });
-      const j = L(S, r), F = L(_, r), W = l.updateType === "update" ? r.join(".") : [...r].slice(0, -1).join("."), rt = o.getState().stateComponents.get(c);
+      const j = L(m, r), F = L(E, r), W = l.updateType === "update" ? r.join(".") : [...r].slice(0, -1).join("."), rt = o.getState().stateComponents.get(c);
       if (rt)
-        for (const [M, y] of rt.components.entries()) {
+        for (const [b, v] of rt.components.entries()) {
           let h = !1;
-          const C = Array.isArray(y.reactiveType) ? y.reactiveType : [y.reactiveType || "component"];
-          if (!C.includes("none")) {
-            if (C.includes("all")) {
-              y.forceUpdate();
+          const A = Array.isArray(v.reactiveType) ? v.reactiveType : [v.reactiveType || "component"];
+          if (!A.includes("none")) {
+            if (A.includes("all")) {
+              v.forceUpdate();
               continue;
             }
-            if (C.includes("component") && y.paths && (y.paths.has(W) || y.paths.has("")) && (h = !0), !h && C.includes("deps") && y.depsFunction) {
-              const V = y.depsFunction(_);
-              typeof V == "boolean" ? V && (h = !0) : G(y.deps, V) || (y.deps = V, h = !0);
+            if (A.includes("component") && v.paths && (v.paths.has(W) || v.paths.has("")) && (h = !0), !h && A.includes("deps") && v.depsFunction) {
+              const N = v.depsFunction(E);
+              typeof N == "boolean" ? N && (h = !0) : G(v.deps, N) || (v.deps = N, h = !0);
             }
-            h && y.forceUpdate();
+            h && v.forceUpdate();
           }
         }
       const ot = {
@@ -281,95 +284,95 @@ function Ot(t, {
         oldValue: j,
         newValue: F
       };
-      if (ht(c, (M) => {
-        const h = [...M ?? [], ot].reduce((C, V) => {
-          const D = `${V.stateKey}:${JSON.stringify(V.path)}`, T = C.get(D);
-          return T ? (T.timeStamp = Math.max(T.timeStamp, V.timeStamp), T.newValue = V.newValue, T.oldValue = T.oldValue ?? V.oldValue, T.updateType = V.updateType) : C.set(D, { ...V }), C;
+      if (ht(c, (b) => {
+        const h = [...b ?? [], ot].reduce((A, N) => {
+          const D = `${N.stateKey}:${JSON.stringify(N.path)}`, T = A.get(D);
+          return T ? (T.timeStamp = Math.max(T.timeStamp, N.timeStamp), T.newValue = N.newValue, T.oldValue = T.oldValue ?? N.oldValue, T.updateType = N.updateType) : A.set(D, { ...N }), A;
         }, /* @__PURE__ */ new Map());
         return Array.from(h.values());
       }), Tt(
-        _,
+        E,
         c,
         $.current,
-        N
-      ), E && E({
+        V
+      ), _ && _({
         updateLog: R,
         update: ot
       }), $.current?.serverSync) {
-        const M = o.getState().serverState[c], y = $.current?.serverSync;
-        Ct(c, {
-          syncKey: typeof y.syncKey == "string" ? y.syncKey : y.syncKey({ state: _ }),
-          rollBackState: M,
-          actionTimeStamp: Date.now() + (y.debounce ?? 3e3),
+        const b = o.getState().serverState[c], v = $.current?.serverSync;
+        At(c, {
+          syncKey: typeof v.syncKey == "string" ? v.syncKey : v.syncKey({ state: E }),
+          rollBackState: b,
+          actionTimeStamp: Date.now() + (v.debounce ?? 3e3),
           status: "waiting"
         });
       }
-      return _;
+      return E;
     });
   };
   o.getState().updaterState[c] || (B(
     c,
     Z(
       c,
-      U,
+      P,
       i.current,
-      N
+      V
     )
   ), o.getState().cogsStateStore[c] || x(c, t), o.getState().initialStateGlobal[c] || nt(c, t));
   const Q = It(() => Z(
     c,
-    U,
+    P,
     i.current,
-    N
+    V
   ), [c]);
   return [gt(c), Q];
 }
-function Z(t, a, u, f) {
+function Z(t, a, f, u) {
   const d = /* @__PURE__ */ new Map();
-  let E = 0;
+  let _ = 0;
   const w = (s) => {
     const e = s.join(".");
-    for (const [v] of d)
-      (v === e || v.startsWith(e + ".")) && d.delete(v);
-    E++;
-  }, m = /* @__PURE__ */ new Map(), I = {
+    for (const [I] of d)
+      (I === e || I.startsWith(e + ".")) && d.delete(I);
+    _++;
+  }, y = /* @__PURE__ */ new Map(), S = {
     removeValidation: (s) => {
-      s?.validationKey && b(s.validationKey);
+      s?.validationKey && M(s.validationKey);
     },
     revertToInitialState: (s) => {
       const e = o.getState().getInitialOptions(t)?.validation;
-      e?.key && b(e?.key), s?.validationKey && b(s.validationKey);
-      const v = o.getState().initialStateGlobal[t];
-      d.clear(), E++;
-      const N = p(v, []);
+      e?.key && M(e?.key), s?.validationKey && M(s.validationKey);
+      const I = o.getState().initialStateGlobal[t];
+      d.clear(), _++;
+      const V = p(I, []);
       J(() => {
-        B(t, N), x(t, v);
+        B(t, V), x(t, I);
         const k = o.getState().stateComponents.get(t);
         k && k.components.forEach((R) => {
           R.forceUpdate();
         });
         const c = et(t);
         c?.localStorage?.key && localStorage.removeItem(
-          c?.initState ? f + "-" + t + "-" + c?.localStorage?.key : t
+          c?.initState ? u + "-" + t + "-" + c?.localStorage?.key : t
         ), localStorage.removeItem(t);
       });
     },
     updateInitialState: (s) => {
-      d.clear(), E++;
+      d.clear(), _++;
       const e = Z(
         t,
         a,
-        u,
-        f
+        f,
+        u
       );
       return J(() => {
         nt(t, s), B(t, e), x(t, s);
-        const v = o.getState().stateComponents.get(t);
-        v && v.components.forEach((N) => {
-          N.forceUpdate();
+        const I = o.getState().stateComponents.get(t);
+        I && I.components.forEach((V) => {
+          V.forceUpdate();
         }), localStorage.removeItem(t);
       }), {
-        fetchId: (v) => e.get()[v]
+        fetchId: (I) => e.get()[I]
       };
     },
     _initialState: o.getState().initialStateGlobal[t],
@@ -380,22 +383,22 @@ function Z(t, a, u, f) {
       return !!(s && G(s, gt(t)));
     }
   };
-  function p(s, e = [], v) {
-    const N = e.map(String).join(".");
-    d.get(N);
+  function p(s, e = [], I) {
+    const V = e.map(String).join(".");
+    d.get(V);
     const k = function() {
       return o().getNestedState(t, e);
     };
-    Object.keys(I).forEach((P) => {
-      k[P] = I[P];
+    Object.keys(S).forEach((U) => {
+      k[U] = S[U];
     });
     const c = {
-      apply(P, i, $) {
+      apply(U, i, $) {
         return o().getNestedState(t, e);
       },
-      get(P, i) {
+      get(U, i) {
         if (i !== "then" && !i.startsWith("$") && i !== "stateMapNoRender") {
-          const n = e.join("."), r = `${t}////${u}`, l = o.getState().stateComponents.get(t);
+          const n = e.join("."), r = `${t}////${f}`, l = o.getState().stateComponents.get(t);
           if (l) {
             const g = l.components.get(r);
             g && (e.length > 0 || i === "get") && g.paths.add(n);
@@ -411,31 +414,31 @@ function Z(t, a, u, f) {
         if (Array.isArray(s)) {
           if (i === "getSelected")
             return () => {
-              const n = m.get(e.join("."));
+              const n = y.get(e.join("."));
               if (n !== void 0)
                 return p(
                   s[n],
                   [...e, n.toString()],
-                  v
+                  I
                 );
             };
           if (i === "stateMap" || i === "stateMapNoRender")
             return (n) => {
-              const r = v?.filtered?.some(
+              const r = I?.filtered?.some(
                 (g) => g.join(".") === e.join(".")
               ), l = r ? s : o.getState().getNestedState(t, e);
-              return i !== "stateMapNoRender" && (d.clear(), E++), l.map((g, S) => {
-                const _ = r && g.__origIndex ? g.__origIndex : S, O = p(
+              return i !== "stateMapNoRender" && (d.clear(), _++), l.map((g, m) => {
+                const E = r && g.__origIndex ? g.__origIndex : m, O = p(
                   g,
-                  [...e, _.toString()],
-                  v
+                  [...e, E.toString()],
+                  I
                 );
                 return n(
                   g,
                   O,
-                  S,
+                  m,
                   s,
-                  p(s, e, v)
+                  p(s, e, I)
                 );
               });
             };
@@ -451,27 +454,27 @@ function Z(t, a, u, f) {
             });
           if (i === "stateFlattenOn")
             return (n) => {
-              const l = v?.filtered?.some(
-                (S) => S.join(".") === e.join(".")
+              const l = I?.filtered?.some(
+                (m) => m.join(".") === e.join(".")
               ) ? s : o.getState().getNestedState(t, e);
-              d.clear(), E++;
+              d.clear(), _++;
               const g = l.flatMap(
-                (S, _) => S[n] ?? []
+                (m, E) => m[n] ?? []
               );
               return p(
                 g,
                 [...e, "[*]", n],
-                v
+                I
               );
             };
           if (i === "findWith")
             return (n, r) => {
               const l = s.findIndex(
-                (_) => _[n] === r
+                (E) => E[n] === r
               );
               if (l === -1) return;
-              const g = s[l], S = [...e, l.toString()];
-              return d.clear(), E++, d.clear(), E++, p(g, S);
+              const g = s[l], m = [...e, l.toString()];
+              return d.clear(), _++, d.clear(), _++, p(g, m);
             };
           if (i === "index")
             return (n) => {
@@ -485,22 +488,22 @@ function Z(t, a, u, f) {
             ));
           if (i === "uniqueInsert")
             return (n, r, l) => {
-              const g = o.getState().getNestedState(t, e), S = ft(n) ? n(g) : n;
-              let _ = null;
-              if (!g.some((A) => {
+              const g = o.getState().getNestedState(t, e), m = ft(n) ? n(g) : n;
+              let E = null;
+              if (!g.some((C) => {
                 if (r) {
                   const F = r.every(
-                    (W) => G(A[W], S[W])
+                    (W) => G(C[W], m[W])
                   );
-                  return F && (_ = A), F;
+                  return F && (E = C), F;
                 }
-                const j = G(A, S);
-                return j && (_ = A), j;
+                const j = G(C, m);
+                return j && (E = C), j;
               }))
-                w(e), st(a, S, e, t);
-              else if (l && _) {
-                const A = l(_), j = g.map(
-                  (F) => G(F, _) ? A : F
+                w(e), st(a, m, e, t);
+              else if (l && E) {
+                const C = l(E), j = g.map(
+                  (F) => G(F, E) ? C : F
                 );
                 w(e), q(a, j, e);
               }
@@ -511,14 +514,14 @@ function Z(t, a, u, f) {
             };
           if (i === "stateFilter")
             return (n) => {
-              const r = s.map((S, _) => ({
-                ...S,
-                __origIndex: _.toString()
+              const r = s.map((m, E) => ({
+                ...m,
+                __origIndex: E.toString()
               })), l = [], g = [];
-              for (let S = 0; S < r.length; S++)
-                n(r[S], S) && (l.push(S), g.push(r[S]));
-              return d.clear(), E++, p(g, e, {
-                filtered: [...v?.filtered || [], e],
+              for (let m = 0; m < r.length; m++)
+                n(r[m], m) && (l.push(m), g.push(r[m]));
+              return d.clear(), _++, p(g, e, {
+                filtered: [...I?.filtered || [], e],
                 validIndices: l
                 // Always pass validIndices, even if empty
               });
@@ -560,16 +563,16 @@ function Z(t, a, u, f) {
         }
         if (i === "_selected") {
           const n = e.slice(0, -1), r = n.join("."), l = o.getState().getNestedState(t, n);
-          return Array.isArray(l) ? Number(e[e.length - 1]) === m.get(r) : void 0;
+          return Array.isArray(l) ? Number(e[e.length - 1]) === y.get(r) : void 0;
         }
         if (i == "getLocalStorage")
-          return (n) => St(f + "-" + t + "-" + n);
+          return (n) => St(u + "-" + t + "-" + n);
         if (i === "setSelected")
           return (n) => {
             const r = e.slice(0, -1), l = Number(e[e.length - 1]), g = r.join(".");
-            n ? m.set(g, l) : m.delete(g);
-            const S = o.getState().getNestedState(t, [...r]);
-            q(a, S, r), w(r);
+            n ? y.set(g, l) : y.delete(g);
+            const m = o.getState().getNestedState(t, [...r]);
+            q(a, m, r), w(r);
           };
         if (e.length == 0) {
           if (i === "validateZodSchema")
@@ -579,23 +582,23 @@ function Z(t, a, u, f) {
                 throw new Error("Zod schema not found");
               if (!n?.key)
                 throw new Error("Validation key not found");
-              b(n.key);
+              M(n.key);
               const l = o.getState().cogsStateStore[t];
               try {
                 const g = o.getState().getValidationErrors(n.key);
-                g && g.length > 0 && g.forEach(([_]) => {
-                  _ && _.startsWith(n.key) && b(_);
+                g && g.length > 0 && g.forEach(([E]) => {
+                  E && E.startsWith(n.key) && M(E);
                 });
-                const S = n.zodSchema.safeParse(l);
-                return S.success ? !0 : (S.error.errors.forEach((O) => {
-                  const A = O.path, j = O.message, F = [n.key, ...A].join(".");
+                const m = n.zodSchema.safeParse(l);
+                return m.success ? !0 : (m.error.errors.forEach((O) => {
+                  const C = O.path, j = O.message, F = [n.key, ...C].join(".");
                   r(F, j);
                 }), mt(t), !1);
               } catch (g) {
                 return console.error("Zod schema validation failed", g), !1;
               }
             };
-          if (i === "_componentId") return u;
+          if (i === "_componentId") return f;
           if (i === "getComponents")
             return () => o().stateComponents.get(t);
           if (i === "getAllFormRefs")
@@ -607,9 +610,9 @@ function Z(t, a, u, f) {
           if (i === "_isLoading")
             return o.getState().isLoadingGlobal[t];
           if (i === "revertToInitialState")
-            return I.revertToInitialState;
-          if (i === "updateInitialState") return I.updateInitialState;
-          if (i === "removeValidation") return I.removeValidation;
+            return S.revertToInitialState;
+          if (i === "updateInitialState") return S.updateInitialState;
+          if (i === "removeValidation") return S.removeValidation;
         }
         if (i === "getFormRef")
           return () => lt.getState().getFormRef(t + "." + e.join("."));
@@ -624,13 +627,13 @@ function Z(t, a, u, f) {
               path: e,
               validationKey: o.getState().getInitialOptions(t)?.validation?.key || "",
               stateKey: t,
-              validIndices: v?.validIndices,
+              validIndices: I?.validIndices,
               children: n
             }
           );
         if (i === "_stateKey") return t;
         if (i === "_path") return e;
-        if (i === "_isServerSynced") return I._isServerSynced;
+        if (i === "_isServerSynced") return S._isServerSynced;
         if (i === "update")
           return (n, r) => {
             if (r?.debounce)
@@ -648,7 +651,7 @@ function Z(t, a, u, f) {
           };
         if (i === "formElement")
           return (n, r) => /* @__PURE__ */ it(
-            Vt,
+            Nt,
             {
               setState: a,
               stateKey: t,
@@ -657,13 +660,13 @@ function Z(t, a, u, f) {
               formOpts: r
             }
           );
-        const U = [...e, i], Q = o.getState().getNestedState(t, U);
-        return p(Q, U, v);
+        const P = [...e, i], Q = o.getState().getNestedState(t, P);
+        return p(Q, P, I);
       }
     }, R = new Proxy(k, c);
-    return d.set(N, {
+    return d.set(V, {
       proxy: R,
-      stateVersion: E
+      stateVersion: _
     }), R;
   }
   return p(
@@ -671,37 +674,37 @@ function Z(t, a, u, f) {
   );
 }
 function X(t) {
-  return H(Mt, { proxy: t });
+  return H(bt, { proxy: t });
 }
 function jt({
   proxy: t,
   rebuildStateShape: a
 }) {
-  const u = o().getNestedState(t._stateKey, t._path);
-  return Array.isArray(u) ? a(
-    u,
+  const f = o().getNestedState(t._stateKey, t._path);
+  return Array.isArray(f) ? a(
+    f,
     t._path
   ).stateMapNoRender(
-    (d, E, w, m, I) => t._mapFn(d, E, w, m, I)
+    (d, _, w, y, S) => t._mapFn(d, _, w, y, S)
   ) : null;
 }
-function Mt({
+function bt({
   proxy: t
 }) {
-  const a = z(null), u = `${t._stateKey}-${t._path.join(".")}`;
+  const a = z(null), f = `${t._stateKey}-${t._path.join(".")}`;
   return K(() => {
-    const f = a.current;
-    if (!f || !f.parentElement) return;
-    const d = f.parentElement, w = Array.from(d.childNodes).indexOf(f);
-    let m = d.getAttribute("data-parent-id");
-    m || (m = `parent-${crypto.randomUUID()}`, d.setAttribute("data-parent-id", m));
+    const u = a.current;
+    if (!u || !u.parentElement) return;
+    const d = u.parentElement, w = Array.from(d.childNodes).indexOf(u);
+    let y = d.getAttribute("data-parent-id");
+    y || (y = `parent-${crypto.randomUUID()}`, d.setAttribute("data-parent-id", y));
     const p = {
       instanceId: `instance-${crypto.randomUUID()}`,
-      parentId: m,
+      parentId: y,
       position: w,
       effect: t._effect
     };
-    o.getState().addSignalElement(u, p);
+    o.getState().addSignalElement(f, p);
     const s = o.getState().getNestedState(t._stateKey, t._path);
     let e;
     if (t._effect)
@@ -710,30 +713,30 @@ function Mt({
           "state",
           `return (${t._effect})(state)`
         )(s);
-      } catch (N) {
-        console.error("Error evaluating effect function during mount:", N), e = s;
+      } catch (V) {
+        console.error("Error evaluating effect function during mount:", V), e = s;
       }
     else
       e = s;
     e !== null && typeof e == "object" && (e = JSON.stringify(e));
-    const v = document.createTextNode(String(e));
-    f.replaceWith(v);
+    const I = document.createTextNode(String(e));
+    u.replaceWith(I);
   }, [t._stateKey, t._path.join("."), t._effect]), H("span", {
     ref: a,
     style: { display: "none" },
-    "data-signal-id": u
+    "data-signal-id": f
   });
 }
 function Jt(t) {
   const a = Et(
-    (u) => {
-      const f = o.getState().stateComponents.get(t._stateKey) || {
+    (f) => {
+      const u = o.getState().stateComponents.get(t._stateKey) || {
         components: /* @__PURE__ */ new Map()
       };
-      return f.components.set(t._stateKey, {
-        forceUpdate: u,
+      return u.components.set(t._stateKey, {
+        forceUpdate: f,
         paths: /* @__PURE__ */ new Set([t._path.join(".")])
-      }), () => f.components.delete(t._stateKey);
+      }), () => u.components.delete(t._stateKey);
     },
     () => o.getState().getNestedState(t._stateKey, t._path)
   );