fix wildcard param handling (#62)

test/router.js

@@ -213,6 +213,38 @@ tape('trie', function (t) {
     r('/foo/bar/beep/boop')
   })
 
+  t.test('wildcards dont conflict with params', function (t) {
+    t.plan(3)
+    var router
+
+    router = wayfarer()
+    router.on('/*', function (params) {
+      t.fail('wildcard called')
+    })
+    router.on('/:match', function (params) {
+      t.pass('param called')
+    })
+    router('/foo')
+
+    router = wayfarer()
+    router.on('/*', function (params) {
+      t.fail('wildcard called')
+    })
+    router.on('/:match/foo', function (params) {
+      t.pass('param called')
+    })
+    router('/foo/foo')
+
+    router = wayfarer()
+    router.on('/*', function (params) {
+      t.pass('wildcard called')
+    })
+    router.on('/:match/foo', function (params) {
+      t.fail('param called')
+    })
+    router('/foo/bar')
+  })
+
   t.test('safe decodeURIComponent', function (t) {
     t.plan(1)
     var r = wayfarer('/404')

trie.js

@@ -70,6 +70,14 @@ Trie.prototype.match = function (route) {
     if (trie.nodes.hasOwnProperty(thisRoute)) {
       // match regular routes first
       return search(index + 1, trie.nodes[thisRoute])
+    } else if (trie.name) {
+      // match named routes
+      try {
+        params[trie.name] = decodeURIComponent(thisRoute)
+      } catch (e) {
+        return search(index, undefined)
+      }
+      return search(index + 1, trie.nodes['$$'])
     } else if (trie.wildcard) {
       // match wildcards
       try {
@@ -79,14 +87,6 @@ Trie.prototype.match = function (route) {
       }
       // return early, or else search may keep recursing through the wildcard
       return trie.nodes['$$']
-    } else if (trie.name) {
-      // match named routes
-      try {
-        params[trie.name] = decodeURIComponent(thisRoute)
-      } catch (e) {
-        return search(index, undefined)
-      }
-      return search(index + 1, trie.nodes['$$'])
     } else {
       // no matches found
       return search(index + 1)