cogsbox-state 0.5.397 → 0.5.399

package/dist/CogsState.jsx

@@ -1,53 +1,53 @@
 "use client";
 import { jsx as Ot } from "react/jsx-runtime";
-import { useState as K, useRef as q, useEffect as ot, useLayoutEffect as ct, useMemo as wt, createElement as lt, useSyncExternalStore as Ht, startTransition as Ft, useCallback as kt } from "react";
-import { transformStateFunc as Bt, isDeepEqual as J, isFunction as tt, getNestedValue as Z, getDifferences as _t, debounce as Wt } from "./utility.js";
-import { pushFunc as Et, updateFn as it, cutFunc as ht, ValidationWrapper as zt, FormControlComponent as qt } from "./Functions.jsx";
+import { useState as K, useRef as q, useEffect as at, useLayoutEffect as lt, useMemo as wt, createElement as rt, useSyncExternalStore as Ft, startTransition as Bt, useCallback as kt } from "react";
+import { transformStateFunc as Wt, isDeepEqual as J, isFunction as tt, getNestedValue as Z, getDifferences as _t, debounce as zt } from "./utility.js";
+import { FormControlComponent as bt, pushFunc as Et, updateFn as ct, cutFunc as ht, ValidationWrapper as qt } from "./Functions.jsx";
 import Jt from "superjson";
 import { v4 as At } from "uuid";
 import "zod";
-import { getGlobalStore as o, formRefStore as bt } from "./store.js";
-import { useCogsConfig as Gt } from "./CogsStateClient.jsx";
+import { getGlobalStore as o, formRefStore as Mt } from "./store.js";
+import { useCogsConfig as Lt } from "./CogsStateClient.jsx";
 import { applyPatch as Yt } from "fast-json-patch";
 import Zt from "react-use-measure";
-function Mt(t, c) {
+function xt(t, i) {
   const m = o.getState().getInitialOptions, g = o.getState().setInitialStateOptions, I = m(t) || {};
   g(t, {
     ...I,
-    ...c
+    ...i
   });
 }
-function xt({
+function Pt({
   stateKey: t,
-  options: c,
+  options: i,
   initialOptionsPart: m
 }) {
-  const g = rt(t) || {}, I = m[t] || {}, N = o.getState().setInitialStateOptions, p = { ...I, ...g };
+  const g = ot(t) || {}, I = m[t] || {}, N = o.getState().setInitialStateOptions, E = { ...I, ...g };
   let v = !1;
-  if (c)
-    for (const s in c)
-      p.hasOwnProperty(s) ? (s == "localStorage" && c[s] && p[s].key !== c[s]?.key && (v = !0, p[s] = c[s]), s == "initialState" && c[s] && p[s] !== c[s] && // Different references
-      !J(p[s], c[s]) && (v = !0, p[s] = c[s])) : (v = !0, p[s] = c[s]);
-  v && N(t, p);
+  if (i)
+    for (const s in i)
+      E.hasOwnProperty(s) ? (s == "localStorage" && i[s] && E[s].key !== i[s]?.key && (v = !0, E[s] = i[s]), s == "initialState" && i[s] && E[s] !== i[s] && // Different references
+      !J(E[s], i[s]) && (v = !0, E[s] = i[s])) : (v = !0, E[s] = i[s]);
+  v && N(t, E);
 }
-function Ie(t, { formElements: c, validation: m }) {
-  return { initialState: t, formElements: c, validation: m };
+function Ie(t, { formElements: i, validation: m }) {
+  return { initialState: t, formElements: i, validation: m };
 }
-const ve = (t, c) => {
+const ve = (t, i) => {
   let m = t;
-  const [g, I] = Bt(m);
-  (Object.keys(I).length > 0 || c && Object.keys(c).length > 0) && Object.keys(I).forEach((v) => {
+  const [g, I] = Wt(m);
+  (Object.keys(I).length > 0 || i && Object.keys(i).length > 0) && Object.keys(I).forEach((v) => {
     I[v] = I[v] || {}, I[v].formElements = {
-      ...c?.formElements,
+      ...i?.formElements,
       // Global defaults first
-      ...c?.validation,
+      ...i?.validation,
       ...I[v].formElements || {}
       // State-specific overrides
-    }, rt(v) || o.getState().setInitialStateOptions(v, I[v]);
+    }, ot(v) || o.getState().setInitialStateOptions(v, I[v]);
   }), o.getState().setInitialStates(g), o.getState().setCreatedState(g);
   const N = (v, s) => {
     const [T] = K(s?.componentId ?? At());
-    xt({
+    Pt({
       stateKey: v,
       options: s,
       initialOptionsPart: I
@@ -70,34 +70,34 @@ const ve = (t, c) => {
     );
     return j;
   };
-  function p(v, s) {
-    xt({ stateKey: v, options: s, initialOptionsPart: I }), s.localStorage && te(v, s), dt(v);
+  function E(v, s) {
+    Pt({ stateKey: v, options: s, initialOptionsPart: I }), s.localStorage && te(v, s), dt(v);
   }
-  return { useCogsState: N, setCogsOptions: p };
+  return { useCogsState: N, setCogsOptions: E };
 }, {
   setUpdaterState: Tt,
   setState: nt,
-  getInitialOptions: rt,
-  getKeyState: Lt,
+  getInitialOptions: ot,
+  getKeyState: Rt,
   getValidationErrors: Xt,
   setStateLog: Qt,
   updateInitialStateGlobal: Nt,
-  addValidationError: Rt,
+  addValidationError: Dt,
   removeValidationError: X,
   setServerSyncActions: Kt
-} = o.getState(), Pt = (t, c, m, g, I) => {
+} = o.getState(), Vt = (t, i, m, g, I) => {
   m?.log && console.log(
     "saving to localstorage",
-    c,
+    i,
     m.localStorage?.key,
     g
   );
   const N = tt(m?.localStorage?.key) ? m.localStorage?.key(t) : m?.localStorage?.key;
   if (N && g) {
-    const p = `${g}-${c}-${N}`;
+    const E = `${g}-${i}-${N}`;
     let v;
     try {
-      v = vt(p)?.lastSyncedWithServer;
+      v = vt(E)?.lastSyncedWithServer;
     } catch {
     }
     const s = {
@@ -106,20 +106,20 @@ const ve = (t, c) => {
       lastSyncedWithServer: I ?? v
     }, T = Jt.serialize(s);
     window.localStorage.setItem(
-      p,
+      E,
       JSON.stringify(T.json)
     );
   }
 }, vt = (t) => {
   if (!t) return null;
   try {
-    const c = window.localStorage.getItem(t);
-    return c ? JSON.parse(c) : null;
-  } catch (c) {
-    return console.error("Error loading from localStorage:", c), null;
+    const i = window.localStorage.getItem(t);
+    return i ? JSON.parse(i) : null;
+  } catch (i) {
+    return console.error("Error loading from localStorage:", i), null;
   }
-}, te = (t, c) => {
-  const m = o.getState().cogsStateStore[t], { sessionId: g } = Gt(), I = tt(c?.localStorage?.key) ? c.localStorage.key(m) : c?.localStorage?.key;
+}, te = (t, i) => {
+  const m = o.getState().cogsStateStore[t], { sessionId: g } = Lt(), I = tt(i?.localStorage?.key) ? i.localStorage.key(m) : i?.localStorage?.key;
   if (I && g) {
     const N = vt(
       `${g}-${t}-${I}`
@@ -128,9 +128,9 @@ const ve = (t, c) => {
       return nt(t, N.state), dt(t), !0;
   }
   return !1;
-}, Dt = (t, c, m, g, I, N) => {
-  const p = {
-    initialState: c,
+}, jt = (t, i, m, g, I, N) => {
+  const E = {
+    initialState: i,
     updaterState: It(
       t,
       g,
@@ -139,29 +139,29 @@ const ve = (t, c) => {
     ),
     state: m
   };
-  Nt(t, p.initialState), Tt(t, p.updaterState), nt(t, p.state);
+  Nt(t, E.initialState), Tt(t, E.updaterState), nt(t, E.state);
 }, dt = (t) => {
-  const c = o.getState().stateComponents.get(t);
-  if (!c) return;
+  const i = o.getState().stateComponents.get(t);
+  if (!i) return;
   const m = /* @__PURE__ */ new Set();
-  c.components.forEach((g) => {
+  i.components.forEach((g) => {
     (g ? Array.isArray(g.reactiveType) ? g.reactiveType : [g.reactiveType || "component"] : null)?.includes("none") || m.add(() => g.forceUpdate());
   }), queueMicrotask(() => {
     m.forEach((g) => g());
   });
-}, ye = (t, c) => {
+}, ye = (t, i) => {
   const m = o.getState().stateComponents.get(t);
   if (m) {
-    const g = `${t}////${c}`, I = m.components.get(g);
+    const g = `${t}////${i}`, I = m.components.get(g);
     if ((I ? Array.isArray(I.reactiveType) ? I.reactiveType : [I.reactiveType || "component"] : null)?.includes("none"))
       return;
     I && I.forceUpdate();
   }
-}, ee = (t, c, m, g) => {
+}, ee = (t, i, m, g) => {
   switch (t) {
     case "update":
       return {
-        oldValue: Z(c, g),
+        oldValue: Z(i, g),
         newValue: Z(m, g)
       };
     case "insert":
@@ -172,7 +172,7 @@ const ve = (t, c) => {
       };
     case "cut":
       return {
-        oldValue: Z(c, g),
+        oldValue: Z(i, g),
         newValue: null
         // or undefined
       };
@@ -181,24 +181,24 @@ const ve = (t, c) => {
   }
 };
 function ne(t, {
-  stateKey: c,
+  stateKey: i,
   serverSync: m,
   localStorage: g,
   formElements: I,
   reactiveDeps: N,
-  reactiveType: p,
+  reactiveType: E,
   componentId: v,
   initialState: s,
   syncUpdate: T,
   dependencies: r,
   serverState: S
 } = {}) {
-  const [W, j] = K({}), { sessionId: U } = Gt();
-  let z = !c;
-  const [h] = K(c ?? At()), l = o.getState().stateLog[h], ut = q(/* @__PURE__ */ new Set()), et = q(v ?? At()), L = q(
+  const [W, j] = K({}), { sessionId: U } = Lt();
+  let z = !i;
+  const [h] = K(i ?? At()), l = o.getState().stateLog[h], ut = q(/* @__PURE__ */ new Set()), et = q(v ?? At()), L = q(
     null
   );
-  L.current = rt(h) ?? null, ot(() => {
+  L.current = ot(h) ?? null, at(() => {
     if (T && T.stateKey === h && T.path?.[0]) {
       nt(h, (n) => ({
         ...n,
@@ -210,35 +210,35 @@ function ne(t, {
         userId: T.userId
       });
     }
-  }, [T]), ot(() => {
+  }, [T]), at(() => {
     if (s) {
-      Mt(h, {
+      xt(h, {
         initialState: s
       });
-      const e = L.current, a = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, i = o.getState().initialStateGlobal[h];
-      if (!(i && !J(i, s) || !i) && !a)
+      const e = L.current, a = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, c = o.getState().initialStateGlobal[h];
+      if (!(c && !J(c, s) || !c) && !a)
         return;
       let u = null;
-      const E = tt(e?.localStorage?.key) ? e?.localStorage?.key(s) : e?.localStorage?.key;
-      E && U && (u = vt(`${U}-${h}-${E}`));
-      let y = s, w = !1;
+      const y = tt(e?.localStorage?.key) ? e?.localStorage?.key(s) : e?.localStorage?.key;
+      y && U && (u = vt(`${U}-${h}-${y}`));
+      let p = s, w = !1;
       const C = a ? Date.now() : 0, A = u?.lastUpdated || 0, b = u?.lastSyncedWithServer || 0;
-      a && C > A ? (y = e.serverState.data, w = !0) : u && A > b && (y = u.state, e?.localStorage?.onChange && e?.localStorage?.onChange(y)), o.getState().initializeShadowState(h, s), Dt(
+      a && C > A ? (p = e.serverState.data, w = !0) : u && A > b && (p = u.state, e?.localStorage?.onChange && e?.localStorage?.onChange(p)), o.getState().initializeShadowState(h, s), jt(
         h,
         s,
-        y,
-        at,
+        p,
+        st,
         et.current,
         U
-      ), w && E && U && Pt(y, h, e, U, Date.now()), dt(h), (Array.isArray(p) ? p : [p || "component"]).includes("none") || j({});
+      ), w && y && U && Vt(p, h, e, U, Date.now()), dt(h), (Array.isArray(E) ? E : [E || "component"]).includes("none") || j({});
     }
   }, [
     s,
     S?.status,
     S?.data,
     ...r || []
-  ]), ct(() => {
-    z && Mt(h, {
+  ]), lt(() => {
+    z && xt(h, {
       serverSync: m,
       formElements: I,
       initialState: s,
@@ -253,23 +253,23 @@ function ne(t, {
       paths: /* @__PURE__ */ new Set(),
       deps: [],
       depsFunction: N || void 0,
-      reactiveType: p ?? ["component", "deps"]
+      reactiveType: E ?? ["component", "deps"]
     }), o.getState().stateComponents.set(h, n), j({}), () => {
       n && (n.components.delete(e), n.components.size === 0 && o.getState().stateComponents.delete(h));
     };
   }, []);
-  const at = (e, n, a, i) => {
+  const st = (e, n, a, c) => {
     if (Array.isArray(n)) {
       const u = `${h}-${n.join(".")}`;
       ut.current.add(u);
     }
     const f = o.getState();
     nt(h, (u) => {
-      const E = tt(e) ? e(u) : e, y = `${h}-${n.join(".")}`;
-      if (y) {
-        let M = !1, $ = f.signalDomElements.get(y);
+      const y = tt(e) ? e(u) : e, p = `${h}-${n.join(".")}`;
+      if (p) {
+        let M = !1, $ = f.signalDomElements.get(p);
         if ((!$ || $.size === 0) && (a.updateType === "insert" || a.updateType === "cut")) {
-          const R = n.slice(0, -1), V = Z(E, R);
+          const R = n.slice(0, -1), V = Z(y, R);
           if (Array.isArray(V)) {
             M = !0;
             const O = `${h}-${R.join(".")}`;
@@ -277,7 +277,7 @@ function ne(t, {
           }
         }
         if ($) {
-          const R = M ? Z(E, n.slice(0, -1)) : Z(E, n);
+          const R = M ? Z(y, n.slice(0, -1)) : Z(y, n);
           $.forEach(({ parentId: V, position: O, effect: _ }) => {
             const D = document.querySelector(
               `[data-parent-id="${V}"]`
@@ -292,8 +292,8 @@ function ne(t, {
           });
         }
       }
-      console.log("shadowState", f.shadowStateStore), a.updateType === "update" && (i || L.current?.validation?.key) && n && X(
-        (i || L.current?.validation?.key) + "." + n.join(".")
+      console.log("shadowState", f.shadowStateStore), a.updateType === "update" && (c || L.current?.validation?.key) && n && X(
+        (c || L.current?.validation?.key) + "." + n.join(".")
       );
       const w = n.slice(0, n.length - 1);
       a.updateType === "cut" && L.current?.validation?.key && X(
@@ -304,12 +304,12 @@ function ne(t, {
         let V = $?.split(".").length;
         if ($ == w.join(".") && V == w.length - 1) {
           let O = $ + "." + w;
-          X($), Rt(O, R);
+          X($), Dt(O, R);
         }
       });
       const C = f.stateComponents.get(h);
       if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", C), C) {
-        const M = _t(u, E), $ = new Set(M), R = a.updateType === "update" ? n.join(".") : n.slice(0, -1).join(".") || "";
+        const M = _t(u, y), $ = new Set(M), R = a.updateType === "update" ? n.join(".") : n.slice(0, -1).join(".") || "";
         for (const [
           V,
           O
@@ -329,14 +329,14 @@ function ne(t, {
                     _ = !0;
                     break;
                   }
-                  const st = B.lastIndexOf(".");
-                  if (st !== -1) {
+                  const it = B.lastIndexOf(".");
+                  if (it !== -1) {
                     const gt = B.substring(
                       0,
-                      st
+                      it
                     );
                     if (!isNaN(
-                      Number(B.substring(st + 1))
+                      Number(B.substring(it + 1))
                     ) && O.paths.has(gt)) {
                       _ = !0;
                       break;
@@ -350,7 +350,7 @@ function ne(t, {
                 if (_) break;
               }
             if (!_ && D.includes("deps") && O.depsFunction) {
-              const G = O.depsFunction(E);
+              const G = O.depsFunction(y);
               let B = !1;
               typeof G == "boolean" ? G && (B = !0) : J(O.deps, G) || (O.deps = G, B = !0), B && (_ = !0);
             }
@@ -360,13 +360,13 @@ function ne(t, {
       }
       const A = Date.now();
       n = n.map((M, $) => {
-        const R = n.slice(0, -1), V = Z(E, R);
+        const R = n.slice(0, -1), V = Z(y, R);
         return $ === n.length - 1 && ["insert", "cut"].includes(a.updateType) ? (V.length - 1).toString() : M;
       });
       const { oldValue: b, newValue: F } = ee(
         a.updateType,
         u,
-        E,
+        y,
         n
       ), Y = {
         timeStamp: A,
@@ -379,7 +379,7 @@ function ne(t, {
       };
       switch (a.updateType) {
         case "update":
-          f.updateShadowAtPath(h, n, E);
+          f.updateShadowAtPath(h, n, y);
           break;
         case "insert":
           const M = n.slice(0, -1);
@@ -396,8 +396,8 @@ function ne(t, {
           return D ? (D.timeStamp = Math.max(D.timeStamp, O.timeStamp), D.newValue = O.newValue, D.oldValue = D.oldValue ?? O.oldValue, D.updateType = O.updateType) : V.set(_, { ...O }), V;
         }, /* @__PURE__ */ new Map());
         return Array.from(R.values());
-      }), Pt(
-        E,
+      }), Vt(
+        y,
         h,
         L.current,
         U
@@ -407,36 +407,36 @@ function ne(t, {
       }), L.current?.serverSync) {
         const M = f.serverState[h], $ = L.current?.serverSync;
         Kt(h, {
-          syncKey: typeof $.syncKey == "string" ? $.syncKey : $.syncKey({ state: E }),
+          syncKey: typeof $.syncKey == "string" ? $.syncKey : $.syncKey({ state: y }),
           rollBackState: M,
           actionTimeStamp: Date.now() + ($.debounce ?? 3e3),
           status: "waiting"
         });
       }
-      return E;
+      return y;
     });
   };
   o.getState().updaterState[h] || (Tt(
     h,
     It(
       h,
-      at,
+      st,
       et.current,
       U
     )
   ), o.getState().cogsStateStore[h] || nt(h, t), o.getState().initialStateGlobal[h] || Nt(h, t));
   const d = wt(() => It(
     h,
-    at,
+    st,
     et.current,
     U
   ), [h, U]);
-  return [Lt(h), d];
+  return [Rt(h), d];
 }
-function It(t, c, m, g) {
+function It(t, i, m, g) {
   const I = /* @__PURE__ */ new Map();
   let N = 0;
-  const p = (T) => {
+  const E = (T) => {
     const r = T.join(".");
     for (const [S] of I)
       (S === r || S.startsWith(r + ".")) && I.delete(S);
@@ -450,7 +450,7 @@ function It(t, c, m, g) {
       r?.key && X(r?.key), T?.validationKey && X(T.validationKey);
       const S = o.getState().initialStateGlobal[t];
       o.getState().clearSelectedIndexesForState(t), I.clear(), N++;
-      const W = s(S, []), j = rt(t), U = tt(j?.localStorage?.key) ? j?.localStorage?.key(S) : j?.localStorage?.key, z = `${g}-${t}-${U}`;
+      const W = s(S, []), j = ot(t), U = tt(j?.localStorage?.key) ? j?.localStorage?.key(S) : j?.localStorage?.key, z = `${g}-${t}-${U}`;
       z && localStorage.removeItem(z), Tt(t, W), nt(t, S);
       const h = o.getState().stateComponents.get(t);
       return h && h.components.forEach((l) => {
@@ -461,11 +461,11 @@ function It(t, c, m, g) {
       I.clear(), N++;
       const r = It(
         t,
-        c,
+        i,
         m,
         g
-      ), S = o.getState().initialStateGlobal[t], W = rt(t), j = tt(W?.localStorage?.key) ? W?.localStorage?.key(S) : W?.localStorage?.key, U = `${g}-${t}-${j}`;
-      return localStorage.getItem(U) && localStorage.removeItem(U), Ft(() => {
+      ), S = o.getState().initialStateGlobal[t], W = ot(t), j = tt(W?.localStorage?.key) ? W?.localStorage?.key(S) : W?.localStorage?.key, U = `${g}-${t}-${j}`;
+      return localStorage.getItem(U) && localStorage.removeItem(U), Bt(() => {
         Nt(t, T), o.getState().initializeShadowState(t, T), Tt(t, r), nt(t, T);
         const z = o.getState().stateComponents.get(t);
         z && z.components.forEach((h) => {
@@ -480,7 +480,7 @@ function It(t, c, m, g) {
     _isLoading: o.getState().isLoadingGlobal[t],
     _isServerSynced: () => {
       const T = o.getState().serverState[t];
-      return !!(T && J(T, Lt(t)));
+      return !!(T && J(T, Rt(t)));
     }
   };
   function s(T, r = [], S) {
@@ -529,13 +529,13 @@ function It(t, c, m, g) {
             const n = e.components.get(d);
             if (n && !n.paths.has("")) {
               const a = r.join(".");
-              let i = !0;
+              let c = !0;
               for (const f of n.paths)
                 if (a.startsWith(f) && (a === f || a[f.length] === ".")) {
-                  i = !1;
+                  c = !1;
                   break;
                 }
-              i && n.paths.add(a);
+              c && n.paths.add(a);
             }
           }
         }
@@ -551,20 +551,20 @@ function It(t, c, m, g) {
               return console.error(`No mutation defined for state key "${t}"`), { success: !1, error: "No mutation defined" };
             const n = o.getState().getNestedState(t, []), a = d?.validation?.key;
             try {
-              const i = await e.action(n);
-              if (i && !i.success && i.errors && a) {
-                o.getState().removeValidationError(a), i.errors.forEach((u) => {
-                  const E = [a, ...u.path].join(".");
-                  o.getState().addValidationError(E, u.message);
+              const c = await e.action(n);
+              if (c && !c.success && c.errors && a) {
+                o.getState().removeValidationError(a), c.errors.forEach((u) => {
+                  const y = [a, ...u.path].join(".");
+                  o.getState().addValidationError(y, u.message);
                 });
                 const f = o.getState().stateComponents.get(t);
                 f && f.components.forEach((u) => {
                   u.forceUpdate();
                 });
               }
-              return i?.success && e.onSuccess ? e.onSuccess(i.data) : !i?.success && e.onError && e.onError(i.error), i;
-            } catch (i) {
-              return e.onError && e.onError(i), { success: !1, error: i };
+              return c?.success && e.onSuccess ? e.onSuccess(c.data) : !c?.success && e.onError && e.onError(c.error), c;
+            } catch (c) {
+              return e.onError && e.onError(c), { success: !1, error: c };
             }
           };
         if (l === "_status") {
@@ -581,7 +581,7 @@ function It(t, c, m, g) {
           };
         if (l === "removeStorage")
           return () => {
-            const d = o.getState().initialStateGlobal[t], e = rt(t), n = tt(e?.localStorage?.key) ? e?.localStorage?.key(d) : e?.localStorage?.key, a = `${g}-${t}-${n}`;
+            const d = o.getState().initialStateGlobal[t], e = ot(t), n = tt(e?.localStorage?.key) ? e?.localStorage?.key(d) : e?.localStorage?.key, a = `${g}-${t}-${n}`;
             a && localStorage.removeItem(a);
           };
         if (l === "showValidationErrors")
@@ -620,13 +620,13 @@ function It(t, c, m, g) {
               const {
                 itemHeight: n = 50,
                 overscan: a = 6,
-                stickToBottom: i = !1,
+                stickToBottom: c = !1,
                 dependencies: f = []
-              } = e, u = q(!1), E = q(null), [y, w] = K({
+              } = e, u = q(!1), y = q(null), [p, w] = K({
                 startIndex: 0,
                 endIndex: 10
               }), [C, A] = K("IDLE_AT_TOP"), b = q(!1), F = q(0), Y = q(f), M = q(0), [$, R] = K(0), V = q(null);
-              ot(() => o.getState().subscribeToShadowState(t, () => {
+              at(() => o.getState().subscribeToShadowState(t, () => {
                 R((x) => x + 1);
               }), [t]);
               const O = o().getNestedState(
@@ -649,7 +649,7 @@ function It(t, c, m, g) {
                 n,
                 $
               ]), B = wt(() => {
-                const k = Math.max(0, y.startIndex), x = Math.min(_, y.endIndex), H = Array.from(
+                const k = Math.max(0, p.startIndex), x = Math.min(_, p.endIndex), H = Array.from(
                   { length: x - k },
                   (Q, ft) => k + ft
                 ), P = H.map((Q) => O[Q]);
@@ -657,9 +657,9 @@ function It(t, c, m, g) {
                   ...S,
                   validIndices: H
                 });
-              }, [y.startIndex, y.endIndex, O, _]);
-              ct(() => {
-                const k = E.current;
+              }, [p.startIndex, p.endIndex, O, _]);
+              lt(() => {
+                const k = y.current;
                 if (!k) return;
                 const x = _ > F.current;
                 if (x && V.current) {
@@ -677,16 +677,16 @@ function It(t, c, m, g) {
                     console.log("TRANSITION: Deps changed -> IDLE_AT_TOP"), A("IDLE_AT_TOP");
                     return;
                   }
-                  x && C === "LOCKED_AT_BOTTOM" && i && (console.log(
+                  x && C === "LOCKED_AT_BOTTOM" && c && (console.log(
                     "TRANSITION: New items arrived while locked -> GETTING_HEIGHTS"
                   ), A("GETTING_HEIGHTS"));
                 }
                 F.current = _, Y.current = f;
-              }, [_, ...f]), ct(() => {
-                const k = E.current;
+              }, [_, ...f]), lt(() => {
+                const k = y.current;
                 if (!k) return;
                 let x;
-                if (C === "IDLE_AT_TOP" && i && _ > 0)
+                if (C === "IDLE_AT_TOP" && c && _ > 0)
                   console.log(
                     "ACTION (IDLE_AT_TOP): Data has arrived -> GETTING_HEIGHTS"
                   ), A("GETTING_HEIGHTS");
@@ -724,8 +724,8 @@ function It(t, c, m, g) {
                 return () => {
                   x && clearInterval(x);
                 };
-              }, [C, _, G]), ot(() => {
-                const k = E.current;
+              }, [C, _, G]), at(() => {
+                const k = y.current;
                 if (!k) return;
                 const x = n, H = () => {
                   if (b.current)
@@ -746,8 +746,8 @@ function It(t, c, m, g) {
                   }
                   const $t = Math.max(0, Ct - a);
                   let St = $t;
-                  const Ut = P + ft;
-                  for (; St < _ && G[St] < Ut; )
+                  const Ht = P + ft;
+                  for (; St < _ && G[St] < Ht; )
                     St++;
                   w({
                     startIndex: $t,
@@ -758,21 +758,21 @@ function It(t, c, m, g) {
                   passive: !0
                 }), () => k.removeEventListener("scroll", H);
               }, [_, G, n, a, C]);
-              const st = kt(() => {
+              const it = kt(() => {
                 console.log(
                   "USER ACTION: Clicked scroll button -> SCROLLING_TO_BOTTOM"
                 ), A("SCROLLING_TO_BOTTOM");
               }, []), gt = kt(
                 (k, x = "smooth") => {
-                  E.current && G[k] !== void 0 && (A("IDLE_NOT_AT_BOTTOM"), E.current.scrollTo({
+                  y.current && G[k] !== void 0 && (A("IDLE_NOT_AT_BOTTOM"), y.current.scrollTo({
                     top: G[k],
                     behavior: x
                   }));
                 },
                 [G]
-              ), jt = {
+              ), Ut = {
                 outer: {
-                  ref: E,
+                  ref: y,
                   style: { overflowY: "auto", height: "100%" }
                 },
                 inner: {
@@ -783,56 +783,56 @@ function It(t, c, m, g) {
                 },
                 list: {
                   style: {
-                    transform: `translateY(${G[y.startIndex] || 0}px)`
+                    transform: `translateY(${G[p.startIndex] || 0}px)`
                   }
                 }
               };
               return {
                 virtualState: B,
-                virtualizerProps: jt,
-                scrollToBottom: st,
+                virtualizerProps: Ut,
+                scrollToBottom: it,
                 scrollToIndex: gt
               };
             };
           if (l === "stateSort")
             return (e) => {
               const a = [...d()].sort(
-                (u, E) => e(u.item, E.item)
-              ), i = a.map(({ item: u }) => u), f = {
+                (u, y) => e(u.item, y.item)
+              ), c = a.map(({ item: u }) => u), f = {
                 ...S,
                 validIndices: a.map(
                   ({ originalIndex: u }) => u
                 )
               };
-              return s(i, r, f);
+              return s(c, r, f);
             };
           if (l === "stateFilter")
             return (e) => {
               const a = d().filter(
-                ({ item: u }, E) => e(u, E)
-              ), i = a.map(({ item: u }) => u), f = {
+                ({ item: u }, y) => e(u, y)
+              ), c = a.map(({ item: u }) => u), f = {
                 ...S,
                 validIndices: a.map(
                   ({ originalIndex: u }) => u
                 )
               };
-              return s(i, r, f);
+              return s(c, r, f);
             };
           if (l === "stateMap")
             return (e) => {
               const n = o.getState().getNestedState(t, r);
-              return Array.isArray(n) ? (S?.validIndices || Array.from({ length: n.length }, (i, f) => f)).map((i, f) => {
-                const u = n[i], E = [...r, i.toString()], y = s(u, E, S);
-                return e(u, y, {
+              return Array.isArray(n) ? (S?.validIndices || Array.from({ length: n.length }, (c, f) => f)).map((c, f) => {
+                const u = n[c], y = [...r, c.toString()], p = s(u, y, S);
+                return e(u, p, {
                   register: () => {
-                    const [, C] = K({}), A = `${m}-${r.join(".")}-${i}`;
-                    ct(() => {
+                    const [, C] = K({}), A = `${m}-${r.join(".")}-${c}`;
+                    lt(() => {
                       const b = `${t}////${A}`, F = o.getState().stateComponents.get(t) || {
                         components: /* @__PURE__ */ new Map()
                       };
                       return F.components.set(b, {
                         forceUpdate: () => C({}),
-                        paths: /* @__PURE__ */ new Set([E.join(".")])
+                        paths: /* @__PURE__ */ new Set([y.join(".")])
                       }), o.getState().stateComponents.set(t, F), () => {
                         const Y = o.getState().stateComponents.get(t);
                         Y && Y.components.delete(b);
@@ -840,7 +840,7 @@ function It(t, c, m, g) {
                     }, [t, A]);
                   },
                   index: f,
-                  originalIndex: i
+                  originalIndex: c
                 });
               }) : (console.warn(
                 `stateMap called on a non-array value at path: ${r.join(".")}. The current value is:`,
@@ -848,20 +848,20 @@ function It(t, c, m, g) {
               ), null);
             };
           if (l === "stateMapNoRender")
-            return (e) => T.map((a, i) => {
+            return (e) => T.map((a, c) => {
               let f;
-              S?.validIndices && S.validIndices[i] !== void 0 ? f = S.validIndices[i] : f = i;
-              const u = [...r, f.toString()], E = s(a, u, S);
+              S?.validIndices && S.validIndices[c] !== void 0 ? f = S.validIndices[c] : f = c;
+              const u = [...r, f.toString()], y = s(a, u, S);
               return e(
                 a,
-                E,
-                i,
+                y,
+                c,
                 T,
                 s(T, r, S)
               );
             });
           if (l === "$stateMap")
-            return (e) => lt(re, {
+            return (e) => rt(re, {
               proxy: {
                 _stateKey: t,
                 _path: r,
@@ -873,20 +873,26 @@ function It(t, c, m, g) {
           if (l === "stateList")
             return (e) => {
               const n = o.getState().getNestedState(t, r);
-              return Array.isArray(n) ? (S?.validIndices || Array.from({ length: n.length }, (i, f) => f)).map((i, f) => {
-                const u = n[i], E = [...r, i.toString()], y = s(u, E, S), w = `${m}-${r.join(".")}-${i}`;
-                return lt(ae, {
-                  key: i,
+              return Array.isArray(n) ? (S?.validIndices || Array.from({ length: n.length }, (c, f) => f)).map((c, f) => {
+                const u = n[c], y = [...r, c.toString()], p = s(u, y, S), w = `${m}-${r.join(".")}-${c}`;
+                return rt(ae, {
+                  key: c,
                   stateKey: t,
                   itemComponentId: w,
-                  itemPath: E,
-                  children: e(
-                    u,
-                    y,
-                    { localIndex: f, originalIndex: i },
-                    n,
-                    s(n, r, S)
-                  )
+                  itemPath: y,
+                  children: rt(bt, {
+                    setState: i,
+                    stateKey: t,
+                    path: y,
+                    child: () => e(
+                      u,
+                      p,
+                      { localIndex: f, originalIndex: c },
+                      n,
+                      s(n, r, S)
+                    ),
+                    formOpts: void 0
+                  })
                 });
               }) : (console.warn(
                 `stateList called on a non-array value at path: ${r.join(".")}.`
@@ -897,7 +903,7 @@ function It(t, c, m, g) {
               const n = T;
               I.clear(), N++;
               const a = n.flatMap(
-                (i) => i[e] ?? []
+                (c) => c[e] ?? []
               );
               return s(
                 a,
@@ -914,40 +920,40 @@ function It(t, c, m, g) {
             return () => {
               const e = o.getState().getNestedState(t, r);
               if (e.length === 0) return;
-              const n = e.length - 1, a = e[n], i = [...r, n.toString()];
-              return s(a, i);
+              const n = e.length - 1, a = e[n], c = [...r, n.toString()];
+              return s(a, c);
             };
           if (l === "insert")
-            return (e) => (p(r), Et(c, e, r, t), s(
+            return (e) => (E(r), Et(i, e, r, t), s(
               o.getState().getNestedState(t, r),
               r
             ));
           if (l === "uniqueInsert")
             return (e, n, a) => {
-              const i = o.getState().getNestedState(t, r), f = tt(e) ? e(i) : e;
+              const c = o.getState().getNestedState(t, r), f = tt(e) ? e(c) : e;
               let u = null;
-              if (!i.some((y) => {
+              if (!c.some((p) => {
                 if (n) {
                   const C = n.every(
-                    (A) => J(y[A], f[A])
+                    (A) => J(p[A], f[A])
                   );
-                  return C && (u = y), C;
+                  return C && (u = p), C;
                 }
-                const w = J(y, f);
-                return w && (u = y), w;
+                const w = J(p, f);
+                return w && (u = p), w;
               }))
-                p(r), Et(c, f, r, t);
+                E(r), Et(i, f, r, t);
               else if (a && u) {
-                const y = a(u), w = i.map(
-                  (C) => J(C, u) ? y : C
+                const p = a(u), w = c.map(
+                  (C) => J(C, u) ? p : C
                 );
-                p(r), it(c, w, r);
+                E(r), ct(i, w, r);
               }
             };
           if (l === "cut")
             return (e, n) => {
               if (!n?.waitForSync)
-                return p(r), ht(c, r, t, e), s(
+                return E(r), ht(i, r, t, e), s(
                   o.getState().getNestedState(t, r),
                   r
                 );
@@ -955,12 +961,12 @@ function It(t, c, m, g) {
           if (l === "cutByValue")
             return (e) => {
               for (let n = 0; n < T.length; n++)
-                T[n] === e && ht(c, r, t, n);
+                T[n] === e && ht(i, r, t, n);
             };
           if (l === "toggleByValue")
             return (e) => {
               const n = T.findIndex((a) => a === e);
-              n > -1 ? ht(c, r, t, n) : Et(c, e, r, t);
+              n > -1 ? ht(i, r, t, n) : Et(i, e, r, t);
             };
           if (l === "stateFind")
             return (e) => {
@@ -968,17 +974,17 @@ function It(t, c, m, g) {
                 ({ item: f }, u) => e(f, u)
               );
               if (!a) return;
-              const i = [...r, a.originalIndex.toString()];
-              return s(a.item, i, S);
+              const c = [...r, a.originalIndex.toString()];
+              return s(a.item, c, S);
             };
           if (l === "findWith")
             return (e, n) => {
-              const i = d().find(
+              const c = d().find(
                 ({ item: u }) => u[e] === n
               );
-              if (!i) return;
-              const f = [...r, i.originalIndex.toString()];
-              return s(i.item, f, S);
+              if (!c) return;
+              const f = [...r, c.originalIndex.toString()];
+              return s(c.item, f, S);
             };
         }
         const et = r[r.length - 1];
@@ -986,7 +992,7 @@ function It(t, c, m, g) {
           const d = r.slice(0, -1), e = o.getState().getNestedState(t, d);
           if (Array.isArray(e) && l === "cut")
             return () => ht(
-              c,
+              i,
               d,
               t,
               Number(et)
@@ -1001,13 +1007,13 @@ function It(t, c, m, g) {
             return o.getState().getNestedState(t, r);
           };
         if (l === "$derive")
-          return (d) => Vt({
+          return (d) => Gt({
             _stateKey: t,
             _path: r,
             _effect: d.toString()
           });
         if (l === "$get")
-          return () => Vt({
+          return () => Gt({
             _stateKey: t,
             _path: r
           });
@@ -1025,8 +1031,8 @@ function It(t, c, m, g) {
           return (d) => {
             const e = r.slice(0, -1), n = Number(r[r.length - 1]), a = e.join(".");
             d ? o.getState().setSelectedIndex(t, a, n) : o.getState().setSelectedIndex(t, a, void 0);
-            const i = o.getState().getNestedState(t, [...e]);
-            it(c, i, e), p(e);
+            const c = o.getState().getNestedState(t, [...e]);
+            ct(i, c, e), E(e);
           };
         if (l === "toggleSelected")
           return () => {
@@ -1036,8 +1042,8 @@ function It(t, c, m, g) {
               n,
               a === e ? void 0 : e
             );
-            const i = o.getState().getNestedState(t, [...d]);
-            it(c, i, d), p(d);
+            const c = o.getState().getNestedState(t, [...d]);
+            ct(i, c, d), E(d);
           };
         if (r.length == 0) {
           if (l === "addValidation")
@@ -1047,44 +1053,44 @@ function It(t, c, m, g) {
                 throw new Error("Validation key not found");
               X(e.key), console.log("addValidationError", d), d.forEach((n) => {
                 const a = [e.key, ...n.path].join(".");
-                console.log("fullErrorPath", a), Rt(a, n.message);
+                console.log("fullErrorPath", a), Dt(a, n.message);
               }), dt(t);
             };
           if (l === "applyJsonPatch")
             return (d) => {
               const e = o.getState().cogsStateStore[t], a = Yt(e, d).newDocument;
-              Dt(
+              jt(
                 t,
                 o.getState().initialStateGlobal[t],
                 a,
-                c,
+                i,
                 m,
                 g
               );
-              const i = o.getState().stateComponents.get(t);
-              if (i) {
+              const c = o.getState().stateComponents.get(t);
+              if (c) {
                 const f = _t(e, a), u = new Set(f);
                 for (const [
-                  E,
-                  y
-                ] of i.components.entries()) {
+                  y,
+                  p
+                ] of c.components.entries()) {
                   let w = !1;
-                  const C = Array.isArray(y.reactiveType) ? y.reactiveType : [y.reactiveType || "component"];
+                  const C = Array.isArray(p.reactiveType) ? p.reactiveType : [p.reactiveType || "component"];
                   if (!C.includes("none")) {
                     if (C.includes("all")) {
-                      y.forceUpdate();
+                      p.forceUpdate();
                       continue;
                     }
-                    if (C.includes("component") && (y.paths.has("") && (w = !0), !w))
+                    if (C.includes("component") && (p.paths.has("") && (w = !0), !w))
                       for (const A of u) {
-                        if (y.paths.has(A)) {
+                        if (p.paths.has(A)) {
                           w = !0;
                           break;
                         }
                         let b = A.lastIndexOf(".");
                         for (; b !== -1; ) {
                           const F = A.substring(0, b);
-                          if (y.paths.has(F)) {
+                          if (p.paths.has(F)) {
                             w = !0;
                             break;
                           }
@@ -1098,7 +1104,7 @@ function It(t, c, m, g) {
                                 0,
                                 M
                               );
-                              if (y.paths.has($)) {
+                              if (p.paths.has($)) {
                                 w = !0;
                                 break;
                               }
@@ -1108,12 +1114,12 @@ function It(t, c, m, g) {
                         }
                         if (w) break;
                       }
-                    if (!w && C.includes("deps") && y.depsFunction) {
-                      const A = y.depsFunction(a);
+                    if (!w && C.includes("deps") && p.depsFunction) {
+                      const A = p.depsFunction(a);
                       let b = !1;
-                      typeof A == "boolean" ? A && (b = !0) : J(y.deps, A) || (y.deps = A, b = !0), b && (w = !0);
+                      typeof A == "boolean" ? A && (b = !0) : J(p.deps, A) || (p.deps = A, b = !0), b && (w = !0);
                     }
-                    w && y.forceUpdate();
+                    w && p.forceUpdate();
                   }
                 }
               }
@@ -1132,10 +1138,10 @@ function It(t, c, m, g) {
                 a && a.length > 0 && a.forEach(([f]) => {
                   f && f.startsWith(d.key) && X(f);
                 });
-                const i = d.zodSchema.safeParse(n);
-                return i.success ? !0 : (i.error.errors.forEach((u) => {
-                  const E = u.path, y = u.message, w = [d.key, ...E].join(".");
-                  e(w, y);
+                const c = d.zodSchema.safeParse(n);
+                return c.success ? !0 : (c.error.errors.forEach((u) => {
+                  const y = u.path, p = u.message, w = [d.key, ...y].join(".");
+                  e(w, p);
                 }), dt(t), !1);
               } catch (a) {
                 return console.error("Zod schema validation failed", a), !1;
@@ -1145,7 +1151,7 @@ function It(t, c, m, g) {
           if (l === "getComponents")
             return () => o().stateComponents.get(t);
           if (l === "getAllFormRefs")
-            return () => bt.getState().getFormRefsByStateKey(t);
+            return () => Mt.getState().getFormRefsByStateKey(t);
           if (l === "_initialState")
             return o.getState().initialStateGlobal[t];
           if (l === "_serverState")
@@ -1158,13 +1164,13 @@ function It(t, c, m, g) {
           if (l === "removeValidation") return v.removeValidation;
         }
         if (l === "getFormRef")
-          return () => bt.getState().getFormRef(t + "." + r.join("."));
+          return () => Mt.getState().getFormRef(t + "." + r.join("."));
         if (l === "validationWrapper")
           return ({
             children: d,
             hideMessage: e
           }) => /* @__PURE__ */ Ot(
-            zt,
+            qt,
             {
               formOpts: e ? { validation: { message: "" } } : void 0,
               path: r,
@@ -1180,31 +1186,31 @@ function It(t, c, m, g) {
         if (l === "update")
           return (d, e) => {
             if (e?.debounce)
-              Wt(() => {
-                it(c, d, r, "");
+              zt(() => {
+                ct(i, d, r, "");
                 const n = o.getState().getNestedState(t, r);
                 e?.afterUpdate && e.afterUpdate(n);
               }, e.debounce);
             else {
-              it(c, d, r, "");
+              ct(i, d, r, "");
               const n = o.getState().getNestedState(t, r);
               e?.afterUpdate && e.afterUpdate(n);
             }
-            p(r);
+            E(r);
           };
         if (l === "formElement")
           return (d, e) => /* @__PURE__ */ Ot(
-            qt,
+            bt,
             {
-              setState: c,
+              setState: i,
               stateKey: t,
               path: r,
               child: d,
               formOpts: e
             }
           );
-        const L = [...r, l], at = o.getState().getNestedState(t, L);
-        return s(at, L, S);
+        const L = [...r, l], st = o.getState().getNestedState(t, L);
+        return s(st, L, S);
       }
     }, z = new Proxy(j, U);
     return I.set(W, {
@@ -1216,35 +1222,35 @@ function It(t, c, m, g) {
     o.getState().getNestedState(t, [])
   );
 }
-function Vt(t) {
-  return lt(oe, { proxy: t });
+function Gt(t) {
+  return rt(oe, { proxy: t });
 }
 function re({
   proxy: t,
-  rebuildStateShape: c
+  rebuildStateShape: i
 }) {
   const m = o().getNestedState(t._stateKey, t._path);
-  return Array.isArray(m) ? c(
+  return Array.isArray(m) ? i(
     m,
     t._path
   ).stateMapNoRender(
-    (I, N, p, v, s) => t._mapFn(I, N, p, v, s)
+    (I, N, E, v, s) => t._mapFn(I, N, E, v, s)
   ) : null;
 }
 function oe({
   proxy: t
 }) {
-  const c = q(null), m = `${t._stateKey}-${t._path.join(".")}`;
-  return ot(() => {
-    const g = c.current;
+  const i = q(null), m = `${t._stateKey}-${t._path.join(".")}`;
+  return at(() => {
+    const g = i.current;
     if (!g || !g.parentElement) return;
-    const I = g.parentElement, p = Array.from(I.childNodes).indexOf(g);
+    const I = g.parentElement, E = Array.from(I.childNodes).indexOf(g);
     let v = I.getAttribute("data-parent-id");
     v || (v = `parent-${crypto.randomUUID()}`, I.setAttribute("data-parent-id", v));
     const T = {
       instanceId: `instance-${crypto.randomUUID()}`,
       parentId: v,
-      position: p,
+      position: E,
       effect: t._effect
     };
     o.getState().addSignalElement(m, T);
@@ -1264,14 +1270,14 @@ function oe({
     S !== null && typeof S == "object" && (S = JSON.stringify(S));
     const W = document.createTextNode(String(S));
     g.replaceWith(W);
-  }, [t._stateKey, t._path.join("."), t._effect]), lt("span", {
-    ref: c,
+  }, [t._stateKey, t._path.join("."), t._effect]), rt("span", {
+    ref: i,
     style: { display: "none" },
     "data-signal-id": m
   });
 }
 function pe(t) {
-  const c = Ht(
+  const i = Ft(
     (m) => {
       const g = o.getState().stateComponents.get(t._stateKey) || {
         components: /* @__PURE__ */ new Map()
@@ -1283,23 +1289,23 @@ function pe(t) {
     },
     () => o.getState().getNestedState(t._stateKey, t._path)
   );
-  return lt("text", {}, String(c));
+  return rt("text", {}, String(i));
 }
 function ae({
   stateKey: t,
-  itemComponentId: c,
+  itemComponentId: i,
   itemPath: m,
   children: g
 }) {
-  const [, I] = K({}), [N, p] = Zt(), v = q(null);
-  return ot(() => {
-    p.height > 0 && p.height !== v.current && (v.current = p.height, o.getState().setShadowMetadata(t, m, {
+  const [, I] = K({}), [N, E] = Zt(), v = q(null);
+  return at(() => {
+    E.height > 0 && E.height !== v.current && (v.current = E.height, o.getState().setShadowMetadata(t, m, {
       virtualizer: {
-        itemHeight: p.height
+        itemHeight: E.height
       }
     }));
-  }, [p.height, t, m]), ct(() => {
-    const s = `${t}////${c}`, T = o.getState().stateComponents.get(t) || {
+  }, [E.height, t, m]), lt(() => {
+    const s = `${t}////${i}`, T = o.getState().stateComponents.get(t) || {
       components: /* @__PURE__ */ new Map()
     };
     return T.components.set(s, {
@@ -1309,10 +1315,10 @@ function ae({
       const r = o.getState().stateComponents.get(t);
       r && r.components.delete(s);
     };
-  }, [t, c, m.join(".")]), /* @__PURE__ */ Ot("div", { ref: N, children: g });
+  }, [t, i, m.join(".")]), /* @__PURE__ */ Ot("div", { ref: N, children: g });
 }
 export {
-  Vt as $cogsSignal,
+  Gt as $cogsSignal,
   pe as $cogsSignalStore,
   Ie as addStateOptions,
   ve as createCogsState,