@middy/http-router 3.3.1 → 3.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/index.cjs +3 -3
  2. package/index.d.ts +16 -4
  3. package/index.js +3 -3
  4. package/package.json +4 -4
package/index.cjs CHANGED
@@ -42,8 +42,8 @@ const httpRouteHandler = (routes)=>{
42
42
  throw (0, _util.createError)(404, 'Route does not exist');
43
43
  };
44
44
  };
45
- const regexpDynamicWildcards = /\/\{proxy\+\}/g;
46
- const regexpDynamicParameters = /\/\{.+\}/g;
45
+ const regexpDynamicWildcards = /\/\{proxy\+\}$/;
46
+ const regexpDynamicParameters = /\/\{[^/]+\}/g;
47
47
  const methods = [
48
48
  'GET',
49
49
  'POST',
@@ -74,7 +74,7 @@ const attachDynamicRoute = (method, path, handler, routesType)=>{
74
74
  if (!routesType[method]) {
75
75
  routesType[method] = [];
76
76
  }
77
- path = path.replace(regexpDynamicWildcards, '/?.*').replace(regexpDynamicParameters, '/.+');
77
+ path = path.replace(regexpDynamicWildcards, '/?.*').replace(regexpDynamicParameters, '/[^/]+');
78
78
  path = new RegExp(`^${path}$`);
79
79
  routesType[method].push({
80
80
  path,
package/index.d.ts CHANGED
@@ -1,18 +1,30 @@
1
1
  import middy from '@middy/core'
2
2
  import {
3
3
  APIGatewayProxyEvent,
4
+ APIGatewayProxyEventV2,
4
5
  APIGatewayProxyResult,
5
6
  Handler as LambdaHandler
6
7
  } from 'aws-lambda'
7
8
 
8
- export type Method = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS' | 'ANY'
9
+ export type Method =
10
+ | 'GET'
11
+ | 'POST'
12
+ | 'PUT'
13
+ | 'PATCH'
14
+ | 'DELETE'
15
+ | 'OPTIONS'
16
+ | 'ANY'
9
17
 
10
- export interface Route {
18
+ export interface Route<TEvent> {
11
19
  method: Method
12
20
  path: string
13
- handler: LambdaHandler<APIGatewayProxyEvent, APIGatewayProxyResult>
21
+ handler: LambdaHandler<TEvent, APIGatewayProxyResult>
14
22
  }
15
23
 
16
- declare function httpRouterHandler (routes: Route[]): middy.MiddyfiedHandler
24
+ declare function httpRouterHandler<
25
+ TEvent extends
26
+ | APIGatewayProxyEvent
27
+ | APIGatewayProxyEventV2 = APIGatewayProxyEvent
28
+ > (routes: Array<Route<TEvent>>): middy.MiddyfiedHandler
17
29
 
18
30
  export default httpRouterHandler
package/index.js CHANGED
@@ -34,8 +34,8 @@ const httpRouteHandler = (routes)=>{
34
34
  throw createError(404, 'Route does not exist');
35
35
  };
36
36
  };
37
- const regexpDynamicWildcards = /\/\{proxy\+\}/g;
38
- const regexpDynamicParameters = /\/\{.+\}/g;
37
+ const regexpDynamicWildcards = /\/\{proxy\+\}$/;
38
+ const regexpDynamicParameters = /\/\{[^/]+\}/g;
39
39
  const methods = [
40
40
  'GET',
41
41
  'POST',
@@ -66,7 +66,7 @@ const attachDynamicRoute = (method, path, handler, routesType)=>{
66
66
  if (!routesType[method]) {
67
67
  routesType[method] = [];
68
68
  }
69
- path = path.replace(regexpDynamicWildcards, '/?.*').replace(regexpDynamicParameters, '/.+');
69
+ path = path.replace(regexpDynamicWildcards, '/?.*').replace(regexpDynamicParameters, '/[^/]+');
70
70
  path = new RegExp(`^${path}$`);
71
71
  routesType[method].push({
72
72
  path,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@middy/http-router",
3
- "version": "3.3.1",
3
+ "version": "3.3.3",
4
4
  "description": "HTTP event router for the middy framework",
5
5
  "type": "module",
6
6
  "engines": {
@@ -62,11 +62,11 @@
62
62
  },
63
63
  "homepage": "https://middy.js.org",
64
64
  "dependencies": {
65
- "@middy/util": "3.3.1"
65
+ "@middy/util": "3.3.3"
66
66
  },
67
67
  "devDependencies": {
68
- "@middy/core": "3.3.1",
68
+ "@middy/core": "3.3.3",
69
69
  "@types/aws-lambda": "^8.10.97"
70
70
  },
71
- "gitHead": "513a8d0c1bc9d647552fa16b42004bad4eee07ee"
71
+ "gitHead": "02ca5e9a539cace47b394fe67bb0a0da23e098bf"
72
72
  }