Merge pull request #9 from ejnshtein/support-fetch-options

Add support for fetch options

Author: yeegor

package.json

@@ -17,7 +17,7 @@
         "test": "jest"
     },
     "dependencies": {
-        "node-fetch": "^2.6.1",
+        "node-fetch": "^2.6.2",
         "tslib": "^2.2.0"
     },
     "devDependencies": {
@@ -26,7 +26,7 @@
         "@rollup/plugin-node-resolve": "^11.2.1",
         "@types/jest": "^26.0.22",
         "@types/node": "^14.14.37",
-        "@types/node-fetch": "^2.5.10",
+        "@types/node-fetch": "2.5.12",
         "jest": "^26.6.3",
         "rollup": "^2.45.2",
         "rollup-plugin-dts": "^3.0.1",

src/client/index.ts

@@ -17,8 +17,8 @@ export type Middleware = (response: GraphQlResponse) => unknown;
 
 export type RequestOptions = {
     endpoint: string,
-    headers?: any
-};
+    headers?: Record<string, string>
+} & Omit<RequestInit, 'method' | 'body' | 'headers'>;
 
 export const defaultOptions: RequestOptions = {
     endpoint: process.env.GRAPHQL_ENDPOINT || '/graphql'
@@ -31,7 +31,7 @@ export class Client {
         this.options.endpoint = endpoint;
     };
 
-    setHeaders = (headers: any): void => {
+    setHeaders = (headers: Record<string, string>): void => {
         this.options.headers = headers;
     };
 

src/client/post.ts

@@ -1,9 +1,9 @@
 import { RequestOptions } from '.';
 import { GraphQLDocument } from './prepare-document';
 
-if (typeof fetch === 'undefined') {
-    var fetch = require('node-fetch');
-}
+const envAgnosticFetch: typeof window.fetch = typeof window === 'undefined'
+    ? require('node-fetch')
+    : window.fetch
 
 export const processHeaders = (headers: any, options: RequestOptions): any => {
     const { headers: additionalHeaders = {} } = options;
@@ -18,9 +18,10 @@ export const postFetch = (
     query: string,
     variables: GraphQLDocument['variables'],
     options: RequestOptions
-): Promise<Response> => fetch(
+): Promise<Response> => envAgnosticFetch(
     options.endpoint,
     {
+        ...options,
         method: 'POST',
         body: JSON.stringify({ query, variables }),
         headers: processHeaders({

yarn.lock

@@ -646,10 +646,10 @@
     jest-diff "^26.0.0"
     pretty-format "^26.0.0"
 
-"@types/node-fetch@^2.5.10":
-  version "2.5.10"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.10.tgz#9b4d4a0425562f9fcea70b12cb3fcdd946ca8132"
-  integrity sha512-IpkX0AasN44hgEad0gEF/V6EgR5n69VEqPEgnmoM8GsIGro3PowbWs4tR6IhxUTyPLpOn+fiGG6nrQhcmoCuIQ==
+"@types/node-fetch@2.5.12":
+  version "2.5.12"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.12.tgz#8a6f779b1d4e60b7a57fb6fd48d84fb545b9cc66"
+  integrity sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==
   dependencies:
     "@types/node" "*"
     form-data "^3.0.0"
@@ -2731,10 +2731,10 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
-node-fetch@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
-  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+node-fetch@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.2.tgz#986996818b73785e47b1965cc34eb093a1d464d0"
+  integrity sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA==
 
 node-int64@^0.4.0:
   version "0.4.0"