refactor: cleanup

Author: mdjastrzebski

src/fire-event.ts

@@ -11,6 +11,7 @@ import { isHostElement } from './helpers/component-tree';
 import { isHostTextInput } from './helpers/host-component-names';
 import { isPointerEventEnabled } from './helpers/pointer-events';
 import { isTextInputEditable } from './helpers/text-input';
+import { StringWithAutocomplete } from './types';
 
 type EventHandler = (...args: unknown[]) => unknown;
 
@@ -106,19 +107,17 @@ function getEventHandlerName(eventName: string) {
 }
 
 // String union type of keys of T that start with on, stripped of 'on'
-type OnKeys<T> = keyof {
+type EventNameExtractor<T> = keyof {
   [K in keyof T as K extends `on${infer Rest}` ? Uncapitalize<Rest> : never]: T[K];
 };
 
-// TS autocomplete trick
-// Ref: https://github.com/microsoft/TypeScript/issues/29729#issuecomment-567871939
-type EventName =
-  | OnKeys<ViewProps>
-  | OnKeys<TextProps>
-  | OnKeys<TextInputProps>
-  | OnKeys<PressableProps>
-  | OnKeys<ScrollViewProps>
-  | (string & {});
+type EventName = StringWithAutocomplete<
+  | EventNameExtractor<ViewProps>
+  | EventNameExtractor<TextProps>
+  | EventNameExtractor<TextInputProps>
+  | EventNameExtractor<PressableProps>
+  | EventNameExtractor<ScrollViewProps>
+>;
 
 function fireEvent(element: ReactTestInstance, eventName: EventName, ...data: unknown[]) {
   const handler = findEventHandler(element, eventName);

src/queries/role.ts

@@ -17,6 +17,7 @@ import {
 } from '../helpers/matchers/match-accessibility-value';
 import { matchStringProp } from '../helpers/matchers/match-string-prop';
 import type { TextMatch } from '../matches';
+import { StringWithAutocomplete } from '../types';
 import { getQueriesForElement } from '../within';
 import { makeQueries } from './make-queries';
 import type {
@@ -29,11 +30,9 @@ import type {
 } from './make-queries';
 import { CommonQueryOptions } from './options';
 
-// TS autocomplete trick
-// Ref: https://github.com/microsoft/TypeScript/issues/29729#issuecomment-567871939
-export type RoleMatcher = AccessibilityRole | Role | (string & {}) | RegExp;
+export type RoleMatcher = StringWithAutocomplete<AccessibilityRole | Role> | RegExp;
 
-type ByRoleOptions = CommonQueryOptions &
+export type ByRoleOptions = CommonQueryOptions &
   AccessibilityStateMatcher & {
     name?: TextMatch;
     value?: AccessibilityValueMatcher;

src/types.ts

@@ -0,0 +1,3 @@
+// TS autocomplete trick
+// Ref: https://github.com/microsoft/TypeScript/issues/29729#issuecomment-567871939
+export type StringWithAutocomplete<T> = T | (string & {});