cogsbox-state 0.5.272 → 0.5.274

package/dist/CogsState.jsx

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