From 1d2f4f32991325a5fc53e193e1dfed0faa040441 Mon Sep 17 00:00:00 2001 From: Remi Thebault Date: Sat, 17 Oct 2020 15:03:47 +0200 Subject: [PATCH] fix: useEventHook param is not optional (#1027) --- packages/vue-apollo-composable/src/useMutation.ts | 4 ++-- packages/vue-apollo-composable/src/useQuery.ts | 4 ++-- packages/vue-apollo-composable/src/useSubscription.ts | 4 ++-- packages/vue-apollo-composable/src/util/useEventHook.ts | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/vue-apollo-composable/src/useMutation.ts b/packages/vue-apollo-composable/src/useMutation.ts index 8f34795..ad1b8a9 100644 --- a/packages/vue-apollo-composable/src/useMutation.ts +++ b/packages/vue-apollo-composable/src/useMutation.ts @@ -25,10 +25,10 @@ export interface UseMutationReturn { loading: Ref error: Ref called: Ref - onDone: (fn: (param?: FetchResult, Record>) => void) => { + onDone: (fn: (param: FetchResult, Record>) => void) => { off: () => void }; - onError: (fn: (param?: Error) => void) => { + onError: (fn: (param: Error) => void) => { off: () => void }; }; diff --git a/packages/vue-apollo-composable/src/useQuery.ts b/packages/vue-apollo-composable/src/useQuery.ts index 3f4a237..04974aa 100644 --- a/packages/vue-apollo-composable/src/useQuery.ts +++ b/packages/vue-apollo-composable/src/useQuery.ts @@ -60,10 +60,10 @@ export interface UseQueryReturn { refetch: (variables?: TVariables) => Promise> fetchMore: (options: FetchMoreQueryOptions & FetchMoreOptions) => Promise> subscribeToMore: (options: SubscribeToMoreOptions | Ref> | ReactiveFunction>) => void - onResult: (fn: (param?: ApolloQueryResult) => void) => { + onResult: (fn: (param: ApolloQueryResult) => void) => { off: () => void } - onError: (fn: (param?: Error) => void) => { + onError: (fn: (param: Error) => void) => { off: () => void } } diff --git a/packages/vue-apollo-composable/src/useSubscription.ts b/packages/vue-apollo-composable/src/useSubscription.ts index 5f8bc62..cc4a514 100644 --- a/packages/vue-apollo-composable/src/useSubscription.ts +++ b/packages/vue-apollo-composable/src/useSubscription.ts @@ -45,10 +45,10 @@ export interface UseSubscriptionReturn { variables: Ref options: UseSubscriptionOptions | Ref> subscription: Ref, Record>>> - onResult: (fn: (param?: FetchResult, Record>) => void) => { + onResult: (fn: (param: FetchResult, Record>) => void) => { off: () => void } - onError: (fn: (param?: Error) => void) => { + onError: (fn: (param: Error) => void) => { off: () => void } } diff --git a/packages/vue-apollo-composable/src/util/useEventHook.ts b/packages/vue-apollo-composable/src/util/useEventHook.ts index 6d8b3b3..23fd503 100644 --- a/packages/vue-apollo-composable/src/util/useEventHook.ts +++ b/packages/vue-apollo-composable/src/util/useEventHook.ts @@ -1,21 +1,21 @@ export function useEventHook () { - const fns: ((param?: TParam) => void)[] = [] + const fns: ((param: TParam) => void)[] = [] - function on (fn: (param?: TParam) => void) { + function on (fn: (param: TParam) => void) { fns.push(fn) return { off: () => off(fn), } } - function off (fn: (param?: TParam) => void) { + function off (fn: (param: TParam) => void) { const index = fns.indexOf(fn) if (index !== -1) { fns.splice(index, 1) } } - function trigger (param?: TParam) { + function trigger (param: TParam) { for (const fn of fns) { fn(param) }