eslint-plugin-react-x 3.0.0-next.61 → 3.0.0-next.63

package/dist/index.js

@@ -6,12 +6,12 @@ import { P, isMatching, match } from "ts-pattern";
 import ts from "typescript";
 import { AST_NODE_TYPES } from "@typescript-eslint/types";
 import { constFalse, constTrue, constVoid, flow, getOrElseUpdate, identity, not, unit } from "@eslint-react/eff";
-import { findEnclosingAssignmentTarget, findVariable, getObjectType, isAssignmentTargetEqual } from "@eslint-react/var";
 import { DefinitionType } from "@typescript-eslint/scope-manager";
+import { findVariable, getStaticValue, isIdentifier, isVariableDeclarator } from "@typescript-eslint/utils/ast-utils";
 import { compare } from "compare-versions";
 import { getConstrainedTypeAtLocation } from "@typescript-eslint/type-utils";
 import { unionConstituents } from "ts-api-utils";
-import { getStaticValue, isIdentifier, isVariableDeclarator } from "@typescript-eslint/utils/ast-utils";
+import { computeObjectType, findEnclosingAssignmentTarget, isAssignmentTargetEqual } from "@eslint-react/var";
 import { snakeCase } from "string-ts";
 
 //#region \0rolldown/runtime.js
@@ -47,10 +47,10 @@ const rules$8 = {
 	"react-x/no-unnecessary-use-callback": "off",
 	"react-x/no-unnecessary-use-memo": "off",
 	"react-x/no-unused-props": "off",
-	"react-x/unstable-rules-of-props": "off",
 	"react-x/refs": "off",
 	"react-x/rules-of-hooks": "off",
-	"react-x/set-state-in-render": "off"
+	"react-x/set-state-in-render": "off",
+	"react-x/unstable-rules-of-props": "off"
 };
 
 //#endregion
@@ -69,7 +69,7 @@ const rules$7 = {
 //#endregion
 //#region package.json
 var name$6 = "eslint-plugin-react-x";
-var version = "3.0.0-next.61";
+var version = "3.0.0-next.63";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -1289,14 +1289,7 @@ function create$61(context) {
 	* @returns True if `id` is a state variable, false otherwise.
 	*/
 	function isStateValue(id) {
-		function resolve(v) {
-			if (v == null) return unit;
-			const def = v.defs.at(0);
-			if (def == null) return unit;
-			if ("init" in def.node && def.node.init != null && !("declarations" in def.node.init)) return def.node.init;
-			return def.node;
-		}
-		const initNode = resolve(findVariable(id, context.sourceCode.getScope(id)));
+		const initNode = resolve$4(findVariable(context.sourceCode.getScope(id), id));
 		if (initNode == null || initNode.type !== AST_NODE_TYPES.CallExpression) return false;
 		if (!isUseStateCall(initNode)) return false;
 		const declarator = initNode.parent;
@@ -1320,7 +1313,7 @@ function create$61(context) {
 	* @returns True if `id` is a props parameter, false otherwise.
 	*/
 	function isPropsObject(id) {
-		const variable = findVariable(id, context.sourceCode.getScope(id));
+		const variable = findVariable(context.sourceCode.getScope(id), id);
 		if (variable == null) return false;
 		for (const def of variable.defs) {
 			if (def.type !== DefinitionType.Parameter) continue;
@@ -1395,6 +1388,13 @@ function create$61(context) {
 		}
 	});
 }
+function resolve$4(v) {
+	if (v == null) return unit;
+	const def = v.defs.at(0);
+	if (def == null) return unit;
+	if ("init" in def.node && def.node.init != null && !("declarations" in def.node.init)) return def.node.init;
+	return def.node;
+}
 
 //#endregion
 //#region src/rules/jsx-dollar/jsx-dollar.ts
@@ -2602,7 +2602,7 @@ function create$33(context) {
 		}).with({ type: AST_NODE_TYPES.ConditionalExpression }, ({ alternate, consequent }) => {
 			return getReportDescriptor(consequent) ?? getReportDescriptor(alternate);
 		}).with({ type: AST_NODE_TYPES.Identifier }, (n) => {
-			const variableDefNode = findVariable(n.name, context.sourceCode.getScope(n))?.defs.at(0)?.node;
+			const variableDefNode = findVariable(context.sourceCode.getScope(n), n.name)?.defs.at(0)?.node;
 			return match(variableDefNode).with({ init: P.select({ type: P.not(AST_NODE_TYPES.VariableDeclaration) }) }, getReportDescriptor).otherwise(() => unit);
 		}).otherwise(() => unit);
 	}
@@ -3151,19 +3151,7 @@ function create$22(context) {
 		const [arg0, arg1] = init.arguments;
 		if (arg0 == null || arg1 == null) return;
 		if (!match(arg1).with({ type: AST_NODE_TYPES.ArrayExpression }, (n) => n.elements.length === 0).with({ type: AST_NODE_TYPES.Identifier }, (n) => {
-			const variable = findVariable(n.name, scope);
-			function resolve(v) {
-				if (v == null) return unit;
-				const def = v.defs.at(0);
-				if (def == null) return unit;
-				switch (true) {
-					case def.type === DefinitionType.FunctionName && def.node.type === AST_NODE_TYPES.FunctionDeclaration: return def.node;
-					case def.type === DefinitionType.ClassName && def.node.type === AST_NODE_TYPES.ClassDeclaration: return def.node;
-					case "init" in def.node && def.node.init != null && !("declarations" in def.node.init): return def.node.init;
-					default: return unit;
-				}
-			}
-			const initNode = resolve(variable);
+			const initNode = resolve$3(findVariable(scope, n.name));
 			if (initNode?.type !== AST_NODE_TYPES.ArrayExpression) return false;
 			return initNode.elements.length === 0;
 		}).otherwise(() => false)) {
@@ -3174,19 +3162,7 @@ function create$22(context) {
 			if (n.body.type === AST_NODE_TYPES.ArrowFunctionExpression) return n.body;
 			return n;
 		}).with({ type: AST_NODE_TYPES.FunctionExpression }, identity).with({ type: AST_NODE_TYPES.Identifier }, (n) => {
-			const variable = findVariable(n.name, scope);
-			function resolve(v) {
-				if (v == null) return unit;
-				const def = v.defs.at(0);
-				if (def == null) return unit;
-				switch (true) {
-					case def.type === DefinitionType.FunctionName && def.node.type === AST_NODE_TYPES.FunctionDeclaration: return def.node;
-					case def.type === DefinitionType.ClassName && def.node.type === AST_NODE_TYPES.ClassDeclaration: return def.node;
-					case "init" in def.node && def.node.init != null && !("declarations" in def.node.init): return def.node.init;
-					default: return unit;
-				}
-			}
-			const initNode = resolve(variable);
+			const initNode = resolve$3(findVariable(scope, n.name));
 			if (initNode?.type !== AST_NODE_TYPES.ArrowFunctionExpression && initNode?.type !== AST_NODE_TYPES.FunctionExpression) return null;
 			return initNode;
 		}).otherwise(() => null);
@@ -3223,6 +3199,13 @@ function checkForUsageInsideUseEffect$1(sourceCode, node) {
 		node
 	};
 }
+function resolve$3(v) {
+	if (v == null) return unit;
+	const def = v.defs.at(0);
+	if (def == null) return unit;
+	if ("init" in def.node && def.node.init != null && !("declarations" in def.node.init)) return def.node.init;
+	return def.node;
+}
 
 //#endregion
 //#region src/rules/no-unnecessary-use-memo/no-unnecessary-use-memo.ts
@@ -3259,19 +3242,7 @@ function create$21(context) {
 			return;
 		}
 		if (!match(arg1).with({ type: AST_NODE_TYPES.ArrayExpression }, (n) => n.elements.length === 0).with({ type: AST_NODE_TYPES.Identifier }, (n) => {
-			const variable = findVariable(n.name, scope);
-			function resolve(v) {
-				if (v == null) return unit;
-				const def = v.defs.at(0);
-				if (def == null) return unit;
-				switch (true) {
-					case def.type === DefinitionType.FunctionName && def.node.type === AST_NODE_TYPES.FunctionDeclaration: return def.node;
-					case def.type === DefinitionType.ClassName && def.node.type === AST_NODE_TYPES.ClassDeclaration: return def.node;
-					case "init" in def.node && def.node.init != null && !("declarations" in def.node.init): return def.node.init;
-					default: return unit;
-				}
-			}
-			const initNode = resolve(variable);
+			const initNode = resolve$2(findVariable(scope, n.name));
 			if (initNode?.type !== AST_NODE_TYPES.ArrayExpression) return false;
 			return initNode.elements.length === 0;
 		}).otherwise(() => false)) {
@@ -3282,14 +3253,7 @@ function create$21(context) {
 			if (n.body.type === AST_NODE_TYPES.ArrowFunctionExpression) return n.body;
 			return n;
 		}).with({ type: AST_NODE_TYPES.FunctionExpression }, identity).with({ type: AST_NODE_TYPES.Identifier }, (n) => {
-			function resolve(v) {
-				if (v == null) return unit;
-				const def = v.defs.at(0);
-				if (def == null) return unit;
-				if ("init" in def.node && def.node.init != null && !("declarations" in def.node.init)) return def.node.init;
-				return def.node;
-			}
-			const variableNode = resolve(findVariable(n.name, scope));
+			const variableNode = resolve$2(findVariable(scope, n.name));
 			if (variableNode?.type !== AST_NODE_TYPES.ArrowFunctionExpression && variableNode?.type !== AST_NODE_TYPES.FunctionExpression) return null;
 			return variableNode;
 		}).otherwise(() => null);
@@ -3326,6 +3290,13 @@ function checkForUsageInsideUseEffect(sourceCode, node) {
 		node
 	};
 }
+function resolve$2(v) {
+	if (v == null) return unit;
+	const def = v.defs.at(0);
+	if (def == null) return unit;
+	if ("init" in def.node && def.node.init != null && !("declarations" in def.node.init)) return def.node.init;
+	return def.node;
+}
 
 //#endregion
 //#region src/rules/no-unnecessary-use-prefix/no-unnecessary-use-prefix.ts
@@ -3481,7 +3452,7 @@ function create$16(context) {
 			const value = attribute.value;
 			if (value?.type !== AST_NODE_TYPES.JSXExpressionContainer) return;
 			const valueExpression = value.expression;
-			const construction = getObjectType(valueExpression, context.sourceCode.getScope(valueExpression));
+			const construction = computeObjectType(valueExpression, context.sourceCode.getScope(valueExpression));
 			if (construction == null) return;
 			if (core.isHookCall(construction.node)) return;
 			getOrElseUpdate(constructions, functionEntry.node, () => []).push(construction);
@@ -3568,7 +3539,7 @@ function create$15(context, [options]) {
 					if (prop.type !== AST_NODE_TYPES.Property || prop.value.type !== AST_NODE_TYPES.AssignmentPattern) continue;
 					const { value } = prop;
 					const { right } = value;
-					const construction = getObjectType(value, context.sourceCode.getScope(value));
+					const construction = computeObjectType(value, context.sourceCode.getScope(value));
 					if (construction == null) continue;
 					if (core.isHookCall(construction.node)) continue;
 					if (safePatterns.length > 0) {
@@ -6595,19 +6566,7 @@ function create$5(context) {
 		}
 	}
 	function isIdFromUseStateCall(id, at) {
-		const variable = findVariable(id, context.sourceCode.getScope(id));
-		function resolve(v) {
-			if (v == null) return unit;
-			const def = v.defs.at(0);
-			if (def == null) return unit;
-			switch (true) {
-				case def.type === DefinitionType.FunctionName && def.node.type === AST_NODE_TYPES.FunctionDeclaration: return def.node;
-				case def.type === DefinitionType.ClassName && def.node.type === AST_NODE_TYPES.ClassDeclaration: return def.node;
-				case "init" in def.node && def.node.init != null && !("declarations" in def.node.init): return def.node.init;
-				default: return unit;
-			}
-		}
-		const initNode = resolve(variable);
+		const initNode = resolve$1(findVariable(context.sourceCode.getScope(id), id));
 		if (initNode == null) return false;
 		if (initNode.type !== AST_NODE_TYPES.CallExpression) return false;
 		if (!isUseStateCall(initNode)) return false;
@@ -6730,14 +6689,7 @@ function create$5(context) {
 		},
 		"Program:exit"() {
 			const getSetStateCalls = (id, initialScope) => {
-				function resolve(v) {
-					if (v == null) return unit;
-					const def = v.defs.at(0);
-					if (def == null) return unit;
-					if ("init" in def.node && def.node.init != null && !("declarations" in def.node.init)) return def.node.init;
-					return def.node;
-				}
-				const node = resolve(findVariable(id, initialScope));
+				const node = resolve$1(findVariable(initialScope, id));
 				switch (node?.type) {
 					case AST_NODE_TYPES.ArrowFunctionExpression:
 					case AST_NODE_TYPES.FunctionDeclaration:
@@ -6772,6 +6724,17 @@ function create$5(context) {
 		}
 	});
 }
+function resolve$1(v) {
+	if (v == null) return unit;
+	const def = v.defs.at(0);
+	if (def == null) return unit;
+	switch (true) {
+		case def.type === DefinitionType.FunctionName && def.node.type === AST_NODE_TYPES.FunctionDeclaration: return def.node;
+		case def.type === DefinitionType.ClassName && def.node.type === AST_NODE_TYPES.ClassDeclaration: return def.node;
+		case "init" in def.node && def.node.init != null && !("declarations" in def.node.init): return def.node.init;
+		default: return unit;
+	}
+}
 
 //#endregion
 //#region src/rules/set-state-in-render/set-state-in-render.ts
@@ -6796,14 +6759,7 @@ function create$4(context) {
 		return core.isUseStateLikeCall(node, additionalStateHooks);
 	}
 	function isIdFromUseStateCall(topLevelId, at) {
-		function resolve(v) {
-			if (v == null) return unit;
-			const def = v.defs.at(0);
-			if (def == null) return unit;
-			if ("init" in def.node && def.node.init != null && !("declarations" in def.node.init)) return def.node.init;
-			return def.node;
-		}
-		const initNode = resolve(findVariable(topLevelId, context.sourceCode.getScope(topLevelId)));
+		const initNode = resolve(findVariable(context.sourceCode.getScope(topLevelId), topLevelId));
 		if (initNode == null) return false;
 		if (initNode.type !== AST_NODE_TYPES.CallExpression) return false;
 		if (!isUseStateCall(initNode)) return false;
@@ -6916,6 +6872,13 @@ function create$4(context) {
 		}
 	});
 }
+function resolve(v) {
+	if (v == null) return unit;
+	const def = v.defs.at(0);
+	if (def == null) return unit;
+	if ("init" in def.node && def.node.init != null && !("declarations" in def.node.init)) return def.node.init;
+	return def.node;
+}
 
 //#endregion
 //#region src/rules/unsupported-syntax/unsupported-syntax.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "3.0.0-next.61",
+  "version": "3.0.0-next.63",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -45,11 +45,11 @@
     "string-ts": "^2.3.1",
     "ts-api-utils": "^2.4.0",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "3.0.0-next.61",
-    "@eslint-react/core": "3.0.0-next.61",
-    "@eslint-react/eff": "3.0.0-next.61",
-    "@eslint-react/shared": "3.0.0-next.61",
-    "@eslint-react/var": "3.0.0-next.61"
+    "@eslint-react/ast": "3.0.0-next.63",
+    "@eslint-react/core": "3.0.0-next.63",
+    "@eslint-react/shared": "3.0.0-next.63",
+    "@eslint-react/var": "3.0.0-next.63",
+    "@eslint-react/eff": "3.0.0-next.63"
   },
   "devDependencies": {
     "@types/react": "^19.2.14",