sofa-api 0.15.5 → 0.16.1

package/index.js

@@ -73,12 +73,12 @@ function resolveVariable({ value, type, schema, }) {
     }
 }
 
-var _a;
+var _a, _b;
 const levels = ['error', 'warn', 'info', 'debug'];
 const toLevel = (string) => levels.includes(string) ? string : null;
-const currentLevel = process.env.SOFA_DEBUG
+const currentLevel = ((_a = globalThis.process) === null || _a === void 0 ? void 0 : _a.env.SOFA_DEBUG)
     ? 'debug'
-    : (_a = toLevel(process.env.SOFA_LOGGER_LEVEL)) !== null && _a !== void 0 ? _a : 'info';
+    : (_b = toLevel(process.env.SOFA_LOGGER_LEVEL)) !== null && _b !== void 0 ? _b : 'info';
 const log = (level, color, args) => {
     if (levels.indexOf(level) <= levels.indexOf(currentLevel)) {
         console.log(`${color(level)}:`, ...args);
@@ -275,6 +275,34 @@ class SubscriptionManager {
     }
 }
 
+const defaultErrorHandler = (errors) => {
+    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);
+            }
+            delete error.extensions.http;
+        }
+    }
+    if (!status) {
+        status = 500;
+    }
+    return new router.Response(JSON.stringify({ errors }), {
+        status,
+        headers,
+    });
+};
 function createRouter(sofa) {
     logger.debug('[Sofa] Creating router');
     const router$1 = router.createRouter({
@@ -451,82 +479,79 @@ function createMutationRoute({ sofa, router, fieldName, }) {
 function useHandler(config) {
     const { sofa, operation, fieldName } = config;
     const info = config.info;
+    const errorHandler = sofa.errorHandler || defaultErrorHandler;
     return (request, serverContext) => tslib.__awaiter(this, void 0, void 0, function* () {
-        var _a;
-        let body = {};
-        if (request.body != null) {
-            const strBody = yield request.text();
-            if (strBody) {
-                body = JSON.parse(strBody);
+        var _a, _b;
+        try {
+            let body = {};
+            if (request.body != null) {
+                const strBody = yield request.text();
+                if (strBody) {
+                    try {
+                        body = JSON.parse(strBody);
+                    }
+                    catch (error) {
+                        throw utils.createGraphQLError('POST body sent invalid JSON.', {
+                            extensions: {
+                                http: {
+                                    status: 400,
+                                }
+                            }
+                        });
+                    }
+                }
             }
-        }
-        const variableValues = info.variables.reduce((variables, variable) => {
-            const name = variable.variable.name.value;
-            const value = parseVariable({
-                value: pickParam({
-                    url: request.url,
-                    body,
-                    params: request.params || {},
-                    name,
-                }),
-                variable,
-                schema: sofa.schema,
-            });
-            if (typeof value === 'undefined') {
-                return variables;
+            let variableValues = {};
+            try {
+                variableValues = info.variables.reduce((variables, variable) => {
+                    const name = variable.variable.name.value;
+                    const value = parseVariable({
+                        value: pickParam({
+                            url: request.url,
+                            body,
+                            params: request.params || {},
+                            name,
+                        }),
+                        variable,
+                        schema: sofa.schema,
+                    });
+                    if (typeof value === 'undefined') {
+                        return variables;
+                    }
+                    return Object.assign(Object.assign({}, variables), { [name]: value });
+                }, {});
             }
-            return Object.assign(Object.assign({}, variables), { [name]: value });
-        }, {});
-        const sofaServerContext = Object.assign(Object.assign({}, serverContext), { request });
-        const contextValue = yield sofa.contextFactory(sofaServerContext);
-        const result = yield sofa.execute({
-            schema: sofa.schema,
-            document: operation,
-            contextValue,
-            variableValues,
-            operationName: info.operation.name && info.operation.name.value,
-        });
-        if (result.errors) {
-            const defaultErrorHandler = (errors) => {
-                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);
+            catch (error) {
+                throw utils.createGraphQLError(error.message || ((_a = error.toString) === null || _a === void 0 ? void 0 : _a.call(error)) || error, {
+                    extensions: {
+                        http: {
+                            status: 400,
                         }
                     }
-                }
-                if (!status) {
-                    status = 500;
-                }
-                if (errors.length === 1) {
-                    return new router.Response(JSON.stringify(errors[0]), {
-                        status,
-                        headers,
-                    });
-                }
-                return new router.Response(JSON.stringify({ errors }), {
-                    status,
-                    headers,
                 });
-            };
-            const errorHandler = sofa.errorHandler || defaultErrorHandler;
-            return errorHandler(result.errors);
+            }
+            const sofaServerContext = Object.assign(Object.assign({}, serverContext), { request });
+            const contextValue = yield sofa.contextFactory(sofaServerContext);
+            const result = yield sofa.execute({
+                schema: sofa.schema,
+                document: operation,
+                contextValue,
+                variableValues,
+                operationName: info.operation.name && info.operation.name.value,
+            });
+            if (result.errors) {
+                return errorHandler(result.errors);
+            }
+            return new router.Response(JSON.stringify((_b = result.data) === null || _b === void 0 ? void 0 : _b[fieldName]), {
+                status: config.route.responseStatus,
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+            });
+        }
+        catch (error) {
+            return errorHandler([error]);
         }
-        return new router.Response(JSON.stringify((_a = result.data) === null || _a === void 0 ? void 0 : _a[fieldName]), {
-            status: config.route.responseStatus,
-            headers: {
-                'Content-Type': 'application/json',
-            },
-        });
     });
 }
 function getPath(fieldName, hasId = false) {
@@ -653,6 +678,16 @@ function mapToPrimitive(type) {
 }
 function mapToRef(type) {
     return `#/components/schemas/${type}`;
+}
+function normalizePathParamForOpenAPI(path) {
+    const pathParts = path.split('/');
+    const normalizedPathParts = pathParts.map((part) => {
+        if (part.startsWith(':')) {
+            return `{${part.slice(1)}}`;
+        }
+        return part;
+    });
+    return normalizedPathParts.join('/');
 }
 
 function buildSchemaObjectFromType(type, opts) {
@@ -887,7 +922,7 @@ function OpenAPI({ schema, info, servers, components, security, tags, customScal
         addRoute(info, config) {
             const basePath = (config === null || config === void 0 ? void 0 : config.basePath) || '';
             const path = basePath +
-                info.path.replace(/\:[a-z0-9]+\w/i, (param) => `{${param.replace(':', '')}}`);
+                normalizePathParamForOpenAPI(info.path);
             if (!swagger.paths[path]) {
                 swagger.paths[path] = {};
             }

package/index.mjs

@@ -1,6 +1,6 @@
 import { __awaiter, __asyncValues } from 'tslib';
 import { getOperationAST, Kind, isScalarType, isEqualType, GraphQLBoolean, isInputObjectType, isObjectType, isNonNullType, execute, subscribe, getNamedType, isListType, isEnumType, parse, printType, isIntrospectionType } from 'graphql';
-import { buildOperationNodeForField } from '@graphql-tools/utils';
+import { buildOperationNodeForField, createGraphQLError } from '@graphql-tools/utils';
 import { paramCase } from 'param-case';
 import { crypto, fetch } from '@whatwg-node/fetch';
 import colors from 'ansi-colors';
@@ -67,12 +67,12 @@ function resolveVariable({ value, type, schema, }) {
     }
 }
 
-var _a;
+var _a, _b;
 const levels = ['error', 'warn', 'info', 'debug'];
 const toLevel = (string) => levels.includes(string) ? string : null;
-const currentLevel = process.env.SOFA_DEBUG
+const currentLevel = ((_a = globalThis.process) === null || _a === void 0 ? void 0 : _a.env.SOFA_DEBUG)
     ? 'debug'
-    : (_a = toLevel(process.env.SOFA_LOGGER_LEVEL)) !== null && _a !== void 0 ? _a : 'info';
+    : (_b = toLevel(process.env.SOFA_LOGGER_LEVEL)) !== null && _b !== void 0 ? _b : 'info';
 const log = (level, color, args) => {
     if (levels.indexOf(level) <= levels.indexOf(currentLevel)) {
         console.log(`${color(level)}:`, ...args);
@@ -269,6 +269,34 @@ class SubscriptionManager {
     }
 }
 
+const defaultErrorHandler = (errors) => {
+    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);
+            }
+            delete error.extensions.http;
+        }
+    }
+    if (!status) {
+        status = 500;
+    }
+    return new Response(JSON.stringify({ errors }), {
+        status,
+        headers,
+    });
+};
 function createRouter(sofa) {
     logger.debug('[Sofa] Creating router');
     const router = createRouter$1({
@@ -445,82 +473,79 @@ function createMutationRoute({ sofa, router, fieldName, }) {
 function useHandler(config) {
     const { sofa, operation, fieldName } = config;
     const info = config.info;
+    const errorHandler = sofa.errorHandler || defaultErrorHandler;
     return (request, serverContext) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        let body = {};
-        if (request.body != null) {
-            const strBody = yield request.text();
-            if (strBody) {
-                body = JSON.parse(strBody);
+        var _a, _b;
+        try {
+            let body = {};
+            if (request.body != null) {
+                const strBody = yield request.text();
+                if (strBody) {
+                    try {
+                        body = JSON.parse(strBody);
+                    }
+                    catch (error) {
+                        throw createGraphQLError('POST body sent invalid JSON.', {
+                            extensions: {
+                                http: {
+                                    status: 400,
+                                }
+                            }
+                        });
+                    }
+                }
             }
-        }
-        const variableValues = info.variables.reduce((variables, variable) => {
-            const name = variable.variable.name.value;
-            const value = parseVariable({
-                value: pickParam({
-                    url: request.url,
-                    body,
-                    params: request.params || {},
-                    name,
-                }),
-                variable,
-                schema: sofa.schema,
-            });
-            if (typeof value === 'undefined') {
-                return variables;
+            let variableValues = {};
+            try {
+                variableValues = info.variables.reduce((variables, variable) => {
+                    const name = variable.variable.name.value;
+                    const value = parseVariable({
+                        value: pickParam({
+                            url: request.url,
+                            body,
+                            params: request.params || {},
+                            name,
+                        }),
+                        variable,
+                        schema: sofa.schema,
+                    });
+                    if (typeof value === 'undefined') {
+                        return variables;
+                    }
+                    return Object.assign(Object.assign({}, variables), { [name]: value });
+                }, {});
             }
-            return Object.assign(Object.assign({}, variables), { [name]: value });
-        }, {});
-        const sofaServerContext = Object.assign(Object.assign({}, serverContext), { request });
-        const contextValue = yield sofa.contextFactory(sofaServerContext);
-        const result = yield sofa.execute({
-            schema: sofa.schema,
-            document: operation,
-            contextValue,
-            variableValues,
-            operationName: info.operation.name && info.operation.name.value,
-        });
-        if (result.errors) {
-            const defaultErrorHandler = (errors) => {
-                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);
+            catch (error) {
+                throw createGraphQLError(error.message || ((_a = error.toString) === null || _a === void 0 ? void 0 : _a.call(error)) || error, {
+                    extensions: {
+                        http: {
+                            status: 400,
                         }
                     }
-                }
-                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;
-            return errorHandler(result.errors);
+            }
+            const sofaServerContext = Object.assign(Object.assign({}, serverContext), { request });
+            const contextValue = yield sofa.contextFactory(sofaServerContext);
+            const result = yield sofa.execute({
+                schema: sofa.schema,
+                document: operation,
+                contextValue,
+                variableValues,
+                operationName: info.operation.name && info.operation.name.value,
+            });
+            if (result.errors) {
+                return errorHandler(result.errors);
+            }
+            return new Response(JSON.stringify((_b = result.data) === null || _b === void 0 ? void 0 : _b[fieldName]), {
+                status: config.route.responseStatus,
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+            });
+        }
+        catch (error) {
+            return errorHandler([error]);
         }
-        return new Response(JSON.stringify((_a = result.data) === null || _a === void 0 ? void 0 : _a[fieldName]), {
-            status: config.route.responseStatus,
-            headers: {
-                'Content-Type': 'application/json',
-            },
-        });
     });
 }
 function getPath(fieldName, hasId = false) {
@@ -647,6 +672,16 @@ function mapToPrimitive(type) {
 }
 function mapToRef(type) {
     return `#/components/schemas/${type}`;
+}
+function normalizePathParamForOpenAPI(path) {
+    const pathParts = path.split('/');
+    const normalizedPathParts = pathParts.map((part) => {
+        if (part.startsWith(':')) {
+            return `{${part.slice(1)}}`;
+        }
+        return part;
+    });
+    return normalizedPathParts.join('/');
 }
 
 function buildSchemaObjectFromType(type, opts) {
@@ -881,7 +916,7 @@ function OpenAPI({ schema, info, servers, components, security, tags, customScal
         addRoute(info, config) {
             const basePath = (config === null || config === void 0 ? void 0 : config.basePath) || '';
             const path = basePath +
-                info.path.replace(/\:[a-z0-9]+\w/i, (param) => `{${param.replace(':', '')}}`);
+                normalizePathParamForOpenAPI(info.path);
             if (!swagger.paths[path]) {
                 swagger.paths[path] = {};
             }

package/open-api/utils.d.ts

@@ -1,2 +1,3 @@
 export declare function mapToPrimitive(type: string): any;
 export declare function mapToRef(type: string): string;
+export declare function normalizePathParamForOpenAPI(path: string): string;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "sofa-api",
-  "version": "0.15.5",
+  "version": "0.16.1",
   "description": "Create REST APIs with GraphQL",
   "sideEffects": false,
   "peerDependencies": {
-    "graphql": "^0.13.2 || ^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^15.0.0 || ^16.0.0"
   },
   "dependencies": {
     "@graphql-tools/utils": "9.1.4",
@@ -14,7 +14,7 @@
     "openapi-types": "12.1.0",
     "param-case": "3.0.4",
     "title-case": "3.0.3",
-    "tslib": "2.4.1"
+    "tslib": "2.5.0"
   },
   "repository": {
     "type": "git",