graphql-http 1.0.0 → 1.3.0

package/lib/handler.js

@@ -5,9 +5,21 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createHandler = void 0;
+exports.makeResponse = exports.getAcceptableMediaType = exports.createHandler = exports.isResponse = void 0;
 const graphql_1 = require("graphql");
-const common_1 = require("./common");
+const utils_1 = require("./utils");
+/**
+ * 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' || val[0] === null) &&
+        (0, utils_1.isObject)(val[1]));
+}
+exports.isResponse = isResponse;
 /**
  * Makes a GraphQL over HTTP Protocol compliant server handler. The handler can
  * be used with your favourite server library.
@@ -64,7 +76,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;
@@ -80,28 +92,7 @@ function createHandler(options) {
                 },
             ];
         }
-        let acceptedMediaType;
-        const accepts = (req.headers.accept || '*/*')
-            .replace(/\s/g, '')
-            .toLowerCase()
-            .split(',');
-        for (const accept of accepts) {
-            // accept-charset became obsolete, shouldnt be used (https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Accept-Charset)
-            // TODO: handle the weight parameter "q"
-            const [mediaType, ...params] = accept.split(';');
-            const charset = (params === null || params === void 0 ? void 0 : params.find((param) => param.includes('charset='))) || 'charset=utf8'; // utf-8 is assumed when not specified;
-            if (mediaType === 'application/json' && charset === 'charset=utf8') {
-                acceptedMediaType = 'application/json';
-                break;
-            }
-            if ((mediaType === 'application/graphql+json' ||
-                mediaType === 'application/*' ||
-                mediaType === '*/*') &&
-                charset === 'charset=utf8') {
-                acceptedMediaType = 'application/graphql+json';
-                break;
-            }
-        }
+        const acceptedMediaType = getAcceptableMediaType(req.headers.accept);
         if (!acceptedMediaType) {
             return [
                 null,
@@ -109,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',
                     },
                 },
             ];
@@ -127,14 +118,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);
                     }
@@ -171,8 +163,10 @@ function createHandler(options) {
                         },
                     ];
             }
-            if (!partParams.query)
+            if (partParams.query == null)
                 throw new Error('Missing query');
+            if (typeof partParams.query !== 'string')
+                throw new Error('Invalid query');
             if (partParams.variables != null &&
                 (typeof partParams.variables !== 'object' ||
                     Array.isArray(partParams.variables))) {
@@ -187,36 +181,27 @@ function createHandler(options) {
             params = partParams;
         }
         catch (err) {
-            return [
-                err.message,
-                {
-                    status: acceptedMediaType === 'application/json' ? 200 : 400,
-                    statusText: 'Bad Request',
-                },
-            ];
+            return makeResponse(new graphql_1.GraphQLError(err.message), acceptedMediaType);
         }
         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 (isResponse(maybeResErrsOrArgs))
+            return maybeResErrsOrArgs;
+        else if ((0, utils_1.isExecutionResult)(maybeResErrsOrArgs) ||
+            (0, utils_1.areGraphQLErrors)(maybeResErrsOrArgs))
+            return makeResponse(maybeResErrsOrArgs, acceptedMediaType);
+        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) {
-                return [
-                    'GraphQL query syntax error',
-                    {
-                        status: acceptedMediaType === 'application/json' ? 200 : 400,
-                        statusText: 'Bad Request',
-                    },
-                ];
+            catch (err) {
+                return makeResponse(err, acceptedMediaType);
             }
             const argsWithoutSchema = {
                 operationName,
@@ -225,44 +210,38 @@ function createHandler(options) {
             };
             if (typeof schema === 'function') {
                 const resOrSchema = await schema(req, argsWithoutSchema);
-                if ((0, common_1.isResponse)(resOrSchema))
+                if (isResponse(resOrSchema))
                     return resOrSchema;
                 args = Object.assign(Object.assign({}, argsWithoutSchema), { schema: resOrSchema });
             }
             else {
                 args = Object.assign(Object.assign({}, argsWithoutSchema), { schema });
             }
+            const validationErrs = validate(args.schema, args.document);
+            if (validationErrs.length) {
+                return makeResponse(validationErrs, acceptedMediaType);
+            }
         }
         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) {
-            return [
-                'Unable to detect operation AST',
-                {
-                    status: acceptedMediaType === 'application/json' ? 200 : 400,
-                    statusText: 'Bad Request',
-                },
-            ];
+        catch (_e) {
+            return makeResponse(new graphql_1.GraphQLError('Unable to detect operation AST'), acceptedMediaType);
         }
         if (operation === 'subscription') {
-            return [
-                'Subscriptions are not supported',
-                {
-                    status: 400,
-                    statusText: 'Bad Request',
-                },
-            ];
+            return makeResponse(new graphql_1.GraphQLError('Subscriptions are not supported'), acceptedMediaType);
         }
         // mutations cannot happen over GETs
         // https://graphql.github.io/graphql-over-http/draft/#sel-CALFJRPAAELBAAxwP
         if (operation === 'mutation' && method === 'GET') {
             return [
-                'Cannot perform mutations over GET',
+                JSON.stringify({
+                    errors: [new graphql_1.GraphQLError('Cannot perform mutations over GET')],
+                }),
                 {
                     status: 405,
                     statusText: 'Method Not Allowed',
@@ -273,42 +252,102 @@ function createHandler(options) {
             ];
         }
         if (!('contextValue' in args)) {
-            args.contextValue =
-                typeof context === 'function' ? await context(req, args) : context;
-        }
-        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: {
-                        'content-type': acceptedMediaType === 'application/json'
-                            ? 'application/json; charset=utf-8'
-                            : 'application/graphql+json; charset=utf-8',
-                    },
-                },
-            ];
+            const maybeResOrContext = typeof context === 'function' ? await context(req, args) : context;
+            if (isResponse(maybeResOrContext))
+                return maybeResOrContext;
+            args.contextValue = maybeResOrContext;
         }
         let result = await execute(args);
-        const maybeResOrResult = await (onOperation === null || onOperation === void 0 ? void 0 : onOperation(req, args, result));
-        if ((0, common_1.isResponse)(maybeResOrResult))
-            return maybeResOrResult;
-        else if (maybeResOrResult)
-            result = maybeResOrResult;
+        const maybeResponseOrResult = await (onOperation === null || onOperation === void 0 ? void 0 : onOperation(req, args, result));
+        if (isResponse(maybeResponseOrResult))
+            return maybeResponseOrResult;
+        else if (maybeResponseOrResult)
+            result = maybeResponseOrResult;
+        if ((0, utils_1.isAsyncIterable)(result)) {
+            return makeResponse(new graphql_1.GraphQLError('Subscriptions are not supported'), acceptedMediaType);
+        }
+        return makeResponse(result, acceptedMediaType);
+    };
+}
+exports.createHandler = createHandler;
+/**
+ * Inspects the request and detects the appropriate/acceptable Media-Type
+ * looking at the `Accept` header while complying with the GraphQL over HTTP Protocol.
+ *
+ * @category Server
+ */
+function getAcceptableMediaType(acceptHeader) {
+    let acceptedMediaType = null;
+    const accepts = (acceptHeader || '*/*')
+        .replace(/\s/g, '')
+        .toLowerCase()
+        .split(',');
+    for (const accept of accepts) {
+        // accept-charset became obsolete, shouldnt be used (https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Accept-Charset)
+        // TODO: handle the weight parameter "q"
+        const [mediaType, ...params] = accept.split(';');
+        const charset = (params === null || params === void 0 ? void 0 : params.find((param) => param.includes('charset='))) || 'charset=utf8'; // utf-8 is assumed when not specified;
+        if (mediaType === 'application/json' && charset === 'charset=utf8') {
+            acceptedMediaType = 'application/json';
+            break;
+        }
+        if ((mediaType === 'application/graphql-response+json' ||
+            mediaType === 'application/*' ||
+            mediaType === '*/*') &&
+            charset === 'charset=utf8') {
+            acceptedMediaType = 'application/graphql-response+json';
+            break;
+        }
+    }
+    return acceptedMediaType;
+}
+exports.getAcceptableMediaType = getAcceptableMediaType;
+/**
+ * Creates an appropriate GraphQL over HTTP response following the provided arguments.
+ *
+ * If the first argument is an `ExecutionResult`, the operation will be treated as "successful".
+ *
+ * If the first argument is _any_ object without the `data` field, it will be treated as an error (as per the spec)
+ * and the response will be constructed with the help of `acceptedMediaType` complying with the GraphQL over HTTP Protocol.
+ *
+ * @category Server
+ */
+function makeResponse(resultOrErrors, acceptedMediaType) {
+    if ((0, utils_1.isExecutionResult)(resultOrErrors)) {
         return [
-            JSON.stringify(result),
+            JSON.stringify(resultOrErrors),
             {
                 status: 200,
                 statusText: 'OK',
                 headers: {
                     'content-type': acceptedMediaType === 'application/json'
                         ? 'application/json; charset=utf-8'
-                        : 'application/graphql+json; charset=utf-8',
+                        : 'application/graphql-response+json; charset=utf-8',
                 },
             },
         ];
-    };
+    }
+    return [
+        JSON.stringify({
+            errors: Array.isArray(resultOrErrors)
+                ? (0, utils_1.isObject)(resultOrErrors)
+                    ? resultOrErrors
+                    : new graphql_1.GraphQLError(String(resultOrErrors))
+                : [resultOrErrors],
+        }),
+        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-response+json; charset=utf-8',
+            } }),
+    ];
 }
-exports.createHandler = createHandler;
+exports.makeResponse = makeResponse;

package/lib/handler.mjs

@@ -3,8 +3,19 @@
  * handler
  *
  */
-import { validate as graphqlValidate, execute as graphqlExecute, parse, getOperationAST, } from 'graphql';
-import { isResponse } from './common.mjs';
+import { validate as graphqlValidate, execute as graphqlExecute, parse as graphqlParse, getOperationAST as graphqlGetOperationAST, GraphQLError, } from 'graphql';
+import { areGraphQLErrors, isAsyncIterable, isExecutionResult, isObject, } from './utils.mjs';
+/**
+ * Checks whether the passed value is the `graphql-http` server agnostic response.
+ *
+ * @category Common
+ */
+export function isResponse(val) {
+    // TODO: make sure the contents of init match ResponseInit
+    return (Array.isArray(val) &&
+        (typeof val[0] === 'string' || val[0] === null) &&
+        isObject(val[1]));
+}
 /**
  * Makes a GraphQL over HTTP Protocol compliant server handler. The handler can
  * be used with your favourite server library.
@@ -61,7 +72,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;
@@ -77,28 +88,7 @@ export function createHandler(options) {
                 },
             ];
         }
-        let acceptedMediaType;
-        const accepts = (req.headers.accept || '*/*')
-            .replace(/\s/g, '')
-            .toLowerCase()
-            .split(',');
-        for (const accept of accepts) {
-            // accept-charset became obsolete, shouldnt be used (https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Accept-Charset)
-            // TODO: handle the weight parameter "q"
-            const [mediaType, ...params] = accept.split(';');
-            const charset = (params === null || params === void 0 ? void 0 : params.find((param) => param.includes('charset='))) || 'charset=utf8'; // utf-8 is assumed when not specified;
-            if (mediaType === 'application/json' && charset === 'charset=utf8') {
-                acceptedMediaType = 'application/json';
-                break;
-            }
-            if ((mediaType === 'application/graphql+json' ||
-                mediaType === 'application/*' ||
-                mediaType === '*/*') &&
-                charset === 'charset=utf8') {
-                acceptedMediaType = 'application/graphql+json';
-                break;
-            }
-        }
+        const acceptedMediaType = getAcceptableMediaType(req.headers.accept);
         if (!acceptedMediaType) {
             return [
                 null,
@@ -106,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',
                     },
                 },
             ];
@@ -124,14 +114,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);
                     }
@@ -168,8 +159,10 @@ export function createHandler(options) {
                         },
                     ];
             }
-            if (!partParams.query)
+            if (partParams.query == null)
                 throw new Error('Missing query');
+            if (typeof partParams.query !== 'string')
+                throw new Error('Invalid query');
             if (partParams.variables != null &&
                 (typeof partParams.variables !== 'object' ||
                     Array.isArray(partParams.variables))) {
@@ -184,20 +177,17 @@ export function createHandler(options) {
             params = partParams;
         }
         catch (err) {
-            return [
-                err.message,
-                {
-                    status: acceptedMediaType === 'application/json' ? 200 : 400,
-                    statusText: 'Bad Request',
-                },
-            ];
+            return makeResponse(new GraphQLError(err.message), acceptedMediaType);
         }
         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 (isExecutionResult(maybeResErrsOrArgs) ||
+            areGraphQLErrors(maybeResErrsOrArgs))
+            return makeResponse(maybeResErrsOrArgs, acceptedMediaType);
+        else if (maybeResErrsOrArgs)
+            args = maybeResErrsOrArgs;
         else {
             if (!schema)
                 throw new Error('The GraphQL schema is not provided');
@@ -206,14 +196,8 @@ export function createHandler(options) {
             try {
                 document = parse(query);
             }
-            catch (_e) {
-                return [
-                    'GraphQL query syntax error',
-                    {
-                        status: acceptedMediaType === 'application/json' ? 200 : 400,
-                        statusText: 'Bad Request',
-                    },
-                ];
+            catch (err) {
+                return makeResponse(err, acceptedMediaType);
             }
             const argsWithoutSchema = {
                 operationName,
@@ -229,6 +213,10 @@ export function createHandler(options) {
             else {
                 args = Object.assign(Object.assign({}, argsWithoutSchema), { schema });
             }
+            const validationErrs = validate(args.schema, args.document);
+            if (validationErrs.length) {
+                return makeResponse(validationErrs, acceptedMediaType);
+            }
         }
         let operation;
         try {
@@ -237,29 +225,19 @@ export function createHandler(options) {
                 throw null;
             operation = ast.operation;
         }
-        catch (_f) {
-            return [
-                'Unable to detect operation AST',
-                {
-                    status: acceptedMediaType === 'application/json' ? 200 : 400,
-                    statusText: 'Bad Request',
-                },
-            ];
+        catch (_e) {
+            return makeResponse(new GraphQLError('Unable to detect operation AST'), acceptedMediaType);
         }
         if (operation === 'subscription') {
-            return [
-                'Subscriptions are not supported',
-                {
-                    status: 400,
-                    statusText: 'Bad Request',
-                },
-            ];
+            return makeResponse(new GraphQLError('Subscriptions are not supported'), acceptedMediaType);
         }
         // mutations cannot happen over GETs
         // https://graphql.github.io/graphql-over-http/draft/#sel-CALFJRPAAELBAAxwP
         if (operation === 'mutation' && method === 'GET') {
             return [
-                'Cannot perform mutations over GET',
+                JSON.stringify({
+                    errors: [new GraphQLError('Cannot perform mutations over GET')],
+                }),
                 {
                     status: 405,
                     statusText: 'Method Not Allowed',
@@ -270,41 +248,99 @@ export function createHandler(options) {
             ];
         }
         if (!('contextValue' in args)) {
-            args.contextValue =
-                typeof context === 'function' ? await context(req, args) : context;
-        }
-        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: {
-                        'content-type': acceptedMediaType === 'application/json'
-                            ? 'application/json; charset=utf-8'
-                            : 'application/graphql+json; charset=utf-8',
-                    },
-                },
-            ];
+            const maybeResOrContext = typeof context === 'function' ? await context(req, args) : context;
+            if (isResponse(maybeResOrContext))
+                return maybeResOrContext;
+            args.contextValue = maybeResOrContext;
         }
         let result = await execute(args);
-        const maybeResOrResult = await (onOperation === null || onOperation === void 0 ? void 0 : onOperation(req, args, result));
-        if (isResponse(maybeResOrResult))
-            return maybeResOrResult;
-        else if (maybeResOrResult)
-            result = maybeResOrResult;
+        const maybeResponseOrResult = await (onOperation === null || onOperation === void 0 ? void 0 : onOperation(req, args, result));
+        if (isResponse(maybeResponseOrResult))
+            return maybeResponseOrResult;
+        else if (maybeResponseOrResult)
+            result = maybeResponseOrResult;
+        if (isAsyncIterable(result)) {
+            return makeResponse(new GraphQLError('Subscriptions are not supported'), acceptedMediaType);
+        }
+        return makeResponse(result, acceptedMediaType);
+    };
+}
+/**
+ * Inspects the request and detects the appropriate/acceptable Media-Type
+ * looking at the `Accept` header while complying with the GraphQL over HTTP Protocol.
+ *
+ * @category Server
+ */
+export function getAcceptableMediaType(acceptHeader) {
+    let acceptedMediaType = null;
+    const accepts = (acceptHeader || '*/*')
+        .replace(/\s/g, '')
+        .toLowerCase()
+        .split(',');
+    for (const accept of accepts) {
+        // accept-charset became obsolete, shouldnt be used (https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Accept-Charset)
+        // TODO: handle the weight parameter "q"
+        const [mediaType, ...params] = accept.split(';');
+        const charset = (params === null || params === void 0 ? void 0 : params.find((param) => param.includes('charset='))) || 'charset=utf8'; // utf-8 is assumed when not specified;
+        if (mediaType === 'application/json' && charset === 'charset=utf8') {
+            acceptedMediaType = 'application/json';
+            break;
+        }
+        if ((mediaType === 'application/graphql-response+json' ||
+            mediaType === 'application/*' ||
+            mediaType === '*/*') &&
+            charset === 'charset=utf8') {
+            acceptedMediaType = 'application/graphql-response+json';
+            break;
+        }
+    }
+    return acceptedMediaType;
+}
+/**
+ * Creates an appropriate GraphQL over HTTP response following the provided arguments.
+ *
+ * If the first argument is an `ExecutionResult`, the operation will be treated as "successful".
+ *
+ * If the first argument is _any_ object without the `data` field, it will be treated as an error (as per the spec)
+ * and the response will be constructed with the help of `acceptedMediaType` complying with the GraphQL over HTTP Protocol.
+ *
+ * @category Server
+ */
+export function makeResponse(resultOrErrors, acceptedMediaType) {
+    if (isExecutionResult(resultOrErrors)) {
         return [
-            JSON.stringify(result),
+            JSON.stringify(resultOrErrors),
             {
                 status: 200,
                 statusText: 'OK',
                 headers: {
                     'content-type': acceptedMediaType === 'application/json'
                         ? 'application/json; charset=utf-8'
-                        : 'application/graphql+json; charset=utf-8',
+                        : 'application/graphql-response+json; charset=utf-8',
                 },
             },
         ];
-    };
+    }
+    return [
+        JSON.stringify({
+            errors: Array.isArray(resultOrErrors)
+                ? isObject(resultOrErrors)
+                    ? resultOrErrors
+                    : new GraphQLError(String(resultOrErrors))
+                : [resultOrErrors],
+        }),
+        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-response+json; charset=utf-8',
+            } }),
+    ];
 }

package/lib/utils.d.ts

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