refactor: override useOriginalName in ClassDeclaration

rollup · Jan 30, 2023 · 9f5dc2b · 9f5dc2b
1 parent f5682eb
commit 9f5dc2b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/src/Chunk.ts b/src/Chunk.ts
@@ -1164,7 +1164,8 @@ export default class Chunk {
 			indent,
 			namespaceToStringTag,
 			pluginDriver,
-			snippets
+			snippets,
+			useOriginalName: null
 		};
 
 		let usesTopLevelAwait = false;

diff --git a/src/ast/nodes/ClassDeclaration.ts b/src/ast/nodes/ClassDeclaration.ts
@@ -2,6 +2,7 @@ import type MagicString from 'magic-string';
 import type { RenderOptions } from '../../utils/renderHelpers';
 import { getSystemExportStatement } from '../../utils/systemJsRendering';
 import type ChildScope from '../scopes/ChildScope';
+import type Variable from '../variables/Variable';
 import Identifier, { type IdentifierWithVariable } from './Identifier';
 import type * as NodeType from './NodeType';
 import ClassNode from './shared/ClassNode';
@@ -43,7 +44,10 @@ export default class ClassDeclaration extends ClassNode {
 			const renderedVariable = variable.getName(getPropertyAccess);
 			if (renderedVariable !== name) {
 				this.superClass?.render(code, options);
-				this.body.render(code, options);
+				this.body.render(code, {
+					...options,
+					useOriginalName: (_variable: Variable) => _variable === variable
+				});
 				code.prependRight(this.start, `let ${renderedVariable}${_}=${_}`);
 				code.prependLeft(this.end, ';');
 				return;

diff --git a/src/ast/nodes/StaticBlock.ts b/src/ast/nodes/StaticBlock.ts
@@ -3,10 +3,7 @@ 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 {
@@ -33,12 +30,6 @@ 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 {

diff --git a/src/utils/renderHelpers.ts b/src/utils/renderHelpers.ts
@@ -15,7 +15,7 @@ export interface RenderOptions {
 	namespaceToStringTag: boolean;
 	pluginDriver: PluginDriver;
 	snippets: GenerateCodeSnippets;
-	useOriginalName?: (variable: Variable) => boolean;
+	useOriginalName: ((variable: Variable) => boolean) | null;
 }
 
 export interface NodeRenderOptions {