cogsbox-state 0.5.440 → 0.5.441

package/dist/CogsState.jsx

@@ -1,6 +1,6 @@
 "use client";
 import { jsx as ot, Fragment as Ut } from "react/jsx-runtime";
-import { memo as Ot, useState as K, useRef as q, useCallback as ct, useEffect as Z, useLayoutEffect as dt, useMemo as St, createElement as lt, startTransition as Rt } from "react";
+import { memo as Ot, useState as K, useRef as q, useCallback as ct, useEffect as Z, useLayoutEffect as dt, useMemo as gt, createElement as lt, startTransition as Rt } from "react";
 import { createRoot as At } from "react-dom/client";
 import { transformStateFunc as Nt, isFunction as at, isArray as Tt, getDifferences as Ct, isDeepEqual as st } from "./utility.js";
 import { ValidationWrapper as kt } from "./Functions.jsx";
@@ -9,51 +9,51 @@ import { v4 as rt } from "uuid";
 import { getGlobalStore as e, formRefStore as vt } from "./store.js";
 import { useCogsConfig as Pt } from "./CogsStateClient.jsx";
 import { useInView as jt } from "react-intersection-observer";
-function yt(t, r) {
-  const g = e.getState().getInitialOptions, S = e.getState().setInitialStateOptions, y = g(t) || {};
-  S(t, {
+function yt(t, n) {
+  const S = e.getState().getInitialOptions, g = e.getState().setInitialStateOptions, y = S(t) || {};
+  g(t, {
     ...y,
-    ...r
+    ...n
   });
 }
 function Et({
   stateKey: t,
-  options: r,
-  initialOptionsPart: g
+  options: n,
+  initialOptionsPart: S
 }) {
-  const S = nt(t) || {}, y = g[t] || {}, I = e.getState().setInitialStateOptions, E = { ...y, ...S };
+  const g = nt(t) || {}, y = S[t] || {}, I = e.getState().setInitialStateOptions, E = { ...y, ...g };
   let u = !1;
-  if (r)
-    for (const f in r)
-      E.hasOwnProperty(f) ? (f == "localStorage" && r[f] && E[f].key !== r[f]?.key && (u = !0, E[f] = r[f]), f == "defaultState" && r[f] && E[f] !== r[f] && !st(E[f], r[f]) && (u = !0, E[f] = r[f])) : (u = !0, E[f] = r[f]);
+  if (n)
+    for (const f in n)
+      E.hasOwnProperty(f) ? (f == "localStorage" && n[f] && E[f].key !== n[f]?.key && (u = !0, E[f] = n[f]), f == "defaultState" && n[f] && E[f] !== n[f] && !st(E[f], n[f]) && (u = !0, E[f] = n[f])) : (u = !0, E[f] = n[f]);
   u && I(t, E);
 }
-function ie(t, { formElements: r, validation: g }) {
-  return { initialState: t, formElements: r, validation: g };
+function ie(t, { formElements: n, validation: S }) {
+  return { initialState: t, formElements: n, validation: S };
 }
-const Lt = (t, r) => {
-  let g = t;
-  const [S, y] = Nt(g);
-  r?.__fromSyncSchema && r?.__syncNotifications && e.getState().setInitialStateOptions("__notifications", r.__syncNotifications), Object.keys(S).forEach((u) => {
+const Lt = (t, n) => {
+  let S = t;
+  const [g, y] = Nt(S);
+  n?.__fromSyncSchema && n?.__syncNotifications && e.getState().setInitialStateOptions("__notifications", n.__syncNotifications), Object.keys(g).forEach((u) => {
     let f = y[u] || {};
     const A = {
       ...f
     };
-    if (r?.formElements && (A.formElements = {
-      ...r.formElements,
+    if (n?.formElements && (A.formElements = {
+      ...n.formElements,
       ...f.formElements || {}
-    }), r?.validation && (A.validation = {
-      ...r.validation,
+    }), n?.validation && (A.validation = {
+      ...n.validation,
       ...f.validation || {}
-    }, r.validation.key && !f.validation?.key && (A.validation.key = `${r.validation.key}.${u}`)), Object.keys(A).length > 0) {
+    }, n.validation.key && !f.validation?.key && (A.validation.key = `${n.validation.key}.${u}`)), Object.keys(A).length > 0) {
       const w = nt(u);
       w ? e.getState().setInitialStateOptions(u, {
         ...w,
         ...A
       }) : e.getState().setInitialStateOptions(u, A);
     }
-  }), Object.keys(S).forEach((u) => {
-    e.getState().initializeShadowState(u, S[u]);
+  }), Object.keys(g).forEach((u) => {
+    e.getState().initializeShadowState(u, g[u]);
   });
   const I = (u, f) => {
     const [A] = K(f?.componentId ?? rt());
@@ -62,7 +62,7 @@ const Lt = (t, r) => {
       options: f,
       initialOptionsPart: y
     });
-    const w = e.getState().getShadowValue(u) || S[u], i = f?.modifyState ? f.modifyState(w) : w;
+    const w = e.getState().getShadowValue(u) || g[u], i = f?.modifyState ? f.modifyState(w) : w;
     return zt(i, {
       stateKey: u,
       syncUpdate: f?.syncUpdate,
@@ -82,15 +82,12 @@ const Lt = (t, r) => {
   return { useCogsState: I, setCogsOptions: E };
 };
 function ce(t) {
-  const r = {};
-  for (const g in t.schemas) {
-    const S = t.schemas[g];
-    S.rawSchema ? r[g] = S.rawSchema : S.schemas?.defaults ? r[g] = S.schemas.defaults : S._tableName ? r[g] = S : r[g] = {};
+  const n = t.schemas, S = {};
+  for (const g in n) {
+    const y = n[g];
+    S[g] = y.schemas?.defaults || {};
   }
-  return Lt(r, {
-    __fromSyncSchema: !0,
-    __syncNotifications: t.notifications
-  });
+  return e.getState().setInitialStateOptions("__notifications", t.notifications), Lt(S);
 }
 const {
   getInitialOptions: nt,
@@ -99,22 +96,22 @@ const {
   updateInitialStateGlobal: _t,
   addValidationError: pt,
   removeValidationError: ut
-} = e.getState(), Ht = (t, r, g, S, y) => {
-  g?.log && console.log(
+} = e.getState(), Ht = (t, n, S, g, y) => {
+  S?.log && console.log(
     "saving to localstorage",
-    r,
-    g.localStorage?.key,
-    S
+    n,
+    S.localStorage?.key,
+    g
   );
-  const I = at(g?.localStorage?.key) ? g.localStorage?.key(t) : g?.localStorage?.key;
-  if (I && S) {
-    const E = `${S}-${r}-${I}`;
+  const I = at(S?.localStorage?.key) ? S.localStorage?.key(t) : S?.localStorage?.key;
+  if (I && g) {
+    const E = `${g}-${n}-${I}`;
     let u;
     try {
-      u = gt(E)?.lastSyncedWithServer;
+      u = St(E)?.lastSyncedWithServer;
     } catch {
     }
-    const f = e.getState().getShadowMetadata(r, []), A = {
+    const f = e.getState().getShadowMetadata(n, []), A = {
       state: t,
       lastUpdated: Date.now(),
       lastSyncedWithServer: u,
@@ -126,69 +123,69 @@ const {
       JSON.stringify(w.json)
     );
   }
-}, gt = (t) => {
+}, St = (t) => {
   if (!t) return null;
   try {
-    const r = window.localStorage.getItem(t);
-    return r ? JSON.parse(r) : null;
-  } catch (r) {
-    return console.error("Error loading from localStorage:", r), null;
+    const n = window.localStorage.getItem(t);
+    return n ? JSON.parse(n) : null;
+  } catch (n) {
+    return console.error("Error loading from localStorage:", n), null;
   }
-}, xt = (t, r) => {
-  const g = e.getState().getShadowValue(t), { sessionId: S } = Pt(), y = at(r?.localStorage?.key) ? r.localStorage.key(g) : r?.localStorage?.key;
-  if (y && S) {
-    const I = gt(
-      `${S}-${t}-${y}`
+}, xt = (t, n) => {
+  const S = e.getState().getShadowValue(t), { sessionId: g } = Pt(), y = at(n?.localStorage?.key) ? n.localStorage.key(S) : n?.localStorage?.key;
+  if (y && g) {
+    const I = St(
+      `${g}-${t}-${y}`
     );
     if (I && I.lastUpdated > (I.lastSyncedWithServer || 0))
       return it(t), !0;
   }
   return !1;
 }, it = (t) => {
-  const r = e.getState().getShadowMetadata(t, []);
-  if (!r) return;
-  const g = /* @__PURE__ */ new Set();
-  r?.components?.forEach((S) => {
-    (S ? Array.isArray(S.reactiveType) ? S.reactiveType : [S.reactiveType || "component"] : null)?.includes("none") || g.add(() => S.forceUpdate());
+  const n = e.getState().getShadowMetadata(t, []);
+  if (!n) return;
+  const S = /* @__PURE__ */ new Set();
+  n?.components?.forEach((g) => {
+    (g ? Array.isArray(g.reactiveType) ? g.reactiveType : [g.reactiveType || "component"] : null)?.includes("none") || S.add(() => g.forceUpdate());
   }), queueMicrotask(() => {
-    g.forEach((S) => S());
+    S.forEach((g) => g());
   });
-}, ue = (t, r) => {
-  const g = e.getState().getShadowMetadata(t, []);
-  if (g) {
-    const S = `${t}////${r}`, y = g?.components?.get(S);
+}, ue = (t, n) => {
+  const S = e.getState().getShadowMetadata(t, []);
+  if (S) {
+    const g = `${t}////${n}`, y = S?.components?.get(g);
     if ((y ? Array.isArray(y.reactiveType) ? y.reactiveType : [y.reactiveType || "component"] : null)?.includes("none"))
       return;
     y && y.forceUpdate();
   }
 };
-function wt(t, r, g, S) {
-  const y = e.getState(), I = y.getShadowMetadata(t, r);
-  if (y.setShadowMetadata(t, r, {
+function wt(t, n, S, g) {
+  const y = e.getState(), I = y.getShadowMetadata(t, n);
+  if (y.setShadowMetadata(t, n, {
     ...I,
     isDirty: !1,
     stateSource: "server",
-    lastServerSync: S || Date.now()
-  }), Array.isArray(g)) {
-    const E = y.getShadowMetadata(t, r);
+    lastServerSync: g || Date.now()
+  }), Array.isArray(S)) {
+    const E = y.getShadowMetadata(t, n);
     E?.arrayKeys && E.arrayKeys.forEach((u, f) => {
-      const A = u.split(".").slice(1), w = g[f];
+      const A = u.split(".").slice(1), w = S[f];
       w !== void 0 && wt(
         t,
         A,
         w,
-        S
+        g
       );
     });
-  } else g && typeof g == "object" && g.constructor === Object && Object.keys(g).forEach((E) => {
-    const u = [...r, E], f = g[E];
-    wt(t, u, f, S);
+  } else S && typeof S == "object" && S.constructor === Object && Object.keys(S).forEach((E) => {
+    const u = [...n, E], f = S[E];
+    wt(t, u, f, g);
   });
 }
 function zt(t, {
-  stateKey: r,
-  localStorage: g,
-  formElements: S,
+  stateKey: n,
+  localStorage: S,
+  formElements: g,
   reactiveDeps: y,
   reactiveType: I,
   componentId: E,
@@ -198,8 +195,8 @@ function zt(t, {
   serverState: w
 } = {}) {
   const [i, h] = K({}), { sessionId: M } = Pt();
-  let z = !r;
-  const [c] = K(r ?? rt()), B = e.getState().stateLog[c], J = q(/* @__PURE__ */ new Set()), H = q(E ?? rt()), W = q(
+  let z = !n;
+  const [c] = K(n ?? rt()), B = e.getState().stateLog[c], J = q(/* @__PURE__ */ new Set()), H = q(E ?? rt()), W = q(
     null
   );
   W.current = nt(c) ?? null, Z(() => {
@@ -221,7 +218,7 @@ function zt(t, {
           timestamp: a.serverState.timestamp || Date.now()
         };
       if (a?.localStorage?.key && M) {
-        const p = at(a.localStorage.key) ? a.localStorage.key(d) : a.localStorage.key, V = gt(
+        const p = at(a.localStorage.key) ? a.localStorage.key(d) : a.localStorage.key, V = St(
           `${M}-${c}-${p}`
         );
         if (V && V.lastUpdated > (a?.serverState?.timestamp || 0))
@@ -241,9 +238,9 @@ function zt(t, {
   );
   Z(() => {
     e.getState().setServerStateUpdate(c, w);
-  }, [w, c]), Z(() => e.getState().subscribeToPath(c, (n) => {
-    if (n?.type === "SERVER_STATE_UPDATE") {
-      const a = n.serverState;
+  }, [w, c]), Z(() => e.getState().subscribeToPath(c, (r) => {
+    if (r?.type === "SERVER_STATE_UPDATE") {
+      const a = r.serverState;
       if (a?.status === "success" && a.data !== void 0) {
         yt(c, { serverState: a });
         const l = typeof a.merge == "object" ? a.merge : a.merge === !0 ? {} : null, p = e.getState().getShadowValue(c), V = a.data;
@@ -295,10 +292,10 @@ function zt(t, {
     const o = e.getState().getShadowMetadata(c, []);
     if (o && o.stateSource)
       return;
-    const n = nt(c);
-    if (n?.defaultState !== void 0 || u !== void 0) {
-      const a = n?.defaultState || u;
-      n?.defaultState || yt(c, {
+    const r = nt(c);
+    if (r?.defaultState !== void 0 || u !== void 0) {
+      const a = r?.defaultState || u;
+      r?.defaultState || yt(c, {
         defaultState: a
       });
       const { value: d, source: l, timestamp: p } = m();
@@ -311,12 +308,12 @@ function zt(t, {
     }
   }, [c, ...A || []]), dt(() => {
     z && yt(c, {
-      formElements: S,
+      formElements: g,
       defaultState: u,
-      localStorage: g,
+      localStorage: S,
       middleware: W.current?.middleware
     });
-    const o = `${c}////${H.current}`, n = e.getState().getShadowMetadata(c, []), a = n?.components || /* @__PURE__ */ new Map();
+    const o = `${c}////${H.current}`, r = e.getState().getShadowMetadata(c, []), a = r?.components || /* @__PURE__ */ new Map();
     return a.set(o, {
       forceUpdate: () => h({}),
       reactiveType: I ?? ["component", "deps"],
@@ -325,7 +322,7 @@ function zt(t, {
       deps: y ? y(e.getState().getShadowValue(c)) : [],
       prevDeps: y ? y(e.getState().getShadowValue(c)) : []
     }), e.getState().setShadowMetadata(c, [], {
-      ...n,
+      ...r,
       components: a
     }), h({}), () => {
       const d = e.getState().getShadowMetadata(c, []), l = d?.components?.get(o);
@@ -335,16 +332,16 @@ function zt(t, {
       }), d?.components && e.getState().setShadowMetadata(c, [], d);
     };
   }, []);
-  const Y = q(null), Q = (o, n, a) => {
-    const d = [c, ...n].join(".");
-    if (Array.isArray(n)) {
-      const b = `${c}-${n.join(".")}`;
+  const Y = q(null), Q = (o, r, a) => {
+    const d = [c, ...r].join(".");
+    if (Array.isArray(r)) {
+      const b = `${c}-${r.join(".")}`;
       J.current.add(b);
     }
-    const l = e.getState(), p = l.getShadowMetadata(c, n), V = l.getShadowValue(d), _ = a.updateType === "insert" && at(o) ? o({ state: V, uuid: rt() }) : at(o) ? o(V) : o, C = {
+    const l = e.getState(), p = l.getShadowMetadata(c, r), V = l.getShadowValue(d), _ = a.updateType === "insert" && at(o) ? o({ state: V, uuid: rt() }) : at(o) ? o(V) : o, C = {
       timeStamp: Date.now(),
       stateKey: c,
-      path: n,
+      path: r,
       updateType: a.updateType,
       status: "new",
       oldValue: V,
@@ -352,8 +349,8 @@ function zt(t, {
     };
     switch (a.updateType) {
       case "insert": {
-        l.insertShadowArrayElement(c, n, C.newValue), l.markAsDirty(c, n, { bubble: !0 });
-        const b = l.getShadowMetadata(c, n);
+        l.insertShadowArrayElement(c, r, C.newValue), l.markAsDirty(c, r, { bubble: !0 });
+        const b = l.getShadowMetadata(c, r);
         if (b?.arrayKeys) {
           const k = b.arrayKeys[b.arrayKeys.length - 1];
           if (k) {
@@ -364,12 +361,12 @@ function zt(t, {
         break;
       }
       case "cut": {
-        const b = n.slice(0, -1);
-        l.removeShadowArrayElement(c, n), l.markAsDirty(c, b, { bubble: !0 });
+        const b = r.slice(0, -1);
+        l.removeShadowArrayElement(c, r), l.markAsDirty(c, b, { bubble: !0 });
         break;
       }
       case "update": {
-        l.updateShadowAtPath(c, n, C.newValue), l.markAsDirty(c, n, { bubble: !0 });
+        l.updateShadowAtPath(c, r, C.newValue), l.markAsDirty(c, r, { bubble: !0 });
         break;
       }
     }
@@ -396,8 +393,8 @@ function zt(t, {
       });
     }
     if (a.updateType === "insert" && p?.mapWrappers && p.mapWrappers.length > 0) {
-      const b = l.getShadowMetadata(c, n)?.arrayKeys || [], k = b[b.length - 1], P = l.getShadowValue(k), O = l.getShadowValue(
-        [c, ...n].join(".")
+      const b = l.getShadowMetadata(c, r)?.arrayKeys || [], k = b[b.length - 1], P = l.getShadowValue(k), O = l.getShadowValue(
+        [c, ...r].join(".")
       );
       if (!k || P === void 0) return;
       p.mapWrappers.forEach((v) => {
@@ -411,7 +408,7 @@ function zt(t, {
           if (T) {
             const D = It(
               c,
-              n,
+              r,
               v.meta.transforms
             ), R = v.meta.transforms.find(
               (L) => L.type === "sort"
@@ -458,7 +455,7 @@ function zt(t, {
       });
     }
     if (a.updateType === "cut") {
-      const b = n.slice(0, -1), k = l.getShadowMetadata(c, b);
+      const b = r.slice(0, -1), k = l.getShadowMetadata(c, b);
       k?.mapWrappers && k.mapWrappers.length > 0 && k.mapWrappers.forEach((P) => {
         if (P.containerRef && P.containerRef.isConnected) {
           const O = P.containerRef.querySelector(
@@ -476,7 +473,7 @@ function zt(t, {
     ), !N?.components)
       return x;
     if (a.updateType === "update") {
-      let b = [...n];
+      let b = [...r];
       for (; ; ) {
         const k = l.getShadowMetadata(c, b);
         if (k?.pathComponents && k.pathComponents.forEach((P) => {
@@ -489,7 +486,7 @@ function zt(t, {
         b.pop();
       }
       _ && typeof _ == "object" && !Tt(_) && V && typeof V == "object" && !Tt(V) && Ct(_, V).forEach((P) => {
-        const O = P.split("."), v = [...n, ...O], T = l.getShadowMetadata(c, v);
+        const O = P.split("."), v = [...r, ...O], T = l.getShadowMetadata(c, v);
         T?.pathComponents && T.pathComponents.forEach(($) => {
           if (j.has($))
             return;
@@ -498,7 +495,7 @@ function zt(t, {
         });
       });
     } else if (a.updateType === "insert" || a.updateType === "cut") {
-      const b = a.updateType === "insert" ? n : n.slice(0, -1), k = l.getShadowMetadata(c, b);
+      const b = a.updateType === "insert" ? r : r.slice(0, -1), k = l.getShadowMetadata(c, b);
       if (k?.signals && k.signals.length > 0) {
         const P = [c, ...b].join("."), O = l.getShadowValue(P);
         k.signals.forEach(({ parentId: v, position: T, effect: $ }) => {
@@ -560,7 +557,7 @@ function zt(t, {
     }), x;
   };
   e.getState().initialStateGlobal[c] || _t(c, t);
-  const X = St(() => Dt(
+  const X = gt(() => Dt(
     c,
     Q,
     H.current,
@@ -570,47 +567,47 @@ function zt(t, {
 }
 function Bt(t) {
   return !t || t.length === 0 ? "" : t.map(
-    (r) => (
+    (n) => (
       // Safely stringify dependencies. An empty array becomes '[]'.
-      `${r.type}${JSON.stringify(r.dependencies || [])}`
+      `${n.type}${JSON.stringify(n.dependencies || [])}`
     )
   ).join("");
 }
-const It = (t, r, g) => {
-  let S = e.getState().getShadowMetadata(t, r)?.arrayKeys || [];
-  if (!g || g.length === 0)
-    return S;
-  let y = S.map((I) => ({
+const It = (t, n, S) => {
+  let g = e.getState().getShadowMetadata(t, n)?.arrayKeys || [];
+  if (!S || S.length === 0)
+    return g;
+  let y = g.map((I) => ({
     key: I,
     value: e.getState().getShadowValue(I)
   }));
-  for (const I of g)
+  for (const I of S)
     I.type === "filter" ? y = y.filter(
       ({ value: E }, u) => I.fn(E, u)
     ) : I.type === "sort" && y.sort((E, u) => I.fn(E.value, u.value));
   return y.map(({ key: I }) => I);
-}, Vt = (t, r, g) => {
-  const S = `${t}////${r}`, { addPathComponent: y, getShadowMetadata: I } = e.getState(), u = I(t, [])?.components?.get(S);
-  !u || u.reactiveType === "none" || !(Array.isArray(u.reactiveType) ? u.reactiveType : [u.reactiveType]).includes("component") || y(t, g, S);
-}, ft = (t, r, g) => {
-  const S = e.getState(), y = S.getShadowMetadata(t, []), I = /* @__PURE__ */ new Set();
+}, Vt = (t, n, S) => {
+  const g = `${t}////${n}`, { addPathComponent: y, getShadowMetadata: I } = e.getState(), u = I(t, [])?.components?.get(g);
+  !u || u.reactiveType === "none" || !(Array.isArray(u.reactiveType) ? u.reactiveType : [u.reactiveType]).includes("component") || y(t, S, g);
+}, ft = (t, n, S) => {
+  const g = e.getState(), y = g.getShadowMetadata(t, []), I = /* @__PURE__ */ new Set();
   y?.components && y.components.forEach((u, f) => {
     (Array.isArray(u.reactiveType) ? u.reactiveType : [u.reactiveType || "component"]).includes("all") && (u.forceUpdate(), I.add(f));
-  }), S.getShadowMetadata(t, [...r, "getSelected"])?.pathComponents?.forEach((u) => {
+  }), g.getShadowMetadata(t, [...n, "getSelected"])?.pathComponents?.forEach((u) => {
     y?.components?.get(u)?.forceUpdate();
   });
-  const E = S.getShadowMetadata(t, r);
+  const E = g.getShadowMetadata(t, n);
   for (let u of E?.arrayKeys || []) {
-    const f = u + ".selected", A = S.getShadowMetadata(
+    const f = u + ".selected", A = g.getShadowMetadata(
       t,
       f.split(".").slice(1)
     );
-    u == g && A?.pathComponents?.forEach((w) => {
+    u == S && A?.pathComponents?.forEach((w) => {
       y?.components?.get(w)?.forceUpdate();
     });
   }
 };
-function Dt(t, r, g, S) {
+function Dt(t, n, S, g) {
   const y = /* @__PURE__ */ new Map();
   let I = 0;
   const E = (w) => {
@@ -640,17 +637,17 @@ function Dt(t, r, g, S) {
         if (m === "getDifferences")
           return () => {
             const s = e.getState().getShadowMetadata(t, []), o = e.getState().getShadowValue(t);
-            let n;
-            return s?.stateSource === "server" && s.baseServerState ? n = s.baseServerState : n = e.getState().initialStateGlobal[t], Ct(o, n);
+            let r;
+            return s?.stateSource === "server" && s.baseServerState ? r = s.baseServerState : r = e.getState().initialStateGlobal[t], Ct(o, r);
           };
         if (m === "sync" && i.length === 0)
           return async function() {
             const s = e.getState().getInitialOptions(t), o = s?.sync;
             if (!o)
               return console.error(`No mutation defined for state key "${t}"`), { success: !1, error: "No mutation defined" };
-            const n = e.getState().getShadowValue(t, []), a = s?.validation?.key;
+            const r = e.getState().getShadowValue(t, []), a = s?.validation?.key;
             try {
-              const d = await o.action(n);
+              const d = await o.action(r);
               if (d && !d.success && d.errors && a && (e.getState().removeValidationError(a), d.errors.forEach((l) => {
                 const p = [a, ...l.path].join(".");
                 e.getState().addValidationError(p, l.message);
@@ -661,7 +658,7 @@ function Dt(t, r, g, S) {
                   isDirty: !1,
                   lastServerSync: Date.now(),
                   stateSource: "server",
-                  baseServerState: n
+                  baseServerState: r
                   // Update base server state
                 }), o.onSuccess && o.onSuccess(d.data);
               } else !d?.success && o.onError && o.onError(d.error);
@@ -672,14 +669,14 @@ function Dt(t, r, g, S) {
           };
         if (m === "_status" || m === "getStatus") {
           const s = () => {
-            const o = e.getState().getShadowMetadata(t, i), n = e.getState().getShadowValue(c);
-            return o?.isDirty === !0 ? "dirty" : o?.isDirty === !1 || o?.stateSource === "server" ? "synced" : o?.stateSource === "localStorage" ? "restored" : o?.stateSource === "default" ? "fresh" : e.getState().getShadowMetadata(t, [])?.stateSource === "server" && !o?.isDirty ? "synced" : n !== void 0 && !o ? "fresh" : "unknown";
+            const o = e.getState().getShadowMetadata(t, i), r = e.getState().getShadowValue(c);
+            return o?.isDirty === !0 ? "dirty" : o?.isDirty === !1 || o?.stateSource === "server" ? "synced" : o?.stateSource === "localStorage" ? "restored" : o?.stateSource === "default" ? "fresh" : e.getState().getShadowMetadata(t, [])?.stateSource === "server" && !o?.isDirty ? "synced" : r !== void 0 && !o ? "fresh" : "unknown";
           };
           return m === "_status" ? s() : s;
         }
         if (m === "removeStorage")
           return () => {
-            const s = e.getState().initialStateGlobal[t], o = nt(t), n = at(o?.localStorage?.key) ? o.localStorage.key(s) : o?.localStorage?.key, a = `${S}-${t}-${n}`;
+            const s = e.getState().initialStateGlobal[t], o = nt(t), r = at(o?.localStorage?.key) ? o.localStorage.key(s) : o?.localStorage?.key, a = `${g}-${t}-${r}`;
             a && localStorage.removeItem(a);
           };
         if (m === "showValidationErrors")
@@ -698,14 +695,14 @@ function Dt(t, r, g, S) {
               const o = e.getState().selectedIndicesMap;
               if (!o || !o.has(s))
                 return;
-              const n = o.get(s);
-              if (h?.validIds && !h.validIds.includes(n))
+              const r = o.get(s);
+              if (h?.validIds && !h.validIds.includes(r))
                 return;
-              const a = e.getState().getShadowValue(n);
+              const a = e.getState().getShadowValue(r);
               if (a)
                 return u({
                   currentState: a,
-                  path: n.split(".").slice(1),
+                  path: r.split(".").slice(1),
                   componentId: M
                 });
             };
@@ -724,7 +721,7 @@ function Dt(t, r, g, S) {
             return (s) => {
               const {
                 itemHeight: o = 50,
-                overscan: n = 6,
+                overscan: r = 6,
                 stickToBottom: a = !1,
                 scrollStickTolerance: d = 75
               } = s, l = q(null), [p, V] = K({
@@ -747,7 +744,7 @@ function Dt(t, r, g, S) {
                   behavior: C.current ? "instant" : "smooth"
                 });
               }, [_, a]);
-              const N = e.getState().getShadowMetadata(t, i)?.arrayKeys || [], { totalHeight: j, itemOffsets: b } = St(() => {
+              const N = e.getState().getShadowMetadata(t, i)?.arrayKeys || [], { totalHeight: j, itemOffsets: b } = gt(() => {
                 let v = 0;
                 const T = /* @__PURE__ */ new Map();
                 return (e.getState().getShadowMetadata(t, i)?.arrayKeys || []).forEach((D) => {
@@ -766,7 +763,7 @@ function Dt(t, r, g, S) {
                         v.clientHeight / o
                       ), D = N.length - 1, R = Math.max(
                         0,
-                        D - $ - n
+                        D - $ - r
                       );
                       V({ startIndex: R, endIndex: D }), requestAnimationFrame(() => {
                         P("instant"), C.current = !1;
@@ -776,7 +773,7 @@ function Dt(t, r, g, S) {
                   };
                   T();
                 }
-              }, [N.length, a, o, n]);
+              }, [N.length, a, o, r]);
               const k = ct(() => {
                 const v = l.current;
                 if (!v) return;
@@ -793,10 +790,10 @@ function Dt(t, r, g, S) {
                 if (tt !== p.startIndex) {
                   const et = Math.ceil(D / o);
                   V({
-                    startIndex: Math.max(0, tt - n),
+                    startIndex: Math.max(0, tt - r),
                     endIndex: Math.min(
                       N.length - 1,
-                      tt + et + n
+                      tt + et + r
                     )
                   });
                 }
@@ -804,7 +801,7 @@ function Dt(t, r, g, S) {
                 N.length,
                 p.startIndex,
                 o,
-                n,
+                r,
                 d
               ]);
               Z(() => {
@@ -870,7 +867,7 @@ function Dt(t, r, g, S) {
                   clearTimeout($), R.disconnect(), v.removeEventListener("load", L, !0);
                 };
               }, [a, N.length, P]), {
-                virtualState: St(() => {
+                virtualState: gt(() => {
                   const v = e.getState(), T = v.getShadowValue(
                     [t, ...i].join(".")
                   ), $ = v.getShadowMetadata(t, i)?.arrayKeys || [], D = T.slice(
@@ -921,7 +918,7 @@ function Dt(t, r, g, S) {
             };
           if (m === "stateMap")
             return (s) => {
-              const [o, n] = K(
+              const [o, r] = K(
                 h?.validIds ?? e.getState().getShadowMetadata(t, i)?.arrayKeys
               ), a = e.getState().getShadowValue(c, h?.validIds);
               if (!o)
@@ -960,11 +957,11 @@ function Dt(t, r, g, S) {
             return (s) => {
               const o = h?.validIds ?? e.getState().getShadowMetadata(t, i)?.arrayKeys;
               if (o)
-                for (let n = 0; n < o.length; n++) {
-                  const a = o[n];
+                for (let r = 0; r < o.length; r++) {
+                  const a = o[r];
                   if (!a) continue;
                   const d = e.getState().getShadowValue(a);
-                  if (s(d, n)) {
+                  if (s(d, r)) {
                     const l = a.split(".").slice(1);
                     return u({
                       currentState: d,
@@ -981,15 +978,15 @@ function Dt(t, r, g, S) {
               const o = h?.validIds ?? e.getState().getShadowMetadata(t, i)?.arrayKeys;
               if (!o)
                 throw new Error("No array keys found for filtering.");
-              const n = [], a = w.filter(
-                (d, l) => s(d, l) ? (n.push(o[l]), !0) : !1
+              const r = [], a = w.filter(
+                (d, l) => s(d, l) ? (r.push(o[l]), !0) : !1
               );
               return u({
                 currentState: a,
                 path: i,
                 componentId: M,
                 meta: {
-                  validIds: n,
+                  validIds: r,
                   transforms: [
                     ...h?.transforms || [],
                     {
@@ -1005,16 +1002,16 @@ function Dt(t, r, g, S) {
               const o = h?.validIds ?? e.getState().getShadowMetadata(t, i)?.arrayKeys;
               if (!o)
                 throw new Error("No array keys found for sorting");
-              const n = w.map((a, d) => ({
+              const r = w.map((a, d) => ({
                 item: a,
                 key: o[d]
               }));
-              return n.sort((a, d) => s(a.item, d.item)).filter(Boolean), u({
-                currentState: n.map((a) => a.item),
+              return r.sort((a, d) => s(a.item, d.item)).filter(Boolean), u({
+                currentState: r.map((a) => a.item),
                 path: i,
                 componentId: M,
                 meta: {
-                  validIds: n.map((a) => a.key),
+                  validIds: r.map((a) => a.key),
                   transforms: [
                     ...h?.transforms || [],
                     { type: "sort", fn: s }
@@ -1026,7 +1023,7 @@ function Dt(t, r, g, S) {
             return function(s = {}) {
               const {
                 bufferSize: o = 100,
-                flushInterval: n = 100,
+                flushInterval: r = 100,
                 bufferStrategy: a = "accumulate",
                 store: d,
                 onFlush: l
@@ -1046,19 +1043,19 @@ function Dt(t, r, g, S) {
                 if (p = [], d) {
                   const b = d(j);
                   b !== void 0 && (Array.isArray(b) ? b : [b]).forEach((P) => {
-                    r(P, i, {
+                    n(P, i, {
                       updateType: "insert"
                     });
                   });
                 } else
                   j.forEach((b) => {
-                    r(b, i, {
+                    n(b, i, {
                       updateType: "insert"
                     });
                   });
                 l?.(j);
               };
-              n > 0 && (_ = setInterval(C, n));
+              r > 0 && (_ = setInterval(C, r));
               const F = rt(), x = e.getState().getShadowMetadata(t, i) || {}, N = x.streams || /* @__PURE__ */ new Map();
               return N.set(F, { buffer: p, flushTimer: _ }), e.getState().setShadowMetadata(t, i, {
                 ...x,
@@ -1082,7 +1079,7 @@ function Dt(t, r, g, S) {
             };
           if (m === "stateList")
             return (s) => /* @__PURE__ */ ot(() => {
-              const n = q(/* @__PURE__ */ new Map()), a = h?.transforms && h.transforms.length > 0 ? `${M}-${Bt(h.transforms)}` : `${M}-base`, [d, l] = K({}), { validIds: p, arrayValues: V } = St(() => {
+              const r = q(/* @__PURE__ */ new Map()), a = h?.transforms && h.transforms.length > 0 ? `${M}-${Bt(h.transforms)}` : `${M}-base`, [d, l] = K({}), { validIds: p, arrayValues: V } = gt(() => {
                 const U = e.getState().getShadowMetadata(t, i)?.transformCaches?.get(a);
                 let C;
                 U && U.validIds ? C = U.validIds : (C = It(
@@ -1128,8 +1125,8 @@ function Dt(t, r, g, S) {
                 const F = p[C];
                 if (!F)
                   return null;
-                let x = n.current.get(F);
-                x || (x = rt(), n.current.set(F, x));
+                let x = r.current.get(F);
+                x || (x = rt(), r.current.set(F, x));
                 const N = F.split(".").slice(1);
                 return lt(Mt, {
                   key: F,
@@ -1147,11 +1144,11 @@ function Dt(t, r, g, S) {
             return (s) => {
               const o = w;
               y.clear(), I++;
-              const n = o.flatMap(
+              const r = o.flatMap(
                 (a) => a[s] ?? []
               );
               return u({
-                currentState: n,
+                currentState: r,
                 path: [...i, "[*]", s],
                 componentId: M,
                 meta: h
@@ -1159,14 +1156,14 @@ function Dt(t, r, g, S) {
             };
           if (m === "index")
             return (s) => {
-              const n = e.getState().getShadowMetadata(t, i)?.arrayKeys?.filter(
+              const r = e.getState().getShadowMetadata(t, i)?.arrayKeys?.filter(
                 (l) => !h?.validIds || h?.validIds && h?.validIds?.includes(l)
               )?.[s];
-              if (!n) return;
-              const a = e.getState().getShadowValue(n, h?.validIds);
+              if (!r) return;
+              const a = e.getState().getShadowValue(r, h?.validIds);
               return u({
                 currentState: a,
-                path: n.split(".").slice(1),
+                path: r.split(".").slice(1),
                 componentId: M,
                 meta: h
               });
@@ -1175,23 +1172,23 @@ function Dt(t, r, g, S) {
             return () => {
               const s = e.getState().getShadowValue(t, i);
               if (s.length === 0) return;
-              const o = s.length - 1, n = s[o], a = [...i, o.toString()];
+              const o = s.length - 1, r = s[o], a = [...i, o.toString()];
               return u({
-                currentState: n,
+                currentState: r,
                 path: a,
                 componentId: M,
                 meta: h
               });
             };
           if (m === "insert")
-            return (s, o) => (r(s, i, { updateType: "insert" }), u({
+            return (s, o) => (n(s, i, { updateType: "insert" }), u({
               currentState: e.getState().getShadowValue(t, i),
               path: i,
               componentId: M,
               meta: h
             }));
           if (m === "uniqueInsert")
-            return (s, o, n) => {
+            return (s, o, r) => {
               const a = e.getState().getShadowValue(t, i), d = at(s) ? s(a) : s;
               let l = null;
               if (!a.some((V) => {
@@ -1200,24 +1197,24 @@ function Dt(t, r, g, S) {
                 ) : st(V, d);
                 return _ && (l = V), _;
               }))
-                E(i), r(d, i, { updateType: "insert" });
-              else if (n && l) {
-                const V = n(l), _ = a.map(
+                E(i), n(d, i, { updateType: "insert" });
+              else if (r && l) {
+                const V = r(l), _ = a.map(
                   (U) => st(U, l) ? V : U
                 );
-                E(i), r(_, i, {
+                E(i), n(_, i, {
                   updateType: "update"
                 });
               }
             };
           if (m === "cut")
             return (s, o) => {
-              const n = h?.validIds ?? e.getState().getShadowMetadata(t, i)?.arrayKeys;
-              if (!n || n.length === 0) return;
-              const a = s == -1 ? n.length - 1 : s !== void 0 ? s : n.length - 1, d = n[a];
+              const r = h?.validIds ?? e.getState().getShadowMetadata(t, i)?.arrayKeys;
+              if (!r || r.length === 0) return;
+              const a = s == -1 ? r.length - 1 : s !== void 0 ? s : r.length - 1, d = r[a];
               if (!d) return;
               const l = d.split(".").slice(1);
-              r(w, l, {
+              n(w, l, {
                 updateType: "cut"
               });
             };
@@ -1230,37 +1227,37 @@ function Dt(t, r, g, S) {
               );
               if (!s || s.length === 0) return;
               const o = e.getState().selectedIndicesMap.get(c);
-              let n = s.findIndex(
+              let r = s.findIndex(
                 (l) => l === o
               );
-              const a = s[n == -1 ? s.length - 1 : n]?.split(".").slice(1);
+              const a = s[r == -1 ? s.length - 1 : r]?.split(".").slice(1);
               e.getState().clearSelectedIndex({ arrayKey: c });
               const d = a?.slice(0, -1);
-              ft(t, d), r(w, a, {
+              ft(t, d), n(w, a, {
                 updateType: "cut"
               });
             };
           if (m === "cutByValue")
             return (s) => {
-              const o = e.getState().getShadowMetadata(t, i), n = h?.validIds ?? o?.arrayKeys;
-              if (!n) return;
+              const o = e.getState().getShadowMetadata(t, i), r = h?.validIds ?? o?.arrayKeys;
+              if (!r) return;
               let a = null;
-              for (const d of n)
+              for (const d of r)
                 if (e.getState().getShadowValue(d) === s) {
                   a = d;
                   break;
                 }
               if (a) {
                 const d = a.split(".").slice(1);
-                r(null, d, { updateType: "cut" });
+                n(null, d, { updateType: "cut" });
               }
             };
           if (m === "toggleByValue")
             return (s) => {
-              const o = e.getState().getShadowMetadata(t, i), n = h?.validIds ?? o?.arrayKeys;
-              if (!n) return;
+              const o = e.getState().getShadowMetadata(t, i), r = h?.validIds ?? o?.arrayKeys;
+              if (!r) return;
               let a = null;
-              for (const d of n) {
+              for (const d of r) {
                 const l = e.getState().getShadowValue(d);
                 if (console.log("itemValue sdasdasdasd", l), l === s) {
                   a = d;
@@ -1269,19 +1266,19 @@ function Dt(t, r, g, S) {
               }
               if (console.log("itemValue keyToCut", a), a) {
                 const d = a.split(".").slice(1);
-                console.log("itemValue keyToCut", a), r(s, d, {
+                console.log("itemValue keyToCut", a), n(s, d, {
                   updateType: "cut"
                 });
               } else
-                r(s, i, { updateType: "insert" });
+                n(s, i, { updateType: "insert" });
             };
           if (m === "findWith")
             return (s, o) => {
-              const n = e.getState().getShadowMetadata(t, i)?.arrayKeys;
-              if (!n)
+              const r = e.getState().getShadowMetadata(t, i)?.arrayKeys;
+              if (!r)
                 throw new Error("No array keys found for sorting");
               let a = null, d = [];
-              for (const l of n) {
+              for (const l of r) {
                 let p = e.getState().getShadowValue(l, h?.validIds);
                 if (p && p[s] === o) {
                   a = p, d = l.split(".").slice(1);
@@ -1299,7 +1296,7 @@ function Dt(t, r, g, S) {
         if (m === "cut") {
           let s = e.getState().getShadowValue(i.join("."));
           return () => {
-            r(s, i, { updateType: "cut" });
+            n(s, i, { updateType: "cut" });
           };
         }
         if (m === "get")
@@ -1320,27 +1317,27 @@ function Dt(t, r, g, S) {
           return e.getState().getSyncInfo(s);
         }
         if (m == "getLocalStorage")
-          return (s) => gt(S + "-" + t + "-" + s);
+          return (s) => St(g + "-" + t + "-" + s);
         if (m === "isSelected") {
           const s = [t, ...i].slice(0, -1);
           if (ft(t, i, void 0), Array.isArray(
             e.getState().getShadowValue(s.join("."), h?.validIds)
           )) {
             i[i.length - 1];
-            const o = s.join("."), n = e.getState().selectedIndicesMap.get(o), a = t + "." + i.join(".");
-            return n === a;
+            const o = s.join("."), r = e.getState().selectedIndicesMap.get(o), a = t + "." + i.join(".");
+            return r === a;
           }
           return;
         }
         if (m === "setSelected")
           return (s) => {
-            const o = i.slice(0, -1), n = t + "." + o.join("."), a = t + "." + i.join(".");
-            ft(t, o, void 0), e.getState().selectedIndicesMap.get(n), s && e.getState().setSelectedIndex(n, a);
+            const o = i.slice(0, -1), r = t + "." + o.join("."), a = t + "." + i.join(".");
+            ft(t, o, void 0), e.getState().selectedIndicesMap.get(r), s && e.getState().setSelectedIndex(r, a);
           };
         if (m === "toggleSelected")
           return () => {
-            const s = i.slice(0, -1), o = t + "." + s.join("."), n = t + "." + i.join(".");
-            e.getState().selectedIndicesMap.get(o) === n ? e.getState().clearSelectedIndex({ arrayKey: o }) : e.getState().setSelectedIndex(o, n);
+            const s = i.slice(0, -1), o = t + "." + s.join("."), r = t + "." + i.join(".");
+            e.getState().selectedIndicesMap.get(o) === r ? e.getState().clearSelectedIndex({ arrayKey: o }) : e.getState().setSelectedIndex(o, r);
           };
         if (m === "_componentId")
           return M;
@@ -1349,15 +1346,15 @@ function Dt(t, r, g, S) {
             return (s) => {
               const o = e.getState().getInitialOptions(t)?.validation;
               if (!o?.key) throw new Error("Validation key not found");
-              ut(o.key), s.forEach((n) => {
-                const a = [o.key, ...n.path].join(".");
-                pt(a, n.message);
+              ut(o.key), s.forEach((r) => {
+                const a = [o.key, ...r.path].join(".");
+                pt(a, r.message);
               }), it(t);
             };
           if (m === "applyJsonPatch")
             return (s) => {
-              const o = e.getState(), n = o.getShadowMetadata(t, []);
-              if (!n?.components) return;
+              const o = e.getState(), r = o.getShadowMetadata(t, []);
+              if (!r?.components) return;
               const a = (l) => !l || l === "/" ? [] : l.split("/").slice(1).map((p) => p.replace(/~1/g, "/").replace(/~0/g, "~")), d = /* @__PURE__ */ new Set();
               for (const l of s) {
                 const p = a(l.path);
@@ -1374,7 +1371,7 @@ function Dt(t, r, g, S) {
                       );
                       if (console.log("pathMeta", U), U?.pathComponents && U.pathComponents.forEach((C) => {
                         if (!d.has(C)) {
-                          const F = n.components?.get(C);
+                          const F = r.components?.get(C);
                           F && (F.forceUpdate(), d.add(C));
                         }
                       }), _.length === 0) break;
@@ -1393,7 +1390,7 @@ function Dt(t, r, g, S) {
                       );
                       if (U?.pathComponents && U.pathComponents.forEach((C) => {
                         if (!d.has(C)) {
-                          const F = n.components?.get(C);
+                          const F = r.components?.get(C);
                           F && (F.forceUpdate(), d.add(C));
                         }
                       }), _.length === 0) break;
@@ -1412,7 +1409,7 @@ function Dt(t, r, g, S) {
                   "Zod schema (v3 or v4) or validation key not found"
                 );
               ut(s.key);
-              const n = e.getState().getShadowValue(t), a = o.safeParse(n);
+              const r = e.getState().getShadowValue(t), a = o.safeParse(r);
               return a.success ? !0 : ("issues" in a.error ? a.error.issues.forEach((d) => {
                 const l = [s.key, ...d.path].join(".");
                 pt(l, d.message);
@@ -1444,7 +1441,7 @@ function Dt(t, r, g, S) {
         if (m === "_stateKey") return t;
         if (m === "_path") return i;
         if (m === "update")
-          return (s) => (r(s, i, { updateType: "update" }), {
+          return (s) => (n(s, i, { updateType: "update" }), {
             /**
              * Marks this specific item, which was just updated, as 'synced' (not dirty).
              */
@@ -1459,8 +1456,8 @@ function Dt(t, r, g, S) {
                 lastServerSync: Date.now()
                 // Add timestamp
               });
-              const n = [t, ...i].join(".");
-              e.getState().notifyPathSubscribers(n, {
+              const r = [t, ...i].join(".");
+              e.getState().notifyPathSubscribers(r, {
                 type: "SYNC_STATUS_CHANGE",
                 isDirty: !1
               });
@@ -1471,7 +1468,7 @@ function Dt(t, r, g, S) {
           if (console.log("currentValueAtPath", s), typeof w != "boolean")
             throw new Error("toggle() can only be used on boolean values");
           return () => {
-            r(!s, i, {
+            n(!s, i, {
               updateType: "update"
             });
           };
@@ -1483,7 +1480,7 @@ function Dt(t, r, g, S) {
               stateKey: t,
               path: i,
               rebuildStateShape: u,
-              setState: r,
+              setState: n,
               formOpts: o,
               renderFn: s
             }
@@ -1515,9 +1512,9 @@ function Dt(t, r, g, S) {
       e.getState().clearSelectedIndexesForState(t), y.clear(), I++, e.getState().initializeShadowState(t, M), u({
         currentState: M,
         path: [],
-        componentId: g
+        componentId: S
       });
-      const z = nt(t), c = at(z?.localStorage?.key) ? z?.localStorage?.key(M) : z?.localStorage?.key, B = `${S}-${t}-${c}`;
+      const z = nt(t), c = at(z?.localStorage?.key) ? z?.localStorage?.key(M) : z?.localStorage?.key, B = `${g}-${t}-${c}`;
       B && localStorage.removeItem(B);
       const J = e.getState().getShadowMetadata(t, []);
       return J && J?.components?.forEach((H) => {
@@ -1528,10 +1525,10 @@ function Dt(t, r, g, S) {
       y.clear(), I++;
       const i = Dt(
         t,
-        r,
-        g,
-        S
-      ), h = e.getState().initialStateGlobal[t], M = nt(t), z = at(M?.localStorage?.key) ? M?.localStorage?.key(h) : M?.localStorage?.key, c = `${S}-${t}-${z}`;
+        n,
+        S,
+        g
+      ), h = e.getState().initialStateGlobal[t], M = nt(t), z = at(M?.localStorage?.key) ? M?.localStorage?.key(h) : M?.localStorage?.key, c = `${g}-${t}-${z}`;
       return localStorage.getItem(c) && localStorage.removeItem(c), Rt(() => {
         _t(t, w), e.getState().initializeShadowState(t, w);
         const B = e.getState().getShadowMetadata(t, []);
@@ -1545,7 +1542,7 @@ function Dt(t, r, g, S) {
   };
   return u({
     currentState: e.getState().getShadowValue(t, []),
-    componentId: g,
+    componentId: S,
     path: []
   });
 }
@@ -1554,21 +1551,21 @@ function bt(t) {
 }
 function qt({
   proxy: t,
-  rebuildStateShape: r
+  rebuildStateShape: n
 }) {
-  const g = q(null), S = q(`map-${crypto.randomUUID()}`), y = q(!1), I = q(/* @__PURE__ */ new Map());
+  const S = q(null), g = q(`map-${crypto.randomUUID()}`), y = q(!1), I = q(/* @__PURE__ */ new Map());
   Z(() => {
-    const u = g.current;
+    const u = S.current;
     if (!u || y.current) return;
     const f = setTimeout(() => {
       const A = e.getState().getShadowMetadata(t._stateKey, t._path) || {}, w = A.mapWrappers || [];
       w.push({
-        instanceId: S.current,
+        instanceId: g.current,
         mapFn: t._mapFn,
         containerRef: u,
-        rebuildStateShape: r,
+        rebuildStateShape: n,
         path: t._path,
-        componentId: S.current,
+        componentId: g.current,
         meta: t._meta
       }), e.getState().setShadowMetadata(t._stateKey, t._path, {
         ...A,
@@ -1576,27 +1573,27 @@ function qt({
       }), y.current = !0, E();
     }, 0);
     return () => {
-      if (clearTimeout(f), S.current) {
+      if (clearTimeout(f), g.current) {
         const A = e.getState().getShadowMetadata(t._stateKey, t._path) || {};
         A.mapWrappers && (A.mapWrappers = A.mapWrappers.filter(
-          (w) => w.instanceId !== S.current
+          (w) => w.instanceId !== g.current
         ), e.getState().setShadowMetadata(t._stateKey, t._path, A));
       }
       I.current.forEach((A) => A.unmount());
     };
   }, []);
   const E = () => {
-    const u = g.current;
+    const u = S.current;
     if (!u) return;
     const f = e.getState().getShadowValue(
       [t._stateKey, ...t._path].join("."),
       t._meta?.validIds
     );
     if (!Array.isArray(f)) return;
-    const A = t._meta?.validIds ?? e.getState().getShadowMetadata(t._stateKey, t._path)?.arrayKeys ?? [], w = r({
+    const A = t._meta?.validIds ?? e.getState().getShadowMetadata(t._stateKey, t._path)?.arrayKeys ?? [], w = n({
       currentState: f,
       path: t._path,
-      componentId: S.current,
+      componentId: g.current,
       meta: t._meta
     });
     f.forEach((i, h) => {
@@ -1614,24 +1611,24 @@ function qt({
           itemPath: J,
           localIndex: h,
           arraySetter: w,
-          rebuildStateShape: r,
+          rebuildStateShape: n,
           renderFn: t._mapFn
         })
       );
     });
   };
-  return /* @__PURE__ */ ot("div", { ref: g, "data-map-container": S.current });
+  return /* @__PURE__ */ ot("div", { ref: S, "data-map-container": g.current });
 }
 function Gt({
   proxy: t
 }) {
-  const r = q(null), g = q(null), S = q(!1), y = `${t._stateKey}-${t._path.join(".")}`, I = e.getState().getShadowValue(
+  const n = q(null), S = q(null), g = q(!1), y = `${t._stateKey}-${t._path.join(".")}`, I = e.getState().getShadowValue(
     [t._stateKey, ...t._path].join("."),
     t._meta?.validIds
   );
   return Z(() => {
-    const E = r.current;
-    if (!E || S.current) return;
+    const E = n.current;
+    if (!E || g.current) return;
     const u = setTimeout(() => {
       if (!E.parentElement) {
         console.warn("Parent element not found for signal", y);
@@ -1639,10 +1636,10 @@ function Gt({
       }
       const f = E.parentElement, w = Array.from(f.childNodes).indexOf(E);
       let i = f.getAttribute("data-parent-id");
-      i || (i = `parent-${crypto.randomUUID()}`, f.setAttribute("data-parent-id", i)), g.current = `instance-${crypto.randomUUID()}`;
+      i || (i = `parent-${crypto.randomUUID()}`, f.setAttribute("data-parent-id", i)), S.current = `instance-${crypto.randomUUID()}`;
       const h = e.getState().getShadowMetadata(t._stateKey, t._path) || {}, M = h.signals || [];
       M.push({
-        instanceId: g.current,
+        instanceId: S.current,
         parentId: i,
         position: w,
         effect: t._effect
@@ -1662,61 +1659,61 @@ function Gt({
         }
       z !== null && typeof z == "object" && (z = JSON.stringify(z));
       const c = document.createTextNode(String(z ?? ""));
-      E.replaceWith(c), S.current = !0;
+      E.replaceWith(c), g.current = !0;
     }, 0);
     return () => {
-      if (clearTimeout(u), g.current) {
+      if (clearTimeout(u), S.current) {
         const f = e.getState().getShadowMetadata(t._stateKey, t._path) || {};
         f.signals && (f.signals = f.signals.filter(
-          (A) => A.instanceId !== g.current
+          (A) => A.instanceId !== S.current
         ), e.getState().setShadowMetadata(t._stateKey, t._path, f));
       }
     };
   }, []), lt("span", {
-    ref: r,
+    ref: n,
     style: { display: "contents" },
     "data-signal-id": y
   });
 }
 const Mt = Ot(
   Yt,
-  (t, r) => t.itemPath.join(".") === r.itemPath.join(".") && t.stateKey === r.stateKey && t.itemComponentId === r.itemComponentId && t.localIndex === r.localIndex
+  (t, n) => t.itemPath.join(".") === n.itemPath.join(".") && t.stateKey === n.stateKey && t.itemComponentId === n.itemComponentId && t.localIndex === n.localIndex
 ), Jt = (t) => {
-  const [r, g] = K(!1);
+  const [n, S] = K(!1);
   return dt(() => {
     if (!t.current) {
-      g(!0);
+      S(!0);
       return;
     }
-    const S = Array.from(t.current.querySelectorAll("img"));
-    if (S.length === 0) {
-      g(!0);
+    const g = Array.from(t.current.querySelectorAll("img"));
+    if (g.length === 0) {
+      S(!0);
       return;
     }
     let y = 0;
     const I = () => {
-      y++, y === S.length && g(!0);
+      y++, y === g.length && S(!0);
     };
-    return S.forEach((E) => {
+    return g.forEach((E) => {
       E.complete ? I() : (E.addEventListener("load", I), E.addEventListener("error", I));
     }), () => {
-      S.forEach((E) => {
+      g.forEach((E) => {
         E.removeEventListener("load", I), E.removeEventListener("error", I);
       });
     };
-  }, [t.current]), r;
+  }, [t.current]), n;
 };
 function Yt({
   stateKey: t,
-  itemComponentId: r,
-  itemPath: g,
-  localIndex: S,
+  itemComponentId: n,
+  itemPath: S,
+  localIndex: g,
   arraySetter: y,
   rebuildStateShape: I,
   renderFn: E
 }) {
-  const [, u] = K({}), { ref: f, inView: A } = jt(), w = q(null), i = Jt(w), h = q(!1), M = [t, ...g].join(".");
-  $t(t, r, u);
+  const [, u] = K({}), { ref: f, inView: A } = jt(), w = q(null), i = Jt(w), h = q(!1), M = [t, ...S].join(".");
+  $t(t, n, u);
   const z = ct(
     (W) => {
       w.current = W, f(W);
@@ -1734,39 +1731,39 @@ function Yt({
     if (W && W.offsetHeight > 0) {
       h.current = !0;
       const m = W.offsetHeight;
-      e.getState().setShadowMetadata(t, g, {
+      e.getState().setShadowMetadata(t, S, {
         virtualizer: {
           itemHeight: m,
           domRef: W
         }
       });
-      const Y = g.slice(0, -1), Q = [t, ...Y].join(".");
+      const Y = S.slice(0, -1), Q = [t, ...Y].join(".");
       e.getState().notifyPathSubscribers(Q, {
         type: "ITEMHEIGHT",
-        itemKey: g.join("."),
+        itemKey: S.join("."),
         ref: w.current
       });
     }
-  }, [A, i, t, g]);
-  const c = [t, ...g].join("."), B = e.getState().getShadowValue(c);
+  }, [A, i, t, S]);
+  const c = [t, ...S].join("."), B = e.getState().getShadowValue(c);
   if (B === void 0)
     return null;
   const J = I({
     currentState: B,
-    path: g,
-    componentId: r
-  }), H = E(J, S, y);
+    path: S,
+    componentId: n
+  }), H = E(J, g, y);
   return /* @__PURE__ */ ot("div", { ref: z, children: H });
 }
 function Zt({
   stateKey: t,
-  path: r,
-  rebuildStateShape: g,
-  renderFn: S,
+  path: n,
+  rebuildStateShape: S,
+  renderFn: g,
   formOpts: y,
   setState: I
 }) {
-  const [E] = K(() => rt()), [, u] = K({}), f = [t, ...r].join(".");
+  const [E] = K(() => rt()), [, u] = K({}), f = [t, ...n].join(".");
   $t(t, E, u);
   const A = e.getState().getShadowValue(f), [w, i] = K(A), h = q(!1), M = q(null);
   Z(() => {
@@ -1784,12 +1781,12 @@ function Zt({
       typeof A === "number" && typeof H == "string" && (H = H === "" ? 0 : Number(H)), i(H), h.current = !0, M.current && clearTimeout(M.current);
       const m = y?.debounceTime ?? 200;
       M.current = setTimeout(() => {
-        h.current = !1, I(H, r, { updateType: "update" });
+        h.current = !1, I(H, n, { updateType: "update" });
         const { getInitialOptions: Y, setShadowMetadata: Q, getShadowMetadata: X } = e.getState(), s = Y(t)?.validation, o = s?.zodSchemaV4 || s?.zodSchemaV3;
         if (o) {
-          const n = e.getState().getShadowValue(t), a = o.safeParse(n), d = X(t, r) || {};
+          const r = e.getState().getShadowValue(t), a = o.safeParse(r), d = X(t, n) || {};
           if (a.success)
-            Q(t, r, {
+            Q(t, n, {
               ...d,
               validation: {
                 status: "VALID_LIVE",
@@ -1798,16 +1795,16 @@ function Zt({
             });
           else {
             const p = ("issues" in a.error ? a.error.issues : a.error.errors).filter(
-              (V) => JSON.stringify(V.path) === JSON.stringify(r)
+              (V) => JSON.stringify(V.path) === JSON.stringify(n)
             );
-            p.length > 0 ? Q(t, r, {
+            p.length > 0 ? Q(t, n, {
               ...d,
               validation: {
                 status: "INVALID_LIVE",
                 message: p[0]?.message,
                 validatedValue: H
               }
-            }) : Q(t, r, {
+            }) : Q(t, n, {
               ...d,
               validation: {
                 status: "VALID_LIVE",
@@ -1818,13 +1815,13 @@ function Zt({
         }
       }, m), u({});
     },
-    [I, r, y?.debounceTime, t]
+    [I, n, y?.debounceTime, t]
   ), c = ct(async () => {
-    console.log("handleBlur triggered"), M.current && (clearTimeout(M.current), M.current = null, h.current = !1, I(w, r, { updateType: "update" }));
+    console.log("handleBlur triggered"), M.current && (clearTimeout(M.current), M.current = null, h.current = !1, I(w, n, { updateType: "update" }));
     const { getInitialOptions: H } = e.getState(), W = H(t)?.validation, m = W?.zodSchemaV4 || W?.zodSchemaV3;
     if (!m) return;
-    const Y = e.getState().getShadowMetadata(t, r);
-    e.getState().setShadowMetadata(t, r, {
+    const Y = e.getState().getShadowMetadata(t, n);
+    e.getState().setShadowMetadata(t, n, {
       ...Y,
       validation: {
         status: "DIRTY",
@@ -1833,7 +1830,7 @@ function Zt({
     });
     const Q = e.getState().getShadowValue(t), X = m.safeParse(Q);
     if (console.log("result ", X), X.success)
-      e.getState().setShadowMetadata(t, r, {
+      e.getState().setShadowMetadata(t, n, {
         ...Y,
         validation: {
           status: "VALID_PENDING_SYNC",
@@ -1842,32 +1839,32 @@ function Zt({
       });
     else {
       const s = "issues" in X.error ? X.error.issues : X.error.errors;
-      console.log("All validation errors:", s), console.log("Current blur path:", r);
-      const o = s.filter((n) => {
-        if (console.log("Processing error:", n), r.some((d) => d.startsWith("id:"))) {
+      console.log("All validation errors:", s), console.log("Current blur path:", n);
+      const o = s.filter((r) => {
+        if (console.log("Processing error:", r), n.some((d) => d.startsWith("id:"))) {
           console.log("Detected array path with ULID");
-          const d = r[0].startsWith("id:") ? [] : r.slice(0, -1);
+          const d = n[0].startsWith("id:") ? [] : n.slice(0, -1);
           console.log("Parent path:", d);
           const l = e.getState().getShadowMetadata(t, d);
           if (console.log("Array metadata:", l), l?.arrayKeys) {
-            const p = [t, ...r.slice(0, -1)].join("."), V = l.arrayKeys.indexOf(p);
+            const p = [t, ...n.slice(0, -1)].join("."), V = l.arrayKeys.indexOf(p);
             console.log("Item key:", p, "Index:", V);
-            const _ = [...d, V, ...r.slice(-1)], U = JSON.stringify(n.path) === JSON.stringify(_);
+            const _ = [...d, V, ...n.slice(-1)], U = JSON.stringify(r.path) === JSON.stringify(_);
             return console.log("Zod path comparison:", {
               zodPath: _,
-              errorPath: n.path,
+              errorPath: r.path,
               match: U
             }), U;
           }
         }
-        const a = JSON.stringify(n.path) === JSON.stringify(r);
+        const a = JSON.stringify(r.path) === JSON.stringify(n);
         return console.log("Direct path comparison:", {
-          errorPath: n.path,
-          currentPath: r,
+          errorPath: r.path,
+          currentPath: n,
           match: a
         }), a;
       });
-      console.log("Filtered path errors:", o), e.getState().setShadowMetadata(t, r, {
+      console.log("Filtered path errors:", o), e.getState().setShadowMetadata(t, n, {
         ...Y,
         validation: {
           status: "VALIDATION_FAILED",
@@ -1877,9 +1874,9 @@ function Zt({
       });
     }
     u({});
-  }, [t, r, w, I]), B = g({
+  }, [t, n, w, I]), B = S({
     currentState: A,
-    path: r,
+    path: n,
     componentId: E
   }), J = new Proxy(B, {
     get(H, W) {
@@ -1890,24 +1887,24 @@ function Zt({
         },
         // 5. Wire the new onBlur handler to the input props.
         onBlur: c,
-        ref: vt.getState().getFormRef(t + "." + r.join("."))
+        ref: vt.getState().getFormRef(t + "." + n.join("."))
       } : H[W];
     }
   });
-  return /* @__PURE__ */ ot(kt, { formOpts: y, path: r, stateKey: t, children: S(J) });
+  return /* @__PURE__ */ ot(kt, { formOpts: y, path: n, stateKey: t, children: g(J) });
 }
-function $t(t, r, g) {
-  const S = `${t}////${r}`;
+function $t(t, n, S) {
+  const g = `${t}////${n}`;
   dt(() => {
     const { registerComponent: y, unregisterComponent: I } = e.getState();
-    return y(t, S, {
-      forceUpdate: () => g({}),
+    return y(t, g, {
+      forceUpdate: () => S({}),
       paths: /* @__PURE__ */ new Set(),
       reactiveType: ["component"]
     }), () => {
-      I(t, S);
+      I(t, g);
     };
-  }, [t, S]);
+  }, [t, g]);
 }
 export {
   bt as $cogsSignal,