eslint-plugin-react-dom 2.0.5-beta.1 → 2.0.5-beta.3

package/dist/index.js

@@ -1,5 +1,5 @@
 import { DEFAULT_ESLINT_REACT_SETTINGS, getConfigAdapters, getDocsUrl, getSettingsFromContext } from "@eslint-react/shared";
-import { getJsxAttribute, getJsxElementType, hasJsxAttribute, isJsxHostElement, isJsxText, resolveJsxAttributeValue } from "@eslint-react/core";
+import { getJsxAttribute, getJsxElementType, isJsxHostElement, isJsxText, resolveJsxAttributeValue } from "@eslint-react/core";
 import { ESLintUtils } from "@typescript-eslint/utils";
 import { AST_NODE_TYPES } from "@typescript-eslint/types";
 import { compare } from "compare-versions";
@@ -47,7 +47,7 @@ const settings = { "react-x": DEFAULT_ESLINT_REACT_SETTINGS };
 //#endregion
 //#region package.json
 var name = "eslint-plugin-react-dom";
-var version = "2.0.5-beta.1";
+var version = "2.0.5-beta.3";
 
 //#endregion
 //#region src/utils/create-jsx-element-resolver.ts
@@ -71,7 +71,7 @@ function createJsxElementResolver(context) {
 			jsxElementType: elementName
 		};
 		if (elementName === elementName.toLowerCase() || polymorphicPropName == null) return result;
-		const polymorphicProp = getJsxAttribute(context, node.openingElement.attributes, context.sourceCode.getScope(node))(polymorphicPropName);
+		const polymorphicProp = getJsxAttribute(context, node)(polymorphicPropName);
 		if (polymorphicProp != null) {
 			const staticValue = resolveJsxAttributeValue(context, polymorphicProp).toStatic(polymorphicPropName);
 			if (typeof staticValue === "string") return {
@@ -109,11 +109,11 @@ var no_dangerously_set_innerhtml_default = createRule({
 function create$17(context) {
 	if (!context.sourceCode.text.includes(DSIH$1)) return {};
 	return { JSXElement(node) {
-		const attr = getJsxAttribute(context, node.openingElement.attributes, context.sourceCode.getScope(node))(DSIH$1);
-		if (attr == null) return;
+		const dsihProp = getJsxAttribute(context, node)(DSIH$1);
+		if (dsihProp == null) return;
 		context.report({
 			messageId: "noDangerouslySetInnerhtml",
-			node: attr
+			node: dsihProp
 		});
 	} };
 }
@@ -129,7 +129,7 @@ var no_dangerously_set_innerhtml_with_children_default = createRule({
 			description: "Disallow `dangerouslySetInnerHTML` and `children` at the same time.",
 			[Symbol.for("rule_features")]: RULE_FEATURES$15
 		},
-		messages: { noDangerouslySetInnerhtmlWithChildren: "A DOM component cannot use both 'children' and 'dangerouslySetInnerHTML'." },
+		messages: { noDangerouslySetInnerhtmlWithChildren: "A DOM component cannot use both children and 'dangerouslySetInnerHTML'." },
 		schema: []
 	},
 	name: RULE_NAME$16,
@@ -146,24 +146,16 @@ function isSignificantChildren(node) {
 	if (!isJsxText(node)) return true;
 	return !(node.raw.trim() === "" && node.raw.includes("\n"));
 }
-/**
-* Checks if a JSX element has children, either through the `children` prop or as JSX children.
-* @param context The rule context.
-* @param node The JSX element to check.
-* @returns `true` if the element has children, `false` otherwise.
-*/
-function hasChildren(context, node) {
-	if (getJsxAttribute(context, node.openingElement.attributes, context.sourceCode.getScope(node))("children") != null) return true;
-	return node.children.some(isSignificantChildren);
-}
 function create$16(context) {
 	if (!context.sourceCode.text.includes(DSIH)) return {};
 	return { JSXElement(node) {
-		const DSIHAttr = getJsxAttribute(context, node.openingElement.attributes, context.sourceCode.getScope(node))(DSIH);
-		if (DSIHAttr == null) return;
-		if (hasChildren(context, node)) context.report({
+		const findJsxAttribute = getJsxAttribute(context, node);
+		if (findJsxAttribute(DSIH) == null) return;
+		const childrenPropOrNode = findJsxAttribute("children") ?? node.children.find(isSignificantChildren);
+		if (childrenPropOrNode == null) return;
+		context.report({
 			messageId: "noDangerouslySetInnerhtmlWithChildren",
-			node: DSIHAttr
+			node: childrenPropOrNode
 		});
 	} };
 }
@@ -349,7 +341,7 @@ function create$12(context) {
 	const resolver = createJsxElementResolver(context);
 	return { JSXElement(node) {
 		if (resolver.resolve(node).domElementType !== "button") return;
-		if (getJsxAttribute(context, node.openingElement.attributes, context.sourceCode.getScope(node))("type") != null) return;
+		if (getJsxAttribute(context, node)("type") != null) return;
 		context.report({
 			messageId: "noMissingButtonType",
 			node: node.openingElement,
@@ -370,14 +362,14 @@ var no_missing_iframe_sandbox_default = createRule({
 	meta: {
 		type: "problem",
 		docs: {
-			description: "Enforces explicit `sandbox` attribute for `iframe` elements.",
+			description: "Enforces explicit `sandbox` prop for `iframe` elements.",
 			[Symbol.for("rule_features")]: RULE_FEATURES$10
 		},
 		fixable: "code",
 		hasSuggestions: true,
 		messages: {
-			addIframeSandbox: "Add 'sandbox' attribute with value '{{value}}'.",
-			noMissingIframeSandbox: "Add missing 'sandbox' attribute on 'iframe' component."
+			addIframeSandbox: "Add 'sandbox' prop with value '{{value}}'.",
+			noMissingIframeSandbox: "Add missing 'sandbox' prop on 'iframe' component."
 		},
 		schema: []
 	},
@@ -390,8 +382,8 @@ function create$11(context) {
 	return { JSXElement(node) {
 		const { domElementType } = resolver.resolve(node);
 		if (domElementType !== "iframe") return;
-		const sandboxAttr = getJsxAttribute(context, node.openingElement.attributes, context.sourceCode.getScope(node))("sandbox");
-		if (sandboxAttr == null) {
+		const sandboxProp = getJsxAttribute(context, node)("sandbox");
+		if (sandboxProp == null) {
 			context.report({
 				messageId: "noMissingIframeSandbox",
 				node: node.openingElement,
@@ -405,17 +397,17 @@ function create$11(context) {
 			});
 			return;
 		}
-		const sandboxValue = resolveJsxAttributeValue(context, sandboxAttr);
+		const sandboxValue = resolveJsxAttributeValue(context, sandboxProp);
 		if (typeof sandboxValue.toStatic("sandbox") === "string") return;
 		context.report({
 			messageId: "noMissingIframeSandbox",
-			node: sandboxValue.node ?? sandboxAttr,
+			node: sandboxValue.node ?? sandboxProp,
 			suggest: [{
 				messageId: "addIframeSandbox",
 				data: { value: "" },
 				fix(fixer) {
 					if (sandboxValue.kind.startsWith("spread")) return null;
-					return fixer.replaceText(sandboxAttr, `sandbox=""`);
+					return fixer.replaceText(sandboxProp, `sandbox=""`);
 				}
 			}]
 		});
@@ -633,12 +625,12 @@ var no_string_style_prop_default = createRule({
 function create$6(context) {
 	return { JSXElement(node) {
 		if (!isJsxHostElement(context, node)) return;
-		const styleAttr = getJsxAttribute(context, node.openingElement.attributes, context.sourceCode.getScope(node))("style");
-		if (styleAttr == null) return;
-		const styleValue = resolveJsxAttributeValue(context, styleAttr);
+		const styleProp = getJsxAttribute(context, node)("style");
+		if (styleProp == null) return;
+		const styleValue = resolveJsxAttributeValue(context, styleProp);
 		if (typeof styleValue.toStatic() === "string") context.report({
 			messageId: "noStringStyleProp",
-			node: styleValue.node ?? styleAttr
+			node: styleValue.node ?? styleProp
 		});
 	} };
 }
@@ -1809,13 +1801,13 @@ function create$4(context) {
 	const resolver = createJsxElementResolver(context);
 	return { JSXElement(node) {
 		if (resolver.resolve(node).domElementType !== "iframe") return;
-		const sandboxAttr = getJsxAttribute(context, node.openingElement.attributes, context.sourceCode.getScope(node))("sandbox");
-		if (sandboxAttr == null) return;
-		const sandboxValue = resolveJsxAttributeValue(context, sandboxAttr);
+		const sandboxProp = getJsxAttribute(context, node)("sandbox");
+		if (sandboxProp == null) return;
+		const sandboxValue = resolveJsxAttributeValue(context, sandboxProp);
 		const sandboxValueStatic = sandboxValue.toStatic("sandbox");
 		if (isUnsafeSandboxCombination(sandboxValueStatic)) context.report({
 			messageId: "noUnsafeIframeSandbox",
-			node: sandboxValue.node ?? sandboxAttr
+			node: sandboxValue.node ?? sandboxProp
 		});
 	} };
 }
@@ -1835,9 +1827,9 @@ function isExternalLinkLike(value) {
 	return value.startsWith("https://") || /^(?:\w+:|\/\/)/u.test(value);
 }
 /**
-* Checks if a rel attribute value contains the necessary security attributes.
+* Checks if a rel prop value contains the necessary security attributes.
 * At minimum, it should contain "noreferrer".
-* @param value - The rel attribute value to check
+* @param value - The rel prop value to check
 * @returns Whether the rel value is considered secure
 */
 function isSafeRel(value) {
@@ -1868,16 +1860,16 @@ function create$3(context) {
 	return { JSXElement(node) {
 		const { domElementType } = resolver.resolve(node);
 		if (domElementType !== "a") return;
-		const findAttribute = getJsxAttribute(context, node.openingElement.attributes, context.sourceCode.getScope(node));
-		const targetAttribute = findAttribute("target");
-		if (targetAttribute == null) return;
-		if (resolveJsxAttributeValue(context, targetAttribute).toStatic("target") !== "_blank") return;
-		const hrefAttribute = findAttribute("href");
-		if (hrefAttribute == null) return;
-		const hrefAttributeValue = resolveJsxAttributeValue(context, hrefAttribute).toStatic("href");
-		if (!isExternalLinkLike(hrefAttributeValue)) return;
-		const relAttribute = findAttribute("rel");
-		if (relAttribute == null) {
+		const findAttribute = getJsxAttribute(context, node);
+		const targetProp = findAttribute("target");
+		if (targetProp == null) return;
+		if (resolveJsxAttributeValue(context, targetProp).toStatic("target") !== "_blank") return;
+		const hrefProp = findAttribute("href");
+		if (hrefProp == null) return;
+		const hrefValue = resolveJsxAttributeValue(context, hrefProp).toStatic("href");
+		if (!isExternalLinkLike(hrefValue)) return;
+		const relProp = findAttribute("rel");
+		if (relProp == null) {
 			context.report({
 				messageId: "noUnsafeTargetBlank",
 				node: node.openingElement,
@@ -1890,15 +1882,15 @@ function create$3(context) {
 			});
 			return;
 		}
-		const relAttributeValue = resolveJsxAttributeValue(context, relAttribute).toStatic("rel");
-		if (isSafeRel(relAttributeValue)) return;
+		const relValue = resolveJsxAttributeValue(context, relProp).toStatic("rel");
+		if (isSafeRel(relValue)) return;
 		context.report({
 			messageId: "noUnsafeTargetBlank",
-			node: relAttribute,
+			node: relProp,
 			suggest: [{
 				messageId: "addRelNoreferrerNoopener",
 				fix(fixer) {
-					return fixer.replaceText(relAttribute, `rel="noreferrer noopener"`);
+					return fixer.replaceText(relProp, `rel="noreferrer noopener"`);
 				}
 			}]
 		});
@@ -2013,10 +2005,9 @@ function create$1(context) {
 	return { JSXElement(node) {
 		const { domElementType: elementName } = resolver.resolve(node);
 		if (!voidElements.has(elementName)) return;
-		const { attributes } = node.openingElement;
-		const initialScope = context.sourceCode.getScope(node);
-		const hasChildrenProp = hasJsxAttribute(context, "children", attributes, initialScope);
-		const hasDangerouslySetInnerHTML = hasJsxAttribute(context, "dangerouslySetInnerHTML", attributes, initialScope);
+		const findJsxAttribute = getJsxAttribute(context, node);
+		const hasChildrenProp = findJsxAttribute("children") != null;
+		const hasDangerouslySetInnerHTML = findJsxAttribute("dangerouslySetInnerHTML") != null;
 		if (node.children.length > 0 || hasChildrenProp || hasDangerouslySetInnerHTML) context.report({
 			messageId: "noVoidElementsWithChildren",
 			node,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-dom",
-  "version": "2.0.5-beta.1",
+  "version": "2.0.5-beta.3",
   "description": "ESLint React's ESLint plugin for React DOM related rules.",
   "keywords": [
     "react",
@@ -41,12 +41,12 @@
     "compare-versions": "^6.1.1",
     "string-ts": "^2.2.1",
     "ts-pattern": "^5.8.0",
-    "@eslint-react/ast": "2.0.5-beta.1",
-    "@eslint-react/eff": "2.0.5-beta.1",
-    "@eslint-react/core": "2.0.5-beta.1",
-    "@eslint-react/shared": "2.0.5-beta.1",
-    "@eslint-react/kit": "2.0.5-beta.1",
-    "@eslint-react/var": "2.0.5-beta.1"
+    "@eslint-react/ast": "2.0.5-beta.3",
+    "@eslint-react/core": "2.0.5-beta.3",
+    "@eslint-react/eff": "2.0.5-beta.3",
+    "@eslint-react/kit": "2.0.5-beta.3",
+    "@eslint-react/shared": "2.0.5-beta.3",
+    "@eslint-react/var": "2.0.5-beta.3"
   },
   "devDependencies": {
     "@types/react": "^19.1.16",
@@ -56,7 +56,7 @@
   },
   "peerDependencies": {
     "eslint": "^9.36.0",
-    "typescript": "^5.9.2"
+    "typescript": "^5.9.3"
   },
   "engines": {
     "node": ">=20.19.0"