No encode, decode in createLocation

modules/LocationUtils.js

@@ -1,5 +1,6 @@
 import resolvePathname from 'resolve-pathname'
 import valueEqual from 'value-equal'
+import warning from 'warning'
 import { parsePath } from './PathUtils'
 
 export const createLocation = (path, state, key, currentLocation) => {
@@ -33,7 +34,19 @@ export const createLocation = (path, state, key, currentLocation) => {
       location.state = state
   }
 
-  location.pathname = decodeURI(location.pathname)
+  try {
+    location.pathname = decodeURI(location.pathname)
+  } catch (e) {
+    if (e instanceof URIError) {
+      warning(
+        false,
+        'Pathname "' + location.pathname + '" could not be decoded. ' + 
+        'Location\'s pathname will be encoded.'
+      )
+    } else {
+      throw e
+    }
+  }
 
   if (key)
     location.key = key

modules/PathUtils.js

@@ -37,16 +37,32 @@ export const parsePath = (path) => {
   }
 }
 
+const validatePath = (path) => {
+  try {
+    decodeURI(path)
+  } catch(e) {
+    if (e instanceof URIError) {
+      throw new Error(
+        'You are attempting to create a path that cannot be decoded. ' +
+        'Please call encodeURI on the pathname.'
+      )
+    }
+    throw e
+  }
+}
+
 export const createPath = (location) => {
   const { pathname, search, hash } = location
 
   let path = pathname || '/'
+  validatePath(path)
 
   if (search && search !== '?')
     path += (search.charAt(0) === '?' ? search : `?${search}`)
 
   if (hash && hash !== '#')
     path += (hash.charAt(0) === '#' ? hash : `#${hash}`)
 
+
   return path
 }

modules/__tests__/BrowserHistory-test.js

@@ -71,6 +71,12 @@ describeHistory('a browser history', () => {
       })
     })
 
+    describe('push with an invalid path string (bad percent-encoding)', () => {
+      it('throws an error', (done) => {
+        TestSequences.PushInvalidPathname(history, done)
+      })
+    })
+
     describe('replace a new path', () => {
       it('calls change listeners with the new location', (done) => {
         TestSequences.ReplaceNewLocation(history, done)
@@ -89,6 +95,12 @@ describeHistory('a browser history', () => {
       })
     })
 
+    describe('replace  with an invalid path string (bad percent-encoding)', () => {
+      it('throws an error', (done) => {
+        TestSequences.ReplaceInvalidPathname(history, done)
+      })
+    })
+
     describe('location created by encoded and unencoded pathname', () => {
       it('produces the same location.pathname', (done) => {
         TestSequences.LocationPathnameAlwaysDecoded(history, done)

modules/__tests__/HashHistory-test.js

@@ -74,6 +74,12 @@ describeHistory('a hash history', () => {
       })
     })
 
+    describe('push with an invalid path string (bad percent-encoding)', () => {
+      it('throws an error', (done) => {
+        TestSequences.PushInvalidPathname(history, done)
+      })
+    })
+
     describe('replace a new path', () => {
       it('calls change listeners with the new location', (done) => {
         TestSequences.ReplaceNewLocation(history, done)
@@ -92,6 +98,12 @@ describeHistory('a hash history', () => {
       })
     })
 
+    describe('replace  with an invalid path string (bad percent-encoding)', () => {
+      it('throws an error', (done) => {
+        TestSequences.ReplaceInvalidPathname(history, done)
+      })
+    })
+
     describe('location created by encoded and unencoded pathname', () => {
       it('produces the same location.pathname', (done) => {
         TestSequences.LocationPathnameAlwaysDecoded(history, done)

modules/__tests__/LocationUtils-test.js

@@ -112,6 +112,55 @@ describe('createLocation', () => {
     })
   })
 
+  describe('with a path that cannot be decoded', () => {
+    let consoleError = console.error // eslint-disable-line no-console
+    let warningMessage
+
+    beforeEach(() => {
+      console.error = (message) => { // eslint-disable-line no-console
+        warningMessage = message
+      }
+    })
+
+    afterEach(() => {
+      console.error = consoleError // eslint-disable-line no-console
+    })
+
+    describe('given as a string', () => {
+      it('does not throw when decodeURI throws a URIError, but logs warning', () => {
+        expect(() => {
+          createLocation('/test%')
+          expect(warningMessage).toBe(
+            'Warning: Pathname "/test%" could not be decoded. ' +
+            'Location\'s pathname will be encoded.'
+          )
+        }).toNotThrow()
+      })
+
+      it('sets pathname to be encoded string', () => {
+        const location = createLocation('/test%')
+        expect(location).toMatch({ pathname: '/test%' })
+      })
+    })
+
+    describe('given as an object', () => {
+      it('does not throw when decodeURI throws a URIError, but logs warning', () => {
+        expect(() => {
+          createLocation({ pathname: '/test%' })
+          expect(warningMessage).toBe(
+            'Warning: Pathname "/test%" could not be decoded. ' +
+            'Location\'s pathname will be encoded.'
+          )
+        }).toNotThrow()
+      })
+
+      it('sets pathname to be encoded string', () => {
+        const location = createLocation({ pathname: '/test%' })
+        expect(location).toMatch({ pathname: '/test%' })
+      })
+    })
+  })
+
   describe('key', () => {
     it('has a key property if a key is provided', () => {
       const location = createLocation('/the/path', undefined, 'key')

modules/__tests__/TestSequences/PushInvalidPathname.js

@@ -0,0 +1,26 @@
+import expect from 'expect'
+import execSteps from './execSteps'
+
+export default (history, done) => {
+  const steps = [
+    () => {
+      // encoded string
+      const pathname = '/hello%'
+      expect(() => {
+        history.push(pathname)
+      }).toThrow(
+        'You are attempting to create a path that cannot be decoded. ' +
+        'Please call encodeURI on the pathname.'
+      )
+    }
+  ]
+
+  let consoleError = console.error // eslint-disable-line no-console
+
+  console.error = () => {} // eslint-disable-line no-console
+
+  execSteps(steps, history, (...args) => {
+    console.error = consoleError // eslint-disable-line no-console
+    done(...args)
+  })
+}

modules/__tests__/TestSequences/ReplaceInvalidPathname.js

@@ -0,0 +1,26 @@
+import expect from 'expect'
+import execSteps from './execSteps'
+
+export default (history, done) => {
+  const steps = [
+    () => {
+      // encoded string
+      const pathname = '/hello%'
+      expect(() => {
+        history.replace(pathname)
+      }).toThrow(
+        'You are attempting to create a path that cannot be decoded. ' +
+        'Please call encodeURI on the pathname.'
+      )
+    }
+  ]
+
+  let consoleError = console.error // eslint-disable-line no-console
+
+  console.error = () => {} // eslint-disable-line no-console
+
+  execSteps(steps, history, (...args) => {
+    console.error = consoleError // eslint-disable-line no-console
+    done(...args)
+  })
+}

modules/__tests__/TestSequences/index.js

@@ -15,6 +15,7 @@ export Listen from './Listen'
 export LocationPathnameAlwaysDecoded from './LocationPathnameAlwaysDecoded'
 export NoslashHashPathCoding from './NoslashHashPathCoding'
 export PushEncodedLocation from './PushEncodedLocation'
+export PushInvalidPathname from './PushInvalidPathname'
 export PushNewLocation from './PushNewLocation'
 export PushMissingPathname from './PushMissingPathname'
 export PushSamePath from './PushSamePath'
@@ -23,6 +24,7 @@ export PushState from './PushState'
 export PushStateWarning from './PushStateWarning'
 export PushRelativePathname from './PushRelativePathname'
 export PushUnicodeLocation from './PushUnicodeLocation'
+export ReplaceInvalidPathname from './ReplaceInvalidPathname'
 export ReplaceNewLocation from './ReplaceNewLocation'
 export ReplaceSamePath from './ReplaceSamePath'
 export ReplaceState from './ReplaceState'