eslint-plugin-react-x 1.24.0-next.8 → 1.24.0

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";
 var createRule = shared.createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -301,7 +301,7 @@ function isReactChildrenMethod(name2) {
   return reactChildrenMethod.some((method) => method === name2);
 }
 function isUsingReactChildren(node, context) {
-  const settings = shared.unsafeDecodeSettings(context.settings);
+  const { importSource = "react" } = shared.unsafeDecodeSettings(context.settings);
   const { callee } = node;
   if (!("property" in callee) || !("object" in callee) || !("name" in callee.property)) {
     return false;
@@ -314,7 +314,7 @@ function isUsingReactChildren(node, context) {
     return true;
   }
   if (callee.object.type === types.AST_NODE_TYPES.MemberExpression && "name" in callee.object.object) {
-    return core.isInitializedFromReact(callee.object.object.name, initialScope, settings.importSource);
+    return core.isInitializedFromReact(callee.object.object.name, importSource, initialScope);
   }
   return false;
 }
@@ -610,10 +610,10 @@ var no_children_prop_default = createRule({
   create(context) {
     return {
       JSXElement(node) {
-        const attribute = JSX7__namespace.getAttributeNode(
+        const attribute = JSX7__namespace.getAttribute(
           "children",
-          context.sourceCode.getScope(node),
-          node.openingElement.attributes
+          node.openingElement.attributes,
+          context.sourceCode.getScope(node)
         );
         if (attribute != null) {
           context.report({
@@ -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,14 +684,13 @@ 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({
             messageId: "noClassComponent",
             node: component,
             data: {
-              // eslint-disable-next-line eslint-plugin/no-unused-placeholders
               name: name2
             }
           });
@@ -1018,7 +1011,7 @@ var no_context_provider_default = createRule({
     }
     return {
       JSXElement(node) {
-        const elementName = JSX7__namespace.getElementName(node.openingElement);
+        const elementName = JSX7__namespace.getElementName(node);
         if (!elementName.endsWith(".Provider")) {
           return;
         }
@@ -1444,7 +1437,7 @@ var no_implicit_key_default = createRule({
     return {
       JSXOpeningElement(node) {
         const initialScope = context.sourceCode.getScope(node);
-        const keyPropFound = JSX7__namespace.getAttributeNode("key", initialScope, node.attributes);
+        const keyPropFound = JSX7__namespace.getAttribute("key", node.attributes, initialScope);
         const keyPropOnElement = node.attributes.some(
           (n) => n.type === types.AST_NODE_TYPES.JSXAttribute && n.name.type === types.AST_NODE_TYPES.JSXIdentifier && n.name.name === "key"
         );
@@ -1589,7 +1582,7 @@ var no_leaked_conditional_rendering_default = createRule({
           return getReportDescriptor(right);
         }
         const initialScope = context.sourceCode.getScope(left);
-        const isLeftNan = left.type === types.AST_NODE_TYPES.Identifier && left.name === "NaN" || VAR__namespace.toResolved({ kind: "lazy", node: left, initialScope }).value === "NaN";
+        const isLeftNan = left.type === types.AST_NODE_TYPES.Identifier && left.name === "NaN" || VAR__namespace.toStaticValue({ kind: "lazy", node: left, initialScope }).value === "NaN";
         if (isLeftNan) {
           return {
             messageId: "noLeakedConditionalRendering",
@@ -1708,7 +1701,7 @@ var no_missing_key_default = createRule({
       switch (node.type) {
         case types.AST_NODE_TYPES.JSXElement: {
           const initialScope = context.sourceCode.getScope(node);
-          if (!JSX7__namespace.hasAttribute("key", initialScope, node.openingElement.attributes)) {
+          if (!JSX7__namespace.hasAttribute("key", node.openingElement.attributes, initialScope)) {
             return {
               messageId: "noMissingKey",
               node
@@ -1769,7 +1762,7 @@ var no_missing_key_default = createRule({
         }
         const initialScope = context.sourceCode.getScope(node);
         for (const element of elements) {
-          if (!JSX7__namespace.hasAttribute("key", initialScope, element.openingElement.attributes)) {
+          if (!JSX7__namespace.hasAttribute("key", element.openingElement.attributes, initialScope)) {
             context.report({
               messageId: "noMissingKey",
               node: element
@@ -1871,7 +1864,7 @@ var no_nested_components_default = createRule({
             continue;
           }
           const isInsideProperty = component.parent.type === types.AST_NODE_TYPES.Property;
-          const isInsideJSXPropValue = component.parent.type === types.AST_NODE_TYPES.JSXAttribute || JSX7__namespace.findParentAttributeNode(node, (n) => n.value?.type === types.AST_NODE_TYPES.JSXExpressionContainer) != null;
+          const isInsideJSXPropValue = component.parent.type === types.AST_NODE_TYPES.JSXAttribute || JSX7__namespace.findParentAttribute(node, (n) => n.value?.type === types.AST_NODE_TYPES.JSXExpressionContainer) != null;
           if (isInsideJSXPropValue) {
             if (!core.isDeclaredInRenderPropLoose(component)) {
               context.report({
@@ -2680,15 +2673,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 +2719,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 });
         }
@@ -2908,9 +2892,7 @@ var no_useless_fragment_default = createRule({
     const { allowExpressions = true } = option;
     return {
       JSXElement(node) {
-        if (JSX7__namespace.getElementName(node.openingElement).split(".").at(-1) !== "Fragment") {
-          return;
-        }
+        if (!JSX7__namespace.isFragmentElement(node)) return;
         checkAndReport(node, context, allowExpressions);
       },
       JSXFragment(node) {
@@ -3022,7 +3004,7 @@ var prefer_react_namespace_import_default = createRule({
   },
   name: RULE_NAME46,
   create(context) {
-    const importSource = shared.getSettingsFromContext(context).importSource ?? "react";
+    const { importSource } = shared.getSettingsFromContext(context);
     return {
       [`ImportDeclaration[source.value="${importSource}"] ImportDefaultSpecifier`](node) {
         const hasOtherSpecifiers = node.parent.specifiers.length > 1;
@@ -3168,9 +3150,7 @@ var prefer_shorthand_fragment_default = createRule({
   create(context) {
     return {
       JSXElement(node) {
-        if (JSX7__namespace.getElementName(node.openingElement).split(".").at(-1) !== "Fragment") {
-          return;
-        }
+        if (!JSX7__namespace.isFragmentElement(node)) return;
         const hasAttributes = node.openingElement.attributes.length > 0;
         if (hasAttributes) {
           return;
@@ -3184,9 +3164,7 @@ var prefer_shorthand_fragment_default = createRule({
               return [];
             }
             return [
-              // eslint-disable-next-line eslint-plugin/prefer-replace-text
               fixer.replaceTextRange([openingElement.range[0], openingElement.range[1]], "<>"),
-              // eslint-disable-next-line eslint-plugin/prefer-replace-text
               fixer.replaceTextRange([closingElement.range[0], closingElement.range[1]], "</>")
             ];
           }
@@ -3202,7 +3180,6 @@ var use_jsx_vars_default = createRule({
   meta: {
     type: "problem",
     docs: {
-      // eslint-disable-next-line eslint-plugin/require-meta-docs-description
       description: "helpes `eslint/no-unused-vars` to correctly mark JSX variables as used.",
       [Symbol.for("rule_features")]: RULE_FEATURES49
     },

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";
 var createRule = createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -274,7 +274,7 @@ function isReactChildrenMethod(name2) {
   return reactChildrenMethod.some((method) => method === name2);
 }
 function isUsingReactChildren(node, context) {
-  const settings = unsafeDecodeSettings(context.settings);
+  const { importSource = "react" } = unsafeDecodeSettings(context.settings);
   const { callee } = node;
   if (!("property" in callee) || !("object" in callee) || !("name" in callee.property)) {
     return false;
@@ -287,7 +287,7 @@ function isUsingReactChildren(node, context) {
     return true;
   }
   if (callee.object.type === AST_NODE_TYPES.MemberExpression && "name" in callee.object.object) {
-    return isInitializedFromReact(callee.object.object.name, initialScope, settings.importSource);
+    return isInitializedFromReact(callee.object.object.name, importSource, initialScope);
   }
   return false;
 }
@@ -583,10 +583,10 @@ var no_children_prop_default = createRule({
   create(context) {
     return {
       JSXElement(node) {
-        const attribute = JSX7.getAttributeNode(
+        const attribute = JSX7.getAttribute(
           "children",
-          context.sourceCode.getScope(node),
-          node.openingElement.attributes
+          node.openingElement.attributes,
+          context.sourceCode.getScope(node)
         );
         if (attribute != null) {
           context.report({
@@ -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",
@@ -670,7 +664,6 @@ var no_class_component_default = createRule({
             messageId: "noClassComponent",
             node: component,
             data: {
-              // eslint-disable-next-line eslint-plugin/no-unused-placeholders
               name: name2
             }
           });
@@ -991,7 +984,7 @@ var no_context_provider_default = createRule({
     }
     return {
       JSXElement(node) {
-        const elementName = JSX7.getElementName(node.openingElement);
+        const elementName = JSX7.getElementName(node);
         if (!elementName.endsWith(".Provider")) {
           return;
         }
@@ -1417,7 +1410,7 @@ var no_implicit_key_default = createRule({
     return {
       JSXOpeningElement(node) {
         const initialScope = context.sourceCode.getScope(node);
-        const keyPropFound = JSX7.getAttributeNode("key", initialScope, node.attributes);
+        const keyPropFound = JSX7.getAttribute("key", node.attributes, initialScope);
         const keyPropOnElement = node.attributes.some(
           (n) => n.type === AST_NODE_TYPES.JSXAttribute && n.name.type === AST_NODE_TYPES.JSXIdentifier && n.name.name === "key"
         );
@@ -1562,7 +1555,7 @@ var no_leaked_conditional_rendering_default = createRule({
           return getReportDescriptor(right);
         }
         const initialScope = context.sourceCode.getScope(left);
-        const isLeftNan = left.type === AST_NODE_TYPES.Identifier && left.name === "NaN" || VAR.toResolved({ kind: "lazy", node: left, initialScope }).value === "NaN";
+        const isLeftNan = left.type === AST_NODE_TYPES.Identifier && left.name === "NaN" || VAR.toStaticValue({ kind: "lazy", node: left, initialScope }).value === "NaN";
         if (isLeftNan) {
           return {
             messageId: "noLeakedConditionalRendering",
@@ -1681,7 +1674,7 @@ var no_missing_key_default = createRule({
       switch (node.type) {
         case AST_NODE_TYPES.JSXElement: {
           const initialScope = context.sourceCode.getScope(node);
-          if (!JSX7.hasAttribute("key", initialScope, node.openingElement.attributes)) {
+          if (!JSX7.hasAttribute("key", node.openingElement.attributes, initialScope)) {
             return {
               messageId: "noMissingKey",
               node
@@ -1742,7 +1735,7 @@ var no_missing_key_default = createRule({
         }
         const initialScope = context.sourceCode.getScope(node);
         for (const element of elements) {
-          if (!JSX7.hasAttribute("key", initialScope, element.openingElement.attributes)) {
+          if (!JSX7.hasAttribute("key", element.openingElement.attributes, initialScope)) {
             context.report({
               messageId: "noMissingKey",
               node: element
@@ -1844,7 +1837,7 @@ var no_nested_components_default = createRule({
             continue;
           }
           const isInsideProperty = component.parent.type === AST_NODE_TYPES.Property;
-          const isInsideJSXPropValue = component.parent.type === AST_NODE_TYPES.JSXAttribute || JSX7.findParentAttributeNode(node, (n) => n.value?.type === AST_NODE_TYPES.JSXExpressionContainer) != null;
+          const isInsideJSXPropValue = component.parent.type === AST_NODE_TYPES.JSXAttribute || JSX7.findParentAttribute(node, (n) => n.value?.type === AST_NODE_TYPES.JSXExpressionContainer) != null;
           if (isInsideJSXPropValue) {
             if (!isDeclaredInRenderPropLoose(component)) {
               context.report({
@@ -2653,15 +2646,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 +2692,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 });
         }
@@ -2881,9 +2865,7 @@ var no_useless_fragment_default = createRule({
     const { allowExpressions = true } = option;
     return {
       JSXElement(node) {
-        if (JSX7.getElementName(node.openingElement).split(".").at(-1) !== "Fragment") {
-          return;
-        }
+        if (!JSX7.isFragmentElement(node)) return;
         checkAndReport(node, context, allowExpressions);
       },
       JSXFragment(node) {
@@ -2995,7 +2977,7 @@ var prefer_react_namespace_import_default = createRule({
   },
   name: RULE_NAME46,
   create(context) {
-    const importSource = getSettingsFromContext(context).importSource ?? "react";
+    const { importSource } = getSettingsFromContext(context);
     return {
       [`ImportDeclaration[source.value="${importSource}"] ImportDefaultSpecifier`](node) {
         const hasOtherSpecifiers = node.parent.specifiers.length > 1;
@@ -3141,9 +3123,7 @@ var prefer_shorthand_fragment_default = createRule({
   create(context) {
     return {
       JSXElement(node) {
-        if (JSX7.getElementName(node.openingElement).split(".").at(-1) !== "Fragment") {
-          return;
-        }
+        if (!JSX7.isFragmentElement(node)) return;
         const hasAttributes = node.openingElement.attributes.length > 0;
         if (hasAttributes) {
           return;
@@ -3157,9 +3137,7 @@ var prefer_shorthand_fragment_default = createRule({
               return [];
             }
             return [
-              // eslint-disable-next-line eslint-plugin/prefer-replace-text
               fixer.replaceTextRange([openingElement.range[0], openingElement.range[1]], "<>"),
-              // eslint-disable-next-line eslint-plugin/prefer-replace-text
               fixer.replaceTextRange([closingElement.range[0], closingElement.range[1]], "</>")
             ];
           }
@@ -3175,7 +3153,6 @@ var use_jsx_vars_default = createRule({
   meta: {
     type: "problem",
     docs: {
-      // eslint-disable-next-line eslint-plugin/require-meta-docs-description
       description: "helpes `eslint/no-unused-vars` to correctly mark JSX variables as used.",
       [Symbol.for("rule_features")]: RULE_FEATURES49
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "1.24.0-next.8",
+  "version": "1.24.0",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -47,13 +47,13 @@
     "compare-versions": "^6.1.1",
     "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"
+    "ts-pattern": "^5.6.1",
+    "@eslint-react/core": "1.24.0",
+    "@eslint-react/eff": "1.24.0",
+    "@eslint-react/jsx": "1.24.0",
+    "@eslint-react/var": "1.24.0",
+    "@eslint-react/ast": "1.24.0",
+    "@eslint-react/shared": "1.24.0"
   },
   "devDependencies": {
     "@types/react": "^19.0.7",