eslint-plugin-react-x 1.24.0-next.8 → 1.24.0-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.24.0-next.8";
+var version = "1.24.0-next.9";
 var createRule = shared.createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -661,12 +661,6 @@ var RULE_NAME12 = "no-class-component";
 var RULE_FEATURES12 = [
   "CHK"
 ];
-function isComponentDidCatch(node) {
-  return (node.type === types.AST_NODE_TYPES.MethodDefinition || node.type === types.AST_NODE_TYPES.PropertyDefinition) && !node.static && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "componentDidCatch";
-}
-function isGetDerivedStateFromError(node) {
-  return (node.type === types.AST_NODE_TYPES.MethodDefinition || node.type === types.AST_NODE_TYPES.PropertyDefinition) && node.static && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "getDerivedStateFromError";
-}
 var no_class_component_default = createRule({
   meta: {
     type: "problem",
@@ -690,7 +684,7 @@ var no_class_component_default = createRule({
       "Program:exit"(node) {
         const components = ctx.getAllComponents(node);
         for (const { name: name2 = "anonymous", node: component } of components.values()) {
-          if (component.body.body.some((m) => isComponentDidCatch(m) || isGetDerivedStateFromError(m))) {
+          if (component.body.body.some((m) => core.isComponentDidCatch(m) || core.isGetDerivedStateFromError(m))) {
             continue;
           }
           context.report({
@@ -2680,15 +2674,6 @@ function isAssignmentToThisState2(node) {
   const { left } = node;
   return left.type === types.AST_NODE_TYPES.MemberExpression && AST11__namespace.isThisExpression(left.object) && getName4(left.property) === "state";
 }
-var isGetDerivedStateFromProps = tsPattern.isMatching({
-  key: {
-    name: "getDerivedStateFromProps"
-  },
-  static: true,
-  value: {
-    params: tsPattern.P.array()
-  }
-});
 var no_unused_state_default = createRule({
   meta: {
     type: "problem",
@@ -2735,7 +2720,7 @@ var no_unused_state_default = createRule({
         return;
       }
       if (node.static) {
-        if (isGetDerivedStateFromProps(node) && node.value.params.length > 1) {
+        if (core.isGetDerivedStateFromProps(node) && tsPattern.isMatching({ params: [tsPattern.P.nonNullable, ...tsPattern.P.array()] })(node.value)) {
           const defNode = stateDefs.get(currentClass)?.node;
           stateDefs.set(currentClass, { node: defNode, isUsed: true });
         }

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import * as JSX7 from '@eslint-react/jsx';
 import { createRuleForPlugin, getSettingsFromContext, unsafeDecodeSettings } from '@eslint-react/shared';
 import * as AST11 from '@eslint-react/ast';
-import { isForwardRefCall, isThisSetState, isClassComponent, isChildrenCount, isChildrenForEach, isChildrenMap, isChildrenOnly, isChildrenToArray, useComponentCollectorLegacy, isCloneElementCall, isCreateRefCall, isComponentName, useComponentCollector, DEFAULT_COMPONENT_HINT, ERFunctionComponentFlag, isChildrenToArrayCall, ERComponentHint, isDirectValueOfRenderPropertyLoose, isDeclaredInRenderPropLoose, isInsideCreateElementProps, isInsideRenderMethod, ERClassComponentFlag, isReactHookCall, isCreateElementCall, isInitializedFromReact } from '@eslint-react/core';
+import { isForwardRefCall, isThisSetState, isClassComponent, isChildrenCount, isChildrenForEach, isChildrenMap, isChildrenOnly, isChildrenToArray, useComponentCollectorLegacy, isComponentDidCatch, isGetDerivedStateFromError, isCloneElementCall, isCreateRefCall, isComponentName, useComponentCollector, DEFAULT_COMPONENT_HINT, ERFunctionComponentFlag, isChildrenToArrayCall, ERComponentHint, isDirectValueOfRenderPropertyLoose, isDeclaredInRenderPropLoose, isInsideCreateElementProps, isInsideRenderMethod, ERClassComponentFlag, isReactHookCall, isCreateElementCall, isGetDerivedStateFromProps, isInitializedFromReact } from '@eslint-react/core';
 import { _, getOrUpdate } from '@eslint-react/eff';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import { isMatching, match, P } from 'ts-pattern';
@@ -15,7 +15,7 @@ import { getTypeImmutability, isUnknown, isImmutable, isReadonlyShallow, isReado
 
 // package.json
 var name = "eslint-plugin-react-x";
-var version = "1.24.0-next.8";
+var version = "1.24.0-next.9";
 var createRule = createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -634,12 +634,6 @@ var RULE_NAME12 = "no-class-component";
 var RULE_FEATURES12 = [
   "CHK"
 ];
-function isComponentDidCatch(node) {
-  return (node.type === AST_NODE_TYPES.MethodDefinition || node.type === AST_NODE_TYPES.PropertyDefinition) && !node.static && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "componentDidCatch";
-}
-function isGetDerivedStateFromError(node) {
-  return (node.type === AST_NODE_TYPES.MethodDefinition || node.type === AST_NODE_TYPES.PropertyDefinition) && node.static && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "getDerivedStateFromError";
-}
 var no_class_component_default = createRule({
   meta: {
     type: "problem",
@@ -2653,15 +2647,6 @@ function isAssignmentToThisState2(node) {
   const { left } = node;
   return left.type === AST_NODE_TYPES.MemberExpression && AST11.isThisExpression(left.object) && getName4(left.property) === "state";
 }
-var isGetDerivedStateFromProps = isMatching({
-  key: {
-    name: "getDerivedStateFromProps"
-  },
-  static: true,
-  value: {
-    params: P.array()
-  }
-});
 var no_unused_state_default = createRule({
   meta: {
     type: "problem",
@@ -2708,7 +2693,7 @@ var no_unused_state_default = createRule({
         return;
       }
       if (node.static) {
-        if (isGetDerivedStateFromProps(node) && node.value.params.length > 1) {
+        if (isGetDerivedStateFromProps(node) && isMatching({ params: [P.nonNullable, ...P.array()] })(node.value)) {
           const defNode = stateDefs.get(currentClass)?.node;
           stateDefs.set(currentClass, { node: defNode, isUsed: true });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "1.24.0-next.8",
+  "version": "1.24.0-next.9",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -48,12 +48,12 @@
     "is-immutable-type": "^5.0.1",
     "string-ts": "^2.2.0",
     "ts-pattern": "^5.6.0",
-    "@eslint-react/ast": "1.24.0-next.8",
-    "@eslint-react/eff": "1.24.0-next.8",
-    "@eslint-react/core": "1.24.0-next.8",
-    "@eslint-react/jsx": "1.24.0-next.8",
-    "@eslint-react/var": "1.24.0-next.8",
-    "@eslint-react/shared": "1.24.0-next.8"
+    "@eslint-react/ast": "1.24.0-next.9",
+    "@eslint-react/core": "1.24.0-next.9",
+    "@eslint-react/eff": "1.24.0-next.9",
+    "@eslint-react/shared": "1.24.0-next.9",
+    "@eslint-react/jsx": "1.24.0-next.9",
+    "@eslint-react/var": "1.24.0-next.9"
   },
   "devDependencies": {
     "@types/react": "^19.0.7",