Merge pull request #832 from preactjs/iso-rest-match

Add support for partial route matching via `/foo/*`

Author: marvinhagemeister

router.js

@@ -42,6 +42,8 @@ export const exec = (url, route, matches) => {
 		val = url[i];
 		// segment match:
 		if (!m && param == val) continue;
+		// /foo/* match
+		if (!m && val && flag == '*') break;
 		// segment mismatch / missing required field:
 		if (!m || (!val && flag != '?' && flag != '*')) return;
 		rest = flag == '+' || flag == '*';

test/match.test.js

@@ -21,6 +21,25 @@ describe('match', () => {
 		expect(inaccurateResult).toEqual(undefined);
 	});
 
+	it('Param rest segment', () => {
+		const accurateResult = execPath('/user/foo', '/user/*');
+		expect(accurateResult).toEqual({ path: '/user/foo', params: {}, query: {} });
+
+		const inaccurateResult = execPath('/', '/user/:id/*');
+		expect(inaccurateResult).toEqual(undefined);
+	});
+
+	it('Param route with rest segment', () => {
+		const accurateResult = execPath('/user/2/foo', '/user/:id/*');
+		expect(accurateResult).toEqual({ path: '/user/2/foo', params: { id: '2' }, id: '2', query: {} });
+
+		const accurateResult2 = execPath('/user/2/foo/bar/bob', '/user/:id/*');
+		expect(accurateResult2).toEqual({ path: '/user/2/foo/bar/bob', params: { id: '2' }, id: '2', query: {} });
+
+		const inaccurateResult = execPath('/', '/user/:id/*');
+		expect(inaccurateResult).toEqual(undefined);
+	});
+
 	it('Optional param route', () => {
 		const accurateResult = execPath('/user', '/user/:id?');
 		expect(accurateResult).toEqual({ path: '/user', params: { id: undefined }, id: undefined, query: {} });