cogsbox-state 0.5.45 → 0.5.47

package/dist/CogsState.jsx

@@ -8,12 +8,12 @@ import { getGlobalStore as o, formRefStore as lt } from "./store.js";
 import { useCogsConfig as Vt } from "./CogsStateClient.jsx";
 import tt from "./node_modules/uuid/dist/esm-browser/v4.js";
 function dt(t, a) {
-  const u = o.getState().getInitialOptions, f = o.getState().setInitialStateOptions, d = u(t) || {};
-  return f(t, {
-    ...d,
+  const u = o.getState().getInitialOptions, f = o.getState().setInitialStateOptions, s = u(t) || {};
+  return console.log("setAndMergeOptions", t, s, a), f(t, {
+    ...s,
     ...a
   }), {
-    ...d,
+    ...s,
     ...a
   };
 }
@@ -22,59 +22,57 @@ function ut({
   options: a,
   initialOptionsPart: u
 }) {
-  const f = et(t) || {}, d = u[t] || {}, _ = o.getState().setInitialStateOptions, p = { ...d, ...f };
+  const f = et(t) || {}, s = u[t] || {}, _ = o.getState().setInitialStateOptions, p = { ...s, ...f };
   let y = !1;
   if (a)
-    for (const g in a)
-      p.hasOwnProperty(g) || (y = !0, (a.log || p.log) && console.log(
+    for (const S in a)
+      p.hasOwnProperty(S) || (y = !0, console.log(
         "setOptions needToAdd",
-        g,
-        a[g]
-      ), p[g] = a[g]);
-  y && _(t, p);
+        S,
+        a[S]
+      ), p[S] = a[S]);
+  return y && _(t, p), p;
 }
 function Wt(t, { formElements: a, validation: u }) {
   return { initialState: t, formElements: a, validation: u };
 }
 const qt = (t, a) => {
   let u = t;
-  const [f, d] = _t(u);
-  (a?.formElements || a?.validation) && Object.keys(d).forEach((y) => {
-    d[y] = d[y] || {}, d[y].formElements = {
+  const [f, s] = _t(u);
+  (a?.formElements || a?.validation) && Object.keys(s).forEach((y) => {
+    s[y] = s[y] || {}, s[y].formElements = {
       ...a.formElements,
       // Global defaults first
       ...a?.validation,
-      ...d[y].formElements || {}
+      ...s[y].formElements || {}
       // State-specific overrides
     };
   }), o.getState().setInitialStates(f);
-  const _ = (y, g) => {
-    const [w] = Y(g?.componentId ?? tt());
-    ut({
+  const _ = (y, S) => {
+    const [w] = Y(S?.componentId ?? tt()), c = ut({
       stateKey: y,
-      options: g,
-      initialOptionsPart: d
+      options: S,
+      initialOptionsPart: s
     });
-    const s = o.getState().cogsStateStore[y] || f[y], e = g?.modifyState ? g.modifyState(s) : s;
-    g?.log && console.log("useCogsState", y, g);
-    const [I, V] = Ot(
-      e,
+    console.log("useCogsState", y, S, s, c);
+    const e = o.getState().cogsStateStore[y] || f[y], v = S?.modifyState ? S.modifyState(e) : e, [V, F] = jt(
+      v,
       {
         stateKey: y,
-        syncUpdate: g?.syncUpdate,
+        syncUpdate: S?.syncUpdate,
         componentId: w,
-        localStorage: g?.localStorage,
-        middleware: g?.middleware,
-        enabledSync: g?.enabledSync,
-        reactiveType: g?.reactiveType,
-        reactiveDeps: g?.reactiveDeps,
-        initState: g?.initState
+        localStorage: S?.localStorage,
+        middleware: S?.middleware,
+        enabledSync: S?.enabledSync,
+        reactiveType: S?.reactiveType,
+        reactiveDeps: S?.reactiveDeps,
+        initState: S?.initState
       }
     );
-    return V;
+    return F;
   };
-  function p(y, g) {
-    ut({ stateKey: y, options: g, initialOptionsPart: d });
+  function p(y, S) {
+    ut({ stateKey: y, options: S, initialOptionsPart: s });
   }
   return { useCogsState: _, setCogsOptions: p };
 }, {
@@ -86,7 +84,7 @@ const qt = (t, a) => {
   setStateLog: ht,
   updateInitialStateGlobal: nt,
   addValidationError: At,
-  removeValidationError: M,
+  removeValidationError: k,
   setServerSyncActions: Ct
 } = o.getState(), St = (t) => {
   if (!t) return null;
@@ -103,21 +101,21 @@ const qt = (t, a) => {
     u.localStorage?.key,
     f
   ), u.localStorage?.key && f) {
-    const d = {
+    const s = {
       state: t,
       lastUpdated: Date.now(),
       lastSyncedWithServer: o.getState().serverSyncLog[a]?.[0]?.timeStamp,
       baseServerState: o.getState().serverState[a]
     }, _ = `${f}-${a}-${u.localStorage?.key}`;
-    window.localStorage.setItem(_, JSON.stringify(d));
+    window.localStorage.setItem(_, JSON.stringify(s));
   }
-}, Ft = (t, a, u, f, d, _) => {
+}, Ft = (t, a, u, f, s, _) => {
   const p = {
     initialState: a,
     updaterState: Z(
       t,
       f,
-      d,
+      s,
       _
     ),
     state: u
@@ -139,100 +137,97 @@ const qt = (t, a) => {
 }, zt = (t, a) => {
   const u = o.getState().stateComponents.get(t);
   if (u) {
-    const f = `${t}////${a}`, d = u.components.get(f);
-    d && d.forceUpdate();
+    const f = `${t}////${a}`, s = u.components.get(f);
+    s && s.forceUpdate();
   }
 };
-function Ot(t, {
+function jt(t, {
   stateKey: a,
   serverSync: u,
   localStorage: f,
-  formElements: d,
+  formElements: s,
   middleware: _,
   reactiveDeps: p,
   reactiveType: y,
-  componentId: g,
+  componentId: S,
   initState: w,
-  syncUpdate: s
+  syncUpdate: c
 } = {}) {
-  const [e, I] = Y({}), { sessionId: V } = Vt();
-  let k = !a;
-  const [c] = Y(a ?? tt()), R = o.getState().stateLog[c], U = z(/* @__PURE__ */ new Set()), i = z(g ?? tt()), $ = z(null);
-  $.current = et(c), K(() => {
-    if (s && s.stateKey === c && s.path?.[0]) {
-      x(c, (r) => ({
+  const [e, v] = Y({}), { sessionId: V } = Vt();
+  let F = !a;
+  const [l] = Y(a ?? tt()), U = o.getState().stateLog[l], P = z(/* @__PURE__ */ new Set()), i = z(S ?? tt()), $ = z(null);
+  $.current = et(l), K(() => {
+    if (c && c.stateKey === l && c.path?.[0]) {
+      x(l, (r) => ({
         ...r,
-        [s.path[0]]: s.newValue
+        [c.path[0]]: c.newValue
       }));
-      const n = `${s.stateKey}:${s.path.join(".")}`;
+      const n = `${c.stateKey}:${c.path.join(".")}`;
       o.getState().setSyncInfo(n, {
-        timeStamp: s.timeStamp,
-        userId: s.userId
+        timeStamp: c.timeStamp,
+        userId: c.userId
       });
     }
-  }, [s]), $.current.log && (console.log(
-    "latestInitialOptionsRef.current ",
-    $.current
-  ), console.log("latestInitialOptionsRef.current localStorage", f)), K(() => {
-    dt(c, {
+  }, [c]), K(() => {
+    dt(l, {
       initState: w
     });
     const n = $.current;
     let r = null;
     n.log && console.log("newoptions", n), n.localStorage?.key && V && (r = St(
-      V + "-" + c + "-" + n.localStorage?.key
+      V + "-" + l + "-" + n.localStorage?.key
     ));
-    let l = null;
-    w?.initialState && (l = w?.initialState, r && r.lastUpdated > (r.lastSyncedWithServer || 0) && (l = r.state), Ft(
-      c,
-      w?.initialState,
+    let d = null;
+    w?.initialState && (d = w?.initialState, r && r.lastUpdated > (r.lastSyncedWithServer || 0) && (d = r.state), Ft(
       l,
-      P,
+      w?.initialState,
+      d,
+      R,
       i.current,
       V
-    ), mt(c), I({}));
+    ), mt(l), v({}));
   }, [...w?.dependencies || []]), vt(() => {
-    k && dt(c, {
+    F && dt(l, {
       serverSync: u,
-      formElements: d,
+      formElements: s,
       initState: w,
       localStorage: f,
       middleware: _
     });
-    const n = `${c}////${i.current}`, r = o.getState().stateComponents.get(c) || {
+    const n = `${l}////${i.current}`, r = o.getState().stateComponents.get(l) || {
       components: /* @__PURE__ */ new Map()
     };
     return r.components.set(n, {
-      forceUpdate: () => I({}),
+      forceUpdate: () => v({}),
       paths: /* @__PURE__ */ new Set(),
       deps: [],
       depsFunction: p || void 0,
       reactiveType: y ?? ["component", "deps"]
-    }), o.getState().stateComponents.set(c, r), I({}), () => {
-      const l = `${c}////${i.current}`;
-      r && (r.components.delete(l), r.components.size === 0 && o.getState().stateComponents.delete(c));
+    }), o.getState().stateComponents.set(l, r), v({}), () => {
+      const d = `${l}////${i.current}`;
+      r && (r.components.delete(d), r.components.size === 0 && o.getState().stateComponents.delete(l));
     };
   }, []);
-  const P = (n, r, l, S) => {
+  const R = (n, r, d, g) => {
     if (Array.isArray(r)) {
-      const m = `${c}-${r.join(".")}`;
-      U.current.add(m);
+      const m = `${l}-${r.join(".")}`;
+      P.current.add(m);
     }
-    x(c, (m) => {
-      const E = ft(n) ? n(m) : n, O = `${c}-${r.join(".")}`;
-      if (O) {
-        let b = !1, v = o.getState().signalDomElements.get(O);
-        if ((!v || v.size === 0) && (l.updateType === "insert" || l.updateType === "cut")) {
+    x(l, (m) => {
+      const E = ft(n) ? n(m) : n, M = `${l}-${r.join(".")}`;
+      if (M) {
+        let b = !1, I = o.getState().signalDomElements.get(M);
+        if ((!I || I.size === 0) && (d.updateType === "insert" || d.updateType === "cut")) {
           const h = r.slice(0, -1), C = L(E, h);
           if (Array.isArray(C)) {
             b = !0;
-            const N = `${c}-${h.join(".")}`;
-            v = o.getState().signalDomElements.get(N);
+            const N = `${l}-${h.join(".")}`;
+            I = o.getState().signalDomElements.get(N);
           }
         }
-        if (v) {
+        if (I) {
           const h = b ? L(E, r.slice(0, -1)) : L(E, r);
-          v.forEach(({ parentId: C, position: N, effect: D }) => {
+          I.forEach(({ parentId: C, position: N, effect: D }) => {
             const T = document.querySelector(
               `[data-parent-id="${C}"]`
             );
@@ -246,48 +241,48 @@ function Ot(t, {
           });
         }
       }
-      l.updateType === "update" && (S || $.current?.validationKey) && r && M(
-        (S || $.current?.validationKey) + "." + r.join(".")
+      d.updateType === "update" && (g || $.current?.validationKey) && r && k(
+        (g || $.current?.validationKey) + "." + r.join(".")
       );
       const A = r.slice(0, r.length - 1);
-      l.updateType === "cut" && $.current?.validationKey && M(
+      d.updateType === "cut" && $.current?.validationKey && k(
         $.current?.validationKey + "." + A.join(".")
-      ), l.updateType === "insert" && $.current?.validationKey && $t(
+      ), d.updateType === "insert" && $.current?.validationKey && $t(
         $.current?.validationKey + "." + A.join(".")
-      ).filter(([v, h]) => {
-        let C = v?.split(".").length;
-        if (v == A.join(".") && C == A.length - 1) {
-          let N = v + "." + A;
-          M(v), At(N, h);
+      ).filter(([I, h]) => {
+        let C = I?.split(".").length;
+        if (I == A.join(".") && C == A.length - 1) {
+          let N = I + "." + A;
+          k(I), At(N, h);
         }
       });
-      const j = L(m, r), F = L(E, r), W = l.updateType === "update" ? r.join(".") : [...r].slice(0, -1).join("."), rt = o.getState().stateComponents.get(c);
+      const O = L(m, r), j = L(E, r), W = d.updateType === "update" ? r.join(".") : [...r].slice(0, -1).join("."), rt = o.getState().stateComponents.get(l);
       if (rt)
-        for (const [b, v] of rt.components.entries()) {
+        for (const [b, I] of rt.components.entries()) {
           let h = !1;
-          const C = Array.isArray(v.reactiveType) ? v.reactiveType : [v.reactiveType || "component"];
+          const C = Array.isArray(I.reactiveType) ? I.reactiveType : [I.reactiveType || "component"];
           if (!C.includes("none")) {
             if (C.includes("all")) {
-              v.forceUpdate();
+              I.forceUpdate();
               continue;
             }
-            if (C.includes("component") && v.paths && (v.paths.has(W) || v.paths.has("")) && (h = !0), !h && C.includes("deps") && v.depsFunction) {
-              const N = v.depsFunction(E);
-              typeof N == "boolean" ? N && (h = !0) : G(v.deps, N) || (v.deps = N, h = !0);
+            if (C.includes("component") && I.paths && (I.paths.has(W) || I.paths.has("")) && (h = !0), !h && C.includes("deps") && I.depsFunction) {
+              const N = I.depsFunction(E);
+              typeof N == "boolean" ? N && (h = !0) : G(I.deps, N) || (I.deps = N, h = !0);
             }
-            h && v.forceUpdate();
+            h && I.forceUpdate();
           }
         }
       const ot = {
         timeStamp: Date.now(),
-        stateKey: c,
+        stateKey: l,
         path: r,
-        updateType: l.updateType,
+        updateType: d.updateType,
         status: "new",
-        oldValue: j,
-        newValue: F
+        oldValue: O,
+        newValue: j
       };
-      if (ht(c, (b) => {
+      if (ht(l, (b) => {
         const h = [...b ?? [], ot].reduce((C, N) => {
           const D = `${N.stateKey}:${JSON.stringify(N.path)}`, T = C.get(D);
           return T ? (T.timeStamp = Math.max(T.timeStamp, N.timeStamp), T.newValue = N.newValue, T.oldValue = T.oldValue ?? N.oldValue, T.updateType = N.updateType) : C.set(D, { ...N }), C;
@@ -295,73 +290,73 @@ function Ot(t, {
         return Array.from(h.values());
       }), Tt(
         E,
-        c,
+        l,
         $.current,
         V
       ), _ && _({
-        updateLog: R,
+        updateLog: U,
         update: ot
       }), $.current?.serverSync) {
-        const b = o.getState().serverState[c], v = $.current?.serverSync;
-        Ct(c, {
-          syncKey: typeof v.syncKey == "string" ? v.syncKey : v.syncKey({ state: E }),
+        const b = o.getState().serverState[l], I = $.current?.serverSync;
+        Ct(l, {
+          syncKey: typeof I.syncKey == "string" ? I.syncKey : I.syncKey({ state: E }),
           rollBackState: b,
-          actionTimeStamp: Date.now() + (v.debounce ?? 3e3),
+          actionTimeStamp: Date.now() + (I.debounce ?? 3e3),
           status: "waiting"
         });
       }
       return E;
     });
   };
-  o.getState().updaterState[c] || (B(
-    c,
+  o.getState().updaterState[l] || (B(
+    l,
     Z(
-      c,
-      P,
+      l,
+      R,
       i.current,
       V
     )
-  ), o.getState().cogsStateStore[c] || x(c, t), o.getState().initialStateGlobal[c] || nt(c, t));
+  ), o.getState().cogsStateStore[l] || x(l, t), o.getState().initialStateGlobal[l] || nt(l, t));
   const Q = It(() => Z(
-    c,
-    P,
+    l,
+    R,
     i.current,
     V
-  ), [c]);
-  return [gt(c), Q];
+  ), [l]);
+  return [gt(l), Q];
 }
 function Z(t, a, u, f) {
-  const d = /* @__PURE__ */ new Map();
+  const s = /* @__PURE__ */ new Map();
   let _ = 0;
-  const p = (s) => {
-    const e = s.join(".");
-    for (const [I] of d)
-      (I === e || I.startsWith(e + ".")) && d.delete(I);
+  const p = (c) => {
+    const e = c.join(".");
+    for (const [v] of s)
+      (v === e || v.startsWith(e + ".")) && s.delete(v);
     _++;
-  }, y = /* @__PURE__ */ new Map(), g = {
-    removeValidation: (s) => {
-      s?.validationKey && M(s.validationKey);
+  }, y = /* @__PURE__ */ new Map(), S = {
+    removeValidation: (c) => {
+      c?.validationKey && k(c.validationKey);
     },
-    revertToInitialState: (s) => {
+    revertToInitialState: (c) => {
       const e = o.getState().getInitialOptions(t)?.validation;
-      e?.key && M(e?.key), s?.validationKey && M(s.validationKey);
-      const I = o.getState().initialStateGlobal[t];
-      d.clear(), _++;
-      const V = w(I, []);
+      e?.key && k(e?.key), c?.validationKey && k(c.validationKey);
+      const v = o.getState().initialStateGlobal[t];
+      s.clear(), _++;
+      const V = w(v, []);
       J(() => {
-        B(t, V), x(t, I);
-        const k = o.getState().stateComponents.get(t);
-        k && k.components.forEach((R) => {
-          R.forceUpdate();
+        B(t, V), x(t, v);
+        const F = o.getState().stateComponents.get(t);
+        F && F.components.forEach((U) => {
+          U.forceUpdate();
         });
-        const c = et(t);
-        c?.localStorage?.key && localStorage.removeItem(
-          c?.initState ? f + "-" + t + "-" + c?.localStorage?.key : t
+        const l = et(t);
+        l?.localStorage?.key && localStorage.removeItem(
+          l?.initState ? f + "-" + t + "-" + l?.localStorage?.key : t
         ), localStorage.removeItem(t);
       });
     },
-    updateInitialState: (s) => {
-      d.clear(), _++;
+    updateInitialState: (c) => {
+      s.clear(), _++;
       const e = Z(
         t,
         a,
@@ -369,42 +364,42 @@ function Z(t, a, u, f) {
         f
       );
       return J(() => {
-        nt(t, s), B(t, e), x(t, s);
-        const I = o.getState().stateComponents.get(t);
-        I && I.components.forEach((V) => {
+        nt(t, c), B(t, e), x(t, c);
+        const v = o.getState().stateComponents.get(t);
+        v && v.components.forEach((V) => {
           V.forceUpdate();
         }), localStorage.removeItem(t);
       }), {
-        fetchId: (I) => e.get()[I]
+        fetchId: (v) => e.get()[v]
       };
     },
     _initialState: o.getState().initialStateGlobal[t],
     _serverState: o.getState().serverState[t],
     _isLoading: o.getState().isLoadingGlobal[t],
     _isServerSynced: () => {
-      const s = o.getState().serverState[t];
-      return !!(s && G(s, gt(t)));
+      const c = o.getState().serverState[t];
+      return !!(c && G(c, gt(t)));
     }
   };
-  function w(s, e = [], I) {
+  function w(c, e = [], v) {
     const V = e.map(String).join(".");
-    d.get(V);
-    const k = function() {
+    s.get(V);
+    const F = function() {
       return o().getNestedState(t, e);
     };
-    Object.keys(g).forEach((U) => {
-      k[U] = g[U];
+    Object.keys(S).forEach((P) => {
+      F[P] = S[P];
     });
-    const c = {
-      apply(U, i, $) {
+    const l = {
+      apply(P, i, $) {
         return o().getNestedState(t, e);
       },
-      get(U, i) {
+      get(P, i) {
         if (i !== "then" && !i.startsWith("$") && i !== "stateMapNoRender") {
-          const n = e.join("."), r = `${t}////${u}`, l = o.getState().stateComponents.get(t);
-          if (l) {
-            const S = l.components.get(r);
-            S && (e.length > 0 || i === "get") && S.paths.add(n);
+          const n = e.join("."), r = `${t}////${u}`, d = o.getState().stateComponents.get(t);
+          if (d) {
+            const g = d.components.get(r);
+            g && (e.length > 0 || i === "get") && g.paths.add(n);
           }
         }
         if (i === "showValidationErrors")
@@ -414,39 +409,39 @@ function Z(t, a, u, f) {
               throw new Error("Validation key not found");
             return o.getState().getValidationErrors(n.key + "." + e.join("."));
           };
-        if (Array.isArray(s)) {
+        if (Array.isArray(c)) {
           if (i === "getSelected")
             return () => {
               const n = y.get(e.join("."));
               if (n !== void 0)
                 return w(
-                  s[n],
+                  c[n],
                   [...e, n.toString()],
-                  I
+                  v
                 );
             };
           if (i === "stateMap" || i === "stateMapNoRender")
             return (n) => {
-              const r = I?.filtered?.some(
-                (S) => S.join(".") === e.join(".")
-              ), l = r ? s : o.getState().getNestedState(t, e);
-              return i !== "stateMapNoRender" && (d.clear(), _++), l.map((S, m) => {
-                const E = r && S.__origIndex ? S.__origIndex : m, O = w(
-                  S,
+              const r = v?.filtered?.some(
+                (g) => g.join(".") === e.join(".")
+              ), d = r ? c : o.getState().getNestedState(t, e);
+              return i !== "stateMapNoRender" && (s.clear(), _++), d.map((g, m) => {
+                const E = r && g.__origIndex ? g.__origIndex : m, M = w(
+                  g,
                   [...e, E.toString()],
-                  I
+                  v
                 );
                 return n(
-                  S,
-                  O,
+                  g,
+                  M,
                   m,
-                  s,
-                  w(s, e, I)
+                  c,
+                  w(c, e, v)
                 );
               });
             };
           if (i === "$stateMap")
-            return (n) => H(jt, {
+            return (n) => H(Mt, {
               proxy: {
                 _stateKey: t,
                 _path: e,
@@ -457,31 +452,31 @@ function Z(t, a, u, f) {
             });
           if (i === "stateFlattenOn")
             return (n) => {
-              const l = I?.filtered?.some(
+              const d = v?.filtered?.some(
                 (m) => m.join(".") === e.join(".")
-              ) ? s : o.getState().getNestedState(t, e);
-              d.clear(), _++;
-              const S = l.flatMap(
+              ) ? c : o.getState().getNestedState(t, e);
+              s.clear(), _++;
+              const g = d.flatMap(
                 (m, E) => m[n] ?? []
               );
               return w(
-                S,
+                g,
                 [...e, "[*]", n],
-                I
+                v
               );
             };
           if (i === "findWith")
             return (n, r) => {
-              const l = s.findIndex(
+              const d = c.findIndex(
                 (E) => E[n] === r
               );
-              if (l === -1) return;
-              const S = s[l], m = [...e, l.toString()];
-              return d.clear(), _++, d.clear(), _++, w(S, m);
+              if (d === -1) return;
+              const g = c[d], m = [...e, d.toString()];
+              return s.clear(), _++, s.clear(), _++, w(g, m);
             };
           if (i === "index")
             return (n) => {
-              const r = s[n];
+              const r = c[n];
               return w(r, [...e, n.toString()]);
             };
           if (i === "insert")
@@ -490,25 +485,25 @@ function Z(t, a, u, f) {
               []
             ));
           if (i === "uniqueInsert")
-            return (n, r, l) => {
-              const S = o.getState().getNestedState(t, e), m = ft(n) ? n(S) : n;
+            return (n, r, d) => {
+              const g = o.getState().getNestedState(t, e), m = ft(n) ? n(g) : n;
               let E = null;
-              if (!S.some((A) => {
+              if (!g.some((A) => {
                 if (r) {
-                  const F = r.every(
+                  const j = r.every(
                     (W) => G(A[W], m[W])
                   );
-                  return F && (E = A), F;
+                  return j && (E = A), j;
                 }
-                const j = G(A, m);
-                return j && (E = A), j;
+                const O = G(A, m);
+                return O && (E = A), O;
               }))
                 p(e), st(a, m, e, t);
-              else if (l && E) {
-                const A = l(E), j = S.map(
-                  (F) => G(F, E) ? A : F
+              else if (d && E) {
+                const A = d(E), O = g.map(
+                  (j) => G(j, E) ? A : j
                 );
-                p(e), q(a, j, e);
+                p(e), q(a, O, e);
               }
             };
           if (i === "cut")
@@ -517,15 +512,15 @@ function Z(t, a, u, f) {
             };
           if (i === "stateFilter")
             return (n) => {
-              const r = s.map((m, E) => ({
+              const r = c.map((m, E) => ({
                 ...m,
                 __origIndex: E.toString()
-              })), l = [], S = [];
+              })), d = [], g = [];
               for (let m = 0; m < r.length; m++)
-                n(r[m], m) && (l.push(m), S.push(r[m]));
-              return d.clear(), _++, w(S, e, {
-                filtered: [...I?.filtered || [], e],
-                validIndices: l
+                n(r[m], m) && (d.push(m), g.push(r[m]));
+              return s.clear(), _++, w(g, e, {
+                filtered: [...v?.filtered || [], e],
+                validIndices: d
                 // Always pass validIndices, even if empty
               });
             };
@@ -565,15 +560,15 @@ function Z(t, a, u, f) {
           return o.getState().getSyncInfo(n);
         }
         if (i === "_selected") {
-          const n = e.slice(0, -1), r = n.join("."), l = o.getState().getNestedState(t, n);
-          return Array.isArray(l) ? Number(e[e.length - 1]) === y.get(r) : void 0;
+          const n = e.slice(0, -1), r = n.join("."), d = o.getState().getNestedState(t, n);
+          return Array.isArray(d) ? Number(e[e.length - 1]) === y.get(r) : void 0;
         }
         if (i == "getLocalStorage")
           return (n) => St(f + "-" + t + "-" + n);
         if (i === "setSelected")
           return (n) => {
-            const r = e.slice(0, -1), l = Number(e[e.length - 1]), S = r.join(".");
-            n ? y.set(S, l) : y.delete(S);
+            const r = e.slice(0, -1), d = Number(e[e.length - 1]), g = r.join(".");
+            n ? y.set(g, d) : y.delete(g);
             const m = o.getState().getNestedState(t, [...r]);
             q(a, m, r), p(r);
           };
@@ -585,20 +580,20 @@ function Z(t, a, u, f) {
                 throw new Error("Zod schema not found");
               if (!n?.key)
                 throw new Error("Validation key not found");
-              M(n.key);
-              const l = o.getState().cogsStateStore[t];
+              k(n.key);
+              const d = o.getState().cogsStateStore[t];
               try {
-                const S = o.getState().getValidationErrors(n.key);
-                S && S.length > 0 && S.forEach(([E]) => {
-                  E && E.startsWith(n.key) && M(E);
+                const g = o.getState().getValidationErrors(n.key);
+                g && g.length > 0 && g.forEach(([E]) => {
+                  E && E.startsWith(n.key) && k(E);
                 });
-                const m = n.zodSchema.safeParse(l);
-                return m.success ? !0 : (m.error.errors.forEach((O) => {
-                  const A = O.path, j = O.message, F = [n.key, ...A].join(".");
-                  r(F, j);
+                const m = n.zodSchema.safeParse(d);
+                return m.success ? !0 : (m.error.errors.forEach((M) => {
+                  const A = M.path, O = M.message, j = [n.key, ...A].join(".");
+                  r(j, O);
                 }), mt(t), !1);
-              } catch (S) {
-                return console.error("Zod schema validation failed", S), !1;
+              } catch (g) {
+                return console.error("Zod schema validation failed", g), !1;
               }
             };
           if (i === "_componentId") return u;
@@ -613,9 +608,9 @@ function Z(t, a, u, f) {
           if (i === "_isLoading")
             return o.getState().isLoadingGlobal[t];
           if (i === "revertToInitialState")
-            return g.revertToInitialState;
-          if (i === "updateInitialState") return g.updateInitialState;
-          if (i === "removeValidation") return g.removeValidation;
+            return S.revertToInitialState;
+          if (i === "updateInitialState") return S.updateInitialState;
+          if (i === "removeValidation") return S.removeValidation;
         }
         if (i === "getFormRef")
           return () => lt.getState().getFormRef(t + "." + e.join("."));
@@ -630,25 +625,25 @@ function Z(t, a, u, f) {
               path: e,
               validationKey: o.getState().getInitialOptions(t)?.validation?.key || "",
               stateKey: t,
-              validIndices: I?.validIndices,
+              validIndices: v?.validIndices,
               children: n
             }
           );
         if (i === "_stateKey") return t;
         if (i === "_path") return e;
-        if (i === "_isServerSynced") return g._isServerSynced;
+        if (i === "_isServerSynced") return S._isServerSynced;
         if (i === "update")
           return (n, r) => {
             if (r?.debounce)
               pt(() => {
                 q(a, n, e, "");
-                const l = o.getState().getNestedState(t, e);
-                r?.afterUpdate && r.afterUpdate(l);
+                const d = o.getState().getNestedState(t, e);
+                r?.afterUpdate && r.afterUpdate(d);
               }, r.debounce);
             else {
               q(a, n, e, "");
-              const l = o.getState().getNestedState(t, e);
-              r?.afterUpdate && r.afterUpdate(l);
+              const d = o.getState().getNestedState(t, e);
+              r?.afterUpdate && r.afterUpdate(d);
             }
             p(e);
           };
@@ -663,23 +658,23 @@ function Z(t, a, u, f) {
               formOpts: r
             }
           );
-        const P = [...e, i], Q = o.getState().getNestedState(t, P);
-        return w(Q, P, I);
+        const R = [...e, i], Q = o.getState().getNestedState(t, R);
+        return w(Q, R, v);
       }
-    }, R = new Proxy(k, c);
-    return d.set(V, {
-      proxy: R,
+    }, U = new Proxy(F, l);
+    return s.set(V, {
+      proxy: U,
       stateVersion: _
-    }), R;
+    }), U;
   }
   return w(
     o.getState().getNestedState(t, [])
   );
 }
 function X(t) {
-  return H(bt, { proxy: t });
+  return H(Ot, { proxy: t });
 }
-function jt({
+function Mt({
   proxy: t,
   rebuildStateShape: a
 }) {
@@ -688,19 +683,19 @@ function jt({
     u,
     t._path
   ).stateMapNoRender(
-    (d, _, p, y, g) => t._mapFn(d, _, p, y, g)
+    (s, _, p, y, S) => t._mapFn(s, _, p, y, S)
   ) : null;
 }
-function bt({
+function Ot({
   proxy: t
 }) {
   const a = z(null), u = `${t._stateKey}-${t._path.join(".")}`;
   return K(() => {
     const f = a.current;
     if (!f || !f.parentElement) return;
-    const d = f.parentElement, p = Array.from(d.childNodes).indexOf(f);
-    let y = d.getAttribute("data-parent-id");
-    y || (y = `parent-${crypto.randomUUID()}`, d.setAttribute("data-parent-id", y));
+    const s = f.parentElement, p = Array.from(s.childNodes).indexOf(f);
+    let y = s.getAttribute("data-parent-id");
+    y || (y = `parent-${crypto.randomUUID()}`, s.setAttribute("data-parent-id", y));
     const w = {
       instanceId: `instance-${crypto.randomUUID()}`,
       parentId: y,
@@ -708,22 +703,22 @@ function bt({
       effect: t._effect
     };
     o.getState().addSignalElement(u, w);
-    const s = o.getState().getNestedState(t._stateKey, t._path);
+    const c = o.getState().getNestedState(t._stateKey, t._path);
     let e;
     if (t._effect)
       try {
         e = new Function(
           "state",
           `return (${t._effect})(state)`
-        )(s);
+        )(c);
       } catch (V) {
-        console.error("Error evaluating effect function during mount:", V), e = s;
+        console.error("Error evaluating effect function during mount:", V), e = c;
       }
     else
-      e = s;
+      e = c;
     e !== null && typeof e == "object" && (e = JSON.stringify(e));
-    const I = document.createTextNode(String(e));
-    f.replaceWith(I);
+    const v = document.createTextNode(String(e));
+    f.replaceWith(v);
   }, [t._stateKey, t._path.join("."), t._effect]), H("span", {
     ref: a,
     style: { display: "none" },
@@ -751,6 +746,6 @@ export {
   Wt as addStateOptions,
   qt as createCogsState,
   zt as notifyComponent,
-  Ot as useCogsStateFn
+  jt as useCogsStateFn
 };
 //# sourceMappingURL=CogsState.jsx.map