fix: handle class name in properties and methods

lib/javascript/JavascriptParser.js

@@ -1600,32 +1600,39 @@ class JavascriptParser extends Parser {
 			}
 		}
 		if (classy.body && classy.body.type === "ClassBody") {
-			for (const classElement of /** @type {TODO} */ (classy.body.body)) {
-				if (!this.hooks.classBodyElement.call(classElement, classy)) {
-					if (classElement.computed && classElement.key) {
-						this.walkExpression(classElement.key);
-					}
-					if (classElement.value) {
-						if (
-							!this.hooks.classBodyValue.call(
-								classElement.value,
-								classElement,
-								classy
-							)
-						) {
+			const scopeParams = [];
+			// Add class name in scope for recursive calls
+			if (classy.id) {
+				scopeParams.push(classy.id);
+			}
+			this.inClassScope(true, scopeParams, () => {
+				for (const classElement of /** @type {TODO} */ (classy.body.body)) {
+					if (!this.hooks.classBodyElement.call(classElement, classy)) {
+						if (classElement.computed && classElement.key) {
+							this.walkExpression(classElement.key);
+						}
+						if (classElement.value) {
+							if (
+								!this.hooks.classBodyValue.call(
+									classElement.value,
+									classElement,
+									classy
+								)
+							) {
+								const wasTopLevel = this.scope.topLevelScope;
+								this.scope.topLevelScope = false;
+								this.walkExpression(classElement.value);
+								this.scope.topLevelScope = wasTopLevel;
+							}
+						} else if (classElement.type === "StaticBlock") {
 							const wasTopLevel = this.scope.topLevelScope;
 							this.scope.topLevelScope = false;
-							this.walkExpression(classElement.value);
+							this.walkBlockStatement(classElement);
 							this.scope.topLevelScope = wasTopLevel;
 						}
-					} else if (classElement.type === "StaticBlock") {
-						const wasTopLevel = this.scope.topLevelScope;
-						this.scope.topLevelScope = false;
-						this.walkBlockStatement(classElement);
-						this.scope.topLevelScope = wasTopLevel;
 					}
 				}
-			}
+			});
 		}
 	}
 
@@ -3561,6 +3568,30 @@ class JavascriptParser extends Parser {
 		this.scope = oldScope;
 	}
 
+	inClassScope(hasThis, params, fn) {
+		const oldScope = this.scope;
+		this.scope = {
+			topLevelScope: oldScope.topLevelScope,
+			inTry: false,
+			inShorthand: false,
+			isStrict: oldScope.isStrict,
+			isAsmJs: oldScope.isAsmJs,
+			definitions: oldScope.definitions.createChild()
+		};
+
+		if (hasThis) {
+			this.undefineVariable("this");
+		}
+
+		this.enterPatterns(params, (ident, pattern) => {
+			this.defineVariable(ident);
+		});
+
+		fn();
+
+		this.scope = oldScope;
+	}
+
 	inFunctionScope(hasThis, params, fn) {
 		const oldScope = this.scope;
 		this.scope = {
@@ -3932,20 +3963,34 @@ class JavascriptParser extends Parser {
 					return false;
 				}
 				const items =
-					/** @type {(MethodDefinition | PropertyDefinition)[]} */
+					/** @type {TODO[]} */
 					(expr.body.body);
-				return items.every(
-					item =>
-						(!item.computed ||
-							!item.key ||
-							this.isPure(item.key, item.range[0])) &&
-						(!item.static ||
-							!item.value ||
-							this.isPure(
-								item.value,
-								item.key ? item.key.range[1] : item.range[0]
-							))
-				);
+				return items.every(item => {
+					if (
+						item.computed &&
+						item.key &&
+						!this.isPure(item.key, item.range[0])
+					) {
+						return false;
+					}
+
+					if (
+						item.static &&
+						item.value &&
+						!this.isPure(
+							item.value,
+							item.key ? item.key.range[1] : item.range[0]
+						)
+					) {
+						return false;
+					}
+
+					if (item.type === "StaticBlock") {
+						return false;
+					}
+
+					return true;
+				});
 			}
 
 			case "FunctionDeclaration":

lib/optimize/InnerGraphPlugin.js

@@ -120,7 +120,10 @@ class InnerGraphPlugin {
 						if (!InnerGraph.isEnabled(parser.state)) return;
 
 						if (parser.scope.topLevelScope === true) {
-							if (statement.type === "ClassDeclaration") {
+							if (
+								statement.type === "ClassDeclaration" &&
+								parser.isPure(statement, statement.range[0])
+							) {
 								const name = statement.id ? statement.id.name : "*default*";
 								const fn = InnerGraph.tagTopLevelSymbol(parser, name);
 								classWithTopLevelSymbol.set(statement, fn);
@@ -131,8 +134,9 @@ class InnerGraphPlugin {
 								const fn = InnerGraph.tagTopLevelSymbol(parser, name);
 								const decl = statement.declaration;
 								if (
-									decl.type === "ClassExpression" ||
-									decl.type === "ClassDeclaration"
+									(decl.type === "ClassExpression" ||
+										decl.type === "ClassDeclaration") &&
+									parser.isPure(decl, decl.range[0])
 								) {
 									classWithTopLevelSymbol.set(decl, fn);
 								} else if (parser.isPure(decl, statement.range[0])) {
@@ -157,7 +161,10 @@ class InnerGraphPlugin {
 							decl.id.type === "Identifier"
 						) {
 							const name = decl.id.name;
-							if (decl.init.type === "ClassExpression") {
+							if (
+								decl.init.type === "ClassExpression" &&
+								parser.isPure(decl.init, decl.id.range[1])
+							) {
 								const fn = InnerGraph.tagTopLevelSymbol(parser, name);
 								classWithTopLevelSymbol.set(decl.init, fn);
 							} else if (parser.isPure(decl.init, decl.id.range[1])) {

test/cases/inner-graph/extend-class/a.js

@@ -0,0 +1,14 @@
+import B from "./b.js";
+import { A1 } from "./dep1";
+
+export default class A extends B {
+	constructor() {
+		super();
+	}
+	test() {
+		super.test();
+
+		this.b = new B();
+		this.a1 = new A1();
+	}
+}

test/cases/inner-graph/extend-class/b.js

@@ -0,0 +1,10 @@
+import A from "./a.js";
+import { A1 } from "./dep1";
+
+export default class B {
+	constructor() {}
+	test() {
+		this.a = new A();
+		this.a2 = new A1();
+	}
+}

test/cases/inner-graph/extend-class/dep2.js

@@ -6,6 +6,8 @@ export class Z {}
 export function mixin1(_class) {return _class}
 export function mixin2(_class) {return _class}
 export function mixin3(_class) {return _class}
+export function mixin4(_class) {return _class}
+export function getField() { return "test" }
 
 export const exportsInfoForA = __webpack_exports_info__.A.used;
 export const exportsInfoForB = __webpack_exports_info__.B.used;
@@ -15,3 +17,5 @@ export const exportsInfoForZ = __webpack_exports_info__.Z.used;
 export const exportsInfoForMixin1 = __webpack_exports_info__.mixin1.used;
 export const exportsInfoForMixin2 = __webpack_exports_info__.mixin2.used;
 export const exportsInfoForMixin3 = __webpack_exports_info__.mixin3.used;
+export const exportsInfoForMixin4 = __webpack_exports_info__.mixin4.used;
+export const exportsInfoForgetField = __webpack_exports_info__.getField.used;

test/cases/inner-graph/extend-class/dep3.js

@@ -1,4 +1,4 @@
-import {mixin1, mixin2, mixin3, A, B, C, Y} from "./dep2";
+import {mixin1, mixin2, mixin3, getField, A, B, C, Y, mixin4} from "./dep2";
 
 export const A1 = class A1 extends A {
 	render() {return new E();}
@@ -12,7 +12,7 @@ export const C1 = class C1 extends mixin2(Y, /*#__PURE__*/ mixin3(C)) {
 	render() {return new D();}
 };
 
-export class Y1 extends mixin2(Y) {
+export class Y1 extends /*#__PURE__*/ mixin2(Y) {
 	constructor() {
 		super();
 
@@ -22,5 +22,9 @@ export class Y1 extends mixin2(Y) {
 	render() {return new D();}
 }
 
+export class Bar extends /*#__PURE__*/ mixin4(A) {
+	[/*#__PURE__*/ getField()] = 12;
+}
+
 export class E {}
 const D = class D {};

test/cases/inner-graph/extend-class/index.js

@@ -6,12 +6,14 @@ import {
 	exportsInfoForZ,
 	exportsInfoForMixin1,
 	exportsInfoForMixin2,
-	exportsInfoForMixin3
+	exportsInfoForMixin3,
+	exportsInfoForMixin4
 } from "./dep2";
 
 it("should load modules correctly", () => {
 	require("./module1");
 	require("./module2");
+	require("./module3");
 });
 
 if (process.env.NODE_ENV === "production") {
@@ -31,6 +33,7 @@ it("Z used, inner graph can not determine const usage", () => {
 it("Pure super expression should be unused, another used", () => {
 	if (process.env.NODE_ENV === "production") {
 		expect(exportsInfoForMixin1).toBe(false);
+		expect(exportsInfoForMixin4).toBe(false);
 	}
 
 	expect(exportsInfoForMixin2).toBe(true);

test/cases/inner-graph/extend-class/module3.js

@@ -0,0 +1,3 @@
+import A from "./a.js";
+let a = new A();
+a.test();

test/cases/inner-graph/extend-class/test.filter.js

@@ -0,0 +1,5 @@
+var supportsClassStaticBlock = require("../../../helpers/supportsClassStaticBlock");
+
+module.exports = function (config) {
+	return supportsClassStaticBlock();
+};

test/cases/inner-graph/extend-class2/dep-decl.js

@@ -1,4 +1,4 @@
-import { A, B, getC, getD, getE, getF } from "./dep2?decl";
+import { A, B, getC, getD, getE, getF, Foo } from "./dep2?decl";
 import { A3, B3, C3, D3, E3, F3 } from "./dep3?decl";
 
 export class A1 extends A {
@@ -39,6 +39,100 @@ export class F1 extends getF() {
 	}
 }
 
+function foo(instance) {
+	return new instance()
+}
+
+class Bar extends Foo {
+	static prop = 42;
+	static a = foo(this).prop;
+	static b = foo(Bar).prop;
+	static c = foo(super.Bar).prop;
+	static inStatic1;
+	static inStatic2;
+	static inStatic3;
+	static {
+		this.inStatic1 = new Bar().prop;
+		this.inStatic2 = new super.Bar().prop;
+		this.inStatic3 = (new this).prop;
+	}
+}
+
+class BarA extends Foo {
+	static prop = 42;
+	static a = foo(this).prop;
+}
+
+class BarB extends Foo {
+	static prop = 42;
+	static b = foo(Bar).prop;
+}
+
+class BarC extends Foo {
+	static prop = 42;
+	static c = foo(super.Bar).prop;
+}
+
+class BarPA extends Foo {
+	static prop = 42;
+	static #a = foo(this).prop;
+}
+
+class BarPB extends Foo {
+	static prop = 42;
+	static #b = foo(Bar).prop;
+}
+
+class BarPC extends Foo {
+	static prop = 42;
+	static #c = foo(super.Bar).prop;
+}
+
+const ExpressionFoo = class Bar extends Foo {
+	static prop = 42;
+	static a = foo(this).prop;
+	static b = foo(Bar).prop;
+	static c = foo(super.Bar).prop;
+	static inStatic1;
+	static inStatic2;
+	static inStatic3;
+	static {
+		this.inStatic1 = new Bar().prop;
+		this.inStatic2 = new super.Bar().prop;
+		this.inStatic3 = (new this).prop;
+	}
+}
+
+export class Baz extends Foo {
+	static prop = 42;
+	static a = foo(this).prop;
+	static b = foo(Bar).prop;
+	static c = foo(super.Bar).prop;
+	static inStatic1;
+	static inStatic2;
+	static inStatic3;
+	static {
+		this.inStatic1 = new Bar().prop;
+		this.inStatic2 = new super.Bar().prop;
+		this.inStatic3 = (new this).prop;
+	}
+}
+
+export default class DefaultBar extends Foo {
+	static prop = 42;
+	static a = foo(this).prop;
+	static b = foo(Bar).prop;
+	static c = foo(super.Bar).prop;
+	static inStatic1;
+	static inStatic2;
+	static inStatic3;
+	static {
+		this.inStatic1 = new Bar().prop;
+		this.inStatic2 = new super.Bar().prop;
+		this.inStatic3 = (new this).prop;
+	}
+}
+
 export class A2 extends A3 {}
 export class B2 extends B3 {}
 export class C2 extends C3 {}

test/cases/inner-graph/extend-class2/dep2.js

@@ -4,10 +4,12 @@ export const getC = () => class C {};
 export const getD = () => class D {};
 export const getE = () => class E {};
 export const getF = () => class F {};
+export class Foo { static Bar = Foo; }
 
 export const exportsInfoForA = __webpack_exports_info__.A.used;
 export const exportsInfoForB = __webpack_exports_info__.B.used;
 export const exportsInfoForC = __webpack_exports_info__.getC.used;
 export const exportsInfoForD = __webpack_exports_info__.getD.used;
 export const exportsInfoForE = __webpack_exports_info__.getE.used;
 export const exportsInfoForF = __webpack_exports_info__.getF.used;
+export const exportsInfoForFoo = __webpack_exports_info__.Foo.used;