Fix issue #280 (#281)

delvedor · May 15, 2022 · 455e3ba · 455e3ba
1 parent 2985fbd
commit 455e3ba
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -458,9 +458,7 @@ Router.prototype.find = function find (method, path, derivedConstraints) {
 
       if (currentNode.isRegex) {
         const matchedParameters = currentNode.regex.exec(decoded)
-        if (matchedParameters === null) {
-          return null
-        }
+        if (matchedParameters === null) continue
 
         for (let i = 1; i < matchedParameters.length; i++) {
           const param = matchedParameters[i]

diff --git a/test/issue-280.test.js b/test/issue-280.test.js
@@ -0,0 +1,15 @@
+'use strict'
+
+const t = require('tap')
+const test = t.test
+const FindMyWay = require('../')
+
+test('Wildcard route match when regexp route fails', (t) => {
+  t.plan(1)
+  const findMyWay = FindMyWay()
+
+  findMyWay.on('GET', '/:a(a)', () => {})
+  findMyWay.on('GET', '/*', () => {})
+
+  t.same(findMyWay.find('GET', '/b', {}).params, { '*': 'b' })
+})