fix: use the original class name in the class body

src/ast/nodes/Identifier.ts

@@ -244,11 +244,11 @@ export default class Identifier extends NodeBase implements PatternNode {
 
 	render(
 		code: MagicString,
-		{ snippets: { getPropertyAccess } }: RenderOptions,
+		{ snippets: { getPropertyAccess }, useOriginalName }: RenderOptions,
 		{ renderedParentType, isCalleeOfRenderedParent, isShorthandProperty }: NodeRenderOptions = BLANK
 	): void {
 		if (this.variable) {
-			const name = this.variable.getName(getPropertyAccess);
+			const name = this.variable.getName(getPropertyAccess, useOriginalName);
 
 			if (name !== this.name) {
 				code.overwrite(this.start, this.end, name, {

src/ast/nodes/StaticBlock.ts

@@ -3,7 +3,10 @@ import { type RenderOptions, renderStatementList } from '../../utils/renderHelpe
 import type { HasEffectsContext, InclusionContext } from '../ExecutionContext';
 import BlockScope from '../scopes/BlockScope';
 import type Scope from '../scopes/Scope';
+import type Variable from '../variables/Variable';
+import type ClassBody from './ClassBody';
 import type * as NodeType from './NodeType';
+import type ClassNode from './shared/ClassNode';
 import { type IncludeChildren, StatementBase, type StatementNode } from './shared/Node';
 
 export default class StaticBlock extends StatementBase {
@@ -30,6 +33,12 @@ export default class StaticBlock extends StatementBase {
 	}
 
 	render(code: MagicString, options: RenderOptions): void {
+		const classVariable = ((this.parent as ClassBody).parent as ClassNode).id!.variable;
+		const useOriginalName = (variable: Variable) => variable === classVariable;
+		options = {
+			...options,
+			useOriginalName
+		};
 		if (this.body.length > 0) {
 			renderStatementList(this.body, code, this.start + 1, this.end - 1, options);
 		} else {

src/ast/variables/Variable.ts

@@ -1,5 +1,6 @@
 import type ExternalModule from '../../ExternalModule';
 import type Module from '../../Module';
+import type { RenderOptions } from '../../utils/renderHelpers';
 import type { HasEffectsContext } from '../ExecutionContext';
 import type { NodeInteraction } from '../NodeInteractions';
 import { INTERACTION_ACCESSED } from '../NodeInteractions';
@@ -42,8 +43,11 @@ export default class Variable extends ExpressionEntity {
 		return this.renderBaseName || this.renderName || this.name;
 	}
 
-	getName(getPropertyAccess: (name: string) => string): string {
-		const name = this.renderName || this.name;
+	getName(
+		getPropertyAccess: (name: string) => string,
+		useOriginalName?: RenderOptions['useOriginalName']
+	): string {
+		const name = useOriginalName?.(this) ? this.name : this.renderName || this.name;
 		return this.renderBaseName ? `${this.renderBaseName}${getPropertyAccess(name)}` : name;
 	}
 

src/utils/renderHelpers.ts

@@ -15,6 +15,7 @@ export interface RenderOptions {
 	namespaceToStringTag: boolean;
 	pluginDriver: PluginDriver;
 	snippets: GenerateCodeSnippets;
+	useOriginalName?: (variable: Variable) => boolean;
 }
 
 export interface NodeRenderOptions {

test/form/samples/use-class-name-in-static-block/_config.js

@@ -0,0 +1,4 @@
+module.exports = {
+	description: 'use class name instead of renderName in static block',
+	solo: true
+};

test/form/samples/use-class-name-in-static-block/_expected/amd.js

@@ -0,0 +1,20 @@
+define((function () { 'use strict';
+
+	let Test$1 = class Test {
+		static test = 'Test1';
+		static {
+			assert.ok(Test.test);
+		}
+	};
+
+	class Test {
+		static test = 'Test2';
+		static {
+			assert.ok(Test.test);
+		}
+	}
+
+	assert.ok(Test$1.test);
+	assert.ok(Test.test);
+
+}));

test/form/samples/use-class-name-in-static-block/_expected/cjs.js

@@ -0,0 +1,18 @@
+'use strict';
+
+let Test$1 = class Test {
+	static test = 'Test1';
+	static {
+		assert.ok(Test.test);
+	}
+};
+
+class Test {
+	static test = 'Test2';
+	static {
+		assert.ok(Test.test);
+	}
+}
+
+assert.ok(Test$1.test);
+assert.ok(Test.test);

test/form/samples/use-class-name-in-static-block/_expected/es.js

@@ -0,0 +1,16 @@
+let Test$1 = class Test {
+	static test = 'Test1';
+	static {
+		assert.ok(Test.test);
+	}
+};
+
+class Test {
+	static test = 'Test2';
+	static {
+		assert.ok(Test.test);
+	}
+}
+
+assert.ok(Test$1.test);
+assert.ok(Test.test);

test/form/samples/use-class-name-in-static-block/_expected/iife.js

@@ -0,0 +1,21 @@
+(function () {
+	'use strict';
+
+	let Test$1 = class Test {
+		static test = 'Test1';
+		static {
+			assert.ok(Test.test);
+		}
+	};
+
+	class Test {
+		static test = 'Test2';
+		static {
+			assert.ok(Test.test);
+		}
+	}
+
+	assert.ok(Test$1.test);
+	assert.ok(Test.test);
+
+})();

test/form/samples/use-class-name-in-static-block/_expected/system.js

@@ -0,0 +1,25 @@
+System.register([], (function () {
+	'use strict';
+	return {
+		execute: (function () {
+
+			let Test$1 = class Test {
+				static test = 'Test1';
+				static {
+					assert.ok(Test.test);
+				}
+			};
+
+			class Test {
+				static test = 'Test2';
+				static {
+					assert.ok(Test.test);
+				}
+			}
+
+			assert.ok(Test$1.test);
+			assert.ok(Test.test);
+
+		})
+	};
+}));

test/form/samples/use-class-name-in-static-block/_expected/umd.js

@@ -0,0 +1,23 @@
+(function (factory) {
+	typeof define === 'function' && define.amd ? define(factory) :
+	factory();
+})((function () { 'use strict';
+
+	let Test$1 = class Test {
+		static test = 'Test1';
+		static {
+			assert.ok(Test.test);
+		}
+	};
+
+	class Test {
+		static test = 'Test2';
+		static {
+			assert.ok(Test.test);
+		}
+	}
+
+	assert.ok(Test$1.test);
+	assert.ok(Test.test);
+
+}));

test/form/samples/use-class-name-in-static-block/main.js

@@ -0,0 +1,5 @@
+import { Test } from './test1.js';
+import { Test as Test2 } from './test2.js';
+
+assert.ok(Test.test);
+assert.ok(Test2.test);

test/form/samples/use-class-name-in-static-block/test1.js

@@ -0,0 +1,6 @@
+export class Test {
+	static test = 'Test1';
+	static {
+		assert.ok(Test.test);
+	}
+}

test/form/samples/use-class-name-in-static-block/test2.js

@@ -0,0 +1,6 @@
+export class Test {
+	static test = 'Test2';
+	static {
+		assert.ok(Test.test);
+	}
+}

test/function/samples/use-class-name-in-static-block/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'use class name instead of renderName in static block'
+};

test/function/samples/use-class-name-in-static-block/main.js

@@ -0,0 +1,5 @@
+import { Test } from './test1.js';
+import { Test as Test2 } from './test2.js';
+
+assert.ok(Test.test);
+assert.ok(Test2.test);

test/function/samples/use-class-name-in-static-block/test1.js

@@ -0,0 +1,6 @@
+export class Test {
+	static test = 'Test1';
+	static {
+		assert.ok(Test.test);
+	}
+}

test/function/samples/use-class-name-in-static-block/test2.js

@@ -0,0 +1,6 @@
+export class Test {
+	static test = 'Test2';
+	static {
+		assert.ok(Test.test);
+	}
+}