Fix renamed external imports (parcel-bundler#3797)

* Add test

* Fix renaming of external imports

packages/core/integration-tests/package.json

@@ -27,6 +27,7 @@
     "jsdom": "^15.2.1",
     "json5": "^1.0.1",
     "kotlin": "^1.3.11",
+    "lodash": "^4.17.15",
     "marked": "^0.6.1",
     "ncp": "^2.0.0",
     "nyc": "^11.1.0",

packages/core/integration-tests/test/integration/formats/commonjs-destructuring-node/single-same.js

@@ -0,0 +1,4 @@
+import { assign as a } from "lodash/fp";
+import { assign as b } from "lodash";
+
+export const bar = a !== b;

packages/core/integration-tests/test/integration/formats/commonjs-external/named-same.js

@@ -0,0 +1,4 @@
+import { assign as a } from "lodash/fp";
+import { assign as b } from "lodash";
+
+export const bar = a !== b;

packages/core/integration-tests/test/integration/formats/esm-external/named-same.js

@@ -0,0 +1,4 @@
+import { assign as a } from "lodash/fp";
+import { assign as b } from "lodash";
+
+export const bar = a !== b;

packages/core/integration-tests/test/output-formats.js

@@ -66,6 +66,25 @@ describe('output formats', function() {
       assert.equal((await run(b)).bar, 3);
     });
 
+    it('should support commonjs output with external modules (named import with same name)', async function() {
+      let b = await bundle(
+        path.join(
+          __dirname,
+          '/integration/formats/commonjs-external/named-same.js'
+        )
+      );
+
+      let dist = await outputFS.readFile(b.getBundles()[0].filePath, 'utf8');
+      assert(dist.includes('exports.bar'));
+      assert(/var {\s*assign\s*} = require\("lodash\/fp"\)/.test(dist));
+      let match = dist.match(
+        /var {\s*assign:\s*(.*)\s*} = require\("lodash"\)/
+      );
+      assert(match);
+      assert.notEqual(match[1], 'assign');
+      assert.equal((await run(b)).bar, true);
+    });
+
     it('should support commonjs output with external modules (namespace import)', async function() {
       let b = await bundle(
         path.join(
@@ -133,6 +152,21 @@ describe('output formats', function() {
       assert.equal((await run(b)).bar, 3);
     });
 
+    it('should support commonjs output with old node without destructuring (multiple single with same name)', async function() {
+      let b = await bundle(
+        path.join(
+          __dirname,
+          '/integration/formats/commonjs-destructuring-node/single-same.js'
+        )
+      );
+
+      let dist = await outputFS.readFile(b.getBundles()[0].filePath, 'utf8');
+      assert(dist.includes('exports.bar'));
+      assert(dist.includes('var assign = require("lodash/fp").assign;'));
+      assert(dist.includes('var _assign = require("lodash").assign;'));
+      assert.equal((await run(b)).bar, true);
+    });
+
     it('should support commonjs output with old node without destructuring (multiple)', async function() {
       let b = await bundle(
         path.join(
@@ -320,6 +354,18 @@ describe('output formats', function() {
       assert(dist.includes('import { add } from "lodash"'));
     });
 
+    it('should support esmodule output with external modules (named import with same name)', async function() {
+      let b = await bundle(
+        path.join(__dirname, '/integration/formats/esm-external/named-same.js')
+      );
+
+      let dist = await outputFS.readFile(b.getBundles()[0].filePath, 'utf8');
+      assert(dist.includes('export const bar'));
+      assert(dist.includes('import { assign } from "lodash/fp"'));
+      assert(dist.includes('import { assign as _assign } from "lodash"'));
+      assert(dist.includes('assign !== _assign'));
+    });
+
     it('should support esmodule output with external modules (namespace import)', async function() {
       let b = await bundle(
         path.join(__dirname, '/integration/formats/esm-external/namespace.js')

packages/shared/scope-hoisting/src/formats/commonjs.js

@@ -53,8 +53,8 @@ function generateDestructuringAssignment(env, specifiers, value, scope) {
     for (let specifier of specifiers) {
       statements.push(
         ASSIGN_TEMPLATE({
-          SPECIFIERS: specifier.key,
-          MODULE: t.memberExpression(value, specifier.value)
+          SPECIFIERS: specifier.value,
+          MODULE: t.memberExpression(value, specifier.key)
         })
       );
     }

packages/shared/scope-hoisting/src/link.js

@@ -248,7 +248,7 @@ export function link({
           programScope.hasBinding(imported) ||
           programScope.hasReference(imported)
         ) {
-          programScope.generateUid(imported);
+          renamed = programScope.generateUid(imported);
         }
 
         programScope.references[renamed] = true;

yarn.lock

@@ -7992,6 +7992,11 @@ lodash@^4.16.4, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.4, lodash@^4.17.5
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba"
   integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==
 
+lodash@^4.17.15:
+  version "4.17.15"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+
 [email protected], log-symbols@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"