@tanstack/solid-query 5.28.5 → 5.28.8

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 (7) hide show
  1. package/build/index.d.cts +8 -8
  2. package/build/index.d.ts +8 -8
  3. package/package.json +3 -2
  4. package/src/QueryClient.ts +4 -3
  5. package/src/__tests__/createQuery.test.tsx +7 -4
  6. package/src/createQueries.ts +5 -4
  7. package/src/types.ts +3 -2
package/build/index.d.cts CHANGED
@@ -1,9 +1,9 @@
1
- import { DefaultError, QueryKey, 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, 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, QueryFilters, InfiniteData, MutationFilters, MutationState, Mutation, QueriesPlaceholderDataFunction, QueryFunction, SkipToken, 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';
5
5
 
6
- interface QueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = never> extends Omit<QueryObserverOptions$1<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'structuralSharing'> {
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
  /**
8
8
  * Set this to a reconciliation key to enable reconciliation between query results.
9
9
  * Set this to `false` to disable reconciliation between query results.
@@ -12,7 +12,7 @@ interface QueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TD
12
12
  */
13
13
  reconcile?: string | false | ((oldData: TData | undefined, newData: TData) => TData);
14
14
  }
15
- interface InfiniteQueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> extends Omit<InfiniteQueryObserverOptions$1<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'structuralSharing'> {
15
+ interface InfiniteQueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> extends OmitKeyof<InfiniteQueryObserverOptions$1<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'structuralSharing'> {
16
16
  /**
17
17
  * Set this to a reconciliation key to enable reconciliation between query results.
18
18
  * Set this to `false` to disable reconciliation between query results.
@@ -22,7 +22,7 @@ interface InfiniteQueryObserverOptions<TQueryFnData = unknown, TError = DefaultE
22
22
  reconcile?: string | false | ((oldData: TData | undefined, newData: TData) => TData);
23
23
  }
24
24
  interface DefaultOptions<TError = DefaultError> extends DefaultOptions$1<TError> {
25
- queries?: Omit<QueryObserverOptions<unknown, TError>, 'queryKey'>;
25
+ queries?: OmitKeyof<QueryObserverOptions<unknown, TError>, 'queryKey'>;
26
26
  }
27
27
  interface QueryClientConfig extends QueryClientConfig$1 {
28
28
  defaultOptions?: DefaultOptions;
@@ -42,13 +42,13 @@ type CreateBaseQueryResult<TData = unknown, TError = DefaultError> = QueryObserv
42
42
  type CreateQueryResult<TData = unknown, TError = DefaultError> = CreateBaseQueryResult<TData, TError>;
43
43
  type DefinedCreateBaseQueryResult<TData = unknown, TError = DefaultError> = DefinedQueryObserverResult<TData, TError>;
44
44
  type DefinedCreateQueryResult<TData = unknown, TError = DefaultError> = DefinedCreateBaseQueryResult<TData, TError>;
45
- interface SolidInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> extends Omit<InfiniteQueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'queryKey'> {
45
+ interface SolidInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> extends OmitKeyof<InfiniteQueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'queryKey'> {
46
46
  queryKey: TQueryKey;
47
47
  deferStream?: boolean;
48
48
  }
49
49
  type CreateInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = FunctionedParams<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey, TPageParam>>;
50
50
  type CreateInfiniteQueryResult<TData = unknown, TError = DefaultError> = InfiniteQueryObserverResult<TData, TError>;
51
- interface SolidMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> extends Omit<MutationObserverOptions<TData, TError, TVariables, TContext>, '_defaulted'> {
51
+ interface SolidMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> extends OmitKeyof<MutationObserverOptions<TData, TError, TVariables, TContext>, '_defaulted'> {
52
52
  }
53
53
  type CreateMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = FunctionedParams<SolidMutationOptions<TData, TError, TVariables, TContext>>;
54
54
  type CreateMutateFunction<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = (...args: Parameters<MutateFunction<TData, TError, TVariables, TContext>>) => void;
@@ -96,7 +96,7 @@ type MutationStateOptions<TResult = MutationState> = {
96
96
  };
97
97
  declare function useMutationState<TResult = MutationState>(options?: Accessor<MutationStateOptions<TResult>>, queryClient?: Accessor<QueryClient>): Accessor<Array<TResult>>;
98
98
 
99
- type CreateQueryOptionsForCreateQueries<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Omit<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'placeholderData'> & {
99
+ type CreateQueryOptionsForCreateQueries<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = OmitKeyof<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'placeholderData'> & {
100
100
  placeholderData?: TQueryFnData | QueriesPlaceholderDataFunction<TQueryFnData>;
101
101
  };
102
102
  type MAXIMUM_DEPTH = 20;
@@ -147,7 +147,7 @@ type QueriesOptions<T extends Array<any>, TResult extends Array<any> = [], TDept
147
147
  ], [
148
148
  ...TDepth,
149
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>;
150
+ ]> : ReadonlyArray<unknown> extends T ? T : T extends Array<CreateQueryOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, infer TQueryKey>> ? Array<CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey>> : Array<CreateQueryOptionsForCreateQueries>;
151
151
  /**
152
152
  * QueriesResults reducer recursively maps type param to results
153
153
  */
package/build/index.d.ts CHANGED
@@ -1,9 +1,9 @@
1
- import { DefaultError, QueryKey, 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, 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, QueryFilters, InfiniteData, MutationFilters, MutationState, Mutation, QueriesPlaceholderDataFunction, QueryFunction, SkipToken, 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';
5
5
 
6
- interface QueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = never> extends Omit<QueryObserverOptions$1<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'structuralSharing'> {
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
  /**
8
8
  * Set this to a reconciliation key to enable reconciliation between query results.
9
9
  * Set this to `false` to disable reconciliation between query results.
@@ -12,7 +12,7 @@ interface QueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TD
12
12
  */
13
13
  reconcile?: string | false | ((oldData: TData | undefined, newData: TData) => TData);
14
14
  }
15
- interface InfiniteQueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> extends Omit<InfiniteQueryObserverOptions$1<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'structuralSharing'> {
15
+ interface InfiniteQueryObserverOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> extends OmitKeyof<InfiniteQueryObserverOptions$1<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'structuralSharing'> {
16
16
  /**
17
17
  * Set this to a reconciliation key to enable reconciliation between query results.
18
18
  * Set this to `false` to disable reconciliation between query results.
@@ -22,7 +22,7 @@ interface InfiniteQueryObserverOptions<TQueryFnData = unknown, TError = DefaultE
22
22
  reconcile?: string | false | ((oldData: TData | undefined, newData: TData) => TData);
23
23
  }
24
24
  interface DefaultOptions<TError = DefaultError> extends DefaultOptions$1<TError> {
25
- queries?: Omit<QueryObserverOptions<unknown, TError>, 'queryKey'>;
25
+ queries?: OmitKeyof<QueryObserverOptions<unknown, TError>, 'queryKey'>;
26
26
  }
27
27
  interface QueryClientConfig extends QueryClientConfig$1 {
28
28
  defaultOptions?: DefaultOptions;
@@ -42,13 +42,13 @@ type CreateBaseQueryResult<TData = unknown, TError = DefaultError> = QueryObserv
42
42
  type CreateQueryResult<TData = unknown, TError = DefaultError> = CreateBaseQueryResult<TData, TError>;
43
43
  type DefinedCreateBaseQueryResult<TData = unknown, TError = DefaultError> = DefinedQueryObserverResult<TData, TError>;
44
44
  type DefinedCreateQueryResult<TData = unknown, TError = DefaultError> = DefinedCreateBaseQueryResult<TData, TError>;
45
- interface SolidInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> extends Omit<InfiniteQueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'queryKey'> {
45
+ interface SolidInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> extends OmitKeyof<InfiniteQueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, 'queryKey'> {
46
46
  queryKey: TQueryKey;
47
47
  deferStream?: boolean;
48
48
  }
49
49
  type CreateInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown> = FunctionedParams<SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey, TPageParam>>;
50
50
  type CreateInfiniteQueryResult<TData = unknown, TError = DefaultError> = InfiniteQueryObserverResult<TData, TError>;
51
- interface SolidMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> extends Omit<MutationObserverOptions<TData, TError, TVariables, TContext>, '_defaulted'> {
51
+ interface SolidMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> extends OmitKeyof<MutationObserverOptions<TData, TError, TVariables, TContext>, '_defaulted'> {
52
52
  }
53
53
  type CreateMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = FunctionedParams<SolidMutationOptions<TData, TError, TVariables, TContext>>;
54
54
  type CreateMutateFunction<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = (...args: Parameters<MutateFunction<TData, TError, TVariables, TContext>>) => void;
@@ -96,7 +96,7 @@ type MutationStateOptions<TResult = MutationState> = {
96
96
  };
97
97
  declare function useMutationState<TResult = MutationState>(options?: Accessor<MutationStateOptions<TResult>>, queryClient?: Accessor<QueryClient>): Accessor<Array<TResult>>;
98
98
 
99
- type CreateQueryOptionsForCreateQueries<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = Omit<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'placeholderData'> & {
99
+ type CreateQueryOptionsForCreateQueries<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = OmitKeyof<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'placeholderData'> & {
100
100
  placeholderData?: TQueryFnData | QueriesPlaceholderDataFunction<TQueryFnData>;
101
101
  };
102
102
  type MAXIMUM_DEPTH = 20;
@@ -147,7 +147,7 @@ type QueriesOptions<T extends Array<any>, TResult extends Array<any> = [], TDept
147
147
  ], [
148
148
  ...TDepth,
149
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>;
150
+ ]> : ReadonlyArray<unknown> extends T ? T : T extends Array<CreateQueryOptionsForCreateQueries<infer TQueryFnData, infer TError, infer TData, infer TQueryKey>> ? Array<CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey>> : Array<CreateQueryOptionsForCreateQueries>;
151
151
  /**
152
152
  * QueriesResults reducer recursively maps type param to results
153
153
  */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tanstack/solid-query",
3
- "version": "5.28.5",
3
+ "version": "5.28.8",
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.14",
51
- "@tanstack/query-core": "5.28.4"
51
+ "@tanstack/query-core": "5.28.8"
52
52
  },
53
53
  "devDependencies": {
54
54
  "tsup-preset-solid": "^2.2.0",
@@ -64,6 +64,7 @@
64
64
  "test:lib": "vitest --retry=3",
65
65
  "test:lib:dev": "pnpm run test:lib --watch",
66
66
  "test:build": "publint --strict",
67
+ "test:attw": "attw --pack",
67
68
  "build": "tsup",
68
69
  "build:watch": "tsup --watch"
69
70
  }
package/src/QueryClient.ts CHANGED
@@ -2,6 +2,7 @@ import { QueryClient as QueryCoreClient } from '@tanstack/query-core'
2
2
  import type {
3
3
  DefaultOptions as CoreDefaultOptions,
4
4
  DefaultError,
5
+ OmitKeyof,
5
6
  QueryClientConfig as QueryCoreClientConfig,
6
7
  InfiniteQueryObserverOptions as QueryCoreInfiniteQueryObserverOptions,
7
8
  QueryObserverOptions as QueryCoreObserverOptions,
@@ -15,7 +16,7 @@ export interface QueryObserverOptions<
15
16
  TQueryData = TQueryFnData,
16
17
  TQueryKey extends QueryKey = QueryKey,
17
18
  TPageParam = never,
18
- > extends Omit<
19
+ > extends OmitKeyof<
19
20
  QueryCoreObserverOptions<
20
21
  TQueryFnData,
21
22
  TError,
@@ -45,7 +46,7 @@ export interface InfiniteQueryObserverOptions<
45
46
  TQueryData = TQueryFnData,
46
47
  TQueryKey extends QueryKey = QueryKey,
47
48
  TPageParam = unknown,
48
- > extends Omit<
49
+ > extends OmitKeyof<
49
50
  QueryCoreInfiniteQueryObserverOptions<
50
51
  TQueryFnData,
51
52
  TError,
@@ -70,7 +71,7 @@ export interface InfiniteQueryObserverOptions<
70
71
 
71
72
  export interface DefaultOptions<TError = DefaultError>
72
73
  extends CoreDefaultOptions<TError> {
73
- queries?: Omit<QueryObserverOptions<unknown, TError>, 'queryKey'>
74
+ queries?: OmitKeyof<QueryObserverOptions<unknown, TError>, 'queryKey'>
74
75
  }
75
76
 
76
77
  export interface QueryClientConfig extends QueryCoreClientConfig {
package/src/__tests__/createQuery.test.tsx CHANGED
@@ -30,6 +30,7 @@ import type {
30
30
  CreateQueryOptions,
31
31
  CreateQueryResult,
32
32
  DefinedCreateQueryResult,
33
+ OmitKeyof,
33
34
  QueryFunction,
34
35
  } from '..'
35
36
  import type { Mock } from 'vitest'
@@ -163,9 +164,10 @@ describe('createQuery', () => {
163
164
  token: string,
164
165
  // return type must be wrapped with TQueryFnReturn
165
166
  ) => Promise<TQueryFnData>,
166
- options?: Omit<
167
+ options?: OmitKeyof<
167
168
  CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
168
- 'queryKey' | 'queryFn' | 'initialData'
169
+ 'queryKey' | 'queryFn' | 'initialData',
170
+ 'safely'
169
171
  >,
170
172
  ) =>
171
173
  createQuery(() => ({
@@ -185,9 +187,10 @@ describe('createQuery', () => {
185
187
  >(
186
188
  qk: TQueryKey,
187
189
  fetcher: () => Promise<TQueryFnData>,
188
- options?: Omit<
190
+ options?: OmitKeyof<
189
191
  CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
190
- 'queryKey' | 'queryFn' | 'initialData'
192
+ 'queryKey' | 'queryFn' | 'initialData',
193
+ 'safely'
191
194
  >,
192
195
  ) => createQuery(() => ({ queryKey: qk, queryFn: fetcher, ...options }))
193
196
  const testFuncStyle = useWrappedFuncStyleQuery([''], async () => true)
package/src/createQueries.ts CHANGED
@@ -18,6 +18,7 @@ import type { Accessor } from 'solid-js'
18
18
  import type { QueryClient } from './QueryClient'
19
19
  import type {
20
20
  DefaultError,
21
+ OmitKeyof,
21
22
  QueriesObserverOptions,
22
23
  QueriesPlaceholderDataFunction,
23
24
  QueryFunction,
@@ -34,7 +35,7 @@ type CreateQueryOptionsForCreateQueries<
34
35
  TError = DefaultError,
35
36
  TData = TQueryFnData,
36
37
  TQueryKey extends QueryKey = QueryKey,
37
- > = Omit<
38
+ > = OmitKeyof<
38
39
  SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
39
40
  'placeholderData'
40
41
  > & {
@@ -147,7 +148,7 @@ type QueriesOptions<
147
148
  [...TResult, GetOptions<Head>],
148
149
  [...TDepth, 1]
149
150
  >
150
- : Array<unknown> extends T
151
+ : ReadonlyArray<unknown> extends T
151
152
  ? T
152
153
  : // If T is *some* array but we couldn't assign unknown[] to it, then it must hold some known/homogenous type!
153
154
  // use this to infer the param types in the case of Array.map() argument
@@ -220,7 +221,7 @@ export function createQueries<
220
221
  const client = createMemo(() => useQueryClient(queryClient?.()))
221
222
  const isRestoring = useIsRestoring()
222
223
 
223
- const defaultedQueries = createMemo(() =>
224
+ const defaultedQueries: QueriesOptions<any> = createMemo(() =>
224
225
  queriesOptions().queries.map((options) =>
225
226
  mergeProps(client().defaultQueryOptions(options), {
226
227
  get _optimisticResults() {
@@ -293,7 +294,7 @@ export function createQueries<
293
294
  const dataResources_ = dataResources()
294
295
  for (let index = 0; index < dataResources_.length; index++) {
295
296
  const dataResource = dataResources_[index]!
296
- const unwrappedResult = { ...unwrap(result[index]!) }
297
+ const unwrappedResult = { ...unwrap(result[index]) }
297
298
  // @ts-expect-error typescript pedantry regarding the possible range of index
298
299
  setState(index, unwrap(unwrappedResult))
299
300
  dataResource[1].mutate(() => unwrap(state[index]!.data))
package/src/types.ts CHANGED
@@ -7,6 +7,7 @@ import type {
7
7
  MutateFunction,
8
8
  MutationObserverOptions,
9
9
  MutationObserverResult,
10
+ OmitKeyof,
10
11
  QueryKey,
11
12
  QueryObserverResult,
12
13
  } from '@tanstack/query-core'
@@ -83,7 +84,7 @@ export interface SolidInfiniteQueryOptions<
83
84
  TQueryData = TQueryFnData,
84
85
  TQueryKey extends QueryKey = QueryKey,
85
86
  TPageParam = unknown,
86
- > extends Omit<
87
+ > extends OmitKeyof<
87
88
  InfiniteQueryObserverOptions<
88
89
  TQueryFnData,
89
90
  TError,
@@ -126,7 +127,7 @@ export interface SolidMutationOptions<
126
127
  TError = DefaultError,
127
128
  TVariables = void,
128
129
  TContext = unknown,
129
- > extends Omit<
130
+ > extends OmitKeyof<
130
131
  MutationObserverOptions<TData, TError, TVariables, TContext>,
131
132
  '_defaulted'
132
133
  > {}