From 1ddcfe83d48a3540bd7693be27ec202572d823cb Mon Sep 17 00:00:00 2001
From: Guillaume Chau <alphadelta.fg@gmail.com>
Date: Thu, 19 Sep 2019 19:30:27 +0200
Subject: [PATCH] fix(types): revert to `ThisType`

---
 types/options.d.ts    | 4 +++-
 types/vue-apollo.d.ts | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/types/options.d.ts b/types/options.d.ts
index 4a0d8bc..85d399e 100644
--- a/types/options.d.ts
+++ b/types/options.d.ts
@@ -39,7 +39,9 @@ interface PrivateVueApolloComponentOptions
     VueApolloComponentSpecialOptions[keyof VueApolloComponentSpecialOptions]
 }
 
-export type VueApolloComponentOptions<Instance> = DeepApplyThisType<PrivateVueApolloComponentOptions, Instance>
+// https://github.com/microsoft/TypeScript/issues/33392
+// export type VueApolloComponentOptions<Instance> = DeepApplyThisType<PrivateVueApolloComponentOptions, Instance>
+export type VueApolloComponentOptions<Instance> = PrivateVueApolloComponentOptions & ThisType<Instance>
 
 /* Special component options */
 
diff --git a/types/vue-apollo.d.ts b/types/vue-apollo.d.ts
index 6586d59..76d781d 100644
--- a/types/vue-apollo.d.ts
+++ b/types/vue-apollo.d.ts
@@ -76,6 +76,6 @@ export interface DollarApollo<V> extends ApolloClientMethods {
 
   getClient<R = any>(): ApolloClient<R>
 
-  addSmartQuery<R = any>(key: string, options: VueApolloQueryDefinition<V, R>): SmartQuery<V>
+  addSmartQuery<R = any>(key: string, options: VueApolloQueryDefinition<R>): SmartQuery<V>
   addSmartSubscription<R = any>(key: string, options: VueApolloSubscriptionDefinition): SmartSubscription<V>
 }