fix: ensure programatic access to client is seperated by operation type

src/Mutation.ts

@@ -1,6 +1,6 @@
 import Vue, { VueConstructor } from 'vue';
 import { VqlClient } from './client';
-import { normalizeQuery, normalizeChildren } from './utils';
+import { normalizeChildren } from './utils';
 
 type withVqlClient = VueConstructor<
   Vue & {
@@ -41,7 +41,7 @@ export const Mutation = (Vue as withVqlClient).extend({
         this.errors = null;
         this.fetching = true;
         this.done = false;
-        const { data, errors } = await this.$vql.query({
+        const { data, errors } = await this.$vql.executeMutation({
           query: this.query,
           variables: vars || undefined
         });

src/Query.ts

@@ -2,7 +2,7 @@ import Vue, { VueConstructor } from 'vue';
 import stringify from 'fast-json-stable-stringify';
 import { CachePolicy } from './types';
 import { VqlClient } from './client';
-import { normalizeVariables, normalizeQuery, normalizeChildren, hash } from './utils';
+import { normalizeVariables, normalizeChildren, hash } from './utils';
 
 type withVqlClient = VueConstructor<
   Vue & {
@@ -81,7 +81,7 @@ export const Query = (Vue as withVqlClient).extend({
 
       try {
         this.fetching = true;
-        const { data, errors } = await this.$vql.query({
+        const { data, errors } = await this.$vql.executeQuery({
           query: this.query,
           variables: normalizeVariables(this.variables, vars || {}),
           cachePolicy: cachePolicy || (this.cachePolicy as CachePolicy)

src/Subscription.ts

@@ -47,7 +47,7 @@ export const Subscription = (Vue as withVqlClient).extend({
 
     const self = this;
     this.$observer = this.$vql
-      .subscribe({
+      .executeSubscription({
         query: this.query,
         variables: this.variables
       })

src/client.ts

@@ -6,6 +6,10 @@ type Fetcher = typeof fetch;
 
 type FetchOptions = Omit<RequestInit, 'body'>;
 
+interface CachedOperation extends Operation {
+  cachePolicy?: CachePolicy;
+}
+
 interface GraphQLRequestContext {
   fetchOptions?: FetchOptions;
 }
@@ -76,7 +80,7 @@ export class VqlClient {
     this.subscriptionForwarder = opts.subscriptionForwarder;
   }
 
-  public async query(operation: Operation): Promise<OperationResult> {
+  public async executeQuery(operation: CachedOperation): Promise<OperationResult> {
     const fetchOptions = this.context ? this.context().fetchOptions : {};
     const opts = makeFetchOptions(operation, fetchOptions || {});
     const policy = operation.cachePolicy || this.defaultCachePolicy;
@@ -105,7 +109,14 @@ export class VqlClient {
     return lazyFetch();
   }
 
-  public subscribe(operation: Operation) {
+  public async executeMutation(operation: Operation): Promise<OperationResult> {
+    const fetchOptions = this.context ? this.context().fetchOptions : {};
+    const opts = makeFetchOptions(operation, fetchOptions || {});
+
+    return this.fetch(this.url, opts).then(response => response.json());
+  }
+
+  public executeSubscription(operation: Operation) {
     if (!this.subscriptionForwarder) {
       throw new Error('No subscription forwarder was set.');
     }

src/types.ts

@@ -10,7 +10,6 @@ export type CachePolicy = 'cache-and-network' | 'network-only' | 'cache-first';
 export interface Operation {
   query: string | DocumentNode;
   variables?: { [k: string]: any };
-  cachePolicy?: CachePolicy;
 }
 
 export interface ObserverLike<T> {