cogsbox-state 0.5.164 → 0.5.165

package/dist/CogsState.jsx

@@ -1,56 +1,56 @@
 "use client";
 import { jsx as me } from "react/jsx-runtime";
-import { useState as le, useRef as Q, useEffect as de, useLayoutEffect as Ne, useMemo as ke, createElement as te, useSyncExternalStore as we, startTransition as Ae } from "react";
-import { transformStateFunc as Te, isDeepEqual as U, isFunction as G, getNestedValue as W, getDifferences as he, debounce as xe } from "./utility.js";
-import { pushFunc as se, updateFn as Z, cutFunc as X, ValidationWrapper as Ve, FormControlComponent as Ce } from "./Functions.jsx";
+import { useState as de, useRef as Q, useEffect as ue, useLayoutEffect as we, useMemo as Ne, createElement as te, useSyncExternalStore as ke, startTransition as Ve } from "react";
+import { transformStateFunc as Ae, isDeepEqual as D, isFunction as L, getNestedValue as M, getDifferences as he, debounce as Te } from "./utility.js";
+import { pushFunc as ce, updateFn as Z, cutFunc as X, ValidationWrapper as xe, FormControlComponent as Ce } from "./Functions.jsx";
 import be from "./node_modules/superjson/dist/index.js";
 import "zod";
 import { getGlobalStore as a, formRefStore as ye } from "./store.js";
 import { useCogsConfig as _e } from "./CogsStateClient.jsx";
 import ge from "./node_modules/uuid/dist/esm-browser/v4.js";
-function ve(e, c) {
-  const m = a.getState().getInitialOptions, g = a.getState().setInitialStateOptions, d = m(e) || {};
-  g(e, {
-    ...d,
-    ...c
+function ve(e, s) {
+  const m = a.getState().getInitialOptions, d = a.getState().setInitialStateOptions, u = m(e) || {};
+  d(e, {
+    ...u,
+    ...s
   });
 }
 function Ie({
   stateKey: e,
-  options: c,
+  options: s,
   initialOptionsPart: m
 }) {
-  const g = z(e) || {}, d = m[e] || {}, I = a.getState().setInitialStateOptions, E = { ...d, ...g };
+  const d = z(e) || {}, u = m[e] || {}, I = a.getState().setInitialStateOptions, E = { ...u, ...d };
   let f = !1;
-  if (c)
-    for (const l in c)
-      E.hasOwnProperty(l) ? (l == "localStorage" && c[l] && E[l].key !== c[l]?.key && (f = !0, E[l] = c[l]), l == "initialState" && c[l] && E[l] !== c[l] && // Different references
-      !U(E[l], c[l]) && (f = !0, E[l] = c[l])) : (f = !0, E[l] = c[l]);
+  if (s)
+    for (const l in s)
+      E.hasOwnProperty(l) ? (l == "localStorage" && s[l] && E[l].key !== s[l]?.key && (f = !0, E[l] = s[l]), l == "initialState" && s[l] && E[l] !== s[l] && // Different references
+      !D(E[l], s[l]) && (f = !0, E[l] = s[l])) : (f = !0, E[l] = s[l]);
   f && I(e, E);
 }
-function Ye(e, { formElements: c, validation: m }) {
-  return { initialState: e, formElements: c, validation: m };
+function Xe(e, { formElements: s, validation: m }) {
+  return { initialState: e, formElements: s, validation: m };
 }
-const Xe = (e, c) => {
+const Qe = (e, s) => {
   let m = e;
-  const [g, d] = Te(m);
-  (Object.keys(d).length > 0 || c && Object.keys(c).length > 0) && Object.keys(d).forEach((f) => {
-    d[f] = d[f] || {}, d[f].formElements = {
-      ...c?.formElements,
+  const [d, u] = Ae(m);
+  (Object.keys(u).length > 0 || s && Object.keys(s).length > 0) && Object.keys(u).forEach((f) => {
+    u[f] = u[f] || {}, u[f].formElements = {
+      ...s?.formElements,
       // Global defaults first
-      ...c?.validation,
-      ...d[f].formElements || {}
+      ...s?.validation,
+      ...u[f].formElements || {}
       // State-specific overrides
-    }, z(f) || a.getState().setInitialStateOptions(f, d[f]);
-  }), a.getState().setInitialStates(g), a.getState().setCreatedState(g);
+    }, z(f) || a.getState().setInitialStateOptions(f, u[f]);
+  }), a.getState().setInitialStates(d), a.getState().setCreatedState(d);
   const I = (f, l) => {
-    const [S] = le(l?.componentId ?? ge());
+    const [S] = de(l?.componentId ?? ge());
     Ie({
       stateKey: f,
       options: l,
-      initialOptionsPart: d
+      initialOptionsPart: u
     });
-    const t = a.getState().cogsStateStore[f] || g[f], v = l?.modifyState ? l.modifyState(t) : t, [T, b] = De(
+    const t = a.getState().cogsStateStore[f] || d[f], v = l?.modifyState ? l.modifyState(t) : t, [A, b] = De(
       v,
       {
         stateKey: f,
@@ -69,7 +69,7 @@ const Xe = (e, c) => {
     return b;
   };
   function E(f, l) {
-    Ie({ stateKey: f, options: l, initialOptionsPart: d }), l.localStorage && Fe(f, l), re(f);
+    Ie({ stateKey: f, options: l, initialOptionsPart: u }), l.localStorage && pe(f, l), re(f);
   }
   return { useCogsState: I, setCogsOptions: E };
 }, {
@@ -78,21 +78,21 @@ const Xe = (e, c) => {
   getInitialOptions: z,
   getKeyState: $e,
   getValidationErrors: Pe,
-  setStateLog: je,
-  updateInitialStateGlobal: ue,
-  addValidationError: Oe,
-  removeValidationError: M,
-  setServerSyncActions: pe
-} = a.getState(), Ee = (e, c, m, g, d) => {
+  setStateLog: Oe,
+  updateInitialStateGlobal: fe,
+  addValidationError: je,
+  removeValidationError: G,
+  setServerSyncActions: Fe
+} = a.getState(), Ee = (e, s, m, d, u) => {
   m?.log && console.log(
     "saving to localstorage",
-    c,
+    s,
     m.localStorage?.key,
-    g
+    d
   );
-  const I = G(m?.localStorage?.key) ? m.localStorage?.key(e) : m?.localStorage?.key;
-  if (I && g) {
-    const E = `${g}-${c}-${I}`;
+  const I = L(m?.localStorage?.key) ? m.localStorage?.key(e) : m?.localStorage?.key;
+  if (I && d) {
+    const E = `${d}-${s}-${I}`;
     let f;
     try {
       f = ne(E)?.lastSyncedWithServer;
@@ -101,7 +101,7 @@ const Xe = (e, c) => {
     const l = {
       state: e,
       lastUpdated: Date.now(),
-      lastSyncedWithServer: d ?? f
+      lastSyncedWithServer: u ?? f
     }, S = be.serialize(l);
     window.localStorage.setItem(
       E,
@@ -111,56 +111,78 @@ const Xe = (e, c) => {
 }, ne = (e) => {
   if (!e) return null;
   try {
-    const c = window.localStorage.getItem(e);
-    return c ? JSON.parse(c) : null;
-  } catch (c) {
-    return console.error("Error loading from localStorage:", c), null;
+    const s = window.localStorage.getItem(e);
+    return s ? JSON.parse(s) : null;
+  } catch (s) {
+    return console.error("Error loading from localStorage:", s), null;
   }
-}, Fe = (e, c) => {
-  const m = a.getState().cogsStateStore[e], { sessionId: g } = _e(), d = G(c?.localStorage?.key) ? c.localStorage.key(m) : c?.localStorage?.key;
-  if (d && g) {
+}, pe = (e, s) => {
+  const m = a.getState().cogsStateStore[e], { sessionId: d } = _e(), u = L(s?.localStorage?.key) ? s.localStorage.key(m) : s?.localStorage?.key;
+  if (u && d) {
     const I = ne(
-      `${g}-${e}-${d}`
+      `${d}-${e}-${u}`
     );
     if (I && I.lastUpdated > (I.lastSyncedWithServer || 0))
       return q(e, I.state), re(e), !0;
   }
   return !1;
-}, Re = (e, c, m, g, d, I) => {
+}, Re = (e, s, m, d, u, I) => {
   const E = {
-    initialState: c,
+    initialState: s,
     updaterState: ee(
       e,
-      g,
       d,
+      u,
       I
     ),
     state: m
   };
-  ue(e, E.initialState), K(e, E.updaterState), q(e, E.state);
+  fe(e, E.initialState), K(e, E.updaterState), q(e, E.state);
 }, re = (e) => {
-  const c = a.getState().stateComponents.get(e);
-  if (!c) return;
+  const s = a.getState().stateComponents.get(e);
+  if (!s) return;
   const m = /* @__PURE__ */ new Set();
-  c.components.forEach((g) => {
-    (g ? Array.isArray(g.reactiveType) ? g.reactiveType : [g.reactiveType || "component"] : null)?.includes("none") || m.add(() => g.forceUpdate());
+  s.components.forEach((d) => {
+    (d ? Array.isArray(d.reactiveType) ? d.reactiveType : [d.reactiveType || "component"] : null)?.includes("none") || m.add(() => d.forceUpdate());
   }), queueMicrotask(() => {
-    m.forEach((g) => g());
+    m.forEach((d) => d());
   });
-}, Qe = (e, c) => {
+}, Ke = (e, s) => {
   const m = a.getState().stateComponents.get(e);
   if (m) {
-    const g = `${e}////${c}`, d = m.components.get(g);
-    if ((d ? Array.isArray(d.reactiveType) ? d.reactiveType : [d.reactiveType || "component"] : null)?.includes("none"))
+    const d = `${e}////${s}`, u = m.components.get(d);
+    if ((u ? Array.isArray(u.reactiveType) ? u.reactiveType : [u.reactiveType || "component"] : null)?.includes("none"))
       return;
-    d && d.forceUpdate();
+    u && u.forceUpdate();
+  }
+}, Ue = (e, s, m, d) => {
+  switch (e) {
+    case "update":
+      return {
+        oldValue: M(s, d),
+        newValue: M(m, d)
+      };
+    case "insert":
+      return {
+        oldValue: null,
+        // or undefined
+        newValue: M(m, d)
+      };
+    case "cut":
+      return {
+        oldValue: M(s, d),
+        newValue: null
+        // or undefined
+      };
+    default:
+      return { oldValue: null, newValue: null };
   }
 };
 function De(e, {
-  stateKey: c,
+  stateKey: s,
   serverSync: m,
-  localStorage: g,
-  formElements: d,
+  localStorage: d,
+  formElements: u,
   middleware: I,
   reactiveDeps: E,
   reactiveType: f,
@@ -168,154 +190,152 @@ function De(e, {
   initialState: S,
   syncUpdate: t,
   dependencies: v,
-  serverState: T
+  serverState: A
 } = {}) {
-  const [b, j] = le({}), { sessionId: $ } = _e();
-  let O = !c;
-  const [r] = le(c ?? ge()), J = a.getState().stateLog[r], H = Q(/* @__PURE__ */ new Set()), L = Q(l ?? ge()), n = Q(
+  const [b, O] = de({}), { sessionId: $ } = _e();
+  let j = !s;
+  const [r] = de(s ?? ge()), J = a.getState().stateLog[r], H = Q(/* @__PURE__ */ new Set()), W = Q(l ?? ge()), n = Q(
     null
   );
-  n.current = z(r) ?? null, de(() => {
+  n.current = z(r) ?? null, ue(() => {
     if (t && t.stateKey === r && t.path?.[0]) {
       q(r, (i) => ({
         ...i,
         [t.path[0]]: t.newValue
       }));
-      const s = `${t.stateKey}:${t.path.join(".")}`;
-      a.getState().setSyncInfo(s, {
+      const c = `${t.stateKey}:${t.path.join(".")}`;
+      a.getState().setSyncInfo(c, {
         timeStamp: t.timeStamp,
         userId: t.userId
       });
     }
-  }, [t]), de(() => {
+  }, [t]), ue(() => {
     if (S) {
       ve(r, {
         initialState: S
       });
-      const s = n.current, y = s?.serverState?.id !== void 0 && s?.serverState?.status === "success" && s?.serverState?.data, k = a.getState().initialStateGlobal[r];
-      if (!(k && !U(k, S) || !k) && !y)
+      const c = n.current, y = c?.serverState?.id !== void 0 && c?.serverState?.status === "success" && c?.serverState?.data, N = a.getState().initialStateGlobal[r];
+      if (!(N && !D(N, S) || !N) && !y)
         return;
       let _ = null;
-      const x = G(s?.localStorage?.key) ? s?.localStorage?.key(S) : s?.localStorage?.key;
-      x && $ && (_ = ne(`${$}-${r}-${x}`));
-      let V = S, Y = !1;
-      const ae = y ? Date.now() : 0, B = _?.lastUpdated || 0, fe = _?.lastSyncedWithServer || 0;
-      y && ae > B ? (V = s.serverState.data, Y = !0) : _ && B > fe && (V = _.state, s?.localStorage?.onChange && s?.localStorage?.onChange(V)), Re(
+      const T = L(c?.localStorage?.key) ? c?.localStorage?.key(S) : c?.localStorage?.key;
+      T && $ && (_ = ne(`${$}-${r}-${T}`));
+      let x = S, B = !1;
+      const ae = y ? Date.now() : 0, Y = _?.lastUpdated || 0, oe = _?.lastSyncedWithServer || 0;
+      y && ae > Y ? (x = c.serverState.data, B = !0) : _ && Y > oe && (x = _.state, c?.localStorage?.onChange && c?.localStorage?.onChange(x)), Re(
         r,
         S,
-        V,
+        x,
         o,
-        L.current,
+        W.current,
         $
-      ), Y && x && $ && Ee(V, r, s, $, Date.now()), re(r), (Array.isArray(f) ? f : [f || "component"]).includes("none") || j({});
+      ), B && T && $ && Ee(x, r, c, $, Date.now()), re(r), (Array.isArray(f) ? f : [f || "component"]).includes("none") || O({});
     }
   }, [
     S,
-    T?.status,
-    T?.data,
+    A?.status,
+    A?.data,
     ...v || []
-  ]), Ne(() => {
-    O && ve(r, {
+  ]), we(() => {
+    j && ve(r, {
       serverSync: m,
-      formElements: d,
+      formElements: u,
       initialState: S,
-      localStorage: g,
+      localStorage: d,
       middleware: I
     });
-    const s = `${r}////${L.current}`, i = a.getState().stateComponents.get(r) || {
+    const c = `${r}////${W.current}`, i = a.getState().stateComponents.get(r) || {
       components: /* @__PURE__ */ new Map()
     };
-    return i.components.set(s, {
-      forceUpdate: () => j({}),
+    return i.components.set(c, {
+      forceUpdate: () => O({}),
       paths: /* @__PURE__ */ new Set(),
       deps: [],
       depsFunction: E || void 0,
       reactiveType: f ?? ["component", "deps"]
-    }), a.getState().stateComponents.set(r, i), j({}), () => {
-      const y = `${r}////${L.current}`;
+    }), a.getState().stateComponents.set(r, i), O({}), () => {
+      const y = `${r}////${W.current}`;
       i && (i.components.delete(y), i.components.size === 0 && a.getState().stateComponents.delete(r));
     };
   }, []);
-  const o = (s, i, y, k) => {
+  const o = (c, i, y, N) => {
     if (Array.isArray(i)) {
-      const w = `${r}-${i.join(".")}`;
-      H.current.add(w);
+      const k = `${r}-${i.join(".")}`;
+      H.current.add(k);
     }
-    q(r, (w) => {
-      const _ = G(s) ? s(w) : s, x = `${r}-${i.join(".")}`;
-      if (x) {
-        let R = !1, N = a.getState().signalDomElements.get(x);
-        if ((!N || N.size === 0) && (y.updateType === "insert" || y.updateType === "cut")) {
-          const p = i.slice(0, -1), F = W(_, p);
-          if (Array.isArray(F)) {
+    q(r, (k) => {
+      const _ = L(c) ? c(k) : c, T = `${r}-${i.join(".")}`;
+      if (T) {
+        let R = !1, w = a.getState().signalDomElements.get(T);
+        if ((!w || w.size === 0) && (y.updateType === "insert" || y.updateType === "cut")) {
+          const F = i.slice(0, -1), p = M(_, F);
+          if (Array.isArray(p)) {
             R = !0;
-            const h = `${r}-${p.join(".")}`;
-            N = a.getState().signalDomElements.get(h);
+            const h = `${r}-${F.join(".")}`;
+            w = a.getState().signalDomElements.get(h);
           }
         }
-        if (N) {
-          const p = R ? W(_, i.slice(0, -1)) : W(_, i);
-          N.forEach(({ parentId: F, position: h, effect: C }) => {
-            const A = document.querySelector(
-              `[data-parent-id="${F}"]`
+        if (w) {
+          const F = R ? M(_, i.slice(0, -1)) : M(_, i);
+          w.forEach(({ parentId: p, position: h, effect: C }) => {
+            const V = document.querySelector(
+              `[data-parent-id="${p}"]`
             );
-            if (A) {
-              const D = Array.from(A.childNodes);
-              if (D[h]) {
-                const P = C ? new Function("state", `return (${C})(state)`)(p) : p;
-                D[h].textContent = String(P);
+            if (V) {
+              const U = Array.from(V.childNodes);
+              if (U[h]) {
+                const P = C ? new Function("state", `return (${C})(state)`)(F) : F;
+                U[h].textContent = String(P);
               }
             }
           });
         }
       }
-      y.updateType === "update" && (k || n.current?.validation?.key) && i && M(
-        (k || n.current?.validation?.key) + "." + i.join(".")
+      y.updateType === "update" && (N || n.current?.validation?.key) && i && G(
+        (N || n.current?.validation?.key) + "." + i.join(".")
       );
-      const V = i.slice(0, i.length - 1);
-      y.updateType === "cut" && n.current?.validation?.key && M(
-        n.current?.validation?.key + "." + V.join(".")
+      const x = i.slice(0, i.length - 1);
+      y.updateType === "cut" && n.current?.validation?.key && G(
+        n.current?.validation?.key + "." + x.join(".")
       ), y.updateType === "insert" && n.current?.validation?.key && Pe(
-        n.current?.validation?.key + "." + V.join(".")
-      ).filter(([N, p]) => {
-        let F = N?.split(".").length;
-        if (N == V.join(".") && F == V.length - 1) {
-          let h = N + "." + V;
-          M(N), Oe(h, p);
+        n.current?.validation?.key + "." + x.join(".")
+      ).filter(([w, F]) => {
+        let p = w?.split(".").length;
+        if (w == x.join(".") && p == x.length - 1) {
+          let h = w + "." + x;
+          G(w), je(h, F);
         }
       });
-      const Y = W(w, i), ae = W(_, i);
-      y.updateType === "update" ? i.join(".") : [...i].slice(0, -1).join(".");
       const B = a.getState().stateComponents.get(r);
       if (B) {
-        const R = he(w, _), N = new Set(R), p = y.updateType === "update" ? i.join(".") : i.slice(0, -1).join(".") || "";
+        const R = he(k, _), w = new Set(R), F = y.updateType === "update" ? i.join(".") : i.slice(0, -1).join(".") || "";
         for (const [
-          F,
+          p,
           h
         ] of B.components.entries()) {
           let C = !1;
-          const A = Array.isArray(h.reactiveType) ? h.reactiveType : [h.reactiveType || "component"];
-          if (!A.includes("none")) {
-            if (A.includes("all")) {
+          const V = Array.isArray(h.reactiveType) ? h.reactiveType : [h.reactiveType || "component"];
+          if (!V.includes("none")) {
+            if (V.includes("all")) {
               h.forceUpdate();
               continue;
             }
-            if (A.includes("component") && ((h.paths.has(p) || h.paths.has("")) && (C = !0), !C))
-              for (const D of N) {
-                let P = D;
+            if (V.includes("component") && ((h.paths.has(F) || h.paths.has("")) && (C = !0), !C))
+              for (const U of w) {
+                let P = U;
                 for (; ; ) {
                   if (h.paths.has(P)) {
                     C = !0;
                     break;
                   }
-                  const ie = P.lastIndexOf(".");
-                  if (ie !== -1) {
+                  const se = P.lastIndexOf(".");
+                  if (se !== -1) {
                     const Se = P.substring(
                       0,
-                      ie
+                      se
                     );
                     if (!isNaN(
-                      Number(P.substring(ie + 1))
+                      Number(P.substring(se + 1))
                     ) && h.paths.has(Se)) {
                       C = !0;
                       break;
@@ -328,30 +348,35 @@ function De(e, {
                 }
                 if (C) break;
               }
-            if (!C && A.includes("deps") && h.depsFunction) {
-              const D = h.depsFunction(_);
+            if (!C && V.includes("deps") && h.depsFunction) {
+              const U = h.depsFunction(_);
               let P = !1;
-              typeof D == "boolean" ? D && (P = !0) : U(h.deps, D) || (h.deps = D, P = !0), P && (C = !0);
+              typeof U == "boolean" ? U && (P = !0) : D(h.deps, U) || (h.deps = U, P = !0), P && (C = !0);
             }
             C && h.forceUpdate();
           }
         }
       }
-      const oe = {
-        timeStamp: Date.now(),
+      const ae = Date.now(), { oldValue: Y, newValue: oe } = Ue(
+        y.updateType,
+        k,
+        _,
+        i
+      ), ie = {
+        timeStamp: ae,
         stateKey: r,
         path: i,
         updateType: y.updateType,
         status: "new",
         oldValue: Y,
-        newValue: ae
+        newValue: oe
       };
-      if (je(r, (R) => {
-        const p = [...R ?? [], oe].reduce((F, h) => {
-          const C = `${h.stateKey}:${JSON.stringify(h.path)}`, A = F.get(C);
-          return A ? (A.timeStamp = Math.max(A.timeStamp, h.timeStamp), A.newValue = h.newValue, A.oldValue = A.oldValue ?? h.oldValue, A.updateType = h.updateType) : F.set(C, { ...h }), F;
+      if (Oe(r, (R) => {
+        const F = [...R ?? [], ie].reduce((p, h) => {
+          const C = `${h.stateKey}:${JSON.stringify(h.path)}`, V = p.get(C);
+          return V ? (V.timeStamp = Math.max(V.timeStamp, h.timeStamp), V.newValue = h.newValue, V.oldValue = V.oldValue ?? h.oldValue, V.updateType = h.updateType) : p.set(C, { ...h }), p;
         }, /* @__PURE__ */ new Map());
-        return Array.from(p.values());
+        return Array.from(F.values());
       }), Ee(
         _,
         r,
@@ -359,13 +384,13 @@ function De(e, {
         $
       ), I && I({
         updateLog: J,
-        update: oe
+        update: ie
       }), n.current?.serverSync) {
-        const R = a.getState().serverState[r], N = n.current?.serverSync;
-        pe(r, {
-          syncKey: typeof N.syncKey == "string" ? N.syncKey : N.syncKey({ state: _ }),
+        const R = a.getState().serverState[r], w = n.current?.serverSync;
+        Fe(r, {
+          syncKey: typeof w.syncKey == "string" ? w.syncKey : w.syncKey({ state: _ }),
           rollBackState: R,
-          actionTimeStamp: Date.now() + (N.debounce ?? 3e3),
+          actionTimeStamp: Date.now() + (w.debounce ?? 3e3),
           status: "waiting"
         });
       }
@@ -377,55 +402,55 @@ function De(e, {
     ee(
       r,
       o,
-      L.current,
+      W.current,
       $
     )
-  ), a.getState().cogsStateStore[r] || q(r, e), a.getState().initialStateGlobal[r] || ue(r, e));
-  const u = ke(() => ee(
+  ), a.getState().cogsStateStore[r] || q(r, e), a.getState().initialStateGlobal[r] || fe(r, e));
+  const g = Ne(() => ee(
     r,
     o,
-    L.current,
+    W.current,
     $
   ), [r]);
-  return [$e(r), u];
+  return [$e(r), g];
 }
-function ee(e, c, m, g) {
-  const d = /* @__PURE__ */ new Map();
+function ee(e, s, m, d) {
+  const u = /* @__PURE__ */ new Map();
   let I = 0;
   const E = (S) => {
     const t = S.join(".");
-    for (const [v] of d)
-      (v === t || v.startsWith(t + ".")) && d.delete(v);
+    for (const [v] of u)
+      (v === t || v.startsWith(t + ".")) && u.delete(v);
     I++;
   }, f = {
     removeValidation: (S) => {
-      S?.validationKey && M(S.validationKey);
+      S?.validationKey && G(S.validationKey);
     },
     revertToInitialState: (S) => {
       const t = a.getState().getInitialOptions(e)?.validation;
-      t?.key && M(t?.key), S?.validationKey && M(S.validationKey);
+      t?.key && G(t?.key), S?.validationKey && G(S.validationKey);
       const v = a.getState().initialStateGlobal[e];
-      a.getState().clearSelectedIndexesForState(e), d.clear(), I++;
-      const T = l(v, []), b = z(e), j = G(b?.localStorage?.key) ? b?.localStorage?.key(v) : b?.localStorage?.key, $ = `${g}-${e}-${j}`;
-      $ && localStorage.removeItem($), K(e, T), q(e, v);
-      const O = a.getState().stateComponents.get(e);
-      return O && O.components.forEach((r) => {
+      a.getState().clearSelectedIndexesForState(e), u.clear(), I++;
+      const A = l(v, []), b = z(e), O = L(b?.localStorage?.key) ? b?.localStorage?.key(v) : b?.localStorage?.key, $ = `${d}-${e}-${O}`;
+      $ && localStorage.removeItem($), K(e, A), q(e, v);
+      const j = a.getState().stateComponents.get(e);
+      return j && j.components.forEach((r) => {
         r.forceUpdate();
       }), v;
     },
     updateInitialState: (S) => {
-      d.clear(), I++;
+      u.clear(), I++;
       const t = ee(
         e,
-        c,
+        s,
         m,
-        g
-      ), v = a.getState().initialStateGlobal[e], T = z(e), b = G(T?.localStorage?.key) ? T?.localStorage?.key(v) : T?.localStorage?.key, j = `${g}-${e}-${b}`;
-      return console.log("removing storage", j), localStorage.getItem(j) && localStorage.removeItem(j), Ae(() => {
-        ue(e, S), K(e, t), q(e, S);
+        d
+      ), v = a.getState().initialStateGlobal[e], A = z(e), b = L(A?.localStorage?.key) ? A?.localStorage?.key(v) : A?.localStorage?.key, O = `${d}-${e}-${b}`;
+      return console.log("removing storage", O), localStorage.getItem(O) && localStorage.removeItem(O), Ve(() => {
+        fe(e, S), K(e, t), q(e, S);
         const $ = a.getState().stateComponents.get(e);
-        $ && $.components.forEach((O) => {
-          O.forceUpdate();
+        $ && $.components.forEach((j) => {
+          j.forceUpdate();
         });
       }), {
         fetchId: ($) => t.get()[$]
@@ -436,30 +461,30 @@ function ee(e, c, m, g) {
     _isLoading: a.getState().isLoadingGlobal[e],
     _isServerSynced: () => {
       const S = a.getState().serverState[e];
-      return !!(S && U(S, $e(e)));
+      return !!(S && D(S, $e(e)));
     }
   };
   function l(S, t = [], v) {
-    const T = t.map(String).join(".");
-    d.get(T);
+    const A = t.map(String).join(".");
+    u.get(A);
     const b = function() {
       return a().getNestedState(e, t);
     };
-    Object.keys(f).forEach((O) => {
-      b[O] = f[O];
+    Object.keys(f).forEach((j) => {
+      b[j] = f[j];
     });
-    const j = {
-      apply(O, r, J) {
+    const O = {
+      apply(j, r, J) {
         return console.log(
           `PROXY APPLY TRAP HIT: stateKey=${e}, path=${t.join(".")}`
         ), console.trace("Apply trap stack trace"), a().getNestedState(e, t);
       },
-      get(O, r) {
+      get(j, r) {
         if (r !== "then" && !r.startsWith("$") && r !== "stateMapNoRender") {
-          const n = t.join("."), o = `${e}////${m}`, u = a.getState().stateComponents.get(e);
-          if (u) {
-            const s = u.components.get(o);
-            s && (t.length > 0 || r === "get") && s.paths.add(n);
+          const n = t.join("."), o = `${e}////${m}`, g = a.getState().stateComponents.get(e);
+          if (g) {
+            const c = g.components.get(o);
+            c && (t.length > 0 || r === "get") && c.paths.add(n);
           }
         }
         if (r === "getDifferences")
@@ -472,17 +497,17 @@ function ee(e, c, m, g) {
             const n = a.getState().getInitialOptions(e), o = n?.sync;
             if (!o)
               return console.error(`No mutation defined for state key "${e}"`), { success: !1, error: "No mutation defined" };
-            const u = a.getState().getNestedState(e, []), s = n?.validation?.key;
+            const g = a.getState().getNestedState(e, []), c = n?.validation?.key;
             try {
-              const i = await o.action(u);
-              if (i && !i.success && i.errors && s) {
-                a.getState().removeValidationError(s), i.errors.forEach((k) => {
-                  const w = [s, ...k.path].join(".");
-                  a.getState().addValidationError(w, k.message);
+              const i = await o.action(g);
+              if (i && !i.success && i.errors && c) {
+                a.getState().removeValidationError(c), i.errors.forEach((N) => {
+                  const k = [c, ...N.path].join(".");
+                  a.getState().addValidationError(k, N.message);
                 });
                 const y = a.getState().stateComponents.get(e);
-                y && y.components.forEach((k) => {
-                  k.forceUpdate();
+                y && y.components.forEach((N) => {
+                  N.forceUpdate();
                 });
               }
               return i?.success && o.onSuccess ? o.onSuccess(i.data) : !i?.success && o.onError && o.onError(i.error), i;
@@ -491,21 +516,21 @@ function ee(e, c, m, g) {
             }
           };
         if (r === "_status") {
-          const n = a.getState().getNestedState(e, t), o = a.getState().initialStateGlobal[e], u = W(o, t);
-          return U(n, u) ? "fresh" : "stale";
+          const n = a.getState().getNestedState(e, t), o = a.getState().initialStateGlobal[e], g = M(o, t);
+          return D(n, g) ? "fresh" : "stale";
         }
         if (r === "getStatus")
           return function() {
             const n = a().getNestedState(
               e,
               t
-            ), o = a.getState().initialStateGlobal[e], u = W(o, t);
-            return U(n, u) ? "fresh" : "stale";
+            ), o = a.getState().initialStateGlobal[e], g = M(o, t);
+            return D(n, g) ? "fresh" : "stale";
           };
         if (r === "removeStorage")
           return () => {
-            const n = a.getState().initialStateGlobal[e], o = z(e), u = G(o?.localStorage?.key) ? o?.localStorage?.key(n) : o?.localStorage?.key, s = `${g}-${e}-${u}`;
-            console.log("removing storage", s), s && localStorage.removeItem(s);
+            const n = a.getState().initialStateGlobal[e], o = z(e), g = L(o?.localStorage?.key) ? o?.localStorage?.key(n) : o?.localStorage?.key, c = `${d}-${e}-${g}`;
+            console.log("removing storage", c), c && localStorage.removeItem(c);
           };
         if (r === "showValidationErrors")
           return () => {
@@ -533,13 +558,13 @@ function ee(e, c, m, g) {
             return () => a.getState().getSelectedIndex(e, t.join(".")) ?? -1;
           if (r === "stateSort")
             return (n) => {
-              const s = [...a.getState().getNestedState(e, t).map((i, y) => ({
+              const c = [...a.getState().getNestedState(e, t).map((i, y) => ({
                 ...i,
                 __origIndex: y.toString()
               }))].sort(n);
-              return d.clear(), I++, l(s, t, {
+              return u.clear(), I++, l(c, t, {
                 filtered: [...v?.filtered || [], t],
-                validIndices: s.map(
+                validIndices: c.map(
                   (i) => parseInt(i.__origIndex)
                 )
               });
@@ -547,17 +572,17 @@ function ee(e, c, m, g) {
           if (r === "stateMap" || r === "stateMapNoRender")
             return (n) => {
               const o = v?.filtered?.some(
-                (s) => s.join(".") === t.join(".")
-              ), u = o ? S : a.getState().getNestedState(e, t);
-              return r !== "stateMapNoRender" && (d.clear(), I++), u.map((s, i) => {
-                const y = o && s.__origIndex ? s.__origIndex : i, k = l(
-                  s,
+                (c) => c.join(".") === t.join(".")
+              ), g = o ? S : a.getState().getNestedState(e, t);
+              return r !== "stateMapNoRender" && (u.clear(), I++), g.map((c, i) => {
+                const y = o && c.__origIndex ? c.__origIndex : i, N = l(
+                  c,
                   [...t, y.toString()],
                   v
                 );
                 return n(
-                  s,
-                  k,
+                  c,
+                  N,
                   i,
                   S,
                   l(S, t, v)
@@ -565,7 +590,7 @@ function ee(e, c, m, g) {
               });
             };
           if (r === "$stateMap")
-            return (n) => te(Ue, {
+            return (n) => te(Me, {
               proxy: {
                 _stateKey: e,
                 _path: t,
@@ -576,25 +601,25 @@ function ee(e, c, m, g) {
             });
           if (r === "stateFlattenOn")
             return (n) => {
-              const u = v?.filtered?.some(
+              const g = v?.filtered?.some(
                 (i) => i.join(".") === t.join(".")
               ) ? S : a.getState().getNestedState(e, t);
-              d.clear(), I++;
-              const s = u.flatMap(
+              u.clear(), I++;
+              const c = g.flatMap(
                 (i, y) => i[n] ?? []
               );
               return l(
-                s,
+                c,
                 [...t, "[*]", n],
                 v
               );
             };
           if (r === "findWith")
             return (n, o) => {
-              const u = S.findIndex((y) => y[n] === o);
-              if (u === -1) return;
-              const s = S[u], i = [...t, u.toString()];
-              return d.clear(), I++, l(s, i);
+              const g = S.findIndex((y) => y[n] === o);
+              if (g === -1) return;
+              const c = S[g], i = [...t, g.toString()];
+              return u.clear(), I++, l(c, i);
             };
           if (r === "index")
             return (n) => {
@@ -605,40 +630,40 @@ function ee(e, c, m, g) {
             return () => {
               const n = a.getState().getNestedState(e, t);
               if (n.length === 0) return;
-              const o = n.length - 1, u = n[o], s = [...t, o.toString()];
-              return l(u, s);
+              const o = n.length - 1, g = n[o], c = [...t, o.toString()];
+              return l(g, c);
             };
           if (r === "insert")
-            return (n) => (E(t), se(c, n, t, e), l(
+            return (n) => (E(t), ce(s, n, t, e), l(
               a.getState().getNestedState(e, t),
               t
             ));
           if (r === "uniqueInsert")
-            return (n, o, u) => {
-              const s = a.getState().getNestedState(e, t), i = G(n) ? n(s) : n;
+            return (n, o, g) => {
+              const c = a.getState().getNestedState(e, t), i = L(n) ? n(c) : n;
               let y = null;
-              if (!s.some((w) => {
+              if (!c.some((k) => {
                 if (o) {
-                  const x = o.every(
-                    (V) => U(w[V], i[V])
+                  const T = o.every(
+                    (x) => D(k[x], i[x])
                   );
-                  return x && (y = w), x;
+                  return T && (y = k), T;
                 }
-                const _ = U(w, i);
-                return _ && (y = w), _;
+                const _ = D(k, i);
+                return _ && (y = k), _;
               }))
-                E(t), se(c, i, t, e);
-              else if (u && y) {
-                const w = u(y), _ = s.map(
-                  (x) => U(x, y) ? w : x
+                E(t), ce(s, i, t, e);
+              else if (g && y) {
+                const k = g(y), _ = c.map(
+                  (T) => D(T, y) ? k : T
                 );
-                E(t), Z(c, _, t);
+                E(t), Z(s, _, t);
               }
             };
           if (r === "cut")
             return (n, o) => {
               if (!o?.waitForSync)
-                return E(t), X(c, t, e, n), l(
+                return E(t), X(s, t, e, n), l(
                   a.getState().getNestedState(e, t),
                   t
                 );
@@ -646,24 +671,24 @@ function ee(e, c, m, g) {
           if (r === "cutByValue")
             return (n) => {
               for (let o = 0; o < S.length; o++)
-                S[o] === n && X(c, t, e, o);
+                S[o] === n && X(s, t, e, o);
             };
           if (r === "toggleByValue")
             return (n) => {
-              const o = S.findIndex((u) => u === n);
-              o > -1 ? X(c, t, e, o) : se(c, n, t, e);
+              const o = S.findIndex((g) => g === n);
+              o > -1 ? X(s, t, e, o) : ce(s, n, t, e);
             };
           if (r === "stateFilter")
             return (n) => {
               const o = S.map((i, y) => ({
                 ...i,
                 __origIndex: y.toString()
-              })), u = [], s = [];
+              })), g = [], c = [];
               for (let i = 0; i < o.length; i++)
-                n(o[i], i) && (u.push(i), s.push(o[i]));
-              return d.clear(), I++, l(s, t, {
+                n(o[i], i) && (g.push(i), c.push(o[i]));
+              return u.clear(), I++, l(c, t, {
                 filtered: [...v?.filtered || [], t],
-                validIndices: u
+                validIndices: g
                 // Always pass validIndices, even if empty
               });
             };
@@ -673,7 +698,7 @@ function ee(e, c, m, g) {
           const n = t.slice(0, -1), o = a.getState().getNestedState(e, n);
           if (Array.isArray(o) && r === "cut")
             return () => X(
-              c,
+              s,
               n,
               e,
               Number(J)
@@ -682,19 +707,19 @@ function ee(e, c, m, g) {
         if (r === "get")
           return () => a.getState().getNestedState(e, t);
         if (r === "$derive")
-          return (n) => ce({
+          return (n) => le({
             _stateKey: e,
             _path: t,
             _effect: n.toString()
           });
         if (r === "$derive")
-          return (n) => ce({
+          return (n) => le({
             _stateKey: e,
             _path: t,
             _effect: n.toString()
           });
         if (r === "$get")
-          return () => ce({
+          return () => le({
             _stateKey: e,
             _path: t
           });
@@ -703,28 +728,28 @@ function ee(e, c, m, g) {
           return a.getState().getSyncInfo(n);
         }
         if (r == "getLocalStorage")
-          return (n) => ne(g + "-" + e + "-" + n);
+          return (n) => ne(d + "-" + e + "-" + n);
         if (r === "_selected") {
-          const n = t.slice(0, -1), o = n.join("."), u = a.getState().getNestedState(e, n);
-          return Array.isArray(u) ? Number(t[t.length - 1]) === a.getState().getSelectedIndex(e, o) : void 0;
+          const n = t.slice(0, -1), o = n.join("."), g = a.getState().getNestedState(e, n);
+          return Array.isArray(g) ? Number(t[t.length - 1]) === a.getState().getSelectedIndex(e, o) : void 0;
         }
         if (r === "setSelected")
           return (n) => {
-            const o = t.slice(0, -1), u = Number(t[t.length - 1]), s = o.join(".");
-            n ? a.getState().setSelectedIndex(e, s, u) : a.getState().setSelectedIndex(e, s, void 0);
+            const o = t.slice(0, -1), g = Number(t[t.length - 1]), c = o.join(".");
+            n ? a.getState().setSelectedIndex(e, c, g) : a.getState().setSelectedIndex(e, c, void 0);
             const i = a.getState().getNestedState(e, [...o]);
-            Z(c, i, o), E(o);
+            Z(s, i, o), E(o);
           };
         if (r === "toggleSelected")
           return () => {
-            const n = t.slice(0, -1), o = Number(t[t.length - 1]), u = n.join("."), s = a.getState().getSelectedIndex(e, u);
+            const n = t.slice(0, -1), o = Number(t[t.length - 1]), g = n.join("."), c = a.getState().getSelectedIndex(e, g);
             a.getState().setSelectedIndex(
               e,
-              u,
-              s === o ? void 0 : o
+              g,
+              c === o ? void 0 : o
             );
             const i = a.getState().getNestedState(e, [...n]);
-            Z(c, i, n), E(n);
+            Z(s, i, n), E(n);
           };
         if (t.length == 0) {
           if (r === "validateZodSchema")
@@ -734,20 +759,20 @@ function ee(e, c, m, g) {
                 throw new Error("Zod schema not found");
               if (!n?.key)
                 throw new Error("Validation key not found");
-              M(n.key);
-              const u = a.getState().cogsStateStore[e];
+              G(n.key);
+              const g = a.getState().cogsStateStore[e];
               try {
-                const s = a.getState().getValidationErrors(n.key);
-                s && s.length > 0 && s.forEach(([y]) => {
-                  y && y.startsWith(n.key) && M(y);
+                const c = a.getState().getValidationErrors(n.key);
+                c && c.length > 0 && c.forEach(([y]) => {
+                  y && y.startsWith(n.key) && G(y);
                 });
-                const i = n.zodSchema.safeParse(u);
-                return i.success ? !0 : (i.error.errors.forEach((k) => {
-                  const w = k.path, _ = k.message, x = [n.key, ...w].join(".");
-                  o(x, _);
+                const i = n.zodSchema.safeParse(g);
+                return i.success ? !0 : (i.error.errors.forEach((N) => {
+                  const k = N.path, _ = N.message, T = [n.key, ...k].join(".");
+                  o(T, _);
                 }), re(e), !1);
-              } catch (s) {
-                return console.error("Zod schema validation failed", s), !1;
+              } catch (c) {
+                return console.error("Zod schema validation failed", c), !1;
               }
             };
           if (r === "_componentId") return m;
@@ -773,7 +798,7 @@ function ee(e, c, m, g) {
             children: n,
             hideMessage: o
           }) => /* @__PURE__ */ me(
-            Ve,
+            xe,
             {
               formOpts: o ? { validation: { message: "" } } : void 0,
               path: t,
@@ -789,15 +814,15 @@ function ee(e, c, m, g) {
         if (r === "update")
           return (n, o) => {
             if (o?.debounce)
-              xe(() => {
-                Z(c, n, t, "");
-                const u = a.getState().getNestedState(e, t);
-                o?.afterUpdate && o.afterUpdate(u);
+              Te(() => {
+                Z(s, n, t, "");
+                const g = a.getState().getNestedState(e, t);
+                o?.afterUpdate && o.afterUpdate(g);
               }, o.debounce);
             else {
-              Z(c, n, t, "");
-              const u = a.getState().getNestedState(e, t);
-              o?.afterUpdate && o.afterUpdate(u);
+              Z(s, n, t, "");
+              const g = a.getState().getNestedState(e, t);
+              o?.afterUpdate && o.afterUpdate(g);
             }
             E(t);
           };
@@ -805,18 +830,18 @@ function ee(e, c, m, g) {
           return (n, o) => /* @__PURE__ */ me(
             Ce,
             {
-              setState: c,
+              setState: s,
               stateKey: e,
               path: t,
               child: n,
               formOpts: o
             }
           );
-        const H = [...t, r], L = a.getState().getNestedState(e, H);
-        return l(L, H, v);
+        const H = [...t, r], W = a.getState().getNestedState(e, H);
+        return l(W, H, v);
       }
-    }, $ = new Proxy(b, j);
-    return d.set(T, {
+    }, $ = new Proxy(b, O);
+    return u.set(A, {
       proxy: $,
       stateVersion: I
     }), $;
@@ -825,31 +850,31 @@ function ee(e, c, m, g) {
     a.getState().getNestedState(e, [])
   );
 }
-function ce(e) {
-  return te(Me, { proxy: e });
+function le(e) {
+  return te(Ge, { proxy: e });
 }
-function Ue({
+function Me({
   proxy: e,
-  rebuildStateShape: c
+  rebuildStateShape: s
 }) {
   const m = a().getNestedState(e._stateKey, e._path);
-  return Array.isArray(m) ? c(
+  return Array.isArray(m) ? s(
     m,
     e._path
   ).stateMapNoRender(
-    (d, I, E, f, l) => e._mapFn(d, I, E, f, l)
+    (u, I, E, f, l) => e._mapFn(u, I, E, f, l)
   ) : null;
 }
-function Me({
+function Ge({
   proxy: e
 }) {
-  const c = Q(null), m = `${e._stateKey}-${e._path.join(".")}`;
-  return de(() => {
-    const g = c.current;
-    if (!g || !g.parentElement) return;
-    const d = g.parentElement, E = Array.from(d.childNodes).indexOf(g);
-    let f = d.getAttribute("data-parent-id");
-    f || (f = `parent-${crypto.randomUUID()}`, d.setAttribute("data-parent-id", f));
+  const s = Q(null), m = `${e._stateKey}-${e._path.join(".")}`;
+  return ue(() => {
+    const d = s.current;
+    if (!d || !d.parentElement) return;
+    const u = d.parentElement, E = Array.from(u.childNodes).indexOf(d);
+    let f = u.getAttribute("data-parent-id");
+    f || (f = `parent-${crypto.randomUUID()}`, u.setAttribute("data-parent-id", f));
     const S = {
       instanceId: `instance-${crypto.randomUUID()}`,
       parentId: f,
@@ -871,35 +896,35 @@ function Me({
     else
       v = t;
     v !== null && typeof v == "object" && (v = JSON.stringify(v));
-    const T = document.createTextNode(String(v));
-    g.replaceWith(T);
+    const A = document.createTextNode(String(v));
+    d.replaceWith(A);
   }, [e._stateKey, e._path.join("."), e._effect]), te("span", {
-    ref: c,
+    ref: s,
     style: { display: "none" },
     "data-signal-id": m
   });
 }
-function Ke(e) {
-  const c = we(
+function et(e) {
+  const s = ke(
     (m) => {
-      const g = a.getState().stateComponents.get(e._stateKey) || {
+      const d = a.getState().stateComponents.get(e._stateKey) || {
         components: /* @__PURE__ */ new Map()
       };
-      return g.components.set(e._stateKey, {
+      return d.components.set(e._stateKey, {
         forceUpdate: m,
         paths: /* @__PURE__ */ new Set([e._path.join(".")])
-      }), () => g.components.delete(e._stateKey);
+      }), () => d.components.delete(e._stateKey);
     },
     () => a.getState().getNestedState(e._stateKey, e._path)
   );
-  return te("text", {}, String(c));
+  return te("text", {}, String(s));
 }
 export {
-  ce as $cogsSignal,
-  Ke as $cogsSignalStore,
-  Ye as addStateOptions,
-  Xe as createCogsState,
-  Qe as notifyComponent,
+  le as $cogsSignal,
+  et as $cogsSignalStore,
+  Xe as addStateOptions,
+  Qe as createCogsState,
+  Ke as notifyComponent,
   De as useCogsStateFn
 };
 //# sourceMappingURL=CogsState.jsx.map