@tanstack/solid-query 5.8.3 → 5.8.6

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 (6) hide show
  1. package/build/index.d.cts +18 -2
  2. package/build/index.d.ts +18 -2
  3. package/package.json +2 -2
  4. package/src/__tests__/createInfiniteQuery.test.tsx +2 -2
  5. package/src/__tests__/createQueries.test.tsx +1 -1
  6. package/src/createQueries.ts +124 -100
package/build/index.d.cts CHANGED
@@ -139,11 +139,27 @@ type GetResults<T> = T extends {
139
139
  /**
140
140
  * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
141
141
  */
142
- type QueriesOptions<T extends Array<any>, Result extends Array<any> = [], Depth extends ReadonlyArray<number> = []> = Depth['length'] extends MAXIMUM_DEPTH ? Array<CreateQueryOptionsForCreateQueries> : T extends [] ? [] : T extends [infer Head] ? [...Result, GetOptions<Head>] : T extends [infer Head, ...infer Tail] ? QueriesOptions<[...Tail], [...Result, GetOptions<Head>], [...Depth, 1]> : Array<unknown> extends T ? T : T extends Array<CreateQueryOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, infer TQueryKey>> ? Array<CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey>> : Array<CreateQueryOptionsForCreateQueries>;
142
+ type QueriesOptions<T extends Array<any>, Result extends Array<any> = [], Depth extends ReadonlyArray<number> = []> = Depth['length'] extends MAXIMUM_DEPTH ? Array<CreateQueryOptionsForCreateQueries> : T extends [] ? [] : T extends [infer Head] ? [...Result, GetOptions<Head>] : T extends [infer Head, ...infer Tail] ? QueriesOptions<[
143
+ ...Tail
144
+ ], [
145
+ ...Result,
146
+ GetOptions<Head>
147
+ ], [
148
+ ...Depth,
149
+ 1
150
+ ]> : Array<unknown> extends T ? T : T extends Array<CreateQueryOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, infer TQueryKey>> ? Array<CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey>> : Array<CreateQueryOptionsForCreateQueries>;
143
151
  /**
144
152
  * QueriesResults reducer recursively maps type param to results
145
153
  */
146
- type QueriesResults<T extends Array<any>, Result extends Array<any> = [], Depth extends ReadonlyArray<number> = []> = Depth['length'] extends MAXIMUM_DEPTH ? Array<CreateQueryResult> : T extends [] ? [] : T extends [infer Head] ? [...Result, GetResults<Head>] : T extends [infer Head, ...infer Tail] ? QueriesResults<[...Tail], [...Result, GetResults<Head>], [...Depth, 1]> : T extends Array<CreateQueryOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, any>> ? Array<CreateQueryResult<unknown extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError>> : Array<CreateQueryResult>;
154
+ type QueriesResults<T extends Array<any>, Result extends Array<any> = [], Depth extends ReadonlyArray<number> = []> = Depth['length'] extends MAXIMUM_DEPTH ? Array<CreateQueryResult> : T extends [] ? [] : T extends [infer Head] ? [...Result, GetResults<Head>] : T extends [infer Head, ...infer Tail] ? QueriesResults<[
155
+ ...Tail
156
+ ], [
157
+ ...Result,
158
+ GetResults<Head>
159
+ ], [
160
+ ...Depth,
161
+ 1
162
+ ]> : T extends Array<CreateQueryOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, any>> ? Array<CreateQueryResult<unknown extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError>> : Array<CreateQueryResult>;
147
163
  declare function createQueries<T extends Array<any>, TCombinedResult extends QueriesResults<T> = QueriesResults<T>>(queriesOptions: Accessor<{
148
164
  queries: readonly [...QueriesOptions<T>];
149
165
  combine?: (result: QueriesResults<T>) => TCombinedResult;
package/build/index.d.ts CHANGED
@@ -139,11 +139,27 @@ type GetResults<T> = T extends {
139
139
  /**
140
140
  * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
141
141
  */
142
- type QueriesOptions<T extends Array<any>, Result extends Array<any> = [], Depth extends ReadonlyArray<number> = []> = Depth['length'] extends MAXIMUM_DEPTH ? Array<CreateQueryOptionsForCreateQueries> : T extends [] ? [] : T extends [infer Head] ? [...Result, GetOptions<Head>] : T extends [infer Head, ...infer Tail] ? QueriesOptions<[...Tail], [...Result, GetOptions<Head>], [...Depth, 1]> : Array<unknown> extends T ? T : T extends Array<CreateQueryOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, infer TQueryKey>> ? Array<CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey>> : Array<CreateQueryOptionsForCreateQueries>;
142
+ type QueriesOptions<T extends Array<any>, Result extends Array<any> = [], Depth extends ReadonlyArray<number> = []> = Depth['length'] extends MAXIMUM_DEPTH ? Array<CreateQueryOptionsForCreateQueries> : T extends [] ? [] : T extends [infer Head] ? [...Result, GetOptions<Head>] : T extends [infer Head, ...infer Tail] ? QueriesOptions<[
143
+ ...Tail
144
+ ], [
145
+ ...Result,
146
+ GetOptions<Head>
147
+ ], [
148
+ ...Depth,
149
+ 1
150
+ ]> : Array<unknown> extends T ? T : T extends Array<CreateQueryOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, infer TQueryKey>> ? Array<CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey>> : Array<CreateQueryOptionsForCreateQueries>;
143
151
  /**
144
152
  * QueriesResults reducer recursively maps type param to results
145
153
  */
146
- type QueriesResults<T extends Array<any>, Result extends Array<any> = [], Depth extends ReadonlyArray<number> = []> = Depth['length'] extends MAXIMUM_DEPTH ? Array<CreateQueryResult> : T extends [] ? [] : T extends [infer Head] ? [...Result, GetResults<Head>] : T extends [infer Head, ...infer Tail] ? QueriesResults<[...Tail], [...Result, GetResults<Head>], [...Depth, 1]> : T extends Array<CreateQueryOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, any>> ? Array<CreateQueryResult<unknown extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError>> : Array<CreateQueryResult>;
154
+ type QueriesResults<T extends Array<any>, Result extends Array<any> = [], Depth extends ReadonlyArray<number> = []> = Depth['length'] extends MAXIMUM_DEPTH ? Array<CreateQueryResult> : T extends [] ? [] : T extends [infer Head] ? [...Result, GetResults<Head>] : T extends [infer Head, ...infer Tail] ? QueriesResults<[
155
+ ...Tail
156
+ ], [
157
+ ...Result,
158
+ GetResults<Head>
159
+ ], [
160
+ ...Depth,
161
+ 1
162
+ ]> : T extends Array<CreateQueryOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, any>> ? Array<CreateQueryResult<unknown extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError>> : Array<CreateQueryResult>;
147
163
  declare function createQueries<T extends Array<any>, TCombinedResult extends QueriesResults<T> = QueriesResults<T>>(queriesOptions: Accessor<{
148
164
  queries: readonly [...QueriesOptions<T>];
149
165
  combine?: (result: QueriesResults<T>) => TCombinedResult;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tanstack/solid-query",
3
- "version": "5.8.3",
3
+ "version": "5.8.6",
4
4
  "description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
5
5
  "author": "tannerlinsley",
6
6
  "license": "MIT",
@@ -48,7 +48,7 @@
48
48
  ],
49
49
  "dependencies": {
50
50
  "solid-js": "^1.8.1",
51
- "@tanstack/query-core": "5.8.3"
51
+ "@tanstack/query-core": "5.8.6"
52
52
  },
53
53
  "devDependencies": {
54
54
  "tsup-preset-solid": "^2.1.0",
package/src/__tests__/createInfiniteQuery.test.tsx CHANGED
@@ -1578,8 +1578,8 @@ describe('useInfiniteQuery', () => {
1578
1578
  {state.isFetchingNextPage
1579
1579
  ? 'Loading more...'
1580
1580
  : state.hasNextPage
1581
- ? 'Load More'
1582
- : 'Nothing more to load'}
1581
+ ? 'Load More'
1582
+ : 'Nothing more to load'}
1583
1583
  </button>
1584
1584
  <button onClick={() => state.refetch()}>Refetch</button>
1585
1585
  <button onClick={() => setIsRemovedLastPage(true)}>
package/src/__tests__/createQueries.test.tsx CHANGED
@@ -495,7 +495,7 @@ describe('useQueries', () => {
495
495
  queryFn: () => 123,
496
496
  },
497
497
  ],
498
- } as const),
498
+ }) as const,
499
499
  )
500
500
  expectTypeOf<QueryObserverResult<string, unknown>>(result6[0])
501
501
  expectTypeOf<QueryObserverResult<number, unknown>>(result6[1])
package/src/createQueries.ts CHANGED
@@ -52,68 +52,79 @@ type GetOptions<T> =
52
52
  }
53
53
  ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData>
54
54
  : T extends { queryFnData: infer TQueryFnData; error?: infer TError }
55
- ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError>
56
- : T extends { data: infer TData; error?: infer TError }
57
- ? CreateQueryOptionsForCreateQueries<unknown, TError, TData>
58
- : // Part 2: responsible for applying explicit type parameter to function arguments, if tuple [TQueryFnData, TError, TData]
59
- T extends [infer TQueryFnData, infer TError, infer TData]
60
- ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData>
61
- : T extends [infer TQueryFnData, infer TError]
62
- ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError>
63
- : T extends [infer TQueryFnData]
64
- ? CreateQueryOptionsForCreateQueries<TQueryFnData>
65
- : // Part 3: responsible for inferring and enforcing type if no explicit parameter was provided
66
- T extends {
67
- queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>
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>
75
- }
76
- ? CreateQueryOptionsForCreateQueries<
77
- TQueryFnData,
78
- TError,
79
- TQueryFnData,
80
- TQueryKey
81
- >
82
- : // Fallback
83
- CreateQueryOptionsForCreateQueries
55
+ ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError>
56
+ : T extends { data: infer TData; error?: infer TError }
57
+ ? CreateQueryOptionsForCreateQueries<unknown, TError, TData>
58
+ : // Part 2: responsible for applying explicit type parameter to function arguments, if tuple [TQueryFnData, TError, TData]
59
+ T extends [infer TQueryFnData, infer TError, infer TData]
60
+ ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData>
61
+ : T extends [infer TQueryFnData, infer TError]
62
+ ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError>
63
+ : T extends [infer TQueryFnData]
64
+ ? CreateQueryOptionsForCreateQueries<TQueryFnData>
65
+ : // Part 3: responsible for inferring and enforcing type if no explicit parameter was provided
66
+ T extends {
67
+ queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>
68
+ select: (data: any) => infer TData
69
+ throwOnError?: ThrowOnError<any, infer TError, any, any>
70
+ }
71
+ ? CreateQueryOptionsForCreateQueries<
72
+ TQueryFnData,
73
+ TError,
74
+ TData,
75
+ TQueryKey
76
+ >
77
+ : T extends {
78
+ queryFn?: QueryFunction<
79
+ infer TQueryFnData,
80
+ infer TQueryKey
81
+ >
82
+ throwOnError?: ThrowOnError<any, infer TError, any, any>
83
+ }
84
+ ? CreateQueryOptionsForCreateQueries<
85
+ TQueryFnData,
86
+ TError,
87
+ TQueryFnData,
88
+ TQueryKey
89
+ >
90
+ : // Fallback
91
+ CreateQueryOptionsForCreateQueries
84
92
 
85
93
  type GetResults<T> =
86
94
  // Part 1: responsible for mapping explicit type parameter to function result, if object
87
95
  T extends { queryFnData: any; error?: infer TError; data: infer TData }
88
96
  ? CreateQueryResult<TData, TError>
89
97
  : T extends { queryFnData: infer TQueryFnData; error?: infer TError }
90
- ? CreateQueryResult<TQueryFnData, TError>
91
- : T extends { data: infer TData; error?: infer TError }
92
- ? CreateQueryResult<TData, TError>
93
- : // Part 2: responsible for mapping explicit type parameter to function result, if tuple
94
- T extends [any, infer TError, infer TData]
95
- ? CreateQueryResult<TData, TError>
96
- : T extends [infer TQueryFnData, infer TError]
97
- ? CreateQueryResult<TQueryFnData, TError>
98
- : T extends [infer TQueryFnData]
99
- ? CreateQueryResult<TQueryFnData>
100
- : // Part 3: responsible for mapping inferred type to results, if no explicit parameter was provided
101
- T extends {
102
- queryFn?: QueryFunction<unknown, any>
103
- select: (data: any) => infer TData
104
- throwOnError?: ThrowOnError<any, infer TError, any, any>
105
- }
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
- >
115
- : // Fallback
116
- CreateQueryResult
98
+ ? CreateQueryResult<TQueryFnData, TError>
99
+ : T extends { data: infer TData; error?: infer TError }
100
+ ? CreateQueryResult<TData, TError>
101
+ : // Part 2: responsible for mapping explicit type parameter to function result, if tuple
102
+ T extends [any, infer TError, infer TData]
103
+ ? CreateQueryResult<TData, TError>
104
+ : T extends [infer TQueryFnData, infer TError]
105
+ ? CreateQueryResult<TQueryFnData, TError>
106
+ : T extends [infer TQueryFnData]
107
+ ? CreateQueryResult<TQueryFnData>
108
+ : // Part 3: responsible for mapping inferred type to results, if no explicit parameter was provided
109
+ T extends {
110
+ queryFn?: QueryFunction<unknown, any>
111
+ select: (data: any) => infer TData
112
+ throwOnError?: ThrowOnError<any, infer TError, any, any>
113
+ }
114
+ ? CreateQueryResult<
115
+ TData,
116
+ unknown extends TError ? DefaultError : TError
117
+ >
118
+ : T extends {
119
+ queryFn?: QueryFunction<infer TQueryFnData, any>
120
+ throwOnError?: ThrowOnError<any, infer TError, any, any>
121
+ }
122
+ ? CreateQueryResult<
123
+ TQueryFnData,
124
+ unknown extends TError ? DefaultError : TError
125
+ >
126
+ : // Fallback
127
+ CreateQueryResult
117
128
 
118
129
  /**
119
130
  * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
@@ -125,28 +136,37 @@ export type QueriesOptions<
125
136
  > = Depth['length'] extends MAXIMUM_DEPTH
126
137
  ? Array<CreateQueryOptionsForCreateQueries>
127
138
  : T extends []
128
- ? []
129
- : T extends [infer Head]
130
- ? [...Result, GetOptions<Head>]
131
- : T extends [infer Head, ...infer Tail]
132
- ? QueriesOptions<[...Tail], [...Result, GetOptions<Head>], [...Depth, 1]>
133
- : Array<unknown> extends T
134
- ? T
135
- : // If T is *some* array but we couldn't assign unknown[] to it, then it must hold some known/homogenous type!
136
- // use this to infer the param types in the case of Array.map() argument
137
- T extends Array<
138
- CreateQueryOptionsForCreateQueries<
139
- infer TQueryFnData,
140
- infer TError,
141
- infer TData,
142
- infer TQueryKey
143
- >
144
- >
145
- ? Array<
146
- CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey>
147
- >
148
- : // Fallback
149
- Array<CreateQueryOptionsForCreateQueries>
139
+ ? []
140
+ : T extends [infer Head]
141
+ ? [...Result, GetOptions<Head>]
142
+ : T extends [infer Head, ...infer Tail]
143
+ ? QueriesOptions<
144
+ [...Tail],
145
+ [...Result, GetOptions<Head>],
146
+ [...Depth, 1]
147
+ >
148
+ : Array<unknown> extends T
149
+ ? T
150
+ : // If T is *some* array but we couldn't assign unknown[] to it, then it must hold some known/homogenous type!
151
+ // use this to infer the param types in the case of Array.map() argument
152
+ T extends Array<
153
+ CreateQueryOptionsForCreateQueries<
154
+ infer TQueryFnData,
155
+ infer TError,
156
+ infer TData,
157
+ infer TQueryKey
158
+ >
159
+ >
160
+ ? Array<
161
+ CreateQueryOptionsForCreateQueries<
162
+ TQueryFnData,
163
+ TError,
164
+ TData,
165
+ TQueryKey
166
+ >
167
+ >
168
+ : // Fallback
169
+ Array<CreateQueryOptionsForCreateQueries>
150
170
 
151
171
  /**
152
172
  * QueriesResults reducer recursively maps type param to results
@@ -158,28 +178,32 @@ export type QueriesResults<
158
178
  > = Depth['length'] extends MAXIMUM_DEPTH
159
179
  ? Array<CreateQueryResult>
160
180
  : T extends []
161
- ? []
162
- : T extends [infer Head]
163
- ? [...Result, GetResults<Head>]
164
- : T extends [infer Head, ...infer Tail]
165
- ? QueriesResults<[...Tail], [...Result, GetResults<Head>], [...Depth, 1]>
166
- : T extends Array<
167
- CreateQueryOptionsForCreateQueries<
168
- infer TQueryFnData,
169
- infer TError,
170
- infer TData,
171
- any
172
- >
173
- >
174
- ? // Dynamic-size (homogenous) UseQueryOptions array: map directly to array of results
175
- Array<
176
- CreateQueryResult<
177
- unknown extends TData ? TQueryFnData : TData,
178
- unknown extends TError ? DefaultError : TError
179
- >
180
- >
181
- : // Fallback
182
- Array<CreateQueryResult>
181
+ ? []
182
+ : T extends [infer Head]
183
+ ? [...Result, GetResults<Head>]
184
+ : T extends [infer Head, ...infer Tail]
185
+ ? QueriesResults<
186
+ [...Tail],
187
+ [...Result, GetResults<Head>],
188
+ [...Depth, 1]
189
+ >
190
+ : T extends Array<
191
+ CreateQueryOptionsForCreateQueries<
192
+ infer TQueryFnData,
193
+ infer TError,
194
+ infer TData,
195
+ any
196
+ >
197
+ >
198
+ ? // Dynamic-size (homogenous) UseQueryOptions array: map directly to array of results
199
+ Array<
200
+ CreateQueryResult<
201
+ unknown extends TData ? TQueryFnData : TData,
202
+ unknown extends TError ? DefaultError : TError
203
+ >
204
+ >
205
+ : // Fallback
206
+ Array<CreateQueryResult>
183
207
 
184
208
  export function createQueries<
185
209
  T extends Array<any>,