@tanstack/solid-query-persist-client 6.0.0-alpha.2 → 6.0.0-beta.3

package/build/index.js

@@ -5,7 +5,7 @@ import { QueryClientProvider, IsRestoringContext } from '@tanstack/solid-query';
 
 // src/index.ts
 
-// ../../node_modules/.pnpm/@solidjs+signals@0.13.6/node_modules/@solidjs/signals/dist/prod.js
+// ../../node_modules/.pnpm/@solidjs+signals@0.13.9/node_modules/@solidjs/signals/dist/prod.js
 var NotReadyError = class extends Error {
   source;
   constructor(e) {
@@ -567,39 +567,125 @@ function assignOrMergeLane(e, t) {
   }
   e.q = t;
 }
+function unlinkSubs(e) {
+  const t = e.m;
+  const n = e.D;
+  const i = e.p;
+  const r = e.Ie;
+  if (i !== null) i.Ie = r;
+  else t.pe = r;
+  if (r !== null) r.p = i;
+  else {
+    t.I = i;
+    if (i === null) {
+      t.he?.();
+      t.L && !t.Ae && !(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.Pe;
+  while (t) {
+    t.O |= REACTIVE_ZOMBIE;
+    if (t.O & REACTIVE_IN_HEAP) {
+      deleteFromHeap(t, dirtyQueue);
+      insertIntoHeap(t, zombieQueue);
+    }
+    markDisposal(t);
+    t = t.ge;
+  }
+}
+function disposeChildren(e, t = false, n) {
+  if (e.O & REACTIVE_DISPOSED) return;
+  if (t) e.O = REACTIVE_DISPOSED;
+  if (t && e.L) e.Ce = null;
+  let i = n ? e.De : e.Pe;
+  while (i) {
+    const e2 = i.ge;
+    if (i.C) {
+      const e3 = i;
+      deleteFromHeap(e3, e3.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+      let t2 = e3.C;
+      do {
+        t2 = unlinkSubs(t2);
+      } while (t2 !== null);
+      e3.C = null;
+      e3.Ne = null;
+    }
+    disposeChildren(i, true);
+    i = e2;
+  }
+  if (n) {
+    e.De = null;
+  } else {
+    e.Pe = null;
+    e.ye = 0;
+  }
+  runDisposal(e, n);
+}
+function runDisposal(e, t) {
+  let n = t ? e.ve : e.me;
+  if (!n) return;
+  if (Array.isArray(n)) {
+    for (let e2 = 0; e2 < n.length; e2++) {
+      const t2 = n[e2];
+      t2.call(t2);
+    }
+  } else {
+    n.call(n);
+  }
+  t ? e.ve = null : e.me = null;
+}
+function cleanup(e) {
+  if (!context) return e;
+  if (!context.me) context.me = e;
+  else if (Array.isArray(context.me)) context.me.push(e);
+  else context.me = [context.me, e];
+  return e;
+}
 function addPendingSource(e, t) {
-  if (e.Ie === t || e.pe?.has(t)) return false;
-  if (!e.Ie) {
-    e.Ie = t;
+  if (e.be === t || e.Le?.has(t)) return false;
+  if (!e.be) {
+    e.be = t;
     return true;
   }
-  if (!e.pe) {
-    e.pe = /* @__PURE__ */ new Set([e.Ie, t]);
+  if (!e.Le) {
+    e.Le = /* @__PURE__ */ new Set([e.be, t]);
   } else {
-    e.pe.add(t);
+    e.Le.add(t);
   }
-  e.Ie = void 0;
+  e.be = void 0;
   return true;
 }
 function removePendingSource(e, t) {
-  if (e.Ie) {
-    if (e.Ie !== t) return false;
-    e.Ie = void 0;
+  if (e.be) {
+    if (e.be !== t) return false;
+    e.be = 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;
+  if (!e.Le?.delete(t)) return false;
+  if (e.Le.size === 1) {
+    e.be = e.Le.values().next().value;
+    e.Le = void 0;
+  } else if (e.Le.size === 0) {
+    e.Le = void 0;
   }
   return true;
 }
 function clearPendingSources(e) {
-  e.Ie = void 0;
-  e.pe?.clear();
-  e.pe = void 0;
+  e.be = void 0;
+  e.Le?.clear();
+  e.Le = void 0;
 }
 function setPendingError(e, t, n) {
   if (!t) {
@@ -628,7 +714,7 @@ function settlePendingSource(e) {
     if (n.has(i) || !removePendingSource(i, e)) return;
     n.add(i);
     i.Ee = clock;
-    const r = i.Ie ?? i.pe?.values().next().value;
+    const r = i.be ?? i.Le?.values().next().value;
     if (r) {
       setPendingError(i, r);
       updatePendingSignal(i);
@@ -636,7 +722,7 @@ function settlePendingSource(e) {
       i.Se &= ~STATUS_PENDING;
       setPendingError(i);
       updatePendingSignal(i);
-      if (i.he) {
+      if (i.Ue) {
         if (i.W === EFFECT_TRACKED) {
           const e2 = i;
           if (!e2.H) {
@@ -650,7 +736,7 @@ function settlePendingSource(e) {
         }
         t = true;
       }
-      i.he = false;
+      i.Ue = false;
     }
     forEachDependent(i, settle);
   };
@@ -662,19 +748,19 @@ function handleAsync(e, t, n) {
   const r = i && untrack(() => t[Symbol.asyncIterator]);
   const s = !r && i && untrack(() => typeof t.then === "function");
   if (!s && !r) {
-    e.Ae = null;
+    e.Ce = null;
     return t;
   }
-  e.Ae = t;
+  e.Ce = t;
   let o;
   const handleError = (n2) => {
-    if (e.Ae !== t) return;
+    if (e.Ce !== t) return;
     globalQueue.initTransition(resolveTransition(e));
     notifyStatus(e, n2 instanceof NotReadyError ? STATUS_PENDING : STATUS_ERROR, n2);
     e.Ee = clock;
   };
   const asyncWrite = (i2, r2) => {
-    if (e.Ae !== t) return;
+    if (e.Ce !== t) return;
     if (e.O & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY)) return;
     globalQueue.initTransition(resolveTransition(e));
     clearStatus(e);
@@ -689,12 +775,12 @@ function handleAsync(e, t, n) {
       e.Ee = clock;
     } else if (s2) {
       const t2 = e.J;
-      const n2 = e.Ne;
+      const n2 = e.ke;
       if (!n2 || !n2(i2, t2)) {
         e.J = i2;
         e.Ee = clock;
-        if (e.Pe) {
-          setSignal(e.Pe, i2);
+        if (e.Ge) {
+          setSignal(e.Ge, i2);
         }
         insertSubs(e, true);
       }
@@ -728,33 +814,53 @@ function handleAsync(e, t, n) {
   if (r) {
     const n2 = t[Symbol.asyncIterator]();
     let i2 = false;
+    let r2 = false;
+    cleanup(() => {
+      if (r2) return;
+      r2 = true;
+      try {
+        const e2 = n2.return?.();
+        if (e2 && typeof e2.then === "function") {
+          e2.then(void 0, () => {
+          });
+        }
+      } catch {
+      }
+    });
     const iterate = () => {
-      let e2, t2 = false, r3 = true;
+      let s3, u = false, c = true;
       n2.next().then(
         (n3) => {
-          if (r3) {
-            e2 = n3;
-            t2 = true;
+          if (c) {
+            s3 = n3;
+            u = true;
+            if (n3.done) r2 = true;
+          } else if (e.Ce !== t) {
+            return;
           } else if (!n3.done) asyncWrite(n3.value, iterate);
           else {
+            r2 = true;
             schedule();
             flush();
           }
         },
-        (e3) => {
-          if (!r3) handleError(e3);
+        (n3) => {
+          if (!c && e.Ce === t) {
+            r2 = true;
+            handleError(n3);
+          }
         }
       );
-      r3 = false;
-      if (t2 && !e2.done) {
-        o = e2.value;
+      c = false;
+      if (u && !s3.done) {
+        o = s3.value;
         i2 = true;
         return iterate();
       }
-      return t2 && e2.done;
+      return u && s3.done;
     };
-    const r2 = iterate();
-    if (!i2 && !r2) {
+    const s2 = iterate();
+    if (!i2 && !s2) {
       globalQueue.initTransition(resolveTransition(e));
       throw new NotReadyError(context);
     }
@@ -763,11 +869,11 @@ function handleAsync(e, t, n) {
 }
 function clearStatus(e, t = false) {
   clearPendingSources(e);
-  e.he = false;
+  e.Ue = false;
   e.Se = t ? 0 : e.Se & STATUS_UNINITIALIZED;
   setPendingError(e);
   updatePendingSignal(e);
-  e.ge?.();
+  e.xe?.();
 }
 function notifyStatus(e, t, n, i, r) {
   if (t === STATUS_ERROR && !(n instanceof StatusError) && !(n instanceof NotReadyError))
@@ -793,104 +899,26 @@ function notifyStatus(e, t, n, i, r) {
   }
   const a = i || c;
   const f = i || u ? void 0 : r;
-  if (e.ge) {
+  if (e.xe) {
     if (i && t === STATUS_PENDING) {
       return;
     }
     if (a) {
-      e.ge(t, n);
+      e.xe(t, n);
     } else {
-      e.ge();
+      e.xe();
     }
     return;
   }
   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 (t === STATUS_PENDING && s && e2.be !== s && !e2.Le?.has(s) || t !== STATUS_PENDING && (e2.le !== n || e2.be || e2.Le)) {
       if (!a && !e2.K) globalQueue.se.push(e2);
       notifyStatus(e2, t, n, a, f);
     }
   });
 }
 var externalSourceConfig = null;
-function markDisposal(e) {
-  let t = e.Ce;
-  while (t) {
-    t.O |= REACTIVE_ZOMBIE;
-    if (t.O & REACTIVE_IN_HEAP) {
-      deleteFromHeap(t, dirtyQueue);
-      insertIntoHeap(t, zombieQueue);
-    }
-    markDisposal(t);
-    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.me : e.Ce;
-  while (i) {
-    const e2 = i.De;
-    if (i.C) {
-      const e3 = i;
-      deleteFromHeap(e3, e3.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
-      let t2 = e3.C;
-      do {
-        t2 = unlinkSubs(t2);
-      } while (t2 !== null);
-      e3.C = null;
-      e3.ye = null;
-    }
-    disposeChildren(i, true);
-    i = e2;
-  }
-  if (n) {
-    e.me = null;
-  } else {
-    e.Ce = null;
-    e.ve = 0;
-  }
-  runDisposal(e, n);
-}
-function runDisposal(e, t) {
-  let n = t ? e.we : e.be;
-  if (!n) return;
-  if (Array.isArray(n)) {
-    for (let e2 = 0; e2 < n.length; e2++) {
-      const t2 = n[e2];
-      t2.call(t2);
-    }
-  } else {
-    n.call(n);
-  }
-  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);
-}
 GlobalQueue.oe = recompute;
 GlobalQueue.ue = disposeChildren;
 var tracking = false;
@@ -902,14 +930,15 @@ function recompute(e, t = false) {
     if (e.K && (!n || activeTransition) && activeTransition !== e.K)
       globalQueue.initTransition(e.K);
     deleteFromHeap(e, e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+    e.Ce = null;
     if (e.K || n === EFFECT_TRACKED) disposeChildren(e);
     else {
       markDisposal(e);
-      e.we = e.be;
-      e.me = e.Ce;
-      e.be = null;
-      e.Ce = null;
-      e.ve = 0;
+      e.ve = e.me;
+      e.De = e.Pe;
+      e.me = null;
+      e.Pe = null;
+      e.ye = 0;
     }
   }
   const i = !!(e.O & REACTIVE_OPTIMISTIC_DIRTY);
@@ -917,7 +946,7 @@ function recompute(e, t = false) {
   const s = !!(e.Se & STATUS_PENDING);
   const o = context;
   context = e;
-  e.ye = null;
+  e.Ne = null;
   e.O = REACTIVE_RECOMPUTING_DEPS;
   e.Ee = clock;
   let u = e.X === NOT_PENDING ? e.J : e.X;
@@ -946,7 +975,7 @@ function recompute(e, t = false) {
         updatePendingSignal(t3.te);
       }
     }
-    if (t2 instanceof NotReadyError) e.he = true;
+    if (t2 instanceof NotReadyError) e.Ue = true;
     notifyStatus(
       e,
       t2 instanceof NotReadyError ? STATUS_PENDING : STATUS_ERROR,
@@ -960,7 +989,7 @@ function recompute(e, t = false) {
     context = o;
   }
   if (!e.le) {
-    const o2 = e.ye;
+    const o2 = e.Ne;
     let a2 = o2 !== null ? o2.D : e.C;
     if (a2 !== null) {
       do {
@@ -970,7 +999,7 @@ function recompute(e, t = false) {
       else e.C = null;
     }
     const f2 = r ? e.ee : e.X === NOT_PENDING ? e.J : e.X;
-    const l = !e.Ne || !e.Ne(f2, u);
+    const l = !e.ke || !e.ke(f2, u);
     if (l) {
       const o3 = r ? e.ee : void 0;
       if (t || n && activeTransition !== e.K || i) {
@@ -1011,7 +1040,7 @@ function setSignal(e, t) {
   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);
+  const s = !e.ke || !e.ke(r, t) || !!(e.Se & STATUS_UNINITIALIZED);
   if (!s) {
     if (n && i && e.L) {
       insertSubs(e, true);
@@ -1035,8 +1064,8 @@ function setSignal(e, t) {
     e.X = t;
   }
   updatePendingSignal(e);
-  if (e.Pe) {
-    setSignal(e.Pe, t);
+  if (e.Ge) {
+    setSignal(e.Ge, t);
   }
   e.Ee = clock;
   insertSubs(e, n);
@@ -1047,7 +1076,7 @@ function computePendingState(e) {
   const t = e;
   const n = e.V;
   if (n && e.X !== NOT_PENDING) {
-    return !n.Ae && !(n.Se & STATUS_PENDING);
+    return !n.Ce && !(n.Se & STATUS_PENDING);
   }
   if (e.ee !== void 0 && e.ee !== NOT_PENDING) {
     if (t.Se & STATUS_PENDING && !(t.Se & STATUS_UNINITIALIZED)) return true;
@@ -1082,7 +1111,7 @@ function updatePendingSignal(e) {
   }
 }
 function isWrappable(e) {
-  return e != null && typeof e === "object" && !Object.isFrozen(e);
+  return e != null && typeof e === "object" && !Object.isFrozen(e) && !(typeof Node !== "undefined" && e instanceof Node);
 }
 var DELETE = /* @__PURE__ */ Symbol(0);
 function updatePath(e, t, n = 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query-persist-client",
-  "version": "6.0.0-alpha.2",
+  "version": "6.0.0-beta.3",
   "description": "Solid.js bindings to work with persisters in TanStack/solid-query",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -55,15 +55,15 @@
     "@solidjs/web": "2.0.0-beta.4",
     "babel-preset-solid": "2.0.0-beta.4",
     "npm-run-all2": "^5.0.0",
-    "solid-js": "2.0.0-beta.4",
+    "solid-js": "2.0.0-beta.5",
     "tsup-preset-solid": "^2.2.0",
-    "vite-plugin-solid": "3.0.0-next.2",
+    "vite-plugin-solid": "3.0.0-next.4",
     "@tanstack/query-test-utils": "0.0.0",
-    "@tanstack/solid-query": "6.0.0-alpha.2"
+    "@tanstack/solid-query": "6.0.0-beta.3"
   },
   "peerDependencies": {
     "solid-js": ">=2.0.0-beta.0 <3.0.0",
-    "@tanstack/solid-query": "^6.0.0-alpha.2"
+    "@tanstack/solid-query": "^6.0.0-beta.3"
   },
   "scripts": {
     "clean": "premove ./build ./coverage ./dist-ts",