@tanstack/solid-query 5.71.2 → 5.71.4

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 (10) hide show
  1. package/build/dev.cjs +5 -10
  2. package/build/dev.js +5 -10
  3. package/build/index.cjs +5 -10
  4. package/build/index.d.cts +9 -10
  5. package/build/index.d.ts +9 -10
  6. package/build/index.js +5 -10
  7. package/package.json +2 -2
  8. package/src/infiniteQueryOptions.ts +4 -3
  9. package/src/queryOptions.ts +4 -3
  10. package/src/types.ts +4 -5
package/build/dev.cjs CHANGED
@@ -52,8 +52,7 @@ exports.IsRestoringProvider = IsRestoringContext.Provider;
52
52
 
53
53
  // src/createBaseQuery.ts
54
54
  function reconcileFn(store$1, result, reconcileOption, queryHash) {
55
- if (reconcileOption === false)
56
- return result;
55
+ if (reconcileOption === false) return result;
57
56
  if (typeof reconcileOption === "function") {
58
57
  const newData2 = reconcileOption(store$1.data, result.data);
59
58
  return { ...result, data: newData2 };
@@ -78,8 +77,7 @@ function reconcileFn(store$1, result, reconcileOption, queryHash) {
78
77
  return { ...result, data: newData };
79
78
  }
80
79
  var hydratableObserverResult = (query, result) => {
81
- if (!web.isServer)
82
- return result;
80
+ if (!web.isServer) return result;
83
81
  const obj = {
84
82
  ...store.unwrap(result),
85
83
  // During SSR, functions cannot be serialized, so we need to remove them
@@ -227,8 +225,7 @@ function createBaseQuery(options, Observer, queryClient) {
227
225
  queries: [{ ...info.value.hydrationData }]
228
226
  });
229
227
  }
230
- if (unsubscribe)
231
- return;
228
+ if (unsubscribe) return;
232
229
  const newOptions = { ...initialOptions };
233
230
  if ((initialOptions.staleTime || !initialOptions.initialData) && info.value) {
234
231
  newOptions.refetchOnMount = false;
@@ -458,8 +455,7 @@ function createQueries(queriesOptions, queryClient) {
458
455
  () => state.length,
459
456
  () => state.map((queryRes) => {
460
457
  const dataPromise = () => new Promise((resolve) => {
461
- if (queryRes.isFetching && queryRes.isLoading)
462
- return;
458
+ if (queryRes.isFetching && queryRes.isLoading) return;
463
459
  resolve(store.unwrap(queryRes.data));
464
460
  });
465
461
  return solidJs.createResource(dataPromise);
@@ -490,8 +486,7 @@ function createQueries(queriesOptions, queryClient) {
490
486
  });
491
487
  queueMicrotask(() => {
492
488
  const taskToRun = taskQueue.pop();
493
- if (taskToRun)
494
- taskToRun();
489
+ if (taskToRun) taskToRun();
495
490
  taskQueue = [];
496
491
  });
497
492
  });
package/build/dev.js CHANGED
@@ -51,8 +51,7 @@ var IsRestoringProvider = IsRestoringContext.Provider;
51
51
 
52
52
  // src/createBaseQuery.ts
53
53
  function reconcileFn(store, result, reconcileOption, queryHash) {
54
- if (reconcileOption === false)
55
- return result;
54
+ if (reconcileOption === false) return result;
56
55
  if (typeof reconcileOption === "function") {
57
56
  const newData2 = reconcileOption(store.data, result.data);
58
57
  return { ...result, data: newData2 };
@@ -77,8 +76,7 @@ function reconcileFn(store, result, reconcileOption, queryHash) {
77
76
  return { ...result, data: newData };
78
77
  }
79
78
  var hydratableObserverResult = (query, result) => {
80
- if (!isServer)
81
- return result;
79
+ if (!isServer) return result;
82
80
  const obj = {
83
81
  ...unwrap(result),
84
82
  // During SSR, functions cannot be serialized, so we need to remove them
@@ -226,8 +224,7 @@ function createBaseQuery(options, Observer, queryClient) {
226
224
  queries: [{ ...info.value.hydrationData }]
227
225
  });
228
226
  }
229
- if (unsubscribe)
230
- return;
227
+ if (unsubscribe) return;
231
228
  const newOptions = { ...initialOptions };
232
229
  if ((initialOptions.staleTime || !initialOptions.initialData) && info.value) {
233
230
  newOptions.refetchOnMount = false;
@@ -457,8 +454,7 @@ function createQueries(queriesOptions, queryClient) {
457
454
  () => state.length,
458
455
  () => state.map((queryRes) => {
459
456
  const dataPromise = () => new Promise((resolve) => {
460
- if (queryRes.isFetching && queryRes.isLoading)
461
- return;
457
+ if (queryRes.isFetching && queryRes.isLoading) return;
462
458
  resolve(unwrap(queryRes.data));
463
459
  });
464
460
  return createResource(dataPromise);
@@ -489,8 +485,7 @@ function createQueries(queriesOptions, queryClient) {
489
485
  });
490
486
  queueMicrotask(() => {
491
487
  const taskToRun = taskQueue.pop();
492
- if (taskToRun)
493
- taskToRun();
488
+ if (taskToRun) taskToRun();
494
489
  taskQueue = [];
495
490
  });
496
491
  });
package/build/index.cjs CHANGED
@@ -52,8 +52,7 @@ exports.IsRestoringProvider = IsRestoringContext.Provider;
52
52
 
53
53
  // src/createBaseQuery.ts
54
54
  function reconcileFn(store$1, result, reconcileOption, queryHash) {
55
- if (reconcileOption === false)
56
- return result;
55
+ if (reconcileOption === false) return result;
57
56
  if (typeof reconcileOption === "function") {
58
57
  const newData2 = reconcileOption(store$1.data, result.data);
59
58
  return { ...result, data: newData2 };
@@ -69,8 +68,7 @@ function reconcileFn(store$1, result, reconcileOption, queryHash) {
69
68
  return { ...result, data: newData };
70
69
  }
71
70
  var hydratableObserverResult = (query, result) => {
72
- if (!web.isServer)
73
- return result;
71
+ if (!web.isServer) return result;
74
72
  const obj = {
75
73
  ...store.unwrap(result),
76
74
  // During SSR, functions cannot be serialized, so we need to remove them
@@ -218,8 +216,7 @@ function createBaseQuery(options, Observer, queryClient) {
218
216
  queries: [{ ...info.value.hydrationData }]
219
217
  });
220
218
  }
221
- if (unsubscribe)
222
- return;
219
+ if (unsubscribe) return;
223
220
  const newOptions = { ...initialOptions };
224
221
  if ((initialOptions.staleTime || !initialOptions.initialData) && info.value) {
225
222
  newOptions.refetchOnMount = false;
@@ -449,8 +446,7 @@ function createQueries(queriesOptions, queryClient) {
449
446
  () => state.length,
450
447
  () => state.map((queryRes) => {
451
448
  const dataPromise = () => new Promise((resolve) => {
452
- if (queryRes.isFetching && queryRes.isLoading)
453
- return;
449
+ if (queryRes.isFetching && queryRes.isLoading) return;
454
450
  resolve(store.unwrap(queryRes.data));
455
451
  });
456
452
  return solidJs.createResource(dataPromise);
@@ -481,8 +477,7 @@ function createQueries(queriesOptions, queryClient) {
481
477
  });
482
478
  queueMicrotask(() => {
483
479
  const taskToRun = taskQueue.pop();
484
- if (taskToRun)
485
- taskToRun();
480
+ if (taskToRun) taskToRun();
486
481
  taskQueue = [];
487
482
  });
488
483
  });
package/build/index.d.cts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { QueryClient as QueryClient$1, QueryClientConfig as QueryClientConfig$1, DefaultError, DefaultOptions as DefaultOptions$1, OmitKeyof, QueryKey, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, QueryObserverResult, DefinedQueryObserverResult, DefinedInfiniteQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, Override, MutationObserverResult, MutateFunction, DataTag, QueryFilters, InfiniteData, MutationFilters, MutationState, Mutation, QueryFunction, ThrowOnError, QueriesPlaceholderDataFunction } from '@tanstack/query-core';
2
2
  export * from '@tanstack/query-core';
3
3
  import * as solid_js from 'solid-js';
4
- import { JSX, Accessor } from 'solid-js';
4
+ import { Accessor, JSX } from 'solid-js';
5
5
 
6
6
  interface QueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = never> extends OmitKeyof<QueryObserverOptions$1<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'structuralSharing'> {
7
7
  /**
@@ -31,7 +31,6 @@ declare class QueryClient extends QueryClient$1 {
31
31
  constructor(config?: QueryClientConfig);
32
32
  }
33
33
 
34
- type FunctionedParams<T> = () => T;
35
34
  interface CreateBaseQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends OmitKeyof<QueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>, 'suspense'> {
36
35
  /**
37
36
  * Only applicable while rendering queries on the server with streaming.
@@ -49,7 +48,7 @@ interface CreateBaseQueryOptions<TQueryFnData = unknown, TError = DefaultError,
49
48
  }
50
49
  interface SolidQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends CreateBaseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey> {
51
50
  }
52
- type CreateQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = FunctionedParams<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>>;
51
+ type CreateQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Accessor<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>>;
53
52
  type CreateBaseQueryResult<TData = unknown, TError = DefaultError> = QueryObserverResult<TData, TError>;
54
53
  type CreateQueryResult<TData = unknown, TError = DefaultError> = CreateBaseQueryResult<TData, TError>;
55
54
  type DefinedCreateBaseQueryResult<TData = unknown, TError = DefaultError> = DefinedQueryObserverResult<TData, TError>;
@@ -70,12 +69,12 @@ interface SolidInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultErro
70
69
  */
71
70
  suspense?: boolean;
72
71
  }
73
- type CreateInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = FunctionedParams<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey, TPageParam>>;
72
+ type CreateInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = Accessor<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey, TPageParam>>;
74
73
  type CreateInfiniteQueryResult<TData = unknown, TError = DefaultError> = InfiniteQueryObserverResult<TData, TError>;
75
74
  type DefinedCreateInfiniteQueryResult<TData = unknown, TError = DefaultError> = DefinedInfiniteQueryObserverResult<TData, TError>;
76
75
  interface SolidMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> extends OmitKeyof<MutationObserverOptions<TData, TError, TVariables, TContext>, '_defaulted'> {
77
76
  }
78
- type CreateMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = FunctionedParams<SolidMutationOptions<TData, TError, TVariables, TContext>>;
77
+ type CreateMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = Accessor<SolidMutationOptions<TData, TError, TVariables, TContext>>;
79
78
  type CreateMutateFunction<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = (...args: Parameters<MutateFunction<TData, TError, TVariables, TContext>>) => void;
80
79
  type CreateMutateAsyncFunction<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = MutateFunction<TData, TError, TVariables, TContext>;
81
80
  type CreateBaseMutationResult<TData = unknown, TError = DefaultError, TVariables = unknown, TContext = unknown> = Override<MutationObserverResult<TData, TError, TVariables, TContext>, {
@@ -85,10 +84,10 @@ type CreateBaseMutationResult<TData = unknown, TError = DefaultError, TVariables
85
84
  };
86
85
  type CreateMutationResult<TData = unknown, TError = DefaultError, TVariables = unknown, TContext = unknown> = CreateBaseMutationResult<TData, TError, TVariables, TContext>;
87
86
 
88
- type UndefinedInitialDataOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = FunctionedParams<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
87
+ type UndefinedInitialDataOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Accessor<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
89
88
  initialData?: undefined;
90
89
  }>;
91
- type DefinedInitialDataOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = FunctionedParams<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
90
+ type DefinedInitialDataOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Accessor<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
92
91
  initialData: TQueryFnData | (() => TQueryFnData);
93
92
  }>;
94
93
  declare function queryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TOptions extends ReturnType<UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>> = ReturnType<UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>>>(options: ReturnType<UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>>): ReturnType<UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>> & {
@@ -111,11 +110,11 @@ declare const QueryClientProvider: (props: QueryClientProviderProps) => JSX.Elem
111
110
 
112
111
  declare function useIsFetching(filters?: Accessor<QueryFilters>, queryClient?: Accessor<QueryClient>): Accessor<number>;
113
112
 
114
- type UndefinedInitialDataInfiniteOptions<TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = FunctionedParams<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey, TPageParam> & {
113
+ type UndefinedInitialDataInfiniteOptions<TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = Accessor<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey, TPageParam> & {
115
114
  initialData?: undefined;
116
115
  }>;
117
116
  type NonUndefinedGuard<T> = T extends undefined ? never : T;
118
- type DefinedInitialDataInfiniteOptions<TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = FunctionedParams<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey, TPageParam> & {
117
+ type DefinedInitialDataInfiniteOptions<TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = Accessor<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey, TPageParam> & {
119
118
  initialData: NonUndefinedGuard<InfiniteData<TQueryFnData, TPageParam>> | (() => NonUndefinedGuard<InfiniteData<TQueryFnData, TPageParam>>);
120
119
  }>;
121
120
  declare function infiniteQueryOptions<TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown>(options: ReturnType<DefinedInitialDataInfiniteOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>>): ReturnType<DefinedInitialDataInfiniteOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>> & {
@@ -216,4 +215,4 @@ declare function createQueries<T extends Array<any>, TCombinedResult extends Que
216
215
  declare const useIsRestoring: () => Accessor<boolean>;
217
216
  declare const IsRestoringProvider: solid_js.ContextProviderComponent<Accessor<boolean>>;
218
217
 
219
- export { type CreateBaseMutationResult, type CreateBaseQueryOptions, type CreateBaseQueryResult, type CreateInfiniteQueryOptions, type CreateInfiniteQueryResult, type CreateMutateAsyncFunction, type CreateMutateFunction, type CreateMutationOptions, type CreateMutationResult, type CreateQueryOptions, type CreateQueryResult, type DefaultOptions, type DefinedCreateBaseQueryResult, type DefinedCreateInfiniteQueryResult, type DefinedCreateQueryResult, type DefinedInitialDataInfiniteOptions, type DefinedInitialDataOptions, type FunctionedParams, type InfiniteQueryObserverOptions, IsRestoringProvider, QueryClient, type QueryClientConfig, QueryClientContext, QueryClientProvider, type QueryClientProviderProps, type QueryObserverOptions, type SolidInfiniteQueryOptions, type SolidMutationOptions, type SolidQueryOptions, type UndefinedInitialDataInfiniteOptions, type UndefinedInitialDataOptions, createInfiniteQuery, createMutation, createQueries, createQuery, infiniteQueryOptions, queryOptions, useIsFetching, useIsMutating, useIsRestoring, useMutationState, useQueryClient };
218
+ export { type CreateBaseMutationResult, type CreateBaseQueryOptions, type CreateBaseQueryResult, type CreateInfiniteQueryOptions, type CreateInfiniteQueryResult, type CreateMutateAsyncFunction, type CreateMutateFunction, type CreateMutationOptions, type CreateMutationResult, type CreateQueryOptions, type CreateQueryResult, type DefaultOptions, type DefinedCreateBaseQueryResult, type DefinedCreateInfiniteQueryResult, type DefinedCreateQueryResult, type DefinedInitialDataInfiniteOptions, type DefinedInitialDataOptions, type InfiniteQueryObserverOptions, IsRestoringProvider, QueryClient, type QueryClientConfig, QueryClientContext, QueryClientProvider, type QueryClientProviderProps, type QueryObserverOptions, type SolidInfiniteQueryOptions, type SolidMutationOptions, type SolidQueryOptions, type UndefinedInitialDataInfiniteOptions, type UndefinedInitialDataOptions, createInfiniteQuery, createMutation, createQueries, createQuery, infiniteQueryOptions, queryOptions, useIsFetching, useIsMutating, useIsRestoring, useMutationState, useQueryClient };
package/build/index.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { QueryClient as QueryClient$1, QueryClientConfig as QueryClientConfig$1, DefaultError, DefaultOptions as DefaultOptions$1, OmitKeyof, QueryKey, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, QueryObserverResult, DefinedQueryObserverResult, DefinedInfiniteQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, Override, MutationObserverResult, MutateFunction, DataTag, QueryFilters, InfiniteData, MutationFilters, MutationState, Mutation, QueryFunction, ThrowOnError, QueriesPlaceholderDataFunction } from '@tanstack/query-core';
2
2
  export * from '@tanstack/query-core';
3
3
  import * as solid_js from 'solid-js';
4
- import { JSX, Accessor } from 'solid-js';
4
+ import { Accessor, JSX } from 'solid-js';
5
5
 
6
6
  interface QueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = never> extends OmitKeyof<QueryObserverOptions$1<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'structuralSharing'> {
7
7
  /**
@@ -31,7 +31,6 @@ declare class QueryClient extends QueryClient$1 {
31
31
  constructor(config?: QueryClientConfig);
32
32
  }
33
33
 
34
- type FunctionedParams<T> = () => T;
35
34
  interface CreateBaseQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends OmitKeyof<QueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>, 'suspense'> {
36
35
  /**
37
36
  * Only applicable while rendering queries on the server with streaming.
@@ -49,7 +48,7 @@ interface CreateBaseQueryOptions<TQueryFnData = unknown, TError = DefaultError,
49
48
  }
50
49
  interface SolidQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends CreateBaseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey> {
51
50
  }
52
- type CreateQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = FunctionedParams<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>>;
51
+ type CreateQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Accessor<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>>;
53
52
  type CreateBaseQueryResult<TData = unknown, TError = DefaultError> = QueryObserverResult<TData, TError>;
54
53
  type CreateQueryResult<TData = unknown, TError = DefaultError> = CreateBaseQueryResult<TData, TError>;
55
54
  type DefinedCreateBaseQueryResult<TData = unknown, TError = DefaultError> = DefinedQueryObserverResult<TData, TError>;
@@ -70,12 +69,12 @@ interface SolidInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultErro
70
69
  */
71
70
  suspense?: boolean;
72
71
  }
73
- type CreateInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = FunctionedParams<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey, TPageParam>>;
72
+ type CreateInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = Accessor<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey, TPageParam>>;
74
73
  type CreateInfiniteQueryResult<TData = unknown, TError = DefaultError> = InfiniteQueryObserverResult<TData, TError>;
75
74
  type DefinedCreateInfiniteQueryResult<TData = unknown, TError = DefaultError> = DefinedInfiniteQueryObserverResult<TData, TError>;
76
75
  interface SolidMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> extends OmitKeyof<MutationObserverOptions<TData, TError, TVariables, TContext>, '_defaulted'> {
77
76
  }
78
- type CreateMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = FunctionedParams<SolidMutationOptions<TData, TError, TVariables, TContext>>;
77
+ type CreateMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = Accessor<SolidMutationOptions<TData, TError, TVariables, TContext>>;
79
78
  type CreateMutateFunction<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = (...args: Parameters<MutateFunction<TData, TError, TVariables, TContext>>) => void;
80
79
  type CreateMutateAsyncFunction<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = MutateFunction<TData, TError, TVariables, TContext>;
81
80
  type CreateBaseMutationResult<TData = unknown, TError = DefaultError, TVariables = unknown, TContext = unknown> = Override<MutationObserverResult<TData, TError, TVariables, TContext>, {
@@ -85,10 +84,10 @@ type CreateBaseMutationResult<TData = unknown, TError = DefaultError, TVariables
85
84
  };
86
85
  type CreateMutationResult<TData = unknown, TError = DefaultError, TVariables = unknown, TContext = unknown> = CreateBaseMutationResult<TData, TError, TVariables, TContext>;
87
86
 
88
- type UndefinedInitialDataOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = FunctionedParams<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
87
+ type UndefinedInitialDataOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Accessor<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
89
88
  initialData?: undefined;
90
89
  }>;
91
- type DefinedInitialDataOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = FunctionedParams<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
90
+ type DefinedInitialDataOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Accessor<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
92
91
  initialData: TQueryFnData | (() => TQueryFnData);
93
92
  }>;
94
93
  declare function queryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TOptions extends ReturnType<UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>> = ReturnType<UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>>>(options: ReturnType<UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>>): ReturnType<UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>> & {
@@ -111,11 +110,11 @@ declare const QueryClientProvider: (props: QueryClientProviderProps) => JSX.Elem
111
110
 
112
111
  declare function useIsFetching(filters?: Accessor<QueryFilters>, queryClient?: Accessor<QueryClient>): Accessor<number>;
113
112
 
114
- type UndefinedInitialDataInfiniteOptions<TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = FunctionedParams<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey, TPageParam> & {
113
+ type UndefinedInitialDataInfiniteOptions<TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = Accessor<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey, TPageParam> & {
115
114
  initialData?: undefined;
116
115
  }>;
117
116
  type NonUndefinedGuard<T> = T extends undefined ? never : T;
118
- type DefinedInitialDataInfiniteOptions<TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = FunctionedParams<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey, TPageParam> & {
117
+ type DefinedInitialDataInfiniteOptions<TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = Accessor<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey, TPageParam> & {
119
118
  initialData: NonUndefinedGuard<InfiniteData<TQueryFnData, TPageParam>> | (() => NonUndefinedGuard<InfiniteData<TQueryFnData, TPageParam>>);
120
119
  }>;
121
120
  declare function infiniteQueryOptions<TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown>(options: ReturnType<DefinedInitialDataInfiniteOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>>): ReturnType<DefinedInitialDataInfiniteOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>> & {
@@ -216,4 +215,4 @@ declare function createQueries<T extends Array<any>, TCombinedResult extends Que
216
215
  declare const useIsRestoring: () => Accessor<boolean>;
217
216
  declare const IsRestoringProvider: solid_js.ContextProviderComponent<Accessor<boolean>>;
218
217
 
219
- export { type CreateBaseMutationResult, type CreateBaseQueryOptions, type CreateBaseQueryResult, type CreateInfiniteQueryOptions, type CreateInfiniteQueryResult, type CreateMutateAsyncFunction, type CreateMutateFunction, type CreateMutationOptions, type CreateMutationResult, type CreateQueryOptions, type CreateQueryResult, type DefaultOptions, type DefinedCreateBaseQueryResult, type DefinedCreateInfiniteQueryResult, type DefinedCreateQueryResult, type DefinedInitialDataInfiniteOptions, type DefinedInitialDataOptions, type FunctionedParams, type InfiniteQueryObserverOptions, IsRestoringProvider, QueryClient, type QueryClientConfig, QueryClientContext, QueryClientProvider, type QueryClientProviderProps, type QueryObserverOptions, type SolidInfiniteQueryOptions, type SolidMutationOptions, type SolidQueryOptions, type UndefinedInitialDataInfiniteOptions, type UndefinedInitialDataOptions, createInfiniteQuery, createMutation, createQueries, createQuery, infiniteQueryOptions, queryOptions, useIsFetching, useIsMutating, useIsRestoring, useMutationState, useQueryClient };
218
+ export { type CreateBaseMutationResult, type CreateBaseQueryOptions, type CreateBaseQueryResult, type CreateInfiniteQueryOptions, type CreateInfiniteQueryResult, type CreateMutateAsyncFunction, type CreateMutateFunction, type CreateMutationOptions, type CreateMutationResult, type CreateQueryOptions, type CreateQueryResult, type DefaultOptions, type DefinedCreateBaseQueryResult, type DefinedCreateInfiniteQueryResult, type DefinedCreateQueryResult, type DefinedInitialDataInfiniteOptions, type DefinedInitialDataOptions, type InfiniteQueryObserverOptions, IsRestoringProvider, QueryClient, type QueryClientConfig, QueryClientContext, QueryClientProvider, type QueryClientProviderProps, type QueryObserverOptions, type SolidInfiniteQueryOptions, type SolidMutationOptions, type SolidQueryOptions, type UndefinedInitialDataInfiniteOptions, type UndefinedInitialDataOptions, createInfiniteQuery, createMutation, createQueries, createQuery, infiniteQueryOptions, queryOptions, useIsFetching, useIsMutating, useIsRestoring, useMutationState, useQueryClient };
package/build/index.js CHANGED
@@ -51,8 +51,7 @@ var IsRestoringProvider = IsRestoringContext.Provider;
51
51
 
52
52
  // src/createBaseQuery.ts
53
53
  function reconcileFn(store, result, reconcileOption, queryHash) {
54
- if (reconcileOption === false)
55
- return result;
54
+ if (reconcileOption === false) return result;
56
55
  if (typeof reconcileOption === "function") {
57
56
  const newData2 = reconcileOption(store.data, result.data);
58
57
  return { ...result, data: newData2 };
@@ -68,8 +67,7 @@ function reconcileFn(store, result, reconcileOption, queryHash) {
68
67
  return { ...result, data: newData };
69
68
  }
70
69
  var hydratableObserverResult = (query, result) => {
71
- if (!isServer)
72
- return result;
70
+ if (!isServer) return result;
73
71
  const obj = {
74
72
  ...unwrap(result),
75
73
  // During SSR, functions cannot be serialized, so we need to remove them
@@ -217,8 +215,7 @@ function createBaseQuery(options, Observer, queryClient) {
217
215
  queries: [{ ...info.value.hydrationData }]
218
216
  });
219
217
  }
220
- if (unsubscribe)
221
- return;
218
+ if (unsubscribe) return;
222
219
  const newOptions = { ...initialOptions };
223
220
  if ((initialOptions.staleTime || !initialOptions.initialData) && info.value) {
224
221
  newOptions.refetchOnMount = false;
@@ -448,8 +445,7 @@ function createQueries(queriesOptions, queryClient) {
448
445
  () => state.length,
449
446
  () => state.map((queryRes) => {
450
447
  const dataPromise = () => new Promise((resolve) => {
451
- if (queryRes.isFetching && queryRes.isLoading)
452
- return;
448
+ if (queryRes.isFetching && queryRes.isLoading) return;
453
449
  resolve(unwrap(queryRes.data));
454
450
  });
455
451
  return createResource(dataPromise);
@@ -480,8 +476,7 @@ function createQueries(queriesOptions, queryClient) {
480
476
  });
481
477
  queueMicrotask(() => {
482
478
  const taskToRun = taskQueue.pop();
483
- if (taskToRun)
484
- taskToRun();
479
+ if (taskToRun) taskToRun();
485
480
  taskQueue = [];
486
481
  });
487
482
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tanstack/solid-query",
3
- "version": "5.71.2",
3
+ "version": "5.71.4",
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
  "!src/__tests__"
46
46
  ],
47
47
  "dependencies": {
48
- "@tanstack/query-core": "5.71.1"
48
+ "@tanstack/query-core": "5.71.3"
49
49
  },
50
50
  "devDependencies": {
51
51
  "@solidjs/testing-library": "^0.8.10",
package/src/infiniteQueryOptions.ts CHANGED
@@ -4,7 +4,8 @@ import type {
4
4
  InfiniteData,
5
5
  QueryKey,
6
6
  } from '@tanstack/query-core'
7
- import type { FunctionedParams, SolidInfiniteQueryOptions } from './types'
7
+ import type { SolidInfiniteQueryOptions } from './types'
8
+ import type { Accessor } from 'solid-js'
8
9
 
9
10
  export type UndefinedInitialDataInfiniteOptions<
10
11
  TQueryFnData,
@@ -12,7 +13,7 @@ export type UndefinedInitialDataInfiniteOptions<
12
13
  TData = InfiniteData<TQueryFnData>,
13
14
  TQueryKey extends QueryKey = QueryKey,
14
15
  TPageParam = unknown,
15
- > = FunctionedParams<
16
+ > = Accessor<
16
17
  SolidInfiniteQueryOptions<
17
18
  TQueryFnData,
18
19
  TError,
@@ -34,7 +35,7 @@ export type DefinedInitialDataInfiniteOptions<
34
35
  TData = InfiniteData<TQueryFnData>,
35
36
  TQueryKey extends QueryKey = QueryKey,
36
37
  TPageParam = unknown,
37
- > = FunctionedParams<
38
+ > = Accessor<
38
39
  SolidInfiniteQueryOptions<
39
40
  TQueryFnData,
40
41
  TError,
package/src/queryOptions.ts CHANGED
@@ -1,12 +1,13 @@
1
1
  import type { DataTag, DefaultError, QueryKey } from '@tanstack/query-core'
2
- import type { FunctionedParams, SolidQueryOptions } from './types'
2
+ import type { SolidQueryOptions } from './types'
3
+ import type { Accessor } from 'solid-js'
3
4
 
4
5
  export type UndefinedInitialDataOptions<
5
6
  TQueryFnData = unknown,
6
7
  TError = DefaultError,
7
8
  TData = TQueryFnData,
8
9
  TQueryKey extends QueryKey = QueryKey,
9
- > = FunctionedParams<
10
+ > = Accessor<
10
11
  SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
11
12
  initialData?: undefined
12
13
  }
@@ -17,7 +18,7 @@ export type DefinedInitialDataOptions<
17
18
  TError = DefaultError,
18
19
  TData = TQueryFnData,
19
20
  TQueryKey extends QueryKey = QueryKey,
20
- > = FunctionedParams<
21
+ > = Accessor<
21
22
  SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
22
23
  initialData: TQueryFnData | (() => TQueryFnData)
23
24
  }
package/src/types.ts CHANGED
@@ -17,8 +17,7 @@ import type {
17
17
  InfiniteQueryObserverOptions,
18
18
  QueryObserverOptions,
19
19
  } from './QueryClient'
20
-
21
- export type FunctionedParams<T> = () => T
20
+ import type { Accessor } from 'solid-js'
22
21
 
23
22
  export interface CreateBaseQueryOptions<
24
23
  TQueryFnData = unknown,
@@ -63,7 +62,7 @@ export type CreateQueryOptions<
63
62
  TError = DefaultError,
64
63
  TData = TQueryFnData,
65
64
  TQueryKey extends QueryKey = QueryKey,
66
- > = FunctionedParams<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>>
65
+ > = Accessor<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>>
67
66
 
68
67
  /* --- Create Query and Create Base Query Types --- */
69
68
 
@@ -128,7 +127,7 @@ export type CreateInfiniteQueryOptions<
128
127
  TData = TQueryFnData,
129
128
  TQueryKey extends QueryKey = QueryKey,
130
129
  TPageParam = unknown,
131
- > = FunctionedParams<
130
+ > = Accessor<
132
131
  SolidInfiniteQueryOptions<
133
132
  TQueryFnData,
134
133
  TError,
@@ -165,7 +164,7 @@ export type CreateMutationOptions<
165
164
  TError = DefaultError,
166
165
  TVariables = void,
167
166
  TContext = unknown,
168
- > = FunctionedParams<SolidMutationOptions<TData, TError, TVariables, TContext>>
167
+ > = Accessor<SolidMutationOptions<TData, TError, TVariables, TContext>>
169
168
 
170
169
  export type CreateMutateFunction<
171
170
  TData = unknown,