@eslint-react/core 1.37.4-next.0 → 1.38.0-beta.11

package/dist/index.d.mts

@@ -1,8 +1,8 @@
-import * as AST from '@eslint-react/ast';
-import { _ } from '@eslint-react/eff';
-import { RuleContext } from '@eslint-react/shared';
+import { RuleContext } from '@eslint-react/kit';
 import { TSESTree } from '@typescript-eslint/types';
 import { ESLintUtils, TSESTree as TSESTree$1 } from '@typescript-eslint/utils';
+import * as AST from '@eslint-react/ast';
+import { _ } from '@eslint-react/eff';
 import * as birecord from 'birecord';
 import { Scope } from '@typescript-eslint/scope-manager';
 
@@ -20,9 +20,9 @@ declare const ERComponentHint: {
      */
     readonly SkipForwardRef: bigint;
     /**
-     * Skip function component defined in map function callback
+     * Skip function component defined as array map argument
      */
-    readonly SkipMapCallback: bigint;
+    readonly SkipArrayMapArgument: bigint;
     /**
      * Skip function component defined on object method
      */

package/dist/index.d.ts

@@ -1,8 +1,8 @@
-import * as AST from '@eslint-react/ast';
-import { _ } from '@eslint-react/eff';
-import { RuleContext } from '@eslint-react/shared';
+import { RuleContext } from '@eslint-react/kit';
 import { TSESTree } from '@typescript-eslint/types';
 import { ESLintUtils, TSESTree as TSESTree$1 } from '@typescript-eslint/utils';
+import * as AST from '@eslint-react/ast';
+import { _ } from '@eslint-react/eff';
 import * as birecord from 'birecord';
 import { Scope } from '@typescript-eslint/scope-manager';
 
@@ -20,9 +20,9 @@ declare const ERComponentHint: {
      */
     readonly SkipForwardRef: bigint;
     /**
-     * Skip function component defined in map function callback
+     * Skip function component defined as array map argument
      */
-    readonly SkipMapCallback: bigint;
+    readonly SkipArrayMapArgument: bigint;
     /**
      * Skip function component defined on object method
      */

package/dist/index.js

@@ -2,11 +2,12 @@
 
 var AST6 = require('@eslint-react/ast');
 var eff = require('@eslint-react/eff');
-var JSX3 = require('@eslint-react/jsx');
+var JSX4 = require('@eslint-react/jsx');
 var shared = require('@eslint-react/shared');
 var types = require('@typescript-eslint/types');
 var VAR = require('@eslint-react/var');
 var tsPattern = require('ts-pattern');
+require('@eslint-react/kit');
 var birecord = require('birecord');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -30,7 +31,7 @@ function _interopNamespace(e) {
 }
 
 var AST6__namespace = /*#__PURE__*/_interopNamespace(AST6);
-var JSX3__namespace = /*#__PURE__*/_interopNamespace(JSX3);
+var JSX4__namespace = /*#__PURE__*/_interopNamespace(JSX4);
 var VAR__namespace = /*#__PURE__*/_interopNamespace(VAR);
 var birecord__default = /*#__PURE__*/_interopDefault(birecord);
 
@@ -818,7 +819,7 @@ var ERComponentHint = {
   /**
    * 1n << 0n - 1n << 63n are reserved for JSXValueHint
    */
-  ...JSX3__namespace.JSXValueHint,
+  ...JSX4__namespace.JSXValueHint,
   /**
    * Skip function component created by React.memo
    */
@@ -828,9 +829,9 @@ var ERComponentHint = {
    */
   SkipForwardRef: 1n << 65n,
   /**
-   * Skip function component defined in map function callback
+   * Skip function component defined as array map argument
    */
-  SkipMapCallback: 1n << 66n,
+  SkipArrayMapArgument: 1n << 66n,
   /**
    * Skip function component defined on object method
    */
@@ -844,7 +845,7 @@ var ERComponentHint = {
    */
   SkipClassProperty: 1n << 69n
 };
-var DEFAULT_COMPONENT_HINT = 0n | ERComponentHint.SkipBooleanLiteral | ERComponentHint.SkipEmptyArray | ERComponentHint.SkipMapCallback | ERComponentHint.SkipNumberLiteral | ERComponentHint.SkipStringLiteral | ERComponentHint.SkipUndefined | ERComponentHint.StrictArray | ERComponentHint.StrictConditional | ERComponentHint.StrictLogical;
+var DEFAULT_COMPONENT_HINT = 0n | ERComponentHint.SkipBooleanLiteral | ERComponentHint.SkipEmptyArray | ERComponentHint.SkipArrayMapArgument | ERComponentHint.SkipNumberLiteral | ERComponentHint.SkipStringLiteral | ERComponentHint.SkipUndefined | ERComponentHint.StrictArray | ERComponentHint.StrictConditional | ERComponentHint.StrictLogical;
 
 // src/component/component-flag.ts
 var ERComponentFlag = {
@@ -958,9 +959,6 @@ function hasValidHierarchy(context, node, hint) {
   if (isChildrenOfCreateElement(context, node) || isFunctionOfRenderMethod(node)) {
     return false;
   }
-  if (hint & ERComponentHint.SkipMapCallback && AST6__namespace.isMapCallLoose(node.parent)) {
-    return false;
-  }
   if (hint & ERComponentHint.SkipObjectMethod && isFunctionOfObjectMethod(node.parent)) {
     return false;
   }
@@ -970,6 +968,9 @@ function hasValidHierarchy(context, node, hint) {
   if (hint & ERComponentHint.SkipClassProperty && isFunctionOfClassProperty(node.parent)) {
     return false;
   }
+  if (hint & ERComponentHint.SkipArrayMapArgument && AST6__namespace.isArrayMapCallLoose(node.parent)) {
+    return false;
+  }
   const boundaryNode = AST6__namespace.findParentNode(
     node,
     AST6__namespace.isOneOf([
@@ -1018,7 +1019,7 @@ function useComponentCollector(context, options = {}) {
     if (entry == null) return;
     if (!entry.isComponent) return functionEntries.pop();
     const shouldDrop = AST6__namespace.getNestedReturnStatements(entry.node.body).slice().reverse().some((r) => {
-      return context.sourceCode.getScope(r).block === entry.node && r.argument != null && !JSX3__namespace.isJSXValue(r.argument, jsxCtx, hint);
+      return context.sourceCode.getScope(r).block === entry.node && r.argument != null && !JSX4__namespace.isJSXValue(r.argument, jsxCtx, hint);
     });
     if (shouldDrop) {
       components.delete(entry.key);
@@ -1042,7 +1043,7 @@ function useComponentCollector(context, options = {}) {
       const entry = getCurrentEntry();
       if (entry == null) return;
       const { body } = entry.node;
-      const isComponent = hasNoneOrLooseComponentName(context, entry.node) && JSX3__namespace.isJSXValue(body, jsxCtx, hint) && hasValidHierarchy(context, entry.node, hint);
+      const isComponent = hasNoneOrLooseComponentName(context, entry.node) && JSX4__namespace.isJSXValue(body, jsxCtx, hint) && hasValidHierarchy(context, entry.node, hint);
       if (!isComponent) return;
       const initPath = AST6__namespace.getFunctionInitPath(entry.node);
       const id = getFunctionComponentIdentifier(context, entry.node);
@@ -1082,7 +1083,7 @@ function useComponentCollector(context, options = {}) {
     "ReturnStatement[type]"(node) {
       const entry = getCurrentEntry();
       if (entry == null) return;
-      const isComponent = hasNoneOrLooseComponentName(context, entry.node) && JSX3__namespace.isJSXValue(node.argument, jsxCtx, hint) && hasValidHierarchy(context, entry.node, hint);
+      const isComponent = hasNoneOrLooseComponentName(context, entry.node) && JSX4__namespace.isJSXValue(node.argument, jsxCtx, hint) && hasValidHierarchy(context, entry.node, hint);
       if (!isComponent) return;
       entry.isComponent = true;
       const initPath = AST6__namespace.getFunctionInitPath(entry.node);
@@ -1162,12 +1163,12 @@ function isRenderFunctionLoose(context, node) {
   if (AST6__namespace.getFunctionIdentifier(node)?.name.startsWith("render")) {
     return parent.type === types.AST_NODE_TYPES.JSXExpressionContainer && parent.parent.type === types.AST_NODE_TYPES.JSXAttribute && parent.parent.name.type === types.AST_NODE_TYPES.JSXIdentifier && parent.parent.name.name.startsWith("render");
   }
-  return JSX3__namespace.isJSXValue(
+  return JSX4__namespace.isJSXValue(
     body,
     {
       getScope: (node2) => context.sourceCode.getScope(node2)
     },
-    JSX3__namespace.JSXValueHint.SkipNullLiteral | JSX3__namespace.JSXValueHint.SkipUndefined | JSX3__namespace.JSXValueHint.StrictLogical | JSX3__namespace.JSXValueHint.StrictConditional
+    JSX4__namespace.JSXValueHint.SkipNullLiteral | JSX4__namespace.JSXValueHint.SkipUndefined | JSX4__namespace.JSXValueHint.StrictLogical | JSX4__namespace.JSXValueHint.StrictConditional
   );
 }
 function isRenderPropLoose(context, node) {

package/dist/index.mjs

@@ -1,10 +1,11 @@
 import * as AST6 from '@eslint-react/ast';
 import { flip, dual, constFalse, identity, _ } from '@eslint-react/eff';
-import * as JSX3 from '@eslint-react/jsx';
+import * as JSX4 from '@eslint-react/jsx';
 import { DEFAULT_ESLINT_REACT_SETTINGS as DEFAULT_ESLINT_REACT_SETTINGS$1, unsafeDecodeSettings, getId } from '@eslint-react/shared';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import * as VAR from '@eslint-react/var';
 import { match, P } from 'ts-pattern';
+import '@eslint-react/kit';
 import birecord from 'birecord';
 
 // src/component/component-collector.ts
@@ -791,7 +792,7 @@ var ERComponentHint = {
   /**
    * 1n << 0n - 1n << 63n are reserved for JSXValueHint
    */
-  ...JSX3.JSXValueHint,
+  ...JSX4.JSXValueHint,
   /**
    * Skip function component created by React.memo
    */
@@ -801,9 +802,9 @@ var ERComponentHint = {
    */
   SkipForwardRef: 1n << 65n,
   /**
-   * Skip function component defined in map function callback
+   * Skip function component defined as array map argument
    */
-  SkipMapCallback: 1n << 66n,
+  SkipArrayMapArgument: 1n << 66n,
   /**
    * Skip function component defined on object method
    */
@@ -817,7 +818,7 @@ var ERComponentHint = {
    */
   SkipClassProperty: 1n << 69n
 };
-var DEFAULT_COMPONENT_HINT = 0n | ERComponentHint.SkipBooleanLiteral | ERComponentHint.SkipEmptyArray | ERComponentHint.SkipMapCallback | ERComponentHint.SkipNumberLiteral | ERComponentHint.SkipStringLiteral | ERComponentHint.SkipUndefined | ERComponentHint.StrictArray | ERComponentHint.StrictConditional | ERComponentHint.StrictLogical;
+var DEFAULT_COMPONENT_HINT = 0n | ERComponentHint.SkipBooleanLiteral | ERComponentHint.SkipEmptyArray | ERComponentHint.SkipArrayMapArgument | ERComponentHint.SkipNumberLiteral | ERComponentHint.SkipStringLiteral | ERComponentHint.SkipUndefined | ERComponentHint.StrictArray | ERComponentHint.StrictConditional | ERComponentHint.StrictLogical;
 
 // src/component/component-flag.ts
 var ERComponentFlag = {
@@ -931,9 +932,6 @@ function hasValidHierarchy(context, node, hint) {
   if (isChildrenOfCreateElement(context, node) || isFunctionOfRenderMethod(node)) {
     return false;
   }
-  if (hint & ERComponentHint.SkipMapCallback && AST6.isMapCallLoose(node.parent)) {
-    return false;
-  }
   if (hint & ERComponentHint.SkipObjectMethod && isFunctionOfObjectMethod(node.parent)) {
     return false;
   }
@@ -943,6 +941,9 @@ function hasValidHierarchy(context, node, hint) {
   if (hint & ERComponentHint.SkipClassProperty && isFunctionOfClassProperty(node.parent)) {
     return false;
   }
+  if (hint & ERComponentHint.SkipArrayMapArgument && AST6.isArrayMapCallLoose(node.parent)) {
+    return false;
+  }
   const boundaryNode = AST6.findParentNode(
     node,
     AST6.isOneOf([
@@ -991,7 +992,7 @@ function useComponentCollector(context, options = {}) {
     if (entry == null) return;
     if (!entry.isComponent) return functionEntries.pop();
     const shouldDrop = AST6.getNestedReturnStatements(entry.node.body).slice().reverse().some((r) => {
-      return context.sourceCode.getScope(r).block === entry.node && r.argument != null && !JSX3.isJSXValue(r.argument, jsxCtx, hint);
+      return context.sourceCode.getScope(r).block === entry.node && r.argument != null && !JSX4.isJSXValue(r.argument, jsxCtx, hint);
     });
     if (shouldDrop) {
       components.delete(entry.key);
@@ -1015,7 +1016,7 @@ function useComponentCollector(context, options = {}) {
       const entry = getCurrentEntry();
       if (entry == null) return;
       const { body } = entry.node;
-      const isComponent = hasNoneOrLooseComponentName(context, entry.node) && JSX3.isJSXValue(body, jsxCtx, hint) && hasValidHierarchy(context, entry.node, hint);
+      const isComponent = hasNoneOrLooseComponentName(context, entry.node) && JSX4.isJSXValue(body, jsxCtx, hint) && hasValidHierarchy(context, entry.node, hint);
       if (!isComponent) return;
       const initPath = AST6.getFunctionInitPath(entry.node);
       const id = getFunctionComponentIdentifier(context, entry.node);
@@ -1055,7 +1056,7 @@ function useComponentCollector(context, options = {}) {
     "ReturnStatement[type]"(node) {
       const entry = getCurrentEntry();
       if (entry == null) return;
-      const isComponent = hasNoneOrLooseComponentName(context, entry.node) && JSX3.isJSXValue(node.argument, jsxCtx, hint) && hasValidHierarchy(context, entry.node, hint);
+      const isComponent = hasNoneOrLooseComponentName(context, entry.node) && JSX4.isJSXValue(node.argument, jsxCtx, hint) && hasValidHierarchy(context, entry.node, hint);
       if (!isComponent) return;
       entry.isComponent = true;
       const initPath = AST6.getFunctionInitPath(entry.node);
@@ -1135,12 +1136,12 @@ function isRenderFunctionLoose(context, node) {
   if (AST6.getFunctionIdentifier(node)?.name.startsWith("render")) {
     return parent.type === AST_NODE_TYPES.JSXExpressionContainer && parent.parent.type === AST_NODE_TYPES.JSXAttribute && parent.parent.name.type === AST_NODE_TYPES.JSXIdentifier && parent.parent.name.name.startsWith("render");
   }
-  return JSX3.isJSXValue(
+  return JSX4.isJSXValue(
     body,
     {
       getScope: (node2) => context.sourceCode.getScope(node2)
     },
-    JSX3.JSXValueHint.SkipNullLiteral | JSX3.JSXValueHint.SkipUndefined | JSX3.JSXValueHint.StrictLogical | JSX3.JSXValueHint.StrictConditional
+    JSX4.JSXValueHint.SkipNullLiteral | JSX4.JSXValueHint.SkipUndefined | JSX4.JSXValueHint.StrictLogical | JSX4.JSXValueHint.StrictConditional
   );
 }
 function isRenderPropLoose(context, node) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "1.37.4-next.0",
+  "version": "1.38.0-beta.11",
   "description": "ESLint React's ESLint utility module for static analysis of React core APIs and patterns.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -41,11 +41,12 @@
     "@typescript-eslint/utils": "^8.27.0",
     "birecord": "^0.1.1",
     "ts-pattern": "^5.6.2",
-    "@eslint-react/ast": "1.37.4-next.0",
-    "@eslint-react/eff": "1.37.4-next.0",
-    "@eslint-react/jsx": "1.37.4-next.0",
-    "@eslint-react/shared": "1.37.4-next.0",
-    "@eslint-react/var": "1.37.4-next.0"
+    "@eslint-react/ast": "1.38.0-beta.11",
+    "@eslint-react/jsx": "1.38.0-beta.11",
+    "@eslint-react/eff": "1.38.0-beta.11",
+    "@eslint-react/kit": "1.38.0-beta.11",
+    "@eslint-react/shared": "1.38.0-beta.11",
+    "@eslint-react/var": "1.38.0-beta.11"
   },
   "devDependencies": {
     "tsup": "^8.4.0",