fix: in non strictQueryParams mode, serialise extra query params to returned matched params

Author: troch

modules/RouteNode.js

@@ -1,5 +1,5 @@
 import Path from 'path-parser';
-import { getSearch, getPath, omit, withoutBrackets } from 'search-params';
+import { getSearch, getPath, omit, withoutBrackets, parse } from 'search-params';
 
 const noop = () => {};
 
@@ -158,10 +158,14 @@ export default class RouteNode {
                     segments.push(child);
                     Object.keys(match).forEach(param => segments.params[param] = match[param]);
 
-                    if (!isRoot && (!remainingPath.length || // fully matched
-                        !strictQueryParams && remainingPath.indexOf('?') === 0) // unmatched queryParams in non strict mode
-                    ) {
-                      return segments;
+                    if (!isRoot && !remainingPath.length) { // fully matched
+                        return segments;
+                    }
+                    if (!isRoot && !strictQueryParams && remainingPath.indexOf('?') === 0) { // unmatched queryParams in non strict mode
+                        const remainingQueryParams = parse(remainingPath.slice(1));
+
+                        remainingQueryParams.forEach(({ name, value} ) => segments.params[name] = value);
+                        return segments;
                     }
                     // If no children to match against but unmatched path left
                     if (!child.children.length) {

test/main.js

@@ -235,7 +235,7 @@ describe('RouteNode', function () {
               }
           },
           name: 'grandParent',
-          params: {nickname: 'gran'}
+          params: {nickname: 'gran', name: 'papa'}
         });
         node.matchPath('/grand-parent/parent/child?nickname=gran&names=papa-maman', { strictQueryParams: false }).should.eql({
           _meta: {
@@ -250,7 +250,7 @@ describe('RouteNode', function () {
               }
           },
           name: 'grandParent.parent.child',
-          params: {nickname: 'gran'}
+          params: {nickname: 'gran', names: 'papa-maman'}
         });
     });
 
@@ -397,6 +397,17 @@ describe('RouteNode', function () {
         node.setPath('?param');
         node.buildPath('route', {  param: '1' }).should.equal('/path?param=1');
     });
+
+    it('should serialise extra search parameters', function () {
+        var node = new RouteNode('', '', [
+            new RouteNode('route', '/path')
+        ]);
+
+        withoutMeta(node.matchPath('/path?a=1&b=2&c=3', { strictQueryParams: false })).should.eql({
+            name: 'route',
+            params: { a: '1', b: '2', c: '3' }
+        });
+    });
 });