@middy/http-router 3.0.0-alpha.0 → 3.0.0-alpha.4

package/README.md

@@ -42,8 +42,8 @@ npm install --save @middy/http-router
   - `handler` (function) (required): Any `handler(event, context)` function
 
 NOTES:
-- Errors should be handled as part of the router middleware stack **or** the baseHandler middleware stack. Handled errors in the later will trigger the `after` middleware stack of the former.
-- Shared middlewares, connected to the router middleware stack, can only be run before the baseHandler middleware stack.
+- Errors should be handled as part of the router middleware stack **or** the lambdaHandler middleware stack. Handled errors in the later will trigger the `after` middleware stack of the former.
+- Shared middlewares, connected to the router middleware stack, can only be run before the lambdaHandler middleware stack.
 
 ## Sample usage
 

package/index.js

@@ -0,0 +1,110 @@
+import { createError } from '@middy/util';
+
+const httpRouteHandler = routes => {
+  const routesStatic = {};
+  const routesDynamic = {};
+  const enumMethods = methods.concat('ANY');
+
+  for (const route of routes) {
+    let {
+      method,
+      path,
+      handler
+    } = route;
+
+    if (!enumMethods.includes(method)) {
+      throw new Error('method not allowed');
+    }
+
+    if (path.endsWith('/') && path !== '/') {
+      path = path.substr(0, path.length - 1);
+    }
+
+    if (path.indexOf('{') < 0) {
+      attachStaticRoute(method, path, handler, routesStatic);
+      continue;
+    }
+
+    attachDynamicRoute(method, path, handler, routesDynamic);
+  }
+
+  return (event, context) => {
+    var _getVersionRoute, _routesStatic$method;
+
+    const {
+      method,
+      path
+    } = (_getVersionRoute = getVersionRoute[event.version ?? '1.0']) === null || _getVersionRoute === void 0 ? void 0 : _getVersionRoute.call(getVersionRoute, event);
+
+    if (!method) {
+      throw new Error('Unknown API Gateway Payload format');
+    }
+
+    const handler = (_routesStatic$method = routesStatic[method]) === null || _routesStatic$method === void 0 ? void 0 : _routesStatic$method[path];
+
+    if (handler !== undefined) {
+      return handler(event, context);
+    }
+
+    for (const route of routesDynamic[method] ?? []) {
+      if (route.path.test(path)) {
+        return route.handler(event, context);
+      }
+    }
+
+    throw createError(404, 'Route does not exist');
+  };
+};
+
+const regexpDynamicWildcards = /\/\{proxy\+\}/g;
+const regexpDynamicParameters = /\/\{.+\}/g;
+const methods = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'];
+
+const attachStaticRoute = (method, path, handler, routesType) => {
+  if (method === 'ANY') {
+    for (const method of methods) {
+      attachStaticRoute(method, path, handler, routesType);
+    }
+
+    return;
+  }
+
+  if (!routesType[method]) {
+    routesType[method] = {};
+  }
+
+  routesType[method][path] = handler;
+};
+
+const attachDynamicRoute = (method, path, handler, routesType) => {
+  if (method === 'ANY') {
+    for (const method of methods) {
+      attachDynamicRoute(method, path, handler, routesType);
+    }
+
+    return;
+  }
+
+  if (!routesType[method]) {
+    routesType[method] = [];
+  }
+
+  path = path.replace(regexpDynamicWildcards, '/?.*').replace(regexpDynamicParameters, '/.+');
+  path = new RegExp(`^${path}$`);
+  routesType[method].push({
+    path,
+    handler
+  });
+};
+
+const getVersionRoute = {
+  '1.0': event => ({
+    method: event.httpMethod,
+    path: event.path
+  }),
+  '2.0': event => ({
+    method: event.requestContext.http.method,
+    path: event.requestContext.http.path
+  })
+};
+export default httpRouteHandler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/http-router",
-  "version": "3.0.0-alpha.0",
+  "version": "3.0.0-alpha.4",
   "description": "http event router for the middy framework",
   "type": "module",
   "engines": {
@@ -13,11 +13,13 @@
   "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": [
@@ -47,10 +49,10 @@
   },
   "homepage": "https://github.com/middyjs/middy#readme",
   "dependencies": {
-    "@middy/util": "^3.0.0-alpha.0"
+    "@middy/util": "^3.0.0-alpha.4"
   },
   "devDependencies": {
-    "@middy/core": "^3.0.0-alpha.0"
+    "@middy/core": "^3.0.0-alpha.4"
   },
-  "gitHead": "c533f62841c8a39d061d7b94f30ba178f002c8db"
+  "gitHead": "d4bea7f4e21f6a9bbb1f6f6908361169598b9e53"
 }