use cherry-pick style lodash imports

Author: Bo Lingen

src/index.js

@@ -618,30 +618,32 @@ export default function (babel) {
       }
 
       const specifierNames = imports[importPath];
-      const specifiers = [];
 
       if (useRequire) {
         // eg; `const { map, uniq } = require('lodash');`
         for (const specifierName of specifierNames) {
           const importIdentifier = t.identifier(specifierName);
-          specifiers.push(t.objectProperty(importIdentifier, importIdentifier, false, true));
+
+          const requireCall = t.callExpression(t.identifier("require"), [
+            t.stringLiteral(importPath + '/' + specifierName)
+          ]);
+          const requireStmt = t.variableDeclaration("const", [
+            t.variableDeclarator(importIdentifier, requireCall),
+          ]);
+
+          declarations.push(requireStmt);
         }
-        const requirePattern = t.objectPattern(specifiers);
-        const requireCall = t.callExpression(t.identifier("require"), [
-          t.stringLiteral(importPath)
-        ]);
-        const requireStmt = t.variableDeclaration("const", [
-          t.variableDeclarator(requirePattern, requireCall),
-        ]);
-        declarations.push(requireStmt);
       } else {
         // eg; `import { map, uniq } from 'lodash';`
         for (const specifierName of specifierNames) {
           const importIdentifier = t.identifier(specifierName);
-          specifiers.push(t.importSpecifier(importIdentifier, importIdentifier));
+          const importSpecifier = t.importDefaultSpecifier(importIdentifier);
+          const importDeclaration = t.importDeclaration(
+            [importSpecifier],
+            t.stringLiteral(importPath + '/' + specifierName)
+          );
+          declarations.push(importDeclaration);
         }
-        const importDeclaration = t.importDeclaration(specifiers, t.stringLiteral(importPath));
-        declarations.push(importDeclaration);
       }
     }
     path.unshiftContainer("body", declarations);

test/fixtures/stdlib/kitchen-sink/expected.js

@@ -1,4 +1,5 @@
-import { map, round } from 'lodash';
+import map from 'lodash/map';
+import round from 'lodash/round';
 
 function looseEq(a, b) {
   return a == b;
@@ -16,4 +17,4 @@ function uniq(x) {
   return x;
 }
 
-uniq(map([0.1, 0.2, 0.5, 0.9], round));
+uniq(map([0.1, 0.2, 0.5, 0.9], round));

test/fixtures/stdlib/lodash-true/expected.js

@@ -1,2 +1,2 @@
-import { uniq } from "lodash";
-uniq();
+import uniq from "lodash/uniq";
+uniq();

test/fixtures/stdlib/overridden/expected.js

@@ -1,8 +1,8 @@
-import { map } from "lodash";
+import map from "lodash/map";
 
 function uniq() {
   return 1;
 }
 
 uniq();
-map();
+map();

test/fixtures/stdlib/require-true/expected.js

@@ -6,10 +6,9 @@ function looseNotEq(a, b) {
   return a != b;
 }
 
-const {
-  map,
-  round
-} = require('lodash');
+const map = require('lodash/map');
+
+const round = require('lodash/round');
 
 looseEq(1, '1');
 looseNotEq(1, '1');
@@ -19,4 +18,4 @@ function uniq(x) {
   return x;
 }
 
-uniq(map([0.1, 0.2, 0.5, 0.9], round));
+uniq(map([0.1, 0.2, 0.5, 0.9], round));