refactor: update types to use type consistently

testing-library · Jan 9, 2021 · ecfd75b · ecfd75b
1 parent a82d5ef
commit ecfd75b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/src/core/index.ts b/src/core/index.ts
@@ -42,11 +42,11 @@ function resultContainer<TValue>(): ResultContainer<TValue> {
 
 function createRenderHook<TProps, TResult, TOptions extends {}, TRenderer extends Renderer<TProps>>(
   createRenderer: CreateRenderer<TProps, TResult, TOptions, TRenderer>
-) {
-  const renderHook = (
-    callback: (props: TProps) => TResult,
-    options: RenderHookOptions<TProps, TOptions> = {} as RenderHookOptions<TProps, TOptions>
-  ): RenderHook<TProps, TResult, TRenderer> => {
+): RenderHook<TProps, TResult, TOptions> {
+  const renderHook: RenderHook<TProps, TResult, TOptions> = (
+    callback,
+    options = {} as RenderHookOptions<TProps, TOptions>
+  ) => {
     const { result, setValue, setError, addResolver } = resultContainer<TResult>()
     const renderProps = { callback, setValue, setError }
     let hookProps = options.initialProps
@@ -81,7 +81,6 @@ function createRenderHook<TProps, TResult, TOptions extends {}, TRenderer extend
   // This dummy usage works around that.
   renderHook.name // eslint-disable-line @typescript-eslint/no-unused-expressions
 
-
   return renderHook
 }
 

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -38,7 +38,7 @@ export type AsyncUtils = {
   waitForValueToChange: (selector: () => unknown, options?: WaitOptions) => Promise<void>
 }
 
-export type RenderHook<
+export type RenderHookResult<
   TProps,
   TValue,
   TRenderer extends Renderer<TProps> = Renderer<TProps>
@@ -51,6 +51,13 @@ export type RenderHookOptions<TProps, TOptions extends {}> = TOptions & {
   initialProps?: TProps
 }
 
+export interface RenderHook<TProps, TResult, TOptions extends object> {
+  (
+    callback: (props: TProps) => TResult,
+    options?: RenderHookOptions<TProps, TOptions>
+  ): RenderHookResult<TProps, TResult>
+}
+
 export interface Act {
   (callback: () => void | undefined): void
   (callback: () => Promise<void | undefined>): Promise<undefined>

diff --git a/src/types/react.ts b/src/types/react.ts
@@ -1,18 +1,18 @@
 import { ComponentType } from 'react'
 
-import { RenderHook, RenderHookOptions, Act } from '.'
+import { RenderHookOptions, RenderHookResult, Act } from '.'
 
 export type WrapperComponent<TProps> = ComponentType<TProps>
 
 export type RendererOptions<TProps> = {
   wrapper?: WrapperComponent<TProps>
 }
 
-export interface ReactHooksRenderer {
+export type ReactHooksRenderer = {
   renderHook: <TProps, TResult>(
     callback: (props: TProps) => TResult,
     options?: RenderHookOptions<TProps, RendererOptions<TProps>>
-  ) => RenderHook<TProps, TResult>
+  ) => RenderHookResult<TProps, TResult>
   act: Act
   cleanup: () => void
   addCleanup: (callback: () => Promise<void> | void) => () => void