eslint-plugin-react-dom 1.23.1 → 1.23.2-beta.6

package/dist/index.js

@@ -32,7 +32,7 @@ var AST__namespace = /*#__PURE__*/_interopNamespace(AST);
 
 // package.json
 var name = "eslint-plugin-react-dom";
-var version = "1.23.1";
+var version = "1.23.2-beta.6";
 var createRule = shared.createRuleForPlugin("dom");
 function findAttrInCustomAttributes(name2, attributes) {
   return eff.F.pipe(
@@ -63,16 +63,12 @@ var no_dangerously_set_innerhtml_default = createRule({
   create(context) {
     return {
       JSXElement(node) {
-        const initialScope = context.sourceCode.getScope(node);
-        const maybeDanger = JSX8__namespace.findPropInAttributes(node.openingElement.attributes, initialScope)(
-          "dangerouslySetInnerHTML"
+        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)
         );
-        if (eff.O.isSome(maybeDanger)) {
-          context.report({
-            messageId: "noDangerouslySetInnerhtml",
-            node
-          });
-        }
       }
     };
   },
@@ -178,11 +174,11 @@ var no_missing_button_type_default = createRule({
         if (elementName !== "button") return;
         const { attributes } = node.openingElement;
         const initialScope = context.sourceCode.getScope(node);
-        const maybeTypeAttribute = JSX8__namespace.findPropInAttributes(attributes, initialScope)("type");
-        if (eff.O.isSome(maybeTypeAttribute)) return;
+        const mbProp = JSX8__namespace.findPropInAttributes(attributes, initialScope)("type");
+        if (eff.O.isSome(mbProp)) return;
         context.report({
           messageId: "noMissingButtonType",
-          node: node.openingElement
+          node
         });
       }
     };
@@ -231,17 +227,17 @@ var no_missing_iframe_sandbox_default = createRule({
         if (elementName !== "iframe") return;
         const { attributes } = node.openingElement;
         const initialScope = context.sourceCode.getScope(node);
-        const maybeSandboxAttribute = JSX8__namespace.findPropInAttributes(attributes, initialScope)("sandbox");
-        if (eff.O.isNone(maybeSandboxAttribute)) {
+        const mbProp = JSX8__namespace.findPropInAttributes(attributes, initialScope)("sandbox");
+        if (eff.O.isNone(mbProp)) {
           context.report({
             messageId: "noMissingIframeSandbox",
             node: node.openingElement
           });
           return;
         }
-        const sandboxAttribute = maybeSandboxAttribute.value;
+        const prop = mbProp.value;
         const hasValidSandbox = eff.F.pipe(
-          JSX8__namespace.getPropValue(sandboxAttribute, context.sourceCode.getScope(sandboxAttribute)),
+          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)))
@@ -249,7 +245,7 @@ var no_missing_iframe_sandbox_default = createRule({
         if (hasValidSandbox) return;
         context.report({
           messageId: "noMissingIframeSandbox",
-          node: sandboxAttribute
+          node: prop
         });
       }
     };
@@ -1428,7 +1424,7 @@ function report(context, message, messageId, data) {
   });
 }
 function testReactVersion(context, comparator, version2) {
-  const { version: localVersion } = shared.normalizeSettings(shared.decodeSettings(context.settings));
+  const { version: localVersion } = shared.getSettingsFromContext(context);
   return compareVersions.compare(localVersion, version2, comparator);
 }
 var RULE_NAME10 = "no-unsafe-iframe-sandbox";
@@ -1459,10 +1455,11 @@ var no_unsafe_iframe_sandbox_default = createRule({
         if (elementName !== "iframe") return;
         const { attributes } = node.openingElement;
         const initialScope = context.sourceCode.getScope(node);
-        const maybeSandboxAttribute = JSX8__namespace.findPropInAttributes(attributes, initialScope)("sandbox");
-        if (eff.O.isNone(maybeSandboxAttribute)) return;
+        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(maybeSandboxAttribute.value, context.sourceCode.getScope(maybeSandboxAttribute.value)),
+          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)
           ),
@@ -1475,7 +1472,7 @@ var no_unsafe_iframe_sandbox_default = createRule({
         if (isSafeSandboxValue) return;
         context.report({
           messageId: "noUnsafeIframeSandbox",
-          node: maybeSandboxAttribute.value
+          node: prop
         });
       }
     };
@@ -1506,7 +1503,7 @@ var no_unsafe_target_blank_default = createRule({
   },
   name: RULE_NAME11,
   create(context) {
-    const settings = shared.normalizeSettings(shared.decodeSettings(context.settings));
+    const settings = shared.getSettingsFromContext(context);
     const additionalComponents = settings.additionalComponents.filter((c) => c.as === "a");
     function getReportDescriptor(node) {
       const name2 = JSX8__namespace.getElementName(node.openingElement);

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { O, F, isString, isNullable } from '@eslint-react/eff';
+import { F, O, isString, isNullable } from '@eslint-react/eff';
 import * as JSX8 from '@eslint-react/jsx';
-import { createRuleForPlugin, RE_JAVASCRIPT_PROTOCOL, normalizeSettings, decodeSettings } from '@eslint-react/shared';
+import { createRuleForPlugin, RE_JAVASCRIPT_PROTOCOL, getSettingsFromContext } from '@eslint-react/shared';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import { getElementRepresentName } from '@eslint-react/core';
 import * as AST from '@eslint-react/ast';
@@ -9,7 +9,7 @@ import { match, P } from 'ts-pattern';
 
 // package.json
 var name = "eslint-plugin-react-dom";
-var version = "1.23.1";
+var version = "1.23.2-beta.6";
 var createRule = createRuleForPlugin("dom");
 function findAttrInCustomAttributes(name2, attributes) {
   return F.pipe(
@@ -40,16 +40,12 @@ var no_dangerously_set_innerhtml_default = createRule({
   create(context) {
     return {
       JSXElement(node) {
-        const initialScope = context.sourceCode.getScope(node);
-        const maybeDanger = JSX8.findPropInAttributes(node.openingElement.attributes, initialScope)(
-          "dangerouslySetInnerHTML"
+        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)
         );
-        if (O.isSome(maybeDanger)) {
-          context.report({
-            messageId: "noDangerouslySetInnerhtml",
-            node
-          });
-        }
       }
     };
   },
@@ -155,11 +151,11 @@ var no_missing_button_type_default = createRule({
         if (elementName !== "button") return;
         const { attributes } = node.openingElement;
         const initialScope = context.sourceCode.getScope(node);
-        const maybeTypeAttribute = JSX8.findPropInAttributes(attributes, initialScope)("type");
-        if (O.isSome(maybeTypeAttribute)) return;
+        const mbProp = JSX8.findPropInAttributes(attributes, initialScope)("type");
+        if (O.isSome(mbProp)) return;
         context.report({
           messageId: "noMissingButtonType",
-          node: node.openingElement
+          node
         });
       }
     };
@@ -208,17 +204,17 @@ var no_missing_iframe_sandbox_default = createRule({
         if (elementName !== "iframe") return;
         const { attributes } = node.openingElement;
         const initialScope = context.sourceCode.getScope(node);
-        const maybeSandboxAttribute = JSX8.findPropInAttributes(attributes, initialScope)("sandbox");
-        if (O.isNone(maybeSandboxAttribute)) {
+        const mbProp = JSX8.findPropInAttributes(attributes, initialScope)("sandbox");
+        if (O.isNone(mbProp)) {
           context.report({
             messageId: "noMissingIframeSandbox",
             node: node.openingElement
           });
           return;
         }
-        const sandboxAttribute = maybeSandboxAttribute.value;
+        const prop = mbProp.value;
         const hasValidSandbox = F.pipe(
-          JSX8.getPropValue(sandboxAttribute, context.sourceCode.getScope(sandboxAttribute)),
+          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)))
@@ -226,7 +222,7 @@ var no_missing_iframe_sandbox_default = createRule({
         if (hasValidSandbox) return;
         context.report({
           messageId: "noMissingIframeSandbox",
-          node: sandboxAttribute
+          node: prop
         });
       }
     };
@@ -1405,7 +1401,7 @@ function report(context, message, messageId, data) {
   });
 }
 function testReactVersion(context, comparator, version2) {
-  const { version: localVersion } = normalizeSettings(decodeSettings(context.settings));
+  const { version: localVersion } = getSettingsFromContext(context);
   return compare(localVersion, version2, comparator);
 }
 var RULE_NAME10 = "no-unsafe-iframe-sandbox";
@@ -1436,10 +1432,11 @@ var no_unsafe_iframe_sandbox_default = createRule({
         if (elementName !== "iframe") return;
         const { attributes } = node.openingElement;
         const initialScope = context.sourceCode.getScope(node);
-        const maybeSandboxAttribute = JSX8.findPropInAttributes(attributes, initialScope)("sandbox");
-        if (O.isNone(maybeSandboxAttribute)) return;
+        const mbProp = JSX8.findPropInAttributes(attributes, initialScope)("sandbox");
+        if (O.isNone(mbProp)) return;
+        const prop = mbProp.value;
         const isSafeSandboxValue = !F.pipe(
-          JSX8.getPropValue(maybeSandboxAttribute.value, context.sourceCode.getScope(maybeSandboxAttribute.value)),
+          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)
           ),
@@ -1452,7 +1449,7 @@ var no_unsafe_iframe_sandbox_default = createRule({
         if (isSafeSandboxValue) return;
         context.report({
           messageId: "noUnsafeIframeSandbox",
-          node: maybeSandboxAttribute.value
+          node: prop
         });
       }
     };
@@ -1483,7 +1480,7 @@ var no_unsafe_target_blank_default = createRule({
   },
   name: RULE_NAME11,
   create(context) {
-    const settings = normalizeSettings(decodeSettings(context.settings));
+    const settings = getSettingsFromContext(context);
     const additionalComponents = settings.additionalComponents.filter((c) => c.as === "a");
     function getReportDescriptor(node) {
       const name2 = JSX8.getElementName(node.openingElement);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-dom",
-  "version": "1.23.1",
+  "version": "1.23.2-beta.6",
   "description": "ESLint React's ESLint plugin for React DOM related rules.",
   "keywords": [
     "react",
@@ -41,22 +41,22 @@
     "./package.json"
   ],
   "dependencies": {
-    "@typescript-eslint/scope-manager": "^8.19.0",
-    "@typescript-eslint/types": "^8.19.0",
-    "@typescript-eslint/utils": "^8.19.0",
+    "@typescript-eslint/scope-manager": "^8.19.1",
+    "@typescript-eslint/types": "^8.19.1",
+    "@typescript-eslint/utils": "^8.19.1",
     "compare-versions": "^6.1.1",
     "string-ts": "^2.2.0",
     "ts-pattern": "^5.6.0",
-    "@eslint-react/core": "1.23.1",
-    "@eslint-react/ast": "1.23.1",
-    "@eslint-react/eff": "1.23.1",
-    "@eslint-react/shared": "1.23.1",
-    "@eslint-react/types": "1.23.1",
-    "@eslint-react/jsx": "1.23.1",
-    "@eslint-react/var": "1.23.1"
+    "@eslint-react/ast": "1.23.2-beta.6",
+    "@eslint-react/eff": "1.23.2-beta.6",
+    "@eslint-react/core": "1.23.2-beta.6",
+    "@eslint-react/jsx": "1.23.2-beta.6",
+    "@eslint-react/shared": "1.23.2-beta.6",
+    "@eslint-react/types": "1.23.2-beta.6",
+    "@eslint-react/var": "1.23.2-beta.6"
   },
   "devDependencies": {
-    "@types/react": "^19.0.2",
+    "@types/react": "^19.0.3",
     "@types/react-dom": "^19.0.2",
     "tsup": "^8.3.5",
     "@workspace/configs": "0.0.0"