@tanstack/solid-query 5.38.0 → 5.40.1

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 (8) hide show
  1. package/build/dev.cjs +7 -4
  2. package/build/dev.js +7 -4
  3. package/build/index.cjs +7 -4
  4. package/build/index.d.cts +6 -11
  5. package/build/index.d.ts +6 -11
  6. package/build/index.js +7 -4
  7. package/package.json +2 -2
  8. package/src/createQueries.ts +22 -34
package/build/dev.cjs CHANGED
@@ -408,11 +408,14 @@ function createQueries(queriesOptions, queryClient) {
408
408
  const isRestoring = exports.useIsRestoring();
409
409
  const defaultedQueries = solidJs.createMemo(
410
410
  () => queriesOptions().queries.map(
411
- (options) => solidJs.mergeProps(client().defaultQueryOptions(options), {
412
- get _optimisticResults() {
413
- return isRestoring() ? "isRestoring" : "optimistic";
411
+ (options) => solidJs.mergeProps(
412
+ client().defaultQueryOptions(options),
413
+ {
414
+ get _optimisticResults() {
415
+ return isRestoring() ? "isRestoring" : "optimistic";
416
+ }
414
417
  }
415
- })
418
+ )
416
419
  )
417
420
  );
418
421
  const observer = new queryCore.QueriesObserver(
package/build/dev.js CHANGED
@@ -407,11 +407,14 @@ function createQueries(queriesOptions, queryClient) {
407
407
  const isRestoring = useIsRestoring();
408
408
  const defaultedQueries = createMemo(
409
409
  () => queriesOptions().queries.map(
410
- (options) => mergeProps(client().defaultQueryOptions(options), {
411
- get _optimisticResults() {
412
- return isRestoring() ? "isRestoring" : "optimistic";
410
+ (options) => mergeProps(
411
+ client().defaultQueryOptions(options),
412
+ {
413
+ get _optimisticResults() {
414
+ return isRestoring() ? "isRestoring" : "optimistic";
415
+ }
413
416
  }
414
- })
417
+ )
415
418
  )
416
419
  );
417
420
  const observer = new QueriesObserver(
package/build/index.cjs CHANGED
@@ -399,11 +399,14 @@ function createQueries(queriesOptions, queryClient) {
399
399
  const isRestoring = exports.useIsRestoring();
400
400
  const defaultedQueries = solidJs.createMemo(
401
401
  () => queriesOptions().queries.map(
402
- (options) => solidJs.mergeProps(client().defaultQueryOptions(options), {
403
- get _optimisticResults() {
404
- return isRestoring() ? "isRestoring" : "optimistic";
402
+ (options) => solidJs.mergeProps(
403
+ client().defaultQueryOptions(options),
404
+ {
405
+ get _optimisticResults() {
406
+ return isRestoring() ? "isRestoring" : "optimistic";
407
+ }
405
408
  }
406
- })
409
+ )
407
410
  )
408
411
  );
409
412
  const observer = new queryCore.QueriesObserver(
package/build/index.d.cts CHANGED
@@ -1,4 +1,4 @@
1
- import { DefaultError, QueryKey, OmitKeyof, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, DefaultOptions as DefaultOptions$1, QueryClientConfig as QueryClientConfig$1, QueryClient as QueryClient$1, QueryObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, MutateFunction, MutationObserverResult, DataTag, QueryFilters, InfiniteData, MutationFilters, MutationState, Mutation, QueriesPlaceholderDataFunction, QueryFunction, SkipToken, ThrowOnError } from '@tanstack/query-core';
1
+ import { DefaultError, QueryKey, OmitKeyof, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, DefaultOptions as DefaultOptions$1, QueryClientConfig as QueryClientConfig$1, QueryClient as QueryClient$1, QueryObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, MutateFunction, MutationObserverResult, DataTag, QueryFilters, InfiniteData, MutationFilters, MutationState, Mutation, 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';
@@ -135,6 +135,7 @@ type CreateQueryOptionsForCreateQueries<TQueryFnData = unknown, TError = Default
135
135
  suspense?: boolean;
136
136
  };
137
137
  type MAXIMUM_DEPTH = 20;
138
+ type SkipTokenForUseQueries = symbol;
138
139
  type GetOptions<T> = T extends {
139
140
  queryFnData: infer TQueryFnData;
140
141
  error?: infer TError;
@@ -146,13 +147,10 @@ type GetOptions<T> = T extends {
146
147
  data: infer TData;
147
148
  error?: infer TError;
148
149
  } ? 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 {
149
- queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> | SkipToken;
150
+ queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> | SkipTokenForUseQueries;
150
151
  select?: (data: any) => infer TData;
151
152
  throwOnError?: ThrowOnError<any, infer TError, any, any>;
152
- } ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey> : T extends {
153
- queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> | SkipToken;
154
- throwOnError?: ThrowOnError<any, infer TError, any, any>;
155
- } ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TQueryFnData, TQueryKey> : CreateQueryOptionsForCreateQueries;
153
+ } ? CreateQueryOptionsForCreateQueries<TQueryFnData, unknown extends TError ? DefaultError : TError, unknown extends TData ? TQueryFnData : TData, TQueryKey> : CreateQueryOptionsForCreateQueries;
156
154
  type GetResults<T> = T extends {
157
155
  queryFnData: any;
158
156
  error?: infer TError;
@@ -164,13 +162,10 @@ type GetResults<T> = T extends {
164
162
  data: infer TData;
165
163
  error?: infer TError;
166
164
  } ? 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 {
167
- queryFn?: QueryFunction<infer TQueryFnData, any>;
165
+ queryFn?: QueryFunction<infer TQueryFnData, any> | SkipTokenForUseQueries;
168
166
  select?: (data: any) => infer TData;
169
167
  throwOnError?: ThrowOnError<any, infer TError, any, any>;
170
- } ? CreateQueryResult<unknown extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError> : T extends {
171
- queryFn?: QueryFunction<infer TQueryFnData, any>;
172
- throwOnError?: ThrowOnError<any, infer TError, any, any>;
173
- } ? CreateQueryResult<TQueryFnData, unknown extends TError ? DefaultError : TError> : CreateQueryResult;
168
+ } ? CreateQueryResult<unknown extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError> : CreateQueryResult;
174
169
  /**
175
170
  * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
176
171
  */
package/build/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { DefaultError, QueryKey, OmitKeyof, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, DefaultOptions as DefaultOptions$1, QueryClientConfig as QueryClientConfig$1, QueryClient as QueryClient$1, QueryObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, MutateFunction, MutationObserverResult, DataTag, QueryFilters, InfiniteData, MutationFilters, MutationState, Mutation, QueriesPlaceholderDataFunction, QueryFunction, SkipToken, ThrowOnError } from '@tanstack/query-core';
1
+ import { DefaultError, QueryKey, OmitKeyof, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, DefaultOptions as DefaultOptions$1, QueryClientConfig as QueryClientConfig$1, QueryClient as QueryClient$1, QueryObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, MutateFunction, MutationObserverResult, DataTag, QueryFilters, InfiniteData, MutationFilters, MutationState, Mutation, 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';
@@ -135,6 +135,7 @@ type CreateQueryOptionsForCreateQueries<TQueryFnData = unknown, TError = Default
135
135
  suspense?: boolean;
136
136
  };
137
137
  type MAXIMUM_DEPTH = 20;
138
+ type SkipTokenForUseQueries = symbol;
138
139
  type GetOptions<T> = T extends {
139
140
  queryFnData: infer TQueryFnData;
140
141
  error?: infer TError;
@@ -146,13 +147,10 @@ type GetOptions<T> = T extends {
146
147
  data: infer TData;
147
148
  error?: infer TError;
148
149
  } ? 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 {
149
- queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> | SkipToken;
150
+ queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> | SkipTokenForUseQueries;
150
151
  select?: (data: any) => infer TData;
151
152
  throwOnError?: ThrowOnError<any, infer TError, any, any>;
152
- } ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey> : T extends {
153
- queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> | SkipToken;
154
- throwOnError?: ThrowOnError<any, infer TError, any, any>;
155
- } ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TQueryFnData, TQueryKey> : CreateQueryOptionsForCreateQueries;
153
+ } ? CreateQueryOptionsForCreateQueries<TQueryFnData, unknown extends TError ? DefaultError : TError, unknown extends TData ? TQueryFnData : TData, TQueryKey> : CreateQueryOptionsForCreateQueries;
156
154
  type GetResults<T> = T extends {
157
155
  queryFnData: any;
158
156
  error?: infer TError;
@@ -164,13 +162,10 @@ type GetResults<T> = T extends {
164
162
  data: infer TData;
165
163
  error?: infer TError;
166
164
  } ? 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 {
167
- queryFn?: QueryFunction<infer TQueryFnData, any>;
165
+ queryFn?: QueryFunction<infer TQueryFnData, any> | SkipTokenForUseQueries;
168
166
  select?: (data: any) => infer TData;
169
167
  throwOnError?: ThrowOnError<any, infer TError, any, any>;
170
- } ? CreateQueryResult<unknown extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError> : T extends {
171
- queryFn?: QueryFunction<infer TQueryFnData, any>;
172
- throwOnError?: ThrowOnError<any, infer TError, any, any>;
173
- } ? CreateQueryResult<TQueryFnData, unknown extends TError ? DefaultError : TError> : CreateQueryResult;
168
+ } ? CreateQueryResult<unknown extends TData ? TQueryFnData : TData, unknown extends TError ? DefaultError : TError> : CreateQueryResult;
174
169
  /**
175
170
  * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
176
171
  */
package/build/index.js CHANGED
@@ -398,11 +398,14 @@ function createQueries(queriesOptions, queryClient) {
398
398
  const isRestoring = useIsRestoring();
399
399
  const defaultedQueries = createMemo(
400
400
  () => queriesOptions().queries.map(
401
- (options) => mergeProps(client().defaultQueryOptions(options), {
402
- get _optimisticResults() {
403
- return isRestoring() ? "isRestoring" : "optimistic";
401
+ (options) => mergeProps(
402
+ client().defaultQueryOptions(options),
403
+ {
404
+ get _optimisticResults() {
405
+ return isRestoring() ? "isRestoring" : "optimistic";
406
+ }
404
407
  }
405
- })
408
+ )
406
409
  )
407
410
  );
408
411
  const observer = new QueriesObserver(
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tanstack/solid-query",
3
- "version": "5.38.0",
3
+ "version": "5.40.1",
4
4
  "description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
5
5
  "author": "tannerlinsley",
6
6
  "license": "MIT",
@@ -45,7 +45,7 @@
45
45
  ],
46
46
  "dependencies": {
47
47
  "solid-js": "^1.8.17",
48
- "@tanstack/query-core": "5.38.0"
48
+ "@tanstack/query-core": "5.40.0"
49
49
  },
50
50
  "devDependencies": {
51
51
  "tsup-preset-solid": "^2.2.0",
package/src/createQueries.ts CHANGED
@@ -23,8 +23,8 @@ import type {
23
23
  QueriesPlaceholderDataFunction,
24
24
  QueryFunction,
25
25
  QueryKey,
26
+ QueryObserverOptions,
26
27
  QueryObserverResult,
27
- SkipToken,
28
28
  ThrowOnError,
29
29
  } from '@tanstack/query-core'
30
30
 
@@ -52,6 +52,9 @@ type CreateQueryOptionsForCreateQueries<
52
52
  // Avoid TS depth-limit error in case of large array literal
53
53
  type MAXIMUM_DEPTH = 20
54
54
 
55
+ // Widen the type of the symbol to enable type inference even if skipToken is not immutable.
56
+ type SkipTokenForUseQueries = symbol
57
+
55
58
  type GetOptions<T> =
56
59
  // Part 1: responsible for applying explicit type parameter to function arguments, if object { queryFnData: TQueryFnData, error: TError, data: TData }
57
60
  T extends {
@@ -75,30 +78,18 @@ type GetOptions<T> =
75
78
  T extends {
76
79
  queryFn?:
77
80
  | QueryFunction<infer TQueryFnData, infer TQueryKey>
78
- | SkipToken
81
+ | SkipTokenForUseQueries
79
82
  select?: (data: any) => infer TData
80
83
  throwOnError?: ThrowOnError<any, infer TError, any, any>
81
84
  }
82
85
  ? CreateQueryOptionsForCreateQueries<
83
86
  TQueryFnData,
84
- TError,
85
- TData,
87
+ unknown extends TError ? DefaultError : TError,
88
+ unknown extends TData ? TQueryFnData : TData,
86
89
  TQueryKey
87
90
  >
88
- : T extends {
89
- queryFn?:
90
- | QueryFunction<infer TQueryFnData, infer TQueryKey>
91
- | SkipToken
92
- throwOnError?: ThrowOnError<any, infer TError, any, any>
93
- }
94
- ? CreateQueryOptionsForCreateQueries<
95
- TQueryFnData,
96
- TError,
97
- TQueryFnData,
98
- TQueryKey
99
- >
100
- : // Fallback
101
- CreateQueryOptionsForCreateQueries
91
+ : // Fallback
92
+ CreateQueryOptionsForCreateQueries
102
93
 
103
94
  type GetResults<T> =
104
95
  // Part 1: responsible for mapping explicit type parameter to function result, if object
@@ -117,7 +108,9 @@ type GetResults<T> =
117
108
  ? CreateQueryResult<TQueryFnData>
118
109
  : // Part 3: responsible for mapping inferred type to results, if no explicit parameter was provided
119
110
  T extends {
120
- queryFn?: QueryFunction<infer TQueryFnData, any>
111
+ queryFn?:
112
+ | QueryFunction<infer TQueryFnData, any>
113
+ | SkipTokenForUseQueries
121
114
  select?: (data: any) => infer TData
122
115
  throwOnError?: ThrowOnError<any, infer TError, any, any>
123
116
  }
@@ -125,16 +118,8 @@ type GetResults<T> =
125
118
  unknown extends TData ? TQueryFnData : TData,
126
119
  unknown extends TError ? DefaultError : TError
127
120
  >
128
- : T extends {
129
- queryFn?: QueryFunction<infer TQueryFnData, any>
130
- throwOnError?: ThrowOnError<any, infer TError, any, any>
131
- }
132
- ? CreateQueryResult<
133
- TQueryFnData,
134
- unknown extends TError ? DefaultError : TError
135
- >
136
- : // Fallback
137
- CreateQueryResult
121
+ : // Fallback
122
+ CreateQueryResult
138
123
 
139
124
  /**
140
125
  * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
@@ -228,13 +213,16 @@ export function createQueries<
228
213
  const client = createMemo(() => useQueryClient(queryClient?.()))
229
214
  const isRestoring = useIsRestoring()
230
215
 
231
- const defaultedQueries: QueriesOptions<any> = createMemo(() =>
216
+ const defaultedQueries = createMemo(() =>
232
217
  queriesOptions().queries.map((options) =>
233
- mergeProps(client().defaultQueryOptions(options), {
234
- get _optimisticResults() {
235
- return isRestoring() ? 'isRestoring' : 'optimistic'
218
+ mergeProps(
219
+ client().defaultQueryOptions(options as QueryObserverOptions),
220
+ {
221
+ get _optimisticResults() {
222
+ return isRestoring() ? 'isRestoring' : 'optimistic'
223
+ },
236
224
  },
237
- }),
225
+ ),
238
226
  ),
239
227
  )
240
228