@tanstack/solid-query 5.24.1 → 5.24.3

package/build/dev.cjs

@@ -45,6 +45,8 @@ function shouldThrowError(throwError, params) {
   }
   return !!throwError;
 }
+function noop() {
+}
 var IsRestoringContext = solidJs.createContext(() => false);
 exports.useIsRestoring = () => solidJs.useContext(IsRestoringContext);
 exports.IsRestoringProvider = IsRestoringContext.Provider;
@@ -86,22 +88,19 @@ var hydratableObserverResult = (query, result) => {
 function createBaseQuery(options, Observer, queryClient) {
   const client = solidJs.createMemo(() => exports.useQueryClient(queryClient?.()));
   const isRestoring = exports.useIsRestoring();
-  const defaultedOptions = solidJs.createMemo(
-    () => solidJs.mergeProps(client()?.defaultQueryOptions(options()) || {}, {
-      get _optimisticResults() {
-        return isRestoring() ? "isRestoring" : "optimistic";
-      },
-      structuralSharing: false,
-      ...web.isServer && { retry: false, throwOnError: true }
-    })
-  );
+  let unsubscribeQueued = false;
+  const defaultedOptions = solidJs.createMemo(() => {
+    const defaultOptions = client().defaultQueryOptions(options());
+    defaultOptions._optimisticResults = isRestoring() ? "isRestoring" : "optimistic";
+    defaultOptions.structuralSharing = false;
+    if (web.isServer) {
+      defaultOptions.retry = false;
+      defaultOptions.throwOnError = true;
+    }
+    return defaultOptions;
+  });
   const [observer, setObserver] = solidJs.createSignal(
-    new Observer(client(), solidJs.untrack(defaultedOptions))
-  );
-  solidJs.createComputed(
-    solidJs.on(client, (c) => setObserver(new Observer(c, defaultedOptions())), {
-      defer: true
-    })
+    new Observer(client(), defaultedOptions())
   );
   const [state, setState] = store.createStore(
     observer().getOptimisticResult(defaultedOptions())
@@ -113,28 +112,44 @@ function createBaseQuery(options, Observer, queryClient) {
         const unwrappedResult = hydratableObserverResult(query, result);
         if (unwrappedResult.isError) {
           reject(unwrappedResult.error);
+          unsubscribeIfQueued();
         } else {
           resolve(unwrappedResult);
+          unsubscribeIfQueued();
         }
       })();
     });
   };
+  const unsubscribeIfQueued = () => {
+    if (unsubscribeQueued) {
+      unsubscribe?.();
+      unsubscribeQueued = false;
+    }
+  };
   const createClientSubscriber = () => {
     const obs = observer();
     return obs.subscribe((result) => {
       queryCore.notifyManager.batchCalls(() => {
         const reconcileOptions = obs.options.reconcile;
-        setState((store) => {
-          return reconcileFn(
-            store,
-            result,
-            reconcileOptions === void 0 ? false : reconcileOptions
-          );
-        });
-        if (queryResource()?.data && result.data && !queryResource.loading && isRestoring())
+        if (queryResource()?.data && result.data && !queryResource.loading) {
+          setState((store) => {
+            return reconcileFn(
+              store,
+              result,
+              reconcileOptions === void 0 ? false : reconcileOptions
+            );
+          });
           mutate(state);
-        else
+        } else {
+          setState((store) => {
+            return reconcileFn(
+              store,
+              result,
+              reconcileOptions === void 0 ? false : reconcileOptions
+            );
+          });
           refetch();
+        }
       })();
     });
   };
@@ -143,12 +158,13 @@ function createBaseQuery(options, Observer, queryClient) {
     () => {
       const obs = observer();
       return new Promise((resolve, reject) => {
-        if (web.isServer)
+        if (web.isServer) {
           unsubscribe = createServerSubscriber(resolve, reject);
-        else if (!unsubscribe && !isRestoring())
+        } else if (!unsubscribe && !isRestoring()) {
           unsubscribe = createClientSubscriber();
+        }
         obs.updateResult();
-        if (!state.isLoading && !isRestoring()) {
+        if (!state.isLoading) {
           const query = obs.getCurrentQuery();
           resolve(hydratableObserverResult(query, state));
         }
@@ -198,18 +214,30 @@ function createBaseQuery(options, Observer, queryClient) {
   );
   solidJs.createComputed(
     solidJs.on(
-      [isRestoring, observer],
-      ([restoring]) => {
-        const _unsubscribe = unsubscribe;
-        queueMicrotask(() => _unsubscribe?.());
-        unsubscribe = null;
-        if (!restoring)
-          refetch();
+      client,
+      (c) => {
+        if (unsubscribe) {
+          unsubscribe();
+        }
+        const newObserver = new Observer(c, defaultedOptions());
+        unsubscribe = createClientSubscriber();
+        setObserver(newObserver);
       },
-      { defer: true }
+      {
+        defer: true
+      }
     )
   );
+  solidJs.createComputed(() => {
+    if (!isRestoring()) {
+      refetch();
+    }
+  });
   solidJs.onCleanup(() => {
+    if (web.isServer && queryResource.loading) {
+      unsubscribeQueued = true;
+      return;
+    }
     if (unsubscribe) {
       unsubscribe();
       unsubscribe = null;
@@ -222,11 +250,7 @@ function createBaseQuery(options, Observer, queryClient) {
         obs.setOptions(opts);
         setState(obs.getOptimisticResult(opts));
       },
-      {
-        // Defer because we don't need to trigger on first render
-        // This only cares about changes to options after the observer is created
-        defer: true
-      }
+      { defer: true }
     )
   );
   solidJs.createComputed(
@@ -317,8 +341,6 @@ function createMutation(options, queryClient) {
   solidJs.onCleanup(unsubscribe);
   return state;
 }
-function noop() {
-}
 function useIsMutating(filters, queryClient) {
   const client = solidJs.createMemo(() => exports.useQueryClient(queryClient?.()));
   const mutationCache = solidJs.createMemo(() => client().getMutationCache());

package/build/dev.js

@@ -1,6 +1,6 @@
 import { notifyManager, QueryClient as QueryClient$1, MutationObserver, replaceEqualDeep, QueriesObserver, hydrate, QueryObserver, InfiniteQueryObserver } from '@tanstack/query-core';
 export * from '@tanstack/query-core';
-import { batch, createContext, useContext, createRenderEffect, onCleanup, createMemo, createSignal, createComputed, on, createEffect, mergeProps, createResource, onMount, untrack } from 'solid-js';
+import { batch, createContext, useContext, createRenderEffect, onCleanup, createMemo, createSignal, createComputed, on, createEffect, mergeProps, createResource, onMount } from 'solid-js';
 import { createComponent, isServer } from 'solid-js/web';
 import { createStore, unwrap, reconcile } from 'solid-js/store';
 
@@ -44,6 +44,8 @@ function shouldThrowError(throwError, params) {
   }
   return !!throwError;
 }
+function noop() {
+}
 var IsRestoringContext = createContext(() => false);
 var useIsRestoring = () => useContext(IsRestoringContext);
 var IsRestoringProvider = IsRestoringContext.Provider;
@@ -85,22 +87,19 @@ var hydratableObserverResult = (query, result) => {
 function createBaseQuery(options, Observer, queryClient) {
   const client = createMemo(() => useQueryClient(queryClient?.()));
   const isRestoring = useIsRestoring();
-  const defaultedOptions = createMemo(
-    () => mergeProps(client()?.defaultQueryOptions(options()) || {}, {
-      get _optimisticResults() {
-        return isRestoring() ? "isRestoring" : "optimistic";
-      },
-      structuralSharing: false,
-      ...isServer && { retry: false, throwOnError: true }
-    })
-  );
+  let unsubscribeQueued = false;
+  const defaultedOptions = createMemo(() => {
+    const defaultOptions = client().defaultQueryOptions(options());
+    defaultOptions._optimisticResults = isRestoring() ? "isRestoring" : "optimistic";
+    defaultOptions.structuralSharing = false;
+    if (isServer) {
+      defaultOptions.retry = false;
+      defaultOptions.throwOnError = true;
+    }
+    return defaultOptions;
+  });
   const [observer, setObserver] = createSignal(
-    new Observer(client(), untrack(defaultedOptions))
-  );
-  createComputed(
-    on(client, (c) => setObserver(new Observer(c, defaultedOptions())), {
-      defer: true
-    })
+    new Observer(client(), defaultedOptions())
   );
   const [state, setState] = createStore(
     observer().getOptimisticResult(defaultedOptions())
@@ -112,28 +111,44 @@ function createBaseQuery(options, Observer, queryClient) {
         const unwrappedResult = hydratableObserverResult(query, result);
         if (unwrappedResult.isError) {
           reject(unwrappedResult.error);
+          unsubscribeIfQueued();
         } else {
           resolve(unwrappedResult);
+          unsubscribeIfQueued();
         }
       })();
     });
   };
+  const unsubscribeIfQueued = () => {
+    if (unsubscribeQueued) {
+      unsubscribe?.();
+      unsubscribeQueued = false;
+    }
+  };
   const createClientSubscriber = () => {
     const obs = observer();
     return obs.subscribe((result) => {
       notifyManager.batchCalls(() => {
         const reconcileOptions = obs.options.reconcile;
-        setState((store) => {
-          return reconcileFn(
-            store,
-            result,
-            reconcileOptions === void 0 ? false : reconcileOptions
-          );
-        });
-        if (queryResource()?.data && result.data && !queryResource.loading && isRestoring())
+        if (queryResource()?.data && result.data && !queryResource.loading) {
+          setState((store) => {
+            return reconcileFn(
+              store,
+              result,
+              reconcileOptions === void 0 ? false : reconcileOptions
+            );
+          });
           mutate(state);
-        else
+        } else {
+          setState((store) => {
+            return reconcileFn(
+              store,
+              result,
+              reconcileOptions === void 0 ? false : reconcileOptions
+            );
+          });
           refetch();
+        }
       })();
     });
   };
@@ -142,12 +157,13 @@ function createBaseQuery(options, Observer, queryClient) {
     () => {
       const obs = observer();
       return new Promise((resolve, reject) => {
-        if (isServer)
+        if (isServer) {
           unsubscribe = createServerSubscriber(resolve, reject);
-        else if (!unsubscribe && !isRestoring())
+        } else if (!unsubscribe && !isRestoring()) {
           unsubscribe = createClientSubscriber();
+        }
         obs.updateResult();
-        if (!state.isLoading && !isRestoring()) {
+        if (!state.isLoading) {
           const query = obs.getCurrentQuery();
           resolve(hydratableObserverResult(query, state));
         }
@@ -197,18 +213,30 @@ function createBaseQuery(options, Observer, queryClient) {
   );
   createComputed(
     on(
-      [isRestoring, observer],
-      ([restoring]) => {
-        const _unsubscribe = unsubscribe;
-        queueMicrotask(() => _unsubscribe?.());
-        unsubscribe = null;
-        if (!restoring)
-          refetch();
+      client,
+      (c) => {
+        if (unsubscribe) {
+          unsubscribe();
+        }
+        const newObserver = new Observer(c, defaultedOptions());
+        unsubscribe = createClientSubscriber();
+        setObserver(newObserver);
       },
-      { defer: true }
+      {
+        defer: true
+      }
     )
   );
+  createComputed(() => {
+    if (!isRestoring()) {
+      refetch();
+    }
+  });
   onCleanup(() => {
+    if (isServer && queryResource.loading) {
+      unsubscribeQueued = true;
+      return;
+    }
     if (unsubscribe) {
       unsubscribe();
       unsubscribe = null;
@@ -221,11 +249,7 @@ function createBaseQuery(options, Observer, queryClient) {
         obs.setOptions(opts);
         setState(obs.getOptimisticResult(opts));
       },
-      {
-        // Defer because we don't need to trigger on first render
-        // This only cares about changes to options after the observer is created
-        defer: true
-      }
+      { defer: true }
     )
   );
   createComputed(
@@ -316,8 +340,6 @@ function createMutation(options, queryClient) {
   onCleanup(unsubscribe);
   return state;
 }
-function noop() {
-}
 function useIsMutating(filters, queryClient) {
   const client = createMemo(() => useQueryClient(queryClient?.()));
   const mutationCache = createMemo(() => client().getMutationCache());

package/build/index.cjs

@@ -45,6 +45,8 @@ function shouldThrowError(throwError, params) {
   }
   return !!throwError;
 }
+function noop() {
+}
 var IsRestoringContext = solidJs.createContext(() => false);
 exports.useIsRestoring = () => solidJs.useContext(IsRestoringContext);
 exports.IsRestoringProvider = IsRestoringContext.Provider;
@@ -86,22 +88,19 @@ var hydratableObserverResult = (query, result) => {
 function createBaseQuery(options, Observer, queryClient) {
   const client = solidJs.createMemo(() => exports.useQueryClient(queryClient?.()));
   const isRestoring = exports.useIsRestoring();
-  const defaultedOptions = solidJs.createMemo(
-    () => solidJs.mergeProps(client()?.defaultQueryOptions(options()) || {}, {
-      get _optimisticResults() {
-        return isRestoring() ? "isRestoring" : "optimistic";
-      },
-      structuralSharing: false,
-      ...web.isServer && { retry: false, throwOnError: true }
-    })
-  );
+  let unsubscribeQueued = false;
+  const defaultedOptions = solidJs.createMemo(() => {
+    const defaultOptions = client().defaultQueryOptions(options());
+    defaultOptions._optimisticResults = isRestoring() ? "isRestoring" : "optimistic";
+    defaultOptions.structuralSharing = false;
+    if (web.isServer) {
+      defaultOptions.retry = false;
+      defaultOptions.throwOnError = true;
+    }
+    return defaultOptions;
+  });
   const [observer, setObserver] = solidJs.createSignal(
-    new Observer(client(), solidJs.untrack(defaultedOptions))
-  );
-  solidJs.createComputed(
-    solidJs.on(client, (c) => setObserver(new Observer(c, defaultedOptions())), {
-      defer: true
-    })
+    new Observer(client(), defaultedOptions())
   );
   const [state, setState] = store.createStore(
     observer().getOptimisticResult(defaultedOptions())
@@ -113,28 +112,44 @@ function createBaseQuery(options, Observer, queryClient) {
         const unwrappedResult = hydratableObserverResult(query, result);
         if (unwrappedResult.isError) {
           reject(unwrappedResult.error);
+          unsubscribeIfQueued();
         } else {
           resolve(unwrappedResult);
+          unsubscribeIfQueued();
         }
       })();
     });
   };
+  const unsubscribeIfQueued = () => {
+    if (unsubscribeQueued) {
+      unsubscribe?.();
+      unsubscribeQueued = false;
+    }
+  };
   const createClientSubscriber = () => {
     const obs = observer();
     return obs.subscribe((result) => {
       queryCore.notifyManager.batchCalls(() => {
         const reconcileOptions = obs.options.reconcile;
-        setState((store) => {
-          return reconcileFn(
-            store,
-            result,
-            reconcileOptions === void 0 ? false : reconcileOptions
-          );
-        });
-        if (queryResource()?.data && result.data && !queryResource.loading && isRestoring())
+        if (queryResource()?.data && result.data && !queryResource.loading) {
+          setState((store) => {
+            return reconcileFn(
+              store,
+              result,
+              reconcileOptions === void 0 ? false : reconcileOptions
+            );
+          });
           mutate(state);
-        else
+        } else {
+          setState((store) => {
+            return reconcileFn(
+              store,
+              result,
+              reconcileOptions === void 0 ? false : reconcileOptions
+            );
+          });
           refetch();
+        }
       })();
     });
   };
@@ -143,12 +158,13 @@ function createBaseQuery(options, Observer, queryClient) {
     () => {
       const obs = observer();
       return new Promise((resolve, reject) => {
-        if (web.isServer)
+        if (web.isServer) {
           unsubscribe = createServerSubscriber(resolve, reject);
-        else if (!unsubscribe && !isRestoring())
+        } else if (!unsubscribe && !isRestoring()) {
           unsubscribe = createClientSubscriber();
+        }
         obs.updateResult();
-        if (!state.isLoading && !isRestoring()) {
+        if (!state.isLoading) {
           const query = obs.getCurrentQuery();
           resolve(hydratableObserverResult(query, state));
         }
@@ -198,18 +214,30 @@ function createBaseQuery(options, Observer, queryClient) {
   );
   solidJs.createComputed(
     solidJs.on(
-      [isRestoring, observer],
-      ([restoring]) => {
-        const _unsubscribe = unsubscribe;
-        queueMicrotask(() => _unsubscribe?.());
-        unsubscribe = null;
-        if (!restoring)
-          refetch();
+      client,
+      (c) => {
+        if (unsubscribe) {
+          unsubscribe();
+        }
+        const newObserver = new Observer(c, defaultedOptions());
+        unsubscribe = createClientSubscriber();
+        setObserver(newObserver);
       },
-      { defer: true }
+      {
+        defer: true
+      }
     )
   );
+  solidJs.createComputed(() => {
+    if (!isRestoring()) {
+      refetch();
+    }
+  });
   solidJs.onCleanup(() => {
+    if (web.isServer && queryResource.loading) {
+      unsubscribeQueued = true;
+      return;
+    }
     if (unsubscribe) {
       unsubscribe();
       unsubscribe = null;
@@ -222,11 +250,7 @@ function createBaseQuery(options, Observer, queryClient) {
         obs.setOptions(opts);
         setState(obs.getOptimisticResult(opts));
       },
-      {
-        // Defer because we don't need to trigger on first render
-        // This only cares about changes to options after the observer is created
-        defer: true
-      }
+      { defer: true }
     )
   );
   solidJs.createComputed(
@@ -317,8 +341,6 @@ function createMutation(options, queryClient) {
   solidJs.onCleanup(unsubscribe);
   return state;
 }
-function noop() {
-}
 function useIsMutating(filters, queryClient) {
   const client = solidJs.createMemo(() => exports.useQueryClient(queryClient?.()));
   const mutationCache = solidJs.createMemo(() => client().getMutationCache());

package/build/index.js

@@ -1,6 +1,6 @@
 import { notifyManager, QueryClient as QueryClient$1, MutationObserver, replaceEqualDeep, QueriesObserver, hydrate, QueryObserver, InfiniteQueryObserver } from '@tanstack/query-core';
 export * from '@tanstack/query-core';
-import { batch, createContext, useContext, createRenderEffect, onCleanup, createMemo, createSignal, createComputed, on, createEffect, mergeProps, createResource, onMount, untrack } from 'solid-js';
+import { batch, createContext, useContext, createRenderEffect, onCleanup, createMemo, createSignal, createComputed, on, createEffect, mergeProps, createResource, onMount } from 'solid-js';
 import { createComponent, isServer } from 'solid-js/web';
 import { createStore, unwrap, reconcile } from 'solid-js/store';
 
@@ -44,6 +44,8 @@ function shouldThrowError(throwError, params) {
   }
   return !!throwError;
 }
+function noop() {
+}
 var IsRestoringContext = createContext(() => false);
 var useIsRestoring = () => useContext(IsRestoringContext);
 var IsRestoringProvider = IsRestoringContext.Provider;
@@ -85,22 +87,19 @@ var hydratableObserverResult = (query, result) => {
 function createBaseQuery(options, Observer, queryClient) {
   const client = createMemo(() => useQueryClient(queryClient?.()));
   const isRestoring = useIsRestoring();
-  const defaultedOptions = createMemo(
-    () => mergeProps(client()?.defaultQueryOptions(options()) || {}, {
-      get _optimisticResults() {
-        return isRestoring() ? "isRestoring" : "optimistic";
-      },
-      structuralSharing: false,
-      ...isServer && { retry: false, throwOnError: true }
-    })
-  );
+  let unsubscribeQueued = false;
+  const defaultedOptions = createMemo(() => {
+    const defaultOptions = client().defaultQueryOptions(options());
+    defaultOptions._optimisticResults = isRestoring() ? "isRestoring" : "optimistic";
+    defaultOptions.structuralSharing = false;
+    if (isServer) {
+      defaultOptions.retry = false;
+      defaultOptions.throwOnError = true;
+    }
+    return defaultOptions;
+  });
   const [observer, setObserver] = createSignal(
-    new Observer(client(), untrack(defaultedOptions))
-  );
-  createComputed(
-    on(client, (c) => setObserver(new Observer(c, defaultedOptions())), {
-      defer: true
-    })
+    new Observer(client(), defaultedOptions())
   );
   const [state, setState] = createStore(
     observer().getOptimisticResult(defaultedOptions())
@@ -112,28 +111,44 @@ function createBaseQuery(options, Observer, queryClient) {
         const unwrappedResult = hydratableObserverResult(query, result);
         if (unwrappedResult.isError) {
           reject(unwrappedResult.error);
+          unsubscribeIfQueued();
         } else {
           resolve(unwrappedResult);
+          unsubscribeIfQueued();
         }
       })();
     });
   };
+  const unsubscribeIfQueued = () => {
+    if (unsubscribeQueued) {
+      unsubscribe?.();
+      unsubscribeQueued = false;
+    }
+  };
   const createClientSubscriber = () => {
     const obs = observer();
     return obs.subscribe((result) => {
       notifyManager.batchCalls(() => {
         const reconcileOptions = obs.options.reconcile;
-        setState((store) => {
-          return reconcileFn(
-            store,
-            result,
-            reconcileOptions === void 0 ? false : reconcileOptions
-          );
-        });
-        if (queryResource()?.data && result.data && !queryResource.loading && isRestoring())
+        if (queryResource()?.data && result.data && !queryResource.loading) {
+          setState((store) => {
+            return reconcileFn(
+              store,
+              result,
+              reconcileOptions === void 0 ? false : reconcileOptions
+            );
+          });
           mutate(state);
-        else
+        } else {
+          setState((store) => {
+            return reconcileFn(
+              store,
+              result,
+              reconcileOptions === void 0 ? false : reconcileOptions
+            );
+          });
           refetch();
+        }
       })();
     });
   };
@@ -142,12 +157,13 @@ function createBaseQuery(options, Observer, queryClient) {
     () => {
       const obs = observer();
       return new Promise((resolve, reject) => {
-        if (isServer)
+        if (isServer) {
           unsubscribe = createServerSubscriber(resolve, reject);
-        else if (!unsubscribe && !isRestoring())
+        } else if (!unsubscribe && !isRestoring()) {
           unsubscribe = createClientSubscriber();
+        }
         obs.updateResult();
-        if (!state.isLoading && !isRestoring()) {
+        if (!state.isLoading) {
           const query = obs.getCurrentQuery();
           resolve(hydratableObserverResult(query, state));
         }
@@ -197,18 +213,30 @@ function createBaseQuery(options, Observer, queryClient) {
   );
   createComputed(
     on(
-      [isRestoring, observer],
-      ([restoring]) => {
-        const _unsubscribe = unsubscribe;
-        queueMicrotask(() => _unsubscribe?.());
-        unsubscribe = null;
-        if (!restoring)
-          refetch();
+      client,
+      (c) => {
+        if (unsubscribe) {
+          unsubscribe();
+        }
+        const newObserver = new Observer(c, defaultedOptions());
+        unsubscribe = createClientSubscriber();
+        setObserver(newObserver);
       },
-      { defer: true }
+      {
+        defer: true
+      }
     )
   );
+  createComputed(() => {
+    if (!isRestoring()) {
+      refetch();
+    }
+  });
   onCleanup(() => {
+    if (isServer && queryResource.loading) {
+      unsubscribeQueued = true;
+      return;
+    }
     if (unsubscribe) {
       unsubscribe();
       unsubscribe = null;
@@ -221,11 +249,7 @@ function createBaseQuery(options, Observer, queryClient) {
         obs.setOptions(opts);
         setState(obs.getOptimisticResult(opts));
       },
-      {
-        // Defer because we don't need to trigger on first render
-        // This only cares about changes to options after the observer is created
-        defer: true
-      }
+      { defer: true }
     )
   );
   createComputed(
@@ -316,8 +340,6 @@ function createMutation(options, queryClient) {
   onCleanup(unsubscribe);
   return state;
 }
-function noop() {
-}
 function useIsMutating(filters, queryClient) {
   const client = createMemo(() => useQueryClient(queryClient?.()));
   const mutationCache = createMemo(() => client().getMutationCache());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query",
-  "version": "5.24.1",
+  "version": "5.24.3",
   "description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -48,7 +48,7 @@
   ],
   "dependencies": {
     "solid-js": "^1.8.14",
-    "@tanstack/query-core": "5.24.1"
+    "@tanstack/query-core": "5.24.2"
   },
   "devDependencies": {
     "tsup-preset-solid": "^2.2.0",
@@ -64,6 +64,7 @@
     "test:lib": "vitest --retry=3",
     "test:lib:dev": "pnpm run test:lib --watch",
     "test:build": "publint --strict",
-    "build": "tsup"
+    "build": "tsup",
+    "build:watch": "tsup --watch"
   }
 }

package/src/createBaseQuery.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unnecessary-condition */
 // Had to disable the lint rule because isServer type is defined as false
 // in solid-js/web package. I'll create a GitHub issue with them to see
 // why that happens.
@@ -9,10 +8,8 @@ import {
   createMemo,
   createResource,
   createSignal,
-  mergeProps,
   on,
   onCleanup,
-  untrack,
 } from 'solid-js'
 import { createStore, reconcile, unwrap } from 'solid-js/store'
 import { useQueryClient } from './QueryClientProvider'
@@ -123,26 +120,27 @@ export function createBaseQuery<
 
   const client = createMemo(() => useQueryClient(queryClient?.()))
   const isRestoring = useIsRestoring()
-
-  const defaultedOptions = createMemo(() =>
-    mergeProps(client()?.defaultQueryOptions(options()) || {}, {
-      get _optimisticResults() {
-        return isRestoring() ? 'isRestoring' : 'optimistic'
-      },
-      structuralSharing: false,
-      ...(isServer && { retry: false, throwOnError: true }),
-    }),
-  )
+  // There are times when we run a query on the server but the resource is never read
+  // This could lead to times when the queryObserver is unsubscribed before the resource has loaded
+  // Causing a time out error. To prevent this we will queue the unsubscribe if the cleanup is called
+  // before the resource has loaded
+  let unsubscribeQueued = false
+
+  const defaultedOptions = createMemo(() => {
+    const defaultOptions = client().defaultQueryOptions(options())
+    defaultOptions._optimisticResults = isRestoring()
+      ? 'isRestoring'
+      : 'optimistic'
+    defaultOptions.structuralSharing = false
+    if (isServer) {
+      defaultOptions.retry = false
+      defaultOptions.throwOnError = true
+    }
+    return defaultOptions
+  })
 
   const [observer, setObserver] = createSignal(
-    new Observer(client(), untrack(defaultedOptions)),
-  )
-  // we set the value in a computed because `createMemo`
-  // returns undefined during transitions
-  createComputed(
-    on(client, (c) => setObserver(new Observer(c, defaultedOptions())), {
-      defer: true,
-    }),
+    new Observer(client(), defaultedOptions()),
   )
 
   const [state, setState] = createStore<QueryObserverResult<TData, TError>>(
@@ -162,13 +160,22 @@ export function createBaseQuery<
 
         if (unwrappedResult.isError) {
           reject(unwrappedResult.error)
+          unsubscribeIfQueued()
         } else {
           resolve(unwrappedResult)
+          unsubscribeIfQueued()
         }
       })()
     })
   }
 
+  const unsubscribeIfQueued = () => {
+    if (unsubscribeQueued) {
+      unsubscribe?.()
+      unsubscribeQueued = false
+    }
+  }
+
   const createClientSubscriber = () => {
     const obs = observer()
     return obs.subscribe((result) => {
@@ -177,23 +184,27 @@ export function createBaseQuery<
         // exist on the query-core QueryObserverResult type
         const reconcileOptions = obs.options.reconcile
 
-        setState((store) => {
-          return reconcileFn(
-            store,
-            result,
-            reconcileOptions === undefined ? false : reconcileOptions,
-          )
-        })
         // If the query has data we don't suspend but instead mutate the resource
         // This could happen when placeholderData/initialData is defined
-        if (
-          queryResource()?.data &&
-          result.data &&
-          !queryResource.loading &&
-          isRestoring()
-        )
+        if (queryResource()?.data && result.data && !queryResource.loading) {
+          setState((store) => {
+            return reconcileFn(
+              store,
+              result,
+              reconcileOptions === undefined ? false : reconcileOptions,
+            )
+          })
           mutate(state)
-        else refetch()
+        } else {
+          setState((store) => {
+            return reconcileFn(
+              store,
+              result,
+              reconcileOptions === undefined ? false : reconcileOptions,
+            )
+          })
+          refetch()
+        }
       })()
     })
   }
@@ -209,13 +220,14 @@ export function createBaseQuery<
     () => {
       const obs = observer()
       return new Promise((resolve, reject) => {
-        if (isServer) unsubscribe = createServerSubscriber(resolve, reject)
-        else if (!unsubscribe && !isRestoring())
+        if (isServer) {
+          unsubscribe = createServerSubscriber(resolve, reject)
+        } else if (!unsubscribe && !isRestoring()) {
           unsubscribe = createClientSubscriber()
-
+        }
         obs.updateResult()
 
-        if (!state.isLoading && !isRestoring()) {
+        if (!state.isLoading) {
           const query = obs.getCurrentQuery()
           resolve(hydratableObserverResult(query, state))
         }
@@ -275,18 +287,32 @@ export function createBaseQuery<
 
   createComputed(
     on(
-      [isRestoring, observer],
-      ([restoring]) => {
-        const _unsubscribe = unsubscribe
-        queueMicrotask(() => _unsubscribe?.())
-        unsubscribe = null
-        if (!restoring) refetch()
+      client,
+      (c) => {
+        if (unsubscribe) {
+          unsubscribe()
+        }
+        const newObserver = new Observer(c, defaultedOptions())
+        unsubscribe = createClientSubscriber()
+        setObserver(newObserver)
+      },
+      {
+        defer: true,
       },
-      { defer: true },
     ),
   )
 
+  createComputed(() => {
+    if (!isRestoring()) {
+      refetch()
+    }
+  })
+
   onCleanup(() => {
+    if (isServer && queryResource.loading) {
+      unsubscribeQueued = true
+      return
+    }
     if (unsubscribe) {
       unsubscribe()
       unsubscribe = null
@@ -300,11 +326,7 @@ export function createBaseQuery<
         obs.setOptions(opts)
         setState(obs.getOptimisticResult(opts))
       },
-      {
-        // Defer because we don't need to trigger on first render
-        // This only cares about changes to options after the observer is created
-        defer: true,
-      },
+      { defer: true },
     ),
   )
 

package/src/createMutation.ts

@@ -2,7 +2,7 @@ import { MutationObserver } from '@tanstack/query-core'
 import { createComputed, createMemo, on, onCleanup } from 'solid-js'
 import { createStore } from 'solid-js/store'
 import { useQueryClient } from './QueryClientProvider'
-import { shouldThrowError } from './utils'
+import { noop, shouldThrowError } from './utils'
 import type { DefaultError } from '@tanstack/query-core'
 import type { QueryClient } from './QueryClient'
 import type {
@@ -74,5 +74,3 @@ export function createMutation<
 
   return state
 }
-
-function noop() {}

package/src/utils.ts

@@ -9,3 +9,5 @@ export function shouldThrowError<T extends (...args: Array<any>) => boolean>(
 
   return !!throwError
 }
+
+export function noop() {}