graphql-http 1.0.0 → 1.1.0

package/README.md

@@ -3,7 +3,7 @@
 
   <h3>graphql-http</h3>
 
-  <h6>Simple, plugable, zero-dependency, <a href="https://graphql.github.io/graphql-over-http">GraphQL over HTTP Protocol</a> compliant server and client.</h6>
+  <h6>Simple, pluggable, zero-dependency, <a href="https://graphql.github.io/graphql-over-http">GraphQL over HTTP Protocol</a> compliant server and client.</h6>
 
 [![Continuous integration](https://github.com/enisdenjo/graphql-http/workflows/Continuous%20integration/badge.svg)](https://github.com/enisdenjo/graphql-http/actions?query=workflow%3A%22Continuous+integration%22) [![graphql-http](https://img.shields.io/npm/v/graphql-http.svg?label=graphql-http&logo=npm)](https://www.npmjs.com/package/graphql-http)
 
@@ -207,6 +207,41 @@ fastify.listen(4000);
 console.log('Listening to port 4000');
 ```
 
+##### With [`Deno`](https://deno.land/)
+
+```ts
+import { serve } from 'https://deno.land/std@0.151.0/http/server.ts';
+import { createHandler } from 'https://esm.sh/graphql-http';
+import { schema } from './previous-step';
+
+const handler = createHandler<Request>({ schema });
+
+await serve(
+  async (req: Request) => {
+    const [path, _search] = req.url.split('?');
+    if (!path.endsWith('/graphql')) {
+      return new Response(null, { status: 404, statusText: 'Not Found' });
+    }
+
+    const headers: Record<string, string> = {};
+    req.headers.forEach((value, key) => (headers[key] = value));
+    const [body, init] = await handler({
+      url: req.url,
+      method: req.method,
+      headers,
+      body: await req.text(),
+      raw: req,
+    });
+    return new Response(body, init);
+  },
+  {
+    port: 4000,
+  },
+);
+
+// Listening to port 4000
+```
+
 #### Use the client
 
 ```js
@@ -515,6 +550,21 @@ const client = createClient({
 
 </details>
 
+<details id="deno-client">
+<summary><a href="#deno-client">🔗</a> Client usage in Deno</summary>
+
+```js
+import { createClient } from 'graphql-http';
+
+const client = createClient({
+  url: 'http://deno.earth:4000/graphql',
+});
+
+// consider other recipes for usage inspiration
+```
+
+</details>
+
 <details id="auth">
 <summary><a href="#auth">🔗</a> Server handler usage with authentication</summary>
 

package/lib/client.d.ts

@@ -3,7 +3,7 @@
  * client
  *
  */
-import { ExecutionResult } from 'graphql';
+import type { ExecutionResult } from 'graphql';
 import { RequestParams, Sink } from './common';
 /** This file is the entry point for browsers, re-export common elements. */
 export * from './common';
@@ -18,8 +18,11 @@ export interface ClientOptions {
      *
      * A good use-case for having a function is when using the URL for authentication,
      * where subsequent requests (due to auth) may have a refreshed identity token.
+     *
+     * Function receives the request params. Useful for example, to ease up debugging and DevTools
+     * navigation you might want to use the operation name in the URL's search params (`/graphql?MyQuery`).
      */
-    url: string | (() => Promise<string> | string);
+    url: string | ((request: RequestParams) => Promise<string> | string);
     /**
      * Indicates whether the user agent should send cookies from the other domain in the case
      * of cross-origin requests.
@@ -140,7 +143,12 @@ export declare class NetworkError<Response extends ResponseLike = ResponseLike>
     response: Response | undefined;
     constructor(msgOrErrOrResponse: string | Error | Response);
 }
-interface ResponseLike {
+/**
+ * Concrete interface a response needs to implement for the client.
+ *
+ * @category Client
+ */
+export interface ResponseLike {
     readonly ok: boolean;
     readonly status: number;
     readonly statusText: string;

package/lib/client.js

@@ -91,7 +91,7 @@ function createClient(options) {
                     }
                     try {
                         const url = typeof options.url === 'function'
-                            ? await options.url()
+                            ? await options.url(request)
                             : options.url;
                         if (control.signal.aborted)
                             return;

package/lib/client.mjs

@@ -74,7 +74,7 @@ export function createClient(options) {
                     }
                     try {
                         const url = typeof options.url === 'function'
-                            ? await options.url()
+                            ? await options.url(request)
                             : options.url;
                         if (control.signal.aborted)
                             return;

package/lib/common.d.ts

@@ -4,11 +4,11 @@
  *
  */
 /**
- * Concrete interface that the headers map should implement.
+ * The incoming request headers the implementing server should provide.
  *
  * @category Common
  */
-export interface Headers {
+export interface RequestHeaders {
     accept?: string | undefined;
     allow?: string | undefined;
     'content-type'?: string | undefined;
@@ -29,7 +29,7 @@ export interface Headers {
 export interface Request<RawRequest> {
     readonly method: string;
     readonly url: string;
-    readonly headers: Headers;
+    readonly headers: RequestHeaders;
     readonly body: string | Record<string, unknown> | null;
     /**
      * The raw request itself from the implementing server.
@@ -52,6 +52,16 @@ export interface RequestParams {
     variables?: Record<string, unknown> | undefined;
     extensions?: Record<string, unknown> | undefined;
 }
+/**
+ * The response headers that get returned from graphql-http.
+ *
+ * @category Common
+ */
+export declare type ResponseHeaders = {
+    accept?: string;
+    allow?: string;
+    'content-type'?: string;
+} & Record<string, string>;
 /**
  * Server agnostic response body returned from `graphql-http` needing
  * to be coerced to the server implementation in use.
@@ -67,8 +77,8 @@ export declare type ResponseBody = string;
  */
 export interface ResponseInit {
     readonly status: number;
-    readonly statusText?: string;
-    readonly headers?: Headers;
+    readonly statusText: string;
+    readonly headers?: ResponseHeaders;
 }
 /**
  * Server agnostic response returned from `graphql-http` containing the

package/lib/common.js

@@ -14,6 +14,8 @@ const utils_1 = require("./utils");
  */
 function isResponse(val) {
     // TODO: make sure the contents of init match ResponseInit
-    return Array.isArray(val) && typeof val[0] === 'string' && (0, utils_1.isObject)(val[1]);
+    return (Array.isArray(val) &&
+        (typeof val[0] === 'string' || val[0] === null) &&
+        (0, utils_1.isObject)(val[1]));
 }
 exports.isResponse = isResponse;

package/lib/common.mjs

@@ -11,5 +11,7 @@ import { isObject } from './utils.mjs';
  */
 export function isResponse(val) {
     // TODO: make sure the contents of init match ResponseInit
-    return Array.isArray(val) && typeof val[0] === 'string' && isObject(val[1]);
+    return (Array.isArray(val) &&
+        (typeof val[0] === 'string' || val[0] === null) &&
+        isObject(val[1]));
 }

package/lib/handler.d.ts

@@ -3,7 +3,7 @@
  * handler
  *
  */
-import { ExecutionArgs, ExecutionResult, GraphQLSchema, validate as graphqlValidate, execute as graphqlExecute } from 'graphql';
+import { ExecutionArgs, ExecutionResult, GraphQLSchema, validate as graphqlValidate, execute as graphqlExecute, parse as graphqlParse, getOperationAST as graphqlGetOperationAST, GraphQLError } from 'graphql';
 import { Request, RequestParams, Response } from './common';
 /**
  * A concrete GraphQL execution context value type.
@@ -51,6 +51,14 @@ export interface HandlerOptions<RawRequest = unknown> {
      * used to execute the query and mutation operations.
      */
     execute?: typeof graphqlExecute;
+    /**
+     * GraphQL parse function allowing you to apply a custom parser.
+     */
+    parse?: typeof graphqlParse;
+    /**
+     * GraphQL operation AST getter used for detecting the operation type.
+     */
+    getOperationAST?: typeof graphqlGetOperationAST;
     /**
      * The subscribe callback executed right after processing the request
      * before proceeding with the GraphQL operation execution.
@@ -59,6 +67,9 @@ export interface HandlerOptions<RawRequest = unknown> {
      * trying to build one internally. In this case, you are responsible for providing
      * a ready set of arguments which will be directly plugged in the operation execution.
      *
+     * If you return an array of `GraphQLError` from the callback, they will be reported
+     * to the client while complying with the spec.
+     *
      * Omitting the fields `contextValue` from the returned `ExecutionArgs` will use the
      * provided `context` option, if available.
      *
@@ -70,7 +81,7 @@ export interface HandlerOptions<RawRequest = unknown> {
      * you should do by returning a `Request` argument which will stop
      * further execution.
      */
-    onSubscribe?: (req: Request<RawRequest>, params: RequestParams) => Promise<ExecutionArgs | Response | void> | ExecutionArgs | Response | void;
+    onSubscribe?: (req: Request<RawRequest>, params: RequestParams) => Promise<ExecutionArgs | GraphQLError[] | Response | void> | ExecutionArgs | GraphQLError[] | Response | void;
     /**
      * Executed after the operation call resolves.
      *

package/lib/handler.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createHandler = void 0;
 const graphql_1 = require("graphql");
 const common_1 = require("./common");
+const utils_1 = require("./utils");
 /**
  * Makes a GraphQL over HTTP Protocol compliant server handler. The handler can
  * be used with your favourite server library.
@@ -64,7 +65,7 @@ const common_1 = require("./common");
  * @category Server
  */
 function createHandler(options) {
-    const { schema, context, validate = graphql_1.validate, execute = graphql_1.execute, onSubscribe, onOperation, } = options;
+    const { schema, context, validate = graphql_1.validate, execute = graphql_1.execute, parse = graphql_1.parse, getOperationAST = graphql_1.getOperationAST, onSubscribe, onOperation, } = options;
     return async function handler(req) {
         var _a, _b;
         const method = req.method;
@@ -127,14 +128,15 @@ function createHandler(options) {
                 case method === 'GET': {
                     // TODO: what if content-type is specified and is not application/x-www-form-urlencoded?
                     try {
-                        const url = new URL(req.url || '', 'http://localhost/');
+                        const [, search] = req.url.split('?');
+                        const searchParams = new URLSearchParams(search);
                         partParams.operationName =
-                            (_a = url.searchParams.get('operationName')) !== null && _a !== void 0 ? _a : undefined;
-                        partParams.query = (_b = url.searchParams.get('query')) !== null && _b !== void 0 ? _b : undefined;
-                        const variables = url.searchParams.get('variables');
+                            (_a = searchParams.get('operationName')) !== null && _a !== void 0 ? _a : undefined;
+                        partParams.query = (_b = searchParams.get('query')) !== null && _b !== void 0 ? _b : undefined;
+                        const variables = searchParams.get('variables');
                         if (variables)
                             partParams.variables = JSON.parse(variables);
-                        const extensions = url.searchParams.get('extensions');
+                        const extensions = searchParams.get('extensions');
                         if (extensions)
                             partParams.extensions = JSON.parse(extensions);
                     }
@@ -189,33 +191,64 @@ function createHandler(options) {
         catch (err) {
             return [
                 err.message,
-                {
-                    status: acceptedMediaType === 'application/json' ? 200 : 400,
-                    statusText: 'Bad Request',
-                },
+                Object.assign(Object.assign({}, (acceptedMediaType === 'application/json'
+                    ? {
+                        status: 200,
+                        statusText: 'OK',
+                    }
+                    : {
+                        status: 400,
+                        statusText: 'Bad Request',
+                    })), { statusText: 'Bad Request' }),
             ];
         }
         let args;
-        const maybeResOrExecArgs = await (onSubscribe === null || onSubscribe === void 0 ? void 0 : onSubscribe(req, params));
-        if ((0, common_1.isResponse)(maybeResOrExecArgs))
-            return maybeResOrExecArgs;
-        else if (maybeResOrExecArgs)
-            args = maybeResOrExecArgs;
+        const maybeResErrsOrArgs = await (onSubscribe === null || onSubscribe === void 0 ? void 0 : onSubscribe(req, params));
+        if ((0, common_1.isResponse)(maybeResErrsOrArgs))
+            return maybeResErrsOrArgs;
+        else if ((0, utils_1.areGraphQLErrors)(maybeResErrsOrArgs))
+            return [
+                JSON.stringify({ errors: maybeResErrsOrArgs }),
+                Object.assign(Object.assign({}, (acceptedMediaType === 'application/json'
+                    ? {
+                        status: 200,
+                        statusText: 'OK',
+                    }
+                    : {
+                        status: 400,
+                        statusText: 'Bad Request',
+                    })), { headers: {
+                        'content-type': acceptedMediaType === 'application/json'
+                            ? 'application/json; charset=utf-8'
+                            : 'application/graphql+json; charset=utf-8',
+                    } }),
+            ];
+        else if (maybeResErrsOrArgs)
+            args = maybeResErrsOrArgs;
         else {
             if (!schema)
                 throw new Error('The GraphQL schema is not provided');
             const { operationName, query, variables } = params;
             let document;
             try {
-                document = (0, graphql_1.parse)(query);
+                document = parse(query);
             }
-            catch (_e) {
+            catch (err) {
                 return [
-                    'GraphQL query syntax error',
-                    {
-                        status: acceptedMediaType === 'application/json' ? 200 : 400,
-                        statusText: 'Bad Request',
-                    },
+                    JSON.stringify({ errors: [err] }),
+                    Object.assign(Object.assign({}, (acceptedMediaType === 'application/json'
+                        ? {
+                            status: 200,
+                            statusText: 'OK',
+                        }
+                        : {
+                            status: 400,
+                            statusText: 'Bad Request',
+                        })), { statusText: 'Bad Request', headers: {
+                            'content-type': acceptedMediaType === 'application/json'
+                                ? 'application/json; charset=utf-8'
+                                : 'application/graphql+json; charset=utf-8',
+                        } }),
                 ];
             }
             const argsWithoutSchema = {
@@ -235,18 +268,23 @@ function createHandler(options) {
         }
         let operation;
         try {
-            const ast = (0, graphql_1.getOperationAST)(args.document, args.operationName);
+            const ast = getOperationAST(args.document, args.operationName);
             if (!ast)
                 throw null;
             operation = ast.operation;
         }
-        catch (_f) {
+        catch (_e) {
             return [
                 'Unable to detect operation AST',
-                {
-                    status: acceptedMediaType === 'application/json' ? 200 : 400,
-                    statusText: 'Bad Request',
-                },
+                Object.assign(Object.assign({}, (acceptedMediaType === 'application/json'
+                    ? {
+                        status: 200,
+                        statusText: 'OK',
+                    }
+                    : {
+                        status: 400,
+                        statusText: 'Bad Request',
+                    })), { statusText: 'Bad Request' }),
             ];
         }
         if (operation === 'subscription') {
@@ -273,22 +311,28 @@ function createHandler(options) {
             ];
         }
         if (!('contextValue' in args)) {
-            args.contextValue =
-                typeof context === 'function' ? await context(req, args) : context;
+            const maybeResOrContext = typeof context === 'function' ? await context(req, args) : context;
+            if ((0, common_1.isResponse)(maybeResOrContext))
+                return maybeResOrContext;
+            args.contextValue = maybeResOrContext;
         }
         const validationErrs = validate(args.schema, args.document);
         if (validationErrs.length) {
             return [
                 JSON.stringify({ errors: validationErrs }),
-                {
-                    status: acceptedMediaType === 'application/json' ? 200 : 400,
-                    statusText: 'Bad Request',
-                    headers: {
+                Object.assign(Object.assign({}, (acceptedMediaType === 'application/json'
+                    ? {
+                        status: 200,
+                        statusText: 'OK',
+                    }
+                    : {
+                        status: 400,
+                        statusText: 'Bad Request',
+                    })), { headers: {
                         'content-type': acceptedMediaType === 'application/json'
                             ? 'application/json; charset=utf-8'
                             : 'application/graphql+json; charset=utf-8',
-                    },
-                },
+                    } }),
             ];
         }
         let result = await execute(args);

package/lib/handler.mjs

@@ -3,8 +3,9 @@
  * handler
  *
  */
-import { validate as graphqlValidate, execute as graphqlExecute, parse, getOperationAST, } from 'graphql';
+import { validate as graphqlValidate, execute as graphqlExecute, parse as graphqlParse, getOperationAST as graphqlGetOperationAST, } from 'graphql';
 import { isResponse } from './common.mjs';
+import { areGraphQLErrors } from './utils.mjs';
 /**
  * Makes a GraphQL over HTTP Protocol compliant server handler. The handler can
  * be used with your favourite server library.
@@ -61,7 +62,7 @@ import { isResponse } from './common.mjs';
  * @category Server
  */
 export function createHandler(options) {
-    const { schema, context, validate = graphqlValidate, execute = graphqlExecute, onSubscribe, onOperation, } = options;
+    const { schema, context, validate = graphqlValidate, execute = graphqlExecute, parse = graphqlParse, getOperationAST = graphqlGetOperationAST, onSubscribe, onOperation, } = options;
     return async function handler(req) {
         var _a, _b;
         const method = req.method;
@@ -124,14 +125,15 @@ export function createHandler(options) {
                 case method === 'GET': {
                     // TODO: what if content-type is specified and is not application/x-www-form-urlencoded?
                     try {
-                        const url = new URL(req.url || '', 'http://localhost/');
+                        const [, search] = req.url.split('?');
+                        const searchParams = new URLSearchParams(search);
                         partParams.operationName =
-                            (_a = url.searchParams.get('operationName')) !== null && _a !== void 0 ? _a : undefined;
-                        partParams.query = (_b = url.searchParams.get('query')) !== null && _b !== void 0 ? _b : undefined;
-                        const variables = url.searchParams.get('variables');
+                            (_a = searchParams.get('operationName')) !== null && _a !== void 0 ? _a : undefined;
+                        partParams.query = (_b = searchParams.get('query')) !== null && _b !== void 0 ? _b : undefined;
+                        const variables = searchParams.get('variables');
                         if (variables)
                             partParams.variables = JSON.parse(variables);
-                        const extensions = url.searchParams.get('extensions');
+                        const extensions = searchParams.get('extensions');
                         if (extensions)
                             partParams.extensions = JSON.parse(extensions);
                     }
@@ -186,18 +188,40 @@ export function createHandler(options) {
         catch (err) {
             return [
                 err.message,
-                {
-                    status: acceptedMediaType === 'application/json' ? 200 : 400,
-                    statusText: 'Bad Request',
-                },
+                Object.assign(Object.assign({}, (acceptedMediaType === 'application/json'
+                    ? {
+                        status: 200,
+                        statusText: 'OK',
+                    }
+                    : {
+                        status: 400,
+                        statusText: 'Bad Request',
+                    })), { statusText: 'Bad Request' }),
             ];
         }
         let args;
-        const maybeResOrExecArgs = await (onSubscribe === null || onSubscribe === void 0 ? void 0 : onSubscribe(req, params));
-        if (isResponse(maybeResOrExecArgs))
-            return maybeResOrExecArgs;
-        else if (maybeResOrExecArgs)
-            args = maybeResOrExecArgs;
+        const maybeResErrsOrArgs = await (onSubscribe === null || onSubscribe === void 0 ? void 0 : onSubscribe(req, params));
+        if (isResponse(maybeResErrsOrArgs))
+            return maybeResErrsOrArgs;
+        else if (areGraphQLErrors(maybeResErrsOrArgs))
+            return [
+                JSON.stringify({ errors: maybeResErrsOrArgs }),
+                Object.assign(Object.assign({}, (acceptedMediaType === 'application/json'
+                    ? {
+                        status: 200,
+                        statusText: 'OK',
+                    }
+                    : {
+                        status: 400,
+                        statusText: 'Bad Request',
+                    })), { headers: {
+                        'content-type': acceptedMediaType === 'application/json'
+                            ? 'application/json; charset=utf-8'
+                            : 'application/graphql+json; charset=utf-8',
+                    } }),
+            ];
+        else if (maybeResErrsOrArgs)
+            args = maybeResErrsOrArgs;
         else {
             if (!schema)
                 throw new Error('The GraphQL schema is not provided');
@@ -206,13 +230,22 @@ export function createHandler(options) {
             try {
                 document = parse(query);
             }
-            catch (_e) {
+            catch (err) {
                 return [
-                    'GraphQL query syntax error',
-                    {
-                        status: acceptedMediaType === 'application/json' ? 200 : 400,
-                        statusText: 'Bad Request',
-                    },
+                    JSON.stringify({ errors: [err] }),
+                    Object.assign(Object.assign({}, (acceptedMediaType === 'application/json'
+                        ? {
+                            status: 200,
+                            statusText: 'OK',
+                        }
+                        : {
+                            status: 400,
+                            statusText: 'Bad Request',
+                        })), { statusText: 'Bad Request', headers: {
+                            'content-type': acceptedMediaType === 'application/json'
+                                ? 'application/json; charset=utf-8'
+                                : 'application/graphql+json; charset=utf-8',
+                        } }),
                 ];
             }
             const argsWithoutSchema = {
@@ -237,13 +270,18 @@ export function createHandler(options) {
                 throw null;
             operation = ast.operation;
         }
-        catch (_f) {
+        catch (_e) {
             return [
                 'Unable to detect operation AST',
-                {
-                    status: acceptedMediaType === 'application/json' ? 200 : 400,
-                    statusText: 'Bad Request',
-                },
+                Object.assign(Object.assign({}, (acceptedMediaType === 'application/json'
+                    ? {
+                        status: 200,
+                        statusText: 'OK',
+                    }
+                    : {
+                        status: 400,
+                        statusText: 'Bad Request',
+                    })), { statusText: 'Bad Request' }),
             ];
         }
         if (operation === 'subscription') {
@@ -270,22 +308,28 @@ export function createHandler(options) {
             ];
         }
         if (!('contextValue' in args)) {
-            args.contextValue =
-                typeof context === 'function' ? await context(req, args) : context;
+            const maybeResOrContext = typeof context === 'function' ? await context(req, args) : context;
+            if (isResponse(maybeResOrContext))
+                return maybeResOrContext;
+            args.contextValue = maybeResOrContext;
         }
         const validationErrs = validate(args.schema, args.document);
         if (validationErrs.length) {
             return [
                 JSON.stringify({ errors: validationErrs }),
-                {
-                    status: acceptedMediaType === 'application/json' ? 200 : 400,
-                    statusText: 'Bad Request',
-                    headers: {
+                Object.assign(Object.assign({}, (acceptedMediaType === 'application/json'
+                    ? {
+                        status: 200,
+                        statusText: 'OK',
+                    }
+                    : {
+                        status: 400,
+                        statusText: 'Bad Request',
+                    })), { headers: {
                         'content-type': acceptedMediaType === 'application/json'
                             ? 'application/json; charset=utf-8'
                             : 'application/graphql+json; charset=utf-8',
-                    },
-                },
+                    } }),
             ];
         }
         let result = await execute(args);

package/lib/utils.d.ts

@@ -3,5 +3,8 @@
  * utils
  *
  */
+import type { GraphQLError } from 'graphql';
 /** @private */
 export declare function isObject(val: unknown): val is Record<PropertyKey, unknown>;
+/** @private */
+export declare function areGraphQLErrors(obj: unknown): obj is GraphQLError[];

package/lib/utils.js

@@ -5,9 +5,18 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isObject = void 0;
+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;

package/lib/utils.mjs

@@ -7,3 +7,11 @@
 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));
+}

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.1.0",
+  "description": "Simple, pluggable, zero-dependency, GraphQL over HTTP Protocol compliant server and client",
   "keywords": [
     "graphql",
     "client",

package/umd/graphql-http.js

@@ -26,7 +26,9 @@
      */
     function isResponse(val) {
         // TODO: make sure the contents of init match ResponseInit
-        return Array.isArray(val) && typeof val[0] === 'string' && isObject(val[1]);
+        return (Array.isArray(val) &&
+            (typeof val[0] === 'string' || val[0] === null) &&
+            isObject(val[1]));
     }
 
     /**
@@ -102,7 +104,7 @@
                         }
                         try {
                             const url = typeof options.url === 'function'
-                                ? await options.url()
+                                ? await options.url(request)
                                 : options.url;
                             if (control.signal.aborted)
                                 return;

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";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(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:t,referrer:o,referrerPolicy:n,body:JSON.stringify(l)})}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 p.next(h),f.abort()}catch(e){if(f.signal.aborted)return;if(!(e instanceof r))throw e;c=e}}})().then((()=>p.complete())).catch((e=>p.error(e))),()=>f.abort()},dispose(){c.dispose()}}},e.isResponse=function(e){return Array.isArray(e)&&("string"==typeof e[0]||null===e[0])&&t(e[1])},Object.defineProperty(e,"__esModule",{value:!0})}));