Just always use regexp

Author: Tyler Rockwood

src/utils/detectors.js

@@ -1,27 +1,18 @@
-import {
-  useTopLevelImportPaths,
-  useTopLevelImportPathPatterns,
-} from './options'
+import escapeRegExp from 'lodash/escapeRegExp'
+import { useTopLevelImportPathMatchers } from './options'
 
-const VALID_TOP_LEVEL_IMPORT_PATHS = [
+const VALID_TOP_LEVEL_IMPORT_PATH_MATCHERS = [
   'styled-components',
   'styled-components/no-tags',
   'styled-components/native',
   'styled-components/primitives',
-]
+].map(literal => new RegExp(`^${escapeRegExp(literal)}$`))
 
 export const isValidTopLevelImport = (x, state) => {
-  const isValid = [
-    ...VALID_TOP_LEVEL_IMPORT_PATHS,
-    ...useTopLevelImportPaths(state),
-  ].includes(x)
-  if (isValid) return true
-  for (const pattern of useTopLevelImportPathPatterns(state)) {
-    if (pattern.test(x)) {
-      return x
-    }
-  }
-  return false
+  return [
+    ...VALID_TOP_LEVEL_IMPORT_PATH_MATCHERS,
+    ...useTopLevelImportPathMatchers(state),
+  ].some(re => re.test(x));
 }
 
 const localNameCache = {}

src/utils/options.js

@@ -5,12 +5,8 @@ function getOption({ opts }, name, defaultValue = true) {
 }
 
 export const useDisplayName = state => getOption(state, 'displayName')
-export const useTopLevelImportPaths = state =>
-  getOption(state, 'topLevelImportPaths', [])
-export const useTopLevelImportPathPatterns = state =>
-  getOption(state, 'topLevelImportPathPatterns', []).map(
-    pattern => new RegExp(pattern)
-  )
+export const useTopLevelImportPathMatchers = state =>
+  getOption(state, 'topLevelImportPaths', []).map(pattern => new RegExp(pattern))
 export const useSSR = state => getOption(state, 'ssr', true)
 export const useFileName = state => getOption(state, 'fileName')
 export const useMinify = state => getOption(state, 'minify')

test/fixtures/add-identifier-with-top-level-import-path-patterns-and-named-import/.babelrc

@@ -6,7 +6,7 @@
         "displayName": true,
         "fileName": false,
         "ssr": true,
-        "topLevelImportPaths": ["@example/example"],
+        "topLevelImportPaths": [".*\/example$"],
         "transpileTemplateLiterals": false
       }
     ]

test/fixtures/add-identifier-with-top-level-import-path-patterns-and-named-import/code.js

@@ -1,4 +1,4 @@
-import { styled } from '@example/example'
+import { styled } from '../../relative/example'
 
 const Test = styled.div`
   width: 100%;