cogsbox-state 0.5.349 → 0.5.350

package/dist/CogsState.jsx

@@ -1,41 +1,41 @@
 "use client";
-import { jsx as vt } from "react/jsx-runtime";
-import { useState as Q, useRef as Z, useEffect as et, useLayoutEffect as dt, useMemo as yt, createElement as at, useSyncExternalStore as _t, startTransition as Mt, useCallback as At } from "react";
-import { transformStateFunc as jt, isDeepEqual as H, isFunction as Y, getNestedValue as z, getDifferences as It, debounce as Rt } from "./utility.js";
-import { pushFunc as ht, updateFn as ot, cutFunc as lt, ValidationWrapper as Ot, FormControlComponent as Ut } from "./Functions.jsx";
-import Ft from "superjson";
-import { v4 as pt } from "uuid";
+import { jsx as ht } from "react/jsx-runtime";
+import { useState as Q, useRef as Z, useEffect as K, useLayoutEffect as lt, useMemo as vt, createElement as ot, useSyncExternalStore as Pt, startTransition as _t, useCallback as Et } from "react";
+import { transformStateFunc as Mt, isDeepEqual as H, isFunction as Y, getNestedValue as B, getDifferences as yt, debounce as Rt } from "./utility.js";
+import { pushFunc as mt, updateFn as rt, cutFunc as ct, ValidationWrapper as Ot, FormControlComponent as Ut } from "./Functions.jsx";
+import jt from "superjson";
+import { v4 as It } from "uuid";
 import "zod";
-import { getGlobalStore as r, formRefStore as Et } from "./store.js";
-import { useCogsConfig as xt } from "./CogsStateClient.jsx";
-import { applyPatch as Dt } from "fast-json-patch";
-import Wt from "react-use-measure";
-function $t(t, i) {
+import { getGlobalStore as r, formRefStore as At } from "./store.js";
+import { useCogsConfig as Nt } from "./CogsStateClient.jsx";
+import { applyPatch as Ft } from "fast-json-patch";
+import Dt from "react-use-measure";
+function Tt(t, i) {
   const m = r.getState().getInitialOptions, f = r.getState().setInitialStateOptions, y = m(t) || {};
   f(t, {
     ...y,
     ...i
   });
 }
-function kt({
+function $t({
   stateKey: t,
   options: i,
   initialOptionsPart: m
 }) {
-  const f = tt(t) || {}, y = m[t] || {}, k = r.getState().setInitialStateOptions, p = { ...y, ...f };
+  const f = et(t) || {}, y = m[t] || {}, b = r.getState().setInitialStateOptions, p = { ...y, ...f };
   let I = !1;
   if (i)
     for (const a in i)
       p.hasOwnProperty(a) ? (a == "localStorage" && i[a] && p[a].key !== i[a]?.key && (I = !0, p[a] = i[a]), a == "initialState" && i[a] && p[a] !== i[a] && // Different references
       !H(p[a], i[a]) && (I = !0, p[a] = i[a])) : (I = !0, p[a] = i[a]);
-  I && k(t, p);
+  I && b(t, p);
 }
-function le(t, { formElements: i, validation: m }) {
+function ce(t, { formElements: i, validation: m }) {
   return { initialState: t, formElements: i, validation: m };
 }
-const de = (t, i) => {
+const le = (t, i) => {
   let m = t;
-  const [f, y] = jt(m);
+  const [f, y] = Mt(m);
   (Object.keys(y).length > 0 || i && Object.keys(i).length > 0) && Object.keys(y).forEach((I) => {
     y[I] = y[I] || {}, y[I].formElements = {
       ...i?.formElements,
@@ -43,16 +43,16 @@ const de = (t, i) => {
       ...i?.validation,
       ...y[I].formElements || {}
       // State-specific overrides
-    }, tt(I) || r.getState().setInitialStateOptions(I, y[I]);
+    }, et(I) || r.getState().setInitialStateOptions(I, y[I]);
   }), r.getState().setInitialStates(f), r.getState().setCreatedState(f);
-  const k = (I, a) => {
-    const [v] = Q(a?.componentId ?? pt());
-    kt({
+  const b = (I, a) => {
+    const [v] = Q(a?.componentId ?? It());
+    $t({
       stateKey: I,
       options: a,
       initialOptionsPart: y
     });
-    const n = r.getState().cogsStateStore[I] || f[I], S = a?.modifyState ? a.modifyState(n) : n, [L, U] = Jt(
+    const n = r.getState().cogsStateStore[I] || f[I], S = a?.modifyState ? a.modifyState(n) : n, [L, j] = qt(
       S,
       {
         stateKey: I,
@@ -68,49 +68,49 @@ const de = (t, i) => {
         serverState: a?.serverState
       }
     );
-    return U;
+    return j;
   };
   function p(I, a) {
-    kt({ stateKey: I, options: a, initialOptionsPart: y }), a.localStorage && Bt(I, a), St(I);
+    $t({ stateKey: I, options: a, initialOptionsPart: y }), a.localStorage && Bt(I, a), ft(I);
   }
-  return { useCogsState: k, setCogsOptions: p };
+  return { useCogsState: b, setCogsOptions: p };
 }, {
-  setUpdaterState: ut,
-  setState: K,
-  getInitialOptions: tt,
-  getKeyState: Vt,
+  setUpdaterState: dt,
+  setState: tt,
+  getInitialOptions: et,
+  getKeyState: Ct,
   getValidationErrors: Lt,
-  setStateLog: Gt,
-  updateInitialStateGlobal: wt,
-  addValidationError: Ht,
+  setStateLog: Wt,
+  updateInitialStateGlobal: pt,
+  addValidationError: Gt,
   removeValidationError: J,
-  setServerSyncActions: zt
-} = r.getState(), bt = (t, i, m, f, y) => {
+  setServerSyncActions: Ht
+} = r.getState(), kt = (t, i, m, f, y) => {
   m?.log && console.log(
     "saving to localstorage",
     i,
     m.localStorage?.key,
     f
   );
-  const k = Y(m?.localStorage?.key) ? m.localStorage?.key(t) : m?.localStorage?.key;
-  if (k && f) {
-    const p = `${f}-${i}-${k}`;
+  const b = Y(m?.localStorage?.key) ? m.localStorage?.key(t) : m?.localStorage?.key;
+  if (b && f) {
+    const p = `${f}-${i}-${b}`;
     let I;
     try {
-      I = ft(p)?.lastSyncedWithServer;
+      I = gt(p)?.lastSyncedWithServer;
     } catch {
     }
     const a = {
       state: t,
       lastUpdated: Date.now(),
       lastSyncedWithServer: y ?? I
-    }, v = Ft.serialize(a);
+    }, v = jt.serialize(a);
     window.localStorage.setItem(
       p,
       JSON.stringify(v.json)
     );
   }
-}, ft = (t) => {
+}, gt = (t) => {
   if (!t) return null;
   try {
     const i = window.localStorage.getItem(t);
@@ -119,28 +119,28 @@ const de = (t, i) => {
     return console.error("Error loading from localStorage:", i), null;
   }
 }, Bt = (t, i) => {
-  const m = r.getState().cogsStateStore[t], { sessionId: f } = xt(), y = Y(i?.localStorage?.key) ? i.localStorage.key(m) : i?.localStorage?.key;
+  const m = r.getState().cogsStateStore[t], { sessionId: f } = Nt(), y = Y(i?.localStorage?.key) ? i.localStorage.key(m) : i?.localStorage?.key;
   if (y && f) {
-    const k = ft(
+    const b = gt(
       `${f}-${t}-${y}`
     );
-    if (k && k.lastUpdated > (k.lastSyncedWithServer || 0))
-      return K(t, k.state), St(t), !0;
+    if (b && b.lastUpdated > (b.lastSyncedWithServer || 0))
+      return tt(t, b.state), ft(t), !0;
   }
   return !1;
-}, Ct = (t, i, m, f, y, k) => {
+}, xt = (t, i, m, f, y, b) => {
   const p = {
     initialState: i,
-    updaterState: gt(
+    updaterState: ut(
       t,
       f,
       y,
-      k
+      b
     ),
     state: m
   };
-  wt(t, p.initialState), ut(t, p.updaterState), K(t, p.state);
-}, St = (t) => {
+  pt(t, p.initialState), dt(t, p.updaterState), tt(t, p.state);
+}, ft = (t) => {
   const i = r.getState().stateComponents.get(t);
   if (!i) return;
   const m = /* @__PURE__ */ new Set();
@@ -149,7 +149,7 @@ const de = (t, i) => {
   }), queueMicrotask(() => {
     m.forEach((f) => f());
   });
-}, ue = (t, i) => {
+}, de = (t, i) => {
   const m = r.getState().stateComponents.get(t);
   if (m) {
     const f = `${t}////${i}`, y = m.components.get(f);
@@ -157,22 +157,22 @@ const de = (t, i) => {
       return;
     y && y.forceUpdate();
   }
-}, qt = (t, i, m, f) => {
+}, zt = (t, i, m, f) => {
   switch (t) {
     case "update":
       return {
-        oldValue: z(i, f),
-        newValue: z(m, f)
+        oldValue: B(i, f),
+        newValue: B(m, f)
       };
     case "insert":
       return {
         oldValue: null,
         // or undefined
-        newValue: z(m, f)
+        newValue: B(m, f)
       };
     case "cut":
       return {
-        oldValue: z(i, f),
+        oldValue: B(i, f),
         newValue: null
         // or undefined
       };
@@ -180,12 +180,12 @@ const de = (t, i) => {
       return { oldValue: null, newValue: null };
   }
 };
-function Jt(t, {
+function qt(t, {
   stateKey: i,
   serverSync: m,
   localStorage: f,
   formElements: y,
-  reactiveDeps: k,
+  reactiveDeps: b,
   reactiveType: p,
   componentId: I,
   initialState: a,
@@ -193,14 +193,14 @@ function Jt(t, {
   dependencies: n,
   serverState: S
 } = {}) {
-  const [L, U] = Q({}), { sessionId: F } = xt();
-  let G = !i;
-  const [h] = Q(i ?? pt()), l = r.getState().stateLog[h], st = Z(/* @__PURE__ */ new Set()), X = Z(I ?? pt()), j = Z(
+  const [L, j] = Q({}), { sessionId: F } = Nt();
+  let W = !i;
+  const [h] = Q(i ?? It()), l = r.getState().stateLog[h], at = Z(/* @__PURE__ */ new Set()), X = Z(I ?? It()), O = Z(
     null
   );
-  j.current = tt(h) ?? null, et(() => {
+  O.current = et(h) ?? null, K(() => {
     if (v && v.stateKey === h && v.path?.[0]) {
-      K(h, (o) => ({
+      tt(h, (o) => ({
         ...o,
         [v.path[0]]: v.newValue
       }));
@@ -210,237 +210,237 @@ function Jt(t, {
         userId: v.userId
       });
     }
-  }, [v]), et(() => {
+  }, [v]), K(() => {
     if (a) {
-      $t(h, {
+      Tt(h, {
         initialState: a
       });
-      const e = j.current, s = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, c = r.getState().initialStateGlobal[h];
+      const e = O.current, s = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, c = r.getState().initialStateGlobal[h];
       if (!(c && !H(c, a) || !c) && !s)
         return;
       let u = null;
-      const T = Y(e?.localStorage?.key) ? e?.localStorage?.key(a) : e?.localStorage?.key;
-      T && F && (u = ft(`${F}-${h}-${T}`));
-      let w = a, E = !1;
-      const _ = s ? Date.now() : 0, P = u?.lastUpdated || 0, R = u?.lastSyncedWithServer || 0;
-      s && _ > P ? (w = e.serverState.data, E = !0) : u && P > R && (w = u.state, e?.localStorage?.onChange && e?.localStorage?.onChange(w)), r.getState().initializeShadowState(h, a), Ct(
+      const A = Y(e?.localStorage?.key) ? e?.localStorage?.key(a) : e?.localStorage?.key;
+      A && F && (u = gt(`${F}-${h}-${A}`));
+      let w = a, T = !1;
+      const M = s ? Date.now() : 0, P = u?.lastUpdated || 0, R = u?.lastSyncedWithServer || 0;
+      s && M > P ? (w = e.serverState.data, T = !0) : u && P > R && (w = u.state, e?.localStorage?.onChange && e?.localStorage?.onChange(w)), r.getState().initializeShadowState(h, a), xt(
         h,
         a,
         w,
         nt,
         X.current,
         F
-      ), E && T && F && bt(w, h, e, F, Date.now()), St(h), (Array.isArray(p) ? p : [p || "component"]).includes("none") || U({});
+      ), T && A && F && kt(w, h, e, F, Date.now()), ft(h), (Array.isArray(p) ? p : [p || "component"]).includes("none") || j({});
     }
   }, [
     a,
     S?.status,
     S?.data,
     ...n || []
-  ]), dt(() => {
-    G && $t(h, {
+  ]), lt(() => {
+    W && Tt(h, {
       serverSync: m,
       formElements: y,
       initialState: a,
       localStorage: f,
-      middleware: j.current?.middleware
+      middleware: O.current?.middleware
     });
     const e = `${h}////${X.current}`, o = r.getState().stateComponents.get(h) || {
       components: /* @__PURE__ */ new Map()
     };
     return o.components.set(e, {
-      forceUpdate: () => U({}),
+      forceUpdate: () => j({}),
       paths: /* @__PURE__ */ new Set(),
       deps: [],
-      depsFunction: k || void 0,
+      depsFunction: b || void 0,
       reactiveType: p ?? ["component", "deps"]
-    }), r.getState().stateComponents.set(h, o), U({}), () => {
+    }), r.getState().stateComponents.set(h, o), j({}), () => {
       o && (o.components.delete(e), o.components.size === 0 && r.getState().stateComponents.delete(h));
     };
   }, []);
   const nt = (e, o, s, c) => {
     if (Array.isArray(o)) {
       const u = `${h}-${o.join(".")}`;
-      st.current.add(u);
+      at.current.add(u);
     }
     const g = r.getState();
-    K(h, (u) => {
-      const T = Y(e) ? e(u) : e, w = `${h}-${o.join(".")}`;
+    tt(h, (u) => {
+      const A = Y(e) ? e(u) : e, w = `${h}-${o.join(".")}`;
       if (w) {
-        let V = !1, N = g.signalDomElements.get(w);
-        if ((!N || N.size === 0) && (s.updateType === "insert" || s.updateType === "cut")) {
-          const O = o.slice(0, -1), W = z(T, O);
-          if (Array.isArray(W)) {
+        let V = !1, C = g.signalDomElements.get(w);
+        if ((!C || C.size === 0) && (s.updateType === "insert" || s.updateType === "cut")) {
+          const U = o.slice(0, -1), D = B(A, U);
+          if (Array.isArray(D)) {
             V = !0;
-            const $ = `${h}-${O.join(".")}`;
-            N = g.signalDomElements.get($);
+            const $ = `${h}-${U.join(".")}`;
+            C = g.signalDomElements.get($);
           }
         }
-        if (N) {
-          const O = V ? z(T, o.slice(0, -1)) : z(T, o);
-          N.forEach(({ parentId: W, position: $, effect: A }) => {
-            const b = document.querySelector(
-              `[data-parent-id="${W}"]`
+        if (C) {
+          const U = V ? B(A, o.slice(0, -1)) : B(A, o);
+          C.forEach(({ parentId: D, position: $, effect: E }) => {
+            const k = document.querySelector(
+              `[data-parent-id="${D}"]`
             );
-            if (b) {
-              const M = Array.from(b.childNodes);
-              if (M[$]) {
-                const C = A ? new Function("state", `return (${A})(state)`)(O) : O;
-                M[$].textContent = String(C);
+            if (k) {
+              const _ = Array.from(k.childNodes);
+              if (_[$]) {
+                const x = E ? new Function("state", `return (${E})(state)`)(U) : U;
+                _[$].textContent = String(x);
               }
             }
           });
         }
       }
-      console.log("shadowState", g.shadowStateStore), s.updateType === "update" && (c || j.current?.validation?.key) && o && J(
-        (c || j.current?.validation?.key) + "." + o.join(".")
+      console.log("shadowState", g.shadowStateStore), s.updateType === "update" && (c || O.current?.validation?.key) && o && J(
+        (c || O.current?.validation?.key) + "." + o.join(".")
       );
-      const E = o.slice(0, o.length - 1);
-      s.updateType === "cut" && j.current?.validation?.key && J(
-        j.current?.validation?.key + "." + E.join(".")
-      ), s.updateType === "insert" && j.current?.validation?.key && Lt(
-        j.current?.validation?.key + "." + E.join(".")
-      ).filter(([N, O]) => {
-        let W = N?.split(".").length;
-        if (N == E.join(".") && W == E.length - 1) {
-          let $ = N + "." + E;
-          J(N), Ht($, O);
+      const T = o.slice(0, o.length - 1);
+      s.updateType === "cut" && O.current?.validation?.key && J(
+        O.current?.validation?.key + "." + T.join(".")
+      ), s.updateType === "insert" && O.current?.validation?.key && Lt(
+        O.current?.validation?.key + "." + T.join(".")
+      ).filter(([C, U]) => {
+        let D = C?.split(".").length;
+        if (C == T.join(".") && D == T.length - 1) {
+          let $ = C + "." + T;
+          J(C), Gt($, U);
         }
       });
-      const _ = g.stateComponents.get(h);
-      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", _), _) {
-        const V = It(u, T), N = new Set(V), O = s.updateType === "update" ? o.join(".") : o.slice(0, -1).join(".") || "";
+      const M = g.stateComponents.get(h);
+      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", M), M) {
+        const V = yt(u, A), C = new Set(V), U = s.updateType === "update" ? o.join(".") : o.slice(0, -1).join(".") || "";
         for (const [
-          W,
+          D,
           $
-        ] of _.components.entries()) {
-          let A = !1;
-          const b = Array.isArray($.reactiveType) ? $.reactiveType : [$.reactiveType || "component"];
-          if (console.log("component", $), !b.includes("none")) {
-            if (b.includes("all")) {
+        ] of M.components.entries()) {
+          let E = !1;
+          const k = Array.isArray($.reactiveType) ? $.reactiveType : [$.reactiveType || "component"];
+          if (console.log("component", $), !k.includes("none")) {
+            if (k.includes("all")) {
               $.forceUpdate();
               continue;
             }
-            if (b.includes("component") && (($.paths.has(O) || $.paths.has("")) && (A = !0), !A))
-              for (const M of N) {
-                let C = M;
+            if (k.includes("component") && (($.paths.has(U) || $.paths.has("")) && (E = !0), !E))
+              for (const _ of C) {
+                let x = _;
                 for (; ; ) {
-                  if ($.paths.has(C)) {
-                    A = !0;
+                  if ($.paths.has(x)) {
+                    E = !0;
                     break;
                   }
-                  const D = C.lastIndexOf(".");
-                  if (D !== -1) {
-                    const q = C.substring(
+                  const G = x.lastIndexOf(".");
+                  if (G !== -1) {
+                    const q = x.substring(
                       0,
-                      D
+                      G
                     );
                     if (!isNaN(
-                      Number(C.substring(D + 1))
+                      Number(x.substring(G + 1))
                     ) && $.paths.has(q)) {
-                      A = !0;
+                      E = !0;
                       break;
                     }
-                    C = q;
+                    x = q;
                   } else
-                    C = "";
-                  if (C === "")
+                    x = "";
+                  if (x === "")
                     break;
                 }
-                if (A) break;
+                if (E) break;
               }
-            if (!A && b.includes("deps") && $.depsFunction) {
-              const M = $.depsFunction(T);
-              let C = !1;
-              typeof M == "boolean" ? M && (C = !0) : H($.deps, M) || ($.deps = M, C = !0), C && (A = !0);
+            if (!E && k.includes("deps") && $.depsFunction) {
+              const _ = $.depsFunction(A);
+              let x = !1;
+              typeof _ == "boolean" ? _ && (x = !0) : H($.deps, _) || ($.deps = _, x = !0), x && (E = !0);
             }
-            A && $.forceUpdate();
+            E && $.forceUpdate();
           }
         }
       }
       const P = Date.now();
-      o = o.map((V, N) => {
-        const O = o.slice(0, -1), W = z(T, O);
-        return N === o.length - 1 && ["insert", "cut"].includes(s.updateType) ? (W.length - 1).toString() : V;
+      o = o.map((V, C) => {
+        const U = o.slice(0, -1), D = B(A, U);
+        return C === o.length - 1 && ["insert", "cut"].includes(s.updateType) ? (D.length - 1).toString() : V;
       });
-      const { oldValue: R, newValue: x } = qt(
+      const { oldValue: R, newValue: N } = zt(
         s.updateType,
         u,
-        T,
+        A,
         o
-      ), B = {
+      ), z = {
         timeStamp: P,
         stateKey: h,
         path: o,
         updateType: s.updateType,
         status: "new",
         oldValue: R,
-        newValue: x
+        newValue: N
       };
       switch (s.updateType) {
         case "update":
-          g.updateShadowAtPath(h, o, T);
+          g.updateShadowAtPath(h, o, A);
           break;
         case "insert":
           const V = o.slice(0, -1);
-          g.insertShadowArrayElement(h, V, x);
+          g.insertShadowArrayElement(h, V, N);
           break;
         case "cut":
-          const N = o.slice(0, -1), O = parseInt(o[o.length - 1]);
-          g.removeShadowArrayElement(h, N, O);
+          const C = o.slice(0, -1), U = parseInt(o[o.length - 1]);
+          g.removeShadowArrayElement(h, C, U);
           break;
       }
-      if (Gt(h, (V) => {
-        const O = [...V ?? [], B].reduce((W, $) => {
-          const A = `${$.stateKey}:${JSON.stringify($.path)}`, b = W.get(A);
-          return b ? (b.timeStamp = Math.max(b.timeStamp, $.timeStamp), b.newValue = $.newValue, b.oldValue = b.oldValue ?? $.oldValue, b.updateType = $.updateType) : W.set(A, { ...$ }), W;
+      if (Wt(h, (V) => {
+        const U = [...V ?? [], z].reduce((D, $) => {
+          const E = `${$.stateKey}:${JSON.stringify($.path)}`, k = D.get(E);
+          return k ? (k.timeStamp = Math.max(k.timeStamp, $.timeStamp), k.newValue = $.newValue, k.oldValue = k.oldValue ?? $.oldValue, k.updateType = $.updateType) : D.set(E, { ...$ }), D;
         }, /* @__PURE__ */ new Map());
-        return Array.from(O.values());
-      }), bt(
-        T,
+        return Array.from(U.values());
+      }), kt(
+        A,
         h,
-        j.current,
+        O.current,
         F
-      ), j.current?.middleware && j.current.middleware({
+      ), O.current?.middleware && O.current.middleware({
         updateLog: l,
-        update: B
-      }), j.current?.serverSync) {
-        const V = g.serverState[h], N = j.current?.serverSync;
-        zt(h, {
-          syncKey: typeof N.syncKey == "string" ? N.syncKey : N.syncKey({ state: T }),
+        update: z
+      }), O.current?.serverSync) {
+        const V = g.serverState[h], C = O.current?.serverSync;
+        Ht(h, {
+          syncKey: typeof C.syncKey == "string" ? C.syncKey : C.syncKey({ state: A }),
           rollBackState: V,
-          actionTimeStamp: Date.now() + (N.debounce ?? 3e3),
+          actionTimeStamp: Date.now() + (C.debounce ?? 3e3),
           status: "waiting"
         });
       }
-      return T;
+      return A;
     });
   };
-  r.getState().updaterState[h] || (ut(
+  r.getState().updaterState[h] || (dt(
     h,
-    gt(
+    ut(
       h,
       nt,
       X.current,
       F
     )
-  ), r.getState().cogsStateStore[h] || K(h, t), r.getState().initialStateGlobal[h] || wt(h, t));
-  const d = yt(() => gt(
+  ), r.getState().cogsStateStore[h] || tt(h, t), r.getState().initialStateGlobal[h] || pt(h, t));
+  const d = vt(() => ut(
     h,
     nt,
     X.current,
     F
   ), [h, F]);
-  return [Vt(h), d];
+  return [Ct(h), d];
 }
-function gt(t, i, m, f) {
+function ut(t, i, m, f) {
   const y = /* @__PURE__ */ new Map();
-  let k = 0;
+  let b = 0;
   const p = (v) => {
     const n = v.join(".");
     for (const [S] of y)
       (S === n || S.startsWith(n + ".")) && y.delete(S);
-    k++;
+    b++;
   }, I = {
     removeValidation: (v) => {
       v?.validationKey && J(v.validationKey);
@@ -449,30 +449,30 @@ function gt(t, i, m, f) {
       const n = r.getState().getInitialOptions(t)?.validation;
       n?.key && J(n?.key), v?.validationKey && J(v.validationKey);
       const S = r.getState().initialStateGlobal[t];
-      r.getState().clearSelectedIndexesForState(t), y.clear(), k++;
-      const L = a(S, []), U = tt(t), F = Y(U?.localStorage?.key) ? U?.localStorage?.key(S) : U?.localStorage?.key, G = `${f}-${t}-${F}`;
-      G && localStorage.removeItem(G), ut(t, L), K(t, S);
+      r.getState().clearSelectedIndexesForState(t), y.clear(), b++;
+      const L = a(S, []), j = et(t), F = Y(j?.localStorage?.key) ? j?.localStorage?.key(S) : j?.localStorage?.key, W = `${f}-${t}-${F}`;
+      W && localStorage.removeItem(W), dt(t, L), tt(t, S);
       const h = r.getState().stateComponents.get(t);
       return h && h.components.forEach((l) => {
         l.forceUpdate();
       }), S;
     },
     updateInitialState: (v) => {
-      y.clear(), k++;
-      const n = gt(
+      y.clear(), b++;
+      const n = ut(
         t,
         i,
         m,
         f
-      ), S = r.getState().initialStateGlobal[t], L = tt(t), U = Y(L?.localStorage?.key) ? L?.localStorage?.key(S) : L?.localStorage?.key, F = `${f}-${t}-${U}`;
-      return localStorage.getItem(F) && localStorage.removeItem(F), Mt(() => {
-        wt(t, v), r.getState().initializeShadowState(t, v), ut(t, n), K(t, v);
-        const G = r.getState().stateComponents.get(t);
-        G && G.components.forEach((h) => {
+      ), S = r.getState().initialStateGlobal[t], L = et(t), j = Y(L?.localStorage?.key) ? L?.localStorage?.key(S) : L?.localStorage?.key, F = `${f}-${t}-${j}`;
+      return localStorage.getItem(F) && localStorage.removeItem(F), _t(() => {
+        pt(t, v), r.getState().initializeShadowState(t, v), dt(t, n), tt(t, v);
+        const W = r.getState().stateComponents.get(t);
+        W && W.components.forEach((h) => {
           h.forceUpdate();
         });
       }), {
-        fetchId: (G) => n.get()[G]
+        fetchId: (W) => n.get()[W]
       };
     },
     _initialState: r.getState().initialStateGlobal[t],
@@ -480,27 +480,27 @@ function gt(t, i, m, f) {
     _isLoading: r.getState().isLoadingGlobal[t],
     _isServerSynced: () => {
       const v = r.getState().serverState[t];
-      return !!(v && H(v, Vt(t)));
+      return !!(v && H(v, Ct(t)));
     }
   };
   function a(v, n = [], S) {
     const L = n.map(String).join(".");
     y.get(L);
-    const U = function() {
+    const j = function() {
       return r().getNestedState(t, n);
     };
     Object.keys(I).forEach((h) => {
-      U[h] = I[h];
+      j[h] = I[h];
     });
     const F = {
-      apply(h, l, st) {
+      apply(h, l, at) {
         return console.log(
           `PROXY APPLY TRAP HIT: stateKey=${t}, path=${n.join(".")}`
         ), console.trace("Apply trap stack trace"), r().getNestedState(t, n);
       },
       get(h, l) {
         S?.validIndices && !Array.isArray(v) && (S = { ...S, validIndices: void 0 });
-        const st = /* @__PURE__ */ new Set([
+        const at = /* @__PURE__ */ new Set([
           "insert",
           "cut",
           "cutByValue",
@@ -523,7 +523,7 @@ function gt(t, i, m, f) {
           "_stateKey",
           "getComponents"
         ]);
-        if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !st.has(l)) {
+        if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !at.has(l)) {
           const d = `${t}////${m}`, e = r.getState().stateComponents.get(t);
           if (e) {
             const o = e.components.get(d);
@@ -540,7 +540,7 @@ function gt(t, i, m, f) {
           }
         }
         if (l === "getDifferences")
-          return () => It(
+          return () => yt(
             r.getState().cogsStateStore[t],
             r.getState().initialStateGlobal[t]
           );
@@ -554,8 +554,8 @@ function gt(t, i, m, f) {
               const c = await e.action(o);
               if (c && !c.success && c.errors && s) {
                 r.getState().removeValidationError(s), c.errors.forEach((u) => {
-                  const T = [s, ...u.path].join(".");
-                  r.getState().addValidationError(T, u.message);
+                  const A = [s, ...u.path].join(".");
+                  r.getState().addValidationError(A, u.message);
                 });
                 const g = r.getState().stateComponents.get(t);
                 g && g.components.forEach((u) => {
@@ -568,7 +568,7 @@ function gt(t, i, m, f) {
             }
           };
         if (l === "_status") {
-          const d = r.getState().getNestedState(t, n), e = r.getState().initialStateGlobal[t], o = z(e, n);
+          const d = r.getState().getNestedState(t, n), e = r.getState().initialStateGlobal[t], o = B(e, n);
           return H(d, o) ? "fresh" : "stale";
         }
         if (l === "getStatus")
@@ -576,12 +576,12 @@ function gt(t, i, m, f) {
             const d = r().getNestedState(
               t,
               n
-            ), e = r.getState().initialStateGlobal[t], o = z(e, n);
+            ), e = r.getState().initialStateGlobal[t], o = B(e, n);
             return H(d, o) ? "fresh" : "stale";
           };
         if (l === "removeStorage")
           return () => {
-            const d = r.getState().initialStateGlobal[t], e = tt(t), o = Y(e?.localStorage?.key) ? e?.localStorage?.key(d) : e?.localStorage?.key, s = `${f}-${t}-${o}`;
+            const d = r.getState().initialStateGlobal[t], e = et(t), o = Y(e?.localStorage?.key) ? e?.localStorage?.key(d) : e?.localStorage?.key, s = `${f}-${t}-${o}`;
             s && localStorage.removeItem(s);
           };
         if (l === "showValidationErrors")
@@ -621,98 +621,99 @@ function gt(t, i, m, f) {
                 itemHeight: o = 50,
                 overscan: s = 6,
                 stickToBottom: c = !1
-              } = e, g = Z(null), [u, T] = Q({
+              } = e, g = Z(null), [u, A] = Q({
                 startIndex: 0,
                 endIndex: 10
-              }), w = r().getNestedState(
+              }), w = Z(c), T = Z(0), [M, P] = Q(0);
+              K(() => r.getState().subscribeToShadowState(t, () => {
+                P((k) => k + 1);
+              }), [t]);
+              const R = r().getNestedState(
                 t,
                 n
-              ), E = Z(c), _ = Z(w.length), [P, R] = Q(0);
-              et(() => r.getState().subscribeToShadowState(t, () => {
-                R((b) => b + 1);
-              }), [t]);
-              const x = w.length, { totalHeight: B, positions: V } = yt(() => {
-                const A = r.getState().getShadowMetadata(t, n) || [];
-                let b = 0;
-                const M = [];
-                for (let C = 0; C < x; C++) {
-                  M[C] = b;
-                  const D = A[C]?.virtualizer?.itemHeight;
-                  b += D || o;
+              ), N = R.length, { totalHeight: z, positions: V } = vt(() => {
+                const E = r.getState().getShadowMetadata(t, n) || [];
+                let k = 0;
+                const _ = [];
+                for (let x = 0; x < N; x++) {
+                  _[x] = k;
+                  const G = E[x]?.virtualizer?.itemHeight;
+                  k += G || o;
                 }
-                return { totalHeight: b, positions: M };
+                return { totalHeight: k, positions: _ };
               }, [
-                x,
+                N,
                 t,
                 n.join("."),
                 o,
-                P
-              ]), N = yt(() => {
-                const A = Math.max(0, u.startIndex), b = Math.min(x, u.endIndex), M = Array.from(
-                  { length: b - A },
-                  (D, q) => A + q
-                ), C = M.map((D) => w[D]);
-                return a(C, n, {
+                M
+              ]), C = vt(() => {
+                const E = Math.max(0, u.startIndex), k = Math.min(N, u.endIndex), _ = Array.from(
+                  { length: k - E },
+                  (G, q) => E + q
+                ), x = _.map((G) => R[G]);
+                return a(x, n, {
                   ...S,
-                  validIndices: M
+                  validIndices: _
                 });
-              }, [u.startIndex, u.endIndex, w, x]);
-              dt(() => {
-                const A = g.current;
-                if (!A) return;
-                const b = x > _.current, M = () => {
-                  const { scrollTop: D, clientHeight: q } = A;
-                  let it = 0, rt = x - 1;
-                  for (; it <= rt; ) {
-                    const mt = Math.floor((it + rt) / 2);
-                    V[mt] < D ? it = mt + 1 : rt = mt - 1;
+              }, [u.startIndex, u.endIndex, R, N]);
+              lt(() => {
+                const E = g.current, k = N > T.current;
+                if (!E || !c || !w.current || !k)
+                  return;
+                A({
+                  startIndex: Math.max(0, N - 10 - s),
+                  endIndex: N
+                });
+                const _ = setInterval(() => {
+                  const x = N - 1;
+                  ((r.getState().getShadowMetadata(t, n) || [])[x]?.virtualizer?.itemHeight || 0) > 0 && (clearInterval(_), E.scrollTo({
+                    top: E.scrollHeight,
+                    behavior: "smooth"
+                  }));
+                }, 100);
+                return () => clearInterval(_);
+              }, [N]), K(() => {
+                const E = g.current;
+                if (!E) return;
+                const k = () => {
+                  const { scrollTop: x, clientHeight: G } = E;
+                  let q = 0, st = N - 1;
+                  for (; q <= st; ) {
+                    const St = Math.floor((q + st) / 2);
+                    V[St] < x ? q = St + 1 : st = St - 1;
                   }
-                  const Tt = Math.max(0, rt - s);
-                  let ct = Tt;
-                  const Pt = D + q;
-                  for (; ct < x && V[ct] < Pt; )
-                    ct++;
-                  T({
-                    startIndex: Tt,
-                    endIndex: Math.min(x, ct + s)
+                  const wt = Math.max(0, st - s);
+                  let it = wt;
+                  const Vt = x + G;
+                  for (; it < N && V[it] < Vt; )
+                    it++;
+                  A({
+                    startIndex: wt,
+                    endIndex: Math.min(N, it + s)
                   });
+                }, _ = () => {
+                  E.scrollHeight - E.scrollTop - E.clientHeight < 1 || (w.current = !1), k();
                 };
-                if (b && E.current) {
-                  T({
-                    startIndex: Math.max(0, x - 10 - s),
-                    endIndex: x
-                  });
-                  const D = setInterval(() => {
-                    const q = x - 1;
-                    ((r.getState().getShadowMetadata(t, n) || [])[q]?.virtualizer?.itemHeight || 0) > 0 && (clearInterval(D), A.scrollTo({
-                      top: A.scrollHeight,
-                      behavior: "smooth"
-                    }));
-                  }, 100);
-                  return () => clearInterval(D);
-                }
-                const C = () => {
-                  A.scrollHeight - A.scrollTop - A.clientHeight < 1 || (E.current = !1), M();
-                };
-                return A.addEventListener("scroll", C, {
+                return E.addEventListener("scroll", _, {
                   passive: !0
-                }), M(), () => A.removeEventListener("scroll", C);
-              }, [x, V]), et(() => {
-                _.current = x;
+                }), k(), () => E.removeEventListener("scroll", _);
+              }, [N, V]), K(() => {
+                T.current = N;
               });
-              const O = At(
-                (A = "smooth") => {
-                  g.current && (E.current = !0, g.current.scrollTo({
+              const U = Et(
+                (E = "smooth") => {
+                  g.current && (w.current = !0, console.log("USER ACTION: Scroll lock ENABLED."), g.current.scrollTo({
                     top: g.current.scrollHeight,
-                    behavior: A
+                    behavior: E
                   }));
                 },
                 []
-              ), W = At(
-                (A, b = "smooth") => {
-                  g.current && V[A] !== void 0 && (E.current = !1, g.current.scrollTo({
-                    top: V[A],
-                    behavior: b
+              ), D = Et(
+                (E, k = "smooth") => {
+                  g.current && V[E] !== void 0 && (w.current = !1, console.log("USER ACTION: Scroll lock DISABLED."), g.current.scrollTo({
+                    top: V[E],
+                    behavior: k
                   }));
                 },
                 [V]
@@ -723,7 +724,7 @@ function gt(t, i, m, f) {
                 },
                 inner: {
                   style: {
-                    height: `${B}px`,
+                    height: `${z}px`,
                     position: "relative"
                   }
                 },
@@ -734,16 +735,16 @@ function gt(t, i, m, f) {
                 }
               };
               return {
-                virtualState: N,
+                virtualState: C,
                 virtualizerProps: $,
-                scrollToBottom: O,
-                scrollToIndex: W
+                scrollToBottom: U,
+                scrollToIndex: D
               };
             };
           if (l === "stateSort")
             return (e) => {
               const s = [...d()].sort(
-                (u, T) => e(u.item, T.item)
+                (u, A) => e(u.item, A.item)
               ), c = s.map(({ item: u }) => u), g = {
                 ...S,
                 validIndices: s.map(
@@ -755,7 +756,7 @@ function gt(t, i, m, f) {
           if (l === "stateFilter")
             return (e) => {
               const s = d().filter(
-                ({ item: u }, T) => e(u, T)
+                ({ item: u }, A) => e(u, A)
               ), c = s.map(({ item: u }) => u), g = {
                 ...S,
                 validIndices: s.map(
@@ -768,20 +769,20 @@ function gt(t, i, m, f) {
             return (e) => {
               const o = r.getState().getNestedState(t, n);
               return Array.isArray(o) ? (S?.validIndices || Array.from({ length: o.length }, (c, g) => g)).map((c, g) => {
-                const u = o[c], T = [...n, c.toString()], w = a(u, T, S);
+                const u = o[c], A = [...n, c.toString()], w = a(u, A, S);
                 return e(u, w, {
                   register: () => {
-                    const [, _] = Q({}), P = `${m}-${n.join(".")}-${c}`;
-                    dt(() => {
-                      const R = `${t}////${P}`, x = r.getState().stateComponents.get(t) || {
+                    const [, M] = Q({}), P = `${m}-${n.join(".")}-${c}`;
+                    lt(() => {
+                      const R = `${t}////${P}`, N = r.getState().stateComponents.get(t) || {
                         components: /* @__PURE__ */ new Map()
                       };
-                      return x.components.set(R, {
-                        forceUpdate: () => _({}),
-                        paths: /* @__PURE__ */ new Set([T.join(".")])
-                      }), r.getState().stateComponents.set(t, x), () => {
-                        const B = r.getState().stateComponents.get(t);
-                        B && B.components.delete(R);
+                      return N.components.set(R, {
+                        forceUpdate: () => M({}),
+                        paths: /* @__PURE__ */ new Set([A.join(".")])
+                      }), r.getState().stateComponents.set(t, N), () => {
+                        const z = r.getState().stateComponents.get(t);
+                        z && z.components.delete(R);
                       };
                     }, [t, P]);
                   },
@@ -797,17 +798,17 @@ function gt(t, i, m, f) {
             return (e) => v.map((s, c) => {
               let g;
               S?.validIndices && S.validIndices[c] !== void 0 ? g = S.validIndices[c] : g = c;
-              const u = [...n, g.toString()], T = a(s, u, S);
+              const u = [...n, g.toString()], A = a(s, u, S);
               return e(
                 s,
-                T,
+                A,
                 c,
                 v,
                 a(v, n, S)
               );
             });
           if (l === "$stateMap")
-            return (e) => at(Yt, {
+            return (e) => ot(Jt, {
               proxy: {
                 _stateKey: t,
                 _path: n,
@@ -820,12 +821,12 @@ function gt(t, i, m, f) {
             return (e) => {
               const o = r.getState().getNestedState(t, n);
               return Array.isArray(o) ? (S?.validIndices || Array.from({ length: o.length }, (c, g) => g)).map((c, g) => {
-                const u = o[c], T = [...n, c.toString()], w = a(u, T, S), E = `${m}-${n.join(".")}-${c}`;
-                return at(Xt, {
+                const u = o[c], A = [...n, c.toString()], w = a(u, A, S), T = `${m}-${n.join(".")}-${c}`;
+                return ot(Zt, {
                   key: c,
                   stateKey: t,
-                  itemComponentId: E,
-                  itemPath: T,
+                  itemComponentId: T,
+                  itemPath: A,
                   children: e(
                     u,
                     w,
@@ -841,7 +842,7 @@ function gt(t, i, m, f) {
           if (l === "stateFlattenOn")
             return (e) => {
               const o = v;
-              y.clear(), k++;
+              y.clear(), b++;
               const s = o.flatMap(
                 (c) => c[e] ?? []
               );
@@ -864,7 +865,7 @@ function gt(t, i, m, f) {
               return a(s, c);
             };
           if (l === "insert")
-            return (e) => (p(n), ht(i, e, n, t), a(
+            return (e) => (p(n), mt(i, e, n, t), a(
               r.getState().getNestedState(t, n),
               n
             ));
@@ -874,26 +875,26 @@ function gt(t, i, m, f) {
               let u = null;
               if (!c.some((w) => {
                 if (o) {
-                  const _ = o.every(
+                  const M = o.every(
                     (P) => H(w[P], g[P])
                   );
-                  return _ && (u = w), _;
+                  return M && (u = w), M;
                 }
-                const E = H(w, g);
-                return E && (u = w), E;
+                const T = H(w, g);
+                return T && (u = w), T;
               }))
-                p(n), ht(i, g, n, t);
+                p(n), mt(i, g, n, t);
               else if (s && u) {
-                const w = s(u), E = c.map(
-                  (_) => H(_, u) ? w : _
+                const w = s(u), T = c.map(
+                  (M) => H(M, u) ? w : M
                 );
-                p(n), ot(i, E, n);
+                p(n), rt(i, T, n);
               }
             };
           if (l === "cut")
             return (e, o) => {
               if (!o?.waitForSync)
-                return p(n), lt(i, n, t, e), a(
+                return p(n), ct(i, n, t, e), a(
                   r.getState().getNestedState(t, n),
                   n
                 );
@@ -901,12 +902,12 @@ function gt(t, i, m, f) {
           if (l === "cutByValue")
             return (e) => {
               for (let o = 0; o < v.length; o++)
-                v[o] === e && lt(i, n, t, o);
+                v[o] === e && ct(i, n, t, o);
             };
           if (l === "toggleByValue")
             return (e) => {
               const o = v.findIndex((s) => s === e);
-              o > -1 ? lt(i, n, t, o) : ht(i, e, n, t);
+              o > -1 ? ct(i, n, t, o) : mt(i, e, n, t);
             };
           if (l === "stateFind")
             return (e) => {
@@ -931,7 +932,7 @@ function gt(t, i, m, f) {
         if (!isNaN(Number(X))) {
           const d = n.slice(0, -1), e = r.getState().getNestedState(t, d);
           if (Array.isArray(e) && l === "cut")
-            return () => lt(
+            return () => ct(
               i,
               d,
               t,
@@ -947,13 +948,13 @@ function gt(t, i, m, f) {
             return r.getState().getNestedState(t, n);
           };
         if (l === "$derive")
-          return (d) => Nt({
+          return (d) => bt({
             _stateKey: t,
             _path: n,
             _effect: d.toString()
           });
         if (l === "$get")
-          return () => Nt({
+          return () => bt({
             _stateKey: t,
             _path: n
           });
@@ -962,7 +963,7 @@ function gt(t, i, m, f) {
           return r.getState().getSyncInfo(d);
         }
         if (l == "getLocalStorage")
-          return (d) => ft(f + "-" + t + "-" + d);
+          return (d) => gt(f + "-" + t + "-" + d);
         if (l === "_selected") {
           const d = n.slice(0, -1), e = d.join("."), o = r.getState().getNestedState(t, d);
           return Array.isArray(o) ? Number(n[n.length - 1]) === r.getState().getSelectedIndex(t, e) : void 0;
@@ -972,7 +973,7 @@ function gt(t, i, m, f) {
             const e = n.slice(0, -1), o = Number(n[n.length - 1]), s = e.join(".");
             d ? r.getState().setSelectedIndex(t, s, o) : r.getState().setSelectedIndex(t, s, void 0);
             const c = r.getState().getNestedState(t, [...e]);
-            ot(i, c, e), p(e);
+            rt(i, c, e), p(e);
           };
         if (l === "toggleSelected")
           return () => {
@@ -983,13 +984,13 @@ function gt(t, i, m, f) {
               s === e ? void 0 : e
             );
             const c = r.getState().getNestedState(t, [...d]);
-            ot(i, c, d), p(d);
+            rt(i, c, d), p(d);
           };
         if (n.length == 0) {
           if (l === "applyJsonPatch")
             return (d) => {
-              const e = r.getState().cogsStateStore[t], s = Dt(e, d).newDocument;
-              Ct(
+              const e = r.getState().cogsStateStore[t], s = Ft(e, d).newDocument;
+              xt(
                 t,
                 r.getState().initialStateGlobal[t],
                 s,
@@ -999,57 +1000,57 @@ function gt(t, i, m, f) {
               );
               const c = r.getState().stateComponents.get(t);
               if (c) {
-                const g = It(e, s), u = new Set(g);
+                const g = yt(e, s), u = new Set(g);
                 for (const [
-                  T,
+                  A,
                   w
                 ] of c.components.entries()) {
-                  let E = !1;
-                  const _ = Array.isArray(w.reactiveType) ? w.reactiveType : [w.reactiveType || "component"];
-                  if (!_.includes("none")) {
-                    if (_.includes("all")) {
+                  let T = !1;
+                  const M = Array.isArray(w.reactiveType) ? w.reactiveType : [w.reactiveType || "component"];
+                  if (!M.includes("none")) {
+                    if (M.includes("all")) {
                       w.forceUpdate();
                       continue;
                     }
-                    if (_.includes("component") && (w.paths.has("") && (E = !0), !E))
+                    if (M.includes("component") && (w.paths.has("") && (T = !0), !T))
                       for (const P of u) {
                         if (w.paths.has(P)) {
-                          E = !0;
+                          T = !0;
                           break;
                         }
                         let R = P.lastIndexOf(".");
                         for (; R !== -1; ) {
-                          const x = P.substring(0, R);
-                          if (w.paths.has(x)) {
-                            E = !0;
+                          const N = P.substring(0, R);
+                          if (w.paths.has(N)) {
+                            T = !0;
                             break;
                           }
-                          const B = P.substring(
+                          const z = P.substring(
                             R + 1
                           );
-                          if (!isNaN(Number(B))) {
-                            const V = x.lastIndexOf(".");
+                          if (!isNaN(Number(z))) {
+                            const V = N.lastIndexOf(".");
                             if (V !== -1) {
-                              const N = x.substring(
+                              const C = N.substring(
                                 0,
                                 V
                               );
-                              if (w.paths.has(N)) {
-                                E = !0;
+                              if (w.paths.has(C)) {
+                                T = !0;
                                 break;
                               }
                             }
                           }
-                          R = x.lastIndexOf(".");
+                          R = N.lastIndexOf(".");
                         }
-                        if (E) break;
+                        if (T) break;
                       }
-                    if (!E && _.includes("deps") && w.depsFunction) {
+                    if (!T && M.includes("deps") && w.depsFunction) {
                       const P = w.depsFunction(s);
                       let R = !1;
-                      typeof P == "boolean" ? P && (R = !0) : H(w.deps, P) || (w.deps = P, R = !0), R && (E = !0);
+                      typeof P == "boolean" ? P && (R = !0) : H(w.deps, P) || (w.deps = P, R = !0), R && (T = !0);
                     }
-                    E && w.forceUpdate();
+                    T && w.forceUpdate();
                   }
                 }
               }
@@ -1070,9 +1071,9 @@ function gt(t, i, m, f) {
                 });
                 const c = d.zodSchema.safeParse(o);
                 return c.success ? !0 : (c.error.errors.forEach((u) => {
-                  const T = u.path, w = u.message, E = [d.key, ...T].join(".");
-                  e(E, w);
-                }), St(t), !1);
+                  const A = u.path, w = u.message, T = [d.key, ...A].join(".");
+                  e(T, w);
+                }), ft(t), !1);
               } catch (s) {
                 return console.error("Zod schema validation failed", s), !1;
               }
@@ -1081,7 +1082,7 @@ function gt(t, i, m, f) {
           if (l === "getComponents")
             return () => r().stateComponents.get(t);
           if (l === "getAllFormRefs")
-            return () => Et.getState().getFormRefsByStateKey(t);
+            return () => At.getState().getFormRefsByStateKey(t);
           if (l === "_initialState")
             return r.getState().initialStateGlobal[t];
           if (l === "_serverState")
@@ -1094,12 +1095,12 @@ function gt(t, i, m, f) {
           if (l === "removeValidation") return I.removeValidation;
         }
         if (l === "getFormRef")
-          return () => Et.getState().getFormRef(t + "." + n.join("."));
+          return () => At.getState().getFormRef(t + "." + n.join("."));
         if (l === "validationWrapper")
           return ({
             children: d,
             hideMessage: e
-          }) => /* @__PURE__ */ vt(
+          }) => /* @__PURE__ */ ht(
             Ot,
             {
               formOpts: e ? { validation: { message: "" } } : void 0,
@@ -1117,19 +1118,19 @@ function gt(t, i, m, f) {
           return (d, e) => {
             if (e?.debounce)
               Rt(() => {
-                ot(i, d, n, "");
+                rt(i, d, n, "");
                 const o = r.getState().getNestedState(t, n);
                 e?.afterUpdate && e.afterUpdate(o);
               }, e.debounce);
             else {
-              ot(i, d, n, "");
+              rt(i, d, n, "");
               const o = r.getState().getNestedState(t, n);
               e?.afterUpdate && e.afterUpdate(o);
             }
             p(n);
           };
         if (l === "formElement")
-          return (d, e) => /* @__PURE__ */ vt(
+          return (d, e) => /* @__PURE__ */ ht(
             Ut,
             {
               setState: i,
@@ -1139,23 +1140,23 @@ function gt(t, i, m, f) {
               formOpts: e
             }
           );
-        const j = [...n, l], nt = r.getState().getNestedState(t, j);
-        return a(nt, j, S);
+        const O = [...n, l], nt = r.getState().getNestedState(t, O);
+        return a(nt, O, S);
       }
-    }, G = new Proxy(U, F);
+    }, W = new Proxy(j, F);
     return y.set(L, {
-      proxy: G,
-      stateVersion: k
-    }), G;
+      proxy: W,
+      stateVersion: b
+    }), W;
   }
   return a(
     r.getState().getNestedState(t, [])
   );
 }
-function Nt(t) {
-  return at(Zt, { proxy: t });
+function bt(t) {
+  return ot(Yt, { proxy: t });
 }
-function Yt({
+function Jt({
   proxy: t,
   rebuildStateShape: i
 }) {
@@ -1164,14 +1165,14 @@ function Yt({
     m,
     t._path
   ).stateMapNoRender(
-    (y, k, p, I, a) => t._mapFn(y, k, p, I, a)
+    (y, b, p, I, a) => t._mapFn(y, b, p, I, a)
   ) : null;
 }
-function Zt({
+function Yt({
   proxy: t
 }) {
   const i = Z(null), m = `${t._stateKey}-${t._path.join(".")}`;
-  return et(() => {
+  return K(() => {
     const f = i.current;
     if (!f || !f.parentElement) return;
     const y = f.parentElement, p = Array.from(y.childNodes).indexOf(f);
@@ -1192,22 +1193,22 @@ function Zt({
           "state",
           `return (${t._effect})(state)`
         )(n);
-      } catch (U) {
-        console.error("Error evaluating effect function during mount:", U), S = n;
+      } catch (j) {
+        console.error("Error evaluating effect function during mount:", j), 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]), at("span", {
+  }, [t._stateKey, t._path.join("."), t._effect]), ot("span", {
     ref: i,
     style: { display: "none" },
     "data-signal-id": m
   });
 }
-function ge(t) {
-  const i = _t(
+function ue(t) {
+  const i = Pt(
     (m) => {
       const f = r.getState().stateComponents.get(t._stateKey) || {
         components: /* @__PURE__ */ new Map()
@@ -1219,22 +1220,22 @@ function ge(t) {
     },
     () => r.getState().getNestedState(t._stateKey, t._path)
   );
-  return at("text", {}, String(i));
+  return ot("text", {}, String(i));
 }
-function Xt({
+function Zt({
   stateKey: t,
   itemComponentId: i,
   itemPath: m,
   children: f
 }) {
-  const [, y] = Q({}), [k, p] = Wt(), I = Z(null);
-  return et(() => {
+  const [, y] = Q({}), [b, p] = Dt(), I = Z(null);
+  return K(() => {
     p.height > 0 && p.height !== I.current && (I.current = p.height, r.getState().setShadowMetadata(t, m, {
       virtualizer: {
         itemHeight: p.height
       }
     }));
-  }, [p.height, t, m]), dt(() => {
+  }, [p.height, t, m]), lt(() => {
     const a = `${t}////${i}`, v = r.getState().stateComponents.get(t) || {
       components: /* @__PURE__ */ new Map()
     };
@@ -1245,14 +1246,14 @@ function Xt({
       const n = r.getState().stateComponents.get(t);
       n && n.components.delete(a);
     };
-  }, [t, i, m.join(".")]), /* @__PURE__ */ vt("div", { ref: k, children: f });
+  }, [t, i, m.join(".")]), /* @__PURE__ */ ht("div", { ref: b, children: f });
 }
 export {
-  Nt as $cogsSignal,
-  ge as $cogsSignalStore,
-  le as addStateOptions,
-  de as createCogsState,
-  ue as notifyComponent,
-  Jt as useCogsStateFn
+  bt as $cogsSignal,
+  ue as $cogsSignalStore,
+  ce as addStateOptions,
+  le as createCogsState,
+  de as notifyComponent,
+  qt as useCogsStateFn
 };
 //# sourceMappingURL=CogsState.jsx.map