cogsbox-state 0.5.260 → 0.5.262

package/dist/CogsState.jsx

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