feat: update to v2.0.0 of path-parser

Author: troch

.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 coverage/
 npm-debug.log
+yarn.lock

modules/RouteNode.js

@@ -186,29 +186,33 @@ export default class RouteNode {
                 const child = nodes[i];
 
                 // Partially match path
-                let match = child.parser.partialMatch(pathSegment);
+                let match;
                 let remainingPath;
 
-                if (!match && trailingSlash) {
-                    // Try with optional trailing slash
-                    match = child.parser.match(pathSegment, true);
-                    remainingPath = '';
-                } else if (match) {
+                if (!child.children.length) {
+                    match = child.parser.test(pathSegment, { trailingSlash });
+                }
+
+                if (!match) {
+                    match = child.parser.partialTest(pathSegment);
+                }
+
+                if (match) {
                     // Remove consumed segment from path
-                    const consumedPath = child.parser.build(match, {ignoreSearch: true});
+                    let consumedPath = child.parser.build(match, {ignoreSearch: true});
+                    if (trailingSlash && !child.children.length) {
+                        consumedPath = consumedPath.replace(/\/$/, '');
+                    }
                     remainingPath = pathSegment.replace(consumedPath, '');
                     const search = omit(
                         getSearch(pathSegment.replace(consumedPath, '')),
                         child.parser.queryParams.concat(child.parser.queryParamsBr)
                     );
                     remainingPath = getPath(remainingPath) + (search ? `?${search}` : '');
-
                     if (trailingSlash && !isRoot && remainingPath === '/' && !/\/$/.test(consumedPath)) {
                         remainingPath = '';
                     }
-                }
 
-                if (match) {
                     segments.push(child);
                     Object.keys(match).forEach(param => segments.params[param] = match[param]);
 

package.json

@@ -54,7 +54,7 @@
     "yargs": "^4.8.1"
   },
   "dependencies": {
-    "path-parser": "~1.0.4",
+    "path-parser": "2.0.0",
     "search-params": "~1.3.0"
   }
 }

test/main.js

@@ -475,6 +475,16 @@ describe('RouteNode', function () {
         withoutMeta(node.matchPath('/admin/?page=1')).should.eql({ name: 'app.admin.users', params: { page: '1' }});
         withoutMeta(node.matchPath('/admin/')).should.eql({ name: 'app.admin.users', params: {}});
     });
+
+    it('should fully match route nodes who have no children', () => {
+        var node = new RouteNode('', '', [
+            new RouteNode('home', '/home'),
+            new RouteNode('section', '/:section')
+        ]);
+
+        withoutMeta(node.matchPath('/homeland')).should.eql({ name: 'section', params: { section: 'homeland' }});
+        withoutMeta(node.matchPath('/hom')).should.eql({ name: 'section', params: { section: 'hom' }});
+    });
 });