cogsbox-state 0.5.487 → 0.5.488

package/dist/CogsState.js

@@ -1,20 +1,20 @@
 "use client";
 import { jsx as Q, Fragment as Pe } from "react/jsx-runtime";
-import { pluginStore as R } from "./pluginStore.js";
-import { useState as ne, useRef as q, useCallback as Ie, useEffect as Z, useLayoutEffect as re, useMemo as Ae, createElement as Se, startTransition as ke } from "react";
-import { transformStateFunc as De, isFunction as L, isDeepEqual as X, isArray as Ce, getDifferences as _e } from "./utility.js";
+import { pluginStore as L } from "./pluginStore.js";
+import { useState as ne, useRef as x, useCallback as Ie, useEffect as Z, useLayoutEffect as re, useMemo as pe, createElement as Se, startTransition as De } from "react";
+import { transformStateFunc as ke, isFunction as W, isDeepEqual as X, 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 Fe from "superjson";
 import { v4 as ae } from "uuid";
-import { getGlobalStore as p, updateShadowTypeInfo as H } from "./store.js";
+import { getGlobalStore as M, updateShadowTypeInfo as H } from "./store.js";
 import { useCogsConfig as Me } from "./CogsStateClient.js";
 import { runValidation as ze } from "./validation.js";
 const {
-  getInitialOptions: j,
+  getInitialOptions: U,
   updateInitialStateGlobal: Ve,
   getShadowMetadata: E,
-  setShadowMetadata: W,
-  getShadowValue: C,
+  setShadowMetadata: B,
+  getShadowValue: O,
   initializeShadowState: K,
   initializeAndMergeShadowState: Re,
   updateShadowAtPath: Le,
@@ -23,7 +23,7 @@ const {
   removeShadowArrayElement: Be,
   setInitialStateOptions: ye,
   setServerStateUpdate: me,
-  markAsDirty: se,
+  markAsDirty: ie,
   addPathComponent: Ge,
   clearSelectedIndexesForState: qe,
   addStateLog: xe,
@@ -33,85 +33,85 @@ const {
   getPluginMetaDataMap: he,
   setPluginMetaData: ve,
   removePluginMetaData: we
-} = p.getState(), { notifyUpdate: Ye } = R.getState();
-function F(e, n, l) {
-  const i = E(e, n);
-  if (!!!i?.arrayKeys)
-    return { isArray: !1, value: p.getState().getShadowValue(e, n), keys: [] };
-  const u = n.length > 0 ? n.join(".") : "root", h = l?.arrayViews?.[u] ?? i.arrayKeys;
-  return Array.isArray(h) && h.length === 0 ? { isArray: !0, value: [], keys: [] } : { isArray: !0, value: p.getState().getShadowValue(e, n, h), keys: h ?? [] };
+} = M.getState(), { notifyUpdate: Ye } = L.getState();
+function z(e, a, l) {
+  const s = E(e, a);
+  if (!!!s?.arrayKeys)
+    return { isArray: !1, value: M.getState().getShadowValue(e, a), keys: [] };
+  const u = a.length > 0 ? a.join(".") : "root", h = l?.arrayViews?.[u] ?? s.arrayKeys;
+  return Array.isArray(h) && h.length === 0 ? { isArray: !0, value: [], keys: [] } : { isArray: !0, value: M.getState().getShadowValue(e, a, h), keys: h ?? [] };
 }
-function le(e, n, l) {
-  for (let i = 0; i < e.length; i++)
-    if (l(e[i], i)) {
-      const f = n[i];
+function le(e, a, l) {
+  for (let s = 0; s < e.length; s++)
+    if (l(e[s], s)) {
+      const f = a[s];
       if (f)
-        return { key: f, index: i, value: e[i] };
+        return { key: f, index: s, value: e[s] };
     }
   return null;
 }
-function ue(e, n) {
-  const i = {
-    ...j(e) || {},
-    ...n
+function ue(e, a) {
+  const s = {
+    ...U(e) || {},
+    ...a
   };
-  (i.validation?.zodSchemaV4 || i.validation?.zodSchemaV3) && !i.validation?.onBlur && (i.validation.onBlur = "error"), ye(e, i);
+  (s.validation?.zodSchemaV4 || s.validation?.zodSchemaV3) && !s.validation?.onBlur && (s.validation.onBlur = "error"), ye(e, s);
 }
 function fe({
   stateKey: e,
-  options: n,
+  options: a,
   initialOptionsPart: l
 }) {
-  const i = j(e) || {}, f = l[e] || {};
-  let u = { ...f, ...i }, h = !1;
-  if (n) {
+  const s = U(e) || {}, f = l[e] || {};
+  let u = { ...f, ...s }, h = !1;
+  if (a) {
     const m = (t, o) => {
       for (const d in o)
         o.hasOwnProperty(d) && (o[d] instanceof Object && !Array.isArray(o[d]) && t[d] instanceof Object ? X(t[d], o[d]) || (m(t[d], o[d]), h = !0) : t[d] !== o[d] && (t[d] = o[d], h = !0));
       return t;
     };
-    u = m(u, n);
+    u = m(u, a);
   }
-  if (u.validation && (n?.validation?.hasOwnProperty("onBlur") || i?.validation?.hasOwnProperty("onBlur") || f?.validation?.hasOwnProperty("onBlur") || (u.validation.onBlur = "error", h = !0)), h) {
+  if (u.validation && (a?.validation?.hasOwnProperty("onBlur") || s?.validation?.hasOwnProperty("onBlur") || f?.validation?.hasOwnProperty("onBlur") || (u.validation.onBlur = "error", h = !0)), h) {
     ye(e, u);
     const m = u.validation?.zodSchemaV4, t = u.validation?.zodSchemaV3;
-    (m !== i?.validation?.zodSchemaV4 || t !== i?.validation?.zodSchemaV3) && (m || t) && (m ? H(e, m, "zod4") : t && H(e, t, "zod3"), U(e));
+    (m !== s?.validation?.zodSchemaV4 || t !== s?.validation?.zodSchemaV3) && (m || t) && (m ? H(e, m, "zod4") : t && H(e, t, "zod3"), N(e));
   }
   return u;
 }
-const bt = (e, n) => {
-  n?.plugins && R.getState().setRegisteredPlugins(n.plugins);
+const bt = (e, a) => {
+  a?.plugins && L.getState().setRegisteredPlugins(a.plugins);
   const l = {};
-  if (n?.plugins)
-    for (const o of n.plugins)
+  if (a?.plugins)
+    for (const o of a.plugins)
       typeof o.initialState == "function" && Object.assign(l, o.initialState());
-  const i = { ...l, ...e }, [f, u] = De(i);
+  const s = { ...l, ...e }, [f, u] = ke(s);
   Object.keys(f).forEach((o) => {
     let d = {};
-    n?.formElements && (d.formElements = n.formElements), d.validation = {
+    a?.formElements && (d.formElements = a.formElements), d.validation = {
       onBlur: "error",
-      ...n?.validation
+      ...a?.validation
     };
-    const $ = j(o), V = $ ? {
+    const $ = U(o), b = $ ? {
       ...$,
-      formElements: n?.formElements,
+      formElements: a?.formElements,
       validation: {
         ...$.validation,
         ...d.validation
       }
     } : d;
-    Object.keys(V).length > 0 && ye(o, V);
+    Object.keys(b).length > 0 && ye(o, b);
   }), Object.keys(f).forEach((o) => {
     K(o, f[o]);
   });
   const h = (o, d) => {
-    const [$] = ne(d?.componentId ?? ae()), V = fe({
+    const [$] = ne(d?.componentId ?? ae()), b = fe({
       stateKey: o,
       options: d,
       initialOptionsPart: u
-    }), T = q(V);
-    T.current = V;
-    const v = C(o, []) || f[o], _ = ct(v, {
+    }), P = x(b);
+    P.current = b;
+    const v = O(o, []) || f[o], j = ct(v, {
       stateKey: o,
       syncUpdate: d?.syncUpdate,
       componentId: $,
@@ -124,23 +124,23 @@ const bt = (e, n) => {
       serverState: d?.serverState
     });
     return re(() => {
-      d && R.getState().setPluginOptionsForState(o, d);
-    }, [o, d]), re(() => (R.getState().registerStateHandler(o, _), () => {
-      R.getState().unregisterStateHandler(o);
-    }), [o, _]), re(() => {
-      const P = j(o)?.validation;
-      P?.zodSchemaV4 ? H(o, P.zodSchemaV4, "zod4") : P?.zodSchemaV3 && H(o, P.zodSchemaV3, "zod3");
-    }), _;
+      d && L.getState().setPluginOptionsForState(o, d);
+    }, [o, d]), re(() => (L.getState().registerStateHandler(o, j), () => {
+      L.getState().unregisterStateHandler(o);
+    }), [o, j]), re(() => {
+      const D = U(o)?.validation;
+      D?.zodSchemaV4 ? H(o, D.zodSchemaV4, "zod4") : D?.zodSchemaV3 && H(o, D.zodSchemaV3, "zod3");
+    }), j;
   };
   function m(o, d) {
     if (fe({ stateKey: o, options: d, initialOptionsPart: u }), d.localStorage && Xe(o, d), d.formElements) {
-      const V = R.getState().registeredPlugins.map((T) => d.formElements.hasOwnProperty(T.name) ? {
-        ...T,
-        formWrapper: d.formElements[T.name]
-      } : T);
-      R.getState().setRegisteredPlugins(V);
+      const b = L.getState().registeredPlugins.map((P) => d.formElements.hasOwnProperty(P.name) ? {
+        ...P,
+        formWrapper: d.formElements[P.name]
+      } : P);
+      L.getState().setRegisteredPlugins(b);
     }
-    U(o);
+    N(o);
   }
   function t(o) {
     Object.keys(f).forEach(($) => {
@@ -152,22 +152,22 @@ const bt = (e, n) => {
     setCogsOptionsByKey: m,
     setCogsOptions: t
   };
-}, Ze = (e, n, l, i, f) => {
+}, Ze = (e, a, l, s, f) => {
   l?.log && console.log(
     "saving to localstorage",
-    n,
+    a,
     l.localStorage?.key,
-    i
+    s
   );
-  const u = L(l?.localStorage?.key) ? l.localStorage?.key(e) : l?.localStorage?.key;
-  if (u && i) {
-    const h = `${i}-${n}-${u}`;
+  const u = W(l?.localStorage?.key) ? l.localStorage?.key(e) : l?.localStorage?.key;
+  if (u && s) {
+    const h = `${s}-${a}-${u}`;
     let m;
     try {
       m = ce(h)?.lastSyncedWithServer;
     } catch {
     }
-    const t = E(n, []), o = {
+    const t = E(a, []), o = {
       state: e,
       lastUpdated: Date.now(),
       lastSyncedWithServer: m,
@@ -182,113 +182,113 @@ const bt = (e, n) => {
 }, ce = (e) => {
   if (!e) return null;
   try {
-    const n = window.localStorage.getItem(e);
-    return n ? JSON.parse(n) : null;
-  } catch (n) {
-    return console.error("Error loading from localStorage:", n), null;
+    const a = window.localStorage.getItem(e);
+    return a ? JSON.parse(a) : null;
+  } catch (a) {
+    return console.error("Error loading from localStorage:", a), null;
   }
 }, de = (e) => {
   if (e)
     try {
       typeof window < "u" && window.localStorage && window.localStorage.removeItem(e);
-    } catch (n) {
-      console.error("Error removing from localStorage:", n);
+    } catch (a) {
+      console.error("Error removing from localStorage:", a);
     }
-}, Xe = (e, n) => {
-  const l = C(e, []), { sessionId: i } = Me(), f = L(n?.localStorage?.key) ? n.localStorage.key(l) : n?.localStorage?.key;
-  if (f && i) {
+}, Xe = (e, a) => {
+  const l = O(e, []), { sessionId: s } = Me(), f = W(a?.localStorage?.key) ? a.localStorage.key(l) : a?.localStorage?.key;
+  if (f && s) {
     const u = ce(
-      `${i}-${e}-${f}`
+      `${s}-${e}-${f}`
     );
     if (u && u.lastUpdated > (u.lastSyncedWithServer || 0))
-      return U(e), !0;
+      return N(e), !0;
   }
   return !1;
-}, U = (e) => {
-  const n = E(e, []);
-  if (!n) return;
+}, N = (e) => {
+  const a = E(e, []);
+  if (!a) return;
   const l = /* @__PURE__ */ new Set();
-  n?.components?.forEach((i) => {
-    (i ? Array.isArray(i.reactiveType) ? i.reactiveType : [i.reactiveType || "component"] : null)?.includes("none") || l.add(() => i.forceUpdate());
+  a?.components?.forEach((s) => {
+    (s ? Array.isArray(s.reactiveType) ? s.reactiveType : [s.reactiveType || "component"] : null)?.includes("none") || l.add(() => s.forceUpdate());
   }), queueMicrotask(() => {
-    l.forEach((i) => i());
+    l.forEach((s) => s());
   });
 };
-function oe(e, n, l, i) {
-  const f = E(e, n);
-  if (W(e, n, {
+function oe(e, a, l, s) {
+  const f = E(e, a);
+  if (B(e, a, {
     ...f,
     isDirty: !1,
     stateSource: "server",
-    lastServerSync: i || Date.now()
+    lastServerSync: s || Date.now()
   }), Array.isArray(l)) {
-    const u = E(e, n);
+    const u = E(e, a);
     u?.arrayKeys && u.arrayKeys.forEach((h, m) => {
-      const t = [...n, h], o = l[m];
+      const t = [...a, h], o = l[m];
       o !== void 0 && oe(
         e,
         t,
         o,
-        i
+        s
       );
     });
   } else l && typeof l == "object" && l.constructor === Object && Object.keys(l).forEach((u) => {
-    const h = [...n, u], m = l[u];
-    oe(e, h, m, i);
+    const h = [...a, u], m = l[u];
+    oe(e, h, m, s);
   });
 }
-let ie = [], ge = !1;
+let se = [], ge = !1;
 function Ke() {
   ge || (ge = !0, queueMicrotask(() => {
-    it();
+    st();
   }));
 }
-function et(e, n) {
-  e?.signals?.length && e.signals.forEach(({ parentId: l, position: i, effect: f }) => {
+function et(e, a) {
+  e?.signals?.length && e.signals.forEach(({ parentId: l, position: s, effect: f }) => {
     const u = document.querySelector(`[data-parent-id="${l}"]`);
     if (!u) return;
     const h = Array.from(u.childNodes);
-    if (!h[i]) return;
-    let m = n;
-    if (f && n !== null)
+    if (!h[s]) return;
+    let m = a;
+    if (f && a !== null)
       try {
         m = new Function("state", `return (${f})(state)`)(
-          n
+          a
         );
       } catch (t) {
         console.error("Error evaluating effect function:", t);
       }
-    m !== null && typeof m == "object" && (m = JSON.stringify(m)), h[i].textContent = String(m ?? "");
+    m !== null && typeof m == "object" && (m = JSON.stringify(m)), h[s].textContent = String(m ?? "");
   });
 }
-function tt(e, n, l) {
-  const i = E(e, []);
-  if (!i?.components)
+function tt(e, a, l) {
+  const s = E(e, []);
+  if (!s?.components)
     return /* @__PURE__ */ new Set();
   const f = /* @__PURE__ */ new Set();
   if (l.type === "update") {
-    let u = [...n];
+    let u = [...a];
     for (; ; ) {
       const h = E(e, u);
       if (h?.pathComponents && h.pathComponents.forEach((m) => {
-        const t = i.components?.get(m);
+        const t = s.components?.get(m);
         t && ((Array.isArray(t.reactiveType) ? t.reactiveType : [t.reactiveType || "component"]).includes("none") || f.add(t));
       }), u.length === 0) break;
       u.pop();
     }
     l.newValue && typeof l.newValue == "object" && !Ce(l.newValue) && _e(l.newValue, l.oldValue).forEach((m) => {
-      const t = m.split("."), o = [...n, ...t], d = E(e, o);
+      const t = m.split("."), o = [...a, ...t], d = E(e, o);
       d?.pathComponents && d.pathComponents.forEach(($) => {
-        const V = i.components?.get($);
-        V && ((Array.isArray(V.reactiveType) ? V.reactiveType : [V.reactiveType || "component"]).includes("none") || f.add(V));
+        const b = s.components?.get($);
+        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 h = [...l.type === "insert" ? n : n.slice(0, -1)];
+    let h = [...l.type === "insert" ? a : a.slice(0, -1)];
     for (; ; ) {
       const m = E(e, h);
       if (m?.pathComponents && m.pathComponents.forEach((t) => {
-        const o = i.components?.get(t);
+        const o = s.components?.get(t);
         o && f.add(o);
       }), h.length === 0) break;
       h.pop();
@@ -296,68 +296,68 @@ function tt(e, n, l) {
   }
   return f;
 }
-function rt(e, n, l) {
-  const i = p.getState().getShadowValue(e, n), f = L(l) ? l(i) : l;
-  if (X(i, f))
+function rt(e, a, l) {
+  const s = M.getState().getShadowValue(e, a), f = W(l) ? l(s) : l;
+  if (X(s, f))
     return null;
-  Le(e, n, f), se(e, n, { bubble: !0 });
-  const u = E(e, n);
+  Le(e, a, f), ie(e, a, { bubble: !0 });
+  const u = E(e, a);
   return {
     type: "update",
-    oldValue: i,
+    oldValue: s,
     newValue: f,
     shadowMeta: u
   };
 }
-function nt(e, n, l) {
-  be(e, n, l), se(e, n, { bubble: !0 });
-  const i = E(e, n);
+function nt(e, a, l) {
+  be(e, a, l), ie(e, a, { bubble: !0 });
+  const s = E(e, a);
   return {
     type: "insert_many",
     count: l.length,
-    shadowMeta: i,
-    path: n
+    shadowMeta: s,
+    path: a
   };
 }
-function at(e, n, l, i, f) {
+function at(e, a, l, s, f) {
   let u;
-  if (L(l)) {
-    const { value: o } = N(e, n);
+  if (W(l)) {
+    const { value: o } = F(e, a);
     u = l({ state: o });
   } else
     u = l;
   const h = We(
     e,
-    n,
+    a,
     u,
-    i,
+    s,
     f
   );
-  se(e, n, { bubble: !0 });
-  const m = E(e, n);
+  ie(e, a, { bubble: !0 });
+  const m = E(e, a);
   let t;
-  return m?.arrayKeys && i !== void 0 && i > 0 && (t = m.arrayKeys[i - 1]), {
+  return m?.arrayKeys && s !== void 0 && s > 0 && (t = m.arrayKeys[s - 1]), {
     type: "insert",
     newValue: u,
     shadowMeta: m,
-    path: n,
+    path: a,
     itemId: h,
     insertAfterId: t
   };
 }
-function ot(e, n) {
-  const l = n.slice(0, -1), i = C(e, n);
-  return Be(e, n), se(e, l, { bubble: !0 }), { type: "cut", oldValue: i, parentPath: l };
+function ot(e, a) {
+  const l = a.slice(0, -1), s = O(e, a);
+  return Be(e, a), ie(e, l, { bubble: !0 }), { type: "cut", oldValue: s, parentPath: l };
 }
-function it() {
-  const e = /* @__PURE__ */ new Set(), n = [], l = [];
-  for (const i of ie) {
-    if (i.status && i.updateType) {
-      l.push(i);
+function st() {
+  const e = /* @__PURE__ */ new Set(), a = [], l = [];
+  for (const s of se) {
+    if (s.status && s.updateType) {
+      l.push(s);
       continue;
     }
-    const f = i, u = f.type === "cut" ? null : f.newValue;
-    f.shadowMeta?.signals?.length > 0 && n.push({ shadowMeta: f.shadowMeta, displayValue: u }), tt(
+    const f = s, u = f.type === "cut" ? null : f.newValue;
+    f.shadowMeta?.signals?.length > 0 && a.push({ shadowMeta: f.shadowMeta, displayValue: u }), tt(
       f.stateKey,
       f.path,
       f
@@ -365,17 +365,17 @@ function it() {
       e.add(m);
     });
   }
-  l.length > 0 && xe(l), n.forEach(({ shadowMeta: i, displayValue: f }) => {
-    et(i, f);
-  }), e.forEach((i) => {
-    i.forceUpdate();
-  }), ie = [], ge = !1;
+  l.length > 0 && xe(l), a.forEach(({ shadowMeta: s, displayValue: f }) => {
+    et(s, f);
+  }), e.forEach((s) => {
+    s.forceUpdate();
+  }), se = [], ge = !1;
 }
-function st(e, n, l) {
+function it(e, a, l) {
   return (f, u, h) => {
-    i(e, u, f, h);
+    s(e, u, f, h);
   };
-  function i(f, u, h, m) {
+  function s(f, u, h, m) {
     let t;
     switch (m.updateType) {
       case "update":
@@ -399,7 +399,7 @@ function st(e, n, l) {
     }
     if (t === null)
       return;
-    t.stateKey = f, t.path = u, ie.push(t), Ke();
+    t.stateKey = f, t.path = u, se.push(t), Ke();
     const o = {
       timeStamp: Date.now(),
       stateKey: f,
@@ -412,18 +412,18 @@ function st(e, n, l) {
       insertAfterId: t.insertAfterId,
       metaData: m.metaData
     };
-    ie.push(o), t.newValue !== void 0 && Ze(
+    se.push(o), t.newValue !== void 0 && Ze(
       t.newValue,
       f,
       l.current,
-      n
+      a
     ), l.current?.middleware && l.current.middleware({ update: o }), ze(o, m.validationTrigger || "programmatic"), Ye(o);
   }
 }
 function ct(e, {
-  stateKey: n,
+  stateKey: a,
   localStorage: l,
-  formElements: i,
+  formElements: s,
   reactiveDeps: f,
   reactiveType: u,
   componentId: h,
@@ -431,68 +431,68 @@ function ct(e, {
   dependencies: t,
   serverState: o
 } = {}) {
-  const [d, $] = ne({}), { sessionId: V } = Me();
-  let T = !n;
-  const [v] = ne(n ?? ae()), _ = q(h ?? ae()), P = q(
+  const [d, $] = ne({}), { sessionId: b } = Me();
+  let P = !a;
+  const [v] = ne(a ?? ae()), j = x(h ?? ae()), D = x(
     null
   );
-  P.current = j(v) ?? null;
-  const x = Ie(
+  D.current = U(v) ?? null;
+  const J = Ie(
     (k) => {
-      const r = k ? { ...j(v), ...k } : j(v), a = r?.defaultState || m || e;
+      const r = k ? { ...U(v), ...k } : U(v), n = r?.defaultState || m || e;
       if (r?.serverState?.status === "success" && r?.serverState?.data !== void 0)
         return {
           value: r.serverState.data,
           source: "server",
           timestamp: r.serverState.timestamp || Date.now()
         };
-      if (r?.localStorage?.key && V) {
-        const S = L(r.localStorage.key) ? r.localStorage.key(a) : r.localStorage.key, s = ce(
-          `${V}-${v}-${S}`
+      if (r?.localStorage?.key && b) {
+        const S = W(r.localStorage.key) ? r.localStorage.key(n) : r.localStorage.key, i = ce(
+          `${b}-${v}-${S}`
         );
-        if (s && s.lastUpdated > (r?.serverState?.timestamp || 0))
+        if (i && i.lastUpdated > (r?.serverState?.timestamp || 0))
           return {
-            value: s.state,
+            value: i.state,
             source: "localStorage",
-            timestamp: s.lastUpdated
+            timestamp: i.lastUpdated
           };
       }
       return {
-        value: a || e,
+        value: n || e,
         source: "default",
         timestamp: Date.now()
       };
     },
-    [v, m, e, V]
+    [v, m, e, b]
   );
   Z(() => {
     o && o.status === "success" && o.data !== void 0 && me(v, o);
-  }, [o, v]), Z(() => p.getState().subscribeToPath(v, (D) => {
-    if (D?.type === "SERVER_STATE_UPDATE") {
-      const r = D.serverState;
+  }, [o, v]), Z(() => M.getState().subscribeToPath(v, (C) => {
+    if (C?.type === "SERVER_STATE_UPDATE") {
+      const r = C.serverState;
       if (r?.status !== "success" || r.data === void 0)
         return;
       ue(v, { serverState: r });
-      const a = typeof r.merge == "object" ? r.merge : r.merge === !0 ? { strategy: "append", key: "id" } : null, c = C(v, []), S = r.data;
-      if (a && a.strategy === "append" && "key" in a && Array.isArray(c) && Array.isArray(S)) {
-        const s = a.key;
-        if (!s) {
+      const n = typeof r.merge == "object" ? r.merge : r.merge === !0 ? { strategy: "append", key: "id" } : null, c = O(v, []), S = r.data;
+      if (n && n.strategy === "append" && "key" in n && Array.isArray(c) && Array.isArray(S)) {
+        const i = n.key;
+        if (!i) {
           console.error(
             "CogsState: Merge strategy 'append' requires a 'key' field."
           );
           return;
         }
         const y = new Set(
-          c.map((M) => M[s])
+          c.map((A) => A[i])
         ), w = S.filter(
-          (M) => !y.has(M[s])
+          (A) => !y.has(A[i])
         );
         w.length > 0 && be(v, [], w);
-        const A = C(v, []);
+        const p = O(v, []);
         oe(
           v,
           [],
-          A,
+          p,
           r.timestamp || Date.now()
         );
       } else
@@ -502,151 +502,151 @@ function ct(e, {
           S,
           r.timestamp || Date.now()
         );
-      U(v);
+      N(v);
     }
   }), [v]), Z(() => {
-    const k = p.getState().getShadowMetadata(v, []);
+    const k = M.getState().getShadowMetadata(v, []);
     if (k && k.stateSource)
       return;
-    const D = j(v), r = {
-      localStorageEnabled: !!D?.localStorage?.key
+    const C = U(v), r = {
+      localStorageEnabled: !!C?.localStorage?.key
     };
-    if (W(v, [], {
+    if (B(v, [], {
       ...k,
       features: r
-    }), D?.defaultState !== void 0 || m !== void 0) {
-      const y = D?.defaultState || m;
-      D?.defaultState || ue(v, {
+    }), C?.defaultState !== void 0 || m !== void 0) {
+      const y = C?.defaultState || m;
+      C?.defaultState || ue(v, {
         defaultState: y
       });
     }
-    const { value: a, source: c, timestamp: S } = x();
-    K(v, a);
-    const s = j(v)?.validation;
-    s?.zodSchemaV4 ? H(v, s.zodSchemaV4, "zod4") : s?.zodSchemaV3 && H(v, s.zodSchemaV3, "zod3"), W(v, [], {
+    const { value: n, source: c, timestamp: S } = J();
+    K(v, n);
+    const i = U(v)?.validation;
+    i?.zodSchemaV4 ? H(v, i.zodSchemaV4, "zod4") : i?.zodSchemaV3 && H(v, i.zodSchemaV3, "zod3"), B(v, [], {
       stateSource: c,
       lastServerSync: c === "server" ? S : void 0,
       isDirty: c === "server" ? !1 : void 0,
-      baseServerState: c === "server" ? a : void 0
-    }), c === "server" && o && me(v, o), U(v);
+      baseServerState: c === "server" ? n : void 0
+    }), c === "server" && o && me(v, o), N(v);
   }, [v, ...t || []]), re(() => {
-    T && ue(v, {
-      formElements: i,
+    P && ue(v, {
+      formElements: s,
       defaultState: m,
       localStorage: l,
-      middleware: P.current?.middleware
+      middleware: D.current?.middleware
     });
-    const k = `${v}////${_.current}`, D = E(v, []), r = D?.components || /* @__PURE__ */ new Map();
+    const k = `${v}////${j.current}`, C = E(v, []), r = C?.components || /* @__PURE__ */ new Map();
     return r.set(k, {
       forceUpdate: () => $({}),
       reactiveType: u ?? ["component"],
       paths: /* @__PURE__ */ new Set(),
       depsFunction: f || void 0,
-      deps: f ? f(C(v, [])) : [],
-      prevDeps: f ? f(C(v, [])) : []
-    }), W(v, [], {
-      ...D,
+      deps: f ? f(O(v, [])) : [],
+      prevDeps: f ? f(O(v, [])) : []
+    }), B(v, [], {
+      ...C,
       components: r
     }), $({}), () => {
-      const a = E(v, []), c = a?.components?.get(k);
+      const n = E(v, []), c = n?.components?.get(k);
       c?.paths && c.paths.forEach((S) => {
-        const y = S.split(".").slice(1), w = p.getState().getShadowMetadata(v, y);
-        w?.pathComponents && w.pathComponents.size === 0 && (delete w.pathComponents, p.getState().setShadowMetadata(v, y, w));
-      }), a?.components && W(v, [], a);
+        const y = S.split(".").slice(1), w = M.getState().getShadowMetadata(v, y);
+        w?.pathComponents && w.pathComponents.size === 0 && (delete w.pathComponents, M.getState().setShadowMetadata(v, y, w));
+      }), n?.components && B(v, [], n);
     };
   }, []);
-  const G = st(
+  const q = it(
     v,
-    V,
-    P
+    b,
+    D
   );
-  return p.getState().initialStateGlobal[v] || Ve(v, e), Ae(() => Te(
+  return M.getState().initialStateGlobal[v] || Ve(v, e), pe(() => Te(
     v,
-    G,
-    _.current,
-    V
-  ), [v, V]);
+    q,
+    j.current,
+    b
+  ), [v, b]);
 }
-const lt = (e, n, l) => {
-  let i = E(e, n)?.arrayKeys || [];
+const lt = (e, a, l) => {
+  let s = E(e, a)?.arrayKeys || [];
   const f = l?.transforms;
   if (!f || f.length === 0)
-    return i;
+    return s;
   for (const u of f)
     if (u.type === "filter") {
       const h = [];
-      i.forEach((m, t) => {
-        const o = C(e, [...n, m]);
+      s.forEach((m, t) => {
+        const o = O(e, [...a, m]);
         u.fn(o, t) && h.push(m);
-      }), i = h;
-    } else u.type === "sort" && i.sort((h, m) => {
-      const t = C(e, [...n, h]), o = C(e, [...n, m]);
+      }), s = h;
+    } else u.type === "sort" && s.sort((h, m) => {
+      const t = O(e, [...a, h]), o = O(e, [...a, m]);
       return u.fn(t, o);
     });
-  return i;
-}, te = (e, n, l) => {
-  const i = `${e}////${n}`, u = E(e, [])?.components?.get(i);
-  !u || u.reactiveType === "none" || !(Array.isArray(u.reactiveType) ? u.reactiveType : [u.reactiveType]).includes("component") || Ge(e, l, i);
-}, Y = (e, n, l) => {
-  const i = E(e, []), f = /* @__PURE__ */ new Set();
-  i?.components && i.components.forEach((h, m) => {
+  return s;
+}, te = (e, a, l) => {
+  const s = `${e}////${a}`, u = E(e, [])?.components?.get(s);
+  !u || u.reactiveType === "none" || !(Array.isArray(u.reactiveType) ? u.reactiveType : [u.reactiveType]).includes("component") || Ge(e, l, s);
+}, Y = (e, a, l) => {
+  const s = E(e, []), f = /* @__PURE__ */ new Set();
+  s?.components && s.components.forEach((h, m) => {
     (Array.isArray(h.reactiveType) ? h.reactiveType : [h.reactiveType || "component"]).includes("all") && (h.forceUpdate(), f.add(m));
   }), E(e, [
-    ...n,
+    ...a,
     "getSelected"
   ])?.pathComponents?.forEach((h) => {
-    i?.components?.get(h)?.forceUpdate();
+    s?.components?.get(h)?.forceUpdate();
   });
-  const u = E(e, n);
+  const u = E(e, a);
   for (let h of u?.arrayKeys || []) {
     const m = h + ".selected", t = E(e, m.split(".").slice(1));
     h == l && t?.pathComponents?.forEach((o) => {
-      i?.components?.get(o)?.forceUpdate();
+      s?.components?.get(o)?.forceUpdate();
     });
   }
 };
-function N(e, n, l) {
-  const i = E(e, n), f = n.length > 0 ? n.join(".") : "root", u = l?.arrayViews?.[f];
+function F(e, a, l) {
+  const s = E(e, a), f = a.length > 0 ? a.join(".") : "root", u = l?.arrayViews?.[f];
   if (Array.isArray(u) && u.length === 0)
     return {
-      shadowMeta: i,
+      shadowMeta: s,
       value: [],
-      arrayKeys: i?.arrayKeys
+      arrayKeys: s?.arrayKeys
     };
-  const h = C(e, n, u);
+  const h = O(e, a, u);
   return {
-    shadowMeta: i,
+    shadowMeta: s,
     value: h,
-    arrayKeys: i?.arrayKeys
+    arrayKeys: s?.arrayKeys
   };
 }
-function ut(e, n) {
-  return n ? e.length !== n.length ? !1 : n.every((l, i) => l === "*" || l === e[i]) : !0;
+function ut(e, a) {
+  return a ? e.length !== a.length ? !1 : a.every((l, s) => l === "*" || l === e[s]) : !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 dt(e, a) {
+  return a === "any" ? !0 : a === "array" ? Array.isArray(e) : a === "boolean" ? typeof e == "boolean" : a === "object" ? e !== null && typeof e == "object" && !Array.isArray(e) : a === "primitive" ? e === null || typeof e != "object" && !Array.isArray(e) : !1;
 }
-function Ee(e, n) {
-  const l = p.getState().getShadowMetadata(e, n);
+function Ee(e, a) {
+  const l = M.getState().getShadowMetadata(e, a);
   if (!l?.clientActivityState?.elements) return [];
-  const i = [];
+  const s = [];
   return l.clientActivityState.elements.forEach((f) => {
-    f.domRef?.current && i.push(f.domRef);
-  }), i;
+    f.domRef?.current && s.push(f.domRef);
+  }), s;
 }
-function $e(e, n) {
-  return Ee(e, n).map((i) => i.current).filter(Boolean);
+function $e(e, a) {
+  return Ee(e, a).map((s) => s.current).filter(Boolean);
 }
-function ft(e, n, l) {
-  $e(e, n).forEach((i) => {
-    if ("disabled" in i) {
-      i.disabled = l;
+function ft(e, a, l) {
+  $e(e, a).forEach((s) => {
+    if ("disabled" in s) {
+      s.disabled = l;
       return;
     }
-    i.style.pointerEvents = l ? "none" : "", i.setAttribute("aria-disabled", String(l));
+    s.style.pointerEvents = l ? "none" : "", s.setAttribute("aria-disabled", String(l));
   });
 }
-function Te(e, n, l, i) {
+function Te(e, a, l, s) {
   const f = /* @__PURE__ */ new Map();
   function u({
     path: t = [],
@@ -654,88 +654,88 @@ function Te(e, n, l, i) {
     componentId: d
   }) {
     if (E(e, t)?.isRaw)
-      return C(e, t);
-    const V = o ? JSON.stringify(o.arrayViews || o.transforms) : "", T = t.join(".") + ":" + d + ":" + V;
-    if (f.has(T))
-      return f.get(T);
-    const v = [e, ...t].join("."), _ = () => {
-    }, P = {
-      apply(G, g, k) {
+      return O(e, t);
+    const b = o ? JSON.stringify(o.arrayViews || o.transforms) : "", P = t.join(".") + ":" + d + ":" + b;
+    if (f.has(P))
+      return f.get(P);
+    const v = [e, ...t].join("."), j = () => {
+    }, D = {
+      apply(q, g, k) {
         if (k.length === 0) {
-          const r = t.length > 0 ? t.join(".") : "root", a = o?.arrayViews?.[r];
-          return te(e, d, t), C(e, t, a);
+          const r = t.length > 0 ? t.join(".") : "root", n = o?.arrayViews?.[r];
+          return te(e, d, t), O(e, t, n);
         }
-        const D = k[0];
-        return n(D, t, { updateType: "update" }), !0;
+        const C = k[0];
+        return a(C, t, { updateType: "update" }), !0;
       },
-      get(G, g, k) {
+      get(q, 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 } = N(e, t, o);
+          const { value: r } = F(e, t, o);
           return Array.isArray(r) ? function* () {
-            for (let a = 0; a < r.length; a++)
-              yield r[a];
+            for (let n = 0; n < r.length; n++)
+              yield r[n];
           } : void 0;
         }
         if (g === "call" || g === "apply" || g === "bind")
-          return Reflect.get(G, g, k);
+          return Reflect.get(q, g, k);
         if (typeof g != "string")
-          return Reflect.get(G, g);
+          return Reflect.get(q, g);
         if (t.length === 0 && g in h)
           return h[g];
         if (typeof g == "string" && !g.startsWith("$")) {
-          const { value: r } = N(e, t, o);
+          const { value: r } = F(e, t, o);
           if (r !== null && typeof r == "object" && !Array.isArray(r) && Object.prototype.hasOwnProperty.call(r, g)) {
-            const s = [...t, g];
+            const i = [...t, g];
             return u({
-              path: s,
+              path: i,
               componentId: d,
               meta: o
             });
           }
-          const c = R.getState().registeredPlugins;
-          for (const s of c) {
-            const y = s.chainMethods?.[g];
+          const c = L.getState().registeredPlugins;
+          for (const i of c) {
+            const y = i.chainMethods?.[g];
             if (y && ut(t, y.pathPattern) && dt(r, y.target))
               return (...w) => {
-                const A = R.getState(), M = A.pluginOptions.get(e)?.get(s.name), I = A.getHookResult(e, s.name);
+                const p = L.getState(), A = p.pluginOptions.get(e)?.get(i.name), T = p.getHookResult(e, i.name);
                 return y.handler(
                   {
                     stateKey: e,
                     path: t,
-                    pluginName: s.name,
-                    options: M,
-                    hookData: I,
-                    $get: () => N(e, t, o).value,
-                    $update: (b) => (n(b, t, {
+                    pluginName: i.name,
+                    options: A,
+                    hookData: T,
+                    $get: () => F(e, t, o).value,
+                    $update: (V) => (a(V, t, {
                       updateType: "update"
                     }), {
                       synced: () => {
-                        const O = p.getState().getShadowMetadata(e, t);
-                        W(e, t, {
-                          ...O,
+                        const _ = M.getState().getShadowMetadata(e, t);
+                        B(e, t, {
+                          ..._,
                           isDirty: !1,
                           stateSource: "server",
                           lastServerSync: Date.now()
                         });
                       }
                     }),
-                    $applyOperation: (b, O) => {
-                      n(b.newValue, b.path, {
-                        updateType: b.updateType,
-                        itemId: b.itemId,
-                        metaData: O
+                    $applyOperation: (V, _) => {
+                      a(V.newValue, V.path, {
+                        updateType: V.updateType,
+                        itemId: V.itemId,
+                        metaData: _
                       });
                     },
-                    getFieldMetaData: () => he(e, t)?.get(s.name),
-                    setFieldMetaData: (b) => ve(e, t, s.name, b),
-                    removeFieldMetaData: () => we(e, t, s.name),
+                    getFieldMetaData: () => he(e, t)?.get(i.name),
+                    setFieldMetaData: (V) => ve(e, t, i.name, V),
+                    removeFieldMetaData: () => we(e, t, i.name),
                     getFieldRefs: () => Ee(e, t),
                     getFieldElements: () => $e(e, t),
-                    setFieldDisabled: (b) => ft(e, t, b)
+                    setFieldDisabled: (V) => ft(e, t, V)
                   },
                   ...w
                 );
@@ -752,55 +752,97 @@ function Te(e, n, l, i) {
           return u;
         if (g === "$sync" && t.length === 0)
           return async function() {
-            const r = p.getState().getInitialOptions(e), a = r?.sync;
-            if (!a)
+            const r = M.getState().getInitialOptions(e), n = r?.sync;
+            if (!n)
               return console.error(`No mutation defined for state key "${e}"`), { success: !1, error: "No mutation defined" };
-            const c = p.getState().getShadowValue(e, []), S = r?.validation?.key;
+            const c = M.getState().getShadowValue(e, []), S = r?.validation?.key;
             try {
-              const s = await a.action(c);
-              if (s && !s.success && s.errors, s?.success) {
-                const y = p.getState().getShadowMetadata(e, []);
-                W(e, [], {
+              const i = await n.action(c);
+              if (i && !i.success && i.errors, i?.success) {
+                const y = M.getState().getShadowMetadata(e, []);
+                B(e, [], {
                   ...y,
                   isDirty: !1,
                   lastServerSync: Date.now(),
                   stateSource: "server",
                   baseServerState: c
                   // Update base server state
-                }), a.onSuccess && a.onSuccess(s.data);
-              } else !s?.success && a.onError && a.onError(s.error);
-              return s;
-            } catch (s) {
-              return a.onError && a.onError(s), { success: !1, error: s };
+                }), n.onSuccess && n.onSuccess(i.data);
+              } else !i?.success && n.onError && n.onError(i.error);
+              return i;
+            } catch (i) {
+              return n.onError && n.onError(i), { success: !1, error: i };
             }
           };
         if (g === "$_status" || g === "$getStatus") {
           const r = () => {
-            const { shadowMeta: a, value: c } = N(e, t, o);
-            return a?.isDirty === !0 ? "dirty" : a?.stateSource === "server" || a?.isDirty === !1 ? "synced" : a?.stateSource === "localStorage" ? "restored" : a?.stateSource === "default" || c !== void 0 ? "fresh" : "unknown";
+            const { shadowMeta: n, value: c } = F(e, t, o);
+            return n?.isDirty === !0 ? "dirty" : n?.stateSource === "server" || n?.isDirty === !1 ? "synced" : n?.stateSource === "localStorage" ? "restored" : n?.stateSource === "default" || c !== void 0 ? "fresh" : "unknown";
           };
           return g === "$_status" ? r() : r;
         }
         if (g === "$removeStorage")
           return () => {
-            const r = p.getState().initialStateGlobal[e], a = j(e), c = L(a?.localStorage?.key) ? a.localStorage.key(r) : a?.localStorage?.key, S = i && c ? `${i}-${e}-${c}` : void 0;
+            const r = M.getState().initialStateGlobal[e], n = U(e), c = W(n?.localStorage?.key) ? n.localStorage.key(r) : n?.localStorage?.key, S = s && c ? `${s}-${e}-${c}` : void 0;
             de(S);
           };
         if (g === "$setRaw")
           return (r) => {
-            const a = E(e, t) || {};
-            W(e, t, { ...a, isRaw: !0 }), n(r, t, { updateType: "update" });
+            const n = E(e, t) || {};
+            B(e, t, { ...n, isRaw: !0 }), a(r, t, { updateType: "update" });
           };
         if (g === "$validate")
-          return () => {
-            const r = p.getState(), { value: a } = N(e, t, o), c = r.getInitialOptions(e), S = c?.validation?.zodSchemaV4 || c?.validation?.zodSchemaV3;
-            if (!S)
-              return { success: !0, data: a };
-            const s = S.safeParse(a);
-            if (s.success) {
-              const y = r.getShadowMetadata(e, t) || {};
-              r.setShadowMetadata(e, t, {
-                ...y,
+          return (r) => {
+            const n = M.getState();
+            if (r) {
+              const w = r.map((p) => {
+                const A = [...t, p], T = n.getShadowValue(e, A), V = n.getShadowMetadata(e, A) || {}, _ = V.typeInfo?.schema;
+                if (!_)
+                  return {
+                    key: p,
+                    path: A,
+                    success: !0,
+                    data: T
+                  };
+                const I = _.safeParse(T), R = I.error?.issues || I.error?.errors || [];
+                return n.setShadowMetadata(e, A, {
+                  ...V,
+                  validation: {
+                    status: I.success ? "VALID" : "INVALID",
+                    errors: I.success ? [] : [
+                      {
+                        source: "client",
+                        message: R[0]?.message || "Invalid value",
+                        severity: "error",
+                        code: R[0]?.code
+                      }
+                    ],
+                    lastValidated: Date.now(),
+                    validatedValue: T
+                  }
+                }), n.notifyPathSubscribers([e, ...A].join("."), {
+                  type: "VALIDATION_UPDATE"
+                }), {
+                  key: p,
+                  path: A,
+                  success: I.success,
+                  data: I.success ? I.data : void 0,
+                  error: I.success ? void 0 : I.error
+                };
+              });
+              return N(e), {
+                success: w.every((p) => p.success),
+                results: w
+              };
+            }
+            const { value: c } = F(e, t, o), S = n.getInitialOptions(e), i = S?.validation?.zodSchemaV4 || S?.validation?.zodSchemaV3;
+            if (!i)
+              return { success: !0, data: c };
+            const y = i.safeParse(c);
+            if (y.success) {
+              const w = n.getShadowMetadata(e, t) || {};
+              n.setShadowMetadata(e, t, {
+                ...w,
                 validation: {
                   status: "VALID",
                   errors: [],
@@ -808,57 +850,57 @@ function Te(e, n, l, i) {
                 }
               });
             } else
-              (s.error?.issues || s.error?.errors || []).forEach((w) => {
-                const A = [...t, ...w.path.map(String)], M = r.getShadowMetadata(e, A) || {};
-                r.setShadowMetadata(e, A, {
-                  ...M,
+              (y.error?.issues || y.error?.errors || []).forEach((p) => {
+                const A = [...t, ...p.path.map(String)], T = n.getShadowMetadata(e, A) || {};
+                n.setShadowMetadata(e, A, {
+                  ...T,
                   validation: {
                     status: "INVALID",
                     errors: [
                       {
                         source: "client",
-                        message: w.message,
+                        message: p.message,
                         severity: "error",
-                        code: w.code
+                        code: p.code
                       }
                     ],
                     lastValidated: Date.now(),
-                    validatedValue: r.getShadowValue(e, A)
+                    validatedValue: n.getShadowValue(e, A)
                   }
                 });
               });
-            return U(e), s;
+            return N(e), y;
           };
         if (g === "$showValidationErrors")
           return () => {
-            const { shadowMeta: r } = N(e, t, o);
-            return r?.validation?.status === "INVALID" && r.validation.errors.length > 0 ? r.validation.errors.filter((a) => a.severity === "error").map((a) => a.message) : [];
+            const { shadowMeta: r } = F(e, t, o);
+            return r?.validation?.status === "INVALID" && r.validation.errors.length > 0 ? r.validation.errors.filter((n) => n.severity === "error").map((n) => n.message) : [];
           };
         if (g === "$validationErrors")
           return (r) => {
-            const a = p.getState(), c = (s) => {
-              const y = a.getShadowMetadata(e, s)?.validation, w = (y?.errors || []).map((b) => ({
-                ...b,
-                path: s
-              })), A = w.filter((b) => b.severity === "error"), M = w.filter(
-                (b) => b.severity === "warning"
-              ), I = A.length > 0 ? "error" : M.length > 0 ? "warning" : void 0;
+            const n = M.getState(), c = (i) => {
+              const y = n.getShadowMetadata(e, i)?.validation, w = (y?.errors || []).map((V) => ({
+                ...V,
+                path: i
+              })), p = w.filter((V) => V.severity === "error"), A = w.filter(
+                (V) => V.severity === "warning"
+              ), T = p.length > 0 ? "error" : A.length > 0 ? "warning" : void 0;
               return {
                 status: y?.status || "NOT_VALIDATED",
-                severity: I,
-                hasErrors: A.length > 0,
-                hasWarnings: M.length > 0,
-                message: A[0]?.message || M[0]?.message || "",
-                errors: A.map((b) => b.message),
-                warnings: M.map((b) => b.message),
+                severity: T,
+                hasErrors: p.length > 0,
+                hasWarnings: A.length > 0,
+                message: p[0]?.message || A[0]?.message || "",
+                errors: p.map((V) => V.message),
+                warnings: A.map((V) => V.message),
                 allErrors: w,
-                path: s,
-                getData: () => a.getShadowValue(e, s)
+                path: i,
+                getData: () => n.getShadowValue(e, i)
               };
             };
-            return (r ?? Object.keys(a.getShadowNode(e, t) ?? {}).filter(
-              (s) => s !== "_meta"
-            )).map((s) => c([...t, s]));
+            return (r ?? Object.keys(n.getShadowNode(e, t) ?? {}).filter(
+              (i) => i !== "_meta"
+            )).map((i) => c([...t, i]));
           };
         if (g === "$getSelected")
           return () => {
@@ -867,16 +909,16 @@ function Te(e, n, l, i) {
               ...t,
               "getSelected"
             ]);
-            const a = p.getState().selectedIndicesMap.get(r);
-            if (!a)
+            const n = M.getState().selectedIndicesMap.get(r);
+            if (!n)
               return;
-            const c = t.join("."), S = o?.arrayViews?.[c], s = a.split(".").pop();
-            if (!(S && !S.includes(s) || C(
+            const c = t.join("."), S = o?.arrayViews?.[c], i = n.split(".").pop();
+            if (!(S && !S.includes(i) || O(
               e,
-              a.split(".").slice(1)
+              n.split(".").slice(1)
             ) === void 0))
               return u({
-                path: a.split(".").slice(1),
+                path: n.split(".").slice(1),
                 componentId: d,
                 meta: o
               });
@@ -885,13 +927,13 @@ function Te(e, n, l, i) {
           return () => {
             const r = e + "." + t.join(".");
             t.join(".");
-            const a = p.getState().selectedIndicesMap.get(r);
-            if (!a)
+            const n = M.getState().selectedIndicesMap.get(r);
+            if (!n)
               return -1;
-            const { keys: c } = F(e, t, o);
+            const { keys: c } = z(e, t, o);
             if (!c)
               return -1;
-            const S = a.split(".").pop();
+            const S = n.split(".").pop();
             return c.indexOf(S);
           };
         if (g === "$clearSelected")
@@ -902,44 +944,44 @@ function Te(e, n, l, i) {
           };
         if (g === "$map")
           return (r) => {
-            const { value: a, keys: c } = F(
+            const { value: n, keys: c } = z(
               e,
               t,
               o
             );
-            if (te(e, d, t), !c || !Array.isArray(a))
+            if (te(e, d, t), !c || !Array.isArray(n))
               return [];
             const S = u({
               path: t,
               componentId: d,
               meta: o
             });
-            return a.map((s, y) => {
+            return n.map((i, y) => {
               const w = c[y];
               if (!w) return;
-              const A = [...t, w], M = u({
-                path: A,
+              const p = [...t, w], A = u({
+                path: p,
                 // This now correctly points to the item in the shadow store.
                 componentId: d,
                 meta: o
               });
-              return r(M, y, S);
+              return r(A, y, S);
             });
           };
         if (g === "$filter")
           return (r) => {
-            const a = t.length > 0 ? t.join(".") : "root", { keys: c, value: S } = F(
+            const n = t.length > 0 ? t.join(".") : "root", { keys: c, value: S } = z(
               e,
               t,
               o
             );
             if (!Array.isArray(S))
               throw new Error("filter can only be used on arrays");
-            const s = [];
+            const i = [];
             return S.forEach((y, w) => {
               if (r(y, w)) {
-                const A = c[w];
-                A && s.push(A);
+                const p = c[w];
+                p && i.push(p);
               }
             }), u({
               path: t,
@@ -948,7 +990,7 @@ function Te(e, n, l, i) {
                 ...o,
                 arrayViews: {
                   ...o?.arrayViews || {},
-                  [a]: s
+                  [n]: i
                 },
                 transforms: [
                   ...o?.transforms || [],
@@ -959,19 +1001,19 @@ function Te(e, n, l, i) {
           };
         if (g === "$sort")
           return (r) => {
-            const a = t.length > 0 ? t.join(".") : "root", { value: c, keys: S } = F(
+            const n = t.length > 0 ? t.join(".") : "root", { value: c, keys: S } = z(
               e,
               t,
               o
             );
             if (!Array.isArray(c) || !S)
               throw new Error("No array keys found for sorting");
-            const s = c.map((w, A) => ({
+            const i = c.map((w, p) => ({
               item: w,
-              key: S[A]
+              key: S[p]
             }));
-            s.sort((w, A) => r(w.item, A.item));
-            const y = s.map((w) => w.key);
+            i.sort((w, p) => r(w.item, p.item));
+            const y = i.map((w) => w.key);
             return u({
               path: t,
               componentId: d,
@@ -979,7 +1021,7 @@ function Te(e, n, l, i) {
                 ...o,
                 arrayViews: {
                   ...o?.arrayViews || {},
-                  [a]: y
+                  [n]: y
                 },
                 transforms: [
                   ...o?.transforms || [],
@@ -990,60 +1032,60 @@ function Te(e, n, l, i) {
           };
         if (g === "$list")
           return (r) => /* @__PURE__ */ Q(() => {
-            const c = q(/* @__PURE__ */ new Map()), [S, s] = ne({}), y = t.length > 0 ? t.join(".") : "root", w = lt(e, t, o), A = Ae(() => ({
+            const c = x(/* @__PURE__ */ new Map()), [S, i] = ne({}), y = t.length > 0 ? t.join(".") : "root", w = lt(e, t, o), p = pe(() => ({
               ...o,
               arrayViews: {
                 ...o?.arrayViews || {},
                 [y]: w
               }
-            }), [o, y, w]), { value: M } = F(
+            }), [o, y, w]), { value: A } = z(
               e,
               t,
-              A
+              p
             );
             if (Z(() => {
-              const O = p.getState().subscribeToPath(v, (z) => {
-                if (z.type === "GET_SELECTED")
+              const _ = M.getState().subscribeToPath(v, (I) => {
+                if (I.type === "GET_SELECTED")
                   return;
-                const B = p.getState().getShadowMetadata(e, t)?.transformCaches;
-                if (B)
-                  for (const ee of B.keys())
-                    ee.startsWith(d) && B.delete(ee);
-                (z.type === "INSERT" || z.type === "INSERT_MANY" || z.type === "REMOVE" || z.type === "CLEAR_SELECTION" || z.type === "SERVER_STATE_UPDATE" && !o?.serverStateIsUpStream) && s({});
+                const G = M.getState().getShadowMetadata(e, t)?.transformCaches;
+                if (G)
+                  for (const ee of G.keys())
+                    ee.startsWith(d) && G.delete(ee);
+                (I.type === "INSERT" || I.type === "INSERT_MANY" || I.type === "REMOVE" || I.type === "CLEAR_SELECTION" || I.type === "SERVER_STATE_UPDATE" && !o?.serverStateIsUpStream) && i({});
               });
               return () => {
-                O();
+                _();
               };
-            }, [d, v]), !Array.isArray(M))
+            }, [d, v]), !Array.isArray(A))
               return null;
-            const I = u({
+            const T = u({
               path: t,
               componentId: d,
-              meta: A
+              meta: p
               // Use updated meta here
-            }), b = M.map((O, z) => {
-              const J = w[z];
-              if (!J)
+            }), V = A.map((_, I) => {
+              const R = w[I];
+              if (!R)
                 return null;
-              let B = c.current.get(J);
-              B || (B = ae(), c.current.set(J, B));
-              const ee = [...t, J];
+              let G = c.current.get(R);
+              G || (G = ae(), c.current.set(R, G));
+              const ee = [...t, R];
               return Se(Ue, {
-                key: J,
+                key: R,
                 stateKey: e,
-                itemComponentId: B,
+                itemComponentId: G,
                 itemPath: ee,
-                localIndex: z,
-                arraySetter: I,
+                localIndex: I,
+                arraySetter: T,
                 rebuildStateShape: u,
                 renderFn: r
               });
             });
-            return /* @__PURE__ */ Q(Pe, { children: b });
+            return /* @__PURE__ */ Q(Pe, { children: V });
           }, {});
         if (g === "$stateFlattenOn")
           return (r) => {
-            const a = t.length > 0 ? t.join(".") : "root", c = o?.arrayViews?.[a], S = p.getState().getShadowValue(e, t, c);
+            const n = t.length > 0 ? t.join(".") : "root", c = o?.arrayViews?.[n], S = M.getState().getShadowValue(e, t, c);
             return Array.isArray(S) ? u({
               path: [...t, "[*]", r],
               componentId: d,
@@ -1052,7 +1094,7 @@ function Te(e, n, l, i) {
           };
         if (g === "$index")
           return (r) => {
-            const a = t.length > 0 ? t.join(".") : "root", c = o?.arrayViews?.[a];
+            const n = t.length > 0 ? t.join(".") : "root", c = o?.arrayViews?.[n];
             if (c) {
               const y = c[r];
               return y ? u({
@@ -1063,23 +1105,23 @@ function Te(e, n, l, i) {
             }
             const S = E(e, t);
             if (!S?.arrayKeys) return;
-            const s = S.arrayKeys[r];
-            if (s)
+            const i = S.arrayKeys[r];
+            if (i)
               return u({
-                path: [...t, s],
+                path: [...t, i],
                 componentId: d,
                 meta: o
               });
           };
         if (g === "$last")
           return () => {
-            const { keys: r } = F(e, t, o);
+            const { keys: r } = z(e, t, o);
             if (!r || r.length === 0)
               return;
-            const a = r[r.length - 1];
-            if (!a)
+            const n = r[r.length - 1];
+            if (!n)
               return;
-            const c = [...t, a];
+            const c = [...t, n];
             return u({
               path: c,
               componentId: d,
@@ -1087,109 +1129,109 @@ function Te(e, n, l, i) {
             });
           };
         if (g === "$insert")
-          return (r, a) => {
-            n(r, t, {
+          return (r, n) => {
+            a(r, t, {
               updateType: "insert",
-              index: a
+              index: n
             });
           };
         if (g === "$insertMany")
           return (r) => {
-            n(r, t, {
+            a(r, t, {
               updateType: "insert_many"
             });
           };
         if (g === "$uniqueInsert")
-          return (r, a, c) => {
-            const { value: S } = N(
+          return (r, n, c) => {
+            const { value: S } = F(
               e,
               t,
               o
-            ), s = L(r) ? r(S) : r;
+            ), i = W(r) ? r(S) : r;
             let y = null;
-            if (!S.some((A) => {
-              const M = a ? a.every(
-                (I) => X(A[I], s[I])
-              ) : X(A, s);
-              return M && (y = A), M;
+            if (!S.some((p) => {
+              const A = n ? n.every(
+                (T) => X(p[T], i[T])
+              ) : X(p, i);
+              return A && (y = p), A;
             }))
-              n(s, t, { updateType: "insert" });
+              a(i, t, { updateType: "insert" });
             else if (c && y) {
-              const A = c(y), M = S.map(
-                (I) => X(I, y) ? A : I
+              const p = c(y), A = S.map(
+                (T) => X(T, y) ? p : T
               );
-              n(M, t, {
+              a(A, t, {
                 updateType: "update"
               });
             }
           };
         if (g === "$cut")
-          return (r, a) => {
+          return (r, n) => {
             const c = E(e, t);
             if (!c?.arrayKeys || c.arrayKeys.length === 0)
               return;
-            const S = r === -1 ? c.arrayKeys.length - 1 : r !== void 0 ? r : c.arrayKeys.length - 1, s = c.arrayKeys[S];
-            s && n(null, [...t, s], {
+            const S = r === -1 ? c.arrayKeys.length - 1 : r !== void 0 ? r : c.arrayKeys.length - 1, i = c.arrayKeys[S];
+            i && a(null, [...t, i], {
               updateType: "cut"
             });
           };
         if (g === "$cutSelected")
           return () => {
-            const r = [e, ...t].join("."), { keys: a } = F(e, t, o);
-            if (!a || a.length === 0)
+            const r = [e, ...t].join("."), { keys: n } = z(e, t, o);
+            if (!n || n.length === 0)
               return;
-            const c = p.getState().selectedIndicesMap.get(r);
+            const c = M.getState().selectedIndicesMap.get(r);
             if (!c)
               return;
             const S = c.split(".").pop();
-            if (!a.includes(S))
+            if (!n.includes(S))
               return;
-            const s = c.split(".").slice(1);
-            p.getState().clearSelectedIndex({ arrayKey: r });
-            const y = s.slice(0, -1);
-            Y(e, y), n(null, s, {
+            const i = c.split(".").slice(1);
+            M.getState().clearSelectedIndex({ arrayKey: r });
+            const y = i.slice(0, -1);
+            Y(e, y), a(null, i, {
               updateType: "cut"
             });
           };
         if (g === "$cutByValue")
           return (r) => {
             const {
-              isArray: a,
+              isArray: n,
               value: c,
               keys: S
-            } = F(e, t, o);
-            if (!a) return;
-            const s = le(c, S, (y) => y === r);
-            s && n(null, [...t, s.key], {
+            } = z(e, t, o);
+            if (!n) return;
+            const i = le(c, S, (y) => y === r);
+            i && a(null, [...t, i.key], {
               updateType: "cut"
             });
           };
         if (g === "$toggleByValue")
           return (r) => {
             const {
-              isArray: a,
+              isArray: n,
               value: c,
               keys: S
-            } = F(e, t, o);
-            if (!a) return;
-            const s = le(c, S, (y) => y === r);
-            if (s) {
-              const y = [...t, s.key];
-              n(null, y, {
+            } = z(e, t, o);
+            if (!n) return;
+            const i = le(c, S, (y) => y === r);
+            if (i) {
+              const y = [...t, i.key];
+              a(null, y, {
                 updateType: "cut"
               });
             } else
-              n(r, t, { updateType: "insert" });
+              a(r, t, { updateType: "insert" });
           };
         if (g === "$findWith")
-          return (r, a) => {
-            const { isArray: c, value: S, keys: s } = F(e, t, o);
+          return (r, n) => {
+            const { isArray: c, value: S, keys: i } = z(e, t, o);
             if (!c)
               throw new Error("findWith can only be used on arrays");
             const y = le(
               S,
-              s,
-              (w) => w?.[r] === a
+              i,
+              (w) => w?.[r] === n
             );
             return y ? u({
               path: [...t, y.key],
@@ -1198,57 +1240,57 @@ function Te(e, n, l, i) {
             }) : null;
           };
         if (g === "$cutThis") {
-          const { value: r } = N(e, t, o), a = t.slice(0, -1);
-          return Y(e, a), () => {
-            n(r, t, { updateType: "cut" });
+          const { value: r } = F(e, t, o), n = t.slice(0, -1);
+          return Y(e, n), () => {
+            a(r, t, { updateType: "cut" });
           };
         }
         if (g === "$get")
           return () => {
             te(e, d, t);
-            const { value: r } = N(e, t, o);
+            const { value: r } = F(e, t, o);
             return r;
           };
         if (g === "$$derive")
-          return (r) => pe({
+          return (r) => Ae({
             _stateKey: e,
             _path: t,
             _effect: r.toString(),
             _meta: o
           });
         if (g === "$$get")
-          return () => pe({ _stateKey: e, _path: t, _meta: o });
+          return () => Ae({ _stateKey: e, _path: t, _meta: o });
         if (g === "$lastSynced") {
           const r = `${e}:${t.join(".")}`;
           return He(r);
         }
         if (g == "getLocalStorage")
-          return (r) => ce(i + "-" + e + "-" + r);
+          return (r) => ce(s + "-" + e + "-" + r);
         if (g === "$isSelected") {
           const r = t.slice(0, -1);
           if (E(e, r)?.arrayKeys) {
-            const c = e + "." + r.join("."), S = p.getState().selectedIndicesMap.get(c), s = e + "." + t.join(".");
-            return S === s;
+            const c = e + "." + r.join("."), S = M.getState().selectedIndicesMap.get(c), i = e + "." + t.join(".");
+            return S === i;
           }
           return;
         }
         if (g === "$setSelected")
           return (r) => {
-            const a = t.slice(0, -1), c = e + "." + a.join("."), S = e + "." + t.join(".");
-            Y(e, a, void 0), p.getState().selectedIndicesMap.get(c), r && p.getState().setSelectedIndex(c, S);
+            const n = t.slice(0, -1), c = e + "." + n.join("."), S = e + "." + t.join(".");
+            Y(e, n, void 0), M.getState().selectedIndicesMap.get(c), r && M.getState().setSelectedIndex(c, S);
           };
         if (g === "$toggleSelected")
           return () => {
-            const r = t.slice(0, -1), a = e + "." + r.join("."), c = e + "." + t.join(".");
-            p.getState().selectedIndicesMap.get(a) === c ? p.getState().clearSelectedIndex({ arrayKey: a }) : p.getState().setSelectedIndex(a, c), Y(e, r);
+            const r = t.slice(0, -1), n = e + "." + r.join("."), c = e + "." + t.join(".");
+            M.getState().selectedIndicesMap.get(n) === c ? M.getState().clearSelectedIndex({ arrayKey: n }) : M.getState().setSelectedIndex(n, c), Y(e, r);
           };
         if (g === "$clearValidation")
           return (r) => {
-            const a = r ? [...t, ...r] : t, c = p.getState(), S = c.getShadowNode(e, a);
+            const n = r ? [...t, ...r] : t, c = M.getState(), S = c.getShadowNode(e, n);
             if (console.log("startNode ", S), !S) return;
-            const s = [[S, a]];
-            for (console.log("stack ", s); s.length > 0; ) {
-              const [y, w] = s.pop();
+            const i = [[S, n]];
+            for (console.log("stack ", i); i.length > 0; ) {
+              const [y, w] = i.pop();
               if (console.log("while (stack.length ", y, w), !y || typeof y != "object") continue;
               if (y._meta?.validation) {
                 y._meta.validation = {
@@ -1257,16 +1299,16 @@ function Te(e, n, l, i) {
                   lastValidated: Date.now(),
                   validatedValue: void 0
                 };
-                const M = [e, ...w].join(".");
-                c.notifyPathSubscribers(M, {
+                const A = [e, ...w].join(".");
+                c.notifyPathSubscribers(A, {
                   type: "VALIDATION_CLEAR"
                 });
               }
-              const A = Object.keys(y);
-              for (const M of A)
-                M !== "_meta" && s.push([y[M], [...w, M]]);
+              const p = Object.keys(y);
+              for (const A of p)
+                A !== "_meta" && i.push([y[A], [...w, A]]);
             }
-            U(e);
+            N(e);
           };
         if (t.length == 0) {
           if (g === "$_componentId")
@@ -1276,29 +1318,29 @@ function Te(e, n, l, i) {
               fe({ stateKey: e, options: r, initialOptionsPart: {} });
             };
           if (g === "$_applyUpdate")
-            return (r, a, c = "update") => {
-              n(r, a, { updateType: c });
+            return (r, n, c = "update") => {
+              a(r, n, { updateType: c });
             };
           if (g === "$_getEffectiveSetState")
-            return n;
+            return a;
           if (g === "$getPluginMetaData")
             return (r) => he(e, t)?.get(r);
           if (g === "$addPluginMetaData")
-            return (r, a) => ve(e, t, r, a);
+            return (r, n) => ve(e, t, r, n);
           if (g === "$removePluginMetaData")
             return (r) => we(e, t, r);
           if (g === "$addZodValidation")
-            return (r, a) => {
-              const c = p.getState();
+            return (r, n) => {
+              const c = M.getState();
               r.forEach((S) => {
-                const s = S.path.map(String), y = c.getShadowMetadata(e, s) || {};
-                c.setShadowMetadata(e, s, {
+                const i = S.path.map(String), y = c.getShadowMetadata(e, i) || {};
+                c.setShadowMetadata(e, i, {
                   ...y,
                   validation: {
                     status: "INVALID",
                     errors: [
                       {
-                        source: a || "client",
+                        source: n || "client",
                         message: S.message,
                         severity: "error",
                         code: S.code
@@ -1308,17 +1350,17 @@ function Te(e, n, l, i) {
                     validatedValue: void 0
                   }
                 }), c.notifyPathSubscribers(
-                  [e, ...s].join("."),
+                  [e, ...i].join("."),
                   { type: "VALIDATION_UPDATE" }
                 );
-              }), U(e);
+              }), N(e);
             };
           if (g === "$clearZodValidationPaths")
             return (r) => {
-              const a = p.getState();
+              const n = M.getState();
               r.forEach((c) => {
-                const S = a.getShadowMetadata(e, c) || {};
-                S.validation && (a.setShadowMetadata(e, c, {
+                const S = n.getShadowMetadata(e, c) || {};
+                S.validation && (n.setShadowMetadata(e, c, {
                   ...S,
                   validation: {
                     status: "NOT_VALIDATED",
@@ -1326,76 +1368,76 @@ function Te(e, n, l, i) {
                     lastValidated: Date.now(),
                     validatedValue: void 0
                   }
-                }), a.notifyPathSubscribers(
+                }), n.notifyPathSubscribers(
                   [e, ...c].join("."),
                   { type: "VALIDATION_CLEAR" }
                 ));
-              }), U(e);
+              }), N(e);
             };
           if (g === "$applyOperation")
-            return (r, a) => {
+            return (r, n) => {
               let c;
               if (r.insertAfterId && r.updateType === "insert") {
                 const S = E(e, r.path);
                 if (S?.arrayKeys) {
-                  const s = S.arrayKeys.indexOf(
+                  const i = S.arrayKeys.indexOf(
                     r.insertAfterId
                   );
-                  s !== -1 && (c = s + 1);
+                  i !== -1 && (c = i + 1);
                 }
               }
-              n(r.newValue, r.path, {
+              a(r.newValue, r.path, {
                 updateType: r.updateType,
                 itemId: r.itemId,
                 index: c,
                 // Pass the calculated index
-                metaData: a
+                metaData: n
               });
             };
           if (g === "$applyJsonPatch")
             return (r) => {
-              const a = p.getState(), c = a.getShadowMetadata(e, []);
+              const n = M.getState(), c = n.getShadowMetadata(e, []);
               if (!c?.components) return;
-              const S = (y) => !y || y === "/" ? [] : y.split("/").slice(1).map((w) => w.replace(/~1/g, "/").replace(/~0/g, "~")), s = /* @__PURE__ */ new Set();
+              const S = (y) => !y || y === "/" ? [] : y.split("/").slice(1).map((w) => w.replace(/~1/g, "/").replace(/~0/g, "~")), i = /* @__PURE__ */ new Set();
               for (const y of r) {
                 const w = S(y.path);
                 switch (y.op) {
                   case "add":
                   case "replace": {
-                    const { value: A } = y;
-                    a.updateShadowAtPath(e, w, A), a.markAsDirty(e, w, { bubble: !0 });
-                    let M = [...w];
+                    const { value: p } = y;
+                    n.updateShadowAtPath(e, w, p), n.markAsDirty(e, w, { bubble: !0 });
+                    let A = [...w];
                     for (; ; ) {
-                      const I = a.getShadowMetadata(
+                      const T = n.getShadowMetadata(
                         e,
-                        M
+                        A
                       );
-                      if (I?.pathComponents && I.pathComponents.forEach((b) => {
-                        if (!s.has(b)) {
-                          const O = c.components?.get(b);
-                          O && (O.forceUpdate(), s.add(b));
+                      if (T?.pathComponents && T.pathComponents.forEach((V) => {
+                        if (!i.has(V)) {
+                          const _ = c.components?.get(V);
+                          _ && (_.forceUpdate(), i.add(V));
                         }
-                      }), M.length === 0) break;
-                      M.pop();
+                      }), A.length === 0) break;
+                      A.pop();
                     }
                     break;
                   }
                   case "remove": {
-                    const A = w.slice(0, -1);
-                    a.removeShadowArrayElement(e, w), a.markAsDirty(e, A, { bubble: !0 });
-                    let M = [...A];
+                    const p = w.slice(0, -1);
+                    n.removeShadowArrayElement(e, w), n.markAsDirty(e, p, { bubble: !0 });
+                    let A = [...p];
                     for (; ; ) {
-                      const I = a.getShadowMetadata(
+                      const T = n.getShadowMetadata(
                         e,
-                        M
+                        A
                       );
-                      if (I?.pathComponents && I.pathComponents.forEach((b) => {
-                        if (!s.has(b)) {
-                          const O = c.components?.get(b);
-                          O && (O.forceUpdate(), s.add(b));
+                      if (T?.pathComponents && T.pathComponents.forEach((V) => {
+                        if (!i.has(V)) {
+                          const _ = c.components?.get(V);
+                          _ && (_.forceUpdate(), i.add(V));
                         }
-                      }), M.length === 0) break;
-                      M.pop();
+                      }), A.length === 0) break;
+                      A.pop();
                     }
                     break;
                   }
@@ -1408,11 +1450,11 @@ function Te(e, n, l, i) {
         if (g === "$validationWrapper")
           return ({
             children: r,
-            hideMessage: a
+            hideMessage: n
           }) => /* @__PURE__ */ Q(
             Oe,
             {
-              formOpts: a ? { validation: { message: "" } } : void 0,
+              formOpts: n ? { validation: { message: "" } } : void 0,
               path: t,
               stateKey: e,
               children: r
@@ -1421,11 +1463,11 @@ function Te(e, n, l, i) {
         if (g === "$_stateKey") return e;
         if (g === "$_path") return t;
         if (g === "$update")
-          return (r) => (n(r, t, { updateType: "update" }), {
+          return (r) => (a(r, t, { updateType: "update" }), {
             synced: () => {
-              const a = p.getState().getShadowMetadata(e, t);
-              W(e, t, {
-                ...a,
+              const n = M.getState().getShadowMetadata(e, t);
+              B(e, t, {
+                ...n,
                 isDirty: !1,
                 stateSource: "server",
                 lastServerSync: Date.now()
@@ -1438,7 +1480,7 @@ function Te(e, n, l, i) {
             }
           });
         if (g === "$toggle") {
-          const { value: r } = N(
+          const { value: r } = F(
             e,
             t,
             o
@@ -1446,15 +1488,15 @@ function Te(e, n, l, i) {
           if (typeof r != "boolean")
             throw new Error("toggle() can only be used on boolean values");
           return () => {
-            n(!r, t, {
+            a(!r, t, {
               updateType: "update"
             });
           };
         }
         if (g === "$isolate")
-          return (r, a) => {
-            const c = Array.isArray(r), S = c ? r : void 0, s = c ? a : r;
-            if (!s || typeof s != "function")
+          return (r, n) => {
+            const c = Array.isArray(r), S = c ? r : void 0, i = c ? n : r;
+            if (!i || typeof i != "function")
               throw new Error(
                 "CogsState: $isolate requires a render function."
               );
@@ -1465,58 +1507,58 @@ function Te(e, n, l, i) {
                 path: t,
                 dependencies: S,
                 rebuildStateShape: u,
-                renderFn: s
+                renderFn: i
               }
             );
           };
         if (g === "$formElement")
-          return (r, a) => /* @__PURE__ */ Q(
+          return (r, n) => /* @__PURE__ */ Q(
             Ne,
             {
               stateKey: e,
               path: t,
               rebuildStateShape: u,
-              setState: n,
-              formOpts: a,
+              setState: a,
+              formOpts: n,
               renderFn: r
             }
           );
-        const D = [...t, g];
+        const C = [...t, g];
         return u({
-          path: D,
+          path: C,
           componentId: d,
           meta: o
         });
       }
-    }, x = new Proxy(_, P);
-    return f.set(T, x), x;
+    }, J = new Proxy(j, D);
+    return f.set(P, J), J;
   }
   const h = {
     $revertToInitialState: (t) => {
-      const o = p.getState().getShadowMetadata(e, []);
+      const o = M.getState().getShadowMetadata(e, []);
       let d;
-      o?.stateSource === "server" && o.baseServerState ? d = o.baseServerState : d = p.getState().initialStateGlobal[e], qe(e), K(e, d), u({
+      o?.stateSource === "server" && o.baseServerState ? d = o.baseServerState : d = M.getState().initialStateGlobal[e], qe(e), K(e, d), u({
         path: [],
         componentId: l
       });
-      const $ = j(e), V = L($?.localStorage?.key) ? $?.localStorage?.key(d) : $?.localStorage?.key, T = i && V ? `${i}-${e}-${V}` : void 0;
-      return de(T), U(e), d;
+      const $ = U(e), b = W($?.localStorage?.key) ? $?.localStorage?.key(d) : $?.localStorage?.key, P = s && b ? `${s}-${e}-${b}` : void 0;
+      return de(P), N(e), d;
     },
     $initializeAndMergeShadowState: (t) => {
-      Re(e, t), U(e);
+      Re(e, t), N(e);
     },
     $updateInitialState: (t) => {
       const o = Te(
         e,
-        n,
+        a,
         l,
-        i
-      ), d = p.getState().initialStateGlobal[e], $ = j(e), V = L($?.localStorage?.key) ? $?.localStorage?.key(d) : $?.localStorage?.key, T = i && V ? `${i}-${e}-${V}` : void 0;
-      return de(T), ke(() => {
+        s
+      ), d = M.getState().initialStateGlobal[e], $ = U(e), b = W($?.localStorage?.key) ? $?.localStorage?.key(d) : $?.localStorage?.key, P = s && b ? `${s}-${e}-${b}` : void 0;
+      return de(P), De(() => {
         Ve(e, t), K(e, t);
-        const v = p.getState().getShadowMetadata(e, []);
-        v && v?.components?.forEach((_) => {
-          _.forceUpdate();
+        const v = M.getState().getShadowMetadata(e, []);
+        v && v?.components?.forEach((j) => {
+          j.forceUpdate();
         });
       }), {
         fetchId: (v) => o.$get()[v]
@@ -1528,64 +1570,64 @@ function Te(e, n, l, i) {
     path: []
   });
 }
-function pe(e) {
+function Ae(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(".")}`, u = e._path.length > 0 ? e._path.join(".") : "root", h = e._meta?.arrayViews?.[u], m = C(e._stateKey, e._path, h);
+  const a = x(null), l = x(null), s = x(!1), f = `${e._stateKey}-${e._path.join(".")}`, u = e._path.length > 0 ? e._path.join(".") : "root", h = e._meta?.arrayViews?.[u], m = O(e._stateKey, e._path, h);
   return Z(() => {
-    const t = n.current;
-    if (!t || i.current) return;
+    const t = a.current;
+    if (!t || s.current) return;
     const o = setTimeout(() => {
       if (!t.parentElement) {
         console.warn("Parent element not found for signal", f);
         return;
       }
-      const d = t.parentElement, V = Array.from(d.childNodes).indexOf(t);
-      let T = d.getAttribute("data-parent-id");
-      T || (T = `parent-${crypto.randomUUID()}`, d.setAttribute("data-parent-id", T)), l.current = `instance-${crypto.randomUUID()}`;
-      const v = p.getState().getShadowMetadata(e._stateKey, e._path) || {}, _ = v.signals || [];
-      _.push({
+      const d = t.parentElement, b = Array.from(d.childNodes).indexOf(t);
+      let P = d.getAttribute("data-parent-id");
+      P || (P = `parent-${crypto.randomUUID()}`, d.setAttribute("data-parent-id", P)), l.current = `instance-${crypto.randomUUID()}`;
+      const v = M.getState().getShadowMetadata(e._stateKey, e._path) || {}, j = v.signals || [];
+      j.push({
         instanceId: l.current,
-        parentId: T,
-        position: V,
+        parentId: P,
+        position: b,
         effect: e._effect
-      }), p.getState().setShadowMetadata(e._stateKey, e._path, {
+      }), M.getState().setShadowMetadata(e._stateKey, e._path, {
         ...v,
-        signals: _
+        signals: j
       });
-      let P = m;
+      let D = m;
       if (e._effect)
         try {
-          P = new Function(
+          D = new Function(
             "state",
             `return (${e._effect})(state)`
           )(m);
-        } catch (G) {
-          console.error("Error evaluating effect function:", G);
+        } catch (q) {
+          console.error("Error evaluating effect function:", q);
         }
-      P !== null && typeof P == "object" && (P = JSON.stringify(P));
-      const x = document.createTextNode(String(P ?? ""));
-      t.replaceWith(x), i.current = !0;
+      D !== null && typeof D == "object" && (D = JSON.stringify(D));
+      const J = document.createTextNode(String(D ?? ""));
+      t.replaceWith(J), s.current = !0;
     }, 0);
     return () => {
       if (clearTimeout(o), l.current) {
-        const d = p.getState().getShadowMetadata(e._stateKey, e._path) || {};
+        const d = M.getState().getShadowMetadata(e._stateKey, e._path) || {};
         d.signals && (d.signals = d.signals.filter(
           ($) => $.instanceId !== l.current
-        ), p.getState().setShadowMetadata(e._stateKey, e._path, d));
+        ), M.getState().setShadowMetadata(e._stateKey, e._path, d));
       }
     };
   }, []), Se("span", {
-    ref: n,
+    ref: a,
     style: { display: "contents" },
     "data-signal-id": f
   });
 }
 export {
-  pe as $cogsSignal,
+  Ae as $cogsSignal,
   bt as createCogsState,
   ct as useCogsStateFn
 };