Wrap parameter with "+" modifier in a non-capturing group

pillarjs · Aug 27, 2021 · 80d4d03 · 80d4d03
1 parent 9251d85
commit 80d4d03
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/index.spec.ts b/src/index.spec.ts
@@ -2610,6 +2610,21 @@ const TESTS: Test[] = [
     ],
     [["foobar", ["foobar", "foobar"]]],
     [[{ name: "foobar" }, "foobar"]]
+  ],
+  [
+    ":name+",
+    undefined,
+    [
+      {
+        name: "name",
+        prefix: "",
+        suffix: "",
+        modifier: "+",
+        pattern: "[^\\/#\\?]+?",
+      },
+    ],
+    [["foobar", ["foobar", "foobar"]]],
+    [[{ name: "foobar" }, "foobar"]],
   ]
 ];
 

diff --git a/src/index.ts b/src/index.ts
@@ -563,7 +563,7 @@ export function tokensToRegexp(
             route += `(?:${prefix}(${token.pattern})${suffix})${token.modifier}`;
           }
         } else {
-          if (token.modifier === "*") {
+          if (token.modifier === "+" || token.modifier === "*") {
             route += `((?:${token.pattern})${token.modifier})`;
           } else {
             route += `(${token.pattern})${token.modifier}`;