eslint-plugin-react-dom 1.46.0-next.0 → 1.46.1-next.0

package/dist/index.js

@@ -67,35 +67,53 @@ var settings = {
 
 // package.json
 var name2 = "eslint-plugin-react-dom";
-var version = "1.46.0-next.0";
+var version = "1.46.1-next.0";
+function createJsxElementResolver(context) {
+  const {
+    additionalComponents,
+    polymorphicPropName
+  } = shared.getSettingsFromContext(context);
+  return {
+    resolve(node) {
+      const name3 = JSX__namespace.getElementType(node);
+      const component = additionalComponents.findLast((c) => c.name === name3 || c.re.test(name3));
+      const result = {
+        attributes: component?.attributes ?? [],
+        domElementType: component?.as ?? name3,
+        jsxElementType: name3
+      };
+      if (name3 === name3.toLowerCase() || component != null || polymorphicPropName == null) {
+        return result;
+      }
+      const initialScope = context.sourceCode.getScope(node);
+      const polymorphicPropAttr = JSX__namespace.getAttribute(
+        polymorphicPropName,
+        node.openingElement.attributes,
+        initialScope
+      );
+      if (polymorphicPropAttr != null) {
+        const polymorphicPropValue = JSX__namespace.getAttributeValue(
+          polymorphicPropAttr,
+          polymorphicPropName,
+          initialScope
+        );
+        if (polymorphicPropValue.kind === "some" && typeof polymorphicPropValue.value === "string") {
+          return {
+            ...result,
+            domElementType: polymorphicPropValue.value
+          };
+        }
+      }
+      return result;
+    }
+  };
+}
 var createRule = utils.ESLintUtils.RuleCreator(shared.getDocsUrl("dom"));
 
 // src/utils/find-custom-component.ts
-function findCustomComponent(name3, components) {
-  return components.findLast((c) => c.name === name3 || c.re.test(name3));
-}
 function findCustomComponentProp(name3, props) {
   return props.findLast((a) => a.as === name3);
 }
-function getElementTypeOnJsxAndDom(context, node, polymorphicPropName, additionalComponents = []) {
-  const name3 = JSX__namespace.getElementType(node);
-  if (name3 === name3.toLowerCase()) return [name3, name3];
-  const component = additionalComponents.findLast((c) => c.name === name3 || c.re.test(name3));
-  if (component != null) return [name3, component.as];
-  if (polymorphicPropName == null) return [name3, name3];
-  const initialScope = context.sourceCode.getScope(node);
-  const attributeNode = JSX__namespace.getAttribute(
-    polymorphicPropName,
-    node.openingElement.attributes,
-    initialScope
-  );
-  if (attributeNode == null) return [name3, name3];
-  const polymorphicPropValue = JSX__namespace.getAttributeValue(attributeNode, polymorphicPropName, initialScope);
-  if (polymorphicPropValue.kind === "some" && typeof polymorphicPropValue.value === "string") {
-    return [name3, polymorphicPropValue.value];
-  }
-  return [name3, name3];
-}
 
 // src/rules/no-dangerously-set-innerhtml.ts
 var RULE_NAME = "no-dangerously-set-innerhtml";
@@ -343,21 +361,13 @@ var no_missing_button_type_default = createRule({
   defaultOptions: []
 });
 function create6(context) {
-  const settings2 = shared.getSettingsFromContext(context);
-  const polymorphicPropName = settings2.polymorphicPropName;
-  const additionalComponents = settings2.additionalComponents.filter((c) => c.as === "button");
+  const resolver = createJsxElementResolver(context);
   return {
     JSXElement(node) {
-      const [elementNameOnJsx, elementNameOnDom] = getElementTypeOnJsxAndDom(
-        context,
-        node,
-        polymorphicPropName,
-        additionalComponents
-      );
-      if (elementNameOnDom !== "button") return;
+      const { attributes, domElementType } = resolver.resolve(node);
+      if (domElementType !== "button") return;
       const elementScope = context.sourceCode.getScope(node);
-      const customComponent = findCustomComponent(elementNameOnJsx, additionalComponents);
-      const customComponentProp = findCustomComponentProp("type", customComponent?.attributes ?? []);
+      const customComponentProp = findCustomComponentProp("type", attributes);
       const propNameOnJsx = customComponentProp?.name ?? "type";
       const attributeNode = JSX__namespace.getAttribute(
         propNameOnJsx,
@@ -424,21 +434,13 @@ var no_missing_iframe_sandbox_default = createRule({
   defaultOptions: []
 });
 function create7(context) {
-  const settings2 = shared.getSettingsFromContext(context);
-  const polymorphicPropName = settings2.polymorphicPropName;
-  const additionalComponents = settings2.additionalComponents.filter((c) => c.as === "iframe");
+  const resolver = createJsxElementResolver(context);
   return {
     JSXElement(node) {
-      const [elementNameOnJsx, elementNameOnDom] = getElementTypeOnJsxAndDom(
-        context,
-        node,
-        polymorphicPropName,
-        additionalComponents
-      );
-      if (elementNameOnDom !== "iframe") return;
+      const { attributes, domElementType } = resolver.resolve(node);
+      if (domElementType !== "iframe") return;
       const elementScope = context.sourceCode.getScope(node);
-      const customComponent = findCustomComponent(elementNameOnJsx, additionalComponents);
-      const customComponentProp = findCustomComponentProp("sandbox", customComponent?.attributes ?? []);
+      const customComponentProp = findCustomComponentProp("sandbox", attributes);
       const propNameOnJsx = customComponentProp?.name ?? "sandbox";
       const attributeNode = JSX__namespace.getAttribute(
         propNameOnJsx,
@@ -1751,21 +1753,13 @@ var no_unsafe_iframe_sandbox_default = createRule({
   defaultOptions: []
 });
 function create13(context) {
-  const settings2 = shared.getSettingsFromContext(context);
-  const polymorphicPropName = settings2.polymorphicPropName;
-  const additionalComponents = settings2.additionalComponents.filter((c) => c.as === "iframe");
+  const resolver = createJsxElementResolver(context);
   return {
     JSXElement(node) {
-      const [elementNameOnJsx, elementNameOnDom] = getElementTypeOnJsxAndDom(
-        context,
-        node,
-        polymorphicPropName,
-        additionalComponents
-      );
-      if (elementNameOnDom !== "iframe") return;
+      const { attributes, domElementType } = resolver.resolve(node);
+      if (domElementType !== "iframe") return;
       const elementScope = context.sourceCode.getScope(node);
-      const customComponent = findCustomComponent(elementNameOnJsx, additionalComponents);
-      const customComponentProp = findCustomComponentProp("sandbox", customComponent?.attributes ?? []);
+      const customComponentProp = findCustomComponentProp("sandbox", attributes);
       const propNameOnJsx = customComponentProp?.name ?? "sandbox";
       const attributeNode = JSX__namespace.getAttribute(
         propNameOnJsx,
@@ -1820,22 +1814,14 @@ var no_unsafe_target_blank_default = createRule({
   defaultOptions: []
 });
 function create14(context) {
-  const settings2 = shared.getSettingsFromContext(context);
-  const polymorphicPropName = settings2.polymorphicPropName;
-  const additionalComponents = settings2.additionalComponents.filter((c) => c.as === "a");
+  const resolver = createJsxElementResolver(context);
   return {
     JSXElement(node) {
-      const [elementNameOnJsx, elementNameOnDom] = getElementTypeOnJsxAndDom(
-        context,
-        node,
-        polymorphicPropName,
-        additionalComponents
-      );
-      if (elementNameOnDom !== "a") return;
+      const { attributes, domElementType } = resolver.resolve(node);
+      if (domElementType !== "a") return;
       const elementScope = context.sourceCode.getScope(node);
-      const customComponent = findCustomComponent(elementNameOnJsx, additionalComponents);
       const getAttributeStringValue = (name3) => {
-        const customComponentProp = findCustomComponentProp(name3, customComponent?.attributes ?? []);
+        const customComponentProp = findCustomComponentProp(name3, attributes);
         const propNameOnJsx = customComponentProp?.name ?? name3;
         const attributeNode = JSX__namespace.getAttribute(
           propNameOnJsx,

package/dist/index.mjs

@@ -44,35 +44,53 @@ var settings = {
 
 // package.json
 var name2 = "eslint-plugin-react-dom";
-var version = "1.46.0-next.0";
+var version = "1.46.1-next.0";
+function createJsxElementResolver(context) {
+  const {
+    additionalComponents,
+    polymorphicPropName
+  } = getSettingsFromContext(context);
+  return {
+    resolve(node) {
+      const name3 = JSX.getElementType(node);
+      const component = additionalComponents.findLast((c) => c.name === name3 || c.re.test(name3));
+      const result = {
+        attributes: component?.attributes ?? [],
+        domElementType: component?.as ?? name3,
+        jsxElementType: name3
+      };
+      if (name3 === name3.toLowerCase() || component != null || polymorphicPropName == null) {
+        return result;
+      }
+      const initialScope = context.sourceCode.getScope(node);
+      const polymorphicPropAttr = JSX.getAttribute(
+        polymorphicPropName,
+        node.openingElement.attributes,
+        initialScope
+      );
+      if (polymorphicPropAttr != null) {
+        const polymorphicPropValue = JSX.getAttributeValue(
+          polymorphicPropAttr,
+          polymorphicPropName,
+          initialScope
+        );
+        if (polymorphicPropValue.kind === "some" && typeof polymorphicPropValue.value === "string") {
+          return {
+            ...result,
+            domElementType: polymorphicPropValue.value
+          };
+        }
+      }
+      return result;
+    }
+  };
+}
 var createRule = ESLintUtils.RuleCreator(getDocsUrl("dom"));
 
 // src/utils/find-custom-component.ts
-function findCustomComponent(name3, components) {
-  return components.findLast((c) => c.name === name3 || c.re.test(name3));
-}
 function findCustomComponentProp(name3, props) {
   return props.findLast((a) => a.as === name3);
 }
-function getElementTypeOnJsxAndDom(context, node, polymorphicPropName, additionalComponents = []) {
-  const name3 = JSX.getElementType(node);
-  if (name3 === name3.toLowerCase()) return [name3, name3];
-  const component = additionalComponents.findLast((c) => c.name === name3 || c.re.test(name3));
-  if (component != null) return [name3, component.as];
-  if (polymorphicPropName == null) return [name3, name3];
-  const initialScope = context.sourceCode.getScope(node);
-  const attributeNode = JSX.getAttribute(
-    polymorphicPropName,
-    node.openingElement.attributes,
-    initialScope
-  );
-  if (attributeNode == null) return [name3, name3];
-  const polymorphicPropValue = JSX.getAttributeValue(attributeNode, polymorphicPropName, initialScope);
-  if (polymorphicPropValue.kind === "some" && typeof polymorphicPropValue.value === "string") {
-    return [name3, polymorphicPropValue.value];
-  }
-  return [name3, name3];
-}
 
 // src/rules/no-dangerously-set-innerhtml.ts
 var RULE_NAME = "no-dangerously-set-innerhtml";
@@ -320,21 +338,13 @@ var no_missing_button_type_default = createRule({
   defaultOptions: []
 });
 function create6(context) {
-  const settings2 = getSettingsFromContext(context);
-  const polymorphicPropName = settings2.polymorphicPropName;
-  const additionalComponents = settings2.additionalComponents.filter((c) => c.as === "button");
+  const resolver = createJsxElementResolver(context);
   return {
     JSXElement(node) {
-      const [elementNameOnJsx, elementNameOnDom] = getElementTypeOnJsxAndDom(
-        context,
-        node,
-        polymorphicPropName,
-        additionalComponents
-      );
-      if (elementNameOnDom !== "button") return;
+      const { attributes, domElementType } = resolver.resolve(node);
+      if (domElementType !== "button") return;
       const elementScope = context.sourceCode.getScope(node);
-      const customComponent = findCustomComponent(elementNameOnJsx, additionalComponents);
-      const customComponentProp = findCustomComponentProp("type", customComponent?.attributes ?? []);
+      const customComponentProp = findCustomComponentProp("type", attributes);
       const propNameOnJsx = customComponentProp?.name ?? "type";
       const attributeNode = JSX.getAttribute(
         propNameOnJsx,
@@ -401,21 +411,13 @@ var no_missing_iframe_sandbox_default = createRule({
   defaultOptions: []
 });
 function create7(context) {
-  const settings2 = getSettingsFromContext(context);
-  const polymorphicPropName = settings2.polymorphicPropName;
-  const additionalComponents = settings2.additionalComponents.filter((c) => c.as === "iframe");
+  const resolver = createJsxElementResolver(context);
   return {
     JSXElement(node) {
-      const [elementNameOnJsx, elementNameOnDom] = getElementTypeOnJsxAndDom(
-        context,
-        node,
-        polymorphicPropName,
-        additionalComponents
-      );
-      if (elementNameOnDom !== "iframe") return;
+      const { attributes, domElementType } = resolver.resolve(node);
+      if (domElementType !== "iframe") return;
       const elementScope = context.sourceCode.getScope(node);
-      const customComponent = findCustomComponent(elementNameOnJsx, additionalComponents);
-      const customComponentProp = findCustomComponentProp("sandbox", customComponent?.attributes ?? []);
+      const customComponentProp = findCustomComponentProp("sandbox", attributes);
       const propNameOnJsx = customComponentProp?.name ?? "sandbox";
       const attributeNode = JSX.getAttribute(
         propNameOnJsx,
@@ -1728,21 +1730,13 @@ var no_unsafe_iframe_sandbox_default = createRule({
   defaultOptions: []
 });
 function create13(context) {
-  const settings2 = getSettingsFromContext(context);
-  const polymorphicPropName = settings2.polymorphicPropName;
-  const additionalComponents = settings2.additionalComponents.filter((c) => c.as === "iframe");
+  const resolver = createJsxElementResolver(context);
   return {
     JSXElement(node) {
-      const [elementNameOnJsx, elementNameOnDom] = getElementTypeOnJsxAndDom(
-        context,
-        node,
-        polymorphicPropName,
-        additionalComponents
-      );
-      if (elementNameOnDom !== "iframe") return;
+      const { attributes, domElementType } = resolver.resolve(node);
+      if (domElementType !== "iframe") return;
       const elementScope = context.sourceCode.getScope(node);
-      const customComponent = findCustomComponent(elementNameOnJsx, additionalComponents);
-      const customComponentProp = findCustomComponentProp("sandbox", customComponent?.attributes ?? []);
+      const customComponentProp = findCustomComponentProp("sandbox", attributes);
       const propNameOnJsx = customComponentProp?.name ?? "sandbox";
       const attributeNode = JSX.getAttribute(
         propNameOnJsx,
@@ -1797,22 +1791,14 @@ var no_unsafe_target_blank_default = createRule({
   defaultOptions: []
 });
 function create14(context) {
-  const settings2 = getSettingsFromContext(context);
-  const polymorphicPropName = settings2.polymorphicPropName;
-  const additionalComponents = settings2.additionalComponents.filter((c) => c.as === "a");
+  const resolver = createJsxElementResolver(context);
   return {
     JSXElement(node) {
-      const [elementNameOnJsx, elementNameOnDom] = getElementTypeOnJsxAndDom(
-        context,
-        node,
-        polymorphicPropName,
-        additionalComponents
-      );
-      if (elementNameOnDom !== "a") return;
+      const { attributes, domElementType } = resolver.resolve(node);
+      if (domElementType !== "a") return;
       const elementScope = context.sourceCode.getScope(node);
-      const customComponent = findCustomComponent(elementNameOnJsx, additionalComponents);
       const getAttributeStringValue = (name3) => {
-        const customComponentProp = findCustomComponentProp(name3, customComponent?.attributes ?? []);
+        const customComponentProp = findCustomComponentProp(name3, attributes);
         const propNameOnJsx = customComponentProp?.name ?? name3;
         const attributeNode = JSX.getAttribute(
           propNameOnJsx,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-dom",
-  "version": "1.46.0-next.0",
+  "version": "1.46.1-next.0",
   "description": "ESLint React's ESLint plugin for React DOM related rules.",
   "keywords": [
     "react",
@@ -49,13 +49,13 @@
     "compare-versions": "^6.1.1",
     "string-ts": "^2.2.1",
     "ts-pattern": "^5.7.0",
-    "@eslint-react/ast": "1.46.0-next.0",
-    "@eslint-react/eff": "1.46.0-next.0",
-    "@eslint-react/shared": "1.46.0-next.0",
-    "@eslint-react/jsx": "1.46.0-next.0",
-    "@eslint-react/kit": "1.46.0-next.0",
-    "@eslint-react/var": "1.46.0-next.0",
-    "@eslint-react/core": "1.46.0-next.0"
+    "@eslint-react/ast": "1.46.1-next.0",
+    "@eslint-react/core": "1.46.1-next.0",
+    "@eslint-react/jsx": "1.46.1-next.0",
+    "@eslint-react/kit": "1.46.1-next.0",
+    "@eslint-react/shared": "1.46.1-next.0",
+    "@eslint-react/eff": "1.46.1-next.0",
+    "@eslint-react/var": "1.46.1-next.0"
   },
   "devDependencies": {
     "@types/react": "^19.1.1",