From e33f28fb899920e2f4ee7a9cf75bf2b04a561aa3 Mon Sep 17 00:00:00 2001
From: mana <a7108100@gmail.com>
Date: Thu, 13 Jun 2019 12:46:27 +0900
Subject: [PATCH] fix(typescript): fix query typings (#1)

* fix(typescript): fix query typings

* fix(typescript): remove NativeTestInstance from function argument in Query interface

* chore: remove unnecessary code
---
 typings/get-queries-for-element.d.ts |  9 +++++----
 typings/index.d.ts                   | 10 +++++-----
 typings/query-helpers.d.ts           |  6 +++---
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/typings/get-queries-for-element.d.ts b/typings/get-queries-for-element.d.ts
index 5457f71..b19c7f1 100644
--- a/typings/get-queries-for-element.d.ts
+++ b/typings/get-queries-for-element.d.ts
@@ -1,6 +1,7 @@
 import { ReactTestRenderer } from 'react-test-renderer';
 
 import * as queries from './queries';
+import { NativeTestInstance } from './query-helpers';
 
 export type BoundFunction<T> = T extends (
   attribute: string,
@@ -17,10 +18,10 @@ export type BoundFunctions<T> = { [P in keyof T]: BoundFunction<T[P]> };
 interface Query extends Function {
   (testRenderer: ReactTestRenderer, ...args: any[]):
     | Error
-    | Promise<ReactTestRenderer[]>
-    | Promise<ReactTestRenderer>
-    | ReactTestRenderer[]
-    | ReactTestRenderer
+    | Promise<NativeTestInstance[]>
+    | Promise<NativeTestInstance>
+    | NativeTestInstance[]
+    | NativeTestInstance
     | null;
 }
 
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 9b58eef..7d2ee46 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -10,12 +10,12 @@ import { getQueriesForElement, BoundFunction } from './get-queries-for-element';
 declare const within: typeof getQueriesForElement;
 
 interface Query extends Function {
-  (testRenderer: ReactTestRenderer | NativeTestInstance, ...args: any[]):
+  (testRenderer: ReactTestRenderer, ...args: any[]):
     | Error
-    | Promise<HTMLElement[]>
-    | Promise<HTMLElement>
-    | HTMLElement[]
-    | HTMLElement
+    | Promise<NativeTestInstance[]>
+    | Promise<NativeTestInstance>
+    | NativeTestInstance[]
+    | NativeTestInstance
     | null;
 }
 
diff --git a/typings/query-helpers.d.ts b/typings/query-helpers.d.ts
index 4e90b51..61d1d04 100644
--- a/typings/query-helpers.d.ts
+++ b/typings/query-helpers.d.ts
@@ -4,12 +4,12 @@ import { Matcher, MatcherOptions } from './matches';
 
 type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
-export interface SelectorMatcherOptions extends MatcherOptions {
+export type SelectorMatcherOptions = Omit<MatcherOptions, 'selector'> & {
   selector?: string;
-}
+};
 
 type ReactTestInstance = {
-  getProp: (string) => NativeTestInstance;
+  getProp: (str: string) => NativeTestInstance;
 };
 
 export type NativeTestInstance = Omit<