@middy/http-response-serializer 5.1.0 → 5.2.0

package/index.js

@@ -1,56 +1,67 @@
-import { normalizeHttpResponse } from '@middy/util';
+import { normalizeHttpResponse } from '@middy/util'
+
 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
+
+    // TODO deprecate `requiredContentType` in v6
+    if (request.event.requiredContentType) {
+      types = [request.event.requiredContentType]
+    } else {
+      types = [
+        ...(request.context.preferredMediaTypes ?? []), // from @middy/http-content-negotiation
+        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 {
-            types = [
-                ...request.context.preferredMediaTypes ?? [],
-                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;
-        await 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.1.0",
+  "version": "5.2.0",
   "description": "The Http Serializer middleware lets you define serialization mechanisms based on the current content negotiation.",
   "type": "module",
   "engines": {
@@ -63,10 +63,10 @@
     "url": "https://github.com/sponsors/willfarrell"
   },
   "dependencies": {
-    "@middy/util": "5.1.0"
+    "@middy/util": "5.2.0"
   },
   "devDependencies": {
-    "@middy/core": "5.1.0"
+    "@middy/core": "5.2.0"
   },
-  "gitHead": "bbdaf5843914921804ba085dd58117273febe6b5"
+  "gitHead": "2d9096a49cd8fb62359517be96d6c93609df41f0"
 }