Use exposed types of options for each method of Angular2Apollo

CHANGELOG.md

@@ -3,7 +3,11 @@
 ### vNEXT
 
 - Made `mutate()` and `query()` methods to return `Observable` instead of `Promise` ([PR #140](https://github.com/apollostack/angular2-apollo/pull/140))
-- Define types of options and results (of `watchQuery`, `query`, `mutate`) ([PR #145](https://github.com/apollostack/angular2-apollo/pull/145) [PR #148](https://github.com/apollostack/angular2-apollo/pull/148))
+- Use types of options (for `watchQuery`, `query`, `mutate`) (
+[PR #145](https://github.com/apollostack/angular2-apollo/pull/145),
+[PR #146](https://github.com/apollostack/angular2-apollo/pull/146),
+[PR #148](https://github.com/apollostack/angular2-apollo/pull/148)
+)
 
 ### v0.7.0
 

package.json

@@ -27,12 +27,12 @@
     "prepublish": "npm run clean && npm run build"
   },
   "peerDependencies": {
-    "apollo-client": "^0.5.0",
     "@angular/core": "^2.0.0",
+    "apollo-client": "^0.5.1",
     "rxjs": "^5.0.0-beta.12 || ^5.0.0-rc.1"
   },
   "dependencies": {
-    "apollo-client-rxjs": "~0.2.2",
+    "apollo-client-rxjs": "~0.2.3",
     "lodash.assign": "^4.0.9",
     "lodash.forin": "^4.2.0",
     "lodash.isequal": "^4.2.0"
@@ -45,14 +45,12 @@
     "@angular/platform-browser": "^2.1.0",
     "@angular/platform-browser-dynamic": "^2.1.0",
     "@angular/platform-server": "^2.1.0",
-    "@types/chai": "^3.4.33",
-    "@types/es6-shim": "^0.31.32",
+    "@types/chai": "^3.4.34",
     "@types/isomorphic-fetch": "^0.0.30",
     "@types/jest": "^15.1.32",
     "@types/lodash": "^4.14.34",
     "@types/node": "^6.0.38",
-    "apollo-client": "^0.5.0",
-    "es6-shim": "^0.35.0",
+    "apollo-client": "^0.5.1",
     "ghooks": "^1.2.1",
     "graphql": "^0.7.0",
     "graphql-tag": "^0.1.9",
@@ -73,17 +71,23 @@
     }
   },
   "jest": {
-    "moduleFileExtensions": ["js"],
+    "moduleFileExtensions": [
+      "js"
+    ],
     "testRegex": "\\.spec\\.js$",
-    "testPathDirs": ["<rootDir>/build/tests"],
+    "testPathDirs": [
+      "<rootDir>/build/tests"
+    ],
     "browser": true,
     "collectCoverage": true,
     "collectCoverageFrom": [
-      "**/src/*.js", 
+      "**/src/*.js",
       "!**/src/index.js",
       "!**/node_modules/**"
     ],
     "coverageDirectory": "coverage",
-    "coverageReporters": ["json"]
+    "coverageReporters": [
+      "json"
+    ]
   }
 }

src/Angular2Apollo.ts

@@ -1,24 +1,14 @@
 import { OpaqueToken, Injectable, Inject } from '@angular/core';
 import { rxify } from 'apollo-client-rxjs';
-import { ApolloClient, ApolloQueryResult, WatchQueryOptions, MutationBehavior, MutationQueryReducersMap } from 'apollo-client';
+import { ApolloClient, ApolloQueryResult, WatchQueryOptions, MutationOptions, SubscriptionOptions } from 'apollo-client';
 import { Observable } from 'rxjs/Observable';
-import { Document, FragmentDefinition } from 'graphql';
+import { FragmentDefinition } from 'graphql';
 
 import { ApolloQueryObservable } from './ApolloQueryObservable';
 
 import 'rxjs/add/observable/from';
 import 'rxjs/add/observable/fromPromise';
 
-export interface MutateOptions {
-  mutation: Document;
-  variables?: Object;
-  resultBehaviors?: MutationBehavior[];
-  fragments?: FragmentDefinition[];
-  optimisticResponse?: Object;
-  updateQueries?: MutationQueryReducersMap;
-  refetchQueries?: string[];
-}
-
 export interface DeprecatedWatchQueryOptions extends WatchQueryOptions {
   fragments?: FragmentDefinition[];
 }
@@ -45,11 +35,11 @@ export class Angular2Apollo {
     return Observable.fromPromise(this.client.query(options));
   }
 
-  public mutate(options: MutateOptions): Observable<ApolloQueryResult> {
+  public mutate(options: MutationOptions): Observable<ApolloQueryResult> {
     return Observable.fromPromise(this.client.mutate(options));
   }
 
-  public subscribe(options: any): Observable<any> {
+  public subscribe(options: SubscriptionOptions): Observable<any> {
     if (typeof this.client.subscribe === 'undefined') {
       throw new Error(`Your version of ApolloClient doesn't support subscriptions`);
     }

tsconfig.json

@@ -7,6 +7,7 @@
     "declaration": true,
     "rootDir": ".",
     "outDir": "build",
+    "lib": ["es6", "dom"],
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "noImplicitAny": false