Merge pull request #45 from delvedor/fix-44

Fixes 44

index.js

@@ -244,6 +244,7 @@ Router.prototype.find = function find (method, path) {
     var prefix = currentNode.prefix
     var prefixLen = prefix.length
     var len = 0
+    var previousPath = path
 
     // found the route
     if (pathLen === 0 || path === prefix) {
@@ -283,7 +284,13 @@ Router.prototype.find = function find (method, path) {
 
     var node = currentNode.find(path[0], method)
     if (node === null) {
-      return getWildcardNode(wildcardNode, method, originalPath, pathLenWildcard)
+      node = currentNode.parametricBrother
+      if (node === null) {
+        return getWildcardNode(wildcardNode, method, originalPath, pathLenWildcard)
+      }
+      path = previousPath
+      pathLen = previousPath.length
+      len = prefixLen
     }
     var kind = node.kind
 

node.js

@@ -19,12 +19,22 @@ function Node (prefix, children, kind, map, regex) {
   this.map = map || {}
   this.regex = regex || null
   this.wildcardChild = null
+  this.parametricBrother = null
 }
 
 Node.prototype.add = function (node) {
   if (node.kind === 2) {
     this.wildcardChild = node
   }
+
+  if (node.kind === 1 || node.kind === 3 || node.kind === 4) {
+    for (var i = 0; i < this.numberOfChildren; i++) {
+      if (this.children[i].kind === 0) {
+        this.children[i].parametricBrother = node
+      }
+    }
+  }
+
   this.children.push(node)
   this.children.sort((n1, n2) => n1.kind - n2.kind)
   this.numberOfChildren++

package.json

@@ -5,8 +5,8 @@
   "main": "index.js",
   "scripts": {
     "bench": "node bench.js",
-    "test": "standard && tap test/*.test.js",
-    "coveralls": "tap test/*.test.js --cov --coverage-report=text-lcov | coveralls"
+    "test": "standard && tap -j4 test/*.test.js",
+    "coveralls": "tap -j4 test/*.test.js --cov --coverage-report=text-lcov | coveralls"
   },
   "repository": {
     "type": "git",
@@ -27,9 +27,9 @@
   "homepage": "https://github.com/delvedor/find-my-way#readme",
   "devDependencies": {
     "benchmark": "^2.1.4",
-    "coveralls": "^2.13.1",
-    "request": "^2.81.0",
+    "coveralls": "^3.0.0",
+    "request": "^2.83.0",
     "standard": "^10.0.3",
-    "tap": "^10.7.2"
+    "tap": "^11.0.0"
   }
 }

test/issue-44.test.js

@@ -0,0 +1,131 @@
+'use strict'
+
+const t = require('tap')
+const test = t.test
+const FindMyWay = require('../')
+
+test('Parametric and static with shared prefix / 1', t => {
+  t.plan(1)
+  const findMyWay = FindMyWay({
+    defaultRoute: (req, res) => {
+      t.fail('Should not be defaultRoute')
+    }
+  })
+
+  findMyWay.on('GET', '/woo', (req, res, params) => {
+    t.fail('we should not be here')
+  })
+
+  findMyWay.on('GET', '/:param', (req, res, params) => {
+    t.equal(params.param, 'winter')
+  })
+
+  findMyWay.lookup({ method: 'GET', url: '/winter' }, null)
+})
+
+test('Parametric and static with shared prefix / 2', t => {
+  t.plan(1)
+  const findMyWay = FindMyWay({
+    defaultRoute: (req, res) => {
+      t.fail('Should not be defaultRoute')
+    }
+  })
+
+  findMyWay.on('GET', '/woo', (req, res, params) => {
+    t.ok('we should be here')
+  })
+
+  findMyWay.on('GET', '/:param', (req, res, params) => {
+    t.fail('we should not be here')
+  })
+
+  findMyWay.lookup({ method: 'GET', url: '/woo' }, null)
+})
+
+test('Parametric and static with shared prefix (nested)', t => {
+  t.plan(1)
+  const findMyWay = FindMyWay({
+    defaultRoute: (req, res) => {
+      t.ok('We should be here')
+    }
+  })
+
+  findMyWay.on('GET', '/woo', (req, res, params) => {
+    t.fail('we should not be here')
+  })
+
+  findMyWay.on('GET', '/:param', (req, res, params) => {
+    t.fail('we should not be here')
+  })
+
+  findMyWay.lookup({ method: 'GET', url: '/winter/coming' }, null)
+})
+
+test('Parametric and static with shared prefix (with wildcard)', t => {
+  t.plan(1)
+  const findMyWay = FindMyWay({
+    defaultRoute: (req, res) => {
+      t.fail('Should not be defaultRoute')
+    }
+  })
+
+  findMyWay.on('GET', '/woo', (req, res, params) => {
+    t.fail('we should not be here')
+  })
+
+  findMyWay.on('GET', '/:param', (req, res, params) => {
+    t.equal(params.param, 'winter')
+  })
+
+  findMyWay.on('GET', '/*', (req, res, params) => {
+    t.fail('we should not be here')
+  })
+
+  findMyWay.lookup({ method: 'GET', url: '/winter' }, null)
+})
+
+test('Parametric and static with shared prefix (nested with wildcard)', t => {
+  t.plan(1)
+  const findMyWay = FindMyWay({
+    defaultRoute: (req, res) => {
+      t.fail('Should not be defaultRoute')
+    }
+  })
+
+  findMyWay.on('GET', '/woo', (req, res, params) => {
+    t.fail('we should not be here')
+  })
+
+  findMyWay.on('GET', '/:param', (req, res, params) => {
+    t.fail('we should not be here')
+  })
+
+  findMyWay.on('GET', '/*', (req, res, params) => {
+    t.equal(params['*'], 'winter/coming')
+  })
+
+  findMyWay.lookup({ method: 'GET', url: '/winter/coming' }, null)
+})
+
+test('Parametric and static with shared prefix (nested with split)', t => {
+  t.plan(1)
+  const findMyWay = FindMyWay({
+    defaultRoute: (req, res) => {
+      t.fail('we should not be here')
+    }
+  })
+
+  findMyWay.on('GET', '/woo', (req, res, params) => {
+    t.fail('we should not be here')
+  })
+
+  findMyWay.on('GET', '/:param', (req, res, params) => {
+    t.equal(params.param, 'winter')
+  })
+
+  findMyWay.on('GET', '/wo', (req, res, params) => {
+    t.fail('we should not be here')
+  })
+
+  findMyWay.lookup({ method: 'GET', url: '/winter' }, null)
+})

test/methods.test.js

@@ -570,7 +570,7 @@ test('Static parametric with shared part of the path', t => {
 
   const findMyWay = FindMyWay({
     defaultRoute: (req, res) => {
-      t.is(req.url, '/example/shared/nested/oops')
+      t.is(req.url, '/example/shared/nested/oopss')
     }
   })
 
@@ -582,7 +582,7 @@ test('Static parametric with shared part of the path', t => {
     t.is(params.param, 'other')
   })
 
-  findMyWay.lookup({ method: 'GET', url: '/example/shared/nested/oops' }, null)
+  findMyWay.lookup({ method: 'GET', url: '/example/shared/nested/oopss' }, null)
   findMyWay.lookup({ method: 'GET', url: '/example/other/nested/oops' }, null)
 })