cogsbox-state 0.5.397 → 0.5.398

package/dist/CogsState.jsx

@@ -1,63 +1,63 @@
 "use client";
-import { jsx as Ot } from "react/jsx-runtime";
-import { useState as K, useRef as q, useEffect as ot, useLayoutEffect as ct, useMemo as wt, createElement as lt, useSyncExternalStore as Ht, startTransition as Ft, useCallback as kt } from "react";
-import { transformStateFunc as Bt, isDeepEqual as J, isFunction as tt, getNestedValue as Z, getDifferences as _t, debounce as Wt } from "./utility.js";
-import { pushFunc as Et, updateFn as it, cutFunc as ht, ValidationWrapper as zt, FormControlComponent as qt } from "./Functions.jsx";
+import { jsx as It } from "react/jsx-runtime";
+import { useState as K, useRef as q, useEffect as ot, useLayoutEffect as ct, useMemo as wt, createElement as lt, useSyncExternalStore as Ft, startTransition as Bt, useCallback as kt } from "react";
+import { transformStateFunc as Wt, isDeepEqual as J, isFunction as tt, getNestedValue as Z, getDifferences as _t, debounce as zt } from "./utility.js";
+import { ValidationWrapper as bt, pushFunc as Ot, updateFn as it, cutFunc as ht, FormControlComponent as qt } from "./Functions.jsx";
 import Jt from "superjson";
 import { v4 as At } from "uuid";
 import "zod";
-import { getGlobalStore as o, formRefStore as bt } from "./store.js";
-import { useCogsConfig as Gt } from "./CogsStateClient.jsx";
+import { getGlobalStore as o, formRefStore as Mt } from "./store.js";
+import { useCogsConfig as Lt } from "./CogsStateClient.jsx";
 import { applyPatch as Yt } from "fast-json-patch";
 import Zt from "react-use-measure";
-function Mt(t, c) {
-  const m = o.getState().getInitialOptions, g = o.getState().setInitialStateOptions, I = m(t) || {};
+function xt(t, c) {
+  const m = o.getState().getInitialOptions, g = o.getState().setInitialStateOptions, T = m(t) || {};
   g(t, {
-    ...I,
+    ...T,
     ...c
   });
 }
-function xt({
+function Pt({
   stateKey: t,
   options: c,
   initialOptionsPart: m
 }) {
-  const g = rt(t) || {}, I = m[t] || {}, N = o.getState().setInitialStateOptions, p = { ...I, ...g };
+  const g = rt(t) || {}, T = m[t] || {}, C = o.getState().setInitialStateOptions, E = { ...T, ...g };
   let v = !1;
   if (c)
     for (const s in c)
-      p.hasOwnProperty(s) ? (s == "localStorage" && c[s] && p[s].key !== c[s]?.key && (v = !0, p[s] = c[s]), s == "initialState" && c[s] && p[s] !== c[s] && // Different references
-      !J(p[s], c[s]) && (v = !0, p[s] = c[s])) : (v = !0, p[s] = c[s]);
-  v && N(t, p);
+      E.hasOwnProperty(s) ? (s == "localStorage" && c[s] && E[s].key !== c[s]?.key && (v = !0, E[s] = c[s]), s == "initialState" && c[s] && E[s] !== c[s] && // Different references
+      !J(E[s], c[s]) && (v = !0, E[s] = c[s])) : (v = !0, E[s] = c[s]);
+  v && C(t, E);
 }
-function Ie(t, { formElements: c, validation: m }) {
+function Te(t, { formElements: c, validation: m }) {
   return { initialState: t, formElements: c, validation: m };
 }
 const ve = (t, c) => {
   let m = t;
-  const [g, I] = Bt(m);
-  (Object.keys(I).length > 0 || c && Object.keys(c).length > 0) && Object.keys(I).forEach((v) => {
-    I[v] = I[v] || {}, I[v].formElements = {
+  const [g, T] = Wt(m);
+  (Object.keys(T).length > 0 || c && Object.keys(c).length > 0) && Object.keys(T).forEach((v) => {
+    T[v] = T[v] || {}, T[v].formElements = {
       ...c?.formElements,
       // Global defaults first
       ...c?.validation,
-      ...I[v].formElements || {}
+      ...T[v].formElements || {}
       // State-specific overrides
-    }, rt(v) || o.getState().setInitialStateOptions(v, I[v]);
+    }, rt(v) || o.getState().setInitialStateOptions(v, T[v]);
   }), o.getState().setInitialStates(g), o.getState().setCreatedState(g);
-  const N = (v, s) => {
-    const [T] = K(s?.componentId ?? At());
-    xt({
+  const C = (v, s) => {
+    const [I] = K(s?.componentId ?? At());
+    Pt({
       stateKey: v,
       options: s,
-      initialOptionsPart: I
+      initialOptionsPart: T
     });
-    const r = o.getState().cogsStateStore[v] || g[v], S = s?.modifyState ? s.modifyState(r) : r, [W, j] = ne(
-      S,
+    const r = o.getState().cogsStateStore[v] || g[v], f = s?.modifyState ? s.modifyState(r) : r, [W, j] = ne(
+      f,
       {
         stateKey: v,
         syncUpdate: s?.syncUpdate,
-        componentId: T,
+        componentId: I,
         localStorage: s?.localStorage,
         middleware: s?.middleware,
         enabledSync: s?.enabledSync,
@@ -70,47 +70,47 @@ const ve = (t, c) => {
     );
     return j;
   };
-  function p(v, s) {
-    xt({ stateKey: v, options: s, initialOptionsPart: I }), s.localStorage && te(v, s), dt(v);
+  function E(v, s) {
+    Pt({ stateKey: v, options: s, initialOptionsPart: T }), s.localStorage && te(v, s), dt(v);
   }
-  return { useCogsState: N, setCogsOptions: p };
+  return { useCogsState: C, setCogsOptions: E };
 }, {
   setUpdaterState: Tt,
   setState: nt,
   getInitialOptions: rt,
-  getKeyState: Lt,
+  getKeyState: Rt,
   getValidationErrors: Xt,
   setStateLog: Qt,
   updateInitialStateGlobal: Nt,
-  addValidationError: Rt,
+  addValidationError: Dt,
   removeValidationError: X,
   setServerSyncActions: Kt
-} = o.getState(), Pt = (t, c, m, g, I) => {
+} = o.getState(), Vt = (t, c, m, g, T) => {
   m?.log && console.log(
     "saving to localstorage",
     c,
     m.localStorage?.key,
     g
   );
-  const N = tt(m?.localStorage?.key) ? m.localStorage?.key(t) : m?.localStorage?.key;
-  if (N && g) {
-    const p = `${g}-${c}-${N}`;
+  const C = tt(m?.localStorage?.key) ? m.localStorage?.key(t) : m?.localStorage?.key;
+  if (C && g) {
+    const E = `${g}-${c}-${C}`;
     let v;
     try {
-      v = vt(p)?.lastSyncedWithServer;
+      v = yt(E)?.lastSyncedWithServer;
     } catch {
     }
     const s = {
       state: t,
       lastUpdated: Date.now(),
-      lastSyncedWithServer: I ?? v
-    }, T = Jt.serialize(s);
+      lastSyncedWithServer: T ?? v
+    }, I = Jt.serialize(s);
     window.localStorage.setItem(
-      p,
-      JSON.stringify(T.json)
+      E,
+      JSON.stringify(I.json)
     );
   }
-}, vt = (t) => {
+}, yt = (t) => {
   if (!t) return null;
   try {
     const c = window.localStorage.getItem(t);
@@ -119,27 +119,27 @@ const ve = (t, c) => {
     return console.error("Error loading from localStorage:", c), null;
   }
 }, te = (t, c) => {
-  const m = o.getState().cogsStateStore[t], { sessionId: g } = Gt(), I = tt(c?.localStorage?.key) ? c.localStorage.key(m) : c?.localStorage?.key;
-  if (I && g) {
-    const N = vt(
-      `${g}-${t}-${I}`
+  const m = o.getState().cogsStateStore[t], { sessionId: g } = Lt(), T = tt(c?.localStorage?.key) ? c.localStorage.key(m) : c?.localStorage?.key;
+  if (T && g) {
+    const C = yt(
+      `${g}-${t}-${T}`
     );
-    if (N && N.lastUpdated > (N.lastSyncedWithServer || 0))
-      return nt(t, N.state), dt(t), !0;
+    if (C && C.lastUpdated > (C.lastSyncedWithServer || 0))
+      return nt(t, C.state), dt(t), !0;
   }
   return !1;
-}, Dt = (t, c, m, g, I, N) => {
-  const p = {
+}, jt = (t, c, m, g, T, C) => {
+  const E = {
     initialState: c,
-    updaterState: It(
+    updaterState: vt(
       t,
       g,
-      I,
-      N
+      T,
+      C
     ),
     state: m
   };
-  Nt(t, p.initialState), Tt(t, p.updaterState), nt(t, p.state);
+  Nt(t, E.initialState), Tt(t, E.updaterState), nt(t, E.state);
 }, dt = (t) => {
   const c = o.getState().stateComponents.get(t);
   if (!c) return;
@@ -152,10 +152,10 @@ const ve = (t, c) => {
 }, ye = (t, c) => {
   const m = o.getState().stateComponents.get(t);
   if (m) {
-    const g = `${t}////${c}`, I = m.components.get(g);
-    if ((I ? Array.isArray(I.reactiveType) ? I.reactiveType : [I.reactiveType || "component"] : null)?.includes("none"))
+    const g = `${t}////${c}`, T = m.components.get(g);
+    if ((T ? Array.isArray(T.reactiveType) ? T.reactiveType : [T.reactiveType || "component"] : null)?.includes("none"))
       return;
-    I && I.forceUpdate();
+    T && T.forceUpdate();
   }
 }, ee = (t, c, m, g) => {
   switch (t) {
@@ -184,63 +184,63 @@ function ne(t, {
   stateKey: c,
   serverSync: m,
   localStorage: g,
-  formElements: I,
-  reactiveDeps: N,
-  reactiveType: p,
+  formElements: T,
+  reactiveDeps: C,
+  reactiveType: E,
   componentId: v,
   initialState: s,
-  syncUpdate: T,
+  syncUpdate: I,
   dependencies: r,
-  serverState: S
+  serverState: f
 } = {}) {
-  const [W, j] = K({}), { sessionId: U } = Gt();
+  const [W, j] = K({}), { sessionId: U } = Lt();
   let z = !c;
   const [h] = K(c ?? At()), l = o.getState().stateLog[h], ut = q(/* @__PURE__ */ new Set()), et = q(v ?? At()), L = q(
     null
   );
   L.current = rt(h) ?? null, ot(() => {
-    if (T && T.stateKey === h && T.path?.[0]) {
+    if (I && I.stateKey === h && I.path?.[0]) {
       nt(h, (n) => ({
         ...n,
-        [T.path[0]]: T.newValue
+        [I.path[0]]: I.newValue
       }));
-      const e = `${T.stateKey}:${T.path.join(".")}`;
+      const e = `${I.stateKey}:${I.path.join(".")}`;
       o.getState().setSyncInfo(e, {
-        timeStamp: T.timeStamp,
-        userId: T.userId
+        timeStamp: I.timeStamp,
+        userId: I.userId
       });
     }
-  }, [T]), ot(() => {
+  }, [I]), ot(() => {
     if (s) {
-      Mt(h, {
+      xt(h, {
         initialState: s
       });
       const e = L.current, a = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, i = o.getState().initialStateGlobal[h];
       if (!(i && !J(i, s) || !i) && !a)
         return;
       let u = null;
-      const E = tt(e?.localStorage?.key) ? e?.localStorage?.key(s) : e?.localStorage?.key;
-      E && U && (u = vt(`${U}-${h}-${E}`));
-      let y = s, w = !1;
-      const C = a ? Date.now() : 0, A = u?.lastUpdated || 0, b = u?.lastSyncedWithServer || 0;
-      a && C > A ? (y = e.serverState.data, w = !0) : u && A > b && (y = u.state, e?.localStorage?.onChange && e?.localStorage?.onChange(y)), o.getState().initializeShadowState(h, s), Dt(
+      const y = tt(e?.localStorage?.key) ? e?.localStorage?.key(s) : e?.localStorage?.key;
+      y && U && (u = yt(`${U}-${h}-${y}`));
+      let p = s, _ = !1;
+      const N = a ? Date.now() : 0, w = u?.lastUpdated || 0, k = u?.lastSyncedWithServer || 0;
+      a && N > w ? (p = e.serverState.data, _ = !0) : u && w > k && (p = u.state, e?.localStorage?.onChange && e?.localStorage?.onChange(p)), o.getState().initializeShadowState(h, s), jt(
         h,
         s,
-        y,
+        p,
         at,
         et.current,
         U
-      ), w && E && U && Pt(y, h, e, U, Date.now()), dt(h), (Array.isArray(p) ? p : [p || "component"]).includes("none") || j({});
+      ), _ && y && U && Vt(p, h, e, U, Date.now()), dt(h), (Array.isArray(E) ? E : [E || "component"]).includes("none") || j({});
     }
   }, [
     s,
-    S?.status,
-    S?.data,
+    f?.status,
+    f?.data,
     ...r || []
   ]), ct(() => {
-    z && Mt(h, {
+    z && xt(h, {
       serverSync: m,
-      formElements: I,
+      formElements: T,
       initialState: s,
       localStorage: g,
       middleware: L.current?.middleware
@@ -252,8 +252,8 @@ function ne(t, {
       forceUpdate: () => j({}),
       paths: /* @__PURE__ */ new Set(),
       deps: [],
-      depsFunction: N || void 0,
-      reactiveType: p ?? ["component", "deps"]
+      depsFunction: C || void 0,
+      reactiveType: E ?? ["component", "deps"]
     }), o.getState().stateComponents.set(h, n), j({}), () => {
       n && (n.components.delete(e), n.components.size === 0 && o.getState().stateComponents.delete(h));
     };
@@ -263,70 +263,70 @@ function ne(t, {
       const u = `${h}-${n.join(".")}`;
       ut.current.add(u);
     }
-    const f = o.getState();
+    const S = o.getState();
     nt(h, (u) => {
-      const E = tt(e) ? e(u) : e, y = `${h}-${n.join(".")}`;
-      if (y) {
-        let M = !1, $ = f.signalDomElements.get(y);
+      const y = tt(e) ? e(u) : e, p = `${h}-${n.join(".")}`;
+      if (p) {
+        let M = !1, $ = S.signalDomElements.get(p);
         if ((!$ || $.size === 0) && (a.updateType === "insert" || a.updateType === "cut")) {
-          const R = n.slice(0, -1), V = Z(E, R);
+          const R = n.slice(0, -1), V = Z(y, R);
           if (Array.isArray(V)) {
             M = !0;
             const O = `${h}-${R.join(".")}`;
-            $ = f.signalDomElements.get(O);
+            $ = S.signalDomElements.get(O);
           }
         }
         if ($) {
-          const R = M ? Z(E, n.slice(0, -1)) : Z(E, n);
-          $.forEach(({ parentId: V, position: O, effect: _ }) => {
+          const R = M ? Z(y, n.slice(0, -1)) : Z(y, n);
+          $.forEach(({ parentId: V, position: O, effect: A }) => {
             const D = document.querySelector(
               `[data-parent-id="${V}"]`
             );
             if (D) {
               const G = Array.from(D.childNodes);
               if (G[O]) {
-                const B = _ ? new Function("state", `return (${_})(state)`)(R) : R;
+                const B = A ? new Function("state", `return (${A})(state)`)(R) : R;
                 G[O].textContent = String(B);
               }
             }
           });
         }
       }
-      console.log("shadowState", f.shadowStateStore), a.updateType === "update" && (i || L.current?.validation?.key) && n && X(
+      console.log("shadowState", S.shadowStateStore), a.updateType === "update" && (i || L.current?.validation?.key) && n && X(
         (i || L.current?.validation?.key) + "." + n.join(".")
       );
-      const w = n.slice(0, n.length - 1);
+      const _ = n.slice(0, n.length - 1);
       a.updateType === "cut" && L.current?.validation?.key && X(
-        L.current?.validation?.key + "." + w.join(".")
+        L.current?.validation?.key + "." + _.join(".")
       ), a.updateType === "insert" && L.current?.validation?.key && Xt(
-        L.current?.validation?.key + "." + w.join(".")
+        L.current?.validation?.key + "." + _.join(".")
       ).filter(([$, R]) => {
         let V = $?.split(".").length;
-        if ($ == w.join(".") && V == w.length - 1) {
-          let O = $ + "." + w;
-          X($), Rt(O, R);
+        if ($ == _.join(".") && V == _.length - 1) {
+          let O = $ + "." + _;
+          X($), Dt(O, R);
         }
       });
-      const C = f.stateComponents.get(h);
-      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", C), C) {
-        const M = _t(u, E), $ = new Set(M), R = a.updateType === "update" ? n.join(".") : n.slice(0, -1).join(".") || "";
+      const N = S.stateComponents.get(h);
+      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", N), N) {
+        const M = _t(u, y), $ = new Set(M), R = a.updateType === "update" ? n.join(".") : n.slice(0, -1).join(".") || "";
         for (const [
           V,
           O
-        ] of C.components.entries()) {
-          let _ = !1;
+        ] of N.components.entries()) {
+          let A = !1;
           const D = Array.isArray(O.reactiveType) ? O.reactiveType : [O.reactiveType || "component"];
           if (console.log("component", O), !D.includes("none")) {
             if (D.includes("all")) {
               O.forceUpdate();
               continue;
             }
-            if (D.includes("component") && ((O.paths.has(R) || O.paths.has("")) && (_ = !0), !_))
+            if (D.includes("component") && ((O.paths.has(R) || O.paths.has("")) && (A = !0), !A))
               for (const G of $) {
                 let B = G;
                 for (; ; ) {
                   if (O.paths.has(B)) {
-                    _ = !0;
+                    A = !0;
                     break;
                   }
                   const st = B.lastIndexOf(".");
@@ -338,7 +338,7 @@ function ne(t, {
                     if (!isNaN(
                       Number(B.substring(st + 1))
                     ) && O.paths.has(gt)) {
-                      _ = !0;
+                      A = !0;
                       break;
                     }
                     B = gt;
@@ -347,57 +347,57 @@ function ne(t, {
                   if (B === "")
                     break;
                 }
-                if (_) break;
+                if (A) break;
               }
-            if (!_ && D.includes("deps") && O.depsFunction) {
-              const G = O.depsFunction(E);
+            if (!A && D.includes("deps") && O.depsFunction) {
+              const G = O.depsFunction(y);
               let B = !1;
-              typeof G == "boolean" ? G && (B = !0) : J(O.deps, G) || (O.deps = G, B = !0), B && (_ = !0);
+              typeof G == "boolean" ? G && (B = !0) : J(O.deps, G) || (O.deps = G, B = !0), B && (A = !0);
             }
-            _ && O.forceUpdate();
+            A && O.forceUpdate();
           }
         }
       }
-      const A = Date.now();
+      const w = Date.now();
       n = n.map((M, $) => {
-        const R = n.slice(0, -1), V = Z(E, R);
+        const R = n.slice(0, -1), V = Z(y, R);
         return $ === n.length - 1 && ["insert", "cut"].includes(a.updateType) ? (V.length - 1).toString() : M;
       });
-      const { oldValue: b, newValue: F } = ee(
+      const { oldValue: k, newValue: H } = ee(
         a.updateType,
         u,
-        E,
+        y,
         n
       ), Y = {
-        timeStamp: A,
+        timeStamp: w,
         stateKey: h,
         path: n,
         updateType: a.updateType,
         status: "new",
-        oldValue: b,
-        newValue: F
+        oldValue: k,
+        newValue: H
       };
       switch (a.updateType) {
         case "update":
-          f.updateShadowAtPath(h, n, E);
+          S.updateShadowAtPath(h, n, y);
           break;
         case "insert":
           const M = n.slice(0, -1);
-          f.insertShadowArrayElement(h, M, F);
+          S.insertShadowArrayElement(h, M, H);
           break;
         case "cut":
           const $ = n.slice(0, -1), R = parseInt(n[n.length - 1]);
-          f.removeShadowArrayElement(h, $, R);
+          S.removeShadowArrayElement(h, $, R);
           break;
       }
       if (Qt(h, (M) => {
         const R = [...M ?? [], Y].reduce((V, O) => {
-          const _ = `${O.stateKey}:${JSON.stringify(O.path)}`, D = V.get(_);
-          return D ? (D.timeStamp = Math.max(D.timeStamp, O.timeStamp), D.newValue = O.newValue, D.oldValue = D.oldValue ?? O.oldValue, D.updateType = O.updateType) : V.set(_, { ...O }), V;
+          const A = `${O.stateKey}:${JSON.stringify(O.path)}`, D = V.get(A);
+          return D ? (D.timeStamp = Math.max(D.timeStamp, O.timeStamp), D.newValue = O.newValue, D.oldValue = D.oldValue ?? O.oldValue, D.updateType = O.updateType) : V.set(A, { ...O }), V;
         }, /* @__PURE__ */ new Map());
         return Array.from(R.values());
-      }), Pt(
-        E,
+      }), Vt(
+        y,
         h,
         L.current,
         U
@@ -405,68 +405,68 @@ function ne(t, {
         updateLog: l,
         update: Y
       }), L.current?.serverSync) {
-        const M = f.serverState[h], $ = L.current?.serverSync;
+        const M = S.serverState[h], $ = L.current?.serverSync;
         Kt(h, {
-          syncKey: typeof $.syncKey == "string" ? $.syncKey : $.syncKey({ state: E }),
+          syncKey: typeof $.syncKey == "string" ? $.syncKey : $.syncKey({ state: y }),
           rollBackState: M,
           actionTimeStamp: Date.now() + ($.debounce ?? 3e3),
           status: "waiting"
         });
       }
-      return E;
+      return y;
     });
   };
   o.getState().updaterState[h] || (Tt(
     h,
-    It(
+    vt(
       h,
       at,
       et.current,
       U
     )
   ), o.getState().cogsStateStore[h] || nt(h, t), o.getState().initialStateGlobal[h] || Nt(h, t));
-  const d = wt(() => It(
+  const d = wt(() => vt(
     h,
     at,
     et.current,
     U
   ), [h, U]);
-  return [Lt(h), d];
+  return [Rt(h), d];
 }
-function It(t, c, m, g) {
-  const I = /* @__PURE__ */ new Map();
-  let N = 0;
-  const p = (T) => {
-    const r = T.join(".");
-    for (const [S] of I)
-      (S === r || S.startsWith(r + ".")) && I.delete(S);
-    N++;
+function vt(t, c, m, g) {
+  const T = /* @__PURE__ */ new Map();
+  let C = 0;
+  const E = (I) => {
+    const r = I.join(".");
+    for (const [f] of T)
+      (f === r || f.startsWith(r + ".")) && T.delete(f);
+    C++;
   }, v = {
-    removeValidation: (T) => {
-      T?.validationKey && X(T.validationKey);
+    removeValidation: (I) => {
+      I?.validationKey && X(I.validationKey);
     },
-    revertToInitialState: (T) => {
+    revertToInitialState: (I) => {
       const r = o.getState().getInitialOptions(t)?.validation;
-      r?.key && X(r?.key), T?.validationKey && X(T.validationKey);
-      const S = o.getState().initialStateGlobal[t];
-      o.getState().clearSelectedIndexesForState(t), I.clear(), N++;
-      const W = s(S, []), j = rt(t), U = tt(j?.localStorage?.key) ? j?.localStorage?.key(S) : j?.localStorage?.key, z = `${g}-${t}-${U}`;
-      z && localStorage.removeItem(z), Tt(t, W), nt(t, S);
+      r?.key && X(r?.key), I?.validationKey && X(I.validationKey);
+      const f = o.getState().initialStateGlobal[t];
+      o.getState().clearSelectedIndexesForState(t), T.clear(), C++;
+      const W = s(f, []), j = rt(t), U = tt(j?.localStorage?.key) ? j?.localStorage?.key(f) : j?.localStorage?.key, z = `${g}-${t}-${U}`;
+      z && localStorage.removeItem(z), Tt(t, W), nt(t, f);
       const h = o.getState().stateComponents.get(t);
       return h && h.components.forEach((l) => {
         l.forceUpdate();
-      }), S;
+      }), f;
     },
-    updateInitialState: (T) => {
-      I.clear(), N++;
-      const r = It(
+    updateInitialState: (I) => {
+      T.clear(), C++;
+      const r = vt(
         t,
         c,
         m,
         g
-      ), S = o.getState().initialStateGlobal[t], W = rt(t), j = tt(W?.localStorage?.key) ? W?.localStorage?.key(S) : W?.localStorage?.key, U = `${g}-${t}-${j}`;
-      return localStorage.getItem(U) && localStorage.removeItem(U), Ft(() => {
-        Nt(t, T), o.getState().initializeShadowState(t, T), Tt(t, r), nt(t, T);
+      ), f = o.getState().initialStateGlobal[t], W = rt(t), j = tt(W?.localStorage?.key) ? W?.localStorage?.key(f) : W?.localStorage?.key, U = `${g}-${t}-${j}`;
+      return localStorage.getItem(U) && localStorage.removeItem(U), Bt(() => {
+        Nt(t, I), o.getState().initializeShadowState(t, I), Tt(t, r), nt(t, I);
         const z = o.getState().stateComponents.get(t);
         z && z.components.forEach((h) => {
           h.forceUpdate();
@@ -479,13 +479,13 @@ function It(t, c, m, g) {
     _serverState: o.getState().serverState[t],
     _isLoading: o.getState().isLoadingGlobal[t],
     _isServerSynced: () => {
-      const T = o.getState().serverState[t];
-      return !!(T && J(T, Lt(t)));
+      const I = o.getState().serverState[t];
+      return !!(I && J(I, Rt(t)));
     }
   };
-  function s(T, r = [], S) {
+  function s(I, r = [], f) {
     const W = r.map(String).join(".");
-    I.get(W);
+    T.get(W);
     const j = function() {
       return o().getNestedState(t, r);
     };
@@ -499,7 +499,7 @@ function It(t, c, m, g) {
         ), console.trace("Apply trap stack trace"), o().getNestedState(t, r);
       },
       get(h, l) {
-        S?.validIndices && !Array.isArray(T) && (S = { ...S, validIndices: void 0 });
+        f?.validIndices && !Array.isArray(I) && (f = { ...f, validIndices: void 0 });
         const ut = /* @__PURE__ */ new Set([
           "insert",
           "cut",
@@ -530,8 +530,8 @@ function It(t, c, m, g) {
             if (n && !n.paths.has("")) {
               const a = r.join(".");
               let i = !0;
-              for (const f of n.paths)
-                if (a.startsWith(f) && (a === f || a[f.length] === ".")) {
+              for (const S of n.paths)
+                if (a.startsWith(S) && (a === S || a[S.length] === ".")) {
                   i = !1;
                   break;
                 }
@@ -554,11 +554,11 @@ function It(t, c, m, g) {
               const i = await e.action(n);
               if (i && !i.success && i.errors && a) {
                 o.getState().removeValidationError(a), i.errors.forEach((u) => {
-                  const E = [a, ...u.path].join(".");
-                  o.getState().addValidationError(E, u.message);
+                  const y = [a, ...u.path].join(".");
+                  o.getState().addValidationError(y, u.message);
                 });
-                const f = o.getState().stateComponents.get(t);
-                f && f.components.forEach((u) => {
+                const S = o.getState().stateComponents.get(t);
+                S && S.components.forEach((u) => {
                   u.forceUpdate();
                 });
               }
@@ -591,10 +591,10 @@ function It(t, c, m, g) {
               throw new Error("Validation key not found");
             return o.getState().getValidationErrors(d.key + "." + r.join("."));
           };
-        if (Array.isArray(T)) {
-          const d = () => S?.validIndices ? T.map((n, a) => ({
+        if (Array.isArray(I)) {
+          const d = () => f?.validIndices ? I.map((n, a) => ({
             item: n,
-            originalIndex: S.validIndices[a]
+            originalIndex: f.validIndices[a]
           })) : o.getState().getNestedState(t, r).map((n, a) => ({
             item: n,
             originalIndex: a
@@ -604,9 +604,9 @@ function It(t, c, m, g) {
               const e = o.getState().getSelectedIndex(t, r.join("."));
               if (e !== void 0)
                 return s(
-                  T[e],
+                  I[e],
                   [...r, e.toString()],
-                  S
+                  f
                 );
             };
           if (l === "clearSelected")
@@ -621,117 +621,117 @@ function It(t, c, m, g) {
                 itemHeight: n = 50,
                 overscan: a = 6,
                 stickToBottom: i = !1,
-                dependencies: f = []
-              } = e, u = q(!1), E = q(null), [y, w] = K({
+                dependencies: S = []
+              } = e, u = q(!1), y = q(null), [p, _] = K({
                 startIndex: 0,
                 endIndex: 10
-              }), [C, A] = K("IDLE_AT_TOP"), b = q(!1), F = q(0), Y = q(f), M = q(0), [$, R] = K(0), V = q(null);
+              }), [N, w] = K("IDLE_AT_TOP"), k = q(!1), H = q(0), Y = q(S), M = q(0), [$, R] = K(0), V = q(null);
               ot(() => o.getState().subscribeToShadowState(t, () => {
                 R((x) => x + 1);
               }), [t]);
               const O = o().getNestedState(
                 t,
                 r
-              ), _ = O.length, { totalHeight: D, positions: G } = wt(() => {
-                const k = o.getState().getShadowMetadata(t, r) || [];
+              ), A = O.length, { totalHeight: D, positions: G } = wt(() => {
+                const b = o.getState().getShadowMetadata(t, r) || [];
                 let x = 0;
-                const H = [];
-                for (let P = 0; P < _; P++) {
-                  H[P] = x;
-                  const Q = k[P]?.virtualizer?.itemHeight;
+                const F = [];
+                for (let P = 0; P < A; P++) {
+                  F[P] = x;
+                  const Q = b[P]?.virtualizer?.itemHeight;
                   x += Q || n;
                 }
-                return { totalHeight: x, positions: H };
+                return { totalHeight: x, positions: F };
               }, [
-                _,
+                A,
                 t,
                 r.join("."),
                 n,
                 $
               ]), B = wt(() => {
-                const k = Math.max(0, y.startIndex), x = Math.min(_, y.endIndex), H = Array.from(
-                  { length: x - k },
-                  (Q, ft) => k + ft
-                ), P = H.map((Q) => O[Q]);
+                const b = Math.max(0, p.startIndex), x = Math.min(A, p.endIndex), F = Array.from(
+                  { length: x - b },
+                  (Q, ft) => b + ft
+                ), P = F.map((Q) => O[Q]);
                 return s(P, r, {
-                  ...S,
-                  validIndices: H
+                  ...f,
+                  validIndices: F
                 });
-              }, [y.startIndex, y.endIndex, O, _]);
+              }, [p.startIndex, p.endIndex, O, A]);
               ct(() => {
-                const k = E.current;
-                if (!k) return;
-                const x = _ > F.current;
+                const b = y.current;
+                if (!b) return;
+                const x = A > H.current;
                 if (x && V.current) {
-                  const { top: H, height: P } = V.current;
-                  b.current = !0, k.scrollTop = H + (k.scrollHeight - P), console.log(
-                    `ANCHOR RESTORED to scrollTop: ${k.scrollTop}`
+                  const { top: F, height: P } = V.current;
+                  k.current = !0, b.scrollTop = F + (b.scrollHeight - P), console.log(
+                    `ANCHOR RESTORED to scrollTop: ${b.scrollTop}`
                   ), setTimeout(() => {
-                    b.current = !1;
+                    k.current = !1;
                   }, 100), V.current = null;
                 } else {
                   if (!J(
-                    f,
+                    S,
                     Y.current
                   )) {
-                    console.log("TRANSITION: Deps changed -> IDLE_AT_TOP"), A("IDLE_AT_TOP");
+                    console.log("TRANSITION: Deps changed -> IDLE_AT_TOP"), w("IDLE_AT_TOP");
                     return;
                   }
-                  x && C === "LOCKED_AT_BOTTOM" && i && (console.log(
+                  x && N === "LOCKED_AT_BOTTOM" && i && (console.log(
                     "TRANSITION: New items arrived while locked -> GETTING_HEIGHTS"
-                  ), A("GETTING_HEIGHTS"));
+                  ), w("GETTING_HEIGHTS"));
                 }
-                F.current = _, Y.current = f;
-              }, [_, ...f]), ct(() => {
-                const k = E.current;
-                if (!k) return;
+                H.current = A, Y.current = S;
+              }, [A, ...S]), ct(() => {
+                const b = y.current;
+                if (!b) return;
                 let x;
-                if (C === "IDLE_AT_TOP" && i && _ > 0)
+                if (N === "IDLE_AT_TOP" && i && A > 0)
                   console.log(
                     "ACTION (IDLE_AT_TOP): Data has arrived -> GETTING_HEIGHTS"
-                  ), A("GETTING_HEIGHTS");
-                else if (C === "GETTING_HEIGHTS")
+                  ), w("GETTING_HEIGHTS");
+                else if (N === "GETTING_HEIGHTS")
                   console.log(
                     "ACTION (GETTING_HEIGHTS): Setting range to end and starting loop."
-                  ), w({
-                    startIndex: Math.max(0, _ - 10 - a),
-                    endIndex: _
+                  ), _({
+                    startIndex: Math.max(0, A - 10 - a),
+                    endIndex: A
                   }), x = setInterval(() => {
-                    const H = _ - 1;
-                    ((o.getState().getShadowMetadata(t, r) || [])[H]?.virtualizer?.itemHeight || 0) > 0 && (clearInterval(x), u.current || (console.log(
+                    const F = A - 1;
+                    ((o.getState().getShadowMetadata(t, r) || [])[F]?.virtualizer?.itemHeight || 0) > 0 && (clearInterval(x), u.current || (console.log(
                       "ACTION (GETTING_HEIGHTS): Measurement success -> SCROLLING_TO_BOTTOM"
-                    ), A("SCROLLING_TO_BOTTOM")));
+                    ), w("SCROLLING_TO_BOTTOM")));
                   }, 100);
-                else if (C === "SCROLLING_TO_BOTTOM") {
+                else if (N === "SCROLLING_TO_BOTTOM") {
                   console.log(
                     "ACTION (SCROLLING_TO_BOTTOM): Executing scroll."
-                  ), b.current = !0;
-                  const H = F.current === 0 ? "auto" : "smooth";
-                  k.scrollTo({
-                    top: k.scrollHeight,
-                    behavior: H
+                  ), k.current = !0;
+                  const F = H.current === 0 ? "auto" : "smooth";
+                  b.scrollTo({
+                    top: b.scrollHeight,
+                    behavior: F
                   });
                   const P = setTimeout(
                     () => {
                       console.log(
                         "ACTION (SCROLLING_TO_BOTTOM): Scroll finished -> LOCKED_AT_BOTTOM"
-                      ), b.current = !1, u.current = !1, A("LOCKED_AT_BOTTOM");
+                      ), k.current = !1, u.current = !1, w("LOCKED_AT_BOTTOM");
                     },
-                    H === "smooth" ? 500 : 50
+                    F === "smooth" ? 500 : 50
                   );
                   return () => clearTimeout(P);
                 }
                 return () => {
                   x && clearInterval(x);
                 };
-              }, [C, _, G]), ot(() => {
-                const k = E.current;
-                if (!k) return;
-                const x = n, H = () => {
-                  if (b.current)
+              }, [N, A, G]), ot(() => {
+                const b = y.current;
+                if (!b) return;
+                const x = n, F = () => {
+                  if (k.current)
                     return;
-                  const { scrollTop: P, scrollHeight: Q, clientHeight: ft } = k;
-                  if (Q - P - ft < 10 ? (C !== "LOCKED_AT_BOTTOM" && A("LOCKED_AT_BOTTOM"), V.current = null) : (C !== "IDLE_NOT_AT_BOTTOM" && A("IDLE_NOT_AT_BOTTOM"), V.current = {
+                  const { scrollTop: P, scrollHeight: Q, clientHeight: ft } = b;
+                  if (Q - P - ft < 10 ? (N !== "LOCKED_AT_BOTTOM" && w("LOCKED_AT_BOTTOM"), V.current = null) : (N !== "IDLE_NOT_AT_BOTTOM" && w("IDLE_NOT_AT_BOTTOM"), V.current = {
                     top: P,
                     height: Q
                   }), Math.abs(P - M.current) < x)
@@ -739,40 +739,40 @@ function It(t, c, m, g) {
                   console.log(
                     `Threshold passed at ${P}px. Recalculating range...`
                   );
-                  let yt = _ - 1, pt = 0, Ct = 0;
-                  for (; pt <= yt; ) {
-                    const mt = Math.floor((pt + yt) / 2);
-                    G[mt] < P ? (Ct = mt, pt = mt + 1) : yt = mt - 1;
+                  let pt = A - 1, Et = 0, Ct = 0;
+                  for (; Et <= pt; ) {
+                    const mt = Math.floor((Et + pt) / 2);
+                    G[mt] < P ? (Ct = mt, Et = mt + 1) : pt = mt - 1;
                   }
                   const $t = Math.max(0, Ct - a);
                   let St = $t;
-                  const Ut = P + ft;
-                  for (; St < _ && G[St] < Ut; )
+                  const Ht = P + ft;
+                  for (; St < A && G[St] < Ht; )
                     St++;
-                  w({
+                  _({
                     startIndex: $t,
-                    endIndex: Math.min(_, St + a)
+                    endIndex: Math.min(A, St + a)
                   }), M.current = P;
                 };
-                return k.addEventListener("scroll", H, {
+                return b.addEventListener("scroll", F, {
                   passive: !0
-                }), () => k.removeEventListener("scroll", H);
-              }, [_, G, n, a, C]);
+                }), () => b.removeEventListener("scroll", F);
+              }, [A, G, n, a, N]);
               const st = kt(() => {
                 console.log(
                   "USER ACTION: Clicked scroll button -> SCROLLING_TO_BOTTOM"
-                ), A("SCROLLING_TO_BOTTOM");
+                ), w("SCROLLING_TO_BOTTOM");
               }, []), gt = kt(
-                (k, x = "smooth") => {
-                  E.current && G[k] !== void 0 && (A("IDLE_NOT_AT_BOTTOM"), E.current.scrollTo({
-                    top: G[k],
+                (b, x = "smooth") => {
+                  y.current && G[b] !== void 0 && (w("IDLE_NOT_AT_BOTTOM"), y.current.scrollTo({
+                    top: G[b],
                     behavior: x
                   }));
                 },
                 [G]
-              ), jt = {
+              ), Ut = {
                 outer: {
-                  ref: E,
+                  ref: y,
                   style: { overflowY: "auto", height: "100%" }
                 },
                 inner: {
@@ -783,13 +783,13 @@ function It(t, c, m, g) {
                 },
                 list: {
                   style: {
-                    transform: `translateY(${G[y.startIndex] || 0}px)`
+                    transform: `translateY(${G[p.startIndex] || 0}px)`
                   }
                 }
               };
               return {
                 virtualState: B,
-                virtualizerProps: jt,
+                virtualizerProps: Ut,
                 scrollToBottom: st,
                 scrollToIndex: gt
               };
@@ -797,49 +797,49 @@ function It(t, c, m, g) {
           if (l === "stateSort")
             return (e) => {
               const a = [...d()].sort(
-                (u, E) => e(u.item, E.item)
-              ), i = a.map(({ item: u }) => u), f = {
-                ...S,
+                (u, y) => e(u.item, y.item)
+              ), i = a.map(({ item: u }) => u), S = {
+                ...f,
                 validIndices: a.map(
                   ({ originalIndex: u }) => u
                 )
               };
-              return s(i, r, f);
+              return s(i, r, S);
             };
           if (l === "stateFilter")
             return (e) => {
               const a = d().filter(
-                ({ item: u }, E) => e(u, E)
-              ), i = a.map(({ item: u }) => u), f = {
-                ...S,
+                ({ item: u }, y) => e(u, y)
+              ), i = a.map(({ item: u }) => u), S = {
+                ...f,
                 validIndices: a.map(
                   ({ originalIndex: u }) => u
                 )
               };
-              return s(i, r, f);
+              return s(i, r, S);
             };
           if (l === "stateMap")
             return (e) => {
               const n = o.getState().getNestedState(t, r);
-              return Array.isArray(n) ? (S?.validIndices || Array.from({ length: n.length }, (i, f) => f)).map((i, f) => {
-                const u = n[i], E = [...r, i.toString()], y = s(u, E, S);
-                return e(u, y, {
+              return Array.isArray(n) ? (f?.validIndices || Array.from({ length: n.length }, (i, S) => S)).map((i, S) => {
+                const u = n[i], y = [...r, i.toString()], p = s(u, y, f);
+                return e(u, p, {
                   register: () => {
-                    const [, C] = K({}), A = `${m}-${r.join(".")}-${i}`;
+                    const [, N] = K({}), w = `${m}-${r.join(".")}-${i}`;
                     ct(() => {
-                      const b = `${t}////${A}`, F = o.getState().stateComponents.get(t) || {
+                      const k = `${t}////${w}`, H = o.getState().stateComponents.get(t) || {
                         components: /* @__PURE__ */ new Map()
                       };
-                      return F.components.set(b, {
-                        forceUpdate: () => C({}),
-                        paths: /* @__PURE__ */ new Set([E.join(".")])
-                      }), o.getState().stateComponents.set(t, F), () => {
+                      return H.components.set(k, {
+                        forceUpdate: () => N({}),
+                        paths: /* @__PURE__ */ new Set([y.join(".")])
+                      }), o.getState().stateComponents.set(t, H), () => {
                         const Y = o.getState().stateComponents.get(t);
-                        Y && Y.components.delete(b);
+                        Y && Y.components.delete(k);
                       };
-                    }, [t, A]);
+                    }, [t, w]);
                   },
-                  index: f,
+                  index: S,
                   originalIndex: i
                 });
               }) : (console.warn(
@@ -848,16 +848,16 @@ function It(t, c, m, g) {
               ), null);
             };
           if (l === "stateMapNoRender")
-            return (e) => T.map((a, i) => {
-              let f;
-              S?.validIndices && S.validIndices[i] !== void 0 ? f = S.validIndices[i] : f = i;
-              const u = [...r, f.toString()], E = s(a, u, S);
+            return (e) => I.map((a, i) => {
+              let S;
+              f?.validIndices && f.validIndices[i] !== void 0 ? S = f.validIndices[i] : S = i;
+              const u = [...r, S.toString()], y = s(a, u, f);
               return e(
                 a,
-                E,
+                y,
                 i,
-                T,
-                s(T, r, S)
+                I,
+                s(I, r, f)
               );
             });
           if (l === "$stateMap")
@@ -873,20 +873,34 @@ function It(t, c, m, g) {
           if (l === "stateList")
             return (e) => {
               const n = o.getState().getNestedState(t, r);
-              return Array.isArray(n) ? (S?.validIndices || Array.from({ length: n.length }, (i, f) => f)).map((i, f) => {
-                const u = n[i], E = [...r, i.toString()], y = s(u, E, S), w = `${m}-${r.join(".")}-${i}`;
+              return Array.isArray(n) ? (f?.validIndices || Array.from({ length: n.length }, (i, S) => S)).map((i, S) => {
+                const u = n[i], y = [...r, i.toString()], p = s(u, y, f), _ = `${m}-${r.join(".")}-${i}`, N = o.getState().getInitialOptions(t), w = N?.formElements?.validation, k = e(
+                  u,
+                  p,
+                  i,
+                  // Use originalIndex here
+                  n,
+                  s(n, r, f)
+                );
                 return lt(ae, {
                   key: i,
                   stateKey: t,
-                  itemComponentId: w,
-                  itemPath: E,
-                  children: e(
-                    u,
-                    y,
-                    { localIndex: f, originalIndex: i },
-                    n,
-                    s(n, r, S)
-                  )
+                  itemComponentId: _,
+                  itemPath: y,
+                  children: w ? (
+                    // Automatically wrap with validation wrapper
+                    /* @__PURE__ */ It(
+                      bt,
+                      {
+                        formOpts: void 0,
+                        path: y,
+                        validationKey: N?.validation?.key || "",
+                        stateKey: t,
+                        validIndices: f?.validIndices,
+                        children: k
+                      }
+                    )
+                  ) : k
                 });
               }) : (console.warn(
                 `stateList called on a non-array value at path: ${r.join(".")}.`
@@ -894,20 +908,20 @@ function It(t, c, m, g) {
             };
           if (l === "stateFlattenOn")
             return (e) => {
-              const n = T;
-              I.clear(), N++;
+              const n = I;
+              T.clear(), C++;
               const a = n.flatMap(
                 (i) => i[e] ?? []
               );
               return s(
                 a,
                 [...r, "[*]", e],
-                S
+                f
               );
             };
           if (l === "index")
             return (e) => {
-              const n = T[e];
+              const n = I[e];
               return s(n, [...r, e.toString()]);
             };
           if (l === "last")
@@ -918,58 +932,58 @@ function It(t, c, m, g) {
               return s(a, i);
             };
           if (l === "insert")
-            return (e) => (p(r), Et(c, e, r, t), s(
+            return (e) => (E(r), Ot(c, e, r, t), s(
               o.getState().getNestedState(t, r),
               r
             ));
           if (l === "uniqueInsert")
             return (e, n, a) => {
-              const i = o.getState().getNestedState(t, r), f = tt(e) ? e(i) : e;
+              const i = o.getState().getNestedState(t, r), S = tt(e) ? e(i) : e;
               let u = null;
-              if (!i.some((y) => {
+              if (!i.some((p) => {
                 if (n) {
-                  const C = n.every(
-                    (A) => J(y[A], f[A])
+                  const N = n.every(
+                    (w) => J(p[w], S[w])
                   );
-                  return C && (u = y), C;
+                  return N && (u = p), N;
                 }
-                const w = J(y, f);
-                return w && (u = y), w;
+                const _ = J(p, S);
+                return _ && (u = p), _;
               }))
-                p(r), Et(c, f, r, t);
+                E(r), Ot(c, S, r, t);
               else if (a && u) {
-                const y = a(u), w = i.map(
-                  (C) => J(C, u) ? y : C
+                const p = a(u), _ = i.map(
+                  (N) => J(N, u) ? p : N
                 );
-                p(r), it(c, w, r);
+                E(r), it(c, _, r);
               }
             };
           if (l === "cut")
             return (e, n) => {
               if (!n?.waitForSync)
-                return p(r), ht(c, r, t, e), s(
+                return E(r), ht(c, r, t, e), s(
                   o.getState().getNestedState(t, r),
                   r
                 );
             };
           if (l === "cutByValue")
             return (e) => {
-              for (let n = 0; n < T.length; n++)
-                T[n] === e && ht(c, r, t, n);
+              for (let n = 0; n < I.length; n++)
+                I[n] === e && ht(c, r, t, n);
             };
           if (l === "toggleByValue")
             return (e) => {
-              const n = T.findIndex((a) => a === e);
-              n > -1 ? ht(c, r, t, n) : Et(c, e, r, t);
+              const n = I.findIndex((a) => a === e);
+              n > -1 ? ht(c, r, t, n) : Ot(c, e, r, t);
             };
           if (l === "stateFind")
             return (e) => {
               const a = d().find(
-                ({ item: f }, u) => e(f, u)
+                ({ item: S }, u) => e(S, u)
               );
               if (!a) return;
               const i = [...r, a.originalIndex.toString()];
-              return s(a.item, i, S);
+              return s(a.item, i, f);
             };
           if (l === "findWith")
             return (e, n) => {
@@ -977,8 +991,8 @@ function It(t, c, m, g) {
                 ({ item: u }) => u[e] === n
               );
               if (!i) return;
-              const f = [...r, i.originalIndex.toString()];
-              return s(i.item, f, S);
+              const S = [...r, i.originalIndex.toString()];
+              return s(i.item, S, f);
             };
         }
         const et = r[r.length - 1];
@@ -994,20 +1008,20 @@ function It(t, c, m, g) {
         }
         if (l === "get")
           return () => {
-            if (S?.validIndices && Array.isArray(T)) {
+            if (f?.validIndices && Array.isArray(I)) {
               const d = o.getState().getNestedState(t, r);
-              return S.validIndices.map((e) => d[e]);
+              return f.validIndices.map((e) => d[e]);
             }
             return o.getState().getNestedState(t, r);
           };
         if (l === "$derive")
-          return (d) => Vt({
+          return (d) => Gt({
             _stateKey: t,
             _path: r,
             _effect: d.toString()
           });
         if (l === "$get")
-          return () => Vt({
+          return () => Gt({
             _stateKey: t,
             _path: r
           });
@@ -1016,7 +1030,7 @@ function It(t, c, m, g) {
           return o.getState().getSyncInfo(d);
         }
         if (l == "getLocalStorage")
-          return (d) => vt(g + "-" + t + "-" + d);
+          return (d) => yt(g + "-" + t + "-" + d);
         if (l === "_selected") {
           const d = r.slice(0, -1), e = d.join("."), n = o.getState().getNestedState(t, d);
           return Array.isArray(n) ? Number(r[r.length - 1]) === o.getState().getSelectedIndex(t, e) : void 0;
@@ -1026,7 +1040,7 @@ function It(t, c, m, g) {
             const e = r.slice(0, -1), n = Number(r[r.length - 1]), a = e.join(".");
             d ? o.getState().setSelectedIndex(t, a, n) : o.getState().setSelectedIndex(t, a, void 0);
             const i = o.getState().getNestedState(t, [...e]);
-            it(c, i, e), p(e);
+            it(c, i, e), E(e);
           };
         if (l === "toggleSelected")
           return () => {
@@ -1037,7 +1051,7 @@ function It(t, c, m, g) {
               a === e ? void 0 : e
             );
             const i = o.getState().getNestedState(t, [...d]);
-            it(c, i, d), p(d);
+            it(c, i, d), E(d);
           };
         if (r.length == 0) {
           if (l === "addValidation")
@@ -1047,13 +1061,13 @@ function It(t, c, m, g) {
                 throw new Error("Validation key not found");
               X(e.key), console.log("addValidationError", d), d.forEach((n) => {
                 const a = [e.key, ...n.path].join(".");
-                console.log("fullErrorPath", a), Rt(a, n.message);
+                console.log("fullErrorPath", a), Dt(a, n.message);
               }), dt(t);
             };
           if (l === "applyJsonPatch")
             return (d) => {
               const e = o.getState().cogsStateStore[t], a = Yt(e, d).newDocument;
-              Dt(
+              jt(
                 t,
                 o.getState().initialStateGlobal[t],
                 a,
@@ -1063,57 +1077,57 @@ function It(t, c, m, g) {
               );
               const i = o.getState().stateComponents.get(t);
               if (i) {
-                const f = _t(e, a), u = new Set(f);
+                const S = _t(e, a), u = new Set(S);
                 for (const [
-                  E,
-                  y
+                  y,
+                  p
                 ] of i.components.entries()) {
-                  let w = !1;
-                  const C = Array.isArray(y.reactiveType) ? y.reactiveType : [y.reactiveType || "component"];
-                  if (!C.includes("none")) {
-                    if (C.includes("all")) {
-                      y.forceUpdate();
+                  let _ = !1;
+                  const N = Array.isArray(p.reactiveType) ? p.reactiveType : [p.reactiveType || "component"];
+                  if (!N.includes("none")) {
+                    if (N.includes("all")) {
+                      p.forceUpdate();
                       continue;
                     }
-                    if (C.includes("component") && (y.paths.has("") && (w = !0), !w))
-                      for (const A of u) {
-                        if (y.paths.has(A)) {
-                          w = !0;
+                    if (N.includes("component") && (p.paths.has("") && (_ = !0), !_))
+                      for (const w of u) {
+                        if (p.paths.has(w)) {
+                          _ = !0;
                           break;
                         }
-                        let b = A.lastIndexOf(".");
-                        for (; b !== -1; ) {
-                          const F = A.substring(0, b);
-                          if (y.paths.has(F)) {
-                            w = !0;
+                        let k = w.lastIndexOf(".");
+                        for (; k !== -1; ) {
+                          const H = w.substring(0, k);
+                          if (p.paths.has(H)) {
+                            _ = !0;
                             break;
                           }
-                          const Y = A.substring(
-                            b + 1
+                          const Y = w.substring(
+                            k + 1
                           );
                           if (!isNaN(Number(Y))) {
-                            const M = F.lastIndexOf(".");
+                            const M = H.lastIndexOf(".");
                             if (M !== -1) {
-                              const $ = F.substring(
+                              const $ = H.substring(
                                 0,
                                 M
                               );
-                              if (y.paths.has($)) {
-                                w = !0;
+                              if (p.paths.has($)) {
+                                _ = !0;
                                 break;
                               }
                             }
                           }
-                          b = F.lastIndexOf(".");
+                          k = H.lastIndexOf(".");
                         }
-                        if (w) break;
+                        if (_) break;
                       }
-                    if (!w && C.includes("deps") && y.depsFunction) {
-                      const A = y.depsFunction(a);
-                      let b = !1;
-                      typeof A == "boolean" ? A && (b = !0) : J(y.deps, A) || (y.deps = A, b = !0), b && (w = !0);
+                    if (!_ && N.includes("deps") && p.depsFunction) {
+                      const w = p.depsFunction(a);
+                      let k = !1;
+                      typeof w == "boolean" ? w && (k = !0) : J(p.deps, w) || (p.deps = w, k = !0), k && (_ = !0);
                     }
-                    w && y.forceUpdate();
+                    _ && p.forceUpdate();
                   }
                 }
               }
@@ -1129,13 +1143,13 @@ function It(t, c, m, g) {
               const n = o.getState().cogsStateStore[t];
               try {
                 const a = o.getState().getValidationErrors(d.key);
-                a && a.length > 0 && a.forEach(([f]) => {
-                  f && f.startsWith(d.key) && X(f);
+                a && a.length > 0 && a.forEach(([S]) => {
+                  S && S.startsWith(d.key) && X(S);
                 });
                 const i = d.zodSchema.safeParse(n);
                 return i.success ? !0 : (i.error.errors.forEach((u) => {
-                  const E = u.path, y = u.message, w = [d.key, ...E].join(".");
-                  e(w, y);
+                  const y = u.path, p = u.message, _ = [d.key, ...y].join(".");
+                  e(_, p);
                 }), dt(t), !1);
               } catch (a) {
                 return console.error("Zod schema validation failed", a), !1;
@@ -1145,7 +1159,7 @@ function It(t, c, m, g) {
           if (l === "getComponents")
             return () => o().stateComponents.get(t);
           if (l === "getAllFormRefs")
-            return () => bt.getState().getFormRefsByStateKey(t);
+            return () => Mt.getState().getFormRefsByStateKey(t);
           if (l === "_initialState")
             return o.getState().initialStateGlobal[t];
           if (l === "_serverState")
@@ -1158,19 +1172,19 @@ function It(t, c, m, g) {
           if (l === "removeValidation") return v.removeValidation;
         }
         if (l === "getFormRef")
-          return () => bt.getState().getFormRef(t + "." + r.join("."));
+          return () => Mt.getState().getFormRef(t + "." + r.join("."));
         if (l === "validationWrapper")
           return ({
             children: d,
             hideMessage: e
-          }) => /* @__PURE__ */ Ot(
-            zt,
+          }) => /* @__PURE__ */ It(
+            bt,
             {
               formOpts: e ? { validation: { message: "" } } : void 0,
               path: r,
               validationKey: o.getState().getInitialOptions(t)?.validation?.key || "",
               stateKey: t,
-              validIndices: S?.validIndices,
+              validIndices: f?.validIndices,
               children: d
             }
           );
@@ -1180,7 +1194,7 @@ function It(t, c, m, g) {
         if (l === "update")
           return (d, e) => {
             if (e?.debounce)
-              Wt(() => {
+              zt(() => {
                 it(c, d, r, "");
                 const n = o.getState().getNestedState(t, r);
                 e?.afterUpdate && e.afterUpdate(n);
@@ -1190,10 +1204,10 @@ function It(t, c, m, g) {
               const n = o.getState().getNestedState(t, r);
               e?.afterUpdate && e.afterUpdate(n);
             }
-            p(r);
+            E(r);
           };
         if (l === "formElement")
-          return (d, e) => /* @__PURE__ */ Ot(
+          return (d, e) => /* @__PURE__ */ It(
             qt,
             {
               setState: c,
@@ -1204,19 +1218,19 @@ function It(t, c, m, g) {
             }
           );
         const L = [...r, l], at = o.getState().getNestedState(t, L);
-        return s(at, L, S);
+        return s(at, L, f);
       }
     }, z = new Proxy(j, U);
-    return I.set(W, {
+    return T.set(W, {
       proxy: z,
-      stateVersion: N
+      stateVersion: C
     }), z;
   }
   return s(
     o.getState().getNestedState(t, [])
   );
 }
-function Vt(t) {
+function Gt(t) {
   return lt(oe, { proxy: t });
 }
 function re({
@@ -1228,7 +1242,7 @@ function re({
     m,
     t._path
   ).stateMapNoRender(
-    (I, N, p, v, s) => t._mapFn(I, N, p, v, s)
+    (T, C, E, v, s) => t._mapFn(T, C, E, v, s)
   ) : null;
 }
 function oe({
@@ -1238,31 +1252,31 @@ function oe({
   return ot(() => {
     const g = c.current;
     if (!g || !g.parentElement) return;
-    const I = g.parentElement, p = Array.from(I.childNodes).indexOf(g);
-    let v = I.getAttribute("data-parent-id");
-    v || (v = `parent-${crypto.randomUUID()}`, I.setAttribute("data-parent-id", v));
-    const T = {
+    const T = g.parentElement, E = Array.from(T.childNodes).indexOf(g);
+    let v = T.getAttribute("data-parent-id");
+    v || (v = `parent-${crypto.randomUUID()}`, T.setAttribute("data-parent-id", v));
+    const I = {
       instanceId: `instance-${crypto.randomUUID()}`,
       parentId: v,
-      position: p,
+      position: E,
       effect: t._effect
     };
-    o.getState().addSignalElement(m, T);
+    o.getState().addSignalElement(m, I);
     const r = o.getState().getNestedState(t._stateKey, t._path);
-    let S;
+    let f;
     if (t._effect)
       try {
-        S = new Function(
+        f = new Function(
           "state",
           `return (${t._effect})(state)`
         )(r);
       } catch (j) {
-        console.error("Error evaluating effect function during mount:", j), S = r;
+        console.error("Error evaluating effect function during mount:", j), f = r;
       }
     else
-      S = r;
-    S !== null && typeof S == "object" && (S = JSON.stringify(S));
-    const W = document.createTextNode(String(S));
+      f = r;
+    f !== null && typeof f == "object" && (f = JSON.stringify(f));
+    const W = document.createTextNode(String(f));
     g.replaceWith(W);
   }, [t._stateKey, t._path.join("."), t._effect]), lt("span", {
     ref: c,
@@ -1271,7 +1285,7 @@ function oe({
   });
 }
 function pe(t) {
-  const c = Ht(
+  const c = Ft(
     (m) => {
       const g = o.getState().stateComponents.get(t._stateKey) || {
         components: /* @__PURE__ */ new Map()
@@ -1291,30 +1305,30 @@ function ae({
   itemPath: m,
   children: g
 }) {
-  const [, I] = K({}), [N, p] = Zt(), v = q(null);
+  const [, T] = K({}), [C, E] = Zt(), v = q(null);
   return ot(() => {
-    p.height > 0 && p.height !== v.current && (v.current = p.height, o.getState().setShadowMetadata(t, m, {
+    E.height > 0 && E.height !== v.current && (v.current = E.height, o.getState().setShadowMetadata(t, m, {
       virtualizer: {
-        itemHeight: p.height
+        itemHeight: E.height
       }
     }));
-  }, [p.height, t, m]), ct(() => {
-    const s = `${t}////${c}`, T = o.getState().stateComponents.get(t) || {
+  }, [E.height, t, m]), ct(() => {
+    const s = `${t}////${c}`, I = o.getState().stateComponents.get(t) || {
       components: /* @__PURE__ */ new Map()
     };
-    return T.components.set(s, {
-      forceUpdate: () => I({}),
+    return I.components.set(s, {
+      forceUpdate: () => T({}),
       paths: /* @__PURE__ */ new Set([m.join(".")])
-    }), o.getState().stateComponents.set(t, T), () => {
+    }), o.getState().stateComponents.set(t, I), () => {
       const r = o.getState().stateComponents.get(t);
       r && r.components.delete(s);
     };
-  }, [t, c, m.join(".")]), /* @__PURE__ */ Ot("div", { ref: N, children: g });
+  }, [t, c, m.join(".")]), /* @__PURE__ */ It("div", { ref: C, children: g });
 }
 export {
-  Vt as $cogsSignal,
+  Gt as $cogsSignal,
   pe as $cogsSignalStore,
-  Ie as addStateOptions,
+  Te as addStateOptions,
   ve as createCogsState,
   ye as notifyComponent,
   ne as useCogsStateFn