npm - @eslint-react/core - Versions diffs - 1.24.2-next.0 → 1.24.2-next.1 - Mend

@eslint-react/core 1.24.2-next.0 → 1.24.2-next.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.d.mts CHANGED Viewed

@@ -1,9 +1,9 @@
 import * as AST from '@eslint-react/ast';
+import { _ } from '@eslint-react/eff';
 import * as _eslint_react_shared from '@eslint-react/shared';
 import { RuleContext } from '@eslint-react/shared';
 import { TSESTree } from '@typescript-eslint/types';
-import { _ } from '@eslint-react/eff';
-import { TSESTree as TSESTree$1 } from '@typescript-eslint/utils';
+import { ESLintUtils, TSESTree as TSESTree$1 } from '@typescript-eslint/utils';
 import * as birecord from 'birecord';
 import * as _typescript_eslint_utils_ts_eslint from '@typescript-eslint/utils/ts-eslint';
 import { Scope } from '@typescript-eslint/scope-manager';
@@ -76,10 +76,6 @@ interface ERClassComponent extends ERSemanticNode {
 }
 type ERComponent = ERClassComponent | ERFunctionComponent;
-interface ComponentCollectorOptions {
-    collectDisplayName?: boolean;
-    collectHookCalls?: boolean;
-}
 /**
  * Get a ctx and listeners for the rule to collect function components
  * @param context The ESLint rule context
@@ -87,49 +83,43 @@ interface ComponentCollectorOptions {
  * @param options The options to use
  * @returns The component collector
  */
-declare function useComponentCollector(context: RuleContext, hint?: bigint, options?: ComponentCollectorOptions): {
-    readonly ctx: {
-        readonly getAllComponents: (node: TSESTree.Program) => Map<string, ERFunctionComponent>;
-        readonly getCurrentEntries: () => {
-            key: string;
-            node: AST.TSESTreeFunction;
-            hookCalls: TSESTree.CallExpression[];
-            isComponent: boolean;
-        }[];
-        readonly getCurrentEntry: () => {
-            key: string;
-            node: AST.TSESTreeFunction;
-            hookCalls: TSESTree.CallExpression[];
-            isComponent: boolean;
-        } | undefined;
+declare function useComponentCollector(context: RuleContext, hint?: bigint, options?: useComponentCollector.Options): useComponentCollector.ReturnType;
+declare namespace useComponentCollector {
+    type Options = {
+        collectDisplayName?: boolean;
+        collectHookCalls?: boolean;
     };
-    readonly listeners: {
-        readonly "ReturnStatement[type]": (node: TSESTree.ReturnStatement) => void;
-        readonly "CallExpression[type]:exit"?: (node: TSESTree.CallExpression) => void;
-        readonly ":function[type]": (node: AST.TSESTreeFunction) => void;
-        readonly ":function[type]:exit": () => {
-            key: string;
-            node: AST.TSESTreeFunction;
-            hookCalls: TSESTree.CallExpression[];
-            isComponent: boolean;
-        } | undefined;
-        readonly "ArrowFunctionExpression[type][body.type!='BlockStatement']": () => void;
+    type Entry = {
+        key: string;
+        node: AST.TSESTreeFunction;
+        hookCalls: TSESTree.CallExpression[];
+        isComponent: boolean;
     };
-};
+    type Ctx = {
+        getAllComponents: (node: TSESTree.Program) => Map<string, ERFunctionComponent>;
+        getCurrentEntries: () => Entry[];
+        getCurrentEntry: () => Entry | _;
+    };
+    type ReturnType = {
+        ctx: Ctx;
+        listeners: ESLintUtils.RuleListener;
+    };
+}
 /**
  * Get a ctx and listeners for the rule to collect class components
  * @returns The context and listeners for the rule
  */
-declare function useComponentCollectorLegacy(): {
-    readonly ctx: {
-        readonly getAllComponents: (node: TSESTree$1.Program) => Map<string, ERClassComponent>;
+declare function useComponentCollectorLegacy(): useComponentCollectorLegacy.ReturnType;
+declare namespace useComponentCollectorLegacy {
+    type Ctx = {
+        getAllComponents: (node: TSESTree$1.Program) => Map<string, ERClassComponent>;
     };
-    readonly listeners: {
-        readonly "ClassDeclaration[type]": (node: AST.TSESTreeClass) => void;
-        readonly "ClassExpression[type]": (node: AST.TSESTreeClass) => void;
+    type ReturnType = {
+        ctx: Ctx;
+        listeners: ESLintUtils.RuleListener;
     };
-};
+}
 /**
  * The ESQuery selector for a component display name assignment expression
@@ -284,17 +274,21 @@ interface ERHook extends ERSemanticNode {
     hookCalls: TSESTree.CallExpression[];
 }
-declare function useHookCollector(): {
-    readonly ctx: {
-        readonly getAllHooks: (node: TSESTree$1.Program) => Map<string, ERHook>;
-        readonly getCurrentHooks: () => Map<string, ERHook>;
+declare function useHookCollector(): useHookCollector.ReturnType;
+declare namespace useHookCollector {
+    type Entry = {
+        key: string;
+        node: AST.TSESTreeFunction;
+        isHook: boolean;
     };
-    readonly listeners: {
-        readonly ":function[type]": (node: AST.TSESTreeFunction) => void;
-        readonly ":function[type]:exit": () => void;
-        readonly "CallExpression[type]": (node: never) => void;
+    type Ctx = {
+        getAllHooks(node: TSESTree$1.Program): Map<string, ERHook>;
     };
-};
+    type ReturnType = {
+        ctx: Ctx;
+        listeners: ESLintUtils.RuleListener;
+    };
+}
 type ERHookKind = "custom" | "useActionState" | "useCallback" | "useContext" | "useDebugValue" | "useDeferredValue" | "useEffect" | "useId" | "useImperativeHandle" | "useInsertionEffect" | "useLayoutEffect" | "useMemo" | "useOptimistic" | "useReducer" | "useRef" | "useState" | "useSyncExternalStore" | "useTransition";
@@ -346,20 +340,24 @@ declare function isFromReact(name: string): (node: TSESTree.Identifier | TSESTre
  * @returns A function that checks if a given node is a member expression of a Pragma member.
  */
 declare function isFromReactMember(memberName: string, name: string): (node: TSESTree.MemberExpression, context: RuleContext) => boolean;
-type IsCallFromReact = {
-    (context: RuleContext): (node: TSESTree.Node) => node is TSESTree.CallExpression;
-    (node: TSESTree.Node, context: RuleContext): node is TSESTree.CallExpression;
-};
-declare function isCallFromReact(name: string): IsCallFromReact;
-type IsCallFromReactMember = {
-    (context: RuleContext): (node: TSESTree.Node) => node is TSESTree.CallExpression & {
-        callee: TSESTree.MemberExpression;
+declare function isCallFromReact(name: string): isCallFromReact.ReturnType;
+declare namespace isCallFromReact {
+    type ReturnType = {
+        (context: RuleContext): (node: TSESTree.Node) => node is TSESTree.CallExpression;
+        (node: TSESTree.Node, context: RuleContext): node is TSESTree.CallExpression;
     };
-    (node: TSESTree.Node, context: RuleContext): node is TSESTree.CallExpression & {
-        callee: TSESTree.MemberExpression;
+}
+declare function isCallFromReactMember(pragmaMemberName: string, name: string): isCallFromReactMember.ReturnType;
+declare namespace isCallFromReactMember {
+    type ReturnType = {
+        (context: RuleContext): (node: TSESTree.Node) => node is TSESTree.CallExpression & {
+            callee: TSESTree.MemberExpression;
+        };
+        (node: TSESTree.Node, context: RuleContext): node is TSESTree.CallExpression & {
+            callee: TSESTree.MemberExpression;
+        };
     };
-};
-declare function isCallFromReactMember(pragmaMemberName: string, name: string): IsCallFromReactMember;
+}
 declare function isInitializedFromReact(name: string, importSource: string, initialScope: Scope): boolean;
@@ -608,21 +606,6 @@ declare enum AST_NODE_TYPES {
     TSUnknownKeyword = "TSUnknownKeyword",
     TSVoidKeyword = "TSVoidKeyword"
 }
-declare enum AST_TOKEN_TYPES {
-    Boolean = "Boolean",
-    Identifier = "Identifier",
-    JSXIdentifier = "JSXIdentifier",
-    JSXText = "JSXText",
-    Keyword = "Keyword",
-    Null = "Null",
-    Numeric = "Numeric",
-    Punctuator = "Punctuator",
-    RegularExpression = "RegularExpression",
-    String = "String",
-    Template = "Template",
-    Block = "Block",
-    Line = "Line"
-}
 declare interface AwaitExpression extends BaseNode {
     type: AST_NODE_TYPES.AwaitExpression;
     argument: Expression;
@@ -630,10 +613,6 @@ declare interface AwaitExpression extends BaseNode {
 declare interface BaseNode extends NodeOrTokenData {
     type: AST_NODE_TYPES;
 }
-declare interface BaseToken extends NodeOrTokenData {
-    type: AST_TOKEN_TYPES;
-    value: string;
-}
 declare interface BigIntLiteral extends LiteralBase {
     bigint: string;
     value: bigint | null;
@@ -672,9 +651,6 @@ declare interface BinaryOperatorToText {
 }
 declare type BindingName = BindingPattern | Identifier;
 declare type BindingPattern = ArrayPattern | ObjectPattern;
-declare interface BlockComment extends BaseToken {
-    type: AST_TOKEN_TYPES.Block;
-}
 declare interface BlockStatement extends BaseNode {
     type: AST_NODE_TYPES.BlockStatement;
     body: Statement[];
@@ -683,9 +659,6 @@ declare interface BooleanLiteral extends LiteralBase {
     raw: 'false' | 'true';
     value: boolean;
 }
-declare interface BooleanToken extends BaseToken {
-    type: AST_TOKEN_TYPES.Boolean;
-}
 declare interface BreakStatement extends BaseNode {
     type: AST_NODE_TYPES.BreakStatement;
     label: Identifier | null;
@@ -766,7 +739,6 @@ declare interface ClassBody extends BaseNode {
     type: AST_NODE_TYPES.ClassBody;
     body: ClassElement[];
 }
-declare type ClassDeclaration = ClassDeclarationWithName | ClassDeclarationWithOptionalName;
 declare interface ClassDeclarationBase extends ClassBase {
     type: AST_NODE_TYPES.ClassDeclaration;
 }
@@ -803,7 +775,6 @@ declare interface ClassPropertyDefinitionNonComputedNameBase extends PropertyDef
     key: ClassPropertyNameNonComputed;
 }
 declare type ClassPropertyNameNonComputed = PrivateIdentifier | PropertyNameNonComputed;
-declare type Comment = BlockComment | LineComment;
 declare interface ConditionalExpression extends BaseNode {
     type: AST_NODE_TYPES.ConditionalExpression;
     alternate: Expression;
@@ -1096,7 +1067,6 @@ declare interface FunctionBase extends BaseNode {
      */
     typeParameters: TSTypeParameterDeclaration | undefined;
 }
-declare type FunctionDeclaration = FunctionDeclarationWithName | FunctionDeclarationWithOptionalName;
 declare interface FunctionDeclarationBase extends FunctionBase {
     type: AST_NODE_TYPES.FunctionDeclaration;
     body: BlockStatement;
@@ -1133,9 +1103,6 @@ declare interface Identifier extends BaseNode {
     optional: boolean;
     typeAnnotation: TSTypeAnnotation | undefined;
 }
-declare interface IdentifierToken extends BaseToken {
-    type: AST_TOKEN_TYPES.Identifier;
-}
 declare interface IfStatement extends BaseNode {
     type: AST_NODE_TYPES.IfStatement;
     alternate: Statement | null;
@@ -1261,9 +1228,6 @@ declare interface JSXIdentifier extends BaseNode {
     type: AST_NODE_TYPES.JSXIdentifier;
     name: string;
 }
-declare interface JSXIdentifierToken extends BaseToken {
-    type: AST_TOKEN_TYPES.JSXIdentifier;
-}
 declare interface JSXMemberExpression extends BaseNode {
     type: AST_NODE_TYPES.JSXMemberExpression;
     object: JSXTagNameExpression;
@@ -1298,12 +1262,6 @@ declare interface JSXText extends BaseNode {
     raw: string;
     value: string;
 }
-declare interface JSXTextToken extends BaseToken {
-    type: AST_TOKEN_TYPES.JSXText;
-}
-declare interface KeywordToken extends BaseToken {
-    type: AST_TOKEN_TYPES.Keyword;
-}
 declare interface LabeledStatement extends BaseNode {
     type: AST_NODE_TYPES.LabeledStatement;
     body: Statement;
@@ -1367,9 +1325,6 @@ declare interface LetOrVarNonDeclaredDeclaration extends LetOrConstOrVarDeclarat
     declare: false;
     kind: 'let' | 'var';
 }
-declare interface LineComment extends BaseToken {
-    type: AST_TOKEN_TYPES.Line;
-}
 declare type Literal = BigIntLiteral | BooleanLiteral | NullLiteral | NumberLiteral | RegExpLiteral | StringLiteral;
 declare interface LiteralBase extends BaseNode {
     type: AST_NODE_TYPES.Literal;
@@ -1439,7 +1394,6 @@ declare interface NewExpression extends BaseNode {
     callee: Expression;
     typeArguments: TSTypeParameterInstantiation | undefined;
 }
-declare type Node = AccessorProperty | ArrayExpression | ArrayPattern | ArrowFunctionExpression | AssignmentExpression | AssignmentPattern | AwaitExpression | BinaryExpression | BlockStatement | BreakStatement | CallExpression | CatchClause | ChainExpression | ClassBody | ClassDeclaration | ClassExpression | ConditionalExpression | ContinueStatement | DebuggerStatement | Decorator | DoWhileStatement | EmptyStatement | ExportAllDeclaration | ExportDefaultDeclaration | ExportNamedDeclaration | ExportSpecifier | ExpressionStatement | ForInStatement | ForOfStatement | ForStatement | FunctionDeclaration | FunctionExpression | Identifier | IfStatement | ImportAttribute | ImportDeclaration | ImportDefaultSpecifier | ImportExpression | ImportNamespaceSpecifier | ImportSpecifier | JSXAttribute | JSXClosingElement | JSXClosingFragment | JSXElement | JSXEmptyExpression | JSXExpressionContainer | JSXFragment | JSXIdentifier | JSXMemberExpression | JSXNamespacedName | JSXOpeningElement | JSXOpeningFragment | JSXSpreadAttribute | JSXSpreadChild | JSXText | LabeledStatement | Literal | LogicalExpression | MemberExpression | MetaProperty | MethodDefinition | NewExpression | ObjectExpression | ObjectPattern | PrivateIdentifier | Program | Property | PropertyDefinition | RestElement | ReturnStatement | SequenceExpression | SpreadElement | StaticBlock | Super | SwitchCase | SwitchStatement | TaggedTemplateExpression | TemplateElement | TemplateLiteral | ThisExpression | ThrowStatement | TryStatement | TSAbstractAccessorProperty | TSAbstractKeyword | TSAbstractMethodDefinition | TSAbstractPropertyDefinition | TSAnyKeyword | TSArrayType | TSAsExpression | TSAsyncKeyword | TSBigIntKeyword | TSBooleanKeyword | TSCallSignatureDeclaration | TSClassImplements | TSConditionalType | TSConstructorType | TSConstructSignatureDeclaration | TSDeclareFunction | TSDeclareKeyword | TSEmptyBodyFunctionExpression | TSEnumBody | TSEnumDeclaration | TSEnumMember | TSExportAssignment | TSExportKeyword | TSExternalModuleReference | TSFunctionType | TSImportEqualsDeclaration | TSImportType | TSIndexedAccessType | TSIndexSignature | TSInferType | TSInstantiationExpression | TSInterfaceBody | TSInterfaceDeclaration | TSInterfaceHeritage | TSIntersectionType | TSIntrinsicKeyword | TSLiteralType | TSMappedType | TSMethodSignature | TSModuleBlock | TSModuleDeclaration | TSNamedTupleMember | TSNamespaceExportDeclaration | TSNeverKeyword | TSNonNullExpression | TSNullKeyword | TSNumberKeyword | TSObjectKeyword | TSOptionalType | TSParameterProperty | TSPrivateKeyword | TSPropertySignature | TSProtectedKeyword | TSPublicKeyword | TSQualifiedName | TSReadonlyKeyword | TSRestType | TSSatisfiesExpression | TSStaticKeyword | TSStringKeyword | TSSymbolKeyword | TSTemplateLiteralType | TSThisType | TSTupleType | TSTypeAliasDeclaration | TSTypeAnnotation | TSTypeAssertion | TSTypeLiteral | TSTypeOperator | TSTypeParameter | TSTypeParameterDeclaration | TSTypeParameterInstantiation | TSTypePredicate | TSTypeQuery | TSTypeReference | TSUndefinedKeyword | TSUnionType | TSUnknownKeyword | TSVoidKeyword | UnaryExpression | UpdateExpression | VariableDeclaration | VariableDeclarator | WhileStatement | WithStatement | YieldExpression;
 declare interface NodeOrTokenData {
     type: string;
     /**
@@ -1454,15 +1408,9 @@ declare interface NullLiteral extends LiteralBase {
     raw: 'null';
     value: null;
 }
-declare interface NullToken extends BaseToken {
-    type: AST_TOKEN_TYPES.Null;
-}
 declare interface NumberLiteral extends LiteralBase {
     value: number;
 }
-declare interface NumericToken extends BaseToken {
-    type: AST_TOKEN_TYPES.Numeric;
-}
 declare interface ObjectExpression extends BaseNode {
     type: AST_NODE_TYPES.ObjectExpression;
     properties: ObjectLiteralElement[];
@@ -1490,13 +1438,6 @@ declare interface PrivateIdentifier extends BaseNode {
     type: AST_NODE_TYPES.PrivateIdentifier;
     name: string;
 }
-declare interface Program extends NodeOrTokenData {
-    type: AST_NODE_TYPES.Program;
-    body: ProgramStatement[];
-    comments: Comment[] | undefined;
-    sourceType: 'module' | 'script';
-    tokens: Token[] | undefined;
-}
 declare type ProgramStatement = ExportAllDeclaration | ExportDefaultDeclaration | ExportNamedDeclaration | ImportDeclaration | Statement | TSImportEqualsDeclaration | TSNamespaceExportDeclaration;
 declare type Property = PropertyComputedName | PropertyNonComputedName;
 declare interface PropertyBase extends BaseNode {
@@ -1549,57 +1490,6 @@ declare interface PropertyNonComputedName extends PropertyBase {
     computed: false;
     key: PropertyNameNonComputed;
 }
-declare interface PunctuatorToken extends BaseToken {
-    type: AST_TOKEN_TYPES.Punctuator;
-    value: ValueOf<PunctuatorTokenToText>;
-}
-declare interface PunctuatorTokenToText extends AssignmentOperatorToText {
-    [SyntaxKind.AmpersandAmpersandToken]: '&&';
-    [SyntaxKind.AmpersandToken]: '&';
-    [SyntaxKind.AsteriskAsteriskToken]: '**';
-    [SyntaxKind.AsteriskToken]: '*';
-    [SyntaxKind.AtToken]: '@';
-    [SyntaxKind.BacktickToken]: '`';
-    [SyntaxKind.BarBarToken]: '||';
-    [SyntaxKind.BarToken]: '|';
-    [SyntaxKind.CaretToken]: '^';
-    [SyntaxKind.CloseBraceToken]: '}';
-    [SyntaxKind.CloseBracketToken]: ']';
-    [SyntaxKind.CloseParenToken]: ')';
-    [SyntaxKind.ColonToken]: ':';
-    [SyntaxKind.CommaToken]: ',';
-    [SyntaxKind.DotDotDotToken]: '...';
-    [SyntaxKind.DotToken]: '.';
-    [SyntaxKind.EqualsEqualsEqualsToken]: '===';
-    [SyntaxKind.EqualsEqualsToken]: '==';
-    [SyntaxKind.EqualsGreaterThanToken]: '=>';
-    [SyntaxKind.ExclamationEqualsEqualsToken]: '!==';
-    [SyntaxKind.ExclamationEqualsToken]: '!=';
-    [SyntaxKind.ExclamationToken]: '!';
-    [SyntaxKind.GreaterThanEqualsToken]: '>=';
-    [SyntaxKind.GreaterThanGreaterThanGreaterThanToken]: '>>>';
-    [SyntaxKind.GreaterThanGreaterThanToken]: '>>';
-    [SyntaxKind.GreaterThanToken]: '>';
-    [SyntaxKind.HashToken]: '#';
-    [SyntaxKind.LessThanEqualsToken]: '<=';
-    [SyntaxKind.LessThanLessThanToken]: '<<';
-    [SyntaxKind.LessThanSlashToken]: '</';
-    [SyntaxKind.LessThanToken]: '<';
-    [SyntaxKind.MinusMinusToken]: '--';
-    [SyntaxKind.MinusToken]: '-';
-    [SyntaxKind.OpenBraceToken]: '{';
-    [SyntaxKind.OpenBracketToken]: '[';
-    [SyntaxKind.OpenParenToken]: '(';
-    [SyntaxKind.PercentToken]: '%';
-    [SyntaxKind.PlusPlusToken]: '++';
-    [SyntaxKind.PlusToken]: '+';
-    [SyntaxKind.QuestionDotToken]: '?.';
-    [SyntaxKind.QuestionQuestionToken]: '??';
-    [SyntaxKind.QuestionToken]: '?';
-    [SyntaxKind.SemicolonToken]: ';';
-    [SyntaxKind.SlashToken]: '/';
-    [SyntaxKind.TildeToken]: '~';
-}
 /**
  * An array of two numbers.
  * Both numbers are a 0-based index which is the position in the array of source code characters.
@@ -1613,13 +1503,6 @@ declare interface RegExpLiteral extends LiteralBase {
     };
     value: RegExp | null;
 }
-declare interface RegularExpressionToken extends BaseToken {
-    type: AST_TOKEN_TYPES.RegularExpression;
-    regex: {
-        flags: string;
-        pattern: string;
-    };
-}
 declare interface RestElement extends BaseNode {
     type: AST_NODE_TYPES.RestElement;
     argument: DestructuringPattern;
@@ -1658,9 +1541,6 @@ declare interface StaticBlock extends BaseNode {
 declare interface StringLiteral extends LiteralBase {
     value: string;
 }
-declare interface StringToken extends BaseToken {
-    type: AST_TOKEN_TYPES.String;
-}
 declare interface Super extends BaseNode {
     type: AST_NODE_TYPES.Super;
 }
@@ -1693,9 +1573,6 @@ declare interface TemplateLiteral extends BaseNode {
     expressions: Expression[];
     quasis: TemplateElement[];
 }
-declare interface TemplateToken extends BaseToken {
-    type: AST_TOKEN_TYPES.Template;
-}
 declare interface ThisExpression extends BaseNode {
     type: AST_NODE_TYPES.ThisExpression;
 }
@@ -1703,7 +1580,6 @@ declare interface ThrowStatement extends BaseNode {
     type: AST_NODE_TYPES.ThrowStatement;
     argument: Expression;
 }
-declare type Token = BooleanToken | Comment | IdentifierToken | JSXIdentifierToken | JSXTextToken | KeywordToken | NullToken | NumericToken | PunctuatorToken | RegularExpressionToken | StringToken | TemplateToken;
 declare interface TryStatement extends BaseNode {
     type: AST_NODE_TYPES.TryStatement;
     block: BlockStatement;
@@ -2420,7 +2296,6 @@ declare interface UsingDeclarationBase extends BaseNode {
      */
     kind: 'await using' | 'using';
 }
-declare type UsingDeclarator = UsingInForOfDeclarator | UsingInNormalContextDeclarator;
 declare interface UsingInForOfDeclaration extends UsingDeclarationBase {
     /**
      * The variables declared by this declaration.
@@ -2456,7 +2331,6 @@ declare interface UsingInNormalContextDeclarator extends VariableDeclaratorBase
 }
 declare type ValueOf<T> = T[keyof T];
 declare type VariableDeclaration = LetOrConstOrVarDeclaration | UsingDeclaration;
-declare type VariableDeclarator = LetOrConstOrVarDeclarator | UsingDeclarator;
 declare interface VariableDeclaratorBase extends BaseNode {
     type: AST_NODE_TYPES.VariableDeclarator;
     /**
@@ -2521,69 +2395,16 @@ declare const isCreateElement: (node: Identifier | MemberExpression, context: _e
 declare const isCreateRef: (node: Identifier | MemberExpression, context: _eslint_react_shared.RuleContext) => boolean;
 declare const isForwardRef: (node: Identifier | MemberExpression, context: _eslint_react_shared.RuleContext) => boolean;
 declare const isMemo: (node: Identifier | MemberExpression, context: _eslint_react_shared.RuleContext) => boolean;
-declare const isChildrenCountCall: {
-    (context: _eslint_react_shared.RuleContext): (node: Node) => node is CallExpression & {
-        callee: MemberExpression;
-    };
-    (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression & {
-        callee: MemberExpression;
-    };
-};
-declare const isChildrenForEachCall: {
-    (context: _eslint_react_shared.RuleContext): (node: Node) => node is CallExpression & {
-        callee: MemberExpression;
-    };
-    (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression & {
-        callee: MemberExpression;
-    };
-};
-declare const isChildrenMapCall: {
-    (context: _eslint_react_shared.RuleContext): (node: Node) => node is CallExpression & {
-        callee: MemberExpression;
-    };
-    (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression & {
-        callee: MemberExpression;
-    };
-};
-declare const isChildrenOnlyCall: {
-    (context: _eslint_react_shared.RuleContext): (node: Node) => node is CallExpression & {
-        callee: MemberExpression;
-    };
-    (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression & {
-        callee: MemberExpression;
-    };
-};
-declare const isChildrenToArrayCall: {
-    (context: _eslint_react_shared.RuleContext): (node: Node) => node is CallExpression & {
-        callee: MemberExpression;
-    };
-    (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression & {
-        callee: MemberExpression;
-    };
-};
-declare const isCloneElementCall: {
-    (context: _eslint_react_shared.RuleContext): (node: Node) => node is CallExpression;
-    (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression;
-};
-declare const isCreateContextCall: {
-    (context: _eslint_react_shared.RuleContext): (node: Node) => node is CallExpression;
-    (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression;
-};
-declare const isCreateElementCall: {
-    (context: _eslint_react_shared.RuleContext): (node: Node) => node is CallExpression;
-    (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression;
-};
-declare const isCreateRefCall: {
-    (context: _eslint_react_shared.RuleContext): (node: Node) => node is CallExpression;
-    (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression;
-};
-declare const isForwardRefCall: {
-    (context: _eslint_react_shared.RuleContext): (node: Node) => node is CallExpression;
-    (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression;
-};
-declare const isMemoCall: {
-    (context: _eslint_react_shared.RuleContext): (node: Node) => node is CallExpression;
-    (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression;
-};
+declare const isChildrenCountCall: isCallFromReactMember.ReturnType;
+declare const isChildrenForEachCall: isCallFromReactMember.ReturnType;
+declare const isChildrenMapCall: isCallFromReactMember.ReturnType;
+declare const isChildrenOnlyCall: isCallFromReactMember.ReturnType;
+declare const isChildrenToArrayCall: isCallFromReactMember.ReturnType;
+declare const isCloneElementCall: isCallFromReact.ReturnType;
+declare const isCreateContextCall: isCallFromReact.ReturnType;
+declare const isCreateElementCall: isCallFromReact.ReturnType;
+declare const isCreateRefCall: isCallFromReact.ReturnType;
+declare const isForwardRefCall: isCallFromReact.ReturnType;
+declare const isMemoCall: isCallFromReact.ReturnType;
-export { COMPONENT_DISPLAY_NAME_ASSIGNMENT_SELECTOR, type ComponentCollectorOptions, DEFAULT_COMPONENT_HINT, type ERClassComponent, type ERComponent, ERComponentFlag, ERComponentHint, type ERComponentKind, type EREffectKind, type EREffectPhaseKind, type ERFunctionComponent, type ERHook, type ERHookKind, type ERLifecyclePhaseKind, type ERPhaseKind, ERPhaseRelevance, type ERSemanticEntry, type ERSemanticNode, type ERStateKind, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getFunctionComponentIdentifier, hasNoneOrValidComponentName, isCallFromReact, isCallFromReactMember, isChildrenCount, isChildrenCountCall, isChildrenForEach, isChildrenForEachCall, isChildrenMap, isChildrenMapCall, isChildrenOfCreateElement, isChildrenOnly, isChildrenOnlyCall, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCloneElement, isCloneElementCall, isComponentDidCatch, isComponentDidMount, isComponentDisplayNameAssignment, isComponentName, isComponentWillUnmount, isCreateContext, isCreateContextCall, isCreateElement, isCreateElementCall, isCreateRef, isCreateRefCall, isDeclaredInRenderPropLoose, isDirectValueOfRenderPropertyLoose, isForwardRef, isForwardRefCall, isFromReact, isFromReactMember, isFunctionOfComponentDidMount, isFunctionOfComponentWillUnmount, isFunctionOfRenderMethod, isFunctionOfUseEffectCleanup, isFunctionOfUseEffectSetup, isGetDerivedStateFromError, isGetDerivedStateFromProps, isInitializedFromReact, isInsideCreateElementProps, isInsideReactHook, isInsideRenderMethod, isInversePhase, isMemo, isMemoCall, isPureComponent, isReactAPICallWithName, isReactAPIWithName, isReactHook, isReactHookCall, isReactHookCallWithName, isReactHookCallWithNameAlias, isReactHookCallWithNameLoose, isReactHookName, isRenderFunctionLoose, isRenderMethodLike, isRenderPropLoose, isThisSetState, isUseCallbackCall, isUseContextCall, isUseDebugValueCall, isUseDeferredValueCall, isUseEffectCall, isUseEffectCallLoose, isUseIdCall, isUseImperativeHandleCall, isUseInsertionEffectCall, isUseLayoutEffectCall, isUseMemoCall, isUseReducerCall, isUseRefCall, isUseStateCall, isUseSyncExternalStoreCall, isUseTransitionCall, useComponentCollector, useComponentCollectorLegacy, useHookCollector };
+export { COMPONENT_DISPLAY_NAME_ASSIGNMENT_SELECTOR, DEFAULT_COMPONENT_HINT, type ERClassComponent, type ERComponent, ERComponentFlag, ERComponentHint, type ERComponentKind, type EREffectKind, type EREffectPhaseKind, type ERFunctionComponent, type ERHook, type ERHookKind, type ERLifecyclePhaseKind, type ERPhaseKind, ERPhaseRelevance, type ERSemanticEntry, type ERSemanticNode, type ERStateKind, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getFunctionComponentIdentifier, hasNoneOrValidComponentName, isCallFromReact, isCallFromReactMember, isChildrenCount, isChildrenCountCall, isChildrenForEach, isChildrenForEachCall, isChildrenMap, isChildrenMapCall, isChildrenOfCreateElement, isChildrenOnly, isChildrenOnlyCall, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCloneElement, isCloneElementCall, isComponentDidCatch, isComponentDidMount, isComponentDisplayNameAssignment, isComponentName, isComponentWillUnmount, isCreateContext, isCreateContextCall, isCreateElement, isCreateElementCall, isCreateRef, isCreateRefCall, isDeclaredInRenderPropLoose, isDirectValueOfRenderPropertyLoose, isForwardRef, isForwardRefCall, isFromReact, isFromReactMember, isFunctionOfComponentDidMount, isFunctionOfComponentWillUnmount, isFunctionOfRenderMethod, isFunctionOfUseEffectCleanup, isFunctionOfUseEffectSetup, isGetDerivedStateFromError, isGetDerivedStateFromProps, isInitializedFromReact, isInsideCreateElementProps, isInsideReactHook, isInsideRenderMethod, isInversePhase, isMemo, isMemoCall, isPureComponent, isReactAPICallWithName, isReactAPIWithName, isReactHook, isReactHookCall, isReactHookCallWithName, isReactHookCallWithNameAlias, isReactHookCallWithNameLoose, isReactHookName, isRenderFunctionLoose, isRenderMethodLike, isRenderPropLoose, isThisSetState, isUseCallbackCall, isUseContextCall, isUseDebugValueCall, isUseDeferredValueCall, isUseEffectCall, isUseEffectCallLoose, isUseIdCall, isUseImperativeHandleCall, isUseInsertionEffectCall, isUseLayoutEffectCall, isUseMemoCall, isUseReducerCall, isUseRefCall, isUseStateCall, isUseSyncExternalStoreCall, isUseTransitionCall, useComponentCollector, useComponentCollectorLegacy, useHookCollector };

package/dist/index.d.ts CHANGED Viewed

@@ -1,9 +1,9 @@
 import * as AST from '@eslint-react/ast';
+import { _ } from '@eslint-react/eff';
 import * as _eslint_react_shared from '@eslint-react/shared';
 import { RuleContext } from '@eslint-react/shared';
 import { TSESTree } from '@typescript-eslint/types';
-import { _ } from '@eslint-react/eff';
-import { TSESTree as TSESTree$1 } from '@typescript-eslint/utils';
+import { ESLintUtils, TSESTree as TSESTree$1 } from '@typescript-eslint/utils';
 import * as birecord from 'birecord';
 import * as _typescript_eslint_utils_ts_eslint from '@typescript-eslint/utils/ts-eslint';
 import { Scope } from '@typescript-eslint/scope-manager';
@@ -76,10 +76,6 @@ interface ERClassComponent extends ERSemanticNode {
 }
 type ERComponent = ERClassComponent | ERFunctionComponent;
-interface ComponentCollectorOptions {
-    collectDisplayName?: boolean;
-    collectHookCalls?: boolean;
-}
 /**
  * Get a ctx and listeners for the rule to collect function components
  * @param context The ESLint rule context
@@ -87,49 +83,43 @@ interface ComponentCollectorOptions {
  * @param options The options to use
  * @returns The component collector
  */
-declare function useComponentCollector(context: RuleContext, hint?: bigint, options?: ComponentCollectorOptions): {
-    readonly ctx: {
-        readonly getAllComponents: (node: TSESTree.Program) => Map<string, ERFunctionComponent>;
-        readonly getCurrentEntries: () => {
-            key: string;
-            node: AST.TSESTreeFunction;
-            hookCalls: TSESTree.CallExpression[];
-            isComponent: boolean;
-        }[];
-        readonly getCurrentEntry: () => {
-            key: string;
-            node: AST.TSESTreeFunction;
-            hookCalls: TSESTree.CallExpression[];
-            isComponent: boolean;
-        } | undefined;
+declare function useComponentCollector(context: RuleContext, hint?: bigint, options?: useComponentCollector.Options): useComponentCollector.ReturnType;
+declare namespace useComponentCollector {
+    type Options = {
+        collectDisplayName?: boolean;
+        collectHookCalls?: boolean;
     };
-    readonly listeners: {
-        readonly "ReturnStatement[type]": (node: TSESTree.ReturnStatement) => void;
-        readonly "CallExpression[type]:exit"?: (node: TSESTree.CallExpression) => void;
-        readonly ":function[type]": (node: AST.TSESTreeFunction) => void;
-        readonly ":function[type]:exit": () => {
-            key: string;
-            node: AST.TSESTreeFunction;
-            hookCalls: TSESTree.CallExpression[];
-            isComponent: boolean;
-        } | undefined;
-        readonly "ArrowFunctionExpression[type][body.type!='BlockStatement']": () => void;
+    type Entry = {
+        key: string;
+        node: AST.TSESTreeFunction;
+        hookCalls: TSESTree.CallExpression[];
+        isComponent: boolean;
     };
-};
+    type Ctx = {
+        getAllComponents: (node: TSESTree.Program) => Map<string, ERFunctionComponent>;
+        getCurrentEntries: () => Entry[];
+        getCurrentEntry: () => Entry | _;
+    };
+    type ReturnType = {
+        ctx: Ctx;
+        listeners: ESLintUtils.RuleListener;
+    };
+}
 /**
  * Get a ctx and listeners for the rule to collect class components
  * @returns The context and listeners for the rule
  */
-declare function useComponentCollectorLegacy(): {
-    readonly ctx: {
-        readonly getAllComponents: (node: TSESTree$1.Program) => Map<string, ERClassComponent>;
+declare function useComponentCollectorLegacy(): useComponentCollectorLegacy.ReturnType;
+declare namespace useComponentCollectorLegacy {
+    type Ctx = {
+        getAllComponents: (node: TSESTree$1.Program) => Map<string, ERClassComponent>;
     };
-    readonly listeners: {
-        readonly "ClassDeclaration[type]": (node: AST.TSESTreeClass) => void;
-        readonly "ClassExpression[type]": (node: AST.TSESTreeClass) => void;
+    type ReturnType = {
+        ctx: Ctx;
+        listeners: ESLintUtils.RuleListener;
     };
-};
+}
 /**
  * The ESQuery selector for a component display name assignment expression
@@ -284,17 +274,21 @@ interface ERHook extends ERSemanticNode {
     hookCalls: TSESTree.CallExpression[];
 }
-declare function useHookCollector(): {
-    readonly ctx: {
-        readonly getAllHooks: (node: TSESTree$1.Program) => Map<string, ERHook>;
-        readonly getCurrentHooks: () => Map<string, ERHook>;
+declare function useHookCollector(): useHookCollector.ReturnType;
+declare namespace useHookCollector {
+    type Entry = {
+        key: string;
+        node: AST.TSESTreeFunction;
+        isHook: boolean;
     };
-    readonly listeners: {
-        readonly ":function[type]": (node: AST.TSESTreeFunction) => void;
-        readonly ":function[type]:exit": () => void;
-        readonly "CallExpression[type]": (node: never) => void;
+    type Ctx = {
+        getAllHooks(node: TSESTree$1.Program): Map<string, ERHook>;
     };
-};
+    type ReturnType = {
+        ctx: Ctx;
+        listeners: ESLintUtils.RuleListener;
+    };
+}
 type ERHookKind = "custom" | "useActionState" | "useCallback" | "useContext" | "useDebugValue" | "useDeferredValue" | "useEffect" | "useId" | "useImperativeHandle" | "useInsertionEffect" | "useLayoutEffect" | "useMemo" | "useOptimistic" | "useReducer" | "useRef" | "useState" | "useSyncExternalStore" | "useTransition";
@@ -346,20 +340,24 @@ declare function isFromReact(name: string): (node: TSESTree.Identifier | TSESTre
  * @returns A function that checks if a given node is a member expression of a Pragma member.
  */
 declare function isFromReactMember(memberName: string, name: string): (node: TSESTree.MemberExpression, context: RuleContext) => boolean;
-type IsCallFromReact = {
-    (context: RuleContext): (node: TSESTree.Node) => node is TSESTree.CallExpression;
-    (node: TSESTree.Node, context: RuleContext): node is TSESTree.CallExpression;
-};
-declare function isCallFromReact(name: string): IsCallFromReact;
-type IsCallFromReactMember = {
-    (context: RuleContext): (node: TSESTree.Node) => node is TSESTree.CallExpression & {
-        callee: TSESTree.MemberExpression;
+declare function isCallFromReact(name: string): isCallFromReact.ReturnType;
+declare namespace isCallFromReact {
+    type ReturnType = {
+        (context: RuleContext): (node: TSESTree.Node) => node is TSESTree.CallExpression;
+        (node: TSESTree.Node, context: RuleContext): node is TSESTree.CallExpression;
     };
-    (node: TSESTree.Node, context: RuleContext): node is TSESTree.CallExpression & {
-        callee: TSESTree.MemberExpression;
+}
+declare function isCallFromReactMember(pragmaMemberName: string, name: string): isCallFromReactMember.ReturnType;
+declare namespace isCallFromReactMember {
+    type ReturnType = {
+        (context: RuleContext): (node: TSESTree.Node) => node is TSESTree.CallExpression & {
+            callee: TSESTree.MemberExpression;
+        };
+        (node: TSESTree.Node, context: RuleContext): node is TSESTree.CallExpression & {
+            callee: TSESTree.MemberExpression;
+        };
     };
-};
-declare function isCallFromReactMember(pragmaMemberName: string, name: string): IsCallFromReactMember;
+}
 declare function isInitializedFromReact(name: string, importSource: string, initialScope: Scope): boolean;
@@ -608,21 +606,6 @@ declare enum AST_NODE_TYPES {
     TSUnknownKeyword = "TSUnknownKeyword",
     TSVoidKeyword = "TSVoidKeyword"
 }
-declare enum AST_TOKEN_TYPES {
-    Boolean = "Boolean",
-    Identifier = "Identifier",
-    JSXIdentifier = "JSXIdentifier",
-    JSXText = "JSXText",
-    Keyword = "Keyword",
-    Null = "Null",
-    Numeric = "Numeric",
-    Punctuator = "Punctuator",
-    RegularExpression = "RegularExpression",
-    String = "String",
-    Template = "Template",
-    Block = "Block",
-    Line = "Line"
-}
 declare interface AwaitExpression extends BaseNode {
     type: AST_NODE_TYPES.AwaitExpression;
     argument: Expression;
@@ -630,10 +613,6 @@ declare interface AwaitExpression extends BaseNode {
 declare interface BaseNode extends NodeOrTokenData {
     type: AST_NODE_TYPES;
 }
-declare interface BaseToken extends NodeOrTokenData {
-    type: AST_TOKEN_TYPES;
-    value: string;
-}
 declare interface BigIntLiteral extends LiteralBase {
     bigint: string;
     value: bigint | null;
@@ -672,9 +651,6 @@ declare interface BinaryOperatorToText {
 }
 declare type BindingName = BindingPattern | Identifier;
 declare type BindingPattern = ArrayPattern | ObjectPattern;
-declare interface BlockComment extends BaseToken {
-    type: AST_TOKEN_TYPES.Block;
-}
 declare interface BlockStatement extends BaseNode {
     type: AST_NODE_TYPES.BlockStatement;
     body: Statement[];
@@ -683,9 +659,6 @@ declare interface BooleanLiteral extends LiteralBase {
     raw: 'false' | 'true';
     value: boolean;
 }
-declare interface BooleanToken extends BaseToken {
-    type: AST_TOKEN_TYPES.Boolean;
-}
 declare interface BreakStatement extends BaseNode {
     type: AST_NODE_TYPES.BreakStatement;
     label: Identifier | null;
@@ -766,7 +739,6 @@ declare interface ClassBody extends BaseNode {
     type: AST_NODE_TYPES.ClassBody;
     body: ClassElement[];
 }
-declare type ClassDeclaration = ClassDeclarationWithName | ClassDeclarationWithOptionalName;
 declare interface ClassDeclarationBase extends ClassBase {
     type: AST_NODE_TYPES.ClassDeclaration;
 }
@@ -803,7 +775,6 @@ declare interface ClassPropertyDefinitionNonComputedNameBase extends PropertyDef
     key: ClassPropertyNameNonComputed;
 }
 declare type ClassPropertyNameNonComputed = PrivateIdentifier | PropertyNameNonComputed;
-declare type Comment = BlockComment | LineComment;
 declare interface ConditionalExpression extends BaseNode {
     type: AST_NODE_TYPES.ConditionalExpression;
     alternate: Expression;
@@ -1096,7 +1067,6 @@ declare interface FunctionBase extends BaseNode {
      */
     typeParameters: TSTypeParameterDeclaration | undefined;
 }
-declare type FunctionDeclaration = FunctionDeclarationWithName | FunctionDeclarationWithOptionalName;
 declare interface FunctionDeclarationBase extends FunctionBase {
     type: AST_NODE_TYPES.FunctionDeclaration;
     body: BlockStatement;
@@ -1133,9 +1103,6 @@ declare interface Identifier extends BaseNode {
     optional: boolean;
     typeAnnotation: TSTypeAnnotation | undefined;
 }
-declare interface IdentifierToken extends BaseToken {
-    type: AST_TOKEN_TYPES.Identifier;
-}
 declare interface IfStatement extends BaseNode {
     type: AST_NODE_TYPES.IfStatement;
     alternate: Statement | null;
@@ -1261,9 +1228,6 @@ declare interface JSXIdentifier extends BaseNode {
     type: AST_NODE_TYPES.JSXIdentifier;
     name: string;
 }
-declare interface JSXIdentifierToken extends BaseToken {
-    type: AST_TOKEN_TYPES.JSXIdentifier;
-}
 declare interface JSXMemberExpression extends BaseNode {
     type: AST_NODE_TYPES.JSXMemberExpression;
     object: JSXTagNameExpression;
@@ -1298,12 +1262,6 @@ declare interface JSXText extends BaseNode {
     raw: string;
     value: string;
 }
-declare interface JSXTextToken extends BaseToken {
-    type: AST_TOKEN_TYPES.JSXText;
-}
-declare interface KeywordToken extends BaseToken {
-    type: AST_TOKEN_TYPES.Keyword;
-}
 declare interface LabeledStatement extends BaseNode {
     type: AST_NODE_TYPES.LabeledStatement;
     body: Statement;
@@ -1367,9 +1325,6 @@ declare interface LetOrVarNonDeclaredDeclaration extends LetOrConstOrVarDeclarat
     declare: false;
     kind: 'let' | 'var';
 }
-declare interface LineComment extends BaseToken {
-    type: AST_TOKEN_TYPES.Line;
-}
 declare type Literal = BigIntLiteral | BooleanLiteral | NullLiteral | NumberLiteral | RegExpLiteral | StringLiteral;
 declare interface LiteralBase extends BaseNode {
     type: AST_NODE_TYPES.Literal;
@@ -1439,7 +1394,6 @@ declare interface NewExpression extends BaseNode {
     callee: Expression;
     typeArguments: TSTypeParameterInstantiation | undefined;
 }
-declare type Node = AccessorProperty | ArrayExpression | ArrayPattern | ArrowFunctionExpression | AssignmentExpression | AssignmentPattern | AwaitExpression | BinaryExpression | BlockStatement | BreakStatement | CallExpression | CatchClause | ChainExpression | ClassBody | ClassDeclaration | ClassExpression | ConditionalExpression | ContinueStatement | DebuggerStatement | Decorator | DoWhileStatement | EmptyStatement | ExportAllDeclaration | ExportDefaultDeclaration | ExportNamedDeclaration | ExportSpecifier | ExpressionStatement | ForInStatement | ForOfStatement | ForStatement | FunctionDeclaration | FunctionExpression | Identifier | IfStatement | ImportAttribute | ImportDeclaration | ImportDefaultSpecifier | ImportExpression | ImportNamespaceSpecifier | ImportSpecifier | JSXAttribute | JSXClosingElement | JSXClosingFragment | JSXElement | JSXEmptyExpression | JSXExpressionContainer | JSXFragment | JSXIdentifier | JSXMemberExpression | JSXNamespacedName | JSXOpeningElement | JSXOpeningFragment | JSXSpreadAttribute | JSXSpreadChild | JSXText | LabeledStatement | Literal | LogicalExpression | MemberExpression | MetaProperty | MethodDefinition | NewExpression | ObjectExpression | ObjectPattern | PrivateIdentifier | Program | Property | PropertyDefinition | RestElement | ReturnStatement | SequenceExpression | SpreadElement | StaticBlock | Super | SwitchCase | SwitchStatement | TaggedTemplateExpression | TemplateElement | TemplateLiteral | ThisExpression | ThrowStatement | TryStatement | TSAbstractAccessorProperty | TSAbstractKeyword | TSAbstractMethodDefinition | TSAbstractPropertyDefinition | TSAnyKeyword | TSArrayType | TSAsExpression | TSAsyncKeyword | TSBigIntKeyword | TSBooleanKeyword | TSCallSignatureDeclaration | TSClassImplements | TSConditionalType | TSConstructorType | TSConstructSignatureDeclaration | TSDeclareFunction | TSDeclareKeyword | TSEmptyBodyFunctionExpression | TSEnumBody | TSEnumDeclaration | TSEnumMember | TSExportAssignment | TSExportKeyword | TSExternalModuleReference | TSFunctionType | TSImportEqualsDeclaration | TSImportType | TSIndexedAccessType | TSIndexSignature | TSInferType | TSInstantiationExpression | TSInterfaceBody | TSInterfaceDeclaration | TSInterfaceHeritage | TSIntersectionType | TSIntrinsicKeyword | TSLiteralType | TSMappedType | TSMethodSignature | TSModuleBlock | TSModuleDeclaration | TSNamedTupleMember | TSNamespaceExportDeclaration | TSNeverKeyword | TSNonNullExpression | TSNullKeyword | TSNumberKeyword | TSObjectKeyword | TSOptionalType | TSParameterProperty | TSPrivateKeyword | TSPropertySignature | TSProtectedKeyword | TSPublicKeyword | TSQualifiedName | TSReadonlyKeyword | TSRestType | TSSatisfiesExpression | TSStaticKeyword | TSStringKeyword | TSSymbolKeyword | TSTemplateLiteralType | TSThisType | TSTupleType | TSTypeAliasDeclaration | TSTypeAnnotation | TSTypeAssertion | TSTypeLiteral | TSTypeOperator | TSTypeParameter | TSTypeParameterDeclaration | TSTypeParameterInstantiation | TSTypePredicate | TSTypeQuery | TSTypeReference | TSUndefinedKeyword | TSUnionType | TSUnknownKeyword | TSVoidKeyword | UnaryExpression | UpdateExpression | VariableDeclaration | VariableDeclarator | WhileStatement | WithStatement | YieldExpression;
 declare interface NodeOrTokenData {
     type: string;
     /**
@@ -1454,15 +1408,9 @@ declare interface NullLiteral extends LiteralBase {
     raw: 'null';
     value: null;
 }
-declare interface NullToken extends BaseToken {
-    type: AST_TOKEN_TYPES.Null;
-}
 declare interface NumberLiteral extends LiteralBase {
     value: number;
 }
-declare interface NumericToken extends BaseToken {
-    type: AST_TOKEN_TYPES.Numeric;
-}
 declare interface ObjectExpression extends BaseNode {
     type: AST_NODE_TYPES.ObjectExpression;
     properties: ObjectLiteralElement[];
@@ -1490,13 +1438,6 @@ declare interface PrivateIdentifier extends BaseNode {
     type: AST_NODE_TYPES.PrivateIdentifier;
     name: string;
 }
-declare interface Program extends NodeOrTokenData {
-    type: AST_NODE_TYPES.Program;
-    body: ProgramStatement[];
-    comments: Comment[] | undefined;
-    sourceType: 'module' | 'script';
-    tokens: Token[] | undefined;
-}
 declare type ProgramStatement = ExportAllDeclaration | ExportDefaultDeclaration | ExportNamedDeclaration | ImportDeclaration | Statement | TSImportEqualsDeclaration | TSNamespaceExportDeclaration;
 declare type Property = PropertyComputedName | PropertyNonComputedName;
 declare interface PropertyBase extends BaseNode {
@@ -1549,57 +1490,6 @@ declare interface PropertyNonComputedName extends PropertyBase {
     computed: false;
     key: PropertyNameNonComputed;
 }
-declare interface PunctuatorToken extends BaseToken {
-    type: AST_TOKEN_TYPES.Punctuator;
-    value: ValueOf<PunctuatorTokenToText>;
-}
-declare interface PunctuatorTokenToText extends AssignmentOperatorToText {
-    [SyntaxKind.AmpersandAmpersandToken]: '&&';
-    [SyntaxKind.AmpersandToken]: '&';
-    [SyntaxKind.AsteriskAsteriskToken]: '**';
-    [SyntaxKind.AsteriskToken]: '*';
-    [SyntaxKind.AtToken]: '@';
-    [SyntaxKind.BacktickToken]: '`';
-    [SyntaxKind.BarBarToken]: '||';
-    [SyntaxKind.BarToken]: '|';
-    [SyntaxKind.CaretToken]: '^';
-    [SyntaxKind.CloseBraceToken]: '}';
-    [SyntaxKind.CloseBracketToken]: ']';
-    [SyntaxKind.CloseParenToken]: ')';
-    [SyntaxKind.ColonToken]: ':';
-    [SyntaxKind.CommaToken]: ',';
-    [SyntaxKind.DotDotDotToken]: '...';
-    [SyntaxKind.DotToken]: '.';
-    [SyntaxKind.EqualsEqualsEqualsToken]: '===';
-    [SyntaxKind.EqualsEqualsToken]: '==';
-    [SyntaxKind.EqualsGreaterThanToken]: '=>';
-    [SyntaxKind.ExclamationEqualsEqualsToken]: '!==';
-    [SyntaxKind.ExclamationEqualsToken]: '!=';
-    [SyntaxKind.ExclamationToken]: '!';
-    [SyntaxKind.GreaterThanEqualsToken]: '>=';
-    [SyntaxKind.GreaterThanGreaterThanGreaterThanToken]: '>>>';
-    [SyntaxKind.GreaterThanGreaterThanToken]: '>>';
-    [SyntaxKind.GreaterThanToken]: '>';
-    [SyntaxKind.HashToken]: '#';
-    [SyntaxKind.LessThanEqualsToken]: '<=';
-    [SyntaxKind.LessThanLessThanToken]: '<<';
-    [SyntaxKind.LessThanSlashToken]: '</';
-    [SyntaxKind.LessThanToken]: '<';
-    [SyntaxKind.MinusMinusToken]: '--';
-    [SyntaxKind.MinusToken]: '-';
-    [SyntaxKind.OpenBraceToken]: '{';
-    [SyntaxKind.OpenBracketToken]: '[';
-    [SyntaxKind.OpenParenToken]: '(';
-    [SyntaxKind.PercentToken]: '%';
-    [SyntaxKind.PlusPlusToken]: '++';
-    [SyntaxKind.PlusToken]: '+';
-    [SyntaxKind.QuestionDotToken]: '?.';
-    [SyntaxKind.QuestionQuestionToken]: '??';
-    [SyntaxKind.QuestionToken]: '?';
-    [SyntaxKind.SemicolonToken]: ';';
-    [SyntaxKind.SlashToken]: '/';
-    [SyntaxKind.TildeToken]: '~';
-}
 /**
  * An array of two numbers.
  * Both numbers are a 0-based index which is the position in the array of source code characters.
@@ -1613,13 +1503,6 @@ declare interface RegExpLiteral extends LiteralBase {
     };
     value: RegExp | null;
 }
-declare interface RegularExpressionToken extends BaseToken {
-    type: AST_TOKEN_TYPES.RegularExpression;
-    regex: {
-        flags: string;
-        pattern: string;
-    };
-}
 declare interface RestElement extends BaseNode {
     type: AST_NODE_TYPES.RestElement;
     argument: DestructuringPattern;
@@ -1658,9 +1541,6 @@ declare interface StaticBlock extends BaseNode {
 declare interface StringLiteral extends LiteralBase {
     value: string;
 }
-declare interface StringToken extends BaseToken {
-    type: AST_TOKEN_TYPES.String;
-}
 declare interface Super extends BaseNode {
     type: AST_NODE_TYPES.Super;
 }
@@ -1693,9 +1573,6 @@ declare interface TemplateLiteral extends BaseNode {
     expressions: Expression[];
     quasis: TemplateElement[];
 }
-declare interface TemplateToken extends BaseToken {
-    type: AST_TOKEN_TYPES.Template;
-}
 declare interface ThisExpression extends BaseNode {
     type: AST_NODE_TYPES.ThisExpression;
 }
@@ -1703,7 +1580,6 @@ declare interface ThrowStatement extends BaseNode {
     type: AST_NODE_TYPES.ThrowStatement;
     argument: Expression;
 }
-declare type Token = BooleanToken | Comment | IdentifierToken | JSXIdentifierToken | JSXTextToken | KeywordToken | NullToken | NumericToken | PunctuatorToken | RegularExpressionToken | StringToken | TemplateToken;
 declare interface TryStatement extends BaseNode {
     type: AST_NODE_TYPES.TryStatement;
     block: BlockStatement;
@@ -2420,7 +2296,6 @@ declare interface UsingDeclarationBase extends BaseNode {
      */
     kind: 'await using' | 'using';
 }
-declare type UsingDeclarator = UsingInForOfDeclarator | UsingInNormalContextDeclarator;
 declare interface UsingInForOfDeclaration extends UsingDeclarationBase {
     /**
      * The variables declared by this declaration.
@@ -2456,7 +2331,6 @@ declare interface UsingInNormalContextDeclarator extends VariableDeclaratorBase
 }
 declare type ValueOf<T> = T[keyof T];
 declare type VariableDeclaration = LetOrConstOrVarDeclaration | UsingDeclaration;
-declare type VariableDeclarator = LetOrConstOrVarDeclarator | UsingDeclarator;
 declare interface VariableDeclaratorBase extends BaseNode {
     type: AST_NODE_TYPES.VariableDeclarator;
     /**
@@ -2521,69 +2395,16 @@ declare const isCreateElement: (node: Identifier | MemberExpression, context: _e
 declare const isCreateRef: (node: Identifier | MemberExpression, context: _eslint_react_shared.RuleContext) => boolean;
 declare const isForwardRef: (node: Identifier | MemberExpression, context: _eslint_react_shared.RuleContext) => boolean;
 declare const isMemo: (node: Identifier | MemberExpression, context: _eslint_react_shared.RuleContext) => boolean;
-declare const isChildrenCountCall: {
-    (context: _eslint_react_shared.RuleContext): (node: Node) => node is CallExpression & {
-        callee: MemberExpression;
-    };
-    (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression & {
-        callee: MemberExpression;
-    };
-};
-declare const isChildrenForEachCall: {
-    (context: _eslint_react_shared.RuleContext): (node: Node) => node is CallExpression & {
-        callee: MemberExpression;
-    };
-    (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression & {
-        callee: MemberExpression;
-    };
-};
-declare const isChildrenMapCall: {
-    (context: _eslint_react_shared.RuleContext): (node: Node) => node is CallExpression & {
-        callee: MemberExpression;
-    };
-    (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression & {
-        callee: MemberExpression;
-    };
-};
-declare const isChildrenOnlyCall: {
-    (context: _eslint_react_shared.RuleContext): (node: Node) => node is CallExpression & {
-        callee: MemberExpression;
-    };
-    (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression & {
-        callee: MemberExpression;
-    };
-};
-declare const isChildrenToArrayCall: {
-    (context: _eslint_react_shared.RuleContext): (node: Node) => node is CallExpression & {
-        callee: MemberExpression;
-    };
-    (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression & {
-        callee: MemberExpression;
-    };
-};
-declare const isCloneElementCall: {
-    (context: _eslint_react_shared.RuleContext): (node: Node) => node is CallExpression;
-    (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression;
-};
-declare const isCreateContextCall: {
-    (context: _eslint_react_shared.RuleContext): (node: Node) => node is CallExpression;
-    (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression;
-};
-declare const isCreateElementCall: {
-    (context: _eslint_react_shared.RuleContext): (node: Node) => node is CallExpression;
-    (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression;
-};
-declare const isCreateRefCall: {
-    (context: _eslint_react_shared.RuleContext): (node: Node) => node is CallExpression;
-    (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression;
-};
-declare const isForwardRefCall: {
-    (context: _eslint_react_shared.RuleContext): (node: Node) => node is CallExpression;
-    (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression;
-};
-declare const isMemoCall: {
-    (context: _eslint_react_shared.RuleContext): (node: Node) => node is CallExpression;
-    (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression;
-};
+declare const isChildrenCountCall: isCallFromReactMember.ReturnType;
+declare const isChildrenForEachCall: isCallFromReactMember.ReturnType;
+declare const isChildrenMapCall: isCallFromReactMember.ReturnType;
+declare const isChildrenOnlyCall: isCallFromReactMember.ReturnType;
+declare const isChildrenToArrayCall: isCallFromReactMember.ReturnType;
+declare const isCloneElementCall: isCallFromReact.ReturnType;
+declare const isCreateContextCall: isCallFromReact.ReturnType;
+declare const isCreateElementCall: isCallFromReact.ReturnType;
+declare const isCreateRefCall: isCallFromReact.ReturnType;
+declare const isForwardRefCall: isCallFromReact.ReturnType;
+declare const isMemoCall: isCallFromReact.ReturnType;
-export { COMPONENT_DISPLAY_NAME_ASSIGNMENT_SELECTOR, type ComponentCollectorOptions, DEFAULT_COMPONENT_HINT, type ERClassComponent, type ERComponent, ERComponentFlag, ERComponentHint, type ERComponentKind, type EREffectKind, type EREffectPhaseKind, type ERFunctionComponent, type ERHook, type ERHookKind, type ERLifecyclePhaseKind, type ERPhaseKind, ERPhaseRelevance, type ERSemanticEntry, type ERSemanticNode, type ERStateKind, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getFunctionComponentIdentifier, hasNoneOrValidComponentName, isCallFromReact, isCallFromReactMember, isChildrenCount, isChildrenCountCall, isChildrenForEach, isChildrenForEachCall, isChildrenMap, isChildrenMapCall, isChildrenOfCreateElement, isChildrenOnly, isChildrenOnlyCall, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCloneElement, isCloneElementCall, isComponentDidCatch, isComponentDidMount, isComponentDisplayNameAssignment, isComponentName, isComponentWillUnmount, isCreateContext, isCreateContextCall, isCreateElement, isCreateElementCall, isCreateRef, isCreateRefCall, isDeclaredInRenderPropLoose, isDirectValueOfRenderPropertyLoose, isForwardRef, isForwardRefCall, isFromReact, isFromReactMember, isFunctionOfComponentDidMount, isFunctionOfComponentWillUnmount, isFunctionOfRenderMethod, isFunctionOfUseEffectCleanup, isFunctionOfUseEffectSetup, isGetDerivedStateFromError, isGetDerivedStateFromProps, isInitializedFromReact, isInsideCreateElementProps, isInsideReactHook, isInsideRenderMethod, isInversePhase, isMemo, isMemoCall, isPureComponent, isReactAPICallWithName, isReactAPIWithName, isReactHook, isReactHookCall, isReactHookCallWithName, isReactHookCallWithNameAlias, isReactHookCallWithNameLoose, isReactHookName, isRenderFunctionLoose, isRenderMethodLike, isRenderPropLoose, isThisSetState, isUseCallbackCall, isUseContextCall, isUseDebugValueCall, isUseDeferredValueCall, isUseEffectCall, isUseEffectCallLoose, isUseIdCall, isUseImperativeHandleCall, isUseInsertionEffectCall, isUseLayoutEffectCall, isUseMemoCall, isUseReducerCall, isUseRefCall, isUseStateCall, isUseSyncExternalStoreCall, isUseTransitionCall, useComponentCollector, useComponentCollectorLegacy, useHookCollector };
+export { COMPONENT_DISPLAY_NAME_ASSIGNMENT_SELECTOR, DEFAULT_COMPONENT_HINT, type ERClassComponent, type ERComponent, ERComponentFlag, ERComponentHint, type ERComponentKind, type EREffectKind, type EREffectPhaseKind, type ERFunctionComponent, type ERHook, type ERHookKind, type ERLifecyclePhaseKind, type ERPhaseKind, ERPhaseRelevance, type ERSemanticEntry, type ERSemanticNode, type ERStateKind, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getFunctionComponentIdentifier, hasNoneOrValidComponentName, isCallFromReact, isCallFromReactMember, isChildrenCount, isChildrenCountCall, isChildrenForEach, isChildrenForEachCall, isChildrenMap, isChildrenMapCall, isChildrenOfCreateElement, isChildrenOnly, isChildrenOnlyCall, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCloneElement, isCloneElementCall, isComponentDidCatch, isComponentDidMount, isComponentDisplayNameAssignment, isComponentName, isComponentWillUnmount, isCreateContext, isCreateContextCall, isCreateElement, isCreateElementCall, isCreateRef, isCreateRefCall, isDeclaredInRenderPropLoose, isDirectValueOfRenderPropertyLoose, isForwardRef, isForwardRefCall, isFromReact, isFromReactMember, isFunctionOfComponentDidMount, isFunctionOfComponentWillUnmount, isFunctionOfRenderMethod, isFunctionOfUseEffectCleanup, isFunctionOfUseEffectSetup, isGetDerivedStateFromError, isGetDerivedStateFromProps, isInitializedFromReact, isInsideCreateElementProps, isInsideReactHook, isInsideRenderMethod, isInversePhase, isMemo, isMemoCall, isPureComponent, isReactAPICallWithName, isReactAPIWithName, isReactHook, isReactHookCall, isReactHookCallWithName, isReactHookCallWithNameAlias, isReactHookCallWithNameLoose, isReactHookName, isRenderFunctionLoose, isRenderMethodLike, isRenderPropLoose, isThisSetState, isUseCallbackCall, isUseContextCall, isUseDebugValueCall, isUseDeferredValueCall, isUseEffectCall, isUseEffectCallLoose, isUseIdCall, isUseImperativeHandleCall, isUseInsertionEffectCall, isUseLayoutEffectCall, isUseMemoCall, isUseReducerCall, isUseRefCall, isUseStateCall, isUseSyncExternalStoreCall, isUseTransitionCall, useComponentCollector, useComponentCollectorLegacy, useHookCollector };

package/dist/index.js CHANGED Viewed

@@ -265,13 +265,13 @@ function isInsideReactHook(node) {
 }
 function useHookCollector() {
   const hooks = /* @__PURE__ */ new Map();
-  const fEntries = [];
+  const functionEntries = [];
   const onFunctionEnter = (node) => {
     const id = AST8__namespace.getFunctionIdentifier(node);
+    const key = shared.getId();
     const name = id?.name;
     if (name != null && isReactHookName(name)) {
-      const key = shared.getId();
-      fEntries.push({ key, node });
+      functionEntries.push({ key, node, isHook: true });
       hooks.set(key, {
         id,
         key,
@@ -284,18 +284,15 @@ function useHookCollector() {
       });
       return;
     }
-    fEntries.push({ key: eff._, node });
+    functionEntries.push({ key, node, isHook: false });
   };
   const onFunctionExit = () => {
-    fEntries.pop();
+    functionEntries.pop();
   };
   const ctx = {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     getAllHooks(node) {
       return hooks;
-    },
-    getCurrentHooks() {
-      return new Map(hooks);
     }
   };
   const listeners = {
@@ -305,7 +302,7 @@ function useHookCollector() {
       if (!isReactHookCall(node)) {
         return;
       }
-      const fEntry = fEntries.at(-1);
+      const fEntry = functionEntries.at(-1);
       if (fEntry?.key == null) {
         return;
       }
@@ -502,9 +499,7 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT, options =
   const onFunctionExit = () => {
     const entry = functionEntries.at(-1);
     if (entry == null) return;
-    if (!entry.isComponent) {
-      return functionEntries.pop();
-    }
+    if (!entry.isComponent) return functionEntries.pop();
     const shouldDrop = AST8__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);
     });
@@ -528,14 +523,10 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT, options =
     ":function[type]:exit": onFunctionExit,
     "ArrowFunctionExpression[type][body.type!='BlockStatement']"() {
       const entry = getCurrentEntry();
-      if (entry == null) {
-        return;
-      }
+      if (entry == null) return;
       const { body } = entry.node;
       const isComponent = hasNoneOrValidComponentName(entry.node, context) && JSX3__namespace.isJSXValue(body, jsxCtx, hint) && hasValidHierarchy(entry.node, context, hint);
-      if (!isComponent) {
-        return;
-      }
+      if (!isComponent) return;
       const initPath = AST8__namespace.getFunctionInitPath(entry.node);
       const id = getFunctionComponentIdentifier(entry.node, context);
       const name = getComponentNameFromIdentifier(id);
@@ -559,35 +550,24 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT, options =
         if (left.type !== types.AST_NODE_TYPES.MemberExpression) return;
         const componentName = left.object.type === types.AST_NODE_TYPES.Identifier ? left.object.name : eff._;
         const component = [...components.values()].findLast(({ name }) => name != null && name === componentName);
-        if (component == null) {
-          return;
-        }
+        if (component == null) return;
         component.displayName = right;
       }
     } : {},
     ...collectHookCalls ? {
       "CallExpression[type]:exit"(node) {
-        if (!isReactHookCall(node)) {
-          return;
-        }
+        if (!isReactHookCall(node)) return;
         const entry = getCurrentEntry();
-        if (entry == null) {
-          return;
-        }
+        if (entry == null) return;
         entry.hookCalls.push(node);
       }
     } : {},
     "ReturnStatement[type]"(node) {
       const entry = getCurrentEntry();
-      if (entry == null) {
-        return;
-      }
+      if (entry == null) return;
       const isComponent = hasNoneOrValidComponentName(entry.node, context) && JSX3__namespace.isJSXValue(node.argument, jsxCtx, hint) && hasValidHierarchy(entry.node, context, hint);
-      if (!isComponent) {
-        return;
-      }
-      functionEntries.pop();
-      functionEntries.push({ ...entry, isComponent });
+      if (!isComponent) return;
+      entry.isComponent = true;
       const initPath = AST8__namespace.getFunctionInitPath(entry.node);
       const id = getFunctionComponentIdentifier(entry.node, context);
       const name = getComponentNameFromIdentifier(id);

package/dist/index.mjs CHANGED Viewed

@@ -238,13 +238,13 @@ function isInsideReactHook(node) {
 }
 function useHookCollector() {
   const hooks = /* @__PURE__ */ new Map();
-  const fEntries = [];
+  const functionEntries = [];
   const onFunctionEnter = (node) => {
     const id = AST8.getFunctionIdentifier(node);
+    const key = getId();
     const name = id?.name;
     if (name != null && isReactHookName(name)) {
-      const key = getId();
-      fEntries.push({ key, node });
+      functionEntries.push({ key, node, isHook: true });
       hooks.set(key, {
         id,
         key,
@@ -257,18 +257,15 @@ function useHookCollector() {
       });
       return;
     }
-    fEntries.push({ key: _, node });
+    functionEntries.push({ key, node, isHook: false });
   };
   const onFunctionExit = () => {
-    fEntries.pop();
+    functionEntries.pop();
   };
   const ctx = {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     getAllHooks(node) {
       return hooks;
-    },
-    getCurrentHooks() {
-      return new Map(hooks);
     }
   };
   const listeners = {
@@ -278,7 +275,7 @@ function useHookCollector() {
       if (!isReactHookCall(node)) {
         return;
       }
-      const fEntry = fEntries.at(-1);
+      const fEntry = functionEntries.at(-1);
       if (fEntry?.key == null) {
         return;
       }
@@ -475,9 +472,7 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT, options =
   const onFunctionExit = () => {
     const entry = functionEntries.at(-1);
     if (entry == null) return;
-    if (!entry.isComponent) {
-      return functionEntries.pop();
-    }
+    if (!entry.isComponent) return functionEntries.pop();
     const shouldDrop = AST8.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);
     });
@@ -501,14 +496,10 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT, options =
     ":function[type]:exit": onFunctionExit,
     "ArrowFunctionExpression[type][body.type!='BlockStatement']"() {
       const entry = getCurrentEntry();
-      if (entry == null) {
-        return;
-      }
+      if (entry == null) return;
       const { body } = entry.node;
       const isComponent = hasNoneOrValidComponentName(entry.node, context) && JSX3.isJSXValue(body, jsxCtx, hint) && hasValidHierarchy(entry.node, context, hint);
-      if (!isComponent) {
-        return;
-      }
+      if (!isComponent) return;
       const initPath = AST8.getFunctionInitPath(entry.node);
       const id = getFunctionComponentIdentifier(entry.node, context);
       const name = getComponentNameFromIdentifier(id);
@@ -532,35 +523,24 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT, options =
         if (left.type !== AST_NODE_TYPES.MemberExpression) return;
         const componentName = left.object.type === AST_NODE_TYPES.Identifier ? left.object.name : _;
         const component = [...components.values()].findLast(({ name }) => name != null && name === componentName);
-        if (component == null) {
-          return;
-        }
+        if (component == null) return;
         component.displayName = right;
       }
     } : {},
     ...collectHookCalls ? {
       "CallExpression[type]:exit"(node) {
-        if (!isReactHookCall(node)) {
-          return;
-        }
+        if (!isReactHookCall(node)) return;
         const entry = getCurrentEntry();
-        if (entry == null) {
-          return;
-        }
+        if (entry == null) return;
         entry.hookCalls.push(node);
       }
     } : {},
     "ReturnStatement[type]"(node) {
       const entry = getCurrentEntry();
-      if (entry == null) {
-        return;
-      }
+      if (entry == null) return;
       const isComponent = hasNoneOrValidComponentName(entry.node, context) && JSX3.isJSXValue(node.argument, jsxCtx, hint) && hasValidHierarchy(entry.node, context, hint);
-      if (!isComponent) {
-        return;
-      }
-      functionEntries.pop();
-      functionEntries.push({ ...entry, isComponent });
+      if (!isComponent) return;
+      entry.isComponent = true;
       const initPath = AST8.getFunctionInitPath(entry.node);
       const id = getFunctionComponentIdentifier(entry.node, context);
       const name = getComponentNameFromIdentifier(id);

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "1.24.2-next.0",
+  "version": "1.24.2-next.1",
   "description": "ESLint React's ESLint utility module for static analysis of React core APIs and Patterns.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -39,14 +39,14 @@
     "@typescript-eslint/utils": "^8.21.0",
     "birecord": "^0.1.1",
     "ts-pattern": "^5.6.2",
-    "@eslint-react/ast": "1.24.2-next.0",
-    "@eslint-react/jsx": "1.24.2-next.0",
-    "@eslint-react/shared": "1.24.2-next.0",
-    "@eslint-react/var": "1.24.2-next.0",
-    "@eslint-react/eff": "1.24.2-next.0"
+    "@eslint-react/ast": "1.24.2-next.1",
+    "@eslint-react/eff": "1.24.2-next.1",
+    "@eslint-react/jsx": "1.24.2-next.1",
+    "@eslint-react/shared": "1.24.2-next.1",
+    "@eslint-react/var": "1.24.2-next.1"
   },
   "devDependencies": {
-    "tsup": "^8.3.5",
+    "tsup": "^8.3.6",
     "@workspace/configs": "0.0.0"
   },
   "engines": {