@tanstack/solid-query-devtools 6.0.0-alpha.0 → 6.0.0-alpha.2

package/build/index.cjs

@@ -14,7 +14,7 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// ../../node_modules/.pnpm/@solidjs+signals@0.12.0/node_modules/@solidjs/signals/dist/prod.js
+// ../../node_modules/.pnpm/@solidjs+signals@0.13.6/node_modules/@solidjs/signals/dist/prod.js
 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;
@@ -62,12 +62,12 @@ function deleteFromHeap(e, t) {
 }
 function runHeap(e, t) {
   e._ = false;
-  for (e.N = 0; e.N <= e.R; e.N++) {
-    let n = e.l[e.N];
+  for (e.P = 0; e.P <= e.R; e.P++) {
+    let n = e.l[e.P];
     while (n !== void 0) {
       if (n.O & REACTIVE_IN_HEAP) t(n);
       else adjustHeight(n, e);
-      n = e.l[e.N];
+      n = e.l[e.P];
     }
   }
   e.R = 0;
@@ -76,8 +76,8 @@ function adjustHeight(e, t) {
   deleteFromHeap(e, t);
   let n = e.o;
   for (let t2 = e.C; t2; t2 = t2.D) {
-    const e2 = t2.V;
-    const i = e2.m || e2;
+    const e2 = t2.m;
+    const i = e2.V || e2;
     if (i.L && i.o >= n) n = i.o + 1;
   }
   if (e.o !== n) {
@@ -89,24 +89,83 @@ function adjustHeight(e, t) {
 }
 function runLaneEffects(e) {
   for (const t of activeLanes) {
-    if (t.k || t.U.size > 0) continue;
-    const n = t.W[e - 1];
+    if (t.U || t.k.size > 0) continue;
+    const n = t.G[e - 1];
     if (n.length) {
-      t.W[e - 1] = [];
+      t.G[e - 1] = [];
       runQueue(n, e);
     }
   }
 }
+function queueStashedOptimisticEffects(e) {
+  for (let t = e.I; t !== null; t = t.p) {
+    const e2 = t.h;
+    if (!e2.W) continue;
+    if (e2.W === EFFECT_TRACKED) {
+      if (!e2.H) {
+        e2.H = true;
+        e2.F.enqueue(EFFECT_USER, e2.M);
+      }
+      continue;
+    }
+    const n = e2.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
+    if (n.P > e2.o) n.P = e2.o;
+    insertIntoHeap(e2, n);
+  }
+}
+function mergeTransitionState(e, t) {
+  t.$ = e;
+  e.j.push(...t.j);
+  for (const n of activeLanes) {
+    if (n.K === t) n.K = e;
+  }
+  e.Y.push(...t.Y);
+  for (const n of t.Z) e.Z.add(n);
+  for (const n of t.B) {
+    if (!e.B.includes(n)) e.B.push(n);
+  }
+}
+function resolveOptimisticNodes(e) {
+  for (let t = 0; t < e.length; t++) {
+    const n = e[t];
+    n.q = void 0;
+    if (n.X !== NOT_PENDING) {
+      n.J = n.X;
+      n.X = NOT_PENDING;
+    }
+    const i = n.ee;
+    n.ee = NOT_PENDING;
+    if (i !== NOT_PENDING && n.J !== i) insertSubs(n, true);
+    n.K = null;
+  }
+  e.length = 0;
+}
+function cleanupCompletedLanes(e) {
+  for (const t of activeLanes) {
+    const n = e ? t.K === e : !t.K;
+    if (!n) continue;
+    if (!t.U) {
+      if (t.G[0].length) runQueue(t.G[0], EFFECT_RENDER);
+      if (t.G[1].length) runQueue(t.G[1], EFFECT_USER);
+    }
+    if (t.te.q === t) t.te.q = void 0;
+    t.k.clear();
+    t.G[0].length = 0;
+    t.G[1].length = 0;
+    activeLanes.delete(t);
+    signalLanes.delete(t.te);
+  }
+}
 function schedule() {
   if (scheduled) return;
   scheduled = true;
-  if (!globalQueue.H && !projectionWriteActive) queueMicrotask(flush);
+  if (!globalQueue.ne && !projectionWriteActive) queueMicrotask(flush);
 }
 function insertSubs(e, t = false) {
-  const n = e.ie || currentOptimisticLane;
-  const i = e.re !== void 0;
+  const n = e.q || currentOptimisticLane;
+  const i = e.Te !== void 0;
   for (let r = e.I; r !== null; r = r.p) {
-    if (i && r.h.se) {
+    if (i && r.h.de) {
       r.h.O |= REACTIVE_SNAPSHOT_STALE;
       continue;
     }
@@ -115,88 +174,70 @@ function insertSubs(e, t = false) {
       assignOrMergeLane(r.h, n);
     } else if (t) {
       r.h.O |= REACTIVE_OPTIMISTIC_DIRTY;
-      r.h.ie = void 0;
+      r.h.q = void 0;
     }
     const e2 = r.h;
-    if (e2.oe === EFFECT_TRACKED) {
-      if (!e2.ue) {
-        e2.ue = true;
-        e2.ce.enqueue(EFFECT_USER, e2.le);
+    if (e2.W === EFFECT_TRACKED) {
+      if (!e2.H) {
+        e2.H = true;
+        e2.F.enqueue(EFFECT_USER, e2.M);
       }
       continue;
     }
     const s = r.h.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
-    if (s.N > r.h.o) s.N = r.h.o;
+    if (s.P > r.h.o) s.P = r.h.o;
     insertIntoHeap(r.h, s);
   }
 }
+function commitPendingNodes() {
+  const e = globalQueue.se;
+  for (let t = 0; t < e.length; t++) {
+    const n = e[t];
+    if (n.X !== NOT_PENDING) {
+      n.J = n.X;
+      n.X = NOT_PENDING;
+      if (n.W && n.W !== EFFECT_TRACKED) n.H = true;
+    }
+    if (!(n.Se & STATUS_PENDING)) n.Se &= ~STATUS_UNINITIALIZED;
+    if (n.L) GlobalQueue.ue(n, false, true);
+  }
+  e.length = 0;
+}
 function finalizePureQueue(e = null, t = false) {
-  let n = !t;
+  const n = !t;
+  if (n) commitPendingNodes();
   if (!t) checkBoundaryChildren(globalQueue);
-  if (dirtyQueue.R >= dirtyQueue.N) runHeap(dirtyQueue, GlobalQueue.K);
+  if (dirtyQueue.R >= dirtyQueue.P) runHeap(dirtyQueue, GlobalQueue.oe);
   if (n) {
-    const t2 = globalQueue.F;
-    for (let e2 = 0; e2 < t2.length; e2++) {
-      const n3 = t2[e2];
-      if (n3.ae !== NOT_PENDING) {
-        n3.fe = n3.ae;
-        n3.ae = NOT_PENDING;
-        if (n3.oe && n3.oe !== EFFECT_TRACKED) n3.ue = true;
-      }
-      if (!(n3.Ee & STATUS_PENDING)) n3.Ee &= ~STATUS_UNINITIALIZED;
-      if (n3.L) GlobalQueue.Y(n3, false, true);
-    }
-    t2.length = 0;
-    const n2 = e ? e.$ : globalQueue.$;
-    for (let e2 = 0; e2 < n2.length; e2++) {
-      const t3 = n2[e2];
-      const i2 = t3.ae;
-      t3.ie = void 0;
-      if (i2 !== NOT_PENDING && t3.fe !== i2) {
-        t3.fe = i2;
-        insertSubs(t3, true);
-      }
-      t3.ae = NOT_PENDING;
-      t3.ne = null;
-    }
-    n2.length = 0;
-    const i = e ? e.j : globalQueue.j;
-    if (GlobalQueue.Z && i.size) {
-      for (const e2 of i) {
-        GlobalQueue.Z(e2);
+    commitPendingNodes();
+    resolveOptimisticNodes(e ? e.Y : globalQueue.Y);
+    const t2 = e ? e.Z : globalQueue.Z;
+    if (GlobalQueue.ce && t2.size) {
+      for (const e2 of t2) {
+        GlobalQueue.ce(e2);
       }
-      i.clear();
+      t2.clear();
       schedule();
     }
-    for (const t3 of activeLanes) {
-      const n3 = e ? t3.ne === e : !t3.ne;
-      if (!n3) continue;
-      if (!t3.k) {
-        if (t3.W[0].length) runQueue(t3.W[0], EFFECT_RENDER);
-        if (t3.W[1].length) runQueue(t3.W[1], EFFECT_USER);
-      }
-      if (t3.Te.ie === t3) t3.Te.ie = void 0;
-      t3.U.clear();
-      t3.W[0].length = 0;
-      t3.W[1].length = 0;
-      activeLanes.delete(t3);
-      signalLanes.delete(t3.Te);
-    }
+    cleanupCompletedLanes(e);
   }
 }
 function checkBoundaryChildren(e) {
-  for (const t of e.M) {
+  for (const t of e.re) {
     t.checkSources?.();
     checkBoundaryChildren(t);
   }
 }
 function reassignPendingTransition(e) {
   for (let t = 0; t < e.length; t++) {
-    e[t].ne = activeTransition;
+    e[t].K = activeTransition;
   }
 }
 function flush() {
-  while (scheduled) {
+  if (globalQueue.ne) {
+    return;
+  }
+  while (scheduled || activeTransition) {
     globalQueue.flush();
   }
 }
@@ -204,21 +245,30 @@ function runQueue(e, t) {
   for (let n = 0; n < e.length; n++) e[n](t);
 }
 function transitionComplete(e) {
-  if (e.te) return true;
-  if (e.ee.length) return false;
+  if (e.$) return true;
+  if (e.j.length) return false;
   let t = true;
-  for (let n = 0; n < e.q.length; n++) {
-    const i = e.q[n];
-    if (i.Ee & STATUS_PENDING && i.X?.source === i) {
+  for (let n = 0; n < e.B.length; n++) {
+    const i = e.B[n];
+    if (i.Se & STATUS_PENDING && i.le?.source === i) {
       t = false;
       break;
     }
   }
-  t && (e.te = true);
+  if (t) {
+    for (let n = 0; n < e.Y.length; n++) {
+      const i = e.Y[n];
+      if (hasActiveOverride(i) && "Se" in i && i.Se & STATUS_PENDING && i.le instanceof NotReadyError && i.le.source !== i) {
+        t = false;
+        break;
+      }
+    }
+  }
+  t && (e.$ = true);
   return t;
 }
 function currentTransition(e) {
-  while (e.te && typeof e.te === "object") e = e.te;
+  while (e.$ && typeof e.$ === "object") e = e.$;
   return e;
 }
 function runInTransition(e, t) {
@@ -235,105 +285,198 @@ function getOrCreateLane(e) {
   if (t) {
     return findLane(t);
   }
-  const n = e.de;
-  const i = n?.ie ? findLane(n.ie) : null;
-  t = { Te: e, U: /* @__PURE__ */ new Set(), W: [[], []], k: null, ne: activeTransition, Se: i };
+  const n = e.Re;
+  const i = n?.q ? findLane(n.q) : null;
+  t = { te: e, k: /* @__PURE__ */ new Set(), G: [[], []], U: null, K: activeTransition, Oe: i };
   signalLanes.set(e, t);
   activeLanes.add(t);
-  e.Re = e.Oe || 0;
+  e._e = false;
   return t;
 }
 function findLane(e) {
-  while (e.k) e = e.k;
+  while (e.U) e = e.U;
   return e;
 }
 function mergeLanes(e, t) {
   e = findLane(e);
   t = findLane(t);
   if (e === t) return e;
-  t.k = e;
-  for (const n of t.U) e.U.add(n);
-  e.W[0].push(...t.W[0]);
-  e.W[1].push(...t.W[1]);
+  t.U = e;
+  for (const n of t.k) e.k.add(n);
+  e.G[0].push(...t.G[0]);
+  e.G[1].push(...t.G[1]);
   return e;
 }
 function resolveLane(e) {
-  const t = e.ie;
+  const t = e.q;
   if (!t) return void 0;
   const n = findLane(t);
   if (activeLanes.has(n)) return n;
-  e.ie = void 0;
+  e.q = void 0;
   return void 0;
 }
+function resolveTransition(e) {
+  return resolveLane(e)?.K ?? e.K;
+}
 function hasActiveOverride(e) {
-  return !!(e._e && e.ae !== NOT_PENDING);
+  return !!(e.ee !== void 0 && e.ee !== NOT_PENDING);
 }
 function assignOrMergeLane(e, t) {
   const n = findLane(t);
-  const i = e.ie;
+  const i = e.q;
   if (i) {
-    if (i.k) {
-      e.ie = t;
+    if (i.U) {
+      e.q = t;
       return;
     }
     const r = findLane(i);
     if (activeLanes.has(r)) {
       if (r !== n && !hasActiveOverride(e)) {
-        if (n.Se && findLane(n.Se) === r) {
-          e.ie = t;
-        } else if (r.Se && findLane(r.Se) === n) ;
+        if (n.Oe && findLane(n.Oe) === r) {
+          e.q = t;
+        } else if (r.Oe && findLane(r.Oe) === n) ;
         else mergeLanes(n, r);
       }
       return;
     }
   }
-  e.ie = t;
+  e.q = t;
+}
+function addPendingSource(e, t) {
+  if (e.Ie === t || e.pe?.has(t)) return false;
+  if (!e.Ie) {
+    e.Ie = t;
+    return true;
+  }
+  if (!e.pe) {
+    e.pe = /* @__PURE__ */ new Set([e.Ie, t]);
+  } else {
+    e.pe.add(t);
+  }
+  e.Ie = void 0;
+  return true;
+}
+function removePendingSource(e, t) {
+  if (e.Ie) {
+    if (e.Ie !== t) return false;
+    e.Ie = void 0;
+    return true;
+  }
+  if (!e.pe?.delete(t)) return false;
+  if (e.pe.size === 1) {
+    e.Ie = e.pe.values().next().value;
+    e.pe = void 0;
+  } else if (e.pe.size === 0) {
+    e.pe = void 0;
+  }
+  return true;
+}
+function clearPendingSources(e) {
+  e.Ie = void 0;
+  e.pe?.clear();
+  e.pe = void 0;
+}
+function setPendingError(e, t, n) {
+  if (!t) {
+    e.le = null;
+    return;
+  }
+  if (n instanceof NotReadyError && n.source === t) {
+    e.le = n;
+    return;
+  }
+  const i = e.le;
+  if (!(i instanceof NotReadyError) || i.source !== t) {
+    e.le = new NotReadyError(t);
+  }
+}
+function forEachDependent(e, t) {
+  for (let n = e.I; n !== null; n = n.p) t(n.h);
+  for (let n = e.A; n !== null; n = n.N) {
+    for (let e2 = n.I; e2 !== null; e2 = e2.p) t(e2.h);
+  }
+}
+function settlePendingSource(e) {
+  let t = false;
+  const n = /* @__PURE__ */ new Set();
+  const settle = (i) => {
+    if (n.has(i) || !removePendingSource(i, e)) return;
+    n.add(i);
+    i.Ee = clock;
+    const r = i.Ie ?? i.pe?.values().next().value;
+    if (r) {
+      setPendingError(i, r);
+      updatePendingSignal(i);
+    } else {
+      i.Se &= ~STATUS_PENDING;
+      setPendingError(i);
+      updatePendingSignal(i);
+      if (i.he) {
+        if (i.W === EFFECT_TRACKED) {
+          const e2 = i;
+          if (!e2.H) {
+            e2.H = true;
+            e2.F.enqueue(EFFECT_USER, e2.M);
+          }
+        } else {
+          const e2 = i.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
+          if (e2.P > i.o) e2.P = i.o;
+          insertIntoHeap(i, e2);
+        }
+        t = true;
+      }
+      i.he = false;
+    }
+    forEachDependent(i, settle);
+  };
+  forEachDependent(e, settle);
+  if (t) schedule();
 }
 function handleAsync(e, t, n) {
   const i = typeof t === "object" && t !== null;
   const r = i && untrack(() => t[Symbol.asyncIterator]);
   const s = !r && i && untrack(() => typeof t.then === "function");
   if (!s && !r) {
-    e.Ie = null;
+    e.Ae = null;
     return t;
   }
-  e.Ie = t;
+  e.Ae = t;
   let o;
   const handleError = (n2) => {
-    if (e.Ie !== t) return;
-    globalQueue.initTransition(e.ne);
+    if (e.Ae !== t) return;
+    globalQueue.initTransition(resolveTransition(e));
     notifyStatus(e, n2 instanceof NotReadyError ? STATUS_PENDING : STATUS_ERROR, n2);
-    e.J = clock;
+    e.Ee = clock;
   };
   const asyncWrite = (i2, r2) => {
-    if (e.Ie !== t) return;
+    if (e.Ae !== t) return;
     if (e.O & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY)) return;
-    globalQueue.initTransition(e.ne);
+    globalQueue.initTransition(resolveTransition(e));
     clearStatus(e);
     const s2 = resolveLane(e);
-    if (s2) s2.U.delete(e);
-    if (e._e) {
-      const t2 = e.ae !== NOT_PENDING;
-      if (e.L) e.ae = i2;
-      if (!t2) {
-        e.fe = i2;
+    if (s2) s2.k.delete(e);
+    if (e.ee !== void 0) {
+      if (e.ee !== void 0 && e.ee !== NOT_PENDING) e.X = i2;
+      else {
+        e.J = i2;
         insertSubs(e);
       }
-      e.J = clock;
+      e.Ee = clock;
     } else if (s2) {
-      const t2 = e.fe;
-      const n2 = e.pe;
+      const t2 = e.J;
+      const n2 = e.Ne;
       if (!n2 || !n2(i2, t2)) {
-        e.fe = i2;
-        e.J = clock;
-        if (e.he) {
-          setSignal(e.he, i2);
+        e.J = i2;
+        e.Ee = clock;
+        if (e.Pe) {
+          setSignal(e.Pe, i2);
         }
         insertSubs(e, true);
       }
     } else {
       setSignal(e, () => i2);
     }
+    settlePendingSource(e);
     schedule();
     flush();
     r2?.();
@@ -353,7 +496,7 @@ function handleAsync(e, t, n) {
     );
     i2 = false;
     if (!n2) {
-      globalQueue.initTransition(e.ne);
+      globalQueue.initTransition(resolveTransition(e));
       throw new NotReadyError(context);
     }
   }
@@ -387,93 +530,65 @@ function handleAsync(e, t, n) {
     };
     const r2 = iterate();
     if (!i2 && !r2) {
-      globalQueue.initTransition(e.ne);
+      globalQueue.initTransition(resolveTransition(e));
       throw new NotReadyError(context);
     }
   }
   return o;
 }
-function clearStatus(e) {
-  e.Ee = e.Ee & STATUS_UNINITIALIZED;
-  e.X = null;
+function clearStatus(e, t = false) {
+  clearPendingSources(e);
+  e.he = false;
+  e.Se = t ? 0 : e.Se & STATUS_UNINITIALIZED;
+  setPendingError(e);
   updatePendingSignal(e);
-  e.Ae?.();
+  e.ge?.();
 }
 function notifyStatus(e, t, n, i, r) {
   if (t === STATUS_ERROR && !(n instanceof StatusError) && !(n instanceof NotReadyError))
     n = new StatusError(e, n);
-  const s = n instanceof NotReadyError && n.source === e;
-  const o = t === STATUS_PENDING && e._e && !s;
-  const u = o && hasActiveOverride(e);
+  const s = t === STATUS_PENDING && n instanceof NotReadyError ? n.source : void 0;
+  const o = s === e;
+  const u = t === STATUS_PENDING && e.ee !== void 0 && !o;
+  const c = u && hasActiveOverride(e);
   if (!i) {
-    e.Ee = t | (t !== STATUS_ERROR ? e.Ee & STATUS_UNINITIALIZED : 0);
-    e.X = n;
+    if (t === STATUS_PENDING && s) {
+      addPendingSource(e, s);
+      e.Se = STATUS_PENDING | e.Se & STATUS_UNINITIALIZED;
+      setPendingError(e, s, n);
+    } else {
+      clearPendingSources(e);
+      e.Se = t | (t !== STATUS_ERROR ? e.Se & STATUS_UNINITIALIZED : 0);
+      e.le = n;
+    }
     updatePendingSignal(e);
   }
   if (r && !i) {
     assignOrMergeLane(e, r);
   }
-  if (u && activeTransition && n instanceof NotReadyError) {
-    const e2 = n.source;
-    if (!activeTransition.q.includes(e2)) {
-      activeTransition.q.push(e2);
+  const a = i || c;
+  const f = i || u ? void 0 : r;
+  if (e.ge) {
+    if (i && t === STATUS_PENDING) {
+      return;
     }
-  }
-  const c = i || u;
-  const l = i || o ? void 0 : r;
-  if (e.Ae) {
-    if (c) {
-      e.Ae(t, n);
+    if (a) {
+      e.ge(t, n);
     } else {
-      e.Ae();
+      e.ge();
     }
     return;
   }
-  for (let i2 = e.I; i2 !== null; i2 = i2.p) {
-    i2.h.J = clock;
-    if (i2.h.X !== n) {
-      !i2.h.ne && globalQueue.F.push(i2.h);
-      notifyStatus(i2.h, t, n, c, l);
+  forEachDependent(e, (e2) => {
+    e2.Ee = clock;
+    if (t === STATUS_PENDING && s && e2.Ie !== s && !e2.pe?.has(s) || t !== STATUS_PENDING && (e2.le !== n || e2.Ie || e2.pe)) {
+      if (!a && !e2.K) globalQueue.se.push(e2);
+      notifyStatus(e2, t, n, a, f);
     }
-  }
-  for (let i2 = e.A; i2 !== null; i2 = i2.P) {
-    for (let e2 = i2.I; e2 !== null; e2 = e2.p) {
-      e2.h.J = clock;
-      if (e2.h.X !== n) {
-        !e2.h.ne && globalQueue.F.push(e2.h);
-        notifyStatus(e2.h, t, n, c, l);
-      }
-    }
-  }
-}
-function unlinkSubs(e) {
-  const t = e.V;
-  const n = e.D;
-  const i = e.p;
-  const r = e.Pe;
-  if (i !== null) i.Pe = r;
-  else t.Ne = r;
-  if (r !== null) r.p = i;
-  else {
-    t.I = i;
-    if (i === null) {
-      t.ge?.();
-      t.L && !t.Ce && !(t.O & REACTIVE_ZOMBIE) && unobserved(t);
-    }
-  }
-  return n;
-}
-function unobserved(e) {
-  deleteFromHeap(e, e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
-  let t = e.C;
-  while (t !== null) {
-    t = unlinkSubs(t);
-  }
-  e.C = null;
-  disposeChildren(e, true);
+  });
 }
 function markDisposal(e) {
-  let t = e.De;
+  let t = e.Ce;
   while (t) {
     t.O |= REACTIVE_ZOMBIE;
     if (t.O & REACTIVE_IN_HEAP) {
@@ -481,15 +596,15 @@ function markDisposal(e) {
       insertIntoHeap(t, zombieQueue);
     }
     markDisposal(t);
-    t = t.ve;
+    t = t.De;
   }
 }
 function disposeChildren(e, t = false, n) {
   if (e.O & REACTIVE_DISPOSED) return;
   if (t) e.O = REACTIVE_DISPOSED;
-  let i = n ? e.be : e.De;
+  let i = n ? e.me : e.Ce;
   while (i) {
-    const e2 = i.ve;
+    const e2 = i.De;
     if (i.C) {
       const e3 = i;
       deleteFromHeap(e3, e3.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
@@ -504,16 +619,15 @@ function disposeChildren(e, t = false, n) {
     i = e2;
   }
   if (n) {
-    e.be = null;
+    e.me = null;
   } else {
-    e.De = null;
-    e.ve = null;
-    e.we = 0;
+    e.Ce = null;
+    e.ve = 0;
   }
   runDisposal(e, n);
 }
 function runDisposal(e, t) {
-  let n = t ? e.Ve : e.me;
+  let n = t ? e.we : e.be;
   if (!n) return;
   if (Array.isArray(n)) {
     for (let e2 = 0; e2 < n.length; e2++) {
@@ -523,36 +637,62 @@ function runDisposal(e, t) {
   } else {
     n.call(n);
   }
-  t ? e.Ve = null : e.me = null;
+  t ? e.we = null : e.be = null;
+}
+function unlinkSubs(e) {
+  const t = e.m;
+  const n = e.D;
+  const i = e.p;
+  const r = e.Ue;
+  if (i !== null) i.Ue = r;
+  else t.ke = r;
+  if (r !== null) r.p = i;
+  else {
+    t.I = i;
+    if (i === null) {
+      t.Ge?.();
+      t.L && !t.xe && !(t.O & REACTIVE_ZOMBIE) && unobserved(t);
+    }
+  }
+  return n;
+}
+function unobserved(e) {
+  deleteFromHeap(e, e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+  let t = e.C;
+  while (t !== null) {
+    t = unlinkSubs(t);
+  }
+  e.C = null;
+  disposeChildren(e, true);
 }
 function recompute(e, t = false) {
-  const n = e.oe;
+  const n = e.W;
   if (!t) {
-    if (e.ne && (!n || activeTransition) && activeTransition !== e.ne)
-      globalQueue.initTransition(e.ne);
+    if (e.K && (!n || activeTransition) && activeTransition !== e.K)
+      globalQueue.initTransition(e.K);
     deleteFromHeap(e, e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
-    if (e.ne || n === EFFECT_TRACKED) disposeChildren(e);
+    if (e.K || n === EFFECT_TRACKED) disposeChildren(e);
     else {
       markDisposal(e);
-      e.Ve = e.me;
-      e.be = e.De;
-      e.me = null;
-      e.De = null;
-      e.we = 0;
+      e.we = e.be;
+      e.me = e.Ce;
+      e.be = null;
+      e.Ce = null;
+      e.ve = 0;
     }
   }
   const i = !!(e.O & REACTIVE_OPTIMISTIC_DIRTY);
-  const r = hasActiveOverride(e);
-  const s = !!(e.Ee & STATUS_PENDING);
+  const r = e.ee !== void 0 && e.ee !== NOT_PENDING;
+  const s = !!(e.Se & STATUS_PENDING);
   const o = context;
   context = e;
   e.ye = null;
   e.O = REACTIVE_RECOMPUTING_DEPS;
-  e.J = clock;
-  let u = e.ae === NOT_PENDING ? e.fe : e.ae;
+  e.Ee = clock;
+  let u = e.X === NOT_PENDING ? e.J : e.X;
   let c = e.o;
-  let l = tracking;
-  let a = currentOptimisticLane;
+  let a = tracking;
+  let f = currentOptimisticLane;
   tracking = true;
   if (i) {
     const t2 = resolveLane(e);
@@ -560,148 +700,153 @@ function recompute(e, t = false) {
   }
   try {
     u = handleAsync(e, e.L(u));
-    clearStatus(e);
-    const t2 = resolveLane(e);
-    if (t2) {
-      t2.U.delete(e);
-      updatePendingSignal(t2.Te);
+    clearStatus(e, t);
+    const n2 = resolveLane(e);
+    if (n2) {
+      n2.k.delete(e);
+      updatePendingSignal(n2.te);
     }
   } catch (t2) {
     if (t2 instanceof NotReadyError && currentOptimisticLane) {
       const t3 = findLane(currentOptimisticLane);
-      if (t3.Te !== e) {
-        t3.U.add(e);
-        e.ie = t3;
-        updatePendingSignal(t3.Te);
+      if (t3.te !== e) {
+        t3.k.add(e);
+        e.q = t3;
+        updatePendingSignal(t3.te);
       }
     }
+    if (t2 instanceof NotReadyError) e.he = true;
     notifyStatus(
       e,
       t2 instanceof NotReadyError ? STATUS_PENDING : STATUS_ERROR,
       t2,
       void 0,
-      t2 instanceof NotReadyError ? e.ie : void 0
+      t2 instanceof NotReadyError ? e.q : void 0
     );
   } finally {
-    tracking = l;
+    tracking = a;
     e.O = REACTIVE_NONE | (t ? e.O & REACTIVE_SNAPSHOT_STALE : 0);
     context = o;
   }
-  if (!e.X) {
+  if (!e.le) {
     const o2 = e.ye;
-    let l2 = o2 !== null ? o2.D : e.C;
-    if (l2 !== null) {
+    let a2 = o2 !== null ? o2.D : e.C;
+    if (a2 !== null) {
       do {
-        l2 = unlinkSubs(l2);
-      } while (l2 !== null);
+        a2 = unlinkSubs(a2);
+      } while (a2 !== null);
       if (o2 !== null) o2.D = null;
       else e.C = null;
     }
-    const a2 = r ? e.fe : e.ae === NOT_PENDING ? e.fe : e.ae;
-    const f = !e.pe || !e.pe(a2, u);
-    if (f) {
-      const o3 = r ? e.fe : void 0;
-      if (t || n && activeTransition !== e.ne || i) e.fe = u;
-      else e.ae = u;
-      if (r && !i && s) {
-        const t2 = e.Oe || 0;
-        const n2 = e.Re || 0;
-        if (t2 <= n2) e.fe = u;
-      }
-      if (!r || i || e.fe !== o3) {
-        insertSubs(e, i || r);
-      }
+    const f2 = r ? e.ee : e.X === NOT_PENDING ? e.J : e.X;
+    const l = !e.Ne || !e.Ne(f2, u);
+    if (l) {
+      const o3 = r ? e.ee : void 0;
+      if (t || n && activeTransition !== e.K || i) {
+        e.J = u;
+        if (r && i) {
+          e.ee = u;
+          e.X = u;
+        }
+      } else e.X = u;
+      if (r && !i && s && !e._e) e.ee = u;
+      if (!r || i || e.ee !== o3) insertSubs(e, i || r);
     } else if (r) {
-      e.ae = u;
+      e.X = u;
     } else if (e.o != c) {
       for (let t2 = e.I; t2 !== null; t2 = t2.p) {
         insertIntoHeapHeight(t2.h, t2.h.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
       }
     }
   }
-  currentOptimisticLane = a;
-  (!t || e.Ee & STATUS_PENDING) && !e.ne && !(activeTransition && e._e) && globalQueue.F.push(e);
-  e.ne && n && activeTransition !== e.ne && runInTransition(e.ne, () => recompute(e));
+  currentOptimisticLane = f;
+  (!t || e.Se & STATUS_PENDING) && !e.K && !(activeTransition && r) && globalQueue.se.push(e);
+  e.K && n && activeTransition !== e.K && runInTransition(e.K, () => recompute(e));
 }
 function untrack(e, t) {
-  if (!tracking && true) return e();
+  if (!externalSourceConfig && !tracking && true) return e();
   const n = tracking;
   tracking = false;
   try {
+    if (externalSourceConfig) return externalSourceConfig.untrack(e);
     return e();
   } finally {
     tracking = n;
   }
 }
 function setSignal(e, t) {
-  if (e.ne && activeTransition !== e.ne) globalQueue.initTransition(e.ne);
-  const n = e._e && !projectionWriteActive;
-  const i = n ? e.fe : e.ae === NOT_PENDING ? e.fe : e.ae;
-  if (typeof t === "function") t = t(i);
-  const r = !e.pe || !e.pe(i, t) || !!(e.Ee & STATUS_UNINITIALIZED);
-  if (!r) {
-    if (n && e.ae !== NOT_PENDING && e.L) {
+  if (e.K && activeTransition !== e.K) globalQueue.initTransition(e.K);
+  const n = e.ee !== void 0 && !projectionWriteActive;
+  const i = e.ee !== void 0 && e.ee !== NOT_PENDING;
+  const r = n ? i ? e.ee : e.J : e.X === NOT_PENDING ? e.J : e.X;
+  if (typeof t === "function") t = t(r);
+  const s = !e.Ne || !e.Ne(r, t) || !!(e.Se & STATUS_UNINITIALIZED);
+  if (!s) {
+    if (n && i && e.L) {
       insertSubs(e, true);
       schedule();
     }
     return t;
   }
   if (n) {
-    const n2 = globalQueue.$.includes(e);
-    if (e.ne && n2) {
-      globalQueue.initTransition(e.ne);
-    }
-    if (e.ae === NOT_PENDING) {
-      e.ae = e.fe;
-    }
-    if (!n2) {
-      globalQueue.$.push(e);
+    const n2 = e.ee === NOT_PENDING;
+    if (!n2) globalQueue.initTransition(resolveTransition(e));
+    if (n2) {
+      e.X = e.J;
+      globalQueue.Y.push(e);
     }
-    e.Oe = (e.Oe || 0) + 1;
+    e._e = true;
     const i2 = getOrCreateLane(e);
-    e.ie = i2;
-    e.fe = t;
+    e.q = i2;
+    e.ee = t;
   } else {
-    if (e.ae === NOT_PENDING) globalQueue.F.push(e);
-    e.ae = t;
+    if (e.X === NOT_PENDING) globalQueue.se.push(e);
+    e.X = t;
   }
   updatePendingSignal(e);
-  if (e.he) {
-    setSignal(e.he, t);
+  if (e.Pe) {
+    setSignal(e.Pe, t);
   }
-  e.J = clock;
+  e.Ee = clock;
   insertSubs(e, n);
   schedule();
   return t;
 }
 function computePendingState(e) {
   const t = e;
-  if (e._e && e.ae !== NOT_PENDING) {
-    if (t.Ee & STATUS_PENDING && !(t.Ee & STATUS_UNINITIALIZED)) return true;
-    if (e.de) {
-      const t2 = e.ie ? findLane(e.ie) : null;
-      return !!(t2 && t2.U.size > 0);
+  const n = e.V;
+  if (n && e.X !== NOT_PENDING) {
+    return !n.Ae && !(n.Se & STATUS_PENDING);
+  }
+  if (e.ee !== void 0 && e.ee !== NOT_PENDING) {
+    if (t.Se & STATUS_PENDING && !(t.Se & STATUS_UNINITIALIZED)) return true;
+    if (e.Re) {
+      const t2 = e.q ? findLane(e.q) : null;
+      return !!(t2 && t2.k.size > 0);
     }
     return true;
   }
-  if (e.ae !== NOT_PENDING && !(t.Ee & STATUS_UNINITIALIZED)) return true;
-  return !!(t.Ee & STATUS_PENDING && !(t.Ee & STATUS_UNINITIALIZED));
+  if (e.ee !== void 0 && e.ee === NOT_PENDING && !e.Re) {
+    return false;
+  }
+  if (e.X !== NOT_PENDING && !(t.Se & STATUS_UNINITIALIZED)) return true;
+  return !!(t.Se & STATUS_PENDING && !(t.Se & STATUS_UNINITIALIZED));
 }
 function updatePendingSignal(e) {
-  if (e.Me) {
+  if (e.Qe) {
     const t = computePendingState(e);
-    const n = e.Me;
+    const n = e.Qe;
     setSignal(n, t);
-    if (!t && n.ie) {
+    if (!t && n.q) {
       const t2 = resolveLane(e);
-      if (t2 && t2.U.size > 0) {
-        const e2 = findLane(n.ie);
+      if (t2 && t2.k.size > 0) {
+        const e2 = findLane(n.q);
         if (e2 !== t2) {
           mergeLanes(t2, e2);
         }
       }
       signalLanes.delete(n);
-      n.ie = void 0;
+      n.q = void 0;
     }
   }
 }
@@ -760,9 +905,9 @@ function updatePath(e, t, n = 0) {
     e[i] = s;
   }
 }
-var NotReadyError, StatusError, REACTIVE_NONE, REACTIVE_CHECK, REACTIVE_DIRTY, REACTIVE_RECOMPUTING_DEPS, REACTIVE_IN_HEAP, REACTIVE_IN_HEAP_HEIGHT, REACTIVE_ZOMBIE, REACTIVE_DISPOSED, REACTIVE_OPTIMISTIC_DIRTY, REACTIVE_SNAPSHOT_STALE, STATUS_PENDING, STATUS_ERROR, STATUS_UNINITIALIZED, EFFECT_RENDER, EFFECT_USER, EFFECT_TRACKED, NOT_PENDING, transitions, dirtyQueue, zombieQueue, clock, activeTransition, scheduled, projectionWriteActive, Queue, GlobalQueue, globalQueue, signalLanes, activeLanes, tracking, context, currentOptimisticLane, DELETE;
+var NotReadyError, StatusError, REACTIVE_NONE, REACTIVE_CHECK, REACTIVE_DIRTY, REACTIVE_RECOMPUTING_DEPS, REACTIVE_IN_HEAP, REACTIVE_IN_HEAP_HEIGHT, REACTIVE_ZOMBIE, REACTIVE_DISPOSED, REACTIVE_OPTIMISTIC_DIRTY, REACTIVE_SNAPSHOT_STALE, STATUS_PENDING, STATUS_ERROR, STATUS_UNINITIALIZED, EFFECT_RENDER, EFFECT_USER, EFFECT_TRACKED, NOT_PENDING, transitions, dirtyQueue, zombieQueue, clock, activeTransition, scheduled, projectionWriteActive, stashedOptimisticReads, Queue, GlobalQueue, globalQueue, signalLanes, activeLanes, externalSourceConfig, tracking, context, currentOptimisticLane, DELETE;
 var init_prod = __esm({
-  "../../node_modules/.pnpm/@solidjs+signals@0.12.0/node_modules/@solidjs/signals/dist/prod.js"() {
+  "../../node_modules/.pnpm/@solidjs+signals@0.13.6/node_modules/@solidjs/signals/dist/prod.js"() {
     NotReadyError = class extends Error {
       source;
       constructor(e) {
@@ -795,25 +940,26 @@ var init_prod = __esm({
     EFFECT_TRACKED = 3;
     NOT_PENDING = {};
     transitions = /* @__PURE__ */ new Set();
-    dirtyQueue = { l: new Array(2e3).fill(void 0), _: false, N: 0, R: 0 };
-    zombieQueue = { l: new Array(2e3).fill(void 0), _: false, N: 0, R: 0 };
+    dirtyQueue = { l: new Array(2e3).fill(void 0), _: false, P: 0, R: 0 };
+    zombieQueue = { l: new Array(2e3).fill(void 0), _: false, P: 0, R: 0 };
     clock = 0;
     activeTransition = null;
     scheduled = false;
     projectionWriteActive = false;
+    stashedOptimisticReads = null;
     Queue = class {
       i = null;
-      G = [[], []];
-      M = [];
+      ie = [[], []];
+      re = [];
       created = clock;
       addChild(e) {
-        this.M.push(e);
+        this.re.push(e);
         e.i = this;
       }
       removeChild(e) {
-        const t = this.M.indexOf(e);
+        const t = this.re.indexOf(e);
         if (t >= 0) {
-          this.M.splice(t, 1);
+          this.re.splice(t, 1);
           e.i = null;
         }
       }
@@ -822,107 +968,123 @@ var init_prod = __esm({
         return false;
       }
       run(e) {
-        if (this.G[e - 1].length) {
-          const t = this.G[e - 1];
-          this.G[e - 1] = [];
+        if (this.ie[e - 1].length) {
+          const t = this.ie[e - 1];
+          this.ie[e - 1] = [];
           runQueue(t, e);
         }
-        for (let t = 0; t < this.M.length; t++) this.M[t].run?.(e);
+        for (let t = 0; t < this.re.length; t++) this.re[t].run?.(e);
       }
       enqueue(e, t) {
         if (e) {
           if (currentOptimisticLane) {
             const n = findLane(currentOptimisticLane);
-            n.W[e - 1].push(t);
+            n.G[e - 1].push(t);
           } else {
-            this.G[e - 1].push(t);
+            this.ie[e - 1].push(t);
           }
         }
         schedule();
       }
       stashQueues(e) {
-        e.G[0].push(...this.G[0]);
-        e.G[1].push(...this.G[1]);
-        this.G = [[], []];
-        for (let t = 0; t < this.M.length; t++) {
-          let n = this.M[t];
-          let i = e.M[t];
+        e.ie[0].push(...this.ie[0]);
+        e.ie[1].push(...this.ie[1]);
+        this.ie = [[], []];
+        for (let t = 0; t < this.re.length; t++) {
+          let n = this.re[t];
+          let i = e.re[t];
           if (!i) {
-            i = { G: [[], []], M: [] };
-            e.M[t] = i;
+            i = { ie: [[], []], re: [] };
+            e.re[t] = i;
           }
           n.stashQueues(i);
         }
       }
       restoreQueues(e) {
-        this.G[0].push(...e.G[0]);
-        this.G[1].push(...e.G[1]);
-        for (let t = 0; t < e.M.length; t++) {
-          const n = e.M[t];
-          let i = this.M[t];
+        this.ie[0].push(...e.ie[0]);
+        this.ie[1].push(...e.ie[1]);
+        for (let t = 0; t < e.re.length; t++) {
+          const n = e.re[t];
+          let i = this.re[t];
           if (i) i.restoreQueues(n);
         }
       }
     };
     GlobalQueue = class _GlobalQueue extends Queue {
-      H = false;
-      F = [];
-      $ = [];
-      j = /* @__PURE__ */ new Set();
-      static K;
-      static Y;
-      static Z = null;
+      ne = false;
+      se = [];
+      Y = [];
+      Z = /* @__PURE__ */ new Set();
+      static oe;
+      static ue;
+      static ce = null;
       flush() {
-        if (this.H) return;
-        this.H = true;
+        if (this.ne) return;
+        this.ne = true;
         try {
-          runHeap(dirtyQueue, _GlobalQueue.K);
+          runHeap(dirtyQueue, _GlobalQueue.oe);
           if (activeTransition) {
             const e = transitionComplete(activeTransition);
             if (!e) {
-              let e2 = activeTransition;
-              runHeap(zombieQueue, _GlobalQueue.K);
-              this.F = [];
-              this.$ = [];
-              this.j = /* @__PURE__ */ new Set();
+              const e2 = activeTransition;
+              runHeap(zombieQueue, _GlobalQueue.oe);
+              this.se = [];
+              this.Y = [];
+              this.Z = /* @__PURE__ */ new Set();
               runLaneEffects(EFFECT_RENDER);
               runLaneEffects(EFFECT_USER);
-              this.stashQueues(activeTransition.B);
+              this.stashQueues(e2.ae);
               clock++;
-              scheduled = dirtyQueue.R >= dirtyQueue.N;
-              reassignPendingTransition(activeTransition.F);
+              scheduled = dirtyQueue.R >= dirtyQueue.P;
+              reassignPendingTransition(e2.se);
               activeTransition = null;
-              finalizePureQueue(null, true);
+              if (!e2.j.length && e2.Y.length) {
+                stashedOptimisticReads = /* @__PURE__ */ new Set();
+                for (let t2 = 0; t2 < e2.Y.length; t2++) {
+                  const n = e2.Y[t2];
+                  if (n.L || n.fe) continue;
+                  stashedOptimisticReads.add(n);
+                  queueStashedOptimisticEffects(n);
+                }
+              }
+              try {
+                finalizePureQueue(null, true);
+              } finally {
+                stashedOptimisticReads = null;
+              }
               return;
             }
-            this.F !== activeTransition.F && this.F.push(...activeTransition.F);
-            this.restoreQueues(activeTransition.B);
+            this.se !== activeTransition.se && this.se.push(...activeTransition.se);
+            this.restoreQueues(activeTransition.ae);
             transitions.delete(activeTransition);
             const t = activeTransition;
             activeTransition = null;
-            reassignPendingTransition(this.F);
+            reassignPendingTransition(this.se);
             finalizePureQueue(t);
           } else {
-            if (transitions.size) runHeap(zombieQueue, _GlobalQueue.K);
+            if (transitions.size) runHeap(zombieQueue, _GlobalQueue.oe);
             finalizePureQueue();
           }
           clock++;
-          scheduled = dirtyQueue.R >= dirtyQueue.N;
+          scheduled = dirtyQueue.R >= dirtyQueue.P;
           runLaneEffects(EFFECT_RENDER);
           this.run(EFFECT_RENDER);
           runLaneEffects(EFFECT_USER);
           this.run(EFFECT_USER);
         } finally {
-          this.H = false;
+          this.ne = false;
         }
       }
       notify(e, t, n, i) {
         if (t & STATUS_PENDING) {
           if (n & STATUS_PENDING) {
-            const t2 = i !== void 0 ? i : e.X;
-            if (activeTransition && t2 && !activeTransition.q.includes(t2.source)) {
-              activeTransition.q.push(t2.source);
-              schedule();
+            const t2 = i !== void 0 ? i : e.le;
+            if (activeTransition && t2) {
+              const e2 = t2.source;
+              if (!activeTransition.B.includes(e2)) {
+                activeTransition.B.push(e2);
+                schedule();
+              }
             }
           }
           return true;
@@ -932,58 +1094,57 @@ var init_prod = __esm({
       initTransition(e) {
         if (e) e = currentTransition(e);
         if (e && e === activeTransition) return;
-        if (!e && activeTransition && activeTransition.J === clock) return;
+        if (!e && activeTransition && activeTransition.Ee === clock) return;
         if (!activeTransition) {
           activeTransition = e ?? {
-            J: clock,
-            F: [],
-            q: [],
-            $: [],
-            j: /* @__PURE__ */ new Set(),
-            ee: [],
-            B: { G: [[], []], M: [] },
-            te: false
+            Ee: clock,
+            se: [],
+            B: [],
+            Y: [],
+            Z: /* @__PURE__ */ new Set(),
+            j: [],
+            ae: { ie: [[], []], re: [] },
+            $: false
           };
         } else if (e) {
           const t = activeTransition;
-          t.te = e;
-          e.ee.push(...t.ee);
-          for (const n of activeLanes) {
-            if (n.ne === t) n.ne = e;
-          }
-          e.$.push(...t.$);
-          for (const n of t.j) {
-            e.j.add(n);
-          }
+          mergeTransitionState(e, t);
           transitions.delete(t);
           activeTransition = e;
         }
         transitions.add(activeTransition);
-        activeTransition.J = clock;
-        for (let e2 = 0; e2 < this.F.length; e2++) {
-          const t = this.F[e2];
-          t.ne = activeTransition;
-          activeTransition.F.push(t);
+        activeTransition.Ee = clock;
+        if (this.se !== activeTransition.se) {
+          for (let e2 = 0; e2 < this.se.length; e2++) {
+            const t = this.se[e2];
+            t.K = activeTransition;
+            activeTransition.se.push(t);
+          }
+          this.se = activeTransition.se;
         }
-        this.F = activeTransition.F;
-        for (let e2 = 0; e2 < this.$.length; e2++) {
-          const t = this.$[e2];
-          t.ne = activeTransition;
-          activeTransition.$.push(t);
+        if (this.Y !== activeTransition.Y) {
+          for (let e2 = 0; e2 < this.Y.length; e2++) {
+            const t = this.Y[e2];
+            t.K = activeTransition;
+            activeTransition.Y.push(t);
+          }
+          this.Y = activeTransition.Y;
         }
-        this.$ = activeTransition.$;
         for (const e2 of activeLanes) {
-          if (!e2.ne) e2.ne = activeTransition;
+          if (!e2.K) e2.K = activeTransition;
+        }
+        if (this.Z !== activeTransition.Z) {
+          for (const e2 of this.Z) activeTransition.Z.add(e2);
+          this.Z = activeTransition.Z;
         }
-        for (const e2 of this.j) activeTransition.j.add(e2);
-        this.j = activeTransition.j;
       }
     };
     globalQueue = new GlobalQueue();
     signalLanes = /* @__PURE__ */ new WeakMap();
     activeLanes = /* @__PURE__ */ new Set();
-    GlobalQueue.K = recompute;
-    GlobalQueue.Y = disposeChildren;
+    externalSourceConfig = null;
+    GlobalQueue.oe = recompute;
+    GlobalQueue.ue = disposeChildren;
     tracking = false;
     context = null;
     currentOptimisticLane = null;
@@ -1042,7 +1203,7 @@ function isHydrating(node) {
 }
 var effect, isServer, isDev;
 var init_web = __esm({
-  "../../node_modules/.pnpm/@solidjs+web@2.0.0-beta.2_@solidjs+signals@0.12.0_solid-js@2.0.0-beta.2/node_modules/@solidjs/web/dist/web.js"() {
+  "../../node_modules/.pnpm/@solidjs+web@2.0.0-beta.4_@solidjs+signals@0.13.6_solid-js@2.0.0-beta.4/node_modules/@solidjs/web/dist/web.js"() {
     init_prod();
     effect = (fn, effectFn, initial) => solidJs.createRenderEffect(fn, effectFn, initial, {
       transparent: true
@@ -1097,9 +1258,18 @@ function SolidQueryDevtools(props) {
   solidJs.createEffect(() => props.theme, (theme) => {
     devtools.setTheme(theme || "system");
   });
-  solidJs.onSettled(() => {
+  let isMounted = false;
+  let isDisposed = false;
+  queueMicrotask(() => {
+    if (isDisposed) return;
     devtools.mount(ref2);
-    solidJs.onCleanup(() => devtools.unmount());
+    isMounted = true;
+  });
+  solidJs.onCleanup(() => {
+    isDisposed = true;
+    if (isMounted) {
+      devtools.unmount();
+    }
   });
   return (() => {
     var _el$ = _tmpl$();
@@ -1160,9 +1330,18 @@ function SolidQueryDevtoolsPanel(props) {
   solidJs.createEffect(() => props.theme, (theme) => {
     devtools.setTheme(theme || "system");
   });
-  solidJs.onSettled(() => {
+  let isMounted = false;
+  let isDisposed = false;
+  queueMicrotask(() => {
+    if (isDisposed) return;
     devtools.mount(ref2);
-    solidJs.onCleanup(() => devtools.unmount());
+    isMounted = true;
+  });
+  solidJs.onCleanup(() => {
+    isDisposed = true;
+    if (isMounted) {
+      devtools.unmount();
+    }
   });
   return (() => {
     var _el$ = _tmpl$2();