@middy/http-event-normalizer 2.5.6 → 3.0.0-alpha.3

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

@@ -54,7 +54,7 @@ npm install --save @middy/http-event-normalizer
 
 ## Options
 
-- payloadFormatVersion (number) (optional): Defaults to `1 `. Set it to `2` to use API Gateway HTTP API v2.0 event payload (https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html).
+- payloadFormatVersion (number) (optional): Defaults to `1 ` for API Gateway REST API v1 or Application Load Balancer (ALB) event payload. Set it to `2` to use API Gateway HTTP API v2 event payload.
 
 
 ## Sample usage
@@ -84,7 +84,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

@@ -1,9 +1,5 @@
 import middy from '@middy/core'
 
-interface Options {
-  payloadFormatVersion?: 1 | 2
-}
-
-declare function httpEventNormalizer (options?: Options): middy.MiddlewareObj
+declare function httpEventNormalizer (): middy.MiddlewareObj
 
 export default httpEventNormalizer

package/index.js

@@ -1,20 +1,18 @@
-const defaults = {
-  payloadFormatVersion: 1
-}
-
-const httpEventNormalizerMiddleware = (opts = {}) => {
-  const options = { ...defaults, ...opts }
-
+const httpEventNormalizerMiddleware = () => {
   const httpEventNormalizerMiddlewareBefore = async (request) => {
     const { event } = request
 
-    if (isHttpEvent(options.payloadFormatVersion, event)) {
-      event.queryStringParameters = event.queryStringParameters ?? {}
-      event.pathParameters = event.pathParameters ?? {}
-      if (options.payloadFormatVersion === 1) {
-        event.multiValueQueryStringParameters =
-          event.multiValueQueryStringParameters ?? {}
-      }
+    const version = event.version ?? '1.0'
+    const isHttpEvent = isVersionHttpEvent[version]?.(event)
+    if (!isHttpEvent) {
+      throw new Error('Unknown API Gateway Payload format')
+    }
+
+    // event.headers ??= {} // Will always have at least one header
+    event.queryStringParameters ??= {}
+    event.pathParameters ??= {}
+    if (version === '1.0') {
+      event.multiValueQueryStringParameters ??= {}
     }
   }
 
@@ -23,19 +21,9 @@ const httpEventNormalizerMiddleware = (opts = {}) => {
   }
 }
 
-const isHttpEvent = (payloadFormatVersion, event) => {
-  if (payloadFormatVersion === 1) {
-    return Object.prototype.hasOwnProperty.call(event, 'httpMethod')
-  } else if (payloadFormatVersion === 2) {
-    return (
-      Object.prototype.hasOwnProperty.call(event, 'requestContext') &&
-      Object.prototype.hasOwnProperty.call(event.requestContext, 'http') &&
-      Object.prototype.hasOwnProperty.call(event.requestContext.http, 'method')
-    )
-  }
-  throw new Error(
-    'Unknown API Gateway Payload format. Please use value 1 or 2.'
-  )
+const isVersionHttpEvent = {
+  '1.0': (event) => event.httpMethod !== undefined,
+  '2.0': (event) => event.requestContext.http.method !== undefined
 }
 
-module.exports = httpEventNormalizerMiddleware
+export default httpEventNormalizerMiddleware

package/package.json

@@ -1,23 +1,25 @@
 {
   "name": "@middy/http-event-normalizer",
-  "version": "2.5.6",
+  "version": "3.0.0-alpha.3",
   "description": "Http event normalizer middleware for the middy framework",
-  "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": {
     "test": "npm run test:unit",
-    "test:unit": "ava"
+    "test:unit": "ava",
+    "test:benchmark": "node __benchmarks__/index.js"
   },
   "license": "MIT",
   "keywords": [
@@ -45,8 +47,8 @@
     "url": "https://github.com/middyjs/middy/issues"
   },
   "homepage": "https://github.com/middyjs/middy#readme",
-  "gitHead": "0c789f55b4adf691f977b0d9904d1a805bb3bb2b",
+  "gitHead": "1441158711580313765e6d156046ef0fade0d156",
   "devDependencies": {
-    "@middy/core": "^2.5.6"
+    "@middy/core": "^3.0.0-alpha.3"
   }
 }