eslint-plugin-react-x 3.0.0-beta.60 → 3.0.0-beta.61

package/dist/index.js

@@ -5,9 +5,9 @@ import { ESLintUtils } from "@typescript-eslint/utils";
 import { P, isMatching, match } from "ts-pattern";
 import ts from "typescript";
 import { AST_NODE_TYPES } from "@typescript-eslint/types";
-import { findEnclosingAssignmentTarget, findVariable, getObjectType, getVariableInitializer, isAssignmentTargetEqual } from "@eslint-react/var";
-import { DefinitionType } from "@typescript-eslint/scope-manager";
 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 { compare } from "compare-versions";
 import { getConstrainedTypeAtLocation } from "@typescript-eslint/type-utils";
 import { unionConstituents } from "ts-api-utils";
@@ -69,7 +69,7 @@ const rules$7 = {
 //#endregion
 //#region package.json
 var name$6 = "eslint-plugin-react-x";
-var version = "3.0.0-beta.60";
+var version = "3.0.0-beta.61";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -1289,7 +1289,14 @@ function create$61(context) {
 	* @returns True if `id` is a state variable, false otherwise.
 	*/
 	function isStateValue(id) {
-		const initNode = getVariableInitializer(findVariable(id, context.sourceCode.getScope(id)), 0);
+		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)));
 		if (initNode == null || initNode.type !== AST_NODE_TYPES.CallExpression) return false;
 		if (!isUseStateCall(initNode)) return false;
 		const declarator = initNode.parent;
@@ -3144,7 +3151,19 @@ 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 initNode = getVariableInitializer(findVariable(n.name, scope), 0);
+			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);
 			if (initNode?.type !== AST_NODE_TYPES.ArrayExpression) return false;
 			return initNode.elements.length === 0;
 		}).otherwise(() => false)) {
@@ -3155,7 +3174,19 @@ 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 initNode = getVariableInitializer(findVariable(n.name, scope), 0);
+			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);
 			if (initNode?.type !== AST_NODE_TYPES.ArrowFunctionExpression && initNode?.type !== AST_NODE_TYPES.FunctionExpression) return null;
 			return initNode;
 		}).otherwise(() => null);
@@ -3228,7 +3259,19 @@ 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 initNode = getVariableInitializer(findVariable(n.name, scope), 0);
+			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);
 			if (initNode?.type !== AST_NODE_TYPES.ArrayExpression) return false;
 			return initNode.elements.length === 0;
 		}).otherwise(() => false)) {
@@ -3239,7 +3282,14 @@ 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) => {
-			const variableNode = getVariableInitializer(findVariable(n.name, scope), 0);
+			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));
 			if (variableNode?.type !== AST_NODE_TYPES.ArrowFunctionExpression && variableNode?.type !== AST_NODE_TYPES.FunctionExpression) return null;
 			return variableNode;
 		}).otherwise(() => null);
@@ -6545,7 +6595,19 @@ function create$5(context) {
 		}
 	}
 	function isIdFromUseStateCall(id, at) {
-		const initNode = getVariableInitializer(findVariable(id, context.sourceCode.getScope(id)), 0);
+		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);
 		if (initNode == null) return false;
 		if (initNode.type !== AST_NODE_TYPES.CallExpression) return false;
 		if (!isUseStateCall(initNode)) return false;
@@ -6668,7 +6730,14 @@ function create$5(context) {
 		},
 		"Program:exit"() {
 			const getSetStateCalls = (id, initialScope) => {
-				const node = getVariableInitializer(findVariable(id, initialScope), 0);
+				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));
 				switch (node?.type) {
 					case AST_NODE_TYPES.ArrowFunctionExpression:
 					case AST_NODE_TYPES.FunctionDeclaration:
@@ -6727,7 +6796,14 @@ function create$4(context) {
 		return core.isUseStateLikeCall(node, additionalStateHooks);
 	}
 	function isIdFromUseStateCall(topLevelId, at) {
-		const initNode = getVariableInitializer(findVariable(topLevelId, context.sourceCode.getScope(topLevelId)), 0);
+		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)));
 		if (initNode == null) return false;
 		if (initNode.type !== AST_NODE_TYPES.CallExpression) return false;
 		if (!isUseStateCall(initNode)) return false;
@@ -7097,14 +7173,6 @@ function create$1(context) {
 //#endregion
 //#region src/rules/unstable-rules-of-props/unstable-rules-of-props.ts
 const RULE_NAME = "unstable-rules-of-props";
-/**
-* Pairs of [controlled prop, uncontrolled prop] that must not appear together
-* on the same JSX element.
-*
-* - `value`   → controlled;   `defaultValue`   → uncontrolled
-* - `checked` → controlled;   `defaultChecked` → uncontrolled
-*/
-const CONTROLLED_UNCONTROLLED_PAIRS = [["value", "defaultValue"], ["checked", "defaultChecked"]];
 var unstable_rules_of_props_default = createRule({
 	meta: {
 		type: "problem",
@@ -7117,25 +7185,33 @@ var unstable_rules_of_props_default = createRule({
 	defaultOptions: []
 });
 function create(context) {
+	/**
+	* Pairs of [controlled prop, uncontrolled prop] that must not appear together
+	* on the same JSX element.
+	*
+	* - `value`   → controlled;   `defaultValue`   → uncontrolled
+	* - `checked` → controlled;   `defaultChecked` → uncontrolled
+	*/
+	const pairs = [["value", "defaultValue"], ["checked", "defaultChecked"]];
 	return defineRuleListener({ JSXOpeningElement(node) {
-		const propMap = /* @__PURE__ */ new Map();
+		const map = /* @__PURE__ */ new Map();
 		for (const attr of node.attributes) {
 			if (attr.type === AST_NODE_TYPES.JSXSpreadAttribute) continue;
 			const { name } = attr.name;
 			if (typeof name !== "string") continue;
-			propMap.set(name, attr);
+			map.set(name, attr);
 		}
-		for (const [controlled, uncontrolled] of CONTROLLED_UNCONTROLLED_PAIRS) {
-			if (!propMap.has(controlled) || !propMap.has(uncontrolled)) continue;
-			const uncontrolledAttr = propMap.get(uncontrolled);
-			if (uncontrolledAttr == null) continue;
+		for (const [controlled, uncontrolled] of pairs) {
+			if (!map.has(controlled) || !map.has(uncontrolled)) continue;
+			const attr = map.get(uncontrolled);
+			if (attr == null) continue;
 			context.report({
 				data: {
 					controlled,
 					uncontrolled
 				},
 				messageId: "noControlledAndUncontrolledTogether",
-				node: uncontrolledAttr
+				node: attr
 			});
 		}
 	} });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "3.0.0-beta.60",
+  "version": "3.0.0-beta.61",
   "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-beta.60",
-    "@eslint-react/eff": "3.0.0-beta.60",
-    "@eslint-react/core": "3.0.0-beta.60",
-    "@eslint-react/shared": "3.0.0-beta.60",
-    "@eslint-react/var": "3.0.0-beta.60"
+    "@eslint-react/ast": "3.0.0-beta.61",
+    "@eslint-react/eff": "3.0.0-beta.61",
+    "@eslint-react/shared": "3.0.0-beta.61",
+    "@eslint-react/var": "3.0.0-beta.61",
+    "@eslint-react/core": "3.0.0-beta.61"
   },
   "devDependencies": {
     "@types/react": "^19.2.14",