graphql-http 1.0.0 → 1.3.0

package/lib/utils.js

@@ -5,9 +5,29 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isObject = void 0;
+exports.isAsyncIterable = exports.isExecutionResult = exports.areGraphQLErrors = exports.isObject = void 0;
 /** @private */
 function isObject(val) {
     return typeof val === 'object' && val !== null;
 }
 exports.isObject = isObject;
+/** @private */
+function areGraphQLErrors(obj) {
+    return (Array.isArray(obj) &&
+        // must be at least one error
+        obj.length > 0 &&
+        // error has at least a message
+        obj.every((ob) => 'message' in ob));
+}
+exports.areGraphQLErrors = areGraphQLErrors;
+/** @private */
+function isExecutionResult(val) {
+    return (isObject(val) &&
+        ('data' in val || ('data' in val && val.data == null && 'errors' in val)));
+}
+exports.isExecutionResult = isExecutionResult;
+/** @private */
+function isAsyncIterable(val) {
+    return typeof Object(val)[Symbol.asyncIterator] === 'function';
+}
+exports.isAsyncIterable = isAsyncIterable;

package/lib/utils.mjs

@@ -7,3 +7,20 @@
 export function isObject(val) {
     return typeof val === 'object' && val !== null;
 }
+/** @private */
+export function areGraphQLErrors(obj) {
+    return (Array.isArray(obj) &&
+        // must be at least one error
+        obj.length > 0 &&
+        // error has at least a message
+        obj.every((ob) => 'message' in ob));
+}
+/** @private */
+export function isExecutionResult(val) {
+    return (isObject(val) &&
+        ('data' in val || ('data' in val && val.data == null && 'errors' in val)));
+}
+/** @private */
+export function isAsyncIterable(val) {
+    return typeof Object(val)[Symbol.asyncIterator] === 'function';
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "graphql-http",
-  "version": "1.0.0",
-  "description": "Simple, plugable, zero-dependency, GraphQL over HTTP Protocol compliant server and client",
+  "version": "1.3.0",
+  "description": "Simple, pluggable, zero-dependency, GraphQL over HTTP Protocol compliant server and client",
   "keywords": [
     "graphql",
     "client",
@@ -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.32.0",
-    "@typescript-eslint/parser": "^5.32.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.2",
+    "rollup": "^2.78.0",
     "rollup-plugin-terser": "^7.0.2",
     "semantic-release": "^19.0.3",
     "tslib": "^2.4.0",

package/umd/graphql-http.js

@@ -14,21 +14,6 @@
         return typeof val === 'object' && val !== null;
     }
 
-    /**
-     *
-     * common
-     *
-     */
-    /**
-     * Checks whether the passed value is the `graphql-http` server agnostic response.
-     *
-     * @category Common
-     */
-    function isResponse(val) {
-        // TODO: make sure the contents of init match ResponseInit
-        return Array.isArray(val) && typeof val[0] === 'string' && isObject(val[1]);
-    }
-
     /**
      *
      * client
@@ -102,7 +87,7 @@
                         }
                         try {
                             const url = typeof options.url === 'function'
-                                ? await options.url()
+                                ? await options.url(request)
                                 : options.url;
                             if (control.signal.aborted)
                                 return;
@@ -116,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,
@@ -133,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}`);
                             }
@@ -199,7 +184,6 @@
 
     exports.NetworkError = NetworkError;
     exports.createClient = createClient;
-    exports.isResponse = isResponse;
 
     Object.defineProperty(exports, '__esModule', { value: true });
 

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";function t(e){return"object"==typeof e&&null!==e}class r extends Error{constructor(e){let r,o;var n;t(n=e)&&"boolean"==typeof n.ok&&"number"==typeof n.status&&"string"==typeof n.statusText?(o=e,r="Server responded with "+e.status+": "+e.statusText):r=e instanceof Error?e.message:String(e),super(r),this.name=this.constructor.name,this.response=o}}e.NetworkError=r,e.createClient=function(e){const{credentials:t="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,f){if(c.disposed)throw new Error("Client has been disposed");const l=new a,u=c.onDispose((()=>{u(),l.abort()}));return(async()=>{var a;let c=null,u=0;for(;;){if(c){const e=await s(c,u);if(l.signal.aborted)return;if(!e)throw c;u++}try{const s="function"==typeof e.url?await e.url():e.url;if(l.signal.aborted)return;const c="function"==typeof e.headers?await e.headers():null!==(a=e.headers)&&void 0!==a?a:{};if(l.signal.aborted)return;let u;try{u=await i(s,{signal:l.signal,method:"POST",headers:Object.assign(Object.assign({},c),{"content-type":"application/json; charset=utf-8",accept:"application/graphql+json, application/json"}),credentials:t,referrer:o,referrerPolicy:n,body:JSON.stringify(p)})}catch(e){throw new r(e)}if(!u.ok)throw new r(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 f.next(h),l.abort()}catch(e){if(l.signal.aborted)return;if(!(e instanceof r))throw e;c=e}}})().then((()=>f.complete())).catch((e=>f.error(e))),()=>l.abort()},dispose(){c.dispose()}}},e.isResponse=function(e){return Array.isArray(e)&&"string"==typeof e[0]&&t(e[1])},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})}));