Give locations a key by default

CHANGES.md

@@ -1,5 +1,6 @@
 ## HEAD
 
+- Give `location` objects a `key` by default
 - Deprecate `history.setState`
 
 ## [v1.12.0]

modules/__tests__/Location-test.js

@@ -10,23 +10,17 @@ describe('a location', function () {
   })
 
   it('knows its pathname', function () {
-    let location = createLocation('/home?the=query')
+    let location = createLocation('/home?the=query#the-hash')
     expect(location.pathname).toEqual('/home')
   })
 
   it('knows its hash', function () {
-    let location = createLocation('/home#the-hash')
-    expect(location.hash).toEqual('#the-hash')
-  })
-
-  it('knows its hash and search together', function () {
     let location = createLocation('/home?the=query#the-hash')
-    expect(location.search).toEqual('?the=query')
     expect(location.hash).toEqual('#the-hash')
   })
 
   it('knows its search string', function () {
-    let location = createLocation('/home?the=query')
+    let location = createLocation('/home?the=query#the-hash')
     expect(location.search).toEqual('?the=query')
   })
 
@@ -40,8 +34,8 @@ describe('a location', function () {
     expect(location.action).toBe(POP)
   })
 
-  it('has null key by default', function () {
+  it('has a key by default', function () {
     let location = createLocation()
-    expect(location.key).toBe(null)
+    expect(location.key).toExist()
   })
 })

modules/createHashHistory.js

@@ -62,6 +62,8 @@ function createHashHistory(options={}) {
         key = history.createKey()
         replaceHashPath(addQueryStringValueToPath(path, queryKey, key))
       }
+    } else {
+      key = state = null
     }
 
     return history.createLocation(path, state, undefined, key)

modules/createHistory.js

@@ -24,36 +24,6 @@ function extractPath(string) {
   return string.substring(match[0].length)
 }
 
-function createLocation(path='/', state=null, action=POP, key=null) {
-  let pathname = extractPath(path)
-  let search = ''
-  let hash = ''
-
-  let hashIndex = pathname.indexOf('#')
-  if (hashIndex !== -1) {
-    hash = pathname.substring(hashIndex)
-    pathname = pathname.substring(0, hashIndex)
-  }
-
-  let searchIndex = pathname.indexOf('?')
-  if (searchIndex !== -1) {
-    search = pathname.substring(searchIndex)
-    pathname = pathname.substring(0, searchIndex)
-  }
-
-  if (pathname === '')
-    pathname = '/'
-
-  return {
-    pathname,
-    search,
-    hash,
-    state,
-    action,
-    key
-  }
-}
-
 function locationsAreEqual(a, b) {
   return a.pathname === b.pathname &&
     a.search === b.search &&
@@ -203,6 +173,36 @@ function createHistory(options={}) {
     return path
   }
 
+  function createLocation(path='/', state=null, action=POP, key=createKey()) {
+    let pathname = extractPath(path)
+    let search = ''
+    let hash = ''
+
+    let hashIndex = pathname.indexOf('#')
+    if (hashIndex !== -1) {
+      hash = pathname.substring(hashIndex)
+      pathname = pathname.substring(0, hashIndex)
+    }
+
+    let searchIndex = pathname.indexOf('?')
+    if (searchIndex !== -1) {
+      search = pathname.substring(searchIndex)
+      pathname = pathname.substring(0, searchIndex)
+    }
+
+    if (pathname === '')
+      pathname = '/'
+
+    return {
+      pathname,
+      search,
+      hash,
+      state,
+      action,
+      key
+    }
+  }
+
   // deprecated
   function setState(state) {
     if (location) {