graphql-http 1.2.0 → 1.3.0

package/lib/client.js

@@ -105,7 +105,7 @@ function createClient(options) {
                             res = await fetchFn(url, {
                                 signal: control.signal,
                                 method: 'POST',
-                                headers: Object.assign(Object.assign({}, headers), { 'content-type': 'application/json; charset=utf-8', accept: 'application/graphql+json, application/json' }),
+                                headers: Object.assign(Object.assign({}, headers), { 'content-type': 'application/json; charset=utf-8', accept: 'application/graphql-response+json, application/json' }),
                                 credentials,
                                 referrer,
                                 referrerPolicy,
@@ -122,7 +122,7 @@ function createClient(options) {
                         const contentType = res.headers.get('content-type');
                         if (!contentType)
                             throw new Error('Missing response content-type');
-                        if (!contentType.includes('application/graphql+json') &&
+                        if (!contentType.includes('application/graphql-response+json') &&
                             !contentType.includes('application/json')) {
                             throw new Error(`Unsupported response content-type ${contentType}`);
                         }

package/lib/client.mjs

@@ -88,7 +88,7 @@ export function createClient(options) {
                             res = await fetchFn(url, {
                                 signal: control.signal,
                                 method: 'POST',
-                                headers: Object.assign(Object.assign({}, headers), { 'content-type': 'application/json; charset=utf-8', accept: 'application/graphql+json, application/json' }),
+                                headers: Object.assign(Object.assign({}, headers), { 'content-type': 'application/json; charset=utf-8', accept: 'application/graphql-response+json, application/json' }),
                                 credentials,
                                 referrer,
                                 referrerPolicy,
@@ -105,7 +105,7 @@ export function createClient(options) {
                         const contentType = res.headers.get('content-type');
                         if (!contentType)
                             throw new Error('Missing response content-type');
-                        if (!contentType.includes('application/graphql+json') &&
+                        if (!contentType.includes('application/graphql-response+json') &&
                             !contentType.includes('application/json')) {
                             throw new Error(`Unsupported response content-type ${contentType}`);
                         }

package/lib/handler.d.ts

@@ -258,7 +258,7 @@ export declare function createHandler<RawRequest = unknown, Context = unknown>(o
  *
  * @category Server
  */
-export declare type AcceptableMediaType = 'application/graphql+json' | 'application/json';
+export declare type AcceptableMediaType = 'application/graphql-response+json' | 'application/json';
 /**
  * Inspects the request and detects the appropriate/acceptable Media-Type
  * looking at the `Accept` header while complying with the GraphQL over HTTP Protocol.

package/lib/handler.js

@@ -100,7 +100,7 @@ function createHandler(options) {
                     status: 406,
                     statusText: 'Not Acceptable',
                     headers: {
-                        accept: 'application/graphql+json; charset=utf-8, application/json; charset=utf-8',
+                        accept: 'application/graphql-response+json; charset=utf-8, application/json; charset=utf-8',
                     },
                 },
             ];
@@ -291,11 +291,11 @@ function getAcceptableMediaType(acceptHeader) {
             acceptedMediaType = 'application/json';
             break;
         }
-        if ((mediaType === 'application/graphql+json' ||
+        if ((mediaType === 'application/graphql-response+json' ||
             mediaType === 'application/*' ||
             mediaType === '*/*') &&
             charset === 'charset=utf8') {
-            acceptedMediaType = 'application/graphql+json';
+            acceptedMediaType = 'application/graphql-response+json';
             break;
         }
     }
@@ -322,7 +322,7 @@ function makeResponse(resultOrErrors, acceptedMediaType) {
                 headers: {
                     'content-type': acceptedMediaType === 'application/json'
                         ? 'application/json; charset=utf-8'
-                        : 'application/graphql+json; charset=utf-8',
+                        : 'application/graphql-response+json; charset=utf-8',
                 },
             },
         ];
@@ -346,7 +346,7 @@ function makeResponse(resultOrErrors, acceptedMediaType) {
             })), { headers: {
                 'content-type': acceptedMediaType === 'application/json'
                     ? 'application/json; charset=utf-8'
-                    : 'application/graphql+json; charset=utf-8',
+                    : 'application/graphql-response+json; charset=utf-8',
             } }),
     ];
 }

package/lib/handler.mjs

@@ -96,7 +96,7 @@ export function createHandler(options) {
                     status: 406,
                     statusText: 'Not Acceptable',
                     headers: {
-                        accept: 'application/graphql+json; charset=utf-8, application/json; charset=utf-8',
+                        accept: 'application/graphql-response+json; charset=utf-8, application/json; charset=utf-8',
                     },
                 },
             ];
@@ -286,11 +286,11 @@ export function getAcceptableMediaType(acceptHeader) {
             acceptedMediaType = 'application/json';
             break;
         }
-        if ((mediaType === 'application/graphql+json' ||
+        if ((mediaType === 'application/graphql-response+json' ||
             mediaType === 'application/*' ||
             mediaType === '*/*') &&
             charset === 'charset=utf8') {
-            acceptedMediaType = 'application/graphql+json';
+            acceptedMediaType = 'application/graphql-response+json';
             break;
         }
     }
@@ -316,7 +316,7 @@ export function makeResponse(resultOrErrors, acceptedMediaType) {
                 headers: {
                     'content-type': acceptedMediaType === 'application/json'
                         ? 'application/json; charset=utf-8'
-                        : 'application/graphql+json; charset=utf-8',
+                        : 'application/graphql-response+json; charset=utf-8',
                 },
             },
         ];
@@ -340,7 +340,7 @@ export function makeResponse(resultOrErrors, acceptedMediaType) {
             })), { headers: {
                 'content-type': acceptedMediaType === 'application/json'
                     ? 'application/json; charset=utf-8'
-                    : 'application/graphql+json; charset=utf-8',
+                    : 'application/graphql-response+json; charset=utf-8',
             } }),
     ];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-http",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Simple, pluggable, zero-dependency, GraphQL over HTTP Protocol compliant server and client",
   "keywords": [
     "graphql",
@@ -75,11 +75,11 @@
     "@rollup/plugin-typescript": "^8.3.4",
     "@semantic-release/changelog": "^6.0.1",
     "@semantic-release/git": "^10.0.1",
-    "@types/jest": "^28.1.6",
-    "@typescript-eslint/eslint-plugin": "^5.33.0",
-    "@typescript-eslint/parser": "^5.33.0",
+    "@types/jest": "^28.1.7",
+    "@typescript-eslint/eslint-plugin": "^5.33.1",
+    "@typescript-eslint/parser": "^5.33.1",
     "babel-jest": "^28.1.3",
-    "eslint": "^8.21.0",
+    "eslint": "^8.22.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
     "graphql": "^16.5.0",
@@ -88,7 +88,7 @@
     "node-fetch": "^3.2.10",
     "prettier": "^2.7.1",
     "replacestream": "^4.0.3",
-    "rollup": "^2.77.3",
+    "rollup": "^2.78.0",
     "rollup-plugin-terser": "^7.0.2",
     "semantic-release": "^19.0.3",
     "tslib": "^2.4.0",

package/umd/graphql-http.js

@@ -101,7 +101,7 @@
                                 res = await fetchFn(url, {
                                     signal: control.signal,
                                     method: 'POST',
-                                    headers: Object.assign(Object.assign({}, headers), { 'content-type': 'application/json; charset=utf-8', accept: 'application/graphql+json, application/json' }),
+                                    headers: Object.assign(Object.assign({}, headers), { 'content-type': 'application/json; charset=utf-8', accept: 'application/graphql-response+json, application/json' }),
                                     credentials,
                                     referrer,
                                     referrerPolicy,
@@ -118,7 +118,7 @@
                             const contentType = res.headers.get('content-type');
                             if (!contentType)
                                 throw new Error('Missing response content-type');
-                            if (!contentType.includes('application/graphql+json') &&
+                            if (!contentType.includes('application/graphql-response+json') &&
                                 !contentType.includes('application/json')) {
                                 throw new Error(`Unsupported response content-type ${contentType}`);
                             }

package/umd/graphql-http.min.js

@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).graphqlHttp={})}(this,(function(e){"use strict";class t extends Error{constructor(e){let t,r;var o;(function(e){return"object"==typeof e&&null!==e})(o=e)&&"boolean"==typeof o.ok&&"number"==typeof o.status&&"string"==typeof o.statusText?(r=e,t="Server responded with "+e.status+": "+e.statusText):t=e instanceof Error?e.message:String(e),super(t),this.name=this.constructor.name,this.response=r}}e.NetworkError=t,e.createClient=function(e){const{credentials:r="same-origin",referrer:o,referrerPolicy:n,shouldRetry:s=(()=>!1)}=e,i=e.fetchFn||fetch,a=e.abortControllerImpl||AbortController,c=(()=>{let e=!1;const t=[];return{get disposed(){return e},onDispose:r=>e?(setTimeout((()=>r()),0),()=>{}):(t.push(r),()=>{t.splice(t.indexOf(r),1)}),dispose(){if(!e){e=!0;for(const e of[...t])e()}}}})();return{subscribe(l,p){if(c.disposed)throw new Error("Client has been disposed");const f=new a,u=c.onDispose((()=>{u(),f.abort()}));return(async()=>{var a;let c=null,u=0;for(;;){if(c){const e=await s(c,u);if(f.signal.aborted)return;if(!e)throw c;u++}try{const s="function"==typeof e.url?await e.url(l):e.url;if(f.signal.aborted)return;const c="function"==typeof e.headers?await e.headers():null!==(a=e.headers)&&void 0!==a?a:{};if(f.signal.aborted)return;let u;try{u=await i(s,{signal:f.signal,method:"POST",headers:Object.assign(Object.assign({},c),{"content-type":"application/json; charset=utf-8",accept:"application/graphql+json, application/json"}),credentials:r,referrer:o,referrerPolicy:n,body:JSON.stringify(l)})}catch(e){throw new t(e)}if(!u.ok)throw new t(u);if(!u.body)throw new Error("Missing response body");const d=u.headers.get("content-type");if(!d)throw new Error("Missing response content-type");if(!d.includes("application/graphql+json")&&!d.includes("application/json"))throw new Error(`Unsupported response content-type ${d}`);const h=await u.json();return p.next(h),f.abort()}catch(e){if(f.signal.aborted)return;if(!(e instanceof t))throw e;c=e}}})().then((()=>p.complete())).catch((e=>p.error(e))),()=>f.abort()},dispose(){c.dispose()}}},Object.defineProperty(e,"__esModule",{value:!0})}));
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).graphqlHttp={})}(this,(function(e){"use strict";class t extends Error{constructor(e){let t,r;var o;(function(e){return"object"==typeof e&&null!==e})(o=e)&&"boolean"==typeof o.ok&&"number"==typeof o.status&&"string"==typeof o.statusText?(r=e,t="Server responded with "+e.status+": "+e.statusText):t=e instanceof Error?e.message:String(e),super(t),this.name=this.constructor.name,this.response=r}}e.NetworkError=t,e.createClient=function(e){const{credentials:r="same-origin",referrer:o,referrerPolicy:n,shouldRetry:s=(()=>!1)}=e,i=e.fetchFn||fetch,a=e.abortControllerImpl||AbortController,c=(()=>{let e=!1;const t=[];return{get disposed(){return e},onDispose:r=>e?(setTimeout((()=>r()),0),()=>{}):(t.push(r),()=>{t.splice(t.indexOf(r),1)}),dispose(){if(!e){e=!0;for(const e of[...t])e()}}}})();return{subscribe(p,l){if(c.disposed)throw new Error("Client has been disposed");const f=new a,u=c.onDispose((()=>{u(),f.abort()}));return(async()=>{var a;let c=null,u=0;for(;;){if(c){const e=await s(c,u);if(f.signal.aborted)return;if(!e)throw c;u++}try{const s="function"==typeof e.url?await e.url(p):e.url;if(f.signal.aborted)return;const c="function"==typeof e.headers?await e.headers():null!==(a=e.headers)&&void 0!==a?a:{};if(f.signal.aborted)return;let u;try{u=await i(s,{signal:f.signal,method:"POST",headers:Object.assign(Object.assign({},c),{"content-type":"application/json; charset=utf-8",accept:"application/graphql-response+json, application/json"}),credentials:r,referrer:o,referrerPolicy:n,body:JSON.stringify(p)})}catch(e){throw new t(e)}if(!u.ok)throw new t(u);if(!u.body)throw new Error("Missing response body");const d=u.headers.get("content-type");if(!d)throw new Error("Missing response content-type");if(!d.includes("application/graphql-response+json")&&!d.includes("application/json"))throw new Error(`Unsupported response content-type ${d}`);const h=await u.json();return l.next(h),f.abort()}catch(e){if(f.signal.aborted)return;if(!(e instanceof t))throw e;c=e}}})().then((()=>l.complete())).catch((e=>l.error(e))),()=>f.abort()},dispose(){c.dispose()}}},Object.defineProperty(e,"__esModule",{value:!0})}));