feat: include this node in matching if it has a parser

Author: troch

index.js

@@ -24,7 +24,7 @@ var RouteNode = (function () {
 
         this.name = name;
         this.path = path;
-        this.parser = path ? new _pathParser2['default'](path) : {};
+        this.parser = path ? new _pathParser2['default'](path) : null;
         this.children = [];
 
         this.add(childRoutes);
@@ -96,11 +96,11 @@ var RouteNode = (function () {
             return matched ? segments : false;
         }
     }, {
-        key: 'getSegmentsByPath',
-        value: function getSegmentsByPath(path) {
-            var matchChildren = function matchChildren(node, pathSegment, segments) {
+        key: 'getSegmentsMatchingPath',
+        value: function getSegmentsMatchingPath(path) {
+            var matchChildren = function matchChildren(nodes, pathSegment, segments) {
                 var _loop = function (i) {
-                    var child = node.children[i];
+                    var child = nodes[i];
                     // Partially match path
                     var match = child.parser.partialMatch(pathSegment);
                     if (match) {
@@ -124,24 +124,25 @@ var RouteNode = (function () {
                         }
                         // Else: remaining path and children
                         return {
-                            v: matchChildren(child, remainingPath, segments)
+                            v: matchChildren(child.children, remainingPath, segments)
                         };
                     }
                 };
 
                 // for (child of node.children) {
-                for (var i in node.children) {
+                for (var i in nodes) {
                     var _ret = _loop(i);
 
                     if (typeof _ret === 'object') return _ret.v;
                 }
                 return false;
             };
 
+            var startingNodes = this.parser ? [this] : this.children;
             var segments = [];
             segments.params = {};
 
-            return matchChildren(this, path, segments);
+            return matchChildren(startingNodes, path, segments);
         }
     }, {
         key: 'getPath',
@@ -166,7 +167,7 @@ var RouteNode = (function () {
     }, {
         key: 'matchPath',
         value: function matchPath(path) {
-            var segments = this.getSegmentsByPath(path);
+            var segments = this.getSegmentsMatchingPath(path);
 
             if (!segments) return false;
 

lib/RouteNode.js

@@ -4,7 +4,7 @@ export default class RouteNode {
     constructor(name = '', path = '', childRoutes = []) {
         this.name     = name
         this.path     = path
-        this.parser   = path ? new Path(path) : {}
+        this.parser   = path ? new Path(path) : null
         this.children = []
 
         this.add(childRoutes)
@@ -62,10 +62,10 @@ export default class RouteNode {
     }
 
     getSegmentsMatchingPath(path) {
-        let matchChildren = (node, pathSegment, segments) => {
+        let matchChildren = (nodes, pathSegment, segments) => {
             // for (child of node.children) {
-            for (let i in node.children) {
-                let child = node.children[i]
+            for (let i in nodes) {
+                let child = nodes[i]
                 // Partially match path
                 let match = child.parser.partialMatch(pathSegment)
                 if (match) {
@@ -82,16 +82,17 @@ export default class RouteNode {
                         return false
                     }
                     // Else: remaining path and children
-                    return matchChildren(child, remainingPath, segments);
+                    return matchChildren(child.children, remainingPath, segments);
                 }
             }
             return false;
         }
 
+        let startingNodes = this.parser ? [this] : this.children
         let segments = []
         segments.params = {}
 
-        return matchChildren(this, path, segments)
+        return matchChildren(startingNodes, path, segments)
     }
 
     getPath(routeName) {

test/main.js

@@ -117,6 +117,16 @@ describe('RouteNode', function () {
         node.matchPath('/users/profile/1').should.eql({name: 'users.splat', params: {id: 'profile/1'}});
         node.matchPath('/users/view/profile/1').should.be.false;
     });
+
+    it('should work on a tree without a root node', function () {
+        var usersNode = new RouteNode('users', '/users', [
+            new RouteNode('list', '/list'),
+            new RouteNode('view', '/view/:id')
+        ]);
+
+        usersNode.matchPath('/users/view/1').should.eql({name: 'users.view', params: {id: '1'}});
+        usersNode.matchPath('/users/list').should.eql({name: 'users.list', params: {}});
+    })
 });