@tanstack/solid-query 5.21.1 → 5.21.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 (6) hide show
  1. package/build/index.d.cts +5 -5
  2. package/build/index.d.ts +5 -5
  3. package/package.json +2 -2
  4. package/src/QueryClient.ts +1 -1
  5. package/src/__tests__/utils.tsx +1 -1
  6. package/src/types.ts +13 -14
package/build/index.d.cts CHANGED
@@ -1,4 +1,4 @@
1
- import { DefaultError, QueryKey, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, DefaultOptions as DefaultOptions$1, QueryClientConfig as QueryClientConfig$1, QueryClient as QueryClient$1, WithRequired, QueryObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, MutateFunction, MutationObserverResult, QueryFilters, InfiniteData, MutationFilters, MutationState, Mutation, QueriesPlaceholderDataFunction, QueryFunction, ThrowOnError } from '@tanstack/query-core';
1
+ import { DefaultError, QueryKey, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, DefaultOptions as DefaultOptions$1, QueryClientConfig as QueryClientConfig$1, QueryClient as QueryClient$1, QueryObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, MutateFunction, MutationObserverResult, 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';
@@ -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?: QueryObserverOptions<unknown, TError>;
25
+ queries?: Omit<QueryObserverOptions<unknown, TError>, 'queryKey'>;
26
26
  }
27
27
  interface QueryClientConfig extends QueryClientConfig$1 {
28
28
  defaultOptions?: DefaultOptions;
@@ -32,10 +32,10 @@ declare class QueryClient extends QueryClient$1 {
32
32
  }
33
33
 
34
34
  type FunctionedParams<T> = () => T;
35
- interface CreateBaseQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends WithRequired<QueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>, 'queryKey'> {
35
+ interface CreateBaseQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends QueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey> {
36
36
  deferStream?: boolean;
37
37
  }
38
- interface SolidQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends WithRequired<CreateBaseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey>, 'queryKey'> {
38
+ interface SolidQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends CreateBaseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey> {
39
39
  }
40
40
  type CreateQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = FunctionedParams<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>>;
41
41
  type CreateBaseQueryResult<TData = unknown, TError = DefaultError> = QueryObserverResult<TData, TError>;
@@ -48,7 +48,7 @@ interface SolidInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultErro
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' | 'variables'> {
51
+ interface SolidMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> extends Omit<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;
package/build/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { DefaultError, QueryKey, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, DefaultOptions as DefaultOptions$1, QueryClientConfig as QueryClientConfig$1, QueryClient as QueryClient$1, WithRequired, QueryObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, MutateFunction, MutationObserverResult, QueryFilters, InfiniteData, MutationFilters, MutationState, Mutation, QueriesPlaceholderDataFunction, QueryFunction, ThrowOnError } from '@tanstack/query-core';
1
+ import { DefaultError, QueryKey, QueryObserverOptions as QueryObserverOptions$1, InfiniteQueryObserverOptions as InfiniteQueryObserverOptions$1, DefaultOptions as DefaultOptions$1, QueryClientConfig as QueryClientConfig$1, QueryClient as QueryClient$1, QueryObserverResult, DefinedQueryObserverResult, InfiniteQueryObserverResult, MutationObserverOptions, MutateFunction, MutationObserverResult, 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';
@@ -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?: QueryObserverOptions<unknown, TError>;
25
+ queries?: Omit<QueryObserverOptions<unknown, TError>, 'queryKey'>;
26
26
  }
27
27
  interface QueryClientConfig extends QueryClientConfig$1 {
28
28
  defaultOptions?: DefaultOptions;
@@ -32,10 +32,10 @@ declare class QueryClient extends QueryClient$1 {
32
32
  }
33
33
 
34
34
  type FunctionedParams<T> = () => T;
35
- interface CreateBaseQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends WithRequired<QueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>, 'queryKey'> {
35
+ interface CreateBaseQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends QueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey> {
36
36
  deferStream?: boolean;
37
37
  }
38
- interface SolidQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends WithRequired<CreateBaseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey>, 'queryKey'> {
38
+ interface SolidQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends CreateBaseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey> {
39
39
  }
40
40
  type CreateQueryOptions<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = FunctionedParams<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>>;
41
41
  type CreateBaseQueryResult<TData = unknown, TError = DefaultError> = QueryObserverResult<TData, TError>;
@@ -48,7 +48,7 @@ interface SolidInfiniteQueryOptions<TQueryFnData = unknown, TError = DefaultErro
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' | 'variables'> {
51
+ interface SolidMutationOptions<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> extends Omit<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;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tanstack/solid-query",
3
- "version": "5.21.1",
3
+ "version": "5.21.4",
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.20.5"
51
+ "@tanstack/query-core": "5.21.4"
52
52
  },
53
53
  "devDependencies": {
54
54
  "tsup-preset-solid": "^2.2.0",
package/src/QueryClient.ts CHANGED
@@ -70,7 +70,7 @@ export interface InfiniteQueryObserverOptions<
70
70
 
71
71
  export interface DefaultOptions<TError = DefaultError>
72
72
  extends CoreDefaultOptions<TError> {
73
- queries?: QueryObserverOptions<unknown, TError>
73
+ queries?: Omit<QueryObserverOptions<unknown, TError>, 'queryKey'>
74
74
  }
75
75
 
76
76
  export interface QueryClientConfig extends QueryCoreClientConfig {
package/src/__tests__/utils.tsx CHANGED
@@ -2,7 +2,7 @@ import { vi } from 'vitest'
2
2
  import { Show, createEffect, createSignal, onCleanup } from 'solid-js'
3
3
  import { onlineManager } from '@tanstack/query-core'
4
4
  import { QueryClient } from '../QueryClient'
5
- import type { QueryClientConfig } from '@tanstack/query-core'
5
+ import type { QueryClientConfig } from '..'
6
6
  import type { ParentProps } from 'solid-js'
7
7
  import type { SpyInstance } from 'vitest'
8
8
 
package/src/types.ts CHANGED
@@ -9,7 +9,6 @@ import type {
9
9
  MutationObserverResult,
10
10
  QueryKey,
11
11
  QueryObserverResult,
12
- WithRequired,
13
12
  } from '@tanstack/query-core'
14
13
  import type {
15
14
  InfiniteQueryObserverOptions,
@@ -24,9 +23,12 @@ export interface CreateBaseQueryOptions<
24
23
  TData = TQueryFnData,
25
24
  TQueryData = TQueryFnData,
26
25
  TQueryKey extends QueryKey = QueryKey,
27
- > extends WithRequired<
28
- QueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>,
29
- 'queryKey'
26
+ > extends QueryObserverOptions<
27
+ TQueryFnData,
28
+ TError,
29
+ TData,
30
+ TQueryData,
31
+ TQueryKey
30
32
  > {
31
33
  deferStream?: boolean
32
34
  }
@@ -36,15 +38,12 @@ export interface SolidQueryOptions<
36
38
  TError = DefaultError,
37
39
  TData = TQueryFnData,
38
40
  TQueryKey extends QueryKey = QueryKey,
39
- > extends WithRequired<
40
- CreateBaseQueryOptions<
41
- TQueryFnData,
42
- TError,
43
- TData,
44
- TQueryFnData,
45
- TQueryKey
46
- >,
47
- 'queryKey'
41
+ > extends CreateBaseQueryOptions<
42
+ TQueryFnData,
43
+ TError,
44
+ TData,
45
+ TQueryFnData,
46
+ TQueryKey
48
47
  > {}
49
48
 
50
49
  export type CreateQueryOptions<
@@ -129,7 +128,7 @@ export interface SolidMutationOptions<
129
128
  TContext = unknown,
130
129
  > extends Omit<
131
130
  MutationObserverOptions<TData, TError, TVariables, TContext>,
132
- '_defaulted' | 'variables'
131
+ '_defaulted'
133
132
  > {}
134
133
 
135
134
  export type CreateMutationOptions<