Incorporate escape-string-regexp function (#540)

Author: ericgio

package.json

@@ -42,7 +42,6 @@
   "dependencies": {
     "@babel/runtime": "^7.3.4",
     "classnames": "^2.2.0",
-    "escape-string-regexp": "^3.0.0",
     "fast-deep-equal": "^3.1.1",
     "invariant": "^2.2.1",
     "lodash.debounce": "^4.0.8",

src/__tests__/utils/getMatchBounds.test.js

@@ -1,4 +1,4 @@
-import { getMatchBounds } from '../../utils';
+import { escapeStringRegexp, getMatchBounds } from '../../utils';
 
 describe('getMatchBounds', () => {
   test('handles a normal string', () => {
@@ -43,3 +43,14 @@ describe('getMatchBounds', () => {
     expect(bounds.end).toBe(22);
   });
 });
+
+describe('escapeStringRegexp', () => {
+  test('main', () => {
+    expect(escapeStringRegexp('\\ ^ $ * + ? . ( ) | { } [ ]'))
+      .toBe('\\\\ \\^ \\$ \\* \\+ \\? \\. \\( \\) \\| \\{ \\} \\[ \\]');
+  });
+
+  test('escapes `-` in a way compatible with PCRE', () => {
+    expect(escapeStringRegexp('foo - bar')).toBe('foo \\x2d bar');
+  });
+});

src/utils/getMatchBounds.js

@@ -1,6 +1,6 @@
 // @flow
 
-import escapeStringRegexp from 'escape-string-regexp';
+import invariant from 'invariant';
 import stripDiacritics from './stripDiacritics';
 
 const CASE_INSENSITIVE = 'i';
@@ -11,6 +11,22 @@ type MatchBounds = {
   start: number,
 };
 
+// Export for testing.
+export function escapeStringRegexp(str: string): string {
+  invariant(
+    typeof str === 'string',
+    '`escapeStringRegexp` expected a string.'
+  );
+
+  // Escape characters with special meaning either inside or outside character
+  // sets. Use a simple backslash escape when it’s always valid, and a \unnnn
+  // escape when the simpler form would be disallowed by Unicode patterns’
+  // stricter grammar.
+  return str
+    .replace(/[|\\{}()[\]^$+*?.]/g, '\\$&')
+    .replace(/-/g, '\\x2d');
+}
+
 export default function getMatchBounds(
   subject: string,
   str: string

src/utils/index.js

@@ -5,7 +5,7 @@ export getHintText from './getHintText';
 export getInputProps from './getInputProps';
 export getInputText from './getInputText';
 export getIsOnlyResult from './getIsOnlyResult';
-export getMatchBounds from './getMatchBounds';
+export getMatchBounds, { escapeStringRegexp } from './getMatchBounds';
 export getMenuItemId from './getMenuItemId';
 export getOptionLabel from './getOptionLabel';
 export getOptionProperty from './getOptionProperty';

yarn.lock

@@ -3150,11 +3150,6 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
-escape-string-regexp@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-3.0.0.tgz#1dad9cc28aed682be0de197280f79911a5fccd61"
-  integrity sha512-11dXIUC3umvzEViLP117d0KN6LJzZxh5+9F4E/7WLAAw7GrHk8NpUR+g9iJi/pe9C0py4F8rs0hreyRCwlAuZg==
-
 escodegen@^1.9.1:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457"