@tanstack/react-query - npm Package Compare versions

Comparing version 5.40.0 to 5.40.1

build/legacy/useQueries.d.ts

 import { UseQueryResult, UseQueryOptions, DefinedUseQueryResult } from './types.js';
-import { DefaultError, QueryClient, QueryKey, OmitKeyof, QueriesPlaceholderDataFunction, QueryFunction, SkipToken, ThrowOnError } from '@tanstack/query-core';
+import { DefaultError, QueryClient, QueryKey, OmitKeyof, QueriesPlaceholderDataFunction, QueryFunction, ThrowOnError } from '@tanstack/query-core';
 
@@ -8,2 +8,3 @@ type UseQueryOptionsForUseQueries<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = OmitKeyof<UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'placeholderData'> & {
 type MAXIMUM_DEPTH = 20;
+type SkipTokenForUseQueries = symbol;
 type GetUseQueryOptionsForUseQueries<T> = T extends {
@@ -20,9 +21,6 @@ queryFnData: infer TQueryFnData;
 } ? UseQueryOptionsForUseQueries<unknown, TError, TData> : T extends [infer TQueryFnData, infer TError, infer TData] ? UseQueryOptionsForUseQueries<TQueryFnData, TError, TData> : T extends [infer TQueryFnData, infer TError] ? UseQueryOptionsForUseQueries<TQueryFnData, TError> : T extends [infer TQueryFnData] ? UseQueryOptionsForUseQueries<TQueryFnData> : T extends {
-    queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> | SkipToken;
+    queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> | SkipTokenForUseQueries;
     select?: (data: any) => infer TData;
     throwOnError?: ThrowOnError<any, infer TError, any, any>;
-} ? UseQueryOptionsForUseQueries<TQueryFnData, TError, TData, TQueryKey> : T extends {
-    queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> | SkipToken;
-    throwOnError?: ThrowOnError<any, infer TError, any, any>;
-} ? UseQueryOptionsForUseQueries<TQueryFnData, TError, TQueryFnData, TQueryKey> : UseQueryOptionsForUseQueries;
+} ? UseQueryOptionsForUseQueries<TQueryFnData, unknown extends TError ? DefaultError : TError, unknown extends TData ? TQueryFnData : TData, TQueryKey> : UseQueryOptionsForUseQueries;
 type GetDefinedOrUndefinedQueryResult<T, TData, TError = unknown> = T extends {
@@ -42,9 +40,6 @@ initialData?: infer TInitialData;
 } ? GetDefinedOrUndefinedQueryResult<T, TData, TError> : T extends [any, infer TError, infer TData] ? GetDefinedOrUndefinedQueryResult<T, TData, TError> : T extends [infer TQueryFnData, infer TError] ? GetDefinedOrUndefinedQueryResult<T, TQueryFnData, TError> : T extends [infer TQueryFnData] ? GetDefinedOrUndefinedQueryResult<T, TQueryFnData> : T extends {
-    queryFn?: QueryFunction<infer TQueryFnData, any> | SkipToken;
+    queryFn?: QueryFunction<infer TQueryFnData, any> | SkipTokenForUseQueries;
     select?: (data: any) => infer TData;
     throwOnError?: ThrowOnError<any, infer TError, any, any>;
-} ? GetDefinedOrUndefinedQueryResult<T, unknown extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError> : T extends {
-    queryFn?: QueryFunction<infer TQueryFnData, any> | SkipToken;
-    throwOnError?: ThrowOnError<any, infer TError, any, any>;
-} ? GetDefinedOrUndefinedQueryResult<T, TQueryFnData, unknown extends TError ? DefaultError : TError> : UseQueryResult;
+} ? GetDefinedOrUndefinedQueryResult<T, unknown extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError> : UseQueryResult;
 /**
@@ -51,0 +46,0 @@ * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param

build/modern/useQueries.d.ts

 import { UseQueryResult, UseQueryOptions, DefinedUseQueryResult } from './types.js';
-import { DefaultError, QueryClient, QueryKey, OmitKeyof, QueriesPlaceholderDataFunction, QueryFunction, SkipToken, ThrowOnError } from '@tanstack/query-core';
+import { DefaultError, QueryClient, QueryKey, OmitKeyof, QueriesPlaceholderDataFunction, QueryFunction, ThrowOnError } from '@tanstack/query-core';
 
@@ -8,2 +8,3 @@ type UseQueryOptionsForUseQueries<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = OmitKeyof<UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'placeholderData'> & {
 type MAXIMUM_DEPTH = 20;
+type SkipTokenForUseQueries = symbol;
 type GetUseQueryOptionsForUseQueries<T> = T extends {
@@ -20,9 +21,6 @@ queryFnData: infer TQueryFnData;
 } ? UseQueryOptionsForUseQueries<unknown, TError, TData> : T extends [infer TQueryFnData, infer TError, infer TData] ? UseQueryOptionsForUseQueries<TQueryFnData, TError, TData> : T extends [infer TQueryFnData, infer TError] ? UseQueryOptionsForUseQueries<TQueryFnData, TError> : T extends [infer TQueryFnData] ? UseQueryOptionsForUseQueries<TQueryFnData> : T extends {
-    queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> | SkipToken;
+    queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> | SkipTokenForUseQueries;
     select?: (data: any) => infer TData;
     throwOnError?: ThrowOnError<any, infer TError, any, any>;
-} ? UseQueryOptionsForUseQueries<TQueryFnData, TError, TData, TQueryKey> : T extends {
-    queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> | SkipToken;
-    throwOnError?: ThrowOnError<any, infer TError, any, any>;
-} ? UseQueryOptionsForUseQueries<TQueryFnData, TError, TQueryFnData, TQueryKey> : UseQueryOptionsForUseQueries;
+} ? UseQueryOptionsForUseQueries<TQueryFnData, unknown extends TError ? DefaultError : TError, unknown extends TData ? TQueryFnData : TData, TQueryKey> : UseQueryOptionsForUseQueries;
 type GetDefinedOrUndefinedQueryResult<T, TData, TError = unknown> = T extends {
@@ -42,9 +40,6 @@ initialData?: infer TInitialData;
 } ? GetDefinedOrUndefinedQueryResult<T, TData, TError> : T extends [any, infer TError, infer TData] ? GetDefinedOrUndefinedQueryResult<T, TData, TError> : T extends [infer TQueryFnData, infer TError] ? GetDefinedOrUndefinedQueryResult<T, TQueryFnData, TError> : T extends [infer TQueryFnData] ? GetDefinedOrUndefinedQueryResult<T, TQueryFnData> : T extends {
-    queryFn?: QueryFunction<infer TQueryFnData, any> | SkipToken;
+    queryFn?: QueryFunction<infer TQueryFnData, any> | SkipTokenForUseQueries;
     select?: (data: any) => infer TData;
     throwOnError?: ThrowOnError<any, infer TError, any, any>;
-} ? GetDefinedOrUndefinedQueryResult<T, unknown extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError> : T extends {
-    queryFn?: QueryFunction<infer TQueryFnData, any> | SkipToken;
-    throwOnError?: ThrowOnError<any, infer TError, any, any>;
-} ? GetDefinedOrUndefinedQueryResult<T, TQueryFnData, unknown extends TError ? DefaultError : TError> : UseQueryResult;
+} ? GetDefinedOrUndefinedQueryResult<T, unknown extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError> : UseQueryResult;
 /**
@@ -51,0 +46,0 @@ * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param

package.json

 {
   "name": "@tanstack/react-query",
-  "version": "5.40.0",
+  "version": "5.40.1",
   "description": "Hooks for managing, caching and syncing asynchronous and remote data in React",
@@ -5,0 +5,0 @@ "author": "tannerlinsley",

src/useQueries.ts

@@ -37,3 +37,2 @@ 'use client'
   QueryObserverOptions,
-  SkipToken,
   ThrowOnError,
@@ -59,2 +58,5 @@ } from '@tanstack/query-core'
 
+// Widen the type of the symbol to enable type inference even if skipToken is not immutable.
+type SkipTokenForUseQueries = symbol
+
 type GetUseQueryOptionsForUseQueries<T> =
@@ -83,3 +85,3 @@ // Part 1: responsible for applying explicit type parameter to function arguments, if object { queryFnData: TQueryFnData, error: TError, data: TData }
                       | QueryFunction<infer TQueryFnData, infer TQueryKey>
-                      | SkipToken
+                      | SkipTokenForUseQueries
                     select?: (data: any) => infer TData
@@ -90,20 +92,8 @@ throwOnError?: ThrowOnError<any, infer TError, any, any>
                     TQueryFnData,
-                    TError,
-                    TData,
+                    unknown extends TError ? DefaultError : TError,
+                    unknown extends TData ? TQueryFnData : TData,
                     TQueryKey
                   >
-                : T extends {
-                      queryFn?:
-                        | QueryFunction<infer TQueryFnData, infer TQueryKey>
-                        | SkipToken
-                      throwOnError?: ThrowOnError<any, infer TError, any, any>
-                    }
-                  ? UseQueryOptionsForUseQueries<
-                      TQueryFnData,
-                      TError,
-                      TQueryFnData,
-                      TQueryKey
-                    >
-                  : // Fallback
-                    UseQueryOptionsForUseQueries
+                : // Fallback
+                  UseQueryOptionsForUseQueries
 
@@ -144,3 +134,5 @@ // A defined initialData setting should return a DefinedUseQueryResult rather than UseQueryResult
                 T extends {
-                    queryFn?: QueryFunction<infer TQueryFnData, any> | SkipToken
+                    queryFn?:
+                      | QueryFunction<infer TQueryFnData, any>
+                      | SkipTokenForUseQueries
                     select?: (data: any) => infer TData
@@ -154,15 +146,4 @@ throwOnError?: ThrowOnError<any, infer TError, any, any>
                   >
-                : T extends {
-                      queryFn?:
-                        | QueryFunction<infer TQueryFnData, any>
-                        | SkipToken
-                      throwOnError?: ThrowOnError<any, infer TError, any, any>
-                    }
-                  ? GetDefinedOrUndefinedQueryResult<
-                      T,
-                      TQueryFnData,
-                      unknown extends TError ? DefaultError : TError
-                    >
-                  : // Fallback
-                    UseQueryResult
+                : // Fallback
+                  UseQueryResult
 
@@ -269,9 +250,3 @@ /**
         const defaultedOptions = client.defaultQueryOptions(
-          opts as QueryObserverOptions<
-            unknown,
-            Error,
-            unknown,
-            unknown,
-            QueryKey
-          >,
+          opts as QueryObserverOptions,
         )
@@ -278,0 +253,0 @@

No alert changes

Worsened metrics

Total package byte prevSize

1063106

decreased by-0.51%

Lines of code

21206

decreased by-0.16%

No dependency changes