@tanstack/solid-query 5.0.0-rc.1 → 5.0.0-rc.16

package/build/dev.cjs

@@ -83,7 +83,7 @@ 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()), {
+    () => solidJs.mergeProps(client()?.defaultQueryOptions(options()) || {}, {
       get _optimisticResults() {
         return isRestoring() ? "isRestoring" : "optimistic";
       },
@@ -124,7 +124,7 @@ function createBaseQuery(options, Observer, queryClient) {
           return reconcileFn(
             store,
             result,
-            reconcileOptions === void 0 ? "id" : reconcileOptions
+            reconcileOptions === void 0 ? false : reconcileOptions
           );
         });
         if (queryResource()?.data && result.data && !queryResource.loading && isRestoring())

package/build/dev.js

@@ -82,7 +82,7 @@ function createBaseQuery(options, Observer, queryClient) {
   const client = createMemo(() => useQueryClient(queryClient?.()));
   const isRestoring = useIsRestoring();
   const defaultedOptions = createMemo(
-    () => mergeProps(client().defaultQueryOptions(options()), {
+    () => mergeProps(client()?.defaultQueryOptions(options()) || {}, {
       get _optimisticResults() {
         return isRestoring() ? "isRestoring" : "optimistic";
       },
@@ -123,7 +123,7 @@ function createBaseQuery(options, Observer, queryClient) {
           return reconcileFn(
             store,
             result,
-            reconcileOptions === void 0 ? "id" : reconcileOptions
+            reconcileOptions === void 0 ? false : reconcileOptions
           );
         });
         if (queryResource()?.data && result.data && !queryResource.loading && isRestoring())

package/build/index.cjs

@@ -83,7 +83,7 @@ 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()), {
+    () => solidJs.mergeProps(client()?.defaultQueryOptions(options()) || {}, {
       get _optimisticResults() {
         return isRestoring() ? "isRestoring" : "optimistic";
       },
@@ -124,7 +124,7 @@ function createBaseQuery(options, Observer, queryClient) {
           return reconcileFn(
             store,
             result,
-            reconcileOptions === void 0 ? "id" : reconcileOptions
+            reconcileOptions === void 0 ? false : reconcileOptions
           );
         });
         if (queryResource()?.data && result.data && !queryResource.loading && isRestoring())

package/build/index.d.cts

@@ -1,4 +1,4 @@
-import { DefaultError, QueryKey, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, DefaultOptions as DefaultOptions$1, QueryClientConfig as QueryClientConfig$1, QueryClient as QueryClient$1, WithRequired, QueryObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, MutateFunction, MutationObserverResult, QueryFilters, InfiniteData, MutationFilters, QueriesPlaceholderDataFunction, QueryFunction } from '@tanstack/query-core';
+import { DefaultError, QueryKey, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, DefaultOptions as DefaultOptions$1, QueryClientConfig as QueryClientConfig$1, QueryClient as QueryClient$1, WithRequired, QueryObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, MutateFunction, MutationObserverResult, QueryFilters, InfiniteData, MutationFilters, QueriesPlaceholderDataFunction, QueryFunction, ThrowOnError } from '@tanstack/query-core';
 export * from '@tanstack/query-core';
 import * as solid_js from 'solid-js';
 import { JSX, Accessor } from 'solid-js';
@@ -9,7 +9,7 @@ interface QueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TD
      * Set this to a reconciliation key to enable reconciliation between query results.
      * Set this to `false` to disable reconciliation between query results.
      * Set this to a function which accepts the old and new data and returns resolved data of the same type to implement custom reconciliation logic.
-     * Defaults reconciliation key to `id`.
+     * Defaults reconciliation to false.
      */
     reconcile?: string | false | ((oldData: TData | undefined, newData: TData) => TData);
 }
@@ -18,7 +18,7 @@ interface InfiniteQueryObserverOptions<TQueryFnData = unknown, TError = DefaultE
      * Set this to a reconciliation key to enable reconciliation between query results.
      * Set this to `false` to disable reconciliation between query results.
      * Set this to a function which accepts the old and new data and returns resolved data of the same type to implement custom reconciliation logic.
-     * Defaults reconciliation key to `id`.
+     * Defaults reconciliation to false.
      */
     reconcile?: string | false | ((oldData: TData | undefined, newData: TData) => TData);
 }
@@ -108,9 +108,11 @@ type GetOptions<T> = T extends {
 } ? CreateQueryOptionsForCreateQueries<unknown, TError, TData> : T extends [infer TQueryFnData, infer TError, infer TData] ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData> : T extends [infer TQueryFnData, infer TError] ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError> : T extends [infer TQueryFnData] ? CreateQueryOptionsForCreateQueries<TQueryFnData> : T extends {
     queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>;
     select: (data: any) => infer TData;
-} ? CreateQueryOptionsForCreateQueries<TQueryFnData, Error, TData, TQueryKey> : T extends {
+    throwOnError?: ThrowOnError<any, infer TError, any, any>;
+} ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey> : T extends {
     queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>;
-} ? CreateQueryOptionsForCreateQueries<TQueryFnData, Error, TQueryFnData, TQueryKey> : CreateQueryOptionsForCreateQueries;
+    throwOnError?: ThrowOnError<any, infer TError, any, any>;
+} ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TQueryFnData, TQueryKey> : CreateQueryOptionsForCreateQueries;
 type GetResults<T> = T extends {
     queryFnData: any;
     error?: infer TError;
@@ -124,9 +126,11 @@ type GetResults<T> = T extends {
 } ? CreateQueryResult<TData, TError> : T extends [any, infer TError, infer TData] ? CreateQueryResult<TData, TError> : T extends [infer TQueryFnData, infer TError] ? CreateQueryResult<TQueryFnData, TError> : T extends [infer TQueryFnData] ? CreateQueryResult<TQueryFnData> : T extends {
     queryFn?: QueryFunction<unknown, any>;
     select: (data: any) => infer TData;
-} ? CreateQueryResult<TData> : T extends {
+    throwOnError?: ThrowOnError<any, infer TError, any, any>;
+} ? CreateQueryResult<TData, unknown extends TError ? DefaultError : TError> : T extends {
     queryFn?: QueryFunction<infer TQueryFnData, any>;
-} ? CreateQueryResult<TQueryFnData> : CreateQueryResult;
+    throwOnError?: ThrowOnError<any, infer TError, any, any>;
+} ? CreateQueryResult<TQueryFnData, unknown extends TError ? DefaultError : TError> : CreateQueryResult;
 /**
  * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
  */

package/build/index.d.ts

@@ -1,4 +1,4 @@
-import { DefaultError, QueryKey, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, DefaultOptions as DefaultOptions$1, QueryClientConfig as QueryClientConfig$1, QueryClient as QueryClient$1, WithRequired, QueryObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, MutateFunction, MutationObserverResult, QueryFilters, InfiniteData, MutationFilters, QueriesPlaceholderDataFunction, QueryFunction } from '@tanstack/query-core';
+import { DefaultError, QueryKey, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, DefaultOptions as DefaultOptions$1, QueryClientConfig as QueryClientConfig$1, QueryClient as QueryClient$1, WithRequired, QueryObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, MutateFunction, MutationObserverResult, QueryFilters, InfiniteData, MutationFilters, QueriesPlaceholderDataFunction, QueryFunction, ThrowOnError } from '@tanstack/query-core';
 export * from '@tanstack/query-core';
 import * as solid_js from 'solid-js';
 import { JSX, Accessor } from 'solid-js';
@@ -9,7 +9,7 @@ interface QueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TD
      * Set this to a reconciliation key to enable reconciliation between query results.
      * Set this to `false` to disable reconciliation between query results.
      * Set this to a function which accepts the old and new data and returns resolved data of the same type to implement custom reconciliation logic.
-     * Defaults reconciliation key to `id`.
+     * Defaults reconciliation to false.
      */
     reconcile?: string | false | ((oldData: TData | undefined, newData: TData) => TData);
 }
@@ -18,7 +18,7 @@ interface InfiniteQueryObserverOptions<TQueryFnData = unknown, TError = DefaultE
      * Set this to a reconciliation key to enable reconciliation between query results.
      * Set this to `false` to disable reconciliation between query results.
      * Set this to a function which accepts the old and new data and returns resolved data of the same type to implement custom reconciliation logic.
-     * Defaults reconciliation key to `id`.
+     * Defaults reconciliation to false.
      */
     reconcile?: string | false | ((oldData: TData | undefined, newData: TData) => TData);
 }
@@ -108,9 +108,11 @@ type GetOptions<T> = T extends {
 } ? CreateQueryOptionsForCreateQueries<unknown, TError, TData> : T extends [infer TQueryFnData, infer TError, infer TData] ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData> : T extends [infer TQueryFnData, infer TError] ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError> : T extends [infer TQueryFnData] ? CreateQueryOptionsForCreateQueries<TQueryFnData> : T extends {
     queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>;
     select: (data: any) => infer TData;
-} ? CreateQueryOptionsForCreateQueries<TQueryFnData, Error, TData, TQueryKey> : T extends {
+    throwOnError?: ThrowOnError<any, infer TError, any, any>;
+} ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey> : T extends {
     queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>;
-} ? CreateQueryOptionsForCreateQueries<TQueryFnData, Error, TQueryFnData, TQueryKey> : CreateQueryOptionsForCreateQueries;
+    throwOnError?: ThrowOnError<any, infer TError, any, any>;
+} ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TQueryFnData, TQueryKey> : CreateQueryOptionsForCreateQueries;
 type GetResults<T> = T extends {
     queryFnData: any;
     error?: infer TError;
@@ -124,9 +126,11 @@ type GetResults<T> = T extends {
 } ? CreateQueryResult<TData, TError> : T extends [any, infer TError, infer TData] ? CreateQueryResult<TData, TError> : T extends [infer TQueryFnData, infer TError] ? CreateQueryResult<TQueryFnData, TError> : T extends [infer TQueryFnData] ? CreateQueryResult<TQueryFnData> : T extends {
     queryFn?: QueryFunction<unknown, any>;
     select: (data: any) => infer TData;
-} ? CreateQueryResult<TData> : T extends {
+    throwOnError?: ThrowOnError<any, infer TError, any, any>;
+} ? CreateQueryResult<TData, unknown extends TError ? DefaultError : TError> : T extends {
     queryFn?: QueryFunction<infer TQueryFnData, any>;
-} ? CreateQueryResult<TQueryFnData> : CreateQueryResult;
+    throwOnError?: ThrowOnError<any, infer TError, any, any>;
+} ? CreateQueryResult<TQueryFnData, unknown extends TError ? DefaultError : TError> : CreateQueryResult;
 /**
  * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
  */

package/build/index.js

@@ -82,7 +82,7 @@ function createBaseQuery(options, Observer, queryClient) {
   const client = createMemo(() => useQueryClient(queryClient?.()));
   const isRestoring = useIsRestoring();
   const defaultedOptions = createMemo(
-    () => mergeProps(client().defaultQueryOptions(options()), {
+    () => mergeProps(client()?.defaultQueryOptions(options()) || {}, {
       get _optimisticResults() {
         return isRestoring() ? "isRestoring" : "optimistic";
       },
@@ -123,7 +123,7 @@ function createBaseQuery(options, Observer, queryClient) {
           return reconcileFn(
             store,
             result,
-            reconcileOptions === void 0 ? "id" : reconcileOptions
+            reconcileOptions === void 0 ? false : reconcileOptions
           );
         });
         if (queryResource()?.data && result.data && !queryResource.loading && isRestoring())

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query",
-  "version": "5.0.0-rc.1",
+  "version": "5.0.0-rc.16",
   "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.7.8",
-    "@tanstack/query-core": "5.0.0-rc.1"
+    "@tanstack/query-core": "5.0.0-rc.12"
   },
   "devDependencies": {
     "tsup-preset-solid": "^2.0.1",

package/src/QueryClient.ts

@@ -30,7 +30,7 @@ export interface QueryObserverOptions<
    * Set this to a reconciliation key to enable reconciliation between query results.
    * Set this to `false` to disable reconciliation between query results.
    * Set this to a function which accepts the old and new data and returns resolved data of the same type to implement custom reconciliation logic.
-   * Defaults reconciliation key to `id`.
+   * Defaults reconciliation to false.
    */
   reconcile?:
     | string
@@ -60,7 +60,7 @@ export interface InfiniteQueryObserverOptions<
    * Set this to a reconciliation key to enable reconciliation between query results.
    * Set this to `false` to disable reconciliation between query results.
    * Set this to a function which accepts the old and new data and returns resolved data of the same type to implement custom reconciliation logic.
-   * Defaults reconciliation key to `id`.
+   * Defaults reconciliation to false.
    */
   reconcile?:
     | string

package/src/__tests__/createQuery.test.tsx

@@ -1046,6 +1046,7 @@ describe('createQuery', () => {
           count++
           return count === 1 ? result1 : result2
         },
+        reconcile: 'id',
       }))
 
       createRenderEffect(() => {
@@ -3714,7 +3715,7 @@ describe('createQuery', () => {
           await sleep(10)
           return count++
         },
-        refetchInterval: (data = 0) => (data < 2 ? 10 : false),
+        refetchInterval: ({ state: { data = 0 } }) => (data < 2 ? 10 : false),
       }))
 
       createRenderEffect(() => {
@@ -5711,11 +5712,11 @@ describe('createQuery', () => {
           <div>data: {state.data}</div>
           <div>dataUpdatedAt: {state.dataUpdatedAt}</div>
           <button
-            onClick={() =>
+            onClick={() => {
               queryClient.setQueryData(key, 'newData', {
                 updatedAt: 100,
               })
-            }
+            }}
           >
             setQueryData
           </button>

package/src/createBaseQuery.ts

@@ -111,7 +111,7 @@ export function createBaseQuery<
   const isRestoring = useIsRestoring()
 
   const defaultedOptions = createMemo(() =>
-    mergeProps(client().defaultQueryOptions(options()), {
+    mergeProps(client()?.defaultQueryOptions(options()) || {}, {
       get _optimisticResults() {
         return isRestoring() ? 'isRestoring' : 'optimistic'
       },
@@ -167,7 +167,7 @@ export function createBaseQuery<
           return reconcileFn(
             store,
             result,
-            reconcileOptions === undefined ? 'id' : reconcileOptions,
+            reconcileOptions === undefined ? false : reconcileOptions,
           )
         })
         // If the query has data we dont suspend but instead mutate the resource

package/src/createQueries.ts

@@ -23,6 +23,7 @@ import type {
   QueryFunction,
   QueryKey,
   QueryObserverResult,
+  ThrowOnError,
 } from '@tanstack/query-core'
 
 // This defines the `UseQueryOptions` that are accepted in `QueriesOptions` & `GetOptions`.
@@ -65,12 +66,16 @@ type GetOptions<T> =
     T extends {
         queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>
         select: (data: any) => infer TData
+        throwOnError?: ThrowOnError<any, infer TError, any, any>
+      }
+    ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey>
+    : T extends {
+        queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>
+        throwOnError?: ThrowOnError<any, infer TError, any, any>
       }
-    ? CreateQueryOptionsForCreateQueries<TQueryFnData, Error, TData, TQueryKey>
-    : T extends { queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> }
     ? CreateQueryOptionsForCreateQueries<
         TQueryFnData,
-        Error,
+        TError,
         TQueryFnData,
         TQueryKey
       >
@@ -96,10 +101,17 @@ type GetResults<T> =
     T extends {
         queryFn?: QueryFunction<unknown, any>
         select: (data: any) => infer TData
+        throwOnError?: ThrowOnError<any, infer TError, any, any>
       }
-    ? CreateQueryResult<TData>
-    : T extends { queryFn?: QueryFunction<infer TQueryFnData, any> }
-    ? CreateQueryResult<TQueryFnData>
+    ? CreateQueryResult<TData, unknown extends TError ? DefaultError : TError>
+    : T extends {
+        queryFn?: QueryFunction<infer TQueryFnData, any>
+        throwOnError?: ThrowOnError<any, infer TError, any, any>
+      }
+    ? CreateQueryResult<
+        TQueryFnData,
+        unknown extends TError ? DefaultError : TError
+      >
     : // Fallback
       CreateQueryResult