@solidjs/signals 0.13.5 → 0.13.6

package/dist/dev.js

@@ -151,6 +151,7 @@ let clock = 0;
 let activeTransition = null;
 let scheduled = false;
 let projectionWriteActive = false;
+let inTrackedQueueCallback = false;
 let _enforceLoadingBoundary = false;
 let _hitUnhandledAsync = false;
 let stashedOptimisticReads = null;
@@ -192,6 +193,9 @@ function queueStashedOptimisticEffects(node) {
 function setProjectionWriteActive(value) {
   projectionWriteActive = value;
 }
+function setTrackedQueueCallback(value) {
+  inTrackedQueueCallback = value;
+}
 function mergeTransitionState(target, outgoing) {
   outgoing._done = target;
   target._actions.push(...outgoing._actions);
@@ -242,20 +246,6 @@ function schedule() {
   scheduled = true;
   if (!globalQueue._running && !projectionWriteActive) queueMicrotask(flush);
 }
-function addTransitionBlocker(node) {
-  if (activeTransition && !activeTransition._asyncNodes.includes(node)) {
-    activeTransition._asyncNodes.push(node);
-  }
-}
-function removeTransitionBlocker(node) {
-  const remove = list => {
-    if (!list) return;
-    const index = list.indexOf(node);
-    if (index >= 0) list.splice(index, 1);
-  };
-  remove(node._transition?._asyncNodes);
-  remove(activeTransition?._asyncNodes);
-}
 class Queue {
   _parent = null;
   _queues = [[], []];
@@ -532,6 +522,14 @@ function reassignPendingTransition(pendingNodes) {
 }
 const globalQueue = new GlobalQueue();
 function flush() {
+  if (globalQueue._running) {
+    if (inTrackedQueueCallback) {
+      throw new Error(
+        "Cannot call flush() from inside onSettled or createTrackedEffect. flush() is not reentrant there."
+      );
+    }
+    return;
+  }
   let count = 0;
   while (scheduled || activeTransition) {
     if (++count === 1e5) throw new Error("Potential Infinite Loop Detected.");
@@ -552,6 +550,21 @@ function transitionComplete(transition) {
       break;
     }
   }
+  if (done) {
+    for (let i = 0; i < transition._optimisticNodes.length; i++) {
+      const node = transition._optimisticNodes[i];
+      if (
+        hasActiveOverride(node) &&
+        "_statusFlags" in node &&
+        node._statusFlags & STATUS_PENDING &&
+        node._error instanceof NotReadyError &&
+        node._error.source !== node
+      ) {
+        done = false;
+        break;
+      }
+    }
+  }
   done && (transition._done = true);
   return done;
 }
@@ -843,7 +856,6 @@ function handleAsync(el, result, setter) {
 }
 function clearStatus(el, clearUninitialized = false) {
   clearPendingSources(el);
-  removeTransitionBlocker(el);
   el._blocked = false;
   el._statusFlags = clearUninitialized ? 0 : el._statusFlags & STATUS_UNINITIALIZED;
   setPendingError(el);
@@ -867,11 +879,9 @@ function notifyStatus(el, status, error, blockStatus, lane) {
     if (status === STATUS_PENDING && pendingSource) {
       addPendingSource(el, pendingSource);
       el._statusFlags = STATUS_PENDING | (el._statusFlags & STATUS_UNINITIALIZED);
-      setPendingError(el, el._pendingSource ?? el._pendingSources?.values().next().value, error);
-      if (pendingSource === el) addTransitionBlocker(el);
+      setPendingError(el, pendingSource, error);
     } else {
       clearPendingSources(el);
-      removeTransitionBlocker(el);
       el._statusFlags =
         status | (status !== STATUS_ERROR ? el._statusFlags & STATUS_UNINITIALIZED : 0);
       el._error = error;
@@ -884,6 +894,9 @@ function notifyStatus(el, status, error, blockStatus, lane) {
   const downstreamBlockStatus = blockStatus || startsBlocking;
   const downstreamLane = blockStatus || isOptimisticBoundary ? undefined : lane;
   if (el._notifyStatus) {
+    if (blockStatus && status === STATUS_PENDING) {
+      return;
+    }
     if (downstreamBlockStatus) {
       el._notifyStatus(status, error);
     } else {
@@ -901,7 +914,7 @@ function notifyStatus(el, status, error, blockStatus, lane) {
       (status !== STATUS_PENDING &&
         (sub._error !== error || sub._pendingSource || sub._pendingSources))
     ) {
-      !sub._transition && globalQueue._pendingNodes.push(sub);
+      if (!downstreamBlockStatus && !sub._transition) globalQueue._pendingNodes.push(sub);
       notifyStatus(sub, status, error, downstreamBlockStatus, downstreamLane);
     }
   });
@@ -1559,6 +1572,9 @@ function read(el) {
         if (!tracking && el !== c) link(el, c);
         throw owner._error;
       }
+    } else if (c && owner !== el && owner._statusFlags & STATUS_UNINITIALIZED) {
+      if (!tracking && el !== c) link(el, c);
+      throw owner._error;
     } else if (!c && owner._statusFlags & STATUS_UNINITIALIZED) {
       throw owner._error;
     }
@@ -1888,8 +1904,13 @@ function runEffect() {
 function trackedEffect(fn, options) {
   const run = () => {
     if (!node._modified || node._flags & REACTIVE_DISPOSED) return;
-    node._modified = false;
-    recompute(node);
+    setTrackedQueueCallback(true);
+    try {
+      node._modified = false;
+      recompute(node);
+    } finally {
+      setTrackedQueueCallback(false);
+    }
   };
   const node = computed(
     () => {