add tests

rollup · Dec 22, 2019 · a69d8f7 · a69d8f7
1 parent 004fb25
commit a69d8f7
Show file tree

Hide file tree

Showing 26 changed files with 84 additions and 44 deletions.
diff --git a/src/Module.ts b/src/Module.ts
@@ -41,7 +41,7 @@ import {
 	RollupWarning,
 	TransformModuleJSON
 } from './rollup/types';
-import { error } from './utils/error';
+import { error, Errors, errSyntheticNamedExportsNeedDefault } from './utils/error';
 import getCodeFrame from './utils/getCodeFrame';
 import { getOriginalLocation } from './utils/getOriginalLocation';
 import { makeLegal } from './utils/identifierHelpers';
@@ -208,7 +208,6 @@ export default class Module {
 	scope!: ModuleScope;
 	sourcemapChain!: DecodedSourceMapOrMissing[];
 	sources = new Set<string>();
-	syntheticExports = new Map<string, SyntheticNamedExport>();
 	syntheticNamedExports: boolean;
 	transformFiles?: EmittedFile[];
 	userChunkNames = new Set<string>();
@@ -218,10 +217,12 @@ export default class Module {
 	private ast!: Program;
 	private astContext!: AstContext;
 	private context: string;
+	private defaultExport: ExportDefaultVariable | null | undefined = null;
 	private esTreeAst!: ESTree.Program;
 	private graph: Graph;
 	private magicString!: MagicString;
 	private namespaceVariable: NamespaceVariable | null = null;
+	private syntheticExports = new Map<string, SyntheticNamedExport>();
 	private transformDependencies: string[] = [];
 	private transitiveReexports: string[] | null = null;
 
@@ -310,6 +311,21 @@ export default class Module {
 		return allExportNames;
 	}
 
+	getDefaultExport() {
+		if (this.defaultExport === null) {
+			this.defaultExport = undefined;
+			this.defaultExport = this.astContext.traceExport('default') as ExportDefaultVariable;
+			if (!this.defaultExport) {
+				error({
+					code: Errors.SYNTHETIC_NAMED_EXPORTS_NEED_DEFAULT,
+					id: this.id,
+					message: `Modules with 'syntheticNamedExports' need a default export.`
+				});
+			}
+		}
+		return this.defaultExport;
+	}
+
 	getDynamicImportExpressions(): (string | Node)[] {
 		return this.dynamicImports.map(({ node }) => {
 			const importArgument = node.source;
@@ -454,12 +470,11 @@ export default class Module {
 			if (this.syntheticNamedExports) {
 				let syntheticExport = this.syntheticExports.get(name);
 				if (!syntheticExport && !this.exports[name]) {
-					syntheticExport = new SyntheticNamedExport(
-						this.astContext,
-						name,
-						this.astContext.traceExport('default') as ExportDefaultVariable
-					);
-					this.syntheticExports.set(name, syntheticExport);
+					const defaultExport = this.getDefaultExport();
+					if (defaultExport) {
+						syntheticExport = new SyntheticNamedExport(this.astContext, name, defaultExport);
+						this.syntheticExports.set(name, syntheticExport);
+					}
 				}
 				if (syntheticExport) {
 					return syntheticExport;

diff --git a/src/ast/variables/NamespaceVariable.ts b/src/ast/variables/NamespaceVariable.ts
@@ -39,10 +39,6 @@ export default class NamespaceVariable extends Variable {
 		}
 	}
 
-	getDefaultVariableName() {
-		return this.context.traceExport('default').getName();
-	}
-
 	include(context: InclusionContext) {
 		if (!this.included) {
 			if (this.containsExternalNamespace) {
@@ -106,16 +102,17 @@ export default class NamespaceVariable extends Variable {
 		}
 
 		const name = this.getName();
+		const defaultExport = this.syntheticNamedExports ? this.module.getDefaultExport() : undefined;
 
 		let output = '';
-		if (this.syntheticNamedExports && members.length === 0) {
-			output = this.getDefaultVariableName();
+		if (defaultExport && members.length === 0) {
+			output = defaultExport.getName();
 		} else {
 			members.unshift(`${t}__proto__:${_}null`);
 
 			output = `{${n}${members.join(`,${n}`)}${n}}`;
-			if (this.syntheticNamedExports) {
-				output = `Object.assign(${output}, ${this.getDefaultVariableName()})`;
+			if (defaultExport) {
+				output = `Object.assign(${output}, ${defaultExport.getName()})`;
 			}
 			if (options.freeze) {
 				output = `/*#__PURE__*/Object.freeze(${output})`;

diff --git a/src/ast/variables/SyntheticNamedExport.ts b/src/ast/variables/SyntheticNamedExport.ts
@@ -1,5 +1,4 @@
 import Module, { AstContext } from '../../Module';
-import { RenderOptions } from '../../utils/renderHelpers';
 import { InclusionContext } from '../ExecutionContext';
 import ExportDefaultVariable from './ExportDefaultVariable';
 import Variable from './Variable';

diff --git a/src/utils/error.ts b/src/utils/error.ts
@@ -55,7 +55,8 @@ export enum Errors {
 	UNRESOLVED_ENTRY = 'UNRESOLVED_ENTRY',
 	UNRESOLVED_IMPORT = 'UNRESOLVED_IMPORT',
 	VALIDATION_ERROR = 'VALIDATION_ERROR',
-	EXTERNAL_SYNTHETIC_EXPORTS = 'EXTERNAL_SYNTHETIC_EXPORTS'
+	EXTERNAL_SYNTHETIC_EXPORTS = 'EXTERNAL_SYNTHETIC_EXPORTS',
+	SYNTHETIC_NAMED_EXPORTS_NEED_DEFAULT = 'SYNTHETIC_NAMED_EXPORTS_NEED_DEFAULT'
 }
 
 export function errAssetNotFinalisedForFileName(name: string) {
@@ -268,7 +269,7 @@ export function errExternalSyntheticExports(source: string, importer: string) {
 	return {
 		code: Errors.EXTERNAL_SYNTHETIC_EXPORTS,
 		importer: relativeId(importer),
-		message: `External '${source}' can not have 'syntheticNamedExports' enabled`,
+		message: `External '${source}' can not have 'syntheticNamedExports' enabled.`,
 		source
 	};
 }

diff --git a/test/form/samples/compact/_expected/amd.js b/test/form/samples/compact/_expected/amd.js
@@ -1,4 +1,4 @@
-define(['external'],function(x){'use strict';x=x&&x.hasOwnProperty('default')?x['default']:x;var self=/*#__PURE__*/Object.freeze({[Symbol.toStringTag]:'Module',__proto__:null,get default(){return foo}});console.log(self);
+define(['external'],function(x){'use strict';x=x&&x.hasOwnProperty('default')?x['default']:x;var self=/*#__PURE__*/Object.freeze({__proto__:null,[Symbol.toStringTag]:'Module',get default(){return foo}});console.log(self);
 function foo () {
 	console.log( x );
 }

diff --git a/test/form/samples/compact/_expected/cjs.js b/test/form/samples/compact/_expected/cjs.js
@@ -1,4 +1,4 @@
-'use strict';function _interopDefault(e){return(e&&(typeof e==='object')&&'default'in e)?e['default']:e}var x=_interopDefault(require('external'));var self=/*#__PURE__*/Object.freeze({[Symbol.toStringTag]:'Module',__proto__:null,get default(){return foo}});console.log(self);
+'use strict';function _interopDefault(e){return(e&&(typeof e==='object')&&'default'in e)?e['default']:e}var x=_interopDefault(require('external'));var self=/*#__PURE__*/Object.freeze({__proto__:null,[Symbol.toStringTag]:'Module',get default(){return foo}});console.log(self);
 function foo () {
 	console.log( x );
 }

diff --git a/test/form/samples/compact/_expected/es.js b/test/form/samples/compact/_expected/es.js
@@ -1,4 +1,4 @@
-import x from'external';var self=/*#__PURE__*/Object.freeze({[Symbol.toStringTag]:'Module',__proto__:null,get default(){return foo}});console.log(self);
+import x from'external';var self=/*#__PURE__*/Object.freeze({__proto__:null,[Symbol.toStringTag]:'Module',get default(){return foo}});console.log(self);
 function foo () {
 	console.log( x );
 }

diff --git a/test/form/samples/compact/_expected/iife.js b/test/form/samples/compact/_expected/iife.js
@@ -1,4 +1,4 @@
-var foo=(function(x){'use strict';x=x&&x.hasOwnProperty('default')?x['default']:x;var self=/*#__PURE__*/Object.freeze({[Symbol.toStringTag]:'Module',__proto__:null,get default(){return foo}});console.log(self);
+var foo=(function(x){'use strict';x=x&&x.hasOwnProperty('default')?x['default']:x;var self=/*#__PURE__*/Object.freeze({__proto__:null,[Symbol.toStringTag]:'Module',get default(){return foo}});console.log(self);
 function foo () {
 	console.log( x );
 }

diff --git a/test/form/samples/compact/_expected/system.js b/test/form/samples/compact/_expected/system.js
@@ -1,4 +1,4 @@
-System.register('foo',['external'],function(exports){'use strict';var x;return{setters:[function(module){x=module.default;}],execute:function(){exports('default',foo);var self=/*#__PURE__*/Object.freeze({[Symbol.toStringTag]:'Module',__proto__:null,get default(){return foo}});console.log(self);
+System.register('foo',['external'],function(exports){'use strict';var x;return{setters:[function(module){x=module.default;}],execute:function(){exports('default',foo);var self=/*#__PURE__*/Object.freeze({__proto__:null,[Symbol.toStringTag]:'Module',get default(){return foo}});console.log(self);
 function foo () {
 	console.log( x );
 }

diff --git a/test/form/samples/compact/_expected/umd.js b/test/form/samples/compact/_expected/umd.js
@@ -1,4 +1,4 @@
-(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?module.exports=f(require('external')):typeof define==='function'&&define.amd?define(['external'],f):(g=g||self,g.foo=f(g.x));}(this,(function(x){'use strict';x=x&&x.hasOwnProperty('default')?x['default']:x;var self=/*#__PURE__*/Object.freeze({[Symbol.toStringTag]:'Module',__proto__:null,get default(){return foo}});console.log(self);
+(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?module.exports=f(require('external')):typeof define==='function'&&define.amd?define(['external'],f):(g=g||self,g.foo=f(g.x));}(this,(function(x){'use strict';x=x&&x.hasOwnProperty('default')?x['default']:x;var self=/*#__PURE__*/Object.freeze({__proto__:null,[Symbol.toStringTag]:'Module',get default(){return foo}});console.log(self);
 function foo () {
 	console.log( x );
 }

diff --git a/test/form/samples/freeze/_expected/amd.js b/test/form/samples/freeze/_expected/amd.js
@@ -3,11 +3,11 @@ define(['exports'], function (exports) { 'use strict';
 	const foo = 1;
 	const bar = 2;
 
-	var namespace = ({
+	var namespace = {
 		__proto__: null,
 		foo: foo,
 		bar: bar
-	});
+	};
 
 	console.log( Object.keys( namespace ) );
 

diff --git a/test/form/samples/freeze/_expected/cjs.js b/test/form/samples/freeze/_expected/cjs.js
@@ -5,11 +5,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 const foo = 1;
 const bar = 2;
 
-var namespace = ({
+var namespace = {
 	__proto__: null,
 	foo: foo,
 	bar: bar
-});
+};
 
 console.log( Object.keys( namespace ) );
 

diff --git a/test/form/samples/freeze/_expected/es.js b/test/form/samples/freeze/_expected/es.js
@@ -1,11 +1,11 @@
 const foo = 1;
 const bar = 2;
 
-var namespace = ({
+var namespace = {
 	__proto__: null,
 	foo: foo,
 	bar: bar
-});
+};
 
 console.log( Object.keys( namespace ) );
 

diff --git a/test/form/samples/freeze/_expected/iife.js b/test/form/samples/freeze/_expected/iife.js
@@ -4,11 +4,11 @@ var myBundle = (function (exports) {
 	const foo = 1;
 	const bar = 2;
 
-	var namespace = ({
+	var namespace = {
 		__proto__: null,
 		foo: foo,
 		bar: bar
-	});
+	};
 
 	console.log( Object.keys( namespace ) );
 

diff --git a/test/form/samples/freeze/_expected/system.js b/test/form/samples/freeze/_expected/system.js
@@ -6,11 +6,11 @@ System.register('myBundle', [], function (exports) {
 			const foo = 1;
 			const bar = 2;
 
-			var namespace = ({
+			var namespace = {
 				__proto__: null,
 				foo: foo,
 				bar: bar
-			});
+			};
 
 			console.log( Object.keys( namespace ) );
 

diff --git a/test/form/samples/freeze/_expected/umd.js b/test/form/samples/freeze/_expected/umd.js
@@ -7,11 +7,11 @@
 	const foo = 1;
 	const bar = 2;
 
-	var namespace = ({
+	var namespace = {
 		__proto__: null,
 		foo: foo,
 		bar: bar
-	});
+	};
 
 	console.log( Object.keys( namespace ) );
 

diff --git a/test/form/samples/namespace-tostringtag/_expected/amd.js b/test/form/samples/namespace-tostringtag/_expected/amd.js
@@ -1,8 +1,8 @@
 define(['exports'], function (exports) { 'use strict';
 
 	var self = /*#__PURE__*/Object.freeze({
-		[Symbol.toStringTag]: 'Module',
 		__proto__: null,
+		[Symbol.toStringTag]: 'Module',
 		get p () { return p; }
 	});
 

diff --git a/test/form/samples/namespace-tostringtag/_expected/cjs.js b/test/form/samples/namespace-tostringtag/_expected/cjs.js
@@ -3,8 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var self = /*#__PURE__*/Object.freeze({
-	[Symbol.toStringTag]: 'Module',
 	__proto__: null,
+	[Symbol.toStringTag]: 'Module',
 	get p () { return p; }
 });
 

diff --git a/test/form/samples/namespace-tostringtag/_expected/es.js b/test/form/samples/namespace-tostringtag/_expected/es.js
@@ -1,6 +1,6 @@
 var self = /*#__PURE__*/Object.freeze({
-	[Symbol.toStringTag]: 'Module',
 	__proto__: null,
+	[Symbol.toStringTag]: 'Module',
 	get p () { return p; }
 });
 

diff --git a/test/form/samples/namespace-tostringtag/_expected/iife.js b/test/form/samples/namespace-tostringtag/_expected/iife.js
@@ -2,8 +2,8 @@ var iife = (function (exports) {
 	'use strict';
 
 	var self = /*#__PURE__*/Object.freeze({
-		[Symbol.toStringTag]: 'Module',
 		__proto__: null,
+		[Symbol.toStringTag]: 'Module',
 		get p () { return p; }
 	});
 

diff --git a/test/form/samples/namespace-tostringtag/_expected/system.js b/test/form/samples/namespace-tostringtag/_expected/system.js
@@ -4,8 +4,8 @@ System.register('iife', [], function (exports) {
 		execute: function () {
 
 			var self = /*#__PURE__*/Object.freeze({
-				[Symbol.toStringTag]: 'Module',
 				__proto__: null,
+				[Symbol.toStringTag]: 'Module',
 				get p () { return p; }
 			});
 

diff --git a/test/form/samples/namespace-tostringtag/_expected/umd.js b/test/form/samples/namespace-tostringtag/_expected/umd.js
@@ -5,8 +5,8 @@
 }(this, (function (exports) { 'use strict';
 
 	var self = /*#__PURE__*/Object.freeze({
-		[Symbol.toStringTag]: 'Module',
 		__proto__: null,
+		[Symbol.toStringTag]: 'Module',
 		get p () { return p; }
 	});
 

diff --git a/test/function/samples/external-synthetic-exports/_config.js b/test/function/samples/external-synthetic-exports/_config.js
@@ -1,6 +1,5 @@
 module.exports = {
 	description: 'external modules can not have syntheticNamedExports',
-	solo: true,
 	options: {
 		plugins: [
 			{

diff --git a/test/function/samples/synthetic-exports-need-default/_config.js b/test/function/samples/synthetic-exports-need-default/_config.js
@@ -0,0 +1,25 @@
+const path = require('path');
+
+module.exports = {
+	description: 'synthetic named exports moduleds need a default export',
+	options: {
+		plugins: [
+			{
+				resolveId(id) {
+					if (id === './dep.js') {
+						return {
+							id,
+							syntheticNamedExports: true
+						};
+					}
+				}
+			}
+		]
+	},
+	error: {
+		code: 'SYNTHETIC_NAMED_EXPORTS_NEED_DEFAULT',
+		id: './dep.js',
+		message: "Modules with 'syntheticNamedExports' need a default export.",
+		watchFiles: [path.resolve(__dirname, 'main.js'), './dep.js']
+	}
+};
diff --git a/test/function/samples/synthetic-exports-need-default/dep.js b/test/function/samples/synthetic-exports-need-default/dep.js
@@ -0,0 +1 @@
+export const foo = 1;
diff --git a/test/function/samples/synthetic-exports-need-default/main.js b/test/function/samples/synthetic-exports-need-default/main.js
@@ -0,0 +1,3 @@
+import { a } from './dep.js';
+a;
+console.log(a);