@solidjs/signals 0.8.4 → 0.8.6

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;
     }
@@ -335,16 +337,19 @@ function notifySubs(node) {
   }
 }
 function recompute(el, create = false) {
-  deleteFromHeap(el, el._flags & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
-  if (el._pendingValue !== NOT_PENDING || el._pendingFirstChild || el._pendingDisposal)
-    disposeChildren(el);
-  else {
-    markDisposal(el);
-    globalQueue._pendingNodes.push(el);
-    el._pendingDisposal = el._disposal;
-    el._pendingFirstChild = el._firstChild;
-    el._disposal = null;
-    el._firstChild = null;
+  const honoraryOptimistic = el._type && el._transition != activeTransition;
+  if (!create) {
+    if (el._transition && activeTransition !== el._transition && !honoraryOptimistic)
+      globalQueue.initTransition(el);
+    deleteFromHeap(el, el._flags & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+    if (el._transition) disposeChildren(el);
+    else {
+      markDisposal(el);
+      el._pendingDisposal = el._disposal;
+      el._pendingFirstChild = el._firstChild;
+      el._disposal = null;
+      el._firstChild = null;
+    }
   }
   const oldcontext = context;
   context = el;
@@ -371,32 +376,32 @@ function recompute(el, create = false) {
   }
   el._flags = REACTIVE_NONE;
   context = oldcontext;
-  const depsTail = el._depsTail;
-  let toRemove = depsTail !== null ? depsTail._nextDep : el._deps;
-  if (toRemove !== null) {
-    do {
-      toRemove = unlinkSubs(toRemove);
-    } while (toRemove !== null);
-    if (depsTail !== null) depsTail._nextDep = null;
-    else el._deps = null;
+  if (!(el._statusFlags & STATUS_PENDING)) {
+    const depsTail = el._depsTail;
+    let toRemove = depsTail !== null ? depsTail._nextDep : el._deps;
+    if (toRemove !== null) {
+      do {
+        toRemove = unlinkSubs(toRemove);
+      } while (toRemove !== null);
+      if (depsTail !== null) depsTail._nextDep = null;
+      else el._deps = null;
+    }
   }
   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;
-      else {
-        if (el._pendingValue === NOT_PENDING) globalQueue._pendingNodes.push(el);
-        el._pendingValue = value;
-      }
-      if (el._pendingSignal) el._pendingSignal._set(value);
+      if (create || el._optimistic || honoraryOptimistic) el._value = value;
+      else el._pendingValue = value;
+      if (el._pendingSignal) el._pendingSignal._pendingValue = value;
     }
     for (let s = el._subs; s !== null; s = s._nextSub) {
       const queue = s._sub._flags & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
@@ -408,8 +413,14 @@ 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 (
+    (!create || el._statusFlags & STATUS_PENDING) &&
+    !el._optimistic &&
+    !honoraryOptimistic &&
+    !el._transition
+  )
+    globalQueue._pendingNodes.push(el);
+  if (el._transition && honoraryOptimistic) runInTransition(el, recompute);
 }
 function updateIfNecessary(el) {
   if (el._flags & REACTIVE_CHECK) {
@@ -441,7 +452,7 @@ function unlinkSubs(link) {
     dep._subs = nextSub;
     if (nextSub === null) {
       dep._unobserved?.();
-      dep._fn && unobserved(dep);
+      dep._fn && !dep._preventAutoDisposal && unobserved(dep);
     }
   }
   return nextDep;
@@ -453,7 +464,7 @@ function unobserved(el) {
     dep = unlinkSubs(dep);
   }
   el._deps = null;
-  runDisposal(el);
+  disposeChildren(el, true);
 }
 function link(dep, sub) {
   const prevDep = sub._depsTail;
@@ -593,7 +604,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";
@@ -708,6 +720,7 @@ function read(el) {
   let c = context;
   if (c?._root) c = c._parentComputed;
   if (c && tracking && !pendingCheck && !pendingValueCheck) {
+    if (el._fn && el._flags & REACTIVE_DISPOSED) recompute(el);
     link(el, c);
     const owner = el._firewall || el;
     if (owner._fn) {
@@ -747,9 +760,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 +887,7 @@ function pending(fn) {
     pendingValueCheck = prevLatest;
   }
 }
-function isPending(fn, loadingValue) {
+function isPending(fn) {
   const current = pendingCheck;
   pendingCheck = { _value: false };
   try {
@@ -882,7 +895,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;
@@ -1944,6 +1956,7 @@ function boundaryComputed(fn, propagationMask) {
     }
   });
   node._propagationMask = propagationMask;
+  node._preventAutoDisposal = true;
   return node;
 }
 function createBoundChildren(owner, fn, queue, mask) {