eslint-plugin-react-x 1.24.0-next.9 → 1.24.1-beta.1

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.9";
+var version = "1.24.1-beta.1";
 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({
@@ -691,7 +691,6 @@ var no_class_component_default = createRule({
             messageId: "noClassComponent",
             node: component,
             data: {
-              // eslint-disable-next-line eslint-plugin/no-unused-placeholders
               name: name2
             }
           });
@@ -1012,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;
         }
@@ -1438,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"
         );
@@ -1533,17 +1532,6 @@ function inspectVariantTypes(types) {
   }
   return variantTypes;
 }
-function isInitExpression(node) {
-  if (node == null) return false;
-  return node.type !== types.AST_NODE_TYPES.VariableDeclaration;
-}
-function getVariableInitExpression(variable, at) {
-  const def = variable?.defs[at];
-  if (def?.node == null || !("init" in def.node)) {
-    return eff._;
-  }
-  return isInitExpression(def.node.init) ? def.node.init : eff._;
-}
 var no_leaked_conditional_rendering_default = createRule({
   meta: {
     type: "problem",
@@ -1583,7 +1571,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",
@@ -1606,7 +1594,7 @@ var no_leaked_conditional_rendering_default = createRule({
         return getReportDescriptor(consequent) ?? getReportDescriptor(alternate);
       }).with({ type: types.AST_NODE_TYPES.Identifier }, (n) => {
         const variable = VAR__namespace.findVariable(n.name, context.sourceCode.getScope(n));
-        const initExpression = getVariableInitExpression(variable, 0);
+        const initExpression = tsPattern.match(variable?.defs.at(0)?.node).with({ init: tsPattern.P.select({ type: tsPattern.P.not(types.AST_NODE_TYPES.VariableDeclaration) }) }, eff.identity).otherwise(() => eff._);
         return getReportDescriptor(initExpression);
       }).otherwise(() => eff._);
     }
@@ -1659,7 +1647,7 @@ var no_missing_component_display_name_default = createRule({
       "Program:exit"(node) {
         const components = ctx.getAllComponents(node);
         for (const { node: node2, displayName, flag } of components.values()) {
-          const isMemoOrForwardRef = (flag & (core.ERFunctionComponentFlag.ForwardRef | core.ERFunctionComponentFlag.Memo)) > 0n;
+          const isMemoOrForwardRef = (flag & (core.ERComponentFlag.ForwardRef | core.ERComponentFlag.Memo)) > 0n;
           if (AST11__namespace.getFunctionIdentifier(node2) != null) {
             continue;
           }
@@ -1702,7 +1690,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
@@ -1763,7 +1751,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
@@ -1865,7 +1853,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({
@@ -2012,7 +2000,7 @@ var no_redundant_should_component_update_default = createRule({
       "Program:exit"(node) {
         const components = ctx.getAllComponents(node);
         for (const { name: name2 = "PureComponent", node: component, flag } of components.values()) {
-          if ((flag & core.ERClassComponentFlag.PureComponent) === 0n) {
+          if ((flag & core.ERComponentFlag.PureComponent) === 0n) {
             continue;
           }
           const { body } = component.body;
@@ -2893,9 +2881,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) {
@@ -3007,7 +2993,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;
@@ -3153,9 +3139,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;
@@ -3169,9 +3153,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]], "</>")
             ];
           }
@@ -3187,7 +3169,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,8 +1,8 @@
 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, 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 { isForwardRefCall, isThisSetState, isClassComponent, isChildrenCount, isChildrenForEach, isChildrenMap, isChildrenOnly, isChildrenToArray, useComponentCollectorLegacy, isComponentDidCatch, isGetDerivedStateFromError, isCloneElementCall, isCreateRefCall, isComponentName, useComponentCollector, DEFAULT_COMPONENT_HINT, ERComponentFlag, isChildrenToArrayCall, ERComponentHint, isDirectValueOfRenderPropertyLoose, isDeclaredInRenderPropLoose, isInsideCreateElementProps, isInsideRenderMethod, isReactHookCall, isCreateElementCall, isGetDerivedStateFromProps, isInitializedFromReact } from '@eslint-react/core';
+import { _, getOrUpdate, identity } from '@eslint-react/eff';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import { isMatching, match, P } from 'ts-pattern';
 import { compare } from 'compare-versions';
@@ -15,7 +15,7 @@ import { getTypeImmutability, isUnknown, isImmutable, isReadonlyShallow, isReado
 
 // package.json
 var name = "eslint-plugin-react-x";
-var version = "1.24.0-next.9";
+var version = "1.24.1-beta.1";
 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({
@@ -664,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
             }
           });
@@ -985,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;
         }
@@ -1411,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"
         );
@@ -1506,17 +1505,6 @@ function inspectVariantTypes(types) {
   }
   return variantTypes;
 }
-function isInitExpression(node) {
-  if (node == null) return false;
-  return node.type !== AST_NODE_TYPES.VariableDeclaration;
-}
-function getVariableInitExpression(variable, at) {
-  const def = variable?.defs[at];
-  if (def?.node == null || !("init" in def.node)) {
-    return _;
-  }
-  return isInitExpression(def.node.init) ? def.node.init : _;
-}
 var no_leaked_conditional_rendering_default = createRule({
   meta: {
     type: "problem",
@@ -1556,7 +1544,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",
@@ -1579,7 +1567,7 @@ var no_leaked_conditional_rendering_default = createRule({
         return getReportDescriptor(consequent) ?? getReportDescriptor(alternate);
       }).with({ type: AST_NODE_TYPES.Identifier }, (n) => {
         const variable = VAR.findVariable(n.name, context.sourceCode.getScope(n));
-        const initExpression = getVariableInitExpression(variable, 0);
+        const initExpression = match(variable?.defs.at(0)?.node).with({ init: P.select({ type: P.not(AST_NODE_TYPES.VariableDeclaration) }) }, identity).otherwise(() => _);
         return getReportDescriptor(initExpression);
       }).otherwise(() => _);
     }
@@ -1632,7 +1620,7 @@ var no_missing_component_display_name_default = createRule({
       "Program:exit"(node) {
         const components = ctx.getAllComponents(node);
         for (const { node: node2, displayName, flag } of components.values()) {
-          const isMemoOrForwardRef = (flag & (ERFunctionComponentFlag.ForwardRef | ERFunctionComponentFlag.Memo)) > 0n;
+          const isMemoOrForwardRef = (flag & (ERComponentFlag.ForwardRef | ERComponentFlag.Memo)) > 0n;
           if (AST11.getFunctionIdentifier(node2) != null) {
             continue;
           }
@@ -1675,7 +1663,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
@@ -1736,7 +1724,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
@@ -1838,7 +1826,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({
@@ -1985,7 +1973,7 @@ var no_redundant_should_component_update_default = createRule({
       "Program:exit"(node) {
         const components = ctx.getAllComponents(node);
         for (const { name: name2 = "PureComponent", node: component, flag } of components.values()) {
-          if ((flag & ERClassComponentFlag.PureComponent) === 0n) {
+          if ((flag & ERComponentFlag.PureComponent) === 0n) {
             continue;
           }
           const { body } = component.body;
@@ -2866,9 +2854,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) {
@@ -2980,7 +2966,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;
@@ -3126,9 +3112,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;
@@ -3142,9 +3126,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]], "</>")
             ];
           }
@@ -3160,7 +3142,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.9",
+  "version": "1.24.1-beta.1",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -40,20 +40,20 @@
     "./package.json"
   ],
   "dependencies": {
-    "@typescript-eslint/scope-manager": "^8.20.0",
-    "@typescript-eslint/type-utils": "^8.20.0",
-    "@typescript-eslint/types": "^8.20.0",
-    "@typescript-eslint/utils": "^8.20.0",
+    "@typescript-eslint/scope-manager": "^8.21.0",
+    "@typescript-eslint/type-utils": "^8.21.0",
+    "@typescript-eslint/types": "^8.21.0",
+    "@typescript-eslint/utils": "^8.21.0",
     "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.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"
+    "ts-pattern": "^5.6.2",
+    "@eslint-react/ast": "1.24.1-beta.1",
+    "@eslint-react/core": "1.24.1-beta.1",
+    "@eslint-react/eff": "1.24.1-beta.1",
+    "@eslint-react/jsx": "1.24.1-beta.1",
+    "@eslint-react/shared": "1.24.1-beta.1",
+    "@eslint-react/var": "1.24.1-beta.1"
   },
   "devDependencies": {
     "@types/react": "^19.0.7",