@middy/http-error-handler 2.5.6 → 3.0.0-alpha.3

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
@@ -54,7 +54,7 @@ import middy from '@middy/core'
 import httpErrorHandler from '@middy/http-error-handler'
 
 const handler = middy((event, context) => {
-  throw createError(422)
+  throw new createError.UnprocessableEntity()
 })
 
 handler
@@ -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,4 +1,4 @@
-const { jsonSafeParse, normalizeHttpResponse } = require('@middy/util')
+import { jsonSafeParse, normalizeHttpResponse } from '@middy/util'
 
 const defaults = {
   logger: console.error,
@@ -9,19 +9,20 @@ const httpErrorHandlerMiddleware = (opts = {}) => {
   const options = { ...defaults, ...opts }
 
   const httpErrorHandlerMiddlewareOnError = async (request) => {
+    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?.statusCode && request.error?.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.error?.statusCode || !request.error?.expose)
+      (!request.error.statusCode || !request.error.expose)
     ) {
       request.error = {
         statusCode: 500,
@@ -30,16 +31,20 @@ const httpErrorHandlerMiddleware = (opts = {}) => {
       }
     }
 
-    if (request.error?.expose) {
-      request.response = normalizeHttpResponse(request.response)
-      request.response.statusCode = request.error?.statusCode
-      request.response.body = request.error?.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'
+        }
+      }
     }
   }
 
@@ -47,4 +52,4 @@ const httpErrorHandlerMiddleware = (opts = {}) => {
     onError: httpErrorHandlerMiddlewareOnError
   }
 }
-module.exports = httpErrorHandlerMiddleware
+export default httpErrorHandlerMiddleware

package/package.json

@@ -1,23 +1,25 @@
 {
   "name": "@middy/http-error-handler",
-  "version": "2.5.6",
+  "version": "3.0.0-alpha.3",
   "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": {
     "test": "npm run test:unit",
-    "test:unit": "ava"
+    "test:unit": "ava",
+    "test:benchmark": "node __benchmarks__/index.js"
   },
   "license": "MIT",
   "keywords": [
@@ -47,12 +49,12 @@
   },
   "homepage": "https://github.com/middyjs/middy#readme",
   "dependencies": {
-    "@middy/util": "^2.5.6"
+    "@middy/util": "^3.0.0-alpha.3"
   },
   "devDependencies": {
-    "@middy/core": "^2.5.6",
+    "@middy/core": "^3.0.0-alpha.3",
     "@types/http-errors": "^1.8.0",
-    "@types/node": "^16.0.0"
+    "@types/node": "^17.0.0"
   },
-  "gitHead": "0c789f55b4adf691f977b0d9904d1a805bb3bb2b"
+  "gitHead": "1441158711580313765e6d156046ef0fade0d156"
 }