@middy/http-cors 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.js

@@ -47,13 +47,13 @@ const httpCorsMiddleware = (opts = {})=>{
     };
     const httpCorsMiddlewareAfter = async (request)=>{
         normalizeHttpResponse(request);
-        const { headers  } = request.response;
+        const { headers } = request.response;
         modifyHeaders(headers, options, request);
         request.response.headers = headers;
     };
     const httpCorsMiddlewareOnError = async (request)=>{
         if (request.response === undefined) return;
-        return httpCorsMiddlewareAfter(request);
+        await httpCorsMiddlewareAfter(request);
     };
     return {
         before: httpCorsMiddlewareBefore,
@@ -105,7 +105,11 @@ const modifyHeaders = (headers, options, request)=>{
     }
     const httpMethod = getVersionHttpMethod[request.event.version ?? '1.0']?.(request.event);
     if (!httpMethod) {
-        throw new Error('[http-cors] Unknown http event format');
+        throw new Error('Unknown http event format', {
+            cause: {
+                package: '@middy/http-cors'
+            }
+        });
     }
     if (httpMethod === 'OPTIONS' && options.cacheControl && !existingHeaders.includes('Cache-Control')) {
         headers['Cache-Control'] = options.cacheControl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/http-cors",
-  "version": "5.0.0-alpha.0",
+  "version": "5.0.0-alpha.2",
   "description": "CORS (Cross-Origin Resource Sharing) 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": {
@@ -64,11 +58,11 @@
     "type": "github",
     "url": "https://github.com/sponsors/willfarrell"
   },
-  "gitHead": "08c35e3dba9efdad0b86666ce206ce302cc65d07",
+  "gitHead": "ebce8d5df8783077fa49ba62ee9be20e8486a7f1",
   "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"
   }
 }

package/index.cjs

@@ -1,123 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(module, "exports", {
-    enumerable: true,
-    get: ()=>_default
-});
-const _util = require("@middy/util");
-const getOrigin = (incomingOrigin, options = {})=>{
-    if (options.origins.length > 0) {
-        if (incomingOrigin && options.origins.includes(incomingOrigin)) {
-            return incomingOrigin;
-        } else {
-            return options.origins[0];
-        }
-    } else {
-        if (incomingOrigin && options.credentials && options.origin === '*') {
-            return incomingOrigin;
-        }
-        return options.origin;
-    }
-};
-const defaults = {
-    disableBeforePreflightResponse: true,
-    getOrigin,
-    credentials: undefined,
-    headers: undefined,
-    methods: undefined,
-    origin: '*',
-    origins: [],
-    exposeHeaders: undefined,
-    maxAge: undefined,
-    requestHeaders: undefined,
-    requestMethods: undefined,
-    cacheControl: undefined,
-    vary: undefined
-};
-const httpCorsMiddleware = (opts = {})=>{
-    const options = {
-        ...defaults,
-        ...opts
-    };
-    const httpCorsMiddlewareBefore = async (request)=>{
-        if (options.disableBeforePreflightResponse) return;
-        const method = getVersionHttpMethod[request.event.version ?? '1.0']?.(request.event);
-        if (method === 'OPTIONS') {
-            (0, _util.normalizeHttpResponse)(request);
-            const headers = {};
-            modifyHeaders(headers, options, request);
-            request.response.headers = headers;
-            request.response.statusCode = 204;
-            return request.response;
-        }
-    };
-    const httpCorsMiddlewareAfter = async (request)=>{
-        (0, _util.normalizeHttpResponse)(request);
-        const { headers  } = request.response;
-        modifyHeaders(headers, options, request);
-        request.response.headers = headers;
-    };
-    const httpCorsMiddlewareOnError = async (request)=>{
-        if (request.response === undefined) return;
-        return httpCorsMiddlewareAfter(request);
-    };
-    return {
-        before: httpCorsMiddlewareBefore,
-        after: httpCorsMiddlewareAfter,
-        onError: httpCorsMiddlewareOnError
-    };
-};
-const getVersionHttpMethod = {
-    '1.0': (event)=>event.httpMethod,
-    '2.0': (event)=>event.requestContext.http.method
-};
-const modifyHeaders = (headers, options, request)=>{
-    const existingHeaders = Object.keys(headers);
-    if (existingHeaders.includes('Access-Control-Allow-Credentials')) {
-        options.credentials = headers['Access-Control-Allow-Credentials'] === 'true';
-    }
-    if (options.credentials) {
-        headers['Access-Control-Allow-Credentials'] = String(options.credentials);
-    }
-    if (options.headers && !existingHeaders.includes('Access-Control-Allow-Headers')) {
-        headers['Access-Control-Allow-Headers'] = options.headers;
-    }
-    if (options.methods && !existingHeaders.includes('Access-Control-Allow-Methods')) {
-        headers['Access-Control-Allow-Methods'] = options.methods;
-    }
-    if (!existingHeaders.includes('Access-Control-Allow-Origin')) {
-        const eventHeaders = request.event.headers ?? {};
-        const incomingOrigin = eventHeaders.Origin ?? eventHeaders.origin;
-        headers['Access-Control-Allow-Origin'] = options.getOrigin(incomingOrigin, options);
-    }
-    let vary = options.vary;
-    if (headers['Access-Control-Allow-Origin'] !== '*' && !vary) {
-        vary = 'Origin';
-    }
-    if (vary && !existingHeaders.includes('Vary')) {
-        headers.Vary = vary;
-    }
-    if (options.exposeHeaders && !existingHeaders.includes('Access-Control-Expose-Headers')) {
-        headers['Access-Control-Expose-Headers'] = options.exposeHeaders;
-    }
-    if (options.maxAge && !existingHeaders.includes('Access-Control-Max-Age')) {
-        headers['Access-Control-Max-Age'] = String(options.maxAge);
-    }
-    if (options.requestHeaders && !existingHeaders.includes('Access-Control-Request-Headers')) {
-        headers['Access-Control-Request-Headers'] = options.requestHeaders;
-    }
-    if (options.requestMethods && !existingHeaders.includes('Access-Control-Request-Methods')) {
-        headers['Access-Control-Request-Methods'] = options.requestMethods;
-    }
-    const httpMethod = getVersionHttpMethod[request.event.version ?? '1.0']?.(request.event);
-    if (!httpMethod) {
-        throw new Error('[http-cors] Unknown http event format');
-    }
-    if (httpMethod === 'OPTIONS' && options.cacheControl && !existingHeaders.includes('Cache-Control')) {
-        headers['Cache-Control'] = options.cacheControl;
-    }
-};
-const _default = httpCorsMiddleware;
-