fix(types): revert to ThisType

Guillaume Chau · Guillaume Chau · commit 1ddcfe83d48a · 2019-09-19T19:30:27.000+02:00
diff --git 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
@@ -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>
 }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,9 @@ interface PrivateVueApolloComponentOptions`
`39`	`39`	`VueApolloComponentSpecialOptions[keyof VueApolloComponentSpecialOptions]`
`40`	`40`	`}`
`41`	`41`
`42`		`-export type VueApolloComponentOptions<Instance> = DeepApplyThisType<PrivateVueApolloComponentOptions, Instance>`
	`42`	`+// https://github.com/microsoft/TypeScript/issues/33392`
	`43`	`+// export type VueApolloComponentOptions<Instance> = DeepApplyThisType<PrivateVueApolloComponentOptions, Instance>`
	`44`	`+export type VueApolloComponentOptions<Instance> = PrivateVueApolloComponentOptions & ThisType<Instance>`
`43`	`45`
`44`	`46`	`/* Special component options */`
`45`	`47`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,6 @@ export interface DollarApollo<V> extends ApolloClientMethods {`
`76`	`76`
`77`	`77`	`getClient<R = any>(): ApolloClient<R>`
`78`	`78`
`79`		`- addSmartQuery<R = any>(key: string, options: VueApolloQueryDefinition<V, R>): SmartQuery<V>`
	`79`	`+ addSmartQuery<R = any>(key: string, options: VueApolloQueryDefinition<R>): SmartQuery<V>`
`80`	`80`	`addSmartSubscription<R = any>(key: string, options: VueApolloSubscriptionDefinition): SmartSubscription<V>`
`81`	`81`	`}`