@suspensive/react-query-4 0.0.1-beta.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.
- package/LICENSE +21 -0
- package/dist/OmitKeyof-CFsZLI4k.d.cts +3 -0
- package/dist/OmitKeyof-CFsZLI4k.d.ts +3 -0
- package/dist/QueryErrorBoundary.cjs +81 -0
- package/dist/QueryErrorBoundary.cjs.map +1 -0
- package/dist/QueryErrorBoundary.d.cts +29 -0
- package/dist/QueryErrorBoundary.d.ts +29 -0
- package/dist/QueryErrorBoundary.js +9 -0
- package/dist/QueryErrorBoundary.js.map +1 -0
- package/dist/SuspenseInfiniteQuery.cjs +81 -0
- package/dist/SuspenseInfiniteQuery.cjs.map +1 -0
- package/dist/SuspenseInfiniteQuery.d.cts +14 -0
- package/dist/SuspenseInfiniteQuery.d.ts +14 -0
- package/dist/SuspenseInfiniteQuery.js +10 -0
- package/dist/SuspenseInfiniteQuery.js.map +1 -0
- package/dist/SuspenseQueries.cjs +69 -0
- package/dist/SuspenseQueries.cjs.map +1 -0
- package/dist/SuspenseQueries.d.cts +16 -0
- package/dist/SuspenseQueries.d.ts +16 -0
- package/dist/SuspenseQueries.js +10 -0
- package/dist/SuspenseQueries.js.map +1 -0
- package/dist/SuspenseQuery.cjs +81 -0
- package/dist/SuspenseQuery.cjs.map +1 -0
- package/dist/SuspenseQuery.d.cts +14 -0
- package/dist/SuspenseQuery.d.ts +14 -0
- package/dist/SuspenseQuery.js +10 -0
- package/dist/SuspenseQuery.js.map +1 -0
- package/dist/chunk-3B63MBHY.js +22 -0
- package/dist/chunk-3B63MBHY.js.map +1 -0
- package/dist/chunk-BN22WZP6.js +18 -0
- package/dist/chunk-BN22WZP6.js.map +1 -0
- package/dist/chunk-J3EHCRU6.js +20 -0
- package/dist/chunk-J3EHCRU6.js.map +1 -0
- package/dist/chunk-MEYWTEWA.js +11 -0
- package/dist/chunk-MEYWTEWA.js.map +1 -0
- package/dist/chunk-P5MROV72.js +34 -0
- package/dist/chunk-P5MROV72.js.map +1 -0
- package/dist/chunk-QETBZSG5.js +39 -0
- package/dist/chunk-QETBZSG5.js.map +1 -0
- package/dist/chunk-S7L2LUVS.js +22 -0
- package/dist/chunk-S7L2LUVS.js.map +1 -0
- package/dist/chunk-VPKMZV3T.js +23 -0
- package/dist/chunk-VPKMZV3T.js.map +1 -0
- package/dist/chunk-ZAOCTI7U.js +23 -0
- package/dist/chunk-ZAOCTI7U.js.map +1 -0
- package/dist/index.cjs +165 -0
- package/dist/index.cjs.map +1 -0
- package/dist/index.d.cts +13 -0
- package/dist/index.d.ts +13 -0
- package/dist/index.js +37 -0
- package/dist/index.js.map +1 -0
- package/dist/queryOptions.cjs +34 -0
- package/dist/queryOptions.cjs.map +1 -0
- package/dist/queryOptions.d.cts +17 -0
- package/dist/queryOptions.d.ts +17 -0
- package/dist/queryOptions.js +9 -0
- package/dist/queryOptions.js.map +1 -0
- package/dist/useSuspenseInfiniteQuery.cjs +56 -0
- package/dist/useSuspenseInfiniteQuery.cjs.map +1 -0
- package/dist/useSuspenseInfiniteQuery.d.cts +16 -0
- package/dist/useSuspenseInfiniteQuery.d.ts +16 -0
- package/dist/useSuspenseInfiniteQuery.js +9 -0
- package/dist/useSuspenseInfiniteQuery.js.map +1 -0
- package/dist/useSuspenseQueries.cjs +58 -0
- package/dist/useSuspenseQueries.cjs.map +1 -0
- package/dist/useSuspenseQueries.d.cts +55 -0
- package/dist/useSuspenseQueries.d.ts +55 -0
- package/dist/useSuspenseQueries.js +9 -0
- package/dist/useSuspenseQueries.js.map +1 -0
- package/dist/useSuspenseQuery.cjs +56 -0
- package/dist/useSuspenseQuery.cjs.map +1 -0
- package/dist/useSuspenseQuery.d.cts +16 -0
- package/dist/useSuspenseQuery.d.ts +16 -0
- package/dist/useSuspenseQuery.js +9 -0
- package/dist/useSuspenseQuery.js.map +1 -0
- package/package.json +80 -0
- package/src/QueryErrorBoundary.tsx +27 -0
- package/src/SuspenseInfiniteQuery.test-d.tsx +102 -0
- package/src/SuspenseInfiniteQuery.tsx +22 -0
- package/src/SuspenseQueries.test-d.tsx +54 -0
- package/src/SuspenseQueries.tsx +15 -0
- package/src/SuspenseQuery.test-d.tsx +94 -0
- package/src/SuspenseQuery.tsx +18 -0
- package/src/index.ts +13 -0
- package/src/queryOptions.test-d.tsx +119 -0
- package/src/queryOptions.ts +88 -0
- package/src/useSuspenseInfiniteQuery.test-d.ts +59 -0
- package/src/useSuspenseInfiniteQuery.ts +47 -0
- package/src/useSuspenseQueries.test-d.ts +75 -0
- package/src/useSuspenseQueries.ts +127 -0
- package/src/useSuspenseQuery.test-d.ts +51 -0
- package/src/useSuspenseQuery.ts +36 -0
- package/src/utility-types/OmitKeyof.test-d.ts +175 -0
- package/src/utility-types/OmitKeyof.ts +11 -0
- package/src/utility-types/RequiredKeyof.ts +3 -0
- package/src/utility-types/index.ts +2 -0
|
@@ -0,0 +1,127 @@
|
|
|
1
|
+
import { type QueryFunction, type UseQueryOptions, useQueries } from '@tanstack/react-query'
|
|
2
|
+
import type { UseSuspenseQueryOptions, UseSuspenseQueryResult } from './useSuspenseQuery'
|
|
3
|
+
|
|
4
|
+
// Avoid TS depth-limit error in case of large array literal
|
|
5
|
+
type MAXIMUM_DEPTH = 20
|
|
6
|
+
|
|
7
|
+
type GetSuspenseOptions<T> =
|
|
8
|
+
// Part 1: responsible for applying explicit type parameter to function arguments, if object { queryFnData: TQueryFnData, error: TError, data: TData }
|
|
9
|
+
T extends {
|
|
10
|
+
queryFnData: infer TQueryFnData
|
|
11
|
+
error?: infer TError
|
|
12
|
+
data: infer TData
|
|
13
|
+
}
|
|
14
|
+
? UseSuspenseQueryOptions<TQueryFnData, TError, TData>
|
|
15
|
+
: T extends { queryFnData: infer TQueryFnData; error?: infer TError }
|
|
16
|
+
? UseSuspenseQueryOptions<TQueryFnData, TError>
|
|
17
|
+
: T extends { data: infer TData; error?: infer TError }
|
|
18
|
+
? UseSuspenseQueryOptions<unknown, TError, TData>
|
|
19
|
+
: // Part 2: responsible for applying explicit type parameter to function arguments, if tuple [TQueryFnData, TError, TData]
|
|
20
|
+
T extends [infer TQueryFnData, infer TError, infer TData]
|
|
21
|
+
? UseSuspenseQueryOptions<TQueryFnData, TError, TData>
|
|
22
|
+
: T extends [infer TQueryFnData, infer TError]
|
|
23
|
+
? UseSuspenseQueryOptions<TQueryFnData, TError>
|
|
24
|
+
: T extends [infer TQueryFnData]
|
|
25
|
+
? UseSuspenseQueryOptions<TQueryFnData>
|
|
26
|
+
: // Part 3: responsible for inferring and enforcing type if no explicit parameter was provided
|
|
27
|
+
T extends {
|
|
28
|
+
queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>
|
|
29
|
+
select?: (data: any) => infer TData
|
|
30
|
+
}
|
|
31
|
+
? UseSuspenseQueryOptions<TQueryFnData, unknown, TData, TQueryKey>
|
|
32
|
+
: T extends {
|
|
33
|
+
queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>
|
|
34
|
+
}
|
|
35
|
+
? UseSuspenseQueryOptions<TQueryFnData, unknown, TQueryFnData, TQueryKey>
|
|
36
|
+
: // Fallback
|
|
37
|
+
UseSuspenseQueryOptions
|
|
38
|
+
|
|
39
|
+
type GetSuspenseResults<T> =
|
|
40
|
+
// Part 1: responsible for mapping explicit type parameter to function result, if object
|
|
41
|
+
T extends { queryFnData: any; error?: infer TError; data: infer TData }
|
|
42
|
+
? UseSuspenseQueryResult<TData, TError>
|
|
43
|
+
: T extends { queryFnData: infer TQueryFnData; error?: infer TError }
|
|
44
|
+
? UseSuspenseQueryResult<TQueryFnData, TError>
|
|
45
|
+
: T extends { data: infer TData; error?: infer TError }
|
|
46
|
+
? UseSuspenseQueryResult<TData, TError>
|
|
47
|
+
: // Part 2: responsible for mapping explicit type parameter to function result, if tuple
|
|
48
|
+
T extends [any, infer TError, infer TData]
|
|
49
|
+
? UseSuspenseQueryResult<TData, TError>
|
|
50
|
+
: T extends [infer TQueryFnData, infer TError]
|
|
51
|
+
? UseSuspenseQueryResult<TQueryFnData, TError>
|
|
52
|
+
: T extends [infer TQueryFnData]
|
|
53
|
+
? UseSuspenseQueryResult<TQueryFnData>
|
|
54
|
+
: // Part 3: responsible for mapping inferred type to results, if no explicit parameter was provided
|
|
55
|
+
T extends {
|
|
56
|
+
queryFn?: QueryFunction<infer TQueryFnData, any>
|
|
57
|
+
select?: (data: any) => infer TData
|
|
58
|
+
}
|
|
59
|
+
? UseSuspenseQueryResult<unknown extends TData ? TQueryFnData : TData>
|
|
60
|
+
: T extends {
|
|
61
|
+
queryFn?: QueryFunction<infer TQueryFnData, any>
|
|
62
|
+
}
|
|
63
|
+
? UseSuspenseQueryResult<TQueryFnData>
|
|
64
|
+
: // Fallback
|
|
65
|
+
UseSuspenseQueryResult
|
|
66
|
+
|
|
67
|
+
/**
|
|
68
|
+
* SuspenseQueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
|
|
69
|
+
*/
|
|
70
|
+
export type SuspenseQueriesOptions<
|
|
71
|
+
T extends Array<any>,
|
|
72
|
+
TResult extends Array<any> = [],
|
|
73
|
+
TDepth extends ReadonlyArray<number> = [],
|
|
74
|
+
> = TDepth['length'] extends MAXIMUM_DEPTH
|
|
75
|
+
? Array<UseSuspenseQueryOptions>
|
|
76
|
+
: T extends []
|
|
77
|
+
? []
|
|
78
|
+
: T extends [infer Head]
|
|
79
|
+
? [...TResult, GetSuspenseOptions<Head>]
|
|
80
|
+
: T extends [infer Head, ...infer Tail]
|
|
81
|
+
? SuspenseQueriesOptions<[...Tail], [...TResult, GetSuspenseOptions<Head>], [...TDepth, 1]>
|
|
82
|
+
: Array<unknown> extends T
|
|
83
|
+
? T
|
|
84
|
+
: // If T is *some* array but we couldn't assign unknown[] to it, then it must hold some known/homogenous type!
|
|
85
|
+
// use this to infer the param types in the case of Array.map() argument
|
|
86
|
+
T extends Array<UseSuspenseQueryOptions<infer TQueryFnData, infer TError, infer TData, infer TQueryKey>>
|
|
87
|
+
? Array<UseSuspenseQueryOptions<TQueryFnData, TError, TData, TQueryKey>>
|
|
88
|
+
: // Fallback
|
|
89
|
+
Array<UseSuspenseQueryOptions>
|
|
90
|
+
|
|
91
|
+
/**
|
|
92
|
+
* SuspenseQueriesResults reducer recursively maps type param to results
|
|
93
|
+
*/
|
|
94
|
+
export type SuspenseQueriesResults<
|
|
95
|
+
T extends Array<any>,
|
|
96
|
+
TResult extends Array<any> = [],
|
|
97
|
+
TDepth extends ReadonlyArray<number> = [],
|
|
98
|
+
> = TDepth['length'] extends MAXIMUM_DEPTH
|
|
99
|
+
? Array<UseSuspenseQueryResult>
|
|
100
|
+
: T extends []
|
|
101
|
+
? []
|
|
102
|
+
: T extends [infer Head]
|
|
103
|
+
? [...TResult, GetSuspenseResults<Head>]
|
|
104
|
+
: T extends [infer Head, ...infer Tail]
|
|
105
|
+
? SuspenseQueriesResults<[...Tail], [...TResult, GetSuspenseResults<Head>], [...TDepth, 1]>
|
|
106
|
+
: T extends Array<UseSuspenseQueryOptions<infer TQueryFnData, infer TError, infer TData, any>>
|
|
107
|
+
? // Dynamic-size (homogenous) UseQueryOptions array: map directly to array of results
|
|
108
|
+
Array<UseSuspenseQueryResult<unknown extends TData ? TQueryFnData : TData, TError>>
|
|
109
|
+
: // Fallback
|
|
110
|
+
Array<UseSuspenseQueryResult>
|
|
111
|
+
|
|
112
|
+
/**
|
|
113
|
+
* This hook is wrapping useQueries of `@tanstack/react-query` v4 with default suspense option.
|
|
114
|
+
* @see {@link https://suspensive.org/docs/react-query/useSuspenseQueries}
|
|
115
|
+
*/
|
|
116
|
+
export function useSuspenseQueries<T extends any[]>({
|
|
117
|
+
queries,
|
|
118
|
+
context,
|
|
119
|
+
}: {
|
|
120
|
+
queries: readonly [...SuspenseQueriesOptions<T>]
|
|
121
|
+
context?: UseQueryOptions['context']
|
|
122
|
+
}): SuspenseQueriesResults<T> {
|
|
123
|
+
return useQueries({
|
|
124
|
+
queries: queries.map((query: typeof queries) => ({ ...query, suspense: true })),
|
|
125
|
+
context,
|
|
126
|
+
}) as SuspenseQueriesResults<T>
|
|
127
|
+
}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { queryFn, queryKey } from '@suspensive/test-utils'
|
|
2
|
+
import { describe, expectTypeOf, it } from 'vitest'
|
|
3
|
+
import { type UseSuspenseQueryResult, useSuspenseQuery } from './useSuspenseQuery'
|
|
4
|
+
|
|
5
|
+
describe('useSuspenseQuery', () => {
|
|
6
|
+
it('type error', () => {
|
|
7
|
+
//@ts-expect-error no arg
|
|
8
|
+
useSuspenseQuery()
|
|
9
|
+
useSuspenseQuery({
|
|
10
|
+
queryKey,
|
|
11
|
+
queryFn,
|
|
12
|
+
//@ts-expect-error no suspense
|
|
13
|
+
suspense: boolean,
|
|
14
|
+
})
|
|
15
|
+
useSuspenseQuery({
|
|
16
|
+
queryKey,
|
|
17
|
+
queryFn,
|
|
18
|
+
//@ts-expect-error no useErrorBoundary
|
|
19
|
+
useErrorBoundary: boolean,
|
|
20
|
+
})
|
|
21
|
+
useSuspenseQuery({
|
|
22
|
+
queryKey,
|
|
23
|
+
queryFn,
|
|
24
|
+
//@ts-expect-error no enabled
|
|
25
|
+
enabled: boolean,
|
|
26
|
+
})
|
|
27
|
+
useSuspenseQuery({
|
|
28
|
+
queryKey,
|
|
29
|
+
queryFn,
|
|
30
|
+
//@ts-expect-error no placeholderData
|
|
31
|
+
placeholderData: 'placeholder',
|
|
32
|
+
})
|
|
33
|
+
useSuspenseQuery({
|
|
34
|
+
queryKey,
|
|
35
|
+
queryFn,
|
|
36
|
+
//@ts-expect-error no isPlaceholderData
|
|
37
|
+
}).isPlaceholderData
|
|
38
|
+
})
|
|
39
|
+
|
|
40
|
+
it('type check', () => {
|
|
41
|
+
const result = useSuspenseQuery({ queryKey, queryFn })
|
|
42
|
+
expectTypeOf(result).toEqualTypeOf<UseSuspenseQueryResult<{ text: string }>>()
|
|
43
|
+
expectTypeOf(result.data).toEqualTypeOf<{ text: string }>()
|
|
44
|
+
expectTypeOf(result.status).toEqualTypeOf<'success'>()
|
|
45
|
+
|
|
46
|
+
const selectedResult = useSuspenseQuery({ queryKey, queryFn, select: (data) => data.text })
|
|
47
|
+
expectTypeOf(selectedResult).toEqualTypeOf<UseSuspenseQueryResult<string>>()
|
|
48
|
+
expectTypeOf(selectedResult.data).toEqualTypeOf<string>()
|
|
49
|
+
expectTypeOf(selectedResult.status).toEqualTypeOf<'success'>()
|
|
50
|
+
})
|
|
51
|
+
})
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { type QueryKey, type UseQueryOptions, type UseQueryResult, useQuery } from '@tanstack/react-query'
|
|
2
|
+
import type { OmitKeyof } from './utility-types'
|
|
3
|
+
|
|
4
|
+
export interface UseSuspenseQueryResult<TData = unknown, TError = unknown>
|
|
5
|
+
extends OmitKeyof<UseQueryResult<TData, TError>, keyof Pick<UseQueryResult, 'isPlaceholderData'>> {
|
|
6
|
+
data: TData
|
|
7
|
+
status: 'success'
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
export interface UseSuspenseQueryOptions<
|
|
11
|
+
TQueryFnData = unknown,
|
|
12
|
+
TError = unknown,
|
|
13
|
+
TData = TQueryFnData,
|
|
14
|
+
TQueryKey extends QueryKey = QueryKey,
|
|
15
|
+
> extends OmitKeyof<
|
|
16
|
+
UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
|
|
17
|
+
'suspense' | 'useErrorBoundary' | 'enabled' | 'placeholderData'
|
|
18
|
+
> {}
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* This hook is wrapping useQuery of `@tanstack/react-query` v4 with default suspense option.
|
|
22
|
+
* @see {@link https://suspensive.org/docs/react-query/useSuspenseQuery}
|
|
23
|
+
*/
|
|
24
|
+
export function useSuspenseQuery<
|
|
25
|
+
TQueryFnData = unknown,
|
|
26
|
+
TError = unknown,
|
|
27
|
+
TData = TQueryFnData,
|
|
28
|
+
TQueryKey extends QueryKey = QueryKey,
|
|
29
|
+
>(options: UseSuspenseQueryOptions<TQueryFnData, TError, TData, TQueryKey>) {
|
|
30
|
+
return useQuery<TQueryFnData, TError, TData, TQueryKey>({
|
|
31
|
+
...options,
|
|
32
|
+
enabled: true,
|
|
33
|
+
useErrorBoundary: true,
|
|
34
|
+
suspense: true,
|
|
35
|
+
}) as UseSuspenseQueryResult<TData, TError>
|
|
36
|
+
}
|
|
@@ -0,0 +1,175 @@
|
|
|
1
|
+
import type { OmitKeyof } from './OmitKeyof'
|
|
2
|
+
|
|
3
|
+
describe('OmitKeyof', () => {
|
|
4
|
+
it("'s string key type check", () => {
|
|
5
|
+
type A = {
|
|
6
|
+
x: string
|
|
7
|
+
y: number
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
type ExpectedType = {
|
|
11
|
+
x: string
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
// Bad point
|
|
15
|
+
// 1. original Omit can use 'z' as type parameter with no type error
|
|
16
|
+
// 2. original Omit have no auto complete for 2nd type parameter
|
|
17
|
+
expectTypeOf<Omit<A, 'z' | 'y'>>().toEqualTypeOf<ExpectedType>()
|
|
18
|
+
|
|
19
|
+
// Solution
|
|
20
|
+
|
|
21
|
+
// 1. strictly
|
|
22
|
+
expectTypeOf<
|
|
23
|
+
OmitKeyof<
|
|
24
|
+
A,
|
|
25
|
+
// OmitKeyof can't use 'z' as type parameter with type error because A don't have key 'z'
|
|
26
|
+
// @ts-expect-error Type does not satisfy the constraint keyof A
|
|
27
|
+
'z' | 'y'
|
|
28
|
+
>
|
|
29
|
+
>().toEqualTypeOf<ExpectedType>
|
|
30
|
+
expectTypeOf<
|
|
31
|
+
OmitKeyof<
|
|
32
|
+
A,
|
|
33
|
+
// OmitKeyof can't use 'z' as type parameter with type error because A don't have key 'z'
|
|
34
|
+
// @ts-expect-error Type does not satisfy the constraint keyof A
|
|
35
|
+
'z' | 'y',
|
|
36
|
+
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-arguments
|
|
37
|
+
'strictly'
|
|
38
|
+
>
|
|
39
|
+
>().toEqualTypeOf<ExpectedType>
|
|
40
|
+
|
|
41
|
+
// 2. safely
|
|
42
|
+
expectTypeOf<
|
|
43
|
+
OmitKeyof<
|
|
44
|
+
A,
|
|
45
|
+
// OmitKeyof can't use 'z' as type parameter type error with strictly parameter or default parameter
|
|
46
|
+
// @ts-expect-error Type does not satisfy the constraint keyof A
|
|
47
|
+
'z' | 'y'
|
|
48
|
+
>
|
|
49
|
+
>().toEqualTypeOf<ExpectedType>
|
|
50
|
+
expectTypeOf<
|
|
51
|
+
OmitKeyof<
|
|
52
|
+
A,
|
|
53
|
+
// With 'safely', OmitKeyof can use 'z' as type parameter like original Omit but This support autocomplete too yet for DX.
|
|
54
|
+
'z' | 'y',
|
|
55
|
+
'safely'
|
|
56
|
+
>
|
|
57
|
+
>().toEqualTypeOf<ExpectedType>
|
|
58
|
+
})
|
|
59
|
+
|
|
60
|
+
it("'s number key type check", () => {
|
|
61
|
+
type A = {
|
|
62
|
+
[1]: string
|
|
63
|
+
[2]: number
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
type ExpectedType = {
|
|
67
|
+
[1]: string
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
// Bad point
|
|
71
|
+
// 1. original Omit can use 3 as type parameter with no type error
|
|
72
|
+
// 2. original Omit have no auto complete for 2nd type parameter
|
|
73
|
+
expectTypeOf<Omit<A, 3 | 2>>().toEqualTypeOf<ExpectedType>()
|
|
74
|
+
|
|
75
|
+
// Solution
|
|
76
|
+
|
|
77
|
+
// 1. strictly
|
|
78
|
+
expectTypeOf<
|
|
79
|
+
OmitKeyof<
|
|
80
|
+
A,
|
|
81
|
+
// OmitKeyof can't use 3 as type parameter with type error because A don't have key 3
|
|
82
|
+
// @ts-expect-error Type does not satisfy the constraint keyof A
|
|
83
|
+
3 | 2
|
|
84
|
+
>
|
|
85
|
+
>().toEqualTypeOf<ExpectedType>
|
|
86
|
+
expectTypeOf<
|
|
87
|
+
OmitKeyof<
|
|
88
|
+
A,
|
|
89
|
+
// OmitKeyof can't use 3 as type parameter with type error because A don't have key 3
|
|
90
|
+
// @ts-expect-error Type does not satisfy the constraint keyof A
|
|
91
|
+
3 | 2,
|
|
92
|
+
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-arguments
|
|
93
|
+
'strictly'
|
|
94
|
+
>
|
|
95
|
+
>().toEqualTypeOf<ExpectedType>
|
|
96
|
+
|
|
97
|
+
// 2. safely
|
|
98
|
+
expectTypeOf<
|
|
99
|
+
OmitKeyof<
|
|
100
|
+
A,
|
|
101
|
+
// OmitKeyof can't use 3 as type parameter type error with strictly parameter or default parameter
|
|
102
|
+
// @ts-expect-error Type does not satisfy the constraint keyof A
|
|
103
|
+
3 | 2
|
|
104
|
+
>
|
|
105
|
+
>().toEqualTypeOf<ExpectedType>
|
|
106
|
+
expectTypeOf<
|
|
107
|
+
OmitKeyof<
|
|
108
|
+
A,
|
|
109
|
+
// With 'safely', OmitKeyof can use 3 as type parameter like original Omit but This support autocomplete too yet for DX.
|
|
110
|
+
3 | 2,
|
|
111
|
+
'safely'
|
|
112
|
+
>
|
|
113
|
+
>().toEqualTypeOf<ExpectedType>
|
|
114
|
+
})
|
|
115
|
+
|
|
116
|
+
it("'s symbol key type check", () => {
|
|
117
|
+
const symbol1 = Symbol()
|
|
118
|
+
const symbol2 = Symbol()
|
|
119
|
+
const symbol3 = Symbol()
|
|
120
|
+
|
|
121
|
+
type A = {
|
|
122
|
+
[symbol1]: string
|
|
123
|
+
[symbol2]: number
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
type ExpectedType = {
|
|
127
|
+
[symbol1]: string
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
// Bad point
|
|
131
|
+
// 1. original Omit can use symbol3 as type parameter with no type error
|
|
132
|
+
// 2. original Omit have no auto complete for 2nd type parameter
|
|
133
|
+
expectTypeOf<Omit<A, typeof symbol3 | typeof symbol2>>().toEqualTypeOf<ExpectedType>()
|
|
134
|
+
|
|
135
|
+
// Solution
|
|
136
|
+
|
|
137
|
+
// 1. strictly
|
|
138
|
+
expectTypeOf<
|
|
139
|
+
OmitKeyof<
|
|
140
|
+
A,
|
|
141
|
+
// OmitKeyof can't use symbol3 as type parameter with type error because A don't have key symbol3
|
|
142
|
+
// @ts-expect-error Type does not satisfy the constraint keyof A
|
|
143
|
+
typeof symbol3 | typeof symbol2
|
|
144
|
+
>
|
|
145
|
+
>().toEqualTypeOf<ExpectedType>
|
|
146
|
+
expectTypeOf<
|
|
147
|
+
OmitKeyof<
|
|
148
|
+
A,
|
|
149
|
+
// OmitKeyof can't use symbol3 as type parameter with type error because A don't have key symbol3
|
|
150
|
+
// @ts-expect-error Type does not satisfy the constraint keyof A
|
|
151
|
+
typeof symbol3 | typeof symbol2,
|
|
152
|
+
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-arguments
|
|
153
|
+
'strictly'
|
|
154
|
+
>
|
|
155
|
+
>().toEqualTypeOf<ExpectedType>
|
|
156
|
+
|
|
157
|
+
// 2. safely
|
|
158
|
+
expectTypeOf<
|
|
159
|
+
OmitKeyof<
|
|
160
|
+
A,
|
|
161
|
+
// OmitKeyof can't use symbol3 as type parameter type error with strictly parameter or default parameter
|
|
162
|
+
// @ts-expect-error Type does not satisfy the constraint keyof A
|
|
163
|
+
typeof symbol3 | typeof symbol2
|
|
164
|
+
>
|
|
165
|
+
>().toEqualTypeOf<ExpectedType>
|
|
166
|
+
expectTypeOf<
|
|
167
|
+
OmitKeyof<
|
|
168
|
+
A,
|
|
169
|
+
// With 'safely', OmitKeyof can use symbol3 as type parameter like original Omit but This support autocomplete too yet for DX.
|
|
170
|
+
typeof symbol3 | typeof symbol2,
|
|
171
|
+
'safely'
|
|
172
|
+
>
|
|
173
|
+
>().toEqualTypeOf<ExpectedType>
|
|
174
|
+
})
|
|
175
|
+
})
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export type OmitKeyof<
|
|
2
|
+
TObject,
|
|
3
|
+
TKey extends TStrictly extends 'safely'
|
|
4
|
+
?
|
|
5
|
+
| keyof TObject
|
|
6
|
+
| (string & Record<never, never>)
|
|
7
|
+
| (number & Record<never, never>)
|
|
8
|
+
| (symbol & Record<never, never>)
|
|
9
|
+
: keyof TObject,
|
|
10
|
+
TStrictly extends 'strictly' | 'safely' = 'strictly',
|
|
11
|
+
> = Omit<TObject, TKey>
|