Update tslint, fix new lint errors

benchmark/index.ts

@@ -85,7 +85,7 @@ const createReservations = (count: number) => {
 
 group((end) => {
   benchmark('constructing an instance', (done) => {
-    new ApolloClient({});
+    const c = new ApolloClient({});
     done();
   });
   end();

benchmark/util.ts

@@ -24,7 +24,7 @@ export type DoneFunction = () => void;
 export interface DescriptionObject {
   name: string;
   [other: string]: any;
-};
+}
 
 export type Nullable<T> = T | undefined;
 export type Description = DescriptionObject | string;
@@ -59,7 +59,7 @@ interface Scope {
   benchmark?: BenchmarkFunction;
   afterEach?: AfterEachFunction;
   afterAll?: AfterAllFunction;
-};
+}
 
 // Internal function that returns the current exposed functions
 // benchmark, setup, etc.

package.json

@@ -75,7 +75,7 @@
     "es6-promise": "^4.0.4",
     "fetch-mock": "^5.5.0",
     "grunt": "1.0.1",
-    "grunt-tslint": "4.0.1",
+    "grunt-tslint": "^5.0.1",
     "gzip-size": "^3.0.0",
     "isomorphic-fetch": "^2.2.1",
     "istanbul": "^0.4.5",
@@ -90,7 +90,7 @@
     "rxjs": "^5.0.0-beta.11",
     "sinon": "^2.1.0",
     "source-map-support": "^0.4.0",
-    "tslint": "4.5.1",
+    "tslint": "^5.1.0",
     "typescript": "2.2.2",
     "uglify-js": "^2.6.2",
     "webpack": "^2.1.0-beta.28",

src/ApolloClient.ts

@@ -296,7 +296,7 @@ export default class ApolloClient implements DataProxy {
     }
 
     return this.queryManager.watchQuery<T>(options);
-  };
+  }
 
   /**
    * This resolves a single query according to the options specified and returns a
@@ -323,7 +323,7 @@ export default class ApolloClient implements DataProxy {
     }
 
     return this.queryManager.query<T>(options);
-  };
+  }
 
   /**
    * This resolves a single mutation according to the options specified and returns a
@@ -336,7 +336,7 @@ export default class ApolloClient implements DataProxy {
     this.initStore();
 
     return this.queryManager.mutate<T>(options);
-  };
+  }
 
   public subscribe(options: SubscriptionOptions): Observable<any> {
     this.initStore();
@@ -467,7 +467,7 @@ export default class ApolloClient implements DataProxy {
         return result;
       },
     }));
-  };
+  }
 
   /**
    * Resets your entire store by clearing out your cache and then re-executing
@@ -489,7 +489,7 @@ export default class ApolloClient implements DataProxy {
     if (this.queryManager) {
       this.queryManager.resetStore();
     }
-  };
+  }
 
   public getInitialState(): { data: Object } {
     this.initStore();
@@ -523,7 +523,7 @@ export default class ApolloClient implements DataProxy {
       queryDeduplication: this.queryDeduplication,
       fragmentMatcher: this.fragmentMatcher,
     });
-  };
+  }
 
   /**
    * Initializes a data proxy for this client instance if one does not already

src/actions.ts

@@ -124,7 +124,7 @@ export interface MutationErrorAction {
   type: 'APOLLO_MUTATION_ERROR';
   error: Error;
   mutationId: string;
-};
+}
 
 export function isMutationErrorAction(action: ApolloAction): action is MutationErrorAction {
   return action.type === 'APOLLO_MUTATION_ERROR';

src/core/QueryManager.ts

@@ -465,7 +465,7 @@ export class QueryManager {
           throw new ApolloError({
             networkError: error,
           });
-        };
+        }
       });
 
       if (fetchPolicy !== 'cache-and-network') {
@@ -702,7 +702,7 @@ export class QueryManager {
       type: 'APOLLO_QUERY_STOP',
       queryId,
     });
-  };
+  }
 
   public getApolloState(): Store {
     return this.reduxRootSelector(this.store.getState());
@@ -882,7 +882,7 @@ export class QueryManager {
         _networkSubscriptionId: subId,
       } as Subscription;
     });
-  };
+  }
 
   public stopQuery(queryId: string) {
     // XXX in the future if we should cancel the request

src/core/watchQueryOptions.ts

@@ -94,7 +94,7 @@ export type SubscribeToMoreOptions = {
 export interface SubscriptionOptions {
   query: DocumentNode;
   variables?: { [key: string]: any };
-};
+}
 
 export interface MutationOptions {
   /**

src/data/fragmentMatcher.ts

@@ -145,5 +145,5 @@ export class HeuristicFragmentMatcher implements FragmentMatcherInterface {
     // difference, so for now, we just do our best to resolve the fragment but turn on partial data
     context.returnPartialData = true;
     return true;
-  };
+  }
 }

src/data/proxy.ts

@@ -70,7 +70,7 @@ export interface DataProxyWriteQueryOptions {
    * Any variables that the GraphQL query may depend on.
    */
   variables?: Object;
-};
+}
 
 export interface DataProxyWriteFragmentOptions {
   /**

src/index.ts

@@ -118,7 +118,7 @@ export {
   Subscription,
   SubscriptionOptions,
   ApolloStore,
-  ApolloClient
+  ApolloClient,
 };
 
 export default ApolloClient;

src/transport/batchedNetworkInterface.ts

@@ -34,7 +34,7 @@ export interface BatchRequestAndOptions {
 export interface BatchResponseAndOptions {
   responses: Response[];
   options: RequestInit;
-};
+}
 
 // An implementation of the network interface that operates over HTTP and batches
 // together requests over the HTTP transport. Note that this implementation will only work correctly
@@ -57,7 +57,7 @@ export class HTTPBatchedNetworkInterface extends BaseNetworkInterface {
       batchInterval: batchInterval,
       batchFetchFunction: this.batchQuery.bind(this),
     });
-  };
+  }
 
   public query(request: Request): Promise<ExecutionResult> {
     // we just pass it through to the batcher.
@@ -212,7 +212,7 @@ export class HTTPBatchedNetworkInterface extends BaseNetworkInterface {
         ...(options.headers as { [headerName: string]: string }),
       },
     });
-  };
+  }
 }
 
 export interface BatchingNetworkInterfaceOptions {

src/transport/batching.ts

@@ -15,7 +15,7 @@ export interface QueryFetchRequest {
   promise?: Promise<ExecutionResult>;
   resolve?: (result: ExecutionResult) => void;
   reject?: (error: Error) => void;
-};
+}
 
 // QueryBatcher doesn't fire requests immediately. Requests that were enqueued within
 // a certain amount of time (configurable through `batchInterval`) will be batched together

src/transport/networkInterface.ts

@@ -184,7 +184,7 @@ export class HTTPFetchNetworkInterface extends BaseNetworkInterface {
         ...(options.headers as { [headerName: string]: string }),
       },
     });
-  };
+  }
 
   public query(request: Request): Promise<ExecutionResult> {
     const options = { ...this._opts };
@@ -216,7 +216,7 @@ export class HTTPFetchNetworkInterface extends BaseNetworkInterface {
           return payload as ExecutionResult;
         }
       });
-  };
+  }
 
   public use(middlewares: MiddlewareInterface[]): HTTPNetworkInterface {
     middlewares.map((middleware) => {

src/util/maybeDeepFreeze.ts

@@ -17,7 +17,7 @@ function deepFreeze (o: any) {
   });
 
   return o;
-};
+}
 
 export default function maybeDeepFreeze(obj: any) {
   if (isDevelopment() || isTest()) {

test/fetchMore.ts

@@ -223,7 +223,7 @@ describe('fetchMore on an observable query', () => {
     });
 
     return Promise.resolve(obsHandle);
-  };
+  }
 
   function unsetup() {
     sub.unsubscribe();

test/graphqlSubscriptions.ts

@@ -194,7 +194,7 @@ describe('GraphQL Subscriptions', () => {
     }) as any;
 
     // Subscribe again. Should also receive the same result.
-    obs.subscribe({
+    const resub = obs.subscribe({
       next(result) {
         assert.deepEqual(result, results[0].result);
         counter++;

test/mocks/mockNetworkInterface.ts

@@ -159,7 +159,7 @@ export class MockSubscriptionNetworkInterface extends MockNetworkInterface imple
       throw new Error('Network interface does not have subscription associated with this request.');
     }
 
-  };
+  }
 
   public fireResult(id: number) {
     const handler = this.handlersById[id];

test/mutationResults.ts

@@ -265,7 +265,7 @@ describe('mutation results', () => {
   function setup(...mockedResponses: any[]) {
     const obsHandle = setupObsHandle(...mockedResponses);
     return obsHandle.result();
-  };
+  }
 
   it('correctly primes cache for tests', () => {
     return setup()

test/networkInterface.ts

@@ -509,7 +509,7 @@ function TestWare(
       next();
     },
   };
-};
+}
 
 // simulate afterware by altering variables and options
 function TestAfterWare(
@@ -525,4 +525,4 @@ function TestAfterWare(
       next();
     },
   };
-};
+}

test/optimistic.ts

@@ -135,7 +135,7 @@ describe('optimistic mutation results', () => {
     });
 
     return obsHandle.result();
-  };
+  }
 
   describe('error handling', () => {
     const mutation = gql`
@@ -1564,7 +1564,7 @@ describe('optimistic mutation - githunt comments', () => {
     });
 
     return obsHandle.result();
-  };
+  }
 
   const mutation = gql`
     mutation submitComment($repoFullName: String!, $commentContent: String!) {

test/util/observableToPromise.ts

@@ -94,7 +94,7 @@ export function observableToPromiseAndSubscription({
     promise,
     subscription,
   };
-};
+}
 
 export default function(
   options: Options,

test/util/subscribeAndCount.ts

@@ -25,4 +25,4 @@ export default function subscribeAndCount(done: MochaDone, observable: Observabl
     error: done,
   });
   return subscription;
-};
+}