@solidjs/signals 0.13.12 → 2.0.0-beta.7

package/dist/node.cjs

@@ -38,13 +38,13 @@ const a = 1 << 0;
 const d = 1 << 1;
 const h = 1 << 2;
 const p = 1;
-const g = 2;
-const y = 3;
+const y = 2;
+const g = 3;
 const S = {};
 const w = {};
 const m = "sp";
-const _ = typeof Proxy === "function";
-const b = {};
+const b = typeof Proxy === "function";
+const _ = {};
 const O = Symbol("refresh");
 function actualInsertIntoHeap(e, t) {
   const n = (e.i?.t ? e.i.u?.o : e.i?.o) ?? -1;
@@ -117,12 +117,12 @@ function markNode(e, r = n) {
 }
 function runHeap(e, t) {
   e._ = false;
-  for (e.A = 0; e.A <= e.S; e.A++) {
-    let n = e.l[e.A];
+  for (e.j = 0; e.j <= e.S; e.j++) {
+    let n = e.l[e.j];
     while (n !== undefined) {
       if (n.m & i) t(n);
       else adjustHeight(n, e);
-      n = e.l[e.A];
+      n = e.l[e.j];
     }
   }
   e.S = 0;
@@ -130,7 +130,7 @@ function runHeap(e, t) {
 function adjustHeight(e, t) {
   deleteFromHeap(e, t);
   let n = e.o;
-  for (let t = e.N; t; t = t.j) {
+  for (let t = e.A; t; t = t.N) {
     const e = t.R;
     const r = e.L || e;
     if (r.I && r.o >= n) n = r.o + 1;
@@ -144,16 +144,16 @@ function adjustHeight(e, t) {
 }
 const x = undefined;
 const v = new Set();
-const P = { l: new Array(2e3).fill(undefined), _: false, A: 0, S: 0 };
-const k = { l: new Array(2e3).fill(undefined), _: false, A: 0, S: 0 };
+const P = { l: new Array(2e3).fill(undefined), _: false, j: 0, S: 0 };
+const k = { l: new Array(2e3).fill(undefined), _: false, j: 0, S: 0 };
 let E = 0;
 let C = null;
 let W = false;
-let A = false;
-let N = null;
+let j = false;
+let A = null;
 function enforceLoadingBoundary(e) {}
 function shouldReadStashedOptimisticValue(e) {
-  return !!N?.has(e);
+  return !!A?.has(e);
 }
 function runLaneEffects(e) {
   for (const t of L) {
@@ -169,25 +169,25 @@ function queueStashedOptimisticEffects(e) {
   for (let t = e.O; t !== null; t = t.P) {
     const e = t.k;
     if (!e.D) continue;
-    if (e.D === y) {
+    if (e.D === g) {
       if (!e.F) {
         e.F = true;
-        e.M.enqueue(g, e.V);
+        e.V.enqueue(y, e.M);
       }
       continue;
     }
     const n = e.m & o ? k : P;
-    if (n.A > e.o) n.A = e.o;
+    if (n.j > e.o) n.j = e.o;
     insertIntoHeap(e, n);
   }
 }
 function setProjectionWriteActive(e) {
-  A = e;
+  j = e;
 }
 function mergeTransitionState(e, t) {
   t.B = e;
-  e.G.push(...t.G);
-  for (const n of L) if (n.K === t) n.K = e;
+  e.K.push(...t.K);
+  for (const n of L) if (n.G === t) n.G = e;
   e.U.push(...t.U);
   for (const n of t.J) e.J.add(n);
   for (const [n, r] of t.X) {
@@ -207,17 +207,17 @@ function resolveOptimisticNodes(e) {
     const r = n.ee;
     n.ee = S;
     if (r !== S && n.$ !== r) insertSubs(n, true);
-    n.K = null;
+    n.G = null;
   }
   e.length = 0;
 }
 function cleanupCompletedLanes(e) {
   for (const t of L) {
-    const n = e ? t.K === e : !t.K;
+    const n = e ? t.G === e : !t.G;
     if (!n) continue;
     if (!t.T) {
       if (t.q[0].length) runQueue(t.q[0], p);
-      if (t.q[1].length) runQueue(t.q[1], g);
+      if (t.q[1].length) runQueue(t.q[1], y);
     }
     if (t.te.Y === t) t.te.Y = undefined;
     t.H.clear();
@@ -230,7 +230,7 @@ function cleanupCompletedLanes(e) {
 function schedule() {
   if (W) return;
   W = true;
-  if (!j.ne && !A) queueMicrotask(flush);
+  if (!N.ne && !j) queueMicrotask(flush);
 }
 class Queue {
   i = null;
@@ -317,25 +317,25 @@ class GlobalQueue extends Queue {
           this.U = [];
           this.J = new Set();
           runLaneEffects(p);
-          runLaneEffects(g);
+          runLaneEffects(y);
           this.stashQueues(e.le);
           E++;
-          W = P.S >= P.A;
+          W = P.S >= P.j;
           reassignPendingTransition(e.se);
           C = null;
-          if (!e.G.length && e.U.length) {
-            N = new Set();
+          if (!e.K.length && e.U.length) {
+            A = new Set();
             for (let t = 0; t < e.U.length; t++) {
               const n = e.U[t];
               if (n.I || n.ce) continue;
-              N.add(n);
+              A.add(n);
               queueStashedOptimisticEffects(n);
             }
           }
           try {
             finalizePureQueue(null, true);
           } finally {
-            N = null;
+            A = null;
           }
           return;
         }
@@ -351,11 +351,11 @@ class GlobalQueue extends Queue {
         finalizePureQueue();
       }
       E++;
-      W = P.S >= P.A;
+      W = P.S >= P.j;
       runLaneEffects(p);
       this.run(p);
-      runLaneEffects(g);
-      this.run(g);
+      runLaneEffects(y);
+      this.run(y);
       if (false);
     } finally {
       this.ne = false;
@@ -389,7 +389,7 @@ class GlobalQueue extends Queue {
         X: new Map(),
         U: [],
         J: new Set(),
-        G: [],
+        K: [],
         le: { re: [[], []], ie: [] },
         B: false
       };
@@ -404,7 +404,7 @@ class GlobalQueue extends Queue {
     if (this.se !== C.se) {
       for (let e = 0; e < this.se.length; e++) {
         const t = this.se[e];
-        t.K = C;
+        t.G = C;
         C.se.push(t);
       }
       this.se = C.se;
@@ -412,13 +412,13 @@ class GlobalQueue extends Queue {
     if (this.U !== C.U) {
       for (let e = 0; e < this.U.length; e++) {
         const t = this.U[e];
-        t.K = C;
+        t.G = C;
         C.U.push(t);
       }
       this.U = C.U;
     }
     for (const e of L) {
-      if (!e.K) e.K = C;
+      if (!e.G) e.G = C;
     }
     if (this.J !== C.J) {
       for (const e of this.J) C.J.add(e);
@@ -442,28 +442,28 @@ function insertSubs(e, t = false) {
       i.k.Y = undefined;
     }
     const e = i.k;
-    if (e.D === y) {
+    if (e.D === g) {
       if (!e.F) {
         e.F = true;
-        e.M.enqueue(g, e.V);
+        e.V.enqueue(y, e.M);
       }
       continue;
     }
     const s = i.k.m & o ? k : P;
-    if (s.A > i.k.o) s.A = i.k.o;
+    if (s.j > i.k.o) s.j = i.k.o;
     insertIntoHeap(i.k, s);
   }
 }
 function commitPendingNodes() {
-  const e = j.se;
+  const e = N.se;
   for (let t = 0; t < e.length; t++) {
     const n = e[t];
     if (n.Z !== S) {
       n.$ = n.Z;
       n.Z = S;
-      if (n.D && n.D !== y) n.F = true;
+      if (n.D && n.D !== g) n.F = true;
     }
-    if (!(n.ge & a)) n.ge &= ~h;
+    if (!(n.ye & a)) n.ye &= ~h;
     if (n.I) GlobalQueue.ue(n, false, true);
   }
   e.length = 0;
@@ -471,12 +471,12 @@ function commitPendingNodes() {
 function finalizePureQueue(e = null, t = false) {
   const n = !t;
   if (n) commitPendingNodes();
-  if (!t) checkBoundaryChildren(j);
-  if (P.S >= P.A) runHeap(P, GlobalQueue.oe);
+  if (!t) checkBoundaryChildren(N);
+  if (P.S >= P.j) runHeap(P, GlobalQueue.oe);
   if (n) {
     commitPendingNodes();
-    resolveOptimisticNodes(e ? e.U : j.U);
-    const t = e ? e.J : j.J;
+    resolveOptimisticNodes(e ? e.U : N.U);
+    const t = e ? e.J : N.J;
     if (GlobalQueue.fe && t.size) {
       for (const e of t) {
         GlobalQueue.fe(e);
@@ -494,21 +494,21 @@ function checkBoundaryChildren(e) {
   }
 }
 function trackOptimisticStore(e) {
-  j.J.add(e);
+  N.J.add(e);
   schedule();
 }
 function reassignPendingTransition(e) {
   for (let t = 0; t < e.length; t++) {
-    e[t].K = C;
+    e[t].G = C;
   }
 }
-const j = new GlobalQueue();
+const N = new GlobalQueue();
 function flush() {
-  if (j.ne) {
+  if (N.ne) {
     return;
   }
   while (W || C) {
-    j.flush();
+    N.flush();
   }
 }
 function runQueue(e, t) {
@@ -516,19 +516,19 @@ function runQueue(e, t) {
 }
 function reporterBlocksSource(e, t) {
   if (e.m & (o | u)) return false;
-  if (e.ye === t || e.Se?.has(t)) return true;
-  for (let n = e.N; n; n = n.j) {
+  if (e.ge === t || e.Se?.has(t)) return true;
+  for (let n = e.A; n; n = n.N) {
     let e = n.R;
     while (e) {
       if (e === t || e.L === t) return true;
       e = e.we;
     }
   }
-  return !!(e.ge & a && e.ae instanceof NotReadyError && e.ae.source === t);
+  return !!(e.ye & a && e.ae instanceof NotReadyError && e.ae.source === t);
 }
 function transitionComplete(e) {
   if (e.B) return true;
-  if (e.G.length) return false;
+  if (e.K.length) return false;
   let t = true;
   for (const [n, r] of e.X) {
     let i = false;
@@ -540,7 +540,7 @@ function transitionComplete(e) {
       r.delete(e);
     }
     if (!i) e.X.delete(n);
-    else if (n.ge & a && n.ae?.source === n) {
+    else if (n.ye & a && n.ae?.source === n) {
       t = false;
       break;
     }
@@ -550,8 +550,8 @@ function transitionComplete(e) {
       const r = e.U[n];
       if (
         hasActiveOverride(r) &&
-        "ge" in r &&
-        r.ge & a &&
+        "ye" in r &&
+        r.ye & a &&
         r.ae instanceof NotReadyError &&
         r.ae.source !== r
       ) {
@@ -588,10 +588,10 @@ function getOrCreateLane(e) {
   }
   const n = e.we;
   const r = n?.Y ? findLane(n.Y) : null;
-  t = { te: e, H: new Set(), q: [[], []], T: null, K: C, me: r };
+  t = { te: e, H: new Set(), q: [[], []], T: null, G: C, me: r };
   R.set(e, t);
   L.add(t);
-  e._e = false;
+  e.be = false;
   return t;
 }
 function findLane(e) {
@@ -617,7 +617,7 @@ function resolveLane(e) {
   return undefined;
 }
 function resolveTransition(e) {
-  return resolveLane(e)?.K ?? e.K;
+  return resolveLane(e)?.G ?? e.G;
 }
 function hasActiveOverride(e) {
   return !!(e.ee !== undefined && e.ee !== S);
@@ -645,10 +645,10 @@ function assignOrMergeLane(e, t) {
 }
 function unlinkSubs(e) {
   const t = e.R;
-  const n = e.j;
+  const n = e.N;
   const r = e.P;
-  const i = e.be;
-  if (r !== null) r.be = i;
+  const i = e._e;
+  if (r !== null) r._e = i;
   else t.Oe = i;
   if (i !== null) i.P = r;
   else {
@@ -662,11 +662,12 @@ function unlinkSubs(e) {
 }
 function unobserved(e) {
   deleteFromHeap(e, e.m & o ? k : P);
-  let t = e.N;
+  let t = e.A;
   while (t !== null) {
     t = unlinkSubs(t);
   }
-  e.N = null;
+  e.A = null;
+  e.Pe = null;
   disposeChildren(e, true);
 }
 function link(e, t) {
@@ -675,7 +676,7 @@ function link(e, t) {
   let i = null;
   const s = t.m & r;
   if (s) {
-    i = n !== null ? n.j : t.N;
+    i = n !== null ? n.N : t.A;
     if (i !== null && i.R === e) {
       t.Pe = i;
       return;
@@ -683,20 +684,20 @@ function link(e, t) {
   }
   const o = e.Oe;
   if (o !== null && o.k === t && (!s || isValidLink(o, t))) return;
-  const u = (t.Pe = e.Oe = { R: e, k: t, j: i, be: o, P: null });
-  if (n !== null) n.j = u;
-  else t.N = u;
+  const u = (t.Pe = e.Oe = { R: e, k: t, N: i, _e: o, P: null });
+  if (n !== null) n.N = u;
+  else t.A = u;
   if (o !== null) o.P = u;
   else e.O = u;
 }
 function isValidLink(e, t) {
   const n = t.Pe;
   if (n !== null) {
-    let r = t.N;
+    let r = t.A;
     do {
       if (r === e) return true;
       if (r === n) break;
-      r = r.j;
+      r = r.N;
     } while (r !== null);
   }
   return false;
@@ -715,11 +716,11 @@ function markDisposal(e) {
   }
 }
 function dispose(e) {
-  let t = e.N || null;
+  let t = e.A || null;
   do {
     t = unlinkSubs(t);
   } while (t !== null);
-  e.N = null;
+  e.A = null;
   e.Pe = null;
   disposeChildren(e, true);
 }
@@ -730,14 +731,14 @@ function disposeChildren(e, t = false, n) {
   let r = n ? e.We : e.ke;
   while (r) {
     const e = r.Ee;
-    if (r.N) {
+    if (r.A) {
       const e = r;
       deleteFromHeap(e, e.m & o ? k : P);
-      let t = e.N;
+      let t = e.A;
       do {
         t = unlinkSubs(t);
       } while (t !== null);
-      e.N = null;
+      e.A = null;
       e.Pe = null;
     }
     disposeChildren(r, true);
@@ -747,12 +748,12 @@ function disposeChildren(e, t = false, n) {
     e.We = null;
   } else {
     e.ke = null;
-    e.Ae = 0;
+    e.je = 0;
   }
   runDisposal(e, n);
 }
 function runDisposal(e, t) {
-  let n = t ? e.Ne : e.je;
+  let n = t ? e.Ae : e.Ne;
   if (!n) return;
   if (Array.isArray(n)) {
     for (let e = 0; e < n.length; e++) {
@@ -762,12 +763,12 @@ function runDisposal(e, t) {
   } else {
     n.call(n);
   }
-  t ? (e.Ne = null) : (e.je = null);
+  t ? (e.Ae = null) : (e.Ne = null);
 }
 function childId(e, t) {
   let n = e;
   while (n.Re && n.i) n = n.i;
-  if (n.id != null) return formatId(n.id, t ? n.Ae++ : n.Ae);
+  if (n.id != null) return formatId(n.id, t ? n.je++ : n.je);
   throw new Error("Cannot get child id from owner without an id");
 }
 function getNextChildId(e) {
@@ -782,24 +783,24 @@ function formatId(e, t) {
   return e + (r ? String.fromCharCode(64 + r) : "") + n;
 }
 function getObserver() {
-  if (D || M) return I;
-  return H ? V : null;
+  if (D || V) return I;
+  return H ? M : null;
 }
 function getOwner() {
-  return V;
+  return M;
 }
 function cleanup(e) {
-  if (!V) return e;
-  if (!V.je) V.je = e;
-  else if (Array.isArray(V.je)) V.je.push(e);
-  else V.je = [V.je, e];
+  if (!M) return e;
+  if (!M.Ne) M.Ne = e;
+  else if (Array.isArray(M.Ne)) M.Ne.push(e);
+  else M.Ne = [M.Ne, e];
   return e;
 }
 function isDisposed(e) {
   return !!(e.m & (u | o));
 }
 function createOwner(e) {
-  const t = V;
+  const t = M;
   const n = e?.transparent ?? false;
   const r = {
     id: e?.id ?? (n ? t?.id : t?.id != null ? getNextChildId(t) : undefined),
@@ -808,11 +809,11 @@ function createOwner(e) {
     u: t?.t ? t.u : t,
     ke: null,
     Ee: null,
-    je: null,
-    M: t?.M ?? j,
-    Le: t?.Le || b,
-    Ae: 0,
     Ne: null,
+    V: t?.V ?? N,
+    Le: t?.Le || _,
+    je: 0,
+    Ae: null,
     We: null,
     i: t,
     dispose(e = true) {
@@ -835,28 +836,28 @@ function createRoot(e, t) {
   return runWithOwner(n, () => e(n.dispose));
 }
 function addPendingSource(e, t) {
-  if (e.ye === t || e.Se?.has(t)) return false;
-  if (!e.ye) {
-    e.ye = t;
+  if (e.ge === t || e.Se?.has(t)) return false;
+  if (!e.ge) {
+    e.ge = t;
     return true;
   }
   if (!e.Se) {
-    e.Se = new Set([e.ye, t]);
+    e.Se = new Set([e.ge, t]);
   } else {
     e.Se.add(t);
   }
-  e.ye = undefined;
+  e.ge = undefined;
   return true;
 }
 function removePendingSource(e, t) {
-  if (e.ye) {
-    if (e.ye !== t) return false;
-    e.ye = undefined;
+  if (e.ge) {
+    if (e.ge !== t) return false;
+    e.ge = undefined;
     return true;
   }
   if (!e.Se?.delete(t)) return false;
   if (e.Se.size === 1) {
-    e.ye = e.Se.values().next().value;
+    e.ge = e.Se.values().next().value;
     e.Se = undefined;
   } else if (e.Se.size === 0) {
     e.Se = undefined;
@@ -864,7 +865,7 @@ function removePendingSource(e, t) {
   return true;
 }
 function clearPendingSources(e) {
-  e.ye = undefined;
+  e.ge = undefined;
   e.Se?.clear();
   e.Se = undefined;
 }
@@ -895,24 +896,24 @@ function settlePendingSource(e) {
     if (n.has(r) || !removePendingSource(r, e)) return;
     n.add(r);
     r.de = E;
-    const i = r.ye ?? r.Se?.values().next().value;
+    const i = r.ge ?? r.Se?.values().next().value;
     if (i) {
       setPendingError(r, i);
       updatePendingSignal(r);
     } else {
-      r.ge &= ~a;
+      r.ye &= ~a;
       setPendingError(r);
       updatePendingSignal(r);
       if (r.Ie) {
-        if (r.D === y) {
+        if (r.D === g) {
           const e = r;
           if (!e.F) {
             e.F = true;
-            e.M.enqueue(g, e.V);
+            e.V.enqueue(y, e.M);
           }
         } else {
           const e = r.m & o ? k : P;
-          if (e.A > r.o) e.A = r.o;
+          if (e.j > r.o) e.j = r.o;
           insertIntoHeap(r, e);
         }
         t = true;
@@ -936,17 +937,18 @@ function handleAsync(e, t, r) {
   let u;
   const handleError = n => {
     if (e.Ce !== t) return;
-    j.initTransition(resolveTransition(e));
+    N.initTransition(resolveTransition(e));
     notifyStatus(e, n instanceof NotReadyError ? a : d, n);
     e.de = E;
   };
   const asyncWrite = (i, s) => {
     if (e.Ce !== t) return;
     if (e.m & (n | f)) return;
-    j.initTransition(resolveTransition(e));
+    N.initTransition(resolveTransition(e));
+    const o = !!(e.ye & h);
     clearStatus(e);
-    const o = resolveLane(e);
-    if (o) o.H.delete(e);
+    const u = resolveLane(e);
+    if (u) u.H.delete(e);
     if (r) r(i);
     else if (e.ee !== undefined) {
       if (e.ee !== undefined && e.ee !== S) e.Z = i;
@@ -955,10 +957,11 @@ function handleAsync(e, t, r) {
         insertSubs(e);
       }
       e.de = E;
-    } else if (o) {
-      const t = e.$;
-      const n = e.Te;
-      if (!n || !n(i, t)) {
+    } else if (u) {
+      const t = e.D;
+      const n = e.$;
+      const r = e.Te;
+      if ((!t && o) || !r || !r(i, n)) {
         e.$ = i;
         e.de = E;
         if (e.He) {
@@ -990,8 +993,8 @@ function handleAsync(e, t, r) {
     );
     r = false;
     if (!n) {
-      j.initTransition(resolveTransition(e));
-      throw new NotReadyError(V);
+      N.initTransition(resolveTransition(e));
+      throw new NotReadyError(M);
     }
   }
   if (s) {
@@ -1044,8 +1047,8 @@ function handleAsync(e, t, r) {
     };
     const s = iterate();
     if (!r && !s) {
-      j.initTransition(resolveTransition(e));
-      throw new NotReadyError(V);
+      N.initTransition(resolveTransition(e));
+      throw new NotReadyError(M);
     }
   }
   return u;
@@ -1053,7 +1056,7 @@ function handleAsync(e, t, r) {
 function clearStatus(e, t = false) {
   clearPendingSources(e);
   e.Ie = false;
-  e.ge = t ? 0 : e.ge & h;
+  e.ye = t ? 0 : e.ye & h;
   setPendingError(e);
   updatePendingSignal(e);
   e.Qe?.();
@@ -1068,11 +1071,11 @@ function notifyStatus(e, t, n, r, i) {
   if (!r) {
     if (t === a && s) {
       addPendingSource(e, s);
-      e.ge = a | (e.ge & h);
+      e.ye = a | (e.ye & h);
       setPendingError(e, s, n);
     } else {
       clearPendingSources(e);
-      e.ge = t | (t !== d ? e.ge & h : 0);
+      e.ye = t | (t !== d ? e.ye & h : 0);
       e.ae = n;
     }
     updatePendingSignal(e);
@@ -1096,10 +1099,10 @@ function notifyStatus(e, t, n, r, i) {
   forEachDependent(e, e => {
     e.de = E;
     if (
-      (t === a && s && e.ye !== s && !e.Se?.has(s)) ||
-      (t !== a && (e.ae !== n || e.ye || e.Se))
+      (t === a && s && e.ge !== s && !e.Se?.has(s)) ||
+      (t !== a && (e.ae !== n || e.ge || e.Se))
     ) {
-      if (!l && !e.K) j.se.push(e);
+      if (!l && !e.G) N.se.push(e);
       notifyStatus(e, t, n, l, c);
     }
   });
@@ -1134,11 +1137,11 @@ let Q = false;
 let q = false;
 let D = false;
 let F = false;
-let M = false;
-let V = null;
+let V = false;
+let M = null;
 let B = null;
-let G = false;
-let K = null;
+let K = false;
+let G = null;
 function ownerInSnapshotScope(e) {
   while (e) {
     if (e.qe) return true;
@@ -1147,8 +1150,8 @@ function ownerInSnapshotScope(e) {
   return false;
 }
 function setSnapshotCapture(e) {
-  G = e;
-  if (e && !K) K = new Set();
+  K = e;
+  if (e && !G) G = new Set();
 }
 function markSnapshotScope(e) {
   e.qe = true;
@@ -1171,7 +1174,7 @@ function releaseSubtree(e) {
       if (e.m & l) {
         e.m &= ~l;
         e.m |= n;
-        if (P.A > e.o) P.A = e.o;
+        if (P.j > e.o) P.j = e.o;
         insertIntoHeap(e, P);
       }
     }
@@ -1180,50 +1183,51 @@ function releaseSubtree(e) {
   }
 }
 function clearSnapshots() {
-  if (K) {
-    for (const e of K) {
+  if (G) {
+    for (const e of G) {
       delete e.he;
       delete e[m];
     }
-    K = null;
+    G = null;
   }
-  G = false;
+  K = false;
 }
 function recompute(t, n = false) {
   const i = t.D;
   if (!n) {
-    if (t.K && (!i || C) && C !== t.K) j.initTransition(t.K);
+    if (t.G && (!i || C) && C !== t.G) N.initTransition(t.G);
     deleteFromHeap(t, t.m & o ? k : P);
     t.Ce = null;
-    if (t.K || i === y) disposeChildren(t);
+    if (t.G || i === g) disposeChildren(t);
     else {
       markDisposal(t);
-      t.Ne = t.je;
+      t.Ae = t.Ne;
       t.We = t.ke;
-      t.je = null;
+      t.Ne = null;
       t.ke = null;
-      t.Ae = 0;
+      t.je = 0;
     }
   }
   const s = !!(t.m & f);
   const u = t.ee !== undefined && t.ee !== S;
-  const c = !!(t.ge & a);
-  const h = V;
-  V = t;
+  const c = !!(t.ye & a);
+  const p = !!(t.ye & h);
+  const y = M;
+  M = t;
   t.Pe = null;
   t.m = r;
   t.de = E;
-  let p = t.Z === S ? t.$ : t.Z;
-  let g = t.o;
-  let w = H;
-  let m = B;
+  let w = t.Z === S ? t.$ : t.Z;
+  let m = t.o;
+  let b = H;
+  let _ = B;
   H = true;
   if (s) {
     const e = resolveLane(t);
     if (e) B = e;
   }
   try {
-    p = handleAsync(t, t.I(p));
+    w = handleAsync(t, t.I(w));
     clearStatus(t, n);
     const e = resolveLane(t);
     if (e) {
@@ -1248,48 +1252,48 @@ function recompute(t, n = false) {
       e instanceof NotReadyError ? t.Y : undefined
     );
   } finally {
-    H = w;
+    H = b;
     t.m = e | (n ? t.m & l : 0);
-    V = h;
+    M = y;
   }
   if (!t.ae) {
     const e = t.Pe;
-    let r = e !== null ? e.j : t.N;
+    let r = e !== null ? e.N : t.A;
     if (r !== null) {
       do {
         r = unlinkSubs(r);
       } while (r !== null);
-      if (e !== null) e.j = null;
-      else t.N = null;
+      if (e !== null) e.N = null;
+      else t.A = null;
     }
     const f = u ? t.ee : t.Z === S ? t.$ : t.Z;
-    const l = !t.Te || !t.Te(f, p);
+    const l = (!i && p) || !t.Te || !t.Te(f, w);
     if (l) {
       const e = u ? t.ee : undefined;
-      if (n || (i && C !== t.K) || s) {
-        t.$ = p;
+      if (n || (i && C !== t.G) || s) {
+        t.$ = w;
         if (u && s) {
-          t.ee = p;
-          t.Z = p;
+          t.ee = w;
+          t.Z = w;
         }
-      } else t.Z = p;
-      if (u && !s && c && !t._e) t.ee = p;
+      } else t.Z = w;
+      if (u && !s && c && !t.be) t.ee = w;
       if (!u || s || t.ee !== e) insertSubs(t, s || u);
     } else if (u) {
-      t.Z = p;
-    } else if (t.o != g) {
+      t.Z = w;
+    } else if (t.o != m) {
       for (let e = t.O; e !== null; e = e.P) {
         insertIntoHeapHeight(e.k, e.k.m & o ? k : P);
       }
     }
   }
-  B = m;
-  (!n || t.ge & a) && !t.K && !(C && u) && j.se.push(t);
-  t.K && i && C !== t.K && runInTransition(t.K, () => recompute(t));
+  B = _;
+  (!n || t.ye & a) && !t.G && !(C && u) && N.se.push(t);
+  t.G && i && C !== t.G && runInTransition(t.G, () => recompute(t));
 }
 function updateIfNecessary(e) {
   if (e.m & t) {
-    for (let t = e.N; t; t = t.j) {
+    for (let t = e.A; t; t = t.N) {
       const r = t.R;
       const i = r.L || r;
       if (i.I) {
@@ -1308,52 +1312,52 @@ function updateIfNecessary(e) {
 function computed(t, n, r) {
   const i = r?.transparent ?? false;
   const s = {
-    id: r?.id ?? (i ? V?.id : V?.id != null ? getNextChildId(V) : undefined),
+    id: r?.id ?? (i ? M?.id : M?.id != null ? getNextChildId(M) : undefined),
     Re: i || undefined,
     Te: r?.equals != null ? r.equals : isEqual,
-    ce: !!r?.pureWrite,
+    ce: !!r?.ownedWrite,
     xe: r?.unobserved,
-    je: null,
-    M: V?.M ?? j,
-    Le: V?.Le ?? b,
-    Ae: 0,
+    Ne: null,
+    V: M?.V ?? N,
+    Le: M?.Le ?? _,
+    je: 0,
     I: t,
     $: n,
     o: 0,
     C: null,
     p: undefined,
     h: null,
-    N: null,
+    A: null,
     Pe: null,
     O: null,
     Oe: null,
-    i: V,
+    i: M,
     Ee: null,
     ke: null,
     m: r?.lazy ? c : e,
-    ge: h,
+    ye: h,
     de: E,
     Z: S,
-    Ne: null,
+    Ae: null,
     We: null,
     Ce: null,
-    K: null
+    G: null
   };
   s.h = s;
-  const o = V?.t ? V.u : V;
-  if (V) {
-    const e = V.ke;
+  const o = M?.t ? M.u : M;
+  if (M) {
+    const e = M.ke;
     if (e === null) {
-      V.ke = s;
+      M.ke = s;
     } else {
       s.Ee = e;
-      V.ke = s;
+      M.ke = s;
     }
   }
   if (o) s.o = o.o + 1;
-  if (G && ownerInSnapshotScope(V)) s.pe = true;
+  if (K && ownerInSnapshotScope(M)) s.pe = true;
   if (T) {
-    const e = signal(undefined, { equals: false, pureWrite: true });
+    const e = signal(undefined, { equals: false, ownedWrite: true });
     const t = T.factory(s.I, () => {
       setSignal(e, undefined);
     });
@@ -1364,10 +1368,10 @@ function computed(t, n, r) {
     };
   }
   !r?.lazy && recompute(s, true);
-  if (G && !r?.lazy) {
-    if (!(s.ge & a)) {
+  if (K && !r?.lazy) {
+    if (!(s.ye & a)) {
       s.he = s.$ === undefined ? w : s.$;
-      K.add(s);
+      G.add(s);
     }
   }
   return s;
@@ -1375,7 +1379,7 @@ function computed(t, n, r) {
 function signal(e, t, n = null) {
   const r = {
     Te: t?.equals != null ? t.equals : isEqual,
-    ce: !!t?.pureWrite,
+    ce: !!t?.ownedWrite,
     De: !!t?.De,
     xe: t?.unobserved,
     $: e,
@@ -1387,9 +1391,9 @@ function signal(e, t, n = null) {
     Z: S
   };
   n && (n.C = r);
-  if (G && !r.De && !((n?.ge ?? 0) & a)) {
+  if (K && !r.De && !((n?.ye ?? 0) & a)) {
     r.he = e === undefined ? w : e;
-    K.add(r);
+    G.add(r);
   }
   return r;
 }
@@ -1418,21 +1422,21 @@ function untrack(e, t) {
   }
 }
 function read(e) {
-  if (M) {
+  if (V) {
     const t = getLatestValueComputed(e);
-    const n = M;
-    M = false;
+    const n = V;
+    V = false;
     const r = e.ee !== undefined && e.ee !== S ? e.ee : e.$;
     let i;
     try {
       i = read(t);
     } catch (e) {
-      if (!V && e instanceof NotReadyError) return r;
+      if (!M && e instanceof NotReadyError) return r;
       throw e;
     } finally {
-      M = n;
+      V = n;
     }
-    if (t.ge & a) return r;
+    if (t.ye & a) return r;
     if (Q && B && t.Y) {
       const e = findLane(t.Y);
       const n = findLane(B);
@@ -1447,10 +1451,10 @@ function read(e) {
     const n = D;
     D = false;
     if (t && e.ee !== undefined) {
-      if (e.ee !== S && (t.Ce || !!(t.ge & a))) {
+      if (e.ee !== S && (t.Ce || !!(t.ye & a))) {
         F = true;
       }
-      let n = V;
+      let n = M;
       if (n?.t) n = n.u;
       if (n && H) link(e, n);
       read(getPendingSignal(e));
@@ -1462,57 +1466,62 @@ function read(e) {
     D = n;
     return e.$;
   }
-  let t = V;
+  let t = M;
   if (t?.t) t = t.u;
-  if (q && e.I) recompute(e);
-  if (e.m & c) {
-    e.m &= ~c;
-    recompute(e, true);
-  }
-  const n = e.L || e;
+  const n = e;
+  if (typeof n.I === "function") {
+    const t = e;
+    if (q && !(t.m & u)) recompute(t);
+    if (t.m & c) {
+      t.m &= ~c;
+      recompute(t, true);
+    } else if (t.m & u) {
+      recompute(t, true);
+    }
+  }
+  const r = e.L || e;
   if (t && H) {
-    if (e.I && e.m & u) recompute(e);
     link(e, t);
-    if (n.I) {
-      const r = e.m & o;
-      if (n.o >= (r ? k.A : P.A)) {
+    if (r.I) {
+      const n = e.m & o;
+      if (r.o >= (n ? k.j : P.j)) {
         markNode(t);
-        markHeap(r ? k : P);
-        updateIfNecessary(n);
+        markHeap(n ? k : P);
+        updateIfNecessary(r);
       }
-      const i = n.o;
+      const i = r.o;
       if (i >= t.o && e.i !== t) {
         t.o = i + 1;
       }
     }
   }
-  if (n.ge & a) {
-    if (t && !(Q && n.K && C !== n.K)) {
+  if (r.ye & a) {
+    if (t && !(Q && r.G && C !== r.G)) {
       if (B) {
-        const r = n.Y;
+        const n = r.Y;
         const i = findLane(B);
-        if (r && findLane(r) === i && !hasActiveOverride(n)) {
+        if (n && findLane(n) === i && !hasActiveOverride(r)) {
           if (!H && e !== t) link(e, t);
-          throw n.ae;
+          throw r.ae;
         }
       } else {
         if (!H && e !== t) link(e, t);
-        throw n.ae;
+        throw r.ae;
       }
-    } else if (t && n !== e && n.ge & h) {
+    } else if (t && r !== e && r.ye & h) {
       if (!H && e !== t) link(e, t);
-      throw n.ae;
-    } else if (!t && n.ge & h) {
-      throw n.ae;
+      throw r.ae;
+    } else if (!t && r.ye & h) {
+      throw r.ae;
     }
   }
-  if (e.I && e.ge & d) {
+  if (e.I && e.ye & d) {
     if (e.de < E) {
       recompute(e);
       return read(e);
     } else throw e.ae;
   }
-  if (G && t && t.pe) {
+  if (K && t && t.pe) {
     const n = e.he;
     if (n !== undefined) {
       const r = n === w ? undefined : n;
@@ -1525,20 +1534,25 @@ function read(e) {
     if (t && Q && shouldReadStashedOptimisticValue(e)) return e.$;
     return e.ee;
   }
-  return !t ||
-    (B !== null && (e.ee !== undefined || e.Y || (n === e && Q) || !!(n.ge & a))) ||
+  const i =
+    !t ||
+    (B !== null && (e.ee !== undefined || e.Y || (r === e && Q) || !!(r.ye & a))) ||
     e.Z === S ||
-    (Q && e.K && C !== e.K)
-    ? e.$
-    : e.Z;
+    (Q && e.G && C !== e.G)
+      ? e.$
+      : e.Z;
+  if (!t && r === e && typeof n.I === "function" && !n.ve && !(r.ye & a) && !n.i && !e.O) {
+    unobserved(e);
+  }
+  return i;
 }
 function setSignal(e, t) {
-  if (e.K && C !== e.K) j.initTransition(e.K);
-  const n = e.ee !== undefined && !A;
+  if (e.G && C !== e.G) N.initTransition(e.G);
+  const n = e.ee !== undefined && !j;
   const r = e.ee !== undefined && e.ee !== S;
   const i = n ? (r ? e.ee : e.$) : e.Z === S ? e.$ : e.Z;
   if (typeof t === "function") t = t(i);
-  const s = !e.Te || !e.Te(i, t) || !!(e.ge & h);
+  const s = !e.Te || !e.Te(i, t) || !!(e.ye & h);
   if (!s) {
     if (n && r && e.I) {
       insertSubs(e, true);
@@ -1548,17 +1562,17 @@ function setSignal(e, t) {
   }
   if (n) {
     const n = e.ee === S;
-    if (!n) j.initTransition(resolveTransition(e));
+    if (!n) N.initTransition(resolveTransition(e));
     if (n) {
       e.Z = e.$;
-      j.U.push(e);
+      N.U.push(e);
     }
-    e._e = true;
+    e.be = true;
     const r = getOrCreateLane(e);
     e.Y = r;
     e.ee = t;
   } else {
-    if (e.Z === S) j.se.push(e);
+    if (e.Z === S) N.se.push(e);
     e.Z = t;
   }
   updatePendingSignal(e);
@@ -1571,20 +1585,20 @@ function setSignal(e, t) {
   return t;
 }
 function runWithOwner(e, t) {
-  const n = V;
+  const n = M;
   const r = H;
-  V = e;
+  M = e;
   H = false;
   try {
     return t();
   } finally {
-    V = n;
+    M = n;
     H = r;
   }
 }
 function getPendingSignal(e) {
   if (!e.Fe) {
-    e.Fe = optimisticSignal(false, { pureWrite: true });
+    e.Fe = optimisticSignal(false, { ownedWrite: true });
     if (e.we) {
       e.Fe.we = e;
     }
@@ -1596,10 +1610,10 @@ function computePendingState(e) {
   const t = e;
   const n = e.L;
   if (n && e.Z !== S) {
-    return !n.Ce && !(n.ge & a);
+    return !n.Ce && !(n.ye & a);
   }
   if (e.ee !== undefined && e.ee !== S) {
-    if (t.ge & a && !(t.ge & h)) return true;
+    if (t.ye & a && !(t.ye & h)) return true;
     if (e.we) {
       const t = e.Y ? findLane(e.Y) : null;
       return !!(t && t.H.size > 0);
@@ -1609,8 +1623,8 @@ function computePendingState(e) {
   if (e.ee !== undefined && e.ee === S && !e.we) {
     return false;
   }
-  if (e.Z !== S && !(t.ge & h)) return true;
-  return !!(t.ge & a && !(t.ge & h));
+  if (e.Z !== S && !(t.ye & h)) return true;
+  return !!(t.ye & a && !(t.ye & h));
 }
 function updatePendingSignal(e) {
   if (e.Fe) {
@@ -1632,17 +1646,17 @@ function updatePendingSignal(e) {
 }
 function getLatestValueComputed(e) {
   if (!e.He) {
-    const t = M;
-    M = false;
+    const t = V;
+    V = false;
     const n = D;
     D = false;
-    const r = V;
-    V = null;
+    const r = M;
+    M = null;
     e.He = optimisticComputed(() => read(e));
     e.He.we = e;
-    V = r;
+    M = r;
     D = n;
-    M = t;
+    V = t;
   }
   return e.He;
 }
@@ -1656,12 +1670,12 @@ function staleValues(e, t = true) {
   }
 }
 function latest(e) {
-  const t = M;
-  M = true;
+  const t = V;
+  V = true;
   try {
     return e();
   } finally {
-    M = t;
+    V = t;
   }
 }
 function isPending(e) {
@@ -1729,58 +1743,58 @@ function effect(e, t, n, r, i) {
     ...i,
     equals: () => {
       o.F = !o.ae;
-      if (s) o.M.enqueue(o.D, runEffect.bind(o));
+      if (s) o.V.enqueue(o.D, runEffect.bind(o));
       return false;
     },
     lazy: true
   });
-  o.Me = r;
-  o.Ve = t;
+  o.Ve = r;
+  o.Me = t;
   o.Be = n;
-  o.Ge = undefined;
-  o.D = i?.render ? p : g;
+  o.Ke = undefined;
+  o.D = i?.render ? p : y;
   o.Qe = (e, t) => {
-    const n = e !== undefined ? e : o.ge;
+    const n = e !== undefined ? e : o.ye;
     const r = t !== undefined ? t : o.ae;
     if (n & d) {
       let e = r;
-      o.M.notify(o, a, 0);
-      if (o.D === g) {
+      o.V.notify(o, a, 0);
+      if (o.D === y) {
         try {
           return o.Be
             ? o.Be(e, () => {
-                o.Ge?.();
-                o.Ge = undefined;
+                o.Ke?.();
+                o.Ke = undefined;
               })
             : console.error(e);
         } catch (t) {
           e = t;
         }
       }
-      if (!o.M.notify(o, d, d)) throw e;
+      if (!o.V.notify(o, d, d)) throw e;
     } else if (o.D === p) {
-      o.M.notify(o, a | d, n, r);
+      o.V.notify(o, a | d, n, r);
     }
   };
   recompute(o, true);
-  !i?.defer && (o.D === g ? o.M.enqueue(o.D, runEffect.bind(o)) : runEffect.call(o));
+  !i?.defer && (o.D === y ? o.V.enqueue(o.D, runEffect.bind(o)) : runEffect.call(o));
   s = true;
-  cleanup(() => o.Ge?.());
+  cleanup(() => o.Ke?.());
 }
 function runEffect() {
   if (!this.F || this.m & u) return;
-  this.Ge?.();
-  this.Ge = undefined;
+  this.Ke?.();
+  this.Ke = undefined;
   try {
-    const e = this.Ve(this.$, this.Me);
+    const e = this.Me(this.$, this.Ve);
     if (false && e !== undefined && typeof e !== "function");
-    this.Ge = e;
+    this.Ke = e;
   } catch (e) {
     this.ae = new StatusError(this, e);
-    this.ge |= d;
-    if (!this.M.notify(this, d, d)) throw e;
+    this.ye |= d;
+    if (!this.V.notify(this, d, d)) throw e;
   } finally {
-    this.Me = this.$;
+    this.Ve = this.$;
     this.F = false;
   }
 }
@@ -1795,32 +1809,32 @@ function trackedEffect(e, t) {
   };
   const n = computed(
     () => {
-      n.Ge?.();
-      n.Ge = undefined;
+      n.Ke?.();
+      n.Ke = undefined;
       const t = staleValues(e);
-      n.Ge = t;
+      n.Ke = t;
     },
     undefined,
     { ...t, lazy: true }
   );
-  n.Ge = undefined;
-  n.Ke = true;
+  n.Ke = undefined;
+  n.Ge = true;
   n.F = true;
-  n.D = y;
+  n.D = g;
   n.Qe = (e, t) => {
-    const r = e !== undefined ? e : n.ge;
+    const r = e !== undefined ? e : n.ye;
     if (r & d) {
-      n.M.notify(n, a, 0);
+      n.V.notify(n, a, 0);
       const e = t !== undefined ? t : n.ae;
-      if (!n.M.notify(n, d, d)) throw e;
+      if (!n.V.notify(n, d, d)) throw e;
     }
   };
-  n.V = run;
-  n.M.enqueue(g, run);
-  cleanup(() => n.Ge?.());
+  n.M = run;
+  n.V.enqueue(y, run);
+  cleanup(() => n.Ke?.());
 }
 function restoreTransition(e, t) {
-  j.initTransition(e);
+  N.initTransition(e);
   const n = t();
   flush();
   return n;
@@ -1829,13 +1843,13 @@ function action(e) {
   return (...t) =>
     new Promise((n, r) => {
       const i = e(...t);
-      j.initTransition();
+      N.initTransition();
       let s = C;
-      s.G.push(i);
+      s.K.push(i);
       const done = (e, t) => {
         s = currentTransition(s);
-        const o = s.G.indexOf(i);
-        if (o >= 0) s.G.splice(o, 1);
+        const o = s.K.indexOf(i);
+        if (o >= 0) s.K.splice(o, 1);
         setActiveTransition(s);
         schedule();
         t ? r(t) : n(e);
@@ -1871,23 +1885,24 @@ function accessor(e) {
   t.$r = true;
   return t;
 }
-function createSignal(e, t, n) {
+function createSignal(e, t) {
   if (typeof e === "function") {
-    const r = computed(e, t, n);
-    return [accessor(r), setSignal.bind(null, r)];
+    const n = computed(e, undefined, t);
+    n.ve = true;
+    return [accessor(n), setSignal.bind(null, n)];
   }
-  const r = signal(e, t);
-  return [accessor(r), setSignal.bind(null, r)];
+  const n = signal(e, t);
+  return [accessor(n), setSignal.bind(null, n)];
 }
-function createMemo(e, t, n) {
-  let r = computed(e, t, n);
-  return accessor(r);
+function createMemo(e, t) {
+  let n = computed(e, undefined, t);
+  return accessor(n);
 }
-function createEffect(e, t, n, r) {
-  effect(e, t.effect || t, t.error, n, r);
+function createEffect(e, t, n) {
+  effect(e, t.effect || t, t.error, undefined, n);
 }
-function createRenderEffect(e, t, n, r) {
-  effect(e, t, undefined, n, { render: true, ...r });
+function createRenderEffect(e, t, n) {
+  effect(e, t, undefined, undefined, { render: true, ...n });
 }
 function createTrackedEffect(e, t) {
   trackedEffect(e, t);
@@ -1929,19 +1944,20 @@ function resolve(e) {
     });
   });
 }
-function createOptimistic(e, t, n) {
+function createOptimistic(e, t) {
   if (typeof e === "function") {
-    const r = optimisticComputed(e, t, n);
-    return [accessor(r), setSignal.bind(null, r)];
+    const n = optimisticComputed(e, undefined, t);
+    n.ve = true;
+    return [accessor(n), setSignal.bind(null, n)];
   }
-  const r = optimisticSignal(e, t);
-  return [accessor(r), setSignal.bind(null, r)];
+  const n = optimisticSignal(e, t);
+  return [accessor(n), setSignal.bind(null, n)];
 }
 function onSettled(e) {
   const t = getOwner();
-  t && !t.Ke
+  t && !t.Ge
     ? createTrackedEffect(() => untrack(e), undefined)
-    : j.enqueue(g, () => {
+    : N.enqueue(y, () => {
         const t = e();
         t?.();
       });
@@ -1973,7 +1989,7 @@ function applyState(e, t, n) {
     let t = false;
     const f = getOverrideValue(i, s, u, "length", o);
     if (e.length && f && e[0] && n(e[0]) != null) {
-      let l, c, a, d, h, p, g, y;
+      let l, c, a, d, h, p, y, g;
       for (
         a = 0, d = Math.min(f, e.length);
         a < d &&
@@ -2008,22 +2024,22 @@ function applyState(e, t, n) {
         f !== e.length && r[ee].length && setSignal(r[ee].length, e.length);
         return;
       }
-      g = new Array(h + 1);
+      y = new Array(h + 1);
       for (c = h; c >= a; c--) {
         p = e[c];
-        y = p ? n(p) : p;
-        l = w.get(y);
-        g[c] = l === undefined ? -1 : l;
-        w.set(y, c);
+        g = p ? n(p) : p;
+        l = w.get(g);
+        y[c] = l === undefined ? -1 : l;
+        w.set(g, c);
       }
       for (l = a; l <= d; l++) {
         p = getOverrideValue(i, s, u, l, o);
-        y = p ? n(p) : p;
-        c = w.get(y);
+        g = p ? n(p) : p;
+        c = w.get(g);
         if (c !== undefined && c !== -1) {
           S[c] = p;
-          c = g[c];
-          w.set(y, c);
+          c = y[c];
+          w.set(g, c);
         }
       }
       for (c = a; c < e.length; c++) {
@@ -2080,7 +2096,7 @@ function reconcile(e, t) {
     applyState(e, n, r);
   };
 }
-function createProjectionInternal(e, t = {}, n) {
+function createProjectionInternal(e, t, n) {
   let r;
   const i = new WeakMap();
   const wrapper = e => {
@@ -2121,7 +2137,7 @@ function createProjectionInternal(e, t = {}, n) {
   r.ve = true;
   return { store: s, node: r };
 }
-function createProjection(e, t = {}, n) {
+function createProjection(e, t, n) {
   return createProjectionInternal(e, t, n).store;
 }
 function createWriteTraps(e) {
@@ -2244,7 +2260,7 @@ function getNode(e, t, n, r, i = isEqual, s, o) {
   if (o && t in o) {
     const e = o[t];
     u.he = e === undefined ? w : e;
-    K?.add(u);
+    G?.add(u);
   }
   return (e[t] = u);
 }
@@ -2263,12 +2279,50 @@ function getKeys(e, t, n = true) {
   return Array.from(i);
 }
 function getPropertyDescriptor(e, t, n) {
-  let r = e;
   if (t && n in t) {
-    if (r[n] === X) return void 0;
-    if (!(n in r)) r = t;
+    if (t[n] === X) return void 0;
+    const r = Reflect.getOwnPropertyDescriptor(t, n);
+    if (r?.get || r?.set || !(n in e)) return r;
+  }
+  return Reflect.getOwnPropertyDescriptor(e, n);
+}
+function prepareStoreWrite(e, t, n) {
+  if (e[se]) {
+    const t = e[ie];
+    if (t?.G) {
+      N.initTransition(t.G);
+    }
   }
-  return Reflect.getOwnPropertyDescriptor(r, n);
+  const r = e[Y];
+  const i = r[n];
+  if (K && typeof n !== "symbol" && !((e[ie]?.ye ?? 0) & a)) {
+    if (!e[m]) {
+      e[m] = Object.create(null);
+      G?.add(e);
+    }
+    if (!(n in e[m])) {
+      e[m][n] = i;
+    }
+  }
+  const s = e[se] && !j;
+  const o = s ? $ : Z;
+  if (s) trackOptimisticStore(t);
+  return { base: i, overrideKey: o, state: r };
+}
+function notifyStoreProperty(e, t, n, r) {
+  if (e[te]?.[t]) setSignal(e[te][t], n !== "delete");
+  const i = getNodes(e, ee);
+  if (n === "set") {
+    i[t] && setSignal(i[t], () => (isWrappable(r) ? wrap(r, e) : r));
+  } else if (n === "invalidate") {
+    if (i[t]) {
+      setSignal(i[t], {});
+      delete i[t];
+    }
+  } else {
+    i[t] && setSignal(i[t], undefined);
+  }
+  i[z] && setSignal(i[z], undefined);
 }
 let fe = null;
 const le = {
@@ -2324,55 +2378,46 @@ const le = {
   set(e, t, n) {
     const r = e[J];
     if (writeOnly(r)) {
-      if (e[se]) {
-        const t = e[ie];
-        if (t?.K) {
-          j.initTransition(t.K);
-        }
-      }
       untrack(() => {
-        const i = e[Y];
-        const s = i[t];
-        if (G && typeof t !== "symbol" && !((e[ie]?.ge ?? 0) & a)) {
-          if (!e[m]) {
-            e[m] = Object.create(null);
-            K?.add(e);
-          }
-          if (!(t in e[m])) {
-            e[m][t] = s;
-          }
-        }
-        const o = e[se] && !A;
-        const u = o ? $ : Z;
-        if (o) trackOptimisticStore(r);
-        const f = e[$] && t in e[$] ? e[$][t] : e[Z] && t in e[Z] ? e[Z][t] : s;
-        const l = n?.[U]?.[Y] ?? n;
-        const c = Array.isArray(i) && t !== "length";
-        const d = c ? parseInt(t) + 1 : 0;
-        const h =
-          c &&
+        const { base: i, overrideKey: s, state: o } = prepareStoreWrite(e, r, t);
+        const u = e[$] && t in e[$] ? e[$][t] : e[Z] && t in e[Z] ? e[Z][t] : i;
+        const f = n?.[U]?.[Y] ?? n;
+        const l = Array.isArray(o) && t !== "length";
+        const c = l ? parseInt(t) + 1 : 0;
+        const a =
+          l &&
           (e[$] && "length" in e[$]
             ? e[$].length
             : e[Z] && "length" in e[Z]
               ? e[Z].length
-              : i.length);
-        const p = c && d > h ? d : undefined;
-        if (f === l && p === undefined) return true;
-        if (l !== undefined && l === s && p === undefined) delete e[u]?.[t];
+              : o.length);
+        const d = l && c > a ? c : undefined;
+        if (u === f && d === undefined) return true;
+        if (f !== undefined && f === i && d === undefined) delete e[s]?.[t];
         else {
-          const n = e[u] || (e[u] = Object.create(null));
-          n[t] = l;
-          if (p !== undefined) n.length = p;
+          const n = e[s] || (e[s] = Object.create(null));
+          n[t] = f;
+          if (d !== undefined) n.length = d;
         }
-        const g = isWrappable(l);
-        e[te]?.[t] && setSignal(e[te][t], true);
-        const y = getNodes(e, ee);
-        y[t] && setSignal(y[t], () => (g ? wrap(l, e) : l));
-        if (Array.isArray(i)) {
-          const e = t === "length" ? l : p;
-          e !== undefined && y.length && setSignal(y.length, e);
+        notifyStoreProperty(e, t, "set", f);
+        if (Array.isArray(o)) {
+          const n = getNodes(e, ee);
+          const r = t === "length" ? f : d;
+          r !== undefined && n.length && setSignal(n.length, r);
         }
-        y[z] && setSignal(y[z], undefined);
+        if (false);
+      });
+    }
+    return true;
+  },
+  defineProperty(e, t, n) {
+    const r = e[J];
+    if (writeOnly(r)) {
+      untrack(() => {
+        const { base: i, overrideKey: s } = prepareStoreWrite(e, r, t);
+        const o = "value" in n ? { ...n, value: n.value?.[U]?.[Y] ?? n.value } : n;
+        Object.defineProperty(e[s] || (e[s] = Object.create(null)), t, o);
+        notifyStoreProperty(e, t, "invalidate");
         if (false);
       });
     }
@@ -2383,7 +2428,7 @@ const le = {
     const r = e[Z]?.[t] === X;
     if (writeOnly(e[J]) && !n && !r) {
       untrack(() => {
-        const n = e[se] && !A;
+        const n = e[se] && !j;
         const r = n ? $ : Z;
         if (n) trackOptimisticStore(e[J]);
         const i = e[$] && t in e[$] ? e[$][t] : e[Z] && t in e[Z] ? e[Z][t] : e[Y][t];
@@ -2392,10 +2437,7 @@ const le = {
         } else if (e[r] && t in e[r]) {
           delete e[r][t];
         } else return true;
-        if (e[te]?.[t]) setSignal(e[te][t], false);
-        const s = getNodes(e, ee);
-        s[t] && setSignal(s[t], undefined);
-        s[z] && setSignal(s[z], undefined);
+        notifyStoreProperty(e, t, "delete");
       });
     }
     return true;
@@ -2417,9 +2459,11 @@ const le = {
     if (t === J) return { value: e[J], writable: true, configurable: true };
     if (e[$] && t in e[$]) {
       if (e[$][t] === X) return undefined;
-      const n = getPropertyDescriptor(e[Y], e[Z], t);
-      if (n) {
-        return { ...n, value: e[$][t] };
+      const n = Reflect.getOwnPropertyDescriptor(e[$], t);
+      if (n?.get || n?.set || !(t in e[Y])) return n;
+      const r = getPropertyDescriptor(e[Y], e[Z], t);
+      if (r) {
+        return { ...r, value: e[$][t] };
       }
       return { value: e[$][t], writable: true, enumerable: true, configurable: true };
     }
@@ -2460,7 +2504,7 @@ function createStore(e, t, n) {
 function createOptimisticStore(e, t, n) {
   GlobalQueue.fe ||= clearOptimisticStore;
   const r = typeof e === "function";
-  const i = (r ? t : e) ?? {};
+  const i = r ? t : e;
   const s = r ? e : undefined;
   const { store: o } = createOptimisticProjectionInternal(s, i, n);
   return [o, e => storeSetter(o, e)];
@@ -2491,7 +2535,7 @@ function clearOptimisticStore(e) {
   }
   delete t[$];
 }
-function createOptimisticProjectionInternal(e, t = {}, n) {
+function createOptimisticProjectionInternal(e, t, n) {
   let r;
   const i = new WeakMap();
   const wrapper = e => {
@@ -2594,7 +2638,12 @@ function updatePath(e, t, n = 0) {
   } else if (r === undefined || (isWrappable(i) && isWrappable(s) && !Array.isArray(s))) {
     const t = r !== undefined ? e[r] : e;
     const n = Object.keys(s);
-    for (let e = 0; e < n.length; e++) t[n[e]] = s[n[e]];
+    for (let e = 0; e < n.length; e++) {
+      const r = n[e];
+      const i = Object.getOwnPropertyDescriptor(s, r);
+      if (i.get || i.set) Object.defineProperty(t, r, i);
+      else t[r] = i.value;
+    }
   } else {
     e[r] = s;
   }
@@ -2703,7 +2752,7 @@ function merge(...e) {
     if (s) n.push(...s);
     else n.push(typeof i === "function" ? ((t = true), createMemo(i)) : i);
   }
-  if (_ && t) {
+  if (b && t) {
     return new Proxy(
       {
         get(e) {
@@ -2762,7 +2811,7 @@ function merge(...e) {
 }
 function omit(e, ...t) {
   const n = new Set(t);
-  if (_ && J in e) {
+  if (b && J in e) {
     return new Proxy(
       {
         get(t) {
@@ -2793,7 +2842,7 @@ function mapArray(e, t, n) {
   const r = typeof n?.keyed === "function" ? n.keyed : undefined;
   const i = t.length > 1;
   const s = t;
-  return createMemo(
+  const o = computed(
     updateKeyedMap.bind({
       ze: createOwner(),
       Ue: 0,
@@ -2808,8 +2857,10 @@ function mapArray(e, t, n) {
       rt: n?.fallback
     })
   );
+  o.ve = true;
+  return accessor(o);
 }
-const pe = { pureWrite: true };
+const pe = { ownedWrite: true };
 function updateKeyedMap() {
   const e = this.Je() || [],
     t = e.length;
@@ -2865,7 +2916,7 @@ function updateKeyedMap() {
         d = new Array(t),
         h = new Array(t),
         p = this.tt ? new Array(t) : undefined,
-        g = this.nt ? new Array(t) : undefined;
+        y = this.nt ? new Array(t) : undefined;
       for (
         s = 0, o = Math.min(this.Ue, t);
         s < o && (this.Xe[s] === e[s] || (this.tt && compare(this.et, this.Xe[s], e[s])));
@@ -2883,7 +2934,7 @@ function updateKeyedMap() {
         d[u] = this.Ze[o];
         h[u] = this.$e[o];
         p && (p[u] = this.tt[o]);
-        g && (g[u] = this.nt[o]);
+        y && (y[u] = this.nt[o]);
       }
       c = new Map();
       a = new Array(u + 1);
@@ -2902,7 +2953,7 @@ function updateKeyedMap() {
           d[r] = this.Ze[n];
           h[r] = this.$e[n];
           p && (p[r] = this.tt[n]);
-          g && (g[r] = this.nt[n]);
+          y && (y[r] = this.nt[n]);
           r = a[r];
           c.set(l, r);
         } else this.$e[n].dispose();
@@ -2915,8 +2966,8 @@ function updateKeyedMap() {
             this.tt[r] = p[r];
             setSignal(this.tt[r], e[r]);
           }
-          if (g) {
-            this.nt[r] = g[r];
+          if (y) {
+            this.nt[r] = y[r];
             setSignal(this.nt[r], r);
           }
         } else {
@@ -2931,17 +2982,21 @@ function updateKeyedMap() {
 }
 function repeat(e, t, n) {
   const r = t;
-  return updateRepeat.bind({
-    ze: createOwner(),
-    Ue: 0,
-    it: 0,
-    st: e,
-    Ye: r,
-    $e: [],
-    Ze: [],
-    ot: n?.from,
-    rt: n?.fallback
-  });
+  const i = computed(
+    updateRepeat.bind({
+      ze: createOwner(),
+      Ue: 0,
+      it: 0,
+      st: e,
+      Ye: r,
+      $e: [],
+      Ze: [],
+      ot: n?.from,
+      rt: n?.fallback
+    })
+  );
+  i.ve = true;
+  return accessor(i);
 }
 function updateRepeat() {
   const e = this.st();
@@ -2996,10 +3051,10 @@ function compare(e, t, n) {
 function boundaryComputed(e, t) {
   const n = computed(e, undefined, { lazy: true });
   n.Qe = (e, t) => {
-    const r = e !== undefined ? e : n.ge;
+    const r = e !== undefined ? e : n.ye;
     const i = t !== undefined ? t : n.ae;
-    n.ge &= ~n.ut;
-    n.M.notify(n, n.ut, r, i);
+    n.ye &= ~n.ut;
+    n.V.notify(n, n.ut, r, i);
   };
   n.ut = t;
   n.ve = true;
@@ -3007,16 +3062,16 @@ function boundaryComputed(e, t) {
   return n;
 }
 function createBoundChildren(e, t, n, r) {
-  const i = e.M;
-  i.addChild((e.M = n));
-  cleanup(() => i.removeChild(e.M));
+  const i = e.V;
+  i.addChild((e.V = n));
+  cleanup(() => i.removeChild(e.V));
   return runWithOwner(e, () => {
     const e = computed(t);
     return boundaryComputed(() => staleValues(() => flatten(read(e))), r);
   });
 }
-const ge = Symbol();
-const ye = createContext(null);
+const ye = Symbol();
+const ge = createContext(null);
 let Se = false;
 const FALSE_ACCESSOR = () => false;
 function isRevealController(e) {
@@ -3032,25 +3087,25 @@ function setSlotState(e, t, n, r) {
     if (!n && e.ht === t) e.ht = undefined;
     return e.evaluate(n, r);
   }
-  if (!n && e.gt === t && e.yt) e.gt = undefined;
+  if (!n && e.yt === t && e.gt) e.yt = undefined;
 }
 class RevealController {
   St;
   wt;
-  _t = [];
+  bt = [];
   ht;
-  ct = signal(false, { pureWrite: true, De: true });
-  dt = signal(false, { pureWrite: true, De: true });
-  bt = true;
+  ct = signal(false, { ownedWrite: true, De: true });
+  dt = signal(false, { ownedWrite: true, De: true });
+  _t = true;
   Ot = false;
   constructor(e, t) {
     this.St = e;
     this.wt = t;
   }
   xt(e) {
-    for (let t = 0; t < this._t.length; t++) {
-      const n = this._t[t];
-      if ((isRevealController(n) ? n.ht : n.gt) !== this) continue;
+    for (let t = 0; t < this.bt.length; t++) {
+      const n = this.bt[t];
+      if ((isRevealController(n) ? n.ht : n.yt) !== this) continue;
       if (e(n) === false) return false;
     }
     return true;
@@ -3059,21 +3114,21 @@ class RevealController {
     return this.xt(isSlotReady);
   }
   register(e) {
-    if (this._t.includes(e)) return;
-    this._t.push(e);
+    if (this.bt.includes(e)) return;
+    this.bt.push(e);
     const t = !!untrack(this.St);
-    setSignal(e.ct, true), setSignal(e.dt, t ? false : !!untrack(this.wt));
+    (setSignal(e.ct, true), setSignal(e.dt, t ? false : !!untrack(this.wt)));
     untrack(() => this.evaluate());
   }
   unregister(e) {
-    const t = this._t.indexOf(e);
-    if (t >= 0) this._t.splice(t, 1);
+    const t = this.bt.indexOf(e);
+    if (t >= 0) this.bt.splice(t, 1);
     untrack(() => this.evaluate());
   }
   evaluate(e, t) {
     if (this.Ot) return;
     this.Ot = true;
-    const n = this.bt;
+    const n = this._t;
     try {
       const n = e ?? read(this.ct),
         r = !!untrack(this.wt),
@@ -3092,10 +3147,10 @@ class RevealController {
         });
       }
     } finally {
-      this.bt = this.isReady();
+      this._t = this.isReady();
       this.Ot = false;
     }
-    if (this.ht && n !== this.bt) this.ht.evaluate();
+    if (this.ht && n !== this._t) this.ht.evaluate();
   }
 }
 class CollectionQueue extends Queue {
@@ -3103,12 +3158,12 @@ class CollectionQueue extends Queue {
   ft = new Set();
   Pt;
   lt = true;
-  ct = signal(false, { pureWrite: true, De: true });
-  dt = signal(false, { pureWrite: true, De: true });
-  gt;
-  yt = false;
+  ct = signal(false, { ownedWrite: true, De: true });
+  dt = signal(false, { ownedWrite: true, De: true });
+  yt;
+  gt = false;
   kt;
-  Et = ge;
+  Et = ye;
   constructor(e) {
     super();
     this.vt = e;
@@ -3119,21 +3174,21 @@ class CollectionQueue extends Queue {
   }
   notify(e, t, n, r) {
     if (!(t & this.vt)) return super.notify(e, t, n, r);
-    if (this.yt && this.kt) {
+    if (this.gt && this.kt) {
       const e = untrack(() => {
         try {
           return this.kt();
         } catch {
-          return ge;
+          return ye;
         }
       });
       if (e !== this.Et) {
         this.Et = e;
-        this.yt = false;
+        this.gt = false;
         this.ft.clear();
       }
     }
-    if (this.vt & a && this.yt) return super.notify(e, t, n, r);
+    if (this.vt & a && this.gt) return super.notify(e, t, n, r);
     if (this.vt & a && n & d) {
       return super.notify(e, d, n, r);
     }
@@ -3151,11 +3206,11 @@ class CollectionQueue extends Queue {
   }
   checkSources() {
     for (const e of this.ft) {
-      if (e.m & u || (!(e.ge & this.vt) && !(this.vt & d && e.ge & a))) this.ft.delete(e);
+      if (e.m & u || (!(e.ye & this.vt) && !(this.vt & d && e.ye & a))) this.ft.delete(e);
     }
     if (!this.ft.size) {
-      if (this.vt & a && this.lt && !this.yt && this.Pt) {
-        this.lt = !!(this.Pt.ge & this.vt);
+      if (this.vt & a && this.lt && !this.gt && this.Pt) {
+        this.lt = !!(this.Pt.ye & this.vt);
       } else {
         this.lt = false;
       }
@@ -3168,12 +3223,12 @@ class CollectionQueue extends Queue {
         }
       }
     }
-    if (Se) this.gt?.evaluate();
+    if (Se) this.yt?.evaluate();
   }
 }
 function createCollectionBoundary(e, t, n, r) {
   const i = createOwner();
-  if (Se) setContext(ye, null, i);
+  if (Se) setContext(ge, null, i);
   const s = new CollectionQueue(e);
   if (r) s.kt = r;
   const o = (s.Pt = createBoundChildren(i, t, s, e));
@@ -3185,18 +3240,18 @@ function createCollectionBoundary(e, t, n, r) {
       if (e instanceof NotReadyError) t = true;
       else throw e;
     }
-    s.lt = t || !!(o.ge & e) || o.ae instanceof NotReadyError;
+    s.lt = t || !!(o.ye & e) || o.ae instanceof NotReadyError;
   });
-  const u = Se && e === a ? getContext(ye) : null;
+  const u = Se && e === a ? getContext(ge) : null;
   if (u) {
-    s.gt = u;
+    s.yt = u;
     u.register(s);
     cleanup(() => u.unregister(s));
   }
   const f = computed(() => {
     if (!read(s.ct)) {
       const e = read(o);
-      if (!untrack(() => read(s.ct))) return (s.yt = true), e;
+      if (!untrack(() => read(s.ct))) return ((s.gt = true), e);
     }
     if (Se && read(s.dt)) return undefined;
     return n(s);
@@ -3219,11 +3274,11 @@ function createErrorBoundary(e, t) {
 function createRevealOrder(e, t) {
   Se = true;
   const n = createOwner();
-  const r = getContext(ye);
+  const r = getContext(ge);
   const i = t?.together || FALSE_ACCESSOR,
     s = t?.collapsed || FALSE_ACCESSOR;
   const o = new RevealController(i, s);
-  setContext(ye, o, n);
+  setContext(ge, o, n);
   return runWithOwner(n, () => {
     const t = e();
     computed(() => {
@@ -3297,7 +3352,7 @@ exports.ContextNotFoundError = ContextNotFoundError;
 exports.DEV = we;
 exports.NoOwnerError = NoOwnerError;
 exports.NotReadyError = NotReadyError;
-exports.SUPPORTS_PROXY = _;
+exports.SUPPORTS_PROXY = b;
 exports.action = action;
 exports.clearSnapshots = clearSnapshots;
 exports.createContext = createContext;