eslint-plugin-react-dom 1.23.3-next.8 → 1.24.0-next.0

package/dist/index.js

@@ -1,13 +1,14 @@
 'use strict';
 
 var eff = require('@eslint-react/eff');
-var JSX8 = require('@eslint-react/jsx');
+var JSX3 = require('@eslint-react/jsx');
+var VAR = require('@eslint-react/var');
+var tsPattern = require('ts-pattern');
 var shared = require('@eslint-react/shared');
 var types = require('@typescript-eslint/types');
 var core = require('@eslint-react/core');
 var AST = require('@eslint-react/ast');
 var compareVersions = require('compare-versions');
-var tsPattern = require('ts-pattern');
 
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -27,20 +28,31 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var JSX8__namespace = /*#__PURE__*/_interopNamespace(JSX8);
+var JSX3__namespace = /*#__PURE__*/_interopNamespace(JSX3);
+var VAR__namespace = /*#__PURE__*/_interopNamespace(VAR);
 var AST__namespace = /*#__PURE__*/_interopNamespace(AST);
 
 // package.json
 var name = "eslint-plugin-react-dom";
-var version = "1.23.3-next.8";
-var createRule = shared.createRuleForPlugin("dom");
-function findAttrInCustomAttributes(name2, attributes) {
-  return eff.F.pipe(
-    eff.O.fromNullable(attributes.findLast((a) => a.as === name2)),
-    eff.O.map((a) => [a.name, a.defaultValue]),
-    eff.O.getOrElse(() => [name2])
+var version = "1.24.0-next.0";
+function getAdditionalAttributes(name2, additionalComponents) {
+  return additionalComponents.findLast((c) => c.name === name2 || c.re.test(name2))?.attributes ?? [];
+}
+function getAttributeStringValue(attributeName, element, context, additionalAttributes) {
+  const attributeConfig = additionalAttributes.findLast((attr) => attr.as === attributeName);
+  const actualAttributeName = attributeConfig?.name ?? attributeName;
+  const actualAttributeNode = JSX3__namespace.findPropInAttributes(
+    actualAttributeName,
+    context.sourceCode.getScope(element),
+    element.openingElement.attributes
   );
+  if (actualAttributeNode === eff._) return attributeConfig?.defaultValue;
+  const actualAttributeScope = context.sourceCode.getScope(actualAttributeNode);
+  const actualAttributeValue = JSX3__namespace.getPropValue(actualAttributeNode, actualAttributeScope);
+  const actualAttributeValueResolved = VAR__namespace.toResolved(actualAttributeValue).value;
+  return tsPattern.match(actualAttributeValueResolved).with(tsPattern.P.string, eff.identity).with({ [actualAttributeName]: tsPattern.P.select(tsPattern.P.string) }, eff.identity).otherwise(() => eff._);
 }
+var createRule = shared.createRuleForPlugin("dom");
 
 // src/rules/no-dangerously-set-innerhtml.ts
 var RULE_NAME = "no-dangerously-set-innerhtml";
@@ -63,12 +75,13 @@ var no_dangerously_set_innerhtml_default = createRule({
   create(context) {
     return {
       JSXElement(node) {
-        eff.F.pipe(
-          eff.O.some("dangerouslySetInnerHTML"),
-          eff.O.flatMap(JSX8__namespace.findPropInAttributes(node.openingElement.attributes, context.sourceCode.getScope(node))),
-          eff.O.map((prop) => ({ messageId: "noDangerouslySetInnerhtml", node: prop })),
-          eff.O.map(context.report)
-        );
+        const attributes = node.openingElement.attributes;
+        const prop = JSX3__namespace.getProp("dangerouslySetInnerHTML", context.sourceCode.getScope(node), attributes);
+        if (prop === eff._) return;
+        context.report({
+          messageId: "noDangerouslySetInnerhtml",
+          node: prop
+        });
       }
     };
   },
@@ -78,10 +91,6 @@ var RULE_NAME2 = "no-dangerously-set-innerhtml-with-children";
 var RULE_FEATURES2 = [
   "CHK"
 ];
-function firstChildIsText(node) {
-  const [firstChild] = node.children;
-  return node.children.length > 0 && !eff.isNullable(firstChild) && !JSX8__namespace.isLineBreak(firstChild);
-}
 var no_dangerously_set_innerhtml_with_children_default = createRule({
   meta: {
     type: "problem",
@@ -98,22 +107,24 @@ var no_dangerously_set_innerhtml_with_children_default = createRule({
   create(context) {
     return {
       JSXElement(node) {
+        const attributes = node.openingElement.attributes;
         const initialScope = context.sourceCode.getScope(node);
-        const hasChildrenWithIn = () => node.children.length > 0 && firstChildIsText(node);
-        const hasChildrenProp = () => JSX8__namespace.hasProp(node.openingElement.attributes, "children", initialScope);
-        const hasDanger = () => JSX8__namespace.hasProp(node.openingElement.attributes, "dangerouslySetInnerHTML", initialScope);
-        if (!(hasChildrenWithIn() || hasChildrenProp()) || !hasDanger()) {
-          return;
+        const hasChildren = hasChildrenWithin(node) || JSX3__namespace.hasProp("children", initialScope, attributes);
+        const hasDangerouslySetInnerHTML = JSX3__namespace.hasProp("dangerouslySetInnerHTML", initialScope, attributes);
+        if (hasChildren && hasDangerouslySetInnerHTML) {
+          context.report({
+            messageId: "noDangerouslySetInnerhtmlWithChildren",
+            node
+          });
         }
-        context.report({
-          messageId: "noDangerouslySetInnerhtmlWithChildren",
-          node
-        });
       }
     };
   },
   defaultOptions: []
 });
+function hasChildrenWithin(node) {
+  return node.children.length > 0 && node.children[0] != null && !JSX3__namespace.isLineBreak(node.children[0]);
+}
 var RULE_NAME3 = "no-find-dom-node";
 var RULE_FEATURES3 = [
   "CHK"
@@ -170,22 +181,32 @@ var no_missing_button_type_default = createRule({
   },
   name: RULE_NAME4,
   create(context) {
+    const settings = shared.getSettingsFromContext(context);
+    const additionalComponents = settings.additionalComponents.filter((c) => c.as === "button");
     return {
       JSXElement(node) {
-        const elementName = core.getElementRepresentName(node.openingElement, context);
-        if (elementName !== "button") {
-          return;
-        }
-        const { attributes } = node.openingElement;
-        const initialScope = context.sourceCode.getScope(node);
-        const mbProp = JSX8__namespace.findPropInAttributes(attributes, initialScope)("type");
-        if (eff.O.isSome(mbProp)) {
-          return;
+        const [name2, representName] = core.getElementNameAndRepresentName(
+          node.openingElement,
+          context,
+          settings.polymorphicPropName,
+          settings.additionalComponents
+        );
+        if (representName !== "button") return;
+        const getPropValue3 = (propName) => {
+          return getAttributeStringValue(
+            propName,
+            node,
+            context,
+            getAdditionalAttributes(name2, additionalComponents)
+          );
+        };
+        const prop = getPropValue3("type");
+        if (typeof prop !== "string") {
+          context.report({
+            messageId: "noMissingButtonType",
+            node
+          });
         }
-        context.report({
-          messageId: "noMissingButtonType",
-          node
-        });
       }
     };
   },
@@ -227,36 +248,40 @@ var no_missing_iframe_sandbox_default = createRule({
   },
   name: RULE_NAME5,
   create(context) {
+    const settings = shared.getSettingsFromContext(context);
+    const additionalComponents = settings.additionalComponents.filter((c) => c.as === "iframe");
     return {
       JSXElement(node) {
-        const elementName = core.getElementRepresentName(node.openingElement, context);
-        if (elementName !== "iframe") {
-          return;
-        }
-        const { attributes } = node.openingElement;
-        const initialScope = context.sourceCode.getScope(node);
-        const mbProp = JSX8__namespace.findPropInAttributes(attributes, initialScope)("sandbox");
-        if (eff.O.isNone(mbProp)) {
+        const [name2, representName] = core.getElementNameAndRepresentName(
+          node.openingElement,
+          context,
+          settings.polymorphicPropName,
+          settings.additionalComponents
+        );
+        if (representName !== "iframe") return;
+        const getPropValue3 = (propName) => {
+          return getAttributeStringValue(
+            propName,
+            node,
+            context,
+            getAdditionalAttributes(name2, additionalComponents)
+          );
+        };
+        const sandboxValue = getPropValue3("sandbox");
+        if (sandboxValue === eff._) {
           context.report({
             messageId: "noMissingIframeSandbox",
             node: node.openingElement
           });
           return;
         }
-        const prop = mbProp.value;
-        const hasValidSandbox = eff.F.pipe(
-          JSX8__namespace.getPropValue(prop, context.sourceCode.getScope(prop)),
-          eff.O.filter(eff.isString),
-          eff.O.map((value) => value.split(" ")),
-          eff.O.exists((values) => values.every((value) => validTypes.some((validType) => validType === value)))
-        );
-        if (hasValidSandbox) {
-          return;
+        const values = sandboxValue.split(" ");
+        if (!values.every((value) => validTypes.some((validType) => validType === value))) {
+          context.report({
+            messageId: "noMissingIframeSandbox",
+            node: node.openingElement
+          });
         }
-        context.report({
-          messageId: "noMissingIframeSandbox",
-          node: prop
-        });
       }
     };
   },
@@ -282,8 +307,8 @@ var no_namespace_default = createRule({
   create(context) {
     return {
       JSXOpeningElement(node) {
-        const name2 = JSX8__namespace.getElementName(node);
-        if (!eff.isString(name2) || !name2.includes(":")) {
+        const name2 = JSX3__namespace.getElementName(node);
+        if (typeof name2 !== "string" || !name2.includes(":")) {
           return;
         }
         context.report({
@@ -374,12 +399,11 @@ var no_script_url_default = createRule({
         if (node.name.type !== types.AST_NODE_TYPES.JSXIdentifier || node.value == null) {
           return;
         }
-        const isJavaScript = eff.F.pipe(
-          JSX8__namespace.getPropValue(node, context.sourceCode.getScope(node)),
-          eff.O.filter(eff.isString),
-          eff.O.exists((v) => shared.RE_JAVASCRIPT_PROTOCOL.test(v))
-        );
-        if (isJavaScript) {
+        const propScope = context.sourceCode.getScope(node);
+        const propValue = JSX3__namespace.getPropValue(node, propScope);
+        const propValueResolved = VAR__namespace.toResolved(propValue).value;
+        if (typeof propValueResolved !== "string") return;
+        if (shared.RE_JAVASCRIPT_PROTOCOL.test(propValueResolved)) {
           context.report({
             messageId: "noScriptUrl",
             node: node.value
@@ -1453,7 +1477,6 @@ var RULE_FEATURES9 = [
 ];
 var unsafeCombinations = [
   ["allow-scripts", "allow-same-origin"]
-  // ...
 ];
 var no_unsafe_iframe_sandbox_default = createRule({
   meta: {
@@ -1469,37 +1492,34 @@ var no_unsafe_iframe_sandbox_default = createRule({
   },
   name: RULE_NAME10,
   create(context) {
+    const settings = shared.getSettingsFromContext(context);
+    const additionalComponents = settings.additionalComponents.filter((c) => c.as === "iframe");
     return {
       JSXElement(node) {
-        const elementName = core.getElementRepresentName(node.openingElement, context);
-        if (elementName !== "iframe") {
-          return;
-        }
-        const { attributes } = node.openingElement;
-        const initialScope = context.sourceCode.getScope(node);
-        const mbProp = JSX8__namespace.findPropInAttributes(attributes, initialScope)("sandbox");
-        if (eff.O.isNone(mbProp)) {
-          return;
-        }
-        const prop = mbProp.value;
-        const isSafeSandboxValue = !eff.F.pipe(
-          JSX8__namespace.getPropValue(prop, context.sourceCode.getScope(prop)),
-          eff.O.flatMapNullable(
-            (v) => tsPattern.match(v).with(tsPattern.P.string, eff.F.identity).with({ sandbox: tsPattern.P.string }, ({ sandbox }) => sandbox).otherwise(eff.F.constNull)
-          ),
-          eff.O.filter(eff.isString),
-          eff.O.map((value) => value.split(" ")),
-          eff.O.exists(
-            (values) => unsafeCombinations.some((combinations) => combinations.every((unsafeValue) => values.includes(unsafeValue)))
-          )
+        const [name2, representName] = core.getElementNameAndRepresentName(
+          node.openingElement,
+          context,
+          settings.polymorphicPropName,
+          settings.additionalComponents
         );
-        if (isSafeSandboxValue) {
-          return;
+        if (representName !== "iframe") return;
+        const getPropValue3 = (propName) => {
+          return getAttributeStringValue(
+            propName,
+            node,
+            context,
+            getAdditionalAttributes(name2, additionalComponents)
+          );
+        };
+        const sandboxValue = getPropValue3("sandbox");
+        if (sandboxValue === eff._) return;
+        const values = sandboxValue.split(" ");
+        if (unsafeCombinations.some((unsafes) => unsafes.every((x) => values.includes(x)))) {
+          context.report({
+            messageId: "noUnsafeIframeSandbox",
+            node: node.openingElement
+          });
         }
-        context.report({
-          messageId: "noUnsafeIframeSandbox",
-          node: prop
-        });
       }
     };
   },
@@ -1510,9 +1530,11 @@ var RULE_FEATURES10 = [
   "CHK"
 ];
 function isExternalLinkLike(value) {
+  if (value === eff._) return false;
   return value.startsWith("https://") || /^(?:\w+:|\/\/)/u.test(value);
 }
 function isSafeRel(value) {
+  if (value === eff._) return false;
   return value === "noreferrer" || /\bnoreferrer\b/u.test(value);
 }
 var no_unsafe_target_blank_default = createRule({
@@ -1531,70 +1553,36 @@ var no_unsafe_target_blank_default = createRule({
   create(context) {
     const settings = shared.getSettingsFromContext(context);
     const additionalComponents = settings.additionalComponents.filter((c) => c.as === "a");
-    function getReportDescriptor(node) {
-      const name2 = JSX8__namespace.getElementName(node.openingElement);
-      const elementName = core.getElementRepresentName(node.openingElement, context);
-      if (elementName !== "a" && !additionalComponents.some((c) => c.re.test(name2))) {
-        return eff.O.none();
-      }
-      const { attributes } = node.openingElement;
-      const initialScope = context.sourceCode.getScope(node);
-      const additionalAttributes = additionalComponents.findLast((c) => c.re.test(name2))?.attributes ?? [];
-      const [
-        targetPropName,
-        targetPropDefaultValue
-      ] = findAttrInCustomAttributes("target", additionalAttributes);
-      const targetProp = JSX8__namespace.findPropInAttributes(attributes, initialScope)(targetPropName);
-      const targetPropValue = eff.O.isNone(targetProp) ? eff.O.fromNullable(targetPropDefaultValue) : eff.F.pipe(
-        targetProp,
-        eff.O.flatMap((attr) => JSX8__namespace.getPropValue(attr, context.sourceCode.getScope(attr))),
-        eff.O.flatMapNullable(
-          (v) => tsPattern.match(v).with(tsPattern.P.string, eff.F.identity).with({ [targetPropName]: tsPattern.P.string }, (v2) => v2[targetPropName]).otherwise(eff.F.constNull)
-        ),
-        eff.O.filter(eff.isString)
-      );
-      if (!eff.O.exists(targetPropValue, (t) => t === "_blank")) {
-        return eff.O.none();
-      }
-      const [
-        hrefPropName,
-        hrefPropDefaultValue
-      ] = findAttrInCustomAttributes("href", additionalAttributes);
-      const hrefProp = JSX8__namespace.findPropInAttributes(attributes, initialScope)(hrefPropName);
-      const hrefPropValue = eff.O.isNone(hrefProp) ? eff.O.fromNullable(hrefPropDefaultValue) : eff.F.pipe(
-        hrefProp,
-        eff.O.flatMap((attr) => JSX8__namespace.getPropValue(attr, context.sourceCode.getScope(attr))),
-        eff.O.flatMapNullable(
-          (v) => tsPattern.match(v).with(tsPattern.P.string, eff.F.identity).with({ [hrefPropName]: tsPattern.P.string }, (v2) => v2[hrefPropName]).otherwise(eff.F.constNull)
-        ),
-        eff.O.filter(eff.isString)
-      );
-      if (!eff.O.exists(hrefPropValue, isExternalLinkLike)) {
-        return eff.O.none();
-      }
-      const [
-        relPropName,
-        relPropDefaultValue
-      ] = findAttrInCustomAttributes("rel", additionalAttributes);
-      const relProp = JSX8__namespace.findPropInAttributes(attributes, initialScope)(relPropName);
-      const relPropValue = eff.O.isNone(relProp) ? eff.O.fromNullable(relPropDefaultValue) : eff.F.pipe(
-        relProp,
-        eff.O.flatMap((attr) => JSX8__namespace.getPropValue(attr, context.sourceCode.getScope(attr))),
-        eff.O.flatMapNullable(
-          (v) => tsPattern.match(v).with(tsPattern.P.string, eff.F.identity).with({ [relPropName]: tsPattern.P.string }, (v2) => v2[relPropName]).otherwise(eff.F.constNull)
-        ),
-        eff.O.filter(eff.isString)
-      );
-      if (eff.O.exists(relPropValue, isSafeRel)) {
-        return eff.O.none();
-      }
-      return eff.O.some({
-        messageId: "noUnsafeTargetBlank",
-        node
-      });
-    }
     return {
-      JSXElement: eff.F.flow(getReportDescriptor, eff.O.map(context.report))
+      JSXElement(node) {
+        const [name2, representName] = core.getElementNameAndRepresentName(
+          node.openingElement,
+          context,
+          settings.polymorphicPropName,
+          settings.additionalComponents
+        );
+        if (representName !== "a") return;
+        const getPropValue3 = (propName) => {
+          return getAttributeStringValue(
+            propName,
+            node,
+            context,
+            getAdditionalAttributes(name2, additionalComponents)
+          );
+        };
+        if (getPropValue3("target") !== "_blank") {
+          return;
+        }
+        if (!isExternalLinkLike(getPropValue3("href"))) {
+          return;
+        }
+        if (!isSafeRel(getPropValue3("rel"))) {
+          context.report({
+            messageId: "noUnsafeTargetBlank",
+            node
+          });
+        }
+      }
     };
   },
   defaultOptions: []
@@ -1637,7 +1625,7 @@ var no_void_elements_with_children_default = createRule({
   create(context) {
     return {
       JSXElement(node) {
-        const elementName = JSX8__namespace.getElementName(node.openingElement);
+        const elementName = JSX3__namespace.getElementName(node.openingElement);
         if (elementName.length === 0 || !voidElements.has(elementName)) {
           return;
         }
@@ -1652,9 +1640,8 @@ var no_void_elements_with_children_default = createRule({
         }
         const { attributes } = node.openingElement;
         const initialScope = context.sourceCode.getScope(node);
-        const hasAttr = (name2) => eff.O.isSome(JSX8__namespace.findPropInAttributes(attributes, initialScope)(name2));
-        const hasChildrenOrDangerAttr = hasAttr("children") || hasAttr("dangerouslySetInnerHTML");
-        if (hasChildrenOrDangerAttr) {
+        const hasAttribute = (name2) => JSX3__namespace.findPropInAttributes(name2, initialScope, attributes) !== eff._;
+        if (hasAttribute("children") || hasAttribute("dangerouslySetInnerHTML")) {
           context.report({
             messageId: "noVoidElementsWithChildren",
             node,

package/dist/index.mjs

@@ -1,23 +1,34 @@
-import { F, O, isString, isNullable } from '@eslint-react/eff';
-import * as JSX8 from '@eslint-react/jsx';
-import { createRuleForPlugin, RE_JAVASCRIPT_PROTOCOL, getSettingsFromContext } from '@eslint-react/shared';
+import { _, identity } from '@eslint-react/eff';
+import * as JSX3 from '@eslint-react/jsx';
+import * as VAR from '@eslint-react/var';
+import { match, P } from 'ts-pattern';
+import { createRuleForPlugin, getSettingsFromContext, RE_JAVASCRIPT_PROTOCOL } from '@eslint-react/shared';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
-import { getElementRepresentName } from '@eslint-react/core';
+import { getElementNameAndRepresentName } from '@eslint-react/core';
 import * as AST from '@eslint-react/ast';
 import { compare } from 'compare-versions';
-import { match, P } from 'ts-pattern';
 
 // package.json
 var name = "eslint-plugin-react-dom";
-var version = "1.23.3-next.8";
-var createRule = createRuleForPlugin("dom");
-function findAttrInCustomAttributes(name2, attributes) {
-  return F.pipe(
-    O.fromNullable(attributes.findLast((a) => a.as === name2)),
-    O.map((a) => [a.name, a.defaultValue]),
-    O.getOrElse(() => [name2])
+var version = "1.24.0-next.0";
+function getAdditionalAttributes(name2, additionalComponents) {
+  return additionalComponents.findLast((c) => c.name === name2 || c.re.test(name2))?.attributes ?? [];
+}
+function getAttributeStringValue(attributeName, element, context, additionalAttributes) {
+  const attributeConfig = additionalAttributes.findLast((attr) => attr.as === attributeName);
+  const actualAttributeName = attributeConfig?.name ?? attributeName;
+  const actualAttributeNode = JSX3.findPropInAttributes(
+    actualAttributeName,
+    context.sourceCode.getScope(element),
+    element.openingElement.attributes
   );
+  if (actualAttributeNode === _) return attributeConfig?.defaultValue;
+  const actualAttributeScope = context.sourceCode.getScope(actualAttributeNode);
+  const actualAttributeValue = JSX3.getPropValue(actualAttributeNode, actualAttributeScope);
+  const actualAttributeValueResolved = VAR.toResolved(actualAttributeValue).value;
+  return match(actualAttributeValueResolved).with(P.string, identity).with({ [actualAttributeName]: P.select(P.string) }, identity).otherwise(() => _);
 }
+var createRule = createRuleForPlugin("dom");
 
 // src/rules/no-dangerously-set-innerhtml.ts
 var RULE_NAME = "no-dangerously-set-innerhtml";
@@ -40,12 +51,13 @@ var no_dangerously_set_innerhtml_default = createRule({
   create(context) {
     return {
       JSXElement(node) {
-        F.pipe(
-          O.some("dangerouslySetInnerHTML"),
-          O.flatMap(JSX8.findPropInAttributes(node.openingElement.attributes, context.sourceCode.getScope(node))),
-          O.map((prop) => ({ messageId: "noDangerouslySetInnerhtml", node: prop })),
-          O.map(context.report)
-        );
+        const attributes = node.openingElement.attributes;
+        const prop = JSX3.getProp("dangerouslySetInnerHTML", context.sourceCode.getScope(node), attributes);
+        if (prop === _) return;
+        context.report({
+          messageId: "noDangerouslySetInnerhtml",
+          node: prop
+        });
       }
     };
   },
@@ -55,10 +67,6 @@ var RULE_NAME2 = "no-dangerously-set-innerhtml-with-children";
 var RULE_FEATURES2 = [
   "CHK"
 ];
-function firstChildIsText(node) {
-  const [firstChild] = node.children;
-  return node.children.length > 0 && !isNullable(firstChild) && !JSX8.isLineBreak(firstChild);
-}
 var no_dangerously_set_innerhtml_with_children_default = createRule({
   meta: {
     type: "problem",
@@ -75,22 +83,24 @@ var no_dangerously_set_innerhtml_with_children_default = createRule({
   create(context) {
     return {
       JSXElement(node) {
+        const attributes = node.openingElement.attributes;
         const initialScope = context.sourceCode.getScope(node);
-        const hasChildrenWithIn = () => node.children.length > 0 && firstChildIsText(node);
-        const hasChildrenProp = () => JSX8.hasProp(node.openingElement.attributes, "children", initialScope);
-        const hasDanger = () => JSX8.hasProp(node.openingElement.attributes, "dangerouslySetInnerHTML", initialScope);
-        if (!(hasChildrenWithIn() || hasChildrenProp()) || !hasDanger()) {
-          return;
+        const hasChildren = hasChildrenWithin(node) || JSX3.hasProp("children", initialScope, attributes);
+        const hasDangerouslySetInnerHTML = JSX3.hasProp("dangerouslySetInnerHTML", initialScope, attributes);
+        if (hasChildren && hasDangerouslySetInnerHTML) {
+          context.report({
+            messageId: "noDangerouslySetInnerhtmlWithChildren",
+            node
+          });
         }
-        context.report({
-          messageId: "noDangerouslySetInnerhtmlWithChildren",
-          node
-        });
       }
     };
   },
   defaultOptions: []
 });
+function hasChildrenWithin(node) {
+  return node.children.length > 0 && node.children[0] != null && !JSX3.isLineBreak(node.children[0]);
+}
 var RULE_NAME3 = "no-find-dom-node";
 var RULE_FEATURES3 = [
   "CHK"
@@ -147,22 +157,32 @@ var no_missing_button_type_default = createRule({
   },
   name: RULE_NAME4,
   create(context) {
+    const settings = getSettingsFromContext(context);
+    const additionalComponents = settings.additionalComponents.filter((c) => c.as === "button");
     return {
       JSXElement(node) {
-        const elementName = getElementRepresentName(node.openingElement, context);
-        if (elementName !== "button") {
-          return;
-        }
-        const { attributes } = node.openingElement;
-        const initialScope = context.sourceCode.getScope(node);
-        const mbProp = JSX8.findPropInAttributes(attributes, initialScope)("type");
-        if (O.isSome(mbProp)) {
-          return;
+        const [name2, representName] = getElementNameAndRepresentName(
+          node.openingElement,
+          context,
+          settings.polymorphicPropName,
+          settings.additionalComponents
+        );
+        if (representName !== "button") return;
+        const getPropValue3 = (propName) => {
+          return getAttributeStringValue(
+            propName,
+            node,
+            context,
+            getAdditionalAttributes(name2, additionalComponents)
+          );
+        };
+        const prop = getPropValue3("type");
+        if (typeof prop !== "string") {
+          context.report({
+            messageId: "noMissingButtonType",
+            node
+          });
         }
-        context.report({
-          messageId: "noMissingButtonType",
-          node
-        });
       }
     };
   },
@@ -204,36 +224,40 @@ var no_missing_iframe_sandbox_default = createRule({
   },
   name: RULE_NAME5,
   create(context) {
+    const settings = getSettingsFromContext(context);
+    const additionalComponents = settings.additionalComponents.filter((c) => c.as === "iframe");
     return {
       JSXElement(node) {
-        const elementName = getElementRepresentName(node.openingElement, context);
-        if (elementName !== "iframe") {
-          return;
-        }
-        const { attributes } = node.openingElement;
-        const initialScope = context.sourceCode.getScope(node);
-        const mbProp = JSX8.findPropInAttributes(attributes, initialScope)("sandbox");
-        if (O.isNone(mbProp)) {
+        const [name2, representName] = getElementNameAndRepresentName(
+          node.openingElement,
+          context,
+          settings.polymorphicPropName,
+          settings.additionalComponents
+        );
+        if (representName !== "iframe") return;
+        const getPropValue3 = (propName) => {
+          return getAttributeStringValue(
+            propName,
+            node,
+            context,
+            getAdditionalAttributes(name2, additionalComponents)
+          );
+        };
+        const sandboxValue = getPropValue3("sandbox");
+        if (sandboxValue === _) {
           context.report({
             messageId: "noMissingIframeSandbox",
             node: node.openingElement
           });
           return;
         }
-        const prop = mbProp.value;
-        const hasValidSandbox = F.pipe(
-          JSX8.getPropValue(prop, context.sourceCode.getScope(prop)),
-          O.filter(isString),
-          O.map((value) => value.split(" ")),
-          O.exists((values) => values.every((value) => validTypes.some((validType) => validType === value)))
-        );
-        if (hasValidSandbox) {
-          return;
+        const values = sandboxValue.split(" ");
+        if (!values.every((value) => validTypes.some((validType) => validType === value))) {
+          context.report({
+            messageId: "noMissingIframeSandbox",
+            node: node.openingElement
+          });
         }
-        context.report({
-          messageId: "noMissingIframeSandbox",
-          node: prop
-        });
       }
     };
   },
@@ -259,8 +283,8 @@ var no_namespace_default = createRule({
   create(context) {
     return {
       JSXOpeningElement(node) {
-        const name2 = JSX8.getElementName(node);
-        if (!isString(name2) || !name2.includes(":")) {
+        const name2 = JSX3.getElementName(node);
+        if (typeof name2 !== "string" || !name2.includes(":")) {
           return;
         }
         context.report({
@@ -351,12 +375,11 @@ var no_script_url_default = createRule({
         if (node.name.type !== AST_NODE_TYPES.JSXIdentifier || node.value == null) {
           return;
         }
-        const isJavaScript = F.pipe(
-          JSX8.getPropValue(node, context.sourceCode.getScope(node)),
-          O.filter(isString),
-          O.exists((v) => RE_JAVASCRIPT_PROTOCOL.test(v))
-        );
-        if (isJavaScript) {
+        const propScope = context.sourceCode.getScope(node);
+        const propValue = JSX3.getPropValue(node, propScope);
+        const propValueResolved = VAR.toResolved(propValue).value;
+        if (typeof propValueResolved !== "string") return;
+        if (RE_JAVASCRIPT_PROTOCOL.test(propValueResolved)) {
           context.report({
             messageId: "noScriptUrl",
             node: node.value
@@ -1430,7 +1453,6 @@ var RULE_FEATURES9 = [
 ];
 var unsafeCombinations = [
   ["allow-scripts", "allow-same-origin"]
-  // ...
 ];
 var no_unsafe_iframe_sandbox_default = createRule({
   meta: {
@@ -1446,37 +1468,34 @@ var no_unsafe_iframe_sandbox_default = createRule({
   },
   name: RULE_NAME10,
   create(context) {
+    const settings = getSettingsFromContext(context);
+    const additionalComponents = settings.additionalComponents.filter((c) => c.as === "iframe");
     return {
       JSXElement(node) {
-        const elementName = getElementRepresentName(node.openingElement, context);
-        if (elementName !== "iframe") {
-          return;
-        }
-        const { attributes } = node.openingElement;
-        const initialScope = context.sourceCode.getScope(node);
-        const mbProp = JSX8.findPropInAttributes(attributes, initialScope)("sandbox");
-        if (O.isNone(mbProp)) {
-          return;
-        }
-        const prop = mbProp.value;
-        const isSafeSandboxValue = !F.pipe(
-          JSX8.getPropValue(prop, context.sourceCode.getScope(prop)),
-          O.flatMapNullable(
-            (v) => match(v).with(P.string, F.identity).with({ sandbox: P.string }, ({ sandbox }) => sandbox).otherwise(F.constNull)
-          ),
-          O.filter(isString),
-          O.map((value) => value.split(" ")),
-          O.exists(
-            (values) => unsafeCombinations.some((combinations) => combinations.every((unsafeValue) => values.includes(unsafeValue)))
-          )
+        const [name2, representName] = getElementNameAndRepresentName(
+          node.openingElement,
+          context,
+          settings.polymorphicPropName,
+          settings.additionalComponents
         );
-        if (isSafeSandboxValue) {
-          return;
+        if (representName !== "iframe") return;
+        const getPropValue3 = (propName) => {
+          return getAttributeStringValue(
+            propName,
+            node,
+            context,
+            getAdditionalAttributes(name2, additionalComponents)
+          );
+        };
+        const sandboxValue = getPropValue3("sandbox");
+        if (sandboxValue === _) return;
+        const values = sandboxValue.split(" ");
+        if (unsafeCombinations.some((unsafes) => unsafes.every((x) => values.includes(x)))) {
+          context.report({
+            messageId: "noUnsafeIframeSandbox",
+            node: node.openingElement
+          });
         }
-        context.report({
-          messageId: "noUnsafeIframeSandbox",
-          node: prop
-        });
       }
     };
   },
@@ -1487,9 +1506,11 @@ var RULE_FEATURES10 = [
   "CHK"
 ];
 function isExternalLinkLike(value) {
+  if (value === _) return false;
   return value.startsWith("https://") || /^(?:\w+:|\/\/)/u.test(value);
 }
 function isSafeRel(value) {
+  if (value === _) return false;
   return value === "noreferrer" || /\bnoreferrer\b/u.test(value);
 }
 var no_unsafe_target_blank_default = createRule({
@@ -1508,70 +1529,36 @@ var no_unsafe_target_blank_default = createRule({
   create(context) {
     const settings = getSettingsFromContext(context);
     const additionalComponents = settings.additionalComponents.filter((c) => c.as === "a");
-    function getReportDescriptor(node) {
-      const name2 = JSX8.getElementName(node.openingElement);
-      const elementName = getElementRepresentName(node.openingElement, context);
-      if (elementName !== "a" && !additionalComponents.some((c) => c.re.test(name2))) {
-        return O.none();
-      }
-      const { attributes } = node.openingElement;
-      const initialScope = context.sourceCode.getScope(node);
-      const additionalAttributes = additionalComponents.findLast((c) => c.re.test(name2))?.attributes ?? [];
-      const [
-        targetPropName,
-        targetPropDefaultValue
-      ] = findAttrInCustomAttributes("target", additionalAttributes);
-      const targetProp = JSX8.findPropInAttributes(attributes, initialScope)(targetPropName);
-      const targetPropValue = O.isNone(targetProp) ? O.fromNullable(targetPropDefaultValue) : F.pipe(
-        targetProp,
-        O.flatMap((attr) => JSX8.getPropValue(attr, context.sourceCode.getScope(attr))),
-        O.flatMapNullable(
-          (v) => match(v).with(P.string, F.identity).with({ [targetPropName]: P.string }, (v2) => v2[targetPropName]).otherwise(F.constNull)
-        ),
-        O.filter(isString)
-      );
-      if (!O.exists(targetPropValue, (t) => t === "_blank")) {
-        return O.none();
-      }
-      const [
-        hrefPropName,
-        hrefPropDefaultValue
-      ] = findAttrInCustomAttributes("href", additionalAttributes);
-      const hrefProp = JSX8.findPropInAttributes(attributes, initialScope)(hrefPropName);
-      const hrefPropValue = O.isNone(hrefProp) ? O.fromNullable(hrefPropDefaultValue) : F.pipe(
-        hrefProp,
-        O.flatMap((attr) => JSX8.getPropValue(attr, context.sourceCode.getScope(attr))),
-        O.flatMapNullable(
-          (v) => match(v).with(P.string, F.identity).with({ [hrefPropName]: P.string }, (v2) => v2[hrefPropName]).otherwise(F.constNull)
-        ),
-        O.filter(isString)
-      );
-      if (!O.exists(hrefPropValue, isExternalLinkLike)) {
-        return O.none();
-      }
-      const [
-        relPropName,
-        relPropDefaultValue
-      ] = findAttrInCustomAttributes("rel", additionalAttributes);
-      const relProp = JSX8.findPropInAttributes(attributes, initialScope)(relPropName);
-      const relPropValue = O.isNone(relProp) ? O.fromNullable(relPropDefaultValue) : F.pipe(
-        relProp,
-        O.flatMap((attr) => JSX8.getPropValue(attr, context.sourceCode.getScope(attr))),
-        O.flatMapNullable(
-          (v) => match(v).with(P.string, F.identity).with({ [relPropName]: P.string }, (v2) => v2[relPropName]).otherwise(F.constNull)
-        ),
-        O.filter(isString)
-      );
-      if (O.exists(relPropValue, isSafeRel)) {
-        return O.none();
-      }
-      return O.some({
-        messageId: "noUnsafeTargetBlank",
-        node
-      });
-    }
     return {
-      JSXElement: F.flow(getReportDescriptor, O.map(context.report))
+      JSXElement(node) {
+        const [name2, representName] = getElementNameAndRepresentName(
+          node.openingElement,
+          context,
+          settings.polymorphicPropName,
+          settings.additionalComponents
+        );
+        if (representName !== "a") return;
+        const getPropValue3 = (propName) => {
+          return getAttributeStringValue(
+            propName,
+            node,
+            context,
+            getAdditionalAttributes(name2, additionalComponents)
+          );
+        };
+        if (getPropValue3("target") !== "_blank") {
+          return;
+        }
+        if (!isExternalLinkLike(getPropValue3("href"))) {
+          return;
+        }
+        if (!isSafeRel(getPropValue3("rel"))) {
+          context.report({
+            messageId: "noUnsafeTargetBlank",
+            node
+          });
+        }
+      }
     };
   },
   defaultOptions: []
@@ -1614,7 +1601,7 @@ var no_void_elements_with_children_default = createRule({
   create(context) {
     return {
       JSXElement(node) {
-        const elementName = JSX8.getElementName(node.openingElement);
+        const elementName = JSX3.getElementName(node.openingElement);
         if (elementName.length === 0 || !voidElements.has(elementName)) {
           return;
         }
@@ -1629,9 +1616,8 @@ var no_void_elements_with_children_default = createRule({
         }
         const { attributes } = node.openingElement;
         const initialScope = context.sourceCode.getScope(node);
-        const hasAttr = (name2) => O.isSome(JSX8.findPropInAttributes(attributes, initialScope)(name2));
-        const hasChildrenOrDangerAttr = hasAttr("children") || hasAttr("dangerouslySetInnerHTML");
-        if (hasChildrenOrDangerAttr) {
+        const hasAttribute = (name2) => JSX3.findPropInAttributes(name2, initialScope, attributes) !== _;
+        if (hasAttribute("children") || hasAttribute("dangerouslySetInnerHTML")) {
           context.report({
             messageId: "noVoidElementsWithChildren",
             node,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-dom",
-  "version": "1.23.3-next.8",
+  "version": "1.24.0-next.0",
   "description": "ESLint React's ESLint plugin for React DOM related rules.",
   "keywords": [
     "react",
@@ -10,13 +10,13 @@
     "eslint-plugin",
     "eslint-plugin-react-dom"
   ],
-  "homepage": "https://github.com/rEl1cx/eslint-react",
+  "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
-    "url": "https://github.com/rEl1cx/eslint-react/issues"
+    "url": "https://github.com/Rel1cx/eslint-react/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/rEl1cx/eslint-react.git",
+    "url": "git+https://github.com/Rel1cx/eslint-react.git",
     "directory": "packages/plugins/eslint-plugin-react-dom"
   },
   "license": "MIT",
@@ -47,13 +47,13 @@
     "compare-versions": "^6.1.1",
     "string-ts": "^2.2.0",
     "ts-pattern": "^5.6.0",
-    "@eslint-react/ast": "1.23.3-next.8",
-    "@eslint-react/core": "1.23.3-next.8",
-    "@eslint-react/eff": "1.23.3-next.8",
-    "@eslint-react/jsx": "1.23.3-next.8",
-    "@eslint-react/shared": "1.23.3-next.8",
-    "@eslint-react/types": "1.23.3-next.8",
-    "@eslint-react/var": "1.23.3-next.8"
+    "@eslint-react/ast": "1.24.0-next.0",
+    "@eslint-react/core": "1.24.0-next.0",
+    "@eslint-react/eff": "1.24.0-next.0",
+    "@eslint-react/jsx": "1.24.0-next.0",
+    "@eslint-react/types": "1.24.0-next.0",
+    "@eslint-react/var": "1.24.0-next.0",
+    "@eslint-react/shared": "1.24.0-next.0"
   },
   "devDependencies": {
     "@types/react": "^19.0.4",