Fix handling of patterns that are method names

remix-run · Jul 29, 2016 · 83d0bf5 · 83d0bf5
1 parent 4fd1db5
commit 83d0bf5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/modules/PatternUtils.js b/modules/PatternUtils.js
@@ -49,10 +49,10 @@ function _compilePattern(pattern) {
   }
 }
 
-const CompiledPatternsCache = {}
+const CompiledPatternsCache = Object.create(null)
 
 export function compilePattern(pattern) {
-  if (!(pattern in CompiledPatternsCache))
+  if (!CompiledPatternsCache[pattern])
     CompiledPatternsCache[pattern] = _compilePattern(pattern)
 
   return CompiledPatternsCache[pattern]

diff --git a/modules/__tests__/getParamNames-test.js b/modules/__tests__/getParamNames-test.js
@@ -19,4 +19,10 @@ describe('getParamNames', function () {
       expect(getParamNames('/files/*.jpg')).toEqual([ 'splat' ])
     })
   })
+
+  describe('when a pattern has the same name as a built-in method', function () {
+    it('should work', function () {
+      expect(getParamNames('toString')).toEqual([])
+    })
+  })
 })
diff --git a/modules/__tests__/matchPattern-test.js b/modules/__tests__/matchPattern-test.js
@@ -41,4 +41,8 @@ describe('matchPattern', function () {
     assertMatch('/**/*.jpg', '/files/path/to/file.jpg', '', [ 'splat', 'splat' ], [ 'files/path/to', 'file' ])
   })
 
+  it('works with patterns that match built-in names', function () {
+    assertMatch('toString', '/toString', '', [], [])
+  })
+
 })