Merge pull request #146 from trotzig/escaped-params

Escaped params

Author: fridays

src/index.js

@@ -52,6 +52,9 @@ class Routes {
       if (result.route) return result
       const params = route.match(pathname)
       if (!params) return result
+      Object.keys(params).forEach((key) => {
+        params[key] = decodeURIComponent(params[key])
+      })
       return {...result, route, params, query: {...query, ...params}}
     }, {query, parsedUrl})
   }

test/index.test.js

@@ -66,6 +66,13 @@ describe('Routes', () => {
     expect(query).not.toHaveProperty('a')
   })
 
+  test('match and merge escaped params', () => {
+    const routes = nextRoutes().add('a', '/a/:b')
+    const {query} = routes.match('/a/b%20%2F%20b')
+    expect(query).toMatchObject({b: 'b / b'})
+    expect(query).not.toHaveProperty('a')
+  })
+
   test('generate urls from params', () => {
     const {route} = setup('a', '/a/:b/:c+')
     const params = {b: 'b', c: [1, 2], d: 'd'}
@@ -74,6 +81,14 @@ describe('Routes', () => {
     expect(setup('a').route.getUrls()).toEqual({as: '/a', href: '/a?'})
   })
 
+  test('generate urls with params that need escaping', () => {
+    const {route} = setup('a', '/a/:b')
+    const params = {b: 'b b'}
+    const expected = {as: '/a/b%20b', href: '/a?b=b%20b'}
+    expect(route.getUrls(params)).toEqual(expected)
+    expect(setup('a').route.getUrls()).toEqual({as: '/a', href: '/a?'})
+  })
+
   test('do not pass "null" for params that have null values', () => {
     const {route} = setup('a', '/a/:b/:c?')
     const params = {b: 'b', c: null, d: undefined}