@eslint-react/core 2.0.0-beta.18 → 2.0.0-beta.4

package/dist/index.d.ts

@@ -2,7 +2,7 @@ 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 { unit } from '@eslint-react/eff';
 import * as birecord from 'birecord';
 import { Scope } from '@typescript-eslint/scope-manager';
 import * as VAR from '@eslint-react/var';
@@ -80,10 +80,10 @@ interface SemanticEntry {
 }
 
 interface SemanticNode {
-    id: _ | TSESTree.Identifier | TSESTree.Identifier[];
+    id: unit | TSESTree.Identifier | TSESTree.Identifier[];
     key: string;
     kind: string;
-    name: _ | string;
+    name: unit | string;
     node: TSESTree.Node;
     flag: bigint;
     hint: bigint;
@@ -100,23 +100,23 @@ declare const ComponentFlag: {
 };
 
 interface FunctionComponent extends SemanticNode {
-    id: _ | TSESTree.Identifier | TSESTree.Identifier[];
+    id: unit | TSESTree.Identifier | TSESTree.Identifier[];
     kind: "function";
     node: AST.TSESTreeFunction;
     flag: ComponentFlag;
     hint: ComponentDetectionHint;
-    initPath: _ | AST.FunctionInitPath;
+    initPath: unit | AST.FunctionInitPath;
     hookCalls: TSESTree.CallExpression[];
-    displayName: _ | TSESTree.Expression;
+    displayName: unit | TSESTree.Expression;
 }
 interface ClassComponent extends SemanticNode {
-    id: _ | TSESTree.Identifier;
+    id: unit | TSESTree.Identifier;
     kind: "class";
     node: AST.TSESTreeClass;
     flag: ComponentFlag;
     hint: ComponentDetectionHint;
     methods: AST.TSESTreeMethodOrProperty[];
-    displayName: _ | TSESTree.Expression;
+    displayName: unit | TSESTree.Expression;
 }
 type Component = ClassComponent | FunctionComponent;
 
@@ -136,7 +136,7 @@ declare namespace useComponentCollector {
         ctx: {
             getAllComponents: (node: TSESTree.Program) => Map<string, FunctionComponent>;
             getCurrentEntries: () => FunctionEntry[];
-            getCurrentEntry: () => FunctionEntry | _;
+            getCurrentEntry: () => FunctionEntry | unit;
         };
         listeners: ESLintUtils.RuleListener;
     };
@@ -178,7 +178,7 @@ declare function useComponentCollectorLegacy(): useComponentCollectorLegacy.Retu
 declare function isFunctionOfRenderMethod(node: AST.TSESTreeFunction): boolean;
 declare function isValidComponentDefinition(context: RuleContext, node: AST.TSESTreeFunction, hint: bigint): boolean;
 
-declare function getFunctionComponentId(context: RuleContext, node: AST.TSESTreeFunction): TSESTree.Identifier | TSESTree.Identifier[] | _;
+declare function getFunctionComponentId(context: RuleContext, node: AST.TSESTreeFunction): TSESTree.Identifier | TSESTree.Identifier[] | unit;
 
 declare function getComponentFlagFromInitPath(initPath: FunctionComponent["initPath"]): bigint;
 
@@ -217,7 +217,7 @@ declare function isGetDerivedStateFromError(node: TSESTree.Node): node is AST.TS
 
 declare function isComponentName(name: string): boolean;
 declare function isComponentNameLoose(name: string): boolean;
-declare function getComponentNameFromId(id: TSESTree.Identifier | TSESTree.Identifier[] | _): string | undefined;
+declare function getComponentNameFromId(id: TSESTree.Identifier | TSESTree.Identifier[] | unit): string | undefined;
 declare function hasNoneOrLooseComponentName(context: RuleContext, fn: AST.TSESTreeFunction): boolean;
 
 /**
@@ -332,7 +332,7 @@ declare function isComponentWrapperCallLoose(context: RuleContext, node: TSESTre
 type EffectKind = "useEffect" | "useLayoutEffect" | "useInsertionEffect";
 
 interface Hook extends SemanticNode {
-    id: TSESTree.Identifier | _;
+    id: TSESTree.Identifier | unit;
     node: AST.TSESTreeFunction;
     name: string;
     hookCalls: TSESTree.CallExpression[];
@@ -350,17 +350,17 @@ declare function useHookCollector(): useHookCollector.ReturnType;
 
 declare function isReactHookId(id: TSESTree.Identifier | TSESTree.MemberExpression): boolean;
 
-declare function isReactHook(node: AST.TSESTreeFunction | _): boolean;
+declare function isReactHook(node: AST.TSESTreeFunction | unit): boolean;
 /**
  * Check if the given node is a React Hook call by its name.
  * @param node The node to check.
  * @returns `true` if the node is a React Hook call, `false` otherwise.
  */
-declare function isReactHookCall(node: TSESTree.Node | _): boolean;
-declare function isReactHookCallWithName(context: RuleContext, node: TSESTree.Node | _): (name: string) => boolean;
-declare function isReactHookCallWithNameLoose(node: TSESTree.Node | _): (name: string) => boolean;
-declare function isReactHookCallWithNameAlias(context: RuleContext, name: string, alias?: _ | string[]): (node: TSESTree.CallExpression) => boolean;
-declare function isUseEffectCallLoose(node: TSESTree.Node | _): boolean;
+declare function isReactHookCall(node: TSESTree.Node | unit): boolean;
+declare function isReactHookCallWithName(context: RuleContext, node: TSESTree.Node | unit): (name: string) => boolean;
+declare function isReactHookCallWithNameLoose(node: TSESTree.Node | unit): (name: string) => boolean;
+declare function isReactHookCallWithNameAlias(context: RuleContext, name: string, alias?: unit | string[]): (node: TSESTree.CallExpression) => boolean;
+declare function isUseEffectCallLoose(node: TSESTree.Node | unit): boolean;
 declare const isUseCall: (context: RuleContext, node: TSESTree.Node | undefined) => boolean;
 declare const isUseActionStateCall: (context: RuleContext, node: TSESTree.Node | undefined) => boolean;
 declare const isUseCallbackCall: (context: RuleContext, node: TSESTree.Node | undefined) => boolean;
@@ -398,7 +398,7 @@ declare function isReactHookName(name: string): boolean;
  * @param initialScope The initial scope to use for variable resolution
  * @returns The JSX attribute node or undefined
  */
-declare function getAttribute(context: RuleContext, name: string, attributes: (TSESTree$1.JSXAttribute | TSESTree$1.JSXSpreadAttribute)[], initialScope?: Scope): TSESTree$1.JSXAttribute | TSESTree$1.JSXSpreadAttribute | _;
+declare function getAttribute(context: RuleContext, name: string, attributes: (TSESTree$1.JSXAttribute | TSESTree$1.JSXSpreadAttribute)[], initialScope?: Scope): TSESTree$1.JSXAttribute | TSESTree$1.JSXSpreadAttribute | unit;
 
 /**
  * Get the stringified name of a JSX attribute
@@ -441,7 +441,7 @@ declare const DEFAULT_JSX_DETECTION_HINT: bigint;
  * @param node The AST node to check
  * @returns `true` if the node is a `JSXText` or a `Literal` node
  */
-declare function isJsxText(node: TSESTree$1.Node | null | _): node is TSESTree$1.JSXText | TSESTree$1.Literal;
+declare function isJsxText(node: TSESTree$1.Node | null | unit): node is TSESTree$1.JSXText | TSESTree$1.Literal;
 /**
  * Heuristic decision to determine if a node is a JSX-like node.
  * @param code The sourceCode object
@@ -452,7 +452,7 @@ declare function isJsxText(node: TSESTree$1.Node | null | _): node is TSESTree$1
  */
 declare function isJsxLike(code: {
     getScope: (node: TSESTree$1.Node) => Scope;
-}, node: TSESTree$1.Node | _ | null, hint?: JSXDetectionHint): boolean;
+}, node: TSESTree$1.Node | unit | null, hint?: JSXDetectionHint): boolean;
 
 /**
  * Get the stringified type of a JSX element
@@ -472,12 +472,12 @@ declare function hasEveryAttribute(context: RuleContext, names: string[], attrib
  * @param test The test to apply to the parent attribute
  * @returns The parent attribute node or undefined
  */
-declare function findParentAttribute(node: TSESTree.Node, test?: (node: TSESTree.JSXAttribute) => boolean): TSESTree.JSXAttribute | _;
+declare function findParentAttribute(node: TSESTree.Node, test?: (node: TSESTree.JSXAttribute) => boolean): TSESTree.JSXAttribute | unit;
 
 declare function isHostElement(context: RuleContext, node: TSESTree.Node): boolean;
 declare function isKeyedElement(context: RuleContext, node: TSESTree.Node, initialScope?: Scope): boolean;
-declare function isFragmentElement(context: RuleContext, node: TSESTree.Node | null | _, allowJSXFragment?: false): node is TSESTree.JSXElement;
-declare function isFragmentElement(context: RuleContext, node: TSESTree.Node | null | _, allowJSXFragment?: true): node is TSESTree.JSXElement | TSESTree.JSXFragment;
+declare function isFragmentElement(context: RuleContext, node: TSESTree.Node | null | unit, allowJSXFragment?: false): node is TSESTree.JSXElement;
+declare function isFragmentElement(context: RuleContext, node: TSESTree.Node | null | unit, allowJSXFragment?: true): node is TSESTree.JSXElement | TSESTree.JSXFragment;
 
 /**
  * Get the stringified representation of a JSX node
@@ -503,15 +503,15 @@ declare function isInstanceIdEqual(context: RuleContext, a: TSESTree.Node, b: TS
 
 declare namespace isReactAPI {
     type ReturnType = {
-        (context: RuleContext, node: _ | null | TSESTree.Node): node is TSESTree.Identifier | TSESTree.MemberExpression;
-        (context: RuleContext): (node: _ | null | TSESTree.Node) => node is TSESTree.MemberExpression | TSESTree.Identifier;
+        (context: RuleContext, node: unit | null | TSESTree.Node): node is TSESTree.Identifier | TSESTree.MemberExpression;
+        (context: RuleContext): (node: unit | null | TSESTree.Node) => node is TSESTree.MemberExpression | TSESTree.Identifier;
     };
 }
 declare function isReactAPI(api: string): isReactAPI.ReturnType;
 declare namespace isReactAPICall {
     type ReturnType = {
-        (context: RuleContext, node: _ | null | TSESTree.Node): node is TSESTree.CallExpression;
-        (context: RuleContext): (node: _ | null | TSESTree.Node) => node is TSESTree.CallExpression;
+        (context: RuleContext, node: unit | null | TSESTree.Node): node is TSESTree.CallExpression;
+        (context: RuleContext): (node: unit | null | TSESTree.Node) => node is TSESTree.CallExpression;
     };
 }
 declare function isReactAPICall(api: string): isReactAPICall.ReturnType;

package/dist/index.js

@@ -1,6 +1,6 @@
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import * as AST14 from '@eslint-react/ast';
-import { flip, dual, constFalse, identity, constTrue, _ } from '@eslint-react/eff';
+import { flip, dual, constFalse, identity, constTrue, unit } from '@eslint-react/eff';
 import { RegExp, Selector } from '@eslint-react/kit';
 import { coerceSettings, DEFAULT_ESLINT_REACT_SETTINGS, getId } from '@eslint-react/shared';
 import * as VAR3 from '@eslint-react/var';
@@ -70,7 +70,7 @@ function getInstanceId(node, prev) {
     case (node.type === AST_NODE_TYPES.PropertyDefinition && node.value === prev):
       return node.key;
     case (node.type === AST_NODE_TYPES.BlockStatement || node.type === AST_NODE_TYPES.Program || node.parent === node):
-      return _;
+      return unit;
     default:
       return getInstanceId(node.parent, node);
   }
@@ -432,6 +432,9 @@ function isJsxLike(code, node, hint = DEFAULT_JSX_DETECTION_HINT) {
       return !(hint & JSXDetectionHint.SkipStringLiteral);
     }
     case AST_NODE_TYPES.ArrayExpression: {
+      if (node.elements.length === 0) {
+        return !(hint & JSXDetectionHint.SkipEmptyArray);
+      }
       if (hint & JSXDetectionHint.StrictArray) {
         return node.elements.every((n) => isJsxLike(code, n, hint));
       }
@@ -664,7 +667,7 @@ function getFunctionComponentId(context, node) {
   if (parent.type === AST_NODE_TYPES.CallExpression && isComponentWrapperCallLoose(context, parent) && parent.parent.type === AST_NODE_TYPES.CallExpression && isComponentWrapperCallLoose(context, parent.parent) && parent.parent.parent.type === AST_NODE_TYPES.VariableDeclarator && parent.parent.parent.id.type === AST_NODE_TYPES.Identifier) {
     return parent.parent.parent.id;
   }
-  return _;
+  return unit;
 }
 
 // src/component/component-flag.ts
@@ -695,7 +698,7 @@ function isComponentNameLoose(name) {
   return RegExp.COMPONENT_NAME_LOOSE.test(name);
 }
 function getComponentNameFromId(id) {
-  if (id == null) return _;
+  if (id == null) return unit;
   return Array.isArray(id) ? id.map((n) => n.name).join(".") : id.name;
 }
 function hasNoneOrLooseComponentName(context, fn) {
@@ -723,11 +726,15 @@ function useComponentCollector(context, options = {}) {
     const entry = functionEntries.at(-1);
     if (entry == null) return;
     if (!entry.isComponent) return functionEntries.pop();
-    const shouldDrop = AST14.getNestedReturnStatements(entry.node.body).slice().reverse().some((r) => {
-      return context.sourceCode.getScope(r).block === entry.node && r.argument != null && !isJsxLike(context.sourceCode, r.argument, hint);
-    });
-    if (shouldDrop) {
-      components.delete(entry.key);
+    const rets = AST14.getNestedReturnStatements(entry.node.body);
+    for (let i = rets.length - 1; i >= 0; i--) {
+      const ret = rets[i];
+      if (ret == null) continue;
+      const shouldDrop = context.sourceCode.getScope(ret).block === entry.node && ret.argument != null && !isJsxLike(context.sourceCode, ret.argument, hint);
+      if (shouldDrop) {
+        components.delete(entry.key);
+        break;
+      }
     }
     return functionEntries.pop();
   };
@@ -760,7 +767,7 @@ function useComponentCollector(context, options = {}) {
         kind: "function",
         name,
         node: entry.node,
-        displayName: _,
+        displayName: unit,
         flag: getComponentFlagFromInitPath(initPath),
         hint,
         hookCalls: entry.hookCalls,
@@ -771,7 +778,7 @@ function useComponentCollector(context, options = {}) {
       [Selector.DISPLAY_NAME_ASSIGNMENT_EXPRESSION](node) {
         const { left, right } = node;
         if (left.type !== AST_NODE_TYPES.MemberExpression) return;
-        const componentName = left.object.type === AST_NODE_TYPES.Identifier ? left.object.name : _;
+        const componentName = left.object.type === AST_NODE_TYPES.Identifier ? left.object.name : unit;
         const component = [...components.values()].findLast(({ name }) => name != null && name === componentName);
         if (component == null) return;
         component.displayName = right;
@@ -800,7 +807,7 @@ function useComponentCollector(context, options = {}) {
         kind: "function",
         name,
         node: entry.node,
-        displayName: _,
+        displayName: unit,
         flag: getComponentFlagFromInitPath(initPath),
         hint,
         hookCalls: entry.hookCalls,
@@ -834,7 +841,7 @@ function useComponentCollectorLegacy() {
         name: id?.name,
         node,
         // TODO: Get displayName of class component
-        displayName: _,
+        displayName: unit,
         flag,
         hint: 0n,
         // TODO: Get methods of class component

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "2.0.0-beta.18",
+  "version": "2.0.0-beta.4",
   "description": "ESLint React's ESLint utility module for static analysis of React core APIs and patterns.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -27,20 +27,20 @@
     "./package.json"
   ],
   "dependencies": {
-    "@typescript-eslint/scope-manager": "^8.32.0",
-    "@typescript-eslint/type-utils": "^8.32.0",
-    "@typescript-eslint/types": "^8.32.0",
-    "@typescript-eslint/utils": "^8.32.0",
+    "@typescript-eslint/scope-manager": "^8.35.0",
+    "@typescript-eslint/type-utils": "^8.35.0",
+    "@typescript-eslint/types": "^8.35.0",
+    "@typescript-eslint/utils": "^8.35.0",
     "birecord": "^0.1.1",
-    "ts-pattern": "^5.7.0",
-    "@eslint-react/ast": "2.0.0-beta.18",
-    "@eslint-react/eff": "2.0.0-beta.18",
-    "@eslint-react/shared": "2.0.0-beta.18",
-    "@eslint-react/kit": "2.0.0-beta.18",
-    "@eslint-react/var": "2.0.0-beta.18"
+    "ts-pattern": "^5.7.1",
+    "@eslint-react/ast": "2.0.0-beta.4",
+    "@eslint-react/eff": "2.0.0-beta.4",
+    "@eslint-react/kit": "2.0.0-beta.4",
+    "@eslint-react/shared": "2.0.0-beta.4",
+    "@eslint-react/var": "2.0.0-beta.4"
   },
   "devDependencies": {
-    "tsup": "^8.4.0",
+    "tsup": "^8.5.0",
     "@local/configs": "0.0.0"
   },
   "engines": {