Merge pull request #574 from seznam/fix-router-looping

Fixes router looping for specific request path and routes with more optional parameters
seznam · Aug 1, 2024 · 6d94496 · 6d94496
2 parents c70a7db + 351f9e2
commit 6d94496
Show file tree

Hide file tree

Showing 3 changed files with 106 additions and 19 deletions.
diff --git a/.changeset/heavy-readers-flow.md b/.changeset/heavy-readers-flow.md
@@ -0,0 +1,5 @@
+---
+"@ima/core": patch
+---
+
+Fixes router looping for specific request path and routes with more optional parameters
diff --git a/packages/core/src/router/StaticRoute.ts b/packages/core/src/router/StaticRoute.ts
@@ -317,23 +317,9 @@ export class StaticRoute extends AbstractRoute<string> {
    * @return RegExp pattern.
    */
   _replaceOptionalParametersInPath(path: string, optionalParams: string[]) {
-    const pattern = optionalParams.reduce((path, paramExpr, idx, matches) => {
-      const lastIdx = matches.length - 1;
-      const hasSlash = paramExpr.substr(0, 2) === '\\/';
-
-      let separator = '';
-
-      if (idx === 0) {
-        separator = '(?:' + (hasSlash ? '/' : '');
-      } else {
-        separator = hasSlash ? '/?' : '';
-      }
-
-      let regExpr = separator + `([^/?]+)?(?=/|$)?`;
-
-      if (idx === lastIdx) {
-        regExpr += ')?';
-      }
+    const pattern = optionalParams.reduce((path, paramExpr) => {
+      const separator = paramExpr.startsWith('\\/') ? '/' : '';
+      const regExpr = '(?:' + separator + `([^/?]+)(?=/|$))?`;
 
       return path.replace(paramExpr, regExpr);
     }, path);