eslint-plugin-react-x 3.0.0-beta.67 → 3.0.0-beta.69

package/dist/index.js

@@ -147,7 +147,7 @@ const rules$7 = {
 //#endregion
 //#region package.json
 var name$6 = "eslint-plugin-react-x";
-var version = "3.0.0-beta.67";
+var version = "3.0.0-beta.69";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -1442,15 +1442,15 @@ function create$61(context) {
 				node
 			});
 		},
-		"Program:exit"(program) {
-			const components = cCollector.ctx.getAllComponents(program);
-			const hooks = hCollector.ctx.getAllHooks(program);
-			const componentAndHookFns = new Set([...components.map((c) => c.node), ...hooks.map((h) => h.node)]);
+		"Program:exit"(node) {
+			const comps = cCollector.ctx.getAllComponents(node);
+			const hooks = hCollector.ctx.getAllHooks(node);
+			const funcs = [...comps, ...hooks];
 			for (const { data, func, messageId, node } of violations) {
 				let current = func;
 				let insideComponentOrHook = false;
 				while (current != null) {
-					if (componentAndHookFns.has(current)) {
+					if (funcs.some((f) => f.node === current)) {
 						insideComponentOrHook = true;
 						break;
 					}
@@ -4273,9 +4273,9 @@ function create$7(context) {
 			});
 		},
 		"Program:exit"(node) {
-			const components = cCollector.ctx.getAllComponents(node);
+			const comps = cCollector.ctx.getAllComponents(node);
 			const hooks = hCollector.ctx.getAllHooks(node);
-			const funcs = [...components, ...hooks];
+			const funcs = [...comps, ...hooks];
 			for (const { func, node } of [...cExprs, ...nExprs]) {
 				if (!funcs.some((f) => f.node === func)) continue;
 				context.report({
@@ -4316,12 +4316,13 @@ function create$6(context) {
 	* @returns true if the node is part of a null check test in an if statement
 	*/
 	function isInNullCheckTest(node) {
-		const { parent } = node;
+		let parent = node.parent;
+		while (ast.isTypeExpression(parent)) parent = parent.parent;
 		if (!isMatching({
 			type: AST_NODE_TYPES.BinaryExpression,
 			operator: P.union("===", "==", "!==", "!=")
 		}, parent)) return false;
-		const otherSide = parent.left === node ? parent.right : parent.left;
+		const otherSide = parent.left === node || ast.getUnderlyingExpression(parent.left) === node ? parent.right : parent.left;
 		if (otherSide.type !== AST_NODE_TYPES.Literal || otherSide.value != null) return false;
 		return parent.parent.type === AST_NODE_TYPES.IfStatement && parent.parent.test === parent;
 	}
@@ -4336,7 +4337,10 @@ function create$6(context) {
 		const op = test.operator;
 		if (op !== "===" && op !== "==" && op !== "!==" && op !== "!=") return false;
 		const { left, right } = test;
-		const checkSides = (a, b) => a.type === AST_NODE_TYPES.MemberExpression && a.object.type === AST_NODE_TYPES.Identifier && a.object.name === refName && a.property.type === AST_NODE_TYPES.Identifier && a.property.name === "current" && b.type === AST_NODE_TYPES.Literal && b.value == null;
+		const checkSides = (a, b) => {
+			a = ast.isTypeExpression(a) ? ast.getUnderlyingExpression(a) : a;
+			return a.type === AST_NODE_TYPES.MemberExpression && a.object.type === AST_NODE_TYPES.Identifier && a.object.name === refName && b.type === AST_NODE_TYPES.Literal && b.value == null && ast.getPropertyName(a.property) === "current";
+		};
 		return checkSides(left, right) || checkSides(right, left);
 	}
 	return defineRuleListener(hCollector.visitor, cCollector.visitor, {
@@ -4350,7 +4354,11 @@ function create$6(context) {
 		MemberExpression(node) {
 			if (!ast.isIdentifier(node.property, "current")) return;
 			refAccesses.push({
-				isWrite: match(node.parent).with({ type: AST_NODE_TYPES.AssignmentExpression }, (p) => p.left === node).with({ type: AST_NODE_TYPES.UpdateExpression }, (p) => p.argument === node).otherwise(() => false),
+				isWrite: (() => {
+					let parent = node.parent;
+					while (ast.isTypeExpression(parent)) parent = parent.parent;
+					return match(parent).with({ type: AST_NODE_TYPES.AssignmentExpression }, (p) => p.left === node || ast.getUnderlyingExpression(p.left) === node).with({ type: AST_NODE_TYPES.UpdateExpression }, (p) => p.argument === node || ast.getUnderlyingExpression(p.argument) === node).otherwise(() => false);
+				})(),
 				node
 			});
 		},
@@ -7020,7 +7028,8 @@ function create$2(context) {
 	if (!context.sourceCode.text.includes("useMemo")) return {};
 	return defineRuleListener({ CallExpression(node) {
 		if (!core.isUseMemoCall(node)) return;
-		const parent = node.parent;
+		let parent = node.parent;
+		while (ast.isTypeExpression(parent)) parent = parent.parent;
 		if (!(parent.type === AST_NODE_TYPES.VariableDeclarator || parent.type === AST_NODE_TYPES.AssignmentExpression || parent.type === AST_NODE_TYPES.AssignmentPattern || parent.type === AST_NODE_TYPES.Property || parent.type === AST_NODE_TYPES.ReturnStatement || parent.type === AST_NODE_TYPES.JSXExpressionContainer || parent.type === AST_NODE_TYPES.CallExpression || parent.type === AST_NODE_TYPES.NewExpression || parent.type === AST_NODE_TYPES.ArrayExpression || parent.type === AST_NODE_TYPES.ConditionalExpression || parent.type === AST_NODE_TYPES.LogicalExpression || parent.type === AST_NODE_TYPES.SequenceExpression || parent.type === AST_NODE_TYPES.SpreadElement || parent.type === AST_NODE_TYPES.TemplateLiteral || parent.type === AST_NODE_TYPES.BinaryExpression || parent.type === AST_NODE_TYPES.UnaryExpression || parent.type === AST_NODE_TYPES.MemberExpression || parent.type === AST_NODE_TYPES.TaggedTemplateExpression || parent.type === AST_NODE_TYPES.ChainExpression)) {
 			context.report({
 				messageId: "notAssignedToVariable",
@@ -7185,34 +7194,31 @@ var unstable_rules_of_props_default = createRule({
 	create,
 	defaultOptions: []
 });
+function toControlledName(uncontrolledName) {
+	const [, head, tail] = /^default([A-Z])(.*)$/.exec(uncontrolledName) ?? [];
+	if (head == null || tail == null) return null;
+	return head.toLowerCase() + tail;
+}
 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 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;
-			map.set(name, attr);
+		const attributes = /* @__PURE__ */ new Map();
+		for (const attribute of node.attributes) {
+			if (attribute.type === AST_NODE_TYPES.JSXSpreadAttribute) continue;
+			const { name: identifier } = attribute.name;
+			if (typeof identifier !== "string") continue;
+			attributes.set(identifier, attribute);
 		}
-		for (const [controlled, uncontrolled] of pairs) {
-			if (!map.has(controlled) || !map.has(uncontrolled)) continue;
-			const attr = map.get(uncontrolled);
-			if (attr == null) continue;
+		for (const [propName, attrNode] of attributes) {
+			const controlledProp = toControlledName(propName);
+			if (controlledProp == null) continue;
+			if (!attributes.has(controlledProp)) continue;
 			context.report({
-				data: {
-					controlled,
-					uncontrolled
-				},
+				node: attrNode,
 				messageId: "noControlledAndUncontrolledTogether",
-				node: attr
+				data: {
+					controlled: controlledProp,
+					uncontrolled: propName
+				}
 			});
 		}
 	} });

package/package.json

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