fix(deconflictChunk): Deconflict multiple index imports for ES form…

…at using nested export star statements (#3435)

* Add failing test for barrel exports #3365

* Update expected outputs

* Fix expected output

* Set chunkOrExternalModule.variableName in deconflictImportsEsm

* Dconflict deps when preserveModules is true

* Update system-exports-wrap-pure-annotation

* Actually use preserveModules flag

* Only deconflict deps in esm to minimize impact

* Update tests expected output

* Update test, add more context to comment

src/utils/deconflictChunk.ts

@@ -18,7 +18,7 @@ const DECONFLICT_IMPORTED_VARIABLES_BY_FORMAT: {
 	cjs: deconflictImportsOther,
 	es: deconflictImportsEsm,
 	iife: deconflictImportsOther,
-	system: deconflictImportsEsm,
+	system: deconflictImportsEsmOrSystem,
 	umd: deconflictImportsOther
 };
 
@@ -49,6 +49,29 @@ export function deconflictChunk(
 }
 
 function deconflictImportsEsm(
+	usedNames: Set<string>,
+	imports: Set<Variable>,
+	dependencies: Set<ExternalModule | Chunk>,
+	interop: boolean,
+	preserveModules: boolean
+) {
+	// Deconflict re-exported variables of dependencies when preserveModules is true.
+	// However, this implementation will result in unnecessary variable renaming without
+	// a deeper, wider fix.
+	//
+	// TODO: https://github.com/rollup/rollup/pull/3435#discussion_r390792792
+	if (preserveModules) {
+		for (const chunkOrExternalModule of dependencies) {
+			chunkOrExternalModule.variableName = getSafeName(
+				chunkOrExternalModule.variableName,
+				usedNames
+			);
+		}
+	}
+	deconflictImportsEsmOrSystem(usedNames, imports, dependencies, interop);
+}
+
+function deconflictImportsEsmOrSystem(
 	usedNames: Set<string>,
 	imports: Set<Variable>,
 	_dependencies: Set<ExternalModule | Chunk>,

test/chunking-form/samples/preserve-modules-commonjs/_expected/es/_virtual/_external_commonjs-external

@@ -1,5 +1,5 @@
-import external from 'external';
+import external$1 from 'external';
 
 
 
-export default external;
+export default external$1;

test/chunking-form/samples/preserve-modules-commonjs/_expected/es/_virtual/other.js_commonjs-proxy

@@ -1,5 +1,5 @@
-import { __moduleExports as other } from '../other.js';
+import { __moduleExports as other$1 } from '../other.js';
 
 
 
-export default other;
+export default other$1;

test/chunking-form/samples/preserve-modules-commonjs/_expected/es/commonjs.js

@@ -1,10 +1,10 @@
 import 'external';
-import external from './_virtual/_external_commonjs-external';
+import external$1 from './_virtual/_external_commonjs-external';
 import require$$0 from './_virtual/other.js_commonjs-proxy';
 
 const { value } = require$$0;
 
-console.log(external, value);
+console.log(external$1, value);
 
 var commonjs = 42;
 

test/chunking-form/samples/preserve-modules-commonjs/_expected/es/main.js

@@ -1,4 +1,4 @@
-import external from 'external';
+import external$1 from 'external';
 import value from './commonjs.js';
 
-console.log(value, external);
+console.log(value, external$1);

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_config.js

@@ -0,0 +1,7 @@
+module.exports = {
+	description: 'confirm exports are deconflicted when exporting nested index aliases',
+	options: {
+		input: 'main.js',
+		preserveModules: true
+	}
+};

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/main.js

@@ -0,0 +1,10 @@
+define(['exports', './module-a/v1/index', './module-b/v1/index'], function (exports, index, index$1) { 'use strict';
+
+
+
+	exports.ModuleA_V1 = index;
+	exports.ModuleB_V1 = index$1;
+
+	Object.defineProperty(exports, '__esModule', { value: true });
+
+});

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/module-a/v1/index.js

@@ -0,0 +1,9 @@
+define(['exports'], function (exports) { 'use strict';
+
+	const TEST_MODULE_A = 'A';
+
+	exports.TEST_MODULE_A = TEST_MODULE_A;
+
+	Object.defineProperty(exports, '__esModule', { value: true });
+
+});

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/module-b/v1/index.js

@@ -0,0 +1,9 @@
+define(['exports'], function (exports) { 'use strict';
+
+	const TEST_MODULE_B = 'A';
+
+	exports.TEST_MODULE_B = TEST_MODULE_B;
+
+	Object.defineProperty(exports, '__esModule', { value: true });
+
+});

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/main.js

@@ -0,0 +1,11 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var index = require('./module-a/v1/index.js');
+var index$1 = require('./module-b/v1/index.js');
+
+
+
+exports.ModuleA_V1 = index;
+exports.ModuleB_V1 = index$1;

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/module-a/v1/index.js

@@ -0,0 +1,7 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const TEST_MODULE_A = 'A';
+
+exports.TEST_MODULE_A = TEST_MODULE_A;

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/module-b/v1/index.js

@@ -0,0 +1,7 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const TEST_MODULE_B = 'A';
+
+exports.TEST_MODULE_B = TEST_MODULE_B;

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/es/main.js

@@ -0,0 +1,4 @@
+import * as index from './module-a/v1/index.js';
+export { index as ModuleA_V1 };
+import * as index$1 from './module-b/v1/index.js';
+export { index$1 as ModuleB_V1 };

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/es/module-a/v1/index.js

@@ -0,0 +1,3 @@
+const TEST_MODULE_A = 'A';
+
+export { TEST_MODULE_A };

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/es/module-b/v1/index.js

@@ -0,0 +1,3 @@
+const TEST_MODULE_B = 'A';
+
+export { TEST_MODULE_B };

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/system/main.js

@@ -0,0 +1,15 @@
+System.register(['./module-a/v1/index.js', './module-b/v1/index.js'], function (exports) {
+	'use strict';
+	return {
+		setters: [function (module) {
+			exports('ModuleA_V1', module);
+		}, function (module) {
+			exports('ModuleB_V1', module);
+		}],
+		execute: function () {
+
+
+
+		}
+	};
+});

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/system/module-a/v1/index.js

@@ -0,0 +1,10 @@
+System.register([], function (exports) {
+	'use strict';
+	return {
+		execute: function () {
+
+			const TEST_MODULE_A = exports('TEST_MODULE_A', 'A');
+
+		}
+	};
+});

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/system/module-b/v1/index.js

@@ -0,0 +1,10 @@
+System.register([], function (exports) {
+	'use strict';
+	return {
+		execute: function () {
+
+			const TEST_MODULE_B = exports('TEST_MODULE_B', 'A');
+
+		}
+	};
+});

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/main.js

@@ -0,0 +1,2 @@
+export * from './module-a/index'
+export * from './module-b/index'

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/module-a/index.js

@@ -0,0 +1,3 @@
+import * as ModuleA_V1 from './v1/index'
+
+export { ModuleA_V1 }

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/module-a/v1/index.js

@@ -0,0 +1 @@
+export const TEST_MODULE_A = 'A'

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/module-b/index.js

@@ -0,0 +1,3 @@
+import * as ModuleB_V1 from './v1/index'
+
+export { ModuleB_V1 }

test/chunking-form/samples/preserve-modules-nested-barrel-es-export/module-b/v1/index.js

@@ -0,0 +1 @@
+export const TEST_MODULE_B = 'A'

test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/es/main.js

@@ -1,4 +1,4 @@
-import { a } from './a.js';
+import { a as a$1 } from './a.js';
 import { d } from './one.js';
 
-console.log(a + d);
+console.log(a$1 + d);

test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/es/one.js

@@ -1,5 +1,5 @@
-import { b } from './b.js';
+import { b as b$1 } from './b.js';
 
-const d = b + 4;
+const d = b$1 + 4;
 
 export { d };

test/misc/bundle-information.js

@@ -381,9 +381,9 @@ describe('The bundle object', () => {
 				assert.deepEqual(
 					output.map(chunk => chunk.code),
 					[
-						`import { other } from './other';
+						`import { other as other$1 } from './other';
 
-console.log(other);Promise.all([import('./dynamic1'), import('./dynamic2')]).then(([{dynamic1}, {dynamic2}]) => console.log(dynamic1, dynamic2));\n`,
+console.log(other$1);Promise.all([import('./dynamic1'), import('./dynamic2')]).then(([{dynamic1}, {dynamic2}]) => console.log(dynamic1, dynamic2));\n`,
 						'const dynamic1 = "dynamic1";\n\nexport { dynamic1 };\n',
 						'const other = "other";\n\nexport { other };\n',
 						'const dynamic2 = "dynamic2";\n\nexport { dynamic2 };\n'
@@ -418,7 +418,7 @@ console.log(other);Promise.all([import('./dynamic1'), import('./dynamic2')]).the
 								originalLength: 169,
 								removedExports: [],
 								renderedExports: [],
-								renderedLength: 141
+								renderedLength: 143
 							}
 						},
 						{