cleaned up code

apollographql · Jul 11, 2016 · 2685c38 · 2685c38
1 parent 7269ca3
commit 2685c38
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 62 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,7 @@
 Expect active development and potentially significant breaking changes in the `0.x` track. We'll try to be diligent about releasing a `1.0` version in a timely fashion (ideally within 3 to 6 months), to signal the start of a more stable API.
 
 ### vNEXT
-- moved refetch(), startPolling(), and stopPolling() methods from QuerySubscription to ObservableQuery [Issue #194] [PR #362]
+- moved refetch(), startPolling(), and stopPolling() methods from QuerySubscription to ObservableQuery [Issue #194] (https://github.com/apollostack/apollo-client/issues/194) and [PR #362] (https://github.com/apollostack/apollo-client/pull/362)
 
 - Don't throw on unknown directives, instead just pass them through. This can open the door to implementing `@live`, `@defer`, and `@stream`, if coupled with some changes in the network layer. [PR #372](https://github.com/apollostack/apollo-client/pull/372)
 

diff --git a/src/QueryManager.ts b/src/QueryManager.ts
@@ -66,11 +66,24 @@ import {
   QueryScheduler,
 } from './scheduler';
 
-import { Observable, Observer, Subscription } from './util/Observable';
+import { Observable, Observer, Subscription, SubscriberFunction } from './util/Observable';
 
 export class ObservableQuery extends Observable<GraphQLResult> {
-  public subscribe(observer: Observer<GraphQLResult>): QuerySubscription {
-    return super.subscribe(observer) as QuerySubscription;
+  public refetch: (variables?: any) => Promise<GraphQLResult>;
+  public stopPolling: () => void;
+  public startPolling: (p: number) => void;
+
+  constructor(subscriberFunction: SubscriberFunction<GraphQLResult>,
+    refetch: (variables?: any) => Promise<GraphQLResult>,
+    stopPolling: () => void, startPolling: (p: number) => void) {
+      super(subscriberFunction);
+      this.refetch = refetch;
+      this.stopPolling = stopPolling;
+      this.startPolling = startPolling;
+
+  }
+  public subscribe(observer: Observer<GraphQLResult>): Subscription {
+    return super.subscribe(observer) as Subscription;
   }
 
 
@@ -91,9 +104,6 @@ export class ObservableQuery extends Observable<GraphQLResult> {
   }
 }
 
-export interface QuerySubscription extends Subscription {
-}
-
 export interface WatchQueryOptions {
   query: Document;
   variables?: { [key: string]: any };
@@ -134,7 +144,7 @@ export class QueryManager {
   // with them in case of some destabalizing action (e.g. reset of the Apollo store).
   private observableQueries: { [queryId: string]:  {
     observableQuery: ObservableQuery;
-    subscriptions: QuerySubscription[];
+    subscriptions: Subscription[];
   } };
 
   constructor({
@@ -308,6 +318,33 @@ export class QueryManager {
     // Call just to get errors synchronously
     getQueryDefinition(options.query);
     const queryId = this.generateQueryId();
+
+    const refetch = (variables?: any) => {
+      // If no new variables passed, use existing variables
+      variables = variables || options.variables;
+
+      // Use the same options as before, but with new variables and forceFetch true
+      return this.fetchQuery(queryId, assign(options, {
+        forceFetch: true,
+        variables,
+      }) as WatchQueryOptions);
+    };
+
+    const stopPolling = () => {
+      if (this.pollingTimers[queryId]) {
+        clearInterval(this.pollingTimers[queryId]);
+      }
+    };
+
+    const startPolling = (pollInterval) => {
+      this.pollingTimers[queryId] = setInterval(() => {
+        const pollingOptions = assign({}, options) as WatchQueryOptions;
+        // subsequent fetches from polling always reqeust new data
+        pollingOptions.forceFetch = true;
+        this.fetchQuery(queryId, pollingOptions);
+      }, pollInterval);
+    };
+
     const observableQuery = new ObservableQuery((observer) => {
       const retQuerySubscription = {
         unsubscribe: () => {
@@ -360,32 +397,11 @@ export class QueryManager {
           }
         }
       });
-
       return retQuerySubscription;
     },
-    (variables?: any) => {
-        // If no new variables passed, use existing variables
-        variables = variables || options.variables;
-
-        // Use the same options as before, but with new variables and forceFetch true
-        return this.fetchQuery(queryId, assign(options, {
-          forceFetch: true,
-          variables,
-        }) as WatchQueryOptions);
-      },
-    () => {
-        if (this.pollingTimers[queryId]) {
-          clearInterval(this.pollingTimers[queryId]);
-        }
-      },
-    (pollInterval) => {
-        this.pollingTimers[queryId] = setInterval(() => {
-          const pollingOptions = assign({}, options) as WatchQueryOptions;
-          // subsequent fetches from polling always reqeust new data
-          pollingOptions.forceFetch = true;
-          this.fetchQuery(queryId, pollingOptions);
-        }, pollInterval);
-      }
+    refetch,
+    stopPolling,
+    startPolling
     );
 
     return observableQuery;
@@ -463,7 +479,7 @@ export class QueryManager {
   }
 
   // Associates a query subscription with an ObservableQuery in this.observableQueries
-  public addQuerySubscription(queryId: string, querySubscription: QuerySubscription) {
+  public addQuerySubscription(queryId: string, querySubscription: Subscription) {
     if (this.observableQueries.hasOwnProperty(queryId)) {
       this.observableQueries[queryId].subscriptions.push(querySubscription);
     } else {

diff --git a/src/scheduler.ts b/src/scheduler.ts
@@ -97,6 +97,29 @@ export class QueryScheduler {
       throw new Error('Tried to register a non-polling query with the scheduler.');
     }
     const queryId = this.queryManager.generateQueryId();
+
+    const refetch = (variables: any) => {
+      variables = variables || options.variables;
+      return this.fetchQuery(queryId, assign(options, {
+        forceFetch: true,
+        variables,
+      }) as WatchQueryOptions);
+    };
+
+    const startPolling = () => {
+      this.pollingTimers[queryId] = setInterval(() => {
+        const pollingOptions = assign({}, options) as WatchQueryOptions;
+        pollingOptions.forceFetch = true;
+        this.fetchQuery(queryId, pollingOptions).then(() => {
+          this.removeInFlight(queryId);
+        });
+      }, options.pollInterval);
+    };
+
+    const stopPolling = () => {
+      this.stopPollingQuery(queryId);
+    };
+
     return new ObservableQuery(
       (observer) => {
         // "Fire" (i.e. add to the QueryBatcher queue)
@@ -109,25 +132,9 @@ export class QueryScheduler {
           },
         };
       },
-      (variables: any) => {
-        variables = variables || options.variables;
-        return this.fetchQuery(queryId, assign(options, {
-          forceFetch: true,
-          variables,
-        }) as WatchQueryOptions);
-      },
-      () => {
-        this.pollingTimers[queryId] = setInterval(() => {
-          const pollingOptions = assign({}, options) as WatchQueryOptions;
-          pollingOptions.forceFetch = true;
-          this.fetchQuery(queryId, pollingOptions).then(() => {
-            this.removeInFlight(queryId);
-          });
-        }, options.pollInterval);
-      },
-      () => {
-        this.stopPollingQuery(queryId);
-      }
+      refetch,
+      stopPolling,
+      startPolling
     );
   }
 

diff --git a/src/util/Observable.ts b/src/util/Observable.ts
@@ -2,7 +2,6 @@
 // See https://github.com/zenparsing/es-observable
 
 import * as $$observable from 'symbol-observable';
-import { GraphQLResult } from 'graphql';
 
 export type CleanupFunction = () => void;
 export type SubscriberFunction<T> = (observer: Observer<T>) => (Subscription | CleanupFunction);
@@ -12,18 +11,10 @@ function isSubscription(subscription: Function | Subscription): subscription is
 }
 
 export class Observable<T> {
-  public refetch: (variables?: any) => Promise<GraphQLResult>;
-  public stopPolling: () => void;
-  public startPolling: (p: number) => void;
   private subscriberFunction: SubscriberFunction<T>;
 
-  constructor(subscriberFunction: SubscriberFunction<T>,
-    refetch: (variables?: any) => Promise<GraphQLResult>,
-    stopPolling: () => void, startPolling: (p: number) => void) {
+  constructor(subscriberFunction: SubscriberFunction<T>) {
     this.subscriberFunction = subscriberFunction;
-    this.refetch = refetch;
-    this.stopPolling = stopPolling;
-    this.startPolling = startPolling;
 
   }