eslint-plugin-react-x 1.22.2-next.8 → 1.22.2-next.9

package/dist/index.js

@@ -42,7 +42,7 @@ var ts__default = /*#__PURE__*/_interopDefault(ts);
 
 // package.json
 var name = "eslint-plugin-react-x";
-var version = "1.22.2-next.8";
+var version = "1.22.2-next.9";
 var createRule = shared.createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -1728,7 +1728,7 @@ var no_nested_components_default = createRule({
           }
         }
         for (const { name: name2, node: component } of classComponents) {
-          if (eff.O.isNone(AST11__namespace.traverseUp(component, (node2) => isClassComponent11(node2) || isFunctionComponent(node2)))) {
+          if (eff.O.isNone(AST11__namespace.traverseUp(component, eff.or(isClassComponent11, isFunctionComponent)))) {
             continue;
           }
           context.report({
@@ -1858,22 +1858,19 @@ var no_set_state_in_component_did_mount_default = createRule({
     if (!context.sourceCode.text.includes("componentDidMount")) return {};
     function getReportDescriptor(node) {
       if (!core.isThisSetState(node)) return eff.O.none();
-      const maybeParentClass = AST11__namespace.traverseUp(
-        node,
-        AST11__namespace.isOneOf([types.AST_NODE_TYPES.ClassDeclaration, types.AST_NODE_TYPES.ClassExpression])
+      return eff.F.pipe(
+        eff.O.Do,
+        eff.O.bind("clazz", () => AST11__namespace.traverseUpGuard(node, core.isClassComponent)),
+        eff.O.bind("method", ({ clazz }) => AST11__namespace.traverseUpStop(node, clazz, isComponentDidMount)),
+        eff.O.bind("upperScope", () => eff.O.fromNullable(context.sourceCode.getScope(node).upper)),
+        eff.O.filter(
+          ({ clazz, method, upperScope }) => method.parent === clazz.body && upperScope === context.sourceCode.getScope(method)
+        ),
+        eff.O.map(() => ({
+          messageId: "noSetStateInComponentDidMount",
+          node
+        }))
       );
-      if (eff.O.isNone(maybeParentClass)) return eff.O.none();
-      const parentClass = maybeParentClass.value;
-      if (!core.isClassComponent(parentClass)) return eff.O.none();
-      const maybeParentMethod = AST11__namespace.traverseUp(node, isComponentDidMount);
-      if (eff.O.isNone(maybeParentMethod)) return eff.O.none();
-      const parentMethod = maybeParentMethod.value;
-      if (parentMethod.parent !== parentClass.body) return eff.O.none();
-      if (context.sourceCode.getScope(node).upper !== context.sourceCode.getScope(parentMethod)) return eff.O.none();
-      return eff.O.some({
-        messageId: "noSetStateInComponentDidMount",
-        node
-      });
     }
     return {
       CallExpression: eff.F.flow(getReportDescriptor, eff.O.map(context.report))
@@ -1905,22 +1902,19 @@ var no_set_state_in_component_did_update_default = createRule({
     if (!context.sourceCode.text.includes("componentDidUpdate")) return {};
     function getReportDescriptor(node) {
       if (!core.isThisSetState(node)) return eff.O.none();
-      const maybeParentClass = AST11__namespace.traverseUp(
-        node,
-        AST11__namespace.isOneOf([types.AST_NODE_TYPES.ClassDeclaration, types.AST_NODE_TYPES.ClassExpression])
+      return eff.F.pipe(
+        eff.O.Do,
+        eff.O.bind("clazz", () => AST11__namespace.traverseUpGuard(node, core.isClassComponent)),
+        eff.O.bind("method", ({ clazz }) => AST11__namespace.traverseUpStop(node, clazz, isComponentDidUpdate)),
+        eff.O.bind("upperScope", () => eff.O.fromNullable(context.sourceCode.getScope(node).upper)),
+        eff.O.filter(
+          ({ clazz, method, upperScope }) => method.parent === clazz.body && upperScope === context.sourceCode.getScope(method)
+        ),
+        eff.O.map(() => ({
+          messageId: "noSetStateInComponentDidUpdate",
+          node
+        }))
       );
-      if (eff.O.isNone(maybeParentClass)) return eff.O.none();
-      const parentClass = maybeParentClass.value;
-      if (!core.isClassComponent(parentClass)) return eff.O.none();
-      const maybeParentMethod = AST11__namespace.traverseUp(node, isComponentDidUpdate);
-      if (eff.O.isNone(maybeParentMethod)) return eff.O.none();
-      const parentMethod = maybeParentMethod.value;
-      if (parentMethod.parent !== parentClass.body) return eff.O.none();
-      if (context.sourceCode.getScope(node).upper !== context.sourceCode.getScope(parentMethod)) return eff.O.none();
-      return eff.O.some({
-        messageId: "noSetStateInComponentDidUpdate",
-        node
-      });
     }
     return {
       CallExpression: eff.F.flow(getReportDescriptor, eff.O.map(context.report))
@@ -1952,22 +1946,19 @@ var no_set_state_in_component_will_update_default = createRule({
     if (!context.sourceCode.text.includes("componentWillUpdate")) return {};
     function getReportDescriptor(node) {
       if (!core.isThisSetState(node)) return eff.O.none();
-      const maybeParentClass = AST11__namespace.traverseUp(
-        node,
-        AST11__namespace.isOneOf([types.AST_NODE_TYPES.ClassDeclaration, types.AST_NODE_TYPES.ClassExpression])
+      return eff.F.pipe(
+        eff.O.Do,
+        eff.O.bind("clazz", () => AST11__namespace.traverseUpGuard(node, core.isClassComponent)),
+        eff.O.bind("method", ({ clazz }) => AST11__namespace.traverseUpStop(node, clazz, isComponentWillUpdate3)),
+        eff.O.bind("upperScope", () => eff.O.fromNullable(context.sourceCode.getScope(node).upper)),
+        eff.O.filter(
+          ({ clazz, method, upperScope }) => method.parent === clazz.body && upperScope === context.sourceCode.getScope(method)
+        ),
+        eff.O.map(() => ({
+          messageId: "noSetStateInComponentWillUpdate",
+          node
+        }))
       );
-      if (eff.O.isNone(maybeParentClass)) return eff.O.none();
-      const parentClass = maybeParentClass.value;
-      if (!core.isClassComponent(parentClass)) return eff.O.none();
-      const maybeParentMethod = AST11__namespace.traverseUp(node, isComponentWillUpdate3);
-      if (eff.O.isNone(maybeParentMethod)) return eff.O.none();
-      const parentMethod = maybeParentMethod.value;
-      if (parentMethod.parent !== parentClass.body) return eff.O.none();
-      if (context.sourceCode.getScope(node).upper !== context.sourceCode.getScope(parentMethod)) return eff.O.none();
-      return eff.O.some({
-        messageId: "noSetStateInComponentWillUpdate",
-        node
-      });
     }
     return {
       CallExpression: eff.F.flow(getReportDescriptor, eff.O.map(context.report))

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { F, O, isString, isNullable } from '@eslint-react/eff';
+import { F, O, isString, or, isNullable } from '@eslint-react/eff';
 import * as JSX7 from '@eslint-react/jsx';
 import { createRuleForPlugin, normalizeSettings, decodeSettings, unsafeReadSettings } from '@eslint-react/shared';
 import * as AST11 from '@eslint-react/ast';
@@ -15,7 +15,7 @@ import { getTypeImmutability, isUnknown, isImmutable, isReadonlyShallow, isReado
 
 // package.json
 var name = "eslint-plugin-react-x";
-var version = "1.22.2-next.8";
+var version = "1.22.2-next.9";
 var createRule = createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -1701,7 +1701,7 @@ var no_nested_components_default = createRule({
           }
         }
         for (const { name: name2, node: component } of classComponents) {
-          if (O.isNone(AST11.traverseUp(component, (node2) => isClassComponent11(node2) || isFunctionComponent(node2)))) {
+          if (O.isNone(AST11.traverseUp(component, or(isClassComponent11, isFunctionComponent)))) {
             continue;
           }
           context.report({
@@ -1831,22 +1831,19 @@ var no_set_state_in_component_did_mount_default = createRule({
     if (!context.sourceCode.text.includes("componentDidMount")) return {};
     function getReportDescriptor(node) {
       if (!isThisSetState(node)) return O.none();
-      const maybeParentClass = AST11.traverseUp(
-        node,
-        AST11.isOneOf([AST_NODE_TYPES.ClassDeclaration, AST_NODE_TYPES.ClassExpression])
+      return F.pipe(
+        O.Do,
+        O.bind("clazz", () => AST11.traverseUpGuard(node, isClassComponent)),
+        O.bind("method", ({ clazz }) => AST11.traverseUpStop(node, clazz, isComponentDidMount)),
+        O.bind("upperScope", () => O.fromNullable(context.sourceCode.getScope(node).upper)),
+        O.filter(
+          ({ clazz, method, upperScope }) => method.parent === clazz.body && upperScope === context.sourceCode.getScope(method)
+        ),
+        O.map(() => ({
+          messageId: "noSetStateInComponentDidMount",
+          node
+        }))
       );
-      if (O.isNone(maybeParentClass)) return O.none();
-      const parentClass = maybeParentClass.value;
-      if (!isClassComponent(parentClass)) return O.none();
-      const maybeParentMethod = AST11.traverseUp(node, isComponentDidMount);
-      if (O.isNone(maybeParentMethod)) return O.none();
-      const parentMethod = maybeParentMethod.value;
-      if (parentMethod.parent !== parentClass.body) return O.none();
-      if (context.sourceCode.getScope(node).upper !== context.sourceCode.getScope(parentMethod)) return O.none();
-      return O.some({
-        messageId: "noSetStateInComponentDidMount",
-        node
-      });
     }
     return {
       CallExpression: F.flow(getReportDescriptor, O.map(context.report))
@@ -1878,22 +1875,19 @@ var no_set_state_in_component_did_update_default = createRule({
     if (!context.sourceCode.text.includes("componentDidUpdate")) return {};
     function getReportDescriptor(node) {
       if (!isThisSetState(node)) return O.none();
-      const maybeParentClass = AST11.traverseUp(
-        node,
-        AST11.isOneOf([AST_NODE_TYPES.ClassDeclaration, AST_NODE_TYPES.ClassExpression])
+      return F.pipe(
+        O.Do,
+        O.bind("clazz", () => AST11.traverseUpGuard(node, isClassComponent)),
+        O.bind("method", ({ clazz }) => AST11.traverseUpStop(node, clazz, isComponentDidUpdate)),
+        O.bind("upperScope", () => O.fromNullable(context.sourceCode.getScope(node).upper)),
+        O.filter(
+          ({ clazz, method, upperScope }) => method.parent === clazz.body && upperScope === context.sourceCode.getScope(method)
+        ),
+        O.map(() => ({
+          messageId: "noSetStateInComponentDidUpdate",
+          node
+        }))
       );
-      if (O.isNone(maybeParentClass)) return O.none();
-      const parentClass = maybeParentClass.value;
-      if (!isClassComponent(parentClass)) return O.none();
-      const maybeParentMethod = AST11.traverseUp(node, isComponentDidUpdate);
-      if (O.isNone(maybeParentMethod)) return O.none();
-      const parentMethod = maybeParentMethod.value;
-      if (parentMethod.parent !== parentClass.body) return O.none();
-      if (context.sourceCode.getScope(node).upper !== context.sourceCode.getScope(parentMethod)) return O.none();
-      return O.some({
-        messageId: "noSetStateInComponentDidUpdate",
-        node
-      });
     }
     return {
       CallExpression: F.flow(getReportDescriptor, O.map(context.report))
@@ -1925,22 +1919,19 @@ var no_set_state_in_component_will_update_default = createRule({
     if (!context.sourceCode.text.includes("componentWillUpdate")) return {};
     function getReportDescriptor(node) {
       if (!isThisSetState(node)) return O.none();
-      const maybeParentClass = AST11.traverseUp(
-        node,
-        AST11.isOneOf([AST_NODE_TYPES.ClassDeclaration, AST_NODE_TYPES.ClassExpression])
+      return F.pipe(
+        O.Do,
+        O.bind("clazz", () => AST11.traverseUpGuard(node, isClassComponent)),
+        O.bind("method", ({ clazz }) => AST11.traverseUpStop(node, clazz, isComponentWillUpdate3)),
+        O.bind("upperScope", () => O.fromNullable(context.sourceCode.getScope(node).upper)),
+        O.filter(
+          ({ clazz, method, upperScope }) => method.parent === clazz.body && upperScope === context.sourceCode.getScope(method)
+        ),
+        O.map(() => ({
+          messageId: "noSetStateInComponentWillUpdate",
+          node
+        }))
       );
-      if (O.isNone(maybeParentClass)) return O.none();
-      const parentClass = maybeParentClass.value;
-      if (!isClassComponent(parentClass)) return O.none();
-      const maybeParentMethod = AST11.traverseUp(node, isComponentWillUpdate3);
-      if (O.isNone(maybeParentMethod)) return O.none();
-      const parentMethod = maybeParentMethod.value;
-      if (parentMethod.parent !== parentClass.body) return O.none();
-      if (context.sourceCode.getScope(node).upper !== context.sourceCode.getScope(parentMethod)) return O.none();
-      return O.some({
-        messageId: "noSetStateInComponentWillUpdate",
-        node
-      });
     }
     return {
       CallExpression: F.flow(getReportDescriptor, O.map(context.report))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "1.22.2-next.8",
+  "version": "1.22.2-next.9",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -49,13 +49,13 @@
     "string-ts": "^2.2.0",
     "ts-api-utils": "^2.0.0",
     "ts-pattern": "^5.6.0",
-    "@eslint-react/ast": "1.22.2-next.8",
-    "@eslint-react/core": "1.22.2-next.8",
-    "@eslint-react/jsx": "1.22.2-next.8",
-    "@eslint-react/eff": "1.22.2-next.8",
-    "@eslint-react/shared": "1.22.2-next.8",
-    "@eslint-react/types": "1.22.2-next.8",
-    "@eslint-react/var": "1.22.2-next.8"
+    "@eslint-react/ast": "1.22.2-next.9",
+    "@eslint-react/core": "1.22.2-next.9",
+    "@eslint-react/jsx": "1.22.2-next.9",
+    "@eslint-react/eff": "1.22.2-next.9",
+    "@eslint-react/shared": "1.22.2-next.9",
+    "@eslint-react/types": "1.22.2-next.9",
+    "@eslint-react/var": "1.22.2-next.9"
   },
   "devDependencies": {
     "@types/react": "^19.0.2",