Slightly improve code

src/ast/nodes/ClassDeclaration.ts

@@ -37,20 +37,18 @@ export default class ClassDeclaration extends ClassNode {
 		} = options;
 		if (this.id) {
 			const { variable, name } = this.id;
+			if (format === 'system' && exportNamesByVariable.has(variable)) {
+				code.appendLeft(this.end, `${_}${getSystemExportStatement([variable], options)};`);
+			}
 			const renderedVariable = variable.getName(getPropertyAccess);
 			if (renderedVariable !== name) {
 				this.superClass?.render(code, options);
 				this.body.render(code, options);
 				code.prependRight(this.start, `let ${renderedVariable}${_}=${_}`);
-				code.appendLeft(this.end, ';');
-			} else {
-				super.render(code, options);
+				code.prependLeft(this.end, ';');
+				return;
 			}
-		} else {
-			super.render(code, options);
-		}
-		if (format === 'system' && this.id && exportNamesByVariable.has(this.id.variable)) {
-			code.appendLeft(this.end, `${_}${getSystemExportStatement([this.id.variable], options)};`);
 		}
+		super.render(code, options);
 	}
 }

test/form/samples/exported-class-declaration-conflict/_config.js

@@ -0,0 +1,4 @@
+module.exports = {
+	description: 'handles exporting class declarations with name conflicts in SystemJS',
+	options: { output: { name: 'bundle' } }
+};

test/form/samples/exported-class-declaration-conflict/_expected/amd.js

@@ -0,0 +1,10 @@
+define(['exports'], (function (exports) { 'use strict';
+
+	let Foo$1 = class Foo {};
+
+	class Foo {}
+
+	exports.First = Foo$1;
+	exports.Second = Foo;
+
+}));

test/form/samples/exported-class-declaration-conflict/_expected/cjs.js

@@ -0,0 +1,8 @@
+'use strict';
+
+let Foo$1 = class Foo {};
+
+class Foo {}
+
+exports.First = Foo$1;
+exports.Second = Foo;

test/form/samples/exported-class-declaration-conflict/_expected/es.js

@@ -0,0 +1,5 @@
+let Foo$1 = class Foo {};
+
+class Foo {}
+
+export { Foo$1 as First, Foo as Second };

test/form/samples/exported-class-declaration-conflict/_expected/iife.js

@@ -0,0 +1,13 @@
+var bundle = (function (exports) {
+	'use strict';
+
+	let Foo$1 = class Foo {};
+
+	class Foo {}
+
+	exports.First = Foo$1;
+	exports.Second = Foo;
+
+	return exports;
+
+})({});

test/form/samples/exported-class-declaration-conflict/_expected/system.js

@@ -0,0 +1,12 @@
+System.register('bundle', [], (function (exports) {
+	'use strict';
+	return {
+		execute: (function () {
+
+			let Foo$1 = class Foo {}; exports('First', Foo$1);
+
+			class Foo {} exports('Second', Foo);
+
+		})
+	};
+}));

test/form/samples/exported-class-declaration-conflict/_expected/umd.js

@@ -0,0 +1,14 @@
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+	typeof define === 'function' && define.amd ? define(['exports'], factory) :
+	(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}));
+})(this, (function (exports) { 'use strict';
+
+	let Foo$1 = class Foo {};
+
+	class Foo {}
+
+	exports.First = Foo$1;
+	exports.Second = Foo;
+
+}));

test/form/samples/exported-class-declaration-conflict/first.js

@@ -0,0 +1,2 @@
+class Foo {}
+export { Foo };

test/form/samples/exported-class-declaration-conflict/main.js

@@ -0,0 +1,2 @@
+export { Foo as First } from './first';
+export { Foo as Second } from './second';

test/form/samples/exported-class-declaration-conflict/second.js

@@ -0,0 +1,2 @@
+class Foo {}
+export { Foo };