cogsbox-state 0.5.482 → 0.5.484

package/dist/CogsState.js

@@ -1,128 +1,120 @@
 "use client";
-import { jsx as Q, Fragment as Pe } from "react/jsx-runtime";
-import { pluginStore as R } from "./pluginStore.js";
-import { useState as te, useRef as q, useCallback as Te, useEffect as x, useLayoutEffect as ke, useMemo as pe, createElement as fe, startTransition as Ie } from "react";
-import { transformStateFunc as De, isFunction as z, isDeepEqual as Z, isArray as Ce, getDifferences as _e } from "./utility.js";
-import { ValidationWrapper as Oe, IsolatedComponentWrapper as je, FormElementWrapper as Ne, MemoizedCogsItemWrapper as Ue } from "./Components.js";
+import { jsx as Q, Fragment as Te } from "react/jsx-runtime";
+import { pluginStore as z } from "./pluginStore.js";
+import { useState as ne, useRef as q, useCallback as ke, useEffect as Z, useLayoutEffect as re, useMemo as Ae, createElement as Se, startTransition as Ie } from "react";
+import { transformStateFunc as De, isFunction as R, isDeepEqual as X, isArray as Ce, getDifferences as _e } from "./utility.js";
+import { ValidationWrapper as Oe, IsolatedComponentWrapper as je, FormElementWrapper as Ue, MemoizedCogsItemWrapper as Ne } from "./Components.js";
 import Fe from "superjson";
-import { v4 as re } from "uuid";
-import { getGlobalStore as p, updateShadowTypeInfo as Se } from "./store.js";
-import { useCogsConfig as Ae } from "./CogsStateClient.js";
-import { runValidation as Re } from "./validation.js";
+import { v4 as ae } from "uuid";
+import { getGlobalStore as p, updateShadowTypeInfo as H } from "./store.js";
+import { useCogsConfig as Me } from "./CogsStateClient.js";
+import { runValidation as ze } from "./validation.js";
 const {
-  getInitialOptions: U,
-  updateInitialStateGlobal: Me,
+  getInitialOptions: j,
+  updateInitialStateGlobal: be,
   getShadowMetadata: $,
   setShadowMetadata: L,
-  getShadowValue: D,
-  initializeShadowState: X,
-  initializeAndMergeShadowState: ze,
+  getShadowValue: C,
+  initializeShadowState: K,
+  initializeAndMergeShadowState: Re,
   updateShadowAtPath: Le,
   insertShadowArrayElement: We,
-  insertManyShadowArrayElements: be,
+  insertManyShadowArrayElements: $e,
   removeShadowArrayElement: Be,
-  setInitialStateOptions: ge,
-  setServerStateUpdate: ye,
-  markAsDirty: oe,
+  setInitialStateOptions: ye,
+  setServerStateUpdate: me,
+  markAsDirty: se,
   addPathComponent: Ge,
   clearSelectedIndexesForState: qe,
   addStateLog: xe,
   clearSelectedIndex: Je,
   getSyncInfo: He,
   notifyPathSubscribers: Qe,
-  getPluginMetaDataMap: me,
-  setPluginMetaData: he,
-  removePluginMetaData: ve
-} = p.getState(), { notifyUpdate: Ye } = R.getState();
-function N(e, n, l) {
+  getPluginMetaDataMap: he,
+  setPluginMetaData: ve,
+  removePluginMetaData: we
+} = p.getState(), { notifyUpdate: Ye } = z.getState();
+function N(e, n, c) {
   const i = $(e, n);
   if (!!!i?.arrayKeys)
     return { isArray: !1, value: p.getState().getShadowValue(e, n), keys: [] };
-  const c = n.length > 0 ? n.join(".") : "root", m = l?.arrayViews?.[c] ?? i.arrayKeys;
+  const l = n.length > 0 ? n.join(".") : "root", m = c?.arrayViews?.[l] ?? i.arrayKeys;
   return Array.isArray(m) && m.length === 0 ? { isArray: !0, value: [], keys: [] } : { isArray: !0, value: p.getState().getShadowValue(e, n, m), keys: m ?? [] };
 }
-function se(e, n, l) {
+function le(e, n, c) {
   for (let i = 0; i < e.length; i++)
-    if (l(e[i], i)) {
+    if (c(e[i], i)) {
       const f = n[i];
       if (f)
         return { key: f, index: i, value: e[i] };
     }
   return null;
 }
-function ce(e, n) {
+function ue(e, n) {
   const i = {
-    ...U(e) || {},
+    ...j(e) || {},
     ...n
   };
-  (i.validation?.zodSchemaV4 || i.validation?.zodSchemaV3) && !i.validation?.onBlur && (i.validation.onBlur = "error"), ge(e, i);
+  (i.validation?.zodSchemaV4 || i.validation?.zodSchemaV3) && !i.validation?.onBlur && (i.validation.onBlur = "error"), ye(e, i);
 }
-function ue({
+function fe({
   stateKey: e,
   options: n,
-  initialOptionsPart: l
+  initialOptionsPart: c
 }) {
-  const i = U(e) || {}, f = l[e] || {};
-  let c = { ...f, ...i }, m = !1;
+  const i = j(e) || {}, f = c[e] || {};
+  let l = { ...f, ...i }, m = !1;
   if (n) {
     const y = (t, a) => {
       for (const d in a)
-        a.hasOwnProperty(d) && (a[d] instanceof Object && !Array.isArray(a[d]) && t[d] instanceof Object ? Z(t[d], a[d]) || (y(t[d], a[d]), m = !0) : t[d] !== a[d] && (t[d] = a[d], m = !0));
+        a.hasOwnProperty(d) && (a[d] instanceof Object && !Array.isArray(a[d]) && t[d] instanceof Object ? X(t[d], a[d]) || (y(t[d], a[d]), m = !0) : t[d] !== a[d] && (t[d] = a[d], m = !0));
       return t;
     };
-    c = y(c, n);
+    l = y(l, n);
   }
-  if (c.validation && (n?.validation?.hasOwnProperty("onBlur") || i?.validation?.hasOwnProperty("onBlur") || f?.validation?.hasOwnProperty("onBlur") || (c.validation.onBlur = "error", m = !0)), m) {
-    ge(e, c);
-    const y = i?.validation?.zodSchemaV4 || i?.validation?.zodSchemaV3, t = c.validation?.zodSchemaV4 && !i?.validation?.zodSchemaV4, a = c.validation?.zodSchemaV3 && !i?.validation?.zodSchemaV3;
-    !y && (t || a) && (t ? Se(
-      e,
-      c.validation.zodSchemaV4,
-      "zod4"
-    ) : a && Se(
-      e,
-      c.validation.zodSchemaV3,
-      "zod3"
-    ), W(e));
+  if (l.validation && (n?.validation?.hasOwnProperty("onBlur") || i?.validation?.hasOwnProperty("onBlur") || f?.validation?.hasOwnProperty("onBlur") || (l.validation.onBlur = "error", m = !0)), m) {
+    ye(e, l);
+    const y = l.validation?.zodSchemaV4, t = l.validation?.zodSchemaV3;
+    (y !== i?.validation?.zodSchemaV4 || t !== i?.validation?.zodSchemaV3) && (y || t) && (y ? H(e, y, "zod4") : t && H(e, t, "zod3"), W(e));
   }
-  return c;
+  return l;
 }
 const $t = (e, n) => {
-  n?.plugins && R.getState().setRegisteredPlugins(n.plugins);
-  const l = {};
+  n?.plugins && z.getState().setRegisteredPlugins(n.plugins);
+  const c = {};
   if (n?.plugins)
     for (const a of n.plugins)
-      typeof a.initialState == "function" && Object.assign(l, a.initialState());
-  const i = { ...l, ...e }, [f, c] = De(i);
+      typeof a.initialState == "function" && Object.assign(c, a.initialState());
+  const i = { ...c, ...e }, [f, l] = De(i);
   Object.keys(f).forEach((a) => {
     let d = {};
     n?.formElements && (d.formElements = n.formElements), d.validation = {
       onBlur: "error",
       ...n?.validation
     };
-    const E = U(a), b = E ? {
-      ...E,
+    const V = j(a), b = V ? {
+      ...V,
       formElements: n?.formElements,
       validation: {
-        ...E.validation,
+        ...V.validation,
         ...d.validation
       }
     } : d;
-    Object.keys(b).length > 0 && ge(a, b);
+    Object.keys(b).length > 0 && ye(a, b);
   }), Object.keys(f).forEach((a) => {
-    X(a, f[a]);
+    K(a, f[a]);
   });
   const m = (a, d) => {
-    const [E] = te(d?.componentId ?? re()), b = ue({
+    const [V] = ne(d?.componentId ?? ae()), b = fe({
       stateKey: a,
       options: d,
-      initialOptionsPart: c
-    }), V = q(b);
-    V.current = b;
-    const v = D(a, []) || f[a], C = ct(v, {
+      initialOptionsPart: l
+    }), E = q(b);
+    E.current = b;
+    const v = C(a, []) || f[a], _ = ct(v, {
       stateKey: a,
       syncUpdate: d?.syncUpdate,
-      componentId: E,
+      componentId: V,
       localStorage: d?.localStorage,
       middleware: d?.middleware,
       reactiveType: d?.reactiveType,
@@ -131,25 +123,28 @@ const $t = (e, n) => {
       dependencies: d?.dependencies,
       serverState: d?.serverState
     });
-    return x(() => {
-      d && R.getState().setPluginOptionsForState(a, d);
-    }, [a, d]), x(() => (R.getState().stateHandlers.set(a, C), () => {
-      R.getState().stateHandlers.delete(a);
-    }), [a, C]), C;
+    return re(() => {
+      d && z.getState().setPluginOptionsForState(a, d);
+    }, [a, d]), re(() => (z.getState().registerStateHandler(a, _), () => {
+      z.getState().unregisterStateHandler(a);
+    }), [a, _]), re(() => {
+      const T = j(a)?.validation;
+      T?.zodSchemaV4 ? H(a, T.zodSchemaV4, "zod4") : T?.zodSchemaV3 && H(a, T.zodSchemaV3, "zod3");
+    }), _;
   };
   function y(a, d) {
-    if (ue({ stateKey: a, options: d, initialOptionsPart: c }), d.localStorage && Xe(a, d), d.formElements) {
-      const b = R.getState().registeredPlugins.map((V) => d.formElements.hasOwnProperty(V.name) ? {
-        ...V,
-        formWrapper: d.formElements[V.name]
-      } : V);
-      R.getState().setRegisteredPlugins(b);
+    if (fe({ stateKey: a, options: d, initialOptionsPart: l }), d.localStorage && Xe(a, d), d.formElements) {
+      const b = z.getState().registeredPlugins.map((E) => d.formElements.hasOwnProperty(E.name) ? {
+        ...E,
+        formWrapper: d.formElements[E.name]
+      } : E);
+      z.getState().setRegisteredPlugins(b);
     }
     W(a);
   }
   function t(a) {
-    Object.keys(f).forEach((E) => {
-      y(E, a);
+    Object.keys(f).forEach((V) => {
+      y(V, a);
     });
   }
   return {
@@ -157,19 +152,19 @@ const $t = (e, n) => {
     setCogsOptionsByKey: y,
     setCogsOptions: t
   };
-}, Ze = (e, n, l, i, f) => {
-  l?.log && console.log(
+}, Ze = (e, n, c, i, f) => {
+  c?.log && console.log(
     "saving to localstorage",
     n,
-    l.localStorage?.key,
+    c.localStorage?.key,
     i
   );
-  const c = z(l?.localStorage?.key) ? l.localStorage?.key(e) : l?.localStorage?.key;
-  if (c && i) {
-    const m = `${i}-${n}-${c}`;
+  const l = R(c?.localStorage?.key) ? c.localStorage?.key(e) : c?.localStorage?.key;
+  if (l && i) {
+    const m = `${i}-${n}-${l}`;
     let y;
     try {
-      y = ie(m)?.lastSyncedWithServer;
+      y = ce(m)?.lastSyncedWithServer;
     } catch {
     }
     const t = $(n, []), a = {
@@ -184,7 +179,7 @@ const $t = (e, n) => {
       JSON.stringify(d.json)
     );
   }
-}, ie = (e) => {
+}, ce = (e) => {
   if (!e) return null;
   try {
     const n = window.localStorage.getItem(e);
@@ -192,7 +187,7 @@ const $t = (e, n) => {
   } catch (n) {
     return console.error("Error loading from localStorage:", n), null;
   }
-}, le = (e) => {
+}, de = (e) => {
   if (e)
     try {
       typeof window < "u" && window.localStorage && window.localStorage.removeItem(e);
@@ -200,59 +195,59 @@ const $t = (e, n) => {
       console.error("Error removing from localStorage:", n);
     }
 }, Xe = (e, n) => {
-  const l = D(e, []), { sessionId: i } = Ae(), f = z(n?.localStorage?.key) ? n.localStorage.key(l) : n?.localStorage?.key;
+  const c = C(e, []), { sessionId: i } = Me(), f = R(n?.localStorage?.key) ? n.localStorage.key(c) : n?.localStorage?.key;
   if (f && i) {
-    const c = ie(
+    const l = ce(
       `${i}-${e}-${f}`
     );
-    if (c && c.lastUpdated > (c.lastSyncedWithServer || 0))
+    if (l && l.lastUpdated > (l.lastSyncedWithServer || 0))
       return W(e), !0;
   }
   return !1;
 }, W = (e) => {
   const n = $(e, []);
   if (!n) return;
-  const l = /* @__PURE__ */ new Set();
+  const c = /* @__PURE__ */ new Set();
   n?.components?.forEach((i) => {
-    (i ? Array.isArray(i.reactiveType) ? i.reactiveType : [i.reactiveType || "component"] : null)?.includes("none") || l.add(() => i.forceUpdate());
+    (i ? Array.isArray(i.reactiveType) ? i.reactiveType : [i.reactiveType || "component"] : null)?.includes("none") || c.add(() => i.forceUpdate());
   }), queueMicrotask(() => {
-    l.forEach((i) => i());
+    c.forEach((i) => i());
   });
 };
-function ne(e, n, l, i) {
+function oe(e, n, c, i) {
   const f = $(e, n);
   if (L(e, n, {
     ...f,
     isDirty: !1,
     stateSource: "server",
     lastServerSync: i || Date.now()
-  }), Array.isArray(l)) {
-    const c = $(e, n);
-    c?.arrayKeys && c.arrayKeys.forEach((m, y) => {
-      const t = [...n, m], a = l[y];
-      a !== void 0 && ne(
+  }), Array.isArray(c)) {
+    const l = $(e, n);
+    l?.arrayKeys && l.arrayKeys.forEach((m, y) => {
+      const t = [...n, m], a = c[y];
+      a !== void 0 && oe(
         e,
         t,
         a,
         i
       );
     });
-  } else l && typeof l == "object" && l.constructor === Object && Object.keys(l).forEach((c) => {
-    const m = [...n, c], y = l[c];
-    ne(e, m, y, i);
+  } else c && typeof c == "object" && c.constructor === Object && Object.keys(c).forEach((l) => {
+    const m = [...n, l], y = c[l];
+    oe(e, m, y, i);
   });
 }
-let ae = [], de = !1;
+let ie = [], ge = !1;
 function Ke() {
-  de || (de = !0, queueMicrotask(() => {
+  ge || (ge = !0, queueMicrotask(() => {
     it();
   }));
 }
 function et(e, n) {
-  e?.signals?.length && e.signals.forEach(({ parentId: l, position: i, effect: f }) => {
-    const c = document.querySelector(`[data-parent-id="${l}"]`);
-    if (!c) return;
-    const m = Array.from(c.childNodes);
+  e?.signals?.length && e.signals.forEach(({ parentId: c, position: i, effect: f }) => {
+    const l = document.querySelector(`[data-parent-id="${c}"]`);
+    if (!l) return;
+    const m = Array.from(l.childNodes);
     if (!m[i]) return;
     let y = n;
     if (f && n !== null)
@@ -266,30 +261,30 @@ function et(e, n) {
     y !== null && typeof y == "object" && (y = JSON.stringify(y)), m[i].textContent = String(y ?? "");
   });
 }
-function tt(e, n, l) {
+function tt(e, n, c) {
   const i = $(e, []);
   if (!i?.components)
     return /* @__PURE__ */ new Set();
   const f = /* @__PURE__ */ new Set();
-  if (l.type === "update") {
-    let c = [...n];
+  if (c.type === "update") {
+    let l = [...n];
     for (; ; ) {
-      const m = $(e, c);
+      const m = $(e, l);
       if (m?.pathComponents && m.pathComponents.forEach((y) => {
         const t = i.components?.get(y);
         t && ((Array.isArray(t.reactiveType) ? t.reactiveType : [t.reactiveType || "component"]).includes("none") || f.add(t));
-      }), c.length === 0) break;
-      c.pop();
+      }), l.length === 0) break;
+      l.pop();
     }
-    l.newValue && typeof l.newValue == "object" && !Ce(l.newValue) && _e(l.newValue, l.oldValue).forEach((y) => {
+    c.newValue && typeof c.newValue == "object" && !Ce(c.newValue) && _e(c.newValue, c.oldValue).forEach((y) => {
       const t = y.split("."), a = [...n, ...t], d = $(e, a);
-      d?.pathComponents && d.pathComponents.forEach((E) => {
-        const b = i.components?.get(E);
+      d?.pathComponents && d.pathComponents.forEach((V) => {
+        const b = i.components?.get(V);
         b && ((Array.isArray(b.reactiveType) ? b.reactiveType : [b.reactiveType || "component"]).includes("none") || f.add(b));
       });
     });
-  } else if (l.type === "insert" || l.type === "cut" || l.type === "insert_many") {
-    let m = [...l.type === "insert" ? n : n.slice(0, -1)];
+  } else if (c.type === "insert" || c.type === "cut" || c.type === "insert_many") {
+    let m = [...c.type === "insert" ? n : n.slice(0, -1)];
     for (; ; ) {
       const y = $(e, m);
       if (y?.pathComponents && y.pathComponents.forEach((t) => {
@@ -301,49 +296,49 @@ function tt(e, n, l) {
   }
   return f;
 }
-function rt(e, n, l) {
-  const i = p.getState().getShadowValue(e, n), f = z(l) ? l(i) : l;
-  if (Z(i, f))
+function rt(e, n, c) {
+  const i = p.getState().getShadowValue(e, n), f = R(c) ? c(i) : c;
+  if (X(i, f))
     return null;
-  Le(e, n, f), oe(e, n, { bubble: !0 });
-  const c = $(e, n);
+  Le(e, n, f), se(e, n, { bubble: !0 });
+  const l = $(e, n);
   return {
     type: "update",
     oldValue: i,
     newValue: f,
-    shadowMeta: c
+    shadowMeta: l
   };
 }
-function nt(e, n, l) {
-  be(e, n, l), oe(e, n, { bubble: !0 });
+function nt(e, n, c) {
+  $e(e, n, c), se(e, n, { bubble: !0 });
   const i = $(e, n);
   return {
     type: "insert_many",
-    count: l.length,
+    count: c.length,
     shadowMeta: i,
     path: n
   };
 }
-function at(e, n, l, i, f) {
-  let c;
-  if (z(l)) {
-    const { value: a } = j(e, n);
-    c = l({ state: a });
+function at(e, n, c, i, f) {
+  let l;
+  if (R(c)) {
+    const { value: a } = U(e, n);
+    l = c({ state: a });
   } else
-    c = l;
+    l = c;
   const m = We(
     e,
     n,
-    c,
+    l,
     i,
     f
   );
-  oe(e, n, { bubble: !0 });
+  se(e, n, { bubble: !0 });
   const y = $(e, n);
   let t;
   return y?.arrayKeys && i !== void 0 && i > 0 && (t = y.arrayKeys[i - 1]), {
     type: "insert",
-    newValue: c,
+    newValue: l,
     shadowMeta: y,
     path: n,
     itemId: m,
@@ -351,18 +346,18 @@ function at(e, n, l, i, f) {
   };
 }
 function ot(e, n) {
-  const l = n.slice(0, -1), i = D(e, n);
-  return Be(e, n), oe(e, l, { bubble: !0 }), { type: "cut", oldValue: i, parentPath: l };
+  const c = n.slice(0, -1), i = C(e, n);
+  return Be(e, n), se(e, c, { bubble: !0 }), { type: "cut", oldValue: i, parentPath: c };
 }
 function it() {
-  const e = /* @__PURE__ */ new Set(), n = [], l = [];
-  for (const i of ae) {
+  const e = /* @__PURE__ */ new Set(), n = [], c = [];
+  for (const i of ie) {
     if (i.status && i.updateType) {
-      l.push(i);
+      c.push(i);
       continue;
     }
-    const f = i, c = f.type === "cut" ? null : f.newValue;
-    f.shadowMeta?.signals?.length > 0 && n.push({ shadowMeta: f.shadowMeta, displayValue: c }), tt(
+    const f = i, l = f.type === "cut" ? null : f.newValue;
+    f.shadowMeta?.signals?.length > 0 && n.push({ shadowMeta: f.shadowMeta, displayValue: l }), tt(
       f.stateKey,
       f.path,
       f
@@ -370,45 +365,45 @@ function it() {
       e.add(y);
     });
   }
-  l.length > 0 && xe(l), n.forEach(({ shadowMeta: i, displayValue: f }) => {
+  c.length > 0 && xe(c), n.forEach(({ shadowMeta: i, displayValue: f }) => {
     et(i, f);
   }), e.forEach((i) => {
     i.forceUpdate();
-  }), ae = [], de = !1;
+  }), ie = [], ge = !1;
 }
-function st(e, n, l) {
-  return (f, c, m) => {
-    i(e, c, f, m);
+function st(e, n, c) {
+  return (f, l, m) => {
+    i(e, l, f, m);
   };
-  function i(f, c, m, y) {
+  function i(f, l, m, y) {
     let t;
     switch (y.updateType) {
       case "update":
-        t = rt(f, c, m);
+        t = rt(f, l, m);
         break;
       case "insert":
         t = at(
           f,
-          c,
+          l,
           m,
           y.index,
           y.itemId
         );
         break;
       case "insert_many":
-        t = nt(f, c, m);
+        t = nt(f, l, m);
         break;
       case "cut":
-        t = ot(f, c);
+        t = ot(f, l);
         break;
     }
     if (t === null)
       return;
-    t.stateKey = f, t.path = c, ae.push(t), Ke();
+    t.stateKey = f, t.path = l, ie.push(t), Ke();
     const a = {
       timeStamp: Date.now(),
       stateKey: f,
-      path: c,
+      path: l,
       updateType: y.updateType,
       status: "new",
       oldValue: t.oldValue,
@@ -417,34 +412,34 @@ function st(e, n, l) {
       insertAfterId: t.insertAfterId,
       metaData: y.metaData
     };
-    ae.push(a), t.newValue !== void 0 && Ze(
+    ie.push(a), t.newValue !== void 0 && Ze(
       t.newValue,
       f,
-      l.current,
+      c.current,
       n
-    ), l.current?.middleware && l.current.middleware({ update: a }), Re(a, y.validationTrigger || "programmatic"), Ye(a);
+    ), c.current?.middleware && c.current.middleware({ update: a }), ze(a, y.validationTrigger || "programmatic"), Ye(a);
   }
 }
 function ct(e, {
   stateKey: n,
-  localStorage: l,
+  localStorage: c,
   formElements: i,
   reactiveDeps: f,
-  reactiveType: c,
+  reactiveType: l,
   componentId: m,
   defaultState: y,
   dependencies: t,
   serverState: a
 } = {}) {
-  const [d, E] = te({}), { sessionId: b } = Ae();
-  let V = !n;
-  const [v] = te(n ?? re()), C = q(m ?? re()), _ = q(
+  const [d, V] = ne({}), { sessionId: b } = Me();
+  let E = !n;
+  const [v] = ne(n ?? ae()), _ = q(m ?? ae()), T = q(
     null
   );
-  _.current = U(v) ?? null;
-  const J = Te(
-    (T) => {
-      const r = T ? { ...U(v), ...T } : U(v), o = r?.defaultState || y || e;
+  T.current = j(v) ?? null;
+  const x = ke(
+    (k) => {
+      const r = k ? { ...j(v), ...k } : j(v), o = r?.defaultState || y || e;
       if (r?.serverState?.status === "success" && r?.serverState?.data !== void 0)
         return {
           value: r.serverState.data,
@@ -452,7 +447,7 @@ function ct(e, {
           timestamp: r.serverState.timestamp || Date.now()
         };
       if (r?.localStorage?.key && b) {
-        const S = z(r.localStorage.key) ? r.localStorage.key(o) : r.localStorage.key, u = ie(
+        const S = R(r.localStorage.key) ? r.localStorage.key(o) : r.localStorage.key, u = ce(
           `${b}-${v}-${S}`
         );
         if (u && u.lastUpdated > (r?.serverState?.timestamp || 0))
@@ -470,15 +465,15 @@ function ct(e, {
     },
     [v, y, e, b]
   );
-  x(() => {
-    a && a.status === "success" && a.data !== void 0 && ye(v, a);
-  }, [a, v]), x(() => p.getState().subscribeToPath(v, (k) => {
-    if (k?.type === "SERVER_STATE_UPDATE") {
-      const r = k.serverState;
+  Z(() => {
+    a && a.status === "success" && a.data !== void 0 && me(v, a);
+  }, [a, v]), Z(() => p.getState().subscribeToPath(v, (I) => {
+    if (I?.type === "SERVER_STATE_UPDATE") {
+      const r = I.serverState;
       if (r?.status !== "success" || r.data === void 0)
         return;
-      ce(v, { serverState: r });
-      const o = typeof r.merge == "object" ? r.merge : r.merge === !0 ? { strategy: "append", key: "id" } : null, s = D(v, []), S = r.data;
+      ue(v, { serverState: r });
+      const o = typeof r.merge == "object" ? r.merge : r.merge === !0 ? { strategy: "append", key: "id" } : null, s = C(v, []), S = r.data;
       if (o && o.strategy === "append" && "key" in o && Array.isArray(s) && Array.isArray(S)) {
         const u = o.key;
         if (!u) {
@@ -492,16 +487,16 @@ function ct(e, {
         ), w = S.filter(
           (M) => !h.has(M[u])
         );
-        w.length > 0 && be(v, [], w);
-        const A = D(v, []);
-        ne(
+        w.length > 0 && $e(v, [], w);
+        const A = C(v, []);
+        oe(
           v,
           [],
           A,
           r.timestamp || Date.now()
         );
       } else
-        X(v, S), ne(
+        K(v, S), oe(
           v,
           [],
           S,
@@ -509,49 +504,51 @@ function ct(e, {
         );
       W(v);
     }
-  }), [v]), x(() => {
-    const T = p.getState().getShadowMetadata(v, []);
-    if (T && T.stateSource)
+  }), [v]), Z(() => {
+    const k = p.getState().getShadowMetadata(v, []);
+    if (k && k.stateSource)
       return;
-    const k = U(v), r = {
-      localStorageEnabled: !!k?.localStorage?.key
+    const I = j(v), r = {
+      localStorageEnabled: !!I?.localStorage?.key
     };
     if (L(v, [], {
-      ...T,
+      ...k,
       features: r
-    }), k?.defaultState !== void 0 || y !== void 0) {
-      const u = k?.defaultState || y;
-      k?.defaultState || ce(v, {
-        defaultState: u
+    }), I?.defaultState !== void 0 || y !== void 0) {
+      const h = I?.defaultState || y;
+      I?.defaultState || ue(v, {
+        defaultState: h
       });
     }
-    const { value: o, source: s, timestamp: S } = J();
-    X(v, o), L(v, [], {
+    const { value: o, source: s, timestamp: S } = x();
+    K(v, o);
+    const u = j(v)?.validation;
+    u?.zodSchemaV4 ? H(v, u.zodSchemaV4, "zod4") : u?.zodSchemaV3 && H(v, u.zodSchemaV3, "zod3"), L(v, [], {
       stateSource: s,
       lastServerSync: s === "server" ? S : void 0,
       isDirty: s === "server" ? !1 : void 0,
       baseServerState: s === "server" ? o : void 0
-    }), s === "server" && a && ye(v, a), W(v);
-  }, [v, ...t || []]), ke(() => {
-    V && ce(v, {
+    }), s === "server" && a && me(v, a), W(v);
+  }, [v, ...t || []]), re(() => {
+    E && ue(v, {
       formElements: i,
       defaultState: y,
-      localStorage: l,
-      middleware: _.current?.middleware
+      localStorage: c,
+      middleware: T.current?.middleware
     });
-    const T = `${v}////${C.current}`, k = $(v, []), r = k?.components || /* @__PURE__ */ new Map();
-    return r.set(T, {
-      forceUpdate: () => E({}),
-      reactiveType: c ?? ["component"],
+    const k = `${v}////${_.current}`, I = $(v, []), r = I?.components || /* @__PURE__ */ new Map();
+    return r.set(k, {
+      forceUpdate: () => V({}),
+      reactiveType: l ?? ["component"],
       paths: /* @__PURE__ */ new Set(),
       depsFunction: f || void 0,
-      deps: f ? f(D(v, [])) : [],
-      prevDeps: f ? f(D(v, [])) : []
+      deps: f ? f(C(v, [])) : [],
+      prevDeps: f ? f(C(v, [])) : []
     }), L(v, [], {
-      ...k,
+      ...I,
       components: r
-    }), E({}), () => {
-      const o = $(v, []), s = o?.components?.get(T);
+    }), V({}), () => {
+      const o = $(v, []), s = o?.components?.get(k);
       s?.paths && s.paths.forEach((S) => {
         const h = S.split(".").slice(1), w = p.getState().getShadowMetadata(v, h);
         w?.pathComponents && w.pathComponents.size === 0 && (delete w.pathComponents, p.getState().setShadowMetadata(v, h, w));
@@ -561,36 +558,36 @@ function ct(e, {
   const G = st(
     v,
     b,
-    _
+    T
   );
-  return p.getState().initialStateGlobal[v] || Me(v, e), pe(() => Ve(
+  return p.getState().initialStateGlobal[v] || be(v, e), Ae(() => Pe(
     v,
     G,
-    C.current,
+    _.current,
     b
   ), [v, b]);
 }
-const lt = (e, n, l) => {
+const lt = (e, n, c) => {
   let i = $(e, n)?.arrayKeys || [];
-  const f = l?.transforms;
+  const f = c?.transforms;
   if (!f || f.length === 0)
     return i;
-  for (const c of f)
-    if (c.type === "filter") {
+  for (const l of f)
+    if (l.type === "filter") {
       const m = [];
       i.forEach((y, t) => {
-        const a = D(e, [...n, y]);
-        c.fn(a, t) && m.push(y);
+        const a = C(e, [...n, y]);
+        l.fn(a, t) && m.push(y);
       }), i = m;
-    } else c.type === "sort" && i.sort((m, y) => {
-      const t = D(e, [...n, m]), a = D(e, [...n, y]);
-      return c.fn(t, a);
+    } else l.type === "sort" && i.sort((m, y) => {
+      const t = C(e, [...n, m]), a = C(e, [...n, y]);
+      return l.fn(t, a);
     });
   return i;
-}, ee = (e, n, l) => {
-  const i = `${e}////${n}`, c = $(e, [])?.components?.get(i);
-  !c || c.reactiveType === "none" || !(Array.isArray(c.reactiveType) ? c.reactiveType : [c.reactiveType]).includes("component") || Ge(e, l, i);
-}, Y = (e, n, l) => {
+}, te = (e, n, c) => {
+  const i = `${e}////${n}`, l = $(e, [])?.components?.get(i);
+  !l || l.reactiveType === "none" || !(Array.isArray(l.reactiveType) ? l.reactiveType : [l.reactiveType]).includes("component") || Ge(e, c, i);
+}, Y = (e, n, c) => {
   const i = $(e, []), f = /* @__PURE__ */ new Set();
   i?.components && i.components.forEach((m, y) => {
     (Array.isArray(m.reactiveType) ? m.reactiveType : [m.reactiveType || "component"]).includes("all") && (m.forceUpdate(), f.add(y));
@@ -600,23 +597,23 @@ const lt = (e, n, l) => {
   ])?.pathComponents?.forEach((m) => {
     i?.components?.get(m)?.forceUpdate();
   });
-  const c = $(e, n);
-  for (let m of c?.arrayKeys || []) {
+  const l = $(e, n);
+  for (let m of l?.arrayKeys || []) {
     const y = m + ".selected", t = $(e, y.split(".").slice(1));
-    m == l && t?.pathComponents?.forEach((a) => {
+    m == c && t?.pathComponents?.forEach((a) => {
       i?.components?.get(a)?.forceUpdate();
     });
   }
 };
-function j(e, n, l) {
-  const i = $(e, n), f = n.length > 0 ? n.join(".") : "root", c = l?.arrayViews?.[f];
-  if (Array.isArray(c) && c.length === 0)
+function U(e, n, c) {
+  const i = $(e, n), f = n.length > 0 ? n.join(".") : "root", l = c?.arrayViews?.[f];
+  if (Array.isArray(l) && l.length === 0)
     return {
       shadowMeta: i,
       value: [],
       arrayKeys: i?.arrayKeys
     };
-  const m = D(e, n, c);
+  const m = C(e, n, l);
   return {
     shadowMeta: i,
     value: m,
@@ -624,95 +621,95 @@ function j(e, n, l) {
   };
 }
 function ut(e, n) {
-  return n ? e.length !== n.length ? !1 : n.every((l, i) => l === "*" || l === e[i]) : !0;
+  return n ? e.length !== n.length ? !1 : n.every((c, i) => c === "*" || c === e[i]) : !0;
 }
 function dt(e, n) {
   return n === "any" ? !0 : n === "array" ? Array.isArray(e) : n === "boolean" ? typeof e == "boolean" : n === "object" ? e !== null && typeof e == "object" && !Array.isArray(e) : n === "primitive" ? e === null || typeof e != "object" && !Array.isArray(e) : !1;
 }
-function $e(e, n) {
-  const l = p.getState().getShadowMetadata(e, n);
-  if (!l?.clientActivityState?.elements) return [];
+function Ve(e, n) {
+  const c = p.getState().getShadowMetadata(e, n);
+  if (!c?.clientActivityState?.elements) return [];
   const i = [];
-  return l.clientActivityState.elements.forEach((f) => {
+  return c.clientActivityState.elements.forEach((f) => {
     f.domRef?.current && i.push(f.domRef);
   }), i;
 }
 function Ee(e, n) {
-  return $e(e, n).map((i) => i.current).filter(Boolean);
+  return Ve(e, n).map((i) => i.current).filter(Boolean);
 }
-function ft(e, n, l) {
+function ft(e, n, c) {
   Ee(e, n).forEach((i) => {
     if ("disabled" in i) {
-      i.disabled = l;
+      i.disabled = c;
       return;
     }
-    i.style.pointerEvents = l ? "none" : "", i.setAttribute("aria-disabled", String(l));
+    i.style.pointerEvents = c ? "none" : "", i.setAttribute("aria-disabled", String(c));
   });
 }
-function Ve(e, n, l, i) {
+function Pe(e, n, c, i) {
   const f = /* @__PURE__ */ new Map();
-  function c({
+  function l({
     path: t = [],
     meta: a,
     componentId: d
   }) {
     if ($(e, t)?.isRaw)
-      return D(e, t);
-    const b = a ? JSON.stringify(a.arrayViews || a.transforms) : "", V = t.join(".") + ":" + d + ":" + b;
-    if (f.has(V))
-      return f.get(V);
-    const v = [e, ...t].join("."), C = () => {
-    }, _ = {
-      apply(G, g, T) {
-        if (T.length === 0) {
+      return C(e, t);
+    const b = a ? JSON.stringify(a.arrayViews || a.transforms) : "", E = t.join(".") + ":" + d + ":" + b;
+    if (f.has(E))
+      return f.get(E);
+    const v = [e, ...t].join("."), _ = () => {
+    }, T = {
+      apply(G, g, k) {
+        if (k.length === 0) {
           const r = t.length > 0 ? t.join(".") : "root", o = a?.arrayViews?.[r];
-          return ee(e, d, t), D(e, t, o);
+          return te(e, d, t), C(e, t, o);
         }
-        const k = T[0];
-        return n(k, t, { updateType: "update" }), !0;
+        const I = k[0];
+        return n(I, t, { updateType: "update" }), !0;
       },
-      get(G, g, T) {
+      get(G, g, k) {
         if (g === Symbol.toPrimitive)
           return (r) => r === "number" ? NaN : r === "string" ? `[CogsState: ${t.join(".") || "root"}]` : null;
         if (g === Symbol.toStringTag)
           return "CogsState";
         if (g === Symbol.iterator) {
-          const { value: r } = j(e, t, a);
+          const { value: r } = U(e, t, a);
           return Array.isArray(r) ? function* () {
             for (let o = 0; o < r.length; o++)
               yield r[o];
           } : void 0;
         }
         if (g === "call" || g === "apply" || g === "bind")
-          return Reflect.get(G, g, T);
+          return Reflect.get(G, g, k);
         if (typeof g != "string")
           return Reflect.get(G, g);
         if (t.length === 0 && g in m)
           return m[g];
         if (typeof g == "string" && !g.startsWith("$")) {
-          const { value: r } = j(e, t, a);
+          const { value: r } = U(e, t, a);
           if (r !== null && typeof r == "object" && !Array.isArray(r) && Object.prototype.hasOwnProperty.call(r, g)) {
             const u = [...t, g];
-            return c({
+            return l({
               path: u,
               componentId: d,
               meta: a
             });
           }
-          const s = R.getState().registeredPlugins;
+          const s = z.getState().registeredPlugins;
           for (const u of s) {
             const h = u.chainMethods?.[g];
             if (h && ut(t, h.pathPattern) && dt(r, h.target))
               return (...w) => {
-                const A = R.getState(), M = A.pluginOptions.get(e)?.get(u.name), I = A.getHookResult(e, u.name);
+                const A = z.getState(), M = A.pluginOptions.get(e)?.get(u.name), D = A.getHookResult(e, u.name);
                 return h.handler(
                   {
                     stateKey: e,
                     path: t,
                     pluginName: u.name,
                     options: M,
-                    hookData: I,
-                    $get: () => j(e, t, a).value,
+                    hookData: D,
+                    $get: () => U(e, t, a).value,
                     $update: (P) => (n(P, t, {
                       updateType: "update"
                     }), {
@@ -733,10 +730,10 @@ function Ve(e, n, l, i) {
                         metaData: O
                       });
                     },
-                    getFieldMetaData: () => me(e, t)?.get(u.name),
-                    setFieldMetaData: (P) => he(e, t, u.name, P),
-                    removeFieldMetaData: () => ve(e, t, u.name),
-                    getFieldRefs: () => $e(e, t),
+                    getFieldMetaData: () => he(e, t)?.get(u.name),
+                    setFieldMetaData: (P) => ve(e, t, u.name, P),
+                    removeFieldMetaData: () => we(e, t, u.name),
+                    getFieldRefs: () => Ve(e, t),
                     getFieldElements: () => Ee(e, t),
                     setFieldDisabled: (P) => ft(e, t, P)
                   },
@@ -745,14 +742,14 @@ function Ve(e, n, l, i) {
               };
           }
           const S = [...t, g];
-          return c({
+          return l({
             path: S,
             componentId: d,
             meta: a
           });
         }
         if (g === "$_rebuildStateShape")
-          return c;
+          return l;
         if (g === "$sync" && t.length === 0)
           return async function() {
             const r = p.getState().getInitialOptions(e), o = r?.sync;
@@ -779,15 +776,15 @@ function Ve(e, n, l, i) {
           };
         if (g === "$_status" || g === "$getStatus") {
           const r = () => {
-            const { shadowMeta: o, value: s } = j(e, t, a);
+            const { shadowMeta: o, value: s } = U(e, t, a);
             return o?.isDirty === !0 ? "dirty" : o?.stateSource === "server" || o?.isDirty === !1 ? "synced" : o?.stateSource === "localStorage" ? "restored" : o?.stateSource === "default" || s !== void 0 ? "fresh" : "unknown";
           };
           return g === "$_status" ? r() : r;
         }
         if (g === "$removeStorage")
           return () => {
-            const r = p.getState().initialStateGlobal[e], o = U(e), s = z(o?.localStorage?.key) ? o.localStorage.key(r) : o?.localStorage?.key, S = i && s ? `${i}-${e}-${s}` : void 0;
-            le(S);
+            const r = p.getState().initialStateGlobal[e], o = j(e), s = R(o?.localStorage?.key) ? o.localStorage.key(r) : o?.localStorage?.key, S = i && s ? `${i}-${e}-${s}` : void 0;
+            de(S);
           };
         if (g === "$setRaw")
           return (r) => {
@@ -796,7 +793,7 @@ function Ve(e, n, l, i) {
           };
         if (g === "$validate")
           return () => {
-            const r = p.getState(), { value: o } = j(e, t, a), s = r.getInitialOptions(e), S = s?.validation?.zodSchemaV4 || s?.validation?.zodSchemaV3;
+            const r = p.getState(), { value: o } = U(e, t, a), s = r.getInitialOptions(e), S = s?.validation?.zodSchemaV4 || s?.validation?.zodSchemaV3;
             if (!S)
               return { success: !0, data: o };
             const u = S.safeParse(o);
@@ -834,13 +831,13 @@ function Ve(e, n, l, i) {
           };
         if (g === "$showValidationErrors")
           return () => {
-            const { shadowMeta: r } = j(e, t, a);
+            const { shadowMeta: r } = U(e, t, a);
             return r?.validation?.status === "INVALID" && r.validation.errors.length > 0 ? r.validation.errors.filter((o) => o.severity === "error").map((o) => o.message) : [];
           };
         if (g === "$getSelected")
           return () => {
             const r = [e, ...t].join(".");
-            ee(e, d, [
+            te(e, d, [
               ...t,
               "getSelected"
             ]);
@@ -848,11 +845,11 @@ function Ve(e, n, l, i) {
             if (!o)
               return;
             const s = t.join("."), S = a?.arrayViews?.[s], u = o.split(".").pop();
-            if (!(S && !S.includes(u) || D(
+            if (!(S && !S.includes(u) || C(
               e,
               o.split(".").slice(1)
             ) === void 0))
-              return c({
+              return l({
                 path: o.split(".").slice(1),
                 componentId: d,
                 meta: a
@@ -884,9 +881,9 @@ function Ve(e, n, l, i) {
               t,
               a
             );
-            if (ee(e, d, t), !s || !Array.isArray(o))
+            if (te(e, d, t), !s || !Array.isArray(o))
               return [];
-            const S = c({
+            const S = l({
               path: t,
               componentId: d,
               meta: a
@@ -894,7 +891,7 @@ function Ve(e, n, l, i) {
             return o.map((u, h) => {
               const w = s[h];
               if (!w) return;
-              const A = [...t, w], M = c({
+              const A = [...t, w], M = l({
                 path: A,
                 // This now correctly points to the item in the shadow store.
                 componentId: d,
@@ -918,7 +915,7 @@ function Ve(e, n, l, i) {
                 const A = s[w];
                 A && u.push(A);
               }
-            }), c({
+            }), l({
               path: t,
               componentId: d,
               meta: {
@@ -949,7 +946,7 @@ function Ve(e, n, l, i) {
             }));
             u.sort((w, A) => r(w.item, A.item));
             const h = u.map((w) => w.key);
-            return c({
+            return l({
               path: t,
               componentId: d,
               meta: {
@@ -967,7 +964,7 @@ function Ve(e, n, l, i) {
           };
         if (g === "$list")
           return (r) => /* @__PURE__ */ Q(() => {
-            const s = q(/* @__PURE__ */ new Map()), [S, u] = te({}), h = t.length > 0 ? t.join(".") : "root", w = lt(e, t, a), A = pe(() => ({
+            const s = q(/* @__PURE__ */ new Map()), [S, u] = ne({}), h = t.length > 0 ? t.join(".") : "root", w = lt(e, t, a), A = Ae(() => ({
               ...a,
               arrayViews: {
                 ...a?.arrayViews || {},
@@ -978,14 +975,14 @@ function Ve(e, n, l, i) {
               t,
               A
             );
-            if (x(() => {
+            if (Z(() => {
               const O = p.getState().subscribeToPath(v, (F) => {
                 if (F.type === "GET_SELECTED")
                   return;
                 const B = p.getState().getShadowMetadata(e, t)?.transformCaches;
                 if (B)
-                  for (const K of B.keys())
-                    K.startsWith(d) && B.delete(K);
+                  for (const ee of B.keys())
+                    ee.startsWith(d) && B.delete(ee);
                 (F.type === "INSERT" || F.type === "INSERT_MANY" || F.type === "REMOVE" || F.type === "CLEAR_SELECTION" || F.type === "SERVER_STATE_UPDATE" && !a?.serverStateIsUpStream) && u({});
               });
               return () => {
@@ -993,35 +990,35 @@ function Ve(e, n, l, i) {
               };
             }, [d, v]), !Array.isArray(M))
               return null;
-            const I = c({
+            const D = l({
               path: t,
               componentId: d,
               meta: A
               // Use updated meta here
             }), P = M.map((O, F) => {
-              const H = w[F];
-              if (!H)
+              const J = w[F];
+              if (!J)
                 return null;
-              let B = s.current.get(H);
-              B || (B = re(), s.current.set(H, B));
-              const K = [...t, H];
-              return fe(Ue, {
-                key: H,
+              let B = s.current.get(J);
+              B || (B = ae(), s.current.set(J, B));
+              const ee = [...t, J];
+              return Se(Ne, {
+                key: J,
                 stateKey: e,
                 itemComponentId: B,
-                itemPath: K,
+                itemPath: ee,
                 localIndex: F,
-                arraySetter: I,
-                rebuildStateShape: c,
+                arraySetter: D,
+                rebuildStateShape: l,
                 renderFn: r
               });
             });
-            return /* @__PURE__ */ Q(Pe, { children: P });
+            return /* @__PURE__ */ Q(Te, { children: P });
           }, {});
         if (g === "$stateFlattenOn")
           return (r) => {
             const o = t.length > 0 ? t.join(".") : "root", s = a?.arrayViews?.[o], S = p.getState().getShadowValue(e, t, s);
-            return Array.isArray(S) ? c({
+            return Array.isArray(S) ? l({
               path: [...t, "[*]", r],
               componentId: d,
               meta: a
@@ -1032,7 +1029,7 @@ function Ve(e, n, l, i) {
             const o = t.length > 0 ? t.join(".") : "root", s = a?.arrayViews?.[o];
             if (s) {
               const h = s[r];
-              return h ? c({
+              return h ? l({
                 path: [...t, h],
                 componentId: d,
                 meta: a
@@ -1042,7 +1039,7 @@ function Ve(e, n, l, i) {
             if (!S?.arrayKeys) return;
             const u = S.arrayKeys[r];
             if (u)
-              return c({
+              return l({
                 path: [...t, u],
                 componentId: d,
                 meta: a
@@ -1057,7 +1054,7 @@ function Ve(e, n, l, i) {
             if (!o)
               return;
             const s = [...t, o];
-            return c({
+            return l({
               path: s,
               componentId: d,
               meta: a
@@ -1078,22 +1075,22 @@ function Ve(e, n, l, i) {
           };
         if (g === "$uniqueInsert")
           return (r, o, s) => {
-            const { value: S } = j(
+            const { value: S } = U(
               e,
               t,
               a
-            ), u = z(r) ? r(S) : r;
+            ), u = R(r) ? r(S) : r;
             let h = null;
             if (!S.some((A) => {
               const M = o ? o.every(
-                (I) => Z(A[I], u[I])
-              ) : Z(A, u);
+                (D) => X(A[D], u[D])
+              ) : X(A, u);
               return M && (h = A), M;
             }))
               n(u, t, { updateType: "insert" });
             else if (s && h) {
               const A = s(h), M = S.map(
-                (I) => Z(I, h) ? A : I
+                (D) => X(D, h) ? A : D
               );
               n(M, t, {
                 updateType: "update"
@@ -1136,7 +1133,7 @@ function Ve(e, n, l, i) {
               keys: S
             } = N(e, t, a);
             if (!o) return;
-            const u = se(s, S, (h) => h === r);
+            const u = le(s, S, (h) => h === r);
             u && n(null, [...t, u.key], {
               updateType: "cut"
             });
@@ -1149,7 +1146,7 @@ function Ve(e, n, l, i) {
               keys: S
             } = N(e, t, a);
             if (!o) return;
-            const u = se(s, S, (h) => h === r);
+            const u = le(s, S, (h) => h === r);
             if (u) {
               const h = [...t, u.key];
               n(null, h, {
@@ -1163,44 +1160,44 @@ function Ve(e, n, l, i) {
             const { isArray: s, value: S, keys: u } = N(e, t, a);
             if (!s)
               throw new Error("findWith can only be used on arrays");
-            const h = se(
+            const h = le(
               S,
               u,
               (w) => w?.[r] === o
             );
-            return h ? c({
+            return h ? l({
               path: [...t, h.key],
               componentId: d,
               meta: a
             }) : null;
           };
         if (g === "$cutThis") {
-          const { value: r } = j(e, t, a), o = t.slice(0, -1);
+          const { value: r } = U(e, t, a), o = t.slice(0, -1);
           return Y(e, o), () => {
             n(r, t, { updateType: "cut" });
           };
         }
         if (g === "$get")
           return () => {
-            ee(e, d, t);
-            const { value: r } = j(e, t, a);
+            te(e, d, t);
+            const { value: r } = U(e, t, a);
             return r;
           };
         if (g === "$$derive")
-          return (r) => we({
+          return (r) => pe({
             _stateKey: e,
             _path: t,
             _effect: r.toString(),
             _meta: a
           });
         if (g === "$$get")
-          return () => we({ _stateKey: e, _path: t, _meta: a });
+          return () => pe({ _stateKey: e, _path: t, _meta: a });
         if (g === "$lastSynced") {
           const r = `${e}:${t.join(".")}`;
           return He(r);
         }
         if (g == "getLocalStorage")
-          return (r) => ie(i + "-" + e + "-" + r);
+          return (r) => ce(i + "-" + e + "-" + r);
         if (g === "$isSelected") {
           const r = t.slice(0, -1);
           if ($(e, r)?.arrayKeys) {
@@ -1250,7 +1247,7 @@ function Ve(e, n, l, i) {
             return d;
           if (g === "$setOptions")
             return (r) => {
-              ue({ stateKey: e, options: r, initialOptionsPart: {} });
+              fe({ stateKey: e, options: r, initialOptionsPart: {} });
             };
           if (g === "$_applyUpdate")
             return (r, o, s = "update") => {
@@ -1259,11 +1256,11 @@ function Ve(e, n, l, i) {
           if (g === "$_getEffectiveSetState")
             return n;
           if (g === "$getPluginMetaData")
-            return (r) => me(e, t)?.get(r);
+            return (r) => he(e, t)?.get(r);
           if (g === "$addPluginMetaData")
-            return (r, o) => he(e, t, r, o);
+            return (r, o) => ve(e, t, r, o);
           if (g === "$removePluginMetaData")
-            return (r) => ve(e, t, r);
+            return (r) => we(e, t, r);
           if (g === "$addZodValidation")
             return (r, o) => {
               r.forEach((s) => {
@@ -1320,11 +1317,11 @@ function Ve(e, n, l, i) {
                     o.updateShadowAtPath(e, w, A), o.markAsDirty(e, w, { bubble: !0 });
                     let M = [...w];
                     for (; ; ) {
-                      const I = o.getShadowMetadata(
+                      const D = o.getShadowMetadata(
                         e,
                         M
                       );
-                      if (I?.pathComponents && I.pathComponents.forEach((P) => {
+                      if (D?.pathComponents && D.pathComponents.forEach((P) => {
                         if (!u.has(P)) {
                           const O = s.components?.get(P);
                           O && (O.forceUpdate(), u.add(P));
@@ -1339,11 +1336,11 @@ function Ve(e, n, l, i) {
                     o.removeShadowArrayElement(e, w), o.markAsDirty(e, A, { bubble: !0 });
                     let M = [...A];
                     for (; ; ) {
-                      const I = o.getShadowMetadata(
+                      const D = o.getShadowMetadata(
                         e,
                         M
                       );
-                      if (I?.pathComponents && I.pathComponents.forEach((P) => {
+                      if (D?.pathComponents && D.pathComponents.forEach((P) => {
                         if (!u.has(P)) {
                           const O = s.components?.get(P);
                           O && (O.forceUpdate(), u.add(P));
@@ -1392,7 +1389,7 @@ function Ve(e, n, l, i) {
             }
           });
         if (g === "$toggle") {
-          const { value: r } = j(
+          const { value: r } = U(
             e,
             t,
             a
@@ -1418,78 +1415,78 @@ function Ve(e, n, l, i) {
                 stateKey: e,
                 path: t,
                 dependencies: S,
-                rebuildStateShape: c,
+                rebuildStateShape: l,
                 renderFn: u
               }
             );
           };
         if (g === "$formElement")
           return (r, o) => /* @__PURE__ */ Q(
-            Ne,
+            Ue,
             {
               stateKey: e,
               path: t,
-              rebuildStateShape: c,
+              rebuildStateShape: l,
               setState: n,
               formOpts: o,
               renderFn: r
             }
           );
-        const k = [...t, g];
-        return c({
-          path: k,
+        const I = [...t, g];
+        return l({
+          path: I,
           componentId: d,
           meta: a
         });
       }
-    }, J = new Proxy(C, _);
-    return f.set(V, J), J;
+    }, x = new Proxy(_, T);
+    return f.set(E, x), x;
   }
   const m = {
     $revertToInitialState: (t) => {
       const a = p.getState().getShadowMetadata(e, []);
       let d;
-      a?.stateSource === "server" && a.baseServerState ? d = a.baseServerState : d = p.getState().initialStateGlobal[e], qe(e), X(e, d), c({
+      a?.stateSource === "server" && a.baseServerState ? d = a.baseServerState : d = p.getState().initialStateGlobal[e], qe(e), K(e, d), l({
         path: [],
-        componentId: l
+        componentId: c
       });
-      const E = U(e), b = z(E?.localStorage?.key) ? E?.localStorage?.key(d) : E?.localStorage?.key, V = i && b ? `${i}-${e}-${b}` : void 0;
-      return le(V), W(e), d;
+      const V = j(e), b = R(V?.localStorage?.key) ? V?.localStorage?.key(d) : V?.localStorage?.key, E = i && b ? `${i}-${e}-${b}` : void 0;
+      return de(E), W(e), d;
     },
     $initializeAndMergeShadowState: (t) => {
-      ze(e, t), W(e);
+      Re(e, t), W(e);
     },
     $updateInitialState: (t) => {
-      const a = Ve(
+      const a = Pe(
         e,
         n,
-        l,
+        c,
         i
-      ), d = p.getState().initialStateGlobal[e], E = U(e), b = z(E?.localStorage?.key) ? E?.localStorage?.key(d) : E?.localStorage?.key, V = i && b ? `${i}-${e}-${b}` : void 0;
-      return le(V), Ie(() => {
-        Me(e, t), X(e, t);
+      ), d = p.getState().initialStateGlobal[e], V = j(e), b = R(V?.localStorage?.key) ? V?.localStorage?.key(d) : V?.localStorage?.key, E = i && b ? `${i}-${e}-${b}` : void 0;
+      return de(E), Ie(() => {
+        be(e, t), K(e, t);
         const v = p.getState().getShadowMetadata(e, []);
-        v && v?.components?.forEach((C) => {
-          C.forceUpdate();
+        v && v?.components?.forEach((_) => {
+          _.forceUpdate();
         });
       }), {
         fetchId: (v) => a.$get()[v]
       };
     }
   };
-  return c({
-    componentId: l,
+  return l({
+    componentId: c,
     path: []
   });
 }
-function we(e) {
-  return fe(gt, { proxy: e });
+function pe(e) {
+  return Se(gt, { proxy: e });
 }
 function gt({
   proxy: e
 }) {
-  const n = q(null), l = q(null), i = q(!1), f = `${e._stateKey}-${e._path.join(".")}`, c = e._path.length > 0 ? e._path.join(".") : "root", m = e._meta?.arrayViews?.[c], y = D(e._stateKey, e._path, m);
-  return x(() => {
+  const n = q(null), c = q(null), i = q(!1), f = `${e._stateKey}-${e._path.join(".")}`, l = e._path.length > 0 ? e._path.join(".") : "root", m = e._meta?.arrayViews?.[l], y = C(e._stateKey, e._path, m);
+  return Z(() => {
     const t = n.current;
     if (!t || i.current) return;
     const a = setTimeout(() => {
@@ -1498,48 +1495,48 @@ function gt({
         return;
       }
       const d = t.parentElement, b = Array.from(d.childNodes).indexOf(t);
-      let V = d.getAttribute("data-parent-id");
-      V || (V = `parent-${crypto.randomUUID()}`, d.setAttribute("data-parent-id", V)), l.current = `instance-${crypto.randomUUID()}`;
-      const v = p.getState().getShadowMetadata(e._stateKey, e._path) || {}, C = v.signals || [];
-      C.push({
-        instanceId: l.current,
-        parentId: V,
+      let E = d.getAttribute("data-parent-id");
+      E || (E = `parent-${crypto.randomUUID()}`, d.setAttribute("data-parent-id", E)), c.current = `instance-${crypto.randomUUID()}`;
+      const v = p.getState().getShadowMetadata(e._stateKey, e._path) || {}, _ = v.signals || [];
+      _.push({
+        instanceId: c.current,
+        parentId: E,
         position: b,
         effect: e._effect
       }), p.getState().setShadowMetadata(e._stateKey, e._path, {
         ...v,
-        signals: C
+        signals: _
       });
-      let _ = y;
+      let T = y;
       if (e._effect)
         try {
-          _ = new Function(
+          T = new Function(
             "state",
             `return (${e._effect})(state)`
           )(y);
         } catch (G) {
           console.error("Error evaluating effect function:", G);
         }
-      _ !== null && typeof _ == "object" && (_ = JSON.stringify(_));
-      const J = document.createTextNode(String(_ ?? ""));
-      t.replaceWith(J), i.current = !0;
+      T !== null && typeof T == "object" && (T = JSON.stringify(T));
+      const x = document.createTextNode(String(T ?? ""));
+      t.replaceWith(x), i.current = !0;
     }, 0);
     return () => {
-      if (clearTimeout(a), l.current) {
+      if (clearTimeout(a), c.current) {
         const d = p.getState().getShadowMetadata(e._stateKey, e._path) || {};
         d.signals && (d.signals = d.signals.filter(
-          (E) => E.instanceId !== l.current
+          (V) => V.instanceId !== c.current
         ), p.getState().setShadowMetadata(e._stateKey, e._path, d));
       }
     };
-  }, []), fe("span", {
+  }, []), Se("span", {
     ref: n,
     style: { display: "contents" },
     "data-signal-id": f
   });
 }
 export {
-  we as $cogsSignal,
+  pe as $cogsSignal,
   $t as createCogsState,
   ct as useCogsStateFn
 };