@solidjs/signals 0.13.12 → 0.13.13

package/dist/prod.js

@@ -103,12 +103,12 @@ function markNode(e, t = REACTIVE_DIRTY) {
   const n = e.O;
   if ((n & (REACTIVE_CHECK | REACTIVE_DIRTY)) >= t) return;
   e.O = (n & -4) | t;
-  for (let t = e.h; t !== null; t = t.I) {
+  for (let t = e.I; t !== null; t = t.h) {
     markNode(t.p, REACTIVE_CHECK);
   }
   if (e.A !== null) {
     for (let t = e.A; t !== null; t = t.N) {
-      for (let e = t.h; e !== null; e = e.I) {
+      for (let e = t.I; e !== null; e = e.h) {
         markNode(e.p, REACTIVE_CHECK);
       }
     }
@@ -136,7 +136,7 @@ function adjustHeight(e, t) {
   }
   if (e.o !== n) {
     e.o = n;
-    for (let n = e.h; n !== null; n = n.I) {
+    for (let n = e.I; n !== null; n = n.h) {
       insertIntoHeapHeight(n.p, t);
     }
   }
@@ -165,7 +165,7 @@ function runLaneEffects(e) {
   }
 }
 function queueStashedOptimisticEffects(e) {
-  for (let t = e.h; t !== null; t = t.I) {
+  for (let t = e.I; t !== null; t = t.h) {
     const e = t.p;
     if (!e.W) continue;
     if (e.W === EFFECT_TRACKED) {
@@ -184,14 +184,14 @@ function setProjectionWriteActive(e) {
   projectionWriteActive = e;
 }
 function mergeTransitionState(e, t) {
-  t.$ = e;
-  e.j.push(...t.j);
+  t.j = e;
+  e.$.push(...t.$);
   for (const n of activeLanes) if (n.K === t) n.K = e;
   e.Y.push(...t.Y);
-  for (const n of t.B) e.B.add(n);
-  for (const [n, i] of t.Z) {
-    let t = e.Z.get(n);
-    if (!t) e.Z.set(n, (t = new Set()));
+  for (const n of t.Z) e.Z.add(n);
+  for (const [n, i] of t.B) {
+    let t = e.B.get(n);
+    if (!t) e.B.set(n, (t = new Set()));
     for (const e of i) t.add(e);
   }
 }
@@ -298,7 +298,7 @@ class GlobalQueue extends Queue {
   ne = false;
   se = [];
   Y = [];
-  B = new Set();
+  Z = new Set();
   static oe;
   static ue;
   static ce = null;
@@ -314,7 +314,7 @@ class GlobalQueue extends Queue {
           runHeap(zombieQueue, GlobalQueue.oe);
           this.se = [];
           this.Y = [];
-          this.B = new Set();
+          this.Z = new Set();
           runLaneEffects(EFFECT_RENDER);
           runLaneEffects(EFFECT_USER);
           this.stashQueues(e.ae);
@@ -322,7 +322,7 @@ class GlobalQueue extends Queue {
           scheduled = dirtyQueue.R >= dirtyQueue.P;
           reassignPendingTransition(e.se);
           activeTransition = null;
-          if (!e.j.length && e.Y.length) {
+          if (!e.$.length && e.Y.length) {
             stashedOptimisticReads = new Set();
             for (let t = 0; t < e.Y.length; t++) {
               const n = e.Y[t];
@@ -366,8 +366,8 @@ class GlobalQueue extends Queue {
         const t = i !== undefined ? i : e.fe;
         if (activeTransition && t) {
           const n = t.source;
-          let i = activeTransition.Z.get(n);
-          if (!i) activeTransition.Z.set(n, (i = new Set()));
+          let i = activeTransition.B.get(n);
+          if (!i) activeTransition.B.set(n, (i = new Set()));
           const r = i.size;
           i.add(e);
           if (i.size !== r) schedule();
@@ -385,12 +385,12 @@ class GlobalQueue extends Queue {
       activeTransition = e ?? {
         Ee: clock,
         se: [],
-        Z: new Map(),
+        B: new Map(),
         Y: [],
-        B: new Set(),
-        j: [],
+        Z: new Set(),
+        $: [],
         ae: { ie: [[], []], re: [] },
-        $: false
+        j: false
       };
     } else if (e) {
       const t = activeTransition;
@@ -419,16 +419,16 @@ class GlobalQueue extends Queue {
     for (const e of activeLanes) {
       if (!e.K) e.K = activeTransition;
     }
-    if (this.B !== activeTransition.B) {
-      for (const e of this.B) activeTransition.B.add(e);
-      this.B = activeTransition.B;
+    if (this.Z !== activeTransition.Z) {
+      for (const e of this.Z) activeTransition.Z.add(e);
+      this.Z = activeTransition.Z;
     }
   }
 }
 function insertSubs(e, t = false) {
   const n = e.q || currentOptimisticLane;
   const i = e.de !== undefined;
-  for (let r = e.h; r !== null; r = r.I) {
+  for (let r = e.I; r !== null; r = r.h) {
     if (i && r.p.Te) {
       r.p.O |= REACTIVE_SNAPSHOT_STALE;
       continue;
@@ -475,7 +475,7 @@ function finalizePureQueue(e = null, t = false) {
   if (n) {
     commitPendingNodes();
     resolveOptimisticNodes(e ? e.Y : globalQueue.Y);
-    const t = e ? e.B : globalQueue.B;
+    const t = e ? e.Z : globalQueue.Z;
     if (GlobalQueue.ce && t.size) {
       for (const e of t) {
         GlobalQueue.ce(e);
@@ -493,7 +493,7 @@ function checkBoundaryChildren(e) {
   }
 }
 function trackOptimisticStore(e) {
-  globalQueue.B.add(e);
+  globalQueue.Z.add(e);
   schedule();
 }
 function reassignPendingTransition(e) {
@@ -526,10 +526,10 @@ function reporterBlocksSource(e, t) {
   return !!(e.Se & STATUS_PENDING && e.fe instanceof NotReadyError && e.fe.source === t);
 }
 function transitionComplete(e) {
-  if (e.$) return true;
-  if (e.j.length) return false;
+  if (e.j) return true;
+  if (e.$.length) return false;
   let t = true;
-  for (const [n, i] of e.Z) {
+  for (const [n, i] of e.B) {
     let r = false;
     for (const e of i) {
       if (reporterBlocksSource(e, n)) {
@@ -538,7 +538,7 @@ function transitionComplete(e) {
       }
       i.delete(e);
     }
-    if (!r) e.Z.delete(n);
+    if (!r) e.B.delete(n);
     else if (n.Se & STATUS_PENDING && n.fe?.source === n) {
       t = false;
       break;
@@ -559,11 +559,11 @@ function transitionComplete(e) {
       }
     }
   }
-  t && (e.$ = true);
+  t && (e.j = true);
   return t;
 }
 function currentTransition(e) {
-  while (e.$ && typeof e.$ === "object") e = e.$;
+  while (e.j && typeof e.j === "object") e = e.j;
   return e;
 }
 function setActiveTransition(e) {
@@ -587,10 +587,10 @@ function getOrCreateLane(e) {
   }
   const n = e._e;
   const i = n?.q ? findLane(n.q) : null;
-  t = { te: e, k: new Set(), G: [[], []], U: null, K: activeTransition, he: i };
+  t = { te: e, k: new Set(), G: [[], []], U: null, K: activeTransition, Ie: i };
   signalLanes.set(e, t);
   activeLanes.add(t);
-  e.Ie = false;
+  e.he = false;
   return t;
 }
 function findLane(e) {
@@ -632,9 +632,9 @@ function assignOrMergeLane(e, t) {
     const r = findLane(i);
     if (activeLanes.has(r)) {
       if (r !== n && !hasActiveOverride(e)) {
-        if (n.he && findLane(n.he) === r) {
+        if (n.Ie && findLane(n.Ie) === r) {
           e.q = t;
-        } else if (r.he && findLane(r.he) === n);
+        } else if (r.Ie && findLane(r.Ie) === n);
         else mergeLanes(n, r);
       }
       return;
@@ -645,16 +645,16 @@ function assignOrMergeLane(e, t) {
 function unlinkSubs(e) {
   const t = e.m;
   const n = e.D;
-  const i = e.I;
+  const i = e.h;
   const r = e.pe;
   if (i !== null) i.pe = r;
   else t.Ae = r;
-  if (r !== null) r.I = i;
+  if (r !== null) r.h = i;
   else {
-    t.h = i;
+    t.I = i;
     if (i === null) {
       t.Ne?.();
-      t.L && !t.ge && !(t.O & REACTIVE_ZOMBIE) && unobserved(t);
+      t.L && !t.Pe && !(t.O & REACTIVE_ZOMBIE) && unobserved(t);
     }
   }
   return n;
@@ -669,27 +669,27 @@ function unobserved(e) {
   disposeChildren(e, true);
 }
 function link(e, t) {
-  const n = t.Pe;
+  const n = t.ge;
   if (n !== null && n.m === e) return;
   let i = null;
   const r = t.O & REACTIVE_RECOMPUTING_DEPS;
   if (r) {
     i = n !== null ? n.D : t.C;
     if (i !== null && i.m === e) {
-      t.Pe = i;
+      t.ge = i;
       return;
     }
   }
   const s = e.Ae;
   if (s !== null && s.p === t && (!r || isValidLink(s, t))) return;
-  const o = (t.Pe = e.Ae = { m: e, p: t, D: i, pe: s, I: null });
+  const o = (t.ge = e.Ae = { m: e, p: t, D: i, pe: s, h: null });
   if (n !== null) n.D = o;
   else t.C = o;
-  if (s !== null) s.I = o;
-  else e.h = o;
+  if (s !== null) s.h = o;
+  else e.I = o;
 }
 function isValidLink(e, t) {
-  const n = t.Pe;
+  const n = t.ge;
   if (n !== null) {
     let i = t.C;
     do {
@@ -719,7 +719,7 @@ function dispose(e) {
     t = unlinkSubs(t);
   } while (t !== null);
   e.C = null;
-  e.Pe = null;
+  e.ge = null;
   disposeChildren(e, true);
 }
 function disposeChildren(e, t = false, n) {
@@ -737,7 +737,7 @@ function disposeChildren(e, t = false, n) {
         t = unlinkSubs(t);
       } while (t !== null);
       e.C = null;
-      e.Pe = null;
+      e.ge = null;
     }
     disposeChildren(i, true);
     i = e;
@@ -882,9 +882,9 @@ function setPendingError(e, t, n) {
   }
 }
 function forEachDependent(e, t) {
-  for (let n = e.h; n !== null; n = n.I) t(n.p);
+  for (let n = e.I; n !== null; n = n.h) t(n.p);
   for (let n = e.A; n !== null; n = n.N) {
-    for (let e = n.h; e !== null; e = e.I) t(e.p);
+    for (let e = n.I; e !== null; e = e.h) t(e.p);
   }
 }
 function settlePendingSource(e) {
@@ -943,9 +943,10 @@ function handleAsync(e, t, n) {
     if (e.ye !== t) return;
     if (e.O & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY)) return;
     globalQueue.initTransition(resolveTransition(e));
+    const s = !!(e.Se & STATUS_UNINITIALIZED);
     clearStatus(e);
-    const s = resolveLane(e);
-    if (s) s.k.delete(e);
+    const o = resolveLane(e);
+    if (o) o.k.delete(e);
     if (n) n(i);
     else if (e.ee !== undefined) {
       if (e.ee !== undefined && e.ee !== NOT_PENDING) e.X = i;
@@ -954,10 +955,11 @@ function handleAsync(e, t, n) {
         insertSubs(e);
       }
       e.Ee = clock;
-    } else if (s) {
-      const t = e.J;
-      const n = e.ke;
-      if (!n || !n(i, t)) {
+    } else if (o) {
+      const t = e.W;
+      const n = e.J;
+      const r = e.ke;
+      if ((!t && s) || !r || !r(i, n)) {
         e.J = i;
         e.Ee = clock;
         if (e.xe) {
@@ -1208,22 +1210,23 @@ function recompute(e, t = false) {
   const i = !!(e.O & REACTIVE_OPTIMISTIC_DIRTY);
   const r = e.ee !== undefined && e.ee !== NOT_PENDING;
   const s = !!(e.Se & STATUS_PENDING);
-  const o = context;
+  const o = !!(e.Se & STATUS_UNINITIALIZED);
+  const u = context;
   context = e;
-  e.Pe = null;
+  e.ge = null;
   e.O = REACTIVE_RECOMPUTING_DEPS;
   e.Ee = clock;
-  let u = e.X === NOT_PENDING ? e.J : e.X;
-  let c = e.o;
-  let a = tracking;
-  let l = currentOptimisticLane;
+  let c = e.X === NOT_PENDING ? e.J : e.X;
+  let a = e.o;
+  let l = tracking;
+  let f = currentOptimisticLane;
   tracking = true;
   if (i) {
     const t = resolveLane(e);
     if (t) currentOptimisticLane = t;
   }
   try {
-    u = handleAsync(e, e.L(u));
+    c = handleAsync(e, e.L(c));
     clearStatus(e, t);
     const n = resolveLane(e);
     if (n) {
@@ -1248,42 +1251,42 @@ function recompute(e, t = false) {
       t instanceof NotReadyError ? e.q : undefined
     );
   } finally {
-    tracking = a;
+    tracking = l;
     e.O = REACTIVE_NONE | (t ? e.O & REACTIVE_SNAPSHOT_STALE : 0);
-    context = o;
+    context = u;
   }
   if (!e.fe) {
-    const o = e.Pe;
-    let a = o !== null ? o.D : e.C;
-    if (a !== null) {
+    const u = e.ge;
+    let l = u !== null ? u.D : e.C;
+    if (l !== null) {
       do {
-        a = unlinkSubs(a);
-      } while (a !== null);
-      if (o !== null) o.D = null;
+        l = unlinkSubs(l);
+      } while (l !== null);
+      if (u !== null) u.D = null;
       else e.C = null;
     }
-    const l = r ? e.ee : e.X === NOT_PENDING ? e.J : e.X;
-    const f = !e.ke || !e.ke(l, u);
-    if (f) {
+    const f = r ? e.ee : e.X === NOT_PENDING ? e.J : e.X;
+    const E = (!n && o) || !e.ke || !e.ke(f, c);
+    if (E) {
       const o = r ? e.ee : undefined;
       if (t || (n && activeTransition !== e.K) || i) {
-        e.J = u;
+        e.J = c;
         if (r && i) {
-          e.ee = u;
-          e.X = u;
+          e.ee = c;
+          e.X = c;
         }
-      } else e.X = u;
-      if (r && !i && s && !e.Ie) e.ee = u;
+      } else e.X = c;
+      if (r && !i && s && !e.he) e.ee = c;
       if (!r || i || e.ee !== o) insertSubs(e, i || r);
     } else if (r) {
-      e.X = u;
-    } else if (e.o != c) {
-      for (let t = e.h; t !== null; t = t.I) {
+      e.X = c;
+    } else if (e.o != a) {
+      for (let t = e.I; t !== null; t = t.h) {
         insertIntoHeapHeight(t.p, t.p.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
       }
     }
   }
-  currentOptimisticLane = l;
+  currentOptimisticLane = f;
   (!t || e.Se & STATUS_PENDING) && !e.K && !(activeTransition && r) && globalQueue.se.push(e);
   e.K && n && activeTransition !== e.K && runInTransition(e.K, () => recompute(e));
 }
@@ -1324,8 +1327,8 @@ function computed(e, t, n) {
     S: undefined,
     T: null,
     C: null,
-    Pe: null,
-    h: null,
+    ge: null,
+    I: null,
     Ae: null,
     i: context,
     De: null,
@@ -1379,7 +1382,7 @@ function signal(e, t, n = null) {
     He: !!t?.He,
     Ne: t?.unobserved,
     J: e,
-    h: null,
+    I: null,
     Ae: null,
     Ee: clock,
     V: n,
@@ -1554,7 +1557,7 @@ function setSignal(e, t) {
       e.X = e.J;
       globalQueue.Y.push(e);
     }
-    e.Ie = true;
+    e.he = true;
     const i = getOrCreateLane(e);
     e.q = i;
     e.ee = t;
@@ -1737,8 +1740,8 @@ function effect(e, t, n, i, r) {
   });
   o.Qe = i;
   o.Me = t;
-  o.$e = n;
-  o.je = undefined;
+  o.je = n;
+  o.$e = undefined;
   o.W = r?.render ? EFFECT_RENDER : EFFECT_USER;
   o.Ge = (e, t) => {
     const n = e !== undefined ? e : o.Se;
@@ -1748,10 +1751,10 @@ function effect(e, t, n, i, r) {
       o.F.notify(o, STATUS_PENDING, 0);
       if (o.W === EFFECT_USER) {
         try {
-          return o.$e
-            ? o.$e(e, () => {
-                o.je?.();
-                o.je = undefined;
+          return o.je
+            ? o.je(e, () => {
+                o.$e?.();
+                o.$e = undefined;
               })
             : console.error(e);
         } catch (t) {
@@ -1766,16 +1769,16 @@ function effect(e, t, n, i, r) {
   recompute(o, true);
   !r?.defer && (o.W === EFFECT_USER ? o.F.enqueue(o.W, runEffect.bind(o)) : runEffect.call(o));
   s = true;
-  cleanup(() => o.je?.());
+  cleanup(() => o.$e?.());
 }
 function runEffect() {
   if (!this.H || this.O & REACTIVE_DISPOSED) return;
-  this.je?.();
-  this.je = undefined;
+  this.$e?.();
+  this.$e = undefined;
   try {
     const e = this.Me(this.J, this.Qe);
     if (false && e !== undefined && typeof e !== "function");
-    this.je = e;
+    this.$e = e;
   } catch (e) {
     this.fe = new StatusError(this, e);
     this.Se |= STATUS_ERROR;
@@ -1796,15 +1799,15 @@ function trackedEffect(e, t) {
   };
   const n = computed(
     () => {
-      n.je?.();
-      n.je = undefined;
+      n.$e?.();
+      n.$e = undefined;
       const t = staleValues(e);
-      n.je = t;
+      n.$e = t;
     },
     undefined,
     { ...t, lazy: true }
   );
-  n.je = undefined;
+  n.$e = undefined;
   n.Ke = true;
   n.H = true;
   n.W = EFFECT_TRACKED;
@@ -1818,7 +1821,7 @@ function trackedEffect(e, t) {
   };
   n.M = run;
   n.F.enqueue(EFFECT_USER, run);
-  cleanup(() => n.je?.());
+  cleanup(() => n.$e?.());
 }
 function restoreTransition(e, t) {
   globalQueue.initTransition(e);
@@ -1832,11 +1835,11 @@ function action(e) {
       const r = e(...t);
       globalQueue.initTransition();
       let s = activeTransition;
-      s.j.push(r);
+      s.$.push(r);
       const done = (e, t) => {
         s = currentTransition(s);
-        const o = s.j.indexOf(r);
-        if (o >= 0) s.j.splice(o, 1);
+        const o = s.$.indexOf(r);
+        if (o >= 0) s.$.splice(o, 1);
         setActiveTransition(s);
         schedule();
         t ? i(t) : n(e);
@@ -2121,7 +2124,7 @@ function createProjectionInternal(e, t = {}, n) {
       u !== o && u !== undefined && reconcile(u, n?.key || "id")(s);
     });
   });
-  i.ge = true;
+  i.Pe = true;
   return { store: s, node: i };
 }
 function createProjection(e, t = {}, n) {
@@ -2269,12 +2272,54 @@ function getKeys(e, t, n = true) {
   return Array.from(r);
 }
 function getPropertyDescriptor(e, t, n) {
-  let i = e;
   if (t && n in t) {
-    if (i[n] === $DELETED) return void 0;
-    if (!(n in i)) i = t;
+    if (t[n] === $DELETED) return void 0;
+    const i = Reflect.getOwnPropertyDescriptor(t, n);
+    if (i?.get || i?.set || !(n in e)) return i;
+  }
+  return Reflect.getOwnPropertyDescriptor(e, n);
+}
+function prepareStoreWrite(e, t, n) {
+  if (e[STORE_OPTIMISTIC]) {
+    const t = e[STORE_FIREWALL];
+    if (t?.K) {
+      globalQueue.initTransition(t.K);
+    }
+  }
+  const i = e[STORE_VALUE];
+  const r = i[n];
+  if (
+    snapshotCaptureActive &&
+    typeof n !== "symbol" &&
+    !((e[STORE_FIREWALL]?.Se ?? 0) & STATUS_PENDING)
+  ) {
+    if (!e[STORE_SNAPSHOT_PROPS]) {
+      e[STORE_SNAPSHOT_PROPS] = Object.create(null);
+      snapshotSources?.add(e);
+    }
+    if (!(n in e[STORE_SNAPSHOT_PROPS])) {
+      e[STORE_SNAPSHOT_PROPS][n] = r;
+    }
+  }
+  const s = e[STORE_OPTIMISTIC] && !projectionWriteActive;
+  const o = s ? STORE_OPTIMISTIC_OVERRIDE : STORE_OVERRIDE;
+  if (s) trackOptimisticStore(t);
+  return { base: r, overrideKey: o, state: i };
+}
+function notifyStoreProperty(e, t, n, i) {
+  if (e[STORE_HAS]?.[t]) setSignal(e[STORE_HAS][t], n !== "delete");
+  const r = getNodes(e, STORE_NODE);
+  if (n === "set") {
+    r[t] && setSignal(r[t], () => (isWrappable(i) ? wrap(i, e) : i));
+  } else if (n === "invalidate") {
+    if (r[t]) {
+      setSignal(r[t], {});
+      delete r[t];
+    }
+  } else {
+    r[t] && setSignal(r[t], undefined);
   }
-  return Reflect.getOwnPropertyDescriptor(i, n);
+  r[$TRACK] && setSignal(r[$TRACK], undefined);
 }
 let Writing = null;
 const storeTraps = {
@@ -2360,64 +2405,51 @@ const storeTraps = {
   set(e, t, n) {
     const i = e[$PROXY];
     if (writeOnly(i)) {
-      if (e[STORE_OPTIMISTIC]) {
-        const t = e[STORE_FIREWALL];
-        if (t?.K) {
-          globalQueue.initTransition(t.K);
-        }
-      }
       untrack(() => {
-        const r = e[STORE_VALUE];
-        const s = r[t];
-        if (
-          snapshotCaptureActive &&
-          typeof t !== "symbol" &&
-          !((e[STORE_FIREWALL]?.Se ?? 0) & STATUS_PENDING)
-        ) {
-          if (!e[STORE_SNAPSHOT_PROPS]) {
-            e[STORE_SNAPSHOT_PROPS] = Object.create(null);
-            snapshotSources?.add(e);
-          }
-          if (!(t in e[STORE_SNAPSHOT_PROPS])) {
-            e[STORE_SNAPSHOT_PROPS][t] = s;
-          }
-        }
-        const o = e[STORE_OPTIMISTIC] && !projectionWriteActive;
-        const u = o ? STORE_OPTIMISTIC_OVERRIDE : STORE_OVERRIDE;
-        if (o) trackOptimisticStore(i);
-        const c =
+        const { base: r, overrideKey: s, state: o } = prepareStoreWrite(e, i, t);
+        const u =
           e[STORE_OPTIMISTIC_OVERRIDE] && t in e[STORE_OPTIMISTIC_OVERRIDE]
             ? e[STORE_OPTIMISTIC_OVERRIDE][t]
             : e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]
               ? e[STORE_OVERRIDE][t]
-              : s;
-        const a = n?.[$TARGET]?.[STORE_VALUE] ?? n;
-        const l = Array.isArray(r) && t !== "length";
-        const f = l ? parseInt(t) + 1 : 0;
-        const E =
-          l &&
+              : r;
+        const c = n?.[$TARGET]?.[STORE_VALUE] ?? n;
+        const a = Array.isArray(o) && t !== "length";
+        const l = a ? parseInt(t) + 1 : 0;
+        const f =
+          a &&
           (e[STORE_OPTIMISTIC_OVERRIDE] && "length" in e[STORE_OPTIMISTIC_OVERRIDE]
             ? e[STORE_OPTIMISTIC_OVERRIDE].length
             : e[STORE_OVERRIDE] && "length" in e[STORE_OVERRIDE]
               ? e[STORE_OVERRIDE].length
-              : r.length);
-        const d = l && f > E ? f : undefined;
-        if (c === a && d === undefined) return true;
-        if (a !== undefined && a === s && d === undefined) delete e[u]?.[t];
+              : o.length);
+        const E = a && l > f ? l : undefined;
+        if (u === c && E === undefined) return true;
+        if (c !== undefined && c === r && E === undefined) delete e[s]?.[t];
         else {
-          const n = e[u] || (e[u] = Object.create(null));
-          n[t] = a;
-          if (d !== undefined) n.length = d;
+          const n = e[s] || (e[s] = Object.create(null));
+          n[t] = c;
+          if (E !== undefined) n.length = E;
         }
-        const T = isWrappable(a);
-        e[STORE_HAS]?.[t] && setSignal(e[STORE_HAS][t], true);
-        const S = getNodes(e, STORE_NODE);
-        S[t] && setSignal(S[t], () => (T ? wrap(a, e) : a));
-        if (Array.isArray(r)) {
-          const e = t === "length" ? a : d;
-          e !== undefined && S.length && setSignal(S.length, e);
+        notifyStoreProperty(e, t, "set", c);
+        if (Array.isArray(o)) {
+          const n = getNodes(e, STORE_NODE);
+          const i = t === "length" ? c : E;
+          i !== undefined && n.length && setSignal(n.length, i);
         }
-        S[$TRACK] && setSignal(S[$TRACK], undefined);
+        if (false);
+      });
+    }
+    return true;
+  },
+  defineProperty(e, t, n) {
+    const i = e[$PROXY];
+    if (writeOnly(i)) {
+      untrack(() => {
+        const { base: r, overrideKey: s } = prepareStoreWrite(e, i, t);
+        const o = "value" in n ? { ...n, value: n.value?.[$TARGET]?.[STORE_VALUE] ?? n.value } : n;
+        Object.defineProperty(e[s] || (e[s] = Object.create(null)), t, o);
+        notifyStoreProperty(e, t, "invalidate");
         if (false);
       });
     }
@@ -2442,10 +2474,7 @@ const storeTraps = {
         } else if (e[i] && t in e[i]) {
           delete e[i][t];
         } else return true;
-        if (e[STORE_HAS]?.[t]) setSignal(e[STORE_HAS][t], false);
-        const s = getNodes(e, STORE_NODE);
-        s[t] && setSignal(s[t], undefined);
-        s[$TRACK] && setSignal(s[$TRACK], undefined);
+        notifyStoreProperty(e, t, "delete");
       });
     }
     return true;
@@ -2467,9 +2496,11 @@ const storeTraps = {
     if (t === $PROXY) return { value: e[$PROXY], writable: true, configurable: true };
     if (e[STORE_OPTIMISTIC_OVERRIDE] && t in e[STORE_OPTIMISTIC_OVERRIDE]) {
       if (e[STORE_OPTIMISTIC_OVERRIDE][t] === $DELETED) return undefined;
-      const n = getPropertyDescriptor(e[STORE_VALUE], e[STORE_OVERRIDE], t);
-      if (n) {
-        return { ...n, value: e[STORE_OPTIMISTIC_OVERRIDE][t] };
+      const n = Reflect.getOwnPropertyDescriptor(e[STORE_OPTIMISTIC_OVERRIDE], t);
+      if (n?.get || n?.set || !(t in e[STORE_VALUE])) return n;
+      const i = getPropertyDescriptor(e[STORE_VALUE], e[STORE_OVERRIDE], t);
+      if (i) {
+        return { ...i, value: e[STORE_OPTIMISTIC_OVERRIDE][t] };
       }
       return {
         value: e[STORE_OPTIMISTIC_OVERRIDE][t],
@@ -2597,7 +2628,7 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
         setProjectionWriteActive(false);
       }
     });
-    i.ge = true;
+    i.Pe = true;
   }
   return { store: s, node: i };
 }
@@ -2650,7 +2681,12 @@ function updatePath(e, t, n = 0) {
   } else if (i === undefined || (isWrappable(r) && isWrappable(s) && !Array.isArray(s))) {
     const t = i !== undefined ? e[i] : 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 i = n[e];
+      const r = Object.getOwnPropertyDescriptor(s, i);
+      if (r.get || r.set) Object.defineProperty(t, i, r);
+      else t[i] = r.value;
+    }
   } else {
     e[i] = s;
   }
@@ -2855,11 +2891,11 @@ function mapArray(e, t, n) {
   return createMemo(
     updateKeyedMap.bind({
       Ye: createOwner(),
-      Be: 0,
-      Ze: e,
+      Ze: 0,
+      Be: e,
       qe: [],
-      ze: s,
-      Xe: [],
+      Xe: s,
+      ze: [],
       Je: [],
       et: i,
       tt: i || n?.keyed === false ? [] : undefined,
@@ -2870,7 +2906,7 @@ function mapArray(e, t, n) {
 }
 const pureOptions = { pureWrite: true };
 function updateKeyedMap() {
-  const e = this.Ze() || [],
+  const e = this.Be() || [],
     t = e.length;
   e[$TRACK];
   runWithOwner(this.Ye, () => {
@@ -2880,39 +2916,39 @@ function updateKeyedMap() {
         ? () => {
             this.tt[i] = signal(e[i], pureOptions);
             this.nt && (this.nt[i] = signal(i, pureOptions));
-            return this.ze(accessor(this.tt[i]), this.nt ? accessor(this.nt[i]) : undefined);
+            return this.Xe(accessor(this.tt[i]), this.nt ? accessor(this.nt[i]) : undefined);
           }
         : this.nt
           ? () => {
               const t = e[i];
               this.nt[i] = signal(i, pureOptions);
-              return this.ze(() => t, accessor(this.nt[i]));
+              return this.Xe(() => t, accessor(this.nt[i]));
             }
           : () => {
               const t = e[i];
-              return this.ze(() => t);
+              return this.Xe(() => t);
             };
     if (t === 0) {
-      if (this.Be !== 0) {
+      if (this.Ze !== 0) {
         this.Ye.dispose(false);
         this.Je = [];
         this.qe = [];
-        this.Xe = [];
-        this.Be = 0;
+        this.ze = [];
+        this.Ze = 0;
         this.tt && (this.tt = []);
         this.nt && (this.nt = []);
       }
-      if (this.it && !this.Xe[0]) {
-        this.Xe[0] = runWithOwner((this.Je[0] = createOwner()), this.it);
+      if (this.it && !this.ze[0]) {
+        this.ze[0] = runWithOwner((this.Je[0] = createOwner()), this.it);
       }
-    } else if (this.Be === 0) {
+    } else if (this.Ze === 0) {
       if (this.Je[0]) this.Je[0].dispose();
-      this.Xe = new Array(t);
+      this.ze = new Array(t);
       for (i = 0; i < t; i++) {
         this.qe[i] = e[i];
-        this.Xe[i] = runWithOwner((this.Je[i] = createOwner()), r);
+        this.ze[i] = runWithOwner((this.Je[i] = createOwner()), r);
       }
-      this.Be = t;
+      this.Ze = t;
     } else {
       let s,
         o,
@@ -2926,20 +2962,20 @@ function updateKeyedMap() {
         T = this.tt ? new Array(t) : undefined,
         S = this.nt ? new Array(t) : undefined;
       for (
-        s = 0, o = Math.min(this.Be, t);
+        s = 0, o = Math.min(this.Ze, t);
         s < o && (this.qe[s] === e[s] || (this.tt && compare(this.et, this.qe[s], e[s])));
         s++
       ) {
         if (this.tt) setSignal(this.tt[s], e[s]);
       }
       for (
-        o = this.Be - 1, u = t - 1;
+        o = this.Ze - 1, u = t - 1;
         o >= s &&
         u >= s &&
         (this.qe[o] === e[u] || (this.tt && compare(this.et, this.qe[o], e[u])));
         o--, u--
       ) {
-        E[u] = this.Xe[o];
+        E[u] = this.ze[o];
         d[u] = this.Je[o];
         T && (T[u] = this.tt[o]);
         S && (S[u] = this.nt[o]);
@@ -2958,7 +2994,7 @@ function updateKeyedMap() {
         a = this.et ? this.et(c) : c;
         i = l.get(a);
         if (i !== undefined && i !== -1) {
-          E[i] = this.Xe[n];
+          E[i] = this.ze[n];
           d[i] = this.Je[n];
           T && (T[i] = this.tt[n]);
           S && (S[i] = this.nt[n]);
@@ -2968,7 +3004,7 @@ function updateKeyedMap() {
       }
       for (i = s; i < t; i++) {
         if (i in E) {
-          this.Xe[i] = E[i];
+          this.ze[i] = E[i];
           this.Je[i] = d[i];
           if (T) {
             this.tt[i] = T[i];
@@ -2979,25 +3015,25 @@ function updateKeyedMap() {
             setSignal(this.nt[i], i);
           }
         } else {
-          this.Xe[i] = runWithOwner((this.Je[i] = createOwner()), r);
+          this.ze[i] = runWithOwner((this.Je[i] = createOwner()), r);
         }
       }
-      this.Xe = this.Xe.slice(0, (this.Be = t));
+      this.ze = this.ze.slice(0, (this.Ze = t));
       this.qe = e.slice(0);
     }
   });
-  return this.Xe;
+  return this.ze;
 }
 function repeat(e, t, n) {
   const i = t;
   return updateRepeat.bind({
     Ye: createOwner(),
-    Be: 0,
+    Ze: 0,
     rt: 0,
     st: e,
-    ze: i,
+    Xe: i,
     Je: [],
-    Xe: [],
+    ze: [],
     ot: n?.from,
     it: n?.fallback
   });
@@ -3007,47 +3043,47 @@ function updateRepeat() {
   const t = this.ot?.() || 0;
   runWithOwner(this.Ye, () => {
     if (e === 0) {
-      if (this.Be !== 0) {
+      if (this.Ze !== 0) {
         this.Ye.dispose(false);
         this.Je = [];
-        this.Xe = [];
-        this.Be = 0;
+        this.ze = [];
+        this.Ze = 0;
       }
-      if (this.it && !this.Xe[0]) {
-        this.Xe[0] = runWithOwner((this.Je[0] = createOwner()), this.it);
+      if (this.it && !this.ze[0]) {
+        this.ze[0] = runWithOwner((this.Je[0] = createOwner()), this.it);
       }
       return;
     }
     const n = t + e;
-    const i = this.rt + this.Be;
-    if (this.Be === 0 && this.Je[0]) this.Je[0].dispose();
+    const i = this.rt + this.Ze;
+    if (this.Ze === 0 && this.Je[0]) this.Je[0].dispose();
     for (let e = n; e < i; e++) this.Je[e - this.rt].dispose();
     if (this.rt < t) {
       let e = this.rt;
-      while (e < t && e < this.Be) this.Je[e++].dispose();
+      while (e < t && e < this.Ze) this.Je[e++].dispose();
       this.Je.splice(0, t - this.rt);
-      this.Xe.splice(0, t - this.rt);
+      this.ze.splice(0, t - this.rt);
     } else if (this.rt > t) {
       let n = i - this.rt - 1;
       let r = this.rt - t;
-      this.Je.length = this.Xe.length = e;
+      this.Je.length = this.ze.length = e;
       while (n >= r) {
         this.Je[n] = this.Je[n - r];
-        this.Xe[n] = this.Xe[n - r];
+        this.ze[n] = this.ze[n - r];
         n--;
       }
       for (let e = 0; e < r; e++) {
-        this.Xe[e] = runWithOwner((this.Je[e] = createOwner()), () => this.ze(e + t));
+        this.ze[e] = runWithOwner((this.Je[e] = createOwner()), () => this.Xe(e + t));
       }
     }
     for (let e = i; e < n; e++) {
-      this.Xe[e - t] = runWithOwner((this.Je[e - t] = createOwner()), () => this.ze(e));
+      this.ze[e - t] = runWithOwner((this.Je[e - t] = createOwner()), () => this.Xe(e));
     }
-    this.Xe = this.Xe.slice(0, e);
+    this.ze = this.ze.slice(0, e);
     this.rt = t;
-    this.Be = e;
+    this.Ze = e;
   });
-  return this.Xe;
+  return this.ze;
 }
 function compare(e, t, n) {
   return e ? e(t) === e(n) : true;
@@ -3061,7 +3097,7 @@ function boundaryComputed(e, t) {
     n.F.notify(n, n.ut, i, r);
   };
   n.ut = t;
-  n.ge = true;
+  n.Pe = true;
   recompute(n, true);
   return n;
 }
@@ -3100,8 +3136,8 @@ class RevealController {
   dt;
   ft = signal(false, { pureWrite: true, He: true });
   Et = signal(false, { pureWrite: true, He: true });
-  ht = true;
-  It = false;
+  It = true;
+  ht = false;
   constructor(e, t) {
     this.Rt = e;
     this.Ot = t;
@@ -3130,9 +3166,9 @@ class RevealController {
     untrack(() => this.evaluate());
   }
   evaluate(e, t) {
-    if (this.It) return;
-    this.It = true;
-    const n = this.ht;
+    if (this.ht) return;
+    this.ht = true;
+    const n = this.It;
     try {
       const n = e ?? read(this.ft),
         i = !!untrack(this.Ot),
@@ -3151,22 +3187,22 @@ class RevealController {
         });
       }
     } finally {
-      this.ht = this.isReady();
-      this.It = false;
+      this.It = this.isReady();
+      this.ht = false;
     }
-    if (this.dt && n !== this.ht) this.dt.evaluate();
+    if (this.dt && n !== this.It) this.dt.evaluate();
   }
 }
 class CollectionQueue extends Queue {
   Nt;
   ct = new Set();
-  gt;
+  Pt;
   lt = true;
   ft = signal(false, { pureWrite: true, He: true });
   Et = signal(false, { pureWrite: true, He: true });
   Tt;
   St = false;
-  Pt;
+  gt;
   Ct = ON_INIT;
   constructor(e) {
     super();
@@ -3178,10 +3214,10 @@ class CollectionQueue extends Queue {
   }
   notify(e, t, n, i) {
     if (!(t & this.Nt)) return super.notify(e, t, n, i);
-    if (this.St && this.Pt) {
+    if (this.St && this.gt) {
       const e = untrack(() => {
         try {
-          return this.Pt();
+          return this.gt();
         } catch {
           return ON_INIT;
         }
@@ -3217,16 +3253,16 @@ class CollectionQueue extends Queue {
         this.ct.delete(e);
     }
     if (!this.ct.size) {
-      if (this.Nt & STATUS_PENDING && this.lt && !this.St && this.gt) {
-        this.lt = !!(this.gt.Se & this.Nt);
+      if (this.Nt & STATUS_PENDING && this.lt && !this.St && this.Pt) {
+        this.lt = !!(this.Pt.Se & this.Nt);
       } else {
         this.lt = false;
       }
       if (!this.lt) {
         setSignal(this.ft, false);
-        if (this.Pt) {
+        if (this.gt) {
           try {
-            this.Ct = untrack(() => this.Pt());
+            this.Ct = untrack(() => this.gt());
           } catch {}
         }
       }
@@ -3238,8 +3274,8 @@ function createCollectionBoundary(e, t, n, i) {
   const r = createOwner();
   if (_revealUsed) setContext(RevealControllerContext, null, r);
   const s = new CollectionQueue(e);
-  if (i) s.Pt = i;
-  const o = (s.gt = createBoundChildren(r, t, s, e));
+  if (i) s.gt = i;
+  const o = (s.Pt = createBoundChildren(r, t, s, e));
   untrack(() => {
     let t = false;
     try {