fix: modify role options types to match upgraded @testing-library/dom

Author: patrickhulce

lib/typedefs.ts

@@ -1,10 +1,28 @@
-import {Matcher, MatcherOptions, SelectorMatcherOptions, waitForOptions} from '@testing-library/dom'
+import {
+  Matcher,
+  MatcherOptions as MatcherOptions_,
+  SelectorMatcherOptions as SelectorMatcherOptions_,
+  waitForOptions,
+} from '@testing-library/dom'
 import {ElementHandle as PlaywrightElementHandle} from 'playwright'
 
 export type ElementHandle = PlaywrightElementHandle<SVGElement | HTMLElement>
 
 type Element = ElementHandle
 
+type MatcherOptions = Omit<MatcherOptions_, 'normalizer'>
+type SelectorMatcherOptions = Omit<SelectorMatcherOptions_, 'normalizer'>
+
+// tslint:disable-next-line
+interface RoleMatcherOptions extends MatcherOptions {
+  name?: string | RegExp
+}
+
+// tslint:disable-next-line
+interface SelectorRoleMatcherOptions extends SelectorMatcherOptions {
+  name?: string | RegExp
+}
+
 interface IQueryMethods {
   queryByPlaceholderText(el: Element, m: Matcher, opts?: MatcherOptions): Promise<Element | null>
   queryAllByPlaceholderText(el: Element, m: Matcher, opts?: MatcherOptions): Promise<Element[]>
@@ -108,20 +126,20 @@ interface IQueryMethods {
     waitForOpts?: waitForOptions,
   ): Promise<Element[]>
 
-  queryByRole(el: Element, m: Matcher, opts?: MatcherOptions): Promise<Element | null>
-  queryAllByRole(el: Element, m: Matcher, opts?: MatcherOptions): Promise<Element[]>
-  getByRole(el: Element, m: Matcher, opts?: MatcherOptions): Promise<Element>
-  getAllByRole(el: Element, m: Matcher, opts?: MatcherOptions): Promise<Element[]>
+  queryByRole(el: Element, m: Matcher, opts?: RoleMatcherOptions): Promise<Element | null>
+  queryAllByRole(el: Element, m: Matcher, opts?: RoleMatcherOptions): Promise<Element[]>
+  getByRole(el: Element, m: Matcher, opts?: RoleMatcherOptions): Promise<Element>
+  getAllByRole(el: Element, m: Matcher, opts?: RoleMatcherOptions): Promise<Element[]>
   findByRole(
     el: Element,
     m: Matcher,
-    opts?: SelectorMatcherOptions,
+    opts?: SelectorRoleMatcherOptions,
     waitForOpts?: waitForOptions,
   ): Promise<Element>
   findAllByRole(
     el: Element,
     m: Matcher,
-    opts?: SelectorMatcherOptions,
+    opts?: SelectorRoleMatcherOptions,
     waitForOpts?: waitForOptions,
   ): Promise<Element[]>
 
@@ -150,8 +168,8 @@ export type BoundFunction<T> = T extends (
   options: infer Q,
 ) => infer R
   ? (text: P, options?: Q) => R
-  : T extends (a1: any, text: infer P, options: infer Q, waitForElementOptions: infer W) => infer R
-  ? (text: P, options?: Q, waitForElementOptions?: W) => R
+  : T extends (a1: any, text: infer P, options: infer Q, waitForOptions: infer W) => infer R
+  ? (text: P, options?: Q, waitForOptions?: W) => R
   : T extends (a1: any, text: infer P, options: infer Q) => infer R
   ? (text: P, options?: Q) => R
   : never

yarn.lock

@@ -1161,9 +1161,9 @@
     "@babel/plugin-transform-react-pure-annotations" "^7.10.1"
 
 "@babel/runtime-corejs3@^7.10.2":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.10.4.tgz#f29fc1990307c4c57b10dbd6ce667b27159d9e0d"
-  integrity sha512-BFlgP2SoLO9HJX9WBwN67gHWMBhDX/eDz64Jajd6mR/UAUzqrNMm99d4qHnVaKscAElZoFiPv+JpR/Siud5lXw==
+  version "7.11.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.11.2.tgz#02c3029743150188edeb66541195f54600278419"
+  integrity sha512-qh5IR+8VgFz83VBa6OkaET6uN/mJOhHONuy3m1sgF0CV6mXdPSEBdA7e1eUbVvyNtANjMbg22JUv71BaDXLY6A==
   dependencies:
     core-js-pure "^3.0.0"
     regenerator-runtime "^0.13.4"