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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/build/index.d.cts +9 -5
  2. package/build/index.d.ts +9 -5
  3. package/package.json +1 -1
  4. package/src/createQueries.ts +18 -6
package/build/index.d.cts CHANGED
@@ -1,4 +1,4 @@
1
- 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';
1
+ 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';
2
2
  export * from '@tanstack/query-core';
3
3
  import * as solid_js from 'solid-js';
4
4
  import { JSX, Accessor } from 'solid-js';
@@ -108,9 +108,11 @@ type GetOptions<T> = T extends {
108
108
  } ? 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 {
109
109
  queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>;
110
110
  select: (data: any) => infer TData;
111
- } ? CreateQueryOptionsForCreateQueries<TQueryFnData, Error, TData, TQueryKey> : T extends {
111
+ throwOnError?: ThrowOnError<any, infer TError, any, any>;
112
+ } ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey> : T extends {
112
113
  queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>;
113
- } ? CreateQueryOptionsForCreateQueries<TQueryFnData, Error, TQueryFnData, TQueryKey> : CreateQueryOptionsForCreateQueries;
114
+ throwOnError?: ThrowOnError<any, infer TError, any, any>;
115
+ } ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TQueryFnData, TQueryKey> : CreateQueryOptionsForCreateQueries;
114
116
  type GetResults<T> = T extends {
115
117
  queryFnData: any;
116
118
  error?: infer TError;
@@ -124,9 +126,11 @@ type GetResults<T> = T extends {
124
126
  } ? 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 {
125
127
  queryFn?: QueryFunction<unknown, any>;
126
128
  select: (data: any) => infer TData;
127
- } ? CreateQueryResult<TData> : T extends {
129
+ throwOnError?: ThrowOnError<any, infer TError, any, any>;
130
+ } ? CreateQueryResult<TData, unknown extends TError ? DefaultError : TError> : T extends {
128
131
  queryFn?: QueryFunction<infer TQueryFnData, any>;
129
- } ? CreateQueryResult<TQueryFnData> : CreateQueryResult;
132
+ throwOnError?: ThrowOnError<any, infer TError, any, any>;
133
+ } ? CreateQueryResult<TQueryFnData, unknown extends TError ? DefaultError : TError> : CreateQueryResult;
130
134
  /**
131
135
  * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
132
136
  */
package/build/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- 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';
1
+ 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';
2
2
  export * from '@tanstack/query-core';
3
3
  import * as solid_js from 'solid-js';
4
4
  import { JSX, Accessor } from 'solid-js';
@@ -108,9 +108,11 @@ type GetOptions<T> = T extends {
108
108
  } ? 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 {
109
109
  queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>;
110
110
  select: (data: any) => infer TData;
111
- } ? CreateQueryOptionsForCreateQueries<TQueryFnData, Error, TData, TQueryKey> : T extends {
111
+ throwOnError?: ThrowOnError<any, infer TError, any, any>;
112
+ } ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey> : T extends {
112
113
  queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>;
113
- } ? CreateQueryOptionsForCreateQueries<TQueryFnData, Error, TQueryFnData, TQueryKey> : CreateQueryOptionsForCreateQueries;
114
+ throwOnError?: ThrowOnError<any, infer TError, any, any>;
115
+ } ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TQueryFnData, TQueryKey> : CreateQueryOptionsForCreateQueries;
114
116
  type GetResults<T> = T extends {
115
117
  queryFnData: any;
116
118
  error?: infer TError;
@@ -124,9 +126,11 @@ type GetResults<T> = T extends {
124
126
  } ? 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 {
125
127
  queryFn?: QueryFunction<unknown, any>;
126
128
  select: (data: any) => infer TData;
127
- } ? CreateQueryResult<TData> : T extends {
129
+ throwOnError?: ThrowOnError<any, infer TError, any, any>;
130
+ } ? CreateQueryResult<TData, unknown extends TError ? DefaultError : TError> : T extends {
128
131
  queryFn?: QueryFunction<infer TQueryFnData, any>;
129
- } ? CreateQueryResult<TQueryFnData> : CreateQueryResult;
132
+ throwOnError?: ThrowOnError<any, infer TError, any, any>;
133
+ } ? CreateQueryResult<TQueryFnData, unknown extends TError ? DefaultError : TError> : CreateQueryResult;
130
134
  /**
131
135
  * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
132
136
  */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tanstack/solid-query",
3
- "version": "5.0.0-rc.12",
3
+ "version": "5.0.0-rc.16",
4
4
  "description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
5
5
  "author": "tannerlinsley",
6
6
  "license": "MIT",
package/src/createQueries.ts CHANGED
@@ -23,6 +23,7 @@ import type {
23
23
  QueryFunction,
24
24
  QueryKey,
25
25
  QueryObserverResult,
26
+ ThrowOnError,
26
27
  } from '@tanstack/query-core'
27
28
 
28
29
  // This defines the `UseQueryOptions` that are accepted in `QueriesOptions` & `GetOptions`.
@@ -65,12 +66,16 @@ type GetOptions<T> =
65
66
  T extends {
66
67
  queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>
67
68
  select: (data: any) => infer TData
69
+ throwOnError?: ThrowOnError<any, infer TError, any, any>
70
+ }
71
+ ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey>
72
+ : T extends {
73
+ queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>
74
+ throwOnError?: ThrowOnError<any, infer TError, any, any>
68
75
  }
69
- ? CreateQueryOptionsForCreateQueries<TQueryFnData, Error, TData, TQueryKey>
70
- : T extends { queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> }
71
76
  ? CreateQueryOptionsForCreateQueries<
72
77
  TQueryFnData,
73
- Error,
78
+ TError,
74
79
  TQueryFnData,
75
80
  TQueryKey
76
81
  >
@@ -96,10 +101,17 @@ type GetResults<T> =
96
101
  T extends {
97
102
  queryFn?: QueryFunction<unknown, any>
98
103
  select: (data: any) => infer TData
104
+ throwOnError?: ThrowOnError<any, infer TError, any, any>
99
105
  }
100
- ? CreateQueryResult<TData>
101
- : T extends { queryFn?: QueryFunction<infer TQueryFnData, any> }
102
- ? CreateQueryResult<TQueryFnData>
106
+ ? CreateQueryResult<TData, unknown extends TError ? DefaultError : TError>
107
+ : T extends {
108
+ queryFn?: QueryFunction<infer TQueryFnData, any>
109
+ throwOnError?: ThrowOnError<any, infer TError, any, any>
110
+ }
111
+ ? CreateQueryResult<
112
+ TQueryFnData,
113
+ unknown extends TError ? DefaultError : TError
114
+ >
103
115
  : // Fallback
104
116
  CreateQueryResult
105
117