Fixes router looping for specific request path for routes with more o…

…ptional parameters
seznam · Aug 1, 2024 · e40b81a · e40b81a
1 parent c70a7db
commit e40b81a
Show file tree

Hide file tree

Showing 2 changed files with 101 additions and 12 deletions.
diff --git a/packages/core/src/router/StaticRoute.ts b/packages/core/src/router/StaticRoute.ts
@@ -320,19 +320,12 @@ export class StaticRoute extends AbstractRoute<string> {
     const pattern = optionalParams.reduce((path, paramExpr, idx, matches) => {
       const lastIdx = matches.length - 1;
       const hasSlash = paramExpr.substr(0, 2) === '\\/';
+      const separator = hasSlash ? '/' : '';
 
-      let separator = '';
-
-      if (idx === 0) {
-        separator = '(?:' + (hasSlash ? '/' : '');
-      } else {
-        separator = hasSlash ? '/?' : '';
-      }
-
-      let regExpr = separator + `([^/?]+)?(?=/|$)?`;
+      let regExpr = '(?:' + separator + `([^/?]+)(?=/|$))?`;
 
       if (idx === lastIdx) {
-        regExpr += ')?';
+        regExpr += '';
       }
 
       return path.replace(paramExpr, regExpr);