eslint-plugin-react-x 1.22.2 → 1.23.0-beta.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.22.2";
+var version = "1.23.0-beta.0";
 var createRule = shared.createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -2553,29 +2553,38 @@ var no_unused_state_default = createRule({
   defaultOptions: []
 });
 var RULE_NAME44 = "no-useless-fragment";
-function check(node, context, allowExpressions) {
+var defaultOptions = [{
+  allowExpressions: true
+}];
+function checkAndReport(node, context, allowExpressions) {
   const initialScope = context.sourceCode.getScope(node);
   if (JSX7__namespace.isKeyedElement(node, initialScope)) return;
   if (JSX7__namespace.isBuiltInElement(node.parent)) context.report({ messageId: "noUselessFragmentInBuiltIn", node });
   if (node.children.length === 0) return context.report({ messageId: "noUselessFragment", node });
-  const isChildren = AST11__namespace.isOneOf([types.AST_NODE_TYPES.JSXElement, types.AST_NODE_TYPES.JSXFragment])(node.parent);
-  const [firstChildren] = node.children;
-  if (allowExpressions && node.children.length === 1 && JSX7__namespace.isLiteral(firstChildren) && !isChildren) return;
-  if (!allowExpressions && isChildren) {
-    return context.report({ messageId: "noUselessFragment", node });
-  } else if (!allowExpressions && !isChildren && node.children.length === 1) {
-    return context.report({ messageId: "noUselessFragment", node });
+  const isChildElement = AST11__namespace.isOneOf([types.AST_NODE_TYPES.JSXElement, types.AST_NODE_TYPES.JSXFragment])(node.parent);
+  switch (true) {
+    // <Foo content={<>ee eeee eeee ...</>} />
+    case (allowExpressions && !isChildElement && node.children.length === 1 && JSX7__namespace.isLiteral(node.children.at(0))): {
+      return;
+    }
+    // <Foo><>hello, world</></Foo>
+    case (!allowExpressions && isChildElement): {
+      return context.report({ messageId: "noUselessFragment", node });
+    }
+    case (!allowExpressions && !isChildElement && node.children.length === 1): {
+      return context.report({ messageId: "noUselessFragment", node });
+    }
   }
   const nonPaddingChildren = node.children.filter((child) => !JSX7__namespace.isPaddingSpaces(child));
-  if (nonPaddingChildren.length > 1) return;
-  if (nonPaddingChildren.length === 0) return context.report({ messageId: "noUselessFragment", node });
-  const [first] = nonPaddingChildren;
-  if (tsPattern.isMatching({ type: types.AST_NODE_TYPES.JSXExpressionContainer, expression: tsPattern.P.not(types.AST_NODE_TYPES.CallExpression) }, first)) return;
-  context.report({ messageId: "noUselessFragment", node });
+  const firstNonPaddingChild = nonPaddingChildren.at(0);
+  switch (true) {
+    case nonPaddingChildren.length === 0:
+    case (nonPaddingChildren.length === 1 && firstNonPaddingChild?.type !== types.AST_NODE_TYPES.JSXExpressionContainer): {
+      return context.report({ messageId: "noUselessFragment", node });
+    }
+  }
+  return;
 }
-var defaultOptions = [{
-  allowExpressions: true
-}];
 var no_useless_fragment_default = createRule({
   meta: {
     type: "problem",
@@ -2603,11 +2612,11 @@ var no_useless_fragment_default = createRule({
     const { allowExpressions = true } = option;
     return {
       JSXElement(node) {
-        if (!core.isFragmentElement(node, context)) return;
-        check(node, context, allowExpressions);
+        if (JSX7__namespace.getElementName(node.openingElement).split(".").at(-1) !== "Fragment") return;
+        checkAndReport(node, context, allowExpressions);
       },
       JSXFragment(node) {
-        check(node, context, allowExpressions);
+        checkAndReport(node, context, allowExpressions);
       }
     };
   },
@@ -2845,7 +2854,7 @@ var prefer_shorthand_fragment_default = createRule({
   name: RULE_NAME49,
   create(context) {
     function getReportDescriptor(node) {
-      if (!core.isFragmentElement(node, context)) return eff.O.none();
+      if (JSX7__namespace.getElementName(node.openingElement).split(".").at(-1) !== "Fragment") return eff.O.none();
       const hasAttributes = node.openingElement.attributes.length > 0;
       if (hasAttributes) return eff.O.none();
       return eff.O.some({

package/dist/index.mjs

@@ -2,7 +2,7 @@ import { F, O, or, isString, 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';
-import { isForwardRefCall, isThisSetState, isClassComponent, isCreateElementCall, isCloneElementCall, isChildrenCount, isChildrenForEach, isChildrenMap, isChildrenOnly, isChildrenToArray, useComponentCollectorLegacy, isCreateRefCall, isComponentName, useComponentCollector, ERFunctionComponentFlag, isChildrenToArrayCall, ERComponentHint, isDirectValueOfRenderPropertyLoose, isDeclaredInRenderPropLoose, isInsideCreateElementProps, isInsideRenderMethod, ERClassComponentFlag, isFragmentElement, isInitializedFromReact } from '@eslint-react/core';
+import { isForwardRefCall, isThisSetState, isClassComponent, isCreateElementCall, isCloneElementCall, isChildrenCount, isChildrenForEach, isChildrenMap, isChildrenOnly, isChildrenToArray, useComponentCollectorLegacy, isCreateRefCall, isComponentName, useComponentCollector, ERFunctionComponentFlag, isChildrenToArrayCall, ERComponentHint, isDirectValueOfRenderPropertyLoose, isDeclaredInRenderPropLoose, isInsideCreateElementProps, isInsideRenderMethod, ERClassComponentFlag, isInitializedFromReact } from '@eslint-react/core';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import { isMatching, P, match } 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.22.2";
+var version = "1.23.0-beta.0";
 var createRule = createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -2526,29 +2526,38 @@ var no_unused_state_default = createRule({
   defaultOptions: []
 });
 var RULE_NAME44 = "no-useless-fragment";
-function check(node, context, allowExpressions) {
+var defaultOptions = [{
+  allowExpressions: true
+}];
+function checkAndReport(node, context, allowExpressions) {
   const initialScope = context.sourceCode.getScope(node);
   if (JSX7.isKeyedElement(node, initialScope)) return;
   if (JSX7.isBuiltInElement(node.parent)) context.report({ messageId: "noUselessFragmentInBuiltIn", node });
   if (node.children.length === 0) return context.report({ messageId: "noUselessFragment", node });
-  const isChildren = AST11.isOneOf([AST_NODE_TYPES.JSXElement, AST_NODE_TYPES.JSXFragment])(node.parent);
-  const [firstChildren] = node.children;
-  if (allowExpressions && node.children.length === 1 && JSX7.isLiteral(firstChildren) && !isChildren) return;
-  if (!allowExpressions && isChildren) {
-    return context.report({ messageId: "noUselessFragment", node });
-  } else if (!allowExpressions && !isChildren && node.children.length === 1) {
-    return context.report({ messageId: "noUselessFragment", node });
+  const isChildElement = AST11.isOneOf([AST_NODE_TYPES.JSXElement, AST_NODE_TYPES.JSXFragment])(node.parent);
+  switch (true) {
+    // <Foo content={<>ee eeee eeee ...</>} />
+    case (allowExpressions && !isChildElement && node.children.length === 1 && JSX7.isLiteral(node.children.at(0))): {
+      return;
+    }
+    // <Foo><>hello, world</></Foo>
+    case (!allowExpressions && isChildElement): {
+      return context.report({ messageId: "noUselessFragment", node });
+    }
+    case (!allowExpressions && !isChildElement && node.children.length === 1): {
+      return context.report({ messageId: "noUselessFragment", node });
+    }
   }
   const nonPaddingChildren = node.children.filter((child) => !JSX7.isPaddingSpaces(child));
-  if (nonPaddingChildren.length > 1) return;
-  if (nonPaddingChildren.length === 0) return context.report({ messageId: "noUselessFragment", node });
-  const [first] = nonPaddingChildren;
-  if (isMatching({ type: AST_NODE_TYPES.JSXExpressionContainer, expression: P.not(AST_NODE_TYPES.CallExpression) }, first)) return;
-  context.report({ messageId: "noUselessFragment", node });
+  const firstNonPaddingChild = nonPaddingChildren.at(0);
+  switch (true) {
+    case nonPaddingChildren.length === 0:
+    case (nonPaddingChildren.length === 1 && firstNonPaddingChild?.type !== AST_NODE_TYPES.JSXExpressionContainer): {
+      return context.report({ messageId: "noUselessFragment", node });
+    }
+  }
+  return;
 }
-var defaultOptions = [{
-  allowExpressions: true
-}];
 var no_useless_fragment_default = createRule({
   meta: {
     type: "problem",
@@ -2576,11 +2585,11 @@ var no_useless_fragment_default = createRule({
     const { allowExpressions = true } = option;
     return {
       JSXElement(node) {
-        if (!isFragmentElement(node, context)) return;
-        check(node, context, allowExpressions);
+        if (JSX7.getElementName(node.openingElement).split(".").at(-1) !== "Fragment") return;
+        checkAndReport(node, context, allowExpressions);
       },
       JSXFragment(node) {
-        check(node, context, allowExpressions);
+        checkAndReport(node, context, allowExpressions);
       }
     };
   },
@@ -2818,7 +2827,7 @@ var prefer_shorthand_fragment_default = createRule({
   name: RULE_NAME49,
   create(context) {
     function getReportDescriptor(node) {
-      if (!isFragmentElement(node, context)) return O.none();
+      if (JSX7.getElementName(node.openingElement).split(".").at(-1) !== "Fragment") return O.none();
       const hasAttributes = node.openingElement.attributes.length > 0;
       if (hasAttributes) return O.none();
       return O.some({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "1.22.2",
+  "version": "1.23.0-beta.0",
   "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",
-    "@eslint-react/core": "1.22.2",
-    "@eslint-react/eff": "1.22.2",
-    "@eslint-react/jsx": "1.22.2",
-    "@eslint-react/types": "1.22.2",
-    "@eslint-react/var": "1.22.2",
-    "@eslint-react/shared": "1.22.2"
+    "@eslint-react/core": "1.23.0-beta.0",
+    "@eslint-react/ast": "1.23.0-beta.0",
+    "@eslint-react/eff": "1.23.0-beta.0",
+    "@eslint-react/jsx": "1.23.0-beta.0",
+    "@eslint-react/shared": "1.23.0-beta.0",
+    "@eslint-react/types": "1.23.0-beta.0",
+    "@eslint-react/var": "1.23.0-beta.0"
   },
   "devDependencies": {
     "@types/react": "^19.0.2",