@solidjs/signals 0.13.0 → 0.13.2

package/dist/dev.js

@@ -398,7 +398,13 @@ function commitPendingNodes() {
       n._pendingValue = NOT_PENDING;
       if (n._type && n._type !== EFFECT_TRACKED) n._modified = true;
     }
-    if (!(n._statusFlags & STATUS_PENDING)) n._statusFlags &= ~STATUS_UNINITIALIZED;
+    if (n._statusFlags & STATUS_PENDING) {
+      const _src = n._error?.source;
+      if (_src && !(_src._statusFlags & STATUS_PENDING)) {
+        n._statusFlags &= -6;
+        n._error = null;
+      }
+    } else n._statusFlags &= ~STATUS_UNINITIALIZED;
     if (n._fn) GlobalQueue._dispose(n, false, true);
   }
   pendingNodes.length = 0;
@@ -1015,6 +1021,8 @@ function runEffect() {
   try {
     this._cleanup = this._effectFn(this._value, this._prevValue);
   } catch (error) {
+    this._error = new StatusError(this, error);
+    this._statusFlags |= STATUS_ERROR;
     if (!this._queue.notify(this, STATUS_ERROR, STATUS_ERROR)) throw error;
   } finally {
     setStrictRead(prevStrictRead);
@@ -1469,7 +1477,9 @@ function read(el) {
     }
   }
   if (owner._statusFlags & STATUS_PENDING) {
-    if (c && !(stale && owner._transition && activeTransition !== owner._transition)) {
+    const _errSource = owner._error?.source;
+    if (_errSource && !(_errSource._statusFlags & STATUS_PENDING)) clearStatus(owner);
+    else if (c && !(stale && owner._transition && activeTransition !== owner._transition)) {
       if (currentOptimisticLane) {
         const pendingLane = owner._optimisticLane;
         const lane = findLane(currentOptimisticLane);
@@ -1511,7 +1521,7 @@ function read(el) {
     (currentOptimisticLane !== null &&
       (el._overrideValue !== undefined ||
         el._optimisticLane ||
-        owner === el ||
+        (owner === el && stale) ||
         !!(owner._statusFlags & STATUS_PENDING))) ||
     el._pendingValue === NOT_PENDING ||
     (stale && el._transition && activeTransition !== el._transition)

package/dist/node.cjs

@@ -32,8 +32,8 @@ const s = 1 << 4;
 const o = 1 << 5;
 const u = 1 << 6;
 const f = 1 << 7;
-const c = 1 << 8;
-const l = 1 << 9;
+const l = 1 << 8;
+const c = 1 << 9;
 const a = 1 << 0;
 const d = 1 << 1;
 const p = 1 << 2;
@@ -351,7 +351,7 @@ function insertSubs(e, t = false) {
   const r = e.ie !== undefined;
   for (let i = e.O; i !== null; i = i.P) {
     if (r && i.k.se) {
-      i.k.m |= c;
+      i.k.m |= l;
       continue;
     }
     if (t && n) {
@@ -365,7 +365,7 @@ function insertSubs(e, t = false) {
     if (e.oe === g) {
       if (!e.ue) {
         e.ue = true;
-        e.fe.enqueue(y, e.ce);
+        e.fe.enqueue(y, e.le);
       }
       continue;
     }
@@ -378,12 +378,18 @@ function commitPendingNodes() {
   const e = A.D;
   for (let t = 0; t < e.length; t++) {
     const n = e[t];
-    if (n.le !== S) {
-      n.ae = n.le;
-      n.le = S;
+    if (n.ce !== S) {
+      n.ae = n.ce;
+      n.ce = S;
       if (n.oe && n.oe !== g) n.ue = true;
     }
-    if (!(n.de & a)) n.de &= ~p;
+    if (n.de & a) {
+      const e = n.Y?.source;
+      if (e && !(e.de & a)) {
+        n.de &= -6;
+        n.Y = null;
+      }
+    } else n.de &= ~p;
     if (n.H) GlobalQueue.U(n, false, true);
   }
   e.length = 0;
@@ -399,9 +405,9 @@ function finalizePureQueue(e = null, t = false) {
     for (let e = 0; e < t.length; e++) {
       const n = t[e];
       n.re = undefined;
-      if (n.le !== S) {
-        n.ae = n.le;
-        n.le = S;
+      if (n.ce !== S) {
+        n.ae = n.ce;
+        n.ce = S;
       }
       const r = n.pe;
       n.pe = S;
@@ -573,7 +579,7 @@ function handleAsync(e, t, r) {
     if (o) o.T.delete(e);
     if (r) r(i);
     else if (e.pe !== undefined) {
-      if (e.pe !== undefined && e.pe !== S) e.le = i;
+      if (e.pe !== undefined && e.pe !== S) e.ce = i;
       else {
         e.ae = i;
         insertSubs(e);
@@ -682,7 +688,7 @@ function notifyStatus(e, t, n, r, i) {
     }
   }
   const f = r || u;
-  const c = r || o ? undefined : i;
+  const l = r || o ? undefined : i;
   if (e._e) {
     if (f) {
       e._e(t, n);
@@ -695,7 +701,7 @@ function notifyStatus(e, t, n, r, i) {
     r.k.$ = k;
     if (r.k.Y !== n) {
       !r.k.ne && A.D.push(r.k);
-      notifyStatus(r.k, t, n, f, c);
+      notifyStatus(r.k, t, n, f, l);
     }
   }
   for (let r = e.C; r !== null; r = r.j) {
@@ -703,7 +709,7 @@ function notifyStatus(e, t, n, r, i) {
       e.k.$ = k;
       if (e.k.Y !== n) {
         !e.k.ne && A.D.push(e.k);
-        notifyStatus(e.k, t, n, f, c);
+        notifyStatus(e.k, t, n, f, l);
       }
     }
   }
@@ -949,6 +955,8 @@ function runEffect() {
   try {
     this.Te = this.Re(this.ae, this.He);
   } catch (e) {
+    this.Y = new StatusError(this, e);
+    this.de |= d;
     if (!this.fe.notify(this, d, d)) throw e;
   } finally {
     this.He = this.ae;
@@ -976,7 +984,7 @@ function trackedEffect(e, t) {
   n.Te = undefined;
   n.ue = true;
   n.oe = g;
-  n.ce = run;
+  n.le = run;
   n.fe.enqueue(y, run);
   onCleanup(() => n.Te?.());
 }
@@ -1044,8 +1052,8 @@ function releaseSubtree(e) {
     if (t.H) {
       const e = t;
       e.se = false;
-      if (e.m & c) {
-        e.m &= ~c;
+      if (e.m & l) {
+        e.m &= ~l;
         e.m |= n;
         if (P.A > e.o) P.A = e.o;
         insertIntoHeap(e, P);
@@ -1082,13 +1090,13 @@ function recompute(t, n = false) {
   }
   const s = !!(t.m & f);
   const u = t.pe !== undefined && t.pe !== S;
-  const l = !!(t.de & a);
+  const c = !!(t.de & a);
   const p = M;
   M = t;
   t.ke = null;
   t.m = r;
   t.$ = k;
-  let h = t.le === S ? t.ae : t.le;
+  let h = t.ce === S ? t.ae : t.ce;
   let y = t.o;
   let w = H;
   let m = V;
@@ -1123,7 +1131,7 @@ function recompute(t, n = false) {
     );
   } finally {
     H = w;
-    t.m = e | (n ? t.m & c : 0);
+    t.m = e | (n ? t.m & l : 0);
     M = p;
   }
   if (!t.Y) {
@@ -1136,21 +1144,21 @@ function recompute(t, n = false) {
       if (e !== null) e.N = null;
       else t.W = null;
     }
-    const f = u ? t.pe : t.le === S ? t.ae : t.le;
-    const c = !t.me || !t.me(f, h);
-    if (c) {
+    const f = u ? t.pe : t.ce === S ? t.ae : t.ce;
+    const l = !t.me || !t.me(f, h);
+    if (l) {
       const e = u ? t.pe : undefined;
       if (n || (i && C !== t.ne) || s) {
         t.ae = h;
         if (u && s) {
           t.pe = h;
-          t.le = h;
+          t.ce = h;
         }
-      } else t.le = h;
-      if (u && !s && l && !t.Se) t.pe = h;
+      } else t.ce = h;
+      if (u && !s && c && !t.Se) t.pe = h;
       if (!u || s || t.pe !== e) insertSubs(t, s || u);
     } else if (u) {
-      t.le = h;
+      t.ce = h;
     } else if (t.o != y) {
       for (let e = t.O; e !== null; e = e.P) {
         insertIntoHeapHeight(e.k, e.k.m & o ? v : P);
@@ -1177,7 +1185,7 @@ function updateIfNecessary(r) {
   if (r.m & (n | f) || (r.Y && r.$ < k && !r.we)) {
     recompute(r);
   }
-  r.m = e | (r.m & c);
+  r.m = e | (r.m & l);
 }
 function computed(t, n, r) {
   const i = r?.transparent ?? false;
@@ -1204,10 +1212,10 @@ function computed(t, n, r) {
     i: M,
     Ee: null,
     Ce: null,
-    m: r?.lazy ? l : e,
+    m: r?.lazy ? c : e,
     de: p,
     $: k,
-    le: S,
+    ce: S,
     We: null,
     je: null,
     we: null,
@@ -1257,7 +1265,7 @@ function signal(e, t, n = null) {
     $: k,
     I: n,
     j: n?.C || null,
-    le: S
+    ce: S
   };
   n && (n.C = r);
   if (D && !r.Fe && !((n?.de ?? 0) & a)) {
@@ -1329,8 +1337,8 @@ function read(e) {
   let t = M;
   if (t?.t) t = t.u;
   if (Q && e.H) recompute(e);
-  if (e.m & l) {
-    e.m &= ~l;
+  if (e.m & c) {
+    e.m &= ~c;
     recompute(e, true);
   }
   const n = e.I || e;
@@ -1351,7 +1359,9 @@ function read(e) {
     }
   }
   if (n.de & a) {
-    if (t && !(R && n.ne && C !== n.ne)) {
+    const r = n.Y?.source;
+    if (r && !(r.de & a)) clearStatus(n);
+    else if (t && !(R && n.ne && C !== n.ne)) {
       if (V) {
         const r = n.re;
         const i = findLane(V);
@@ -1377,24 +1387,24 @@ function read(e) {
     const n = e.ie;
     if (n !== undefined) {
       const r = n === w ? undefined : n;
-      const i = e.le !== S ? e.le : e.ae;
-      if (i !== r) t.m |= c;
+      const i = e.ce !== S ? e.ce : e.ae;
+      if (i !== r) t.m |= l;
       return r;
     }
   }
   if (e.pe !== undefined && e.pe !== S) return e.pe;
   return !t ||
-    (V !== null && (e.pe !== undefined || e.re || n === e || !!(n.de & a))) ||
-    e.le === S ||
+    (V !== null && (e.pe !== undefined || e.re || (n === e && R) || !!(n.de & a))) ||
+    e.ce === S ||
     (R && e.ne && C !== e.ne)
     ? e.ae
-    : e.le;
+    : e.ce;
 }
 function setSignal(e, t) {
   if (e.ne && C !== e.ne) A.initTransition(e.ne);
   const n = e.pe !== undefined && !j;
   const r = e.pe !== undefined && e.pe !== S;
-  const i = n ? (r ? e.pe : e.ae) : e.le === S ? e.ae : e.le;
+  const i = n ? (r ? e.pe : e.ae) : e.ce === S ? e.ae : e.ce;
   if (typeof t === "function") t = t(i);
   const s = !e.me || !e.me(i, t) || !!(e.de & p);
   if (!s) {
@@ -1408,7 +1418,7 @@ function setSignal(e, t) {
     const n = e.pe === S;
     if (!n && e.ne) A.initTransition(e.ne);
     if (n) {
-      e.le = e.ae;
+      e.ce = e.ae;
       A.B.push(e);
     }
     e.Se = true;
@@ -1416,8 +1426,8 @@ function setSignal(e, t) {
     e.re = r;
     e.pe = t;
   } else {
-    if (e.le === S) A.D.push(e);
-    e.le = t;
+    if (e.ce === S) A.D.push(e);
+    e.ce = t;
   }
   updatePendingSignal(e);
   if (e.be) {
@@ -1460,7 +1470,7 @@ function computePendingState(e) {
     }
     return true;
   }
-  if (e.le !== S && !(t.de & p)) return true;
+  if (e.ce !== S && !(t.de & p)) return true;
   return !!(t.de & a && !(t.de & p));
 }
 function updatePendingSignal(e) {
@@ -1718,7 +1728,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 c, l, a, d, p, h, y, g;
+      let l, c, a, d, p, h, y, g;
       for (
         a = 0, d = Math.min(f, e.length);
         a < d &&
@@ -1739,44 +1749,44 @@ function applyState(e, t, n) {
         S[p] = h;
       }
       if (a > p || a > d) {
-        for (l = a; l <= p; l++) {
+        for (c = a; c <= p; c++) {
           t = true;
-          r[$][l] && setSignal(r[$][l], wrap(e[l], r));
+          r[$][c] && setSignal(r[$][c], wrap(e[c], r));
         }
-        for (; l < e.length; l++) {
+        for (; c < e.length; c++) {
           t = true;
-          const i = wrap(S[l], r);
-          r[$][l] && setSignal(r[$][l], i);
-          applyState(e[l], i, n);
+          const i = wrap(S[c], r);
+          r[$][c] && setSignal(r[$][c], i);
+          applyState(e[c], i, n);
         }
         t && r[$][K] && setSignal(r[$][K], void 0);
         f !== e.length && r[$].length && setSignal(r[$].length, e.length);
         return;
       }
       y = new Array(p + 1);
-      for (l = p; l >= a; l--) {
-        h = e[l];
+      for (c = p; c >= a; c--) {
+        h = e[c];
         g = h ? n(h) : h;
-        c = w.get(g);
-        y[l] = c === undefined ? -1 : c;
-        w.set(g, l);
+        l = w.get(g);
+        y[c] = l === undefined ? -1 : l;
+        w.set(g, c);
       }
-      for (c = a; c <= d; c++) {
-        h = getOverrideValue(i, s, u, c, o);
+      for (l = a; l <= d; l++) {
+        h = getOverrideValue(i, s, u, l, o);
         g = h ? n(h) : h;
-        l = w.get(g);
-        if (l !== undefined && l !== -1) {
-          S[l] = h;
-          l = y[l];
-          w.set(g, l);
+        c = w.get(g);
+        if (c !== undefined && c !== -1) {
+          S[c] = h;
+          c = y[c];
+          w.set(g, c);
         }
       }
-      for (l = a; l < e.length; l++) {
-        if (l in S) {
-          const t = wrap(S[l], r);
-          r[$][l] && setSignal(r[$][l], t);
-          applyState(e[l], t, n);
-        } else r[$][l] && setSignal(r[$][l], wrap(e[l], r));
+      for (c = a; c < e.length; c++) {
+        if (c in S) {
+          const t = wrap(S[c], r);
+          r[$][c] && setSignal(r[$][c], t);
+          applyState(e[c], t, n);
+        } else r[$][c] && setSignal(r[$][c], wrap(e[c], r));
       }
       if (a < e.length) t = true;
     } else if (e.length) {
@@ -1795,11 +1805,11 @@ function applyState(e, t, n) {
   if (u) {
     const t = u[K];
     const f = t ? getAllKeys(i, s, e) : Object.keys(u);
-    for (let c = 0, l = f.length; c < l; c++) {
-      const l = f[c];
-      const a = u[l];
-      const d = unwrap(getOverrideValue(i, s, u, l, o));
-      let p = unwrap(e[l]);
+    for (let l = 0, c = f.length; l < c; l++) {
+      const c = f[l];
+      const a = u[c];
+      const d = unwrap(getOverrideValue(i, s, u, c, o));
+      let p = unwrap(e[c]);
       if (d === p) continue;
       if (!d || !isWrappable(d) || !isWrappable(p) || (n(d) != null && n(d) !== n(p))) {
         t && setSignal(t, void 0);
@@ -2010,8 +2020,8 @@ const fe = {
         i && (o || !u)
           ? i.pe !== undefined && i.pe !== S
             ? i.pe
-            : i.le !== S
-              ? i.le
+            : i.ce !== S
+              ? i.ce
               : i.ae
           : f[t];
       n === J && (n = undefined);
@@ -2020,19 +2030,19 @@ const fe = {
       ue?.add(r);
       return r;
     }
-    let c = i ? (o || !u ? read(r[t]) : (read(r[t]), f[t])) : f[t];
-    c === J && (c = undefined);
+    let l = i ? (o || !u ? read(r[t]) : (read(r[t]), f[t])) : f[t];
+    l === J && (l = undefined);
     if (!i) {
-      if (!o && typeof c === "function" && !f.hasOwnProperty(t)) {
+      if (!o && typeof l === "function" && !f.hasOwnProperty(t)) {
         let t;
         return !Array.isArray(e[X]) && (t = Object.getPrototypeOf(e[X])) && t !== Object.prototype
-          ? c.bind(f)
-          : c;
+          ? l.bind(f)
+          : l;
       } else if (getObserver()) {
-        return read(getNode(r, t, isWrappable(c) ? wrap(c, e) : c, e[re], isEqual, e[ie], e[m]));
+        return read(getNode(r, t, isWrappable(l) ? wrap(l, e) : l, e[re], isEqual, e[ie], e[m]));
       }
     }
-    return isWrappable(c) ? wrap(c, e) : c;
+    return isWrappable(l) ? wrap(l, e) : l;
   },
   has(e, t) {
     if (t === U || t === K || t === "__proto__") return true;
@@ -2065,21 +2075,21 @@ const fe = {
         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 = n?.[z]?.[X] ?? n;
+        if (f === l) return true;
+        const c = e[Z]?.length || e[Y]?.length || i.length;
+        if (l !== undefined && l === s) delete e[u][t];
+        else (e[u] || (e[u] = Object.create(null)))[t] = l;
+        const d = isWrappable(l);
         e[ee]?.[t] && setSignal(e[ee][t], true);
         const p = getNodes(e, $);
-        p[t] && setSignal(p[t], () => (d ? wrap(c, e) : c));
+        p[t] && setSignal(p[t], () => (d ? wrap(l, e) : l));
         if (Array.isArray(i)) {
           if (t === "length") {
-            p.length && setSignal(p.length, c);
+            p.length && setSignal(p.length, l);
           } else {
             const e = parseInt(t) + 1;
-            if (e > l) p.length && setSignal(p.length, e);
+            if (e > c) p.length && setSignal(p.length, e);
           }
         }
         p[K] && setSignal(p[K], undefined);
@@ -2246,7 +2256,7 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
   }
   return { store: s, node: r };
 }
-const ce = Symbol(0);
+const le = Symbol(0);
 function updatePath(e, t, n = 0) {
   let r,
     i = e;
@@ -2290,7 +2300,7 @@ function updatePath(e, t, n = 0) {
     if (s === i) return;
   }
   if (r === undefined && s == undefined) return;
-  if (s === ce) {
+  if (s === le) {
     delete e[r];
   } else if (r === undefined || (isWrappable(i) && isWrappable(s) && !Array.isArray(s))) {
     const t = r !== undefined ? e[r] : e;
@@ -2300,16 +2310,16 @@ function updatePath(e, t, n = 0) {
     e[r] = s;
   }
 }
-const le = Object.assign(
+const ce = Object.assign(
   function storePath(...e) {
     return t => {
       updatePath(t, e);
     };
   },
-  { DELETE: ce }
+  { DELETE: le }
 );
 function snapshotImpl(e, t, n, r) {
-  let i, s, o, u, f, c;
+  let i, s, o, u, f, l;
   if (!isWrappable(e)) return e;
   if (n && n.has(e)) return n.get(e);
   if (!n) n = new Map();
@@ -2326,24 +2336,24 @@ function snapshotImpl(e, t, n, r) {
   }
   if (s) {
     const s = o?.length || e.length;
-    for (let l = 0; l < s; l++) {
-      c = o && l in o ? o[l] : e[l];
-      if (c === J) continue;
-      if (t && isWrappable(c)) wrap(c, i);
-      if ((f = snapshotImpl(c, t, n, r)) !== c || u) {
+    for (let c = 0; c < s; c++) {
+      l = o && c in o ? o[c] : e[c];
+      if (l === J) continue;
+      if (t && isWrappable(l)) wrap(l, i);
+      if ((f = snapshotImpl(l, t, n, r)) !== l || u) {
         if (!u) n.set(e, (u = [...e]));
-        u[l] = f;
+        u[c] = f;
       }
     }
   } else {
     const s = getKeys(e, o);
-    for (let l = 0, a = s.length; l < a; l++) {
-      let a = s[l];
+    for (let c = 0, a = s.length; c < a; c++) {
+      let a = s[c];
       const d = getPropertyDescriptor(e, o, a);
       if (d.get) continue;
-      c = o && a in o ? o[a] : e[a];
-      if (t && isWrappable(c)) wrap(c, i);
-      if ((f = snapshotImpl(c, t, n, r)) !== e[a] || u) {
+      l = o && a in o ? o[a] : e[a];
+      if (t && isWrappable(l)) wrap(l, i);
+      if ((f = snapshotImpl(l, t, n, r)) !== e[a] || u) {
         if (!u) {
           u = Object.create(Object.getPrototypeOf(e));
           Object.assign(u, e);
@@ -2560,8 +2570,8 @@ function updateKeyedMap() {
         o,
         u,
         f,
-        c,
         l,
+        c,
         a,
         d = new Array(t),
         p = new Array(t),
@@ -2586,26 +2596,26 @@ function updateKeyedMap() {
         h && (h[u] = this.Xe[o]);
         y && (y[u] = this.Ye[o]);
       }
-      l = new Map();
+      c = new Map();
       a = new Array(u + 1);
       for (r = u; r >= s; r--) {
         f = e[r];
-        c = this.Je ? this.Je(f) : f;
-        n = l.get(c);
+        l = this.Je ? this.Je(f) : f;
+        n = c.get(l);
         a[r] = n === undefined ? -1 : n;
-        l.set(c, r);
+        c.set(l, r);
       }
       for (n = s; n <= o; n++) {
         f = this.Ge[n];
-        c = this.Je ? this.Je(f) : f;
-        r = l.get(c);
+        l = this.Je ? this.Je(f) : f;
+        r = c.get(l);
         if (r !== undefined && r !== -1) {
           d[r] = this.ze[n];
           p[r] = this.Ue[n];
           h && (h[r] = this.Xe[n]);
           y && (y[r] = this.Ye[n]);
           r = a[r];
-          l.set(c, r);
+          c.set(l, r);
         } else this.Ue[n].dispose();
       }
       for (r = s; r < t; r++) {
@@ -2909,5 +2919,5 @@ exports.runWithOwner = runWithOwner;
 exports.setContext = setContext;
 exports.setSnapshotCapture = setSnapshotCapture;
 exports.snapshot = snapshot;
-exports.storePath = le;
+exports.storePath = ce;
 exports.untrack = untrack;

package/dist/prod.js

@@ -382,7 +382,13 @@ function commitPendingNodes() {
       n.le = NOT_PENDING;
       if (n.se && n.se !== EFFECT_TRACKED) n.ue = true;
     }
-    if (!(n.Ee & STATUS_PENDING)) n.Ee &= ~STATUS_UNINITIALIZED;
+    if (n.Ee & STATUS_PENDING) {
+      const e = n.q?.source;
+      if (e && !(e.Ee & STATUS_PENDING)) {
+        n.Ee &= -6;
+        n.q = null;
+      }
+    } else n.Ee &= ~STATUS_UNINITIALIZED;
     if (n.L) GlobalQueue.Y(n, false, true);
   }
   e.length = 0;
@@ -948,6 +954,8 @@ function runEffect() {
   try {
     this.We = this.Ue(this.fe, this.ke);
   } catch (e) {
+    this.q = new StatusError(this, e);
+    this.Ee |= STATUS_ERROR;
     if (!this.ce.notify(this, STATUS_ERROR, STATUS_ERROR)) throw e;
   } finally {
     this.ke = this.fe;
@@ -1351,7 +1359,9 @@ function read(e) {
     }
   }
   if (n.Ee & STATUS_PENDING) {
-    if (t && !(stale && n.ne && activeTransition !== n.ne)) {
+    const i = n.q?.source;
+    if (i && !(i.Ee & STATUS_PENDING)) clearStatus(n);
+    else if (t && !(stale && n.ne && activeTransition !== n.ne)) {
       if (currentOptimisticLane) {
         const i = n.ie;
         const r = findLane(currentOptimisticLane);
@@ -1385,7 +1395,7 @@ function read(e) {
   if (e.Te !== undefined && e.Te !== NOT_PENDING) return e.Te;
   return !t ||
     (currentOptimisticLane !== null &&
-      (e.Te !== undefined || e.ie || n === e || !!(n.Ee & STATUS_PENDING))) ||
+      (e.Te !== undefined || e.ie || (n === e && stale) || !!(n.Ee & STATUS_PENDING))) ||
     e.le === NOT_PENDING ||
     (stale && e.ne && activeTransition !== e.ne)
     ? e.fe

package/package.json

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