@solidjs/signals 0.13.7 → 0.13.9

package/dist/dev.js

@@ -1361,7 +1361,7 @@ function updateIfNecessary(el) {
   ) {
     recompute(el);
   }
-  el._flags = REACTIVE_NONE | (el._flags & REACTIVE_SNAPSHOT_STALE);
+  el._flags = el._flags & (REACTIVE_SNAPSHOT_STALE | REACTIVE_IN_HEAP | REACTIVE_IN_HEAP_HEIGHT);
 }
 function computed(fn, initialValue, options) {
   const transparent = options?.transparent ?? false;
@@ -1606,7 +1606,7 @@ function read(el) {
   }
   if (el._fn && el._statusFlags & STATUS_ERROR) {
     if (el._time < clock) {
-      recompute(el, true);
+      recompute(el);
       return read(el);
     } else throw el._error;
   }
@@ -2335,6 +2335,18 @@ function createWriteTraps(isActive) {
       }
       return typeof value === "object" && value !== null ? new Proxy(value, traps) : value;
     },
+    has(_, prop) {
+      let value;
+      setWriteOverride(true);
+      setProjectionWriteActive(true);
+      try {
+        value = prop in _;
+      } finally {
+        setWriteOverride(false);
+        setProjectionWriteActive(false);
+      }
+      return value;
+    },
     set(_, prop, value) {
       if (isActive && !isActive()) return true;
       setWriteOverride(true);
@@ -2392,7 +2404,12 @@ function wrap(value, target) {
   return p;
 }
 function isWrappable(obj) {
-  return obj != null && typeof obj === "object" && !Object.isFrozen(obj);
+  return (
+    obj != null &&
+    typeof obj === "object" &&
+    !Object.isFrozen(obj) &&
+    !(typeof Node !== "undefined" && obj instanceof Node)
+  );
 }
 let writeOverride = false;
 function setWriteOverride(value) {
@@ -2544,17 +2561,19 @@ const storeTraps = {
         : target[STORE_OVERRIDE] && property in target[STORE_OVERRIDE]
           ? target[STORE_OVERRIDE][property] !== $DELETED
           : property in target[STORE_VALUE];
-    getObserver() &&
-      read(
-        getNode(
-          getNodes(target, STORE_HAS),
-          property,
-          has,
-          target[STORE_FIREWALL],
-          isEqual,
-          target[STORE_OPTIMISTIC]
-        )
-      );
+    if (!writeOnly(target[$PROXY])) {
+      getObserver() &&
+        read(
+          getNode(
+            getNodes(target, STORE_HAS),
+            property,
+            has,
+            target[STORE_FIREWALL],
+            isEqual,
+            target[STORE_OPTIMISTIC]
+          )
+        );
+    }
     return has;
   },
   set(target, property, rawValue) {
@@ -2592,25 +2611,32 @@ const storeTraps = {
               ? target[STORE_OVERRIDE][property]
               : base;
         const value = rawValue?.[$TARGET]?.[STORE_VALUE] ?? rawValue;
-        if (prev === value) return true;
+        const isArrayIndexWrite = Array.isArray(state) && property !== "length";
+        const nextIndex = isArrayIndexWrite ? parseInt(property) + 1 : 0;
         const len =
-          target[STORE_OPTIMISTIC_OVERRIDE]?.length ||
-          target[STORE_OVERRIDE]?.length ||
-          state.length;
-        if (value !== undefined && value === base) delete target[overrideKey][property];
-        else (target[overrideKey] || (target[overrideKey] = Object.create(null)))[property] = value;
+          isArrayIndexWrite &&
+          (target[STORE_OPTIMISTIC_OVERRIDE] && "length" in target[STORE_OPTIMISTIC_OVERRIDE]
+            ? target[STORE_OPTIMISTIC_OVERRIDE].length
+            : target[STORE_OVERRIDE] && "length" in target[STORE_OVERRIDE]
+              ? target[STORE_OVERRIDE].length
+              : state.length);
+        const nextLength = isArrayIndexWrite && nextIndex > len ? nextIndex : undefined;
+        if (prev === value && nextLength === undefined) return true;
+        if (value !== undefined && value === base && nextLength === undefined)
+          delete target[overrideKey]?.[property];
+        else {
+          const override = target[overrideKey] || (target[overrideKey] = Object.create(null));
+          override[property] = value;
+          if (nextLength !== undefined) override.length = nextLength;
+        }
         const wrappable = isWrappable(value);
         target[STORE_HAS]?.[property] && setSignal(target[STORE_HAS][property], true);
         const nodes = getNodes(target, STORE_NODE);
         nodes[property] &&
           setSignal(nodes[property], () => (wrappable ? wrap(value, target) : value));
         if (Array.isArray(state)) {
-          if (property === "length") {
-            nodes.length && setSignal(nodes.length, value);
-          } else {
-            const index = parseInt(property) + 1;
-            if (index > len) nodes.length && setSignal(nodes.length, index);
-          }
+          const lengthValue = property === "length" ? value : nextLength;
+          lengthValue !== undefined && nodes.length && setSignal(nodes.length, lengthValue);
         }
         nodes[$TRACK] && setSignal(nodes[$TRACK], undefined);
       });
@@ -3364,8 +3390,9 @@ class CollectionQueue extends Queue {
   checkSources() {
     for (const source of this._sources) {
       if (
-        !(source._statusFlags & this._collectionType) &&
-        !(this._collectionType & STATUS_ERROR && source._statusFlags & STATUS_PENDING)
+        source._flags & REACTIVE_DISPOSED ||
+        (!(source._statusFlags & this._collectionType) &&
+          !(this._collectionType & STATUS_ERROR && source._statusFlags & STATUS_PENDING))
       )
         this._sources.delete(source);
     }

package/dist/node.cjs

@@ -44,8 +44,8 @@ const S = {};
 const w = {};
 const m = "sp";
 const b = typeof Proxy === "function";
-const _ = {};
-const O = Symbol("refresh");
+const O = {};
+const _ = Symbol("refresh");
 function actualInsertIntoHeap(e, t) {
   const n = (e.i?.t ? e.i.u?.o : e.i?.o) ?? -1;
   if (n >= e.o) e.o = n + 1;
@@ -92,8 +92,8 @@ function deleteFromHeap(e, t) {
   e.h = undefined;
 }
 function markHeap(e) {
-  if (e._) return;
-  e._ = true;
+  if (e.O) return;
+  e.O = true;
   for (let t = 0; t <= e.S; t++) {
     for (let n = e.l[t]; n !== undefined; n = n.h) {
       if (n.m & i) markNode(n);
@@ -104,19 +104,19 @@ function markNode(e, r = n) {
   const i = e.m;
   if ((i & (t | n)) >= r) return;
   e.m = (i & -4) | r;
-  for (let n = e.O; n !== null; n = n.P) {
+  for (let n = e._; n !== null; n = n.P) {
     markNode(n.k, t);
   }
-  if (e.C !== null) {
-    for (let n = e.C; n !== null; n = n.W) {
-      for (let e = n.O; e !== null; e = e.P) {
+  if (e.W !== null) {
+    for (let n = e.W; n !== null; n = n.C) {
+      for (let e = n._; e !== null; e = e.P) {
         markNode(e.k, t);
       }
     }
   }
 }
 function runHeap(e, t) {
-  e._ = false;
+  e.O = false;
   for (e.j = 0; e.j <= e.S; e.j++) {
     let n = e.l[e.j];
     while (n !== undefined) {
@@ -137,18 +137,18 @@ function adjustHeight(e, t) {
   }
   if (e.o !== n) {
     e.o = n;
-    for (let n = e.O; n !== null; n = n.P) {
+    for (let n = e._; n !== null; n = n.P) {
       insertIntoHeapHeight(n.k, t);
     }
   }
 }
 const x = new Set();
-const P = { l: new Array(2e3).fill(undefined), _: false, j: 0, S: 0 };
-const v = { l: new Array(2e3).fill(undefined), _: false, j: 0, S: 0 };
+const P = { l: new Array(2e3).fill(undefined), O: false, j: 0, S: 0 };
+const v = { l: new Array(2e3).fill(undefined), O: false, j: 0, S: 0 };
 let E = 0;
 let k = null;
-let C = false;
 let W = false;
+let C = false;
 let j = null;
 function enforceLoadingBoundary(e) {}
 function shouldReadStashedOptimisticValue(e) {
@@ -165,7 +165,7 @@ function runLaneEffects(e) {
   }
 }
 function queueStashedOptimisticEffects(e) {
-  for (let t = e.O; t !== null; t = t.P) {
+  for (let t = e._; t !== null; t = t.P) {
     const e = t.k;
     if (!e.D) continue;
     if (e.D === y) {
@@ -181,7 +181,7 @@ function queueStashedOptimisticEffects(e) {
   }
 }
 function setProjectionWriteActive(e) {
-  W = e;
+  C = e;
 }
 function mergeTransitionState(e, t) {
   t.B = e;
@@ -227,9 +227,9 @@ function cleanupCompletedLanes(e) {
   }
 }
 function schedule() {
-  if (C) return;
-  C = true;
-  if (!A.ne && !W) queueMicrotask(flush);
+  if (W) return;
+  W = true;
+  if (!A.ne && !C) queueMicrotask(flush);
 }
 class Queue {
   i = null;
@@ -319,7 +319,7 @@ class GlobalQueue extends Queue {
           runLaneEffects(g);
           this.stashQueues(e.ce);
           E++;
-          C = P.S >= P.j;
+          W = P.S >= P.j;
           reassignPendingTransition(e.se);
           k = null;
           if (!e.G.length && e.U.length) {
@@ -350,7 +350,7 @@ class GlobalQueue extends Queue {
         finalizePureQueue();
       }
       E++;
-      C = P.S >= P.j;
+      W = P.S >= P.j;
       runLaneEffects(h);
       this.run(h);
       runLaneEffects(g);
@@ -426,7 +426,7 @@ class GlobalQueue extends Queue {
 function insertSubs(e, t = false) {
   const n = e.Y || M;
   const r = e.pe !== undefined;
-  for (let i = e.O; i !== null; i = i.P) {
+  for (let i = e._; i !== null; i = i.P) {
     if (r && i.k.he) {
       i.k.m |= c;
       continue;
@@ -504,7 +504,7 @@ function flush() {
   if (A.ne) {
     return;
   }
-  while (C || k) {
+  while (W || k) {
     A.flush();
   }
 }
@@ -629,10 +629,10 @@ function unlinkSubs(e) {
   else t.be = i;
   if (i !== null) i.P = r;
   else {
-    t.O = r;
+    t._ = r;
     if (r === null) {
-      t._e?.();
-      t.R && !t.Oe && !(t.m & o) && unobserved(t);
+      t.Oe?.();
+      t.R && !t._e && !(t.m & o) && unobserved(t);
     }
   }
   return n;
@@ -664,7 +664,7 @@ function link(e, t) {
   if (n !== null) n.N = u;
   else t.A = u;
   if (o !== null) o.P = u;
-  else e.O = u;
+  else e._ = u;
 }
 function isValidLink(e, t) {
   const n = t.xe;
@@ -724,12 +724,12 @@ function disposeChildren(e, t = false, n) {
     e.ke = null;
   } else {
     e.Pe = null;
-    e.Ce = 0;
+    e.We = 0;
   }
   runDisposal(e, n);
 }
 function runDisposal(e, t) {
-  let n = t ? e.We : e.je;
+  let n = t ? e.Ce : e.je;
   if (!n) return;
   if (Array.isArray(n)) {
     for (let e = 0; e < n.length; e++) {
@@ -739,12 +739,12 @@ function runDisposal(e, t) {
   } else {
     n.call(n);
   }
-  t ? (e.We = null) : (e.je = null);
+  t ? (e.Ce = null) : (e.je = null);
 }
 function childId(e, t) {
   let n = e;
   while (n.Ae && n.i) n = n.i;
-  if (n.id != null) return formatId(n.id, t ? n.Ce++ : n.Ce);
+  if (n.id != null) return formatId(n.id, t ? n.We++ : n.We);
   throw new Error("Cannot get child id from owner without an id");
 }
 function getNextChildId(e) {
@@ -787,9 +787,9 @@ function createOwner(e) {
     ve: null,
     je: null,
     V: t?.V ?? A,
-    Ne: t?.Ne || _,
-    Ce: 0,
-    We: null,
+    Ne: t?.Ne || O,
+    We: 0,
+    Ce: null,
     ke: null,
     i: t,
     dispose(e = true) {
@@ -860,9 +860,9 @@ function setPendingError(e, t, n) {
   }
 }
 function forEachDependent(e, t) {
-  for (let n = e.O; n !== null; n = n.P) t(n.k);
-  for (let n = e.C; n !== null; n = n.W) {
-    for (let e = n.O; e !== null; e = e.P) t(e.k);
+  for (let n = e._; n !== null; n = n.P) t(n.k);
+  for (let n = e.W; n !== null; n = n.C) {
+    for (let e = n._; e !== null; e = e.P) t(e.k);
   }
 }
 function settlePendingSource(e) {
@@ -1175,11 +1175,11 @@ function recompute(t, n = false) {
     if (t.K || i === y) disposeChildren(t);
     else {
       markDisposal(t);
-      t.We = t.je;
+      t.Ce = t.je;
       t.ke = t.Pe;
       t.je = null;
       t.Pe = null;
-      t.Ce = 0;
+      t.We = 0;
     }
   }
   const s = !!(t.m & f);
@@ -1255,7 +1255,7 @@ function recompute(t, n = false) {
     } else if (u) {
       t.Z = h;
     } else if (t.o != g) {
-      for (let e = t.O; e !== null; e = e.P) {
+      for (let e = t._; e !== null; e = e.P) {
         insertIntoHeapHeight(e.k, e.k.m & o ? v : P);
       }
     }
@@ -1264,23 +1264,23 @@ function recompute(t, n = false) {
   (!n || t.ge & a) && !t.K && !(k && u) && A.se.push(t);
   t.K && i && k !== t.K && runInTransition(t.K, () => recompute(t));
 }
-function updateIfNecessary(r) {
-  if (r.m & t) {
-    for (let e = r.A; e; e = e.N) {
-      const t = e.L;
-      const i = t.I || t;
+function updateIfNecessary(e) {
+  if (e.m & t) {
+    for (let t = e.A; t; t = t.N) {
+      const r = t.L;
+      const i = r.I || r;
       if (i.R) {
         updateIfNecessary(i);
       }
-      if (r.m & n) {
+      if (e.m & n) {
         break;
       }
     }
   }
-  if (r.m & (n | f) || (r.ae && r.de < E && !r.Ee)) {
-    recompute(r);
+  if (e.m & (n | f) || (e.ae && e.de < E && !e.Ee)) {
+    recompute(e);
   }
-  r.m = e | (r.m & c);
+  e.m = e.m & (c | i | s);
 }
 function computed(t, n, r) {
   const i = r?.transparent ?? false;
@@ -1289,20 +1289,20 @@ function computed(t, n, r) {
     Ae: i || undefined,
     Te: r?.equals != null ? r.equals : isEqual,
     le: !!r?.pureWrite,
-    _e: r?.unobserved,
+    Oe: r?.unobserved,
     je: null,
     V: V?.V ?? A,
-    Ne: V?.Ne ?? _,
-    Ce: 0,
+    Ne: V?.Ne ?? O,
+    We: 0,
     R: t,
     $: n,
     o: 0,
-    C: null,
+    W: null,
     h: undefined,
     p: null,
     A: null,
     xe: null,
-    O: null,
+    _: null,
     be: null,
     i: V,
     ve: null,
@@ -1311,7 +1311,7 @@ function computed(t, n, r) {
     ge: p,
     de: E,
     Z: S,
-    We: null,
+    Ce: null,
     ke: null,
     Ee: null,
     K: null
@@ -1354,16 +1354,16 @@ function signal(e, t, n = null) {
     Te: t?.equals != null ? t.equals : isEqual,
     le: !!t?.pureWrite,
     De: !!t?.De,
-    _e: t?.unobserved,
+    Oe: t?.unobserved,
     $: e,
-    O: null,
+    _: null,
     be: null,
     de: E,
     I: n,
-    W: n?.C || null,
+    C: n?.W || null,
     Z: S
   };
-  n && (n.C = r);
+  n && (n.W = r);
   if (B && !r.De && !((n?.ge ?? 0) & a)) {
     r.pe = e === undefined ? w : e;
     G.add(r);
@@ -1485,7 +1485,7 @@ function read(e) {
   }
   if (e.R && e.ge & d) {
     if (e.de < E) {
-      recompute(e, true);
+      recompute(e);
       return read(e);
     } else throw e.ae;
   }
@@ -1511,7 +1511,7 @@ function read(e) {
 }
 function setSignal(e, t) {
   if (e.K && k !== e.K) A.initTransition(e.K);
-  const n = e.ee !== undefined && !W;
+  const n = e.ee !== undefined && !C;
   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);
@@ -1661,7 +1661,7 @@ function refresh(e) {
   Q = true;
   try {
     if (typeof e !== "function") {
-      recompute(e[O]);
+      recompute(e[_]);
       return e;
     }
     return untrack(e);
@@ -2091,7 +2091,7 @@ function createProjectionInternal(e, t = {}, n) {
       u !== o && u !== undefined && reconcile(u, n?.key || "id")(s);
     });
   });
-  r.Oe = true;
+  r._e = true;
   return { store: s, node: r };
 }
 function createProjection(e, t = {}, n) {
@@ -2111,6 +2111,18 @@ function createWriteTraps(e) {
       }
       return typeof r === "object" && r !== null ? new Proxy(r, t) : r;
     },
+    has(e, t) {
+      let n;
+      setWriteOverride(true);
+      setProjectionWriteActive(true);
+      try {
+        n = t in e;
+      } finally {
+        setWriteOverride(false);
+        setProjectionWriteActive(false);
+      }
+      return n;
+    },
     set(t, n, r) {
       if (e && !e()) return true;
       setWriteOverride(true);
@@ -2168,7 +2180,12 @@ function wrap(e, t) {
   return n;
 }
 function isWrappable(e) {
-  return e != null && typeof e === "object" && !Object.isFrozen(e);
+  return (
+    e != null &&
+    typeof e === "object" &&
+    !Object.isFrozen(e) &&
+    !(typeof Node !== "undefined" && e instanceof Node)
+  );
 }
 let oe = false;
 function setWriteOverride(e) {
@@ -2231,7 +2248,7 @@ const fe = {
   get(e, t, n) {
     if (t === z) return e;
     if (t === U) return n;
-    if (t === O) return e[re];
+    if (t === _) return e[re];
     if (t === K) {
       trackSelf(e);
       return n;
@@ -2272,7 +2289,9 @@ const fe = {
   has(e, t) {
     if (t === U || t === K || t === "__proto__") return true;
     const n = e[Z] && t in e[Z] ? e[Z][t] !== J : e[Y] && t in e[Y] ? e[Y][t] !== J : t in e[X];
-    getObserver() && read(getNode(getNodes(e, ee), t, n, e[re], isEqual, e[ie]));
+    if (!writeOnly(e[U])) {
+      getObserver() && read(getNode(getNodes(e, ee), t, n, e[re], isEqual, e[ie]));
+    }
     return n;
   },
   set(e, t, n) {
@@ -2296,28 +2315,37 @@ const fe = {
             e[m][t] = s;
           }
         }
-        const o = e[ie] && !W;
+        const o = e[ie] && !C;
         const u = o ? Z : Y;
         if (o) trackOptimisticStore(r);
         const f = e[Z] && t in e[Z] ? e[Z][t] : e[Y] && t in e[Y] ? e[Y][t] : s;
         const c = n?.[z]?.[X] ?? n;
-        if (f === c) return true;
-        const l = e[Z]?.length || e[Y]?.length || i.length;
-        if (c !== undefined && c === s) delete e[u][t];
-        else (e[u] || (e[u] = Object.create(null)))[t] = c;
-        const d = isWrappable(c);
+        const l = Array.isArray(i) && t !== "length";
+        const d = l ? parseInt(t) + 1 : 0;
+        const p =
+          l &&
+          (e[Z] && "length" in e[Z]
+            ? e[Z].length
+            : e[Y] && "length" in e[Y]
+              ? e[Y].length
+              : i.length);
+        const h = l && d > p ? d : undefined;
+        if (f === c && h === undefined) return true;
+        if (c !== undefined && c === s && h === undefined) delete e[u]?.[t];
+        else {
+          const n = e[u] || (e[u] = Object.create(null));
+          n[t] = c;
+          if (h !== undefined) n.length = h;
+        }
+        const g = isWrappable(c);
         e[ee]?.[t] && setSignal(e[ee][t], true);
-        const p = getNodes(e, $);
-        p[t] && setSignal(p[t], () => (d ? wrap(c, e) : c));
+        const y = getNodes(e, $);
+        y[t] && setSignal(y[t], () => (g ? wrap(c, e) : c));
         if (Array.isArray(i)) {
-          if (t === "length") {
-            p.length && setSignal(p.length, c);
-          } else {
-            const e = parseInt(t) + 1;
-            if (e > l) p.length && setSignal(p.length, e);
-          }
+          const e = t === "length" ? c : h;
+          e !== undefined && y.length && setSignal(y.length, e);
         }
-        p[K] && setSignal(p[K], undefined);
+        y[K] && setSignal(y[K], undefined);
       });
     }
     return true;
@@ -2327,7 +2355,7 @@ const fe = {
     const r = e[Y]?.[t] === J;
     if (writeOnly(e[U]) && !n && !r) {
       untrack(() => {
-        const n = e[ie] && !W;
+        const n = e[ie] && !C;
         const r = n ? Z : Y;
         if (n) trackOptimisticStore(e[U]);
         const i = e[Z] && t in e[Z] ? e[Z][t] : e[Y] && t in e[Y] ? e[Y][t] : e[X][t];
@@ -2485,7 +2513,7 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
         setProjectionWriteActive(false);
       }
     });
-    r.Oe = true;
+    r._e = true;
   }
   return { store: s, node: r };
 }
@@ -2946,7 +2974,7 @@ function boundaryComputed(e, t) {
     n.V.notify(n, n.ut, r, i);
   };
   n.ut = t;
-  n.Oe = true;
+  n._e = true;
   recompute(n, true);
   return n;
 }
@@ -3008,7 +3036,7 @@ class CollectionQueue extends Queue {
   }
   checkSources() {
     for (const e of this.ct) {
-      if (!(e.ge & this.ft) && !(this.ft & d && e.ge & a)) this.ct.delete(e);
+      if (e.m & u || (!(e.ge & this.ft) && !(this.ft & d && e.ge & a))) this.ct.delete(e);
     }
     if (!this.ct.size) {
       setSignal(this.lt, false);
@@ -3100,7 +3128,7 @@ function flattenArray(e, t = [], n) {
   return i;
 }
 exports.$PROXY = U;
-exports.$REFRESH = O;
+exports.$REFRESH = _;
 exports.$TARGET = z;
 exports.$TRACK = K;
 exports.ContextNotFoundError = ContextNotFoundError;

package/dist/prod.js

@@ -679,7 +679,7 @@ function isValidLink(e, t) {
 }
 const PENDING_OWNER = {};
 function markDisposal(e) {
-  let t = e.ge;
+  let t = e.Pe;
   while (t) {
     t.O |= REACTIVE_ZOMBIE;
     if (t.O & REACTIVE_IN_HEAP) {
@@ -687,7 +687,7 @@ function markDisposal(e) {
       insertIntoHeap(t, zombieQueue);
     }
     markDisposal(t);
-    t = t.Pe;
+    t = t.ge;
   }
 }
 function dispose(e) {
@@ -703,9 +703,9 @@ function disposeChildren(e, t = false, n) {
   if (e.O & REACTIVE_DISPOSED) return;
   if (t) e.O = REACTIVE_DISPOSED;
   if (t && e.L) e.Ce = null;
-  let i = n ? e.De : e.ge;
+  let i = n ? e.De : e.Pe;
   while (i) {
-    const e = i.Pe;
+    const e = i.ge;
     if (i.C) {
       const e = i;
       deleteFromHeap(e, e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
@@ -722,13 +722,13 @@ function disposeChildren(e, t = false, n) {
   if (n) {
     e.De = null;
   } else {
-    e.ge = null;
+    e.Pe = null;
     e.ye = 0;
   }
   runDisposal(e, n);
 }
 function runDisposal(e, t) {
-  let n = t ? e.me : e.ve;
+  let n = t ? e.ve : e.me;
   if (!n) return;
   if (Array.isArray(n)) {
     for (let e = 0; e < n.length; e++) {
@@ -738,11 +738,11 @@ function runDisposal(e, t) {
   } else {
     n.call(n);
   }
-  t ? (e.me = null) : (e.ve = null);
+  t ? (e.ve = null) : (e.me = null);
 }
 function childId(e, t) {
   let n = e;
-  while (n.we && n.i) n = n.i;
+  while (n.Ve && n.i) n = n.i;
   if (n.id != null) return formatId(n.id, t ? n.ye++ : n.ye);
   throw new Error("Cannot get child id from owner without an id");
 }
@@ -766,9 +766,9 @@ function getOwner() {
 }
 function cleanup(e) {
   if (!context) return e;
-  if (!context.ve) context.ve = e;
-  else if (Array.isArray(context.ve)) context.ve.push(e);
-  else context.ve = [context.ve, e];
+  if (!context.me) context.me = e;
+  else if (Array.isArray(context.me)) context.me.push(e);
+  else context.me = [context.me, e];
   return e;
 }
 function isDisposed(e) {
@@ -779,16 +779,16 @@ function createOwner(e) {
   const n = e?.transparent ?? false;
   const i = {
     id: e?.id ?? (n ? t?.id : t?.id != null ? getNextChildId(t) : undefined),
-    we: n || undefined,
+    Ve: n || undefined,
     t: true,
     u: t?.t ? t.u : t,
-    ge: null,
     Pe: null,
-    ve: null,
+    ge: null,
+    me: null,
     F: t?.F ?? globalQueue,
-    be: t?.be || defaultContext,
+    we: t?.we || defaultContext,
     ye: 0,
-    me: null,
+    ve: null,
     De: null,
     i: t,
     dispose(e = true) {
@@ -796,12 +796,12 @@ function createOwner(e) {
     }
   };
   if (t) {
-    const e = t.ge;
+    const e = t.Pe;
     if (e === null) {
-      t.ge = i;
+      t.Pe = i;
     } else {
-      i.Pe = e;
-      t.ge = i;
+      i.ge = e;
+      t.Pe = i;
     }
   }
   return i;
@@ -811,28 +811,28 @@ function createRoot(e, t) {
   return runWithOwner(n, () => e(n.dispose));
 }
 function addPendingSource(e, t) {
-  if (e.Ve === t || e.Le?.has(t)) return false;
-  if (!e.Ve) {
-    e.Ve = t;
+  if (e.be === t || e.Le?.has(t)) return false;
+  if (!e.be) {
+    e.be = t;
     return true;
   }
   if (!e.Le) {
-    e.Le = new Set([e.Ve, t]);
+    e.Le = new Set([e.be, t]);
   } else {
     e.Le.add(t);
   }
-  e.Ve = undefined;
+  e.be = undefined;
   return true;
 }
 function removePendingSource(e, t) {
-  if (e.Ve) {
-    if (e.Ve !== t) return false;
-    e.Ve = undefined;
+  if (e.be) {
+    if (e.be !== t) return false;
+    e.be = undefined;
     return true;
   }
   if (!e.Le?.delete(t)) return false;
   if (e.Le.size === 1) {
-    e.Ve = e.Le.values().next().value;
+    e.be = e.Le.values().next().value;
     e.Le = undefined;
   } else if (e.Le.size === 0) {
     e.Le = undefined;
@@ -840,7 +840,7 @@ function removePendingSource(e, t) {
   return true;
 }
 function clearPendingSources(e) {
-  e.Ve = undefined;
+  e.be = undefined;
   e.Le?.clear();
   e.Le = undefined;
 }
@@ -871,7 +871,7 @@ function settlePendingSource(e) {
     if (n.has(i) || !removePendingSource(i, e)) return;
     n.add(i);
     i.Ee = clock;
-    const r = i.Ve ?? i.Le?.values().next().value;
+    const r = i.be ?? i.Le?.values().next().value;
     if (r) {
       setPendingError(i, r);
       updatePendingSignal(i);
@@ -1072,8 +1072,8 @@ function notifyStatus(e, t, n, i, r) {
   forEachDependent(e, e => {
     e.Ee = clock;
     if (
-      (t === STATUS_PENDING && s && e.Ve !== s && !e.Le?.has(s)) ||
-      (t !== STATUS_PENDING && (e.le !== n || e.Ve || e.Le))
+      (t === STATUS_PENDING && s && e.be !== s && !e.Le?.has(s)) ||
+      (t !== STATUS_PENDING && (e.le !== n || e.be || e.Le))
     ) {
       if (!a && !e.K) globalQueue.se.push(e);
       notifyStatus(e, t, n, a, f);
@@ -1135,10 +1135,10 @@ function releaseSnapshotScope(e) {
   schedule();
 }
 function releaseSubtree(e) {
-  let t = e.ge;
+  let t = e.Pe;
   while (t) {
     if (t.We) {
-      t = t.Pe;
+      t = t.ge;
       continue;
     }
     if (t.L) {
@@ -1152,7 +1152,7 @@ function releaseSubtree(e) {
       }
     }
     releaseSubtree(t);
-    t = t.Pe;
+    t = t.ge;
   }
 }
 function clearSnapshots() {
@@ -1175,10 +1175,10 @@ function recompute(e, t = false) {
     if (e.K || n === EFFECT_TRACKED) disposeChildren(e);
     else {
       markDisposal(e);
-      e.me = e.ve;
-      e.De = e.ge;
-      e.ve = null;
-      e.ge = null;
+      e.ve = e.me;
+      e.De = e.Pe;
+      e.me = null;
+      e.Pe = null;
       e.ye = 0;
     }
   }
@@ -1280,19 +1280,19 @@ function updateIfNecessary(e) {
   if (e.O & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY) || (e.le && e.Ee < clock && !e.Ce)) {
     recompute(e);
   }
-  e.O = REACTIVE_NONE | (e.O & REACTIVE_SNAPSHOT_STALE);
+  e.O = e.O & (REACTIVE_SNAPSHOT_STALE | REACTIVE_IN_HEAP | REACTIVE_IN_HEAP_HEIGHT);
 }
 function computed(e, t, n) {
   const i = n?.transparent ?? false;
   const r = {
     id: n?.id ?? (i ? context?.id : context?.id != null ? getNextChildId(context) : undefined),
-    we: i || undefined,
+    Ve: i || undefined,
     ke: n?.equals != null ? n.equals : isEqual,
     fe: !!n?.pureWrite,
     he: n?.unobserved,
-    ve: null,
+    me: null,
     F: context?.F ?? globalQueue,
-    be: context?.be ?? defaultContext,
+    we: context?.we ?? defaultContext,
     ye: 0,
     L: e,
     J: t,
@@ -1305,13 +1305,13 @@ function computed(e, t, n) {
     I: null,
     pe: null,
     i: context,
-    Pe: null,
     ge: null,
+    Pe: null,
     O: n?.lazy ? REACTIVE_LAZY : REACTIVE_NONE,
     Se: STATUS_UNINITIALIZED,
     Ee: clock,
     X: NOT_PENDING,
-    me: null,
+    ve: null,
     De: null,
     Ce: null,
     K: null
@@ -1319,12 +1319,12 @@ function computed(e, t, n) {
   r.T = r;
   const s = context?.t ? context.u : context;
   if (context) {
-    const e = context.ge;
+    const e = context.Pe;
     if (e === null) {
-      context.ge = r;
+      context.Pe = r;
     } else {
-      r.Pe = e;
-      context.ge = r;
+      r.ge = e;
+      context.Pe = r;
     }
   }
   if (s) r.o = s.o + 1;
@@ -1485,7 +1485,7 @@ function read(e) {
   }
   if (e.L && e.Se & STATUS_ERROR) {
     if (e.Ee < clock) {
-      recompute(e, true);
+      recompute(e);
       return read(e);
     } else throw e.le;
   }
@@ -1683,7 +1683,7 @@ function getContext(e, t = getOwner()) {
   if (!t) {
     throw new NoOwnerError();
   }
-  const n = hasContext(e, t) ? t.be[e.id] : e.defaultValue;
+  const n = hasContext(e, t) ? t.we[e.id] : e.defaultValue;
   if (isUndefined(n)) {
     throw new ContextNotFoundError();
   }
@@ -1693,10 +1693,10 @@ function setContext(e, t, n = getOwner()) {
   if (!n) {
     throw new NoOwnerError();
   }
-  n.be = { ...n.be, [e.id]: isUndefined(t) ? e.defaultValue : t };
+  n.we = { ...n.we, [e.id]: isUndefined(t) ? e.defaultValue : t };
 }
 function hasContext(e, t) {
-  return !isUndefined(t?.be[e.id]);
+  return !isUndefined(t?.we[e.id]);
 }
 function isUndefined(e) {
   return typeof e === "undefined";
@@ -2114,6 +2114,18 @@ function createWriteTraps(e) {
       }
       return typeof i === "object" && i !== null ? new Proxy(i, t) : i;
     },
+    has(e, t) {
+      let n;
+      setWriteOverride(true);
+      setProjectionWriteActive(true);
+      try {
+        n = t in e;
+      } finally {
+        setWriteOverride(false);
+        setProjectionWriteActive(false);
+      }
+      return n;
+    },
     set(t, n, i) {
       if (e && !e()) return true;
       setWriteOverride(true);
@@ -2171,7 +2183,12 @@ function wrap(e, t) {
   return n;
 }
 function isWrappable(e) {
-  return e != null && typeof e === "object" && !Object.isFrozen(e);
+  return (
+    e != null &&
+    typeof e === "object" &&
+    !Object.isFrozen(e) &&
+    !(typeof Node !== "undefined" && e instanceof Node)
+  );
 }
 let writeOverride = false;
 function setWriteOverride(e) {
@@ -2305,8 +2322,12 @@ const storeTraps = {
         : e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]
           ? e[STORE_OVERRIDE][t] !== $DELETED
           : t in e[STORE_VALUE];
-    getObserver() &&
-      read(getNode(getNodes(e, STORE_HAS), t, n, e[STORE_FIREWALL], isEqual, e[STORE_OPTIMISTIC]));
+    if (!writeOnly(e[$PROXY])) {
+      getObserver() &&
+        read(
+          getNode(getNodes(e, STORE_HAS), t, n, e[STORE_FIREWALL], isEqual, e[STORE_OPTIMISTIC])
+        );
+    }
     return n;
   },
   set(e, t, n) {
@@ -2344,23 +2365,32 @@ const storeTraps = {
               ? e[STORE_OVERRIDE][t]
               : s;
         const a = n?.[$TARGET]?.[STORE_VALUE] ?? n;
-        if (c === a) return true;
-        const f = e[STORE_OPTIMISTIC_OVERRIDE]?.length || e[STORE_OVERRIDE]?.length || r.length;
-        if (a !== undefined && a === s) delete e[u][t];
-        else (e[u] || (e[u] = Object.create(null)))[t] = a;
-        const l = isWrappable(a);
+        const f = Array.isArray(r) && t !== "length";
+        const l = f ? parseInt(t) + 1 : 0;
+        const E =
+          f &&
+          (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 T = f && l > E ? l : undefined;
+        if (c === a && T === undefined) return true;
+        if (a !== undefined && a === s && T === undefined) delete e[u]?.[t];
+        else {
+          const n = e[u] || (e[u] = Object.create(null));
+          n[t] = a;
+          if (T !== undefined) n.length = T;
+        }
+        const d = isWrappable(a);
         e[STORE_HAS]?.[t] && setSignal(e[STORE_HAS][t], true);
-        const E = getNodes(e, STORE_NODE);
-        E[t] && setSignal(E[t], () => (l ? wrap(a, e) : a));
+        const S = getNodes(e, STORE_NODE);
+        S[t] && setSignal(S[t], () => (d ? wrap(a, e) : a));
         if (Array.isArray(r)) {
-          if (t === "length") {
-            E.length && setSignal(E.length, a);
-          } else {
-            const e = parseInt(t) + 1;
-            if (e > f) E.length && setSignal(E.length, e);
-          }
+          const e = t === "length" ? a : T;
+          e !== undefined && S.length && setSignal(S.length, e);
         }
-        E[$TRACK] && setSignal(E[$TRACK], undefined);
+        S[$TRACK] && setSignal(S[$TRACK], undefined);
       });
     }
     return true;
@@ -3065,7 +3095,10 @@ class CollectionQueue extends Queue {
   }
   checkSources() {
     for (const e of this.ft) {
-      if (!(e.Se & this.ct) && !(this.ct & STATUS_ERROR && e.Se & STATUS_PENDING))
+      if (
+        e.O & REACTIVE_DISPOSED ||
+        (!(e.Se & this.ct) && !(this.ct & STATUS_ERROR && e.Se & STATUS_PENDING))
+      )
         this.ft.delete(e);
     }
     if (!this.ft.size) {

package/dist/types/store/utils.d.ts

@@ -1,4 +1,3 @@
-import { type Store } from "./store.js";
 /**
  * Returns a non reactive copy of the store object.
  * It will attempt to preserver the original reference unless the value has been modified.
@@ -12,7 +11,7 @@ export declare function snapshot<T>(item: T, map?: Map<unknown, unknown>, lookup
  * and returns plain (non-proxy) data. Works correctly with `reconcile()`.
  * @param store store proxy object
  */
-export declare function deep<T extends object>(store: Store<T>): T;
+export declare function deep<T extends object>(store: T): T;
 type DistributeOverride<T, F> = T extends undefined ? F : T;
 type Override<T, U> = T extends any ? U extends any ? {
     [K in keyof T]: K extends keyof U ? DistributeOverride<U[K], T[K]> : T[K];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/signals",
-  "version": "0.13.7",
+  "version": "0.13.9",
   "description": "SolidJS' standalone reactivity implementation",
   "author": "Ryan Carniato",
   "license": "MIT",