Merge branch 'master' of github.com:graphcool/nodeql

Author: schickling

package.json

@@ -26,13 +26,16 @@
   "scripts": {
     "prepublish": "npm run build",
     "build": "rm -rf dist && tsc -d",
-    "test": "npm run build && ava --serial"
+    "lint": "tslint --type-check --project tsconfig.json {src,test}/**/*.ts",
+    "test": "npm run lint && npm run build && ava --serial"
   },
   "devDependencies": {
     "@types/fetch-mock": "^5.8.2",
     "@types/node": "^7.0.18",
     "ava": "^0.19.1",
     "fetch-mock": "^5.11.0",
+    "tslint": "^5.5.0",
+    "tslint-config-standard": "^6.0.1",
     "typescript": "^2.3.2"
   },
   "dependencies": {

src/index.ts

@@ -2,7 +2,7 @@ import { ClientError, Options, Variables } from './types'
 export { ClientError } from './types'
 import 'isomorphic-fetch'
 
-export async function request<T extends any>(url: string, query: string, variables?: Variables): Promise<T> {
+export async function request<T extends any> (url: string, query: string, variables?: Variables): Promise<T> {
   const client = new GraphQLClient(url)
 
   return client.request<T>(query, variables)
@@ -14,21 +14,20 @@ export class GraphQLClient {
   private url: string
   private options: Options
 
-  constructor(url: string, options?: Options) {
+  constructor (url: string, options?: Options) {
     this.url = url
-    this.options = {
-      headers: (options && options.headers) ? options.headers : {},
-    }
+    this.options = options || {}
   }
 
-  async request<T extends any>(query: string, variables?: Variables): Promise<T> {
+  async request<T extends any> (query: string, variables?: Variables): Promise<T> {
     const body = JSON.stringify({
       query,
       variables: variables ? variables : undefined,
     })
 
     const response = await fetch(this.url, {
       method: 'POST',
+      ...this.options,
       headers: Object.assign({'Content-Type': 'application/json'}, this.options.headers),
       body,
     })
@@ -43,8 +42,8 @@ export class GraphQLClient {
   }
 }
 
-async function getResult(response: Response): Promise<any> {
-  const contentType = response.headers.get('Content-Type');
+async function getResult (response: Response): Promise<any> {
+  const contentType = response.headers.get('Content-Type')
   if (contentType && contentType.startsWith('application/json')) {
     return await response.json()
   } else {

src/types.ts

@@ -1,7 +1,15 @@
 export type Variables = { [key: string]: any }
 
 export interface Options {
+  method?: RequestInit['method']
   headers?: { [key: string]: string }
+  mode?: RequestInit['mode']
+  credentials?: RequestInit['credentials']
+  cache?: RequestInit['cache']
+  redirect?: RequestInit['redirect']
+  referrer?: RequestInit['referrer']
+  referrerPolicy?: RequestInit['referrerPolicy']
+  integrity?: RequestInit['integrity']
 }
 
 export interface GraphQLError {
@@ -27,7 +35,7 @@ export class ClientError extends Error {
   response: GraphQLResponse
   request: GraphQLRequestContext
 
-  constructor(response: GraphQLResponse, request: GraphQLRequestContext) {
+  constructor (response: GraphQLResponse, request: GraphQLRequestContext) {
     const message = `${ClientError.extractMessage(response)}: ${JSON.stringify({ response, request })}`
 
     super(message)
@@ -38,12 +46,11 @@ export class ClientError extends Error {
     Error.captureStackTrace(this, ClientError)
   }
 
-  private static extractMessage(response: GraphQLResponse): string {
+  private static extractMessage (response: GraphQLResponse): string {
     try {
       return response.errors![0].message
     } catch (e) {
       return `GraphQL Error (Code: ${response.status})`
     }
   }
 }
-

tests/index.test.ts

@@ -1,6 +1,7 @@
 import test from 'ava'
 import * as fetchMock from 'fetch-mock'
-import { ClientError, request } from '../src/index'
+import { ClientError, request, GraphQLClient } from '../src/index'
+import { Options } from '../src/types'
 
 test('minimal query', async (t) => {
   const data = {
@@ -46,6 +47,26 @@ test('content-type with charset', async (t) => {
   })
 })
 
+
+test('extra fetch options', async (t) => {
+  const options: Options = {
+    credentials: 'include',
+    mode: 'cors',
+    cache: 'reload',
+  }
+
+  const client = new GraphQLClient('https://mock-api.com/graphql', options)
+  await mock({
+    body: { data: {test: 'test'} }
+  }, async () => {
+    await client.request('{ test }')
+    const actualOptions = fetchMock.lastCall()[1]
+    for (let name in options) {
+      t.deepEqual(actualOptions[name], options[name])
+    }
+  })
+})
+
 async function mock(response: any, testFn: () => Promise<void>) {
   fetchMock.mock({
     matcher: '*',

tsconfig.json

@@ -7,7 +7,7 @@
     "sourceMap": true,
     "strictNullChecks": true,
     "outDir": "dist",
-    "lib": ["es2016", "dom"]
+    "lib": ["es2015", "es2016", "dom"]
   },
   "exclude": [
     "node_modules"

tslint.json

@@ -0,0 +1,13 @@
+{
+  "extends": ["tslint-config-standard"],
+  "rules": {
+    "trailing-comma": [
+      true,
+      {
+        "multiline": "always",
+        "singleline": "never"
+      }
+    ],
+    "no-use-before-declare": false
+  }
+}

yarn.lock

@@ -768,12 +768,20 @@ color-name@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
 
+colors@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
   dependencies:
     delayed-stream "~1.0.0"
 
+commander@^2.9.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
+
 common-path-prefix@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-1.0.0.tgz#cd52f6f0712e0baab97d6f9732874f22f47752c0"
@@ -910,10 +918,17 @@ diff-match-patch@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.0.tgz#1cc3c83a490d67f95d91e39f6ad1f2e086b63048"
 
-diff@^3.0.0, diff@^3.0.1:
+diff@^3.0.0, diff@^3.0.1, diff@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
 
+doctrine@^0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-0.7.2.tgz#7cb860359ba3be90e040b26b729ce4bfa654c523"
+  dependencies:
+    esutils "^1.1.6"
+    isarray "0.0.1"
+
 dot-prop@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.1.1.tgz#a8493f0b7b5eeec82525b5c7587fa7de7ca859c1"
@@ -984,6 +999,10 @@ estraverse@^4.0.0, estraverse@^4.1.1:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
 
+esutils@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.1.6.tgz#c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375"
+
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -1195,7 +1214,7 @@ glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
 
-glob@^7.0.3, glob@^7.0.5:
+glob@^7.0.3, glob@^7.0.5, glob@^7.1.1:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -2104,6 +2123,10 @@ path-key@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
 
+path-parse@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+
 path-to-regexp@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
@@ -2408,6 +2431,12 @@ resolve-from@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
 
+resolve@^1.3.2:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
+  dependencies:
+    path-parse "^1.0.5"
+
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -2670,6 +2699,49 @@ trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
 
+tslib@^1.0.0, tslib@^1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec"
+
+tslint-config-standard@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/tslint-config-standard/-/tslint-config-standard-6.0.1.tgz#a04ba0a794759e877287056f549b081e47a56d6c"
+  dependencies:
+    tslint-eslint-rules "^4.0.0"
+
+tslint-eslint-rules@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/tslint-eslint-rules/-/tslint-eslint-rules-4.1.1.tgz#7c30e7882f26bc276bff91d2384975c69daf88ba"
+  dependencies:
+    doctrine "^0.7.2"
+    tslib "^1.0.0"
+    tsutils "^1.4.0"
+
+tslint@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.5.0.tgz#10e8dab3e3061fa61e9442e8cee3982acf20a6aa"
+  dependencies:
+    babel-code-frame "^6.22.0"
+    colors "^1.1.2"
+    commander "^2.9.0"
+    diff "^3.2.0"
+    glob "^7.1.1"
+    minimatch "^3.0.4"
+    resolve "^1.3.2"
+    semver "^5.3.0"
+    tslib "^1.7.1"
+    tsutils "^2.5.1"
+
+tsutils@^1.4.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.9.1.tgz#b9f9ab44e55af9681831d5f28d0aeeaf5c750cb0"
+
+tsutils@^2.5.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.7.1.tgz#411a0e9466525a2b2869260a55620d7292155e24"
+  dependencies:
+    tslib "^1.7.1"
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"