graphql-http 1.2.0 → 1.5.0

package/lib/handler.js

@@ -55,7 +55,7 @@ exports.isResponse = isResponse;
  *       url: req.url,
  *       method: req.method,
  *       headers: req.headers,
- *       body: await new Promise((resolve) => {
+ *       body: () => new Promise((resolve) => {
  *         let body = '';
  *         req.on('data', (chunk) => (body += chunk));
  *         req.on('end', () => resolve(body));
@@ -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',
                     },
                 },
             ];
@@ -142,16 +142,21 @@ function createHandler(options) {
                         if (!req.body) {
                             throw new Error('Missing body');
                         }
+                        let data;
                         try {
-                            const data = typeof req.body === 'string' ? JSON.parse(req.body) : req.body;
-                            partParams.operationName = data.operationName;
-                            partParams.query = data.query;
-                            partParams.variables = data.variables;
-                            partParams.extensions = data.extensions;
+                            const body = typeof req.body === 'function' ? await req.body() : req.body;
+                            data = typeof body === 'string' ? JSON.parse(body) : body;
                         }
-                        catch (_d) {
+                        catch (err) {
                             throw new Error('Unparsable JSON body');
                         }
+                        if (!(0, utils_1.isObject)(data)) {
+                            throw new Error('JSON body must be an object');
+                        }
+                        partParams.operationName = data.operationName;
+                        partParams.query = data.query;
+                        partParams.variables = data.variables;
+                        partParams.extensions = data.extensions;
                         break;
                     }
                 default: // graphql-http doesnt support any other content type
@@ -229,7 +234,7 @@ function createHandler(options) {
                 throw null;
             operation = ast.operation;
         }
-        catch (_e) {
+        catch (_d) {
             return makeResponse(new graphql_1.GraphQLError('Unable to detect operation AST'), acceptedMediaType);
         }
         if (operation === 'subscription') {
@@ -291,11 +296,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 +327,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 +351,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

@@ -51,7 +51,7 @@ export function isResponse(val) {
  *       url: req.url,
  *       method: req.method,
  *       headers: req.headers,
- *       body: await new Promise((resolve) => {
+ *       body: () => new Promise((resolve) => {
  *         let body = '';
  *         req.on('data', (chunk) => (body += chunk));
  *         req.on('end', () => resolve(body));
@@ -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',
                     },
                 },
             ];
@@ -138,16 +138,21 @@ export function createHandler(options) {
                         if (!req.body) {
                             throw new Error('Missing body');
                         }
+                        let data;
                         try {
-                            const data = typeof req.body === 'string' ? JSON.parse(req.body) : req.body;
-                            partParams.operationName = data.operationName;
-                            partParams.query = data.query;
-                            partParams.variables = data.variables;
-                            partParams.extensions = data.extensions;
+                            const body = typeof req.body === 'function' ? await req.body() : req.body;
+                            data = typeof body === 'string' ? JSON.parse(body) : body;
                         }
-                        catch (_d) {
+                        catch (err) {
                             throw new Error('Unparsable JSON body');
                         }
+                        if (!isObject(data)) {
+                            throw new Error('JSON body must be an object');
+                        }
+                        partParams.operationName = data.operationName;
+                        partParams.query = data.query;
+                        partParams.variables = data.variables;
+                        partParams.extensions = data.extensions;
                         break;
                     }
                 default: // graphql-http doesnt support any other content type
@@ -225,7 +230,7 @@ export function createHandler(options) {
                 throw null;
             operation = ast.operation;
         }
-        catch (_e) {
+        catch (_d) {
             return makeResponse(new GraphQLError('Unable to detect operation AST'), acceptedMediaType);
         }
         if (operation === 'subscription') {
@@ -286,11 +291,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 +321,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 +345,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/lib/index.d.ts

@@ -1,3 +1,4 @@
 export * from './common';
 export * from './handler';
 export * from './client';
+export * from './audits';

package/lib/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./common"), exports);
 __exportStar(require("./handler"), exports);
 __exportStar(require("./client"), exports);
+__exportStar(require("./audits"), exports);

package/lib/index.mjs

@@ -1,3 +1,4 @@
 export * from './common.mjs';
 export * from './handler.mjs';
 export * from './client.mjs';
+export * from './audits.mjs';

package/lib/utils.d.ts

@@ -5,7 +5,9 @@
  */
 import type { ExecutionResult, GraphQLError } from 'graphql';
 /** @private */
-export declare function isObject(val: unknown): val is Record<PropertyKey, unknown>;
+export declare function extendedTypeof(val: unknown): 'string' | 'number' | 'bigint' | 'boolean' | 'symbol' | 'undefined' | 'object' | 'function' | 'array' | 'null';
+/** @private */
+export declare function isObject(val: unknown): val is Record<PropertyKey, any>;
 /** @private */
 export declare function areGraphQLErrors(obj: unknown): obj is readonly GraphQLError[];
 /** @private */

package/lib/utils.js

@@ -5,7 +5,18 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isAsyncIterable = exports.isExecutionResult = exports.areGraphQLErrors = exports.isObject = void 0;
+exports.isAsyncIterable = exports.isExecutionResult = exports.areGraphQLErrors = exports.isObject = exports.extendedTypeof = void 0;
+/** @private */
+function extendedTypeof(val) {
+    if (val === null) {
+        return 'null';
+    }
+    if (Array.isArray(val)) {
+        return 'array';
+    }
+    return typeof val;
+}
+exports.extendedTypeof = extendedTypeof;
 /** @private */
 function isObject(val) {
     return typeof val === 'object' && val !== null;

package/lib/utils.mjs

@@ -4,6 +4,16 @@
  *
  */
 /** @private */
+export function extendedTypeof(val) {
+    if (val === null) {
+        return 'null';
+    }
+    if (Array.isArray(val)) {
+        return 'array';
+    }
+    return typeof val;
+}
+/** @private */
 export function isObject(val) {
     return typeof val === 'object' && val !== null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-http",
-  "version": "1.2.0",
+  "version": "1.5.0",
   "description": "Simple, pluggable, zero-dependency, GraphQL over HTTP Protocol compliant server and client",
   "keywords": [
     "graphql",
@@ -65,35 +65,35 @@
     "graphql": ">=0.11 <=16"
   },
   "devDependencies": {
-    "@babel/core": "^7.18.10",
+    "@babel/core": "^7.18.13",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
     "@babel/plugin-proposal-object-rest-spread": "^7.18.9",
     "@babel/plugin-proposal-optional-chaining": "^7.18.9",
     "@babel/preset-env": "^7.18.10",
     "@babel/preset-typescript": "^7.18.6",
-    "@rollup/plugin-typescript": "^8.3.4",
+    "@rollup/plugin-typescript": "^8.4.0",
     "@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",
-    "babel-jest": "^28.1.3",
-    "eslint": "^8.21.0",
+    "@types/jest": "^29.0.0",
+    "@typescript-eslint/eslint-plugin": "^5.36.1",
+    "@typescript-eslint/parser": "^5.36.1",
+    "babel-jest": "^29.0.1",
+    "eslint": "^8.23.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "graphql": "^16.5.0",
-    "jest": "^28.1.3",
-    "jest-jasmine2": "^28.1.3",
+    "graphql": "^16.6.0",
+    "jest": "^29.0.1",
+    "jest-jasmine2": "^29.0.1",
     "node-fetch": "^3.2.10",
     "prettier": "^2.7.1",
     "replacestream": "^4.0.3",
-    "rollup": "^2.77.3",
+    "rollup": "^2.78.1",
     "rollup-plugin-terser": "^7.0.2",
-    "semantic-release": "^19.0.3",
+    "semantic-release": "^19.0.5",
     "tslib": "^2.4.0",
-    "typedoc": "^0.23.10",
+    "typedoc": "^0.23.11",
     "typedoc-plugin-markdown": "^3.13.4",
-    "typescript": "^4.7.4"
+    "typescript": "^4.8.2"
   }
 }

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})}));