cogsbox-state 0.5.97 → 0.5.99

package/dist/CogsState.jsx

@@ -1,54 +1,54 @@
 "use client";
-import { jsx as lt } from "react/jsx-runtime";
-import { useState as et, useRef as Z, useEffect as nt, useLayoutEffect as _t, useMemo as Et, createElement as Q, useSyncExternalStore as $t, startTransition as H } from "react";
-import { transformStateFunc as wt, isFunction as L, getNestedValue as U, isDeepEqual as M, debounce as Nt } from "./utility.js";
-import { pushFunc as K, updateFn as B, cutFunc as J, ValidationWrapper as Vt, FormControlComponent as At } from "./Functions.jsx";
+import { jsx as ct } from "react/jsx-runtime";
+import { useState as et, useRef as Z, useEffect as nt, useLayoutEffect as It, useMemo as _t, createElement as Q, useSyncExternalStore as Et, startTransition as H } from "react";
+import { transformStateFunc as wt, isFunction as L, getNestedValue as U, isDeepEqual as M, debounce as $t } from "./utility.js";
+import { pushFunc as K, updateFn as B, cutFunc as J, ValidationWrapper as Nt, FormControlComponent as Vt } from "./Functions.jsx";
 import "zod";
-import { getGlobalStore as r, formRefStore as dt } from "./store.js";
-import { useCogsConfig as ht } from "./CogsStateClient.jsx";
+import { getGlobalStore as r, formRefStore as lt } from "./store.js";
+import { useCogsConfig as At } from "./CogsStateClient.jsx";
 import rt from "./node_modules/uuid/dist/esm-browser/v4.js";
-function ut(t, i) {
-  const m = r.getState().getInitialOptions, y = r.getState().setInitialStateOptions, g = m(t) || {};
+function dt(t, i) {
+  const m = r.getState().getInitialOptions, y = r.getState().setInitialStateOptions, u = m(t) || {};
   y(t, {
-    ...g,
+    ...u,
     ...i
   });
 }
-function gt({
+function ut({
   stateKey: t,
   options: i,
   initialOptionsPart: m
 }) {
-  const y = q(t) || {}, g = m[t] || {}, E = r.getState().setInitialStateOptions, _ = { ...g, ...y };
+  const y = q(t) || {}, u = m[t] || {}, w = r.getState().setInitialStateOptions, E = { ...u, ...y };
   let v = !1;
   if (i)
     for (const l in i)
-      _.hasOwnProperty(l) ? l == "localStorage" && i[l] && _[l].key !== i[l]?.key && (v = !0, _[l] = i[l]) : (v = !0, _[l] = i[l]);
-  v && E(t, _);
+      E.hasOwnProperty(l) ? l == "localStorage" && i[l] && E[l].key !== i[l]?.key && (v = !0, E[l] = i[l]) : (v = !0, E[l] = i[l]);
+  v && w(t, E);
 }
 function qt(t, { formElements: i, validation: m }) {
   return { initialState: t, formElements: i, validation: m };
 }
 const zt = (t, i) => {
   let m = t;
-  const [y, g] = wt(m);
-  (Object.keys(g).length > 0 || i && Object.keys(i).length > 0) && Object.keys(g).forEach((v) => {
-    g[v] = g[v] || {}, g[v].formElements = {
+  const [y, u] = wt(m);
+  (Object.keys(u).length > 0 || i && Object.keys(i).length > 0) && Object.keys(u).forEach((v) => {
+    u[v] = u[v] || {}, u[v].formElements = {
       ...i?.formElements,
       // Global defaults first
       ...i?.validation,
-      ...g[v].formElements || {}
+      ...u[v].formElements || {}
       // State-specific overrides
-    }, q(v) || r.getState().setInitialStateOptions(v, g[v]);
+    }, q(v) || r.getState().setInitialStateOptions(v, u[v]);
   }), r.getState().setInitialStates(y);
-  const E = (v, l) => {
+  const w = (v, l) => {
     const [f] = et(l?.componentId ?? rt());
-    gt({
+    ut({
       stateKey: v,
       options: l,
-      initialOptionsPart: g
+      initialOptionsPart: u
     });
-    const e = r.getState().cogsStateStore[v] || y[v], S = l?.modifyState ? l.modifyState(e) : e, [T, h] = Ot(
+    const e = r.getState().cogsStateStore[v] || y[v], S = l?.modifyState ? l.modifyState(e) : e, [x, A] = Ot(
       S,
       {
         stateKey: v,
@@ -63,24 +63,24 @@ const zt = (t, i) => {
         dependencies: l?.dependencies
       }
     );
-    return h;
+    return A;
   };
-  function _(v, l) {
-    gt({ stateKey: v, options: l, initialOptionsPart: g });
+  function E(v, l) {
+    ut({ stateKey: v, options: l, initialOptionsPart: u });
   }
-  return { useCogsState: E, setCogsOptions: _ };
+  return { useCogsState: w, setCogsOptions: E };
 }, {
   setUpdaterState: Y,
   setState: D,
   getInitialOptions: q,
-  getKeyState: St,
-  getValidationErrors: pt,
+  getKeyState: gt,
+  getValidationErrors: ht,
   setStateLog: Ct,
-  updateInitialStateGlobal: at,
+  updateInitialStateGlobal: ot,
   addValidationError: kt,
   removeValidationError: P,
-  setServerSyncActions: xt
-} = r.getState(), mt = (t) => {
+  setServerSyncActions: pt
+} = r.getState(), ft = (t) => {
   if (!t) return null;
   try {
     const i = window.localStorage.getItem(t);
@@ -88,38 +88,38 @@ const zt = (t, i) => {
   } catch (i) {
     return console.error("Error loading from localStorage:", i), null;
   }
-}, Tt = (t, i, m, y) => {
+}, xt = (t, i, m, y) => {
   m?.log && console.log(
     "saving to localstorage",
     i,
     m.localStorage?.key,
     y
   );
-  const g = L(m?.localStorage?.key) ? m.localStorage?.key(t) : m?.localStorage?.key;
-  if (g && y) {
-    const E = {
+  const u = L(m?.localStorage?.key) ? m.localStorage?.key(t) : m?.localStorage?.key;
+  if (u && y) {
+    const w = {
       state: t,
       lastUpdated: Date.now(),
       lastSyncedWithServer: r.getState().serverSyncLog[i]?.[0]?.timeStamp,
       baseServerState: r.getState().serverState[i]
-    }, _ = `${y}-${i}-${g}`;
-    window.localStorage.setItem(_, JSON.stringify(E));
+    }, E = `${y}-${i}-${u}`;
+    window.localStorage.setItem(E, JSON.stringify(w));
   }
-}, ft = (t, i, m, y, g, E) => {
-  const _ = {
+}, Tt = (t, i, m, y, u, w) => {
+  const E = {
     initialState: i,
     updaterState: X(
       t,
       y,
-      g,
-      E
+      u,
+      w
     ),
     state: m
   };
   H(() => {
-    at(t, _.initialState), Y(t, _.updaterState), D(t, _.state);
+    ot(t, E.initialState), Y(t, E.updaterState), D(t, E.state);
   });
-}, ot = (t) => {
+}, St = (t) => {
   const i = r.getState().stateComponents.get(t);
   if (!i) return;
   const m = /* @__PURE__ */ new Set();
@@ -133,29 +133,29 @@ const zt = (t, i) => {
 }, Bt = (t, i) => {
   const m = r.getState().stateComponents.get(t);
   if (m) {
-    const y = `${t}////${i}`, g = m.components.get(y);
-    g && g.forceUpdate();
+    const y = `${t}////${i}`, u = m.components.get(y);
+    u && u.forceUpdate();
   }
 };
 function Ot(t, {
   stateKey: i,
   serverSync: m,
   localStorage: y,
-  formElements: g,
-  middleware: E,
-  reactiveDeps: _,
+  formElements: u,
+  middleware: w,
+  reactiveDeps: E,
   reactiveType: v,
   componentId: l,
   initialState: f,
   syncUpdate: e,
   dependencies: S
 } = {}) {
-  const [T, h] = et({}), { sessionId: x } = ht();
+  const [x, A] = et({}), { sessionId: T } = At();
   let R = !i;
-  const [d] = et(i ?? rt()), s = r.getState().stateLog[d], G = Z(/* @__PURE__ */ new Set()), j = Z(l ?? rt()), C = Z(null);
-  C.current = q(d), nt(() => {
-    if (e && e.stateKey === d && e.path?.[0]) {
-      D(d, (o) => ({
+  const [g] = et(i ?? rt()), s = r.getState().stateLog[g], G = Z(/* @__PURE__ */ new Set()), b = Z(l ?? rt()), C = Z(null);
+  C.current = q(g), nt(() => {
+    if (e && e.stateKey === g && e.path?.[0]) {
+      D(g, (o) => ({
         ...o,
         [e.path[0]]: e.newValue
       }));
@@ -166,180 +166,171 @@ function Ot(t, {
       });
     }
   }, [e]), nt(() => {
-    ut(d, {
+    dt(g, {
       initialState: f
     });
-    let c = null;
-    f && (c = f), c && (console.log("newState thius is newstate", c), ft(
-      d,
+    const c = C.current;
+    let o = null;
+    const d = L(c?.localStorage?.key) ? c?.localStorage?.key(f) : c?.localStorage?.key;
+    c?.log && (console.log("newoptions", c), console.log("localkey", d), console.log("initialState", f)), d && T && (o = ft(
+      T + "-" + g + "-" + d
+    ));
+    let I = null, k = !1;
+    f && (I = f), o && o.lastUpdated > (o.lastSyncedWithServer || 0) && (I = o.state, k = !0), I && (console.log("newState thius is newstate", I), Tt(
+      g,
       f,
-      c,
+      I,
       n,
-      j.current,
-      x
-    ), ot(d), h({}));
-  }, [f, ...S || []]), _t(() => {
-    R && ut(d, {
+      b.current,
+      T
+    ), k && c?.localStorage?.onChange && c?.localStorage?.onChange(I), St(g), A({}));
+  }, [f, ...S || []]), It(() => {
+    R && dt(g, {
       serverSync: m,
-      formElements: g,
+      formElements: u,
       initialState: f,
       localStorage: y,
-      middleware: E
+      middleware: w
     });
-    const c = `${d}////${j.current}`, o = r.getState().stateComponents.get(d) || {
+    const c = `${g}////${b.current}`, o = r.getState().stateComponents.get(g) || {
       components: /* @__PURE__ */ new Map()
     };
-    o.components.set(c, {
-      forceUpdate: () => h({}),
+    return o.components.set(c, {
+      forceUpdate: () => A({}),
       paths: /* @__PURE__ */ new Set(),
       deps: [],
-      depsFunction: _ || void 0,
+      depsFunction: E || void 0,
       reactiveType: v ?? ["component", "deps"]
-    }), r.getState().stateComponents.set(d, o);
-    const u = C.current, $ = L(u?.localStorage?.key) ? u?.localStorage?.key(f) : u?.localStorage?.key;
-    if ($ && x) {
-      let w = mt(
-        x + "-" + d + "-" + $
-      );
-      w && w.lastUpdated && w.lastUpdated > (w.lastSyncedWithServer || 0) && (ft(
-        d,
-        f,
-        w.state,
-        n,
-        j.current,
-        x
-      ), u?.localStorage?.onChange(w.state), ot(d));
-    }
-    return h({}), () => {
-      const w = `${d}////${j.current}`;
-      o && (o.components.delete(w), o.components.size === 0 && r.getState().stateComponents.delete(d));
+    }), r.getState().stateComponents.set(g, o), A({}), () => {
+      const d = `${g}////${b.current}`;
+      o && (o.components.delete(d), o.components.size === 0 && r.getState().stateComponents.delete(g));
     };
   }, []);
-  const n = (c, o, u, $) => {
+  const n = (c, o, d, I) => {
     if (Array.isArray(o)) {
-      const w = `${d}-${o.join(".")}`;
-      G.current.add(w);
+      const k = `${g}-${o.join(".")}`;
+      G.current.add(k);
     }
-    D(d, (w) => {
-      const V = L(c) ? c(w) : c, b = `${d}-${o.join(".")}`;
-      if (b) {
-        let F = !1, I = r.getState().signalDomElements.get(b);
-        if ((!I || I.size === 0) && (u.updateType === "insert" || u.updateType === "cut")) {
-          const A = o.slice(0, -1), p = U(V, A);
-          if (Array.isArray(p)) {
+    D(g, (k) => {
+      const N = L(c) ? c(k) : c, j = `${g}-${o.join(".")}`;
+      if (j) {
+        let F = !1, _ = r.getState().signalDomElements.get(j);
+        if ((!_ || _.size === 0) && (d.updateType === "insert" || d.updateType === "cut")) {
+          const V = o.slice(0, -1), h = U(N, V);
+          if (Array.isArray(h)) {
             F = !0;
-            const N = `${d}-${A.join(".")}`;
-            I = r.getState().signalDomElements.get(N);
+            const $ = `${g}-${V.join(".")}`;
+            _ = r.getState().signalDomElements.get($);
           }
         }
-        if (I) {
-          const A = F ? U(V, o.slice(0, -1)) : U(V, o);
-          I.forEach(({ parentId: p, position: N, effect: W }) => {
+        if (_) {
+          const V = F ? U(N, o.slice(0, -1)) : U(N, o);
+          _.forEach(({ parentId: h, position: $, effect: W }) => {
             const O = document.querySelector(
-              `[data-parent-id="${p}"]`
+              `[data-parent-id="${h}"]`
             );
             if (O) {
-              const ct = Array.from(O.childNodes);
-              if (ct[N]) {
-                const It = W ? new Function("state", `return (${W})(state)`)(A) : A;
-                ct[N].textContent = String(It);
+              const st = Array.from(O.childNodes);
+              if (st[$]) {
+                const vt = W ? new Function("state", `return (${W})(state)`)(V) : V;
+                st[$].textContent = String(vt);
               }
             }
           });
         }
       }
-      u.updateType === "update" && ($ || C.current?.validationKey) && o && P(
-        ($ || C.current?.validationKey) + "." + o.join(".")
+      d.updateType === "update" && (I || C.current?.validationKey) && o && P(
+        (I || C.current?.validationKey) + "." + o.join(".")
       );
-      const k = o.slice(0, o.length - 1);
-      u.updateType === "cut" && C.current?.validationKey && P(
-        C.current?.validationKey + "." + k.join(".")
-      ), u.updateType === "insert" && C.current?.validationKey && pt(
-        C.current?.validationKey + "." + k.join(".")
-      ).filter(([I, A]) => {
-        let p = I?.split(".").length;
-        if (I == k.join(".") && p == k.length - 1) {
-          let N = I + "." + k;
-          P(I), kt(N, A);
+      const p = o.slice(0, o.length - 1);
+      d.updateType === "cut" && C.current?.validationKey && P(
+        C.current?.validationKey + "." + p.join(".")
+      ), d.updateType === "insert" && C.current?.validationKey && ht(
+        C.current?.validationKey + "." + p.join(".")
+      ).filter(([_, V]) => {
+        let h = _?.split(".").length;
+        if (_ == p.join(".") && h == p.length - 1) {
+          let $ = _ + "." + p;
+          P(_), kt($, V);
         }
       });
-      const z = U(w, o), yt = U(V, o), vt = u.updateType === "update" ? o.join(".") : [...o].slice(0, -1).join("."), it = r.getState().stateComponents.get(d);
-      if (it)
-        for (const [F, I] of it.components.entries()) {
-          let A = !1;
-          const p = Array.isArray(I.reactiveType) ? I.reactiveType : [I.reactiveType || "component"];
-          if (!p.includes("none")) {
-            if (p.includes("all")) {
-              I.forceUpdate();
+      const z = U(k, o), mt = U(N, o), yt = d.updateType === "update" ? o.join(".") : [...o].slice(0, -1).join("."), at = r.getState().stateComponents.get(g);
+      if (at)
+        for (const [F, _] of at.components.entries()) {
+          let V = !1;
+          const h = Array.isArray(_.reactiveType) ? _.reactiveType : [_.reactiveType || "component"];
+          if (!h.includes("none")) {
+            if (h.includes("all")) {
+              _.forceUpdate();
               continue;
             }
-            if (p.includes("component") && I.paths && (I.paths.has(vt) || I.paths.has("")) && (A = !0), !A && p.includes("deps") && I.depsFunction) {
-              const N = I.depsFunction(V);
-              typeof N == "boolean" ? N && (A = !0) : M(I.deps, N) || (I.deps = N, A = !0);
+            if (h.includes("component") && _.paths && (_.paths.has(yt) || _.paths.has("")) && (V = !0), !V && h.includes("deps") && _.depsFunction) {
+              const $ = _.depsFunction(N);
+              typeof $ == "boolean" ? $ && (V = !0) : M(_.deps, $) || (_.deps = $, V = !0);
             }
-            A && I.forceUpdate();
+            V && _.forceUpdate();
           }
         }
-      const st = {
+      const it = {
         timeStamp: Date.now(),
-        stateKey: d,
+        stateKey: g,
         path: o,
-        updateType: u.updateType,
+        updateType: d.updateType,
         status: "new",
         oldValue: z,
-        newValue: yt
+        newValue: mt
       };
-      if (Ct(d, (F) => {
-        const A = [...F ?? [], st].reduce((p, N) => {
-          const W = `${N.stateKey}:${JSON.stringify(N.path)}`, O = p.get(W);
-          return O ? (O.timeStamp = Math.max(O.timeStamp, N.timeStamp), O.newValue = N.newValue, O.oldValue = O.oldValue ?? N.oldValue, O.updateType = N.updateType) : p.set(W, { ...N }), p;
+      if (Ct(g, (F) => {
+        const V = [...F ?? [], it].reduce((h, $) => {
+          const W = `${$.stateKey}:${JSON.stringify($.path)}`, O = h.get(W);
+          return O ? (O.timeStamp = Math.max(O.timeStamp, $.timeStamp), O.newValue = $.newValue, O.oldValue = O.oldValue ?? $.oldValue, O.updateType = $.updateType) : h.set(W, { ...$ }), h;
         }, /* @__PURE__ */ new Map());
-        return Array.from(A.values());
-      }), Tt(
-        V,
-        d,
+        return Array.from(V.values());
+      }), xt(
+        N,
+        g,
         C.current,
-        x
-      ), E && E({
+        T
+      ), w && w({
         updateLog: s,
-        update: st
+        update: it
       }), C.current?.serverSync) {
-        const F = r.getState().serverState[d], I = C.current?.serverSync;
-        xt(d, {
-          syncKey: typeof I.syncKey == "string" ? I.syncKey : I.syncKey({ state: V }),
+        const F = r.getState().serverState[g], _ = C.current?.serverSync;
+        pt(g, {
+          syncKey: typeof _.syncKey == "string" ? _.syncKey : _.syncKey({ state: N }),
           rollBackState: F,
-          actionTimeStamp: Date.now() + (I.debounce ?? 3e3),
+          actionTimeStamp: Date.now() + (_.debounce ?? 3e3),
           status: "waiting"
         });
       }
-      return V;
+      return N;
     });
   };
-  r.getState().updaterState[d] || (Y(
-    d,
+  r.getState().updaterState[g] || (Y(
+    g,
     X(
-      d,
+      g,
       n,
-      j.current,
-      x
+      b.current,
+      T
     )
-  ), r.getState().cogsStateStore[d] || D(d, t), r.getState().initialStateGlobal[d] || at(d, t));
-  const a = Et(() => X(
-    d,
+  ), r.getState().cogsStateStore[g] || D(g, t), r.getState().initialStateGlobal[g] || ot(g, t));
+  const a = _t(() => X(
+    g,
     n,
-    j.current,
-    x
-  ), [d]);
-  return [St(d), a];
+    b.current,
+    T
+  ), [g]);
+  return [gt(g), a];
 }
 function X(t, i, m, y) {
-  const g = /* @__PURE__ */ new Map();
-  let E = 0;
-  const _ = (f) => {
+  const u = /* @__PURE__ */ new Map();
+  let w = 0;
+  const E = (f) => {
     const e = f.join(".");
-    for (const [S] of g)
-      (S === e || S.startsWith(e + ".")) && g.delete(S);
-    E++;
+    for (const [S] of u)
+      (S === e || S.startsWith(e + ".")) && u.delete(S);
+    w++;
   }, v = {
     removeValidation: (f) => {
       f?.validationKey && P(f.validationKey);
@@ -348,18 +339,18 @@ function X(t, i, m, y) {
       const e = r.getState().getInitialOptions(t)?.validation;
       e?.key && P(e?.key), f?.validationKey && P(f.validationKey);
       const S = r.getState().initialStateGlobal[t];
-      g.clear(), E++;
-      const T = l(S, []), h = q(t), x = L(h?.localStorage?.key) ? h?.localStorage?.key(S) : h?.localStorage?.key, R = `${y}-${t}-${x}`;
+      u.clear(), w++;
+      const x = l(S, []), A = q(t), T = L(A?.localStorage?.key) ? A?.localStorage?.key(S) : A?.localStorage?.key, R = `${y}-${t}-${T}`;
       return R && localStorage.removeItem(R), H(() => {
-        Y(t, T), D(t, S);
-        const d = r.getState().stateComponents.get(t);
-        d && d.components.forEach((s) => {
+        Y(t, x), D(t, S);
+        const g = r.getState().stateComponents.get(t);
+        g && g.components.forEach((s) => {
           s.forceUpdate();
         });
       }), S;
     },
     updateInitialState: (f) => {
-      g.clear(), E++;
+      u.clear(), w++;
       const e = X(
         t,
         i,
@@ -367,10 +358,10 @@ function X(t, i, m, y) {
         y
       );
       return H(() => {
-        at(t, f), Y(t, e), D(t, f);
+        ot(t, f), Y(t, e), D(t, f);
         const S = r.getState().stateComponents.get(t);
-        S && S.components.forEach((T) => {
-          T.forceUpdate();
+        S && S.components.forEach((x) => {
+          x.forceUpdate();
         });
       }), {
         fetchId: (S) => e.get()[S]
@@ -381,25 +372,25 @@ function X(t, i, m, y) {
     _isLoading: r.getState().isLoadingGlobal[t],
     _isServerSynced: () => {
       const f = r.getState().serverState[t];
-      return !!(f && M(f, St(t)));
+      return !!(f && M(f, gt(t)));
     }
   };
   function l(f, e = [], S) {
-    const T = e.map(String).join(".");
-    g.get(T);
-    const h = function() {
+    const x = e.map(String).join(".");
+    u.get(x);
+    const A = function() {
       return r().getNestedState(t, e);
     };
-    Object.keys(v).forEach((d) => {
-      h[d] = v[d];
+    Object.keys(v).forEach((g) => {
+      A[g] = v[g];
     });
-    const x = {
-      apply(d, s, G) {
+    const T = {
+      apply(g, s, G) {
         return console.log(
           `PROXY APPLY TRAP HIT: stateKey=${t}, path=${e.join(".")}`
         ), console.trace("Apply trap stack trace"), r().getNestedState(t, e);
       },
-      get(d, s) {
+      get(g, s) {
         if (s !== "then" && !s.startsWith("$") && s !== "stateMapNoRender") {
           const n = e.join("."), a = `${t}////${m}`, c = r.getState().stateComponents.get(t);
           if (c) {
@@ -446,14 +437,14 @@ function X(t, i, m, y) {
             return () => r.getState().getSelectedIndex(t, e.join(".")) ?? -1;
           if (s === "stateSort")
             return (n) => {
-              const o = [...r.getState().getNestedState(t, e).map((u, $) => ({
-                ...u,
-                __origIndex: $.toString()
+              const o = [...r.getState().getNestedState(t, e).map((d, I) => ({
+                ...d,
+                __origIndex: I.toString()
               }))].sort(n);
-              return g.clear(), E++, l(o, e, {
+              return u.clear(), w++, l(o, e, {
                 filtered: [...S?.filtered || [], e],
                 validIndices: o.map(
-                  (u) => parseInt(u.__origIndex)
+                  (d) => parseInt(d.__origIndex)
                 )
               });
             };
@@ -462,16 +453,16 @@ function X(t, i, m, y) {
               const a = S?.filtered?.some(
                 (o) => o.join(".") === e.join(".")
               ), c = a ? f : r.getState().getNestedState(t, e);
-              return s !== "stateMapNoRender" && (g.clear(), E++), c.map((o, u) => {
-                const $ = a && o.__origIndex ? o.__origIndex : u, w = l(
+              return s !== "stateMapNoRender" && (u.clear(), w++), c.map((o, d) => {
+                const I = a && o.__origIndex ? o.__origIndex : d, k = l(
                   o,
-                  [...e, $.toString()],
+                  [...e, I.toString()],
                   S
                 );
                 return n(
                   o,
-                  w,
-                  u,
+                  k,
+                  d,
                   f,
                   l(f, e, S)
                 );
@@ -490,11 +481,11 @@ function X(t, i, m, y) {
           if (s === "stateFlattenOn")
             return (n) => {
               const c = S?.filtered?.some(
-                (u) => u.join(".") === e.join(".")
+                (d) => d.join(".") === e.join(".")
               ) ? f : r.getState().getNestedState(t, e);
-              g.clear(), E++;
+              u.clear(), w++;
               const o = c.flatMap(
-                (u, $) => u[n] ?? []
+                (d, I) => d[n] ?? []
               );
               return l(
                 o,
@@ -505,11 +496,11 @@ function X(t, i, m, y) {
           if (s === "findWith")
             return (n, a) => {
               const c = f.findIndex(
-                ($) => $[n] === a
+                (I) => I[n] === a
               );
               if (c === -1) return;
-              const o = f[c], u = [...e, c.toString()];
-              return g.clear(), E++, g.clear(), E++, l(o, u);
+              const o = f[c], d = [...e, c.toString()];
+              return u.clear(), w++, u.clear(), w++, l(o, d);
             };
           if (s === "index")
             return (n) => {
@@ -517,35 +508,35 @@ function X(t, i, m, y) {
               return l(a, [...e, n.toString()]);
             };
           if (s === "insert")
-            return (n) => (_(e), K(i, n, e, t), l(
+            return (n) => (E(e), K(i, n, e, t), l(
               r.getState().cogsStateStore[t],
               []
             ));
           if (s === "uniqueInsert")
             return (n, a, c) => {
-              const o = r.getState().getNestedState(t, e), u = L(n) ? n(o) : n;
-              let $ = null;
-              if (!o.some((V) => {
+              const o = r.getState().getNestedState(t, e), d = L(n) ? n(o) : n;
+              let I = null;
+              if (!o.some((N) => {
                 if (a) {
-                  const k = a.every(
-                    (z) => M(V[z], u[z])
+                  const p = a.every(
+                    (z) => M(N[z], d[z])
                   );
-                  return k && ($ = V), k;
+                  return p && (I = N), p;
                 }
-                const b = M(V, u);
-                return b && ($ = V), b;
+                const j = M(N, d);
+                return j && (I = N), j;
               }))
-                _(e), K(i, u, e, t);
-              else if (c && $) {
-                const V = c($), b = o.map(
-                  (k) => M(k, $) ? V : k
+                E(e), K(i, d, e, t);
+              else if (c && I) {
+                const N = c(I), j = o.map(
+                  (p) => M(p, I) ? N : p
                 );
-                _(e), B(i, b, e);
+                E(e), B(i, j, e);
               }
             };
           if (s === "cut")
             return (n, a) => {
-              a?.waitForSync || (_(e), J(i, e, t, n));
+              a?.waitForSync || (E(e), J(i, e, t, n));
             };
           if (s === "cutByValue")
             return (n) => {
@@ -559,13 +550,13 @@ function X(t, i, m, y) {
             };
           if (s === "stateFilter")
             return (n) => {
-              const a = f.map((u, $) => ({
-                ...u,
-                __origIndex: $.toString()
+              const a = f.map((d, I) => ({
+                ...d,
+                __origIndex: I.toString()
               })), c = [], o = [];
-              for (let u = 0; u < a.length; u++)
-                n(a[u], u) && (c.push(u), o.push(a[u]));
-              return g.clear(), E++, l(o, e, {
+              for (let d = 0; d < a.length; d++)
+                n(a[d], d) && (c.push(d), o.push(a[d]));
+              return u.clear(), w++, l(o, e, {
                 filtered: [...S?.filtered || [], e],
                 validIndices: c
                 // Always pass validIndices, even if empty
@@ -607,7 +598,7 @@ function X(t, i, m, y) {
           return r.getState().getSyncInfo(n);
         }
         if (s == "getLocalStorage")
-          return (n) => mt(y + "-" + t + "-" + n);
+          return (n) => ft(y + "-" + t + "-" + n);
         if (s === "_selected") {
           const n = e.slice(0, -1), a = n.join("."), c = r.getState().getNestedState(t, n);
           return Array.isArray(c) ? Number(e[e.length - 1]) === r.getState().getSelectedIndex(t, a) : void 0;
@@ -616,8 +607,8 @@ function X(t, i, m, y) {
           return (n) => {
             const a = e.slice(0, -1), c = Number(e[e.length - 1]), o = a.join(".");
             n ? r.getState().setSelectedIndex(t, o, c) : r.getState().setSelectedIndex(t, o, void 0);
-            const u = r.getState().getNestedState(t, [...a]);
-            B(i, u, a), _(a);
+            const d = r.getState().getNestedState(t, [...a]);
+            B(i, d, a), E(a);
           };
         if (e.length == 0) {
           if (s === "validateZodSchema")
@@ -631,14 +622,14 @@ function X(t, i, m, y) {
               const c = r.getState().cogsStateStore[t];
               try {
                 const o = r.getState().getValidationErrors(n.key);
-                o && o.length > 0 && o.forEach(([$]) => {
-                  $ && $.startsWith(n.key) && P($);
+                o && o.length > 0 && o.forEach(([I]) => {
+                  I && I.startsWith(n.key) && P(I);
                 });
-                const u = n.zodSchema.safeParse(c);
-                return u.success ? !0 : (u.error.errors.forEach((w) => {
-                  const V = w.path, b = w.message, k = [n.key, ...V].join(".");
-                  a(k, b);
-                }), ot(t), !1);
+                const d = n.zodSchema.safeParse(c);
+                return d.success ? !0 : (d.error.errors.forEach((k) => {
+                  const N = k.path, j = k.message, p = [n.key, ...N].join(".");
+                  a(p, j);
+                }), St(t), !1);
               } catch (o) {
                 return console.error("Zod schema validation failed", o), !1;
               }
@@ -647,7 +638,7 @@ function X(t, i, m, y) {
           if (s === "getComponents")
             return () => r().stateComponents.get(t);
           if (s === "getAllFormRefs")
-            return () => dt.getState().getFormRefsByStateKey(t);
+            return () => lt.getState().getFormRefsByStateKey(t);
           if (s === "_initialState")
             return r.getState().initialStateGlobal[t];
           if (s === "_serverState")
@@ -660,13 +651,13 @@ function X(t, i, m, y) {
           if (s === "removeValidation") return v.removeValidation;
         }
         if (s === "getFormRef")
-          return () => dt.getState().getFormRef(t + "." + e.join("."));
+          return () => lt.getState().getFormRef(t + "." + e.join("."));
         if (s === "validationWrapper")
           return ({
             children: n,
             hideMessage: a
-          }) => /* @__PURE__ */ lt(
-            Vt,
+          }) => /* @__PURE__ */ ct(
+            Nt,
             {
               formOpts: a ? { validation: { message: "" } } : void 0,
               path: e,
@@ -682,7 +673,7 @@ function X(t, i, m, y) {
         if (s === "update")
           return (n, a) => {
             if (a?.debounce)
-              Nt(() => {
+              $t(() => {
                 B(i, n, e, "");
                 const c = r.getState().getNestedState(t, e);
                 a?.afterUpdate && a.afterUpdate(c);
@@ -692,11 +683,11 @@ function X(t, i, m, y) {
               const c = r.getState().getNestedState(t, e);
               a?.afterUpdate && a.afterUpdate(c);
             }
-            _(e);
+            E(e);
           };
         if (s === "formElement")
-          return (n, a) => /* @__PURE__ */ lt(
-            At,
+          return (n, a) => /* @__PURE__ */ ct(
+            Vt,
             {
               setState: i,
               stateKey: t,
@@ -705,13 +696,13 @@ function X(t, i, m, y) {
               formOpts: a
             }
           );
-        const j = [...e, s], C = r.getState().getNestedState(t, j);
-        return l(C, j, S);
+        const b = [...e, s], C = r.getState().getNestedState(t, b);
+        return l(C, b, S);
       }
-    }, R = new Proxy(h, x);
-    return g.set(T, {
+    }, R = new Proxy(A, T);
+    return u.set(x, {
       proxy: R,
-      stateVersion: E
+      stateVersion: w
     }), R;
   }
   return l(
@@ -730,7 +721,7 @@ function jt({
     m,
     t._path
   ).stateMapNoRender(
-    (g, E, _, v, l) => t._mapFn(g, E, _, v, l)
+    (u, w, E, v, l) => t._mapFn(u, w, E, v, l)
   ) : null;
 }
 function bt({
@@ -740,13 +731,13 @@ function bt({
   return nt(() => {
     const y = i.current;
     if (!y || !y.parentElement) return;
-    const g = y.parentElement, _ = Array.from(g.childNodes).indexOf(y);
-    let v = g.getAttribute("data-parent-id");
-    v || (v = `parent-${crypto.randomUUID()}`, g.setAttribute("data-parent-id", v));
+    const u = y.parentElement, E = Array.from(u.childNodes).indexOf(y);
+    let v = u.getAttribute("data-parent-id");
+    v || (v = `parent-${crypto.randomUUID()}`, u.setAttribute("data-parent-id", v));
     const f = {
       instanceId: `instance-${crypto.randomUUID()}`,
       parentId: v,
-      position: _,
+      position: E,
       effect: t._effect
     };
     r.getState().addSignalElement(m, f);
@@ -758,14 +749,14 @@ function bt({
           "state",
           `return (${t._effect})(state)`
         )(e);
-      } catch (h) {
-        console.error("Error evaluating effect function during mount:", h), S = e;
+      } catch (A) {
+        console.error("Error evaluating effect function during mount:", A), S = e;
       }
     else
       S = e;
     S !== null && typeof S == "object" && (S = JSON.stringify(S));
-    const T = document.createTextNode(String(S));
-    y.replaceWith(T);
+    const x = document.createTextNode(String(S));
+    y.replaceWith(x);
   }, [t._stateKey, t._path.join("."), t._effect]), Q("span", {
     ref: i,
     style: { display: "none" },
@@ -773,7 +764,7 @@ function bt({
   });
 }
 function Jt(t) {
-  const i = $t(
+  const i = Et(
     (m) => {
       const y = r.getState().stateComponents.get(t._stateKey) || {
         components: /* @__PURE__ */ new Map()