eslint-plugin-react-x 2.0.7-beta.2 → 2.0.7-beta.3

package/dist/index.js

@@ -134,7 +134,7 @@ const settings = { ...settings$1 };
 //#endregion
 //#region package.json
 var name = "eslint-plugin-react-x";
-var version = "2.0.7-beta.2";
+var version = "2.0.7-beta.3";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -1241,8 +1241,7 @@ function create$37(context) {
 		if (object.type !== AST_NODE_TYPES.Identifier) return;
 		if (property.type !== AST_NODE_TYPES.Identifier || property.name !== "defaultProps") return;
 		if (!isComponentNameLoose(object.name)) return;
-		const variable = findVariable(object.name, context.sourceCode.getScope(node));
-		const variableNode = getVariableDefinitionNode(variable, 0);
+		const variableNode = getVariableDefinitionNode(findVariable(object.name, context.sourceCode.getScope(node)), 0);
 		if (variableNode == null) return;
 		if (!AST.isFunction(variableNode)) return;
 		context.report({
@@ -1423,8 +1422,7 @@ function create$34(context, [option]) {
 					if ("excludedNodes" in forbiddenPropItem && forbiddenPropItem.excludedNodes.includes(nodeName)) continue;
 					if ("includedNodes" in forbiddenPropItem && !forbiddenPropItem.includedNodes.includes(nodeName)) continue;
 				}
-				const forbiddenProp = typeof forbiddenPropItem === "string" ? forbiddenPropItem : forbiddenPropItem.prop;
-				if (toRegExp(forbiddenProp).test(name$4)) context.report({
+				if (toRegExp(typeof forbiddenPropItem === "string" ? forbiddenPropItem : forbiddenPropItem.prop).test(name$4)) context.report({
 					messageId,
 					node: attr,
 					data: { name: name$4 }
@@ -1630,8 +1628,7 @@ function create$31(context) {
 				node: left,
 				data: { value: context.sourceCode.getText(left) }
 			};
-			const leftType = getConstrainedTypeAtLocation(services, left);
-			const leftTypeVariants = getTypeVariants(unionConstituents(leftType));
+			const leftTypeVariants = getTypeVariants(unionConstituents(getConstrainedTypeAtLocation(services, left)));
 			if (Array.from(leftTypeVariants.values()).every((type) => allowedVariants.some((allowed) => allowed === type))) return getReportDescriptor(right);
 			return {
 				messageId: "noLeakedConditionalRendering",
@@ -1930,8 +1927,7 @@ var no_nested_component_definitions_default = createRule({
 	defaultOptions: []
 });
 function create$26(context) {
-	const hint = ComponentDetectionHint.SkipArrayMapArgument | ComponentDetectionHint.SkipNullLiteral | ComponentDetectionHint.SkipUndefined | ComponentDetectionHint.SkipBooleanLiteral | ComponentDetectionHint.SkipStringLiteral | ComponentDetectionHint.SkipNumberLiteral | ComponentDetectionHint.StrictLogical | ComponentDetectionHint.StrictConditional;
-	const collector = useComponentCollector(context, { hint });
+	const collector = useComponentCollector(context, { hint: ComponentDetectionHint.SkipArrayMapArgument | ComponentDetectionHint.SkipNullLiteral | ComponentDetectionHint.SkipUndefined | ComponentDetectionHint.SkipBooleanLiteral | ComponentDetectionHint.SkipStringLiteral | ComponentDetectionHint.SkipNumberLiteral | ComponentDetectionHint.StrictLogical | ComponentDetectionHint.StrictConditional });
 	const collectorLegacy = useComponentCollectorLegacy();
 	return {
 		...collector.listeners,
@@ -2110,8 +2106,7 @@ function create$24(context) {
 			if (object.type !== AST_NODE_TYPES.Identifier) return;
 			if (property.type !== AST_NODE_TYPES.Identifier || property.name !== "propTypes") return;
 			if (!isComponentNameLoose(object.name)) return;
-			const variable = findVariable(object.name, context.sourceCode.getScope(node));
-			const variableNode = getVariableDefinitionNode(variable, 0);
+			const variableNode = getVariableDefinitionNode(findVariable(object.name, context.sourceCode.getScope(node)), 0);
 			if (variableNode != null && (AST.isFunction(variableNode) || isClassComponent(variableNode))) context.report({
 				messageId: "noPropTypes",
 				node: property
@@ -2409,8 +2404,7 @@ function create$17(context) {
 		const [arg0, arg1] = node.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, initialScope);
-			const variableNode = getVariableDefinitionNode(variable, 0);
+			const variableNode = getVariableDefinitionNode(findVariable(n.name, initialScope), 0);
 			if (variableNode?.type !== AST_NODE_TYPES.ArrayExpression) return false;
 			return variableNode.elements.length === 0;
 		}).otherwise(() => false)) return;
@@ -2418,14 +2412,12 @@ function create$17(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, initialScope);
-			const variableNode = getVariableDefinitionNode(variable, 0);
+			const variableNode = getVariableDefinitionNode(findVariable(n.name, initialScope), 0);
 			if (variableNode?.type !== AST_NODE_TYPES.ArrowFunctionExpression && variableNode?.type !== AST_NODE_TYPES.FunctionExpression) return null;
 			return variableNode;
 		}).otherwise(() => null);
 		if (arg0Node == null) return;
-		const arg0NodeScope = context.sourceCode.getScope(arg0Node);
-		if (!getChildScopes(arg0NodeScope).flatMap((x) => x.references).some((x) => x.resolved?.scope.block === component)) context.report({
+		if (!getChildScopes(context.sourceCode.getScope(arg0Node)).flatMap((x) => x.references).some((x) => x.resolved?.scope.block === component)) context.report({
 			messageId: "noUnnecessaryUseCallback",
 			node
 		});
@@ -2461,8 +2453,7 @@ function create$16(context) {
 		if (arg0 == null || arg1 == null) return;
 		if (AST.isFunction(arg0) && [...AST.getNestedCallExpressions(arg0.body), ...AST.getNestedNewExpressions(arg0.body)].length > 0) 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, initialScope);
-			const variableNode = getVariableDefinitionNode(variable, 0);
+			const variableNode = getVariableDefinitionNode(findVariable(n.name, initialScope), 0);
 			if (variableNode?.type !== AST_NODE_TYPES.ArrayExpression) return false;
 			return variableNode.elements.length === 0;
 		}).otherwise(() => false)) return;
@@ -2470,14 +2461,12 @@ function create$16(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, initialScope);
-			const variableNode = getVariableDefinitionNode(variable, 0);
+			const variableNode = getVariableDefinitionNode(findVariable(n.name, initialScope), 0);
 			if (variableNode?.type !== AST_NODE_TYPES.ArrowFunctionExpression && variableNode?.type !== AST_NODE_TYPES.FunctionExpression) return null;
 			return variableNode;
 		}).otherwise(() => null);
 		if (arg0Node == null) return;
-		const arg0NodeScope = context.sourceCode.getScope(arg0Node);
-		if (!getChildScopes(arg0NodeScope).flatMap((x) => x.references).some((x) => x.resolved?.scope.block === component)) context.report({
+		if (!getChildScopes(context.sourceCode.getScope(arg0Node)).flatMap((x) => x.references).some((x) => x.resolved?.scope.block === component)) context.report({
 			messageId: "noUnnecessaryUseMemo",
 			node
 		});
@@ -2672,8 +2661,7 @@ function create$11(context) {
 			const value = attribute.value;
 			if (value?.type !== AST_NODE_TYPES.JSXExpressionContainer) return;
 			const valueExpression = value.expression;
-			const initialScope = context.sourceCode.getScope(valueExpression);
-			const construction = getConstruction(valueExpression, initialScope);
+			const construction = getConstruction(valueExpression, context.sourceCode.getScope(valueExpression));
 			if (construction == null) return;
 			if (isReactHookCall(construction.node)) return;
 			getOrElseUpdate(constructions, functionEntry.node, () => []).push(construction);
@@ -2742,8 +2730,7 @@ function create$10(context) {
 					if (prop.type !== AST_NODE_TYPES.Property || prop.value.type !== AST_NODE_TYPES.AssignmentPattern) continue;
 					const { value } = prop;
 					const { right } = value;
-					const initialScope = context.sourceCode.getScope(value);
-					const construction = getConstruction(value, initialScope, ConstructionDetectionHint.StrictCallExpression);
+					const construction = getConstruction(value, context.sourceCode.getScope(value), ConstructionDetectionHint.StrictCallExpression);
 					if (construction == null) continue;
 					if (isReactHookCall(construction.node)) continue;
 					const forbiddenType = AST.toDelimiterFormat(right);
@@ -3502,8 +3489,7 @@ function create$1(context) {
 				if (component.name == null) continue;
 				const [props] = component.node.params;
 				if (props == null) continue;
-				const propsType = getConstrainedTypeAtLocation(services, props);
-				if (isTypeReadonlyLoose(services, propsType)) continue;
+				if (isTypeReadonlyLoose(services, getConstrainedTypeAtLocation(services, props))) continue;
 				context.report({
 					messageId: "preferReadOnlyProps",
 					node: props

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "2.0.7-beta.2",
+  "version": "2.0.7-beta.3",
   "description": "A set of composable ESLint rules for for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -43,16 +43,16 @@
     "string-ts": "^2.2.1",
     "ts-api-utils": "^2.1.0",
     "ts-pattern": "^5.8.0",
-    "@eslint-react/ast": "2.0.7-beta.2",
-    "@eslint-react/core": "2.0.7-beta.2",
-    "@eslint-react/eff": "2.0.7-beta.2",
-    "@eslint-react/kit": "2.0.7-beta.2",
-    "@eslint-react/shared": "2.0.7-beta.2",
-    "@eslint-react/var": "2.0.7-beta.2"
+    "@eslint-react/ast": "2.0.7-beta.3",
+    "@eslint-react/core": "2.0.7-beta.3",
+    "@eslint-react/eff": "2.0.7-beta.3",
+    "@eslint-react/kit": "2.0.7-beta.3",
+    "@eslint-react/var": "2.0.7-beta.3",
+    "@eslint-react/shared": "2.0.7-beta.3"
   },
   "devDependencies": {
-    "@types/react": "^19.2.0",
-    "@types/react-dom": "^19.2.0",
+    "@types/react": "^19.2.2",
+    "@types/react-dom": "^19.2.1",
     "tsdown": "^0.15.6",
     "@local/configs": "0.0.0"
   },