Merge pull request #15 from lydell/query-param-precedence

gvergnaud · web-flow · commit de72b180134f · 2019-01-23T11:43:34.000+01:00
Query param precedence
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -22,9 +22,9 @@
     "babel-preset-react": "^6.23.0",
     "babel-preset-stage-2": "^6.22.0",
     "jest": "^22.4.3",
-    "next": "7.0.2",
-    "react": "16.7.0",
-    "react-dom": "16.7.0",
+    "next": "^7.0.2",
+    "react": "^16.7.0",
+    "react-dom": "^16.7.0",
     "regenerator-runtime": "^0.11.1",
     "webpack": "^2.2.1",
     "webpack-node-externals": "^1.5.4"
diff --git a/src/Router.js b/src/Router.js
@@ -55,7 +55,7 @@ class Router {
       if (acc.page) return acc
       const { pathname, query: queryParams } = urlLib.parse(url, true)
       const params = match(pattern)(pathname)
-      if (params) return { page, params: { ...params, ...queryParams } }
+      if (params) return { page, params: { ...queryParams, ...params } }
       else return acc
     }, {})
   }
diff --git a/tests/Router.test.js b/tests/Router.test.js
@@ -10,3 +10,12 @@ test('getMatchingRoute should should decode query params', () => {
     params: { test: 'ä' },
   })
 })
+
+test('getMatchingRoute should give precedence to inline params', () => {
+  const router = new Router()
+  router.add({ name: 'film', pattern: '/films/:id' })
+  expect(router.getMatchingRoute('/films/2?utm_campaign=website&id=1')).toEqual({
+    page: '/film',
+    params: { id: '2', utm_campaign: 'website' },
+  })
+})
diff --git a/yarn.lock b/yarn.lock
@@ -5065,7 +5065,7 @@ neo-async@^2.5.0:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
   integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
 
-next@7.0.2:
+next@^7.0.2:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/next/-/next-7.0.2.tgz#5ff6b3f0e6cf03ce539d5779a55dc1f8fb1759d7"
   integrity sha512-DOPKKk+2rAEvXS/JMaZL5+jd2WUJI5BEv8xXiR4ijqIuvAL0dI/cT8H6bhFCqbYIgFNuefp+NSVh2kvxpELyeg==
@@ -5840,7 +5840,7 @@ rc@~1.1.6:
     minimist "^1.2.0"
     strip-json-comments "~1.0.4"
 
-react-dom@16.7.0:
+react-dom@^16.7.0:
   version "16.7.0"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.7.0.tgz#a17b2a7ca89ee7390bc1ed5eb81783c7461748b8"
   integrity sha512-D0Ufv1ExCAmF38P2Uh1lwpminZFRXEINJe53zRAbm4KPwSyd6DY/uDoS0Blj9jvPpn1+wivKpZYc8aAAN/nAkg==
@@ -5855,7 +5855,7 @@ react-error-overlay@4.0.0:
   resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-4.0.0.tgz#d198408a85b4070937a98667f500c832f86bd5d4"
   integrity sha512-FlsPxavEyMuR6TjVbSSywovXSEyOg6ZDj5+Z8nbsRl9EkOzAhEIcS+GLoQDC5fz/t9suhUXWmUrOBrgeUvrMxw==
 
-react@16.7.0:
+react@^16.7.0:
   version "16.7.0"
   resolved "https://registry.yarnpkg.com/react/-/react-16.7.0.tgz#b674ec396b0a5715873b350446f7ea0802ab6381"
   integrity sha512-StCz3QY8lxTb5cl2HJxjwLFOXPIFQp+p+hxQfc8WE0QiLfCtIlKj8/+5tjjKm8uSTlAW+fCPaavGFS06V9Ar3A==

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ class Router {`
`55`	`55`	`if (acc.page) return acc`
`56`	`56`	`const { pathname, query: queryParams } = urlLib.parse(url, true)`
`57`	`57`	`const params = match(pattern)(pathname)`
`58`		`- if (params) return { page, params: { ...params, ...queryParams } }`
	`58`	`+ if (params) return { page, params: { ...queryParams, ...params } }`
`59`	`59`	`else return acc`
`60`	`60`	`}, {})`
`61`	`61`	`}`