eslint-plugin-react-x 5.20.7 → 5.21.0

package/dist/index.js

@@ -1,8 +1,8 @@
 import { DEFAULT_ESLINT_REACT_SETTINGS, getSettingsFromContext, toRegExp } from "@eslint-react/shared";
-import { ESLintUtils } from "@typescript-eslint/utils";
+import * as ESLintUtils from "@typescript-eslint/utils/eslint-utils";
 import { Check, Compare, Extract, Traverse } from "@eslint-react/ast";
 import * as core from "@eslint-react/core";
-import { merge } from "@eslint-react/eslint";
+import { getConstrainedTypeAtLocation, merge, report } from "@eslint-react/eslint";
 import { AST_NODE_TYPES } from "@typescript-eslint/types";
 import { P, isMatching, match } from "ts-pattern";
 import { isAssignmentTargetEqual, isInitializedFromReact, resolveEnclosingAssignmentTarget, resolveObjectType, resolveOrigin } from "@eslint-react/var";
@@ -10,7 +10,6 @@ import { DefinitionType, ScopeType } from "@typescript-eslint/scope-manager";
 import { findVariable, getStaticValue } from "@typescript-eslint/utils/ast-utils";
 import { findParentAttribute, getElementFullType, hasAttribute } from "@eslint-react/jsx";
 import { compare } from "compare-versions";
-import { getConstrainedTypeAtLocation } from "@typescript-eslint/type-utils";
 import { unionConstituents } from "ts-api-utils";
 import "typescript";
 import { simpleTraverse } from "@typescript-eslint/typescript-estree";
@@ -145,7 +144,7 @@ const rules$6 = {
 //#endregion
 //#region package.json
 var name$6 = "eslint-plugin-react-x";
-var version = "5.20.7";
+var version = "5.21.0";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -1806,71 +1805,15 @@ var no_access_state_in_setstate_default = createRule({
 });
 function create$47(context) {
 	if (!context.sourceCode.text.includes("setState")) return {};
-	const classStack = [];
-	const methodStack = [];
-	const setStateStack = [];
-	return {
-		CallExpression(node) {
-			if (!core.isThisSetStateCall(node)) return;
-			setStateStack.push([node, false]);
-		},
-		"CallExpression:exit"(node) {
-			if (!core.isThisSetStateCall(node)) return;
-			setStateStack.pop();
-		},
-		ClassDeclaration(node) {
-			classStack.push([node, core.isClassComponent(node)]);
-		},
-		"ClassDeclaration:exit"() {
-			classStack.pop();
-		},
-		ClassExpression(node) {
-			classStack.push([node, core.isClassComponent(node)]);
-		},
-		"ClassExpression:exit"() {
-			classStack.pop();
-		},
-		MemberExpression(node) {
-			if (node.object.type !== AST_NODE_TYPES.ThisExpression) return;
-			const [currClass, isComponent = false] = classStack.at(-1) ?? [];
-			if (currClass == null || !isComponent) return;
-			const [currMethod, isStatic = false] = methodStack.at(-1) ?? [];
-			if (currMethod == null || isStatic) return;
-			const [setState, hasThisState = false] = setStateStack.at(-1) ?? [];
-			if (setState == null || hasThisState) return;
-			if (!Check.isIdentifier(node.property, "state")) return;
-			context.report({
-				messageId: "default",
-				node
-			});
-		},
-		MethodDefinition(node) {
-			methodStack.push([node, node.static]);
-		},
-		"MethodDefinition:exit"() {
-			methodStack.pop();
-		},
-		PropertyDefinition(node) {
-			methodStack.push([node, node.static]);
-		},
-		"PropertyDefinition:exit"() {
-			methodStack.pop();
-		},
-		VariableDeclarator(node) {
-			const [currClass, isComponent = false] = classStack.at(-1) ?? [];
-			if (currClass == null || !isComponent) return;
-			const [currMethod, isStatic = false] = methodStack.at(-1) ?? [];
-			if (currMethod == null || isStatic) return;
-			const [setState, hasThisState = false] = setStateStack.at(-1) ?? [];
-			if (setState == null || hasThisState) return;
-			if (node.init == null || node.init.type !== AST_NODE_TYPES.ThisExpression || node.id.type !== AST_NODE_TYPES.ObjectPattern) return;
-			if (!node.id.properties.some((prop) => prop.type === AST_NODE_TYPES.Property && !prop.computed && Check.isIdentifier(prop.key, "state"))) return;
-			context.report({
-				messageId: "default",
-				node
-			});
-		}
-	};
+	return { MemberExpression(node) {
+		if (!core.isAPI("this.state")(context, node)) return;
+		const fact = Traverse.findParent(Traverse.findParent(node, (n) => Check.is(AST_NODE_TYPES.CallExpression)(n) && core.isThisSetStateCall(n)), (n) => Check.isClass(n));
+		if (fact == null || !core.isClassComponent(fact)) return;
+		context.report({
+			messageId: "default",
+			node
+		});
+	} };
 }
 
 //#endregion
@@ -2374,9 +2317,6 @@ function create$34(context) {
 //#endregion
 //#region src/rules/no-direct-mutation-state/no-direct-mutation-state.ts
 const RULE_NAME$33 = "no-direct-mutation-state";
-function isConstructorFunction(node) {
-	return Check.isOneOf([AST_NODE_TYPES.FunctionDeclaration, AST_NODE_TYPES.FunctionExpression])(node) && Check.isPropertyOrMethod(node.parent) && Check.isIdentifier(node.parent.key) && node.parent.key.name === "constructor";
-}
 var no_direct_mutation_state_default = createRule({
 	meta: {
 		type: "problem",
@@ -2388,12 +2328,26 @@ var no_direct_mutation_state_default = createRule({
 	create: create$33,
 	defaultOptions: []
 });
+function isConstructorFunction(node) {
+	return Check.isOneOf([AST_NODE_TYPES.FunctionDeclaration, AST_NODE_TYPES.FunctionExpression])(node) && Check.isPropertyOrMethod(node.parent) && Check.isIdentifier(node.parent.key) && node.parent.key.name === "constructor";
+}
+function isAssignmentToThisState(node) {
+	const { left } = node;
+	let current = Extract.unwrap(left);
+	while (current.type === AST_NODE_TYPES.MemberExpression) {
+		const object = Extract.unwrap(current.object);
+		const property = current.property;
+		if (object.type === AST_NODE_TYPES.ThisExpression && Check.isIdentifier(property, "state")) return true;
+		current = object;
+	}
+	return false;
+}
 function create$33(context) {
 	return { AssignmentExpression(node) {
-		if (!core.isAssignmentToThisState(node)) return;
-		const parentClass = Traverse.findParent(node, Check.isOneOf([AST_NODE_TYPES.ClassDeclaration, AST_NODE_TYPES.ClassExpression]));
-		if (parentClass == null) return;
-		if (core.isClassComponent(parentClass) && context.sourceCode.getScope(node).block !== Traverse.findParent(node, isConstructorFunction)) context.report({
+		if (!isAssignmentToThisState(node)) return;
+		const fact = Traverse.findParent(node, Check.isOneOf([AST_NODE_TYPES.ClassDeclaration, AST_NODE_TYPES.ClassExpression]));
+		if (fact == null) return;
+		if (core.isClassComponent(fact) && context.sourceCode.getScope(node).block !== Traverse.findParent(node, isConstructorFunction)) context.report({
 			messageId: "default",
 			node
 		});
@@ -3249,20 +3203,6 @@ const takeWhile = dual(2, (xs, pred) => {
 	return xs.slice(0, idx);
 });
 
-//#endregion
-//#region src/rules/no-leaked-conditional-rendering/lib.ts
-/**
-* Creates a report function for the given rule context.
-* @param context The ESLint rule context.
-* @returns A function that can be used to report violations.
-*/
-function report(context) {
-	return (descriptor) => {
-		if (descriptor == null) return;
-		context.report(descriptor);
-	};
-}
-
 //#endregion
 //#region src/rules/no-leaked-conditional-rendering/no-leaked-conditional-rendering.ts
 const RULE_NAME$27 = "no-leaked-conditional-rendering";
@@ -4208,21 +4148,6 @@ var no_unstable_default_props_default = createRule({
 	create: create$12,
 	defaultOptions: defaultOptions$1
 });
-function extractIdentifier(node) {
-	if (node.type === AST_NODE_TYPES.NewExpression) {
-		const callee = Extract.unwrap(node.callee);
-		if (Check.isIdentifier(callee)) return callee.name;
-	}
-	if (node.type === AST_NODE_TYPES.CallExpression) {
-		const callee = Extract.unwrap(node.callee);
-		if (Check.isIdentifier(callee)) return callee.name;
-		if (callee.type === AST_NODE_TYPES.MemberExpression) {
-			const { object } = callee;
-			if (Check.isIdentifier(object)) return object.name;
-		}
-	}
-	return null;
-}
 function create$12(context, [options]) {
 	const { compilationMode } = getSettingsFromContext(context);
 	if (compilationMode === "infer" || compilationMode === "all") return {};
@@ -4248,8 +4173,11 @@ function create$12(context, [options]) {
 					if (construction == null) continue;
 					if (core.isHookCall(construction.node)) continue;
 					if (safePatterns.length > 0) {
-						const identifier = extractIdentifier(right);
-						if (identifier != null && safePatterns.some((pattern) => pattern.test(identifier))) continue;
+						const getName = (n) => Check.isIdentifier(n) ? n.name : null;
+						const name = match(right).with({ type: AST_NODE_TYPES.NewExpression }, (n) => getName(n.callee)).with({ type: AST_NODE_TYPES.CallExpression }, (n) => {
+							return match(Extract.unwrap(n.callee)).when(Check.isIdentifier, ({ name }) => name).when(Check.is(AST_NODE_TYPES.MemberExpression), ({ object }) => getName(object)).otherwise(() => null);
+						}).otherwise(() => null);
+						if (name != null && safePatterns.some((pattern) => pattern.test(name))) continue;
 					}
 					context.report({
 						data: { kind: getHumanReadableKind(right) },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "5.20.7",
+  "version": "5.21.0",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -36,17 +36,16 @@
     "dist"
   ],
   "dependencies": {
-    "@eslint-react/ast": "5.20.7",
-    "@eslint-react/core": "5.20.7",
-    "@eslint-react/eslint": "5.20.7",
-    "@eslint-react/jsx": "5.20.7",
-    "@eslint-react/shared": "5.20.7",
-    "@eslint-react/var": "5.20.7",
-    "@typescript-eslint/scope-manager": "^8.70.0",
-    "@typescript-eslint/type-utils": "^8.70.0",
-    "@typescript-eslint/types": "^8.70.0",
-    "@typescript-eslint/typescript-estree": "^8.70.0",
-    "@typescript-eslint/utils": "^8.70.0",
+    "@eslint-react/ast": "5.21.0",
+    "@eslint-react/core": "5.21.0",
+    "@eslint-react/eslint": "5.21.0",
+    "@eslint-react/jsx": "5.21.0",
+    "@eslint-react/shared": "5.21.0",
+    "@eslint-react/var": "5.21.0",
+    "@typescript-eslint/scope-manager": "^8.70.1",
+    "@typescript-eslint/types": "^8.70.1",
+    "@typescript-eslint/typescript-estree": "^8.70.1",
+    "@typescript-eslint/utils": "^8.70.1",
     "compare-versions": "^6.1.1",
     "string-ts": "^2.3.1",
     "ts-api-utils": "^2.5.0",
@@ -70,6 +69,11 @@
     "eslint": "*",
     "typescript": "*"
   },
+  "peerDependenciesMeta": {
+    "eslint": {
+      "optional": true
+    }
+  },
   "engines": {
     "node": ">=22.0.0"
   },