Allow backtrack handling to match itself (#427)

Author: blakeembrey

src/cases.spec.ts

@@ -1664,7 +1664,7 @@ export const MATCH_TESTS: MatchTestSet[] = [
         input: "/123abcabc",
         expected: {
           path: "/123abcabc",
-          params: { foo: "123abcabc" },
+          params: { foo: "123", bar: "abc" },
         },
       },
     ],
@@ -1689,7 +1689,10 @@ export const MATCH_TESTS: MatchTestSet[] = [
       },
       {
         input: "/123abcabc",
-        expected: false,
+        expected: {
+          path: "/123abcabc",
+          params: { foo: "123", bar: "abc" },
+        },
       },
     ],
   },
@@ -2170,6 +2173,18 @@ export const MATCH_TESTS: MatchTestSet[] = [
       },
     ],
   },
+  {
+    path: "/:a-:b^*c@*d%:e",
+    tests: [
+      {
+        input: "/a-b^c@d%e",
+        expected: {
+          path: "/a-b^c@d%e",
+          params: { a: "a", b: "b", c: ["c"], d: ["d"], e: "e" },
+        },
+      },
+    ],
+  },
 
   /**
    * Multi character delimiters.

src/index.ts

@@ -614,11 +614,14 @@ function toRegExpSource(
 
       if (token.type === "param") {
         result.push({
-          source: hasSegmentCapture // Seen param/wildcard in segment.
-            ? `(${negate(delimiter, backtrack)}+?)`
-            : hasInSegment(index, "wildcard") // See wildcard later in segment.
-              ? `(${negate(delimiter, peekText(index))}+?)`
-              : `(${negate(delimiter, "")}+?)`,
+          source:
+            hasSegmentCapture & 2 // Seen wildcard in segment.
+              ? `(${negate(delimiter, backtrack)}+)`
+              : hasInSegment(index, "wildcard") // See wildcard later in segment.
+                ? `(${negate(delimiter, peekText(index))}+)`
+                : hasSegmentCapture & 1 // Seen parameter in segment.
+                  ? `(${negate(delimiter, backtrack)}+|${escape(backtrack)})`
+                  : `(${negate(delimiter, "")}+?)`,
           key: token,
         });
 
@@ -627,12 +630,10 @@ function toRegExpSource(
         result.push({
           source:
             hasSegmentCapture & 2 // Seen wildcard in segment.
-              ? `(${negate(backtrack, "")}+?)`
-              : hasSegmentCapture & 1 // Seen param in segment.
-                ? `(${negate(wildcardBacktrack, "")}+?)`
-                : wildcardBacktrack // No capture in segment, seen wildcard in path.
-                  ? `(${negate(wildcardBacktrack, "")}+?|${negate(delimiter, "")}+?)`
-                  : `([^]+?)`,
+              ? `(${negate(backtrack, "")}+)`
+              : wildcardBacktrack // No capture in segment, seen wildcard in path.
+                ? `(${negate(wildcardBacktrack, "")}+|${negate(delimiter, "")}+)`
+                : `([^]+?)`,
           key: token,
         });