@middy/http-error-handler 2.5.2 → 3.0.0-alpha.1

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2021 Luciano Mammino, will Farrell and the [Middy team](https://github.com/middyjs/middy/graphs/contributors)
+Copyright (c) 2017-2022 Luciano Mammino, will Farrell and the [Middy team](https://github.com/middyjs/middy/graphs/contributors)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -44,7 +44,7 @@ npm install --save @middy/http-error-handler
 
 ## Options
 
-- `logger` (defaults to `console.error`) - a logging function that is invoked with the current error as an argument. You can pass `false` if you don't want the logging to happen.
+- `logger` function (defaults to `console.error`) - a logging function that is invoked with the current error as an argument. You can pass `false` if you don't want the logging to happen.
 - `fallbackMessage` (default to null) - When non-http errors occur you can catch them by setting a fallback message to be used. These will be returned with a 500 status code.
 
 ## Sample usage
@@ -82,7 +82,7 @@ Everyone is very welcome to contribute to this repository. Feel free to [raise i
 
 ## License
 
-Licensed under [MIT License](LICENSE). Copyright (c) 2017-2021 Luciano Mammino, will Farrell, and the [Middy team](https://github.com/middyjs/middy/graphs/contributors).
+Licensed under [MIT License](LICENSE). Copyright (c) 2017-2022 Luciano Mammino, will Farrell, and the [Middy team](https://github.com/middyjs/middy/graphs/contributors).
 
 <a href="https://app.fossa.io/projects/git%2Bgithub.com%2Fmiddyjs%2Fmiddy?ref=badge_large">
   <img src="https://app.fossa.io/api/projects/git%2Bgithub.com%2Fmiddyjs%2Fmiddy.svg?type=large" alt="FOSSA Status"  style="max-width:100%;">

package/index.js

@@ -1,10 +1,4 @@
-"use strict";
-
-const {
-  jsonSafeParse,
-  normalizeHttpResponse
-} = require('@middy/util');
-
+import { jsonSafeParse, normalizeHttpResponse } from '@middy/util';
 const defaults = {
   logger: console.error,
   fallbackMessage: null
@@ -16,19 +10,17 @@ const httpErrorHandlerMiddleware = (opts = {}) => {
   };
 
   const httpErrorHandlerMiddlewareOnError = async request => {
-    var _request$error, _request$error2, _request$error3, _request$error4, _request$error5;
+    if (request.response !== undefined) return;
 
     if (typeof options.logger === 'function') {
       options.logger(request.error);
-    } // Set default expose value, only passes in when there is an override
-
+    }
 
-    if ((_request$error = request.error) !== null && _request$error !== void 0 && _request$error.statusCode && ((_request$error2 = request.error) === null || _request$error2 === void 0 ? void 0 : _request$error2.expose) === undefined) {
+    if (request.error.statusCode && request.error.expose === undefined) {
       request.error.expose = request.error.statusCode < 500;
-    } // Non-http error OR expose set to false
-
+    }
 
-    if (options.fallbackMessage && (!((_request$error3 = request.error) !== null && _request$error3 !== void 0 && _request$error3.statusCode) || !((_request$error4 = request.error) !== null && _request$error4 !== void 0 && _request$error4.expose))) {
+    if (options.fallbackMessage && (!request.error.statusCode || !request.error.expose)) {
       request.error = {
         statusCode: 500,
         message: options.fallbackMessage,
@@ -36,14 +28,15 @@ const httpErrorHandlerMiddleware = (opts = {}) => {
       };
     }
 
-    if ((_request$error5 = request.error) !== null && _request$error5 !== void 0 && _request$error5.expose) {
-      var _request$error6, _request$error7;
-
-      request.response = normalizeHttpResponse(request.response);
-      request.response.statusCode = (_request$error6 = request.error) === null || _request$error6 === void 0 ? void 0 : _request$error6.statusCode;
-      request.response.body = (_request$error7 = request.error) === null || _request$error7 === void 0 ? void 0 : _request$error7.message;
-      request.response.headers['Content-Type'] = typeof jsonSafeParse(request.response.body) === 'string' ? 'text/plain' : 'application/json';
-      return request.response;
+    if (request.error.expose) {
+      normalizeHttpResponse(request);
+      request.response = { ...request.response,
+        statusCode: request.error.statusCode,
+        body: request.error.message,
+        headers: { ...request.response.headers,
+          'Content-Type': typeof jsonSafeParse(request.error.message) === 'string' ? 'text/plain' : 'application/json'
+        }
+      };
     }
   };
 
@@ -52,4 +45,4 @@ const httpErrorHandlerMiddleware = (opts = {}) => {
   };
 };
 
-module.exports = httpErrorHandlerMiddleware;
+export default httpErrorHandlerMiddleware;

package/package.json

@@ -1,18 +1,19 @@
 {
   "name": "@middy/http-error-handler",
-  "version": "2.5.2",
+  "version": "3.0.0-alpha.1",
   "description": "Http error handler middleware for the middy framework",
-  "type": "commonjs",
+  "type": "module",
   "engines": {
-    "node": ">=12"
+    "node": ">=14"
   },
   "engineStrict": true,
   "publishConfig": {
     "access": "public"
   },
-  "main": "index.js",
+  "exports": "./index.js",
   "types": "index.d.ts",
   "files": [
+    "index.js",
     "index.d.ts"
   ],
   "scripts": {
@@ -47,13 +48,12 @@
   },
   "homepage": "https://github.com/middyjs/middy#readme",
   "dependencies": {
-    "@middy/util": "^2.5.2"
+    "@middy/util": "^3.0.0-alpha.1"
   },
   "devDependencies": {
-    "@middy/core": "^2.5.2",
+    "@middy/core": "^3.0.0-alpha.1",
     "@types/http-errors": "^1.8.0",
-    "@types/node": "^16.0.0",
-    "http-errors": "^1.8.0"
+    "@types/node": "^17.0.0"
   },
-  "gitHead": "a2bb757a7a13638ae64277f8eecfcf11c1af17d4"
+  "gitHead": "a14125c6b2e21b181824f9985a919a47f1e4711f"
 }