Skip to content

Commit b247386

Browse files
phryneasphryneas
authored
fix: BoundSyncFunctions type should contain query*, not find* (#5)
1 parent c3e71b2 commit b247386

File tree

2 files changed

+44
-49
lines changed

2 files changed

+44
-49
lines changed

‎src/renderStream/__tests__/createRenderStream.test.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ describe('snapshotDOM', () => {
4949
}
5050
{
5151
const {withinDOM} = await takeRender()
52-
const input = withinDOM().getByLabelText<HTMLInputElement>('Value')
52+
// a one-off to test that `queryBy` works and accepts a type argument
53+
const input = withinDOM().queryByLabelText<HTMLInputElement>('Value')!
5354
expect(input.value).toBe('1')
5455
}
5556
{

‎src/renderStream/syncQueries.ts‎

Lines changed: 42 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -31,84 +31,84 @@ export type BoundSyncFunctions<Q> = Q extends typeof syncQueries
3131
getAllByLabelText<T extends HTMLElement = HTMLElement>(
3232
...args: Parameters<BoundFunction<queries.AllByText<T>>>
3333
): ReturnType<queries.AllByText<T>>
34-
findByLabelText<T extends HTMLElement = HTMLElement>(
35-
...args: Parameters<BoundFunction<queries.FindByText<T>>>
36-
): ReturnType<queries.FindByText<T>>
37-
findAllByLabelText<T extends HTMLElement = HTMLElement>(
38-
...args: Parameters<BoundFunction<queries.FindAllByText<T>>>
39-
): ReturnType<queries.FindAllByText<T>>
34+
queryByLabelText<T extends HTMLElement = HTMLElement>(
35+
...args: Parameters<BoundFunction<queries.QueryByText<T>>>
36+
): ReturnType<queries.QueryByText<T>>
37+
queryAllByLabelText<T extends HTMLElement = HTMLElement>(
38+
...args: Parameters<BoundFunction<queries.AllByText<T>>>
39+
): ReturnType<queries.AllByText<T>>
4040
getByPlaceholderText<T extends HTMLElement = HTMLElement>(
4141
...args: Parameters<BoundFunction<queries.GetByBoundAttribute<T>>>
4242
): ReturnType<queries.GetByBoundAttribute<T>>
4343
getAllByPlaceholderText<T extends HTMLElement = HTMLElement>(
4444
...args: Parameters<BoundFunction<queries.AllByBoundAttribute<T>>>
4545
): ReturnType<queries.AllByBoundAttribute<T>>
46-
findByPlaceholderText<T extends HTMLElement = HTMLElement>(
47-
...args: Parameters<BoundFunction<queries.FindByBoundAttribute<T>>>
48-
): ReturnType<queries.FindByBoundAttribute<T>>
49-
findAllByPlaceholderText<T extends HTMLElement = HTMLElement>(
50-
...args: Parameters<BoundFunction<queries.FindAllByBoundAttribute<T>>>
51-
): ReturnType<queries.FindAllByBoundAttribute<T>>
46+
queryByPlaceholderText<T extends HTMLElement = HTMLElement>(
47+
...args: Parameters<BoundFunction<queries.QueryByBoundAttribute<T>>>
48+
): ReturnType<queries.QueryByBoundAttribute<T>>
49+
queryAllByPlaceholderText<T extends HTMLElement = HTMLElement>(
50+
...args: Parameters<BoundFunction<queries.AllByBoundAttribute<T>>>
51+
): ReturnType<queries.AllByBoundAttribute<T>>
5252
getByText<T extends HTMLElement = HTMLElement>(
5353
...args: Parameters<BoundFunction<queries.GetByText<T>>>
5454
): ReturnType<queries.GetByText<T>>
5555
getAllByText<T extends HTMLElement = HTMLElement>(
5656
...args: Parameters<BoundFunction<queries.AllByText<T>>>
5757
): ReturnType<queries.AllByText<T>>
58-
findByText<T extends HTMLElement = HTMLElement>(
59-
...args: Parameters<BoundFunction<queries.FindByText<T>>>
60-
): ReturnType<queries.FindByText<T>>
61-
findAllByText<T extends HTMLElement = HTMLElement>(
62-
...args: Parameters<BoundFunction<queries.FindAllByText<T>>>
63-
): ReturnType<queries.FindAllByText<T>>
58+
queryByText<T extends HTMLElement = HTMLElement>(
59+
...args: Parameters<BoundFunction<queries.QueryByText<T>>>
60+
): ReturnType<queries.QueryByText<T>>
61+
queryAllByText<T extends HTMLElement = HTMLElement>(
62+
...args: Parameters<BoundFunction<queries.AllByText<T>>>
63+
): ReturnType<queries.AllByText<T>>
6464
getByAltText<T extends HTMLElement = HTMLElement>(
6565
...args: Parameters<BoundFunction<queries.GetByBoundAttribute<T>>>
6666
): ReturnType<queries.GetByBoundAttribute<T>>
6767
getAllByAltText<T extends HTMLElement = HTMLElement>(
6868
...args: Parameters<BoundFunction<queries.AllByBoundAttribute<T>>>
6969
): ReturnType<queries.AllByBoundAttribute<T>>
70-
findByAltText<T extends HTMLElement = HTMLElement>(
71-
...args: Parameters<BoundFunction<queries.FindByBoundAttribute<T>>>
72-
): ReturnType<queries.FindByBoundAttribute<T>>
73-
findAllByAltText<T extends HTMLElement = HTMLElement>(
74-
...args: Parameters<BoundFunction<queries.FindAllByBoundAttribute<T>>>
75-
): ReturnType<queries.FindAllByBoundAttribute<T>>
70+
queryByAltText<T extends HTMLElement = HTMLElement>(
71+
...args: Parameters<BoundFunction<queries.QueryByBoundAttribute<T>>>
72+
): ReturnType<queries.QueryByBoundAttribute<T>>
73+
queryAllByAltText<T extends HTMLElement = HTMLElement>(
74+
...args: Parameters<BoundFunction<queries.AllByBoundAttribute<T>>>
75+
): ReturnType<queries.AllByBoundAttribute<T>>
7676
getByTitle<T extends HTMLElement = HTMLElement>(
7777
...args: Parameters<BoundFunction<queries.GetByBoundAttribute<T>>>
7878
): ReturnType<queries.GetByBoundAttribute<T>>
7979
getAllByTitle<T extends HTMLElement = HTMLElement>(
8080
...args: Parameters<BoundFunction<queries.AllByBoundAttribute<T>>>
8181
): ReturnType<queries.AllByBoundAttribute<T>>
82-
findByTitle<T extends HTMLElement = HTMLElement>(
83-
...args: Parameters<BoundFunction<queries.FindByBoundAttribute<T>>>
84-
): ReturnType<queries.FindByBoundAttribute<T>>
85-
findAllByTitle<T extends HTMLElement = HTMLElement>(
86-
...args: Parameters<BoundFunction<queries.FindAllByBoundAttribute<T>>>
87-
): ReturnType<queries.FindAllByBoundAttribute<T>>
82+
queryByTitle<T extends HTMLElement = HTMLElement>(
83+
...args: Parameters<BoundFunction<queries.QueryByBoundAttribute<T>>>
84+
): ReturnType<queries.QueryByBoundAttribute<T>>
85+
queryAllByTitle<T extends HTMLElement = HTMLElement>(
86+
...args: Parameters<BoundFunction<queries.AllByBoundAttribute<T>>>
87+
): ReturnType<queries.AllByBoundAttribute<T>>
8888
getByDisplayValue<T extends HTMLElement = HTMLElement>(
8989
...args: Parameters<BoundFunction<queries.GetByBoundAttribute<T>>>
9090
): ReturnType<queries.GetByBoundAttribute<T>>
9191
getAllByDisplayValue<T extends HTMLElement = HTMLElement>(
9292
...args: Parameters<BoundFunction<queries.AllByBoundAttribute<T>>>
9393
): ReturnType<queries.AllByBoundAttribute<T>>
94-
findByDisplayValue<T extends HTMLElement = HTMLElement>(
95-
...args: Parameters<BoundFunction<queries.FindByBoundAttribute<T>>>
96-
): ReturnType<queries.FindByBoundAttribute<T>>
97-
findAllByDisplayValue<T extends HTMLElement = HTMLElement>(
98-
...args: Parameters<BoundFunction<queries.FindAllByBoundAttribute<T>>>
99-
): ReturnType<queries.FindAllByBoundAttribute<T>>
94+
queryByDisplayValue<T extends HTMLElement = HTMLElement>(
95+
...args: Parameters<BoundFunction<queries.QueryByBoundAttribute<T>>>
96+
): ReturnType<queries.QueryByBoundAttribute<T>>
97+
queryAllByDisplayValue<T extends HTMLElement = HTMLElement>(
98+
...args: Parameters<BoundFunction<queries.AllByBoundAttribute<T>>>
99+
): ReturnType<queries.AllByBoundAttribute<T>>
100100
getByRole<T extends HTMLElement = HTMLElement>(
101101
...args: Parameters<BoundFunction<queries.GetByRole<T>>>
102102
): ReturnType<queries.GetByRole<T>>
103103
getAllByRole<T extends HTMLElement = HTMLElement>(
104104
...args: Parameters<BoundFunction<queries.AllByRole<T>>>
105105
): ReturnType<queries.AllByRole<T>>
106-
findByRole<T extends HTMLElement = HTMLElement>(
107-
...args: Parameters<BoundFunction<queries.FindByRole<T>>>
108-
): ReturnType<queries.FindByRole<T>>
109-
findAllByRole<T extends HTMLElement = HTMLElement>(
110-
...args: Parameters<BoundFunction<queries.FindAllByRole<T>>>
111-
): ReturnType<queries.FindAllByRole<T>>
106+
queryByRole<T extends HTMLElement = HTMLElement>(
107+
...args: Parameters<BoundFunction<queries.QueryByRole<T>>>
108+
): ReturnType<queries.QueryByRole<T>>
109+
queryAllByRole<T extends HTMLElement = HTMLElement>(
110+
...args: Parameters<BoundFunction<queries.AllByRole<T>>>
111+
): ReturnType<queries.AllByRole<T>>
112112
getByTestId<T extends HTMLElement = HTMLElement>(
113113
...args: Parameters<BoundFunction<queries.GetByBoundAttribute<T>>>
114114
): ReturnType<queries.GetByBoundAttribute<T>>
@@ -121,12 +121,6 @@ export type BoundSyncFunctions<Q> = Q extends typeof syncQueries
121121
queryAllByTestId<T extends HTMLElement = HTMLElement>(
122122
...args: Parameters<BoundFunction<queries.AllByBoundAttribute<T>>>
123123
): ReturnType<queries.AllByBoundAttribute<T>>
124-
findByTestId<T extends HTMLElement = HTMLElement>(
125-
...args: Parameters<BoundFunction<queries.FindByBoundAttribute<T>>>
126-
): ReturnType<queries.FindByBoundAttribute<T>>
127-
findAllByTestId<T extends HTMLElement = HTMLElement>(
128-
...args: Parameters<BoundFunction<queries.FindAllByBoundAttribute<T>>>
129-
): ReturnType<queries.FindAllByBoundAttribute<T>>
130124
} & {
131125
[P in keyof Q]: BoundFunction<Q[P]>
132126
}

0 commit comments

Comments
 (0)