@solidjs/signals 0.8.4 → 0.8.5

package/dist/dev.js

@@ -248,8 +248,10 @@ class GlobalQueue extends Queue {
   notify(node, mask, flags) {
     if (mask & STATUS_PENDING) {
       if (flags & STATUS_PENDING) {
-        if (activeTransition && !activeTransition.asyncNodes.includes(node._error.cause))
+        if (activeTransition && !activeTransition.asyncNodes.includes(node._error.cause)) {
           activeTransition.asyncNodes.push(node._error.cause);
+          schedule();
+        }
       }
       return true;
     }
@@ -380,18 +382,20 @@ function recompute(el, create = false) {
     if (depsTail !== null) depsTail._nextDep = null;
     else el._deps = null;
   }
+  const honoraryOptimistic = el._type && el._transition != activeTransition;
   const valueChanged =
     !el._equals ||
     !el._equals(
-      el._pendingValue === NOT_PENDING || el._optimistic ? el._value : el._pendingValue,
+      el._pendingValue === NOT_PENDING || el._optimistic || honoraryOptimistic
+        ? el._value
+        : el._pendingValue,
       value
     );
   const statusFlagsChanged = el._statusFlags !== prevStatusFlags || el._error !== prevError;
   el._notifyQueue?.(statusFlagsChanged, prevStatusFlags);
   if (valueChanged || statusFlagsChanged) {
     if (valueChanged) {
-      if (create || el._optimistic || (el._type && el._transition != activeTransition))
-        el._value = value;
+      if (create || el._optimistic || honoraryOptimistic) el._value = value;
       else {
         if (el._pendingValue === NOT_PENDING) globalQueue._pendingNodes.push(el);
         el._pendingValue = value;
@@ -408,8 +412,7 @@ function recompute(el, create = false) {
       insertIntoHeapHeight(s._sub, s._sub._flags & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
     }
   }
-  if (el._type && el._transition && activeTransition !== el._transition)
-    runInTransition(el, recompute);
+  if (el._transition && honoraryOptimistic) runInTransition(el, recompute);
 }
 function updateIfNecessary(el) {
   if (el._flags & REACTIVE_CHECK) {
@@ -593,7 +596,8 @@ function computed(fn, initialValue, options) {
     _time: clock,
     _pendingValue: NOT_PENDING,
     _pendingDisposal: null,
-    _pendingFirstChild: null
+    _pendingFirstChild: null,
+    _transition: null
   };
   if (options?._internal) Object.assign(self, options._internal);
   self._name = options?.name ?? "computed";
@@ -747,9 +751,9 @@ function read(el) {
       pendingValueCheck = true;
     }
   }
-  if (el._statusFlags & STATUS_PENDING) {
+  if (el._statusFlags & STATUS_PENDING && !pendingCheck) {
     if ((c && !stale) || el._statusFlags & STATUS_UNINITIALIZED) throw el._error;
-    else if (c && stale && !pendingCheck) {
+    else if (c && stale) {
       setStatusFlags(c, c._statusFlags | 1, el._error);
     }
   }
@@ -874,7 +878,7 @@ function pending(fn) {
     pendingValueCheck = prevLatest;
   }
 }
-function isPending(fn, loadingValue) {
+function isPending(fn) {
   const current = pendingCheck;
   pendingCheck = { _value: false };
   try {
@@ -882,7 +886,6 @@ function isPending(fn, loadingValue) {
     return pendingCheck._value;
   } catch (err) {
     if (!(err instanceof NotReadyError)) return false;
-    if (loadingValue !== undefined) return loadingValue;
     throw err;
   } finally {
     pendingCheck = current;

package/dist/node.cjs

@@ -246,7 +246,10 @@ class GlobalQueue extends Queue {
   notify(e, t, n) {
     if (t & f) {
       if (n & f) {
-        if (m && !m.asyncNodes.includes(e.L.cause)) m.asyncNodes.push(e.L.cause);
+        if (m && !m.asyncNodes.includes(e.L.cause)) {
+          m.asyncNodes.push(e.L.cause);
+          schedule();
+        }
       }
       return true;
     }
@@ -369,12 +372,13 @@ function recompute(t, n = false) {
     if (g !== null) g.P = null;
     else t.W = null;
   }
-  const x = !t.oe || !t.oe(t.K === p || t.ue ? t.G : t.K, s);
-  const v = t.$ !== d || t.L !== h;
-  t.le?.(v, d);
-  if (x || v) {
-    if (x) {
-      if (n || t.ue || (t.T && t.J != m)) t.G = s;
+  const x = t.T && t.J != m;
+  const v = !t.oe || !t.oe(t.K === p || t.ue || x ? t.G : t.K, s);
+  const N = t.$ !== d || t.L !== h;
+  t.le?.(N, d);
+  if (v || N) {
+    if (v) {
+      if (n || t.ue || x) t.G = s;
       else {
         if (t.K === p) O.M.push(t);
         t.K = s;
@@ -391,7 +395,7 @@ function recompute(t, n = false) {
       insertIntoHeapHeight(e.N, e.N.S & o ? S : _);
     }
   }
-  if (t.T && t.J && m !== t.J) runInTransition(t, recompute);
+  if (t.J && x) runInTransition(t, recompute);
 }
 function updateIfNecessary(r) {
   if (r.S & t) {
@@ -571,7 +575,8 @@ function computed(t, n, r) {
     se: b,
     K: p,
     te: null,
-    ee: null
+    ee: null,
+    J: null
   };
   if (r?.we) Object.assign(i, r.we);
   i.h = i;
@@ -721,9 +726,9 @@ function read(e) {
       N = true;
     }
   }
-  if (e.$ & f) {
+  if (e.$ & f && !k) {
     if ((t && !v) || e.$ & a) throw e.L;
-    else if (t && v && !k) {
+    else if (t && v) {
       setStatusFlags(t, t.$ | 1, e.L);
     }
   }
@@ -836,18 +841,17 @@ function pending(e) {
     N = t;
   }
 }
-function isPending(e, t) {
-  const n = k;
+function isPending(e) {
+  const t = k;
   k = { G: false };
   try {
     staleValues(e);
     return k.G;
   } catch (e) {
     if (!(e instanceof NotReadyError)) return false;
-    if (t !== undefined) return t;
     throw e;
   } finally {
-    k = n;
+    k = t;
   }
 }
 function createContext(e, t) {

package/dist/prod.js

@@ -245,8 +245,10 @@ class GlobalQueue extends Queue {
   notify(e, t, n) {
     if (t & STATUS_PENDING) {
       if (n & STATUS_PENDING) {
-        if (activeTransition && !activeTransition.asyncNodes.includes(e.Y.cause))
+        if (activeTransition && !activeTransition.asyncNodes.includes(e.Y.cause)) {
           activeTransition.asyncNodes.push(e.Y.cause);
+          schedule();
+        }
       }
       return true;
     }
@@ -374,12 +376,13 @@ function recompute(e, t = false) {
     if (l !== null) l.P = null;
     else e.D = null;
   }
-  const a = !e.oe || !e.oe(e.W === NOT_PENDING || e.ue ? e.j : e.W, i);
-  const f = e.J !== s || e.Y !== o;
-  e.le?.(f, s);
-  if (a || f) {
-    if (a) {
-      if (t || e.ue || (e.K && e.B != activeTransition)) e.j = i;
+  const a = e.K && e.B != activeTransition;
+  const f = !e.oe || !e.oe(e.W === NOT_PENDING || e.ue || a ? e.j : e.W, i);
+  const E = e.J !== s || e.Y !== o;
+  e.le?.(E, s);
+  if (f || E) {
+    if (f) {
+      if (t || e.ue || a) e.j = i;
       else {
         if (e.W === NOT_PENDING) globalQueue.$.push(e);
         e.W = i;
@@ -396,7 +399,7 @@ function recompute(e, t = false) {
       insertIntoHeapHeight(t.A, t.A._ & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
     }
   }
-  if (e.K && e.B && activeTransition !== e.B) runInTransition(e, recompute);
+  if (e.B && a) runInTransition(e, recompute);
 }
 function updateIfNecessary(e) {
   if (e._ & REACTIVE_CHECK) {
@@ -576,7 +579,8 @@ function computed(e, t, n) {
     se: clock,
     W: NOT_PENDING,
     te: null,
-    ee: null
+    ee: null,
+    B: null
   };
   if (n?._e) Object.assign(i, n._e);
   i.T = i;
@@ -726,9 +730,9 @@ function read(e) {
       pendingValueCheck = true;
     }
   }
-  if (e.J & STATUS_PENDING) {
+  if (e.J & STATUS_PENDING && !pendingCheck) {
     if ((t && !stale) || e.J & STATUS_UNINITIALIZED) throw e.Y;
-    else if (t && stale && !pendingCheck) {
+    else if (t && stale) {
       setStatusFlags(t, t.J | 1, e.Y);
     }
   }
@@ -846,18 +850,17 @@ function pending(e) {
     pendingValueCheck = t;
   }
 }
-function isPending(e, t) {
-  const n = pendingCheck;
+function isPending(e) {
+  const t = pendingCheck;
   pendingCheck = { j: false };
   try {
     staleValues(e);
     return pendingCheck.j;
   } catch (e) {
     if (!(e instanceof NotReadyError)) return false;
-    if (t !== undefined) return t;
     throw e;
   } finally {
-    pendingCheck = n;
+    pendingCheck = t;
   }
 }
 function createContext(e, t) {

package/dist/types/core/core.d.ts

@@ -29,6 +29,7 @@ export interface RawSignal<T> {
     _pureWrite?: boolean;
     _unobserved?: () => void;
     _time: number;
+    _transition: Transition | null;
     _pendingValue: T | typeof NOT_PENDING;
     _pendingCheck?: Signal<boolean> & {
         _set: (v: boolean) => void;
@@ -36,7 +37,6 @@ export interface RawSignal<T> {
     _pendingSignal?: Signal<T> & {
         _set: (v: T) => void;
     };
-    _transition?: Transition;
     _optimistic?: boolean;
 }
 export interface FirewallSignal<T> extends RawSignal<T> {
@@ -121,4 +121,3 @@ export declare function runWithOwner<T>(owner: Owner | null, fn: () => T): T;
 export declare function staleValues<T>(fn: () => T, set?: boolean): T;
 export declare function pending<T>(fn: () => T): T;
 export declare function isPending(fn: () => any): boolean;
-export declare function isPending(fn: () => any, loadingValue: boolean): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/signals",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "description": "",
   "author": "Ryan Carniato",
   "license": "MIT",