@middy/http-error-handler 5.0.0-alpha.0 → 5.0.0-alpha.1

package/README.md

@@ -19,8 +19,9 @@
   <a href="https://snyk.io/test/github/middyjs/middy">
     <img src="https://snyk.io/test/github/middyjs/middy/badge.svg" alt="Known Vulnerabilities" data-canonical-src="https://snyk.io/test/github/middyjs/middy" style="max-width:100%;">
   </a>
-  <a href="https://lgtm.com/projects/g/middyjs/middy/context:javascript">
-    <img src="https://img.shields.io/lgtm/grade/javascript/g/middyjs/middy.svg?logo=lgtm&logoWidth=18" alt="Language grade: JavaScript" style="max-width:100%;">
+  <a href="https://github.com/middyjs/middy/actions/workflows/sast.yml">
+    <img src="https://github.com/middyjs/middy/actions/workflows/sast.yml/badge.svg
+?branch=main&event=push" alt="CodeQL" style="max-width:100%;">
   </a>
   <a href="https://bestpractices.coreinfrastructure.org/projects/5280">
     <img src="https://bestpractices.coreinfrastructure.org/projects/5280/badge" alt="Core Infrastructure Initiative (CII) Best Practices"  style="max-width:100%;">

package/index.js

@@ -1,46 +1,57 @@
-import { jsonSafeParse, normalizeHttpResponse } from '@middy/util';
+import { jsonSafeParse, normalizeHttpResponse } from '@middy/util'
+
 const defaults = {
-    logger: console.error,
-    fallbackMessage: null
-};
-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);
-        }
-        if (request.error.statusCode && request.error.expose === undefined) {
-            request.error.expose = request.error.statusCode < 500;
-        }
-        if (options.fallbackMessage && (!request.error.statusCode || !request.error.expose)) {
-            request.error = {
-                statusCode: 500,
-                message: options.fallbackMessage,
-                expose: true
-            };
-        }
-        if (request.error.expose) {
-            normalizeHttpResponse(request);
-            const { statusCode , message , headers  } = request.error;
-            request.response = {
-                ...request.response,
-                statusCode,
-                body: message,
-                headers: {
-                    ...headers,
-                    ...request.response.headers,
-                    'Content-Type': typeof jsonSafeParse(message) === 'string' ? 'text/plain' : 'application/json'
-                }
-            };
+  logger: console.error,
+  fallbackMessage: null
+}
+
+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) {
+      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: 500,
+        message: options.fallbackMessage,
+        expose: true
+      }
+    }
+
+    if (request.error.expose) {
+      normalizeHttpResponse(request)
+      const { statusCode, message, headers } = request.error
+      request.response = {
+        ...request.response,
+        statusCode,
+        body: message,
+        headers: {
+          ...headers,
+          ...request.response.headers,
+          'Content-Type':
+            typeof jsonSafeParse(message) === 'string'
+              ? 'text/plain'
+              : 'application/json'
         }
-    };
-    return {
-        onError: httpErrorHandlerMiddlewareOnError
-    };
-};
-export default httpErrorHandlerMiddleware;
+      }
+    }
+  }
 
+  return {
+    onError: httpErrorHandlerMiddlewareOnError
+  }
+}
+export default httpErrorHandlerMiddleware

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/http-error-handler",
-  "version": "5.0.0-alpha.0",
+  "version": "5.0.0-alpha.1",
   "description": "Http error handler middleware for the middy framework",
   "type": "module",
   "engines": {
@@ -10,24 +10,18 @@
   "publishConfig": {
     "access": "public"
   },
-  "main": "./index.cjs",
   "module": "./index.js",
   "exports": {
     ".": {
       "import": {
         "types": "./index.d.ts",
         "default": "./index.js"
-      },
-      "require": {
-        "types": "./index.d.ts",
-        "default": "./index.cjs"
       }
     }
   },
   "types": "index.d.ts",
   "files": [
     "index.js",
-    "index.cjs",
     "index.d.ts"
   ],
   "scripts": {
@@ -67,12 +61,12 @@
     "url": "https://github.com/sponsors/willfarrell"
   },
   "dependencies": {
-    "@middy/util": "5.0.0-alpha.0"
+    "@middy/util": "5.0.0-alpha.1"
   },
   "devDependencies": {
-    "@middy/core": "5.0.0-alpha.0",
+    "@middy/core": "5.0.0-alpha.1",
     "@types/http-errors": "^2.0.0",
-    "@types/node": "^18.0.0"
+    "@types/node": "^20.0.0"
   },
-  "gitHead": "08c35e3dba9efdad0b86666ce206ce302cc65d07"
+  "gitHead": "ebce8d5df8783077fa49ba62ee9be20e8486a7f1"
 }

package/index.cjs

@@ -1,54 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(module, "exports", {
-    enumerable: true,
-    get: ()=>_default
-});
-const _util = require("@middy/util");
-const defaults = {
-    logger: console.error,
-    fallbackMessage: null
-};
-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);
-        }
-        if (request.error.statusCode && request.error.expose === undefined) {
-            request.error.expose = request.error.statusCode < 500;
-        }
-        if (options.fallbackMessage && (!request.error.statusCode || !request.error.expose)) {
-            request.error = {
-                statusCode: 500,
-                message: options.fallbackMessage,
-                expose: true
-            };
-        }
-        if (request.error.expose) {
-            (0, _util.normalizeHttpResponse)(request);
-            const { statusCode , message , headers  } = request.error;
-            request.response = {
-                ...request.response,
-                statusCode,
-                body: message,
-                headers: {
-                    ...headers,
-                    ...request.response.headers,
-                    'Content-Type': typeof (0, _util.jsonSafeParse)(message) === 'string' ? 'text/plain' : 'application/json'
-                }
-            };
-        }
-    };
-    return {
-        onError: httpErrorHandlerMiddlewareOnError
-    };
-};
-const _default = httpErrorHandlerMiddleware;
-