Fixed the query encoding order issue.

The original code would encode full path differently based on whether the path was supplied as `name` or as `path`. Fixed so that all branches conform to the same encoding order, which is encoding of URI components and then or URI itself. Also, route-recognizer would decode in inverse order (first decode URI components and then URI). That was fixed as well (encode and decode orders should be inverse).

Author: dragantl

lib/route-recognizer.js

@@ -490,15 +490,15 @@ RouteRecognizer.prototype = {
         pathLen, i, l, queryStart, queryParams = {},
         isSlashDropped = false;
 
+    path = decodeURI(path);
+
     queryStart = path.indexOf('?');
     if (queryStart !== -1) {
       var queryString = path.substr(queryStart + 1, path.length);
       path = path.substr(0, queryStart);
       queryParams = this.parseQueryString(queryString);
     }
 
-    path = decodeURI(path);
-
     // DEBUG GROUP path
 
     if (path.charAt(0) !== "/") { path = "/" + path; }

src/index.js

@@ -320,7 +320,7 @@ class Router {
         }
         fullPath = encodeURI(this._recognizer.generate(path.name, params))
       } else if (path.path) {
-        fullPath = encodeURI(path.path)
+        fullPath = path.path
         if (path.query) {
           const query = this._recognizer.generateQueryString(path.query)
           if (fullPath.indexOf('?') > -1) {
@@ -329,6 +329,7 @@ class Router {
             fullPath += query
           }
         }
+        fullPath = encodeURI(fullPath)
       }
     } else {
       fullPath = encodeURI(path ? path + '' : '')