Unified all waitForOptions types to one single type

Author: Ali Nasserzadeh

types/queries.d.ts

@@ -1,6 +1,6 @@
 import { Matcher, MatcherOptions } from './matches';
 import { SelectorMatcherOptions } from './query-helpers';
-import { WaitForElementOptions } from './wait-for-element';
+import { waitForOptions } from 'wait-for';
 
 export type QueryByBoundAttribute = (
     container: HTMLElement,
@@ -14,7 +14,7 @@ export type FindAllByBoundAttribute = (
     container: HTMLElement,
     id: Matcher,
     options?: MatcherOptions,
-    waitForElementOptions?: WaitForElementOptions,
+    waitForElementOptions?: waitForOptions,
 ) => Promise<HTMLElement[]>;
 
 export type GetByBoundAttribute = (container: HTMLElement, id: Matcher, options?: MatcherOptions) => HTMLElement;
@@ -23,7 +23,7 @@ export type FindByBoundAttribute = (
     container: HTMLElement,
     id: Matcher,
     options?: MatcherOptions,
-    waitForElementOptions?: WaitForElementOptions,
+    waitForElementOptions?: waitForOptions,
 ) => Promise<HTMLElement>;
 
 export type QueryByText = (container: HTMLElement, id: Matcher, options?: SelectorMatcherOptions) => HTMLElement | null;
@@ -34,7 +34,7 @@ export type FindAllByText = (
     container: HTMLElement,
     id: Matcher,
     options?: SelectorMatcherOptions,
-    waitForElementOptions?: WaitForElementOptions,
+    waitForElementOptions?: waitForOptions,
 ) => Promise<HTMLElement[]>;
 
 export type GetByText = (container: HTMLElement, id: Matcher, options?: SelectorMatcherOptions) => HTMLElement;
@@ -43,7 +43,7 @@ export type FindByText = (
     container: HTMLElement,
     id: Matcher,
     options?: SelectorMatcherOptions,
-    waitForElementOptions?: WaitForElementOptions,
+    waitForElementOptions?: waitForOptions,
 ) => Promise<HTMLElement>;
 
 export interface ByRoleOptions extends MatcherOptions {
@@ -74,14 +74,14 @@ export type FindByRole = (
     container: HTMLElement,
     role: Matcher,
     options?: ByRoleOptions,
-    waitForElementOptions?: WaitForElementOptions,
+    waitForElementOptions?: waitForOptions,
 ) => Promise<HTMLElement>;
 
 export type FindAllByRole = (
     container: HTMLElement,
     role: Matcher,
     options?: ByRoleOptions,
-    waitForElementOptions?: WaitForElementOptions,
+    waitForElementOptions?: waitForOptions,
 ) => Promise<HTMLElement[]>;
 
 export const getByLabelText: GetByText;

types/wait-for-dom-change.d.ts

@@ -1,5 +1,3 @@
-export function waitForDomChange(options?: {
-    container?: HTMLElement;
-    timeout?: number;
-    mutationObserverOptions?: MutationObserverInit;
-}): Promise<any>;
+import { waitForOptions } from "index";
+
+export function waitForDomChange(options?: waitForOptions): Promise<any>;

types/wait-for-element-to-be-removed.d.ts

@@ -1,8 +1,6 @@
+import { waitForOptions } from "wait-for";
+
 export function waitForElementToBeRemoved<T>(
     callback: (() => T) | T,
-    options?: {
-        container?: HTMLElement;
-        timeout?: number;
-        mutationObserverOptions?: MutationObserverInit;
-    },
+    options?: waitForOptions,
 ): Promise<T>;

types/wait-for-element.d.ts

@@ -1,7 +1,3 @@
-export interface WaitForElementOptions {
-    container?: HTMLElement;
-    timeout?: number;
-    mutationObserverOptions?: MutationObserverInit;
-}
+import { waitForOptions } from "wait-for";
 
-export function waitForElement<T>(callback: () => T, options?: WaitForElementOptions): Promise<T>;
+export function waitForElement<T>(callback: () => T, options?: waitForOptions): Promise<T>;

types/wait-for.d.ts

@@ -1,9 +1,11 @@
+export interface waitForOptions {
+    container?: HTMLElement;
+    timeout?: number;
+    interval?: number;
+    mutationObserverOptions?: MutationObserverInit;
+}
+
 export function waitFor<T>(
     callback: () => T,
-    options?: {
-        container?: HTMLElement;
-        timeout?: number;
-        interval?: number;
-        mutationObserverOptions?: MutationObserverInit;
-    },
+    options?: waitForOptions,
 ): Promise<T>;