@middy/http-json-body-parser 5.0.0-alpha.0 → 5.0.0-alpha.2

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.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

@@ -2,7 +2,7 @@ import { createError } from '@middy/util';
 const mimePattern = /^application\/(.+\+)?json($|;.+)/;
 const defaults = {
     reviver: undefined,
-    disableContentTypeError: true
+    disableContentTypeError: false
 };
 const httpJsonBodyParserMiddleware = (opts = {})=>{
     const options = {
@@ -10,22 +10,29 @@ const httpJsonBodyParserMiddleware = (opts = {})=>{
         ...opts
     };
     const httpJsonBodyParserMiddlewareBefore = async (request)=>{
-        const { headers , body  } = request.event;
-        const contentType = headers['Content-Type'] ?? headers['content-type'];
+        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
+                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 (cause) {
+        } catch (err) {
+            // UnprocessableEntity
             throw createError(415, 'Invalid or malformed JSON was provided', {
-                cause
+                cause: {
+                    package: '@middy/http-json-body-parser',
+                    data: err
+                }
             });
         }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/http-json-body-parser",
-  "version": "5.0.0-alpha.0",
+  "version": "5.0.0-alpha.2",
   "description": "Http JSON body parser 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": {
@@ -68,12 +62,12 @@
     "url": "https://github.com/sponsors/willfarrell"
   },
   "dependencies": {
-    "@middy/util": "5.0.0-alpha.0"
+    "@middy/util": "5.0.0-alpha.2"
   },
   "devDependencies": {
-    "@middy/core": "5.0.0-alpha.0",
+    "@middy/core": "5.0.0-alpha.2",
     "@types/aws-lambda": "^8.10.101",
-    "type-fest": "^3.0.0"
+    "type-fest": "^4.0.0"
   },
-  "gitHead": "08c35e3dba9efdad0b86666ce206ce302cc65d07"
+  "gitHead": "ebce8d5df8783077fa49ba62ee9be20e8486a7f1"
 }

package/index.cjs

@@ -1,45 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(module, "exports", {
-    enumerable: true,
-    get: ()=>_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) {
-            throw (0, _util.createError)(415, 'Invalid or malformed JSON was provided', {
-                cause
-            });
-        }
-    };
-    return {
-        before: httpJsonBodyParserMiddlewareBefore
-    };
-};
-const _default = httpJsonBodyParserMiddleware;
-