cogsbox-state 0.5.476 → 0.5.479

package/dist/CogsState.js

@@ -1,729 +1,806 @@
 "use client";
-import { jsx as H, Fragment as pe } from "react/jsx-runtime";
-import { pluginStore as W } from "./pluginStore.js";
-import { useState as ee, useRef as G, useCallback as Ae, useEffect as q, useLayoutEffect as Me, useMemo as ye, createElement as ue, startTransition as $e } from "react";
-import { transformStateFunc as Ve, isFunction as U, isDeepEqual as Y, isArray as Ee, getDifferences as be } from "./utility.js";
-import { ValidationWrapper as Te, IsolatedComponentWrapper as Pe, FormElementWrapper as Ie, MemoizedCogsItemWrapper as ke } from "./Components.js";
-import De from "superjson";
-import { v4 as te } from "uuid";
-import { getGlobalStore as w, updateShadowTypeInfo as fe } from "./store.js";
-import { useCogsConfig as me } from "./CogsStateClient.js";
-import { runValidation as Ce } from "./validation.js";
+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 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";
 const {
-  getInitialOptions: C,
-  updateInitialStateGlobal: he,
-  getShadowMetadata: V,
-  setShadowMetadata: B,
-  getShadowValue: I,
-  initializeShadowState: Z,
-  initializeAndMergeShadowState: _e,
-  updateShadowAtPath: Oe,
-  insertShadowArrayElement: je,
-  insertManyShadowArrayElements: ve,
-  removeShadowArrayElement: Ne,
-  setInitialStateOptions: de,
-  setServerStateUpdate: ge,
-  markAsDirty: ae,
-  addPathComponent: Ue,
-  clearSelectedIndexesForState: Fe,
-  addStateLog: ze,
-  clearSelectedIndex: Re,
-  getSyncInfo: Le,
-  notifyPathSubscribers: We,
-  getPluginMetaDataMap: Be,
-  setPluginMetaData: Ge,
-  removePluginMetaData: qe
-} = w.getState(), { notifyUpdate: xe } = W.getState();
-function D(e, a, l) {
-  const s = V(e, a);
-  if (!!!s?.arrayKeys)
-    return { isArray: !1, value: w.getState().getShadowValue(e, a), keys: [] };
-  const c = a.length > 0 ? a.join(".") : "root", m = l?.arrayViews?.[c] ?? s.arrayKeys;
-  return Array.isArray(m) && m.length === 0 ? { isArray: !0, value: [], keys: [] } : { isArray: !0, value: w.getState().getShadowValue(e, a, m), keys: m ?? [] };
+  getInitialOptions: U,
+  updateInitialStateGlobal: Me,
+  getShadowMetadata: $,
+  setShadowMetadata: L,
+  getShadowValue: D,
+  initializeShadowState: X,
+  initializeAndMergeShadowState: ze,
+  updateShadowAtPath: Le,
+  insertShadowArrayElement: We,
+  insertManyShadowArrayElements: be,
+  removeShadowArrayElement: Be,
+  setInitialStateOptions: ge,
+  setServerStateUpdate: ye,
+  markAsDirty: oe,
+  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) {
+  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;
+  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, a, l) {
-  for (let s = 0; s < e.length; s++)
-    if (l(e[s], s)) {
-      const g = a[s];
-      if (g)
-        return { key: g, index: s, value: e[s] };
+function se(e, n, l) {
+  for (let i = 0; i < e.length; i++)
+    if (l(e[i], i)) {
+      const f = n[i];
+      if (f)
+        return { key: f, index: i, value: e[i] };
     }
   return null;
 }
-function ie(e, a) {
-  const s = {
-    ...C(e) || {},
-    ...a
+function ce(e, n) {
+  const i = {
+    ...U(e) || {},
+    ...n
   };
-  (s.validation?.zodSchemaV4 || s.validation?.zodSchemaV3) && !s.validation?.onBlur && (s.validation.onBlur = "error"), de(e, s);
+  (i.validation?.zodSchemaV4 || i.validation?.zodSchemaV3) && !i.validation?.onBlur && (i.validation.onBlur = "error"), ge(e, i);
 }
-function ce({
+function ue({
   stateKey: e,
-  options: a,
+  options: n,
   initialOptionsPart: l
 }) {
-  const s = C(e) || {}, g = l[e] || {};
-  let c = { ...g, ...s }, m = !1;
-  if (a) {
-    const u = (t, o) => {
-      for (const y in o)
-        o.hasOwnProperty(y) && (o[y] instanceof Object && !Array.isArray(o[y]) && t[y] instanceof Object ? Y(t[y], o[y]) || (u(t[y], o[y]), m = !0) : t[y] !== o[y] && (t[y] = o[y], m = !0));
+  const i = U(e) || {}, f = l[e] || {};
+  let c = { ...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));
       return t;
     };
-    c = u(c, a);
+    c = y(c, n);
   }
-  if (c.validation && (a?.validation?.hasOwnProperty("onBlur") || s?.validation?.hasOwnProperty("onBlur") || g?.validation?.hasOwnProperty("onBlur") || (c.validation.onBlur = "error", m = !0)), m) {
-    de(e, c);
-    const u = s?.validation?.zodSchemaV4 || s?.validation?.zodSchemaV3, t = c.validation?.zodSchemaV4 && !s?.validation?.zodSchemaV4, o = c.validation?.zodSchemaV3 && !s?.validation?.zodSchemaV3;
-    !u && (t || o) && (t ? fe(
+  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"
-    ) : o && fe(
+    ) : a && Se(
       e,
       c.validation.zodSchemaV3,
       "zod3"
-    ), F(e));
+    ), W(e));
   }
   return c;
 }
-function ht(e, a) {
-  return {
-    ...a,
-    initialState: e,
-    _addStateOptions: !0
-  };
-}
-const vt = (e, a) => {
-  a?.plugins && W.getState().setRegisteredPlugins(a.plugins);
-  const [l, s] = Ve(e);
-  Object.keys(l).forEach((u) => {
-    let t = s[u] || {};
-    const o = {
-      ...t
-    };
-    a?.formElements && (o.formElements = {
-      ...a.formElements,
-      ...t.formElements || {}
-    }), o.validation = {
+const $t = (e, n) => {
+  n?.plugins && R.getState().setRegisteredPlugins(n.plugins);
+  const l = {};
+  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);
+  Object.keys(f).forEach((a) => {
+    let d = {};
+    n?.formElements && (d.formElements = n.formElements), d.validation = {
       onBlur: "error",
-      ...a?.validation,
-      ...t.validation || {}
-    }, a?.validation?.key && !t.validation?.key && (o.validation.key = `${a.validation.key}.${u}`);
-    const y = C(u), M = y ? {
-      ...y,
-      ...o,
-      formElements: {
-        ...y.formElements,
-        ...o.formElements
-      },
+      ...n?.validation
+    };
+    const E = U(a), b = E ? {
+      ...E,
+      formElements: n?.formElements,
       validation: {
-        ...y.validation,
-        ...o.validation
+        ...E.validation,
+        ...d.validation
       }
-    } : o;
-    de(u, M);
-  }), Object.keys(l).forEach((u) => {
-    Z(u, l[u]);
+    } : d;
+    Object.keys(b).length > 0 && ge(a, b);
+  }), Object.keys(f).forEach((a) => {
+    X(a, f[a]);
   });
-  const g = (u, t) => {
-    const [o] = ee(t?.componentId ?? te()), y = ce({
-      stateKey: u,
-      options: t,
-      initialOptionsPart: s
-    }), M = G(y);
-    M.current = y;
-    const E = I(u, []) || l[u], b = at(
-      E,
-      {
-        stateKey: u,
-        syncUpdate: t?.syncUpdate,
-        componentId: o,
-        localStorage: t?.localStorage,
-        middleware: t?.middleware,
-        reactiveType: t?.reactiveType,
-        reactiveDeps: t?.reactiveDeps,
-        defaultState: t?.defaultState,
-        dependencies: t?.dependencies,
-        serverState: t?.serverState
-      }
-    );
-    return q(() => {
-      t && W.getState().setPluginOptionsForState(u, t);
-    }, [u, t]), q(() => (W.getState().stateHandlers.set(u, b), () => {
-      W.getState().stateHandlers.delete(u);
-    }), [u, b]), b;
+  const m = (a, d) => {
+    const [E] = te(d?.componentId ?? re()), b = ue({
+      stateKey: a,
+      options: d,
+      initialOptionsPart: c
+    }), V = q(b);
+    V.current = b;
+    const v = D(a, []) || f[a], C = ct(v, {
+      stateKey: a,
+      syncUpdate: d?.syncUpdate,
+      componentId: E,
+      localStorage: d?.localStorage,
+      middleware: d?.middleware,
+      reactiveType: d?.reactiveType,
+      reactiveDeps: d?.reactiveDeps,
+      defaultState: d?.defaultState,
+      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;
   };
-  function c(u, t) {
-    if (ce({ stateKey: u, options: t, initialOptionsPart: s }), t.localStorage && He(u, t), t.formElements) {
-      const y = W.getState().registeredPlugins.map((M) => t.formElements.hasOwnProperty(M.name) ? {
-        ...M,
-        formWrapper: t.formElements[M.name]
-      } : M);
-      W.getState().setRegisteredPlugins(y);
+  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);
     }
-    F(u);
+    W(a);
   }
-  function m(u) {
-    Object.keys(l).forEach((o) => {
-      c(o, u);
+  function t(a) {
+    Object.keys(f).forEach((E) => {
+      y(E, a);
     });
   }
   return {
-    useCogsState: g,
-    setCogsOptionsByKey: c,
-    setCogsOptions: m
+    useCogsState: m,
+    setCogsOptionsByKey: y,
+    setCogsOptions: t
   };
-}, Je = (e, a, l, s, g) => {
+}, Ze = (e, n, l, i, f) => {
   l?.log && console.log(
     "saving to localstorage",
-    a,
+    n,
     l.localStorage?.key,
-    s
+    i
   );
-  const c = U(l?.localStorage?.key) ? l.localStorage?.key(e) : l?.localStorage?.key;
-  if (c && s) {
-    const m = `${s}-${a}-${c}`;
-    let u;
+  const c = z(l?.localStorage?.key) ? l.localStorage?.key(e) : l?.localStorage?.key;
+  if (c && i) {
+    const m = `${i}-${n}-${c}`;
+    let y;
     try {
-      u = oe(m)?.lastSyncedWithServer;
+      y = ie(m)?.lastSyncedWithServer;
     } catch {
     }
-    const t = V(a, []), o = {
+    const t = $(n, []), a = {
       state: e,
       lastUpdated: Date.now(),
-      lastSyncedWithServer: u,
+      lastSyncedWithServer: y,
       stateSource: t?.stateSource,
       baseServerState: t?.baseServerState
-    }, y = De.serialize(o);
+    }, d = Fe.serialize(a);
     window.localStorage.setItem(
       m,
-      JSON.stringify(y.json)
+      JSON.stringify(d.json)
     );
   }
-}, oe = (e) => {
+}, ie = (e) => {
   if (!e) return null;
   try {
-    const a = window.localStorage.getItem(e);
-    return a ? JSON.parse(a) : null;
-  } catch (a) {
-    return console.error("Error loading from localStorage:", a), null;
+    const n = window.localStorage.getItem(e);
+    return n ? JSON.parse(n) : null;
+  } catch (n) {
+    return console.error("Error loading from localStorage:", n), null;
   }
-}, He = (e, a) => {
-  const l = I(e, []), { sessionId: s } = me(), g = U(a?.localStorage?.key) ? a.localStorage.key(l) : a?.localStorage?.key;
-  if (g && s) {
-    const c = oe(
-      `${s}-${e}-${g}`
+}, le = (e) => {
+  if (e)
+    try {
+      typeof window < "u" && window.localStorage && window.localStorage.removeItem(e);
+    } catch (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;
+  if (f && i) {
+    const c = ie(
+      `${i}-${e}-${f}`
     );
     if (c && c.lastUpdated > (c.lastSyncedWithServer || 0))
-      return F(e), !0;
+      return W(e), !0;
   }
   return !1;
-}, F = (e) => {
-  const a = V(e, []);
-  if (!a) return;
+}, W = (e) => {
+  const n = $(e, []);
+  if (!n) return;
   const l = /* @__PURE__ */ new Set();
-  a?.components?.forEach((s) => {
-    (s ? Array.isArray(s.reactiveType) ? s.reactiveType : [s.reactiveType || "component"] : null)?.includes("none") || l.add(() => s.forceUpdate());
+  n?.components?.forEach((i) => {
+    (i ? Array.isArray(i.reactiveType) ? i.reactiveType : [i.reactiveType || "component"] : null)?.includes("none") || l.add(() => i.forceUpdate());
   }), queueMicrotask(() => {
-    l.forEach((s) => s());
+    l.forEach((i) => i());
   });
 };
-function re(e, a, l, s) {
-  const g = V(e, a);
-  if (B(e, a, {
-    ...g,
+function ne(e, n, l, i) {
+  const f = $(e, n);
+  if (L(e, n, {
+    ...f,
     isDirty: !1,
     stateSource: "server",
-    lastServerSync: s || Date.now()
+    lastServerSync: i || Date.now()
   }), Array.isArray(l)) {
-    const c = V(e, a);
-    c?.arrayKeys && c.arrayKeys.forEach((m, u) => {
-      const t = [...a, m], o = l[u];
-      o !== void 0 && re(
+    const c = $(e, n);
+    c?.arrayKeys && c.arrayKeys.forEach((m, y) => {
+      const t = [...n, m], a = l[y];
+      a !== void 0 && ne(
         e,
         t,
-        o,
-        s
+        a,
+        i
       );
     });
   } else l && typeof l == "object" && l.constructor === Object && Object.keys(l).forEach((c) => {
-    const m = [...a, c], u = l[c];
-    re(e, m, u, s);
+    const m = [...n, c], y = l[c];
+    ne(e, m, y, i);
   });
 }
-let ne = [], le = !1;
-function Qe() {
-  le || (le = !0, queueMicrotask(() => {
-    rt();
+let ae = [], de = !1;
+function Ke() {
+  de || (de = !0, queueMicrotask(() => {
+    it();
   }));
 }
-function Ye(e, a) {
-  e?.signals?.length && e.signals.forEach(({ parentId: l, position: s, effect: g }) => {
+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);
-    if (!m[s]) return;
-    let u = a;
-    if (g && a !== null)
+    if (!m[i]) return;
+    let y = n;
+    if (f && n !== null)
       try {
-        u = new Function("state", `return (${g})(state)`)(
-          a
+        y = new Function("state", `return (${f})(state)`)(
+          n
         );
       } catch (t) {
         console.error("Error evaluating effect function:", t);
       }
-    u !== null && typeof u == "object" && (u = JSON.stringify(u)), m[s].textContent = String(u ?? "");
+    y !== null && typeof y == "object" && (y = JSON.stringify(y)), m[i].textContent = String(y ?? "");
   });
 }
-function Ze(e, a, l) {
-  const s = V(e, []);
-  if (!s?.components)
+function tt(e, n, l) {
+  const i = $(e, []);
+  if (!i?.components)
     return /* @__PURE__ */ new Set();
-  const g = /* @__PURE__ */ new Set();
+  const f = /* @__PURE__ */ new Set();
   if (l.type === "update") {
-    let c = [...a];
+    let c = [...n];
     for (; ; ) {
-      const m = V(e, c);
-      if (m?.pathComponents && m.pathComponents.forEach((u) => {
-        const t = s.components?.get(u);
-        t && ((Array.isArray(t.reactiveType) ? t.reactiveType : [t.reactiveType || "component"]).includes("none") || g.add(t));
+      const m = $(e, c);
+      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.newValue && typeof l.newValue == "object" && !Ee(l.newValue) && be(l.newValue, l.oldValue).forEach((u) => {
-      const t = u.split("."), o = [...a, ...t], y = V(e, o);
-      y?.pathComponents && y.pathComponents.forEach((M) => {
-        const E = s.components?.get(M);
-        E && ((Array.isArray(E.reactiveType) ? E.reactiveType : [E.reactiveType || "component"]).includes("none") || g.add(E));
+    l.newValue && typeof l.newValue == "object" && !Ce(l.newValue) && _e(l.newValue, l.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);
+        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" ? a : a.slice(0, -1)];
+    let m = [...l.type === "insert" ? n : n.slice(0, -1)];
     for (; ; ) {
-      const u = V(e, m);
-      if (u?.pathComponents && u.pathComponents.forEach((t) => {
-        const o = s.components?.get(t);
-        o && g.add(o);
+      const y = $(e, m);
+      if (y?.pathComponents && y.pathComponents.forEach((t) => {
+        const a = i.components?.get(t);
+        a && f.add(a);
       }), m.length === 0) break;
       m.pop();
     }
   }
-  return g;
+  return f;
 }
-function Xe(e, a, l) {
-  const s = w.getState().getShadowValue(e, a), g = U(l) ? l(s) : l;
-  if (Y(s, g))
+function rt(e, n, l) {
+  const i = p.getState().getShadowValue(e, n), f = z(l) ? l(i) : l;
+  if (Z(i, f))
     return null;
-  Oe(e, a, g), ae(e, a, { bubble: !0 });
-  const c = V(e, a);
+  Le(e, n, f), oe(e, n, { bubble: !0 });
+  const c = $(e, n);
   return {
     type: "update",
-    oldValue: s,
-    newValue: g,
+    oldValue: i,
+    newValue: f,
     shadowMeta: c
   };
 }
-function Ke(e, a, l) {
-  ve(e, a, l), ae(e, a, { bubble: !0 });
-  const s = V(e, a);
+function nt(e, n, l) {
+  be(e, n, l), oe(e, n, { bubble: !0 });
+  const i = $(e, n);
   return {
     type: "insert_many",
     count: l.length,
-    shadowMeta: s,
-    path: a
+    shadowMeta: i,
+    path: n
   };
 }
-function et(e, a, l, s, g) {
+function at(e, n, l, i, f) {
   let c;
-  if (U(l)) {
-    const { value: o } = N(e, a);
-    c = l({ state: o });
+  if (z(l)) {
+    const { value: a } = j(e, n);
+    c = l({ state: a });
   } else
     c = l;
-  const m = je(
+  const m = We(
     e,
-    a,
+    n,
     c,
-    s,
-    g
+    i,
+    f
   );
-  ae(e, a, { bubble: !0 });
-  const u = V(e, a);
+  oe(e, n, { bubble: !0 });
+  const y = $(e, n);
   let t;
-  return u?.arrayKeys && s !== void 0 && s > 0 && (t = u.arrayKeys[s - 1]), {
+  return y?.arrayKeys && i !== void 0 && i > 0 && (t = y.arrayKeys[i - 1]), {
     type: "insert",
     newValue: c,
-    shadowMeta: u,
-    path: a,
+    shadowMeta: y,
+    path: n,
     itemId: m,
     insertAfterId: t
   };
 }
-function tt(e, a) {
-  const l = a.slice(0, -1), s = I(e, a);
-  return Ne(e, a), ae(e, l, { bubble: !0 }), { type: "cut", oldValue: s, parentPath: l };
+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 };
 }
-function rt() {
-  const e = /* @__PURE__ */ new Set(), a = [], l = [];
-  for (const s of ne) {
-    if (s.status && s.updateType) {
-      l.push(s);
+function it() {
+  const e = /* @__PURE__ */ new Set(), n = [], l = [];
+  for (const i of ae) {
+    if (i.status && i.updateType) {
+      l.push(i);
       continue;
     }
-    const g = s, c = g.type === "cut" ? null : g.newValue;
-    g.shadowMeta?.signals?.length > 0 && a.push({ shadowMeta: g.shadowMeta, displayValue: c }), Ze(
-      g.stateKey,
-      g.path,
-      g
-    ).forEach((u) => {
-      e.add(u);
+    const f = i, c = f.type === "cut" ? null : f.newValue;
+    f.shadowMeta?.signals?.length > 0 && n.push({ shadowMeta: f.shadowMeta, displayValue: c }), tt(
+      f.stateKey,
+      f.path,
+      f
+    ).forEach((y) => {
+      e.add(y);
     });
   }
-  l.length > 0 && ze(l), a.forEach(({ shadowMeta: s, displayValue: g }) => {
-    Ye(s, g);
-  }), e.forEach((s) => {
-    s.forceUpdate();
-  }), ne = [], le = !1;
+  l.length > 0 && xe(l), n.forEach(({ shadowMeta: i, displayValue: f }) => {
+    et(i, f);
+  }), e.forEach((i) => {
+    i.forceUpdate();
+  }), ae = [], de = !1;
 }
-function nt(e, a, l) {
-  return (g, c, m) => {
-    s(e, c, g, m);
+function st(e, n, l) {
+  return (f, c, m) => {
+    i(e, c, f, m);
   };
-  function s(g, c, m, u) {
+  function i(f, c, m, y) {
     let t;
-    switch (u.updateType) {
+    switch (y.updateType) {
       case "update":
-        t = Xe(g, c, m);
+        t = rt(f, c, m);
         break;
       case "insert":
-        t = et(
-          g,
+        t = at(
+          f,
           c,
           m,
-          u.index,
-          u.itemId
+          y.index,
+          y.itemId
         );
         break;
       case "insert_many":
-        t = Ke(g, c, m);
+        t = nt(f, c, m);
         break;
       case "cut":
-        t = tt(g, c);
+        t = ot(f, c);
         break;
     }
     if (t === null)
       return;
-    t.stateKey = g, t.path = c, ne.push(t), Qe();
-    const o = {
+    t.stateKey = f, t.path = c, ae.push(t), Ke();
+    const a = {
       timeStamp: Date.now(),
-      stateKey: g,
+      stateKey: f,
       path: c,
-      updateType: u.updateType,
+      updateType: y.updateType,
       status: "new",
       oldValue: t.oldValue,
       newValue: t.newValue ?? null,
       itemId: t.itemId,
       insertAfterId: t.insertAfterId,
-      metaData: u.metaData
+      metaData: y.metaData
     };
-    ne.push(o), t.newValue !== void 0 && Je(
+    ae.push(a), t.newValue !== void 0 && Ze(
       t.newValue,
-      g,
+      f,
       l.current,
-      a
-    ), l.current?.middleware && l.current.middleware({ update: o }), Ce(o, u.validationTrigger || "programmatic"), xe(o);
+      n
+    ), l.current?.middleware && l.current.middleware({ update: a }), Re(a, y.validationTrigger || "programmatic"), Ye(a);
   }
 }
-function at(e, {
-  stateKey: a,
+function ct(e, {
+  stateKey: n,
   localStorage: l,
-  formElements: s,
-  reactiveDeps: g,
+  formElements: i,
+  reactiveDeps: f,
   reactiveType: c,
   componentId: m,
-  defaultState: u,
+  defaultState: y,
   dependencies: t,
-  serverState: o
+  serverState: a
 } = {}) {
-  const [y, M] = ee({}), { sessionId: E } = me();
-  let b = !a;
-  const [v] = ee(a ?? te()), _ = G(m ?? te()), k = G(
+  const [d, E] = te({}), { sessionId: b } = Ae();
+  let V = !n;
+  const [v] = te(n ?? re()), C = q(m ?? re()), _ = q(
     null
   );
-  k.current = C(v) ?? null;
-  const L = Ae(
-    (P) => {
-      const n = P ? { ...C(v), ...P } : C(v), i = n?.defaultState || u || e;
-      if (n?.serverState?.status === "success" && n?.serverState?.data !== void 0)
+  _.current = U(v) ?? null;
+  const J = Te(
+    (T) => {
+      const r = T ? { ...U(v), ...T } : U(v), o = r?.defaultState || y || e;
+      if (r?.serverState?.status === "success" && r?.serverState?.data !== void 0)
         return {
-          value: n.serverState.data,
+          value: r.serverState.data,
           source: "server",
-          timestamp: n.serverState.timestamp || Date.now()
+          timestamp: r.serverState.timestamp || Date.now()
         };
-      if (n?.localStorage?.key && E) {
-        const d = U(n.localStorage.key) ? n.localStorage.key(i) : n.localStorage.key, h = oe(
-          `${E}-${v}-${d}`
+      if (r?.localStorage?.key && b) {
+        const S = z(r.localStorage.key) ? r.localStorage.key(o) : r.localStorage.key, u = ie(
+          `${b}-${v}-${S}`
         );
-        if (h && h.lastUpdated > (n?.serverState?.timestamp || 0))
+        if (u && u.lastUpdated > (r?.serverState?.timestamp || 0))
           return {
-            value: h.state,
+            value: u.state,
             source: "localStorage",
-            timestamp: h.lastUpdated
+            timestamp: u.lastUpdated
           };
       }
       return {
-        value: i || e,
+        value: o || e,
         source: "default",
         timestamp: Date.now()
       };
     },
-    [v, u, e, E]
+    [v, y, e, b]
   );
-  q(() => {
-    o && o.status === "success" && o.data !== void 0 && ge(v, o);
-  }, [o, v]), q(() => w.getState().subscribeToPath(v, (r) => {
-    if (r?.type === "SERVER_STATE_UPDATE") {
-      const n = r.serverState;
-      if (n?.status !== "success" || n.data === void 0)
+  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;
+      if (r?.status !== "success" || r.data === void 0)
         return;
-      ie(v, { serverState: n });
-      const i = typeof n.merge == "object" ? n.merge : n.merge === !0 ? { strategy: "append", key: "id" } : null, S = I(v, []), d = n.data;
-      if (i && i.strategy === "append" && "key" in i && Array.isArray(S) && Array.isArray(d)) {
-        const h = i.key;
-        if (!h) {
+      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;
+      if (o && o.strategy === "append" && "key" in o && Array.isArray(s) && Array.isArray(S)) {
+        const u = o.key;
+        if (!u) {
           console.error(
             "CogsState: Merge strategy 'append' requires a 'key' field."
           );
           return;
         }
-        const p = new Set(
-          S.map((T) => T[h])
-        ), A = d.filter(
-          (T) => !p.has(T[h])
+        const h = new Set(
+          s.map((M) => M[u])
+        ), w = S.filter(
+          (M) => !h.has(M[u])
         );
-        A.length > 0 && ve(v, [], A);
-        const $ = I(v, []);
-        re(
+        w.length > 0 && be(v, [], w);
+        const A = D(v, []);
+        ne(
           v,
           [],
-          $,
-          n.timestamp || Date.now()
+          A,
+          r.timestamp || Date.now()
         );
       } else
-        Z(v, d), re(
+        X(v, S), ne(
           v,
           [],
-          d,
-          n.timestamp || Date.now()
+          S,
+          r.timestamp || Date.now()
         );
-      F(v);
+      W(v);
     }
-  }), [v]), q(() => {
-    const P = w.getState().getShadowMetadata(v, []);
-    if (P && P.stateSource)
+  }), [v]), x(() => {
+    const T = p.getState().getShadowMetadata(v, []);
+    if (T && T.stateSource)
       return;
-    const r = C(v), n = {
-      localStorageEnabled: !!r?.localStorage?.key
+    const k = U(v), r = {
+      localStorageEnabled: !!k?.localStorage?.key
     };
-    if (B(v, [], {
-      ...P,
-      features: n
-    }), r?.defaultState !== void 0 || u !== void 0) {
-      const h = r?.defaultState || u;
-      r?.defaultState || ie(v, {
-        defaultState: h
+    if (L(v, [], {
+      ...T,
+      features: r
+    }), k?.defaultState !== void 0 || y !== void 0) {
+      const u = k?.defaultState || y;
+      k?.defaultState || ce(v, {
+        defaultState: u
       });
     }
-    const { value: i, source: S, timestamp: d } = L();
-    Z(v, i), B(v, [], {
-      stateSource: S,
-      lastServerSync: S === "server" ? d : void 0,
-      isDirty: S === "server" ? !1 : void 0,
-      baseServerState: S === "server" ? i : void 0
-    }), S === "server" && o && ge(v, o), F(v);
-  }, [v, ...t || []]), Me(() => {
-    b && ie(v, {
-      formElements: s,
-      defaultState: u,
+    const { value: o, source: s, timestamp: S } = J();
+    X(v, o), 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, {
+      formElements: i,
+      defaultState: y,
       localStorage: l,
-      middleware: k.current?.middleware
+      middleware: _.current?.middleware
     });
-    const P = `${v}////${_.current}`, r = V(v, []), n = r?.components || /* @__PURE__ */ new Map();
-    return n.set(P, {
-      forceUpdate: () => M({}),
+    const T = `${v}////${C.current}`, k = $(v, []), r = k?.components || /* @__PURE__ */ new Map();
+    return r.set(T, {
+      forceUpdate: () => E({}),
       reactiveType: c ?? ["component"],
       paths: /* @__PURE__ */ new Set(),
-      depsFunction: g || void 0,
-      deps: g ? g(I(v, [])) : [],
-      prevDeps: g ? g(I(v, [])) : []
-    }), B(v, [], {
-      ...r,
-      components: n
-    }), M({}), () => {
-      const i = V(v, []), S = i?.components?.get(P);
-      S?.paths && S.paths.forEach((d) => {
-        const p = d.split(".").slice(1), A = w.getState().getShadowMetadata(v, p);
-        A?.pathComponents && A.pathComponents.size === 0 && (delete A.pathComponents, w.getState().setShadowMetadata(v, p, A));
-      }), i?.components && B(v, [], i);
+      depsFunction: f || void 0,
+      deps: f ? f(D(v, [])) : [],
+      prevDeps: f ? f(D(v, [])) : []
+    }), L(v, [], {
+      ...k,
+      components: r
+    }), E({}), () => {
+      const o = $(v, []), s = o?.components?.get(T);
+      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));
+      }), o?.components && L(v, [], o);
     };
   }, []);
-  const f = nt(
+  const G = st(
     v,
-    E,
-    k
+    b,
+    _
   );
-  return w.getState().initialStateGlobal[v] || he(v, e), ye(() => we(
+  return p.getState().initialStateGlobal[v] || Me(v, e), pe(() => Ve(
     v,
-    f,
-    _.current,
-    E
-  ), [v, E]);
+    G,
+    C.current,
+    b
+  ), [v, b]);
 }
-const ot = (e, a, l) => {
-  let s = V(e, a)?.arrayKeys || [];
-  const g = l?.transforms;
-  if (!g || g.length === 0)
-    return s;
-  for (const c of g)
+const lt = (e, n, l) => {
+  let i = $(e, n)?.arrayKeys || [];
+  const f = l?.transforms;
+  if (!f || f.length === 0)
+    return i;
+  for (const c of f)
     if (c.type === "filter") {
       const m = [];
-      s.forEach((u, t) => {
-        const o = I(e, [...a, u]);
-        c.fn(o, t) && m.push(u);
-      }), s = m;
-    } else c.type === "sort" && s.sort((m, u) => {
-      const t = I(e, [...a, m]), o = I(e, [...a, u]);
-      return c.fn(t, o);
+      i.forEach((y, t) => {
+        const a = D(e, [...n, y]);
+        c.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);
     });
-  return s;
-}, K = (e, a, l) => {
-  const s = `${e}////${a}`, c = V(e, [])?.components?.get(s);
-  !c || c.reactiveType === "none" || !(Array.isArray(c.reactiveType) ? c.reactiveType : [c.reactiveType]).includes("component") || Ue(e, l, s);
-}, Q = (e, a, l) => {
-  const s = V(e, []), g = /* @__PURE__ */ new Set();
-  s?.components && s.components.forEach((m, u) => {
-    (Array.isArray(m.reactiveType) ? m.reactiveType : [m.reactiveType || "component"]).includes("all") && (m.forceUpdate(), g.add(u));
-  }), V(e, [
-    ...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) => {
+  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));
+  }), $(e, [
+    ...n,
     "getSelected"
   ])?.pathComponents?.forEach((m) => {
-    s?.components?.get(m)?.forceUpdate();
+    i?.components?.get(m)?.forceUpdate();
   });
-  const c = V(e, a);
+  const c = $(e, n);
   for (let m of c?.arrayKeys || []) {
-    const u = m + ".selected", t = V(e, u.split(".").slice(1));
-    m == l && t?.pathComponents?.forEach((o) => {
-      s?.components?.get(o)?.forceUpdate();
+    const y = m + ".selected", t = $(e, y.split(".").slice(1));
+    m == l && t?.pathComponents?.forEach((a) => {
+      i?.components?.get(a)?.forceUpdate();
     });
   }
 };
-function N(e, a, l) {
-  const s = V(e, a), g = a.length > 0 ? a.join(".") : "root", c = l?.arrayViews?.[g];
+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)
     return {
-      shadowMeta: s,
+      shadowMeta: i,
       value: [],
-      arrayKeys: s?.arrayKeys
+      arrayKeys: i?.arrayKeys
     };
-  const m = I(e, a, c);
+  const m = D(e, n, c);
   return {
-    shadowMeta: s,
+    shadowMeta: i,
     value: m,
-    arrayKeys: s?.arrayKeys
+    arrayKeys: i?.arrayKeys
   };
 }
-function we(e, a, l, s) {
-  const g = /* @__PURE__ */ new Map();
+function ut(e, n) {
+  return n ? e.length !== n.length ? !1 : n.every((l, i) => l === "*" || l === 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 [];
+  const i = [];
+  return l.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);
+}
+function ft(e, n, l) {
+  Ee(e, n).forEach((i) => {
+    if ("disabled" in i) {
+      i.disabled = l;
+      return;
+    }
+    i.style.pointerEvents = l ? "none" : "", i.setAttribute("aria-disabled", String(l));
+  });
+}
+function Ve(e, n, l, i) {
+  const f = /* @__PURE__ */ new Map();
   function c({
     path: t = [],
-    meta: o,
-    componentId: y
+    meta: a,
+    componentId: d
   }) {
-    const M = o ? JSON.stringify(o.arrayViews || o.transforms) : "", E = t.join(".") + ":" + y + ":" + M;
-    if (g.has(E))
-      return g.get(E);
-    const b = [e, ...t].join("."), v = () => {
+    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(L, f, J) {
-        if (J.length === 0) {
-          const r = t.length > 0 ? t.join(".") : "root", n = o?.arrayViews?.[r];
-          return K(e, y, t), I(e, t, n);
+      apply(G, g, T) {
+        if (T.length === 0) {
+          const r = t.length > 0 ? t.join(".") : "root", o = a?.arrayViews?.[r];
+          return ee(e, d, t), D(e, t, o);
         }
-        const P = J[0];
-        return a(P, t, { updateType: "update" }), !0;
+        const k = T[0];
+        return n(k, t, { updateType: "update" }), !0;
       },
-      get(L, f, J) {
-        if (f === Symbol.toPrimitive)
+      get(G, g, T) {
+        if (g === Symbol.toPrimitive)
           return (r) => r === "number" ? NaN : r === "string" ? `[CogsState: ${t.join(".") || "root"}]` : null;
-        if (f === Symbol.toStringTag)
+        if (g === Symbol.toStringTag)
           return "CogsState";
-        if (f === Symbol.iterator) {
-          const { value: r } = N(e, t, o);
+        if (g === Symbol.iterator) {
+          const { value: r } = j(e, t, a);
           return Array.isArray(r) ? function* () {
-            for (let n = 0; n < r.length; n++)
-              yield r[n];
+            for (let o = 0; o < r.length; o++)
+              yield r[o];
           } : void 0;
         }
-        if (f === "call" || f === "apply" || f === "bind")
-          return Reflect.get(L, f, J);
-        if (typeof f != "string")
-          return Reflect.get(L, f);
-        if (t.length === 0 && f in m)
-          return m[f];
-        if (typeof f == "string" && !f.startsWith("$")) {
-          const r = [...t, f];
+        if (g === "call" || g === "apply" || g === "bind")
+          return Reflect.get(G, g, T);
+        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);
+          if (r !== null && typeof r == "object" && !Array.isArray(r) && Object.prototype.hasOwnProperty.call(r, g)) {
+            const u = [...t, g];
+            return c({
+              path: u,
+              componentId: d,
+              meta: a
+            });
+          }
+          const s = R.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);
+                return h.handler(
+                  {
+                    stateKey: e,
+                    path: t,
+                    pluginName: u.name,
+                    options: M,
+                    hookData: I,
+                    $get: () => j(e, t, a).value,
+                    $update: (P) => (n(P, t, {
+                      updateType: "update"
+                    }), {
+                      synced: () => {
+                        const O = p.getState().getShadowMetadata(e, t);
+                        L(e, t, {
+                          ...O,
+                          isDirty: !1,
+                          stateSource: "server",
+                          lastServerSync: Date.now()
+                        });
+                      }
+                    }),
+                    $applyOperation: (P, O) => {
+                      n(P.newValue, P.path, {
+                        updateType: P.updateType,
+                        itemId: P.itemId,
+                        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),
+                    getFieldElements: () => Ee(e, t),
+                    setFieldDisabled: (P) => ft(e, t, P)
+                  },
+                  ...w
+                );
+              };
+          }
+          const S = [...t, g];
           return c({
-            path: r,
-            componentId: y,
-            meta: o
+            path: S,
+            componentId: d,
+            meta: a
           });
         }
-        if (f === "$_rebuildStateShape")
+        if (g === "$_rebuildStateShape")
           return c;
-        if (f === "$sync" && t.length === 0)
+        if (g === "$sync" && t.length === 0)
           return async function() {
-            const r = w.getState().getInitialOptions(e), n = r?.sync;
-            if (!n)
+            const r = p.getState().getInitialOptions(e), o = r?.sync;
+            if (!o)
               return console.error(`No mutation defined for state key "${e}"`), { success: !1, error: "No mutation defined" };
-            const i = w.getState().getShadowValue(e, []), S = r?.validation?.key;
+            const s = p.getState().getShadowValue(e, []), S = r?.validation?.key;
             try {
-              const d = await n.action(i);
-              if (d && !d.success && d.errors, d?.success) {
-                const h = w.getState().getShadowMetadata(e, []);
-                B(e, [], {
+              const u = await o.action(s);
+              if (u && !u.success && u.errors, u?.success) {
+                const h = p.getState().getShadowMetadata(e, []);
+                L(e, [], {
                   ...h,
                   isDirty: !1,
                   lastServerSync: Date.now(),
                   stateSource: "server",
-                  baseServerState: i
+                  baseServerState: s
                   // Update base server state
-                }), n.onSuccess && n.onSuccess(d.data);
-              } else !d?.success && n.onError && n.onError(d.error);
-              return d;
-            } catch (d) {
-              return n.onError && n.onError(d), { success: !1, error: d };
+                }), o.onSuccess && o.onSuccess(u.data);
+              } else !u?.success && o.onError && o.onError(u.error);
+              return u;
+            } catch (u) {
+              return o.onError && o.onError(u), { success: !1, error: u };
             }
           };
-        if (f === "$_status" || f === "$getStatus") {
+        if (g === "$_status" || g === "$getStatus") {
           const r = () => {
-            const { shadowMeta: n, value: i } = N(e, t, o);
-            return n?.isDirty === !0 ? "dirty" : n?.stateSource === "server" || n?.isDirty === !1 ? "synced" : n?.stateSource === "localStorage" ? "restored" : n?.stateSource === "default" || i !== void 0 ? "fresh" : "unknown";
+            const { shadowMeta: o, value: s } = j(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 f === "$_status" ? r() : r;
+          return g === "$_status" ? r() : r;
         }
-        if (f === "$removeStorage")
+        if (g === "$removeStorage")
           return () => {
-            const r = w.getState().initialStateGlobal[e], n = C(e), i = U(n?.localStorage?.key) ? n.localStorage.key(r) : n?.localStorage?.key, S = `${s}-${e}-${i}`;
-            S && localStorage.removeItem(S);
+            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);
+          };
+        if (g === "$setRaw")
+          return (r) => {
+            const o = $(e, t) || {};
+            L(e, t, { ...o, isRaw: !0 }), n(r, t, { updateType: "update" });
           };
-        if (f === "$validate")
+        if (g === "$validate")
           return () => {
-            const r = w.getState(), { value: n } = N(e, t, o), i = r.getInitialOptions(e), S = i?.validation?.zodSchemaV4 || i?.validation?.zodSchemaV3;
+            const r = p.getState(), { value: o } = j(e, t, a), s = r.getInitialOptions(e), S = s?.validation?.zodSchemaV4 || s?.validation?.zodSchemaV3;
             if (!S)
-              return { success: !0, data: n };
-            const d = S.safeParse(n);
-            if (d.success) {
+              return { success: !0, data: o };
+            const u = S.safeParse(o);
+            if (u.success) {
               const h = r.getShadowMetadata(e, t) || {};
               r.setShadowMetadata(e, t, {
                 ...h,
@@ -734,18 +811,18 @@ function we(e, a, l, s) {
                 }
               });
             } else
-              (d.error?.issues || d.error?.errors || []).forEach((p) => {
-                const A = [...t, ...p.path.map(String)], $ = r.getShadowMetadata(e, A) || {};
+              (u.error?.issues || u.error?.errors || []).forEach((w) => {
+                const A = [...t, ...w.path.map(String)], M = r.getShadowMetadata(e, A) || {};
                 r.setShadowMetadata(e, A, {
-                  ...$,
+                  ...M,
                   validation: {
                     status: "INVALID",
                     errors: [
                       {
                         source: "client",
-                        message: p.message,
+                        message: w.message,
                         severity: "error",
-                        code: p.code
+                        code: w.code
                       }
                     ],
                     lastValidated: Date.now(),
@@ -753,403 +830,403 @@ function we(e, a, l, s) {
                   }
                 });
               });
-            return F(e), d;
+            return W(e), u;
           };
-        if (f === "$showValidationErrors")
+        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((n) => n.severity === "error").map((n) => n.message) : [];
+            const { shadowMeta: r } = j(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 (f === "$getSelected")
+        if (g === "$getSelected")
           return () => {
             const r = [e, ...t].join(".");
-            K(e, y, [
+            ee(e, d, [
               ...t,
               "getSelected"
             ]);
-            const n = w.getState().selectedIndicesMap.get(r);
-            if (!n)
+            const o = p.getState().selectedIndicesMap.get(r);
+            if (!o)
               return;
-            const i = t.join("."), S = o?.arrayViews?.[i], d = n.split(".").pop();
-            if (!(S && !S.includes(d) || I(
+            const s = t.join("."), S = a?.arrayViews?.[s], u = o.split(".").pop();
+            if (!(S && !S.includes(u) || D(
               e,
-              n.split(".").slice(1)
+              o.split(".").slice(1)
             ) === void 0))
               return c({
-                path: n.split(".").slice(1),
-                componentId: y,
-                meta: o
+                path: o.split(".").slice(1),
+                componentId: d,
+                meta: a
               });
           };
-        if (f === "$getSelectedIndex")
+        if (g === "$getSelectedIndex")
           return () => {
             const r = e + "." + t.join(".");
             t.join(".");
-            const n = w.getState().selectedIndicesMap.get(r);
-            if (!n)
+            const o = p.getState().selectedIndicesMap.get(r);
+            if (!o)
               return -1;
-            const { keys: i } = D(e, t, o);
-            if (!i)
+            const { keys: s } = N(e, t, a);
+            if (!s)
               return -1;
-            const S = n.split(".").pop();
-            return i.indexOf(S);
+            const S = o.split(".").pop();
+            return s.indexOf(S);
           };
-        if (f === "$clearSelected")
-          return Q(e, t), () => {
-            Re({
+        if (g === "$clearSelected")
+          return Y(e, t), () => {
+            Je({
               arrayKey: e + "." + t.join(".")
             });
           };
-        if (f === "$map")
+        if (g === "$map")
           return (r) => {
-            const { value: n, keys: i } = D(
+            const { value: o, keys: s } = N(
               e,
               t,
-              o
+              a
             );
-            if (K(e, y, t), !i || !Array.isArray(n))
+            if (ee(e, d, t), !s || !Array.isArray(o))
               return [];
             const S = c({
               path: t,
-              componentId: y,
-              meta: o
+              componentId: d,
+              meta: a
             });
-            return n.map((d, h) => {
-              const p = i[h];
-              if (!p) return;
-              const A = [...t, p], $ = c({
+            return o.map((u, h) => {
+              const w = s[h];
+              if (!w) return;
+              const A = [...t, w], M = c({
                 path: A,
                 // This now correctly points to the item in the shadow store.
-                componentId: y,
-                meta: o
+                componentId: d,
+                meta: a
               });
-              return r($, h, S);
+              return r(M, h, S);
             });
           };
-        if (f === "$filter")
+        if (g === "$filter")
           return (r) => {
-            const n = t.length > 0 ? t.join(".") : "root", { keys: i, value: S } = D(
+            const o = t.length > 0 ? t.join(".") : "root", { keys: s, value: S } = N(
               e,
               t,
-              o
+              a
             );
             if (!Array.isArray(S))
               throw new Error("filter can only be used on arrays");
-            const d = [];
-            return S.forEach((h, p) => {
-              if (r(h, p)) {
-                const A = i[p];
-                A && d.push(A);
+            const u = [];
+            return S.forEach((h, w) => {
+              if (r(h, w)) {
+                const A = s[w];
+                A && u.push(A);
               }
             }), c({
               path: t,
-              componentId: y,
+              componentId: d,
               meta: {
-                ...o,
+                ...a,
                 arrayViews: {
-                  ...o?.arrayViews || {},
-                  [n]: d
+                  ...a?.arrayViews || {},
+                  [o]: u
                 },
                 transforms: [
-                  ...o?.transforms || [],
+                  ...a?.transforms || [],
                   { type: "filter", fn: r, path: t }
                 ]
               }
             });
           };
-        if (f === "$sort")
+        if (g === "$sort")
           return (r) => {
-            const n = t.length > 0 ? t.join(".") : "root", { value: i, keys: S } = D(
+            const o = t.length > 0 ? t.join(".") : "root", { value: s, keys: S } = N(
               e,
               t,
-              o
+              a
             );
-            if (!Array.isArray(i) || !S)
+            if (!Array.isArray(s) || !S)
               throw new Error("No array keys found for sorting");
-            const d = i.map((p, A) => ({
-              item: p,
+            const u = s.map((w, A) => ({
+              item: w,
               key: S[A]
             }));
-            d.sort((p, A) => r(p.item, A.item));
-            const h = d.map((p) => p.key);
+            u.sort((w, A) => r(w.item, A.item));
+            const h = u.map((w) => w.key);
             return c({
               path: t,
-              componentId: y,
+              componentId: d,
               meta: {
-                ...o,
+                ...a,
                 arrayViews: {
-                  ...o?.arrayViews || {},
-                  [n]: h
+                  ...a?.arrayViews || {},
+                  [o]: h
                 },
                 transforms: [
-                  ...o?.transforms || [],
+                  ...a?.transforms || [],
                   { type: "sort", fn: r, path: t }
                 ]
               }
             });
           };
-        if (f === "$list")
-          return (r) => /* @__PURE__ */ H(() => {
-            const i = G(/* @__PURE__ */ new Map()), [S, d] = ee({}), h = t.length > 0 ? t.join(".") : "root", p = ot(e, t, o), A = ye(() => ({
-              ...o,
+        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(() => ({
+              ...a,
               arrayViews: {
-                ...o?.arrayViews || {},
-                [h]: p
+                ...a?.arrayViews || {},
+                [h]: w
               }
-            }), [o, h, p]), { value: $ } = D(
+            }), [a, h, w]), { value: M } = N(
               e,
               t,
               A
             );
-            if (q(() => {
-              const z = w.getState().subscribeToPath(b, (j) => {
-                if (j.type === "GET_SELECTED")
+            if (x(() => {
+              const O = p.getState().subscribeToPath(v, (F) => {
+                if (F.type === "GET_SELECTED")
                   return;
-                const R = w.getState().getShadowMetadata(e, t)?.transformCaches;
-                if (R)
-                  for (const X of R.keys())
-                    X.startsWith(y) && R.delete(X);
-                (j.type === "INSERT" || j.type === "INSERT_MANY" || j.type === "REMOVE" || j.type === "CLEAR_SELECTION" || j.type === "SERVER_STATE_UPDATE" && !o?.serverStateIsUpStream) && d({});
+                const B = p.getState().getShadowMetadata(e, t)?.transformCaches;
+                if (B)
+                  for (const K of B.keys())
+                    K.startsWith(d) && B.delete(K);
+                (F.type === "INSERT" || F.type === "INSERT_MANY" || F.type === "REMOVE" || F.type === "CLEAR_SELECTION" || F.type === "SERVER_STATE_UPDATE" && !a?.serverStateIsUpStream) && u({});
               });
               return () => {
-                z();
+                O();
               };
-            }, [y, b]), !Array.isArray($))
+            }, [d, v]), !Array.isArray(M))
               return null;
-            const T = c({
+            const I = c({
               path: t,
-              componentId: y,
+              componentId: d,
               meta: A
               // Use updated meta here
-            }), O = $.map((z, j) => {
-              const x = p[j];
-              if (!x)
+            }), P = M.map((O, F) => {
+              const H = w[F];
+              if (!H)
                 return null;
-              let R = i.current.get(x);
-              R || (R = te(), i.current.set(x, R));
-              const X = [...t, x];
-              return ue(ke, {
-                key: x,
+              let B = s.current.get(H);
+              B || (B = re(), s.current.set(H, B));
+              const K = [...t, H];
+              return fe(Ue, {
+                key: H,
                 stateKey: e,
-                itemComponentId: R,
-                itemPath: X,
-                localIndex: j,
-                arraySetter: T,
+                itemComponentId: B,
+                itemPath: K,
+                localIndex: F,
+                arraySetter: I,
                 rebuildStateShape: c,
                 renderFn: r
               });
             });
-            return /* @__PURE__ */ H(pe, { children: O });
+            return /* @__PURE__ */ Q(Pe, { children: P });
           }, {});
-        if (f === "$stateFlattenOn")
+        if (g === "$stateFlattenOn")
           return (r) => {
-            const n = t.length > 0 ? t.join(".") : "root", i = o?.arrayViews?.[n], S = w.getState().getShadowValue(e, t, i);
+            const o = t.length > 0 ? t.join(".") : "root", s = a?.arrayViews?.[o], S = p.getState().getShadowValue(e, t, s);
             return Array.isArray(S) ? c({
               path: [...t, "[*]", r],
-              componentId: y,
-              meta: o
+              componentId: d,
+              meta: a
             }) : [];
           };
-        if (f === "$index")
+        if (g === "$index")
           return (r) => {
-            const n = t.length > 0 ? t.join(".") : "root", i = o?.arrayViews?.[n];
-            if (i) {
-              const h = i[r];
+            const o = t.length > 0 ? t.join(".") : "root", s = a?.arrayViews?.[o];
+            if (s) {
+              const h = s[r];
               return h ? c({
                 path: [...t, h],
-                componentId: y,
-                meta: o
+                componentId: d,
+                meta: a
               }) : void 0;
             }
-            const S = V(e, t);
+            const S = $(e, t);
             if (!S?.arrayKeys) return;
-            const d = S.arrayKeys[r];
-            if (d)
+            const u = S.arrayKeys[r];
+            if (u)
               return c({
-                path: [...t, d],
-                componentId: y,
-                meta: o
+                path: [...t, u],
+                componentId: d,
+                meta: a
               });
           };
-        if (f === "$last")
+        if (g === "$last")
           return () => {
-            const { keys: r } = D(e, t, o);
+            const { keys: r } = N(e, t, a);
             if (!r || r.length === 0)
               return;
-            const n = r[r.length - 1];
-            if (!n)
+            const o = r[r.length - 1];
+            if (!o)
               return;
-            const i = [...t, n];
+            const s = [...t, o];
             return c({
-              path: i,
-              componentId: y,
-              meta: o
+              path: s,
+              componentId: d,
+              meta: a
             });
           };
-        if (f === "$insert")
-          return (r, n) => {
-            a(r, t, {
+        if (g === "$insert")
+          return (r, o) => {
+            n(r, t, {
               updateType: "insert",
-              index: n
+              index: o
             });
           };
-        if (f === "$insertMany")
+        if (g === "$insertMany")
           return (r) => {
-            a(r, t, {
+            n(r, t, {
               updateType: "insert_many"
             });
           };
-        if (f === "$uniqueInsert")
-          return (r, n, i) => {
-            const { value: S } = N(
+        if (g === "$uniqueInsert")
+          return (r, o, s) => {
+            const { value: S } = j(
               e,
               t,
-              o
-            ), d = U(r) ? r(S) : r;
+              a
+            ), u = z(r) ? r(S) : r;
             let h = null;
             if (!S.some((A) => {
-              const $ = n ? n.every(
-                (T) => Y(A[T], d[T])
-              ) : Y(A, d);
-              return $ && (h = A), $;
+              const M = o ? o.every(
+                (I) => Z(A[I], u[I])
+              ) : Z(A, u);
+              return M && (h = A), M;
             }))
-              a(d, t, { updateType: "insert" });
-            else if (i && h) {
-              const A = i(h), $ = S.map(
-                (T) => Y(T, h) ? A : T
+              n(u, t, { updateType: "insert" });
+            else if (s && h) {
+              const A = s(h), M = S.map(
+                (I) => Z(I, h) ? A : I
               );
-              a($, t, {
+              n(M, t, {
                 updateType: "update"
               });
             }
           };
-        if (f === "$cut")
-          return (r, n) => {
-            const i = V(e, t);
-            if (!i?.arrayKeys || i.arrayKeys.length === 0)
+        if (g === "$cut")
+          return (r, o) => {
+            const s = $(e, t);
+            if (!s?.arrayKeys || s.arrayKeys.length === 0)
               return;
-            const S = r === -1 ? i.arrayKeys.length - 1 : r !== void 0 ? r : i.arrayKeys.length - 1, d = i.arrayKeys[S];
-            d && a(null, [...t, d], {
+            const S = r === -1 ? s.arrayKeys.length - 1 : r !== void 0 ? r : s.arrayKeys.length - 1, u = s.arrayKeys[S];
+            u && n(null, [...t, u], {
               updateType: "cut"
             });
           };
-        if (f === "$cutSelected")
+        if (g === "$cutSelected")
           return () => {
-            const r = [e, ...t].join("."), { keys: n } = D(e, t, o);
-            if (!n || n.length === 0)
+            const r = [e, ...t].join("."), { keys: o } = N(e, t, a);
+            if (!o || o.length === 0)
               return;
-            const i = w.getState().selectedIndicesMap.get(r);
-            if (!i)
+            const s = p.getState().selectedIndicesMap.get(r);
+            if (!s)
               return;
-            const S = i.split(".").pop();
-            if (!n.includes(S))
+            const S = s.split(".").pop();
+            if (!o.includes(S))
               return;
-            const d = i.split(".").slice(1);
-            w.getState().clearSelectedIndex({ arrayKey: r });
-            const h = d.slice(0, -1);
-            Q(e, h), a(null, d, {
+            const u = s.split(".").slice(1);
+            p.getState().clearSelectedIndex({ arrayKey: r });
+            const h = u.slice(0, -1);
+            Y(e, h), n(null, u, {
               updateType: "cut"
             });
           };
-        if (f === "$cutByValue")
+        if (g === "$cutByValue")
           return (r) => {
             const {
-              isArray: n,
-              value: i,
+              isArray: o,
+              value: s,
               keys: S
-            } = D(e, t, o);
-            if (!n) return;
-            const d = se(i, S, (h) => h === r);
-            d && a(null, [...t, d.key], {
+            } = N(e, t, a);
+            if (!o) return;
+            const u = se(s, S, (h) => h === r);
+            u && n(null, [...t, u.key], {
               updateType: "cut"
             });
           };
-        if (f === "$toggleByValue")
+        if (g === "$toggleByValue")
           return (r) => {
             const {
-              isArray: n,
-              value: i,
+              isArray: o,
+              value: s,
               keys: S
-            } = D(e, t, o);
-            if (!n) return;
-            const d = se(i, S, (h) => h === r);
-            if (d) {
-              const h = [...t, d.key];
-              a(null, h, {
+            } = N(e, t, a);
+            if (!o) return;
+            const u = se(s, S, (h) => h === r);
+            if (u) {
+              const h = [...t, u.key];
+              n(null, h, {
                 updateType: "cut"
               });
             } else
-              a(r, t, { updateType: "insert" });
+              n(r, t, { updateType: "insert" });
           };
-        if (f === "$findWith")
-          return (r, n) => {
-            const { isArray: i, value: S, keys: d } = D(e, t, o);
-            if (!i)
+        if (g === "$findWith")
+          return (r, o) => {
+            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(
               S,
-              d,
-              (p) => p?.[r] === n
+              u,
+              (w) => w?.[r] === o
             );
             return h ? c({
               path: [...t, h.key],
-              componentId: y,
-              meta: o
+              componentId: d,
+              meta: a
             }) : null;
           };
-        if (f === "$cutThis") {
-          const { value: r } = N(e, t, o), n = t.slice(0, -1);
-          return Q(e, n), () => {
-            a(r, t, { updateType: "cut" });
+        if (g === "$cutThis") {
+          const { value: r } = j(e, t, a), o = t.slice(0, -1);
+          return Y(e, o), () => {
+            n(r, t, { updateType: "cut" });
           };
         }
-        if (f === "$get")
+        if (g === "$get")
           return () => {
-            K(e, y, t);
-            const { value: r } = N(e, t, o);
+            ee(e, d, t);
+            const { value: r } = j(e, t, a);
             return r;
           };
-        if (f === "$$derive")
-          return (r) => Se({
+        if (g === "$$derive")
+          return (r) => we({
             _stateKey: e,
             _path: t,
             _effect: r.toString(),
-            _meta: o
+            _meta: a
           });
-        if (f === "$$get")
-          return () => Se({ _stateKey: e, _path: t, _meta: o });
-        if (f === "$lastSynced") {
+        if (g === "$$get")
+          return () => we({ _stateKey: e, _path: t, _meta: a });
+        if (g === "$lastSynced") {
           const r = `${e}:${t.join(".")}`;
-          return Le(r);
+          return He(r);
         }
-        if (f == "getLocalStorage")
-          return (r) => oe(s + "-" + e + "-" + r);
-        if (f === "$isSelected") {
+        if (g == "getLocalStorage")
+          return (r) => ie(i + "-" + e + "-" + r);
+        if (g === "$isSelected") {
           const r = t.slice(0, -1);
-          if (V(e, r)?.arrayKeys) {
-            const i = e + "." + r.join("."), S = w.getState().selectedIndicesMap.get(i), d = e + "." + t.join(".");
-            return S === d;
+          if ($(e, r)?.arrayKeys) {
+            const s = e + "." + r.join("."), S = p.getState().selectedIndicesMap.get(s), u = e + "." + t.join(".");
+            return S === u;
           }
           return;
         }
-        if (f === "$setSelected")
+        if (g === "$setSelected")
           return (r) => {
-            const n = t.slice(0, -1), i = e + "." + n.join("."), S = e + "." + t.join(".");
-            Q(e, n, void 0), w.getState().selectedIndicesMap.get(i), r && w.getState().setSelectedIndex(i, S);
+            const o = t.slice(0, -1), s = e + "." + o.join("."), S = e + "." + t.join(".");
+            Y(e, o, void 0), p.getState().selectedIndicesMap.get(s), r && p.getState().setSelectedIndex(s, S);
           };
-        if (f === "$toggleSelected")
+        if (g === "$toggleSelected")
           return () => {
-            const r = t.slice(0, -1), n = e + "." + r.join("."), i = e + "." + t.join(".");
-            w.getState().selectedIndicesMap.get(n) === i ? w.getState().clearSelectedIndex({ arrayKey: n }) : w.getState().setSelectedIndex(n, i), Q(e, r);
+            const r = t.slice(0, -1), o = e + "." + r.join("."), s = e + "." + t.join(".");
+            p.getState().selectedIndicesMap.get(o) === s ? p.getState().clearSelectedIndex({ arrayKey: o }) : p.getState().setSelectedIndex(o, s), Y(e, r);
           };
-        if (f === "$clearValidation")
+        if (g === "$clearValidation")
           return (r) => {
-            const n = r ? [...t, ...r] : t, i = w.getState(), S = i.getShadowNode(e, n);
+            const o = r ? [...t, ...r] : t, s = p.getState(), S = s.getShadowNode(e, o);
             if (console.log("startNode ", S), !S) return;
-            const d = [[S, n]];
-            for (console.log("stack ", d); d.length > 0; ) {
-              const [h, p] = d.pop();
-              if (console.log("while (stack.length ", h, p), !h || typeof h != "object") continue;
+            const u = [[S, o]];
+            for (console.log("stack ", u); u.length > 0; ) {
+              const [h, w] = u.pop();
+              if (console.log("while (stack.length ", h, w), !h || typeof h != "object") continue;
               if (h._meta?.validation) {
                 h._meta.validation = {
                   status: "NOT_VALIDATED",
@@ -1157,50 +1234,50 @@ function we(e, a, l, s) {
                   lastValidated: Date.now(),
                   validatedValue: void 0
                 };
-                const $ = [e, ...p].join(".");
-                i.notifyPathSubscribers($, {
+                const M = [e, ...w].join(".");
+                s.notifyPathSubscribers(M, {
                   type: "VALIDATION_CLEAR"
                 });
               }
               const A = Object.keys(h);
-              for (const $ of A)
-                $ !== "_meta" && d.push([h[$], [...p, $]]);
+              for (const M of A)
+                M !== "_meta" && u.push([h[M], [...w, M]]);
             }
-            F(e);
+            W(e);
           };
         if (t.length == 0) {
-          if (f === "$_componentId")
-            return y;
-          if (f === "$setOptions")
+          if (g === "$_componentId")
+            return d;
+          if (g === "$setOptions")
             return (r) => {
-              ce({ stateKey: e, options: r, initialOptionsPart: {} });
+              ue({ stateKey: e, options: r, initialOptionsPart: {} });
             };
-          if (f === "$_applyUpdate")
-            return (r, n, i = "update") => {
-              a(r, n, { updateType: i });
+          if (g === "$_applyUpdate")
+            return (r, o, s = "update") => {
+              n(r, o, { updateType: s });
             };
-          if (f === "$_getEffectiveSetState")
-            return a;
-          if (f === "$getPluginMetaData")
-            return (r) => Be(e, t)?.get(r);
-          if (f === "$addPluginMetaData")
-            return (r, n) => Ge(e, t, r, n);
-          if (f === "$removePluginMetaData")
-            return (r) => qe(e, t, r);
-          if (f === "$addZodValidation")
-            return (r, n) => {
-              r.forEach((i) => {
-                const S = w.getState().getShadowMetadata(e, i.path) || {};
-                w.getState().setShadowMetadata(e, i.path, {
+          if (g === "$_getEffectiveSetState")
+            return n;
+          if (g === "$getPluginMetaData")
+            return (r) => me(e, t)?.get(r);
+          if (g === "$addPluginMetaData")
+            return (r, o) => he(e, t, r, o);
+          if (g === "$removePluginMetaData")
+            return (r) => ve(e, t, r);
+          if (g === "$addZodValidation")
+            return (r, o) => {
+              r.forEach((s) => {
+                const S = p.getState().getShadowMetadata(e, s.path) || {};
+                p.getState().setShadowMetadata(e, s.path, {
                   ...S,
                   validation: {
                     status: "INVALID",
                     errors: [
                       {
-                        source: n || "client",
-                        message: i.message,
+                        source: o || "client",
+                        message: s.message,
                         severity: "error",
-                        code: i.code
+                        code: s.code
                       }
                     ],
                     lastValidated: Date.now(),
@@ -1209,194 +1286,194 @@ function we(e, a, l, s) {
                 });
               });
             };
-          if (f === "$applyOperation")
-            return (r, n) => {
-              let i;
+          if (g === "$applyOperation")
+            return (r, o) => {
+              let s;
               if (r.insertAfterId && r.updateType === "insert") {
-                const S = V(e, r.path);
+                const S = $(e, r.path);
                 if (S?.arrayKeys) {
-                  const d = S.arrayKeys.indexOf(
+                  const u = S.arrayKeys.indexOf(
                     r.insertAfterId
                   );
-                  d !== -1 && (i = d + 1);
+                  u !== -1 && (s = u + 1);
                 }
               }
-              a(r.newValue, r.path, {
+              n(r.newValue, r.path, {
                 updateType: r.updateType,
                 itemId: r.itemId,
-                index: i,
+                index: s,
                 // Pass the calculated index
-                metaData: n
+                metaData: o
               });
             };
-          if (f === "$applyJsonPatch")
+          if (g === "$applyJsonPatch")
             return (r) => {
-              const n = w.getState(), i = n.getShadowMetadata(e, []);
-              if (!i?.components) return;
-              const S = (h) => !h || h === "/" ? [] : h.split("/").slice(1).map((p) => p.replace(/~1/g, "/").replace(/~0/g, "~")), d = /* @__PURE__ */ new Set();
+              const o = p.getState(), s = o.getShadowMetadata(e, []);
+              if (!s?.components) return;
+              const S = (h) => !h || h === "/" ? [] : h.split("/").slice(1).map((w) => w.replace(/~1/g, "/").replace(/~0/g, "~")), u = /* @__PURE__ */ new Set();
               for (const h of r) {
-                const p = S(h.path);
+                const w = S(h.path);
                 switch (h.op) {
                   case "add":
                   case "replace": {
                     const { value: A } = h;
-                    n.updateShadowAtPath(e, p, A), n.markAsDirty(e, p, { bubble: !0 });
-                    let $ = [...p];
+                    o.updateShadowAtPath(e, w, A), o.markAsDirty(e, w, { bubble: !0 });
+                    let M = [...w];
                     for (; ; ) {
-                      const T = n.getShadowMetadata(
+                      const I = o.getShadowMetadata(
                         e,
-                        $
+                        M
                       );
-                      if (T?.pathComponents && T.pathComponents.forEach((O) => {
-                        if (!d.has(O)) {
-                          const z = i.components?.get(O);
-                          z && (z.forceUpdate(), d.add(O));
+                      if (I?.pathComponents && I.pathComponents.forEach((P) => {
+                        if (!u.has(P)) {
+                          const O = s.components?.get(P);
+                          O && (O.forceUpdate(), u.add(P));
                         }
-                      }), $.length === 0) break;
-                      $.pop();
+                      }), M.length === 0) break;
+                      M.pop();
                     }
                     break;
                   }
                   case "remove": {
-                    const A = p.slice(0, -1);
-                    n.removeShadowArrayElement(e, p), n.markAsDirty(e, A, { bubble: !0 });
-                    let $ = [...A];
+                    const A = w.slice(0, -1);
+                    o.removeShadowArrayElement(e, w), o.markAsDirty(e, A, { bubble: !0 });
+                    let M = [...A];
                     for (; ; ) {
-                      const T = n.getShadowMetadata(
+                      const I = o.getShadowMetadata(
                         e,
-                        $
+                        M
                       );
-                      if (T?.pathComponents && T.pathComponents.forEach((O) => {
-                        if (!d.has(O)) {
-                          const z = i.components?.get(O);
-                          z && (z.forceUpdate(), d.add(O));
+                      if (I?.pathComponents && I.pathComponents.forEach((P) => {
+                        if (!u.has(P)) {
+                          const O = s.components?.get(P);
+                          O && (O.forceUpdate(), u.add(P));
                         }
-                      }), $.length === 0) break;
-                      $.pop();
+                      }), M.length === 0) break;
+                      M.pop();
                     }
                     break;
                   }
                 }
               }
             };
-          if (f === "$getComponents")
-            return () => V(e, [])?.components;
+          if (g === "$getComponents")
+            return () => $(e, [])?.components;
         }
-        if (f === "$validationWrapper")
+        if (g === "$validationWrapper")
           return ({
             children: r,
-            hideMessage: n
-          }) => /* @__PURE__ */ H(
-            Te,
+            hideMessage: o
+          }) => /* @__PURE__ */ Q(
+            Oe,
             {
-              formOpts: n ? { validation: { message: "" } } : void 0,
+              formOpts: o ? { validation: { message: "" } } : void 0,
               path: t,
               stateKey: e,
               children: r
             }
           );
-        if (f === "$_stateKey") return e;
-        if (f === "$_path") return t;
-        if (f === "$update")
-          return (r) => (a(r, t, { updateType: "update" }), {
+        if (g === "$_stateKey") return e;
+        if (g === "$_path") return t;
+        if (g === "$update")
+          return (r) => (n(r, t, { updateType: "update" }), {
             synced: () => {
-              const n = w.getState().getShadowMetadata(e, t);
-              B(e, t, {
-                ...n,
+              const o = p.getState().getShadowMetadata(e, t);
+              L(e, t, {
+                ...o,
                 isDirty: !1,
                 stateSource: "server",
                 lastServerSync: Date.now()
               });
-              const i = [e, ...t].join(".");
-              We(i, {
+              const s = [e, ...t].join(".");
+              Qe(s, {
                 type: "SYNC_STATUS_CHANGE",
                 isDirty: !1
               });
             }
           });
-        if (f === "$toggle") {
-          const { value: r } = N(
+        if (g === "$toggle") {
+          const { value: r } = j(
             e,
             t,
-            o
+            a
           );
           if (typeof r != "boolean")
             throw new Error("toggle() can only be used on boolean values");
           return () => {
-            a(!r, t, {
+            n(!r, t, {
               updateType: "update"
             });
           };
         }
-        if (f === "$isolate")
-          return (r, n) => {
-            const i = Array.isArray(r), S = i ? r : void 0, d = i ? n : r;
-            if (!d || typeof d != "function")
+        if (g === "$isolate")
+          return (r, o) => {
+            const s = Array.isArray(r), S = s ? r : void 0, u = s ? o : r;
+            if (!u || typeof u != "function")
               throw new Error(
                 "CogsState: $isolate requires a render function."
               );
-            return /* @__PURE__ */ H(
-              Pe,
+            return /* @__PURE__ */ Q(
+              je,
               {
                 stateKey: e,
                 path: t,
                 dependencies: S,
                 rebuildStateShape: c,
-                renderFn: d
+                renderFn: u
               }
             );
           };
-        if (f === "$formElement")
-          return (r, n) => /* @__PURE__ */ H(
-            Ie,
+        if (g === "$formElement")
+          return (r, o) => /* @__PURE__ */ Q(
+            Ne,
             {
               stateKey: e,
               path: t,
               rebuildStateShape: c,
-              setState: a,
-              formOpts: n,
+              setState: n,
+              formOpts: o,
               renderFn: r
             }
           );
-        const P = [...t, f];
+        const k = [...t, g];
         return c({
-          path: P,
-          componentId: y,
-          meta: o
+          path: k,
+          componentId: d,
+          meta: a
         });
       }
-    }, k = new Proxy(v, _);
-    return g.set(E, k), k;
+    }, J = new Proxy(C, _);
+    return f.set(V, J), J;
   }
   const m = {
     $revertToInitialState: (t) => {
-      const o = w.getState().getShadowMetadata(e, []);
-      let y;
-      o?.stateSource === "server" && o.baseServerState ? y = o.baseServerState : y = w.getState().initialStateGlobal[e], Fe(e), Z(e, y), c({
+      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({
         path: [],
         componentId: l
       });
-      const M = C(e), E = U(M?.localStorage?.key) ? M?.localStorage?.key(y) : M?.localStorage?.key, b = `${s}-${e}-${E}`;
-      return b && localStorage.removeItem(b), F(e), y;
+      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;
     },
     $initializeAndMergeShadowState: (t) => {
-      _e(e, t), F(e);
+      ze(e, t), W(e);
     },
     $updateInitialState: (t) => {
-      const o = we(
+      const a = Ve(
         e,
-        a,
+        n,
         l,
-        s
-      ), y = w.getState().initialStateGlobal[e], M = C(e), E = U(M?.localStorage?.key) ? M?.localStorage?.key(y) : M?.localStorage?.key, b = `${s}-${e}-${E}`;
-      return localStorage.getItem(b) && localStorage.removeItem(b), $e(() => {
-        he(e, t), Z(e, t);
-        const v = w.getState().getShadowMetadata(e, []);
-        v && v?.components?.forEach((_) => {
-          _.forceUpdate();
+        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);
+        const v = p.getState().getShadowMetadata(e, []);
+        v && v?.components?.forEach((C) => {
+          C.forceUpdate();
         });
       }), {
-        fetchId: (v) => o.$get()[v]
+        fetchId: (v) => a.$get()[v]
       };
     }
   };
@@ -1405,66 +1482,65 @@ function we(e, a, l, s) {
     path: []
   });
 }
-function Se(e) {
-  return ue(st, { proxy: e });
+function we(e) {
+  return fe(gt, { proxy: e });
 }
-function st({
+function gt({
   proxy: e
 }) {
-  const a = G(null), l = G(null), s = G(!1), g = `${e._stateKey}-${e._path.join(".")}`, c = e._path.length > 0 ? e._path.join(".") : "root", m = e._meta?.arrayViews?.[c], u = I(e._stateKey, e._path, m);
-  return q(() => {
-    const t = a.current;
-    if (!t || s.current) return;
-    const o = setTimeout(() => {
+  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 t = n.current;
+    if (!t || i.current) return;
+    const a = setTimeout(() => {
       if (!t.parentElement) {
-        console.warn("Parent element not found for signal", g);
+        console.warn("Parent element not found for signal", f);
         return;
       }
-      const y = t.parentElement, E = Array.from(y.childNodes).indexOf(t);
-      let b = y.getAttribute("data-parent-id");
-      b || (b = `parent-${crypto.randomUUID()}`, y.setAttribute("data-parent-id", b)), l.current = `instance-${crypto.randomUUID()}`;
-      const v = w.getState().getShadowMetadata(e._stateKey, e._path) || {}, _ = v.signals || [];
-      _.push({
+      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: b,
-        position: E,
+        parentId: V,
+        position: b,
         effect: e._effect
-      }), w.getState().setShadowMetadata(e._stateKey, e._path, {
+      }), p.getState().setShadowMetadata(e._stateKey, e._path, {
         ...v,
-        signals: _
+        signals: C
       });
-      let k = u;
+      let _ = y;
       if (e._effect)
         try {
-          k = new Function(
+          _ = new Function(
             "state",
             `return (${e._effect})(state)`
-          )(u);
-        } catch (f) {
-          console.error("Error evaluating effect function:", f);
+          )(y);
+        } catch (G) {
+          console.error("Error evaluating effect function:", G);
         }
-      k !== null && typeof k == "object" && (k = JSON.stringify(k));
-      const L = document.createTextNode(String(k ?? ""));
-      t.replaceWith(L), s.current = !0;
+      _ !== null && typeof _ == "object" && (_ = JSON.stringify(_));
+      const J = document.createTextNode(String(_ ?? ""));
+      t.replaceWith(J), i.current = !0;
     }, 0);
     return () => {
-      if (clearTimeout(o), l.current) {
-        const y = w.getState().getShadowMetadata(e._stateKey, e._path) || {};
-        y.signals && (y.signals = y.signals.filter(
-          (M) => M.instanceId !== l.current
-        ), w.getState().setShadowMetadata(e._stateKey, e._path, y));
+      if (clearTimeout(a), l.current) {
+        const d = p.getState().getShadowMetadata(e._stateKey, e._path) || {};
+        d.signals && (d.signals = d.signals.filter(
+          (E) => E.instanceId !== l.current
+        ), p.getState().setShadowMetadata(e._stateKey, e._path, d));
       }
     };
-  }, []), ue("span", {
-    ref: a,
+  }, []), fe("span", {
+    ref: n,
     style: { display: "contents" },
-    "data-signal-id": g
+    "data-signal-id": f
   });
 }
 export {
-  Se as $cogsSignal,
-  ht as addStateOptions,
-  vt as createCogsState,
-  at as useCogsStateFn
+  we as $cogsSignal,
+  $t as createCogsState,
+  ct as useCogsStateFn
 };
 //# sourceMappingURL=CogsState.js.map