Injected query into location (#356)

Author: codejockie

src/reducer.js

@@ -1,5 +1,43 @@
 import { LOCATION_CHANGE } from './actions'
 
+/**
+ * Adds query to location.
+ * Utilises the search prop of location to construct query.
+ */
+const injectQuery = (location) => {
+  if (!location) {
+    return location
+  }
+
+  const searchQuery = location.search || window.location.search
+
+  if (typeof searchQuery !== 'string' || searchQuery.length === 0) {
+    return {
+      ...location,
+      query: {}
+    }
+  }
+
+  // Ignore the `?` part of the search string e.g. ?username=codejockie
+  const search = searchQuery.substring(1)
+  // Split the query string on `&` e.g. ?username=codejockie&name=Kennedy
+  const queries = search.split('&')
+  // Contruct query
+  const query = queries.reduce((acc, currentQuery) => {
+    // Split on `=`, to get key and value
+    const [queryKey, queryValue] = currentQuery.split('=')
+    return {
+      ...acc,
+      [queryKey]: queryValue
+    }
+  }, {})
+
+  return {
+    ...location,
+    query
+  }
+}
+
 const createConnectRouter = (structure) => {
   const {
     fromJS,
@@ -8,7 +46,7 @@ const createConnectRouter = (structure) => {
 
   const createRouterReducer = (history) => {
     const initialRouterState = fromJS({
-      location: history.location,
+      location: injectQuery(history.location),
       action: history.action,
     })
 
@@ -23,7 +61,7 @@ const createConnectRouter = (structure) => {
         // to prevent the double-rendering issue on initilization
         return isFirstRendering
           ? state
-          : merge(state, { location: fromJS(location), action })
+          : merge(state, { location: fromJS(injectQuery(location)), action })
       }
 
       return state

test/reducer.test.js

@@ -63,6 +63,7 @@ describe('connectRouter', () => {
             pathname: '/path/to/somewhere',
             search: '?query=test',
             hash: '',
+            query: { query: 'test' }
           },
           action: 'PUSH',
         },
@@ -167,6 +168,7 @@ describe('connectRouter', () => {
             pathname: '/path/to/somewhere',
             search: '?query=test',
             hash: '',
+            query: { query: 'test' }
           },
           action: 'PUSH',
         },
@@ -248,6 +250,7 @@ describe('connectRouter', () => {
             pathname: '/path/to/somewhere',
             search: '?query=test',
             hash: '',
+            query: { query: 'test' }
           },
           action: 'PUSH',
         },

test/selectors.test.js

@@ -55,7 +55,7 @@ describe("selectors", () => {
 
   describe("getLocation", () => {
     it("gets the location from the state", () => {
-      const location = { pathname: "/", hash: '', search: '' }
+      const location = { pathname: "/", hash: '', query: {}, search: '', }
       store.dispatch(push('/'))
       const state = store.getState()
       expect(getLocation(state)).toEqual(location)