eslint-plugin-react-x 1.40.4-beta.5 → 1.40.4-beta.7

package/dist/index.js

@@ -141,7 +141,7 @@ var settings3 = {
 
 // package.json
 var name4 = "eslint-plugin-react-x";
-var version = "1.40.4-beta.5";
+var version = "1.40.4-beta.7";
 var createRule = utils.ESLintUtils.RuleCreator(shared.getDocsUrl("x"));
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -295,7 +295,7 @@ var jsx_uses_react_default = createRule({
   meta: {
     type: "problem",
     docs: {
-      description: "Marks React variables as used when JSX is used in the file.",
+      description: "Marks React variables as used when JSX is used.",
       [Symbol.for("rule_features")]: RULE_FEATURES5
     },
     messages: {
@@ -308,30 +308,17 @@ var jsx_uses_react_default = createRule({
   defaultOptions: []
 });
 function create5(context) {
-  const { jsx, jsxFactory, jsxFragmentFactory, reactNamespace } = kit.JsxRuntime.getJsxRuntimeOptionsFromContext(context);
-  const jsxAnnotation = getJsxAnnotation(context);
+  const jsxOptions = kit.JsxRuntime.getJsxRuntimeOptions(context);
+  const jsxAnnotation = kit.JsxRuntime.getJsxRuntimeAnnotation(context);
+  const jsx = jsxAnnotation.jsxRuntime === "classic" ? ts.JsxEmit.React : jsxOptions.jsx;
   if (jsx === ts.JsxEmit.ReactJSX || jsx === ts.JsxEmit.ReactJSXDev) return {};
+  const jsxFactory = jsxAnnotation.jsx ?? jsxOptions.jsxFactory;
+  const jsxFragmentFactory = jsxAnnotation.jsxFrag ?? jsxOptions.jsxFragmentFactory;
   function handleJsxElement(node) {
-    if (jsxAnnotation == null) {
-      context.sourceCode.markVariableAsUsed(reactNamespace, node);
-      context.sourceCode.markVariableAsUsed(jsxFactory, node);
-      debugReport(context, node, reactNamespace);
-      debugReport(context, node, jsxFactory);
-    }
-    if (jsxAnnotation?.jsx != null) {
-      context.sourceCode.markVariableAsUsed(jsxAnnotation.jsx, node);
-      debugReport(context, node, jsxAnnotation.jsx);
-    }
+    context.sourceCode.markVariableAsUsed(jsxFactory, node);
   }
   function handleJsxFragment(node) {
-    if (jsxAnnotation == null) {
-      context.sourceCode.markVariableAsUsed(jsxFragmentFactory, node);
-      debugReport(context, node, jsxFragmentFactory);
-    }
-    if (jsxAnnotation?.jsxFrag != null) {
-      context.sourceCode.markVariableAsUsed(jsxAnnotation.jsxFrag, node);
-      debugReport(context, node, jsxAnnotation.jsxFrag);
-    }
+    context.sourceCode.markVariableAsUsed(jsxFragmentFactory, node);
   }
   return {
     JSXFragment: handleJsxFragment,
@@ -339,25 +326,6 @@ function create5(context) {
     JSXOpeningFragment: handleJsxElement
   };
 }
-function getJsxAnnotation(context) {
-  if (!context.sourceCode.text.includes("@jsx")) return;
-  const allComments = context.sourceCode.getAllComments();
-  const jsxComment = allComments.find((n) => kit.RE_JSX_ANNOTATION.test(n.value));
-  const jsxFragComment = allComments.find((n) => kit.RE_JSX_FRAG_ANNOTATION.test(n.value));
-  const jsx = jsxComment?.value.match(kit.RE_JSX_ANNOTATION)?.[1];
-  const jsxFrag = jsxFragComment?.value.match(kit.RE_JSX_FRAG_ANNOTATION)?.[1];
-  return {
-    jsx,
-    jsxFrag
-  };
-}
-function debugReport(context, node, name5) {
-  context.report({
-    messageId: "jsxUsesReact",
-    node,
-    data: { name: name5 }
-  });
-}
 var RULE_NAME6 = "jsx-uses-vars";
 var RULE_FEATURES6 = [];
 var jsx_uses_vars_default = createRule({
@@ -543,7 +511,8 @@ function getMapIndexParamName(context, node) {
     return eff._;
   }
   const { name: name5 } = callee.property;
-  if (!AST8__namespace.ITERATOR_FUNCTION_INDEX_PARAM_POSITION.has(name5)) {
+  const indexPosition = AST8__namespace.getArrayMethodIndexParamPosition(name5);
+  if (indexPosition === -1) {
     return eff._;
   }
   const callbackArg = node.arguments[isUsingReactChildren(context, node) ? 1 : 0];
@@ -554,14 +523,10 @@ function getMapIndexParamName(context, node) {
     return eff._;
   }
   const { params } = callbackArg;
-  const indexParamPosition = AST8__namespace.ITERATOR_FUNCTION_INDEX_PARAM_POSITION.get(name5);
-  if (indexParamPosition == null) {
-    return eff._;
-  }
-  if (params.length < indexParamPosition + 1) {
+  if (params.length < indexPosition + 1) {
     return eff._;
   }
-  const param = params.at(indexParamPosition);
+  const param = params.at(indexPosition);
   return param != null && "name" in param ? param.name : eff._;
 }
 function getIdentifiersFromBinaryExpression(side) {
@@ -1403,7 +1368,7 @@ function create26(context) {
           break;
         }
         default: {
-          const call = AST8__namespace.findParentNode(jsxElement, AST8__namespace.isArrayMapCallLoose);
+          const call = AST8__namespace.findParentNode(jsxElement, AST8__namespace.isArrayMapCall);
           const iter = AST8__namespace.findParentNode(jsxElement, (n) => n === call || AST8__namespace.isFunction(n));
           if (!AST8__namespace.isFunction(iter)) return;
           const arg0 = call?.arguments[0];
@@ -1940,7 +1905,7 @@ function create32(context) {
       if (state.isWithinChildrenToArray) {
         return;
       }
-      const isMapCall = AST8__namespace.isArrayMapCallLoose(node);
+      const isMapCall = AST8__namespace.isArrayMapCall(node);
       if (!isMapCall && !isArrayFromCall(node)) {
         return;
       }
@@ -3104,7 +3069,7 @@ function create49(context, [option]) {
   const { allowExpressions = true } = option;
   return {
     JSXElement(node) {
-      if (!JSX8__namespace.isJsxFragmentElement(node)) return;
+      if (!JSX8__namespace.isFragmentElement(node)) return;
       checkNode(context, node, allowExpressions);
     },
     JSXFragment(node) {
@@ -3127,15 +3092,15 @@ function trimLikeReact(text) {
 }
 function checkNode(context, node, allowExpressions) {
   const initialScope = context.sourceCode.getScope(node);
-  if (JSX8__namespace.isJsxKeyedElement(node, initialScope)) {
+  if (JSX8__namespace.isKeyedElement(node, initialScope)) {
     return;
   }
-  if (JSX8__namespace.isJsxBuiltInElement(node.parent)) {
+  if (JSX8__namespace.isHostElement(node.parent)) {
     context.report({
       messageId: "uselessFragment",
       node,
       data: {
-        reason: "placed inside a built-in component"
+        reason: "placed inside a host component"
       },
       fix: getFix2(context, node)
     });
@@ -3210,7 +3175,7 @@ function getFix2(context, node) {
 }
 function canFix(node) {
   if (node.parent.type === types.AST_NODE_TYPES.JSXElement || node.parent.type === types.AST_NODE_TYPES.JSXFragment) {
-    return !JSX8__namespace.isJsxUserDefinedElement(node.parent);
+    return JSX8__namespace.isHostElement(node.parent);
   }
   if (node.children.length === 0) {
     return false;
@@ -3473,7 +3438,7 @@ var prefer_shorthand_fragment_default = createRule({
 function create54(context) {
   return {
     JSXElement(node) {
-      if (!JSX8__namespace.isJsxFragmentElement(node)) return;
+      if (!JSX8__namespace.isFragmentElement(node)) return;
       const hasAttributes = node.openingElement.attributes.length > 0;
       if (hasAttributes) {
         return;

package/dist/index.mjs

@@ -5,7 +5,7 @@ import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import { _, flow, getOrUpdate, constTrue, constFalse } from '@eslint-react/eff';
 import * as VAR2 from '@eslint-react/var';
 import { match, isMatching, P } from 'ts-pattern';
-import { JsxRuntime, RE_JSX_ANNOTATION, RE_JSX_FRAG_ANNOTATION, createReport } from '@eslint-react/kit';
+import { JsxRuntime, createReport } from '@eslint-react/kit';
 import ts, { JsxEmit } from 'typescript';
 import * as AST8 from '@eslint-react/ast';
 import * as ER21 from '@eslint-react/core';
@@ -113,7 +113,7 @@ var settings3 = {
 
 // package.json
 var name4 = "eslint-plugin-react-x";
-var version = "1.40.4-beta.5";
+var version = "1.40.4-beta.7";
 var createRule = ESLintUtils.RuleCreator(getDocsUrl("x"));
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -267,7 +267,7 @@ var jsx_uses_react_default = createRule({
   meta: {
     type: "problem",
     docs: {
-      description: "Marks React variables as used when JSX is used in the file.",
+      description: "Marks React variables as used when JSX is used.",
       [Symbol.for("rule_features")]: RULE_FEATURES5
     },
     messages: {
@@ -280,30 +280,17 @@ var jsx_uses_react_default = createRule({
   defaultOptions: []
 });
 function create5(context) {
-  const { jsx, jsxFactory, jsxFragmentFactory, reactNamespace } = JsxRuntime.getJsxRuntimeOptionsFromContext(context);
-  const jsxAnnotation = getJsxAnnotation(context);
+  const jsxOptions = JsxRuntime.getJsxRuntimeOptions(context);
+  const jsxAnnotation = JsxRuntime.getJsxRuntimeAnnotation(context);
+  const jsx = jsxAnnotation.jsxRuntime === "classic" ? JsxEmit.React : jsxOptions.jsx;
   if (jsx === JsxEmit.ReactJSX || jsx === JsxEmit.ReactJSXDev) return {};
+  const jsxFactory = jsxAnnotation.jsx ?? jsxOptions.jsxFactory;
+  const jsxFragmentFactory = jsxAnnotation.jsxFrag ?? jsxOptions.jsxFragmentFactory;
   function handleJsxElement(node) {
-    if (jsxAnnotation == null) {
-      context.sourceCode.markVariableAsUsed(reactNamespace, node);
-      context.sourceCode.markVariableAsUsed(jsxFactory, node);
-      debugReport(context, node, reactNamespace);
-      debugReport(context, node, jsxFactory);
-    }
-    if (jsxAnnotation?.jsx != null) {
-      context.sourceCode.markVariableAsUsed(jsxAnnotation.jsx, node);
-      debugReport(context, node, jsxAnnotation.jsx);
-    }
+    context.sourceCode.markVariableAsUsed(jsxFactory, node);
   }
   function handleJsxFragment(node) {
-    if (jsxAnnotation == null) {
-      context.sourceCode.markVariableAsUsed(jsxFragmentFactory, node);
-      debugReport(context, node, jsxFragmentFactory);
-    }
-    if (jsxAnnotation?.jsxFrag != null) {
-      context.sourceCode.markVariableAsUsed(jsxAnnotation.jsxFrag, node);
-      debugReport(context, node, jsxAnnotation.jsxFrag);
-    }
+    context.sourceCode.markVariableAsUsed(jsxFragmentFactory, node);
   }
   return {
     JSXFragment: handleJsxFragment,
@@ -311,25 +298,6 @@ function create5(context) {
     JSXOpeningFragment: handleJsxElement
   };
 }
-function getJsxAnnotation(context) {
-  if (!context.sourceCode.text.includes("@jsx")) return;
-  const allComments = context.sourceCode.getAllComments();
-  const jsxComment = allComments.find((n) => RE_JSX_ANNOTATION.test(n.value));
-  const jsxFragComment = allComments.find((n) => RE_JSX_FRAG_ANNOTATION.test(n.value));
-  const jsx = jsxComment?.value.match(RE_JSX_ANNOTATION)?.[1];
-  const jsxFrag = jsxFragComment?.value.match(RE_JSX_FRAG_ANNOTATION)?.[1];
-  return {
-    jsx,
-    jsxFrag
-  };
-}
-function debugReport(context, node, name5) {
-  context.report({
-    messageId: "jsxUsesReact",
-    node,
-    data: { name: name5 }
-  });
-}
 var RULE_NAME6 = "jsx-uses-vars";
 var RULE_FEATURES6 = [];
 var jsx_uses_vars_default = createRule({
@@ -515,7 +483,8 @@ function getMapIndexParamName(context, node) {
     return _;
   }
   const { name: name5 } = callee.property;
-  if (!AST8.ITERATOR_FUNCTION_INDEX_PARAM_POSITION.has(name5)) {
+  const indexPosition = AST8.getArrayMethodIndexParamPosition(name5);
+  if (indexPosition === -1) {
     return _;
   }
   const callbackArg = node.arguments[isUsingReactChildren(context, node) ? 1 : 0];
@@ -526,14 +495,10 @@ function getMapIndexParamName(context, node) {
     return _;
   }
   const { params } = callbackArg;
-  const indexParamPosition = AST8.ITERATOR_FUNCTION_INDEX_PARAM_POSITION.get(name5);
-  if (indexParamPosition == null) {
-    return _;
-  }
-  if (params.length < indexParamPosition + 1) {
+  if (params.length < indexPosition + 1) {
     return _;
   }
-  const param = params.at(indexParamPosition);
+  const param = params.at(indexPosition);
   return param != null && "name" in param ? param.name : _;
 }
 function getIdentifiersFromBinaryExpression(side) {
@@ -1375,7 +1340,7 @@ function create26(context) {
           break;
         }
         default: {
-          const call = AST8.findParentNode(jsxElement, AST8.isArrayMapCallLoose);
+          const call = AST8.findParentNode(jsxElement, AST8.isArrayMapCall);
           const iter = AST8.findParentNode(jsxElement, (n) => n === call || AST8.isFunction(n));
           if (!AST8.isFunction(iter)) return;
           const arg0 = call?.arguments[0];
@@ -1912,7 +1877,7 @@ function create32(context) {
       if (state.isWithinChildrenToArray) {
         return;
       }
-      const isMapCall = AST8.isArrayMapCallLoose(node);
+      const isMapCall = AST8.isArrayMapCall(node);
       if (!isMapCall && !isArrayFromCall(node)) {
         return;
       }
@@ -3076,7 +3041,7 @@ function create49(context, [option]) {
   const { allowExpressions = true } = option;
   return {
     JSXElement(node) {
-      if (!JSX8.isJsxFragmentElement(node)) return;
+      if (!JSX8.isFragmentElement(node)) return;
       checkNode(context, node, allowExpressions);
     },
     JSXFragment(node) {
@@ -3099,15 +3064,15 @@ function trimLikeReact(text) {
 }
 function checkNode(context, node, allowExpressions) {
   const initialScope = context.sourceCode.getScope(node);
-  if (JSX8.isJsxKeyedElement(node, initialScope)) {
+  if (JSX8.isKeyedElement(node, initialScope)) {
     return;
   }
-  if (JSX8.isJsxBuiltInElement(node.parent)) {
+  if (JSX8.isHostElement(node.parent)) {
     context.report({
       messageId: "uselessFragment",
       node,
       data: {
-        reason: "placed inside a built-in component"
+        reason: "placed inside a host component"
       },
       fix: getFix2(context, node)
     });
@@ -3182,7 +3147,7 @@ function getFix2(context, node) {
 }
 function canFix(node) {
   if (node.parent.type === AST_NODE_TYPES.JSXElement || node.parent.type === AST_NODE_TYPES.JSXFragment) {
-    return !JSX8.isJsxUserDefinedElement(node.parent);
+    return JSX8.isHostElement(node.parent);
   }
   if (node.children.length === 0) {
     return false;
@@ -3445,7 +3410,7 @@ var prefer_shorthand_fragment_default = createRule({
 function create54(context) {
   return {
     JSXElement(node) {
-      if (!JSX8.isJsxFragmentElement(node)) return;
+      if (!JSX8.isFragmentElement(node)) return;
       const hasAttributes = node.openingElement.attributes.length > 0;
       if (hasAttributes) {
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "1.40.4-beta.5",
+  "version": "1.40.4-beta.7",
   "description": "A set of composable linting rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -50,13 +50,13 @@
     "is-immutable-type": "^5.0.1",
     "string-ts": "^2.2.1",
     "ts-pattern": "^5.7.0",
-    "@eslint-react/ast": "1.40.4-beta.5",
-    "@eslint-react/eff": "1.40.4-beta.5",
-    "@eslint-react/core": "1.40.4-beta.5",
-    "@eslint-react/jsx": "1.40.4-beta.5",
-    "@eslint-react/shared": "1.40.4-beta.5",
-    "@eslint-react/kit": "1.40.4-beta.5",
-    "@eslint-react/var": "1.40.4-beta.5"
+    "@eslint-react/ast": "1.40.4-beta.7",
+    "@eslint-react/core": "1.40.4-beta.7",
+    "@eslint-react/eff": "1.40.4-beta.7",
+    "@eslint-react/kit": "1.40.4-beta.7",
+    "@eslint-react/jsx": "1.40.4-beta.7",
+    "@eslint-react/shared": "1.40.4-beta.7",
+    "@eslint-react/var": "1.40.4-beta.7"
   },
   "devDependencies": {
     "@types/react": "^19.1.0",