cogsbox-state 0.5.287 → 0.5.289

package/dist/CogsState.jsx

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