Deconflict top-level class and function expressions with ids (#2458)

src/ast/variables/ExportDefaultVariable.ts

@@ -2,6 +2,7 @@ import ClassDeclaration from '../nodes/ClassDeclaration';
 import ExportDefaultDeclaration from '../nodes/ExportDefaultDeclaration';
 import FunctionDeclaration from '../nodes/FunctionDeclaration';
 import Identifier from '../nodes/Identifier';
+import * as NodeType from '../nodes/NodeType';
 import { EntityPathTracker } from '../utils/EntityPathTracker';
 import LocalVariable from './LocalVariable';
 import Variable from './Variable';
@@ -28,8 +29,10 @@ export default class ExportDefaultVariable extends LocalVariable {
 			exportDefaultDeclaration.declaration,
 			deoptimizationTracker
 		);
-		this.hasId = !!(<FunctionDeclaration | ClassDeclaration>exportDefaultDeclaration.declaration)
-			.id;
+		this.hasId =
+			(exportDefaultDeclaration.declaration.type === NodeType.FunctionDeclaration ||
+				exportDefaultDeclaration.declaration.type === NodeType.ClassDeclaration) &&
+			!!(<FunctionDeclaration | ClassDeclaration>exportDefaultDeclaration.declaration).id;
 	}
 
 	addReference(identifier: Identifier) {

test/function/samples/deconflict-default-exported-named-function/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'deconflict default exported named function and class expressions'
+};

test/function/samples/deconflict-default-exported-named-function/classDeclaration1.js

@@ -0,0 +1,5 @@
+export default class test {
+	constructor() {
+		this.name = 'classDeclaration1';
+	}
+}

test/function/samples/deconflict-default-exported-named-function/classDeclaration2.js

@@ -0,0 +1,5 @@
+export default class test {
+	constructor() {
+		this.name = 'classDeclaration2';
+	}
+}

test/function/samples/deconflict-default-exported-named-function/classExpression1.js

@@ -0,0 +1,5 @@
+export default (class test {
+	constructor() {
+		this.name = 'classExpression1';
+	}
+})

test/function/samples/deconflict-default-exported-named-function/classExpression2.js

@@ -0,0 +1,5 @@
+export default (class test {
+	constructor() {
+		this.name = 'classExpression2';
+	}
+})

test/function/samples/deconflict-default-exported-named-function/functionDeclaration1.js

@@ -0,0 +1,3 @@
+export default function test() {
+	return 'functionDeclaration1';
+};

test/function/samples/deconflict-default-exported-named-function/functionDeclaration2.js

@@ -0,0 +1,3 @@
+export default function test() {
+	return 'functionDeclaration2';
+};

test/function/samples/deconflict-default-exported-named-function/functionExpression1.js

@@ -0,0 +1,3 @@
+export default (function test() {
+	return 'functionExpression1';
+});

test/function/samples/deconflict-default-exported-named-function/functionExpression2.js

@@ -0,0 +1,3 @@
+export default (function test() {
+	return 'functionExpression2';
+});

test/function/samples/deconflict-default-exported-named-function/main.js

@@ -0,0 +1,19 @@
+import ClassDeclaration1 from './classDeclaration1';
+import ClassDeclaration2 from './classDeclaration2';
+import ClassExpression1 from './classExpression1';
+import ClassExpression2 from './classExpression2';
+import functionDeclaration1 from './functionDeclaration1';
+import functionDeclaration2 from './functionDeclaration2';
+import functionExpression1 from './functionExpression1';
+import functionExpression2 from './functionExpression2';
+import { test } from './named.js';
+
+assert.equal(test(), 'named');
+assert.equal(functionDeclaration1(), 'functionDeclaration1');
+assert.equal(functionDeclaration2(), 'functionDeclaration2');
+assert.equal(functionExpression1(), 'functionExpression1');
+assert.equal(functionExpression2(), 'functionExpression2');
+assert.equal((new ClassDeclaration1()).name, 'classDeclaration1');
+assert.equal((new ClassDeclaration2()).name, 'classDeclaration2');
+assert.equal((new ClassExpression1()).name, 'classExpression1');
+assert.equal((new ClassExpression2()).name, 'classExpression2');

test/function/samples/deconflict-default-exported-named-function/named.js

@@ -0,0 +1,3 @@
+export const test = function() {
+	return 'named';
+};