eslint-plugin-react-x 5.8.3 → 5.8.4-beta.1

package/dist/index.js

@@ -4,9 +4,9 @@ import { Check, Compare, Extract, Traverse, is, isOneOf } from "@eslint-react/as
 import * as core from "@eslint-react/core";
 import { merge } from "@eslint-react/eslint";
 import { AST_NODE_TYPES } from "@typescript-eslint/types";
+import { DefinitionType, ScopeType } from "@typescript-eslint/scope-manager";
 import { findVariable, getStaticValue } from "@typescript-eslint/utils/ast-utils";
 import { computeObjectType, isAssignmentTargetEqual, resolve, resolveEnclosingAssignmentTarget } from "@eslint-react/var";
-import { DefinitionType } from "@typescript-eslint/scope-manager";
 import { P, isMatching, match } from "ts-pattern";
 import { findParentAttribute, getElementFullType, hasAttribute } from "@eslint-react/jsx";
 import { compare } from "compare-versions";
@@ -143,7 +143,7 @@ const rules$6 = {
 //#endregion
 //#region package.json
 var name$6 = "eslint-plugin-react-x";
-var version = "5.8.3";
+var version = "5.8.4-beta.1";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -185,7 +185,7 @@ function getEnclosingTryBlock(node) {
 				n = n.parent;
 			}
 		}
-		if (current.type === "Program") return null;
+		if (current.type === AST_NODE_TYPES.Program) return null;
 		current = current.parent;
 	}
 	return null;
@@ -1188,7 +1188,7 @@ function create$49(context) {
 		if (variable == null) return true;
 		if (variable.defs.length === 0) return true;
 		const scopeType = variable.scope.type;
-		return scopeType === "global" || scopeType === "module";
+		return scopeType === ScopeType.global || scopeType === ScopeType.module;
 	}
 	/**
 	* Return the nearest enclosing function for `node`.
@@ -1326,8 +1326,7 @@ function identifierExistsInPattern(pattern, name) {
 		case AST_NODE_TYPES.Identifier: return pattern.name === name;
 		case AST_NODE_TYPES.ObjectPattern: return pattern.properties.some((p) => {
 			if (p.type === AST_NODE_TYPES.Property) return identifierExistsInPattern(p.value, name);
-			if (p.type === AST_NODE_TYPES.RestElement) return identifierExistsInPattern(p.argument, name);
-			return false;
+			return identifierExistsInPattern(p.argument, name);
 		});
 		case AST_NODE_TYPES.ArrayPattern: return pattern.elements.some((el) => el != null && identifierExistsInPattern(el, name));
 		case AST_NODE_TYPES.RestElement: return identifierExistsInPattern(pattern.argument, name);
@@ -1405,9 +1404,12 @@ function create$48(context) {
 		if (variable == null) return null;
 		for (const def of variable.defs) {
 			if (def.type !== DefinitionType.Parameter) continue;
-			if (def.node == null) continue;
 			let fn = def.node;
-			while (fn != null && !Check.isFunction(fn)) fn = fn.parent ?? null;
+			for (;;) {
+				if (Check.isFunction(fn)) break;
+				fn = fn.parent ?? null;
+				if (fn == null) break;
+			}
 			if (fn == null) continue;
 			const func = fn;
 			if (func.params.some((param) => identifierExistsInPattern(param, id.name))) return func;
@@ -1428,7 +1430,7 @@ function create$48(context) {
 		CallExpression(node) {
 			if (isUseStateCall(node) || core.isUseReducerCall(context, node)) {
 				const declarator = node.parent;
-				if (declarator?.type === AST_NODE_TYPES.VariableDeclarator && declarator.id?.type === AST_NODE_TYPES.ArrayPattern) {
+				if (declarator.type === AST_NODE_TYPES.VariableDeclarator && declarator.id.type === AST_NODE_TYPES.ArrayPattern) {
 					const [firstElement] = declarator.id.elements;
 					if (firstElement?.type === AST_NODE_TYPES.Identifier && isRefLikeName(firstElement.name)) context.report({
 						data: { name: firstElement.name },
@@ -1729,13 +1731,13 @@ function create$47(context) {
 			setStateStack.pop();
 		},
 		ClassDeclaration(node) {
-			classStack.push([node, core.isClassComponent(node)]);
+			classStack.push([node, core.isClassComponent(context, node)]);
 		},
 		"ClassDeclaration:exit"() {
 			classStack.pop();
 		},
 		ClassExpression(node) {
-			classStack.push([node, core.isClassComponent(node)]);
+			classStack.push([node, core.isClassComponent(context, node)]);
 		},
 		"ClassExpression:exit"() {
 			classStack.pop();
@@ -1793,7 +1795,7 @@ function create$47(context) {
 function report$2(context) {
 	return (descriptor) => {
 		if (descriptor == null) return;
-		return context.report(descriptor);
+		context.report(descriptor);
 	};
 }
 function getIndexParamPosition(methodName) {
@@ -2244,7 +2246,7 @@ var no_create_ref_default = createRule({
 });
 function create$34(context) {
 	return merge({ CallExpression(node) {
-		if (core.isCreateRefCall(context, node) && Traverse.findParent(node, core.isClassComponent) == null) context.report({
+		if (core.isCreateRefCall(context, node) && Traverse.findParent(node, (n) => core.isClassComponent(context, n)) == null) context.report({
 			messageId: "default",
 			node
 		});
@@ -2273,7 +2275,7 @@ function create$33(context) {
 		if (!core.isAssignmentToThisState(node)) return;
 		const parentClass = Traverse.findParent(node, 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 (core.isClassComponent(context, parentClass) && context.sourceCode.getScope(node).block !== Traverse.findParent(node, isConstructorFunction)) context.report({
 			messageId: "default",
 			node
 		});
@@ -2593,7 +2595,7 @@ function create$28(context) {
 function report$1(context) {
 	return (descriptor) => {
 		if (descriptor == null) return;
-		return context.report(descriptor);
+		context.report(descriptor);
 	};
 }
 
@@ -2778,7 +2780,7 @@ function create$25(context) {
 function report(context) {
 	return (descriptor) => {
 		if (descriptor == null) return;
-		return context.report(descriptor);
+		context.report(descriptor);
 	};
 }
 /**
@@ -2969,11 +2971,12 @@ function isInsideJSXAttributeValue(node) {
 /**
 * Check whether a given node is declared inside a class component's render block
 * Ex: class C extends React.Component { render() { const Nested = () => <div />; } }
+* @param context The rule context
 * @param node The AST node being checked
 * @returns `true` if the node is inside a class component's render block
 */
-function isInsideRenderMethod(node) {
-	return Traverse.findParent(node, (n) => core.isRenderMethodLike(n) && core.isClassComponent(n.parent.parent)) != null;
+function isInsideRenderMethod(context, node) {
+	return Traverse.findParent(node, (n) => core.isRenderMethodLike(n) && core.isClassComponent(context, n.parent.parent)) != null;
 }
 /**
 * Determine whether the node is inside `createElement`'s props argument
@@ -3052,7 +3055,7 @@ function create$22(context) {
 				});
 				continue;
 			}
-			if (isInsideRenderMethod(component)) context.report({
+			if (isInsideRenderMethod(context, component)) context.report({
 				data: {
 					name,
 					suggestion: "Move it to the top level."
@@ -3105,7 +3108,7 @@ function create$21(context) {
 				...hc.api.getAllHooks(program),
 				...cc.api.getAllComponents(program)
 			];
-			for (const lazy of lazyCalls) if (Traverse.findParent(lazy, (n) => significantParents.some((p) => p.node === n))) context.report({
+			for (const lazy of lazyCalls) if (Traverse.findParent(lazy, (n) => significantParents.some((p) => p.node === n)) != null) context.report({
 				messageId: "default",
 				node: lazy
 			});
@@ -3131,7 +3134,7 @@ function create$20(context) {
 	if (!context.sourceCode.text.includes("componentDidMount")) return {};
 	return merge({ CallExpression(node) {
 		if (!core.isThisSetStateCall(node)) return;
-		const enclosingClassNode = Traverse.findParent(node, core.isClassComponent);
+		const enclosingClassNode = Traverse.findParent(node, (n) => core.isClassComponent(context, n));
 		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);
@@ -3161,7 +3164,7 @@ function create$19(context) {
 	if (!context.sourceCode.text.includes("componentDidUpdate")) return {};
 	return merge({ CallExpression(node) {
 		if (!core.isThisSetStateCall(node)) return;
-		const enclosingClassNode = Traverse.findParent(node, core.isClassComponent);
+		const enclosingClassNode = Traverse.findParent(node, (n) => core.isClassComponent(context, n));
 		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);
@@ -3191,7 +3194,7 @@ function create$18(context) {
 	if (!context.sourceCode.text.includes("componentWillUpdate")) return {};
 	return merge({ CallExpression(node) {
 		if (!core.isThisSetStateCall(node)) return;
-		const enclosingClassNode = Traverse.findParent(node, core.isClassComponent);
+		const enclosingClassNode = Traverse.findParent(node, (n) => core.isClassComponent(context, n));
 		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);
@@ -3537,13 +3540,13 @@ function create$11(context) {
 	const propertyUsages = /* @__PURE__ */ new WeakMap();
 	function classEnter(node) {
 		classStack.push(node);
-		if (!core.isClassComponent(node)) return;
+		if (!core.isClassComponent(context, node)) return;
 		propertyDefs.set(node, /* @__PURE__ */ new Set());
 		propertyUsages.set(node, /* @__PURE__ */ new Set());
 	}
 	function classExit() {
 		const currentClass = classStack.pop();
-		if (currentClass == null || !core.isClassComponent(currentClass)) return;
+		if (currentClass == null || !core.isClassComponent(context, currentClass)) return;
 		const id = core.getClassId(currentClass);
 		const defs = propertyDefs.get(currentClass);
 		const usages = propertyUsages.get(currentClass);
@@ -3566,7 +3569,7 @@ function create$11(context) {
 	function methodEnter(node) {
 		methodStack.push(node);
 		const currentClass = classStack.at(-1);
-		if (currentClass == null || !core.isClassComponent(currentClass)) return;
+		if (currentClass == null || !core.isClassComponent(context, currentClass)) return;
 		if (node.static) return;
 		if (isKeyLiteral(node, node.key)) propertyDefs.get(currentClass)?.add(node.key);
 	}
@@ -3582,7 +3585,7 @@ function create$11(context) {
 			const currentClass = classStack.at(-1);
 			const currentMethod = methodStack.at(-1);
 			if (currentClass == null || currentMethod == null) return;
-			if (!core.isClassComponent(currentClass) || currentMethod.static) return;
+			if (!core.isClassComponent(context, currentClass) || currentMethod.static) return;
 			if (node.object.type !== AST_NODE_TYPES.ThisExpression || !isKeyLiteral(node, node.property)) return;
 			if (node.parent.type === AST_NODE_TYPES.AssignmentExpression && node.parent.left === node) {
 				propertyDefs.get(currentClass)?.add(node.property);
@@ -3599,7 +3602,7 @@ function create$11(context) {
 			const currentClass = classStack.at(-1);
 			const currentMethod = methodStack.at(-1);
 			if (currentClass == null || currentMethod == null) return;
-			if (!core.isClassComponent(currentClass) || currentMethod.static) return;
+			if (!core.isClassComponent(context, currentClass) || currentMethod.static) return;
 			if (node.init != null && node.init.type === AST_NODE_TYPES.ThisExpression && node.id.type === AST_NODE_TYPES.ObjectPattern) {
 				for (const prop of node.id.properties) if (prop.type === AST_NODE_TYPES.Property && isKeyLiteral(prop, prop.key)) {
 					const keyName = Extract.getPropertyName(prop.key);
@@ -3749,7 +3752,7 @@ function create$9(context) {
 		CallExpression(node) {
 			if (!core.isUseStateLikeCall(node, additionalStateHooks)) return;
 			const { parent } = node;
-			if (parent?.type !== AST_NODE_TYPES.VariableDeclarator || parent.id.type !== AST_NODE_TYPES.ArrayPattern) return;
+			if (parent.type !== AST_NODE_TYPES.VariableDeclarator || parent.id.type !== AST_NODE_TYPES.ArrayPattern) return;
 			const [stateEl] = parent.id.elements;
 			if (stateEl?.type !== AST_NODE_TYPES.Identifier) return;
 			stateEntries.push({
@@ -4159,7 +4162,8 @@ function create$7(context) {
 				case expr.type === AST_NODE_TYPES.Identifier: {
 					const builtinName = resolveBuiltinObjectName(context, expr);
 					if (builtinName == null) return;
-					if (!IMPURE_FUNCS.get("globalThis")?.has(builtinName)) return;
+					const globalThisImpure = IMPURE_FUNCS.get("globalThis");
+					if (globalThisImpure == null || !globalThisImpure.has(builtinName)) return;
 					const func = Traverse.findParent(node, Check.isFunction);
 					if (func == null) return;
 					cEntries.push({
@@ -4174,7 +4178,8 @@ function create$7(context) {
 					const objectName = resolveBuiltinObjectName(context, rootId);
 					if (objectName == null) return;
 					const propertyName = expr.property.name;
-					if (!IMPURE_FUNCS.get(objectName)?.has(propertyName)) return;
+					const objectImpure = IMPURE_FUNCS.get(objectName);
+					if (objectImpure == null || !objectImpure.has(propertyName)) return;
 					const func = Traverse.findParent(node, Check.isFunction);
 					if (func == null) return;
 					cEntries.push({
@@ -4238,7 +4243,7 @@ function isInNullCheckTest(node) {
 		if (!isLiteralNull(parent.left === node || Extract.unwrap(parent.left) === node ? parent.right : parent.left)) return false;
 		if (isIfTest(parent)) return true;
 		const grandparent = parent.parent;
-		if (grandparent?.type === AST_NODE_TYPES.UnaryExpression && grandparent.operator === "!" && isIfTest(grandparent)) return true;
+		if (grandparent.type === AST_NODE_TYPES.UnaryExpression && grandparent.operator === "!" && isIfTest(grandparent)) return true;
 		return false;
 	}
 	if (parent.type === AST_NODE_TYPES.UnaryExpression && parent.operator === "!") return isIfTest(parent);
@@ -4390,7 +4395,7 @@ function create$6(context) {
 				let isLazyInit = isInNullCheckTest(node);
 				if (!isLazyInit) {
 					let current = node.parent;
-					findIf: while (current != null) {
+					findIf: for (;;) {
 						if (current.type === AST_NODE_TYPES.IfStatement) {
 							if (isRefCurrentNullCheck(current.test, refName)) isLazyInit = true;
 							break;
@@ -6740,7 +6745,7 @@ function isRefInExpression(context, node) {
 * @returns The actual CallExpression node
 */
 function getSetStateCallExpression(node) {
-	return node.type === AST_NODE_TYPES.Identifier && node.parent?.type === AST_NODE_TYPES.CallExpression ? node.parent : node;
+	return node.type === AST_NODE_TYPES.Identifier && node.parent.type === AST_NODE_TYPES.CallExpression ? node.parent : node;
 }
 
 //#endregion
@@ -7174,7 +7179,7 @@ function getDynamicComponentSource(context, variable, isInsideRender, seen = /*
 			for (const ref of variable.references) {
 				if (!ref.isWrite()) continue;
 				const id = ref.identifier;
-				if (id.parent?.type === AST_NODE_TYPES.AssignmentExpression && id.parent.left === id) {
+				if (id.parent.type === AST_NODE_TYPES.AssignmentExpression && id.parent.left === id) {
 					const source = resolveDynamicValue(context, id.parent.right, isInsideRender, seen);
 					if (source != null) return {
 						creationNode: source,
@@ -7400,7 +7405,7 @@ function create$1(context) {
 			if (node.type !== AST_NODE_TYPES.AssignmentExpression) return;
 			const left = Extract.unwrap(node.left);
 			if (left.type !== AST_NODE_TYPES.Identifier) return;
-			if (Traverse.findParent(node, Check.isFunction, (n) => n === callback)) return;
+			if (Traverse.findParent(node, Check.isFunction, (n) => n === callback) != null) return;
 			const variable = findVariable(context.sourceCode.getScope(left), left);
 			if (variable != null && variable.defs.length > 0 && isDeclaredInsideCallback(variable, callback)) return;
 			violations.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "5.8.3",
+  "version": "5.8.4-beta.1",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -45,12 +45,12 @@
     "string-ts": "^2.3.1",
     "ts-api-utils": "^2.5.0",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "5.8.3",
-    "@eslint-react/core": "5.8.3",
-    "@eslint-react/eslint": "5.8.3",
-    "@eslint-react/jsx": "5.8.3",
-    "@eslint-react/shared": "5.8.3",
-    "@eslint-react/var": "5.8.3"
+    "@eslint-react/ast": "5.8.4-beta.1",
+    "@eslint-react/core": "5.8.4-beta.1",
+    "@eslint-react/eslint": "5.8.4-beta.1",
+    "@eslint-react/jsx": "5.8.4-beta.1",
+    "@eslint-react/shared": "5.8.4-beta.1",
+    "@eslint-react/var": "5.8.4-beta.1"
   },
   "devDependencies": {
     "@types/react": "^19.2.14",
@@ -77,7 +77,7 @@
     "@local/eff": "workspace:*"
   },
   "scripts": {
-    "build": "tsdown --dts-resolve",
+    "build": "tsdown",
     "lint:publish": "publint",
     "lint:ts": "tsl"
   }