@middy/http-json-body-parser 4.6.5 → 5.0.0-alpha.1

package/index.d.ts

@@ -1,5 +1,5 @@
 import middy from '@middy/core'
-import { APIGatewayEvent } from 'aws-lambda'
+import { APIGatewayEvent, APIGatewayProxyEventV2 } from 'aws-lambda'
 import { JsonValue } from 'type-fest'
 
 interface Options {
@@ -7,13 +7,15 @@ interface Options {
   disableContentTypeError?: boolean
 }
 
-export type Event = Omit<APIGatewayEvent, 'body'> & {
+type VersionedApiGatewayEvent = APIGatewayEvent | APIGatewayProxyEventV2
+
+export type Event<APIGatewayEventType extends VersionedApiGatewayEvent = VersionedApiGatewayEvent> = Omit<APIGatewayEventType, 'body'> & {
   /**
    * The body of the HTTP request.
    */
   body: JsonValue
 }
 
-declare function jsonBodyParser (options?: Options): middy.MiddlewareObj<Event>
+declare function jsonBodyParser<APIGatewayEventType extends VersionedApiGatewayEvent = VersionedApiGatewayEvent> (options?: Options): middy.MiddlewareObj<Event<APIGatewayEventType>>
 
 export default jsonBodyParser

package/index.js

@@ -1,38 +1,44 @@
-import { createError } from '@middy/util';
-const mimePattern = /^application\/(.+\+)?json($|;.+)/;
+import { createError } from '@middy/util'
+
+const mimePattern = /^application\/(.+\+)?json($|;.+)/
+
 const defaults = {
-    reviver: undefined,
-    disableContentTypeError: true
-};
-const httpJsonBodyParserMiddleware = (opts = {})=>{
-    const options = {
-        ...defaults,
-        ...opts
-    };
-    const httpJsonBodyParserMiddlewareBefore = async (request)=>{
-        const { headers, body } = request.event;
-        const contentType = headers?.['Content-Type'] ?? headers?.['content-type'];
-        if (!mimePattern.test(contentType)) {
-            if (options.disableContentTypeError) {
-                return;
-            }
-            throw createError(415, 'Unsupported Media Type', {
-                cause: contentType
-            });
-        }
-        try {
-            const data = request.event.isBase64Encoded ? Buffer.from(body, 'base64').toString() : body;
-            request.event.body = JSON.parse(data, options.reviver);
-        } catch (cause) {
-            // UnprocessableEntity
-            throw createError(415, 'Invalid or malformed JSON was provided', {
-                cause
-            });
-        }
-    };
-    return {
-        before: httpJsonBodyParserMiddlewareBefore
-    };
-};
-export default httpJsonBodyParserMiddleware;
+  reviver: undefined,
+  disableContentTypeError: false
+}
+
+const httpJsonBodyParserMiddleware = (opts = {}) => {
+  const options = { ...defaults, ...opts }
+  const httpJsonBodyParserMiddlewareBefore = async (request) => {
+    const { headers, body } = request.event
+
+    const contentType = headers?.['Content-Type'] ?? headers?.['content-type']
+
+    if (!mimePattern.test(contentType)) {
+      if (options.disableContentTypeError) {
+        return
+      }
+      throw createError(415, 'Unsupported Media Type', {
+        cause: { package: '@middy/http-json-body-parser', data: contentType }
+      })
+    }
+
+    try {
+      const data = request.event.isBase64Encoded
+        ? Buffer.from(body, 'base64').toString()
+        : body
+
+      request.event.body = JSON.parse(data, options.reviver)
+    } catch (err) {
+      // UnprocessableEntity
+      throw createError(415, 'Invalid or malformed JSON was provided', {
+        cause: { package: '@middy/http-json-body-parser', data: err }
+      })
+    }
+  }
 
+  return {
+    before: httpJsonBodyParserMiddlewareBefore
+  }
+}
+export default httpJsonBodyParserMiddleware

package/package.json

@@ -1,33 +1,27 @@
 {
   "name": "@middy/http-json-body-parser",
-  "version": "4.6.5",
+  "version": "5.0.0-alpha.1",
   "description": "Http JSON body parser middleware for the middy framework",
   "type": "module",
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "engineStrict": true,
   "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": {
@@ -68,12 +62,12 @@
     "url": "https://github.com/sponsors/willfarrell"
   },
   "dependencies": {
-    "@middy/util": "4.6.5"
+    "@middy/util": "5.0.0-alpha.1"
   },
   "devDependencies": {
-    "@middy/core": "4.6.5",
+    "@middy/core": "5.0.0-alpha.1",
     "@types/aws-lambda": "^8.10.101",
     "type-fest": "^4.0.0"
   },
-  "gitHead": "573d7b0bb243d8c5a9bcb00cf29d031aa7a0c606"
+  "gitHead": "ebce8d5df8783077fa49ba62ee9be20e8486a7f1"
 }

package/index.cjs

@@ -1,48 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(module, "exports", {
-    enumerable: true,
-    get: function() {
-        return _default;
-    }
-});
-const _util = require("@middy/util");
-const mimePattern = /^application\/(.+\+)?json($|;.+)/;
-const defaults = {
-    reviver: undefined,
-    disableContentTypeError: true
-};
-const httpJsonBodyParserMiddleware = (opts = {})=>{
-    const options = {
-        ...defaults,
-        ...opts
-    };
-    const httpJsonBodyParserMiddlewareBefore = async (request)=>{
-        const { headers, body } = request.event;
-        const contentType = headers?.['Content-Type'] ?? headers?.['content-type'];
-        if (!mimePattern.test(contentType)) {
-            if (options.disableContentTypeError) {
-                return;
-            }
-            throw (0, _util.createError)(415, 'Unsupported Media Type', {
-                cause: contentType
-            });
-        }
-        try {
-            const data = request.event.isBase64Encoded ? Buffer.from(body, 'base64').toString() : body;
-            request.event.body = JSON.parse(data, options.reviver);
-        } catch (cause) {
-            // UnprocessableEntity
-            throw (0, _util.createError)(415, 'Invalid or malformed JSON was provided', {
-                cause
-            });
-        }
-    };
-    return {
-        before: httpJsonBodyParserMiddlewareBefore
-    };
-};
-const _default = httpJsonBodyParserMiddleware;
-