cogsbox-state 0.5.285 → 0.5.287

package/dist/CogsState.jsx

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