@tanstack/vue-query - npm Package Compare versions

Comparing version 5.40.0 to 5.40.1

build/legacy/useQueries.d.ts

 import { Ref } from 'vue-demi';
-import { QueryObserverResult, QueryKey, QueriesPlaceholderDataFunction, QueryFunction, ThrowOnError, DefaultError, DefinedQueryObserverResult } from '@tanstack/query-core';
+import { QueryObserverResult, DefaultError, QueryKey, QueriesPlaceholderDataFunction, QueryFunction, ThrowOnError, DefinedQueryObserverResult } from '@tanstack/query-core';
 import { U as UseQueryOptions } from './useQuery-JLP2sK49.js';
@@ -11,2 +11,3 @@ import { QueryClient } from './queryClient.js';
 type MAXIMUM_DEPTH = 20;
+type SkipTokenForUseQueries = symbol;
 type GetOptions<T> = T extends UseQueryOptions ? DeepUnwrapRef<T> : T extends {
@@ -23,13 +24,10 @@ 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>;
+    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>;
-    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 {
     initialData?: infer TInitialData;
 } ? unknown extends TInitialData ? QueryObserverResult<TData, TError> : TInitialData extends TData ? DefinedQueryObserverResult<TData, TError> : TInitialData extends () => infer TInitialDataResult ? unknown extends TInitialDataResult ? QueryObserverResult<TData, TError> : TInitialDataResult extends TData ? DefinedQueryObserverResult<TData, TError> : QueryObserverResult<TData, TError> : QueryObserverResult<TData, TError> : QueryObserverResult<TData, TError>;
-type GetResults<T> = T extends UseQueryOptions<infer TQueryFnData, infer TError, infer TData, any, any> ? GetDefinedOrUndefinedQueryResult<T, undefined extends TData ? TQueryFnData : TData, TError> : T extends {
+type GetResults<T> = T extends UseQueryOptions<infer TQueryFnData, infer TError, infer TData, any, any> ? GetDefinedOrUndefinedQueryResult<T, undefined extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError> : T extends {
     queryFnData: any;
@@ -45,9 +43,6 @@ error?: infer TError;
 } ? 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>;
+    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>;
-    throwOnError?: ThrowOnError<any, infer TError, any, any>;
-} ? GetDefinedOrUndefinedQueryResult<T, TQueryFnData, unknown extends TError ? DefaultError : TError> : QueryObserverResult;
+} ? GetDefinedOrUndefinedQueryResult<T, unknown extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError> : QueryObserverResult;
 /**
@@ -64,3 +59,3 @@ * UseQueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
     1
-]> : Readonly<unknown> extends T ? T : T extends Array<UseQueryOptionsForUseQueries<infer TQueryFnData, infer TError, infer TData, infer TQueryKey>> ? Array<UseQueryOptionsForUseQueries<TQueryFnData, TError, TData, TQueryKey>> : Array<UseQueryOptionsForUseQueries>;
+]> : ReadonlyArray<unknown> extends T ? T : T extends Array<UseQueryOptionsForUseQueries<infer TQueryFnData, infer TError, infer TData, infer TQueryKey>> ? Array<UseQueryOptionsForUseQueries<TQueryFnData, TError, TData, TQueryKey>> : Array<UseQueryOptionsForUseQueries>;
 /**
@@ -77,3 +72,3 @@ * UseQueriesResults reducer recursively maps type param to results
     1
-]> : T extends Array<UseQueryOptionsForUseQueries<infer TQueryFnData, infer TError, infer TData, any>> ? Array<QueryObserverResult<unknown extends TData ? TQueryFnData : TData, TError>> : Array<QueryObserverResult>;
+]> : T extends Array<UseQueryOptionsForUseQueries<infer TQueryFnData, infer TError, infer TData, any>> ? Array<QueryObserverResult<unknown extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError>> : Array<QueryObserverResult>;
 type UseQueriesOptionsArg<T extends Array<any>> = readonly [
@@ -80,0 +75,0 @@ ...UseQueriesOptions<T>

build/modern/useQueries.d.ts

 import { Ref } from 'vue-demi';
-import { QueryObserverResult, QueryKey, QueriesPlaceholderDataFunction, QueryFunction, ThrowOnError, DefaultError, DefinedQueryObserverResult } from '@tanstack/query-core';
+import { QueryObserverResult, DefaultError, QueryKey, QueriesPlaceholderDataFunction, QueryFunction, ThrowOnError, DefinedQueryObserverResult } from '@tanstack/query-core';
 import { U as UseQueryOptions } from './useQuery-JLP2sK49.js';
@@ -11,2 +11,3 @@ import { QueryClient } from './queryClient.js';
 type MAXIMUM_DEPTH = 20;
+type SkipTokenForUseQueries = symbol;
 type GetOptions<T> = T extends UseQueryOptions ? DeepUnwrapRef<T> : T extends {
@@ -23,13 +24,10 @@ 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>;
+    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>;
-    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 {
     initialData?: infer TInitialData;
 } ? unknown extends TInitialData ? QueryObserverResult<TData, TError> : TInitialData extends TData ? DefinedQueryObserverResult<TData, TError> : TInitialData extends () => infer TInitialDataResult ? unknown extends TInitialDataResult ? QueryObserverResult<TData, TError> : TInitialDataResult extends TData ? DefinedQueryObserverResult<TData, TError> : QueryObserverResult<TData, TError> : QueryObserverResult<TData, TError> : QueryObserverResult<TData, TError>;
-type GetResults<T> = T extends UseQueryOptions<infer TQueryFnData, infer TError, infer TData, any, any> ? GetDefinedOrUndefinedQueryResult<T, undefined extends TData ? TQueryFnData : TData, TError> : T extends {
+type GetResults<T> = T extends UseQueryOptions<infer TQueryFnData, infer TError, infer TData, any, any> ? GetDefinedOrUndefinedQueryResult<T, undefined extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError> : T extends {
     queryFnData: any;
@@ -45,9 +43,6 @@ error?: infer TError;
 } ? 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>;
+    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>;
-    throwOnError?: ThrowOnError<any, infer TError, any, any>;
-} ? GetDefinedOrUndefinedQueryResult<T, TQueryFnData, unknown extends TError ? DefaultError : TError> : QueryObserverResult;
+} ? GetDefinedOrUndefinedQueryResult<T, unknown extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError> : QueryObserverResult;
 /**
@@ -64,3 +59,3 @@ * UseQueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
     1
-]> : Readonly<unknown> extends T ? T : T extends Array<UseQueryOptionsForUseQueries<infer TQueryFnData, infer TError, infer TData, infer TQueryKey>> ? Array<UseQueryOptionsForUseQueries<TQueryFnData, TError, TData, TQueryKey>> : Array<UseQueryOptionsForUseQueries>;
+]> : ReadonlyArray<unknown> extends T ? T : T extends Array<UseQueryOptionsForUseQueries<infer TQueryFnData, infer TError, infer TData, infer TQueryKey>> ? Array<UseQueryOptionsForUseQueries<TQueryFnData, TError, TData, TQueryKey>> : Array<UseQueryOptionsForUseQueries>;
 /**
@@ -77,3 +72,3 @@ * UseQueriesResults reducer recursively maps type param to results
     1
-]> : T extends Array<UseQueryOptionsForUseQueries<infer TQueryFnData, infer TError, infer TData, any>> ? Array<QueryObserverResult<unknown extends TData ? TQueryFnData : TData, TError>> : Array<QueryObserverResult>;
+]> : T extends Array<UseQueryOptionsForUseQueries<infer TQueryFnData, infer TError, infer TData, any>> ? Array<QueryObserverResult<unknown extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError>> : Array<QueryObserverResult>;
 type UseQueriesOptionsArg<T extends Array<any>> = readonly [
@@ -80,0 +75,0 @@ ...UseQueriesOptions<T>

package.json

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

src/__tests__/test-utils.ts

@@ -53,11 +53,1 @@ /* istanbul ignore file */
 }
-
-export type Equal<TTargetA, TTargetB> = (<T>() => T extends TTargetA
-  ? 1
-  : 2) extends <T>() => T extends TTargetB ? 1 : 2
-  ? true
-  : false
-
-export type Expect<T extends true> = T
-
-export const doNotExecute = (_func: () => void) => true

src/useQueries.ts

@@ -45,2 +45,5 @@ import { QueriesObserver } from '@tanstack/query-core'
 
+// Widen the type of the symbol to enable type inference even if skipToken is not immutable.
+type SkipTokenForUseQueries = symbol
+
 type GetOptions<T> =
@@ -70,6 +73,5 @@ // Part 1: if UseQueryOptions are already being sent through, then just return T
                   T extends {
-                      queryFn?: QueryFunction<
-                        infer TQueryFnData,
-                        infer TQueryKey
-                      >
+                      queryFn?:
+                        | QueryFunction<infer TQueryFnData, infer TQueryKey>
+                        | SkipTokenForUseQueries
                       select?: (data: any) => infer TData
@@ -80,21 +82,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
-                        >
-                        throwOnError?: ThrowOnError<any, infer TError, any, any>
-                      }
-                    ? UseQueryOptionsForUseQueries<
-                        TQueryFnData,
-                        TError,
-                        TQueryFnData,
-                        TQueryKey
-                      >
-                    : // Fallback
-                      UseQueryOptionsForUseQueries
+                  : // Fallback
+                    UseQueryOptionsForUseQueries
 
@@ -130,3 +119,3 @@ // A defined initialData setting should return a DefinedQueryObserverResult rather than QueryObserverResult
         undefined extends TData ? TQueryFnData : TData,
-        TError
+        unknown extends TError ? DefaultError : TError
       >
@@ -149,3 +138,5 @@ : // Part 2: responsible for mapping explicit type parameter to function result, if object
                   T extends {
-                      queryFn?: QueryFunction<infer TQueryFnData, any>
+                      queryFn?:
+                        | QueryFunction<infer TQueryFnData, any>
+                        | SkipTokenForUseQueries
                       select?: (data: any) => infer TData
@@ -159,13 +150,4 @@ throwOnError?: ThrowOnError<any, infer TError, any, any>
                     >
-                  : T extends {
-                        queryFn?: QueryFunction<infer TQueryFnData, any>
-                        throwOnError?: ThrowOnError<any, infer TError, any, any>
-                      }
-                    ? GetDefinedOrUndefinedQueryResult<
-                        T,
-                        TQueryFnData,
-                        unknown extends TError ? DefaultError : TError
-                      >
-                    : // Fallback
-                      QueryObserverResult
+                  : // Fallback
+                    QueryObserverResult
 
@@ -191,3 +173,3 @@ /**
           >
-        : Readonly<unknown> extends T
+        : ReadonlyArray<unknown> extends T
           ? T
@@ -246,3 +228,3 @@ : // If T is *some* array but we couldn't assign unknown[] to it, then it must hold some known/homogenous type!
                 unknown extends TData ? TQueryFnData : TData,
-                TError
+                unknown extends TError ? DefaultError : TError
               >
@@ -249,0 +231,0 @@ >

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

737459

decreased by-1.31%

Lines of code

10120

decreased by-2.31%

No dependency changes