sofa-api 0.13.0 → 0.15.0

package/index.js

@@ -367,7 +367,7 @@ function createRouter(sofa) {
     return router;
 }
 function createQueryRoute({ sofa, router, fieldName, }) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     logger.debug(`[Router] Creating ${fieldName} query`);
     const queryType = sofa.schema.getQueryType();
     const operationNode = utils.buildOperationNodeForField({
@@ -402,13 +402,14 @@ function createQueryRoute({ sofa, router, fieldName, }) {
         path: route.path,
         method: route.method.toUpperCase(),
         tags: (_e = routeConfig === null || routeConfig === void 0 ? void 0 : routeConfig.tags) !== null && _e !== void 0 ? _e : [],
-        description: (_f = routeConfig === null || routeConfig === void 0 ? void 0 : routeConfig.description) !== null && _f !== void 0 ? _f : '',
+        description: (_g = (_f = routeConfig === null || routeConfig === void 0 ? void 0 : routeConfig.description) !== null && _f !== void 0 ? _f : field.description) !== null && _g !== void 0 ? _g : '',
     };
 }
 function createMutationRoute({ sofa, router, fieldName, }) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     logger.debug(`[Router] Creating ${fieldName} mutation`);
     const mutationType = sofa.schema.getMutationType();
+    const field = mutationType.getFields()[fieldName];
     const operationNode = utils.buildOperationNodeForField({
         kind: 'mutation',
         schema: sofa.schema,
@@ -437,7 +438,7 @@ function createMutationRoute({ sofa, router, fieldName, }) {
         path,
         method,
         tags: (routeConfig === null || routeConfig === void 0 ? void 0 : routeConfig.tags) || [],
-        description: (routeConfig === null || routeConfig === void 0 ? void 0 : routeConfig.description) || '',
+        description: (_f = (_e = routeConfig === null || routeConfig === void 0 ? void 0 : routeConfig.description) !== null && _e !== void 0 ? _e : field.description) !== null && _f !== void 0 ? _f : '',
     };
 }
 function useHandler(config) {
@@ -480,9 +481,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;
@@ -644,6 +670,7 @@ function resolveField(field, opts) {
 // type -> $ref
 // scalar -> swagger primitive
 function resolveFieldType(type, opts) {
+    var _a;
     if (graphql.isNonNullType(type)) {
         return resolveFieldType(type.ofType, opts);
     }
@@ -660,9 +687,11 @@ function resolveFieldType(type, opts) {
     }
     if (graphql.isScalarType(type)) {
         return (mapToPrimitive(type.name) ||
-            opts.customScalars[type.name] || {
-            type: 'object',
-        });
+            opts.customScalars[type.name] ||
+            ((_a = type.extensions) === null || _a === void 0 ? void 0 : _a.jsonSchema)
+            || {
+                type: 'object',
+            });
     }
     if (graphql.isEnumType(type)) {
         return {

package/index.mjs

@@ -361,7 +361,7 @@ function createRouter(sofa) {
     return router;
 }
 function createQueryRoute({ sofa, router, fieldName, }) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     logger.debug(`[Router] Creating ${fieldName} query`);
     const queryType = sofa.schema.getQueryType();
     const operationNode = buildOperationNodeForField({
@@ -396,13 +396,14 @@ function createQueryRoute({ sofa, router, fieldName, }) {
         path: route.path,
         method: route.method.toUpperCase(),
         tags: (_e = routeConfig === null || routeConfig === void 0 ? void 0 : routeConfig.tags) !== null && _e !== void 0 ? _e : [],
-        description: (_f = routeConfig === null || routeConfig === void 0 ? void 0 : routeConfig.description) !== null && _f !== void 0 ? _f : '',
+        description: (_g = (_f = routeConfig === null || routeConfig === void 0 ? void 0 : routeConfig.description) !== null && _f !== void 0 ? _f : field.description) !== null && _g !== void 0 ? _g : '',
     };
 }
 function createMutationRoute({ sofa, router, fieldName, }) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     logger.debug(`[Router] Creating ${fieldName} mutation`);
     const mutationType = sofa.schema.getMutationType();
+    const field = mutationType.getFields()[fieldName];
     const operationNode = buildOperationNodeForField({
         kind: 'mutation',
         schema: sofa.schema,
@@ -431,7 +432,7 @@ function createMutationRoute({ sofa, router, fieldName, }) {
         path,
         method,
         tags: (routeConfig === null || routeConfig === void 0 ? void 0 : routeConfig.tags) || [],
-        description: (routeConfig === null || routeConfig === void 0 ? void 0 : routeConfig.description) || '',
+        description: (_f = (_e = routeConfig === null || routeConfig === void 0 ? void 0 : routeConfig.description) !== null && _e !== void 0 ? _e : field.description) !== null && _f !== void 0 ? _f : '',
     };
 }
 function useHandler(config) {
@@ -474,9 +475,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;
@@ -638,6 +664,7 @@ function resolveField(field, opts) {
 // type -> $ref
 // scalar -> swagger primitive
 function resolveFieldType(type, opts) {
+    var _a;
     if (isNonNullType(type)) {
         return resolveFieldType(type.ofType, opts);
     }
@@ -654,9 +681,11 @@ function resolveFieldType(type, opts) {
     }
     if (isScalarType(type)) {
         return (mapToPrimitive(type.name) ||
-            opts.customScalars[type.name] || {
-            type: 'object',
-        });
+            opts.customScalars[type.name] ||
+            ((_a = type.extensions) === null || _a === void 0 ? void 0 : _a.jsonSchema)
+            || {
+                type: 'object',
+            });
     }
     if (isEnumType(type)) {
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sofa-api",
-  "version": "0.13.0",
+  "version": "0.15.0",
   "description": "Create REST APIs with GraphQL",
   "sideEffects": false,
   "peerDependencies": {

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