@middy/http-event-normalizer 2.5.2 → 3.0.0-alpha.1

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,30 +1,22 @@
-"use strict";
-
-const defaults = {
-  payloadFormatVersion: 1
-};
-
-const httpEventNormalizerMiddleware = (opts = {}) => {
-  const options = { ...defaults,
-    ...opts
-  };
-
+const httpEventNormalizerMiddleware = () => {
   const httpEventNormalizerMiddlewareBefore = async request => {
+    var _isVersionHttpEvent$v;
+
     const {
       event
     } = request;
+    const version = event.version ?? '1.0';
+    const isHttpEvent = (_isVersionHttpEvent$v = isVersionHttpEvent[version]) === null || _isVersionHttpEvent$v === void 0 ? void 0 : _isVersionHttpEvent$v.call(isVersionHttpEvent, event);
 
-    if (isHttpEvent(options.payloadFormatVersion, event)) {
-      var _event$queryStringPar, _event$pathParameters;
-
-      event.queryStringParameters = (_event$queryStringPar = event.queryStringParameters) !== null && _event$queryStringPar !== void 0 ? _event$queryStringPar : {};
-      event.pathParameters = (_event$pathParameters = event.pathParameters) !== null && _event$pathParameters !== void 0 ? _event$pathParameters : {};
+    if (!isHttpEvent) {
+      throw new Error('Unknown API Gateway Payload format');
+    }
 
-      if (options.payloadFormatVersion === 1) {
-        var _event$multiValueQuer;
+    event.queryStringParameters ?? (event.queryStringParameters = {});
+    event.pathParameters ?? (event.pathParameters = {});
 
-        event.multiValueQueryStringParameters = (_event$multiValueQuer = event.multiValueQueryStringParameters) !== null && _event$multiValueQuer !== void 0 ? _event$multiValueQuer : {};
-      }
+    if (version === '1.0') {
+      event.multiValueQueryStringParameters ?? (event.multiValueQueryStringParameters = {});
     }
   };
 
@@ -33,14 +25,12 @@ 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');
-  }
+const isVersionHttpEvent = {
+  '1.0': event => event.httpMethod !== undefined,
+  '2.0': event => {
+    var _event$requestContext, _event$requestContext2;
 
-  throw new Error('Unknown API Gateway Payload format. Please use value 1 or 2.');
+    return ((_event$requestContext = event.requestContext) === null || _event$requestContext === void 0 ? void 0 : (_event$requestContext2 = _event$requestContext.http) === null || _event$requestContext2 === void 0 ? void 0 : _event$requestContext2.method) !== undefined;
+  }
 };
-
-module.exports = httpEventNormalizerMiddleware;
+export default httpEventNormalizerMiddleware;

package/package.json

@@ -1,18 +1,19 @@
 {
   "name": "@middy/http-event-normalizer",
-  "version": "2.5.2",
+  "version": "3.0.0-alpha.1",
   "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": {
@@ -45,8 +46,8 @@
     "url": "https://github.com/middyjs/middy/issues"
   },
   "homepage": "https://github.com/middyjs/middy#readme",
-  "gitHead": "a2bb757a7a13638ae64277f8eecfcf11c1af17d4",
+  "gitHead": "a14125c6b2e21b181824f9985a919a47f1e4711f",
   "devDependencies": {
-    "@middy/core": "^2.5.2"
+    "@middy/core": "^3.0.0-alpha.1"
   }
 }