@middy/http-router 4.0.8 → 4.0.10

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2022 [Luciano Mammino](https://github.com/lmammino), [will Farrell](https://github.com/willfarrell) and the [Middy team](https://github.com/middyjs/middy/graphs/contributors)
+Copyright (c) 2017-2023 [Luciano Mammino](https://github.com/lmammino), [will Farrell](https://github.com/willfarrell) 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

@@ -38,7 +38,7 @@
 
 ## License
 
-Licensed under [MIT License](LICENSE). Copyright (c) 2017-2022 [Luciano Mammino](https://github.com/lmammino), [will Farrell](https://github.com/willfarrell), and the [Middy team](https://github.com/middyjs/middy/graphs/contributors).
+Licensed under [MIT License](LICENSE). Copyright (c) 2017-2023 [Luciano Mammino](https://github.com/lmammino), [will Farrell](https://github.com/willfarrell), 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.cjs

@@ -2,9 +2,15 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(module, "exports", {
-    enumerable: true,
-    get: ()=>_default
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    Method: ()=>Method,
+    default: ()=>_default
 });
 const _util = require("@middy/util");
 const httpRouteHandler = (routes)=>{
@@ -37,8 +43,9 @@ const httpRouteHandler = (routes)=>{
         for (const route of routesDynamic[method] ?? []){
             const match = path.match(route.path);
             if (match) {
-                event.pathParameters ??= {
-                    ...match.groups
+                event.pathParameters = {
+                    ...match.groups,
+                    ...event.pathParameters
                 };
                 return route.handler(event, context, abort);
             }
@@ -48,14 +55,16 @@ const httpRouteHandler = (routes)=>{
 };
 const regexpDynamicWildcards = /\/\{(proxy)\+\}$/;
 const regexpDynamicParameters = /\/\{([^/]+)\}/g;
-const methods = [
-    'GET',
-    'POST',
-    'PUT',
-    'PATCH',
-    'DELETE',
-    'OPTIONS'
-];
+const Method = {
+    Get: 'GET',
+    Post: 'POST',
+    Put: 'PUT',
+    Patch: 'PATCH',
+    Delete: 'DELETE',
+    Options: 'OPTIONS',
+    Any: 'ANY'
+};
+const methods = Object.values(Method).filter((method)=>method !== 'ANY');
 const attachStaticRoute = (method, path, handler, routesType)=>{
     if (method === 'ANY') {
         for (const method1 of methods){

package/index.d.ts

@@ -1,6 +1,7 @@
-import middy from '@middy/core'
+import middy, { MiddyfiedHandler } from '@middy/core'
 import {
   ALBEvent,
+  ALBResult,
   APIGatewayProxyEvent,
   APIGatewayProxyEventV2,
   APIGatewayProxyResult,
@@ -17,10 +18,12 @@ export enum Method {
   Any = 'ANY'
 }
 
+type TResult = ALBResult | APIGatewayProxyResult
+
 export interface Route<TEvent> {
   method: Method
   path: string
-  handler: LambdaHandler<TEvent, APIGatewayProxyResult>
+  handler: LambdaHandler<TEvent, TResult> | MiddyfiedHandler<TEvent, TResult, any, any>
 }
 
 declare function httpRouterHandler<

package/index.js

@@ -29,8 +29,9 @@ const httpRouteHandler = (routes)=>{
         for (const route of routesDynamic[method] ?? []){
             const match = path.match(route.path);
             if (match) {
-                event.pathParameters ??= {
-                    ...match.groups
+                event.pathParameters = {
+                    ...match.groups,
+                    ...event.pathParameters
                 };
                 return route.handler(event, context, abort);
             }
@@ -40,14 +41,16 @@ const httpRouteHandler = (routes)=>{
 };
 const regexpDynamicWildcards = /\/\{(proxy)\+\}$/;
 const regexpDynamicParameters = /\/\{([^/]+)\}/g;
-const methods = [
-    'GET',
-    'POST',
-    'PUT',
-    'PATCH',
-    'DELETE',
-    'OPTIONS'
-];
+export const Method = {
+    Get: 'GET',
+    Post: 'POST',
+    Put: 'PUT',
+    Patch: 'PATCH',
+    Delete: 'DELETE',
+    Options: 'OPTIONS',
+    Any: 'ANY'
+};
+const methods = Object.values(Method).filter((method)=>method !== 'ANY');
 const attachStaticRoute = (method, path, handler, routesType)=>{
     if (method === 'ANY') {
         for (const method1 of methods){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/http-router",
-  "version": "4.0.8",
+  "version": "4.0.10",
   "description": "HTTP event router for the middy framework",
   "type": "module",
   "engines": {
@@ -62,11 +62,11 @@
   },
   "homepage": "https://middy.js.org",
   "dependencies": {
-    "@middy/util": "4.0.8"
+    "@middy/util": "4.0.10"
   },
   "devDependencies": {
-    "@middy/core": "4.0.8",
+    "@middy/core": "4.0.10",
     "@types/aws-lambda": "^8.10.97"
   },
-  "gitHead": "e38d1c27d153f9d9c5bf5627fd1abf425fdf3978"
+  "gitHead": "e2a97d380fc4150781004092ea054f5d0fc7a8c0"
 }