chore: ignore trailing for optional/zero-or-more params

Author: kettanaito

src/index.ts

@@ -273,6 +273,27 @@ function matchTokens(
         }
       }
 
+      // If this literal ends with '/' and the only remaining token is
+      // an optional/zero-or-more param, try matching without the trailing
+      // slash. This allows `/users` to match pattern `/users/:id?`.
+      if (
+        token.value.charCodeAt(token.value.length - 1) === SLASH &&
+        i + 1 === tokens.length - 1
+      ) {
+        const nextToken = tokens[i + 1]
+        if (
+          nextToken.type === TokenType.Param &&
+          (nextToken.modifier === '?' || nextToken.modifier === '*')
+        ) {
+          const trimmed = token.value.slice(0, -1)
+          if (inputString.startsWith(trimmed, position)) {
+            position += trimmed.length
+            i++
+            continue
+          }
+        }
+      }
+
       return NO_MATCH
     }
 

tests/index.test.ts

@@ -175,6 +175,11 @@ it.each<
     'http://localhost/:param?/settings',
     MATCHES_WITHOUT_PARAMS,
   ],
+  [
+    'http://localhost/user',
+    'http://localhost/user/:id?',
+    MATCHES_WITHOUT_PARAMS,
+  ],
 
   /* One or more path parameter (+) */
   [
@@ -313,7 +318,11 @@ it.each<
   [new URL('http://localhost'), 'http://localhost/', MATCHES_WITHOUT_PARAMS],
   [new URL('http://localhost/'), 'http://localhost', MATCHES_WITHOUT_PARAMS],
   [new URL('http://localhost/'), 'http://localhost/', MATCHES_WITHOUT_PARAMS],
-  [new URL('http://localhost/user/'), 'http://localhost/user', MATCHES_WITHOUT_PARAMS],
+  [
+    new URL('http://localhost/user/'),
+    'http://localhost/user',
+    MATCHES_WITHOUT_PARAMS,
+  ],
   [
     new URL('http://localhost/user/'),
     'http://localhost/user/',