cogsbox-state 0.5.330 → 0.5.332

package/dist/CogsState.jsx

@@ -1,9 +1,9 @@
 "use client";
 import { jsx as mt } from "react/jsx-runtime";
-import { useState as Q, useRef as Z, useEffect as nt, useLayoutEffect as ct, useMemo as ht, createElement as at, useSyncExternalStore as xt, startTransition as Pt, useCallback as wt } from "react";
-import { transformStateFunc as _t, isDeepEqual as B, isFunction as Y, getNestedValue as q, getDifferences as vt, debounce as Mt } from "./utility.js";
-import { pushFunc as St, updateFn as ot, cutFunc as it, ValidationWrapper as jt, FormControlComponent as Rt } from "./Functions.jsx";
-import Ot from "superjson";
+import { useState as X, useRef as Q, useEffect as nt, useLayoutEffect as ct, useMemo as ht, createElement as at, useSyncExternalStore as xt, startTransition as Pt, useCallback as wt } from "react";
+import { transformStateFunc as _t, isDeepEqual as H, isFunction as J, getNestedValue as z, getDifferences as vt, debounce as Mt } from "./utility.js";
+import { pushFunc as St, updateFn as ot, cutFunc as it, ValidationWrapper as jt, FormControlComponent as Ot } from "./Functions.jsx";
+import Rt from "superjson";
 import { v4 as yt } from "uuid";
 import "zod";
 import { getGlobalStore as o, formRefStore as Tt } from "./store.js";
@@ -11,53 +11,53 @@ import { useCogsConfig as bt } from "./CogsStateClient.jsx";
 import { applyPatch as Ut } from "fast-json-patch";
 import Ft from "react-use-measure";
 function Et(t, c) {
-  const m = o.getState().getInitialOptions, f = o.getState().setInitialStateOptions, y = m(t) || {};
-  f(t, {
-    ...y,
+  const h = o.getState().getInitialOptions, S = o.getState().setInitialStateOptions, I = h(t) || {};
+  S(t, {
+    ...I,
     ...c
   });
 }
 function At({
   stateKey: t,
   options: c,
-  initialOptionsPart: m
+  initialOptionsPart: h
 }) {
-  const f = et(t) || {}, y = m[t] || {}, b = o.getState().setInitialStateOptions, w = { ...y, ...f };
+  const S = et(t) || {}, I = h[t] || {}, b = o.getState().setInitialStateOptions, T = { ...I, ...S };
   let p = !1;
   if (c)
     for (const a in c)
-      w.hasOwnProperty(a) ? (a == "localStorage" && c[a] && w[a].key !== c[a]?.key && (p = !0, w[a] = c[a]), a == "initialState" && c[a] && w[a] !== c[a] && // Different references
-      !B(w[a], c[a]) && (p = !0, w[a] = c[a])) : (p = !0, w[a] = c[a]);
-  p && b(t, w);
+      T.hasOwnProperty(a) ? (a == "localStorage" && c[a] && T[a].key !== c[a]?.key && (p = !0, T[a] = c[a]), a == "initialState" && c[a] && T[a] !== c[a] && // Different references
+      !H(T[a], c[a]) && (p = !0, T[a] = c[a])) : (p = !0, T[a] = c[a]);
+  p && b(t, T);
 }
-function ie(t, { formElements: c, validation: m }) {
-  return { initialState: t, formElements: c, validation: m };
+function ie(t, { formElements: c, validation: h }) {
+  return { initialState: t, formElements: c, validation: h };
 }
 const ce = (t, c) => {
-  let m = t;
-  const [f, y] = _t(m);
-  (Object.keys(y).length > 0 || c && Object.keys(c).length > 0) && Object.keys(y).forEach((p) => {
-    y[p] = y[p] || {}, y[p].formElements = {
+  let h = t;
+  const [S, I] = _t(h);
+  (Object.keys(I).length > 0 || c && Object.keys(c).length > 0) && Object.keys(I).forEach((p) => {
+    I[p] = I[p] || {}, I[p].formElements = {
       ...c?.formElements,
       // Global defaults first
       ...c?.validation,
-      ...y[p].formElements || {}
+      ...I[p].formElements || {}
       // State-specific overrides
-    }, et(p) || o.getState().setInitialStateOptions(p, y[p]);
-  }), o.getState().setInitialStates(f), o.getState().setCreatedState(f);
+    }, et(p) || o.getState().setInitialStateOptions(p, I[p]);
+  }), o.getState().setInitialStates(S), o.getState().setCreatedState(S);
   const b = (p, a) => {
-    const [v] = Q(a?.componentId ?? yt());
+    const [y] = X(a?.componentId ?? yt());
     At({
       stateKey: p,
       options: a,
-      initialOptionsPart: y
+      initialOptionsPart: I
     });
-    const n = o.getState().cogsStateStore[p] || f[p], S = a?.modifyState ? a.modifyState(n) : n, [W, U] = Bt(
-      S,
+    const n = o.getState().cogsStateStore[p] || S[p], m = a?.modifyState ? a.modifyState(n) : n, [L, R] = Bt(
+      m,
       {
         stateKey: p,
         syncUpdate: a?.syncUpdate,
-        componentId: v,
+        componentId: y,
         localStorage: a?.localStorage,
         middleware: a?.middleware,
         enabledSync: a?.enabledSync,
@@ -68,46 +68,46 @@ const ce = (t, c) => {
         serverState: a?.serverState
       }
     );
-    return U;
+    return R;
   };
-  function w(p, a) {
-    At({ stateKey: p, options: a, initialOptionsPart: y }), a.localStorage && Ht(p, a), gt(p);
+  function T(p, a) {
+    At({ stateKey: p, options: a, initialOptionsPart: I }), a.localStorage && Ht(p, a), gt(p);
   }
-  return { useCogsState: b, setCogsOptions: w };
+  return { useCogsState: b, setCogsOptions: T };
 }, {
   setUpdaterState: lt,
   setState: K,
   getInitialOptions: et,
   getKeyState: Nt,
   getValidationErrors: Dt,
-  setStateLog: Lt,
+  setStateLog: Wt,
   updateInitialStateGlobal: It,
-  addValidationError: Wt,
-  removeValidationError: J,
+  addValidationError: Lt,
+  removeValidationError: q,
   setServerSyncActions: Gt
-} = o.getState(), $t = (t, c, m, f, y) => {
-  m?.log && console.log(
+} = o.getState(), $t = (t, c, h, S, I) => {
+  h?.log && console.log(
     "saving to localstorage",
     c,
-    m.localStorage?.key,
-    f
+    h.localStorage?.key,
+    S
   );
-  const b = Y(m?.localStorage?.key) ? m.localStorage?.key(t) : m?.localStorage?.key;
-  if (b && f) {
-    const w = `${f}-${c}-${b}`;
+  const b = J(h?.localStorage?.key) ? h.localStorage?.key(t) : h?.localStorage?.key;
+  if (b && S) {
+    const T = `${S}-${c}-${b}`;
     let p;
     try {
-      p = ut(w)?.lastSyncedWithServer;
+      p = ut(T)?.lastSyncedWithServer;
     } catch {
     }
     const a = {
       state: t,
       lastUpdated: Date.now(),
-      lastSyncedWithServer: y ?? p
-    }, v = Ot.serialize(a);
+      lastSyncedWithServer: I ?? p
+    }, y = Rt.serialize(a);
     window.localStorage.setItem(
-      w,
-      JSON.stringify(v.json)
+      T,
+      JSON.stringify(y.json)
     );
   }
 }, ut = (t) => {
@@ -119,60 +119,60 @@ const ce = (t, c) => {
     return console.error("Error loading from localStorage:", c), null;
   }
 }, Ht = (t, c) => {
-  const m = o.getState().cogsStateStore[t], { sessionId: f } = bt(), y = Y(c?.localStorage?.key) ? c.localStorage.key(m) : c?.localStorage?.key;
-  if (y && f) {
+  const h = o.getState().cogsStateStore[t], { sessionId: S } = bt(), I = J(c?.localStorage?.key) ? c.localStorage.key(h) : c?.localStorage?.key;
+  if (I && S) {
     const b = ut(
-      `${f}-${t}-${y}`
+      `${S}-${t}-${I}`
     );
     if (b && b.lastUpdated > (b.lastSyncedWithServer || 0))
       return K(t, b.state), gt(t), !0;
   }
   return !1;
-}, Vt = (t, c, m, f, y, b) => {
-  const w = {
+}, Vt = (t, c, h, S, I, b) => {
+  const T = {
     initialState: c,
     updaterState: dt(
       t,
-      f,
-      y,
+      S,
+      I,
       b
     ),
-    state: m
+    state: h
   };
-  It(t, w.initialState), lt(t, w.updaterState), K(t, w.state);
+  It(t, T.initialState), lt(t, T.updaterState), K(t, T.state);
 }, gt = (t) => {
   const c = o.getState().stateComponents.get(t);
   if (!c) return;
-  const m = /* @__PURE__ */ new Set();
-  c.components.forEach((f) => {
-    (f ? Array.isArray(f.reactiveType) ? f.reactiveType : [f.reactiveType || "component"] : null)?.includes("none") || m.add(() => f.forceUpdate());
+  const h = /* @__PURE__ */ new Set();
+  c.components.forEach((S) => {
+    (S ? Array.isArray(S.reactiveType) ? S.reactiveType : [S.reactiveType || "component"] : null)?.includes("none") || h.add(() => S.forceUpdate());
   }), queueMicrotask(() => {
-    m.forEach((f) => f());
+    h.forEach((S) => S());
   });
 }, le = (t, c) => {
-  const m = o.getState().stateComponents.get(t);
-  if (m) {
-    const f = `${t}////${c}`, y = m.components.get(f);
-    if ((y ? Array.isArray(y.reactiveType) ? y.reactiveType : [y.reactiveType || "component"] : null)?.includes("none"))
+  const h = o.getState().stateComponents.get(t);
+  if (h) {
+    const S = `${t}////${c}`, I = h.components.get(S);
+    if ((I ? Array.isArray(I.reactiveType) ? I.reactiveType : [I.reactiveType || "component"] : null)?.includes("none"))
       return;
-    y && y.forceUpdate();
+    I && I.forceUpdate();
   }
-}, zt = (t, c, m, f) => {
+}, zt = (t, c, h, S) => {
   switch (t) {
     case "update":
       return {
-        oldValue: q(c, f),
-        newValue: q(m, f)
+        oldValue: z(c, S),
+        newValue: z(h, S)
       };
     case "insert":
       return {
         oldValue: null,
         // or undefined
-        newValue: q(m, f)
+        newValue: z(h, S)
       };
     case "cut":
       return {
-        oldValue: q(c, f),
+        oldValue: z(c, S),
         newValue: null
         // or undefined
       };
@@ -182,294 +182,294 @@ const ce = (t, c) => {
 };
 function Bt(t, {
   stateKey: c,
-  serverSync: m,
-  localStorage: f,
-  formElements: y,
+  serverSync: h,
+  localStorage: S,
+  formElements: I,
   reactiveDeps: b,
-  reactiveType: w,
+  reactiveType: T,
   componentId: p,
   initialState: a,
-  syncUpdate: v,
+  syncUpdate: y,
   dependencies: n,
-  serverState: S
+  serverState: m
 } = {}) {
-  const [W, U] = Q({}), { sessionId: F } = bt();
+  const [L, R] = X({}), { sessionId: U } = bt();
   let G = !c;
-  const [h] = Q(c ?? yt()), l = o.getState().stateLog[h], st = Z(/* @__PURE__ */ new Set()), X = Z(p ?? yt()), R = Z(
+  const [v] = X(c ?? yt()), l = o.getState().stateLog[v], st = Q(/* @__PURE__ */ new Set()), Y = Q(p ?? yt()), j = Q(
     null
   );
-  R.current = et(h) ?? null, nt(() => {
-    if (v && v.stateKey === h && v.path?.[0]) {
-      K(h, (r) => ({
+  j.current = et(v) ?? null, nt(() => {
+    if (y && y.stateKey === v && y.path?.[0]) {
+      K(v, (r) => ({
         ...r,
-        [v.path[0]]: v.newValue
+        [y.path[0]]: y.newValue
       }));
-      const e = `${v.stateKey}:${v.path.join(".")}`;
+      const e = `${y.stateKey}:${y.path.join(".")}`;
       o.getState().setSyncInfo(e, {
-        timeStamp: v.timeStamp,
-        userId: v.userId
+        timeStamp: y.timeStamp,
+        userId: y.userId
       });
     }
-  }, [v]), nt(() => {
+  }, [y]), nt(() => {
     if (a) {
-      Et(h, {
+      Et(v, {
         initialState: a
       });
-      const e = R.current, s = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, i = o.getState().initialStateGlobal[h];
-      if (!(i && !B(i, a) || !i) && !s)
+      const e = j.current, s = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, i = o.getState().initialStateGlobal[v];
+      if (!(i && !H(i, a) || !i) && !s)
         return;
       let g = null;
-      const E = Y(e?.localStorage?.key) ? e?.localStorage?.key(a) : e?.localStorage?.key;
-      E && F && (g = ut(`${F}-${h}-${E}`));
-      let T = a, A = !1;
-      const _ = s ? Date.now() : 0, P = g?.lastUpdated || 0, M = g?.lastSyncedWithServer || 0;
-      s && _ > P ? (T = e.serverState.data, A = !0) : g && P > M && (T = g.state, e?.localStorage?.onChange && e?.localStorage?.onChange(T)), o.getState().initializeShadowState(h, a), Vt(
-        h,
+      const E = J(e?.localStorage?.key) ? e?.localStorage?.key(a) : e?.localStorage?.key;
+      E && U && (g = ut(`${U}-${v}-${E}`));
+      let w = a, A = !1;
+      const P = s ? Date.now() : 0, V = g?.lastUpdated || 0, k = g?.lastSyncedWithServer || 0;
+      s && P > V ? (w = e.serverState.data, A = !0) : g && V > k && (w = g.state, e?.localStorage?.onChange && e?.localStorage?.onChange(w)), o.getState().initializeShadowState(v, a), Vt(
+        v,
         a,
-        T,
+        w,
         rt,
-        X.current,
-        F
-      ), A && E && F && $t(T, h, e, F, Date.now()), gt(h), (Array.isArray(w) ? w : [w || "component"]).includes("none") || U({});
+        Y.current,
+        U
+      ), A && E && U && $t(w, v, e, U, Date.now()), gt(v), (Array.isArray(T) ? T : [T || "component"]).includes("none") || R({});
     }
   }, [
     a,
-    S?.status,
-    S?.data,
+    m?.status,
+    m?.data,
     ...n || []
   ]), ct(() => {
-    G && Et(h, {
-      serverSync: m,
-      formElements: y,
+    G && Et(v, {
+      serverSync: h,
+      formElements: I,
       initialState: a,
-      localStorage: f,
-      middleware: R.current?.middleware
+      localStorage: S,
+      middleware: j.current?.middleware
     });
-    const e = `${h}////${X.current}`, r = o.getState().stateComponents.get(h) || {
+    const e = `${v}////${Y.current}`, r = o.getState().stateComponents.get(v) || {
       components: /* @__PURE__ */ new Map()
     };
     return r.components.set(e, {
-      forceUpdate: () => U({}),
+      forceUpdate: () => R({}),
       paths: /* @__PURE__ */ new Set(),
       deps: [],
       depsFunction: b || void 0,
-      reactiveType: w ?? ["component", "deps"]
-    }), o.getState().stateComponents.set(h, r), U({}), () => {
-      r && (r.components.delete(e), r.components.size === 0 && o.getState().stateComponents.delete(h));
+      reactiveType: T ?? ["component", "deps"]
+    }), o.getState().stateComponents.set(v, r), R({}), () => {
+      r && (r.components.delete(e), r.components.size === 0 && o.getState().stateComponents.delete(v));
     };
   }, []);
   const rt = (e, r, s, i) => {
     if (Array.isArray(r)) {
-      const g = `${h}-${r.join(".")}`;
+      const g = `${v}-${r.join(".")}`;
       st.current.add(g);
     }
     const u = o.getState();
-    K(h, (g) => {
-      const E = Y(e) ? e(g) : e, T = `${h}-${r.join(".")}`;
-      if (T) {
-        let x = !1, V = u.signalDomElements.get(T);
-        if ((!V || V.size === 0) && (s.updateType === "insert" || s.updateType === "cut")) {
-          const O = r.slice(0, -1), D = q(E, O);
-          if (Array.isArray(D)) {
-            x = !0;
-            const $ = `${h}-${O.join(".")}`;
-            V = u.signalDomElements.get($);
+    K(v, (g) => {
+      const E = J(e) ? e(g) : e, w = `${v}-${r.join(".")}`;
+      if (w) {
+        let M = !1, N = u.signalDomElements.get(w);
+        if ((!N || N.size === 0) && (s.updateType === "insert" || s.updateType === "cut")) {
+          const O = r.slice(0, -1), W = z(E, O);
+          if (Array.isArray(W)) {
+            M = !0;
+            const f = `${v}-${O.join(".")}`;
+            N = u.signalDomElements.get(f);
           }
         }
-        if (V) {
-          const O = x ? q(E, r.slice(0, -1)) : q(E, r);
-          V.forEach(({ parentId: D, position: $, effect: I }) => {
-            const k = document.querySelector(
-              `[data-parent-id="${D}"]`
+        if (N) {
+          const O = M ? z(E, r.slice(0, -1)) : z(E, r);
+          N.forEach(({ parentId: W, position: f, effect: $ }) => {
+            const C = document.querySelector(
+              `[data-parent-id="${W}"]`
             );
-            if (k) {
-              const j = Array.from(k.childNodes);
-              if (j[$]) {
-                const N = I ? new Function("state", `return (${I})(state)`)(O) : O;
-                j[$].textContent = String(N);
+            if (C) {
+              const _ = Array.from(C.childNodes);
+              if (_[f]) {
+                const x = $ ? new Function("state", `return (${$})(state)`)(O) : O;
+                _[f].textContent = String(x);
               }
             }
           });
         }
       }
-      console.log("shadowState", u.shadowStateStore), s.updateType === "update" && (i || R.current?.validation?.key) && r && J(
-        (i || R.current?.validation?.key) + "." + r.join(".")
+      console.log("shadowState", u.shadowStateStore), s.updateType === "update" && (i || j.current?.validation?.key) && r && q(
+        (i || j.current?.validation?.key) + "." + r.join(".")
       );
       const A = r.slice(0, r.length - 1);
-      s.updateType === "cut" && R.current?.validation?.key && J(
-        R.current?.validation?.key + "." + A.join(".")
-      ), s.updateType === "insert" && R.current?.validation?.key && Dt(
-        R.current?.validation?.key + "." + A.join(".")
-      ).filter(([V, O]) => {
-        let D = V?.split(".").length;
-        if (V == A.join(".") && D == A.length - 1) {
-          let $ = V + "." + A;
-          J(V), Wt($, O);
+      s.updateType === "cut" && j.current?.validation?.key && q(
+        j.current?.validation?.key + "." + A.join(".")
+      ), s.updateType === "insert" && j.current?.validation?.key && Dt(
+        j.current?.validation?.key + "." + A.join(".")
+      ).filter(([N, O]) => {
+        let W = N?.split(".").length;
+        if (N == A.join(".") && W == A.length - 1) {
+          let f = N + "." + A;
+          q(N), Lt(f, O);
         }
       });
-      const _ = u.stateComponents.get(h);
-      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", _), _) {
-        const x = vt(g, E), V = new Set(x), O = s.updateType === "update" ? r.join(".") : r.slice(0, -1).join(".") || "";
+      const P = u.stateComponents.get(v);
+      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", P), P) {
+        const M = vt(g, E), N = new Set(M), O = s.updateType === "update" ? r.join(".") : r.slice(0, -1).join(".") || "";
         for (const [
-          D,
-          $
-        ] of _.components.entries()) {
-          let I = !1;
-          const k = Array.isArray($.reactiveType) ? $.reactiveType : [$.reactiveType || "component"];
-          if (console.log("component", $), !k.includes("none")) {
-            if (k.includes("all")) {
-              $.forceUpdate();
+          W,
+          f
+        ] of P.components.entries()) {
+          let $ = !1;
+          const C = Array.isArray(f.reactiveType) ? f.reactiveType : [f.reactiveType || "component"];
+          if (console.log("component", f), !C.includes("none")) {
+            if (C.includes("all")) {
+              f.forceUpdate();
               continue;
             }
-            if (k.includes("component") && (($.paths.has(O) || $.paths.has("")) && (I = !0), !I))
-              for (const j of V) {
-                let N = j;
+            if (C.includes("component") && ((f.paths.has(O) || f.paths.has("")) && ($ = !0), !$))
+              for (const _ of N) {
+                let x = _;
                 for (; ; ) {
-                  if ($.paths.has(N)) {
-                    I = !0;
+                  if (f.paths.has(x)) {
+                    $ = !0;
                     break;
                   }
-                  const L = N.lastIndexOf(".");
-                  if (L !== -1) {
-                    const H = N.substring(
+                  const B = x.lastIndexOf(".");
+                  if (B !== -1) {
+                    const Z = x.substring(
                       0,
-                      L
+                      B
                     );
                     if (!isNaN(
-                      Number(N.substring(L + 1))
-                    ) && $.paths.has(H)) {
-                      I = !0;
+                      Number(x.substring(B + 1))
+                    ) && f.paths.has(Z)) {
+                      $ = !0;
                       break;
                     }
-                    N = H;
+                    x = Z;
                   } else
-                    N = "";
-                  if (N === "")
+                    x = "";
+                  if (x === "")
                     break;
                 }
-                if (I) break;
+                if ($) break;
               }
-            if (!I && k.includes("deps") && $.depsFunction) {
-              const j = $.depsFunction(E);
-              let N = !1;
-              typeof j == "boolean" ? j && (N = !0) : B($.deps, j) || ($.deps = j, N = !0), N && (I = !0);
+            if (!$ && C.includes("deps") && f.depsFunction) {
+              const _ = f.depsFunction(E);
+              let x = !1;
+              typeof _ == "boolean" ? _ && (x = !0) : H(f.deps, _) || (f.deps = _, x = !0), x && ($ = !0);
             }
-            I && $.forceUpdate();
+            $ && f.forceUpdate();
           }
         }
       }
-      const P = Date.now();
-      r = r.map((x, V) => {
-        const O = r.slice(0, -1), D = q(E, O);
-        return V === r.length - 1 && ["insert", "cut"].includes(s.updateType) ? (D.length - 1).toString() : x;
+      const V = Date.now();
+      r = r.map((M, N) => {
+        const O = r.slice(0, -1), W = z(E, O);
+        return N === r.length - 1 && ["insert", "cut"].includes(s.updateType) ? (W.length - 1).toString() : M;
       });
-      const { oldValue: M, newValue: C } = zt(
+      const { oldValue: k, newValue: F } = zt(
         s.updateType,
         g,
         E,
         r
-      ), z = {
-        timeStamp: P,
-        stateKey: h,
+      ), D = {
+        timeStamp: V,
+        stateKey: v,
         path: r,
         updateType: s.updateType,
         status: "new",
-        oldValue: M,
-        newValue: C
+        oldValue: k,
+        newValue: F
       };
       switch (s.updateType) {
         case "update":
-          u.updateShadowAtPath(h, r, E);
+          u.updateShadowAtPath(v, r, E);
           break;
         case "insert":
-          const x = r.slice(0, -1);
-          u.insertShadowArrayElement(h, x, C);
+          const M = r.slice(0, -1);
+          u.insertShadowArrayElement(v, M, F);
           break;
         case "cut":
-          const V = r.slice(0, -1), O = parseInt(r[r.length - 1]);
-          u.removeShadowArrayElement(h, V, O);
+          const N = r.slice(0, -1), O = parseInt(r[r.length - 1]);
+          u.removeShadowArrayElement(v, N, O);
           break;
       }
-      if (Lt(h, (x) => {
-        const O = [...x ?? [], z].reduce((D, $) => {
-          const I = `${$.stateKey}:${JSON.stringify($.path)}`, k = D.get(I);
-          return k ? (k.timeStamp = Math.max(k.timeStamp, $.timeStamp), k.newValue = $.newValue, k.oldValue = k.oldValue ?? $.oldValue, k.updateType = $.updateType) : D.set(I, { ...$ }), D;
+      if (Wt(v, (M) => {
+        const O = [...M ?? [], D].reduce((W, f) => {
+          const $ = `${f.stateKey}:${JSON.stringify(f.path)}`, C = W.get($);
+          return C ? (C.timeStamp = Math.max(C.timeStamp, f.timeStamp), C.newValue = f.newValue, C.oldValue = C.oldValue ?? f.oldValue, C.updateType = f.updateType) : W.set($, { ...f }), W;
         }, /* @__PURE__ */ new Map());
         return Array.from(O.values());
       }), $t(
         E,
-        h,
-        R.current,
-        F
-      ), R.current?.middleware && R.current.middleware({
+        v,
+        j.current,
+        U
+      ), j.current?.middleware && j.current.middleware({
         updateLog: l,
-        update: z
-      }), R.current?.serverSync) {
-        const x = u.serverState[h], V = R.current?.serverSync;
-        Gt(h, {
-          syncKey: typeof V.syncKey == "string" ? V.syncKey : V.syncKey({ state: E }),
-          rollBackState: x,
-          actionTimeStamp: Date.now() + (V.debounce ?? 3e3),
+        update: D
+      }), j.current?.serverSync) {
+        const M = u.serverState[v], N = j.current?.serverSync;
+        Gt(v, {
+          syncKey: typeof N.syncKey == "string" ? N.syncKey : N.syncKey({ state: E }),
+          rollBackState: M,
+          actionTimeStamp: Date.now() + (N.debounce ?? 3e3),
           status: "waiting"
         });
       }
       return E;
     });
   };
-  o.getState().updaterState[h] || (lt(
-    h,
+  o.getState().updaterState[v] || (lt(
+    v,
     dt(
-      h,
+      v,
       rt,
-      X.current,
-      F
+      Y.current,
+      U
     )
-  ), o.getState().cogsStateStore[h] || K(h, t), o.getState().initialStateGlobal[h] || It(h, t));
+  ), o.getState().cogsStateStore[v] || K(v, t), o.getState().initialStateGlobal[v] || It(v, t));
   const d = ht(() => dt(
-    h,
+    v,
     rt,
-    X.current,
-    F
-  ), [h, F]);
-  return [Nt(h), d];
+    Y.current,
+    U
+  ), [v, U]);
+  return [Nt(v), d];
 }
-function dt(t, c, m, f) {
-  const y = /* @__PURE__ */ new Map();
+function dt(t, c, h, S) {
+  const I = /* @__PURE__ */ new Map();
   let b = 0;
-  const w = (v) => {
-    const n = v.join(".");
-    for (const [S] of y)
-      (S === n || S.startsWith(n + ".")) && y.delete(S);
+  const T = (y) => {
+    const n = y.join(".");
+    for (const [m] of I)
+      (m === n || m.startsWith(n + ".")) && I.delete(m);
     b++;
   }, p = {
-    removeValidation: (v) => {
-      v?.validationKey && J(v.validationKey);
+    removeValidation: (y) => {
+      y?.validationKey && q(y.validationKey);
     },
-    revertToInitialState: (v) => {
+    revertToInitialState: (y) => {
       const n = o.getState().getInitialOptions(t)?.validation;
-      n?.key && J(n?.key), v?.validationKey && J(v.validationKey);
-      const S = o.getState().initialStateGlobal[t];
-      o.getState().clearSelectedIndexesForState(t), y.clear(), b++;
-      const W = a(S, []), U = et(t), F = Y(U?.localStorage?.key) ? U?.localStorage?.key(S) : U?.localStorage?.key, G = `${f}-${t}-${F}`;
-      G && localStorage.removeItem(G), lt(t, W), K(t, S);
-      const h = o.getState().stateComponents.get(t);
-      return h && h.components.forEach((l) => {
+      n?.key && q(n?.key), y?.validationKey && q(y.validationKey);
+      const m = o.getState().initialStateGlobal[t];
+      o.getState().clearSelectedIndexesForState(t), I.clear(), b++;
+      const L = a(m, []), R = et(t), U = J(R?.localStorage?.key) ? R?.localStorage?.key(m) : R?.localStorage?.key, G = `${S}-${t}-${U}`;
+      G && localStorage.removeItem(G), lt(t, L), K(t, m);
+      const v = o.getState().stateComponents.get(t);
+      return v && v.components.forEach((l) => {
         l.forceUpdate();
-      }), S;
+      }), m;
     },
-    updateInitialState: (v) => {
-      y.clear(), b++;
+    updateInitialState: (y) => {
+      I.clear(), b++;
       const n = dt(
         t,
         c,
-        m,
-        f
-      ), S = o.getState().initialStateGlobal[t], W = et(t), U = Y(W?.localStorage?.key) ? W?.localStorage?.key(S) : W?.localStorage?.key, F = `${f}-${t}-${U}`;
-      return localStorage.getItem(F) && localStorage.removeItem(F), Pt(() => {
-        It(t, v), o.getState().initializeShadowState(t, v), lt(t, n), K(t, v);
+        h,
+        S
+      ), m = o.getState().initialStateGlobal[t], L = et(t), R = J(L?.localStorage?.key) ? L?.localStorage?.key(m) : L?.localStorage?.key, U = `${S}-${t}-${R}`;
+      return localStorage.getItem(U) && localStorage.removeItem(U), Pt(() => {
+        It(t, y), o.getState().initializeShadowState(t, y), lt(t, n), K(t, y);
         const G = o.getState().stateComponents.get(t);
-        G && G.components.forEach((h) => {
-          h.forceUpdate();
+        G && G.components.forEach((v) => {
+          v.forceUpdate();
         });
       }), {
         fetchId: (G) => n.get()[G]
@@ -479,27 +479,27 @@ function dt(t, c, m, f) {
     _serverState: o.getState().serverState[t],
     _isLoading: o.getState().isLoadingGlobal[t],
     _isServerSynced: () => {
-      const v = o.getState().serverState[t];
-      return !!(v && B(v, Nt(t)));
+      const y = o.getState().serverState[t];
+      return !!(y && H(y, Nt(t)));
     }
   };
-  function a(v, n = [], S) {
-    const W = n.map(String).join(".");
-    y.get(W);
-    const U = function() {
+  function a(y, n = [], m) {
+    const L = n.map(String).join(".");
+    I.get(L);
+    const R = function() {
       return o().getNestedState(t, n);
     };
-    Object.keys(p).forEach((h) => {
-      U[h] = p[h];
+    Object.keys(p).forEach((v) => {
+      R[v] = p[v];
     });
-    const F = {
-      apply(h, l, st) {
+    const U = {
+      apply(v, l, st) {
         return console.log(
           `PROXY APPLY TRAP HIT: stateKey=${t}, path=${n.join(".")}`
         ), console.trace("Apply trap stack trace"), o().getNestedState(t, n);
       },
-      get(h, l) {
-        S?.validIndices && !Array.isArray(v) && (S = { ...S, validIndices: void 0 });
+      get(v, l) {
+        m?.validIndices && !Array.isArray(y) && (m = { ...m, validIndices: void 0 });
         const st = /* @__PURE__ */ new Set([
           "insert",
           "cut",
@@ -524,7 +524,7 @@ function dt(t, c, m, f) {
           "getComponents"
         ]);
         if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !st.has(l)) {
-          const d = `${t}////${m}`, e = o.getState().stateComponents.get(t);
+          const d = `${t}////${h}`, e = o.getState().stateComponents.get(t);
           if (e) {
             const r = e.components.get(d);
             if (r && !r.paths.has("")) {
@@ -568,20 +568,20 @@ function dt(t, c, m, f) {
             }
           };
         if (l === "_status") {
-          const d = o.getState().getNestedState(t, n), e = o.getState().initialStateGlobal[t], r = q(e, n);
-          return B(d, r) ? "fresh" : "stale";
+          const d = o.getState().getNestedState(t, n), e = o.getState().initialStateGlobal[t], r = z(e, n);
+          return H(d, r) ? "fresh" : "stale";
         }
         if (l === "getStatus")
           return function() {
             const d = o().getNestedState(
               t,
               n
-            ), e = o.getState().initialStateGlobal[t], r = q(e, n);
-            return B(d, r) ? "fresh" : "stale";
+            ), e = o.getState().initialStateGlobal[t], r = z(e, n);
+            return H(d, r) ? "fresh" : "stale";
           };
         if (l === "removeStorage")
           return () => {
-            const d = o.getState().initialStateGlobal[t], e = et(t), r = Y(e?.localStorage?.key) ? e?.localStorage?.key(d) : e?.localStorage?.key, s = `${f}-${t}-${r}`;
+            const d = o.getState().initialStateGlobal[t], e = et(t), r = J(e?.localStorage?.key) ? e?.localStorage?.key(d) : e?.localStorage?.key, s = `${S}-${t}-${r}`;
             s && localStorage.removeItem(s);
           };
         if (l === "showValidationErrors")
@@ -591,10 +591,10 @@ function dt(t, c, m, f) {
               throw new Error("Validation key not found");
             return o.getState().getValidationErrors(d.key + "." + n.join("."));
           };
-        if (Array.isArray(v)) {
-          const d = () => S?.validIndices ? v.map((r, s) => ({
+        if (Array.isArray(y)) {
+          const d = () => m?.validIndices ? y.map((r, s) => ({
             item: r,
-            originalIndex: S.validIndices[s]
+            originalIndex: m.validIndices[s]
           })) : o.getState().getNestedState(t, n).map((r, s) => ({
             item: r,
             originalIndex: s
@@ -604,9 +604,9 @@ function dt(t, c, m, f) {
               const e = o.getState().getSelectedIndex(t, n.join("."));
               if (e !== void 0)
                 return a(
-                  v[e],
+                  y[e],
                   [...n, e.toString()],
-                  S
+                  m
                 );
             };
           if (l === "clearSelected")
@@ -621,132 +621,128 @@ function dt(t, c, m, f) {
                 itemHeight: r = 50,
                 overscan: s = 5,
                 stickToBottom: i = !1
-              } = e, u = Z(null), [g, E] = Q({
+              } = e, u = Q(null), [g, E] = X({
                 startIndex: 0,
                 endIndex: 10
-              }), T = Z(i), A = Z(0), [_, P] = Q(0);
+              }), w = Q(i), [A, P] = X(0);
               nt(() => o.getState().subscribeToShadowState(t, () => {
-                P((k) => k + 1);
+                P(($) => $ + 1);
               }), [t]);
-              const M = o().getNestedState(
+              const V = o().getNestedState(
                 t,
                 n
-              ), C = M.length, { totalHeight: z, positions: x } = ht(() => {
-                const I = o.getState().getShadowMetadata(t, n) || [];
-                let k = 0;
-                const j = [];
-                for (let N = 0; N < C; N++) {
-                  j[N] = k;
-                  const L = I[N]?.virtualizer?.itemHeight;
-                  k += L || r;
+              ), k = V.length, { totalHeight: F, positions: D } = ht(() => {
+                const f = o.getState().getShadowMetadata(t, n) || [];
+                let $ = 0;
+                const C = [];
+                for (let _ = 0; _ < k; _++) {
+                  C[_] = $;
+                  const x = f[_]?.virtualizer?.itemHeight;
+                  $ += x || r;
                 }
-                return { totalHeight: k, positions: j };
+                return { totalHeight: $, positions: C };
               }, [
-                C,
+                k,
                 t,
                 n.join("."),
                 r,
-                _
-              ]), V = ht(() => {
-                const I = Math.max(0, g.startIndex), k = Math.min(C, g.endIndex), j = Array.from(
-                  { length: k - I },
-                  (L, H) => I + H
-                ), N = j.map((L) => M[L]);
-                return a(N, n, {
-                  ...S,
-                  validIndices: j
+                A
+              ]), M = ht(() => {
+                const f = Math.max(0, g.startIndex), $ = Math.min(k, g.endIndex), C = Array.from(
+                  { length: $ - f },
+                  (x, B) => f + B
+                ), _ = C.map((x) => V[x]);
+                return a(_, n, {
+                  ...m,
+                  validIndices: C
                 });
-              }, [g.startIndex, g.endIndex, M, C]);
+              }, [g.startIndex, g.endIndex, V, k]);
               nt(() => {
-                if (i && C > 0 && u.current) {
-                  const I = u.current, k = Math.ceil(
-                    I.clientHeight / r
+                if (i && k > 0 && u.current) {
+                  const f = u.current, $ = Math.ceil(
+                    f.clientHeight / r
                   );
                   E({
                     startIndex: Math.max(
                       0,
-                      C - k - s
+                      k - $ - s
                     ),
-                    endIndex: C
+                    endIndex: k
                   }), setTimeout(() => {
-                    I.scrollTop = I.scrollHeight;
+                    f.scrollTop = f.scrollHeight;
                   }, 100);
                 }
-              }, [C]), ct(() => {
-                const I = u.current;
-                if (!I) return;
-                const k = () => {
-                  if (!I) return;
-                  const { scrollTop: N } = I;
-                  let L = 0, H = C - 1;
-                  for (; L <= H; ) {
-                    const ft = Math.floor((L + H) / 2);
-                    x[ft] < N ? L = ft + 1 : H = ft - 1;
+              }, [k]), ct(() => {
+                const f = u.current;
+                if (!f) return;
+                let $;
+                const C = () => {
+                  if (!f) return;
+                  const { scrollTop: x } = f;
+                  let B = 0, Z = k - 1;
+                  for (; B <= Z; ) {
+                    const ft = Math.floor((B + Z) / 2);
+                    D[ft] < x ? B = ft + 1 : Z = ft - 1;
                   }
-                  const pt = Math.max(0, H - s);
+                  const pt = Math.max(0, Z - s);
                   let tt = pt;
-                  const Ct = N + I.clientHeight;
-                  for (; tt < C && x[tt] < Ct; )
+                  const Ct = x + f.clientHeight;
+                  for (; tt < k && D[tt] < Ct; )
                     tt++;
-                  tt = Math.min(C, tt + s), E({ startIndex: pt, endIndex: tt });
-                }, j = () => {
-                  T.current = I.scrollHeight - I.scrollTop - I.clientHeight < 1, k();
+                  tt = Math.min(k, tt + s), E({ startIndex: pt, endIndex: tt });
+                }, _ = () => {
+                  w.current = f.scrollHeight - f.scrollTop - f.clientHeight < 1, C();
                 };
-                if (I.addEventListener("scroll", j, {
+                return f.addEventListener("scroll", _, {
                   passive: !0
-                }), i && T.current) {
-                  const N = I.scrollHeight;
-                  if (N > A.current) {
-                    const H = N - I.scrollTop - I.clientHeight > I.clientHeight * 2;
-                    I.scrollTo({
-                      top: 999999999,
-                      behavior: H ? "auto" : "smooth"
-                      // Instant for big jumps, smooth for small
-                    }), A.current = N;
-                  }
-                }
-                return k(), () => {
-                  I.removeEventListener("scroll", j);
+                }), i && w.current && ($ = setTimeout(() => {
+                  console.log("totalHeight", F), w.current && f.scrollTo({
+                    top: 999999999,
+                    behavior: "smooth"
+                    // ALWAYS 'auto' for an instant, correct jump.
+                  });
+                }, 200)), C(), () => {
+                  clearTimeout($), f.removeEventListener("scroll", _);
                 };
-              }, [C, x, z, i]);
-              const O = wt(
-                (I = "smooth") => {
-                  u.current && (T.current = !0, u.current.scrollTo({
+              }, [k, D, F, i]);
+              const N = wt(
+                (f = "smooth") => {
+                  u.current && (w.current = !0, u.current.scrollTo({
                     top: u.current.scrollHeight,
-                    behavior: I
+                    behavior: f
                   }));
                 },
                 []
-              ), D = wt(
-                (I, k = "smooth") => {
-                  u.current && x[I] !== void 0 && (T.current = !1, u.current.scrollTo({
-                    top: x[I],
-                    behavior: k
+              ), O = wt(
+                (f, $ = "smooth") => {
+                  u.current && D[f] !== void 0 && (w.current = !1, u.current.scrollTo({
+                    top: D[f],
+                    behavior: $
                   }));
                 },
-                [x]
-              ), $ = {
+                [D]
+              ), W = {
                 outer: {
                   ref: u,
                   style: { overflowY: "auto", height: "100%" }
                 },
                 inner: {
                   style: {
-                    height: `${z}px`,
+                    height: `${F}px`,
                     position: "relative"
                   }
                 },
                 list: {
                   style: {
-                    transform: `translateY(${x[g.startIndex] || 0}px)`
+                    transform: `translateY(${D[g.startIndex] || 0}px)`
                   }
                 }
               };
               return {
-                virtualState: V,
-                virtualizerProps: $,
-                scrollToBottom: O,
-                scrollToIndex: D
+                virtualState: M,
+                virtualizerProps: W,
+                scrollToBottom: N,
+                scrollToIndex: O
               };
             };
           if (l === "stateSort")
@@ -754,7 +750,7 @@ function dt(t, c, m, f) {
               const s = [...d()].sort(
                 (g, E) => e(g.item, E.item)
               ), i = s.map(({ item: g }) => g), u = {
-                ...S,
+                ...m,
                 validIndices: s.map(
                   ({ originalIndex: g }) => g
                 )
@@ -766,7 +762,7 @@ function dt(t, c, m, f) {
               const s = d().filter(
                 ({ item: g }, E) => e(g, E)
               ), i = s.map(({ item: g }) => g), u = {
-                ...S,
+                ...m,
                 validIndices: s.map(
                   ({ originalIndex: g }) => g
                 )
@@ -776,23 +772,23 @@ function dt(t, c, m, f) {
           if (l === "stateMap")
             return (e) => {
               const r = o.getState().getNestedState(t, n);
-              return Array.isArray(r) ? (S?.validIndices || Array.from({ length: r.length }, (i, u) => u)).map((i, u) => {
-                const g = r[i], E = [...n, i.toString()], T = a(g, E, S);
-                return e(g, T, {
+              return Array.isArray(r) ? (m?.validIndices || Array.from({ length: r.length }, (i, u) => u)).map((i, u) => {
+                const g = r[i], E = [...n, i.toString()], w = a(g, E, m);
+                return e(g, w, {
                   register: () => {
-                    const [, _] = Q({}), P = `${m}-${n.join(".")}-${i}`;
+                    const [, P] = X({}), V = `${h}-${n.join(".")}-${i}`;
                     ct(() => {
-                      const M = `${t}////${P}`, C = o.getState().stateComponents.get(t) || {
+                      const k = `${t}////${V}`, F = o.getState().stateComponents.get(t) || {
                         components: /* @__PURE__ */ new Map()
                       };
-                      return C.components.set(M, {
-                        forceUpdate: () => _({}),
+                      return F.components.set(k, {
+                        forceUpdate: () => P({}),
                         paths: /* @__PURE__ */ new Set([E.join(".")])
-                      }), o.getState().stateComponents.set(t, C), () => {
-                        const z = o.getState().stateComponents.get(t);
-                        z && z.components.delete(M);
+                      }), o.getState().stateComponents.set(t, F), () => {
+                        const D = o.getState().stateComponents.get(t);
+                        D && D.components.delete(k);
                       };
-                    }, [t, P]);
+                    }, [t, V]);
                   },
                   index: u,
                   originalIndex: i
@@ -803,16 +799,16 @@ function dt(t, c, m, f) {
               ), null);
             };
           if (l === "stateMapNoRender")
-            return (e) => v.map((s, i) => {
+            return (e) => y.map((s, i) => {
               let u;
-              S?.validIndices && S.validIndices[i] !== void 0 ? u = S.validIndices[i] : u = i;
-              const g = [...n, u.toString()], E = a(s, g, S);
+              m?.validIndices && m.validIndices[i] !== void 0 ? u = m.validIndices[i] : u = i;
+              const g = [...n, u.toString()], E = a(s, g, m);
               return e(
                 s,
                 E,
                 i,
-                v,
-                a(v, n, S)
+                y,
+                a(y, n, m)
               );
             });
           if (l === "$stateMap")
@@ -828,8 +824,8 @@ function dt(t, c, m, f) {
           if (l === "stateList")
             return (e) => {
               const r = o.getState().getNestedState(t, n);
-              return Array.isArray(r) ? (S?.validIndices || Array.from({ length: r.length }, (i, u) => u)).map((i, u) => {
-                const g = r[i], E = [...n, i.toString()], T = a(g, E, S), A = `${m}-${n.join(".")}-${i}`;
+              return Array.isArray(r) ? (m?.validIndices || Array.from({ length: r.length }, (i, u) => u)).map((i, u) => {
+                const g = r[i], E = [...n, i.toString()], w = a(g, E, m), A = `${h}-${n.join(".")}-${i}`;
                 return at(Yt, {
                   key: i,
                   stateKey: t,
@@ -837,10 +833,10 @@ function dt(t, c, m, f) {
                   itemPath: E,
                   children: e(
                     g,
-                    T,
+                    w,
                     u,
                     r,
-                    a(r, n, S)
+                    a(r, n, m)
                   )
                 });
               }) : (console.warn(
@@ -849,20 +845,20 @@ function dt(t, c, m, f) {
             };
           if (l === "stateFlattenOn")
             return (e) => {
-              const r = v;
-              y.clear(), b++;
+              const r = y;
+              I.clear(), b++;
               const s = r.flatMap(
                 (i) => i[e] ?? []
               );
               return a(
                 s,
                 [...n, "[*]", e],
-                S
+                m
               );
             };
           if (l === "index")
             return (e) => {
-              const r = v[e];
+              const r = y[e];
               return a(r, [...n, e.toString()]);
             };
           if (l === "last")
@@ -873,48 +869,48 @@ function dt(t, c, m, f) {
               return a(s, i);
             };
           if (l === "insert")
-            return (e) => (w(n), St(c, e, n, t), a(
+            return (e) => (T(n), St(c, e, n, t), a(
               o.getState().getNestedState(t, n),
               n
             ));
           if (l === "uniqueInsert")
             return (e, r, s) => {
-              const i = o.getState().getNestedState(t, n), u = Y(e) ? e(i) : e;
+              const i = o.getState().getNestedState(t, n), u = J(e) ? e(i) : e;
               let g = null;
-              if (!i.some((T) => {
+              if (!i.some((w) => {
                 if (r) {
-                  const _ = r.every(
-                    (P) => B(T[P], u[P])
+                  const P = r.every(
+                    (V) => H(w[V], u[V])
                   );
-                  return _ && (g = T), _;
+                  return P && (g = w), P;
                 }
-                const A = B(T, u);
-                return A && (g = T), A;
+                const A = H(w, u);
+                return A && (g = w), A;
               }))
-                w(n), St(c, u, n, t);
+                T(n), St(c, u, n, t);
               else if (s && g) {
-                const T = s(g), A = i.map(
-                  (_) => B(_, g) ? T : _
+                const w = s(g), A = i.map(
+                  (P) => H(P, g) ? w : P
                 );
-                w(n), ot(c, A, n);
+                T(n), ot(c, A, n);
               }
             };
           if (l === "cut")
             return (e, r) => {
               if (!r?.waitForSync)
-                return w(n), it(c, n, t, e), a(
+                return T(n), it(c, n, t, e), a(
                   o.getState().getNestedState(t, n),
                   n
                 );
             };
           if (l === "cutByValue")
             return (e) => {
-              for (let r = 0; r < v.length; r++)
-                v[r] === e && it(c, n, t, r);
+              for (let r = 0; r < y.length; r++)
+                y[r] === e && it(c, n, t, r);
             };
           if (l === "toggleByValue")
             return (e) => {
-              const r = v.findIndex((s) => s === e);
+              const r = y.findIndex((s) => s === e);
               r > -1 ? it(c, n, t, r) : St(c, e, n, t);
             };
           if (l === "stateFind")
@@ -924,7 +920,7 @@ function dt(t, c, m, f) {
               );
               if (!s) return;
               const i = [...n, s.originalIndex.toString()];
-              return a(s.item, i, S);
+              return a(s.item, i, m);
             };
           if (l === "findWith")
             return (e, r) => {
@@ -933,25 +929,25 @@ function dt(t, c, m, f) {
               );
               if (!i) return;
               const u = [...n, i.originalIndex.toString()];
-              return a(i.item, u, S);
+              return a(i.item, u, m);
             };
         }
-        const X = n[n.length - 1];
-        if (!isNaN(Number(X))) {
+        const Y = n[n.length - 1];
+        if (!isNaN(Number(Y))) {
           const d = n.slice(0, -1), e = o.getState().getNestedState(t, d);
           if (Array.isArray(e) && l === "cut")
             return () => it(
               c,
               d,
               t,
-              Number(X)
+              Number(Y)
             );
         }
         if (l === "get")
           return () => {
-            if (S?.validIndices && Array.isArray(v)) {
+            if (m?.validIndices && Array.isArray(y)) {
               const d = o.getState().getNestedState(t, n);
-              return S.validIndices.map((e) => d[e]);
+              return m.validIndices.map((e) => d[e]);
             }
             return o.getState().getNestedState(t, n);
           };
@@ -971,7 +967,7 @@ function dt(t, c, m, f) {
           return o.getState().getSyncInfo(d);
         }
         if (l == "getLocalStorage")
-          return (d) => ut(f + "-" + t + "-" + d);
+          return (d) => ut(S + "-" + t + "-" + d);
         if (l === "_selected") {
           const d = n.slice(0, -1), e = d.join("."), r = o.getState().getNestedState(t, d);
           return Array.isArray(r) ? Number(n[n.length - 1]) === o.getState().getSelectedIndex(t, e) : void 0;
@@ -981,7 +977,7 @@ function dt(t, c, m, f) {
             const e = n.slice(0, -1), r = Number(n[n.length - 1]), s = e.join(".");
             d ? o.getState().setSelectedIndex(t, s, r) : o.getState().setSelectedIndex(t, s, void 0);
             const i = o.getState().getNestedState(t, [...e]);
-            ot(c, i, e), w(e);
+            ot(c, i, e), T(e);
           };
         if (l === "toggleSelected")
           return () => {
@@ -992,7 +988,7 @@ function dt(t, c, m, f) {
               s === e ? void 0 : e
             );
             const i = o.getState().getNestedState(t, [...d]);
-            ot(c, i, d), w(d);
+            ot(c, i, d), T(d);
           };
         if (n.length == 0) {
           if (l === "applyJsonPatch")
@@ -1003,62 +999,62 @@ function dt(t, c, m, f) {
                 o.getState().initialStateGlobal[t],
                 s,
                 c,
-                m,
-                f
+                h,
+                S
               );
               const i = o.getState().stateComponents.get(t);
               if (i) {
                 const u = vt(e, s), g = new Set(u);
                 for (const [
                   E,
-                  T
+                  w
                 ] of i.components.entries()) {
                   let A = !1;
-                  const _ = Array.isArray(T.reactiveType) ? T.reactiveType : [T.reactiveType || "component"];
-                  if (!_.includes("none")) {
-                    if (_.includes("all")) {
-                      T.forceUpdate();
+                  const P = Array.isArray(w.reactiveType) ? w.reactiveType : [w.reactiveType || "component"];
+                  if (!P.includes("none")) {
+                    if (P.includes("all")) {
+                      w.forceUpdate();
                       continue;
                     }
-                    if (_.includes("component") && (T.paths.has("") && (A = !0), !A))
-                      for (const P of g) {
-                        if (T.paths.has(P)) {
+                    if (P.includes("component") && (w.paths.has("") && (A = !0), !A))
+                      for (const V of g) {
+                        if (w.paths.has(V)) {
                           A = !0;
                           break;
                         }
-                        let M = P.lastIndexOf(".");
-                        for (; M !== -1; ) {
-                          const C = P.substring(0, M);
-                          if (T.paths.has(C)) {
+                        let k = V.lastIndexOf(".");
+                        for (; k !== -1; ) {
+                          const F = V.substring(0, k);
+                          if (w.paths.has(F)) {
                             A = !0;
                             break;
                           }
-                          const z = P.substring(
-                            M + 1
+                          const D = V.substring(
+                            k + 1
                           );
-                          if (!isNaN(Number(z))) {
-                            const x = C.lastIndexOf(".");
-                            if (x !== -1) {
-                              const V = C.substring(
+                          if (!isNaN(Number(D))) {
+                            const M = F.lastIndexOf(".");
+                            if (M !== -1) {
+                              const N = F.substring(
                                 0,
-                                x
+                                M
                               );
-                              if (T.paths.has(V)) {
+                              if (w.paths.has(N)) {
                                 A = !0;
                                 break;
                               }
                             }
                           }
-                          M = C.lastIndexOf(".");
+                          k = F.lastIndexOf(".");
                         }
                         if (A) break;
                       }
-                    if (!A && _.includes("deps") && T.depsFunction) {
-                      const P = T.depsFunction(s);
-                      let M = !1;
-                      typeof P == "boolean" ? P && (M = !0) : B(T.deps, P) || (T.deps = P, M = !0), M && (A = !0);
+                    if (!A && P.includes("deps") && w.depsFunction) {
+                      const V = w.depsFunction(s);
+                      let k = !1;
+                      typeof V == "boolean" ? V && (k = !0) : H(w.deps, V) || (w.deps = V, k = !0), k && (A = !0);
                     }
-                    A && T.forceUpdate();
+                    A && w.forceUpdate();
                   }
                 }
               }
@@ -1070,23 +1066,23 @@ function dt(t, c, m, f) {
                 throw new Error("Zod schema not found");
               if (!d?.key)
                 throw new Error("Validation key not found");
-              J(d.key);
+              q(d.key);
               const r = o.getState().cogsStateStore[t];
               try {
                 const s = o.getState().getValidationErrors(d.key);
                 s && s.length > 0 && s.forEach(([u]) => {
-                  u && u.startsWith(d.key) && J(u);
+                  u && u.startsWith(d.key) && q(u);
                 });
                 const i = d.zodSchema.safeParse(r);
                 return i.success ? !0 : (i.error.errors.forEach((g) => {
-                  const E = g.path, T = g.message, A = [d.key, ...E].join(".");
-                  e(A, T);
+                  const E = g.path, w = g.message, A = [d.key, ...E].join(".");
+                  e(A, w);
                 }), gt(t), !1);
               } catch (s) {
                 return console.error("Zod schema validation failed", s), !1;
               }
             };
-          if (l === "_componentId") return m;
+          if (l === "_componentId") return h;
           if (l === "getComponents")
             return () => o().stateComponents.get(t);
           if (l === "getAllFormRefs")
@@ -1115,7 +1111,7 @@ function dt(t, c, m, f) {
               path: n,
               validationKey: o.getState().getInitialOptions(t)?.validation?.key || "",
               stateKey: t,
-              validIndices: S?.validIndices,
+              validIndices: m?.validIndices,
               children: d
             }
           );
@@ -1135,11 +1131,11 @@ function dt(t, c, m, f) {
               const r = o.getState().getNestedState(t, n);
               e?.afterUpdate && e.afterUpdate(r);
             }
-            w(n);
+            T(n);
           };
         if (l === "formElement")
           return (d, e) => /* @__PURE__ */ mt(
-            Rt,
+            Ot,
             {
               setState: c,
               stateKey: t,
@@ -1148,11 +1144,11 @@ function dt(t, c, m, f) {
               formOpts: e
             }
           );
-        const R = [...n, l], rt = o.getState().getNestedState(t, R);
-        return a(rt, R, S);
+        const j = [...n, l], rt = o.getState().getNestedState(t, j);
+        return a(rt, j, m);
       }
-    }, G = new Proxy(U, F);
-    return y.set(W, {
+    }, G = new Proxy(R, U);
+    return I.set(L, {
       proxy: G,
       stateVersion: b
     }), G;
@@ -1168,63 +1164,63 @@ function qt({
   proxy: t,
   rebuildStateShape: c
 }) {
-  const m = o().getNestedState(t._stateKey, t._path);
-  return Array.isArray(m) ? c(
-    m,
+  const h = o().getNestedState(t._stateKey, t._path);
+  return Array.isArray(h) ? c(
+    h,
     t._path
   ).stateMapNoRender(
-    (y, b, w, p, a) => t._mapFn(y, b, w, p, a)
+    (I, b, T, p, a) => t._mapFn(I, b, T, p, a)
   ) : null;
 }
 function Jt({
   proxy: t
 }) {
-  const c = Z(null), m = `${t._stateKey}-${t._path.join(".")}`;
+  const c = Q(null), h = `${t._stateKey}-${t._path.join(".")}`;
   return nt(() => {
-    const f = c.current;
-    if (!f || !f.parentElement) return;
-    const y = f.parentElement, w = Array.from(y.childNodes).indexOf(f);
-    let p = y.getAttribute("data-parent-id");
-    p || (p = `parent-${crypto.randomUUID()}`, y.setAttribute("data-parent-id", p));
-    const v = {
+    const S = c.current;
+    if (!S || !S.parentElement) return;
+    const I = S.parentElement, T = Array.from(I.childNodes).indexOf(S);
+    let p = I.getAttribute("data-parent-id");
+    p || (p = `parent-${crypto.randomUUID()}`, I.setAttribute("data-parent-id", p));
+    const y = {
       instanceId: `instance-${crypto.randomUUID()}`,
       parentId: p,
-      position: w,
+      position: T,
       effect: t._effect
     };
-    o.getState().addSignalElement(m, v);
+    o.getState().addSignalElement(h, y);
     const n = o.getState().getNestedState(t._stateKey, t._path);
-    let S;
+    let m;
     if (t._effect)
       try {
-        S = new Function(
+        m = new Function(
           "state",
           `return (${t._effect})(state)`
         )(n);
-      } catch (U) {
-        console.error("Error evaluating effect function during mount:", U), S = n;
+      } catch (R) {
+        console.error("Error evaluating effect function during mount:", R), m = n;
       }
     else
-      S = n;
-    S !== null && typeof S == "object" && (S = JSON.stringify(S));
-    const W = document.createTextNode(String(S));
-    f.replaceWith(W);
+      m = n;
+    m !== null && typeof m == "object" && (m = JSON.stringify(m));
+    const L = document.createTextNode(String(m));
+    S.replaceWith(L);
   }, [t._stateKey, t._path.join("."), t._effect]), at("span", {
     ref: c,
     style: { display: "none" },
-    "data-signal-id": m
+    "data-signal-id": h
   });
 }
 function de(t) {
   const c = xt(
-    (m) => {
-      const f = o.getState().stateComponents.get(t._stateKey) || {
+    (h) => {
+      const S = o.getState().stateComponents.get(t._stateKey) || {
         components: /* @__PURE__ */ new Map()
       };
-      return f.components.set(t._stateKey, {
-        forceUpdate: m,
+      return S.components.set(t._stateKey, {
+        forceUpdate: h,
         paths: /* @__PURE__ */ new Set([t._path.join(".")])
-      }), () => f.components.delete(t._stateKey);
+      }), () => S.components.delete(t._stateKey);
     },
     () => o.getState().getNestedState(t._stateKey, t._path)
   );
@@ -1233,28 +1229,28 @@ function de(t) {
 function Yt({
   stateKey: t,
   itemComponentId: c,
-  itemPath: m,
-  children: f
+  itemPath: h,
+  children: S
 }) {
-  const [, y] = Q({}), [b, w] = Ft(), p = Z(null);
+  const [, I] = X({}), [b, T] = Ft(), p = Q(null);
   return nt(() => {
-    w.height > 0 && w.height !== p.current && (p.current = w.height, o.getState().setShadowMetadata(t, m, {
+    T.height > 0 && T.height !== p.current && (p.current = T.height, o.getState().setShadowMetadata(t, h, {
       virtualizer: {
-        itemHeight: w.height
+        itemHeight: T.height
       }
     }));
-  }, [w.height, t, m]), ct(() => {
-    const a = `${t}////${c}`, v = o.getState().stateComponents.get(t) || {
+  }, [T.height, t, h]), ct(() => {
+    const a = `${t}////${c}`, y = o.getState().stateComponents.get(t) || {
       components: /* @__PURE__ */ new Map()
     };
-    return v.components.set(a, {
-      forceUpdate: () => y({}),
-      paths: /* @__PURE__ */ new Set([m.join(".")])
-    }), o.getState().stateComponents.set(t, v), () => {
+    return y.components.set(a, {
+      forceUpdate: () => I({}),
+      paths: /* @__PURE__ */ new Set([h.join(".")])
+    }), o.getState().stateComponents.set(t, y), () => {
       const n = o.getState().stateComponents.get(t);
       n && n.components.delete(a);
     };
-  }, [t, c, m.join(".")]), /* @__PURE__ */ mt("div", { ref: b, children: f });
+  }, [t, c, h.join(".")]), /* @__PURE__ */ mt("div", { ref: b, children: S });
 }
 export {
   kt as $cogsSignal,