@middy/http-response-serializer 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,59 +1,70 @@
-import { normalizeHttpResponse } from '@middy/util';
-import Accept from '@hapi/accept';
+import { normalizeHttpResponse } from '@middy/util'
+import Accept from '@hapi/accept'
+
 const defaults = {
-    serializers: [],
-    defaultContentType: undefined
-};
-const httpResponseSerializerMiddleware = (opts = {})=>{
-    const { serializers , defaultContentType  } = {
-        ...defaults,
-        ...opts
-    };
-    const httpResponseSerializerMiddlewareAfter = async (request)=>{
-        normalizeHttpResponse(request);
-        if (request.response.headers['Content-Type'] ?? request.response.headers['content-type']) {
-            return;
+  serializers: [],
+  defaultContentType: undefined
+}
+
+const httpResponseSerializerMiddleware = (opts = {}) => {
+  const { serializers, defaultContentType } = { ...defaults, ...opts }
+  const httpResponseSerializerMiddlewareAfter = async (request) => {
+    normalizeHttpResponse(request)
+
+    // skip serialization when Content-Type or content-type is already set
+    if (
+      request.response.headers['Content-Type'] ??
+      request.response.headers['content-type']
+    ) {
+      return
+    }
+
+    // find accept value(s)
+    let types
+
+    if (request.event.requiredContentType) {
+      types = [request.event.requiredContentType]
+    } else {
+      const acceptHeader =
+        request.event.headers.Accept ?? request.event.headers.accept
+      types = [
+        ...((acceptHeader && Accept.mediaTypes(acceptHeader)) ?? []),
+        request.event.preferredContentType,
+        defaultContentType
+      ]
+    }
+
+    for (const type of types) {
+      let breakTypes
+      for (const s of serializers) {
+        if (!s.regex.test(type)) {
+          continue
         }
-        let types;
-        if (request.event.requiredContentType) {
-            types = [
-                request.event.requiredContentType
-            ];
+
+        request.response.headers['Content-Type'] = type
+        const result = s.serializer(request.response)
+        if (typeof result === 'object' && 'body' in result) {
+          request.response = result
         } else {
-            const acceptHeader = request.event.headers.Accept ?? request.event.headers.accept;
-            types = [
-                ...(acceptHeader && Accept.mediaTypes(acceptHeader)) ?? [],
-                request.event.preferredContentType,
-                defaultContentType
-            ];
-        }
-        for (const type of types){
-            let breakTypes;
-            for (const s of serializers){
-                if (!s.regex.test(type)) {
-                    continue;
-                }
-                request.response.headers['Content-Type'] = type;
-                const result = s.serializer(request.response);
-                if (typeof result === 'object' && 'body' in result) {
-                    request.response = result;
-                } else {
-                    request.response.body = result;
-                }
-                breakTypes = true;
-                break;
-            }
-            if (breakTypes) break;
+          // otherwise only replace the body attribute
+          request.response.body = result
         }
-    };
-    const httpResponseSerializerMiddlewareOnError = async (request)=>{
-        if (request.response === undefined) return;
-        return httpResponseSerializerMiddlewareAfter(request);
-    };
-    return {
-        after: httpResponseSerializerMiddlewareAfter,
-        onError: httpResponseSerializerMiddlewareOnError
-    };
-};
-export default httpResponseSerializerMiddleware;
 
+        breakTypes = true
+        break
+      }
+      if (breakTypes) break
+    }
+  }
+
+  const httpResponseSerializerMiddlewareOnError = async (request) => {
+    if (request.response === undefined) return
+    await httpResponseSerializerMiddlewareAfter(request)
+  }
+  return {
+    after: httpResponseSerializerMiddlewareAfter,
+    onError: httpResponseSerializerMiddlewareOnError
+  }
+}
+
+export default httpResponseSerializerMiddleware

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/http-response-serializer",
-  "version": "5.0.0-alpha.0",
+  "version": "5.0.0-alpha.1",
   "description": "The Http Serializer middleware lets you define serialization mechanisms based on the current content negotiation.",
   "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": {
@@ -69,11 +63,11 @@
     "url": "https://github.com/sponsors/willfarrell"
   },
   "dependencies": {
-    "@hapi/accept": "6.0.1",
-    "@middy/util": "5.0.0-alpha.0"
+    "@hapi/accept": "6.0.2",
+    "@middy/util": "5.0.0-alpha.1"
   },
   "devDependencies": {
-    "@middy/core": "5.0.0-alpha.0"
+    "@middy/core": "5.0.0-alpha.1"
   },
-  "gitHead": "08c35e3dba9efdad0b86666ce206ce302cc65d07"
+  "gitHead": "ebce8d5df8783077fa49ba62ee9be20e8486a7f1"
 }

package/index.cjs

@@ -1,72 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(module, "exports", {
-    enumerable: true,
-    get: ()=>_default
-});
-const _util = require("@middy/util");
-const _accept = _interopRequireDefault(require("@hapi/accept"));
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-const defaults = {
-    serializers: [],
-    defaultContentType: undefined
-};
-const httpResponseSerializerMiddleware = (opts = {})=>{
-    const { serializers , defaultContentType  } = {
-        ...defaults,
-        ...opts
-    };
-    const httpResponseSerializerMiddlewareAfter = async (request)=>{
-        (0, _util.normalizeHttpResponse)(request);
-        if (request.response.headers['Content-Type'] ?? request.response.headers['content-type']) {
-            return;
-        }
-        let types;
-        if (request.event.requiredContentType) {
-            types = [
-                request.event.requiredContentType
-            ];
-        } else {
-            const acceptHeader = request.event.headers.Accept ?? request.event.headers.accept;
-            types = [
-                ...(acceptHeader && _accept.default.mediaTypes(acceptHeader)) ?? [],
-                request.event.preferredContentType,
-                defaultContentType
-            ];
-        }
-        for (const type of types){
-            let breakTypes;
-            for (const s of serializers){
-                if (!s.regex.test(type)) {
-                    continue;
-                }
-                request.response.headers['Content-Type'] = type;
-                const result = s.serializer(request.response);
-                if (typeof result === 'object' && 'body' in result) {
-                    request.response = result;
-                } else {
-                    request.response.body = result;
-                }
-                breakTypes = true;
-                break;
-            }
-            if (breakTypes) break;
-        }
-    };
-    const httpResponseSerializerMiddlewareOnError = async (request)=>{
-        if (request.response === undefined) return;
-        return httpResponseSerializerMiddlewareAfter(request);
-    };
-    return {
-        after: httpResponseSerializerMiddlewareAfter,
-        onError: httpResponseSerializerMiddlewareOnError
-    };
-};
-const _default = httpResponseSerializerMiddleware;
-