@tanstack/solid-query 5.24.7 → 5.25.0

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 (5) hide show
  1. package/build/index.d.cts +3 -3
  2. package/build/index.d.ts +3 -3
  3. package/package.json +2 -2
  4. package/src/__tests__/createQueries.test.tsx +12 -3
  5. package/src/createQueries.ts +7 -5
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, 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, 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';
@@ -111,11 +111,11 @@ type GetOptions<T> = T extends {
111
111
  data: infer TData;
112
112
  error?: infer TError;
113
113
  } ? 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 {
114
- queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>;
114
+ queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> | SkipToken;
115
115
  select?: (data: any) => infer TData;
116
116
  throwOnError?: ThrowOnError<any, infer TError, any, any>;
117
117
  } ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey> : T extends {
118
- queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>;
118
+ queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> | SkipToken;
119
119
  throwOnError?: ThrowOnError<any, infer TError, any, any>;
120
120
  } ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TQueryFnData, TQueryKey> : CreateQueryOptionsForCreateQueries;
121
121
  type GetResults<T> = T extends {
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, 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, 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';
@@ -111,11 +111,11 @@ type GetOptions<T> = T extends {
111
111
  data: infer TData;
112
112
  error?: infer TError;
113
113
  } ? 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 {
114
- queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>;
114
+ queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> | SkipToken;
115
115
  select?: (data: any) => infer TData;
116
116
  throwOnError?: ThrowOnError<any, infer TError, any, any>;
117
117
  } ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TData, TQueryKey> : T extends {
118
- queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>;
118
+ queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey> | SkipToken;
119
119
  throwOnError?: ThrowOnError<any, infer TError, any, any>;
120
120
  } ? CreateQueryOptionsForCreateQueries<TQueryFnData, TError, TQueryFnData, TQueryKey> : CreateQueryOptionsForCreateQueries;
121
121
  type GetResults<T> = T extends {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tanstack/solid-query",
3
- "version": "5.24.7",
3
+ "version": "5.25.0",
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.24.7"
51
+ "@tanstack/query-core": "5.25.0"
52
52
  },
53
53
  "devDependencies": {
54
54
  "tsup-preset-solid": "^2.2.0",
package/src/__tests__/createQueries.test.tsx CHANGED
@@ -10,7 +10,11 @@ import {
10
10
  createQueries,
11
11
  } from '..'
12
12
  import { createQueryClient, expectTypeNotAny, queryKey, sleep } from './utils'
13
- import type { QueryFunctionContext, QueryKey } from '@tanstack/query-core'
13
+ import type {
14
+ QueryFunctionContext,
15
+ QueryKey,
16
+ SkipToken,
17
+ } from '@tanstack/query-core'
14
18
  import type {
15
19
  CreateQueryResult,
16
20
  QueryFunction,
@@ -581,13 +585,18 @@ describe('useQueries', () => {
581
585
  // no need to type the mapped query
582
586
  (query) => {
583
587
  const { queryFn: fn, queryKey: key } = query
584
- expectTypeOf<QueryFunction<TQueryFnData, TQueryKey> | undefined>(fn)
588
+ expectTypeOf<
589
+ QueryFunction<TQueryFnData, TQueryKey> | SkipToken | undefined
590
+ >(fn)
585
591
  return {
586
592
  queryKey: key,
587
593
  queryFn: fn
588
594
  ? (ctx: QueryFunctionContext<TQueryKey>) => {
589
595
  expectTypeOf<TQueryKey>(ctx.queryKey)
590
- return fn.call({}, ctx)
596
+ return (fn as QueryFunction<TQueryFnData, TQueryKey>).call(
597
+ {},
598
+ ctx,
599
+ )
591
600
  }
592
601
  : undefined,
593
602
  }
package/src/createQueries.ts CHANGED
@@ -23,6 +23,7 @@ import type {
23
23
  QueryFunction,
24
24
  QueryKey,
25
25
  QueryObserverResult,
26
+ SkipToken,
26
27
  ThrowOnError,
27
28
  } from '@tanstack/query-core'
28
29
 
@@ -64,7 +65,9 @@ type GetOptions<T> =
64
65
  ? CreateQueryOptionsForCreateQueries<TQueryFnData>
65
66
  : // Part 3: responsible for inferring and enforcing type if no explicit parameter was provided
66
67
  T extends {
67
- queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>
68
+ queryFn?:
69
+ | QueryFunction<infer TQueryFnData, infer TQueryKey>
70
+ | SkipToken
68
71
  select?: (data: any) => infer TData
69
72
  throwOnError?: ThrowOnError<any, infer TError, any, any>
70
73
  }
@@ -75,10 +78,9 @@ type GetOptions<T> =
75
78
  TQueryKey
76
79
  >
77
80
  : T extends {
78
- queryFn?: QueryFunction<
79
- infer TQueryFnData,
80
- infer TQueryKey
81
- >
81
+ queryFn?:
82
+ | QueryFunction<infer TQueryFnData, infer TQueryKey>
83
+ | SkipToken
82
84
  throwOnError?: ThrowOnError<any, infer TError, any, any>
83
85
  }
84
86
  ? CreateQueryOptionsForCreateQueries<