eslint-plugin-react-jsx 5.8.11 → 5.8.13

package/dist/index.js

@@ -1,8 +1,8 @@
 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 "@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, isOneOf } from "@eslint-react/ast";
 import ts from "typescript";
@@ -26,7 +26,7 @@ var __exportAll = (all, no_symbols) => {
 //#endregion
 //#region package.json
 var name$2 = "eslint-plugin-react-jsx";
-var version = "5.8.11";
+var version = "5.8.13";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -99,7 +99,7 @@ var no_children_prop_with_children_default = createRule({
 	defaultOptions: []
 });
 function create$7(context) {
-	return merge({
+	return {
 		CallExpression(node) {
 			if (!core.isCreateElementCall(context, node)) return;
 			const [, propsArg, firstExtra] = node.arguments;
@@ -142,7 +142,7 @@ function create$7(context) {
 				}]
 			});
 		}
-	});
+	};
 }
 
 //#endregion
@@ -220,7 +220,7 @@ var no_children_prop_default = createRule({
 	defaultOptions: []
 });
 function create$6(context) {
-	return merge({
+	return {
 		CallExpression(node) {
 			if (!core.isCreateElementCall(context, node)) return;
 			const [, propsArg] = node.arguments;
@@ -273,7 +273,7 @@ function create$6(context) {
 				}]
 			});
 		}
-	});
+	};
 }
 
 //#endregion
@@ -303,10 +303,10 @@ function create$5(context) {
 			node
 		});
 	};
-	return merge({
+	return {
 		JSXText: visitorFunction,
 		Literal: visitorFunction
-	});
+	};
 }
 
 //#endregion
@@ -326,7 +326,7 @@ var no_key_after_spread_default = createRule({
 function create$4(context) {
 	const { jsx } = core.getJsxConfig(context);
 	if (!(jsx === ts.JsxEmit.ReactJSX || jsx === ts.JsxEmit.ReactJSXDev)) return {};
-	return merge({ JSXOpeningElement(node) {
+	return { JSXOpeningElement(node) {
 		let firstSpreadPropIndex = null;
 		for (const [index, prop] of node.attributes.entries()) {
 			if (prop.type === AST_NODE_TYPES.JSXSpreadAttribute) {
@@ -339,7 +339,7 @@ function create$4(context) {
 				node: prop
 			});
 		}
-	} });
+	} };
 }
 
 //#endregion
@@ -394,10 +394,10 @@ function create$3(context) {
 			});
 		}
 	};
-	return merge({
+	return {
 		JSXElement: visitorFunction,
 		JSXFragment: visitorFunction
-	});
+	};
 }
 
 //#endregion
@@ -436,10 +436,10 @@ function create$2(context) {
 			}]
 		});
 	};
-	return merge({
+	return {
 		JSXText: visitorFunction,
 		Literal: visitorFunction
-	});
+	};
 }
 
 //#endregion
@@ -457,7 +457,7 @@ var no_namespace_default = createRule({
 	defaultOptions: []
 });
 function create$1(context) {
-	return merge({ JSXElement(node) {
+	return { JSXElement(node) {
 		const name = getElementFullType(node);
 		if (typeof name !== "string" || !name.includes(":")) return;
 		context.report({
@@ -465,45 +465,7 @@ function create$1(context) {
 			messageId: "noNamespace",
 			node: node.openingElement.name
 		});
-	} });
-}
-
-//#endregion
-//#region src/rules/no-useless-fragment/lib.ts
-/**
-* Trim leading / trailing whitespace that spans across a newline.
-*
-* This is used by the auto-fixer to remove indentation / formatting artefacts
-* from the raw source text between a fragment's opening and closing tags,
-* producing cleaner unwrapped output. It does **not** model React's rendering
-* behaviour — React DOM preserves text nodes exactly as written.
-*
-* Whitespace that contains a newline is stripped entirely;
-* whitespace that stays on the same line is preserved.
-* @param text The raw source text between JSX tags.
-*/
-function trimLikeReact(text) {
-	const leadingSpaces = /^\s*/.exec(text)?.[0] ?? "";
-	const trailingSpaces = /\s*$/.exec(text)?.[0] ?? "";
-	const start = leadingSpaces.includes("\n") ? leadingSpaces.length : 0;
-	const end = trailingSpaces.includes("\n") ? text.length - trailingSpaces.length : text.length;
-	return text.slice(start, end);
-}
-/**
-* Extract the raw source text of an element's / fragment's children
-* (everything between the opening and closing tags).
-*
-* Returns `""` for self-closing elements like `<Fragment />`.
-* @param context The rule context.
-* @param node The JSX element or fragment.
-*/
-function getChildrenSourceText(context, node) {
-	const { sourceCode } = context;
-	const opener = node.type === AST_NODE_TYPES.JSXFragment ? node.openingFragment : node.openingElement;
-	const closer = node.type === AST_NODE_TYPES.JSXFragment ? node.closingFragment : node.closingElement;
-	if (opener.type === AST_NODE_TYPES.JSXOpeningElement && opener.selfClosing) return "";
-	if (closer == null) return "";
-	return sourceCode.text.slice(opener.range[1], closer.range[0]);
+	} };
 }
 
 //#endregion
@@ -579,14 +541,18 @@ function create(context, [option]) {
 	}
 	/**
 	* Build an autofix that unwraps the fragment, replacing it with its
-	* trimmed children text.  Returns `null` when the fix is unsafe.
+	* meaningful children content.  Returns `null` when the fix is unsafe.
 	* @param node The fragment node to fix.
 	*/
 	function buildFix(node) {
 		if (!isSafeToFix(node)) return null;
 		return (fixer) => {
-			const childrenText = getChildrenSourceText(context, node);
-			return fixer.replaceText(node, trimLikeReact(childrenText));
+			let text = "";
+			for (const child of node.children) if (child.type === AST_NODE_TYPES.JSXText) {
+				const cleaned = collapseMultilineText(child.value);
+				if (cleaned != null) text += cleaned;
+			} else text += context.sourceCode.getText(child);
+			return fixer.replaceText(node, text);
 		};
 	}
 	/**
@@ -611,7 +577,7 @@ function create(context, [option]) {
 			node
 		});
 	}
-	return merge({
+	return {
 		JSXElement(node) {
 			if (!isFragmentElement(node, jsxConfig.jsxFragmentFactory)) return;
 			if (hasAnyAttribute(context, node, ["key", "ref"])) return;
@@ -620,7 +586,7 @@ function create(context, [option]) {
 		JSXFragment(node) {
 			checkNode(node);
 		}
-	});
+	};
 }
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-jsx",
-  "version": "5.8.11",
+  "version": "5.8.13",
   "description": "ESLint React's ESLint plugin for React Flavored JSX rules.",
   "keywords": [
     "react",
@@ -39,11 +39,11 @@
   "dependencies": {
     "@typescript-eslint/types": "^8.60.1",
     "@typescript-eslint/utils": "^8.60.1",
-    "@eslint-react/ast": "5.8.11",
-    "@eslint-react/core": "5.8.11",
-    "@eslint-react/jsx": "5.8.11",
-    "@eslint-react/shared": "5.8.11",
-    "@eslint-react/eslint": "5.8.11"
+    "@eslint-react/ast": "5.8.13",
+    "@eslint-react/core": "5.8.13",
+    "@eslint-react/eslint": "5.8.13",
+    "@eslint-react/jsx": "5.8.13",
+    "@eslint-react/shared": "5.8.13"
   },
   "devDependencies": {
     "@types/react": "^19.2.16",
@@ -51,10 +51,10 @@
     "@typescript-eslint/rule-tester": "^8.60.1",
     "dedent": "^1.7.2",
     "eslint": "^10.4.1",
-    "tsdown": "^0.22.1",
+    "tsdown": "^0.22.2",
     "typescript": "6.0.3",
-    "@local/configs": "0.0.0",
-    "@local/eff": "0.0.0"
+    "@local/eff": "0.0.0",
+    "@local/configs": "0.0.0"
   },
   "peerDependencies": {
     "eslint": "^10.3.0",