Skip to content
This repository was archived by the owner on Jul 30, 2020. It is now read-only.

Commit c6088ad

Browse files
manakurobcarroll22
authored andcommitted
fix(typescript): fix query typings (#1) (#32)
* fix(typescript): fix query typings * fix(typescript): remove NativeTestInstance from function argument in Query interface * chore: remove unnecessary code
1 parent 204ff08 commit c6088ad

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

typings/get-queries-for-element.d.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { ReactTestRenderer } from 'react-test-renderer';
22

33
import * as queries from './queries';
4+
import { NativeTestInstance } from './query-helpers';
45

56
export type BoundFunction<T> = T extends (
67
attribute: string,
@@ -17,10 +18,10 @@ export type BoundFunctions<T> = { [P in keyof T]: BoundFunction<T[P]> };
1718
interface Query extends Function {
1819
(testRenderer: ReactTestRenderer, ...args: any[]):
1920
| Error
20-
| Promise<ReactTestRenderer[]>
21-
| Promise<ReactTestRenderer>
22-
| ReactTestRenderer[]
23-
| ReactTestRenderer
21+
| Promise<NativeTestInstance[]>
22+
| Promise<NativeTestInstance>
23+
| NativeTestInstance[]
24+
| NativeTestInstance
2425
| null;
2526
}
2627

typings/index.d.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import { getQueriesForElement, BoundFunction } from './get-queries-for-element';
1010
declare const within: typeof getQueriesForElement;
1111

1212
interface Query extends Function {
13-
(testRenderer: ReactTestRenderer | NativeTestInstance, ...args: any[]):
13+
(testRenderer: ReactTestRenderer, ...args: any[]):
1414
| Error
15-
| Promise<HTMLElement[]>
16-
| Promise<HTMLElement>
17-
| HTMLElement[]
18-
| HTMLElement
15+
| Promise<NativeTestInstance[]>
16+
| Promise<NativeTestInstance>
17+
| NativeTestInstance[]
18+
| NativeTestInstance
1919
| null;
2020
}
2121

typings/query-helpers.d.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import { Matcher, MatcherOptions } from './matches';
44

55
type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
66

7-
export interface SelectorMatcherOptions extends MatcherOptions {
7+
export type SelectorMatcherOptions = Omit<MatcherOptions, 'selector'> & {
88
selector?: string;
9-
}
9+
};
1010

1111
type ReactTestInstance = {
12-
getProp: (string) => NativeTestInstance;
12+
getProp: (str: string) => NativeTestInstance;
1313
};
1414

1515
export type NativeTestInstance = Omit<

0 commit comments

Comments
 (0)