@tanstack/solid-query 6.0.0-beta.3 → 6.0.0-beta.5

package/build/dev.cjs

@@ -93,10 +93,10 @@ var hydratableObserverResult = (query, result) => {
   return obj;
 };
 function useBaseQuery(options, Observer, queryClient) {
-  const client = solidJs.createMemo(() => exports.useQueryClient(queryClient?.()));
+  const [client] = solidJs.createSignal(() => exports.useQueryClient(queryClient?.()));
   const isRestoring = exports.useIsRestoring();
   let unsubscribeQueued = false;
-  const defaultedOptions = solidJs.createMemo(() => {
+  const [defaultedOptions] = solidJs.createSignal(() => {
     const defaultOptions = client().defaultQueryOptions(options());
     defaultOptions._optimisticResults = isRestoring() ? "isRestoring" : "optimistic";
     defaultOptions.structuralSharing = false;
@@ -108,11 +108,11 @@ function useBaseQuery(options, Observer, queryClient) {
     return defaultOptions;
   });
   const observer = solidJs.untrack(() => new Observer(client(), defaultedOptions()));
-  const trackedDefaultedOptions = solidJs.createMemo(() => defaultedOptions());
+  const [trackedDefaultedOptions] = solidJs.createSignal(() => defaultedOptions());
   solidJs.createRenderEffect(
     () => trackedDefaultedOptions(),
     (opts) => {
-      observer.setOptions(opts);
+      solidJs.runWithOwner(null, () => observer.setOptions(opts));
     }
   );
   let observerResult = solidJs.untrack(
@@ -146,8 +146,8 @@ function useBaseQuery(options, Observer, queryClient) {
     return observer.subscribe((result) => {
       const previousResult = observerResult;
       observerResult = result;
-      setStateWithReconciliation(result);
-      queueMicrotask(() => {
+      solidJs.runWithOwner(null, () => {
+        setStateWithReconciliation(result);
         if (unsubscribe && !disposed && (previousResult.isLoading !== result.isLoading || previousResult.isError !== result.isError)) {
           try {
             solidJs.refresh(queryResource);
@@ -173,41 +173,58 @@ function useBaseQuery(options, Observer, queryClient) {
   let unsubscribe = null;
   let disposed = false;
   let resolver = null;
-  const queryResource = solidJs.createMemo(
-    () => {
-      const opts = trackedDefaultedOptions();
-      const restoring = isRestoring();
-      return new Promise((resolve, reject) => {
-        resolver = resolve;
-        if (isServer) {
-          unsubscribe = createServerSubscriber((data) => {
-            resolve(data);
-          }, reject);
-        } else if (!unsubscribe && !restoring) {
-          unsubscribe = createClientSubscriber();
-        }
-        const currentResult = observer.getOptimisticResult(opts);
-        observerResult = currentResult;
+  const [queryResource] = solidJs.createSignal(() => {
+    const opts = trackedDefaultedOptions();
+    const restoring = isRestoring();
+    if (isServer) {
+      const cached = observer.getOptimisticResult(opts);
+      if (!cached.isLoading) {
+        observerResult = cached;
+        solidJs.runWithOwner(null, () => {
+          setStateWithReconciliation(cached);
+        });
+        return hydratableObserverResult(
+          observer.getCurrentQuery(),
+          cached
+        );
+      }
+    }
+    return new Promise((resolve, reject) => {
+      resolver = resolve;
+      if (isServer) {
+        unsubscribe = createServerSubscriber((data) => {
+          resolve(data);
+        }, reject);
+      } else if (!unsubscribe && !restoring) {
+        unsubscribe = createClientSubscriber();
+      }
+      const currentResult = observer.getOptimisticResult(opts);
+      observerResult = currentResult;
+      solidJs.runWithOwner(null, () => {
         if (currentResult.isError && !currentResult.isFetching && !restoring && queryCore.shouldThrowError(opts.throwOnError, [
           currentResult.error,
           observer.getCurrentQuery()
         ])) {
           setStateWithReconciliation(currentResult);
-          return reject(currentResult.error);
-        }
-        if (!currentResult.isLoading) {
-          resolver = null;
-          setStateWithReconciliation(currentResult);
-          return resolve(
-            hydratableObserverResult(observer.getCurrentQuery(), currentResult)
-          );
+          reject(currentResult.error);
+          return;
         }
-        queueMicrotask(() => setStateWithReconciliation(currentResult));
+        setStateWithReconciliation(currentResult);
       });
-    },
-    observerResult,
-    { ssrSource: "client" }
-  );
+      if (currentResult.isError && !currentResult.isFetching && !restoring && queryCore.shouldThrowError(opts.throwOnError, [
+        currentResult.error,
+        observer.getCurrentQuery()
+      ])) {
+        return;
+      }
+      if (!currentResult.isLoading) {
+        resolver = null;
+        return resolve(
+          hydratableObserverResult(observer.getCurrentQuery(), currentResult)
+        );
+      }
+    });
+  });
   solidJs.onCleanup(() => {
     disposed = true;
     if (isServer && solidJs.isPending(queryResource)) {
@@ -236,6 +253,12 @@ function useBaseQuery(options, Observer, queryClient) {
       if (typeof prop === "symbol") {
         return Reflect.get(target, prop, receiver);
       }
+      if (isServer) {
+        const resolved = queryResource();
+        if (prop in resolved) {
+          return Reflect.get(resolved, prop);
+        }
+      }
       if (errorPassthroughProps.has(prop)) {
         return Reflect.get(target, prop, receiver);
       }
@@ -289,11 +312,13 @@ function useMutation(options, queryClient) {
     mutateAsync: initialResult.mutate
   });
   const unsubscribe = observer.subscribe((result) => {
-    setState(() => ({
-      ...result,
-      mutate,
-      mutateAsync: result.mutate
-    }));
+    solidJs.runWithOwner(null, () => {
+      setState(() => ({
+        ...result,
+        mutate,
+        mutateAsync: result.mutate
+      }));
+    });
   });
   solidJs.onCleanup(unsubscribe);
   solidJs.createRenderEffect(
@@ -345,14 +370,16 @@ function useQueries(queriesOptions, queryClient) {
     () => {
       if (!isRestoring()) {
         unsubscribe = observer.subscribe((result) => {
-          setState(
-            solidJs.reconcile(
-              [...result],
-              // Use a key function that returns undefined so reconcile
-              // uses positional matching and recursively updates nested properties
-              () => void 0
-            )
-          );
+          solidJs.runWithOwner(null, () => {
+            setState(
+              solidJs.reconcile(
+                [...result],
+                // Use a key function that returns undefined so reconcile
+                // uses positional matching and recursively updates nested properties
+                () => void 0
+              )
+            );
+          });
         });
       }
     },
@@ -364,12 +391,14 @@ function useQueries(queriesOptions, queryClient) {
   });
   solidJs.createMemo(() => {
     const queries = defaultedQueries();
-    observer.setQueries(
-      queries,
-      queriesOptions().combine ? {
-        combine: queriesOptions().combine
-      } : void 0
-    );
+    solidJs.runWithOwner(null, () => {
+      observer.setQueries(
+        queries,
+        queriesOptions().combine ? {
+          combine: queriesOptions().combine
+        } : void 0
+      );
+    });
     return queries;
   });
   return state;
@@ -389,7 +418,7 @@ function useIsFetching(filters, queryClient) {
   const queryCache = solidJs.createMemo(() => client().getQueryCache());
   const [fetches, setFetches] = solidJs.createSignal(
     solidJs.untrack(() => client().isFetching(filters?.())),
-    { pureWrite: true }
+    { ownedWrite: true }
   );
   const unsubscribe = solidJs.untrack(
     () => queryCache().subscribe(() => {
@@ -414,7 +443,7 @@ function useIsMutating(filters, queryClient) {
   const mutationCache = solidJs.createMemo(() => client().getMutationCache());
   const [mutations, setMutations] = solidJs.createSignal(
     solidJs.untrack(() => client().isMutating(filters?.())),
-    { pureWrite: true }
+    { ownedWrite: true }
   );
   const unsubscribe = solidJs.untrack(
     () => mutationCache().subscribe((_result) => {
@@ -434,7 +463,7 @@ function useMutationState(options = () => ({}), queryClient) {
   const mutationCache = solidJs.createMemo(() => client().getMutationCache());
   const [result, setResult] = solidJs.createSignal(
     solidJs.untrack(() => getResult(mutationCache(), options())),
-    { pureWrite: true }
+    { ownedWrite: true }
   );
   const unsubscribe = solidJs.untrack(
     () => mutationCache().subscribe(() => {

package/build/dev.d.cts

@@ -1,9 +1,9 @@
 export { DefinedUseBaseQueryResult } from './_tsup-dts-rollup.cjs';
 export { DefinedUseInfiniteQueryResult } from './_tsup-dts-rollup.cjs';
 export { DefinedUseQueryResult } from './_tsup-dts-rollup.cjs';
-export { SolidInfiniteQueryOptions } from './_tsup-dts-rollup.cjs';
-export { SolidMutationOptions } from './_tsup-dts-rollup.cjs';
-export { SolidQueryOptions } from './_tsup-dts-rollup.cjs';
+export { InfiniteQueryOptions } from './_tsup-dts-rollup.cjs';
+export { MutationOptions } from './_tsup-dts-rollup.cjs';
+export { QueryOptions } from './_tsup-dts-rollup.cjs';
 export { UseBaseMutationResult } from './_tsup-dts-rollup.cjs';
 export { UseBaseQueryOptions } from './_tsup-dts-rollup.cjs';
 export { UseBaseQueryResult } from './_tsup-dts-rollup.cjs';
@@ -111,7 +111,6 @@ export { NonUndefinedGuard } from './_tsup-dts-rollup.cjs';
 export { DistributiveOmit } from './_tsup-dts-rollup.cjs';
 export { OmitKeyof } from './_tsup-dts-rollup.cjs';
 export { Override } from './_tsup-dts-rollup.cjs';
-export { NoInfer } from './_tsup-dts-rollup.cjs';
 export { Register } from './_tsup-dts-rollup.cjs';
 export { DefaultError } from './_tsup-dts-rollup.cjs';
 export { QueryKey } from './_tsup-dts-rollup.cjs';
@@ -126,7 +125,7 @@ export { InferErrorFromTag } from './_tsup-dts-rollup.cjs';
 export { QueryFunction } from './_tsup-dts-rollup.cjs';
 export { StaleTime } from './_tsup-dts-rollup.cjs';
 export { StaleTimeFunction } from './_tsup-dts-rollup.cjs';
-export { Enabled } from './_tsup-dts-rollup.cjs';
+export { QueryBooleanOption } from './_tsup-dts-rollup.cjs';
 export { QueryPersister } from './_tsup-dts-rollup.cjs';
 export { QueryFunctionContext } from './_tsup-dts-rollup.cjs';
 export { InitialDataFunction } from './_tsup-dts-rollup.cjs';
@@ -139,7 +138,6 @@ export { InfiniteData } from './_tsup-dts-rollup.cjs';
 export { QueryMeta } from './_tsup-dts-rollup.cjs';
 export { NetworkMode } from './_tsup-dts-rollup.cjs';
 export { NotifyOnChangeProps } from './_tsup-dts-rollup.cjs';
-export { QueryOptions } from './_tsup-dts-rollup.cjs';
 export { InitialPageParam } from './_tsup-dts-rollup.cjs';
 export { InfiniteQueryPageParamsOptions } from './_tsup-dts-rollup.cjs';
 export { ThrowOnError } from './_tsup-dts-rollup.cjs';
@@ -184,7 +182,6 @@ export { MutationScope } from './_tsup-dts-rollup.cjs';
 export { MutationMeta } from './_tsup-dts-rollup.cjs';
 export { MutationFunctionContext } from './_tsup-dts-rollup.cjs';
 export { MutationFunction } from './_tsup-dts-rollup.cjs';
-export { MutationOptions } from './_tsup-dts-rollup.cjs';
 export { MutationObserverOptions } from './_tsup-dts-rollup.cjs';
 export { MutateOptions } from './_tsup-dts-rollup.cjs';
 export { MutateFunction } from './_tsup-dts-rollup.cjs';

package/build/dev.d.ts

@@ -1,9 +1,9 @@
 export { DefinedUseBaseQueryResult } from './_tsup-dts-rollup.js';
 export { DefinedUseInfiniteQueryResult } from './_tsup-dts-rollup.js';
 export { DefinedUseQueryResult } from './_tsup-dts-rollup.js';
-export { SolidInfiniteQueryOptions } from './_tsup-dts-rollup.js';
-export { SolidMutationOptions } from './_tsup-dts-rollup.js';
-export { SolidQueryOptions } from './_tsup-dts-rollup.js';
+export { InfiniteQueryOptions } from './_tsup-dts-rollup.js';
+export { MutationOptions } from './_tsup-dts-rollup.js';
+export { QueryOptions } from './_tsup-dts-rollup.js';
 export { UseBaseMutationResult } from './_tsup-dts-rollup.js';
 export { UseBaseQueryOptions } from './_tsup-dts-rollup.js';
 export { UseBaseQueryResult } from './_tsup-dts-rollup.js';
@@ -111,7 +111,6 @@ export { NonUndefinedGuard } from './_tsup-dts-rollup.js';
 export { DistributiveOmit } from './_tsup-dts-rollup.js';
 export { OmitKeyof } from './_tsup-dts-rollup.js';
 export { Override } from './_tsup-dts-rollup.js';
-export { NoInfer } from './_tsup-dts-rollup.js';
 export { Register } from './_tsup-dts-rollup.js';
 export { DefaultError } from './_tsup-dts-rollup.js';
 export { QueryKey } from './_tsup-dts-rollup.js';
@@ -126,7 +125,7 @@ export { InferErrorFromTag } from './_tsup-dts-rollup.js';
 export { QueryFunction } from './_tsup-dts-rollup.js';
 export { StaleTime } from './_tsup-dts-rollup.js';
 export { StaleTimeFunction } from './_tsup-dts-rollup.js';
-export { Enabled } from './_tsup-dts-rollup.js';
+export { QueryBooleanOption } from './_tsup-dts-rollup.js';
 export { QueryPersister } from './_tsup-dts-rollup.js';
 export { QueryFunctionContext } from './_tsup-dts-rollup.js';
 export { InitialDataFunction } from './_tsup-dts-rollup.js';
@@ -139,7 +138,6 @@ export { InfiniteData } from './_tsup-dts-rollup.js';
 export { QueryMeta } from './_tsup-dts-rollup.js';
 export { NetworkMode } from './_tsup-dts-rollup.js';
 export { NotifyOnChangeProps } from './_tsup-dts-rollup.js';
-export { QueryOptions } from './_tsup-dts-rollup.js';
 export { InitialPageParam } from './_tsup-dts-rollup.js';
 export { InfiniteQueryPageParamsOptions } from './_tsup-dts-rollup.js';
 export { ThrowOnError } from './_tsup-dts-rollup.js';
@@ -184,7 +182,6 @@ export { MutationScope } from './_tsup-dts-rollup.js';
 export { MutationMeta } from './_tsup-dts-rollup.js';
 export { MutationFunctionContext } from './_tsup-dts-rollup.js';
 export { MutationFunction } from './_tsup-dts-rollup.js';
-export { MutationOptions } from './_tsup-dts-rollup.js';
 export { MutationObserverOptions } from './_tsup-dts-rollup.js';
 export { MutateOptions } from './_tsup-dts-rollup.js';
 export { MutateFunction } from './_tsup-dts-rollup.js';

package/build/dev.js

@@ -1,6 +1,6 @@
 import { MutationObserver, shouldThrowError, QueriesObserver, QueryClient as QueryClient$1, replaceEqualDeep, noop, notifyManager, QueryObserver, InfiniteQueryObserver } from '@tanstack/query-core';
 export * from '@tanstack/query-core';
-import { createContext, useContext, onCleanup, createMemo, untrack, createRenderEffect, createStore, merge, createEffect, reconcile, createSignal, isPending, refresh, snapshot } from 'solid-js';
+import { createContext, useContext, onCleanup, createMemo, untrack, createRenderEffect, createStore, runWithOwner, merge, createEffect, reconcile, createSignal, isPending, refresh, snapshot } from 'solid-js';
 import { createComponent } from '@solidjs/web';
 
 // src/useQuery.ts
@@ -92,10 +92,10 @@ var hydratableObserverResult = (query, result) => {
   return obj;
 };
 function useBaseQuery(options, Observer, queryClient) {
-  const client = createMemo(() => useQueryClient(queryClient?.()));
+  const [client] = createSignal(() => useQueryClient(queryClient?.()));
   const isRestoring = useIsRestoring();
   let unsubscribeQueued = false;
-  const defaultedOptions = createMemo(() => {
+  const [defaultedOptions] = createSignal(() => {
     const defaultOptions = client().defaultQueryOptions(options());
     defaultOptions._optimisticResults = isRestoring() ? "isRestoring" : "optimistic";
     defaultOptions.structuralSharing = false;
@@ -107,11 +107,11 @@ function useBaseQuery(options, Observer, queryClient) {
     return defaultOptions;
   });
   const observer = untrack(() => new Observer(client(), defaultedOptions()));
-  const trackedDefaultedOptions = createMemo(() => defaultedOptions());
+  const [trackedDefaultedOptions] = createSignal(() => defaultedOptions());
   createRenderEffect(
     () => trackedDefaultedOptions(),
     (opts) => {
-      observer.setOptions(opts);
+      runWithOwner(null, () => observer.setOptions(opts));
     }
   );
   let observerResult = untrack(
@@ -145,8 +145,8 @@ function useBaseQuery(options, Observer, queryClient) {
     return observer.subscribe((result) => {
       const previousResult = observerResult;
       observerResult = result;
-      setStateWithReconciliation(result);
-      queueMicrotask(() => {
+      runWithOwner(null, () => {
+        setStateWithReconciliation(result);
         if (unsubscribe && !disposed && (previousResult.isLoading !== result.isLoading || previousResult.isError !== result.isError)) {
           try {
             refresh(queryResource);
@@ -172,41 +172,58 @@ function useBaseQuery(options, Observer, queryClient) {
   let unsubscribe = null;
   let disposed = false;
   let resolver = null;
-  const queryResource = createMemo(
-    () => {
-      const opts = trackedDefaultedOptions();
-      const restoring = isRestoring();
-      return new Promise((resolve, reject) => {
-        resolver = resolve;
-        if (isServer) {
-          unsubscribe = createServerSubscriber((data) => {
-            resolve(data);
-          }, reject);
-        } else if (!unsubscribe && !restoring) {
-          unsubscribe = createClientSubscriber();
-        }
-        const currentResult = observer.getOptimisticResult(opts);
-        observerResult = currentResult;
+  const [queryResource] = createSignal(() => {
+    const opts = trackedDefaultedOptions();
+    const restoring = isRestoring();
+    if (isServer) {
+      const cached = observer.getOptimisticResult(opts);
+      if (!cached.isLoading) {
+        observerResult = cached;
+        runWithOwner(null, () => {
+          setStateWithReconciliation(cached);
+        });
+        return hydratableObserverResult(
+          observer.getCurrentQuery(),
+          cached
+        );
+      }
+    }
+    return new Promise((resolve, reject) => {
+      resolver = resolve;
+      if (isServer) {
+        unsubscribe = createServerSubscriber((data) => {
+          resolve(data);
+        }, reject);
+      } else if (!unsubscribe && !restoring) {
+        unsubscribe = createClientSubscriber();
+      }
+      const currentResult = observer.getOptimisticResult(opts);
+      observerResult = currentResult;
+      runWithOwner(null, () => {
         if (currentResult.isError && !currentResult.isFetching && !restoring && shouldThrowError(opts.throwOnError, [
           currentResult.error,
           observer.getCurrentQuery()
         ])) {
           setStateWithReconciliation(currentResult);
-          return reject(currentResult.error);
-        }
-        if (!currentResult.isLoading) {
-          resolver = null;
-          setStateWithReconciliation(currentResult);
-          return resolve(
-            hydratableObserverResult(observer.getCurrentQuery(), currentResult)
-          );
+          reject(currentResult.error);
+          return;
         }
-        queueMicrotask(() => setStateWithReconciliation(currentResult));
+        setStateWithReconciliation(currentResult);
       });
-    },
-    observerResult,
-    { ssrSource: "client" }
-  );
+      if (currentResult.isError && !currentResult.isFetching && !restoring && shouldThrowError(opts.throwOnError, [
+        currentResult.error,
+        observer.getCurrentQuery()
+      ])) {
+        return;
+      }
+      if (!currentResult.isLoading) {
+        resolver = null;
+        return resolve(
+          hydratableObserverResult(observer.getCurrentQuery(), currentResult)
+        );
+      }
+    });
+  });
   onCleanup(() => {
     disposed = true;
     if (isServer && isPending(queryResource)) {
@@ -235,6 +252,12 @@ function useBaseQuery(options, Observer, queryClient) {
       if (typeof prop === "symbol") {
         return Reflect.get(target, prop, receiver);
       }
+      if (isServer) {
+        const resolved = queryResource();
+        if (prop in resolved) {
+          return Reflect.get(resolved, prop);
+        }
+      }
       if (errorPassthroughProps.has(prop)) {
         return Reflect.get(target, prop, receiver);
       }
@@ -288,11 +311,13 @@ function useMutation(options, queryClient) {
     mutateAsync: initialResult.mutate
   });
   const unsubscribe = observer.subscribe((result) => {
-    setState(() => ({
-      ...result,
-      mutate,
-      mutateAsync: result.mutate
-    }));
+    runWithOwner(null, () => {
+      setState(() => ({
+        ...result,
+        mutate,
+        mutateAsync: result.mutate
+      }));
+    });
   });
   onCleanup(unsubscribe);
   createRenderEffect(
@@ -344,14 +369,16 @@ function useQueries(queriesOptions, queryClient) {
     () => {
       if (!isRestoring()) {
         unsubscribe = observer.subscribe((result) => {
-          setState(
-            reconcile(
-              [...result],
-              // Use a key function that returns undefined so reconcile
-              // uses positional matching and recursively updates nested properties
-              () => void 0
-            )
-          );
+          runWithOwner(null, () => {
+            setState(
+              reconcile(
+                [...result],
+                // Use a key function that returns undefined so reconcile
+                // uses positional matching and recursively updates nested properties
+                () => void 0
+              )
+            );
+          });
         });
       }
     },
@@ -363,12 +390,14 @@ function useQueries(queriesOptions, queryClient) {
   });
   createMemo(() => {
     const queries = defaultedQueries();
-    observer.setQueries(
-      queries,
-      queriesOptions().combine ? {
-        combine: queriesOptions().combine
-      } : void 0
-    );
+    runWithOwner(null, () => {
+      observer.setQueries(
+        queries,
+        queriesOptions().combine ? {
+          combine: queriesOptions().combine
+        } : void 0
+      );
+    });
     return queries;
   });
   return state;
@@ -388,7 +417,7 @@ function useIsFetching(filters, queryClient) {
   const queryCache = createMemo(() => client().getQueryCache());
   const [fetches, setFetches] = createSignal(
     untrack(() => client().isFetching(filters?.())),
-    { pureWrite: true }
+    { ownedWrite: true }
   );
   const unsubscribe = untrack(
     () => queryCache().subscribe(() => {
@@ -413,7 +442,7 @@ function useIsMutating(filters, queryClient) {
   const mutationCache = createMemo(() => client().getMutationCache());
   const [mutations, setMutations] = createSignal(
     untrack(() => client().isMutating(filters?.())),
-    { pureWrite: true }
+    { ownedWrite: true }
   );
   const unsubscribe = untrack(
     () => mutationCache().subscribe((_result) => {
@@ -433,7 +462,7 @@ function useMutationState(options = () => ({}), queryClient) {
   const mutationCache = createMemo(() => client().getMutationCache());
   const [result, setResult] = createSignal(
     untrack(() => getResult(mutationCache(), options())),
-    { pureWrite: true }
+    { ownedWrite: true }
   );
   const unsubscribe = untrack(
     () => mutationCache().subscribe(() => {