@middy/http-response-serializer 2.5.3 → 3.0.0-alpha.2

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

@@ -61,7 +61,7 @@ The middleware is configured by defining some `serializers`.
 }
 ```
 
-The `default` (optional) option is used if the request and handler don't specify what type is wanted.
+The `defaultContentType` (optional) option is used if the request and handler don't specify what type is wanted.
 
 
 ## Serializer Functions
@@ -84,7 +84,7 @@ The content type is determined in the following order:
  * `event.requiredContentType` -- allows the handler to override everything else
  * The `Accept` header via [accept](https://www.npmjs.com/package/accept)
  * `event.preferredContentType` -- allows the handler to override the default, but lets the request ask first
- * `default` middleware configuration
+ * `defaultContentType` middleware option
 
 All options allow for multiple types to be specified in your order of preference, and the first matching serializer will be executed.
 
@@ -120,7 +120,7 @@ handler
         serializer: ({ body }) => body
       }
     ],
-    default: 'application/json'
+    defaultContentType: 'application/json'
   }))
 
 const event = {
@@ -147,7 +147,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.d.ts

@@ -7,7 +7,7 @@ interface SerializerHandler {
 
 interface Options {
   serializers: SerializerHandler[]
-  default?: string
+  defaultContentType?: string
 }
 
 declare function httpResponseSerializer (options?: Options): middy.MiddlewareObj

package/index.js

@@ -1,47 +1,34 @@
-"use strict";
-
-const {
-  normalizeHttpResponse
-} = require('@middy/util');
-
-const Accept = require('@hapi/accept');
-
+import { normalizeHttpResponse } from '@middy/util';
+import Accept from '@hapi/accept';
 const defaults = {
   serializers: [],
-  default: undefined
+  defaultContentType: undefined
 };
 
 const httpResponseSerializerMiddleware = (opts = {}) => {
-  const options = { ...defaults,
+  const {
+    serializers,
+    defaultContentType
+  } = { ...defaults,
     ...opts
   };
 
   const httpResponseSerializerMiddlewareAfter = async request => {
-    var _request$event;
-
-    if (request.response === undefined) return;
-    request.response = normalizeHttpResponse(request.response); // skip serialization when content-type is already set
-
-    if (request.response.headers['Content-Type'] || request.response.headers['content-type']) {
-      return;
-    } // find accept value(s)
-
-
+    normalizeHttpResponse(request);
+    if (request.response.headers['Content-Type']) return;
     let types;
 
-    if ((_request$event = request.event) !== null && _request$event !== void 0 && _request$event.requiredContentType) {
+    if (request.event.requiredContentType) {
       types = [request.event.requiredContentType];
     } else {
-      var _request$event$header, _request$event2, _request$event2$heade, _request$event3, _request$event3$heade, _ref;
-
-      const acceptHeader = (_request$event$header = (_request$event2 = request.event) === null || _request$event2 === void 0 ? void 0 : (_request$event2$heade = _request$event2.headers) === null || _request$event2$heade === void 0 ? void 0 : _request$event2$heade.accept) !== null && _request$event$header !== void 0 ? _request$event$header : (_request$event3 = request.event) === null || _request$event3 === void 0 ? void 0 : (_request$event3$heade = _request$event3.headers) === null || _request$event3$heade === void 0 ? void 0 : _request$event3$heade.Accept;
-      types = [...((_ref = acceptHeader && Accept.mediaTypes(acceptHeader)) !== null && _ref !== void 0 ? _ref : []), request.event.preferredContentType, options.default];
+      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 options.serializers) {
+      for (const s of serializers) {
         if (!s.regex.test(type)) {
           continue;
         }
@@ -52,7 +39,6 @@ const httpResponseSerializerMiddleware = (opts = {}) => {
         if (typeof result === 'object' && 'body' in result) {
           request.response = result;
         } else {
-          // otherwise only replace the body attribute
           request.response.body = result;
         }
 
@@ -64,11 +50,15 @@ const httpResponseSerializerMiddleware = (opts = {}) => {
     }
   };
 
-  const httpResponseSerializerMiddlewareOnError = httpResponseSerializerMiddlewareAfter;
+  const httpResponseSerializerMiddlewareOnError = async request => {
+    if (request.response === undefined) return;
+    return httpResponseSerializerMiddlewareAfter(request);
+  };
+
   return {
     after: httpResponseSerializerMiddlewareAfter,
     onError: httpResponseSerializerMiddlewareOnError
   };
 };
 
-module.exports = httpResponseSerializerMiddleware;
+export default httpResponseSerializerMiddleware;

package/package.json

@@ -1,18 +1,19 @@
 {
   "name": "@middy/http-response-serializer",
-  "version": "2.5.3",
+  "version": "3.0.0-alpha.2",
   "description": "The Http Serializer middleware lets you define serialization mechanisms based on the current content negotiation.",
-  "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": {
@@ -50,11 +51,10 @@
   "homepage": "https://github.com/middyjs/middy#readme",
   "dependencies": {
     "@hapi/accept": "5.0.2",
-    "@middy/util": "^2.5.3"
+    "@middy/util": "^3.0.0-alpha.2"
   },
   "devDependencies": {
-    "@middy/core": "^2.5.3",
-    "http-errors": "^1.8.0"
+    "@middy/core": "^3.0.0-alpha.2"
   },
-  "gitHead": "690884d43b9cd632aeca9a5eba1612160b987cd4"
+  "gitHead": "de30419273ecbff08f367f47c7e320ec981cf145"
 }