From 0254d85180b8a64d336de86706cf7b7dc9d2ccf4 Mon Sep 17 00:00:00 2001
From: Guillaume Chau <alphadelta.fg@gmail.com>
Date: Thu, 20 Jun 2019 07:55:57 +0200
Subject: [PATCH] fix(types): use ApolloQueryResult & FetchResult

---
 types/options.d.ts    | 15 ++++++++++++---
 types/vue-apollo.d.ts | 14 +++++---------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/types/options.d.ts b/types/options.d.ts
index 24a95e3..d4a4f09 100644
--- a/types/options.d.ts
+++ b/types/options.d.ts
@@ -1,4 +1,13 @@
-import { WatchQueryOptions, MutationOptions, SubscriptionOptions, SubscribeToMoreOptions, ObservableQuery, NetworkStatus } from 'apollo-client'
+import {
+  WatchQueryOptions,
+  MutationOptions,
+  SubscriptionOptions,
+  SubscribeToMoreOptions,
+  ObservableQuery,
+  NetworkStatus,
+  ApolloQueryResult,
+} from 'apollo-client';
+import { FetchResult } from 'apollo-link';
 import { DocumentNode } from 'graphql';
 
 // include Omit type from https://github.com/Microsoft/TypeScript/issues/12215
@@ -28,7 +37,7 @@ type _WatchQueryOptions = Omit<WatchQueryOptions, 'query'>; // exclude query pro
 
 interface ExtendableVueApolloQueryOptions<V, R> extends _WatchQueryOptions {
   update?: (this: ApolloVueThisType<V>, data: R) => any;
-  result?: (this: ApolloVueThisType<V>, data: R, loader: any, netWorkStatus: NetworkStatus) => void;
+  result?: (this: ApolloVueThisType<V>, data: ApolloQueryResult<R>, loader: any, netWorkStatus: NetworkStatus) => void;
   error?: ErrorHandler<V>;
   loadingKey?: string;
   watchLoading?: WatchLoading<V>;
@@ -55,7 +64,7 @@ export interface VueApolloSubscriptionOptions<V, R> extends SubscriptionOptions
   query: DocumentNode;
   variables?: VariableFn<V>;
   skip?: (this: ApolloVueThisType<V>) => boolean | boolean;
-  result?: (this: V, data: R) => void;
+  result?: (this: V, data: FetchResult<R>) => void;
 }
 
 type QueryComponentProperty<V> = ((this: ApolloVueThisType<V>) => VueApolloQueryOptions<V, any>) | VueApolloQueryOptions<V, any>
diff --git a/types/vue-apollo.d.ts b/types/vue-apollo.d.ts
index 701bec2..1cdf54c 100644
--- a/types/vue-apollo.d.ts
+++ b/types/vue-apollo.d.ts
@@ -1,5 +1,6 @@
 import Vue, { PluginObject, PluginFunction } from 'vue';
-import { ApolloClient, ObservableQuery } from 'apollo-client';
+import { ApolloClient, ObservableQuery, ApolloQueryResult } from 'apollo-client';
+import { FetchResult } from 'apollo-link';
 import { Observable } from 'apollo-client/util/Observable';
 import { ApolloProvider, VueApolloComponent } from './apollo-provider'
 import {
@@ -40,11 +41,6 @@ export interface SmartQuery<V> extends SmartApollo<V> {
 export interface SmartSubscription<V> extends SmartApollo<V> {
 }
 
-export declare type QueryResult<T> = {
-  data: T;
-  errors?: GraphQLError[];
-};
-
 export interface DollarApollo<V> {
   vm: V;
   queries: Record<string, SmartQuery<V>>;
@@ -57,9 +53,9 @@ export interface DollarApollo<V> {
   /* writeonly */ skipAllSubscriptions: boolean;
   /* writeonly */ skipAll: boolean;
 
-  query<R=any>(options: VueApolloQueryOptions<V, R>): Promise<QueryResult<R>>;
-  mutate<R=any>(options: VueApolloMutationOptions<V, R>): Promise<QueryResult<R>>;
-  subscribe<R=any>(options: VueApolloSubscriptionOptions<V, R>): Observable<R>;
+  query<R=any>(options: VueApolloQueryOptions<V, R>): Promise<ApolloQueryResult<R>>;
+  mutate<R=any>(options: VueApolloMutationOptions<V, R>): Promise<FetchResult<R>>;
+  subscribe<R=any>(options: VueApolloSubscriptionOptions<V, R>): Observable<FetchResult<R>>;
 
   addSmartQuery<R=any>(key: string, options: VueApolloQueryOptions<V, R>): SmartQuery<V>;
   addSmartSubscription<R=any>(key: string, options: VueApolloSubscriptionOptions<V, R>): SmartSubscription<V>;