Merge branch 'master' of github.com:alex-cory/react-usefetch

Author: Alex Cory

src/__tests__/useFetch.test.tsx

@@ -168,7 +168,7 @@ describe('useFetch - responseType', (): void => {
     expect(result.current.loading).toBe(true)
     await waitForNextUpdate()
     expect(result.current.loading).toBe(false)
-    expect(result.current.error.name).toBe('FetchError')
+    expect(result.current.error?.name).toBe('FetchError')
   })
 
   it('should process .text() with default array responseType', async (): Promise<void> => {
@@ -353,8 +353,8 @@ describe('timeouts', (): void => {
     expect(result.current.loading).toBe(true)
     await waitForNextUpdate()
     expect(result.current.loading).toBe(false)
-    expect(result.current.error.name).toBe('AbortError')
-    expect(result.current.error.message).toBe('Timeout Error')
+    expect(result.current.error?.name).toBe('AbortError')
+    expect(result.current.error?.message).toBe('Timeout Error')
     expect(onAbort).toBeCalled()
     expect(onTimeout).toBeCalled()
     expect(onAbort).toHaveBeenCalledTimes(1)
@@ -386,8 +386,8 @@ describe('timeouts', (): void => {
     expect(fetch.mock.calls[0][0]).toBe('https://example.com/todos')
     expect(fetch).toHaveBeenCalledTimes(2)
     expect(result.current.loading).toBe(false)
-    expect(result.current.error.name).toBe('AbortError')
-    expect(result.current.error.message).toBe('Timeout Error')
+    expect(result.current.error?.name).toBe('AbortError')
+    expect(result.current.error?.message).toBe('Timeout Error')
     expect(onAbort).toBeCalled()
     expect(onTimeout).toBeCalled()
     expect(onAbort).toHaveBeenCalledTimes(2)

src/types.ts

@@ -133,7 +133,7 @@ export interface Data<TData> {
 export interface ReqBase<TData> {
   data: TData | undefined
   loading: boolean
-  error: Error
+  error: Error | undefined
   cache: Cache
 }
 

src/useMutation.ts

@@ -7,7 +7,7 @@ import { invariant, isString, useURLRequiredInvariant } from './utils'
 type ArrayDestructure<TData = any> = [
   TData | undefined,
   boolean,
-  Error,
+  Error | undefined,
   (variables?: object) => Promise<any>,
 ]
 interface ObjectDestructure<TData = any> extends ReqBase<TData> {

src/useQuery.ts

@@ -7,7 +7,7 @@ import { invariant, isString, useURLRequiredInvariant } from './utils'
 type ArrayDestructure<TData = any> = [
   TData | undefined,
   boolean,
-  Error,
+  Error | undefined,
   (variables?: object) => Promise<any>,
 ]
 interface ObjectDestructure<TData = any> extends ReqBase<TData> {