eslint-plugin-react-x 2.0.0-beta.174 → 2.0.0-beta.176

package/dist/index.js

@@ -115,7 +115,7 @@ const settings = { ...settings$1 };
 //#endregion
 //#region package.json
 var name = "eslint-plugin-react-x";
-var version = "2.0.0-beta.174";
+var version = "2.0.0-beta.176";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -378,15 +378,13 @@ var jsx_shorthand_fragment_default = createRule({
 });
 function create$55(context) {
 	const policy = context.options[0] ?? defaultOptions$2[0];
-	const jsxConfig = {
+	const { jsxFragmentFactory } = {
 		...JsxConfig.getFromContext(context),
 		...JsxConfig.getFromAnnotation(context)
 	};
-	const { jsxFragmentFactory } = jsxConfig;
 	return match(policy).with(1, () => ({ JSXElement(node) {
 		if (!ER.isFragmentElement(context, node)) return;
-		const hasAttributes = node.openingElement.attributes.length > 0;
-		if (hasAttributes) return;
+		if (node.openingElement.attributes.length > 0) return;
 		context.report({
 			messageId: "jsxShorthandFragment",
 			node,
@@ -430,11 +428,10 @@ var jsx_uses_react_default = createRule({
 	defaultOptions: []
 });
 function create$54(context) {
-	const jsxConfig = {
+	const { jsx, jsxFactory, jsxFragmentFactory } = {
 		...JsxConfig.getFromContext(context),
 		...JsxConfig.getFromAnnotation(context)
 	};
-	const { jsx, jsxFactory, jsxFragmentFactory } = jsxConfig;
 	if (jsx === JsxEmit.ReactJSX || jsx === JsxEmit.ReactJSXDev) return {};
 	function handleJsxElement(node) {
 		context.sourceCode.markVariableAsUsed(jsxFactory, node);
@@ -577,8 +574,7 @@ function create$52(context) {
 			const [setState, hasThisState = false] = setStateEntries.at(-1) ?? [];
 			if (setState == null || hasThisState) return;
 			if (node.init == null || !AST.isThisExpression(node.init) || node.id.type !== AST_NODE_TYPES.ObjectPattern) return;
-			const hasState = node.id.properties.some((prop) => prop.type === AST_NODE_TYPES.Property && isKeyLiteral$2(prop, prop.key) && AST.getPropertyName(prop.key) === "state");
-			if (!hasState) return;
+			if (!node.id.properties.some((prop) => prop.type === AST_NODE_TYPES.Property && isKeyLiteral$2(prop, prop.key) && AST.getPropertyName(prop.key) === "state")) return;
 			context.report({
 				messageId: "noAccessStateInSetstate",
 				node
@@ -832,8 +828,7 @@ var no_children_prop_default = createRule({
 });
 function create$46(context) {
 	return { JSXElement(node) {
-		const getAttribute = ER.getAttribute(context, node.openingElement.attributes, context.sourceCode.getScope(node));
-		const childrenProp = getAttribute("children");
+		const childrenProp = ER.getAttribute(context, node.openingElement.attributes, context.sourceCode.getScope(node))("children");
 		if (childrenProp != null) context.report({
 			messageId: "noChildrenProp",
 			node: childrenProp
@@ -1079,8 +1074,7 @@ function create$39(context) {
 	const { version: version$1 } = getSettingsFromContext(context);
 	if (compare(version$1, "19.0.0", "<")) return {};
 	return { JSXElement(node) {
-		const fullName = ER.getElementType(context, node);
-		const parts = fullName.split(".");
+		const parts = ER.getElementType(context, node).split(".");
 		const selfName = parts.pop();
 		const contextFullName = parts.join(".");
 		const contextSelfName = parts.pop();
@@ -1335,8 +1329,7 @@ function create$34(context, [option]) {
 					if ("includedNodes" in forbiddenPropItem && !forbiddenPropItem.includedNodes.includes(nodeName)) continue;
 				}
 				const forbiddenProp = typeof forbiddenPropItem === "string" ? forbiddenPropItem : forbiddenPropItem.prop;
-				const forbiddenPropRegExp = RegExp.toRegExp(forbiddenProp);
-				if (forbiddenPropRegExp.test(name$4)) context.report({
+				if (RegExp.toRegExp(forbiddenProp).test(name$4)) context.report({
 					messageId,
 					node: attr,
 					data: { name: name$4 }
@@ -1517,19 +1510,16 @@ function create$31(context) {
 			type: AST_NODE_TYPES.LogicalExpression,
 			operator: "&&"
 		}, ({ left, right }) => {
-			const isLeftUnaryNot = left.type === AST_NODE_TYPES.UnaryExpression && left.operator === "!";
-			if (isLeftUnaryNot) return getReportDescriptor(right);
+			if (left.type === AST_NODE_TYPES.UnaryExpression && left.operator === "!") return getReportDescriptor(right);
 			const initialScope = context.sourceCode.getScope(left);
-			const isLeftNan = left.type === AST_NODE_TYPES.Identifier && left.name === "NaN" || getStaticValue(left, initialScope)?.value === "NaN";
-			if (isLeftNan) return {
+			if (left.type === AST_NODE_TYPES.Identifier && left.name === "NaN" || getStaticValue(left, initialScope)?.value === "NaN") return {
 				messageId: "noLeakedConditionalRendering",
 				node: left,
 				data: { value: context.sourceCode.getText(left) }
 			};
 			const leftType = getConstrainedTypeAtLocation(services, left);
 			const leftTypeVariants = ER.getTypeVariants(unionConstituents(leftType));
-			const isLeftValid = Array.from(leftTypeVariants.values()).every((type) => allowedVariants.some((allowed) => allowed === type));
-			if (isLeftValid) return getReportDescriptor(right);
+			if (Array.from(leftTypeVariants.values()).every((type) => allowedVariants.some((allowed) => allowed === type))) return getReportDescriptor(right);
 			return {
 				messageId: "noLeakedConditionalRendering",
 				node: left,
@@ -1538,8 +1528,7 @@ function create$31(context) {
 		}).with({ type: AST_NODE_TYPES.ConditionalExpression }, ({ alternate, consequent }) => {
 			return getReportDescriptor(consequent) ?? getReportDescriptor(alternate);
 		}).with({ type: AST_NODE_TYPES.Identifier }, (n) => {
-			const variable = VAR.findVariable(n.name, context.sourceCode.getScope(n));
-			const variableDefNode = variable?.defs.at(0)?.node;
+			const variableDefNode = VAR.findVariable(n.name, context.sourceCode.getScope(n))?.defs.at(0)?.node;
 			return match(variableDefNode).with({ init: P.select({ type: P.not(AST_NODE_TYPES.VariableDeclaration) }) }, getReportDescriptor).otherwise(() => unit);
 		}).otherwise(() => unit);
 	}
@@ -1629,13 +1618,12 @@ function create$29(context) {
 					});
 					continue;
 				}
-				const hasDisplayNameAssignment = displayNameAssignments.some((node) => {
+				if (!displayNameAssignments.some((node) => {
 					const left = node.left;
 					if (left.type !== AST_NODE_TYPES.MemberExpression) return false;
 					const object = left.object;
 					return ER.isInstanceIdEqual(context, id, object);
-				});
-				if (!hasDisplayNameAssignment) {
+				})) {
 					const semi = LanguagePreference.defaultLanguagePreference.semicolons === "always" ? ";" : "";
 					context.report({
 						messageId: "noMissingContextDisplayName",
@@ -1983,19 +1971,16 @@ function create$25(context) {
 		"Program:exit"(program) {
 			const functionComponents = [...collector.ctx.getAllComponents(program).values()];
 			const classComponents = [...collectorLegacy.ctx.getAllComponents(program).values()];
-			for (const lazy of lazyComponentDeclarations) {
-				const significantParent = AST.findParentNode(lazy, (n) => {
-					if (AST.isJSX(n)) return true;
-					if (n.type === AST_NODE_TYPES.CallExpression) return ER.isReactHookCall(n) || ER.isCreateElementCall(context, n) || ER.isCreateContextCall(context, n);
-					if (AST.isFunction(n)) return functionComponents.some((c) => c.node === n);
-					if (AST.isClass(n)) return classComponents.some((c) => c.node === n);
-					return false;
-				});
-				if (significantParent != null) context.report({
-					messageId: "noNestedLazyComponentDeclarations",
-					node: lazy
-				});
-			}
+			for (const lazy of lazyComponentDeclarations) if (AST.findParentNode(lazy, (n) => {
+				if (AST.isJSX(n)) return true;
+				if (n.type === AST_NODE_TYPES.CallExpression) return ER.isReactHookCall(n) || ER.isCreateElementCall(context, n) || ER.isCreateContextCall(context, n);
+				if (AST.isFunction(n)) return functionComponents.some((c) => c.node === n);
+				if (AST.isClass(n)) return classComponents.some((c) => c.node === n);
+				return false;
+			}) != null) context.report({
+				messageId: "noNestedLazyComponentDeclarations",
+				node: lazy
+			});
 		}
 	};
 }
@@ -2263,12 +2248,13 @@ var no_unnecessary_key_default = createRule({
 	defaultOptions: []
 });
 function create$18(context) {
-	if (!context.sourceCode.getText().includes("key=")) return {};
+	if (!context.sourceCode.text.includes("key=")) return {};
 	return { JSXAttribute(node) {
 		if (node.name.name !== "key") return;
 		const jsxElement = node.parent.parent;
+		const initialScope = context.sourceCode.getScope(jsxElement);
 		const pMapCallback = AST.findParentNode(jsxElement, isMapCallback);
-		if (pMapCallback == null) return;
+		if (pMapCallback == null || context.sourceCode.getScope(pMapCallback) !== initialScope) return;
 		const pKeyedElementOrElse = AST.findParentNode(jsxElement, (n) => {
 			if (n === pMapCallback) return true;
 			return AST.isJSXElement(n) && n.openingElement.attributes.some((n$1) => n$1.type === AST_NODE_TYPES.JSXAttribute && n$1.name.type === AST_NODE_TYPES.JSXIdentifier && n$1.name.name === "key");
@@ -2313,13 +2299,12 @@ function create$17(context) {
 		if (!AST.isFunction(component)) return;
 		const [arg0, arg1] = node.arguments;
 		if (arg0 == null || arg1 == null) return;
-		const hasEmptyDeps = match(arg1).with({ type: AST_NODE_TYPES.ArrayExpression }, (n) => n.elements.length === 0).with({ type: AST_NODE_TYPES.Identifier }, (n) => {
+		if (!match(arg1).with({ type: AST_NODE_TYPES.ArrayExpression }, (n) => n.elements.length === 0).with({ type: AST_NODE_TYPES.Identifier }, (n) => {
 			const variable = VAR.findVariable(n.name, initialScope);
 			const variableNode = VAR.getVariableDefinitionNode(variable, 0);
 			if (variableNode?.type !== AST_NODE_TYPES.ArrayExpression) return false;
 			return variableNode.elements.length === 0;
-		}).otherwise(() => false);
-		if (!hasEmptyDeps) return;
+		}).otherwise(() => false)) return;
 		const arg0Node = match(arg0).with({ type: AST_NODE_TYPES.ArrowFunctionExpression }, (n) => {
 			if (n.body.type === AST_NODE_TYPES.ArrowFunctionExpression) return n.body;
 			return n;
@@ -2331,9 +2316,7 @@ function create$17(context) {
 		}).otherwise(() => null);
 		if (arg0Node == null) return;
 		const arg0NodeScope = context.sourceCode.getScope(arg0Node);
-		const arg0NodeReferences = VAR.getChildScopes(arg0NodeScope).flatMap((x) => x.references);
-		const isReferencedToComponentScope = arg0NodeReferences.some((x) => x.resolved?.scope.block === component);
-		if (!isReferencedToComponentScope) context.report({
+		if (!VAR.getChildScopes(arg0NodeScope).flatMap((x) => x.references).some((x) => x.resolved?.scope.block === component)) context.report({
 			messageId: "noUnnecessaryUseCallback",
 			node
 		});
@@ -2363,20 +2346,17 @@ function create$16(context) {
 	return { CallExpression(node) {
 		const initialScope = context.sourceCode.getScope(node);
 		if (!ER.isUseMemoCall(node)) return;
-		const scope = context.sourceCode.getScope(node);
-		const component = scope.block;
+		const component = context.sourceCode.getScope(node).block;
 		if (!AST.isFunction(component)) return;
 		const [arg0, arg1] = node.arguments;
 		if (arg0 == null || arg1 == null) return;
-		const hasCallInArg0 = AST.isFunction(arg0) && [...AST.getNestedCallExpressions(arg0.body), ...AST.getNestedNewExpressions(arg0.body)].length > 0;
-		if (hasCallInArg0) return;
-		const hasEmptyDeps = match(arg1).with({ type: AST_NODE_TYPES.ArrayExpression }, (n) => n.elements.length === 0).with({ type: AST_NODE_TYPES.Identifier }, (n) => {
+		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 = VAR.findVariable(n.name, initialScope);
 			const variableNode = VAR.getVariableDefinitionNode(variable, 0);
 			if (variableNode?.type !== AST_NODE_TYPES.ArrayExpression) return false;
 			return variableNode.elements.length === 0;
-		}).otherwise(() => false);
-		if (!hasEmptyDeps) return;
+		}).otherwise(() => false)) return;
 		const arg0Node = match(arg0).with({ type: AST_NODE_TYPES.ArrowFunctionExpression }, (n) => {
 			if (n.body.type === AST_NODE_TYPES.ArrowFunctionExpression) return n.body;
 			return n;
@@ -2388,9 +2368,7 @@ function create$16(context) {
 		}).otherwise(() => null);
 		if (arg0Node == null) return;
 		const arg0NodeScope = context.sourceCode.getScope(arg0Node);
-		const arg0NodeReferences = VAR.getChildScopes(arg0NodeScope).flatMap((x) => x.references);
-		const isReferencedToComponentScope = arg0NodeReferences.some((x) => x.resolved?.scope.block === component);
-		if (!isReferencedToComponentScope) context.report({
+		if (!VAR.getChildScopes(arg0NodeScope).flatMap((x) => x.references).some((x) => x.resolved?.scope.block === component)) context.report({
 			messageId: "noUnnecessaryUseMemo",
 			node
 		});
@@ -2575,8 +2553,7 @@ function create$11(context) {
 	return {
 		...listeners,
 		JSXOpeningElement(node) {
-			const fullName = ER.getElementType(context, node.parent);
-			const selfName = fullName.split(".").at(-1);
+			const selfName = ER.getElementType(context, node.parent).split(".").at(-1);
 			if (selfName == null) return;
 			if (!isContextName(selfName, isReact18OrBelow)) return;
 			const functionEntry = ctx.getCurrentEntry();
@@ -2824,8 +2801,7 @@ function create$8(context) {
 				const [props] = component.node.params;
 				if (props == null) continue;
 				const usedPropKeys = /* @__PURE__ */ new Set();
-				const couldFindAllUsedPropKeys = collectUsedPropKeysOfParameter(context, usedPropKeys, props);
-				if (!couldFindAllUsedPropKeys) continue;
+				if (!collectUsedPropKeysOfParameter(context, usedPropKeys, props)) continue;
 				const tsNode = services.esTreeNodeToTSNodeMap.get(props);
 				const declaredProps = checker.getTypeAtLocation(tsNode).getProperties();
 				for (const declaredProp of declaredProps) {
@@ -2866,8 +2842,7 @@ function collectUsedPropsOfRestElement(context, usedPropKeys, restElement) {
 	}
 }
 function collectUsedPropKeysOfIdentifier(context, usedPropKeys, identifier) {
-	const scope = context.sourceCode.getScope(identifier);
-	const variable = scope.variables.find((v) => v.name === identifier.name);
+	const variable = context.sourceCode.getScope(identifier).variables.find((v) => v.name === identifier.name);
 	if (variable == null) return false;
 	for (const ref of variable.references) {
 		if (ref.identifier === identifier) continue;
@@ -3030,11 +3005,10 @@ function create$7(context) {
 			if (currentMethod === constructorEntries.at(-1)) return;
 			if (!currentClass.body.body.includes(currentMethod)) return;
 			if (node.init == null || !AST.isThisExpression(node.init) || node.id.type !== AST_NODE_TYPES.ObjectPattern) return;
-			const hasState = node.id.properties.some((prop) => {
+			if (!node.id.properties.some((prop) => {
 				if (prop.type === AST_NODE_TYPES.Property && isKeyLiteral(prop, prop.key)) return AST.getPropertyName(prop.key) === "state";
 				return false;
-			});
-			if (!hasState) return;
+			})) return;
 			const defNode = stateDefs.get(currentClass)?.node;
 			stateDefs.set(currentClass, {
 				node: defNode,
@@ -3149,8 +3123,7 @@ function create$5(context) {
 		if (!ER.isForwardRefCall(context, node)) return;
 		const [component] = node.arguments;
 		if (component == null || !AST.isFunction(component)) return;
-		const ref = component.params[1];
-		if (ref != null) return;
+		if (component.params[1] != null) return;
 		context.report({
 			messageId: "noUselessForwardRef",
 			node: node.callee
@@ -3384,8 +3357,7 @@ function create$2(context) {
 				const importDeclarationText = context.sourceCode.getText(node.parent);
 				const semi = importDeclarationText.endsWith(";") ? ";" : "";
 				const quote = node.parent.source.raw.at(0) ?? "'";
-				const isTypeImport = node.parent.importKind === "type";
-				const importStringPrefix = `import${isTypeImport ? " type" : ""}`;
+				const importStringPrefix = `import${node.parent.importKind === "type" ? " type" : ""}`;
 				const importSourceQuoted = `${quote}${importSource}${quote}`;
 				if (!hasOtherSpecifiers) return fixer.replaceText(node.parent, `${importStringPrefix} * as ${node.local.name} from ${importSourceQuoted}${semi}`);
 				const specifiers = importDeclarationText.slice(importDeclarationText.indexOf("{"), importDeclarationText.indexOf("}") + 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "2.0.0-beta.174",
+  "version": "2.0.0-beta.176",
   "description": "A set of composable ESLint rules for for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -34,20 +34,20 @@
     "./package.json"
   ],
   "dependencies": {
-    "@typescript-eslint/scope-manager": "^8.42.0",
-    "@typescript-eslint/type-utils": "^8.42.0",
-    "@typescript-eslint/types": "^8.42.0",
-    "@typescript-eslint/utils": "^8.42.0",
+    "@typescript-eslint/scope-manager": "^8.43.0",
+    "@typescript-eslint/type-utils": "^8.43.0",
+    "@typescript-eslint/types": "^8.43.0",
+    "@typescript-eslint/utils": "^8.43.0",
     "compare-versions": "^6.1.1",
     "is-immutable-type": "^5.0.1",
     "string-ts": "^2.2.1",
     "ts-pattern": "^5.8.0",
-    "@eslint-react/ast": "2.0.0-beta.174",
-    "@eslint-react/core": "2.0.0-beta.174",
-    "@eslint-react/eff": "2.0.0-beta.174",
-    "@eslint-react/kit": "2.0.0-beta.174",
-    "@eslint-react/shared": "2.0.0-beta.174",
-    "@eslint-react/var": "2.0.0-beta.174"
+    "@eslint-react/ast": "2.0.0-beta.176",
+    "@eslint-react/core": "2.0.0-beta.176",
+    "@eslint-react/kit": "2.0.0-beta.176",
+    "@eslint-react/eff": "2.0.0-beta.176",
+    "@eslint-react/var": "2.0.0-beta.176",
+    "@eslint-react/shared": "2.0.0-beta.176"
   },
   "devDependencies": {
     "@types/react": "^19.1.12",