eslint-plugin-react-jsx 5.15.0 → 5.16.1

package/dist/index.js

@@ -1,10 +1,10 @@
 import { DEFAULT_ESLINT_REACT_SETTINGS } from "@eslint-react/shared";
+import { Check, Extract } from "@eslint-react/ast";
+import { AST_NODE_TYPES } from "@typescript-eslint/types";
 import { ESLintUtils } from "@typescript-eslint/utils";
 import * as core from "@eslint-react/core";
 import "@eslint-react/eslint";
 import { collapseMultilineText, findAttribute, getChildren, getElementFullType, hasAnyAttribute, hasChildren, isFragmentElement, isHostElement, isWhitespaceText } from "@eslint-react/jsx";
-import { AST_NODE_TYPES } from "@typescript-eslint/types";
-import { Check, Extract } from "@eslint-react/ast";
 import ts from "typescript";
 
 //#region \0rolldown/runtime.js
@@ -26,58 +26,53 @@ var __exportAll = (all, no_symbols) => {
 //#endregion
 //#region package.json
 var name$2 = "eslint-plugin-react-jsx";
-var version = "5.15.0";
+var version = "5.16.1";
 
 //#endregion
-//#region src/utils/create-rule.ts
-function getDocsUrl(ruleName) {
-	return `https://eslint-react.xyz/docs/rules/jsx-${ruleName}`;
-}
-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;
-	}
+//#region src/utils/common.ts
+function findChildrenProperty(node) {
+	for (const prop of node.properties) if (prop.type === AST_NODE_TYPES.Property && Extract.getStaticPropertyName(prop) === "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.
-* @param prop The JSX attribute.
-*/
-function getPropRemovalRange$1(context, prop) {
+function getChildrenContentRange(node) {
+	const first = node.children.at(0);
+	const last = node.children.at(-1);
+	if (first == null || last == null) return null;
+	return [first.range[0], last.range[1]];
+}
+function getChildrenPropText(context, prop) {
+	const { sourceCode } = context;
+	const { value } = prop;
+	if (value == null) return null;
+	if (value.type === AST_NODE_TYPES.Literal) return escapeJsxText(String(value.value));
+	if (value.type !== AST_NODE_TYPES.JSXExpressionContainer) return null;
+	const { expression } = value;
+	if (expression.type === AST_NODE_TYPES.JSXEmptyExpression) return null;
+	const exprText = sourceCode.getText(expression);
+	if (Check.isJSXElementOrFragment(expression)) return exprText;
+	return `{${exprText}}`;
+}
+function escapeJsxText(text) {
+	return text.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("{", "&#123;").replaceAll("}", "&#125;");
+}
+function getPropRemovalRange(context, prop) {
 	const { sourceCode } = context;
 	let start = prop.range[0];
 	const end = prop.range[1];
-	while (start > 0 && /\s/.test(sourceCode.text[start - 1])) start--;
+	while (start > 0 && /\s/.test(sourceCode.text[start - 1] ?? "")) start--;
 	return [start, end];
 }
-/**
-* Compute the range covering **all** children content of a JSX element or
-* fragment (from the start of the first child to the end of the last child).
-*
-* Returns `null` when there are no children at all.
-* @param node The JSX element or fragment.
-*/
-function getChildrenContentRange(node) {
-	if (node.children.length === 0) return null;
-	const first = node.children[0];
-	const last = node.children[node.children.length - 1];
-	return [first.range[0], last.range[1]];
+function isDirectJsxChild(node) {
+	return Check.isJSXElementOrFragment(node.parent);
 }
 
+//#endregion
+//#region src/utils/create-rule.ts
+function getDocsUrl(ruleName) {
+	return `https://eslint-react.xyz/docs/rules/jsx-${ruleName}`;
+}
+const createRule = ESLintUtils.RuleCreator(getDocsUrl);
+
 //#endregion
 //#region src/rules/no-children-prop-with-children/no-children-prop-with-children.ts
 const RULE_NAME$7 = "no-children-prop-with-children";
@@ -103,8 +98,10 @@ function create$7(context) {
 		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 (propsArg == null) return;
+			const propsObject = Extract.unwrap(propsArg);
+			if (propsObject.type !== AST_NODE_TYPES.ObjectExpression) return;
+			const childrenProp = findChildrenProperty(propsObject);
 			if (childrenProp == null) return;
 			if (firstExtra == null) return;
 			context.report({
@@ -128,7 +125,7 @@ function create$7(context) {
 				node: childrenProp,
 				suggest: [{
 					fix(fixer) {
-						const [start, end] = getPropRemovalRange$1(context, childrenProp);
+						const [start, end] = getPropRemovalRange(context, childrenProp);
 						return fixer.removeRange([start, end]);
 					},
 					messageId: "removeChildrenProp"
@@ -145,61 +142,6 @@ function create$7(context) {
 	};
 }
 
-//#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.
-* @param prop The JSX attribute.
-*/
-function getPropRemovalRange(context, prop) {
-	const { sourceCode } = context;
-	let start = prop.range[0];
-	const end = prop.range[1];
-	while (start > 0 && /\s/.test(sourceCode.text[start - 1])) start--;
-	return [start, end];
-}
-/**
-* Extract the text to use as JSX children content from a `children` prop.
-*
-* - `children="text"`        -> `text`  (raw string, no quotes)
-* - `children={<div />}`     -> `<div />`  (JSX element, no braces)
-* - `children={<>…</>}`      -> `<>…</>`  (JSX fragment, no braces)
-* - `children={expression}`  -> `{expression}`  (wrapped in braces)
-* - `children`               -> `null`  (boolean shorthand, cannot extract)
-* @param context The rule context.
-* @param prop The JSX attribute.
-*/
-function getChildrenPropText(context, prop) {
-	const { sourceCode } = context;
-	const { value } = prop;
-	if (value == null) return null;
-	if (value.type === AST_NODE_TYPES.Literal) return String(value.value);
-	if (value.type === AST_NODE_TYPES.JSXExpressionContainer) {
-		const { expression } = value;
-		if (expression.type === AST_NODE_TYPES.JSXEmptyExpression) return null;
-		const exprText = sourceCode.getText(expression);
-		if (Check.isJSXElementOrFragment(expression)) return exprText;
-		return `{${exprText}}`;
-	}
-	return null;
-}
-
 //#endregion
 //#region src/rules/no-children-prop/no-children-prop.ts
 const RULE_NAME$6 = "no-children-prop";
@@ -224,8 +166,10 @@ function create$6(context) {
 		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 (propsArg == null) return;
+			const propsObject = Extract.unwrap(propsArg);
+			if (propsObject.type !== AST_NODE_TYPES.ObjectExpression) return;
+			const childrenProp = findChildrenProperty(propsObject);
 			if (childrenProp == null) return;
 			context.report({
 				messageId: "default",
@@ -291,18 +235,14 @@ var no_comment_textnodes_default = createRule({
 	defaultOptions: []
 });
 function create$5(context) {
-	function hasCommentLike(node) {
-		if (Check.isOneOf([AST_NODE_TYPES.JSXAttribute, AST_NODE_TYPES.JSXExpressionContainer])(node.parent)) return false;
-		return /^\s*\/(?:\/|\*)/mu.test(context.sourceCode.getText(node));
-	}
-	const visit = (node) => {
-		if (!Check.isJSXElementOrFragment(node.parent)) return;
-		if (!hasCommentLike(node)) return;
+	function visit(node) {
+		if (!isDirectJsxChild(node)) return;
+		if (!/^\s*\/(?:\/|\*)/mu.test(context.sourceCode.getText(node))) return;
 		context.report({
 			messageId: "default",
 			node
 		});
-	};
+	}
 	return {
 		JSXText: visit,
 		Literal: visit
@@ -366,34 +306,30 @@ function create$3(context) {
 	* Visitor function for JSXElement and JSXFragment nodes
 	* @param node The JSXElement or JSXFragment node to be checked
 	*/
-	const visit = (node) => {
+	function visit(node) {
 		for (const [index, child] of node.children.entries()) {
 			if (child.type !== AST_NODE_TYPES.JSXText || !child.value.endsWith("$")) continue;
 			if (node.children[index + 1]?.type !== AST_NODE_TYPES.JSXExpressionContainer) continue;
 			if (child.value === "$" && node.children.length === 2) continue;
-			const pos = child.loc.end;
+			if (!context.sourceCode.getText(child).endsWith("$")) continue;
+			const dollarStart = child.range[1] - 1;
+			const dollarEnd = child.range[1];
 			context.report({
 				loc: {
-					end: {
-						column: pos.column,
-						line: pos.line
-					},
-					start: {
-						column: pos.column - 1,
-						line: pos.line
-					}
+					end: context.sourceCode.getLocFromIndex(dollarEnd),
+					start: context.sourceCode.getLocFromIndex(dollarStart)
 				},
 				messageId: "default",
 				node: child,
 				suggest: [{
 					fix(fixer) {
-						return fixer.removeRange([child.range[1] - 1, child.range[1]]);
+						return fixer.removeRange([dollarStart, dollarEnd]);
 					},
 					messageId: "removeDollarSign"
 				}]
 			});
 		}
-	};
+	}
 	return {
 		JSXElement: visit,
 		JSXFragment: visit
@@ -419,23 +355,25 @@ var no_leaked_semicolon_default = createRule({
 	defaultOptions: []
 });
 function hasLeakedSemicolon(text) {
-	return text.startsWith(";\n") || text.startsWith(";\r");
+	return /^;[ \t]*(?:\r\n|\r|\n)/u.test(text);
 }
 function create$2(context) {
-	const visit = (node) => {
-		if (!Check.isJSXElementOrFragment(node.parent)) return;
+	function visit(node) {
+		if (!isDirectJsxChild(node)) return;
 		if (!hasLeakedSemicolon(context.sourceCode.getText(node))) return;
+		const semicolonStart = node.range[0];
+		const semicolonEnd = node.range[0] + 1;
 		context.report({
 			messageId: "default",
 			node,
 			suggest: [{
 				fix(fixer) {
-					return fixer.removeRange([node.range[0], node.range[0] + 1]);
+					return fixer.removeRange([semicolonStart, semicolonEnd]);
 				},
 				messageId: "removeSemicolon"
 			}]
 		});
-	};
+	}
 	return {
 		JSXText: visit,
 		Literal: visit
@@ -459,7 +397,7 @@ var no_namespace_default = createRule({
 function create$1(context) {
 	return { JSXElement(node) {
 		const name = getElementFullType(node);
-		if (typeof name !== "string" || !name.includes(":")) return;
+		if (!name.includes(":")) return;
 		context.report({
 			data: { name },
 			messageId: "noNamespace",
@@ -513,30 +451,24 @@ function create(context, [option]) {
 	function isContentUseless(node) {
 		if (node.children.length === 0) return !allowEmptyFragment;
 		const insideJsx = Check.isJSXElementOrFragment(node.parent);
-		if (!allowExpressions) {
-			if (insideJsx) return true;
-			if (node.children.length === 1) return true;
-		}
-		if (allowExpressions && !insideJsx && node.children.length === 1) {
-			const child = node.children[0];
-			if (child != null && child.type === AST_NODE_TYPES.JSXText) return false;
-		}
+		if (allowExpressions && !insideJsx && node.children.length === 1 && node.children[0]?.type === AST_NODE_TYPES.JSXText) return false;
 		const meaningful = getChildren(node);
 		if (meaningful.length === 0) return true;
-		if (meaningful.length === 1 && meaningful[0].type !== AST_NODE_TYPES.JSXExpressionContainer) return true;
-		return false;
+		if (meaningful.length > 1) return false;
+		if (meaningful[0]?.type === AST_NODE_TYPES.JSXExpressionContainer) return !allowExpressions;
+		return true;
 	}
 	/**
 	* Whether it is safe to auto-fix the fragment by unwrapping it.
 	* @param node The fragment node to check.
 	*/
 	function isSafeToFix(node) {
+		if (node.type === AST_NODE_TYPES.JSXElement && node.openingElement.attributes.some((attr) => attr.type === AST_NODE_TYPES.JSXSpreadAttribute)) return false;
 		if (Check.isJSXElementOrFragment(node.parent)) return isHostElement(node.parent);
 		if (node.children.length === 0) return false;
-		return !node.children.some((child) => {
-			if (child.type === AST_NODE_TYPES.JSXExpressionContainer) return true;
-			if (child.type === AST_NODE_TYPES.JSXText) return !isWhitespaceText(child);
-			return false;
+		return node.children.every((child) => {
+			if (Check.isJSXElementOrFragment(child)) return true;
+			return child.type === AST_NODE_TYPES.JSXText && isWhitespaceText(child);
 		});
 	}
 	/**
@@ -552,7 +484,12 @@ function create(context, [option]) {
 				const cleaned = collapseMultilineText(child.value);
 				if (cleaned != null) text += cleaned;
 			} else text += context.sourceCode.getText(child);
-			return fixer.replaceText(node, text);
+			let start = node.range[0];
+			if (text === "" && node.children.length > 0) {
+				const lineStart = Math.max(context.sourceCode.text.lastIndexOf("\n", start - 1), context.sourceCode.text.lastIndexOf("\r", start - 1)) + 1;
+				if (/^[ \t]*$/u.test(context.sourceCode.text.slice(lineStart, start))) start = lineStart;
+			}
+			return fixer.replaceTextRange([start, node.range[1]], text);
 		};
 	}
 	/**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-jsx",
-  "version": "5.15.0",
+  "version": "5.16.1",
   "description": "ESLint React's ESLint plugin for React Flavored JSX rules.",
   "keywords": [
     "react",
@@ -39,11 +39,11 @@
   "dependencies": {
     "@typescript-eslint/types": "^8.64.0",
     "@typescript-eslint/utils": "^8.64.0",
-    "@eslint-react/eslint": "5.15.0",
-    "@eslint-react/core": "5.15.0",
-    "@eslint-react/jsx": "5.15.0",
-    "@eslint-react/ast": "5.15.0",
-    "@eslint-react/shared": "5.15.0"
+    "@eslint-react/ast": "5.16.1",
+    "@eslint-react/eslint": "5.16.1",
+    "@eslint-react/jsx": "5.16.1",
+    "@eslint-react/shared": "5.16.1",
+    "@eslint-react/core": "5.16.1"
   },
   "devDependencies": {
     "@types/react": "^19.2.17",