Use entryFileNames when generating filenames for virtual modules (#4270)

* Use entryFileNames for virtual files when preserveModules is set

* Fix existing tests

- virtual files now have a .js extension by default
- systemjs module references include this file extension
- amd module references omit this file extension. this seems to be
  consistent with amd output of other chunks

* Add new test for virtual file output when modifying entryFileNames

Use entryFileNames to change the extension of the filename to be mjs,
and see that the file created from the virtual file chunk has a .mjs
extension

Note that the amd definition contains the .mjs extension, as amd ids only
strip the .js file extension, which is slightly odd but probably ok as
this amd is not the targetted usecase for this behaviour

* Refactor - don't repeat pattern generation logic

src/Chunk.ts

@@ -434,23 +434,22 @@ export default class Chunk {
 		const id = this.orderedModules[0].id;
 		const sanitizedId = this.outputOptions.sanitizeFileName(id);
 		let path: string;
+
+		const patternOpt = unsetOptions.has('entryFileNames')
+			? '[name][assetExtname].js'
+			: options.entryFileNames;
+		const pattern = typeof patternOpt === 'function' ? patternOpt(this.getChunkInfo()) : patternOpt;
+
 		if (isAbsolute(id)) {
-			const extension = extname(id);
-			const pattern = unsetOptions.has('entryFileNames')
-				? '[name][assetExtname].js'
-				: options.entryFileNames;
 			const currentDir = dirname(sanitizedId);
-			const fileName = renderNamePattern(
-				typeof pattern === 'function' ? pattern(this.getChunkInfo()) : pattern,
-				'output.entryFileNames',
-				{
-					assetExtname: () => (NON_ASSET_EXTENSIONS.includes(extension) ? '' : extension),
-					ext: () => extension.substr(1),
-					extname: () => extension,
-					format: () => options.format as string,
-					name: () => this.getChunkName()
-				}
-			);
+			const extension = extname(id);
+			const fileName = renderNamePattern(pattern, 'output.entryFileNames', {
+				assetExtname: () => (NON_ASSET_EXTENSIONS.includes(extension) ? '' : extension),
+				ext: () => extension.substr(1),
+				extname: () => extension,
+				format: () => options.format as string,
+				name: () => this.getChunkName()
+			});
 			const currentPath = `${currentDir}/${fileName}`;
 			const { preserveModulesRoot } = options;
 			if (preserveModulesRoot && currentPath.startsWith(preserveModulesRoot)) {
@@ -459,7 +458,15 @@ export default class Chunk {
 				path = relative(preserveModulesRelativeDir, currentPath);
 			}
 		} else {
-			path = `_virtual/${basename(sanitizedId)}`;
+			const extension = extname(sanitizedId);
+			const fileName = renderNamePattern(pattern, 'output.entryFileNames', {
+				assetExtname: () => (NON_ASSET_EXTENSIONS.includes(extension) ? '' : extension),
+				ext: () => extension.substr(1),
+				extname: () => extension,
+				format: () => options.format as string,
+				name: () => getAliasName(sanitizedId)
+			});
+			path = `_virtual/${fileName}`;
 		}
 		return makeUnique(normalize(path), existingNames);
 	}

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

@@ -2,7 +2,7 @@
 
 var require$$0 = require('external');
 require('./other.js');
-var other = require('./_virtual/other.js_commonjs-exports');
+var other = require('./_virtual/other.js_commonjs-exports.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 

test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/other.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var other = require('./_virtual/other.js_commonjs-exports');
+var other = require('./_virtual/other.js_commonjs-exports.js');
 
 other.__exports.value = 43;
 

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

@@ -1,6 +1,6 @@
 import require$$0 from 'external';
 import './other.js';
-import { __exports as other } from './_virtual/other.js_commonjs-exports';
+import { __exports as other } from './_virtual/other.js_commonjs-exports.js';
 
 const external = require$$0;
 const { value } = other;

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

@@ -1,4 +1,4 @@
-import { __exports as other } from './_virtual/other.js_commonjs-exports';
-export { __exports as default } from './_virtual/other.js_commonjs-exports';
+import { __exports as other } from './_virtual/other.js_commonjs-exports.js';
+export { __exports as default } from './_virtual/other.js_commonjs-exports.js';
 
 other.value = 43;

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

@@ -1,4 +1,4 @@
-System.register(['external', './other.js', './_virtual/other.js_commonjs-exports'], (function (exports) {
+System.register(['external', './other.js', './_virtual/other.js_commonjs-exports.js'], (function (exports) {
 	'use strict';
 	var require$$0, other;
 	return {

test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/other.js

@@ -1,4 +1,4 @@
-System.register(['./_virtual/other.js_commonjs-exports'], (function (exports) {
+System.register(['./_virtual/other.js_commonjs-exports.js'], (function (exports) {
 	'use strict';
 	var other;
 	return {

test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/cjs/main.js

@@ -1,5 +1,5 @@
 'use strict';
 
-var _virtualModule = require('./_virtual/_virtualModule');
+var _virtualModule = require('./_virtual/_virtualModule.js');
 
 assert.equal(_virtualModule.virtual, 'Virtual!');

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

@@ -1,3 +1,3 @@
-import { virtual } from './_virtual/_virtualModule';
+import { virtual } from './_virtual/_virtualModule.js';
 
 assert.equal(virtual, 'Virtual!');

test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/system/main.js

@@ -1,4 +1,4 @@
-System.register(['./_virtual/_virtualModule'], (function () {
+System.register(['./_virtual/_virtualModule.js'], (function () {
 	'use strict';
 	var virtual;
 	return {

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

@@ -2,7 +2,7 @@
 
 var require$$0 = require('external');
 require('./other.js');
-var other = require('./_virtual/other.js_commonjs-exports');
+var other = require('./_virtual/other.js_commonjs-exports.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 

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

@@ -1,6 +1,6 @@
 'use strict';
 
-var other = require('./_virtual/other.js_commonjs-exports');
+var other = require('./_virtual/other.js_commonjs-exports.js');
 
 other.__exports.value = 43;
 

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

@@ -1,6 +1,6 @@
 import require$$0 from 'external';
 import './other.js';
-import { __exports as other } from './_virtual/other.js_commonjs-exports';
+import { __exports as other } from './_virtual/other.js_commonjs-exports.js';
 
 const external = require$$0;
 const { value } = other;

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

@@ -1,4 +1,4 @@
-import { __exports as other } from './_virtual/other.js_commonjs-exports';
-export { __exports as default } from './_virtual/other.js_commonjs-exports';
+import { __exports as other } from './_virtual/other.js_commonjs-exports.js';
+export { __exports as default } from './_virtual/other.js_commonjs-exports.js';
 
 other.value = 43;

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

@@ -1,4 +1,4 @@
-System.register(['external', './other.js', './_virtual/other.js_commonjs-exports'], (function (exports) {
+System.register(['external', './other.js', './_virtual/other.js_commonjs-exports.js'], (function (exports) {
 	'use strict';
 	var require$$0, other;
 	return {

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

@@ -1,4 +1,4 @@
-System.register(['./_virtual/other.js_commonjs-exports'], (function (exports) {
+System.register(['./_virtual/other.js_commonjs-exports.js'], (function (exports) {
 	'use strict';
 	var other;
 	return {

test/chunking-form/samples/preserve-modules-root/_expected/cjs/below/module.js

@@ -1,7 +1,7 @@
 'use strict';
 
 require('../custom_modules/@my-scope/my-base-pkg/index.js');
-var index = require('../_virtual/index.js_commonjs-exports');
+var index = require('../_virtual/index.js_commonjs-exports.js');
 
 const base2 = index.__exports;
 

test/chunking-form/samples/preserve-modules-root/_expected/cjs/custom_modules/@my-scope/my-base-pkg/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('../../../_virtual/index.js_commonjs-exports');
+var index = require('../../../_virtual/index.js_commonjs-exports.js');
 
 Object.defineProperty(index.__exports, '__esModule', { value: true });
 

test/chunking-form/samples/preserve-modules-root/_expected/cjs/under-build.js

@@ -1,7 +1,7 @@
 'use strict';
 
 require('./custom_modules/@my-scope/my-base-pkg/index.js');
-var index = require('./_virtual/index.js_commonjs-exports');
+var index = require('./_virtual/index.js_commonjs-exports.js');
 
 const base = index.__exports;
 

test/chunking-form/samples/preserve-modules-root/_expected/es/below/module.js

@@ -1,5 +1,5 @@
 import '../custom_modules/@my-scope/my-base-pkg/index.js';
-import { __exports as myBasePkg } from '../_virtual/index.js_commonjs-exports';
+import { __exports as myBasePkg } from '../_virtual/index.js_commonjs-exports.js';
 
 const base2 = myBasePkg;
 

test/chunking-form/samples/preserve-modules-root/_expected/es/custom_modules/@my-scope/my-base-pkg/index.js

@@ -1,5 +1,5 @@
-import { __exports as myBasePkg } from '../../../_virtual/index.js_commonjs-exports';
-export { __exports as default } from '../../../_virtual/index.js_commonjs-exports';
+import { __exports as myBasePkg } from '../../../_virtual/index.js_commonjs-exports.js';
+export { __exports as default } from '../../../_virtual/index.js_commonjs-exports.js';
 
 Object.defineProperty(myBasePkg, '__esModule', { value: true });
 

test/chunking-form/samples/preserve-modules-root/_expected/es/under-build.js

@@ -1,5 +1,5 @@
 import './custom_modules/@my-scope/my-base-pkg/index.js';
-import { __exports as myBasePkg } from './_virtual/index.js_commonjs-exports';
+import { __exports as myBasePkg } from './_virtual/index.js_commonjs-exports.js';
 
 const base = myBasePkg;
 

test/chunking-form/samples/preserve-modules-root/_expected/system/below/module.js

@@ -1,4 +1,4 @@
-System.register(['../custom_modules/@my-scope/my-base-pkg/index.js', '../_virtual/index.js_commonjs-exports'], (function (exports) {
+System.register(['../custom_modules/@my-scope/my-base-pkg/index.js', '../_virtual/index.js_commonjs-exports.js'], (function (exports) {
   'use strict';
   var myBasePkg;
   return {

test/chunking-form/samples/preserve-modules-root/_expected/system/custom_modules/@my-scope/my-base-pkg/index.js

@@ -1,4 +1,4 @@
-System.register(['../../../_virtual/index.js_commonjs-exports'], (function (exports) {
+System.register(['../../../_virtual/index.js_commonjs-exports.js'], (function (exports) {
 	'use strict';
 	var myBasePkg;
 	return {

test/chunking-form/samples/preserve-modules-root/_expected/system/under-build.js

@@ -1,4 +1,4 @@
-System.register(['./custom_modules/@my-scope/my-base-pkg/index.js', './_virtual/index.js_commonjs-exports'], (function (exports) {
+System.register(['./custom_modules/@my-scope/my-base-pkg/index.js', './_virtual/index.js_commonjs-exports.js'], (function (exports) {
 	'use strict';
 	var myBasePkg;
 	return {

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

@@ -0,0 +1,34 @@
+module.exports = {
+	description:
+		'Generates actual files whose filename adheres to entryFileNames for virtual modules when preserving modules',
+	options: {
+		input: 'main.js',
+		output: {
+			preserveModules: true,
+			entryFileNames: 'entry-[name]-[format]-[ext][extname][assetExtname].mjs'
+		},
+		plugins: [
+			{
+				resolveId(id) {
+					if (id === '\0virtualModule') return id;
+					if (id === '\0virtualWithExt.js') return id;
+					if (id === '\0virtualWithAssetExt.str') return id;
+				},
+				load(id) {
+					if (id === '\0virtualModule') return 'export const virtual = "Virtual!";\n';
+					if (id === '\0virtualWithExt.js') return 'export const virtual2 = "Virtual2!";\n';
+					if (id === '\0virtualWithAssetExt.str') return 'export const virtual3 = "Virtual3!";\n';
+				},
+				transform(code, id) {
+					if (id === '\0virtualModule') return null;
+					if (id === '\0virtualWithExt.js') return null;
+					if (id === '\0virtualWithAssetExt.str') return null;
+					return (
+						'import {virtual} from "\0virtualModule";\nimport {virtual2} from "\0virtualWithExt.js";\nimport {virtual3} from "\0virtualWithAssetExt.str";' +
+						code
+					);
+				}
+			}
+		]
+	}
+};

test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/entry-_virtualWithAssetExt-amd-str.str.str.mjs

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

test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/entry-_virtualWithExt-amd-js.js.mjs

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

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

@@ -0,0 +1,7 @@
+define(['./_virtual/entry-_virtualModule-amd-.mjs', './_virtual/entry-_virtualWithExt-amd-js.js.mjs', './_virtual/entry-_virtualWithAssetExt-amd-str.str.str.mjs'], (function (_virtualModule, _virtualWithExt, _virtualWithAssetExt) { 'use strict';
+
+	assert.equal(_virtualModule.virtual, 'Virtual!');
+	assert.equal(_virtualWithExt.virtual2, 'Virtual2!');
+	assert.equal(_virtualWithAssetExt.virtual3, 'Virtual3!');
+
+}));

test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/entry-_virtualWithAssetExt-cjs-str.str.str.mjs

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

test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/entry-_virtualWithExt-cjs-js.js.mjs

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

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

@@ -0,0 +1,9 @@
+'use strict';
+
+var _virtualModule = require('./_virtual/entry-_virtualModule-cjs-.mjs');
+var _virtualWithExt = require('./_virtual/entry-_virtualWithExt-cjs-js.js.mjs');
+var _virtualWithAssetExt = require('./_virtual/entry-_virtualWithAssetExt-cjs-str.str.str.mjs');
+
+assert.equal(_virtualModule.virtual, 'Virtual!');
+assert.equal(_virtualWithExt.virtual2, 'Virtual2!');
+assert.equal(_virtualWithAssetExt.virtual3, 'Virtual3!');

test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/entry-_virtualWithAssetExt-es-str.str.str.mjs

@@ -0,0 +1,3 @@
+const virtual3 = "Virtual3!";
+
+export { virtual3 };

test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/entry-_virtualWithExt-es-js.js.mjs

@@ -0,0 +1,3 @@
+const virtual2 = "Virtual2!";
+
+export { virtual2 };

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

@@ -0,0 +1,7 @@
+import { virtual } from './_virtual/entry-_virtualModule-es-.mjs';
+import { virtual2 } from './_virtual/entry-_virtualWithExt-es-js.js.mjs';
+import { virtual3 } from './_virtual/entry-_virtualWithAssetExt-es-str.str.str.mjs';
+
+assert.equal(virtual, 'Virtual!');
+assert.equal(virtual2, 'Virtual2!');
+assert.equal(virtual3, 'Virtual3!');

test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/entry-_virtualWithAssetExt-system-str.str.str.mjs

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

test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/entry-_virtualWithExt-system-js.js.mjs

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

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

@@ -0,0 +1,20 @@
+System.register(['./_virtual/entry-_virtualModule-system-.mjs', './_virtual/entry-_virtualWithExt-system-js.js.mjs', './_virtual/entry-_virtualWithAssetExt-system-str.str.str.mjs'], (function () {
+	'use strict';
+	var virtual, virtual2, virtual3;
+	return {
+		setters: [function (module) {
+			virtual = module.virtual;
+		}, function (module) {
+			virtual2 = module.virtual2;
+		}, function (module) {
+			virtual3 = module.virtual3;
+		}],
+		execute: (function () {
+
+			assert.equal(virtual, 'Virtual!');
+			assert.equal(virtual2, 'Virtual2!');
+			assert.equal(virtual3, 'Virtual3!');
+
+		})
+	};
+}));

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

@@ -0,0 +1,3 @@
+assert.equal(virtual, 'Virtual!');
+assert.equal(virtual2, 'Virtual2!');
+assert.equal(virtual3, 'Virtual3!');

test/chunking-form/samples/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule.js

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

test/chunking-form/samples/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule.js

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