Refactor regexp generators into shared module

Author: i-like-robots

lib/ReactTags.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import Tag from './Tag'
 import Input from './Input'
 import Suggestions from './Suggestions'
-import { escapeForRegExp } from './utils'
+import { matchExact, matchPartial } from './concerns/matchers'
 
 const KEYS = {
   ENTER: 'Enter',
@@ -34,10 +34,7 @@ function pressDelimiterKey (e) {
   if (this.state.query.length >= this.props.minQueryLength) {
     // Check if the user typed in an existing suggestion.
     const match = this.state.options.findIndex((option) => {
-      const query = escapeForRegExp(this.state.query)
-      const regex = new RegExp(`^${query}$`, 'i')
-
-      return regex.test(option.name)
+      return matchExact(this.state.query).test(option.name)
     })
 
     const index = this.state.selected === -1 ? match : this.state.selected
@@ -80,7 +77,7 @@ function pressBackspaceKey () {
 }
 
 function filterSuggestions (query, suggestions) {
-  const regexp = new RegExp(`(?:^|\\s)${escapeForRegExp(query)}`, 'i')
+  const regexp = matchPartial(query)
   return suggestions.filter((item) => regexp.test(item.name))
 }
 

lib/Suggestions.js

@@ -1,8 +1,8 @@
 import React from 'react'
-import { escapeForRegExp } from './utils'
+import { matchAny } from './concerns/matchers'
 
 function markIt (name, query) {
-  const regexp = new RegExp(escapeForRegExp(query), 'gi')
+  const regexp = matchAny(query)
   return name.replace(regexp, '<mark>$&</mark>')
 }
 

lib/concerns/matchers.js

@@ -0,0 +1,17 @@
+function escapeForRegExp (string) {
+  return string.replace(/[-\\^$*+?.()|[\]{}]/g, '\\$&')
+}
+
+function matchAny (string) {
+  return new RegExp(escapeForRegExp(string), 'gi')
+}
+
+function matchPartial (string) {
+  return new RegExp(`(?:^|\\s)${escapeForRegExp(string)}`, 'i')
+}
+
+function matchExact (string) {
+  return new RegExp(`^${escapeForRegExp(string)}$`, 'i')
+}
+
+module.exports = { escapeForRegExp, matchAny, matchPartial, matchExact }