eslint-plugin-react-jsx 5.7.10 → 5.8.0

package/dist/index.js

@@ -1,10 +1,10 @@
 import { DEFAULT_ESLINT_REACT_SETTINGS } from "@eslint-react/shared";
 import { ESLintUtils } from "@typescript-eslint/utils";
+import * as core from "@eslint-react/core";
 import { merge } from "@eslint-react/eslint";
 import { findAttribute, getChildren, getElementFullType, hasAnyAttribute, hasChildren, isFragmentElement, isHostElement, isWhitespaceText } from "@eslint-react/jsx";
 import { AST_NODE_TYPES } from "@typescript-eslint/types";
-import { Check, isOneOf } from "@eslint-react/ast";
-import * as core from "@eslint-react/core";
+import { Check, Extract, isOneOf } from "@eslint-react/ast";
 import ts from "typescript";
 
 //#region \0rolldown/runtime.js
@@ -26,7 +26,7 @@ var __exportAll = (all, no_symbols) => {
 //#endregion
 //#region package.json
 var name$2 = "eslint-plugin-react-jsx";
-var version = "5.7.10";
+var version = "5.8.0";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -38,6 +38,20 @@ const createRule = ESLintUtils.RuleCreator(getDocsUrl);
 //#endregion
 //#region src/rules/no-children-prop-with-children/lib.ts
 /**
+* Find a `children` property inside an ObjectExpression.
+* @param node The object expression.
+* @returns The Property node whose key is "children", or null.
+*/
+function findChildrenProperty$1(node) {
+	for (const prop of node.properties) {
+		if (prop.type !== AST_NODE_TYPES.Property) continue;
+		const key = Extract.unwrap(prop.key);
+		if (key.type === AST_NODE_TYPES.Identifier && key.name === "children") return prop;
+		if (key.type === AST_NODE_TYPES.Literal && key.value === "children") return prop;
+	}
+	return null;
+}
+/**
 * Compute the removal range for a JSX attribute, consuming any leading
 * whitespace (spaces, tabs, newlines) so the resulting markup stays clean.
 * @param context The rule context.
@@ -85,41 +99,69 @@ var no_children_prop_with_children_default = createRule({
 	defaultOptions: []
 });
 function create$7(context) {
-	return merge({ JSXElement(node) {
-		const childrenProp = findAttribute(context, node, "children");
-		if (childrenProp == null) return;
-		if (!hasChildren(node)) return;
-		if (childrenProp.type !== AST_NODE_TYPES.JSXAttribute) {
+	return merge({
+		CallExpression(node) {
+			if (!core.isCreateElementCall(context, node)) return;
+			const [, propsArg, firstExtra] = node.arguments;
+			if (propsArg == null || propsArg.type !== AST_NODE_TYPES.ObjectExpression) return;
+			const childrenProp = findChildrenProperty$1(propsArg);
+			if (childrenProp == null) return;
+			if (firstExtra == null) return;
 			context.report({
 				messageId: "default",
 				node: childrenProp
 			});
-			return;
+		},
+		JSXElement(node) {
+			const childrenProp = findAttribute(context, node, "children");
+			if (childrenProp == null) return;
+			if (!hasChildren(node)) return;
+			if (childrenProp.type !== AST_NODE_TYPES.JSXAttribute) {
+				context.report({
+					messageId: "default",
+					node: childrenProp
+				});
+				return;
+			}
+			context.report({
+				messageId: "default",
+				node: childrenProp,
+				suggest: [{
+					fix(fixer) {
+						const [start, end] = getPropRemovalRange$1(context, childrenProp);
+						return fixer.removeRange([start, end]);
+					},
+					messageId: "removeChildrenProp"
+				}, {
+					fix(fixer) {
+						const range = getChildrenContentRange(node);
+						if (range == null) return [];
+						return fixer.removeRange(range);
+					},
+					messageId: "removeChildrenContent"
+				}]
+			});
 		}
-		context.report({
-			messageId: "default",
-			node: childrenProp,
-			suggest: [{
-				fix(fixer) {
-					const [start, end] = getPropRemovalRange$1(context, childrenProp);
-					return fixer.removeRange([start, end]);
-				},
-				messageId: "removeChildrenProp"
-			}, {
-				fix(fixer) {
-					const range = getChildrenContentRange(node);
-					if (range == null) return [];
-					return fixer.removeRange(range);
-				},
-				messageId: "removeChildrenContent"
-			}]
-		});
-	} });
+	});
 }
 
 //#endregion
 //#region src/rules/no-children-prop/lib.ts
 /**
+* Find a `children` property inside an ObjectExpression.
+* @param node The object expression.
+* @returns The Property node whose key is "children", or null.
+*/
+function findChildrenProperty(node) {
+	for (const prop of node.properties) {
+		if (prop.type !== AST_NODE_TYPES.Property) continue;
+		const key = Extract.unwrap(prop.key);
+		if (key.type === AST_NODE_TYPES.Identifier && key.name === "children") return prop;
+		if (key.type === AST_NODE_TYPES.Literal && key.value === "children") return prop;
+	}
+	return null;
+}
+/**
 * Compute the removal range for a JSX attribute, consuming any leading
 * whitespace (spaces, tabs, newlines) so the resulting markup stays clean.
 * @param context The rule context.
@@ -178,47 +220,60 @@ var no_children_prop_default = createRule({
 	defaultOptions: []
 });
 function create$6(context) {
-	return merge({ JSXElement(node) {
-		const childrenProp = findAttribute(context, node, "children");
-		if (childrenProp == null) return;
-		if (childrenProp.type !== AST_NODE_TYPES.JSXAttribute) {
+	return merge({
+		JSXElement(node) {
+			const childrenProp = findAttribute(context, node, "children");
+			if (childrenProp == null) return;
+			if (childrenProp.type !== AST_NODE_TYPES.JSXAttribute) {
+				context.report({
+					messageId: "default",
+					node: childrenProp
+				});
+				return;
+			}
+			const childrenText = getChildrenPropText(context, childrenProp);
+			if (childrenText == null) {
+				context.report({
+					messageId: "default",
+					node: childrenProp
+				});
+				return;
+			}
 			context.report({
 				messageId: "default",
-				node: childrenProp
+				node: childrenProp,
+				suggest: [{
+					fix(fixer) {
+						const sourceCode = context.sourceCode;
+						const { openingElement } = node;
+						const [removeStart, removeEnd] = getPropRemovalRange(context, childrenProp);
+						if (openingElement.selfClosing) {
+							const tagName = sourceCode.getText(openingElement.name);
+							const selfCloseOffset = sourceCode.getText(openingElement).lastIndexOf("/>");
+							let wsStart = openingElement.range[0] + selfCloseOffset;
+							while (wsStart > removeEnd && /\s/.test(sourceCode.text[wsStart - 1])) wsStart--;
+							return [fixer.removeRange([removeStart, removeEnd]), fixer.replaceTextRange([wsStart, openingElement.range[1]], `>${childrenText}</${tagName}>`)];
+						}
+						const fixes = [fixer.removeRange([removeStart, removeEnd])];
+						if (node.closingElement != null) fixes.push(fixer.insertTextBefore(node.closingElement, childrenText));
+						return fixes;
+					},
+					messageId: "moveChildrenToContent"
+				}]
 			});
-			return;
-		}
-		const childrenText = getChildrenPropText(context, childrenProp);
-		if (childrenText == null) {
+		},
+		CallExpression(node) {
+			if (!core.isCreateElementCall(context, node)) return;
+			const [, propsArg] = node.arguments;
+			if (propsArg == null || propsArg.type !== AST_NODE_TYPES.ObjectExpression) return;
+			const childrenProp = findChildrenProperty(propsArg);
+			if (childrenProp == null) return;
 			context.report({
 				messageId: "default",
 				node: childrenProp
 			});
-			return;
 		}
-		context.report({
-			messageId: "default",
-			node: childrenProp,
-			suggest: [{
-				fix(fixer) {
-					const sourceCode = context.sourceCode;
-					const { openingElement } = node;
-					const [removeStart, removeEnd] = getPropRemovalRange(context, childrenProp);
-					if (openingElement.selfClosing) {
-						const tagName = sourceCode.getText(openingElement.name);
-						const selfCloseOffset = sourceCode.getText(openingElement).lastIndexOf("/>");
-						let wsStart = openingElement.range[0] + selfCloseOffset;
-						while (wsStart > removeEnd && /\s/.test(sourceCode.text[wsStart - 1])) wsStart--;
-						return [fixer.removeRange([removeStart, removeEnd]), fixer.replaceTextRange([wsStart, openingElement.range[1]], `>${childrenText}</${tagName}>`)];
-					}
-					const fixes = [fixer.removeRange([removeStart, removeEnd])];
-					if (node.closingElement != null) fixes.push(fixer.insertTextBefore(node.closingElement, childrenText));
-					return fixes;
-				},
-				messageId: "moveChildrenToContent"
-			}]
-		});
-	} });
+	});
 }
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-jsx",
-  "version": "5.7.10",
+  "version": "5.8.0",
   "description": "ESLint React's ESLint plugin for React Flavored JSX rules.",
   "keywords": [
     "react",
@@ -39,11 +39,11 @@
   "dependencies": {
     "@typescript-eslint/types": "^8.59.3",
     "@typescript-eslint/utils": "^8.59.3",
-    "@eslint-react/ast": "5.7.10",
-    "@eslint-react/core": "5.7.10",
-    "@eslint-react/eslint": "5.7.10",
-    "@eslint-react/shared": "5.7.10",
-    "@eslint-react/jsx": "5.7.10"
+    "@eslint-react/core": "5.8.0",
+    "@eslint-react/ast": "5.8.0",
+    "@eslint-react/eslint": "5.8.0",
+    "@eslint-react/jsx": "5.8.0",
+    "@eslint-react/shared": "5.8.0"
   },
   "devDependencies": {
     "@types/react": "^19.2.14",
@@ -53,8 +53,8 @@
     "eslint": "^10.3.0",
     "tsdown": "^0.22.0",
     "typescript": "^6.0.3",
-    "@local/configs": "0.0.0",
-    "@local/eff": "3.0.0-beta.72"
+    "@local/eff": "3.0.0-beta.72",
+    "@local/configs": "0.0.0"
   },
   "peerDependencies": {
     "eslint": "^10.3.0",