add support for optional catch all routes

Author: Egor

package.json

@@ -39,7 +39,7 @@
     "@zeit/node-file-trace": "^0.8.2",
     "ansi-escapes": "^4.3.1",
     "archiver": "^5.0.0",
-    "aws-sdk": "^2.724.0",
+    "aws-sdk": "^2.725.0",
     "chalk": "^4.1.0",
     "execa": "^4.0.3",
     "figures": "^3.2.0",
@@ -73,13 +73,13 @@
     "@types/node": "^14.0.27",
     "@types/path-to-regexp": "^1.7.0",
     "@types/ramda": "^0.27.14",
-    "@types/react": "^16.9.43",
+    "@types/react": "^16.9.44",
     "@types/react-dom": "^16.9.8",
     "@types/strip-ansi": "^5.2.1",
     "@types/webpack": "^4.41.21",
     "@typescript-eslint/eslint-plugin": "^3.7.1",
     "@typescript-eslint/parser": "^3.7.1",
-    "eslint": "^7.5.0",
+    "eslint": "^7.6.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.4",
     "husky": "^4.2.5",

packages/aws-lambda-builder/src/index.ts

@@ -11,24 +11,20 @@ import {
   readFile,
 } from 'fs-extra';
 import { join, resolve, sep, extname, relative, basename } from 'path';
-import { pathToRegexp } from 'path-to-regexp';
 
 import getAllFiles from './lib/getAllFilesInDirectory';
 import { getSortedRoutes } from './lib/sortedRoutes';
 import { OriginRequestHandlerManifest } from '../types';
-import expressifyDynamicRoute from './lib/expressifyDynamicRoute';
 import createServerlessConfig from './lib/createServerlessConfig';
+import {
+  expressifyDynamicRoute,
+  normalizeNodeModules,
+  isDynamicRoute,
+  pathToRegexStr,
+} from './utils';
 
 export const REQUEST_LAMBDA_CODE_DIR = 'request-lambda';
 
-const normalizeNodeModules = (path: string): string => path.substring(path.indexOf('node_modules'));
-// Identify /[param]/ in route string
-const isDynamicRoute = (route: string): boolean => /\/\[[^\/]+?\](?=\/|$)/.test(route);
-const pathToRegexStr = (path: string): string =>
-  pathToRegexp(path)
-    .toString()
-    .replace(/\/(.*)\/\i/, '$1');
-
 const defaultBuildOptions = {
   args: [],
   cwd: process.cwd(),
@@ -205,6 +201,7 @@ class Builder {
       if (isHtmlPage(pageFile)) {
         if (dynamicRoute) {
           const route = expressRoute as string;
+
           htmlPages.dynamic[route] = {
             file: pageFile,
             regex: pathToRegexStr(route),

packages/aws-lambda-builder/src/lib/expressifyDynamicRoute.ts

@@ -0,0 +1,31 @@
+import { pathToRegexp } from 'path-to-regexp';
+
+/**
+ * Dynamic routes: /[param]/ -> /:param
+ * Catch all routes: /[...param]/ -> /:param+
+ * Optional catch all routes: /[...param]/ -> /:param*
+ *
+ * @param dynamicRoute - route to expressify.
+ */
+export const expressifyDynamicRoute = (dynamicRoute: string): string => {
+  // replace any catch all group first
+  let expressified = dynamicRoute.replace(/\[\.\.\.(.*)]$/, ':$1+');
+
+  // replace other dynamic route groups
+  expressified = expressified.replace(/\[(.*?)]/g, ':$1');
+
+  // check if this is actually an optional catch all group
+  if (expressified.includes('/::')) {
+    expressified = expressified.replace('/::', '/:').replace(/\+$/, '*');
+  }
+
+  return expressified;
+};
+export const normalizeNodeModules = (path: string): string =>
+  path.substring(path.indexOf('node_modules'));
+// Identify /[param]/ in route string
+export const isDynamicRoute = (route: string): boolean => /\/\[[^\/]+?\](?=\/|$)/.test(route);
+export const pathToRegexStr = (path: string): string =>
+  pathToRegexp(path)
+    .toString()
+    .replace(/\/(.*)\/\i/, '$1');