sofa-api 0.14.0 → 0.15.1

package/index.js

@@ -49,8 +49,7 @@ function resolveVariable({ value, type, schema, }) {
         if (graphql.isScalarType(namedType)) {
             // GraphQLBoolean.serialize expects a boolean or a number only
             if (graphql.isEqualType(graphql.GraphQLBoolean, namedType)) {
-                // we don't support TRUE
-                value = value === 'true';
+                value = (value === 'true' || value === true);
             }
             return namedType.serialize(value);
         }
@@ -481,9 +480,34 @@ function useHandler(config) {
         });
         if (result.errors) {
             const defaultErrorHandler = (errors) => {
-                return new fetch.Response(JSON.stringify(errors[0]), {
-                    status: 500,
-                    headers: { 'Content-Type': 'application/json' },
+                var _a;
+                let status;
+                const headers = {
+                    'Content-Type': 'application/json; charset=utf-8',
+                };
+                for (const error of errors) {
+                    if (typeof error === 'object' && error != null && ((_a = error.extensions) === null || _a === void 0 ? void 0 : _a.http)) {
+                        if (error.extensions.http.status &&
+                            (!status || error.extensions.http.status > status)) {
+                            status = error.extensions.http.status;
+                        }
+                        if (error.extensions.http.headers) {
+                            Object.assign(headers, error.extensions.http.headers);
+                        }
+                    }
+                }
+                if (!status) {
+                    status = 500;
+                }
+                if (errors.length === 1) {
+                    return new fetch.Response(JSON.stringify(errors[0]), {
+                        status,
+                        headers,
+                    });
+                }
+                return new fetch.Response(JSON.stringify({ errors }), {
+                    status,
+                    headers,
                 });
             };
             const errorHandler = sofa.errorHandler || defaultErrorHandler;

package/index.mjs

@@ -43,8 +43,7 @@ function resolveVariable({ value, type, schema, }) {
         if (isScalarType(namedType)) {
             // GraphQLBoolean.serialize expects a boolean or a number only
             if (isEqualType(GraphQLBoolean, namedType)) {
-                // we don't support TRUE
-                value = value === 'true';
+                value = (value === 'true' || value === true);
             }
             return namedType.serialize(value);
         }
@@ -475,9 +474,34 @@ function useHandler(config) {
         });
         if (result.errors) {
             const defaultErrorHandler = (errors) => {
-                return new Response(JSON.stringify(errors[0]), {
-                    status: 500,
-                    headers: { 'Content-Type': 'application/json' },
+                var _a;
+                let status;
+                const headers = {
+                    'Content-Type': 'application/json; charset=utf-8',
+                };
+                for (const error of errors) {
+                    if (typeof error === 'object' && error != null && ((_a = error.extensions) === null || _a === void 0 ? void 0 : _a.http)) {
+                        if (error.extensions.http.status &&
+                            (!status || error.extensions.http.status > status)) {
+                            status = error.extensions.http.status;
+                        }
+                        if (error.extensions.http.headers) {
+                            Object.assign(headers, error.extensions.http.headers);
+                        }
+                    }
+                }
+                if (!status) {
+                    status = 500;
+                }
+                if (errors.length === 1) {
+                    return new Response(JSON.stringify(errors[0]), {
+                        status,
+                        headers,
+                    });
+                }
+                return new Response(JSON.stringify({ errors }), {
+                    status,
+                    headers,
                 });
             };
             const errorHandler = sofa.errorHandler || defaultErrorHandler;

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "sofa-api",
-  "version": "0.14.0",
+  "version": "0.15.1",
   "description": "Create REST APIs with GraphQL",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^0.13.2 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@graphql-tools/utils": "8.12.0",
-    "@whatwg-node/fetch": "^0.4.3",
+    "@graphql-tools/utils": "9.1.0",
+    "@whatwg-node/fetch": "^0.5.0",
     "@whatwg-node/server": "^0.4.1",
     "ansi-colors": "4.1.3",
     "itty-router": "^2.6.1",
     "openapi-types": "12.0.2",
     "param-case": "3.0.4",
     "title-case": "3.0.3",
-    "tslib": "2.4.0"
+    "tslib": "2.4.1"
   },
   "repository": {
     "type": "git",

package/router.d.ts

@@ -1,6 +1,15 @@
 import { Request as IttyRequest, Router } from 'itty-router';
 import type { Sofa } from './sofa';
 export declare type ErrorHandler = (errors: ReadonlyArray<any>) => Response;
+declare module 'graphql' {
+    interface GraphQLHTTPErrorExtensions {
+        status?: number;
+        headers?: Record<string, string>;
+    }
+    interface GraphQLErrorExtensions {
+        http?: GraphQLHTTPErrorExtensions;
+    }
+}
 declare type SofaRequest = IttyRequest & Request;
 export declare function createRouter(sofa: Sofa): Router<SofaRequest, {}>;
 export {};