Improve coverage

src/ast/nodes/ExportDefaultDeclaration.ts

@@ -17,13 +17,13 @@ import { ExpressionNode, IncludeChildren, NodeBase } from './shared/Node';
 const WHITESPACE = /\s/;
 
 // The header ends at the first non-white-space after "default"
-function getDeclarationStart(code: string, start = 0) {
+function getDeclarationStart(code: string, start: number) {
 	start = findFirstOccurrenceOutsideComment(code, 'default', start) + 7;
 	while (WHITESPACE.test(code[start])) start++;
 	return start;
 }
 
-function getIdInsertPosition(code: string, declarationKeyword: string, start = 0) {
+function getIdInsertPosition(code: string, declarationKeyword: string, start: number) {
 	const declarationEnd =
 		findFirstOccurrenceOutsideComment(code, declarationKeyword, start) + declarationKeyword.length;
 	code = code.slice(declarationEnd, findFirstOccurrenceOutsideComment(code, '{', declarationEnd));
@@ -84,15 +84,7 @@ export default class ExportDefaultDeclaration extends NodeBase {
 			);
 		} else if (this.variable.getOriginalVariable() !== this.variable) {
 			// Remove altogether to prevent re-declaring the same variable
-			if (options.format === 'system' && this.variable.exportName) {
-				code.overwrite(
-					start,
-					end,
-					`exports('${this.variable.exportName}', ${this.variable.getName()});`
-				);
-			} else {
-				treeshakeNode(this, code, start, end);
-			}
+			treeshakeNode(this, code, start, end);
 			return;
 		} else if (this.variable.included) {
 			this.renderVariableDeclaration(code, declarationStart, options);

src/ast/variables/ExportDefaultVariable.ts

@@ -73,22 +73,4 @@ export default class ExportDefaultVariable extends LocalVariable {
 		}
 		return this.originalVariable;
 	}
-
-	setRenderNames(baseName: string | null, name: string | null) {
-		const original = this.getOriginalVariable();
-		if (original === this) {
-			super.setRenderNames(baseName, name);
-		} else {
-			original.setRenderNames(baseName, name);
-		}
-	}
-
-	setSafeName(name: string | null) {
-		const original = this.getOriginalVariable();
-		if (original === this) {
-			super.setSafeName(name);
-		} else {
-			original.setSafeName(name);
-		}
-	}
 }

test/form/samples/aaa/_config.js

@@ -0,0 +1,8 @@
+module.exports = {
+	description: 'puts the export after the declaration for default exported classes in SystemJS',
+	options: {
+		output: {
+			name: 'bundle'
+		}
+	}
+};

test/form/samples/aaa/_expected/amd.js

@@ -0,0 +1,11 @@
+define(function () { 'use strict';
+
+	class main {
+		constructor() {
+			console.log('class');
+		}
+	}
+
+	return main;
+
+});

test/form/samples/aaa/_expected/cjs.js

@@ -0,0 +1,9 @@
+'use strict';
+
+class main {
+	constructor() {
+		console.log('class');
+	}
+}
+
+module.exports = main;

test/form/samples/aaa/_expected/es.js

@@ -0,0 +1,7 @@
+class main {
+	constructor() {
+		console.log('class');
+	}
+}
+
+export default main;

test/form/samples/aaa/_expected/iife.js

@@ -0,0 +1,12 @@
+var bundle = (function () {
+	'use strict';
+
+	class main {
+		constructor() {
+			console.log('class');
+		}
+	}
+
+	return main;
+
+}());

test/form/samples/aaa/_expected/system.js

@@ -0,0 +1,14 @@
+System.register('bundle', [], function (exports) {
+	'use strict';
+	return {
+		execute: function () {
+
+			class main {
+				constructor() {
+					console.log('class');
+				}
+			} exports('default', main);
+
+		}
+	};
+});

test/form/samples/aaa/_expected/umd.js

@@ -0,0 +1,15 @@
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(global = global || self, global.bundle = factory());
+}(this, (function () { 'use strict';
+
+	class main {
+		constructor() {
+			console.log('class');
+		}
+	}
+
+	return main;
+
+})));

test/form/samples/aaa/main.js

@@ -0,0 +1,5 @@
+export default class {
+	constructor() {
+		console.log('class');
+	}
+}