Merge branch 'NaridaL-class-name-not-changed' into release-0.56.5

# Conflicts:
#	src/ast/nodes/ClassDeclaration.ts
#	src/finalisers/es.ts

CHANGELOG.md

@@ -1,8 +1,9 @@
 # rollup changelog
 
 ## 0.56.5
-* Convert code style via prettier ([#2031](https://github.com/rollup/rollup/pull/2031))
+* Preserve ids when deconflicting classes ([#2025](https://github.com/rollup/rollup/pull/2025))
 * Fix an issue with re-exported namespace imports ([#2034](https://github.com/rollup/rollup/pull/2034))
+* Convert code style via prettier ([#2031](https://github.com/rollup/rollup/pull/2031))
 * Fix links in documentation ([#2026](https://github.com/rollup/rollup/pull/2026))
 
 ## 0.56.4

src/ast/nodes/ClassDeclaration.ts

@@ -30,6 +30,13 @@ export default class ClassDeclaration extends ClassNode {
 				` exports('${this.id.variable.exportName}', ${this.id.variable.getName()});`
 			);
 		}
+		if (this.id) {
+			const name = this.id.variable.getName();
+			if (name !== this.id.variable.name) {
+				code.appendRight(this.start, `let ${this.id.variable.safeName} = `);
+				code.prependLeft(this.end, ';');
+			}
+		}
 		super.render(code, options);
 	}
 }

src/ast/nodes/Identifier.ts

@@ -16,6 +16,7 @@ import {
 import { NodeType } from './NodeType';
 import AssignmentExpression from './AssignmentExpression';
 import UpdateExpression from './UpdateExpression';
+import ClassDeclaration from './ClassDeclaration';
 import { RenderOptions } from '../../utils/renderHelpers';
 
 export function isIdentifier(node: Node): node is Identifier {
@@ -162,7 +163,13 @@ export default class Identifier extends NodeBase {
 		if (this.variable) {
 			const name = this.variable.getName();
 
-			if (name !== this.name) {
+			if (
+				name !== this.name &&
+				!(
+					this.parent.type === NodeType.ClassDeclaration &&
+					(<ClassDeclaration>this.parent).id === this
+				)
+			) {
 				code.overwrite(this.start, this.end, name, {
 					storeName: true,
 					contentOnly: false

src/finalisers/es.ts

@@ -59,7 +59,10 @@ export default function es(
 					output += '\n';
 				}
 				if (namespaceReexport) {
-					if (!imports || !imports.some(specifier => specifier.imported === '*' && specifier.local === name))
+					if (
+						!imports ||
+						!imports.some(specifier => specifier.imported === '*' && specifier.local === name)
+					)
 						output += `import * as ${name} from '${getPath(id)}';\n`;
 					output += `export { ${
 						name === namespaceReexport.reexported

test/form/samples/class-name-not-changed/MyClass.js

@@ -0,0 +1,3 @@
+export class MyClass {
+	constructor() { }
+}

test/form/samples/class-name-not-changed/_config.js

@@ -0,0 +1,4 @@
+module.exports = {
+	description: 'class name should not be changed, even if symbol is renamed',
+	options: { output: { name: 'myBundle' } }
+};

test/form/samples/class-name-not-changed/_expected/amd.js

@@ -0,0 +1,17 @@
+define(['exports'], function (exports) { 'use strict';
+
+	class MyClass {
+		constructor() { }
+	}
+
+	let MyClass$1 = class MyClass {
+		constructor() { }
+	}; /* comment */ functionCall();
+	assert.equal(MyClass$1.name, "MyClass"); // oops
+
+	exports.MyClass = MyClass$1;
+	exports.MyClass2 = MyClass;
+
+	Object.defineProperty(exports, '__esModule', { value: true });
+
+});

test/form/samples/class-name-not-changed/_expected/cjs.js

@@ -0,0 +1,15 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+class MyClass {
+	constructor() { }
+}
+
+let MyClass$1 = class MyClass {
+	constructor() { }
+}; /* comment */ functionCall();
+assert.equal(MyClass$1.name, "MyClass"); // oops
+
+exports.MyClass = MyClass$1;
+exports.MyClass2 = MyClass;

test/form/samples/class-name-not-changed/_expected/es.js

@@ -0,0 +1,10 @@
+class MyClass {
+	constructor() { }
+}
+
+let MyClass$1 = class MyClass {
+	constructor() { }
+}; /* comment */ functionCall();
+assert.equal(MyClass$1.name, "MyClass"); // oops
+
+export { MyClass$1 as MyClass, MyClass as MyClass2 };

test/form/samples/class-name-not-changed/_expected/iife.js

@@ -0,0 +1,18 @@
+var myBundle = (function (exports) {
+	'use strict';
+
+	class MyClass {
+		constructor() { }
+	}
+
+	let MyClass$1 = class MyClass {
+		constructor() { }
+	}; /* comment */ functionCall();
+	assert.equal(MyClass$1.name, "MyClass"); // oops
+
+	exports.MyClass = MyClass$1;
+	exports.MyClass2 = MyClass;
+
+	return exports;
+
+}({}));

test/form/samples/class-name-not-changed/_expected/system.js

@@ -0,0 +1,17 @@
+System.register([], function (exports, module) {
+	'use strict';
+	return {
+		execute: function () {
+
+			class MyClass {
+				constructor() { }
+			} exports('MyClass2', MyClass);
+
+			let MyClass$1 = class MyClass {
+				constructor() { }
+			}; exports('MyClass', MyClass$1); /* comment */ functionCall();
+			assert.equal(MyClass$1.name, "MyClass"); // oops
+
+		}
+	};
+});

test/form/samples/class-name-not-changed/_expected/umd.js

@@ -0,0 +1,21 @@
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+	typeof define === 'function' && define.amd ? define(['exports'], factory) :
+	(factory((global.myBundle = {})));
+}(this, (function (exports) { 'use strict';
+
+	class MyClass {
+		constructor() { }
+	}
+
+	let MyClass$1 = class MyClass {
+		constructor() { }
+	}; /* comment */ functionCall();
+	assert.equal(MyClass$1.name, "MyClass"); // oops
+
+	exports.MyClass = MyClass$1;
+	exports.MyClass2 = MyClass;
+
+	Object.defineProperty(exports, '__esModule', { value: true });
+
+})));

test/form/samples/class-name-not-changed/main.js

@@ -0,0 +1,5 @@
+export class MyClass {
+	constructor() { }
+} /* comment */ functionCall()
+assert.equal(MyClass.name, "MyClass") // oops
+export { MyClass as MyClass2 } from "./MyClass"

test/function/samples/class-name-not-changed/MyClass.js

@@ -0,0 +1,3 @@
+export class MyClass {
+	constructor() { }
+}

test/function/samples/class-name-not-changed/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'class name should not be changed, even if symbol is renamed'
+};

test/function/samples/class-name-not-changed/main.js

@@ -0,0 +1,5 @@
+export class MyClass {
+	constructor() { }
+}
+assert.equal(MyClass.name, "MyClass") // oops
+export { MyClass as MyClass2 } from "./MyClass"