cogsbox-state 0.5.119 → 0.5.120

package/dist/CogsState.jsx

@@ -1,57 +1,57 @@
 "use client";
-import { jsx as ct } from "react/jsx-runtime";
-import { useState as tt, useRef as Z, useEffect as et, useLayoutEffect as vt, useMemo as It, createElement as X, useSyncExternalStore as _t, startTransition as Et } from "react";
-import { transformStateFunc as wt, isFunction as L, getNestedValue as U, isDeepEqual as M, debounce as $t } from "./utility.js";
-import { pushFunc as Q, updateFn as B, cutFunc as J, ValidationWrapper as At, FormControlComponent as Nt } from "./Functions.jsx";
+import { jsx as ce } from "react/jsx-runtime";
+import { useState as ee, useRef as Z, useEffect as te, useLayoutEffect as ve, useMemo as Ie, createElement as X, useSyncExternalStore as _e, startTransition as Ee } from "react";
+import { transformStateFunc as we, isFunction as L, getNestedValue as U, isDeepEqual as M, debounce as $e } from "./utility.js";
+import { pushFunc as Q, updateFn as B, cutFunc as J, ValidationWrapper as Ae, FormControlComponent as Ne } from "./Functions.jsx";
 import "zod";
-import { getGlobalStore as r, formRefStore as lt } from "./store.js";
-import { useCogsConfig as Vt } from "./CogsStateClient.jsx";
-import nt from "./node_modules/uuid/dist/esm-browser/v4.js";
-function dt(t, i) {
-  const y = r.getState().getInitialOptions, v = r.getState().setInitialStateOptions, d = y(t) || {};
-  v(t, {
+import { getGlobalStore as r, formRefStore as le } from "./store.js";
+import { useCogsConfig as Te } from "./CogsStateClient.jsx";
+import ne from "./node_modules/uuid/dist/esm-browser/v4.js";
+function de(e, i) {
+  const v = r.getState().getInitialOptions, S = r.getState().setInitialStateOptions, d = v(e) || {};
+  S(e, {
     ...d,
     ...i
   });
 }
-function ut({
-  stateKey: t,
+function ue({
+  stateKey: e,
   options: i,
-  initialOptionsPart: y
+  initialOptionsPart: v
 }) {
-  const v = q(t) || {}, d = y[t] || {}, E = r.getState().setInitialStateOptions, _ = { ...d, ...v };
-  let S = !1;
+  const S = q(e) || {}, d = v[e] || {}, E = r.getState().setInitialStateOptions, _ = { ...d, ...S };
+  let m = !1;
   if (i)
     for (const c in i)
-      _.hasOwnProperty(c) ? (c == "localStorage" && i[c] && _[c].key !== i[c]?.key && (S = !0, _[c] = i[c]), c == "initialState" && i[c] && _[c] !== i[c] && (S = !0, _[c] = i[c])) : (S = !0, _[c] = i[c]);
-  S && E(t, _);
+      _.hasOwnProperty(c) ? (c == "localStorage" && i[c] && _[c].key !== i[c]?.key && (m = !0, _[c] = i[c]), c == "initialState" && i[c] && _[c] !== i[c] && (m = !0, _[c] = i[c])) : (m = !0, _[c] = i[c]);
+  m && E(e, _);
 }
-function qt(t, { formElements: i, validation: y }) {
-  return { initialState: t, formElements: i, validation: y };
+function qe(e, { formElements: i, validation: v }) {
+  return { initialState: e, formElements: i, validation: v };
 }
-const zt = (t, i) => {
-  let y = t;
-  const [v, d] = wt(y);
-  (Object.keys(d).length > 0 || i && Object.keys(i).length > 0) && Object.keys(d).forEach((S) => {
-    d[S] = d[S] || {}, d[S].formElements = {
+const ze = (e, i) => {
+  let v = e;
+  const [S, d] = we(v);
+  (Object.keys(d).length > 0 || i && Object.keys(i).length > 0) && Object.keys(d).forEach((m) => {
+    d[m] = d[m] || {}, d[m].formElements = {
       ...i?.formElements,
       // Global defaults first
       ...i?.validation,
-      ...d[S].formElements || {}
+      ...d[m].formElements || {}
       // State-specific overrides
-    }, q(S) || r.getState().setInitialStateOptions(S, d[S]);
-  }), r.getState().setInitialStates(v), r.getState().setCreatedState(v);
-  const E = (S, c) => {
-    const [f] = tt(c?.componentId ?? nt());
-    ut({
-      stateKey: S,
+    }, q(m) || r.getState().setInitialStateOptions(m, d[m]);
+  }), r.getState().setInitialStates(S), r.getState().setCreatedState(S);
+  const E = (m, c) => {
+    const [f] = ee(c?.componentId ?? ne());
+    ue({
+      stateKey: m,
       options: c,
       initialOptionsPart: d
     });
-    const e = r.getState().cogsStateStore[S] || v[S], m = c?.modifyState ? c.modifyState(e) : e, [k, p] = Ot(
-      m,
+    const t = r.getState().cogsStateStore[m] || S[m], y = c?.modifyState ? c.modifyState(t) : t, [k, V] = Oe(
+      y,
       {
-        stateKey: S,
+        stateKey: m,
         syncUpdate: c?.syncUpdate,
         componentId: f,
         localStorage: c?.localStorage,
@@ -63,145 +63,149 @@ const zt = (t, i) => {
         dependencies: c?.dependencies
       }
     );
-    return p;
+    return V;
   };
-  function _(S, c) {
-    ut({ stateKey: S, options: c, initialOptionsPart: d }), ot(S);
+  function _(m, c) {
+    ue({ stateKey: m, options: c, initialOptionsPart: d }), oe(m);
   }
   return { useCogsState: E, setCogsOptions: _ };
 }, {
   setUpdaterState: H,
   setState: D,
   getInitialOptions: q,
-  getKeyState: gt,
-  getValidationErrors: pt,
-  setStateLog: Ct,
-  updateInitialStateGlobal: rt,
-  addValidationError: Tt,
+  getKeyState: ge,
+  getValidationErrors: Ve,
+  setStateLog: pe,
+  updateInitialStateGlobal: re,
+  addValidationError: Ce,
   removeValidationError: P,
-  setServerSyncActions: ht
-} = r.getState(), ft = (t) => {
-  if (!t) return null;
+  setServerSyncActions: he
+} = r.getState(), fe = (e) => {
+  if (!e) return null;
   try {
-    const i = window.localStorage.getItem(t);
+    const i = window.localStorage.getItem(e);
     return i ? JSON.parse(i) : null;
   } catch (i) {
     return console.error("Error loading from localStorage:", i), null;
   }
-}, kt = (t, i, y, v) => {
-  y?.log && console.log(
+}, ke = (e, i, v, S) => {
+  v?.log && console.log(
     "saving to localstorage",
     i,
-    y.localStorage?.key,
-    v
+    v.localStorage?.key,
+    S
   );
-  const d = L(y?.localStorage?.key) ? y.localStorage?.key(t) : y?.localStorage?.key;
-  if (d && v) {
+  const d = L(v?.localStorage?.key) ? v.localStorage?.key(e) : v?.localStorage?.key;
+  if (d && S) {
     const E = {
-      state: t,
+      state: e,
       lastUpdated: Date.now(),
       lastSyncedWithServer: r.getState().serverSyncLog[i]?.[0]?.timeStamp,
       baseServerState: r.getState().serverState[i]
-    }, _ = `${v}-${i}-${d}`;
+    }, _ = `${S}-${i}-${d}`;
     window.localStorage.setItem(_, JSON.stringify(E));
   }
-}, xt = (t, i, y, v, d, E) => {
+}, xe = (e, i, v, S, d, E) => {
   const _ = {
     initialState: i,
     updaterState: Y(
-      t,
-      v,
+      e,
+      S,
       d,
       E
     ),
-    state: y
+    state: v
   };
-  rt(t, _.initialState), H(t, _.updaterState), D(t, _.state);
-}, ot = (t) => {
-  const i = r.getState().stateComponents.get(t);
+  re(e, _.initialState), H(e, _.updaterState), D(e, _.state);
+}, oe = (e) => {
+  const i = r.getState().stateComponents.get(e);
   if (!i) return;
-  const y = /* @__PURE__ */ new Set();
-  i.components.forEach((v) => {
-    y.add(() => v.forceUpdate());
+  const v = /* @__PURE__ */ new Set();
+  i.components.forEach((S) => {
+    (S ? Array.isArray(S.reactiveType) ? S.reactiveType : [S.reactiveType || "component"] : null)?.includes("none") || v.add(() => S.forceUpdate());
   }), queueMicrotask(() => {
-    y.forEach((v) => v());
+    v.forEach((S) => S());
   });
-}, Bt = (t, i) => {
-  const y = r.getState().stateComponents.get(t);
-  if (y) {
-    const v = `${t}////${i}`, d = y.components.get(v);
+}, Be = (e, i) => {
+  const v = r.getState().stateComponents.get(e);
+  if (v) {
+    const S = `${e}////${i}`, d = v.components.get(S);
     if ((d ? Array.isArray(d.reactiveType) ? d.reactiveType : [d.reactiveType || "component"] : null)?.includes("none"))
       return;
     d && d.forceUpdate();
   }
 };
-function Ot(t, {
+function Oe(e, {
   stateKey: i,
-  serverSync: y,
-  localStorage: v,
+  serverSync: v,
+  localStorage: S,
   formElements: d,
   middleware: E,
   reactiveDeps: _,
-  reactiveType: S,
+  reactiveType: m,
   componentId: c,
   initialState: f,
-  syncUpdate: e,
-  dependencies: m
+  syncUpdate: t,
+  dependencies: y
 } = {}) {
-  const [k, p] = tt({}), { sessionId: x } = Vt();
+  const [k, V] = ee({}), { sessionId: x } = Te();
   let R = !i;
-  const [g] = tt(i ?? nt()), s = r.getState().stateLog[g], G = Z(/* @__PURE__ */ new Set()), b = Z(c ?? nt()), T = Z(null);
-  T.current = q(g), et(() => {
-    if (e && e.stateKey === g && e.path?.[0]) {
+  const [g] = ee(i ?? ne()), s = r.getState().stateLog[g], G = Z(/* @__PURE__ */ new Set()), b = Z(c ?? ne()), C = Z(null);
+  C.current = q(g), te(() => {
+    if (t && t.stateKey === g && t.path?.[0]) {
       D(g, (o) => ({
         ...o,
-        [e.path[0]]: e.newValue
+        [t.path[0]]: t.newValue
       }));
-      const l = `${e.stateKey}:${e.path.join(".")}`;
+      const l = `${t.stateKey}:${t.path.join(".")}`;
       r.getState().setSyncInfo(l, {
-        timeStamp: e.timeStamp,
-        userId: e.userId
+        timeStamp: t.timeStamp,
+        userId: t.userId
       });
     }
-  }, [e]), et(() => {
-    f && dt(g, {
+  }, [t]), te(() => {
+    f && de(g, {
       initialState: f
     });
-    const l = T.current;
+    const l = C.current;
     let o = null;
     const u = L(l?.localStorage?.key) ? l?.localStorage?.key(f) : l?.localStorage?.key;
-    console.log("newoptions", l), console.log("localkey", u), console.log("initialState", f), u && x && (o = ft(
+    console.log("newoptions", l), console.log("localkey", u), console.log("initialState", f), u && x && (o = fe(
       x + "-" + g + "-" + u
     ));
     const w = r.getState().iniitialCreatedState[g];
     console.log("createdState - intiual", w, f);
     let N = null;
-    f && (N = f, o && o.lastUpdated > (o.lastSyncedWithServer || 0) && (N = o.state, l?.localStorage?.onChange && l?.localStorage?.onChange(N)), console.log("newState thius is newstate", N), xt(
-      g,
-      f,
-      N,
-      n,
-      b.current,
-      x
-    ), ot(g), (Array.isArray(S) ? S : [S || "component"]).includes("none") || p({}));
-  }, [f, ...m || []]), vt(() => {
-    R && dt(g, {
-      serverSync: y,
+    if (f) {
+      N = f, o && o.lastUpdated > (o.lastSyncedWithServer || 0) && (N = o.state, l?.localStorage?.onChange && l?.localStorage?.onChange(N)), console.log("newState thius is newstate", N), xe(
+        g,
+        f,
+        N,
+        n,
+        b.current,
+        x
+      ), oe(g);
+      const $ = Array.isArray(m) ? m : [m || "component"];
+      console.log("reactiveTypes.............................", $), $.includes("none") || V({});
+    }
+  }, [f, ...y || []]), ve(() => {
+    R && de(g, {
+      serverSync: v,
       formElements: d,
       initialState: f,
-      localStorage: v,
+      localStorage: S,
       middleware: E
     });
     const l = `${g}////${b.current}`, o = r.getState().stateComponents.get(g) || {
       components: /* @__PURE__ */ new Map()
     };
     return o.components.set(l, {
-      forceUpdate: () => p({}),
+      forceUpdate: () => V({}),
       paths: /* @__PURE__ */ new Set(),
       deps: [],
       depsFunction: _ || void 0,
-      reactiveType: S ?? ["component", "deps"]
-    }), r.getState().stateComponents.set(g, o), p({}), () => {
+      reactiveType: m ?? ["component", "deps"]
+    }), r.getState().stateComponents.set(g, o), V({}), () => {
       const u = `${g}////${b.current}`;
       o && (o.components.delete(u), o.components.size === 0 && r.getState().stateComponents.delete(g));
     };
@@ -212,98 +216,98 @@ function Ot(t, {
       G.current.add(N);
     }
     D(g, (N) => {
-      const A = L(l) ? l(N) : l, j = `${g}-${o.join(".")}`;
+      const $ = L(l) ? l(N) : l, j = `${g}-${o.join(".")}`;
       if (j) {
         let F = !1, I = r.getState().signalDomElements.get(j);
         if ((!I || I.size === 0) && (u.updateType === "insert" || u.updateType === "cut")) {
-          const V = o.slice(0, -1), C = U(A, V);
-          if (Array.isArray(C)) {
+          const T = o.slice(0, -1), p = U($, T);
+          if (Array.isArray(p)) {
             F = !0;
-            const $ = `${g}-${V.join(".")}`;
-            I = r.getState().signalDomElements.get($);
+            const A = `${g}-${T.join(".")}`;
+            I = r.getState().signalDomElements.get(A);
           }
         }
         if (I) {
-          const V = F ? U(A, o.slice(0, -1)) : U(A, o);
-          I.forEach(({ parentId: C, position: $, effect: W }) => {
+          const T = F ? U($, o.slice(0, -1)) : U($, o);
+          I.forEach(({ parentId: p, position: A, effect: W }) => {
             const O = document.querySelector(
-              `[data-parent-id="${C}"]`
+              `[data-parent-id="${p}"]`
             );
             if (O) {
-              const st = Array.from(O.childNodes);
-              if (st[$]) {
-                const yt = W ? new Function("state", `return (${W})(state)`)(V) : V;
-                st[$].textContent = String(yt);
+              const se = Array.from(O.childNodes);
+              if (se[A]) {
+                const ye = W ? new Function("state", `return (${W})(state)`)(T) : T;
+                se[A].textContent = String(ye);
               }
             }
           });
         }
       }
-      u.updateType === "update" && (w || T.current?.validationKey) && o && P(
-        (w || T.current?.validationKey) + "." + o.join(".")
+      u.updateType === "update" && (w || C.current?.validationKey) && o && P(
+        (w || C.current?.validationKey) + "." + o.join(".")
       );
       const h = o.slice(0, o.length - 1);
-      u.updateType === "cut" && T.current?.validationKey && P(
-        T.current?.validationKey + "." + h.join(".")
-      ), u.updateType === "insert" && T.current?.validationKey && pt(
-        T.current?.validationKey + "." + h.join(".")
-      ).filter(([I, V]) => {
-        let C = I?.split(".").length;
-        if (I == h.join(".") && C == h.length - 1) {
-          let $ = I + "." + h;
-          P(I), Tt($, V);
+      u.updateType === "cut" && C.current?.validationKey && P(
+        C.current?.validationKey + "." + h.join(".")
+      ), u.updateType === "insert" && C.current?.validationKey && Ve(
+        C.current?.validationKey + "." + h.join(".")
+      ).filter(([I, T]) => {
+        let p = I?.split(".").length;
+        if (I == h.join(".") && p == h.length - 1) {
+          let A = I + "." + h;
+          P(I), Ce(A, T);
         }
       });
-      const z = U(N, o), St = U(A, o), mt = u.updateType === "update" ? o.join(".") : [...o].slice(0, -1).join("."), at = r.getState().stateComponents.get(g);
-      if (at)
-        for (const [F, I] of at.components.entries()) {
-          let V = !1;
-          const C = Array.isArray(I.reactiveType) ? I.reactiveType : [I.reactiveType || "component"];
-          if (!C.includes("none")) {
-            if (C.includes("all")) {
+      const z = U(N, o), Se = U($, o), me = u.updateType === "update" ? o.join(".") : [...o].slice(0, -1).join("."), ae = r.getState().stateComponents.get(g);
+      if (ae)
+        for (const [F, I] of ae.components.entries()) {
+          let T = !1;
+          const p = Array.isArray(I.reactiveType) ? I.reactiveType : [I.reactiveType || "component"];
+          if (!p.includes("none")) {
+            if (p.includes("all")) {
               I.forceUpdate();
               continue;
             }
-            if (C.includes("component") && I.paths && (I.paths.has(mt) || I.paths.has("")) && (V = !0), !V && C.includes("deps") && I.depsFunction) {
-              const $ = I.depsFunction(A);
-              typeof $ == "boolean" ? $ && (V = !0) : M(I.deps, $) || (I.deps = $, V = !0);
+            if (p.includes("component") && I.paths && (I.paths.has(me) || I.paths.has("")) && (T = !0), !T && p.includes("deps") && I.depsFunction) {
+              const A = I.depsFunction($);
+              typeof A == "boolean" ? A && (T = !0) : M(I.deps, A) || (I.deps = A, T = !0);
             }
-            V && I.forceUpdate();
+            T && I.forceUpdate();
           }
         }
-      const it = {
+      const ie = {
         timeStamp: Date.now(),
         stateKey: g,
         path: o,
         updateType: u.updateType,
         status: "new",
         oldValue: z,
-        newValue: St
+        newValue: Se
       };
-      if (Ct(g, (F) => {
-        const V = [...F ?? [], it].reduce((C, $) => {
-          const W = `${$.stateKey}:${JSON.stringify($.path)}`, O = C.get(W);
-          return O ? (O.timeStamp = Math.max(O.timeStamp, $.timeStamp), O.newValue = $.newValue, O.oldValue = O.oldValue ?? $.oldValue, O.updateType = $.updateType) : C.set(W, { ...$ }), C;
+      if (pe(g, (F) => {
+        const T = [...F ?? [], ie].reduce((p, A) => {
+          const W = `${A.stateKey}:${JSON.stringify(A.path)}`, O = p.get(W);
+          return O ? (O.timeStamp = Math.max(O.timeStamp, A.timeStamp), O.newValue = A.newValue, O.oldValue = O.oldValue ?? A.oldValue, O.updateType = A.updateType) : p.set(W, { ...A }), p;
         }, /* @__PURE__ */ new Map());
-        return Array.from(V.values());
-      }), kt(
-        A,
+        return Array.from(T.values());
+      }), ke(
+        $,
         g,
-        T.current,
+        C.current,
         x
       ), E && E({
         updateLog: s,
-        update: it
-      }), T.current?.serverSync) {
-        const F = r.getState().serverState[g], I = T.current?.serverSync;
-        ht(g, {
-          syncKey: typeof I.syncKey == "string" ? I.syncKey : I.syncKey({ state: A }),
+        update: ie
+      }), C.current?.serverSync) {
+        const F = r.getState().serverState[g], I = C.current?.serverSync;
+        he(g, {
+          syncKey: typeof I.syncKey == "string" ? I.syncKey : I.syncKey({ state: $ }),
           rollBackState: F,
           actionTimeStamp: Date.now() + (I.debounce ?? 3e3),
           status: "waiting"
         });
       }
-      return A;
+      return $;
     });
   };
   r.getState().updaterState[g] || (H(
@@ -314,133 +318,133 @@ function Ot(t, {
       b.current,
       x
     )
-  ), r.getState().cogsStateStore[g] || D(g, t), r.getState().initialStateGlobal[g] || rt(g, t));
-  const a = It(() => Y(
+  ), r.getState().cogsStateStore[g] || D(g, e), r.getState().initialStateGlobal[g] || re(g, e));
+  const a = Ie(() => Y(
     g,
     n,
     b.current,
     x
   ), [g]);
-  return [gt(g), a];
+  return [ge(g), a];
 }
-function Y(t, i, y, v) {
+function Y(e, i, v, S) {
   const d = /* @__PURE__ */ new Map();
   let E = 0;
   const _ = (f) => {
-    const e = f.join(".");
-    for (const [m] of d)
-      (m === e || m.startsWith(e + ".")) && d.delete(m);
+    const t = f.join(".");
+    for (const [y] of d)
+      (y === t || y.startsWith(t + ".")) && d.delete(y);
     E++;
-  }, S = {
+  }, m = {
     removeValidation: (f) => {
       f?.validationKey && P(f.validationKey);
     },
     revertToInitialState: (f) => {
-      const e = r.getState().getInitialOptions(t)?.validation;
-      e?.key && P(e?.key), f?.validationKey && P(f.validationKey);
-      const m = r.getState().initialStateGlobal[t];
-      r.getState().clearSelectedIndexesForState(t), d.clear(), E++;
-      const k = c(m, []), p = q(t), x = L(p?.localStorage?.key) ? p?.localStorage?.key(m) : p?.localStorage?.key, R = `${v}-${t}-${x}`;
-      R && localStorage.removeItem(R), H(t, k), D(t, m);
-      const g = r.getState().stateComponents.get(t);
+      const t = r.getState().getInitialOptions(e)?.validation;
+      t?.key && P(t?.key), f?.validationKey && P(f.validationKey);
+      const y = r.getState().initialStateGlobal[e];
+      r.getState().clearSelectedIndexesForState(e), d.clear(), E++;
+      const k = c(y, []), V = q(e), x = L(V?.localStorage?.key) ? V?.localStorage?.key(y) : V?.localStorage?.key, R = `${S}-${e}-${x}`;
+      R && localStorage.removeItem(R), H(e, k), D(e, y);
+      const g = r.getState().stateComponents.get(e);
       return g && g.components.forEach((s) => {
         s.forceUpdate();
-      }), m;
+      }), y;
     },
     updateInitialState: (f) => {
       d.clear(), E++;
-      const e = Y(
-        t,
+      const t = Y(
+        e,
         i,
-        y,
-        v
+        v,
+        S
       );
-      return Et(() => {
-        rt(t, f), H(t, e), D(t, f);
-        const m = r.getState().stateComponents.get(t);
-        m && m.components.forEach((k) => {
+      return Ee(() => {
+        re(e, f), H(e, t), D(e, f);
+        const y = r.getState().stateComponents.get(e);
+        y && y.components.forEach((k) => {
           k.forceUpdate();
         });
       }), {
-        fetchId: (m) => e.get()[m]
+        fetchId: (y) => t.get()[y]
       };
     },
-    _initialState: r.getState().initialStateGlobal[t],
-    _serverState: r.getState().serverState[t],
-    _isLoading: r.getState().isLoadingGlobal[t],
+    _initialState: r.getState().initialStateGlobal[e],
+    _serverState: r.getState().serverState[e],
+    _isLoading: r.getState().isLoadingGlobal[e],
     _isServerSynced: () => {
-      const f = r.getState().serverState[t];
-      return !!(f && M(f, gt(t)));
+      const f = r.getState().serverState[e];
+      return !!(f && M(f, ge(e)));
     }
   };
-  function c(f, e = [], m) {
-    const k = e.map(String).join(".");
+  function c(f, t = [], y) {
+    const k = t.map(String).join(".");
     d.get(k);
-    const p = function() {
-      return r().getNestedState(t, e);
+    const V = function() {
+      return r().getNestedState(e, t);
     };
-    Object.keys(S).forEach((g) => {
-      p[g] = S[g];
+    Object.keys(m).forEach((g) => {
+      V[g] = m[g];
     });
     const x = {
       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);
+          `PROXY APPLY TRAP HIT: stateKey=${e}, path=${t.join(".")}`
+        ), console.trace("Apply trap stack trace"), r().getNestedState(e, t);
       },
       get(g, s) {
         if (s !== "then" && !s.startsWith("$") && s !== "stateMapNoRender") {
-          const n = e.join("."), a = `${t}////${y}`, l = r.getState().stateComponents.get(t);
+          const n = t.join("."), a = `${e}////${v}`, l = r.getState().stateComponents.get(e);
           if (l) {
             const o = l.components.get(a);
-            o && (e.length > 0 || s === "get") && o.paths.add(n);
+            o && (t.length > 0 || s === "get") && o.paths.add(n);
           }
         }
         if (s === "_status") {
-          const n = r.getState().getNestedState(t, e), a = r.getState().initialStateGlobal[t], l = U(a, e);
+          const n = r.getState().getNestedState(e, t), a = r.getState().initialStateGlobal[e], l = U(a, t);
           return M(n, l) ? "fresh" : "stale";
         }
         if (s === "getStatus")
           return function() {
             const n = r().getNestedState(
-              t,
-              e
-            ), a = r.getState().initialStateGlobal[t], l = U(a, e);
+              e,
+              t
+            ), a = r.getState().initialStateGlobal[e], l = U(a, t);
             return M(n, l) ? "fresh" : "stale";
           };
         if (s === "removeStorage")
           return () => {
-            const n = r.getState().initialStateGlobal[t], a = q(t), l = L(a?.localStorage?.key) ? a?.localStorage?.key(n) : a?.localStorage?.key, o = `${v}-${t}-${l}`;
+            const n = r.getState().initialStateGlobal[e], a = q(e), l = L(a?.localStorage?.key) ? a?.localStorage?.key(n) : a?.localStorage?.key, o = `${S}-${e}-${l}`;
             console.log("removing storage", o), o && localStorage.removeItem(o);
           };
         if (s === "showValidationErrors")
           return () => {
-            const n = r.getState().getInitialOptions(t)?.validation;
+            const n = r.getState().getInitialOptions(e)?.validation;
             if (!n?.key)
               throw new Error("Validation key not found");
-            return r.getState().getValidationErrors(n.key + "." + e.join("."));
+            return r.getState().getValidationErrors(n.key + "." + t.join("."));
           };
         if (Array.isArray(f)) {
           if (s === "getSelected")
             return () => {
-              const n = r.getState().getSelectedIndex(t, e.join("."));
+              const n = r.getState().getSelectedIndex(e, t.join("."));
               if (n !== void 0)
                 return c(
                   f[n],
-                  [...e, n.toString()],
-                  m
+                  [...t, n.toString()],
+                  y
                 );
             };
           if (s === "getSelectedIndex")
-            return () => r.getState().getSelectedIndex(t, e.join(".")) ?? -1;
+            return () => r.getState().getSelectedIndex(e, t.join(".")) ?? -1;
           if (s === "stateSort")
             return (n) => {
-              const o = [...r.getState().getNestedState(t, e).map((u, w) => ({
+              const o = [...r.getState().getNestedState(e, t).map((u, w) => ({
                 ...u,
                 __origIndex: w.toString()
               }))].sort(n);
-              return d.clear(), E++, c(o, e, {
-                filtered: [...m?.filtered || [], e],
+              return d.clear(), E++, c(o, t, {
+                filtered: [...y?.filtered || [], t],
                 validIndices: o.map(
                   (u) => parseInt(u.__origIndex)
                 )
@@ -448,29 +452,29 @@ function Y(t, i, y, v) {
             };
           if (s === "stateMap" || s === "stateMapNoRender")
             return (n) => {
-              const a = m?.filtered?.some(
-                (o) => o.join(".") === e.join(".")
-              ), l = a ? f : r.getState().getNestedState(t, e);
+              const a = y?.filtered?.some(
+                (o) => o.join(".") === t.join(".")
+              ), l = a ? f : r.getState().getNestedState(e, t);
               return s !== "stateMapNoRender" && (d.clear(), E++), l.map((o, u) => {
                 const w = a && o.__origIndex ? o.__origIndex : u, N = c(
                   o,
-                  [...e, w.toString()],
-                  m
+                  [...t, w.toString()],
+                  y
                 );
                 return n(
                   o,
                   N,
                   u,
                   f,
-                  c(f, e, m)
+                  c(f, t, y)
                 );
               });
             };
           if (s === "$stateMap")
-            return (n) => X(jt, {
+            return (n) => X(je, {
               proxy: {
-                _stateKey: t,
-                _path: e,
+                _stateKey: e,
+                _path: t,
                 _mapFn: n
                 // Pass the actual function, not string
               },
@@ -478,17 +482,17 @@ function Y(t, i, y, v) {
             });
           if (s === "stateFlattenOn")
             return (n) => {
-              const l = m?.filtered?.some(
-                (u) => u.join(".") === e.join(".")
-              ) ? f : r.getState().getNestedState(t, e);
+              const l = y?.filtered?.some(
+                (u) => u.join(".") === t.join(".")
+              ) ? f : r.getState().getNestedState(e, t);
               d.clear(), E++;
               const o = l.flatMap(
                 (u, w) => u[n] ?? []
               );
               return c(
                 o,
-                [...e, "[*]", n],
-                m
+                [...t, "[*]", n],
+                y
               );
             };
           if (s === "findWith")
@@ -497,54 +501,54 @@ function Y(t, i, y, v) {
                 (w) => w[n] === a
               );
               if (l === -1) return;
-              const o = f[l], u = [...e, l.toString()];
+              const o = f[l], u = [...t, l.toString()];
               return d.clear(), E++, d.clear(), E++, c(o, u);
             };
           if (s === "index")
             return (n) => {
               const a = f[n];
-              return c(a, [...e, n.toString()]);
+              return c(a, [...t, n.toString()]);
             };
           if (s === "insert")
-            return (n) => (_(e), Q(i, n, e, t), c(
-              r.getState().cogsStateStore[t],
+            return (n) => (_(t), Q(i, n, t, e), c(
+              r.getState().cogsStateStore[e],
               []
             ));
           if (s === "uniqueInsert")
             return (n, a, l) => {
-              const o = r.getState().getNestedState(t, e), u = L(n) ? n(o) : n;
+              const o = r.getState().getNestedState(e, t), u = L(n) ? n(o) : n;
               let w = null;
-              if (!o.some((A) => {
+              if (!o.some(($) => {
                 if (a) {
                   const h = a.every(
-                    (z) => M(A[z], u[z])
+                    (z) => M($[z], u[z])
                   );
-                  return h && (w = A), h;
+                  return h && (w = $), h;
                 }
-                const j = M(A, u);
-                return j && (w = A), j;
+                const j = M($, u);
+                return j && (w = $), j;
               }))
-                _(e), Q(i, u, e, t);
+                _(t), Q(i, u, t, e);
               else if (l && w) {
-                const A = l(w), j = o.map(
-                  (h) => M(h, w) ? A : h
+                const $ = l(w), j = o.map(
+                  (h) => M(h, w) ? $ : h
                 );
-                _(e), B(i, j, e);
+                _(t), B(i, j, t);
               }
             };
           if (s === "cut")
             return (n, a) => {
-              a?.waitForSync || (_(e), J(i, e, t, n));
+              a?.waitForSync || (_(t), J(i, t, e, n));
             };
           if (s === "cutByValue")
             return (n) => {
               for (let a = 0; a < f.length; a++)
-                f[a] === n && J(i, e, t, a);
+                f[a] === n && J(i, t, e, a);
             };
           if (s === "toggleByValue")
             return (n) => {
               const a = f.findIndex((l) => l === n);
-              a > -1 ? J(i, e, t, a) : Q(i, n, e, t);
+              a > -1 ? J(i, t, e, a) : Q(i, n, t, e);
             };
           if (s === "stateFilter")
             return (n) => {
@@ -554,70 +558,70 @@ function Y(t, i, y, v) {
               })), l = [], o = [];
               for (let u = 0; u < a.length; u++)
                 n(a[u], u) && (l.push(u), o.push(a[u]));
-              return d.clear(), E++, c(o, e, {
-                filtered: [...m?.filtered || [], e],
+              return d.clear(), E++, c(o, t, {
+                filtered: [...y?.filtered || [], t],
                 validIndices: l
                 // Always pass validIndices, even if empty
               });
             };
         }
-        const G = e[e.length - 1];
+        const G = t[t.length - 1];
         if (!isNaN(Number(G))) {
-          const n = e.slice(0, -1), a = r.getState().getNestedState(t, n);
+          const n = t.slice(0, -1), a = r.getState().getNestedState(e, n);
           if (Array.isArray(a) && s === "cut")
             return () => J(
               i,
               n,
-              t,
+              e,
               Number(G)
             );
         }
         if (s === "get")
-          return () => r.getState().getNestedState(t, e);
+          return () => r.getState().getNestedState(e, t);
         if (s === "$derive")
           return (n) => K({
-            _stateKey: t,
-            _path: e,
+            _stateKey: e,
+            _path: t,
             _effect: n.toString()
           });
         if (s === "$derive")
           return (n) => K({
-            _stateKey: t,
-            _path: e,
+            _stateKey: e,
+            _path: t,
             _effect: n.toString()
           });
         if (s === "$get")
           return () => K({
-            _stateKey: t,
-            _path: e
+            _stateKey: e,
+            _path: t
           });
         if (s === "lastSynced") {
-          const n = `${t}:${e.join(".")}`;
+          const n = `${e}:${t.join(".")}`;
           return r.getState().getSyncInfo(n);
         }
         if (s == "getLocalStorage")
-          return (n) => ft(v + "-" + t + "-" + n);
+          return (n) => fe(S + "-" + e + "-" + n);
         if (s === "_selected") {
-          const n = e.slice(0, -1), a = n.join("."), l = r.getState().getNestedState(t, n);
-          return Array.isArray(l) ? Number(e[e.length - 1]) === r.getState().getSelectedIndex(t, a) : void 0;
+          const n = t.slice(0, -1), a = n.join("."), l = r.getState().getNestedState(e, n);
+          return Array.isArray(l) ? Number(t[t.length - 1]) === r.getState().getSelectedIndex(e, a) : void 0;
         }
         if (s === "setSelected")
           return (n) => {
-            const a = e.slice(0, -1), l = Number(e[e.length - 1]), o = a.join(".");
-            n ? r.getState().setSelectedIndex(t, o, l) : r.getState().setSelectedIndex(t, o, void 0);
-            const u = r.getState().getNestedState(t, [...a]);
+            const a = t.slice(0, -1), l = Number(t[t.length - 1]), o = a.join(".");
+            n ? r.getState().setSelectedIndex(e, o, l) : r.getState().setSelectedIndex(e, o, void 0);
+            const u = r.getState().getNestedState(e, [...a]);
             B(i, u, a), _(a);
           };
-        if (e.length == 0) {
+        if (t.length == 0) {
           if (s === "validateZodSchema")
             return () => {
-              const n = r.getState().getInitialOptions(t)?.validation, a = r.getState().addValidationError;
+              const n = r.getState().getInitialOptions(e)?.validation, a = r.getState().addValidationError;
               if (!n?.zodSchema)
                 throw new Error("Zod schema not found");
               if (!n?.key)
                 throw new Error("Validation key not found");
               P(n.key);
-              const l = r.getState().cogsStateStore[t];
+              const l = r.getState().cogsStateStore[e];
               try {
                 const o = r.getState().getValidationErrors(n.key);
                 o && o.length > 0 && o.forEach(([w]) => {
@@ -625,163 +629,163 @@ function Y(t, i, y, v) {
                 });
                 const u = n.zodSchema.safeParse(l);
                 return u.success ? !0 : (u.error.errors.forEach((N) => {
-                  const A = N.path, j = N.message, h = [n.key, ...A].join(".");
+                  const $ = N.path, j = N.message, h = [n.key, ...$].join(".");
                   a(h, j);
-                }), ot(t), !1);
+                }), oe(e), !1);
               } catch (o) {
                 return console.error("Zod schema validation failed", o), !1;
               }
             };
-          if (s === "_componentId") return y;
+          if (s === "_componentId") return v;
           if (s === "getComponents")
-            return () => r().stateComponents.get(t);
+            return () => r().stateComponents.get(e);
           if (s === "getAllFormRefs")
-            return () => lt.getState().getFormRefsByStateKey(t);
+            return () => le.getState().getFormRefsByStateKey(e);
           if (s === "_initialState")
-            return r.getState().initialStateGlobal[t];
+            return r.getState().initialStateGlobal[e];
           if (s === "_serverState")
-            return r.getState().serverState[t];
+            return r.getState().serverState[e];
           if (s === "_isLoading")
-            return r.getState().isLoadingGlobal[t];
+            return r.getState().isLoadingGlobal[e];
           if (s === "revertToInitialState")
-            return S.revertToInitialState;
-          if (s === "updateInitialState") return S.updateInitialState;
-          if (s === "removeValidation") return S.removeValidation;
+            return m.revertToInitialState;
+          if (s === "updateInitialState") return m.updateInitialState;
+          if (s === "removeValidation") return m.removeValidation;
         }
         if (s === "getFormRef")
-          return () => lt.getState().getFormRef(t + "." + e.join("."));
+          return () => le.getState().getFormRef(e + "." + t.join("."));
         if (s === "validationWrapper")
           return ({
             children: n,
             hideMessage: a
-          }) => /* @__PURE__ */ ct(
-            At,
+          }) => /* @__PURE__ */ ce(
+            Ae,
             {
               formOpts: a ? { validation: { message: "" } } : void 0,
-              path: e,
-              validationKey: r.getState().getInitialOptions(t)?.validation?.key || "",
-              stateKey: t,
-              validIndices: m?.validIndices,
+              path: t,
+              validationKey: r.getState().getInitialOptions(e)?.validation?.key || "",
+              stateKey: e,
+              validIndices: y?.validIndices,
               children: n
             }
           );
-        if (s === "_stateKey") return t;
-        if (s === "_path") return e;
-        if (s === "_isServerSynced") return S._isServerSynced;
+        if (s === "_stateKey") return e;
+        if (s === "_path") return t;
+        if (s === "_isServerSynced") return m._isServerSynced;
         if (s === "update")
           return (n, a) => {
             if (a?.debounce)
-              $t(() => {
-                B(i, n, e, "");
-                const l = r.getState().getNestedState(t, e);
+              $e(() => {
+                B(i, n, t, "");
+                const l = r.getState().getNestedState(e, t);
                 a?.afterUpdate && a.afterUpdate(l);
               }, a.debounce);
             else {
-              B(i, n, e, "");
-              const l = r.getState().getNestedState(t, e);
+              B(i, n, t, "");
+              const l = r.getState().getNestedState(e, t);
               a?.afterUpdate && a.afterUpdate(l);
             }
-            _(e);
+            _(t);
           };
         if (s === "formElement")
-          return (n, a) => /* @__PURE__ */ ct(
-            Nt,
+          return (n, a) => /* @__PURE__ */ ce(
+            Ne,
             {
               setState: i,
-              stateKey: t,
-              path: e,
+              stateKey: e,
+              path: t,
               child: n,
               formOpts: a
             }
           );
-        const b = [...e, s], T = r.getState().getNestedState(t, b);
-        return c(T, b, m);
+        const b = [...t, s], C = r.getState().getNestedState(e, b);
+        return c(C, b, y);
       }
-    }, R = new Proxy(p, x);
+    }, R = new Proxy(V, x);
     return d.set(k, {
       proxy: R,
       stateVersion: E
     }), R;
   }
   return c(
-    r.getState().getNestedState(t, [])
+    r.getState().getNestedState(e, [])
   );
 }
-function K(t) {
-  return X(bt, { proxy: t });
+function K(e) {
+  return X(be, { proxy: e });
 }
-function jt({
-  proxy: t,
+function je({
+  proxy: e,
   rebuildStateShape: i
 }) {
-  const y = r().getNestedState(t._stateKey, t._path);
-  return Array.isArray(y) ? i(
-    y,
-    t._path
+  const v = r().getNestedState(e._stateKey, e._path);
+  return Array.isArray(v) ? i(
+    v,
+    e._path
   ).stateMapNoRender(
-    (d, E, _, S, c) => t._mapFn(d, E, _, S, c)
+    (d, E, _, m, c) => e._mapFn(d, E, _, m, c)
   ) : null;
 }
-function bt({
-  proxy: t
+function be({
+  proxy: e
 }) {
-  const i = Z(null), y = `${t._stateKey}-${t._path.join(".")}`;
-  return et(() => {
-    const v = i.current;
-    if (!v || !v.parentElement) return;
-    const d = v.parentElement, _ = Array.from(d.childNodes).indexOf(v);
-    let S = d.getAttribute("data-parent-id");
-    S || (S = `parent-${crypto.randomUUID()}`, d.setAttribute("data-parent-id", S));
+  const i = Z(null), v = `${e._stateKey}-${e._path.join(".")}`;
+  return te(() => {
+    const S = i.current;
+    if (!S || !S.parentElement) return;
+    const d = S.parentElement, _ = Array.from(d.childNodes).indexOf(S);
+    let m = d.getAttribute("data-parent-id");
+    m || (m = `parent-${crypto.randomUUID()}`, d.setAttribute("data-parent-id", m));
     const f = {
       instanceId: `instance-${crypto.randomUUID()}`,
-      parentId: S,
+      parentId: m,
       position: _,
-      effect: t._effect
+      effect: e._effect
     };
-    r.getState().addSignalElement(y, f);
-    const e = r.getState().getNestedState(t._stateKey, t._path);
-    let m;
-    if (t._effect)
+    r.getState().addSignalElement(v, f);
+    const t = r.getState().getNestedState(e._stateKey, e._path);
+    let y;
+    if (e._effect)
       try {
-        m = new Function(
+        y = new Function(
           "state",
-          `return (${t._effect})(state)`
-        )(e);
-      } catch (p) {
-        console.error("Error evaluating effect function during mount:", p), m = e;
+          `return (${e._effect})(state)`
+        )(t);
+      } catch (V) {
+        console.error("Error evaluating effect function during mount:", V), y = t;
       }
     else
-      m = e;
-    m !== null && typeof m == "object" && (m = JSON.stringify(m));
-    const k = document.createTextNode(String(m));
-    v.replaceWith(k);
-  }, [t._stateKey, t._path.join("."), t._effect]), X("span", {
+      y = t;
+    y !== null && typeof y == "object" && (y = JSON.stringify(y));
+    const k = document.createTextNode(String(y));
+    S.replaceWith(k);
+  }, [e._stateKey, e._path.join("."), e._effect]), X("span", {
     ref: i,
     style: { display: "none" },
-    "data-signal-id": y
+    "data-signal-id": v
   });
 }
-function Jt(t) {
-  const i = _t(
-    (y) => {
-      const v = r.getState().stateComponents.get(t._stateKey) || {
+function Je(e) {
+  const i = _e(
+    (v) => {
+      const S = r.getState().stateComponents.get(e._stateKey) || {
         components: /* @__PURE__ */ new Map()
       };
-      return v.components.set(t._stateKey, {
-        forceUpdate: y,
-        paths: /* @__PURE__ */ new Set([t._path.join(".")])
-      }), () => v.components.delete(t._stateKey);
+      return S.components.set(e._stateKey, {
+        forceUpdate: v,
+        paths: /* @__PURE__ */ new Set([e._path.join(".")])
+      }), () => S.components.delete(e._stateKey);
     },
-    () => r.getState().getNestedState(t._stateKey, t._path)
+    () => r.getState().getNestedState(e._stateKey, e._path)
   );
   return X("text", {}, String(i));
 }
 export {
   K as $cogsSignal,
-  Jt as $cogsSignalStore,
-  qt as addStateOptions,
-  zt as createCogsState,
-  Bt as notifyComponent,
-  Ot as useCogsStateFn
+  Je as $cogsSignalStore,
+  qe as addStateOptions,
+  ze as createCogsState,
+  Be as notifyComponent,
+  Oe as useCogsStateFn
 };
 //# sourceMappingURL=CogsState.jsx.map