add support for single method package imports in LodashContext

wix-incubator · Oct 18, 2017 · 3037b9f · 3037b9f
1 parent 2ed03fc
commit 3037b9f
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/src/util/importUtil.js b/src/util/importUtil.js
@@ -10,7 +10,7 @@ function getNameFromCjsRequire(init) {
 
 const isFullLodashImport = str => /^lodash(-es)?$/.test(str)
 const getMethodImportFromName = str => {
-    const match = /^lodash(-es)?\/(?!fp)(\w+)$/.exec(str)
+    const match = /^lodash(-es\/|[./])(?!fp)(\w+)$/.exec(str)
     return match && match[2]
 }
 

diff --git a/tests/lib/util/LodashContext.js b/tests/lib/util/LodashContext.js
@@ -65,6 +65,22 @@ describe('LodashContext', () => {
                     }
                 }))
             })
+            it('should accept a single method package import as lodash', done => {
+                visitWithContext('import map from "lodash.map"; map(arr, x => x)', {sourceType: 'module'}, lodashContext => ({
+                    CallExpression(node) {
+                        assert(lodashContext.methods[node.callee.name] === 'map')
+                        done()
+                    }
+                }))
+            })
+            it('should not accept a single method packge import from lodash-es as lodash', done => {
+                visitWithContext('import map from "lodash-es.map"; map(arr, x => x)', {sourceType: 'module'}, lodashContext => ({
+                    CallExpression(node) {
+                        assert(!lodashContext.methods[node.callee.name])
+                        done()
+                    }
+                }))
+            })
             it('should not throw error when trying to import lodash for side effects', () => {
                 traverser('import "lodash"', {sourceType: 'module'})
                     .runRuleCode(context => (new LodashContext(context)).getImportVisitors())
@@ -139,6 +155,26 @@ describe('LodashContext', () => {
                     }
                 }))
             })
+            it('should accept a single method package require', done => {
+                visitWithContext('const map = require("lodash.map"); map(arr, x => x)', undefined, lodashContext => ({
+                    CallExpression(node) {
+                        if (node.callee.name === 'map') {
+                            assert(lodashContext.methods[node.callee.name] === 'map')
+                            done()
+                        }
+                    }
+                }))
+            })
+            it('should not accept a single method package require from lodash-es', done => {
+                visitWithContext('const map = require("lodash-es.map"); map(arr, x => x)', undefined, lodashContext => ({
+                    CallExpression(node) {
+                        if (node.callee.name === 'map') {
+                            assert(!lodashContext.methods[node.callee.name])
+                            done()
+                        }
+                    }
+                }))
+            })
             it('should not collect arbitrary requires', done => {
                 visitWithContext('const map = require("some-other-map"); map(arr, x => x)', undefined, lodashContext => ({
                     CallExpression(node) {
@@ -319,4 +355,4 @@ describe('LodashContext', () => {
             }))
         })
     })
-})
+})