fix: restore types

Author: DaniAcu

src/queries/role.ts

@@ -26,6 +26,7 @@ import {
   ByRoleMatcher,
   ByRoleOptions,
   GetErrorFunction,
+  Matcher,
   MatcherFunction,
   MatcherOptions,
   NormalizerFn,
@@ -143,26 +144,25 @@ const queryAllByRole: AllByRole = (
 
       if (isRoleSpecifiedExplicitly) {
         const roleValue = node.getAttribute('role')!
-        /* istanbul ignore next */
         if (queryFallbacks) {
           return roleValue
             .split(' ')
             .filter(Boolean)
-            .some(text => matcher(text, node, role, matchNormalizer))
+            .some(text => matcher(text, node, role as Matcher, matchNormalizer))
         }
         // if a custom normalizer is passed then let normalizer handle the role value
         if (normalizer) {
-          return matcher(roleValue, node, role, matchNormalizer)
+          return matcher(roleValue, node, role as Matcher, matchNormalizer)
         }
         // other wise only send the first word to match
         const [firstWord] = roleValue.split(' ')
-        return matcher(firstWord, node, role, matchNormalizer)
+        return matcher(firstWord, node, role as Matcher, matchNormalizer)
       }
 
       const implicitRoles = getImplicitAriaRoles(node)
 
       return implicitRoles.some(implicitRole =>
-        matcher(implicitRole, node, role, matchNormalizer),
+        matcher(implicitRole, node, role as Matcher, matchNormalizer),
       )
     })
     .filter(element => {
@@ -215,7 +215,7 @@ const queryAllByRole: AllByRole = (
             getConfig().computedStyleSupportsPseudoElements,
         }),
         element,
-        description,
+        description as Matcher,
         text => text,
       )
     })
@@ -241,7 +241,7 @@ function makeRoleSelector(
   const explicitRoleSelector =
     exact && !customNormalizer ? `*[role~="${role}"]` : '*[role]'
 
-  const roleRelations = roleElements.get(role) ?? new Set()
+  const roleRelations = roleElements.get(role as any) ?? new Set()
   const implicitRoleSelectors = new Set(
     Array.from(roleRelations).map(({name}) => name),
   )

src/query-helpers.ts

@@ -213,15 +213,16 @@ const wrapAllByQueryWithSuggestion =
 // However, the implementation always required a dyadic (after `container`) not variadic `queryAllBy` considering the implementation of `makeFindQuery`
 // This is at least statically true and can be verified by accepting `QueryMethod<Arguments, HTMLElement[]>`
 function buildQueries(
-  queryAllBy:
-    | AllByRole
-    | QueryMethod<[matcher: Matcher, options: MatcherOptions], HTMLElement[]>,
-  getMultipleError:
-    | GetErrorFunction<[matcher: ByRoleMatcher, options: ByRoleOptions]>
-    | GetErrorFunction<[matcher: Matcher, options: MatcherOptions]>,
-  getMissingError:
-    | GetErrorFunction<[matcher: ByRoleMatcher, options: ByRoleOptions]>
-    | GetErrorFunction<[matcher: Matcher, options: MatcherOptions]>,
+  queryAllBy: QueryMethod<
+    [matcher: Matcher, options: MatcherOptions],
+    HTMLElement[]
+  >,
+  getMultipleError: GetErrorFunction<
+    [matcher: Matcher, options: MatcherOptions]
+  >,
+  getMissingError: GetErrorFunction<
+    [matcher: Matcher, options: MatcherOptions]
+  >,
 ) {
   const queryBy = wrapSingleQueryWithSuggestion(
     makeSingleQuery(queryAllBy, getMultipleError),
@@ -243,11 +244,9 @@ function buildQueries(
   )
 
   const findAllBy = makeFindQuery(
-    // @ts-expect-error -- See `wrapAllByQueryWithSuggestion` Argument constraint comment
     wrapAllByQueryWithSuggestion(getAllBy, queryAllBy.name, 'findAll'),
   )
   const findBy = makeFindQuery(
-    // @ts-expect-error -- See `wrapAllByQueryWithSuggestion` Argument constraint comment
     wrapSingleQueryWithSuggestion(getBy, queryAllBy.name, 'find'),
   )
 

types/queries.d.ts

@@ -126,7 +126,7 @@ export interface ByRoleOptions extends MatcherOptions {
   description?:
     | RegExp
     | string
-    | ((accessibleName: string, element: Element) => boolean)
+    | ((accessibleDescription: string, element: Element) => boolean)
 }
 
 export type AllByRole<T extends HTMLElement = HTMLElement> = (