cogsbox-state 0.5.222 → 0.5.224

package/dist/CogsState.jsx

@@ -1,16 +1,16 @@
 "use client";
 import { jsx as ye } from "react/jsx-runtime";
 import { useState as de, useRef as te, useEffect as ue, useLayoutEffect as $e, useMemo as Te, createElement as ae, useSyncExternalStore as Ve, startTransition as Ne } from "react";
-import { transformStateFunc as Ae, isDeepEqual as W, isFunction as J, getNestedValue as G, getDifferences as fe, debounce as be } from "./utility.js";
+import { transformStateFunc as Ae, isDeepEqual as W, isFunction as J, getNestedValue as G, getDifferences as ge, debounce as be } from "./utility.js";
 import { pushFunc as ce, updateFn as Q, cutFunc as ee, ValidationWrapper as Pe, FormControlComponent as _e } from "./Functions.jsx";
 import xe from "superjson";
-import { v4 as ge } from "uuid";
+import { v4 as fe } from "uuid";
 import "zod";
-import { getGlobalStore as n, formRefStore as ve } from "./store.js";
+import { getGlobalStore as r, formRefStore as ve } from "./store.js";
 import { useCogsConfig as we } from "./CogsStateClient.jsx";
 import { applyPatch as Ce } from "fast-json-patch";
 function he(e, i) {
-  const v = n.getState().getInitialOptions, u = n.getState().setInitialStateOptions, S = v(e) || {};
+  const v = r.getState().getInitialOptions, u = r.getState().setInitialStateOptions, S = v(e) || {};
   u(e, {
     ...S,
     ...i
@@ -21,7 +21,7 @@ function Ie({
   options: i,
   initialOptionsPart: v
 }) {
-  const u = Y(e) || {}, S = v[e] || {}, E = n.getState().setInitialStateOptions, p = { ...S, ...u };
+  const u = Y(e) || {}, S = v[e] || {}, E = r.getState().setInitialStateOptions, p = { ...S, ...u };
   let h = !1;
   if (i)
     for (const s in i)
@@ -42,16 +42,16 @@ const et = (e, i) => {
       ...i?.validation,
       ...S[h].formElements || {}
       // State-specific overrides
-    }, Y(h) || n.getState().setInitialStateOptions(h, S[h]);
-  }), n.getState().setInitialStates(u), n.getState().setCreatedState(u);
+    }, Y(h) || r.getState().setInitialStateOptions(h, S[h]);
+  }), r.getState().setInitialStates(u), r.getState().setCreatedState(u);
   const E = (h, s) => {
-    const [m] = de(s?.componentId ?? ge());
+    const [m] = de(s?.componentId ?? fe());
     Ie({
       stateKey: h,
       options: s,
       initialOptionsPart: S
     });
-    const r = n.getState().cogsStateStore[h] || u[h], y = s?.modifyState ? s.modifyState(r) : r, [j, _] = De(
+    const n = r.getState().cogsStateStore[h] || u[h], y = s?.modifyState ? s.modifyState(n) : n, [j, _] = De(
       y,
       {
         stateKey: h,
@@ -84,7 +84,7 @@ const et = (e, i) => {
   addValidationError: Re,
   removeValidationError: B,
   setServerSyncActions: je
-} = n.getState(), pe = (e, i, v, u, S) => {
+} = r.getState(), pe = (e, i, v, u, S) => {
   v?.log && console.log(
     "saving to localstorage",
     i,
@@ -118,7 +118,7 @@ const et = (e, i) => {
     return console.error("Error loading from localStorage:", i), null;
   }
 }, Ue = (e, i) => {
-  const v = n.getState().cogsStateStore[e], { sessionId: u } = we(), S = J(i?.localStorage?.key) ? i.localStorage.key(v) : i?.localStorage?.key;
+  const v = r.getState().cogsStateStore[e], { sessionId: u } = we(), S = J(i?.localStorage?.key) ? i.localStorage.key(v) : i?.localStorage?.key;
   if (S && u) {
     const E = oe(
       `${u}-${e}-${S}`
@@ -140,7 +140,7 @@ const et = (e, i) => {
   };
   Se(e, p.initialState), ne(e, p.updaterState), H(e, p.state);
 }, ie = (e) => {
-  const i = n.getState().stateComponents.get(e);
+  const i = r.getState().stateComponents.get(e);
   if (!i) return;
   const v = /* @__PURE__ */ new Set();
   i.components.forEach((u) => {
@@ -149,7 +149,7 @@ const et = (e, i) => {
     v.forEach((u) => u());
   });
 }, tt = (e, i) => {
-  const v = n.getState().stateComponents.get(e);
+  const v = r.getState().stateComponents.get(e);
   if (v) {
     const u = `${e}////${i}`, S = v.components.get(u);
     if ((S ? Array.isArray(S.reactiveType) ? S.reactiveType : [S.reactiveType || "component"] : null)?.includes("none"))
@@ -189,62 +189,62 @@ function De(e, {
   componentId: h,
   initialState: s,
   syncUpdate: m,
-  dependencies: r,
+  dependencies: n,
   serverState: y
 } = {}) {
   const [j, _] = de({}), { sessionId: x } = we();
   let U = !i;
-  const [g] = de(i ?? ge()), c = n.getState().stateLog[g], K = te(/* @__PURE__ */ new Set()), L = te(h ?? ge()), A = te(
+  const [f] = de(i ?? fe()), c = r.getState().stateLog[f], K = te(/* @__PURE__ */ new Set()), L = te(h ?? fe()), A = te(
     null
   );
-  A.current = Y(g) ?? null, ue(() => {
-    if (m && m.stateKey === g && m.path?.[0]) {
-      H(g, (a) => ({
+  A.current = Y(f) ?? null, ue(() => {
+    if (m && m.stateKey === f && m.path?.[0]) {
+      H(f, (a) => ({
         ...a,
         [m.path[0]]: m.newValue
       }));
       const t = `${m.stateKey}:${m.path.join(".")}`;
-      n.getState().setSyncInfo(t, {
+      r.getState().setSyncInfo(t, {
         timeStamp: m.timeStamp,
         userId: m.userId
       });
     }
   }, [m]), ue(() => {
     if (s) {
-      he(g, {
+      he(f, {
         initialState: s
       });
-      const t = A.current, o = t?.serverState?.id !== void 0 && t?.serverState?.status === "success" && t?.serverState?.data, d = n.getState().initialStateGlobal[g];
+      const t = A.current, o = t?.serverState?.id !== void 0 && t?.serverState?.status === "success" && t?.serverState?.data, d = r.getState().initialStateGlobal[f];
       if (!(d && !W(d, s) || !d) && !o)
         return;
-      let f = null;
+      let g = null;
       const N = J(t?.localStorage?.key) ? t?.localStorage?.key(s) : t?.localStorage?.key;
-      N && x && (f = oe(`${x}-${g}-${N}`));
+      N && x && (g = oe(`${x}-${f}-${N}`));
       let w = s, $ = !1;
-      const F = o ? Date.now() : 0, b = f?.lastUpdated || 0, M = f?.lastSyncedWithServer || 0;
-      o && F > b ? (w = t.serverState.data, $ = !0) : f && b > M && (w = f.state, t?.localStorage?.onChange && t?.localStorage?.onChange(w)), ke(
-        g,
+      const F = o ? Date.now() : 0, b = g?.lastUpdated || 0, M = g?.lastSyncedWithServer || 0;
+      o && F > b ? (w = t.serverState.data, $ = !0) : g && b > M && (w = g.state, t?.localStorage?.onChange && t?.localStorage?.onChange(w)), ke(
+        f,
         s,
         w,
         X,
         L.current,
         x
-      ), $ && N && x && pe(w, g, t, x, Date.now()), ie(g), (Array.isArray(p) ? p : [p || "component"]).includes("none") || _({});
+      ), $ && N && x && pe(w, f, t, x, Date.now()), ie(f), (Array.isArray(p) ? p : [p || "component"]).includes("none") || _({});
     }
   }, [
     s,
     y?.status,
     y?.data,
-    ...r || []
+    ...n || []
   ]), $e(() => {
-    U && he(g, {
+    U && he(f, {
       serverSync: v,
       formElements: S,
       initialState: s,
       localStorage: u,
       middleware: A.current?.middleware
     });
-    const t = `${g}////${L.current}`, a = n.getState().stateComponents.get(g) || {
+    const t = `${f}////${L.current}`, a = r.getState().stateComponents.get(f) || {
       components: /* @__PURE__ */ new Map()
     };
     return a.components.set(t, {
@@ -253,30 +253,30 @@ function De(e, {
       deps: [],
       depsFunction: E || void 0,
       reactiveType: p ?? ["component", "deps"]
-    }), n.getState().stateComponents.set(g, a), _({}), () => {
-      const o = `${g}////${L.current}`;
-      a && (a.components.delete(o), a.components.size === 0 && n.getState().stateComponents.delete(g));
+    }), r.getState().stateComponents.set(f, a), _({}), () => {
+      const o = `${f}////${L.current}`;
+      a && (a.components.delete(o), a.components.size === 0 && r.getState().stateComponents.delete(f));
     };
   }, []);
   const X = (t, a, o, d) => {
     if (Array.isArray(a)) {
-      const I = `${g}-${a.join(".")}`;
+      const I = `${f}-${a.join(".")}`;
       K.current.add(I);
     }
-    H(g, (I) => {
-      const f = J(t) ? t(I) : t, N = `${g}-${a.join(".")}`;
+    H(f, (I) => {
+      const g = J(t) ? t(I) : t, N = `${f}-${a.join(".")}`;
       if (N) {
-        let R = !1, k = n.getState().signalDomElements.get(N);
+        let R = !1, k = r.getState().signalDomElements.get(N);
         if ((!k || k.size === 0) && (o.updateType === "insert" || o.updateType === "cut")) {
-          const O = a.slice(0, -1), C = G(f, O);
+          const O = a.slice(0, -1), C = G(g, O);
           if (Array.isArray(C)) {
             R = !0;
-            const P = `${g}-${O.join(".")}`;
-            k = n.getState().signalDomElements.get(P);
+            const P = `${f}-${O.join(".")}`;
+            k = r.getState().signalDomElements.get(P);
           }
         }
         if (k) {
-          const O = R ? G(f, a.slice(0, -1)) : G(f, a);
+          const O = R ? G(g, a.slice(0, -1)) : G(g, a);
           k.forEach(({ parentId: C, position: P, effect: T }) => {
             const V = document.querySelector(
               `[data-parent-id="${C}"]`
@@ -306,9 +306,9 @@ function De(e, {
           B(k), Re(P, O);
         }
       });
-      const $ = n.getState().stateComponents.get(g);
+      const $ = r.getState().stateComponents.get(f);
       if ($) {
-        const R = fe(I, f), k = new Set(R), O = o.updateType === "update" ? a.join(".") : a.slice(0, -1).join(".") || "", C = [];
+        const R = ge(I, g), k = new Set(R), O = o.updateType === "update" ? a.join(".") : a.slice(0, -1).join(".") || "", C = [];
         for (const [
           P,
           T
@@ -349,7 +349,7 @@ function De(e, {
                 if (V) break;
               }
             if (!V && Z.includes("deps") && T.depsFunction) {
-              const z = T.depsFunction(f);
+              const z = T.depsFunction(g);
               let D = !1;
               typeof z == "boolean" ? z && (D = !0) : W(T.deps, z) || (T.deps = z, D = !0), D && (V = !0);
             }
@@ -362,132 +362,132 @@ function De(e, {
       }
       const F = Date.now();
       a = a.map((R, k) => {
-        const O = a.slice(0, -1), C = G(f, O);
+        const O = a.slice(0, -1), C = G(g, O);
         return k === a.length - 1 && ["insert", "cut"].includes(o.updateType) ? (C.length - 1).toString() : R;
       });
       const { oldValue: b, newValue: M } = Me(
         o.updateType,
         I,
-        f,
+        g,
         a
       ), q = {
         timeStamp: F,
-        stateKey: g,
+        stateKey: f,
         path: a,
         updateType: o.updateType,
         status: "new",
         oldValue: b,
         newValue: M
       };
-      if (Fe(g, (R) => {
+      if (Fe(f, (R) => {
         const O = [...R ?? [], q].reduce((C, P) => {
           const T = `${P.stateKey}:${JSON.stringify(P.path)}`, V = C.get(T);
           return V ? (V.timeStamp = Math.max(V.timeStamp, P.timeStamp), V.newValue = P.newValue, V.oldValue = V.oldValue ?? P.oldValue, V.updateType = P.updateType) : C.set(T, { ...P }), C;
         }, /* @__PURE__ */ new Map());
         return Array.from(O.values());
       }), pe(
-        f,
         g,
+        f,
         A.current,
         x
       ), A.current?.middleware && A.current.middleware({
         updateLog: c,
         update: q
       }), A.current?.serverSync) {
-        const R = n.getState().serverState[g], k = A.current?.serverSync;
-        je(g, {
-          syncKey: typeof k.syncKey == "string" ? k.syncKey : k.syncKey({ state: f }),
+        const R = r.getState().serverState[f], k = A.current?.serverSync;
+        je(f, {
+          syncKey: typeof k.syncKey == "string" ? k.syncKey : k.syncKey({ state: g }),
           rollBackState: R,
           actionTimeStamp: Date.now() + (k.debounce ?? 3e3),
           status: "waiting"
         });
       }
-      return f;
+      return g;
     });
   };
-  n.getState().updaterState[g] || (ne(
-    g,
+  r.getState().updaterState[f] || (ne(
+    f,
     re(
-      g,
+      f,
       X,
       L.current,
       x
     )
-  ), n.getState().cogsStateStore[g] || H(g, e), n.getState().initialStateGlobal[g] || Se(g, e));
+  ), r.getState().cogsStateStore[f] || H(f, e), r.getState().initialStateGlobal[f] || Se(f, e));
   const l = Te(() => re(
-    g,
+    f,
     X,
     L.current,
     x
-  ), [g, x]);
-  return [Ee(g), l];
+  ), [f, x]);
+  return [Ee(f), l];
 }
 function re(e, i, v, u) {
   const S = /* @__PURE__ */ new Map();
   let E = 0;
   const p = (m) => {
-    const r = m.join(".");
+    const n = m.join(".");
     for (const [y] of S)
-      (y === r || y.startsWith(r + ".")) && S.delete(y);
+      (y === n || y.startsWith(n + ".")) && S.delete(y);
     E++;
   }, h = {
     removeValidation: (m) => {
       m?.validationKey && B(m.validationKey);
     },
     revertToInitialState: (m) => {
-      const r = n.getState().getInitialOptions(e)?.validation;
-      r?.key && B(r?.key), m?.validationKey && B(m.validationKey);
-      const y = n.getState().initialStateGlobal[e];
-      n.getState().clearSelectedIndexesForState(e), S.clear(), E++;
+      const n = r.getState().getInitialOptions(e)?.validation;
+      n?.key && B(n?.key), m?.validationKey && B(m.validationKey);
+      const y = r.getState().initialStateGlobal[e];
+      r.getState().clearSelectedIndexesForState(e), S.clear(), E++;
       const j = s(y, []), _ = Y(e), x = J(_?.localStorage?.key) ? _?.localStorage?.key(y) : _?.localStorage?.key, U = `${u}-${e}-${x}`;
       U && localStorage.removeItem(U), ne(e, j), H(e, y);
-      const g = n.getState().stateComponents.get(e);
-      return g && g.components.forEach((c) => {
+      const f = r.getState().stateComponents.get(e);
+      return f && f.components.forEach((c) => {
         c.forceUpdate();
       }), y;
     },
     updateInitialState: (m) => {
       S.clear(), E++;
-      const r = re(
+      const n = re(
         e,
         i,
         v,
         u
-      ), y = n.getState().initialStateGlobal[e], j = Y(e), _ = J(j?.localStorage?.key) ? j?.localStorage?.key(y) : j?.localStorage?.key, x = `${u}-${e}-${_}`;
+      ), y = r.getState().initialStateGlobal[e], j = Y(e), _ = J(j?.localStorage?.key) ? j?.localStorage?.key(y) : j?.localStorage?.key, x = `${u}-${e}-${_}`;
       return localStorage.getItem(x) && localStorage.removeItem(x), Ne(() => {
-        Se(e, m), ne(e, r), H(e, m);
-        const U = n.getState().stateComponents.get(e);
-        U && U.components.forEach((g) => {
-          g.forceUpdate();
+        Se(e, m), ne(e, n), H(e, m);
+        const U = r.getState().stateComponents.get(e);
+        U && U.components.forEach((f) => {
+          f.forceUpdate();
         });
       }), {
-        fetchId: (U) => r.get()[U]
+        fetchId: (U) => n.get()[U]
       };
     },
-    _initialState: n.getState().initialStateGlobal[e],
-    _serverState: n.getState().serverState[e],
-    _isLoading: n.getState().isLoadingGlobal[e],
+    _initialState: r.getState().initialStateGlobal[e],
+    _serverState: r.getState().serverState[e],
+    _isLoading: r.getState().isLoadingGlobal[e],
     _isServerSynced: () => {
-      const m = n.getState().serverState[e];
+      const m = r.getState().serverState[e];
       return !!(m && W(m, Ee(e)));
     }
   };
-  function s(m, r = [], y) {
-    const j = r.map(String).join(".");
+  function s(m, n = [], y) {
+    const j = n.map(String).join(".");
     S.get(j);
     const _ = function() {
-      return n().getNestedState(e, r);
+      return r().getNestedState(e, n);
     };
-    Object.keys(h).forEach((g) => {
-      _[g] = h[g];
+    Object.keys(h).forEach((f) => {
+      _[f] = h[f];
     });
     const x = {
-      apply(g, c, K) {
+      apply(f, c, K) {
         return console.log(
-          `PROXY APPLY TRAP HIT: stateKey=${e}, path=${r.join(".")}`
-        ), console.trace("Apply trap stack trace"), n().getNestedState(e, r);
+          `PROXY APPLY TRAP HIT: stateKey=${e}, path=${n.join(".")}`
+        ), console.trace("Apply trap stack trace"), r().getNestedState(e, n);
       },
-      get(g, c) {
+      get(f, c) {
         y?.validIndices && !Array.isArray(m) && (y = { ...y, validIndices: void 0 });
         const K = /* @__PURE__ */ new Set([
           "insert",
@@ -510,42 +510,49 @@ function re(e, i, v, u) {
           "middleware"
         ]);
         if (c !== "then" && !c.startsWith("$") && c !== "stateMapNoRender" && !K.has(c)) {
-          const l = `${e}////${v}`, t = n.getState().stateComponents.get(e);
+          const l = `${e}////${v}`;
+          console.log("adding path", l, n, c);
+          const t = r.getState().stateComponents.get(e);
           if (t) {
             const a = t.components.get(l);
             if (a && !a.pathsInitialized && (a.pathsInitialized = !0, !a.paths.has(""))) {
-              const o = r.join(".");
+              const o = n.join(".");
               let d = !0;
               for (const I of a.paths)
                 if (o.startsWith(I) && (o === I || o[I.length] === ".")) {
                   d = !1;
                   break;
                 }
-              d && a.paths.add(o);
+              d && (console.log(
+                "adding path actualyl adding",
+                l,
+                n,
+                c
+              ), a.paths.add(o));
             }
           }
         }
         if (c === "getDifferences")
-          return () => fe(
-            n.getState().cogsStateStore[e],
-            n.getState().initialStateGlobal[e]
+          return () => ge(
+            r.getState().cogsStateStore[e],
+            r.getState().initialStateGlobal[e]
           );
-        if (c === "sync" && r.length === 0)
+        if (c === "sync" && n.length === 0)
           return async function() {
-            const l = n.getState().getInitialOptions(e), t = l?.sync;
+            const l = r.getState().getInitialOptions(e), t = l?.sync;
             if (!t)
               return console.error(`No mutation defined for state key "${e}"`), { success: !1, error: "No mutation defined" };
-            const a = n.getState().getNestedState(e, []), o = l?.validation?.key;
+            const a = r.getState().getNestedState(e, []), o = l?.validation?.key;
             try {
               const d = await t.action(a);
               if (d && !d.success && d.errors && o) {
-                n.getState().removeValidationError(o), d.errors.forEach((f) => {
-                  const N = [o, ...f.path].join(".");
-                  n.getState().addValidationError(N, f.message);
+                r.getState().removeValidationError(o), d.errors.forEach((g) => {
+                  const N = [o, ...g.path].join(".");
+                  r.getState().addValidationError(N, g.message);
                 });
-                const I = n.getState().stateComponents.get(e);
-                I && I.components.forEach((f) => {
-                  f.forceUpdate();
+                const I = r.getState().stateComponents.get(e);
+                I && I.components.forEach((g) => {
+                  g.forceUpdate();
                 });
               }
               return d?.success && t.onSuccess ? t.onSuccess(d.data) : !d?.success && t.onError && t.onError(d.error), d;
@@ -554,95 +561,95 @@ function re(e, i, v, u) {
             }
           };
         if (c === "_status") {
-          const l = n.getState().getNestedState(e, r), t = n.getState().initialStateGlobal[e], a = G(t, r);
+          const l = r.getState().getNestedState(e, n), t = r.getState().initialStateGlobal[e], a = G(t, n);
           return W(l, a) ? "fresh" : "stale";
         }
         if (c === "getStatus")
           return function() {
-            const l = n().getNestedState(
+            const l = r().getNestedState(
               e,
-              r
-            ), t = n.getState().initialStateGlobal[e], a = G(t, r);
+              n
+            ), t = r.getState().initialStateGlobal[e], a = G(t, n);
             return W(l, a) ? "fresh" : "stale";
           };
         if (c === "removeStorage")
           return () => {
-            const l = n.getState().initialStateGlobal[e], t = Y(e), a = J(t?.localStorage?.key) ? t?.localStorage?.key(l) : t?.localStorage?.key, o = `${u}-${e}-${a}`;
+            const l = r.getState().initialStateGlobal[e], t = Y(e), a = J(t?.localStorage?.key) ? t?.localStorage?.key(l) : t?.localStorage?.key, o = `${u}-${e}-${a}`;
             o && localStorage.removeItem(o);
           };
         if (c === "showValidationErrors")
           return () => {
-            const l = n.getState().getInitialOptions(e)?.validation;
+            const l = r.getState().getInitialOptions(e)?.validation;
             if (!l?.key)
               throw new Error("Validation key not found");
-            return n.getState().getValidationErrors(l.key + "." + r.join("."));
+            return r.getState().getValidationErrors(l.key + "." + n.join("."));
           };
         if (Array.isArray(m)) {
           const l = () => y?.validIndices ? m.map((a, o) => ({
             item: a,
             originalIndex: y.validIndices[o]
-          })) : n.getState().getNestedState(e, r).map((a, o) => ({
+          })) : r.getState().getNestedState(e, n).map((a, o) => ({
             item: a,
             originalIndex: o
           }));
           if (c === "getSelected")
             return () => {
-              const t = n.getState().getSelectedIndex(e, r.join("."));
+              const t = r.getState().getSelectedIndex(e, n.join("."));
               if (t !== void 0)
                 return s(
                   m[t],
-                  [...r, t.toString()],
+                  [...n, t.toString()],
                   y
                 );
             };
           if (c === "clearSelected")
             return () => {
-              n.getState().clearSelectedIndex({ stateKey: e, path: r });
+              r.getState().clearSelectedIndex({ stateKey: e, path: n });
             };
           if (c === "getSelectedIndex")
-            return () => n.getState().getSelectedIndex(e, r.join(".")) ?? -1;
+            return () => r.getState().getSelectedIndex(e, n.join(".")) ?? -1;
           if (c === "stateSort")
             return (t) => {
               const o = [...l()].sort(
-                (f, N) => t(f.item, N.item)
-              ), d = o.map(({ item: f }) => f), I = {
+                (g, N) => t(g.item, N.item)
+              ), d = o.map(({ item: g }) => g), I = {
                 ...y,
                 validIndices: o.map(
-                  ({ originalIndex: f }) => f
+                  ({ originalIndex: g }) => g
                 )
               };
-              return s(d, r, I);
+              return s(d, n, I);
             };
           if (c === "stateFilter")
             return (t) => {
               const o = l().filter(
-                ({ item: f }, N) => t(f, N)
-              ), d = o.map(({ item: f }) => f), I = {
+                ({ item: g }, N) => t(g, N)
+              ), d = o.map(({ item: g }) => g), I = {
                 ...y,
                 validIndices: o.map(
-                  ({ originalIndex: f }) => f
+                  ({ originalIndex: g }) => g
                 )
               };
-              return s(d, r, I);
+              return s(d, n, I);
             };
           if (c === "stateMap" || c === "stateMapNoRender")
             return (t) => m.map((o, d) => {
               let I;
               y?.validIndices && y.validIndices[d] !== void 0 ? I = y.validIndices[d] : I = d;
-              const f = [...r, I.toString()], N = s(o, f, y);
+              const g = [...n, I.toString()], N = s(o, g, y);
               return t(
                 o,
                 N,
                 d,
                 m,
-                s(m, r, y)
+                s(m, n, y)
               );
             });
           if (c === "$stateMap")
             return (t) => ae(We, {
               proxy: {
                 _stateKey: e,
-                _path: r,
+                _path: n,
                 _mapFn: t
                 // Pass the actual function, not string
               },
@@ -657,89 +664,89 @@ function re(e, i, v, u) {
               );
               return s(
                 o,
-                [...r, "[*]", t],
+                [...n, "[*]", t],
                 y
               );
             };
           if (c === "index")
             return (t) => {
               const a = m[t];
-              return s(a, [...r, t.toString()]);
+              return s(a, [...n, t.toString()]);
             };
           if (c === "last")
             return () => {
-              const t = n.getState().getNestedState(e, r);
+              const t = r.getState().getNestedState(e, n);
               if (t.length === 0) return;
-              const a = t.length - 1, o = t[a], d = [...r, a.toString()];
+              const a = t.length - 1, o = t[a], d = [...n, a.toString()];
               return s(o, d);
             };
           if (c === "insert")
-            return (t) => (p(r), ce(i, t, r, e), s(
-              n.getState().getNestedState(e, r),
-              r
+            return (t) => (p(n), ce(i, t, n, e), s(
+              r.getState().getNestedState(e, n),
+              n
             ));
           if (c === "uniqueInsert")
             return (t, a, o) => {
-              const d = n.getState().getNestedState(e, r), I = J(t) ? t(d) : t;
-              let f = null;
+              const d = r.getState().getNestedState(e, n), I = J(t) ? t(d) : t;
+              let g = null;
               if (!d.some((w) => {
                 if (a) {
                   const F = a.every(
                     (b) => W(w[b], I[b])
                   );
-                  return F && (f = w), F;
+                  return F && (g = w), F;
                 }
                 const $ = W(w, I);
-                return $ && (f = w), $;
+                return $ && (g = w), $;
               }))
-                p(r), ce(i, I, r, e);
-              else if (o && f) {
-                const w = o(f), $ = d.map(
-                  (F) => W(F, f) ? w : F
+                p(n), ce(i, I, n, e);
+              else if (o && g) {
+                const w = o(g), $ = d.map(
+                  (F) => W(F, g) ? w : F
                 );
-                p(r), Q(i, $, r);
+                p(n), Q(i, $, n);
               }
             };
           if (c === "cut")
             return (t, a) => {
               if (!a?.waitForSync)
-                return p(r), ee(i, r, e, t), s(
-                  n.getState().getNestedState(e, r),
-                  r
+                return p(n), ee(i, n, e, t), s(
+                  r.getState().getNestedState(e, n),
+                  n
                 );
             };
           if (c === "cutByValue")
             return (t) => {
               for (let a = 0; a < m.length; a++)
-                m[a] === t && ee(i, r, e, a);
+                m[a] === t && ee(i, n, e, a);
             };
           if (c === "toggleByValue")
             return (t) => {
               const a = m.findIndex((o) => o === t);
-              a > -1 ? ee(i, r, e, a) : ce(i, t, r, e);
+              a > -1 ? ee(i, n, e, a) : ce(i, t, n, e);
             };
           if (c === "stateFind")
             return (t) => {
               const o = l().find(
-                ({ item: I }, f) => t(I, f)
+                ({ item: I }, g) => t(I, g)
               );
               if (!o) return;
-              const d = [...r, o.originalIndex.toString()];
+              const d = [...n, o.originalIndex.toString()];
               return s(o.item, d, y);
             };
           if (c === "findWith")
             return (t, a) => {
               const d = l().find(
-                ({ item: f }) => f[t] === a
+                ({ item: g }) => g[t] === a
               );
               if (!d) return;
-              const I = [...r, d.originalIndex.toString()];
+              const I = [...n, d.originalIndex.toString()];
               return s(d.item, I, y);
             };
         }
-        const L = r[r.length - 1];
+        const L = n[n.length - 1];
         if (!isNaN(Number(L))) {
-          const l = r.slice(0, -1), t = n.getState().getNestedState(e, l);
+          const l = n.slice(0, -1), t = r.getState().getNestedState(e, l);
           if (Array.isArray(t) && c === "cut")
             return () => ee(
               i,
@@ -749,67 +756,67 @@ function re(e, i, v, u) {
             );
         }
         if (c === "get")
-          return () => n.getState().getNestedState(e, r);
+          return () => r.getState().getNestedState(e, n);
         if (c === "$derive")
           return (l) => le({
             _stateKey: e,
-            _path: r,
+            _path: n,
             _effect: l.toString()
           });
         if (c === "$derive")
           return (l) => le({
             _stateKey: e,
-            _path: r,
+            _path: n,
             _effect: l.toString()
           });
         if (c === "$get")
           return () => le({
             _stateKey: e,
-            _path: r
+            _path: n
           });
         if (c === "lastSynced") {
-          const l = `${e}:${r.join(".")}`;
-          return n.getState().getSyncInfo(l);
+          const l = `${e}:${n.join(".")}`;
+          return r.getState().getSyncInfo(l);
         }
         if (c == "getLocalStorage")
           return (l) => oe(u + "-" + e + "-" + l);
         if (c === "_selected") {
-          const l = r.slice(0, -1), t = l.join("."), a = n.getState().getNestedState(e, l);
-          return Array.isArray(a) ? Number(r[r.length - 1]) === n.getState().getSelectedIndex(e, t) : void 0;
+          const l = n.slice(0, -1), t = l.join("."), a = r.getState().getNestedState(e, l);
+          return Array.isArray(a) ? Number(n[n.length - 1]) === r.getState().getSelectedIndex(e, t) : void 0;
         }
         if (c === "setSelected")
           return (l) => {
-            const t = r.slice(0, -1), a = Number(r[r.length - 1]), o = t.join(".");
-            l ? n.getState().setSelectedIndex(e, o, a) : n.getState().setSelectedIndex(e, o, void 0);
-            const d = n.getState().getNestedState(e, [...t]);
+            const t = n.slice(0, -1), a = Number(n[n.length - 1]), o = t.join(".");
+            l ? r.getState().setSelectedIndex(e, o, a) : r.getState().setSelectedIndex(e, o, void 0);
+            const d = r.getState().getNestedState(e, [...t]);
             Q(i, d, t), p(t);
           };
         if (c === "toggleSelected")
           return () => {
-            const l = r.slice(0, -1), t = Number(r[r.length - 1]), a = l.join("."), o = n.getState().getSelectedIndex(e, a);
-            n.getState().setSelectedIndex(
+            const l = n.slice(0, -1), t = Number(n[n.length - 1]), a = l.join("."), o = r.getState().getSelectedIndex(e, a);
+            r.getState().setSelectedIndex(
               e,
               a,
               o === t ? void 0 : t
             );
-            const d = n.getState().getNestedState(e, [...l]);
+            const d = r.getState().getNestedState(e, [...l]);
             Q(i, d, l), p(l);
           };
-        if (r.length == 0) {
+        if (n.length == 0) {
           if (c === "applyJsonPatch")
             return (l) => {
-              const t = n.getState().cogsStateStore[e], o = Ce(t, l).newDocument;
+              const t = r.getState().cogsStateStore[e], o = Ce(t, l).newDocument;
               ke(
                 e,
-                n.getState().initialStateGlobal[e],
+                r.getState().initialStateGlobal[e],
                 o,
                 i,
                 v,
                 u
               );
-              const d = n.getState().stateComponents.get(e);
+              const d = r.getState().stateComponents.get(e);
               if (d) {
-                const I = fe(t, o), f = new Set(I);
+                const I = ge(t, o), g = new Set(I);
                 for (const [
                   N,
                   w
@@ -822,7 +829,7 @@ function re(e, i, v, u) {
                       continue;
                     }
                     if (F.includes("component") && (w.paths.has("") && ($ = !0), !$))
-                      for (const b of f) {
+                      for (const b of g) {
                         if (w.paths.has(b)) {
                           $ = !0;
                           break;
@@ -866,21 +873,21 @@ function re(e, i, v, u) {
             };
           if (c === "validateZodSchema")
             return () => {
-              const l = n.getState().getInitialOptions(e)?.validation, t = n.getState().addValidationError;
+              const l = r.getState().getInitialOptions(e)?.validation, t = r.getState().addValidationError;
               if (!l?.zodSchema)
                 throw new Error("Zod schema not found");
               if (!l?.key)
                 throw new Error("Validation key not found");
               B(l.key);
-              const a = n.getState().cogsStateStore[e];
+              const a = r.getState().cogsStateStore[e];
               try {
-                const o = n.getState().getValidationErrors(l.key);
+                const o = r.getState().getValidationErrors(l.key);
                 o && o.length > 0 && o.forEach(([I]) => {
                   I && I.startsWith(l.key) && B(I);
                 });
                 const d = l.zodSchema.safeParse(a);
-                return d.success ? !0 : (d.error.errors.forEach((f) => {
-                  const N = f.path, w = f.message, $ = [l.key, ...N].join(".");
+                return d.success ? !0 : (d.error.errors.forEach((g) => {
+                  const N = g.path, w = g.message, $ = [l.key, ...N].join(".");
                   t($, w);
                 }), ie(e), !1);
               } catch (o) {
@@ -889,22 +896,22 @@ function re(e, i, v, u) {
             };
           if (c === "_componentId") return v;
           if (c === "getComponents")
-            return () => n().stateComponents.get(e);
+            return () => r().stateComponents.get(e);
           if (c === "getAllFormRefs")
             return () => ve.getState().getFormRefsByStateKey(e);
           if (c === "_initialState")
-            return n.getState().initialStateGlobal[e];
+            return r.getState().initialStateGlobal[e];
           if (c === "_serverState")
-            return n.getState().serverState[e];
+            return r.getState().serverState[e];
           if (c === "_isLoading")
-            return n.getState().isLoadingGlobal[e];
+            return r.getState().isLoadingGlobal[e];
           if (c === "revertToInitialState")
             return h.revertToInitialState;
           if (c === "updateInitialState") return h.updateInitialState;
           if (c === "removeValidation") return h.removeValidation;
         }
         if (c === "getFormRef")
-          return () => ve.getState().getFormRef(e + "." + r.join("."));
+          return () => ve.getState().getFormRef(e + "." + n.join("."));
         if (c === "validationWrapper")
           return ({
             children: l,
@@ -913,30 +920,30 @@ function re(e, i, v, u) {
             Pe,
             {
               formOpts: t ? { validation: { message: "" } } : void 0,
-              path: r,
-              validationKey: n.getState().getInitialOptions(e)?.validation?.key || "",
+              path: n,
+              validationKey: r.getState().getInitialOptions(e)?.validation?.key || "",
               stateKey: e,
               validIndices: y?.validIndices,
               children: l
             }
           );
         if (c === "_stateKey") return e;
-        if (c === "_path") return r;
+        if (c === "_path") return n;
         if (c === "_isServerSynced") return h._isServerSynced;
         if (c === "update")
           return (l, t) => {
             if (t?.debounce)
               be(() => {
-                Q(i, l, r, "");
-                const a = n.getState().getNestedState(e, r);
+                Q(i, l, n, "");
+                const a = r.getState().getNestedState(e, n);
                 t?.afterUpdate && t.afterUpdate(a);
               }, t.debounce);
             else {
-              Q(i, l, r, "");
-              const a = n.getState().getNestedState(e, r);
+              Q(i, l, n, "");
+              const a = r.getState().getNestedState(e, n);
               t?.afterUpdate && t.afterUpdate(a);
             }
-            p(r);
+            p(n);
           };
         if (c === "formElement")
           return (l, t) => /* @__PURE__ */ ye(
@@ -944,12 +951,12 @@ function re(e, i, v, u) {
             {
               setState: i,
               stateKey: e,
-              path: r,
+              path: n,
               child: l,
               formOpts: t
             }
           );
-        const A = [...r, c], X = n.getState().getNestedState(e, A);
+        const A = [...n, c], X = r.getState().getNestedState(e, A);
         return s(X, A, y);
       }
     }, U = new Proxy(_, x);
@@ -959,7 +966,7 @@ function re(e, i, v, u) {
     }), U;
   }
   return s(
-    n.getState().getNestedState(e, [])
+    r.getState().getNestedState(e, [])
   );
 }
 function le(e) {
@@ -969,7 +976,7 @@ function We({
   proxy: e,
   rebuildStateShape: i
 }) {
-  const v = n().getNestedState(e._stateKey, e._path);
+  const v = r().getNestedState(e._stateKey, e._path);
   return Array.isArray(v) ? i(
     v,
     e._path
@@ -993,20 +1000,20 @@ function Ge({
       position: p,
       effect: e._effect
     };
-    n.getState().addSignalElement(v, m);
-    const r = n.getState().getNestedState(e._stateKey, e._path);
+    r.getState().addSignalElement(v, m);
+    const n = r.getState().getNestedState(e._stateKey, e._path);
     let y;
     if (e._effect)
       try {
         y = new Function(
           "state",
           `return (${e._effect})(state)`
-        )(r);
+        )(n);
       } catch (_) {
-        console.error("Error evaluating effect function during mount:", _), y = r;
+        console.error("Error evaluating effect function during mount:", _), y = n;
       }
     else
-      y = r;
+      y = n;
     y !== null && typeof y == "object" && (y = JSON.stringify(y));
     const j = document.createTextNode(String(y));
     u.replaceWith(j);
@@ -1019,7 +1026,7 @@ function Ge({
 function nt(e) {
   const i = Ve(
     (v) => {
-      const u = n.getState().stateComponents.get(e._stateKey) || {
+      const u = r.getState().stateComponents.get(e._stateKey) || {
         components: /* @__PURE__ */ new Map()
       };
       return u.components.set(e._stateKey, {
@@ -1027,7 +1034,7 @@ function nt(e) {
         paths: /* @__PURE__ */ new Set([e._path.join(".")])
       }), () => u.components.delete(e._stateKey);
     },
-    () => n.getState().getNestedState(e._stateKey, e._path)
+    () => r.getState().getNestedState(e._stateKey, e._path)
   );
   return ae("text", {}, String(i));
 }