Add support for entryFileNames pattern used in combination with prese…

…rveModules option

src/Chunk.ts

@@ -277,17 +277,27 @@ export default class Chunk {
 
 	generateIdPreserveModules(
 		preserveModulesRelativeDir: string,
+		options: OutputOptions,
 		existingNames: Record<string, any>
 	): string {
 		const sanitizedId = sanitizeFileName(this.orderedModules[0].id);
-		return makeUnique(
-			normalize(
-				isAbsolute(this.orderedModules[0].id)
-					? relative(preserveModulesRelativeDir, sanitizedId)
-					: '_virtual/' + basename(sanitizedId)
-			),
-			existingNames
-		);
+
+		let path: string;
+		if (isAbsolute(this.orderedModules[0].id)) {
+			const name = renderNamePattern(
+				options.entryFileNames || '[name].js',
+				'output.entryFileNames',
+				{
+					format: () => (options.format === 'es' ? 'esm' : (options.format as string)),
+					name: () => this.getChunkName()
+				}
+			);
+
+			path = relative(preserveModulesRelativeDir, `${dirname(sanitizedId)}/${name}`);
+		} else {
+			path = `_virtual/${basename(sanitizedId)}`;
+		}
+		return makeUnique(normalize(path), existingNames);
 	}
 
 	generateInternalExports(options: OutputOptions) {

src/utils/assignChunkIds.ts

@@ -27,7 +27,7 @@ export function assignChunkIds(
 		if (outputOptions.file) {
 			chunk.id = basename(outputOptions.file);
 		} else if (inputOptions.preserveModules) {
-			chunk.id = chunk.generateIdPreserveModules(inputBase, bundle);
+			chunk.id = chunk.generateIdPreserveModules(inputBase, outputOptions, bundle);
 		} else {
 			chunk.id = chunk.generateId(addons, outputOptions, bundle, true);
 		}

test/chunking-form/samples/preserve-modules-filename-pattern/_config.js

@@ -0,0 +1,10 @@
+module.exports = {
+	description: 'entryFileNames pattern supported in combination with preserveModules',
+	options: {
+		input: 'src/main.ts',
+		output: {
+			entryFileNames: 'entry-[name]-[format].js'
+		},
+		preserveModules: true
+	}
+};

test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/entry-foo-amd.js

@@ -0,0 +1,7 @@
+define(['exports'], function (exports) { 'use strict';
+
+	var foo = 42;
+
+	exports.default = foo;
+
+});

test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/entry-main-amd.js

@@ -0,0 +1,11 @@
+define(['exports', './entry-foo-amd', './nested/entry-bar-amd', './nested/entry-baz-amd'], function (exports, foo, bar, baz) { 'use strict';
+
+
+
+	exports.foo = foo.default;
+	exports.bar = bar.default;
+	exports.baz = baz.default;
+
+	Object.defineProperty(exports, '__esModule', { value: true });
+
+});

test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/nested/entry-bar-amd.js

@@ -0,0 +1,7 @@
+define(['exports'], function (exports) { 'use strict';
+
+	var bar = 'banana';
+
+	exports.default = bar;
+
+});

test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/nested/entry-baz-amd.js

@@ -0,0 +1,7 @@
+define(['exports'], function (exports) { 'use strict';
+
+	var baz = 'whatever';
+
+	exports.default = baz;
+
+});

test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/entry-foo-cjs.js

@@ -0,0 +1,5 @@
+'use strict';
+
+var foo = 42;
+
+exports.default = foo;

test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/entry-main-cjs.js

@@ -0,0 +1,13 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var foo = require('./entry-foo-cjs.js');
+var bar = require('./nested/entry-bar-cjs.js');
+var baz = require('./nested/entry-baz-cjs.js');
+
+
+
+exports.foo = foo.default;
+exports.bar = bar.default;
+exports.baz = baz.default;

test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/nested/entry-bar-cjs.js

@@ -0,0 +1,5 @@
+'use strict';
+
+var bar = 'banana';
+
+exports.default = bar;

test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/nested/entry-baz-cjs.js

@@ -0,0 +1,5 @@
+'use strict';
+
+var baz = 'whatever';
+
+exports.default = baz;

test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-foo-esm.js

@@ -0,0 +1,3 @@
+var foo = 42;
+
+export default foo;

test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-main-esm.js

@@ -0,0 +1,3 @@
+export { default as foo } from './entry-foo-esm.js';
+export { default as bar } from './nested/entry-bar-esm.js';
+export { default as baz } from './nested/entry-baz-esm.js';

test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/entry-bar-esm.js

@@ -0,0 +1,3 @@
+var bar = 'banana';
+
+export default bar;

test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/entry-baz-esm.js

@@ -0,0 +1,3 @@
+var baz = 'whatever';
+
+export default baz;

test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/entry-foo-system.js

@@ -0,0 +1,10 @@
+System.register([], function (exports) {
+	'use strict';
+	return {
+		execute: function () {
+
+			var foo = exports('default', 42);
+
+		}
+	};
+});

test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/entry-main-system.js

@@ -0,0 +1,17 @@
+System.register(['./entry-foo-system.js', './nested/entry-bar-system.js', './nested/entry-baz-system.js'], function (exports) {
+	'use strict';
+	return {
+		setters: [function (module) {
+			exports('foo', module.default);
+		}, function (module) {
+			exports('bar', module.default);
+		}, function (module) {
+			exports('baz', module.default);
+		}],
+		execute: function () {
+
+
+
+		}
+	};
+});

test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/nested/entry-bar-system.js

@@ -0,0 +1,10 @@
+System.register([], function (exports) {
+	'use strict';
+	return {
+		execute: function () {
+
+			var bar = exports('default', 'banana');
+
+		}
+	};
+});

test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/nested/entry-baz-system.js

@@ -0,0 +1,10 @@
+System.register([], function (exports) {
+	'use strict';
+	return {
+		execute: function () {
+
+			var baz = exports('default', 'whatever');
+
+		}
+	};
+});

test/chunking-form/samples/preserve-modules-filename-pattern/src/foo.ts

@@ -0,0 +1 @@
+export default 42;

test/chunking-form/samples/preserve-modules-filename-pattern/src/main.ts

@@ -0,0 +1,6 @@
+// @ts-ignore
+export { default as foo } from './foo.ts';
+// @ts-ignore
+export { default as bar } from './nested/bar.ts';
+// @ts-ignore
+export { default as baz } from './nested/baz.ts';

test/chunking-form/samples/preserve-modules-filename-pattern/src/nested/bar.ts

@@ -0,0 +1 @@
+export default 'banana';

test/chunking-form/samples/preserve-modules-filename-pattern/src/nested/baz.ts

@@ -0,0 +1 @@
+export default 'whatever';