eslint-plugin-react-x 5.26.8 → 5.27.1

package/dist/index.js

@@ -135,7 +135,7 @@ const rules$6 = {
 //#endregion
 //#region package.json
 var name$6 = "eslint-plugin-react-x";
-var version = "5.26.8";
+var version = "5.27.1";
 //#endregion
 //#region src/utils/create-rule.ts
 function getDocsUrl(ruleName) {
@@ -1547,9 +1547,10 @@ function inferMutableFunctions(context, mutations) {
 		const origin = mutation.kind === "binding" ? variable : resolveVariableOrigin(context, variable);
 		if (isGlobalOrModuleVariable(origin)) continue;
 		const declaration = origin.identifiers.at(0) ?? null;
+		const declarationFn = declaration == null ? null : Traverse.findParent(declaration, Check.isFunction);
 		let current = mutation.enclosingFunction;
 		while (current != null) {
-			if (declaration != null && Traverse.findParent(declaration, Check.isFunction) === current) break;
+			if (declarationFn === current) break;
 			if (!mutableFunctions.has(current)) mutableFunctions.set(current, {
 				name: origin.name,
 				node: mutation.node
@@ -2005,7 +2006,7 @@ cast(absurd);
 function not(predicate) {
 	return (data) => !predicate(data);
 }
-dual(2, (a, b) => (data) => a(data) && b(data));
+const and = dual(2, (a, b) => (data) => a(data) && b(data));
 const or = dual(2, (a, b) => (data) => a(data) || b(data));
 dual(2, (a, b) => (data) => a(data) !== b(data));
 dual(2, (a, b) => (data) => a(data) === b(data));
@@ -2322,10 +2323,11 @@ function create$32(context) {
 						if (callee.type !== AST_NODE_TYPES.MemberExpression) return false;
 						return Check.isIdentifier(callee.property, "map");
 					});
+					if (call == null) return;
 					const iter = Traverse.findParent(jsxElement, Check.isFunction, (n) => n === call);
-					if (!Check.isFunction(iter)) return;
-					const arg0 = call?.arguments[0];
-					if (call == null || arg0 == null) return;
+					if (iter == null) return;
+					const arg0 = call.arguments[0];
+					if (arg0 == null) return;
 					if (Extract.unwrap(arg0) !== iter) return;
 					keyedEntries.set(call, {
 						hasDuplicate: node.value?.type === AST_NODE_TYPES.Literal,
@@ -3023,12 +3025,12 @@ function create$20(context) {
 	if (!context.sourceCode.text.includes("componentDidMount")) return {};
 	return { CallExpression(node) {
 		if (!core.isThisSetStateCall(node)) return;
-		const enclosingClassNode = Traverse.findParent(node, core.isClassComponent);
-		const enclosingMethodNode = Traverse.findParent(node, (n) => n === enclosingClassNode || core.isComponentDidMount(n));
-		if (enclosingClassNode == null || enclosingMethodNode == null || enclosingMethodNode === enclosingClassNode) return;
-		const enclosingMethodScope = context.sourceCode.getScope(enclosingMethodNode);
-		const setStateCallParentScope = context.sourceCode.getScope(node).upper;
-		if (enclosingMethodNode.parent === enclosingClassNode.body && setStateCallParentScope === enclosingMethodScope) context.report({
+		const component = Traverse.findParent(node, core.isClassComponent);
+		if (component == null) return;
+		const method = Traverse.findParent(node, core.isComponentDidMount, (n) => n === component);
+		if (method == null) return;
+		const lifecycleFunction = method.value == null ? null : Extract.unwrap(method.value);
+		if (method.parent === component.body && lifecycleFunction != null && lifecycleFunction === Traverse.findParent(node, Check.isFunctionOrClass)) context.report({
 			messageId: "default",
 			node
 		});
@@ -3048,12 +3050,12 @@ function create$19(context) {
 	if (!context.sourceCode.text.includes("componentDidUpdate")) return {};
 	return { CallExpression(node) {
 		if (!core.isThisSetStateCall(node)) return;
-		const enclosingClassNode = Traverse.findParent(node, core.isClassComponent);
-		const enclosingMethodNode = Traverse.findParent(node, (n) => n === enclosingClassNode || core.isComponentDidUpdate(n));
-		if (enclosingClassNode == null || enclosingMethodNode == null || enclosingMethodNode === enclosingClassNode) return;
-		const enclosingMethodScope = context.sourceCode.getScope(enclosingMethodNode);
-		const setStateCallParentScope = context.sourceCode.getScope(node).upper;
-		if (enclosingMethodNode.parent === enclosingClassNode.body && setStateCallParentScope === enclosingMethodScope) context.report({
+		const component = Traverse.findParent(node, core.isClassComponent);
+		if (component == null) return;
+		const method = Traverse.findParent(node, core.isComponentDidUpdate, (n) => n === component);
+		if (method == null) return;
+		const lifecycleFunction = method.value == null ? null : Extract.unwrap(method.value);
+		if (method.parent === component.body && lifecycleFunction != null && lifecycleFunction === Traverse.findParent(node, Check.isFunctionOrClass)) context.report({
 			messageId: "default",
 			node
 		});
@@ -3073,12 +3075,12 @@ function create$18(context) {
 	if (!context.sourceCode.text.includes("componentWillUpdate")) return {};
 	return { CallExpression(node) {
 		if (!core.isThisSetStateCall(node)) return;
-		const enclosingClassNode = Traverse.findParent(node, core.isClassComponent);
-		const enclosingMethodNode = Traverse.findParent(node, (n) => n === enclosingClassNode || core.isComponentWillUpdate(n));
-		if (enclosingClassNode == null || enclosingMethodNode == null || enclosingMethodNode === enclosingClassNode) return;
-		const enclosingMethodScope = context.sourceCode.getScope(enclosingMethodNode);
-		const setStateCallParentScope = context.sourceCode.getScope(node).upper;
-		if (enclosingMethodNode.parent === enclosingClassNode.body && setStateCallParentScope === enclosingMethodScope) context.report({
+		const component = Traverse.findParent(node, core.isClassComponent);
+		if (component == null) return;
+		const method = Traverse.findParent(node, core.isComponentWillUpdate, (n) => n === component);
+		if (method == null) return;
+		const lifecycleFunction = method.value == null ? null : Extract.unwrap(method.value);
+		if (method.parent === component.body && lifecycleFunction != null && lifecycleFunction === Traverse.findParent(node, Check.isFunctionOrClass)) context.report({
 			messageId: "default",
 			node
 		});
@@ -6589,20 +6591,11 @@ function isInitializedFromRef(context, id, refParams, seen = /* @__PURE__ */ new
 		const writeExpr = reference.writeExpr == null ? null : Extract.unwrap(reference.writeExpr);
 		if (writeExpr == null) continue;
 		if (writeExpr.range[1] > id.range[0]) continue;
-		const writeFn = Traverse.findParent(writeExpr, Check.isFunction);
-		if (writeFn != null && !isSelfOrAncestorFunction(writeFn, id)) continue;
+		if (Traverse.findParent(writeExpr, and(Check.isFunction, (n) => !Traverse.hasParent(id, (m) => m === n))) != null) continue;
 		if (isExpressionFromRef(context, writeExpr, refParams, seen)) return true;
 	}
 	return false;
 }
-function isSelfOrAncestorFunction(fn, node) {
-	let current = Traverse.findParent(node, Check.isFunction);
-	while (current != null) {
-		if (current === fn) return true;
-		current = Traverse.findParent(current, Check.isFunction);
-	}
-	return false;
-}
 function isExpressionFromRef(context, init, refParams, seen) {
 	const { additionalRefHooks } = getSettingsFromContext(context);
 	switch (true) {
@@ -7041,7 +7034,7 @@ const KNOWN_DYNAMIC_EXPRESSION_TYPES = /* @__PURE__ */ new Set([
 ]);
 function createRenderBoundaryChecker(componentNodes) {
 	const components = new Set(componentNodes);
-	return (node) => Traverse.hasParent(node, (n) => (Check.isFunction(n) || Check.isClass(n)) && components.has(n));
+	return (node) => Traverse.hasParent(node, (n) => Check.isFunctionOrClass(n) && components.has(n));
 }
 //#endregion
 //#region src/rules/static-components/origins.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "5.26.8",
+  "version": "5.27.1",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -36,12 +36,12 @@
     "dist"
   ],
   "dependencies": {
-    "@eslint-react/ast": "5.26.8",
-    "@eslint-react/core": "5.26.8",
-    "@eslint-react/eslint": "5.26.8",
-    "@eslint-react/jsx": "5.26.8",
-    "@eslint-react/shared": "5.26.8",
-    "@eslint-react/var": "5.26.8",
+    "@eslint-react/ast": "5.27.1",
+    "@eslint-react/core": "5.27.1",
+    "@eslint-react/eslint": "5.27.1",
+    "@eslint-react/jsx": "5.27.1",
+    "@eslint-react/shared": "5.27.1",
+    "@eslint-react/var": "5.27.1",
     "@typescript-eslint/scope-manager": "^8.71.2",
     "@typescript-eslint/types": "^8.71.2",
     "@typescript-eslint/typescript-estree": "^8.71.2",