cogsbox-state 0.5.423 → 0.5.425

package/dist/CogsState.jsx

@@ -1,41 +1,41 @@
 "use client";
-import { jsx as yt } from "react/jsx-runtime";
-import { useState as st, useRef as J, useEffect as nt, useLayoutEffect as xt, useMemo as It, createElement as lt, useSyncExternalStore as Mt, startTransition as Ot, useCallback as ft } from "react";
-import { transformStateFunc as jt, isDeepEqual as q, isFunction as K, getNestedValue as Y, getDifferences as wt, debounce as Ut } from "./utility.js";
-import { pushFunc as vt, updateFn as ct, cutFunc as gt, ValidationWrapper as Ft, FormControlComponent as Dt } from "./Functions.jsx";
-import Lt from "superjson";
-import { v4 as pt } from "uuid";
+import { jsx as pt } from "react/jsx-runtime";
+import { useState as it, useRef as q, useEffect as rt, useLayoutEffect as Ct, useMemo as Et, createElement as dt, useSyncExternalStore as Ft, startTransition as Dt, useCallback as St } from "react";
+import { transformStateFunc as Lt, isDeepEqual as Y, isFunction as tt, getNestedValue as Z, getDifferences as Tt, debounce as Gt } from "./utility.js";
+import { pushFunc as wt, updateFn as lt, cutFunc as ft, ValidationWrapper as _t, FormControlComponent as Wt } from "./Functions.jsx";
+import Ht from "superjson";
+import { v4 as At } from "uuid";
 import "zod";
-import { getGlobalStore as o, formRefStore as kt } from "./store.js";
-import { useCogsConfig as Nt } from "./CogsStateClient.jsx";
-import { applyPatch as Gt } from "fast-json-patch";
-import Wt from "react-use-measure";
-function At(t, i) {
-  const S = o.getState().getInitialOptions, u = o.getState().setInitialStateOptions, h = S(t) || {};
+import { getGlobalStore as r, formRefStore as bt } from "./store.js";
+import { useCogsConfig as Rt } from "./CogsStateClient.jsx";
+import { applyPatch as zt } from "fast-json-patch";
+import Bt from "react-use-measure";
+function Vt(t, i) {
+  const f = r.getState().getInitialOptions, u = r.getState().setInitialStateOptions, h = f(t) || {};
   u(t, {
     ...h,
     ...i
   });
 }
-function bt({
+function $t({
   stateKey: t,
   options: i,
-  initialOptionsPart: S
+  initialOptionsPart: f
 }) {
-  const u = at(t) || {}, h = S[t] || {}, V = o.getState().setInitialStateOptions, I = { ...h, ...u };
+  const u = st(t) || {}, h = f[t] || {}, x = r.getState().setInitialStateOptions, p = { ...h, ...u };
   let y = !1;
   if (i)
     for (const s in i)
-      I.hasOwnProperty(s) ? (s == "localStorage" && i[s] && I[s].key !== i[s]?.key && (y = !0, I[s] = i[s]), s == "initialState" && i[s] && I[s] !== i[s] && // Different references
-      !q(I[s], i[s]) && (y = !0, I[s] = i[s])) : (y = !0, I[s] = i[s]);
-  y && V(t, I);
+      p.hasOwnProperty(s) ? (s == "localStorage" && i[s] && p[s].key !== i[s]?.key && (y = !0, p[s] = i[s]), s == "initialState" && i[s] && p[s] !== i[s] && // Different references
+      !Y(p[s], i[s]) && (y = !0, p[s] = i[s])) : (y = !0, p[s] = i[s]);
+  y && x(t, p);
 }
-function de(t, { formElements: i, validation: S }) {
-  return { initialState: t, formElements: i, validation: S };
+function fe(t, { formElements: i, validation: f }) {
+  return { initialState: t, formElements: i, validation: f };
 }
-const ue = (t, i) => {
-  let S = t;
-  const [u, h] = jt(S);
+const Se = (t, i) => {
+  let f = t;
+  const [u, h] = Lt(f);
   (Object.keys(h).length > 0 || i && Object.keys(i).length > 0) && Object.keys(h).forEach((y) => {
     h[y] = h[y] || {}, h[y].formElements = {
       ...i?.formElements,
@@ -43,16 +43,16 @@ const ue = (t, i) => {
       ...i?.validation,
       ...h[y].formElements || {}
       // State-specific overrides
-    }, at(y) || o.getState().setInitialStateOptions(y, h[y]);
-  }), o.getState().setInitialStates(u), o.getState().setCreatedState(u);
-  const V = (y, s) => {
-    const [m] = st(s?.componentId ?? pt());
-    bt({
+    }, st(y) || r.getState().setInitialStateOptions(y, h[y]);
+  }), r.getState().setInitialStates(u), r.getState().setCreatedState(u);
+  const x = (y, s) => {
+    const [m] = it(s?.componentId ?? At());
+    $t({
       stateKey: y,
       options: s,
       initialOptionsPart: h
     });
-    const n = o.getState().cogsStateStore[y] || u[y], g = s?.modifyState ? s.modifyState(n) : n, [D, j] = Yt(
+    const n = r.getState().cogsStateStore[y] || u[y], g = s?.modifyState ? s.modifyState(n) : n, [L, F] = Qt(
       g,
       {
         stateKey: y,
@@ -68,49 +68,49 @@ const ue = (t, i) => {
         serverState: s?.serverState
       }
     );
-    return j;
+    return F;
   };
-  function I(y, s) {
-    bt({ stateKey: y, options: s, initialOptionsPart: h }), s.localStorage && qt(y, s), dt(y);
+  function p(y, s) {
+    $t({ stateKey: y, options: s, initialOptionsPart: h }), s.localStorage && Zt(y, s), ut(y);
   }
-  return { useCogsState: V, setCogsOptions: I };
+  return { useCogsState: x, setCogsOptions: p };
 }, {
-  setUpdaterState: St,
-  setState: rt,
-  getInitialOptions: at,
-  getKeyState: Pt,
-  getValidationErrors: Ht,
-  setStateLog: zt,
-  updateInitialStateGlobal: Et,
-  addValidationError: Ct,
-  removeValidationError: X,
-  setServerSyncActions: Bt
-} = o.getState(), Vt = (t, i, S, u, h) => {
-  S?.log && console.log(
+  setUpdaterState: mt,
+  setState: ot,
+  getInitialOptions: st,
+  getKeyState: Mt,
+  getValidationErrors: qt,
+  setStateLog: Jt,
+  updateInitialStateGlobal: kt,
+  addValidationError: Ot,
+  removeValidationError: Q,
+  setServerSyncActions: Yt
+} = r.getState(), Nt = (t, i, f, u, h) => {
+  f?.log && console.log(
     "saving to localstorage",
     i,
-    S.localStorage?.key,
+    f.localStorage?.key,
     u
   );
-  const V = K(S?.localStorage?.key) ? S.localStorage?.key(t) : S?.localStorage?.key;
-  if (V && u) {
-    const I = `${u}-${i}-${V}`;
+  const x = tt(f?.localStorage?.key) ? f.localStorage?.key(t) : f?.localStorage?.key;
+  if (x && u) {
+    const p = `${u}-${i}-${x}`;
     let y;
     try {
-      y = ht(I)?.lastSyncedWithServer;
+      y = yt(p)?.lastSyncedWithServer;
     } catch {
     }
     const s = {
       state: t,
       lastUpdated: Date.now(),
       lastSyncedWithServer: h ?? y
-    }, m = Lt.serialize(s);
+    }, m = Ht.serialize(s);
     window.localStorage.setItem(
-      I,
+      p,
       JSON.stringify(m.json)
     );
   }
-}, ht = (t) => {
+}, yt = (t) => {
   if (!t) return null;
   try {
     const i = window.localStorage.getItem(t);
@@ -118,61 +118,61 @@ const ue = (t, i) => {
   } catch (i) {
     return console.error("Error loading from localStorage:", i), null;
   }
-}, qt = (t, i) => {
-  const S = o.getState().cogsStateStore[t], { sessionId: u } = Nt(), h = K(i?.localStorage?.key) ? i.localStorage.key(S) : i?.localStorage?.key;
+}, Zt = (t, i) => {
+  const f = r.getState().cogsStateStore[t], { sessionId: u } = Rt(), h = tt(i?.localStorage?.key) ? i.localStorage.key(f) : i?.localStorage?.key;
   if (h && u) {
-    const V = ht(
+    const x = yt(
       `${u}-${t}-${h}`
     );
-    if (V && V.lastUpdated > (V.lastSyncedWithServer || 0))
-      return rt(t, V.state), dt(t), !0;
+    if (x && x.lastUpdated > (x.lastSyncedWithServer || 0))
+      return ot(t, x.state), ut(t), !0;
   }
   return !1;
-}, _t = (t, i, S, u, h, V) => {
-  const I = {
+}, jt = (t, i, f, u, h, x) => {
+  const p = {
     initialState: i,
-    updaterState: mt(
+    updaterState: ht(
       t,
       u,
       h,
-      V
+      x
     ),
-    state: S
+    state: f
   };
-  Et(t, I.initialState), St(t, I.updaterState), rt(t, I.state);
-}, dt = (t) => {
-  const i = o.getState().stateComponents.get(t);
+  kt(t, p.initialState), mt(t, p.updaterState), ot(t, p.state);
+}, ut = (t) => {
+  const i = r.getState().stateComponents.get(t);
   if (!i) return;
-  const S = /* @__PURE__ */ new Set();
+  const f = /* @__PURE__ */ new Set();
   i.components.forEach((u) => {
-    (u ? Array.isArray(u.reactiveType) ? u.reactiveType : [u.reactiveType || "component"] : null)?.includes("none") || S.add(() => u.forceUpdate());
+    (u ? Array.isArray(u.reactiveType) ? u.reactiveType : [u.reactiveType || "component"] : null)?.includes("none") || f.add(() => u.forceUpdate());
   }), queueMicrotask(() => {
-    S.forEach((u) => u());
+    f.forEach((u) => u());
   });
-}, ge = (t, i) => {
-  const S = o.getState().stateComponents.get(t);
-  if (S) {
-    const u = `${t}////${i}`, h = S.components.get(u);
+}, me = (t, i) => {
+  const f = r.getState().stateComponents.get(t);
+  if (f) {
+    const u = `${t}////${i}`, h = f.components.get(u);
     if ((h ? Array.isArray(h.reactiveType) ? h.reactiveType : [h.reactiveType || "component"] : null)?.includes("none"))
       return;
     h && h.forceUpdate();
   }
-}, Jt = (t, i, S, u) => {
+}, Xt = (t, i, f, u) => {
   switch (t) {
     case "update":
       return {
-        oldValue: Y(i, u),
-        newValue: Y(S, u)
+        oldValue: Z(i, u),
+        newValue: Z(f, u)
       };
     case "insert":
       return {
         oldValue: null,
         // or undefined
-        newValue: Y(S, u)
+        newValue: Z(f, u)
       };
     case "cut":
       return {
-        oldValue: Y(i, u),
+        oldValue: Z(i, u),
         newValue: null
         // or undefined
       };
@@ -180,327 +180,327 @@ const ue = (t, i) => {
       return { oldValue: null, newValue: null };
   }
 };
-function Yt(t, {
+function Qt(t, {
   stateKey: i,
-  serverSync: S,
+  serverSync: f,
   localStorage: u,
   formElements: h,
-  reactiveDeps: V,
-  reactiveType: I,
+  reactiveDeps: x,
+  reactiveType: p,
   componentId: y,
   initialState: s,
   syncUpdate: m,
   dependencies: n,
   serverState: g
 } = {}) {
-  const [D, j] = st({}), { sessionId: U } = Nt();
-  let W = !i;
-  const [f] = st(i ?? pt()), l = o.getState().stateLog[f], ut = J(/* @__PURE__ */ new Set()), tt = J(y ?? pt()), O = J(
+  const [L, F] = it({}), { sessionId: D } = Rt();
+  let H = !i;
+  const [S] = it(i ?? At()), c = r.getState().stateLog[S], gt = q(/* @__PURE__ */ new Set()), et = q(y ?? At()), M = q(
     null
   );
-  O.current = at(f) ?? null, nt(() => {
-    if (m && m.stateKey === f && m.path?.[0]) {
-      rt(f, (r) => ({
-        ...r,
+  M.current = st(S) ?? null, rt(() => {
+    if (m && m.stateKey === S && m.path?.[0]) {
+      ot(S, (o) => ({
+        ...o,
         [m.path[0]]: m.newValue
       }));
       const e = `${m.stateKey}:${m.path.join(".")}`;
-      o.getState().setSyncInfo(e, {
+      r.getState().setSyncInfo(e, {
         timeStamp: m.timeStamp,
         userId: m.userId
       });
     }
-  }, [m]), nt(() => {
+  }, [m]), rt(() => {
     if (s) {
-      At(f, {
+      Vt(S, {
         initialState: s
       });
-      const e = O.current, a = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, c = o.getState().initialStateGlobal[f];
-      if (!(c && !q(c, s) || !c) && !a)
+      const e = M.current, a = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, d = r.getState().initialStateGlobal[S];
+      if (!(d && !Y(d, s) || !d) && !a)
         return;
       let v = null;
-      const k = K(e?.localStorage?.key) ? e?.localStorage?.key(s) : e?.localStorage?.key;
-      k && U && (v = ht(`${U}-${f}-${k}`));
-      let E = s, b = !1;
-      const _ = a ? Date.now() : 0, C = v?.lastUpdated || 0, R = v?.lastSyncedWithServer || 0;
-      a && _ > C ? (E = e.serverState.data, b = !0) : v && C > R && (E = v.state, e?.localStorage?.onChange && e?.localStorage?.onChange(E)), o.getState().initializeShadowState(f, s), _t(
-        f,
+      const T = tt(e?.localStorage?.key) ? e?.localStorage?.key(s) : e?.localStorage?.key;
+      T && D && (v = yt(`${D}-${S}-${T}`));
+      let E = s, k = !1;
+      const C = a ? Date.now() : 0, $ = v?.lastUpdated || 0, R = v?.lastSyncedWithServer || 0;
+      a && C > $ ? (E = e.serverState.data, k = !0) : v && $ > R && (E = v.state, e?.localStorage?.onChange && e?.localStorage?.onChange(E)), r.getState().initializeShadowState(S, s), jt(
+        S,
         s,
         E,
-        it,
-        tt.current,
-        U
-      ), b && k && U && Vt(E, f, e, U, Date.now()), dt(f), (Array.isArray(I) ? I : [I || "component"]).includes("none") || j({});
+        ct,
+        et.current,
+        D
+      ), k && T && D && Nt(E, S, e, D, Date.now()), ut(S), (Array.isArray(p) ? p : [p || "component"]).includes("none") || F({});
     }
   }, [
     s,
     g?.status,
     g?.data,
     ...n || []
-  ]), xt(() => {
-    W && At(f, {
-      serverSync: S,
+  ]), Ct(() => {
+    H && Vt(S, {
+      serverSync: f,
       formElements: h,
       initialState: s,
       localStorage: u,
-      middleware: O.current?.middleware
+      middleware: M.current?.middleware
     });
-    const e = `${f}////${tt.current}`, r = o.getState().stateComponents.get(f) || {
+    const e = `${S}////${et.current}`, o = r.getState().stateComponents.get(S) || {
       components: /* @__PURE__ */ new Map()
     };
-    return r.components.set(e, {
-      forceUpdate: () => j({}),
+    return o.components.set(e, {
+      forceUpdate: () => F({}),
       paths: /* @__PURE__ */ new Set(),
       deps: [],
-      depsFunction: V || void 0,
-      reactiveType: I ?? ["component", "deps"]
-    }), o.getState().stateComponents.set(f, r), j({}), () => {
-      r && (r.components.delete(e), r.components.size === 0 && o.getState().stateComponents.delete(f));
+      depsFunction: x || void 0,
+      reactiveType: p ?? ["component", "deps"]
+    }), r.getState().stateComponents.set(S, o), F({}), () => {
+      o && (o.components.delete(e), o.components.size === 0 && r.getState().stateComponents.delete(S));
     };
   }, []);
-  const it = (e, r, a, c) => {
-    if (Array.isArray(r)) {
-      const v = `${f}-${r.join(".")}`;
-      ut.current.add(v);
+  const ct = (e, o, a, d) => {
+    if (Array.isArray(o)) {
+      const v = `${S}-${o.join(".")}`;
+      gt.current.add(v);
     }
-    const w = o.getState();
-    rt(f, (v) => {
-      const k = K(e) ? e(v) : e, E = `${f}-${r.join(".")}`;
+    const w = r.getState();
+    ot(S, (v) => {
+      const T = tt(e) ? e(v) : e, E = `${S}-${o.join(".")}`;
       if (E) {
-        let T = !1, $ = w.signalDomElements.get(E);
-        if ((!$ || $.size === 0) && (a.updateType === "insert" || a.updateType === "cut")) {
-          const x = r.slice(0, -1), G = Y(k, x);
-          if (Array.isArray(G)) {
-            T = !0;
-            const A = `${f}-${x.join(".")}`;
-            $ = w.signalDomElements.get(A);
+        let _ = !1, I = w.signalDomElements.get(E);
+        if ((!I || I.size === 0) && (a.updateType === "insert" || a.updateType === "cut")) {
+          const O = o.slice(0, -1), N = Z(T, O);
+          if (Array.isArray(N)) {
+            _ = !0;
+            const A = `${S}-${O.join(".")}`;
+            I = w.signalDomElements.get(A);
           }
         }
-        if ($) {
-          const x = T ? Y(k, r.slice(0, -1)) : Y(k, r);
-          $.forEach(({ parentId: G, position: A, effect: F }) => {
-            const M = document.querySelector(
-              `[data-parent-id="${G}"]`
+        if (I) {
+          const O = _ ? Z(T, o.slice(0, -1)) : Z(T, o);
+          I.forEach(({ parentId: N, position: A, effect: j }) => {
+            const U = document.querySelector(
+              `[data-parent-id="${N}"]`
             );
-            if (M) {
-              const z = Array.from(M.childNodes);
-              if (z[A]) {
-                const p = F ? new Function("state", `return (${F})(state)`)(x) : x;
-                z[A].textContent = String(p);
+            if (U) {
+              const B = Array.from(U.childNodes);
+              if (B[A]) {
+                const G = j ? new Function("state", `return (${j})(state)`)(O) : O;
+                B[A].textContent = String(G);
               }
             }
           });
         }
       }
-      console.log("shadowState", w.shadowStateStore), a.updateType === "update" && (c || O.current?.validation?.key) && r && X(
-        (c || O.current?.validation?.key) + "." + r.join(".")
+      console.log("shadowState", w.shadowStateStore), a.updateType === "update" && (d || M.current?.validation?.key) && o && Q(
+        (d || M.current?.validation?.key) + "." + o.join(".")
       );
-      const b = r.slice(0, r.length - 1);
-      a.updateType === "cut" && O.current?.validation?.key && X(
-        O.current?.validation?.key + "." + b.join(".")
-      ), a.updateType === "insert" && O.current?.validation?.key && Ht(
-        O.current?.validation?.key + "." + b.join(".")
-      ).filter(([$, x]) => {
-        let G = $?.split(".").length;
-        if ($ == b.join(".") && G == b.length - 1) {
-          let A = $ + "." + b;
-          X($), Ct(A, x);
+      const k = o.slice(0, o.length - 1);
+      a.updateType === "cut" && M.current?.validation?.key && Q(
+        M.current?.validation?.key + "." + k.join(".")
+      ), a.updateType === "insert" && M.current?.validation?.key && qt(
+        M.current?.validation?.key + "." + k.join(".")
+      ).filter(([I, O]) => {
+        let N = I?.split(".").length;
+        if (I == k.join(".") && N == k.length - 1) {
+          let A = I + "." + k;
+          Q(I), Ot(A, O);
         }
       });
-      const _ = w.stateComponents.get(f);
-      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", _), _) {
-        const T = wt(v, k), $ = new Set(T), x = a.updateType === "update" ? r.join(".") : r.slice(0, -1).join(".") || "";
+      const C = w.stateComponents.get(S);
+      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", C), C) {
+        const _ = Tt(v, T), I = new Set(_), O = a.updateType === "update" ? o.join(".") : o.slice(0, -1).join(".") || "";
         for (const [
-          G,
+          N,
           A
-        ] of _.components.entries()) {
-          let F = !1;
-          const M = Array.isArray(A.reactiveType) ? A.reactiveType : [A.reactiveType || "component"];
-          if (console.log("component", A), !M.includes("none")) {
-            if (M.includes("all")) {
+        ] of C.components.entries()) {
+          let j = !1;
+          const U = Array.isArray(A.reactiveType) ? A.reactiveType : [A.reactiveType || "component"];
+          if (console.log("component", A), !U.includes("none")) {
+            if (U.includes("all")) {
               A.forceUpdate();
               continue;
             }
-            if (M.includes("component") && ((A.paths.has(x) || A.paths.has("")) && (F = !0), !F))
-              for (const z of $) {
-                let p = z;
+            if (U.includes("component") && ((A.paths.has(O) || A.paths.has("")) && (j = !0), !j))
+              for (const B of I) {
+                let G = B;
                 for (; ; ) {
-                  if (A.paths.has(p)) {
-                    F = !0;
+                  if (A.paths.has(G)) {
+                    j = !0;
                     break;
                   }
-                  const N = p.lastIndexOf(".");
-                  if (N !== -1) {
-                    const P = p.substring(
+                  const b = G.lastIndexOf(".");
+                  if (b !== -1) {
+                    const V = G.substring(
                       0,
-                      N
+                      b
                     );
                     if (!isNaN(
-                      Number(p.substring(N + 1))
-                    ) && A.paths.has(P)) {
-                      F = !0;
+                      Number(G.substring(b + 1))
+                    ) && A.paths.has(V)) {
+                      j = !0;
                       break;
                     }
-                    p = P;
+                    G = V;
                   } else
-                    p = "";
-                  if (p === "")
+                    G = "";
+                  if (G === "")
                     break;
                 }
-                if (F) break;
+                if (j) break;
               }
-            if (!F && M.includes("deps") && A.depsFunction) {
-              const z = A.depsFunction(k);
-              let p = !1;
-              typeof z == "boolean" ? z && (p = !0) : q(A.deps, z) || (A.deps = z, p = !0), p && (F = !0);
+            if (!j && U.includes("deps") && A.depsFunction) {
+              const B = A.depsFunction(T);
+              let G = !1;
+              typeof B == "boolean" ? B && (G = !0) : Y(A.deps, B) || (A.deps = B, G = !0), G && (j = !0);
             }
-            F && A.forceUpdate();
+            j && A.forceUpdate();
           }
         }
       }
-      const C = Date.now();
-      r = r.map((T, $) => {
-        const x = r.slice(0, -1), G = Y(k, x);
-        return $ === r.length - 1 && ["insert", "cut"].includes(a.updateType) ? (G.length - 1).toString() : T;
+      const $ = Date.now();
+      o = o.map((_, I) => {
+        const O = o.slice(0, -1), N = Z(T, O);
+        return I === o.length - 1 && ["insert", "cut"].includes(a.updateType) ? (N.length - 1).toString() : _;
       });
-      const { oldValue: R, newValue: H } = Jt(
+      const { oldValue: R, newValue: z } = Xt(
         a.updateType,
         v,
-        k,
-        r
-      ), Q = {
-        timeStamp: C,
-        stateKey: f,
-        path: r,
+        T,
+        o
+      ), K = {
+        timeStamp: $,
+        stateKey: S,
+        path: o,
         updateType: a.updateType,
         status: "new",
         oldValue: R,
-        newValue: H
+        newValue: z
       };
       switch (a.updateType) {
         case "update":
-          w.updateShadowAtPath(f, r, k);
+          w.updateShadowAtPath(S, o, T);
           break;
         case "insert":
-          const T = r.slice(0, -1);
-          w.insertShadowArrayElement(f, T, H);
+          const _ = o.slice(0, -1);
+          w.insertShadowArrayElement(S, _, z);
           break;
         case "cut":
-          const $ = r.slice(0, -1), x = parseInt(r[r.length - 1]);
-          w.removeShadowArrayElement(f, $, x);
+          const I = o.slice(0, -1), O = parseInt(o[o.length - 1]);
+          w.removeShadowArrayElement(S, I, O);
           break;
       }
-      if (zt(f, (T) => {
-        const x = [...T ?? [], Q].reduce((G, A) => {
-          const F = `${A.stateKey}:${JSON.stringify(A.path)}`, M = G.get(F);
-          return M ? (M.timeStamp = Math.max(M.timeStamp, A.timeStamp), M.newValue = A.newValue, M.oldValue = M.oldValue ?? A.oldValue, M.updateType = A.updateType) : G.set(F, { ...A }), G;
+      if (Jt(S, (_) => {
+        const O = [..._ ?? [], K].reduce((N, A) => {
+          const j = `${A.stateKey}:${JSON.stringify(A.path)}`, U = N.get(j);
+          return U ? (U.timeStamp = Math.max(U.timeStamp, A.timeStamp), U.newValue = A.newValue, U.oldValue = U.oldValue ?? A.oldValue, U.updateType = A.updateType) : N.set(j, { ...A }), N;
         }, /* @__PURE__ */ new Map());
-        return Array.from(x.values());
-      }), Vt(
-        k,
-        f,
-        O.current,
-        U
-      ), O.current?.middleware && O.current.middleware({
-        updateLog: l,
-        update: Q
-      }), O.current?.serverSync) {
-        const T = w.serverState[f], $ = O.current?.serverSync;
-        Bt(f, {
-          syncKey: typeof $.syncKey == "string" ? $.syncKey : $.syncKey({ state: k }),
-          rollBackState: T,
-          actionTimeStamp: Date.now() + ($.debounce ?? 3e3),
+        return Array.from(O.values());
+      }), Nt(
+        T,
+        S,
+        M.current,
+        D
+      ), M.current?.middleware && M.current.middleware({
+        updateLog: c,
+        update: K
+      }), M.current?.serverSync) {
+        const _ = w.serverState[S], I = M.current?.serverSync;
+        Yt(S, {
+          syncKey: typeof I.syncKey == "string" ? I.syncKey : I.syncKey({ state: T }),
+          rollBackState: _,
+          actionTimeStamp: Date.now() + (I.debounce ?? 3e3),
           status: "waiting"
         });
       }
-      return k;
+      return T;
     });
   };
-  o.getState().updaterState[f] || (St(
-    f,
-    mt(
-      f,
-      it,
-      tt.current,
-      U
+  r.getState().updaterState[S] || (mt(
+    S,
+    ht(
+      S,
+      ct,
+      et.current,
+      D
     )
-  ), o.getState().cogsStateStore[f] || rt(f, t), o.getState().initialStateGlobal[f] || Et(f, t));
-  const d = It(() => mt(
-    f,
-    it,
-    tt.current,
-    U
-  ), [f, U]);
-  return [Pt(f), d];
+  ), r.getState().cogsStateStore[S] || ot(S, t), r.getState().initialStateGlobal[S] || kt(S, t));
+  const l = Et(() => ht(
+    S,
+    ct,
+    et.current,
+    D
+  ), [S, D]);
+  return [Mt(S), l];
 }
-function mt(t, i, S, u) {
+function ht(t, i, f, u) {
   const h = /* @__PURE__ */ new Map();
-  let V = 0;
-  const I = (m) => {
+  let x = 0;
+  const p = (m) => {
     const n = m.join(".");
     for (const [g] of h)
       (g === n || g.startsWith(n + ".")) && h.delete(g);
-    V++;
+    x++;
   }, y = {
     removeValidation: (m) => {
-      m?.validationKey && X(m.validationKey);
+      m?.validationKey && Q(m.validationKey);
     },
     revertToInitialState: (m) => {
-      const n = o.getState().getInitialOptions(t)?.validation;
-      n?.key && X(n?.key), m?.validationKey && X(m.validationKey);
-      const g = o.getState().initialStateGlobal[t];
-      o.getState().clearSelectedIndexesForState(t), h.clear(), V++;
-      const D = s(g, []), j = at(t), U = K(j?.localStorage?.key) ? j?.localStorage?.key(g) : j?.localStorage?.key, W = `${u}-${t}-${U}`;
-      W && localStorage.removeItem(W), St(t, D), rt(t, g);
-      const f = o.getState().stateComponents.get(t);
-      return f && f.components.forEach((l) => {
-        l.forceUpdate();
+      const n = r.getState().getInitialOptions(t)?.validation;
+      n?.key && Q(n?.key), m?.validationKey && Q(m.validationKey);
+      const g = r.getState().initialStateGlobal[t];
+      r.getState().clearSelectedIndexesForState(t), h.clear(), x++;
+      const L = s(g, []), F = st(t), D = tt(F?.localStorage?.key) ? F?.localStorage?.key(g) : F?.localStorage?.key, H = `${u}-${t}-${D}`;
+      H && localStorage.removeItem(H), mt(t, L), ot(t, g);
+      const S = r.getState().stateComponents.get(t);
+      return S && S.components.forEach((c) => {
+        c.forceUpdate();
       }), g;
     },
     updateInitialState: (m) => {
-      h.clear(), V++;
-      const n = mt(
+      h.clear(), x++;
+      const n = ht(
         t,
         i,
-        S,
+        f,
         u
-      ), g = o.getState().initialStateGlobal[t], D = at(t), j = K(D?.localStorage?.key) ? D?.localStorage?.key(g) : D?.localStorage?.key, U = `${u}-${t}-${j}`;
-      return localStorage.getItem(U) && localStorage.removeItem(U), Ot(() => {
-        Et(t, m), o.getState().initializeShadowState(t, m), St(t, n), rt(t, m);
-        const W = o.getState().stateComponents.get(t);
-        W && W.components.forEach((f) => {
-          f.forceUpdate();
+      ), g = r.getState().initialStateGlobal[t], L = st(t), F = tt(L?.localStorage?.key) ? L?.localStorage?.key(g) : L?.localStorage?.key, D = `${u}-${t}-${F}`;
+      return localStorage.getItem(D) && localStorage.removeItem(D), Dt(() => {
+        kt(t, m), r.getState().initializeShadowState(t, m), mt(t, n), ot(t, m);
+        const H = r.getState().stateComponents.get(t);
+        H && H.components.forEach((S) => {
+          S.forceUpdate();
         });
       }), {
-        fetchId: (W) => n.get()[W]
+        fetchId: (H) => n.get()[H]
       };
     },
-    _initialState: o.getState().initialStateGlobal[t],
-    _serverState: o.getState().serverState[t],
-    _isLoading: o.getState().isLoadingGlobal[t],
+    _initialState: r.getState().initialStateGlobal[t],
+    _serverState: r.getState().serverState[t],
+    _isLoading: r.getState().isLoadingGlobal[t],
     _isServerSynced: () => {
-      const m = o.getState().serverState[t];
-      return !!(m && q(m, Pt(t)));
+      const m = r.getState().serverState[t];
+      return !!(m && Y(m, Mt(t)));
     }
   };
   function s(m, n = [], g) {
-    const D = n.map(String).join(".");
-    h.get(D);
-    const j = function() {
-      return o().getNestedState(t, n);
+    const L = n.map(String).join(".");
+    h.get(L);
+    const F = function() {
+      return r().getNestedState(t, n);
     };
-    Object.keys(y).forEach((f) => {
-      j[f] = y[f];
+    Object.keys(y).forEach((S) => {
+      F[S] = y[S];
     });
-    const U = {
-      apply(f, l, ut) {
+    const D = {
+      apply(S, c, gt) {
         return console.log(
           `PROXY APPLY TRAP HIT: stateKey=${t}, path=${n.join(".")}`
-        ), console.trace("Apply trap stack trace"), o().getNestedState(t, n);
+        ), console.trace("Apply trap stack trace"), r().getNestedState(t, n);
       },
-      get(f, l) {
+      get(S, c) {
         g?.validIndices && !Array.isArray(m) && (g = { ...g, validIndices: void 0 });
-        const ut = /* @__PURE__ */ new Set([
+        const gt = /* @__PURE__ */ new Set([
           "insert",
           "cut",
           "cutByValue",
@@ -523,85 +523,85 @@ function mt(t, i, S, u) {
           "_stateKey",
           "getComponents"
         ]);
-        if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !ut.has(l)) {
-          const d = `${t}////${S}`, e = o.getState().stateComponents.get(t);
+        if (c !== "then" && !c.startsWith("$") && c !== "stateMapNoRender" && !gt.has(c)) {
+          const l = `${t}////${f}`, e = r.getState().stateComponents.get(t);
           if (e) {
-            const r = e.components.get(d);
-            if (r && !r.paths.has("")) {
+            const o = e.components.get(l);
+            if (o && !o.paths.has("")) {
               const a = n.join(".");
-              let c = !0;
-              for (const w of r.paths)
+              let d = !0;
+              for (const w of o.paths)
                 if (a.startsWith(w) && (a === w || a[w.length] === ".")) {
-                  c = !1;
+                  d = !1;
                   break;
                 }
-              c && r.paths.add(a);
+              d && o.paths.add(a);
             }
           }
         }
-        if (l === "getDifferences")
-          return () => wt(
-            o.getState().cogsStateStore[t],
-            o.getState().initialStateGlobal[t]
+        if (c === "getDifferences")
+          return () => Tt(
+            r.getState().cogsStateStore[t],
+            r.getState().initialStateGlobal[t]
           );
-        if (l === "sync" && n.length === 0)
+        if (c === "sync" && n.length === 0)
           return async function() {
-            const d = o.getState().getInitialOptions(t), e = d?.sync;
+            const l = r.getState().getInitialOptions(t), e = l?.sync;
             if (!e)
               return console.error(`No mutation defined for state key "${t}"`), { success: !1, error: "No mutation defined" };
-            const r = o.getState().getNestedState(t, []), a = d?.validation?.key;
+            const o = r.getState().getNestedState(t, []), a = l?.validation?.key;
             try {
-              const c = await e.action(r);
-              if (c && !c.success && c.errors && a) {
-                o.getState().removeValidationError(a), c.errors.forEach((v) => {
-                  const k = [a, ...v.path].join(".");
-                  o.getState().addValidationError(k, v.message);
+              const d = await e.action(o);
+              if (d && !d.success && d.errors && a) {
+                r.getState().removeValidationError(a), d.errors.forEach((v) => {
+                  const T = [a, ...v.path].join(".");
+                  r.getState().addValidationError(T, v.message);
                 });
-                const w = o.getState().stateComponents.get(t);
+                const w = r.getState().stateComponents.get(t);
                 w && w.components.forEach((v) => {
                   v.forceUpdate();
                 });
               }
-              return c?.success && e.onSuccess ? e.onSuccess(c.data) : !c?.success && e.onError && e.onError(c.error), c;
-            } catch (c) {
-              return e.onError && e.onError(c), { success: !1, error: c };
+              return d?.success && e.onSuccess ? e.onSuccess(d.data) : !d?.success && e.onError && e.onError(d.error), d;
+            } catch (d) {
+              return e.onError && e.onError(d), { success: !1, error: d };
             }
           };
-        if (l === "_status") {
-          const d = o.getState().getNestedState(t, n), e = o.getState().initialStateGlobal[t], r = Y(e, n);
-          return q(d, r) ? "fresh" : "stale";
+        if (c === "_status") {
+          const l = r.getState().getNestedState(t, n), e = r.getState().initialStateGlobal[t], o = Z(e, n);
+          return Y(l, o) ? "fresh" : "stale";
         }
-        if (l === "getStatus")
+        if (c === "getStatus")
           return function() {
-            const d = o().getNestedState(
+            const l = r().getNestedState(
               t,
               n
-            ), e = o.getState().initialStateGlobal[t], r = Y(e, n);
-            return q(d, r) ? "fresh" : "stale";
+            ), e = r.getState().initialStateGlobal[t], o = Z(e, n);
+            return Y(l, o) ? "fresh" : "stale";
           };
-        if (l === "removeStorage")
+        if (c === "removeStorage")
           return () => {
-            const d = o.getState().initialStateGlobal[t], e = at(t), r = K(e?.localStorage?.key) ? e?.localStorage?.key(d) : e?.localStorage?.key, a = `${u}-${t}-${r}`;
+            const l = r.getState().initialStateGlobal[t], e = st(t), o = tt(e?.localStorage?.key) ? e?.localStorage?.key(l) : e?.localStorage?.key, a = `${u}-${t}-${o}`;
             a && localStorage.removeItem(a);
           };
-        if (l === "showValidationErrors")
+        if (c === "showValidationErrors")
           return () => {
-            const d = o.getState().getInitialOptions(t)?.validation;
-            if (!d?.key)
+            const l = r.getState().getInitialOptions(t)?.validation;
+            if (!l?.key)
               throw new Error("Validation key not found");
-            return o.getState().getValidationErrors(d.key + "." + n.join("."));
+            return r.getState().getValidationErrors(l.key + "." + n.join("."));
           };
         if (Array.isArray(m)) {
-          const d = () => g?.validIndices ? m.map((r, a) => ({
-            item: r,
+          const l = () => g?.validIndices ? m.map((o, a) => ({
+            item: o,
             originalIndex: g.validIndices[a]
-          })) : o.getState().getNestedState(t, n).map((r, a) => ({
-            item: r,
+          })) : r.getState().getNestedState(t, n).map((o, a) => ({
+            item: o,
             originalIndex: a
           }));
-          if (l === "getSelected")
+          if (c === "getSelected")
             return () => {
-              const e = o.getState().getSelectedIndex(t, n.join("."));
+              const e = r.getState().getSelectedIndex(t, n.join("."));
               if (e !== void 0)
                 return s(
                   m[e],
@@ -609,62 +609,62 @@ function mt(t, i, S, u) {
                   g
                 );
             };
-          if (l === "clearSelected")
+          if (c === "clearSelected")
             return () => {
-              o.getState().clearSelectedIndex({ stateKey: t, path: n });
+              r.getState().clearSelectedIndex({ stateKey: t, path: n });
             };
-          if (l === "getSelectedIndex")
-            return () => o.getState().getSelectedIndex(t, n.join(".")) ?? -1;
-          if (l === "useVirtualView")
+          if (c === "getSelectedIndex")
+            return () => r.getState().getSelectedIndex(t, n.join(".")) ?? -1;
+          if (c === "useVirtualView")
             return (e) => {
               const {
-                itemHeight: r = 50,
+                itemHeight: o = 50,
                 overscan: a = 6,
-                stickToBottom: c = !1,
+                stickToBottom: d = !1,
                 dependencies: w = []
-              } = e, v = J(null), [k, E] = st({
+              } = e, v = q(null), [T, E] = it({
                 startIndex: 0,
                 endIndex: 10
-              }), [b, _] = st(0), C = J(!0), R = J(!1), H = J(0);
-              nt(() => o.getState().subscribeToShadowState(t, () => {
-                _((N) => N + 1);
+              }), [k, C] = it(0), $ = q(!0), R = q(!1), z = q(0), K = q(T);
+              rt(() => r.getState().subscribeToShadowState(t, () => {
+                C((V) => V + 1);
               }), [t]);
-              const Q = o().getNestedState(
+              const _ = r().getNestedState(
                 t,
                 n
-              ), T = Q.length, { totalHeight: $, positions: x } = It(() => {
-                const p = o.getState().getShadowMetadata(t, n) || [];
-                let N = 0;
+              ), I = _.length, { totalHeight: O, positions: N } = Et(() => {
+                const b = r.getState().getShadowMetadata(t, n) || [];
+                let V = 0;
                 const P = [];
-                for (let L = 0; L < T; L++) {
-                  P[L] = N;
-                  const B = p[L]?.virtualizer?.itemHeight;
-                  N += B || r;
+                for (let W = 0; W < I; W++) {
+                  P[W] = V;
+                  const J = b[W]?.virtualizer?.itemHeight;
+                  V += J || o;
                 }
-                return { totalHeight: N, positions: P };
+                return { totalHeight: V, positions: P };
               }, [
-                T,
+                I,
                 t,
                 n.join("."),
-                r,
-                b
-              ]), G = It(() => {
-                const p = Math.max(0, k.startIndex), N = Math.min(T, k.endIndex), P = Array.from(
-                  { length: N - p },
-                  (B, ot) => p + ot
-                ), L = P.map((B) => Q[B]);
-                return s(L, n, {
+                o,
+                k
+              ]), A = Et(() => {
+                const b = Math.max(0, T.startIndex), V = Math.min(I, T.endIndex), P = Array.from(
+                  { length: V - b },
+                  (J, at) => b + at
+                ), W = P.map((J) => _[J]);
+                return s(W, n, {
                   ...g,
                   validIndices: P
                 });
-              }, [k.startIndex, k.endIndex, Q, T]), A = ft(() => {
-                const p = o.getState().getShadowMetadata(t, n) || [], N = T - 1;
-                if (N >= 0) {
-                  const P = p[N];
+              }, [T.startIndex, T.endIndex, _, I]), j = St(() => {
+                const b = r.getState().getShadowMetadata(t, n) || [], V = I - 1;
+                if (V >= 0) {
+                  const P = b[V];
                   if (P?.virtualizer?.domRef) {
-                    const L = P.virtualizer.domRef;
-                    if (L && L.scrollIntoView)
-                      return L.scrollIntoView({
+                    const W = P.virtualizer.domRef;
+                    if (W && W.scrollIntoView)
+                      return W.scrollIntoView({
                         behavior: "auto",
                         block: "end",
                         inline: "nearest"
@@ -672,121 +672,128 @@ function mt(t, i, S, u) {
                   }
                 }
                 return !1;
-              }, [t, n, T]);
-              nt(() => {
-                if (!c || T === 0) return;
-                const p = T > H.current, N = H.current === 0 && T > 0;
-                if ((p || N) && C.current && !R.current) {
+              }, [t, n, I]);
+              rt(() => {
+                if (!d || I === 0) return;
+                const b = I > z.current, V = z.current === 0 && I > 0;
+                if ((b || V) && $.current && !R.current) {
                   const P = Math.ceil(
-                    (v.current?.clientHeight || 0) / r
-                  ), L = {
+                    (v.current?.clientHeight || 0) / o
+                  ), W = {
                     startIndex: Math.max(
                       0,
-                      T - P - a
+                      I - P - a
                     ),
-                    endIndex: T
+                    endIndex: I
                   };
-                  E(L);
-                  const B = setTimeout(() => {
-                    M(T - 1, "smooth");
+                  E(W);
+                  const J = setTimeout(() => {
+                    B(I - 1, "smooth");
                   }, 50);
-                  return () => clearTimeout(B);
+                  return () => clearTimeout(J);
                 }
-                H.current = T;
-              }, [T, r, a]), nt(() => {
-                const p = v.current;
-                if (!p) return;
-                const N = () => {
-                  const { scrollTop: P, scrollHeight: L, clientHeight: B } = p, ot = L - P - B;
-                  C.current = ot < 5, ot > 100 && (R.current = !0), ot < 5 && (R.current = !1);
-                  let et = 0;
-                  for (let Z = 0; Z < x.length; Z++)
-                    if (x[Z] > P - r * a) {
-                      et = Math.max(0, Z - 1);
+                z.current = I;
+              }, [I, o, a]), rt(() => {
+                const b = v.current;
+                if (!b) return;
+                const V = () => {
+                  const { scrollTop: P, scrollHeight: W, clientHeight: J } = b, at = W - P - J;
+                  $.current = at < 5, at > 100 && (R.current = !0), at < 5 && (R.current = !1);
+                  let nt = 0;
+                  for (let X = 0; X < N.length; X++)
+                    if (N[X] > P - o * a) {
+                      nt = Math.max(0, X - 1);
                       break;
                     }
-                  let Tt = et;
-                  const Rt = P + B;
-                  for (let Z = et; Z < x.length && !(x[Z] > Rt + r * a); Z++)
-                    Tt = Z;
-                  E({
-                    startIndex: Math.max(0, et),
-                    endIndex: Math.min(T, Tt + 1 + a)
-                  });
+                  let xt = nt;
+                  const Ut = P + J;
+                  for (let X = nt; X < N.length && !(N[X] > Ut + o * a); X++)
+                    xt = X;
+                  const vt = Math.max(0, nt), It = Math.min(
+                    I,
+                    xt + 1 + a
+                  );
+                  (vt !== K.current.startIndex || It !== K.current.endIndex) && (K.current = {
+                    startIndex: vt,
+                    endIndex: It
+                  }, E({
+                    startIndex: vt,
+                    endIndex: It
+                  }));
                 };
-                if (p.addEventListener("scroll", N, {
+                if (b.addEventListener("scroll", V, {
                   passive: !0
-                }), c && T > 0 && !R.current) {
-                  const { scrollTop: P } = p;
-                  P === 0 && (p.scrollTop = p.scrollHeight, C.current = !0);
+                }), d && I > 0 && !R.current) {
+                  const { scrollTop: P } = b;
+                  P === 0 && (b.scrollTop = b.scrollHeight, $.current = !0);
                 }
-                return N(), () => {
-                  p.removeEventListener("scroll", N);
+                return V(), () => {
+                  b.removeEventListener("scroll", V);
                 };
-              }, [x, T, r, a, c]);
-              const F = ft(() => {
-                C.current = !0, R.current = !1, !A() && v.current && (v.current.scrollTop = v.current.scrollHeight);
-              }, [A]), M = ft(
-                (p, N = "smooth") => {
+              }, [N, I, o, a, d]);
+              const U = St(() => {
+                $.current = !0, R.current = !1, !j() && v.current && (v.current.scrollTop = v.current.scrollHeight);
+              }, [j]), B = St(
+                (b, V = "smooth") => {
                   const P = v.current;
                   if (!P) return;
-                  if (p === T - 1) {
+                  if (b === I - 1) {
                     P.scrollTo({
                       top: P.scrollHeight,
-                      behavior: N
+                      behavior: V
                     });
                     return;
                   }
-                  const et = (o.getState().getShadowMetadata(t, n) || [])[p]?.virtualizer?.domRef;
-                  et ? et.scrollIntoView({
-                    behavior: N,
+                  const nt = (r.getState().getShadowMetadata(t, n) || [])[b]?.virtualizer?.domRef;
+                  nt ? nt.scrollIntoView({
+                    behavior: V,
                     block: "center"
-                  }) : x[p] !== void 0 && P.scrollTo({
-                    top: x[p],
-                    behavior: N
+                  }) : N[b] !== void 0 && P.scrollTo({
+                    top: N[b],
+                    behavior: V
                   });
                 },
-                [x, t, n, T]
+                [N, t, n, I]
                 // Add totalCount to the dependencies
-              ), z = {
+              ), G = {
                 outer: {
                   ref: v,
                   style: { overflowY: "auto", height: "100%" }
                 },
                 inner: {
                   style: {
-                    height: `${$}px`,
+                    height: `${O}px`,
                     position: "relative"
                   }
                 },
                 list: {
                   style: {
-                    transform: `translateY(${x[k.startIndex] || 0}px)`
+                    transform: `translateY(${N[T.startIndex] || 0}px)`
                   }
                 }
               };
               return {
-                virtualState: G,
-                virtualizerProps: z,
-                scrollToBottom: F,
-                scrollToIndex: M
+                virtualState: A,
+                virtualizerProps: G,
+                scrollToBottom: U,
+                scrollToIndex: B
               };
             };
-          if (l === "stateMapNoRender")
-            return (e) => m.map((a, c) => {
+          if (c === "stateMapNoRender")
+            return (e) => m.map((a, d) => {
               let w;
-              g?.validIndices && g.validIndices[c] !== void 0 ? w = g.validIndices[c] : w = c;
-              const v = [...n, w.toString()], k = s(a, v, g);
+              g?.validIndices && g.validIndices[d] !== void 0 ? w = g.validIndices[d] : w = d;
+              const v = [...n, w.toString()], T = s(a, v, g);
               return e(
                 a,
-                k,
-                c,
+                T,
+                d,
                 m,
                 s(m, n, g)
               );
             });
-          if (l === "$stateMap")
-            return (e) => lt(Zt, {
+          if (c === "$stateMap")
+            return (e) => dt(Kt, {
               proxy: {
                 _stateKey: t,
                 _path: n,
@@ -795,34 +802,35 @@ function mt(t, i, S, u) {
               },
               rebuildStateShape: s
             });
-          if (l === "stateList")
-            return (e) => {
-              const r = o.getState().getNestedState(t, n);
-              return Array.isArray(r) ? (g?.validIndices || Array.from({ length: r.length }, (c, w) => w)).map((c, w) => {
-                const v = r[c], k = [...n, c.toString()], E = s(v, k, g), b = `${S}-${n.join(".")}-${c}`;
-                return lt(Qt, {
-                  key: c,
+          if (c === "stateList")
+            return (e, o) => {
+              const a = r.getState().getNestedState(t, n);
+              return Array.isArray(a) ? (g?.validIndices || Array.from({ length: a.length }, (w, v) => v)).map((w, v) => {
+                const T = a[w], E = [...n, w.toString()], k = s(T, E, g), C = `${f}-${n.join(".")}-${w}`;
+                return dt(ee, {
+                  key: w,
                   stateKey: t,
-                  itemComponentId: b,
-                  itemPath: k,
+                  itemComponentId: C,
+                  formOpts: o,
+                  itemPath: E,
                   children: e(
-                    v,
-                    E,
-                    { localIndex: w, originalIndex: c },
-                    r,
-                    s(r, n, g)
+                    T,
+                    k,
+                    { localIndex: v, originalIndex: w },
+                    a,
+                    s(a, n, g)
                   )
                 });
               }) : (console.warn(
                 `stateList called on a non-array value at path: ${n.join(".")}.`
               ), null);
             };
-          if (l === "stateFlattenOn")
+          if (c === "stateFlattenOn")
             return (e) => {
-              const r = m;
-              h.clear(), V++;
-              const a = r.flatMap(
-                (c) => c[e] ?? []
+              const o = m;
+              h.clear(), x++;
+              const a = o.flatMap(
+                (d) => d[e] ?? []
               );
               return s(
                 a,
@@ -830,350 +838,349 @@ function mt(t, i, S, u) {
                 g
               );
             };
-          if (l === "index")
+          if (c === "index")
             return (e) => {
-              const r = m[e];
-              return s(r, [...n, e.toString()]);
+              const o = m[e];
+              return s(o, [...n, e.toString()]);
             };
-          if (l === "last")
+          if (c === "last")
             return () => {
-              const e = o.getState().getNestedState(t, n);
+              const e = r.getState().getNestedState(t, n);
               if (e.length === 0) return;
-              const r = e.length - 1, a = e[r], c = [...n, r.toString()];
-              return s(a, c);
+              const o = e.length - 1, a = e[o], d = [...n, o.toString()];
+              return s(a, d);
             };
-          if (l === "insert")
-            return (e) => (I(n), vt(i, e, n, t), s(
-              o.getState().getNestedState(t, n),
+          if (c === "insert")
+            return (e) => (p(n), wt(i, e, n, t), s(
+              r.getState().getNestedState(t, n),
               n
             ));
-          if (l === "uniqueInsert")
-            return (e, r, a) => {
-              const c = o.getState().getNestedState(t, n), w = K(e) ? e(c) : e;
+          if (c === "uniqueInsert")
+            return (e, o, a) => {
+              const d = r.getState().getNestedState(t, n), w = tt(e) ? e(d) : e;
               let v = null;
-              if (!c.some((E) => {
-                if (r) {
-                  const _ = r.every(
-                    (C) => q(E[C], w[C])
+              if (!d.some((E) => {
+                if (o) {
+                  const C = o.every(
+                    ($) => Y(E[$], w[$])
                   );
-                  return _ && (v = E), _;
+                  return C && (v = E), C;
                 }
-                const b = q(E, w);
-                return b && (v = E), b;
+                const k = Y(E, w);
+                return k && (v = E), k;
               }))
-                I(n), vt(i, w, n, t);
+                p(n), wt(i, w, n, t);
               else if (a && v) {
-                const E = a(v), b = c.map(
-                  (_) => q(_, v) ? E : _
+                const E = a(v), k = d.map(
+                  (C) => Y(C, v) ? E : C
                 );
-                I(n), ct(i, b, n);
+                p(n), lt(i, k, n);
               }
             };
-          if (l === "cut")
-            return (e, r) => {
-              if (!r?.waitForSync)
-                return I(n), gt(i, n, t, e), s(
-                  o.getState().getNestedState(t, n),
+          if (c === "cut")
+            return (e, o) => {
+              if (!o?.waitForSync)
+                return p(n), ft(i, n, t, e), s(
+                  r.getState().getNestedState(t, n),
                   n
                 );
             };
-          if (l === "cutByValue")
+          if (c === "cutByValue")
             return (e) => {
-              for (let r = 0; r < m.length; r++)
-                m[r] === e && gt(i, n, t, r);
+              for (let o = 0; o < m.length; o++)
+                m[o] === e && ft(i, n, t, o);
             };
-          if (l === "toggleByValue")
+          if (c === "toggleByValue")
             return (e) => {
-              const r = m.findIndex((a) => a === e);
-              r > -1 ? gt(i, n, t, r) : vt(i, e, n, t);
+              const o = m.findIndex((a) => a === e);
+              o > -1 ? ft(i, n, t, o) : wt(i, e, n, t);
             };
-          if (l === "stateFind")
+          if (c === "stateFind")
             return (e) => {
-              const a = d().find(
+              const a = l().find(
                 ({ item: w }, v) => e(w, v)
               );
               if (!a) return;
-              const c = [...n, a.originalIndex.toString()];
-              return s(a.item, c, g);
+              const d = [...n, a.originalIndex.toString()];
+              return s(a.item, d, g);
             };
-          if (l === "findWith")
-            return (e, r) => {
-              const c = d().find(
-                ({ item: v }) => v[e] === r
+          if (c === "findWith")
+            return (e, o) => {
+              const d = l().find(
+                ({ item: v }) => v[e] === o
               );
-              if (!c) return;
-              const w = [...n, c.originalIndex.toString()];
-              return s(c.item, w, g);
+              if (!d) return;
+              const w = [...n, d.originalIndex.toString()];
+              return s(d.item, w, g);
             };
         }
-        const tt = n[n.length - 1];
-        if (!isNaN(Number(tt))) {
-          const d = n.slice(0, -1), e = o.getState().getNestedState(t, d);
-          if (Array.isArray(e) && l === "cut")
-            return () => gt(
+        const et = n[n.length - 1];
+        if (!isNaN(Number(et))) {
+          const l = n.slice(0, -1), e = r.getState().getNestedState(t, l);
+          if (Array.isArray(e) && c === "cut")
+            return () => ft(
               i,
-              d,
+              l,
               t,
-              Number(tt)
+              Number(et)
             );
         }
-        if (l === "get")
+        if (c === "get")
           return () => {
             if (g?.validIndices && Array.isArray(m)) {
-              const d = o.getState().getNestedState(t, n);
-              return g.validIndices.map((e) => d[e]);
+              const l = r.getState().getNestedState(t, n);
+              return g.validIndices.map((e) => l[e]);
             }
-            return o.getState().getNestedState(t, n);
+            return r.getState().getNestedState(t, n);
           };
-        if (l === "$derive")
-          return (d) => $t({
+        if (c === "$derive")
+          return (l) => Pt({
             _stateKey: t,
             _path: n,
-            _effect: d.toString()
+            _effect: l.toString()
           });
-        if (l === "$get")
-          return () => $t({
+        if (c === "$get")
+          return () => Pt({
             _stateKey: t,
             _path: n
           });
-        if (l === "lastSynced") {
-          const d = `${t}:${n.join(".")}`;
-          return o.getState().getSyncInfo(d);
+        if (c === "lastSynced") {
+          const l = `${t}:${n.join(".")}`;
+          return r.getState().getSyncInfo(l);
         }
-        if (l == "getLocalStorage")
-          return (d) => ht(u + "-" + t + "-" + d);
-        if (l === "_selected") {
-          const d = n.slice(0, -1), e = d.join("."), r = o.getState().getNestedState(t, d);
-          return Array.isArray(r) ? Number(n[n.length - 1]) === o.getState().getSelectedIndex(t, e) : void 0;
+        if (c == "getLocalStorage")
+          return (l) => yt(u + "-" + t + "-" + l);
+        if (c === "_selected") {
+          const l = n.slice(0, -1), e = l.join("."), o = r.getState().getNestedState(t, l);
+          return Array.isArray(o) ? Number(n[n.length - 1]) === r.getState().getSelectedIndex(t, e) : void 0;
         }
-        if (l === "setSelected")
-          return (d) => {
-            const e = n.slice(0, -1), r = Number(n[n.length - 1]), a = e.join(".");
-            d ? o.getState().setSelectedIndex(t, a, r) : o.getState().setSelectedIndex(t, a, void 0);
-            const c = o.getState().getNestedState(t, [...e]);
-            ct(i, c, e), I(e);
+        if (c === "setSelected")
+          return (l) => {
+            const e = n.slice(0, -1), o = Number(n[n.length - 1]), a = e.join(".");
+            l ? r.getState().setSelectedIndex(t, a, o) : r.getState().setSelectedIndex(t, a, void 0);
+            const d = r.getState().getNestedState(t, [...e]);
+            lt(i, d, e), p(e);
           };
-        if (l === "toggleSelected")
+        if (c === "toggleSelected")
           return () => {
-            const d = n.slice(0, -1), e = Number(n[n.length - 1]), r = d.join("."), a = o.getState().getSelectedIndex(t, r);
-            o.getState().setSelectedIndex(
+            const l = n.slice(0, -1), e = Number(n[n.length - 1]), o = l.join("."), a = r.getState().getSelectedIndex(t, o);
+            r.getState().setSelectedIndex(
               t,
-              r,
+              o,
               a === e ? void 0 : e
             );
-            const c = o.getState().getNestedState(t, [...d]);
-            ct(i, c, d), I(d);
+            const d = r.getState().getNestedState(t, [...l]);
+            lt(i, d, l), p(l);
           };
         if (n.length == 0) {
-          if (l === "addValidation")
-            return (d) => {
-              const e = o.getState().getInitialOptions(t)?.validation;
+          if (c === "addValidation")
+            return (l) => {
+              const e = r.getState().getInitialOptions(t)?.validation;
               if (!e?.key)
                 throw new Error("Validation key not found");
-              X(e.key), console.log("addValidationError", d), d.forEach((r) => {
-                const a = [e.key, ...r.path].join(".");
-                console.log("fullErrorPath", a), Ct(a, r.message);
-              }), dt(t);
+              Q(e.key), console.log("addValidationError", l), l.forEach((o) => {
+                const a = [e.key, ...o.path].join(".");
+                console.log("fullErrorPath", a), Ot(a, o.message);
+              }), ut(t);
             };
-          if (l === "applyJsonPatch")
-            return (d) => {
-              const e = o.getState().cogsStateStore[t], a = Gt(e, d).newDocument;
-              _t(
+          if (c === "applyJsonPatch")
+            return (l) => {
+              const e = r.getState().cogsStateStore[t], a = zt(e, l).newDocument;
+              jt(
                 t,
-                o.getState().initialStateGlobal[t],
+                r.getState().initialStateGlobal[t],
                 a,
                 i,
-                S,
+                f,
                 u
               );
-              const c = o.getState().stateComponents.get(t);
-              if (c) {
-                const w = wt(e, a), v = new Set(w);
+              const d = r.getState().stateComponents.get(t);
+              if (d) {
+                const w = Tt(e, a), v = new Set(w);
                 for (const [
-                  k,
+                  T,
                   E
-                ] of c.components.entries()) {
-                  let b = !1;
-                  const _ = Array.isArray(E.reactiveType) ? E.reactiveType : [E.reactiveType || "component"];
-                  if (!_.includes("none")) {
-                    if (_.includes("all")) {
+                ] of d.components.entries()) {
+                  let k = !1;
+                  const C = Array.isArray(E.reactiveType) ? E.reactiveType : [E.reactiveType || "component"];
+                  if (!C.includes("none")) {
+                    if (C.includes("all")) {
                       E.forceUpdate();
                       continue;
                     }
-                    if (_.includes("component") && (E.paths.has("") && (b = !0), !b))
-                      for (const C of v) {
-                        if (E.paths.has(C)) {
-                          b = !0;
+                    if (C.includes("component") && (E.paths.has("") && (k = !0), !k))
+                      for (const $ of v) {
+                        if (E.paths.has($)) {
+                          k = !0;
                           break;
                         }
-                        let R = C.lastIndexOf(".");
+                        let R = $.lastIndexOf(".");
                         for (; R !== -1; ) {
-                          const H = C.substring(0, R);
-                          if (E.paths.has(H)) {
-                            b = !0;
+                          const z = $.substring(0, R);
+                          if (E.paths.has(z)) {
+                            k = !0;
                             break;
                           }
-                          const Q = C.substring(
+                          const K = $.substring(
                             R + 1
                           );
-                          if (!isNaN(Number(Q))) {
-                            const T = H.lastIndexOf(".");
-                            if (T !== -1) {
-                              const $ = H.substring(
+                          if (!isNaN(Number(K))) {
+                            const _ = z.lastIndexOf(".");
+                            if (_ !== -1) {
+                              const I = z.substring(
                                 0,
-                                T
+                                _
                               );
-                              if (E.paths.has($)) {
-                                b = !0;
+                              if (E.paths.has(I)) {
+                                k = !0;
                                 break;
                               }
                             }
                           }
-                          R = H.lastIndexOf(".");
+                          R = z.lastIndexOf(".");
                         }
-                        if (b) break;
+                        if (k) break;
                       }
-                    if (!b && _.includes("deps") && E.depsFunction) {
-                      const C = E.depsFunction(a);
+                    if (!k && C.includes("deps") && E.depsFunction) {
+                      const $ = E.depsFunction(a);
                       let R = !1;
-                      typeof C == "boolean" ? C && (R = !0) : q(E.deps, C) || (E.deps = C, R = !0), R && (b = !0);
+                      typeof $ == "boolean" ? $ && (R = !0) : Y(E.deps, $) || (E.deps = $, R = !0), R && (k = !0);
                     }
-                    b && E.forceUpdate();
+                    k && E.forceUpdate();
                   }
                 }
               }
             };
-          if (l === "validateZodSchema")
+          if (c === "validateZodSchema")
             return () => {
-              const d = o.getState().getInitialOptions(t)?.validation, e = o.getState().addValidationError;
-              if (!d?.zodSchema)
+              const l = r.getState().getInitialOptions(t)?.validation, e = r.getState().addValidationError;
+              if (!l?.zodSchema)
                 throw new Error("Zod schema not found");
-              if (!d?.key)
+              if (!l?.key)
                 throw new Error("Validation key not found");
-              X(d.key);
-              const r = o.getState().cogsStateStore[t];
+              Q(l.key);
+              const o = r.getState().cogsStateStore[t];
               try {
-                const a = o.getState().getValidationErrors(d.key);
+                const a = r.getState().getValidationErrors(l.key);
                 a && a.length > 0 && a.forEach(([w]) => {
-                  w && w.startsWith(d.key) && X(w);
+                  w && w.startsWith(l.key) && Q(w);
                 });
-                const c = d.zodSchema.safeParse(r);
-                return c.success ? !0 : (c.error.errors.forEach((v) => {
-                  const k = v.path, E = v.message, b = [d.key, ...k].join(".");
-                  e(b, E);
-                }), dt(t), !1);
+                const d = l.zodSchema.safeParse(o);
+                return d.success ? !0 : (d.error.errors.forEach((v) => {
+                  const T = v.path, E = v.message, k = [l.key, ...T].join(".");
+                  e(k, E);
+                }), ut(t), !1);
               } catch (a) {
                 return console.error("Zod schema validation failed", a), !1;
               }
             };
-          if (l === "_componentId") return S;
-          if (l === "getComponents")
-            return () => o().stateComponents.get(t);
-          if (l === "getAllFormRefs")
-            return () => kt.getState().getFormRefsByStateKey(t);
-          if (l === "_initialState")
-            return o.getState().initialStateGlobal[t];
-          if (l === "_serverState")
-            return o.getState().serverState[t];
-          if (l === "_isLoading")
-            return o.getState().isLoadingGlobal[t];
-          if (l === "revertToInitialState")
+          if (c === "_componentId") return f;
+          if (c === "getComponents")
+            return () => r().stateComponents.get(t);
+          if (c === "getAllFormRefs")
+            return () => bt.getState().getFormRefsByStateKey(t);
+          if (c === "_initialState")
+            return r.getState().initialStateGlobal[t];
+          if (c === "_serverState")
+            return r.getState().serverState[t];
+          if (c === "_isLoading")
+            return r.getState().isLoadingGlobal[t];
+          if (c === "revertToInitialState")
             return y.revertToInitialState;
-          if (l === "updateInitialState") return y.updateInitialState;
-          if (l === "removeValidation") return y.removeValidation;
+          if (c === "updateInitialState") return y.updateInitialState;
+          if (c === "removeValidation") return y.removeValidation;
         }
-        if (l === "getFormRef")
-          return () => kt.getState().getFormRef(t + "." + n.join("."));
-        if (l === "validationWrapper")
+        if (c === "getFormRef")
+          return () => bt.getState().getFormRef(t + "." + n.join("."));
+        if (c === "validationWrapper")
           return ({
-            children: d,
+            children: l,
             hideMessage: e
-          }) => /* @__PURE__ */ yt(
-            Ft,
+          }) => /* @__PURE__ */ pt(
+            _t,
             {
               formOpts: e ? { validation: { message: "" } } : void 0,
               path: n,
-              validationKey: o.getState().getInitialOptions(t)?.validation?.key || "",
               stateKey: t,
               validIndices: g?.validIndices,
-              children: d
+              children: l
             }
           );
-        if (l === "_stateKey") return t;
-        if (l === "_path") return n;
-        if (l === "_isServerSynced") return y._isServerSynced;
-        if (l === "update")
-          return (d, e) => {
+        if (c === "_stateKey") return t;
+        if (c === "_path") return n;
+        if (c === "_isServerSynced") return y._isServerSynced;
+        if (c === "update")
+          return (l, e) => {
             if (e?.debounce)
-              Ut(() => {
-                ct(i, d, n, "");
-                const r = o.getState().getNestedState(t, n);
-                e?.afterUpdate && e.afterUpdate(r);
+              Gt(() => {
+                lt(i, l, n, "");
+                const o = r.getState().getNestedState(t, n);
+                e?.afterUpdate && e.afterUpdate(o);
               }, e.debounce);
             else {
-              ct(i, d, n, "");
-              const r = o.getState().getNestedState(t, n);
-              e?.afterUpdate && e.afterUpdate(r);
+              lt(i, l, n, "");
+              const o = r.getState().getNestedState(t, n);
+              e?.afterUpdate && e.afterUpdate(o);
             }
-            I(n);
+            p(n);
           };
-        if (l === "formElement")
-          return (d, e) => /* @__PURE__ */ yt(
-            Dt,
+        if (c === "formElement")
+          return (l, e) => /* @__PURE__ */ pt(
+            Wt,
             {
               setState: i,
               stateKey: t,
               path: n,
-              child: d,
+              child: l,
               formOpts: e
             }
           );
-        const O = [...n, l], it = o.getState().getNestedState(t, O);
-        return s(it, O, g);
+        const M = [...n, c], ct = r.getState().getNestedState(t, M);
+        return s(ct, M, g);
       }
-    }, W = new Proxy(j, U);
-    return h.set(D, {
-      proxy: W,
-      stateVersion: V
-    }), W;
+    }, H = new Proxy(F, D);
+    return h.set(L, {
+      proxy: H,
+      stateVersion: x
+    }), H;
   }
   return s(
-    o.getState().getNestedState(t, [])
+    r.getState().getNestedState(t, [])
   );
 }
-function $t(t) {
-  return lt(Xt, { proxy: t });
+function Pt(t) {
+  return dt(te, { proxy: t });
 }
-function Zt({
+function Kt({
   proxy: t,
   rebuildStateShape: i
 }) {
-  const S = o().getNestedState(t._stateKey, t._path);
-  return Array.isArray(S) ? i(
-    S,
+  const f = r().getNestedState(t._stateKey, t._path);
+  return Array.isArray(f) ? i(
+    f,
     t._path
   ).stateMapNoRender(
-    (h, V, I, y, s) => t._mapFn(h, V, I, y, s)
+    (h, x, p, y, s) => t._mapFn(h, x, p, y, s)
   ) : null;
 }
-function Xt({
+function te({
   proxy: t
 }) {
-  const i = J(null), S = `${t._stateKey}-${t._path.join(".")}`;
-  return nt(() => {
+  const i = q(null), f = `${t._stateKey}-${t._path.join(".")}`;
+  return rt(() => {
     const u = i.current;
     if (!u || !u.parentElement) return;
-    const h = u.parentElement, I = Array.from(h.childNodes).indexOf(u);
+    const h = u.parentElement, p = Array.from(h.childNodes).indexOf(u);
     let y = h.getAttribute("data-parent-id");
     y || (y = `parent-${crypto.randomUUID()}`, h.setAttribute("data-parent-id", y));
     const m = {
       instanceId: `instance-${crypto.randomUUID()}`,
       parentId: y,
-      position: I,
+      position: p,
       effect: t._effect
     };
-    o.getState().addSignalElement(S, m);
-    const n = o.getState().getNestedState(t._stateKey, t._path);
+    r.getState().addSignalElement(f, m);
+    const n = r.getState().getNestedState(t._stateKey, t._path);
     let g;
     if (t._effect)
       try {
@@ -1181,74 +1188,75 @@ function Xt({
           "state",
           `return (${t._effect})(state)`
         )(n);
-      } catch (j) {
-        console.error("Error evaluating effect function during mount:", j), g = n;
+      } catch (F) {
+        console.error("Error evaluating effect function during mount:", F), g = n;
       }
     else
       g = n;
     g !== null && typeof g == "object" && (g = JSON.stringify(g));
-    const D = document.createTextNode(String(g));
-    u.replaceWith(D);
-  }, [t._stateKey, t._path.join("."), t._effect]), lt("span", {
+    const L = document.createTextNode(String(g));
+    u.replaceWith(L);
+  }, [t._stateKey, t._path.join("."), t._effect]), dt("span", {
     ref: i,
     style: { display: "none" },
-    "data-signal-id": S
+    "data-signal-id": f
   });
 }
-function fe(t) {
-  const i = Mt(
-    (S) => {
-      const u = o.getState().stateComponents.get(t._stateKey) || {
+function he(t) {
+  const i = Ft(
+    (f) => {
+      const u = r.getState().stateComponents.get(t._stateKey) || {
         components: /* @__PURE__ */ new Map()
       };
       return u.components.set(t._stateKey, {
-        forceUpdate: S,
+        forceUpdate: f,
         paths: /* @__PURE__ */ new Set([t._path.join(".")])
       }), () => u.components.delete(t._stateKey);
     },
-    () => o.getState().getNestedState(t._stateKey, t._path)
+    () => r.getState().getNestedState(t._stateKey, t._path)
   );
-  return lt("text", {}, String(i));
+  return dt("text", {}, String(i));
 }
-function Qt({
+function ee({
   stateKey: t,
   itemComponentId: i,
-  itemPath: S,
-  children: u
+  itemPath: f,
+  formOpts: u,
+  children: h
 }) {
-  const [, h] = st({}), [V, I] = Wt(), y = J(null), s = J(null), m = ft(
+  const [, x] = it({}), [p, y] = Bt(), s = q(null), m = q(null);
+  return St(
     (n) => {
-      V(n), y.current = n;
+      p(n), s.current = n;
     },
-    [V]
-  );
-  return nt(() => {
-    I.height > 0 && I.height !== s.current && (s.current = I.height, o.getState().setShadowMetadata(t, S, {
+    [p]
+  ), rt(() => {
+    y.height > 0 && y.height !== m.current && (m.current = y.height, r.getState().setShadowMetadata(t, f, {
       virtualizer: {
-        itemHeight: I.height,
-        domRef: y.current
+        itemHeight: y.height,
+        domRef: s.current
         // Store the actual DOM element reference
       }
     }));
-  }, [I.height, t, S]), xt(() => {
-    const n = `${t}////${i}`, g = o.getState().stateComponents.get(t) || {
+  }, [y.height, t, f]), Ct(() => {
+    const n = `${t}////${i}`, g = r.getState().stateComponents.get(t) || {
       components: /* @__PURE__ */ new Map()
     };
     return g.components.set(n, {
-      forceUpdate: () => h({}),
-      paths: /* @__PURE__ */ new Set([S.join(".")])
-    }), o.getState().stateComponents.set(t, g), () => {
-      const D = o.getState().stateComponents.get(t);
-      D && D.components.delete(n);
+      forceUpdate: () => x({}),
+      paths: /* @__PURE__ */ new Set([f.join(".")])
+    }), r.getState().stateComponents.set(t, g), () => {
+      const L = r.getState().stateComponents.get(t);
+      L && L.components.delete(n);
     };
-  }, [t, i, S.join(".")]), /* @__PURE__ */ yt("div", { ref: m, children: u });
+  }, [t, i, f.join(".")]), /* @__PURE__ */ pt(_t, { formOpts: u, path: f, stateKey: t, children: h });
 }
 export {
-  $t as $cogsSignal,
-  fe as $cogsSignalStore,
-  de as addStateOptions,
-  ue as createCogsState,
-  ge as notifyComponent,
-  Yt as useCogsStateFn
+  Pt as $cogsSignal,
+  he as $cogsSignalStore,
+  fe as addStateOptions,
+  Se as createCogsState,
+  me as notifyComponent,
+  Qt as useCogsStateFn
 };
 //# sourceMappingURL=CogsState.jsx.map