cogsbox-state 0.5.210 → 0.5.211

package/dist/CogsState.jsx

@@ -1,62 +1,62 @@
 "use client";
 import { jsx as me } from "react/jsx-runtime";
-import { useState as le, useRef as Q, useEffect as de, useLayoutEffect as $e, useMemo as ke, createElement as te, useSyncExternalStore as Ne, startTransition as Te } from "react";
-import { transformStateFunc as Ve, isDeepEqual as M, isFunction as J, getNestedValue as L, getDifferences as ue, debounce as pe } from "./utility.js";
-import { pushFunc as se, updateFn as Y, cutFunc as X, ValidationWrapper as Ae, FormControlComponent as xe } from "./Functions.jsx";
-import be from "superjson";
+import { useState as le, useRef as Q, useEffect as de, useLayoutEffect as $e, useMemo as ke, createElement as te, useSyncExternalStore as Te, startTransition as Ne } from "react";
+import { transformStateFunc as Ae, isDeepEqual as G, isFunction as J, getNestedValue as W, getDifferences as ue, debounce as Ve } from "./utility.js";
+import { pushFunc as se, updateFn as Y, cutFunc as X, ValidationWrapper as _e, FormControlComponent as be } from "./Functions.jsx";
+import Ce from "superjson";
 import { v4 as ge } from "uuid";
 import "zod";
-import { getGlobalStore as r, formRefStore as ye } from "./store.js";
+import { getGlobalStore as n, formRefStore as ye } from "./store.js";
 import { useCogsConfig as we } from "./CogsStateClient.jsx";
-import { applyPatch as Ce } from "fast-json-patch";
+import { applyPatch as Pe } from "fast-json-patch";
 function ve(e, i) {
-  const m = r.getState().getInitialOptions, u = r.getState().setInitialStateOptions, g = m(e) || {};
+  const S = n.getState().getInitialOptions, u = n.getState().setInitialStateOptions, f = S(e) || {};
   u(e, {
-    ...g,
+    ...f,
     ...i
   });
 }
 function Ie({
   stateKey: e,
   options: i,
-  initialOptionsPart: m
+  initialOptionsPart: S
 }) {
-  const u = Z(e) || {}, g = m[e] || {}, w = r.getState().setInitialStateOptions, I = { ...g, ...u };
-  let y = !1;
+  const u = Z(e) || {}, f = S[e] || {}, T = n.getState().setInitialStateOptions, h = { ...f, ...u };
+  let v = !1;
   if (i)
     for (const s in i)
-      I.hasOwnProperty(s) ? (s == "localStorage" && i[s] && I[s].key !== i[s]?.key && (y = !0, I[s] = i[s]), s == "initialState" && i[s] && I[s] !== i[s] && // Different references
-      !M(I[s], i[s]) && (y = !0, I[s] = i[s])) : (y = !0, I[s] = i[s]);
-  y && w(e, I);
+      h.hasOwnProperty(s) ? (s == "localStorage" && i[s] && h[s].key !== i[s]?.key && (v = !0, h[s] = i[s]), s == "initialState" && i[s] && h[s] !== i[s] && // Different references
+      !G(h[s], i[s]) && (v = !0, h[s] = i[s])) : (v = !0, h[s] = i[s]);
+  v && T(e, h);
 }
-function Qe(e, { formElements: i, validation: m }) {
-  return { initialState: e, formElements: i, validation: m };
+function Qe(e, { formElements: i, validation: S }) {
+  return { initialState: e, formElements: i, validation: S };
 }
 const Ke = (e, i) => {
-  let m = e;
-  const [u, g] = Ve(m);
-  (Object.keys(g).length > 0 || i && Object.keys(i).length > 0) && Object.keys(g).forEach((y) => {
-    g[y] = g[y] || {}, g[y].formElements = {
+  let S = e;
+  const [u, f] = Ae(S);
+  (Object.keys(f).length > 0 || i && Object.keys(i).length > 0) && Object.keys(f).forEach((v) => {
+    f[v] = f[v] || {}, f[v].formElements = {
       ...i?.formElements,
       // Global defaults first
       ...i?.validation,
-      ...g[y].formElements || {}
+      ...f[v].formElements || {}
       // State-specific overrides
-    }, Z(y) || r.getState().setInitialStateOptions(y, g[y]);
-  }), r.getState().setInitialStates(u), r.getState().setCreatedState(u);
-  const w = (y, s) => {
-    const [f] = le(s?.componentId ?? ge());
+    }, Z(v) || n.getState().setInitialStateOptions(v, f[v]);
+  }), n.getState().setInitialStates(u), n.getState().setCreatedState(u);
+  const T = (v, s) => {
+    const [m] = le(s?.componentId ?? ge());
     Ie({
-      stateKey: y,
+      stateKey: v,
       options: s,
-      initialOptionsPart: g
+      initialOptionsPart: f
     });
-    const t = r.getState().cogsStateStore[y] || u[y], v = s?.modifyState ? s.modifyState(t) : t, [j, V] = De(
-      v,
+    const t = n.getState().cogsStateStore[v] || u[v], I = s?.modifyState ? s.modifyState(t) : t, [M, A] = Ue(
+      I,
       {
-        stateKey: y,
+        stateKey: v,
         syncUpdate: s?.syncUpdate,
-        componentId: f,
+        componentId: m,
         localStorage: s?.localStorage,
         middleware: s?.middleware,
         enabledSync: s?.enabledSync,
@@ -67,46 +67,46 @@ const Ke = (e, i) => {
         serverState: s?.serverState
       }
     );
-    return V;
+    return A;
   };
-  function I(y, s) {
-    Ie({ stateKey: y, options: s, initialOptionsPart: g }), s.localStorage && Re(y, s), re(y);
+  function h(v, s) {
+    Ie({ stateKey: v, options: s, initialOptionsPart: f }), s.localStorage && Me(v, s), re(v);
   }
-  return { useCogsState: w, setCogsOptions: I };
+  return { useCogsState: T, setCogsOptions: h };
 }, {
   setUpdaterState: K,
   setState: B,
   getInitialOptions: Z,
   getKeyState: Ee,
-  getValidationErrors: Pe,
-  setStateLog: Fe,
+  getValidationErrors: xe,
+  setStateLog: Oe,
   updateInitialStateGlobal: fe,
-  addValidationError: Oe,
+  addValidationError: Fe,
   removeValidationError: z,
-  setServerSyncActions: je
-} = r.getState(), he = (e, i, m, u, g) => {
-  m?.log && console.log(
+  setServerSyncActions: Re
+} = n.getState(), he = (e, i, S, u, f) => {
+  S?.log && console.log(
     "saving to localstorage",
     i,
-    m.localStorage?.key,
+    S.localStorage?.key,
     u
   );
-  const w = J(m?.localStorage?.key) ? m.localStorage?.key(e) : m?.localStorage?.key;
-  if (w && u) {
-    const I = `${u}-${i}-${w}`;
-    let y;
+  const T = J(S?.localStorage?.key) ? S.localStorage?.key(e) : S?.localStorage?.key;
+  if (T && u) {
+    const h = `${u}-${i}-${T}`;
+    let v;
     try {
-      y = ne(I)?.lastSyncedWithServer;
+      v = ne(h)?.lastSyncedWithServer;
     } catch {
     }
     const s = {
       state: e,
       lastUpdated: Date.now(),
-      lastSyncedWithServer: g ?? y
-    }, f = be.serialize(s);
+      lastSyncedWithServer: f ?? v
+    }, m = Ce.serialize(s);
     window.localStorage.setItem(
-      I,
-      JSON.stringify(f.json)
+      h,
+      JSON.stringify(m.json)
     );
   }
 }, ne = (e) => {
@@ -117,61 +117,61 @@ const Ke = (e, i) => {
   } catch (i) {
     return console.error("Error loading from localStorage:", i), null;
   }
-}, Re = (e, i) => {
-  const m = r.getState().cogsStateStore[e], { sessionId: u } = we(), g = J(i?.localStorage?.key) ? i.localStorage.key(m) : i?.localStorage?.key;
-  if (g && u) {
-    const w = ne(
-      `${u}-${e}-${g}`
+}, Me = (e, i) => {
+  const S = n.getState().cogsStateStore[e], { sessionId: u } = we(), f = J(i?.localStorage?.key) ? i.localStorage.key(S) : i?.localStorage?.key;
+  if (f && u) {
+    const T = ne(
+      `${u}-${e}-${f}`
     );
-    if (w && w.lastUpdated > (w.lastSyncedWithServer || 0))
-      return B(e, w.state), re(e), !0;
+    if (T && T.lastUpdated > (T.lastSyncedWithServer || 0))
+      return B(e, T.state), re(e), !0;
   }
   return !1;
-}, _e = (e, i, m, u, g, w) => {
-  const I = {
+}, pe = (e, i, S, u, f, T) => {
+  const h = {
     initialState: i,
     updaterState: ee(
       e,
       u,
-      g,
-      w
+      f,
+      T
     ),
-    state: m
+    state: S
   };
-  fe(e, I.initialState), K(e, I.updaterState), B(e, I.state);
+  fe(e, h.initialState), K(e, h.updaterState), B(e, h.state);
 }, re = (e) => {
-  const i = r.getState().stateComponents.get(e);
+  const i = n.getState().stateComponents.get(e);
   if (!i) return;
-  const m = /* @__PURE__ */ new Set();
+  const S = /* @__PURE__ */ new Set();
   i.components.forEach((u) => {
-    (u ? Array.isArray(u.reactiveType) ? u.reactiveType : [u.reactiveType || "component"] : null)?.includes("none") || m.add(() => u.forceUpdate());
+    (u ? Array.isArray(u.reactiveType) ? u.reactiveType : [u.reactiveType || "component"] : null)?.includes("none") || S.add(() => u.forceUpdate());
   }), queueMicrotask(() => {
-    m.forEach((u) => u());
+    S.forEach((u) => u());
   });
 }, et = (e, i) => {
-  const m = r.getState().stateComponents.get(e);
-  if (m) {
-    const u = `${e}////${i}`, g = m.components.get(u);
-    if ((g ? Array.isArray(g.reactiveType) ? g.reactiveType : [g.reactiveType || "component"] : null)?.includes("none"))
+  const S = n.getState().stateComponents.get(e);
+  if (S) {
+    const u = `${e}////${i}`, f = S.components.get(u);
+    if ((f ? Array.isArray(f.reactiveType) ? f.reactiveType : [f.reactiveType || "component"] : null)?.includes("none"))
       return;
-    g && g.forceUpdate();
+    f && f.forceUpdate();
   }
-}, Ue = (e, i, m, u) => {
+}, je = (e, i, S, u) => {
   switch (e) {
     case "update":
       return {
-        oldValue: L(i, u),
-        newValue: L(m, u)
+        oldValue: W(i, u),
+        newValue: W(S, u)
       };
     case "insert":
       return {
         oldValue: null,
         // or undefined
-        newValue: L(m, u)
+        newValue: W(S, u)
       };
     case "cut":
       return {
-        oldValue: L(i, u),
+        oldValue: W(i, u),
         newValue: null
         // or undefined
       };
@@ -179,816 +179,814 @@ const Ke = (e, i) => {
       return { oldValue: null, newValue: null };
   }
 };
-function De(e, {
+function Ue(e, {
   stateKey: i,
-  serverSync: m,
+  serverSync: S,
   localStorage: u,
-  formElements: g,
-  reactiveDeps: w,
-  reactiveType: I,
-  componentId: y,
+  formElements: f,
+  reactiveDeps: T,
+  reactiveType: h,
+  componentId: v,
   initialState: s,
-  syncUpdate: f,
+  syncUpdate: m,
   dependencies: t,
-  serverState: v
+  serverState: I
 } = {}) {
-  const [j, V] = le({}), { sessionId: p } = we();
-  let R = !i;
-  const [S] = le(i ?? ge()), d = r.getState().stateLog[S], H = Q(/* @__PURE__ */ new Set()), q = Q(y ?? ge()), A = Q(
+  const [M, A] = le({}), { sessionId: V } = we();
+  let j = !i;
+  const [g] = le(i ?? ge()), c = n.getState().stateLog[g], H = Q(/* @__PURE__ */ new Set()), q = Q(v ?? ge()), _ = Q(
     null
   );
-  A.current = Z(S) ?? null, de(() => {
-    if (f && f.stateKey === S && f.path?.[0]) {
-      B(S, (o) => ({
-        ...o,
-        [f.path[0]]: f.newValue
+  _.current = Z(g) ?? null, de(() => {
+    if (m && m.stateKey === g && m.path?.[0]) {
+      B(g, (a) => ({
+        ...a,
+        [m.path[0]]: m.newValue
       }));
-      const l = `${f.stateKey}:${f.path.join(".")}`;
-      r.getState().setSyncInfo(l, {
-        timeStamp: f.timeStamp,
-        userId: f.userId
+      const o = `${m.stateKey}:${m.path.join(".")}`;
+      n.getState().setSyncInfo(o, {
+        timeStamp: m.timeStamp,
+        userId: m.userId
       });
     }
-  }, [f]), de(() => {
+  }, [m]), de(() => {
     if (s) {
-      ve(S, {
+      ve(g, {
         initialState: s
       });
-      const l = A.current, c = l?.serverState?.id !== void 0 && l?.serverState?.status === "success" && l?.serverState?.data, h = r.getState().initialStateGlobal[S];
-      if (!(h && !M(h, s) || !h) && !c)
+      const o = _.current, l = o?.serverState?.id !== void 0 && o?.serverState?.status === "success" && o?.serverState?.data, w = n.getState().initialStateGlobal[g];
+      if (!(w && !G(w, s) || !w) && !l)
         return;
       let E = null;
-      const k = J(l?.localStorage?.key) ? l?.localStorage?.key(s) : l?.localStorage?.key;
-      k && p && (E = ne(`${p}-${S}-${k}`));
-      let _ = s, P = !1;
-      const D = c ? Date.now() : 0, b = E?.lastUpdated || 0, ae = E?.lastSyncedWithServer || 0;
-      c && D > b ? (_ = l.serverState.data, P = !0) : E && b > ae && (_ = E.state, l?.localStorage?.onChange && l?.localStorage?.onChange(_)), _e(
-        S,
+      const p = J(o?.localStorage?.key) ? o?.localStorage?.key(s) : o?.localStorage?.key;
+      p && V && (E = ne(`${V}-${g}-${p}`));
+      let k = s, b = !1;
+      const P = l ? Date.now() : 0, x = E?.lastUpdated || 0, ae = E?.lastSyncedWithServer || 0;
+      l && P > x ? (k = o.serverState.data, b = !0) : E && x > ae && (k = E.state, o?.localStorage?.onChange && o?.localStorage?.onChange(k)), pe(
+        g,
         s,
-        _,
-        n,
+        k,
+        d,
         q.current,
-        p
-      ), P && k && p && he(_, S, l, p, Date.now()), re(S), (Array.isArray(I) ? I : [I || "component"]).includes("none") || V({});
+        V
+      ), b && p && V && he(k, g, o, V, Date.now()), re(g), (Array.isArray(h) ? h : [h || "component"]).includes("none") || A({});
     }
   }, [
     s,
-    v?.status,
-    v?.data,
+    I?.status,
+    I?.data,
     ...t || []
   ]), $e(() => {
-    R && ve(S, {
-      serverSync: m,
-      formElements: g,
+    j && ve(g, {
+      serverSync: S,
+      formElements: f,
       initialState: s,
       localStorage: u,
-      middleware: A.current?.middleware
+      middleware: _.current?.middleware
     });
-    const l = `${S}////${q.current}`, o = r.getState().stateComponents.get(S) || {
+    const o = `${g}////${q.current}`, a = n.getState().stateComponents.get(g) || {
       components: /* @__PURE__ */ new Map()
     };
-    return o.components.set(l, {
-      forceUpdate: () => V({}),
+    return a.components.set(o, {
+      forceUpdate: () => A({}),
       paths: /* @__PURE__ */ new Set(),
       deps: [],
-      depsFunction: w || void 0,
-      reactiveType: I ?? ["component", "deps"]
-    }), r.getState().stateComponents.set(S, o), V({}), () => {
-      const c = `${S}////${q.current}`;
-      o && (o.components.delete(c), o.components.size === 0 && r.getState().stateComponents.delete(S));
+      depsFunction: T || void 0,
+      reactiveType: h ?? ["component", "deps"]
+    }), n.getState().stateComponents.set(g, a), A({}), () => {
+      const l = `${g}////${q.current}`;
+      a && (a.components.delete(l), a.components.size === 0 && n.getState().stateComponents.delete(g));
     };
   }, []);
-  const n = (l, o, c, h) => {
-    if (Array.isArray(o)) {
-      const N = `${S}-${o.join(".")}`;
-      H.current.add(N);
+  const d = (o, a, l, w) => {
+    if (Array.isArray(a)) {
+      const y = `${g}-${a.join(".")}`;
+      H.current.add(y);
     }
-    B(S, (N) => {
-      const E = J(l) ? l(N) : l, k = `${S}-${o.join(".")}`;
-      if (k) {
-        let G = !1, T = r.getState().signalDomElements.get(k);
-        if ((!T || T.size === 0) && (c.updateType === "insert" || c.updateType === "cut")) {
-          const F = o.slice(0, -1), U = L(E, F);
+    B(g, (y) => {
+      const E = J(o) ? o(y) : o, p = `${g}-${a.join(".")}`;
+      if (p) {
+        let D = !1, N = n.getState().signalDomElements.get(p);
+        if ((!N || N.size === 0) && (l.updateType === "insert" || l.updateType === "cut")) {
+          const F = a.slice(0, -1), U = W(E, F);
           if (Array.isArray(U)) {
-            G = !0;
-            const $ = `${S}-${F.join(".")}`;
-            T = r.getState().signalDomElements.get($);
+            D = !0;
+            const $ = `${g}-${F.join(".")}`;
+            N = n.getState().signalDomElements.get($);
           }
         }
-        if (T) {
-          const F = G ? L(E, o.slice(0, -1)) : L(E, o);
-          T.forEach(({ parentId: U, position: $, effect: C }) => {
-            const x = document.querySelector(
+        if (N) {
+          const F = D ? W(E, a.slice(0, -1)) : W(E, a);
+          N.forEach(({ parentId: U, position: $, effect: O }) => {
+            const C = document.querySelector(
               `[data-parent-id="${U}"]`
             );
-            if (x) {
-              const W = Array.from(x.childNodes);
-              if (W[$]) {
-                const O = C ? new Function("state", `return (${C})(state)`)(F) : F;
-                W[$].textContent = String(O);
+            if (C) {
+              const L = Array.from(C.childNodes);
+              if (L[$]) {
+                const R = O ? new Function("state", `return (${O})(state)`)(F) : F;
+                L[$].textContent = String(R);
               }
             }
           });
         }
       }
-      c.updateType === "update" && (h || A.current?.validation?.key) && o && z(
-        (h || A.current?.validation?.key) + "." + o.join(".")
+      l.updateType === "update" && (w || _.current?.validation?.key) && a && z(
+        (w || _.current?.validation?.key) + "." + a.join(".")
       );
-      const _ = o.slice(0, o.length - 1);
-      c.updateType === "cut" && A.current?.validation?.key && z(
-        A.current?.validation?.key + "." + _.join(".")
-      ), c.updateType === "insert" && A.current?.validation?.key && Pe(
-        A.current?.validation?.key + "." + _.join(".")
-      ).filter(([T, F]) => {
-        let U = T?.split(".").length;
-        if (T == _.join(".") && U == _.length - 1) {
-          let $ = T + "." + _;
-          z(T), Oe($, F);
+      const k = a.slice(0, a.length - 1);
+      l.updateType === "cut" && _.current?.validation?.key && z(
+        _.current?.validation?.key + "." + k.join(".")
+      ), l.updateType === "insert" && _.current?.validation?.key && xe(
+        _.current?.validation?.key + "." + k.join(".")
+      ).filter(([N, F]) => {
+        let U = N?.split(".").length;
+        if (N == k.join(".") && U == k.length - 1) {
+          let $ = N + "." + k;
+          z(N), Fe($, F);
         }
       });
-      const P = r.getState().stateComponents.get(S);
-      if (P) {
-        const G = ue(N, E), T = new Set(G), F = c.updateType === "update" ? o.join(".") : o.slice(0, -1).join(".") || "";
+      const b = n.getState().stateComponents.get(g);
+      if (b) {
+        const D = ue(y, E), N = new Set(D), F = l.updateType === "update" ? a.join(".") : a.slice(0, -1).join(".") || "";
         for (const [
           U,
           $
-        ] of P.components.entries()) {
-          let C = !1;
-          const x = Array.isArray($.reactiveType) ? $.reactiveType : [$.reactiveType || "component"];
-          if (!x.includes("none")) {
-            if (x.includes("all")) {
+        ] of b.components.entries()) {
+          let O = !1;
+          const C = Array.isArray($.reactiveType) ? $.reactiveType : [$.reactiveType || "component"];
+          if (!C.includes("none")) {
+            if (C.includes("all")) {
               $.forceUpdate();
               continue;
             }
-            if (x.includes("component") && (($.paths.has(F) || $.paths.has("")) && (C = !0), !C))
-              for (const W of T) {
-                let O = W;
+            if (C.includes("component") && (($.paths.has(F) || $.paths.has("")) && (O = !0), !O))
+              for (const L of N) {
+                let R = L;
                 for (; ; ) {
-                  if ($.paths.has(O)) {
-                    C = !0;
+                  if ($.paths.has(R)) {
+                    O = !0;
                     break;
                   }
-                  const ie = O.lastIndexOf(".");
+                  const ie = R.lastIndexOf(".");
                   if (ie !== -1) {
-                    const Se = O.substring(
+                    const Se = R.substring(
                       0,
                       ie
                     );
                     if (!isNaN(
-                      Number(O.substring(ie + 1))
+                      Number(R.substring(ie + 1))
                     ) && $.paths.has(Se)) {
-                      C = !0;
+                      O = !0;
                       break;
                     }
-                    O = Se;
+                    R = Se;
                   } else
-                    O = "";
-                  if (O === "")
+                    R = "";
+                  if (R === "")
                     break;
                 }
-                if (C) break;
+                if (O) break;
               }
-            if (!C && x.includes("deps") && $.depsFunction) {
-              const W = $.depsFunction(E);
-              let O = !1;
-              typeof W == "boolean" ? W && (O = !0) : M($.deps, W) || ($.deps = W, O = !0), O && (C = !0);
+            if (!O && C.includes("deps") && $.depsFunction) {
+              const L = $.depsFunction(E);
+              let R = !1;
+              typeof L == "boolean" ? L && (R = !0) : G($.deps, L) || ($.deps = L, R = !0), R && (O = !0);
             }
-            C && $.forceUpdate();
+            O && $.forceUpdate();
           }
         }
       }
-      const D = Date.now();
-      o = o.map((G, T) => {
-        const F = o.slice(0, -1), U = L(E, F);
-        return T === o.length - 1 && ["insert", "cut"].includes(c.updateType) ? (U.length - 1).toString() : G;
+      const P = Date.now();
+      a = a.map((D, N) => {
+        const F = a.slice(0, -1), U = W(E, F);
+        return N === a.length - 1 && ["insert", "cut"].includes(l.updateType) ? (U.length - 1).toString() : D;
       }), console.log(
         "mmmmmmmmmmmmmmmmm22222222222222",
-        c.updateType,
-        N,
+        l.updateType,
+        y,
         E,
-        o
+        a
       );
-      const { oldValue: b, newValue: ae } = Ue(
-        c.updateType,
-        N,
+      const { oldValue: x, newValue: ae } = je(
+        l.updateType,
+        y,
         E,
-        o
+        a
       ), oe = {
-        timeStamp: D,
-        stateKey: S,
-        path: o,
-        updateType: c.updateType,
+        timeStamp: P,
+        stateKey: g,
+        path: a,
+        updateType: l.updateType,
         status: "new",
-        oldValue: b,
+        oldValue: x,
         newValue: ae
       };
-      if (Fe(S, (G) => {
-        const F = [...G ?? [], oe].reduce((U, $) => {
-          const C = `${$.stateKey}:${JSON.stringify($.path)}`, x = U.get(C);
-          return x ? (x.timeStamp = Math.max(x.timeStamp, $.timeStamp), x.newValue = $.newValue, x.oldValue = x.oldValue ?? $.oldValue, x.updateType = $.updateType) : U.set(C, { ...$ }), U;
+      if (Oe(g, (D) => {
+        const F = [...D ?? [], oe].reduce((U, $) => {
+          const O = `${$.stateKey}:${JSON.stringify($.path)}`, C = U.get(O);
+          return C ? (C.timeStamp = Math.max(C.timeStamp, $.timeStamp), C.newValue = $.newValue, C.oldValue = C.oldValue ?? $.oldValue, C.updateType = $.updateType) : U.set(O, { ...$ }), U;
         }, /* @__PURE__ */ new Map());
         return Array.from(F.values());
       }), he(
         E,
-        S,
-        A.current,
-        p
-      ), A.current?.middleware && A.current.middleware({
-        updateLog: d,
+        g,
+        _.current,
+        V
+      ), _.current?.middleware && _.current.middleware({
+        updateLog: c,
         update: oe
-      }), A.current?.serverSync) {
-        const G = r.getState().serverState[S], T = A.current?.serverSync;
-        je(S, {
-          syncKey: typeof T.syncKey == "string" ? T.syncKey : T.syncKey({ state: E }),
-          rollBackState: G,
-          actionTimeStamp: Date.now() + (T.debounce ?? 3e3),
+      }), _.current?.serverSync) {
+        const D = n.getState().serverState[g], N = _.current?.serverSync;
+        Re(g, {
+          syncKey: typeof N.syncKey == "string" ? N.syncKey : N.syncKey({ state: E }),
+          rollBackState: D,
+          actionTimeStamp: Date.now() + (N.debounce ?? 3e3),
           status: "waiting"
         });
       }
       return E;
     });
   };
-  r.getState().updaterState[S] || (K(
-    S,
+  n.getState().updaterState[g] || (K(
+    g,
     ee(
-      S,
-      n,
+      g,
+      d,
       q.current,
-      p
+      V
     )
-  ), r.getState().cogsStateStore[S] || B(S, e), r.getState().initialStateGlobal[S] || fe(S, e));
-  const a = ke(() => ee(
-    S,
-    n,
+  ), n.getState().cogsStateStore[g] || B(g, e), n.getState().initialStateGlobal[g] || fe(g, e));
+  const r = ke(() => ee(
+    g,
+    d,
     q.current,
-    p
-  ), [S]);
-  return [Ee(S), a];
+    V
+  ), [g]);
+  return [Ee(g), r];
 }
-function ee(e, i, m, u) {
-  const g = /* @__PURE__ */ new Map();
-  let w = 0;
-  const I = (f) => {
-    const t = f.join(".");
-    for (const [v] of g)
-      (v === t || v.startsWith(t + ".")) && g.delete(v);
-    w++;
-  }, y = {
-    removeValidation: (f) => {
-      f?.validationKey && z(f.validationKey);
+function ee(e, i, S, u) {
+  const f = /* @__PURE__ */ new Map();
+  let T = 0;
+  const h = (m) => {
+    const t = m.join(".");
+    for (const [I] of f)
+      (I === t || I.startsWith(t + ".")) && f.delete(I);
+    T++;
+  }, v = {
+    removeValidation: (m) => {
+      m?.validationKey && z(m.validationKey);
     },
-    revertToInitialState: (f) => {
-      const t = r.getState().getInitialOptions(e)?.validation;
-      t?.key && z(t?.key), f?.validationKey && z(f.validationKey);
-      const v = r.getState().initialStateGlobal[e];
-      r.getState().clearSelectedIndexesForState(e), g.clear(), w++;
-      const j = s(v, []), V = Z(e), p = J(V?.localStorage?.key) ? V?.localStorage?.key(v) : V?.localStorage?.key, R = `${u}-${e}-${p}`;
-      R && localStorage.removeItem(R), K(e, j), B(e, v);
-      const S = r.getState().stateComponents.get(e);
-      return S && S.components.forEach((d) => {
-        d.forceUpdate();
-      }), v;
+    revertToInitialState: (m) => {
+      const t = n.getState().getInitialOptions(e)?.validation;
+      t?.key && z(t?.key), m?.validationKey && z(m.validationKey);
+      const I = n.getState().initialStateGlobal[e];
+      n.getState().clearSelectedIndexesForState(e), f.clear(), T++;
+      const M = s(I, []), A = Z(e), V = J(A?.localStorage?.key) ? A?.localStorage?.key(I) : A?.localStorage?.key, j = `${u}-${e}-${V}`;
+      j && localStorage.removeItem(j), K(e, M), B(e, I);
+      const g = n.getState().stateComponents.get(e);
+      return g && g.components.forEach((c) => {
+        c.forceUpdate();
+      }), I;
     },
-    updateInitialState: (f) => {
-      g.clear(), w++;
+    updateInitialState: (m) => {
+      f.clear(), T++;
       const t = ee(
         e,
         i,
-        m,
+        S,
         u
-      ), v = r.getState().initialStateGlobal[e], j = Z(e), V = J(j?.localStorage?.key) ? j?.localStorage?.key(v) : j?.localStorage?.key, p = `${u}-${e}-${V}`;
-      return console.log("removing storage", p), localStorage.getItem(p) && localStorage.removeItem(p), Te(() => {
-        fe(e, f), K(e, t), B(e, f);
-        const R = r.getState().stateComponents.get(e);
-        R && R.components.forEach((S) => {
-          S.forceUpdate();
+      ), I = n.getState().initialStateGlobal[e], M = Z(e), A = J(M?.localStorage?.key) ? M?.localStorage?.key(I) : M?.localStorage?.key, V = `${u}-${e}-${A}`;
+      return console.log("removing storage", V), localStorage.getItem(V) && localStorage.removeItem(V), Ne(() => {
+        fe(e, m), K(e, t), B(e, m);
+        const j = n.getState().stateComponents.get(e);
+        j && j.components.forEach((g) => {
+          g.forceUpdate();
         });
       }), {
-        fetchId: (R) => t.get()[R]
+        fetchId: (j) => t.get()[j]
       };
     },
-    _initialState: r.getState().initialStateGlobal[e],
-    _serverState: r.getState().serverState[e],
-    _isLoading: r.getState().isLoadingGlobal[e],
+    _initialState: n.getState().initialStateGlobal[e],
+    _serverState: n.getState().serverState[e],
+    _isLoading: n.getState().isLoadingGlobal[e],
     _isServerSynced: () => {
-      const f = r.getState().serverState[e];
-      return !!(f && M(f, Ee(e)));
+      const m = n.getState().serverState[e];
+      return !!(m && G(m, Ee(e)));
     }
   };
-  function s(f, t = [], v) {
-    const j = t.map(String).join(".");
-    g.get(j);
-    const V = function() {
-      return r().getNestedState(e, t);
+  function s(m, t = [], I) {
+    const M = t.map(String).join(".");
+    f.get(M);
+    const A = function() {
+      return n().getNestedState(e, t);
     };
-    Object.keys(y).forEach((S) => {
-      V[S] = y[S];
+    Object.keys(v).forEach((g) => {
+      A[g] = v[g];
     }), console.log("rebuildStateShapessss", t);
-    const p = {
-      apply(S, d, H) {
+    const V = {
+      apply(g, c, H) {
         return console.log(
           `PROXY APPLY TRAP HIT: stateKey=${e}, path=${t.join(".")}`
-        ), console.trace("Apply trap stack trace"), r().getNestedState(e, t);
+        ), console.trace("Apply trap stack trace"), n().getNestedState(e, t);
       },
-      get(S, d) {
-        if (d !== "then" && !d.startsWith("$") && d !== "stateMapNoRender") {
-          const n = t.join("."), a = `${e}////${m}`, l = r.getState().stateComponents.get(e);
-          if (l) {
-            const o = l.components.get(a);
-            o && (t.length > 0 || d === "get") && o.paths.add(n);
+      get(g, c) {
+        if (c !== "then" && !c.startsWith("$") && c !== "stateMapNoRender") {
+          const d = t.join("."), r = `${e}////${S}`, o = n.getState().stateComponents.get(e);
+          if (o) {
+            const a = o.components.get(r);
+            a && (t.length > 0 || c === "get") && a.paths.add(d);
           }
         }
-        if (d === "getDifferences")
+        if (c === "getDifferences")
           return () => ue(
-            r.getState().cogsStateStore[e],
-            r.getState().initialStateGlobal[e]
+            n.getState().cogsStateStore[e],
+            n.getState().initialStateGlobal[e]
           );
-        if (d === "sync" && t.length === 0)
+        if (c === "sync" && t.length === 0)
           return async function() {
-            const n = r.getState().getInitialOptions(e), a = n?.sync;
-            if (!a)
+            const d = n.getState().getInitialOptions(e), r = d?.sync;
+            if (!r)
               return console.error(`No mutation defined for state key "${e}"`), { success: !1, error: "No mutation defined" };
-            const l = r.getState().getNestedState(e, []), o = n?.validation?.key;
+            const o = n.getState().getNestedState(e, []), a = d?.validation?.key;
             try {
-              const c = await a.action(l);
-              if (c && !c.success && c.errors && o) {
-                r.getState().removeValidationError(o), c.errors.forEach((N) => {
-                  const E = [o, ...N.path].join(".");
-                  r.getState().addValidationError(E, N.message);
+              const l = await r.action(o);
+              if (l && !l.success && l.errors && a) {
+                n.getState().removeValidationError(a), l.errors.forEach((y) => {
+                  const E = [a, ...y.path].join(".");
+                  n.getState().addValidationError(E, y.message);
                 });
-                const h = r.getState().stateComponents.get(e);
-                h && h.components.forEach((N) => {
-                  N.forceUpdate();
+                const w = n.getState().stateComponents.get(e);
+                w && w.components.forEach((y) => {
+                  y.forceUpdate();
                 });
               }
-              return c?.success && a.onSuccess ? a.onSuccess(c.data) : !c?.success && a.onError && a.onError(c.error), c;
-            } catch (c) {
-              return a.onError && a.onError(c), { success: !1, error: c };
+              return l?.success && r.onSuccess ? r.onSuccess(l.data) : !l?.success && r.onError && r.onError(l.error), l;
+            } catch (l) {
+              return r.onError && r.onError(l), { success: !1, error: l };
             }
           };
-        if (d === "_status") {
-          const n = r.getState().getNestedState(e, t), a = r.getState().initialStateGlobal[e], l = L(a, t);
-          return M(n, l) ? "fresh" : "stale";
+        if (c === "_status") {
+          const d = n.getState().getNestedState(e, t), r = n.getState().initialStateGlobal[e], o = W(r, t);
+          return G(d, o) ? "fresh" : "stale";
         }
-        if (d === "getStatus")
+        if (c === "getStatus")
           return function() {
-            const n = r().getNestedState(
+            const d = n().getNestedState(
               e,
               t
-            ), a = r.getState().initialStateGlobal[e], l = L(a, t);
-            return M(n, l) ? "fresh" : "stale";
+            ), r = n.getState().initialStateGlobal[e], o = W(r, t);
+            return G(d, o) ? "fresh" : "stale";
           };
-        if (d === "removeStorage")
+        if (c === "removeStorage")
           return () => {
-            const n = r.getState().initialStateGlobal[e], a = Z(e), l = J(a?.localStorage?.key) ? a?.localStorage?.key(n) : a?.localStorage?.key, o = `${u}-${e}-${l}`;
-            console.log("removing storage", o), o && localStorage.removeItem(o);
+            const d = n.getState().initialStateGlobal[e], r = Z(e), o = J(r?.localStorage?.key) ? r?.localStorage?.key(d) : r?.localStorage?.key, a = `${u}-${e}-${o}`;
+            console.log("removing storage", a), a && localStorage.removeItem(a);
           };
-        if (d === "showValidationErrors")
+        if (c === "showValidationErrors")
           return () => {
-            const n = r.getState().getInitialOptions(e)?.validation;
-            if (!n?.key)
+            const d = n.getState().getInitialOptions(e)?.validation;
+            if (!d?.key)
               throw new Error("Validation key not found");
-            return r.getState().getValidationErrors(n.key + "." + t.join("."));
+            return n.getState().getValidationErrors(d.key + "." + t.join("."));
           };
-        if (Array.isArray(f)) {
-          if (d === "getSelected")
+        if (Array.isArray(m)) {
+          const d = () => I?.validIndices ? m.map((o, a) => ({
+            item: o,
+            originalIndex: I.validIndices[a]
+          })) : n.getState().getNestedState(e, t).map((o, a) => ({
+            item: o,
+            originalIndex: a
+          }));
+          if (c === "getSelected")
             return () => {
-              const n = r.getState().getSelectedIndex(e, t.join("."));
-              if (n !== void 0)
+              const r = n.getState().getSelectedIndex(e, t.join("."));
+              if (r !== void 0)
                 return s(
-                  f[n],
-                  [...t, n.toString()],
-                  v
+                  m[r],
+                  [...t, r.toString()],
+                  I
                 );
             };
-          if (d === "clearSelected")
+          if (c === "clearSelected")
             return () => {
-              r.getState().clearSelectedIndex({ stateKey: e, path: t });
+              n.getState().clearSelectedIndex({ stateKey: e, path: t });
             };
-          if (d === "getSelectedIndex")
-            return () => r.getState().getSelectedIndex(e, t.join(".")) ?? -1;
-          if (d === "stateSort")
-            return (n) => {
-              const o = [...r.getState().getNestedState(e, t).map((c, h) => ({
-                ...c,
-                __origIndex: h.toString()
-              }))].sort(n);
-              return g.clear(), w++, s(o, t, {
-                filtered: [...v?.filtered || [], t],
-                validIndices: o.map(
-                  (c) => parseInt(c.__origIndex)
+          if (c === "getSelectedIndex")
+            return () => n.getState().getSelectedIndex(e, t.join(".")) ?? -1;
+          if (c === "stateSort")
+            return (r) => {
+              const a = [...d()].sort(
+                (y, E) => r(y.item, E.item)
+              ), l = a.map(({ item: y }) => y), w = {
+                ...I,
+                validIndices: a.map(
+                  ({ originalIndex: y }) => y
                 )
-              });
-            };
-          if (d === "stateFilter")
-            return (n) => {
-              const a = f.map((c, h) => ({
-                ...c,
-                __origIndex: h.toString()
-              })), l = [], o = [];
-              for (let c = 0; c < a.length; c++)
-                n(a[c], c) && (l.push(c), o.push(a[c]));
-              return g.clear(), w++, s(o, t, {
-                filtered: [...v?.filtered || [], t],
-                validIndices: l
-                // Always pass validIndices, even if empty
-              });
+              };
+              return s(l, t, w);
             };
-          if (d === "stateMap" || d === "stateMapNoRender")
-            return (n) => {
-              const a = v?.filtered?.some(
-                (o) => o.join(".") === t.join(".")
-              ), l = a ? f : r.getState().getNestedState(e, t);
-              return d !== "stateMapNoRender" && (g.clear(), w++), l.map((o, c) => {
-                const h = a && o.__origIndex ? o.__origIndex : c, N = s(
-                  o,
-                  [...t, h.toString()],
-                  v
-                );
-                return n(
-                  o,
-                  N,
-                  c,
-                  f,
-                  s(f, t, v)
-                );
-              });
+          if (c === "stateFilter")
+            return (r) => {
+              const a = d().filter(
+                ({ item: y }, E) => r(y, E)
+              ), l = a.map(({ item: y }) => y), w = {
+                ...I,
+                validIndices: a.map(
+                  ({ originalIndex: y }) => y
+                )
+              };
+              return s(l, t, w);
             };
-          if (d === "$stateMap")
-            return (n) => te(Ge, {
+          if (c === "stateMap" || c === "stateMapNoRender")
+            return (r) => m.map((a, l) => {
+              let w;
+              I?.validIndices && I.validIndices[l] !== void 0 ? w = I.validIndices[l] : w = l;
+              const y = [...t, w.toString()];
+              console.log("stateMapstateMapstateMapstateMap", y);
+              const E = s(a, y, I);
+              return r(
+                a,
+                E,
+                l,
+                m,
+                s(m, t, I)
+              );
+            });
+          if (c === "$stateMap")
+            return (r) => te(De, {
               proxy: {
                 _stateKey: e,
                 _path: t,
-                _mapFn: n
+                _mapFn: r
                 // Pass the actual function, not string
               },
               rebuildStateShape: s
             });
-          if (d === "stateFlattenOn")
-            return (n) => {
-              const l = v?.filtered?.some(
-                (c) => c.join(".") === t.join(".")
-              ) ? f : r.getState().getNestedState(e, t);
-              g.clear(), w++;
-              const o = l.flatMap(
-                (c, h) => c[n] ?? []
+          if (c === "stateFlattenOn")
+            return (r) => {
+              const o = m;
+              f.clear(), T++;
+              const a = o.flatMap(
+                (l) => l[r] ?? []
               );
               return s(
-                o,
-                [...t, "[*]", n],
-                v
+                a,
+                [...t, "[*]", r],
+                I
               );
             };
-          if (d === "index")
-            return (n) => {
-              const a = f[n];
-              return s(a, [...t, n.toString()]);
+          if (c === "index")
+            return (r) => {
+              const o = m[r];
+              return s(o, [...t, r.toString()]);
             };
-          if (d === "last")
+          if (c === "last")
             return () => {
-              const n = r.getState().getNestedState(e, t);
-              if (n.length === 0) return;
-              const a = n.length - 1, l = n[a], o = [...t, a.toString()];
-              return s(l, o);
+              const r = n.getState().getNestedState(e, t);
+              if (r.length === 0) return;
+              const o = r.length - 1, a = r[o], l = [...t, o.toString()];
+              return s(a, l);
             };
-          if (d === "insert")
-            return (n) => (I(t), se(i, n, t, e), s(
-              r.getState().getNestedState(e, t),
+          if (c === "insert")
+            return (r) => (h(t), se(i, r, t, e), s(
+              n.getState().getNestedState(e, t),
               t
             ));
-          if (d === "uniqueInsert")
-            return (n, a, l) => {
-              const o = r.getState().getNestedState(e, t), c = J(n) ? n(o) : n;
-              let h = null;
-              if (!o.some((E) => {
-                if (a) {
-                  const _ = a.every(
-                    (P) => M(E[P], c[P])
+          if (c === "uniqueInsert")
+            return (r, o, a) => {
+              const l = n.getState().getNestedState(e, t), w = J(r) ? r(l) : r;
+              let y = null;
+              if (!l.some((p) => {
+                if (o) {
+                  const b = o.every(
+                    (P) => G(p[P], w[P])
                   );
-                  return _ && (h = E), _;
+                  return b && (y = p), b;
                 }
-                const k = M(E, c);
-                return k && (h = E), k;
+                const k = G(p, w);
+                return k && (y = p), k;
               }))
-                I(t), se(i, c, t, e);
-              else if (l && h) {
-                const E = l(h), k = o.map(
-                  (_) => M(_, h) ? E : _
+                h(t), se(i, w, t, e);
+              else if (a && y) {
+                const p = a(y), k = l.map(
+                  (b) => G(b, y) ? p : b
                 );
-                I(t), Y(i, k, t);
+                h(t), Y(i, k, t);
               }
             };
-          if (d === "cut")
-            return (n, a) => {
-              if (!a?.waitForSync)
-                return I(t), X(i, t, e, n), s(
-                  r.getState().getNestedState(e, t),
+          if (c === "cut")
+            return (r, o) => {
+              if (!o?.waitForSync)
+                return h(t), X(i, t, e, r), s(
+                  n.getState().getNestedState(e, t),
                   t
                 );
             };
-          if (d === "cutByValue")
-            return (n) => {
-              for (let a = 0; a < f.length; a++)
-                f[a] === n && X(i, t, e, a);
+          if (c === "cutByValue")
+            return (r) => {
+              for (let o = 0; o < m.length; o++)
+                m[o] === r && X(i, t, e, o);
             };
-          if (d === "toggleByValue")
-            return (n) => {
-              const a = f.findIndex((l) => l === n);
-              a > -1 ? X(i, t, e, a) : se(i, n, t, e);
+          if (c === "toggleByValue")
+            return (r) => {
+              const o = m.findIndex((a) => a === r);
+              o > -1 ? X(i, t, e, o) : se(i, r, t, e);
             };
-          if (d === "stateFind")
-            return (n) => {
-              const a = f.findIndex(n);
-              if (a === -1)
-                return;
-              let l;
-              v?.validIndices ? l = v.validIndices[a] : l = a;
-              const o = f[a], c = [...t, l.toString()];
-              return s(o, c, v);
+          if (c === "stateFind")
+            return (r) => {
+              const a = d().find(
+                ({ item: w }, y) => r(w, y)
+              );
+              if (!a) return;
+              const l = [...t, a.originalIndex.toString()];
+              return s(a.item, l, I);
             };
-          if (d === "findWith")
-            return (n, a) => {
-              const l = f.findIndex((h) => h[n] === a);
-              if (l === -1) return;
-              const o = f[l], c = [...t, l.toString()];
-              return g.clear(), w++, s(o, c);
+          if (c === "findWith")
+            return (r, o) => {
+              const l = d().find(
+                ({ item: y }) => y[r] === o
+              );
+              if (!l) return;
+              const w = [...t, l.originalIndex.toString()];
+              return s(l.item, w, I);
             };
         }
         const H = t[t.length - 1];
         if (!isNaN(Number(H))) {
-          const n = t.slice(0, -1), a = r.getState().getNestedState(e, n);
-          if (Array.isArray(a) && d === "cut")
+          const d = t.slice(0, -1), r = n.getState().getNestedState(e, d);
+          if (Array.isArray(r) && c === "cut")
             return () => X(
               i,
-              n,
+              d,
               e,
               Number(H)
             );
         }
-        if (d === "get")
-          return () => r.getState().getNestedState(e, t);
-        if (d === "$derive")
-          return (n) => ce({
+        if (c === "get")
+          return () => n.getState().getNestedState(e, t);
+        if (c === "$derive")
+          return (d) => ce({
             _stateKey: e,
             _path: t,
-            _effect: n.toString()
+            _effect: d.toString()
           });
-        if (d === "$derive")
-          return (n) => ce({
+        if (c === "$derive")
+          return (d) => ce({
             _stateKey: e,
             _path: t,
-            _effect: n.toString()
+            _effect: d.toString()
           });
-        if (d === "$get")
+        if (c === "$get")
           return () => ce({
             _stateKey: e,
             _path: t
           });
-        if (d === "lastSynced") {
-          const n = `${e}:${t.join(".")}`;
-          return r.getState().getSyncInfo(n);
+        if (c === "lastSynced") {
+          const d = `${e}:${t.join(".")}`;
+          return n.getState().getSyncInfo(d);
         }
-        if (d == "getLocalStorage")
-          return (n) => ne(u + "-" + e + "-" + n);
-        if (d === "_selected") {
-          const n = t.slice(0, -1), a = n.join("."), l = r.getState().getNestedState(e, n);
-          return Array.isArray(l) ? Number(t[t.length - 1]) === r.getState().getSelectedIndex(e, a) : void 0;
+        if (c == "getLocalStorage")
+          return (d) => ne(u + "-" + e + "-" + d);
+        if (c === "_selected") {
+          const d = t.slice(0, -1), r = d.join("."), o = n.getState().getNestedState(e, d);
+          return Array.isArray(o) ? Number(t[t.length - 1]) === n.getState().getSelectedIndex(e, r) : void 0;
         }
-        if (d === "setSelected")
-          return (n) => {
-            const a = t.slice(0, -1), l = Number(t[t.length - 1]), o = a.join(".");
-            n ? r.getState().setSelectedIndex(e, o, l) : r.getState().setSelectedIndex(e, o, void 0);
-            const c = r.getState().getNestedState(e, [...a]);
-            Y(i, c, a), I(a);
+        if (c === "setSelected")
+          return (d) => {
+            const r = t.slice(0, -1), o = Number(t[t.length - 1]), a = r.join(".");
+            d ? n.getState().setSelectedIndex(e, a, o) : n.getState().setSelectedIndex(e, a, void 0);
+            const l = n.getState().getNestedState(e, [...r]);
+            Y(i, l, r), h(r);
           };
-        if (d === "toggleSelected")
+        if (c === "toggleSelected")
           return () => {
-            const n = t.slice(0, -1), a = Number(t[t.length - 1]), l = n.join("."), o = r.getState().getSelectedIndex(e, l);
-            r.getState().setSelectedIndex(
+            const d = t.slice(0, -1), r = Number(t[t.length - 1]), o = d.join("."), a = n.getState().getSelectedIndex(e, o);
+            n.getState().setSelectedIndex(
               e,
-              l,
-              o === a ? void 0 : a
+              o,
+              a === r ? void 0 : r
             );
-            const c = r.getState().getNestedState(e, [...n]);
-            Y(i, c, n), I(n);
+            const l = n.getState().getNestedState(e, [...d]);
+            Y(i, l, d), h(d);
           };
         if (t.length == 0) {
-          if (d === "applyJsonPatch")
-            return (n) => {
-              const a = r.getState().cogsStateStore[e], o = Ce(a, n).newDocument;
-              _e(
+          if (c === "applyJsonPatch")
+            return (d) => {
+              const r = n.getState().cogsStateStore[e], a = Pe(r, d).newDocument;
+              pe(
                 e,
-                r.getState().initialStateGlobal[e],
-                o,
+                n.getState().initialStateGlobal[e],
+                a,
                 i,
-                m,
+                S,
                 u
               );
-              const c = r.getState().stateComponents.get(e);
-              if (c) {
-                const h = ue(a, o), N = new Set(h);
+              const l = n.getState().stateComponents.get(e);
+              if (l) {
+                const w = ue(r, a), y = new Set(w);
                 for (const [
                   E,
-                  k
-                ] of c.components.entries()) {
-                  let _ = !1;
-                  const P = Array.isArray(k.reactiveType) ? k.reactiveType : [k.reactiveType || "component"];
-                  if (!P.includes("none")) {
-                    if (P.includes("all")) {
-                      k.forceUpdate();
+                  p
+                ] of l.components.entries()) {
+                  let k = !1;
+                  const b = Array.isArray(p.reactiveType) ? p.reactiveType : [p.reactiveType || "component"];
+                  if (!b.includes("none")) {
+                    if (b.includes("all")) {
+                      p.forceUpdate();
                       continue;
                     }
-                    if (P.includes("component") && (k.paths.has("") && (_ = !0), !_))
-                      for (const D of N) {
-                        if (k.paths.has(D)) {
-                          _ = !0;
+                    if (b.includes("component") && (p.paths.has("") && (k = !0), !k))
+                      for (const P of y) {
+                        if (p.paths.has(P)) {
+                          k = !0;
                           break;
                         }
-                        let b = D;
-                        for (; b.includes("."); )
-                          if (b = b.substring(
+                        let x = P;
+                        for (; x.includes("."); )
+                          if (x = x.substring(
                             0,
-                            b.lastIndexOf(".")
-                          ), k.paths.has(b)) {
-                            _ = !0;
+                            x.lastIndexOf(".")
+                          ), p.paths.has(x)) {
+                            k = !0;
                             break;
                           }
-                        if (_) break;
+                        if (k) break;
                       }
-                    if (!_ && P.includes("deps") && k.depsFunction) {
-                      const D = k.depsFunction(o);
-                      let b = !1;
-                      typeof D == "boolean" ? D && (b = !0) : M(k.deps, D) || (k.deps = D, b = !0), b && (_ = !0);
+                    if (!k && b.includes("deps") && p.depsFunction) {
+                      const P = p.depsFunction(a);
+                      let x = !1;
+                      typeof P == "boolean" ? P && (x = !0) : G(p.deps, P) || (p.deps = P, x = !0), x && (k = !0);
                     }
-                    _ && k.forceUpdate();
+                    k && p.forceUpdate();
                   }
                 }
               }
             };
-          if (d === "validateZodSchema")
+          if (c === "validateZodSchema")
             return () => {
-              const n = r.getState().getInitialOptions(e)?.validation, a = r.getState().addValidationError;
-              if (!n?.zodSchema)
+              const d = n.getState().getInitialOptions(e)?.validation, r = n.getState().addValidationError;
+              if (!d?.zodSchema)
                 throw new Error("Zod schema not found");
-              if (!n?.key)
+              if (!d?.key)
                 throw new Error("Validation key not found");
-              z(n.key);
-              const l = r.getState().cogsStateStore[e];
+              z(d.key);
+              const o = n.getState().cogsStateStore[e];
               try {
-                const o = r.getState().getValidationErrors(n.key);
-                o && o.length > 0 && o.forEach(([h]) => {
-                  h && h.startsWith(n.key) && z(h);
+                const a = n.getState().getValidationErrors(d.key);
+                a && a.length > 0 && a.forEach(([w]) => {
+                  w && w.startsWith(d.key) && z(w);
                 });
-                const c = n.zodSchema.safeParse(l);
-                return c.success ? !0 : (c.error.errors.forEach((N) => {
-                  const E = N.path, k = N.message, _ = [n.key, ...E].join(".");
-                  a(_, k);
+                const l = d.zodSchema.safeParse(o);
+                return l.success ? !0 : (l.error.errors.forEach((y) => {
+                  const E = y.path, p = y.message, k = [d.key, ...E].join(".");
+                  r(k, p);
                 }), re(e), !1);
-              } catch (o) {
-                return console.error("Zod schema validation failed", o), !1;
+              } catch (a) {
+                return console.error("Zod schema validation failed", a), !1;
               }
             };
-          if (d === "_componentId") return m;
-          if (d === "getComponents")
-            return () => r().stateComponents.get(e);
-          if (d === "getAllFormRefs")
+          if (c === "_componentId") return S;
+          if (c === "getComponents")
+            return () => n().stateComponents.get(e);
+          if (c === "getAllFormRefs")
             return () => ye.getState().getFormRefsByStateKey(e);
-          if (d === "_initialState")
-            return r.getState().initialStateGlobal[e];
-          if (d === "_serverState")
-            return r.getState().serverState[e];
-          if (d === "_isLoading")
-            return r.getState().isLoadingGlobal[e];
-          if (d === "revertToInitialState")
-            return y.revertToInitialState;
-          if (d === "updateInitialState") return y.updateInitialState;
-          if (d === "removeValidation") return y.removeValidation;
+          if (c === "_initialState")
+            return n.getState().initialStateGlobal[e];
+          if (c === "_serverState")
+            return n.getState().serverState[e];
+          if (c === "_isLoading")
+            return n.getState().isLoadingGlobal[e];
+          if (c === "revertToInitialState")
+            return v.revertToInitialState;
+          if (c === "updateInitialState") return v.updateInitialState;
+          if (c === "removeValidation") return v.removeValidation;
         }
-        if (d === "getFormRef")
+        if (c === "getFormRef")
           return () => ye.getState().getFormRef(e + "." + t.join("."));
-        if (d === "validationWrapper")
+        if (c === "validationWrapper")
           return ({
-            children: n,
-            hideMessage: a
+            children: d,
+            hideMessage: r
           }) => /* @__PURE__ */ me(
-            Ae,
+            _e,
             {
-              formOpts: a ? { validation: { message: "" } } : void 0,
+              formOpts: r ? { validation: { message: "" } } : void 0,
               path: t,
-              validationKey: r.getState().getInitialOptions(e)?.validation?.key || "",
+              validationKey: n.getState().getInitialOptions(e)?.validation?.key || "",
               stateKey: e,
-              validIndices: v?.validIndices,
-              children: n
+              validIndices: I?.validIndices,
+              children: d
             }
           );
-        if (d === "_stateKey") return e;
-        if (d === "_path") return t;
-        if (d === "_isServerSynced") return y._isServerSynced;
-        if (d === "update")
-          return (n, a) => {
-            if (a?.debounce)
-              pe(() => {
-                Y(i, n, t, "");
-                const l = r.getState().getNestedState(e, t);
-                a?.afterUpdate && a.afterUpdate(l);
-              }, a.debounce);
+        if (c === "_stateKey") return e;
+        if (c === "_path") return t;
+        if (c === "_isServerSynced") return v._isServerSynced;
+        if (c === "update")
+          return (d, r) => {
+            if (r?.debounce)
+              Ve(() => {
+                Y(i, d, t, "");
+                const o = n.getState().getNestedState(e, t);
+                r?.afterUpdate && r.afterUpdate(o);
+              }, r.debounce);
             else {
-              Y(i, n, t, "");
-              const l = r.getState().getNestedState(e, t);
-              a?.afterUpdate && a.afterUpdate(l);
+              Y(i, d, t, "");
+              const o = n.getState().getNestedState(e, t);
+              r?.afterUpdate && r.afterUpdate(o);
             }
-            I(t);
+            h(t);
           };
-        if (d === "formElement")
-          return (n, a) => /* @__PURE__ */ me(
-            xe,
+        if (c === "formElement")
+          return (d, r) => /* @__PURE__ */ me(
+            be,
             {
               setState: i,
               stateKey: e,
               path: t,
-              child: n,
-              formOpts: a
+              child: d,
+              formOpts: r
             }
           );
-        const q = [...t, d], A = r.getState().getNestedState(e, q);
-        return s(A, q, v);
+        const q = [...t, c], _ = n.getState().getNestedState(e, q);
+        return s(_, q, I);
       }
-    }, R = new Proxy(V, p);
-    return g.set(j, {
-      proxy: R,
-      stateVersion: w
-    }), R;
+    }, j = new Proxy(A, V);
+    return f.set(M, {
+      proxy: j,
+      stateVersion: T
+    }), j;
   }
   return s(
-    r.getState().getNestedState(e, [])
+    n.getState().getNestedState(e, [])
   );
 }
 function ce(e) {
-  return te(Me, { proxy: e });
+  return te(Ge, { proxy: e });
 }
-function Ge({
+function De({
   proxy: e,
   rebuildStateShape: i
 }) {
-  const m = r().getNestedState(e._stateKey, e._path);
-  return Array.isArray(m) ? i(
-    m,
+  const S = n().getNestedState(e._stateKey, e._path);
+  return Array.isArray(S) ? i(
+    S,
     e._path
   ).stateMapNoRender(
-    (g, w, I, y, s) => e._mapFn(g, w, I, y, s)
+    (f, T, h, v, s) => e._mapFn(f, T, h, v, s)
   ) : null;
 }
-function Me({
+function Ge({
   proxy: e
 }) {
-  const i = Q(null), m = `${e._stateKey}-${e._path.join(".")}`;
+  const i = Q(null), S = `${e._stateKey}-${e._path.join(".")}`;
   return de(() => {
     const u = i.current;
     if (!u || !u.parentElement) return;
-    const g = u.parentElement, I = Array.from(g.childNodes).indexOf(u);
-    let y = g.getAttribute("data-parent-id");
-    y || (y = `parent-${crypto.randomUUID()}`, g.setAttribute("data-parent-id", y));
-    const f = {
+    const f = u.parentElement, h = Array.from(f.childNodes).indexOf(u);
+    let v = f.getAttribute("data-parent-id");
+    v || (v = `parent-${crypto.randomUUID()}`, f.setAttribute("data-parent-id", v));
+    const m = {
       instanceId: `instance-${crypto.randomUUID()}`,
-      parentId: y,
-      position: I,
+      parentId: v,
+      position: h,
       effect: e._effect
     };
-    r.getState().addSignalElement(m, f);
-    const t = r.getState().getNestedState(e._stateKey, e._path);
-    let v;
+    n.getState().addSignalElement(S, m);
+    const t = n.getState().getNestedState(e._stateKey, e._path);
+    let I;
     if (e._effect)
       try {
-        v = new Function(
+        I = new Function(
           "state",
           `return (${e._effect})(state)`
         )(t);
-      } catch (V) {
-        console.error("Error evaluating effect function during mount:", V), v = t;
+      } catch (A) {
+        console.error("Error evaluating effect function during mount:", A), I = t;
       }
     else
-      v = t;
-    v !== null && typeof v == "object" && (v = JSON.stringify(v));
-    const j = document.createTextNode(String(v));
-    u.replaceWith(j);
+      I = t;
+    I !== null && typeof I == "object" && (I = JSON.stringify(I));
+    const M = document.createTextNode(String(I));
+    u.replaceWith(M);
   }, [e._stateKey, e._path.join("."), e._effect]), te("span", {
     ref: i,
     style: { display: "none" },
-    "data-signal-id": m
+    "data-signal-id": S
   });
 }
 function tt(e) {
-  const i = Ne(
-    (m) => {
-      const u = r.getState().stateComponents.get(e._stateKey) || {
+  const i = Te(
+    (S) => {
+      const u = n.getState().stateComponents.get(e._stateKey) || {
         components: /* @__PURE__ */ new Map()
       };
       return u.components.set(e._stateKey, {
-        forceUpdate: m,
+        forceUpdate: S,
         paths: /* @__PURE__ */ new Set([e._path.join(".")])
       }), () => u.components.delete(e._stateKey);
     },
-    () => r.getState().getNestedState(e._stateKey, e._path)
+    () => n.getState().getNestedState(e._stateKey, e._path)
   );
   return te("text", {}, String(i));
 }
@@ -998,6 +996,6 @@ export {
   Qe as addStateOptions,
   Ke as createCogsState,
   et as notifyComponent,
-  De as useCogsStateFn
+  Ue as useCogsStateFn
 };
 //# sourceMappingURL=CogsState.jsx.map