Merge pull request #142 from preactjs/fix-double-decode

Fix double decode w/ nested router

Author: JoviDeCroock

src/router.js

@@ -76,7 +76,7 @@ export const exec = (url, route, matches = {}) => {
 		if (!m && param == val) continue;
 		// /foo/* match
 		if (!m && val && flag == '*') {
-			matches.rest = '/' + url.slice(i).map(decodeURIComponent).join('/');
+			matches.rest = '/' + url.slice(i).join('/');
 			break;
 		}
 		// segment mismatch / missing required field:

test/node/router-match.test.js

@@ -116,6 +116,11 @@ test('Handles leading/trailing slashes', () => {
 	});
 });
 
+test('Percent-encoded characters in rest are not decoded', () => {
+	const result = execPath('/nested/child/%25', '/nested/*');
+	assert.equal(result, { path: '/nested/child/%25', params: {}, query: {}, rest: '/child/%25' });
+});
+
 test('should not overwrite existing properties', () => {
 	const result = execPath('/foo/bar', '/:path/:query', { path: '/custom-path' });
 	assert.equal(result, {

test/router.test.js

@@ -927,6 +927,35 @@ describe('Router', () => {
 		expect(params).to.deep.include({ id: 'bar' });
 	});
 
+	it('should not double-decode percent-encoded characters in nested routes', async () => {
+		let route;
+		const Inner = () => (
+			<Router>
+				<Route
+					path="/child/:id"
+					component={() => {
+						route = useRoute();
+						return null;
+					}}
+				/>
+			</Router>
+		);
+
+		render(
+			<LocationProvider>
+				<Router>
+					<Route path="/nested/*" component={Inner} />
+				</Router>
+				<a href="/nested/child/%25"></a>
+			</LocationProvider>,
+			scratch
+		);
+
+		scratch.querySelector('a[href="/nested/child/%25"]').click();
+		await sleep(1);
+		expect(route).to.deep.include({ params: { id: '%' } });
+	});
+
 	it('should replace the current URL', async () => {
 		const pushState = sinon.spy(history, 'pushState');
 		const replaceState = sinon.spy(history, 'replaceState');