npm - @eslint-react/core - Versions diffs - 1.24.0-next.9 → 1.24.1-beta.1 - Mend

@eslint-react/core 1.24.0-next.9 → 1.24.1-beta.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,6 +1,6 @@
 import * as AST from '@eslint-react/ast';
 import * as _eslint_react_shared from '@eslint-react/shared';
-import { RuleContext, CustomComponentNormalized } 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';
@@ -45,15 +45,13 @@ declare const ERComponentHint: {
 };
 declare const DEFAULT_COMPONENT_HINT: bigint;
-type ERClassComponentFlag = bigint;
-declare const ERClassComponentFlag: {
+type ERComponentFlag = bigint;
+declare const ERComponentFlag: {
     None: bigint;
     PureComponent: bigint;
-};
-type ERFunctionComponentFlag = bigint;
-declare const ERFunctionComponentFlag: {
-    None: bigint;
+    CreateElement: bigint;
     Memo: bigint;
+    Async: bigint;
     ForwardRef: bigint;
 };
@@ -61,7 +59,7 @@ interface ERFunctionComponent extends ERSemanticNode {
     id: _ | TSESTree.Identifier | TSESTree.Identifier[];
     kind: "function";
     node: AST.TSESTreeFunction;
-    flag: ERFunctionComponentFlag;
+    flag: ERComponentFlag;
     hint: ERComponentHint;
     initPath: _ | AST.FunctionInitPath;
     hookCalls: TSESTree.CallExpression[];
@@ -71,7 +69,7 @@ interface ERClassComponent extends ERSemanticNode {
     id: _ | TSESTree.Identifier;
     kind: "class";
     node: AST.TSESTreeClass;
-    flag: ERClassComponentFlag;
+    flag: ERComponentFlag;
     hint: ERComponentHint;
     methods: AST.TSESTreeMethodOrProperty[];
     displayName: _ | TSESTree.Expression;
@@ -82,6 +80,13 @@ interface ComponentCollectorOptions {
     collectDisplayName?: boolean;
     collectHookCalls?: boolean;
 }
+/**
+ * Get a ctx and listeners for the rule to collect function components
+ * @param context The ESLint rule context
+ * @param hint The hint to use
+ * @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>;
@@ -101,9 +106,6 @@ declare function useComponentCollector(context: RuleContext, hint?: bigint, opti
     readonly listeners: {
         readonly "ReturnStatement[type]": (node: TSESTree.ReturnStatement) => void;
         readonly "CallExpression[type]:exit"?: (node: TSESTree.CallExpression) => void;
-        readonly "AssignmentExpression[type][operator='='][left.type='MemberExpression'][left.property.name='displayName']"?: (node: TSESTree.AssignmentExpression & {
-            left: TSESTree.MemberExpression;
-        }) => void;
         readonly ":function[type]": (node: AST.TSESTreeFunction) => void;
         readonly ":function[type]:exit": () => {
             key: string;
@@ -115,6 +117,10 @@ declare function useComponentCollector(context: RuleContext, hint?: bigint, opti
     };
 };
+/**
+ * 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>;
@@ -125,6 +131,17 @@ declare function useComponentCollectorLegacy(): {
     };
 };
+/**
+ * The ESQuery selector for a component display name assignment expression
+ */
+declare const COMPONENT_DISPLAY_NAME_ASSIGNMENT_SELECTOR: string;
+/**
+ * Check if the node is a component display name assignment expression
+ * @param node The AST node
+ * @returns `true` if the node is a component display name assignment
+ */
+declare function isComponentDisplayNameAssignment(node: TSESTree.Node | _): node is TSESTree.AssignmentExpression;
 declare function getFunctionComponentIdentifier(node: AST.TSESTreeFunction, context: RuleContext): TSESTree.Identifier | TSESTree.Identifier[] | _;
 type ERComponentKind = "classComponent" | "functionComponent";
@@ -155,9 +172,6 @@ declare function isFunctionOfRenderMethod(node: AST.TSESTreeFunction): boolean;
  */
 declare function isInsideRenderMethod(node: TSESTree.Node): boolean;
-type EREffectMethodKind = "useEffect" | "useInsertionEffect" | "useLayoutEffect";
-type ERLifecycleMethodKind = "componentDidMount" | "componentWillUnmount";
 declare const RE_COMPONENT_NAME: RegExp;
 declare function getComponentNameFromIdentifier(node: TSESTree.Identifier | TSESTree.Identifier[] | _): string | undefined;
 declare function isComponentName(name: string): boolean;
@@ -241,13 +255,11 @@ declare function isClassComponent(node: TSESTree.Node): node is AST.TSESTreeClas
  */
 declare function isPureComponent(node: TSESTree.Node): boolean;
-type EREffectKind = "effect" | "insertionEffect" | "layoutEffect";
+type EREffectKind = "useEffect" | "useLayoutEffect" | "useInsertionEffect";
 declare function isFunctionOfUseEffectSetup(node: TSESTree.Node | _): boolean | undefined;
 declare function isFunctionOfUseEffectCleanup(node: TSESTree.Node): boolean | undefined;
-declare function getElementNameOnJsxAndHtml(node: TSESTree.JSXOpeningElement, context: RuleContext, polymorphicPropName?: string, additionalComponents?: CustomComponentNormalized[]): [string, string];
 /**
  * Determines whether inside `createElement`'s props.
  * @param node The AST node to check
@@ -321,8 +333,6 @@ interface ERSemanticEntry {
     phase: ERPhaseKind;
 }
-declare const getId: () => string;
 /**
  * Checks if the given node is a call expression to the given function or method of the pragma
  * @param name The name of the function or method to check
@@ -351,7 +361,7 @@ type IsCallFromReactMember = {
 };
 declare function isCallFromReactMember(pragmaMemberName: string, name: string): IsCallFromReactMember;
-declare function isInitializedFromReact(name: string, initialScope: Scope, importSource?: string): boolean;
+declare function isInitializedFromReact(name: string, importSource: string, initialScope: Scope): boolean;
 /**********************************************
  *      DO NOT MODIFY THIS FILE MANUALLY      *
@@ -1964,6 +1974,7 @@ declare interface TSImportEqualsRequireDeclaration extends TSImportEqualsDeclara
 declare interface TSImportType extends BaseNode {
     type: AST_NODE_TYPES.TSImportType;
     argument: TypeNode;
+    attributes: ImportAttribute[];
     qualifier: EntityName | null;
     typeArguments: TSTypeParameterInstantiation | null;
 }
@@ -2575,4 +2586,4 @@ declare const isMemoCall: {
     (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression;
 };
-export { type ComponentCollectorOptions, DEFAULT_COMPONENT_HINT, type ERClassComponent, ERClassComponentFlag, type ERComponent, ERComponentHint, type ERComponentKind, type EREffectKind, type EREffectMethodKind, type EREffectPhaseKind, type ERFunctionComponent, ERFunctionComponentFlag, type ERHook, type ERHookKind, type ERLifecycleMethodKind, type ERLifecyclePhaseKind, type ERPhaseKind, ERPhaseRelevance, type ERSemanticEntry, type ERSemanticNode, type ERStateKind, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getElementNameOnJsxAndHtml, getFunctionComponentIdentifier, getId, hasNoneOrValidComponentName, isCallFromReact, isCallFromReactMember, isChildrenCount, isChildrenCountCall, isChildrenForEach, isChildrenForEachCall, isChildrenMap, isChildrenMapCall, isChildrenOfCreateElement, isChildrenOnly, isChildrenOnlyCall, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCloneElement, isCloneElementCall, isComponentDidCatch, isComponentDidMount, 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, 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 };

package/dist/index.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import * as AST from '@eslint-react/ast';
 import * as _eslint_react_shared from '@eslint-react/shared';
-import { RuleContext, CustomComponentNormalized } 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';
@@ -45,15 +45,13 @@ declare const ERComponentHint: {
 };
 declare const DEFAULT_COMPONENT_HINT: bigint;
-type ERClassComponentFlag = bigint;
-declare const ERClassComponentFlag: {
+type ERComponentFlag = bigint;
+declare const ERComponentFlag: {
     None: bigint;
     PureComponent: bigint;
-};
-type ERFunctionComponentFlag = bigint;
-declare const ERFunctionComponentFlag: {
-    None: bigint;
+    CreateElement: bigint;
     Memo: bigint;
+    Async: bigint;
     ForwardRef: bigint;
 };
@@ -61,7 +59,7 @@ interface ERFunctionComponent extends ERSemanticNode {
     id: _ | TSESTree.Identifier | TSESTree.Identifier[];
     kind: "function";
     node: AST.TSESTreeFunction;
-    flag: ERFunctionComponentFlag;
+    flag: ERComponentFlag;
     hint: ERComponentHint;
     initPath: _ | AST.FunctionInitPath;
     hookCalls: TSESTree.CallExpression[];
@@ -71,7 +69,7 @@ interface ERClassComponent extends ERSemanticNode {
     id: _ | TSESTree.Identifier;
     kind: "class";
     node: AST.TSESTreeClass;
-    flag: ERClassComponentFlag;
+    flag: ERComponentFlag;
     hint: ERComponentHint;
     methods: AST.TSESTreeMethodOrProperty[];
     displayName: _ | TSESTree.Expression;
@@ -82,6 +80,13 @@ interface ComponentCollectorOptions {
     collectDisplayName?: boolean;
     collectHookCalls?: boolean;
 }
+/**
+ * Get a ctx and listeners for the rule to collect function components
+ * @param context The ESLint rule context
+ * @param hint The hint to use
+ * @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>;
@@ -101,9 +106,6 @@ declare function useComponentCollector(context: RuleContext, hint?: bigint, opti
     readonly listeners: {
         readonly "ReturnStatement[type]": (node: TSESTree.ReturnStatement) => void;
         readonly "CallExpression[type]:exit"?: (node: TSESTree.CallExpression) => void;
-        readonly "AssignmentExpression[type][operator='='][left.type='MemberExpression'][left.property.name='displayName']"?: (node: TSESTree.AssignmentExpression & {
-            left: TSESTree.MemberExpression;
-        }) => void;
         readonly ":function[type]": (node: AST.TSESTreeFunction) => void;
         readonly ":function[type]:exit": () => {
             key: string;
@@ -115,6 +117,10 @@ declare function useComponentCollector(context: RuleContext, hint?: bigint, opti
     };
 };
+/**
+ * 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>;
@@ -125,6 +131,17 @@ declare function useComponentCollectorLegacy(): {
     };
 };
+/**
+ * The ESQuery selector for a component display name assignment expression
+ */
+declare const COMPONENT_DISPLAY_NAME_ASSIGNMENT_SELECTOR: string;
+/**
+ * Check if the node is a component display name assignment expression
+ * @param node The AST node
+ * @returns `true` if the node is a component display name assignment
+ */
+declare function isComponentDisplayNameAssignment(node: TSESTree.Node | _): node is TSESTree.AssignmentExpression;
 declare function getFunctionComponentIdentifier(node: AST.TSESTreeFunction, context: RuleContext): TSESTree.Identifier | TSESTree.Identifier[] | _;
 type ERComponentKind = "classComponent" | "functionComponent";
@@ -155,9 +172,6 @@ declare function isFunctionOfRenderMethod(node: AST.TSESTreeFunction): boolean;
  */
 declare function isInsideRenderMethod(node: TSESTree.Node): boolean;
-type EREffectMethodKind = "useEffect" | "useInsertionEffect" | "useLayoutEffect";
-type ERLifecycleMethodKind = "componentDidMount" | "componentWillUnmount";
 declare const RE_COMPONENT_NAME: RegExp;
 declare function getComponentNameFromIdentifier(node: TSESTree.Identifier | TSESTree.Identifier[] | _): string | undefined;
 declare function isComponentName(name: string): boolean;
@@ -241,13 +255,11 @@ declare function isClassComponent(node: TSESTree.Node): node is AST.TSESTreeClas
  */
 declare function isPureComponent(node: TSESTree.Node): boolean;
-type EREffectKind = "effect" | "insertionEffect" | "layoutEffect";
+type EREffectKind = "useEffect" | "useLayoutEffect" | "useInsertionEffect";
 declare function isFunctionOfUseEffectSetup(node: TSESTree.Node | _): boolean | undefined;
 declare function isFunctionOfUseEffectCleanup(node: TSESTree.Node): boolean | undefined;
-declare function getElementNameOnJsxAndHtml(node: TSESTree.JSXOpeningElement, context: RuleContext, polymorphicPropName?: string, additionalComponents?: CustomComponentNormalized[]): [string, string];
 /**
  * Determines whether inside `createElement`'s props.
  * @param node The AST node to check
@@ -321,8 +333,6 @@ interface ERSemanticEntry {
     phase: ERPhaseKind;
 }
-declare const getId: () => string;
 /**
  * Checks if the given node is a call expression to the given function or method of the pragma
  * @param name The name of the function or method to check
@@ -351,7 +361,7 @@ type IsCallFromReactMember = {
 };
 declare function isCallFromReactMember(pragmaMemberName: string, name: string): IsCallFromReactMember;
-declare function isInitializedFromReact(name: string, initialScope: Scope, importSource?: string): boolean;
+declare function isInitializedFromReact(name: string, importSource: string, initialScope: Scope): boolean;
 /**********************************************
  *      DO NOT MODIFY THIS FILE MANUALLY      *
@@ -1964,6 +1974,7 @@ declare interface TSImportEqualsRequireDeclaration extends TSImportEqualsDeclara
 declare interface TSImportType extends BaseNode {
     type: AST_NODE_TYPES.TSImportType;
     argument: TypeNode;
+    attributes: ImportAttribute[];
     qualifier: EntityName | null;
     typeArguments: TSTypeParameterInstantiation | null;
 }
@@ -2575,4 +2586,4 @@ declare const isMemoCall: {
     (node: Node, context: _eslint_react_shared.RuleContext): node is CallExpression;
 };
-export { type ComponentCollectorOptions, DEFAULT_COMPONENT_HINT, type ERClassComponent, ERClassComponentFlag, type ERComponent, ERComponentHint, type ERComponentKind, type EREffectKind, type EREffectMethodKind, type EREffectPhaseKind, type ERFunctionComponent, ERFunctionComponentFlag, type ERHook, type ERHookKind, type ERLifecycleMethodKind, type ERLifecyclePhaseKind, type ERPhaseKind, ERPhaseRelevance, type ERSemanticEntry, type ERSemanticNode, type ERStateKind, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getElementNameOnJsxAndHtml, getFunctionComponentIdentifier, getId, hasNoneOrValidComponentName, isCallFromReact, isCallFromReactMember, isChildrenCount, isChildrenCountCall, isChildrenForEach, isChildrenForEachCall, isChildrenMap, isChildrenMapCall, isChildrenOfCreateElement, isChildrenOnly, isChildrenOnlyCall, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCloneElement, isCloneElementCall, isComponentDidCatch, isComponentDidMount, 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, 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 };

package/dist/index.js CHANGED Viewed

@@ -2,11 +2,10 @@
 var AST8 = require('@eslint-react/ast');
 var eff = require('@eslint-react/eff');
-var JSX4 = require('@eslint-react/jsx');
+var JSX3 = require('@eslint-react/jsx');
+var shared = require('@eslint-react/shared');
 var types = require('@typescript-eslint/types');
 var VAR = require('@eslint-react/var');
-var shared = require('@eslint-react/shared');
-require('ts-pattern');
 var birecord = require('birecord');
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -30,35 +29,12 @@ function _interopNamespace(e) {
 }
 var AST8__namespace = /*#__PURE__*/_interopNamespace(AST8);
-var JSX4__namespace = /*#__PURE__*/_interopNamespace(JSX4);
+var JSX3__namespace = /*#__PURE__*/_interopNamespace(JSX3);
 var VAR__namespace = /*#__PURE__*/_interopNamespace(VAR);
 var birecord__default = /*#__PURE__*/_interopDefault(birecord);
 // src/component/component-collector.ts
-function getElementNameOnJsxAndHtml(node, context, polymorphicPropName, additionalComponents = []) {
-  const name = JSX4__namespace.getElementName(node);
-  if (name === name.toLowerCase()) return [name, name];
-  const component = additionalComponents.findLast((c) => c.name === name || c.re.test(name));
-  if (component != null) return [name, component.as];
-  if (polymorphicPropName == null) return [name, name];
-  const initialScope = context.sourceCode.getScope(node);
-  const attributeNode = JSX4__namespace.getAttributeNode(
-    polymorphicPropName,
-    initialScope,
-    node.attributes
-  );
-  if (attributeNode == null) return [name, name];
-  const polymorphicPropValue = VAR__namespace.toResolved(JSX4__namespace.getAttributeStaticValue(attributeNode, initialScope)).value;
-  if (typeof polymorphicPropValue === "string") {
-    return [name, polymorphicPropValue];
-  }
-  return [name, name];
-}
-// src/utils/get-id.ts
-var id = 0n;
-var getId = () => (id++).toString();
-function isInitializedFromReact(name, initialScope, importSource = "react") {
+function isInitializedFromReact(name, importSource, initialScope) {
   return name.toLowerCase() === "react" || VAR__namespace.isInitializedFromSource(
     name,
     importSource,
@@ -76,12 +52,13 @@ function isFromReact(name) {
       }
       return node.name === name;
     }
+    const importSource = settings.importSource ?? shared.DEFAULT_ESLINT_REACT_SETTINGS.importSource;
     const initialScope = context.sourceCode.getScope(node);
     if (node.type === types.AST_NODE_TYPES.MemberExpression) {
-      return node.object.type === types.AST_NODE_TYPES.Identifier && node.property.type === types.AST_NODE_TYPES.Identifier && node.property.name === name && isInitializedFromReact(node.object.name, initialScope, settings.importSource);
+      return node.object.type === types.AST_NODE_TYPES.Identifier && node.property.type === types.AST_NODE_TYPES.Identifier && node.property.name === name && isInitializedFromReact(node.object.name, importSource, initialScope);
     }
     if (node.name === name) {
-      return isInitializedFromReact(name, initialScope, settings.importSource);
+      return isInitializedFromReact(name, importSource, initialScope);
     }
     return false;
   };
@@ -101,14 +78,15 @@ function isFromReactMember(memberName, name) {
       }
       return false;
     }
+    const importSource = settings.importSource ?? shared.DEFAULT_ESLINT_REACT_SETTINGS.importSource;
     const initialScope = context.sourceCode.getScope(node);
     if (node.property.type !== types.AST_NODE_TYPES.Identifier || node.property.name !== name) {
       return false;
     }
     if (node.object.type === types.AST_NODE_TYPES.Identifier && node.object.name === memberName) {
-      return isInitializedFromReact(node.object.name, initialScope, settings.importSource);
+      return isInitializedFromReact(node.object.name, importSource, initialScope);
     }
-    if (node.object.type === types.AST_NODE_TYPES.MemberExpression && node.object.object.type === types.AST_NODE_TYPES.Identifier && isInitializedFromReact(node.object.object.name, initialScope, settings.importSource) && node.object.property.type === types.AST_NODE_TYPES.Identifier) {
+    if (node.object.type === types.AST_NODE_TYPES.MemberExpression && node.object.object.type === types.AST_NODE_TYPES.Identifier && isInitializedFromReact(node.object.object.name, importSource, initialScope) && node.object.property.type === types.AST_NODE_TYPES.Identifier) {
       return node.object.property.name === memberName;
     }
     return false;
@@ -191,8 +169,8 @@ function isReactHookName(name) {
 // src/hook/is.ts
 function isReactHook(node) {
   if (node == null) return eff._;
-  const id2 = AST8__namespace.getFunctionIdentifier(node);
-  return id2?.name != null && isReactHookName(id2.name);
+  const id = AST8__namespace.getFunctionIdentifier(node);
+  return id?.name != null && isReactHookName(id.name);
 }
 function isReactHookCall(node) {
   if (node == null) return false;
@@ -210,13 +188,14 @@ function isReactHookCall(node) {
 function isReactHookCallWithName(node, context) {
   if (node == null) return eff.returnFalse;
   const settings = shared.unsafeDecodeSettings(context.settings);
+  const importSource = settings.importSource ?? "react";
+  const initialScope = context.sourceCode.getScope(node);
   return (name) => {
-    const initialScope = context.sourceCode.getScope(node);
     switch (true) {
       case (node.callee.type === types.AST_NODE_TYPES.Identifier && node.callee.name === name):
-        return !settings.strictImportCheck || isInitializedFromReact(name, initialScope, settings.importSource);
+        return !settings.strictImportCheck || isInitializedFromReact(name, importSource, initialScope);
       case (node.callee.type === types.AST_NODE_TYPES.MemberExpression && node.callee.property.type === types.AST_NODE_TYPES.Identifier && node.callee.property.name === name && "name" in node.callee.object):
-        return !settings.strictImportCheck || isInitializedFromReact(node.callee.object.name, initialScope, settings.importSource);
+        return !settings.strictImportCheck || isInitializedFromReact(node.callee.object.name, importSource, initialScope);
       default:
         return false;
     }
@@ -237,13 +216,14 @@ function isReactHookCallWithNameLoose(node) {
 }
 function isReactHookCallWithNameAlias(name, context, alias) {
   const settings = shared.unsafeDecodeSettings(context);
+  const importSource = settings.importSource ?? "react";
   return (node) => {
     const initialScope = context.sourceCode.getScope(node);
     switch (true) {
       case (node.callee.type === types.AST_NODE_TYPES.Identifier && node.callee.name === name):
-        return !settings.strictImportCheck || isInitializedFromReact(name, initialScope, settings.importSource);
+        return !settings.strictImportCheck || isInitializedFromReact(name, importSource, initialScope);
       case (node.callee.type === types.AST_NODE_TYPES.MemberExpression && node.callee.property.type === types.AST_NODE_TYPES.Identifier && node.callee.property.name === name && "name" in node.callee.object):
-        return !settings.strictImportCheck || isInitializedFromReact(node.callee.object.name, initialScope, settings.importSource);
+        return !settings.strictImportCheck || isInitializedFromReact(node.callee.object.name, importSource, initialScope);
       default:
         return alias.some(isReactHookCallWithNameLoose(node));
     }
@@ -287,13 +267,13 @@ function useHookCollector() {
   const hooks = /* @__PURE__ */ new Map();
   const fEntries = [];
   const onFunctionEnter = (node) => {
-    const id2 = AST8__namespace.getFunctionIdentifier(node);
-    const name = id2?.name;
+    const id = AST8__namespace.getFunctionIdentifier(node);
+    const name = id?.name;
     if (name != null && isReactHookName(name)) {
-      const key = getId();
+      const key = shared.getId();
       fEntries.push({ key, node });
       hooks.set(key, {
-        id: id2,
+        id,
         key,
         kind: "function",
         name,
@@ -339,7 +319,7 @@ function useHookCollector() {
   return { ctx, listeners };
 }
 var ERComponentHint = {
-  ...JSX4__namespace.JSXValueHint,
+  ...JSX3__namespace.JSXValueHint,
   // 1n << 0n - 1n << 63n are reserved for JSXValueHint
   // Skip function component created by React.memo
   SkipMemo: 1n << 64n,
@@ -355,24 +335,26 @@ var ERComponentHint = {
   SkipClassProperty: 1n << 69n
 };
 var DEFAULT_COMPONENT_HINT = 0n | ERComponentHint.SkipBooleanLiteral | ERComponentHint.SkipMapCallback | ERComponentHint.SkipNumberLiteral | ERComponentHint.SkipStringLiteral | ERComponentHint.SkipUndefined | ERComponentHint.SkipEmptyArray | ERComponentHint.StrictArray | ERComponentHint.StrictConditional | ERComponentHint.StrictLogical;
+var COMPONENT_DISPLAY_NAME_ASSIGNMENT_SELECTOR = [
+  "AssignmentExpression",
+  "[type]",
+  "[operator='=']",
+  "[left.type='MemberExpression']",
+  "[left.property.name='displayName']"
+].join("");
+function isComponentDisplayNameAssignment(node) {
+  if (node == null) return false;
+  return node.type === types.AST_NODE_TYPES.AssignmentExpression && node.operator === "=" && node.left.type === types.AST_NODE_TYPES.MemberExpression && node.left.property.type === types.AST_NODE_TYPES.Identifier && node.left.property.name === "displayName";
+}
 // src/component/component-flag.ts
-var ERClassComponentFlag = {
+var ERComponentFlag = {
   None: 0n,
-  PureComponent: 1n << 0n
-  // Reserved for future use
-  // CreateElement: 1n << 1n,
-};
-var ERFunctionComponentFlag = {
-  None: 0n,
-  Memo: 1n << 0n,
-  ForwardRef: 1n << 1n
-  // Reserved for future use
-  // CreateElement: 1n << 2n,
-  // Reserved for future use
-  // hasHooks: 1n << 3n,
-  // Reserved for future use
-  // Async: 1n << 4n,
+  PureComponent: 1n << 0n,
+  CreateElement: 1n << 1n,
+  Memo: 1n << 2n,
+  Async: 1n << 3n,
+  ForwardRef: 1n << 4n
 };
 function isComponentWrapperCall(node, context) {
   if (node.type !== types.AST_NODE_TYPES.CallExpression) {
@@ -418,6 +400,8 @@ function isPureComponent(node) {
   }
   return false;
 }
+// src/component/component-lifecycle.ts
 function isComponentDidMount(node) {
   return AST8__namespace.isMethodOrProperty(node) && node.key.type === types.AST_NODE_TYPES.Identifier && node.key.name === "componentDidMount";
 }
@@ -460,9 +444,9 @@ function isComponentName(name) {
   return RE_COMPONENT_NAME.test(name);
 }
 function hasNoneOrValidComponentName(node, context) {
-  const id2 = getFunctionComponentIdentifier(node, context);
-  if (id2 == null) return true;
-  const name = Array.isArray(id2) ? id2.at(-1)?.name : id2.name;
+  const id = getFunctionComponentIdentifier(node, context);
+  if (id == null) return true;
+  const name = Array.isArray(id) ? id.at(-1)?.name : id.name;
   return name != null && isComponentName(name);
 }
@@ -496,16 +480,15 @@ function hasValidHierarchy(node, context, hint) {
   return boundaryNode == null || boundaryNode.type !== types.AST_NODE_TYPES.JSXExpressionContainer;
 }
 function getComponentFlag(initPath) {
-  let flag = ERFunctionComponentFlag.None;
+  let flag = ERComponentFlag.None;
   if (initPath != null && AST8__namespace.hasCallInFunctionInitPath("memo", initPath)) {
-    flag |= ERFunctionComponentFlag.Memo;
+    flag |= ERComponentFlag.Memo;
   }
   if (initPath != null && AST8__namespace.hasCallInFunctionInitPath("forwardRef", initPath)) {
-    flag |= ERFunctionComponentFlag.ForwardRef;
+    flag |= ERComponentFlag.ForwardRef;
   }
   return flag;
 }
-var displayNameAssignmentSelector = "AssignmentExpression[type][operator='='][left.type='MemberExpression'][left.property.name='displayName']";
 function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT, options = {}) {
   const { collectDisplayName = false, collectHookCalls = false } = options;
   const jsxCtx = { getScope: (node) => context.sourceCode.getScope(node) };
@@ -513,7 +496,7 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT, options =
   const functionEntries = [];
   const getCurrentEntry = () => functionEntries.at(-1);
   const onFunctionEnter = (node) => {
-    const key = getId();
+    const key = shared.getId();
     functionEntries.push({ key, node, hookCalls: [], isComponent: false });
   };
   const onFunctionExit = () => {
@@ -523,7 +506,7 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT, options =
       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 && !JSX4__namespace.isJSXValue(r.argument, jsxCtx, hint);
+      return context.sourceCode.getScope(r).block === entry.node && r.argument != null && !JSX3__namespace.isJSXValue(r.argument, jsxCtx, hint);
     });
     if (shouldDrop) {
       components.delete(entry.key);
@@ -549,16 +532,16 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT, options =
         return;
       }
       const { body } = entry.node;
-      const isComponent = hasNoneOrValidComponentName(entry.node, context) && JSX4__namespace.isJSXValue(body, jsxCtx, hint) && hasValidHierarchy(entry.node, context, hint);
+      const isComponent = hasNoneOrValidComponentName(entry.node, context) && JSX3__namespace.isJSXValue(body, jsxCtx, hint) && hasValidHierarchy(entry.node, context, hint);
       if (!isComponent) {
         return;
       }
       const initPath = AST8__namespace.getFunctionInitPath(entry.node);
-      const id2 = getFunctionComponentIdentifier(entry.node, context);
-      const name = getComponentNameFromIdentifier(id2);
-      const key = getId();
+      const id = getFunctionComponentIdentifier(entry.node, context);
+      const name = getComponentNameFromIdentifier(id);
+      const key = shared.getId();
       components.set(key, {
-        id: id2,
+        id,
         key,
         kind: "function",
         name,
@@ -571,8 +554,9 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT, options =
       });
     },
     ...collectDisplayName ? {
-      [displayNameAssignmentSelector](node) {
+      [COMPONENT_DISPLAY_NAME_ASSIGNMENT_SELECTOR](node) {
         const { left, right } = node;
+        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) {
@@ -598,17 +582,17 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT, options =
       if (entry == null) {
         return;
       }
-      const isComponent = hasNoneOrValidComponentName(entry.node, context) && JSX4__namespace.isJSXValue(node.argument, jsxCtx, hint) && hasValidHierarchy(entry.node, context, hint);
+      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 });
       const initPath = AST8__namespace.getFunctionInitPath(entry.node);
-      const id2 = getFunctionComponentIdentifier(entry.node, context);
-      const name = getComponentNameFromIdentifier(id2);
+      const id = getFunctionComponentIdentifier(entry.node, context);
+      const name = getComponentNameFromIdentifier(id);
       components.set(entry.key, {
-        id: id2,
+        id,
         key: entry.key,
         kind: "function",
         name,
@@ -635,16 +619,16 @@ function useComponentCollectorLegacy() {
     if (!isClassComponent(node)) {
       return;
     }
-    const id2 = AST8__namespace.getClassIdentifier(node);
-    const key = getId();
-    const flag = isPureComponent(node) ? ERClassComponentFlag.PureComponent : ERClassComponentFlag.None;
+    const id = AST8__namespace.getClassIdentifier(node);
+    const key = shared.getId();
+    const flag = isPureComponent(node) ? ERComponentFlag.PureComponent : ERComponentFlag.None;
     components.set(
       key,
       {
-        id: id2,
+        id,
         key,
         kind: "class",
-        name: id2?.name,
+        name: id?.name,
         node,
         // TODO: Get displayName of class component
         displayName: eff._,
@@ -671,12 +655,12 @@ function isRenderFunctionLoose(node, context) {
   if (AST8__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 JSX4__namespace.isJSXValue(
+  return JSX3__namespace.isJSXValue(
     body,
     {
       getScope: (node2) => context.sourceCode.getScope(node2)
     },
-    JSX4__namespace.JSXValueHint.SkipNullLiteral | JSX4__namespace.JSXValueHint.SkipUndefined | JSX4__namespace.JSXValueHint.StrictLogical | JSX4__namespace.JSXValueHint.StrictConditional
+    JSX3__namespace.JSXValueHint.SkipNullLiteral | JSX3__namespace.JSXValueHint.SkipUndefined | JSX3__namespace.JSXValueHint.StrictLogical | JSX3__namespace.JSXValueHint.StrictConditional
   );
 }
 function isRenderPropLoose(node, context) {
@@ -716,17 +700,15 @@ function isFunctionOfUseEffectCleanup(node) {
   return nearFunction === nearFunctionOfReturn && isFunctionOfUseEffectSetup(nearFunction);
 }
+exports.COMPONENT_DISPLAY_NAME_ASSIGNMENT_SELECTOR = COMPONENT_DISPLAY_NAME_ASSIGNMENT_SELECTOR;
 exports.DEFAULT_COMPONENT_HINT = DEFAULT_COMPONENT_HINT;
-exports.ERClassComponentFlag = ERClassComponentFlag;
+exports.ERComponentFlag = ERComponentFlag;
 exports.ERComponentHint = ERComponentHint;
-exports.ERFunctionComponentFlag = ERFunctionComponentFlag;
 exports.ERPhaseRelevance = ERPhaseRelevance;
 exports.RE_COMPONENT_NAME = RE_COMPONENT_NAME;
 exports.RE_HOOK_NAME = RE_HOOK_NAME;
 exports.getComponentNameFromIdentifier = getComponentNameFromIdentifier;
-exports.getElementNameOnJsxAndHtml = getElementNameOnJsxAndHtml;
 exports.getFunctionComponentIdentifier = getFunctionComponentIdentifier;
-exports.getId = getId;
 exports.hasNoneOrValidComponentName = hasNoneOrValidComponentName;
 exports.isCallFromReact = isCallFromReact;
 exports.isCallFromReactMember = isCallFromReactMember;
@@ -746,6 +728,7 @@ exports.isCloneElement = isCloneElement;
 exports.isCloneElementCall = isCloneElementCall;
 exports.isComponentDidCatch = isComponentDidCatch;
 exports.isComponentDidMount = isComponentDidMount;
+exports.isComponentDisplayNameAssignment = isComponentDisplayNameAssignment;
 exports.isComponentName = isComponentName;
 exports.isComponentWillUnmount = isComponentWillUnmount;
 exports.isCreateContext = isCreateContext;

package/dist/index.mjs CHANGED Viewed

@@ -1,37 +1,13 @@
 import * as AST8 from '@eslint-react/ast';
 import { flip, dual, _, returnFalse } from '@eslint-react/eff';
-import * as JSX4 from '@eslint-react/jsx';
+import * as JSX3 from '@eslint-react/jsx';
+import { unsafeDecodeSettings, DEFAULT_ESLINT_REACT_SETTINGS, getId } from '@eslint-react/shared';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import * as VAR from '@eslint-react/var';
-import { unsafeDecodeSettings } from '@eslint-react/shared';
-import 'ts-pattern';
 import birecord from 'birecord';
 // src/component/component-collector.ts
-function getElementNameOnJsxAndHtml(node, context, polymorphicPropName, additionalComponents = []) {
-  const name = JSX4.getElementName(node);
-  if (name === name.toLowerCase()) return [name, name];
-  const component = additionalComponents.findLast((c) => c.name === name || c.re.test(name));
-  if (component != null) return [name, component.as];
-  if (polymorphicPropName == null) return [name, name];
-  const initialScope = context.sourceCode.getScope(node);
-  const attributeNode = JSX4.getAttributeNode(
-    polymorphicPropName,
-    initialScope,
-    node.attributes
-  );
-  if (attributeNode == null) return [name, name];
-  const polymorphicPropValue = VAR.toResolved(JSX4.getAttributeStaticValue(attributeNode, initialScope)).value;
-  if (typeof polymorphicPropValue === "string") {
-    return [name, polymorphicPropValue];
-  }
-  return [name, name];
-}
-// src/utils/get-id.ts
-var id = 0n;
-var getId = () => (id++).toString();
-function isInitializedFromReact(name, initialScope, importSource = "react") {
+function isInitializedFromReact(name, importSource, initialScope) {
   return name.toLowerCase() === "react" || VAR.isInitializedFromSource(
     name,
     importSource,
@@ -49,12 +25,13 @@ function isFromReact(name) {
       }
       return node.name === name;
     }
+    const importSource = settings.importSource ?? DEFAULT_ESLINT_REACT_SETTINGS.importSource;
     const initialScope = context.sourceCode.getScope(node);
     if (node.type === AST_NODE_TYPES.MemberExpression) {
-      return node.object.type === AST_NODE_TYPES.Identifier && node.property.type === AST_NODE_TYPES.Identifier && node.property.name === name && isInitializedFromReact(node.object.name, initialScope, settings.importSource);
+      return node.object.type === AST_NODE_TYPES.Identifier && node.property.type === AST_NODE_TYPES.Identifier && node.property.name === name && isInitializedFromReact(node.object.name, importSource, initialScope);
     }
     if (node.name === name) {
-      return isInitializedFromReact(name, initialScope, settings.importSource);
+      return isInitializedFromReact(name, importSource, initialScope);
     }
     return false;
   };
@@ -74,14 +51,15 @@ function isFromReactMember(memberName, name) {
       }
       return false;
     }
+    const importSource = settings.importSource ?? DEFAULT_ESLINT_REACT_SETTINGS.importSource;
     const initialScope = context.sourceCode.getScope(node);
     if (node.property.type !== AST_NODE_TYPES.Identifier || node.property.name !== name) {
       return false;
     }
     if (node.object.type === AST_NODE_TYPES.Identifier && node.object.name === memberName) {
-      return isInitializedFromReact(node.object.name, initialScope, settings.importSource);
+      return isInitializedFromReact(node.object.name, importSource, initialScope);
     }
-    if (node.object.type === AST_NODE_TYPES.MemberExpression && node.object.object.type === AST_NODE_TYPES.Identifier && isInitializedFromReact(node.object.object.name, initialScope, settings.importSource) && node.object.property.type === AST_NODE_TYPES.Identifier) {
+    if (node.object.type === AST_NODE_TYPES.MemberExpression && node.object.object.type === AST_NODE_TYPES.Identifier && isInitializedFromReact(node.object.object.name, importSource, initialScope) && node.object.property.type === AST_NODE_TYPES.Identifier) {
       return node.object.property.name === memberName;
     }
     return false;
@@ -164,8 +142,8 @@ function isReactHookName(name) {
 // src/hook/is.ts
 function isReactHook(node) {
   if (node == null) return _;
-  const id2 = AST8.getFunctionIdentifier(node);
-  return id2?.name != null && isReactHookName(id2.name);
+  const id = AST8.getFunctionIdentifier(node);
+  return id?.name != null && isReactHookName(id.name);
 }
 function isReactHookCall(node) {
   if (node == null) return false;
@@ -183,13 +161,14 @@ function isReactHookCall(node) {
 function isReactHookCallWithName(node, context) {
   if (node == null) return returnFalse;
   const settings = unsafeDecodeSettings(context.settings);
+  const importSource = settings.importSource ?? "react";
+  const initialScope = context.sourceCode.getScope(node);
   return (name) => {
-    const initialScope = context.sourceCode.getScope(node);
     switch (true) {
       case (node.callee.type === AST_NODE_TYPES.Identifier && node.callee.name === name):
-        return !settings.strictImportCheck || isInitializedFromReact(name, initialScope, settings.importSource);
+        return !settings.strictImportCheck || isInitializedFromReact(name, importSource, initialScope);
       case (node.callee.type === AST_NODE_TYPES.MemberExpression && node.callee.property.type === AST_NODE_TYPES.Identifier && node.callee.property.name === name && "name" in node.callee.object):
-        return !settings.strictImportCheck || isInitializedFromReact(node.callee.object.name, initialScope, settings.importSource);
+        return !settings.strictImportCheck || isInitializedFromReact(node.callee.object.name, importSource, initialScope);
       default:
         return false;
     }
@@ -210,13 +189,14 @@ function isReactHookCallWithNameLoose(node) {
 }
 function isReactHookCallWithNameAlias(name, context, alias) {
   const settings = unsafeDecodeSettings(context);
+  const importSource = settings.importSource ?? "react";
   return (node) => {
     const initialScope = context.sourceCode.getScope(node);
     switch (true) {
       case (node.callee.type === AST_NODE_TYPES.Identifier && node.callee.name === name):
-        return !settings.strictImportCheck || isInitializedFromReact(name, initialScope, settings.importSource);
+        return !settings.strictImportCheck || isInitializedFromReact(name, importSource, initialScope);
       case (node.callee.type === AST_NODE_TYPES.MemberExpression && node.callee.property.type === AST_NODE_TYPES.Identifier && node.callee.property.name === name && "name" in node.callee.object):
-        return !settings.strictImportCheck || isInitializedFromReact(node.callee.object.name, initialScope, settings.importSource);
+        return !settings.strictImportCheck || isInitializedFromReact(node.callee.object.name, importSource, initialScope);
       default:
         return alias.some(isReactHookCallWithNameLoose(node));
     }
@@ -260,13 +240,13 @@ function useHookCollector() {
   const hooks = /* @__PURE__ */ new Map();
   const fEntries = [];
   const onFunctionEnter = (node) => {
-    const id2 = AST8.getFunctionIdentifier(node);
-    const name = id2?.name;
+    const id = AST8.getFunctionIdentifier(node);
+    const name = id?.name;
     if (name != null && isReactHookName(name)) {
       const key = getId();
       fEntries.push({ key, node });
       hooks.set(key, {
-        id: id2,
+        id,
         key,
         kind: "function",
         name,
@@ -312,7 +292,7 @@ function useHookCollector() {
   return { ctx, listeners };
 }
 var ERComponentHint = {
-  ...JSX4.JSXValueHint,
+  ...JSX3.JSXValueHint,
   // 1n << 0n - 1n << 63n are reserved for JSXValueHint
   // Skip function component created by React.memo
   SkipMemo: 1n << 64n,
@@ -328,24 +308,26 @@ var ERComponentHint = {
   SkipClassProperty: 1n << 69n
 };
 var DEFAULT_COMPONENT_HINT = 0n | ERComponentHint.SkipBooleanLiteral | ERComponentHint.SkipMapCallback | ERComponentHint.SkipNumberLiteral | ERComponentHint.SkipStringLiteral | ERComponentHint.SkipUndefined | ERComponentHint.SkipEmptyArray | ERComponentHint.StrictArray | ERComponentHint.StrictConditional | ERComponentHint.StrictLogical;
+var COMPONENT_DISPLAY_NAME_ASSIGNMENT_SELECTOR = [
+  "AssignmentExpression",
+  "[type]",
+  "[operator='=']",
+  "[left.type='MemberExpression']",
+  "[left.property.name='displayName']"
+].join("");
+function isComponentDisplayNameAssignment(node) {
+  if (node == null) return false;
+  return node.type === AST_NODE_TYPES.AssignmentExpression && node.operator === "=" && node.left.type === AST_NODE_TYPES.MemberExpression && node.left.property.type === AST_NODE_TYPES.Identifier && node.left.property.name === "displayName";
+}
 // src/component/component-flag.ts
-var ERClassComponentFlag = {
+var ERComponentFlag = {
   None: 0n,
-  PureComponent: 1n << 0n
-  // Reserved for future use
-  // CreateElement: 1n << 1n,
-};
-var ERFunctionComponentFlag = {
-  None: 0n,
-  Memo: 1n << 0n,
-  ForwardRef: 1n << 1n
-  // Reserved for future use
-  // CreateElement: 1n << 2n,
-  // Reserved for future use
-  // hasHooks: 1n << 3n,
-  // Reserved for future use
-  // Async: 1n << 4n,
+  PureComponent: 1n << 0n,
+  CreateElement: 1n << 1n,
+  Memo: 1n << 2n,
+  Async: 1n << 3n,
+  ForwardRef: 1n << 4n
 };
 function isComponentWrapperCall(node, context) {
   if (node.type !== AST_NODE_TYPES.CallExpression) {
@@ -391,6 +373,8 @@ function isPureComponent(node) {
   }
   return false;
 }
+// src/component/component-lifecycle.ts
 function isComponentDidMount(node) {
   return AST8.isMethodOrProperty(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "componentDidMount";
 }
@@ -433,9 +417,9 @@ function isComponentName(name) {
   return RE_COMPONENT_NAME.test(name);
 }
 function hasNoneOrValidComponentName(node, context) {
-  const id2 = getFunctionComponentIdentifier(node, context);
-  if (id2 == null) return true;
-  const name = Array.isArray(id2) ? id2.at(-1)?.name : id2.name;
+  const id = getFunctionComponentIdentifier(node, context);
+  if (id == null) return true;
+  const name = Array.isArray(id) ? id.at(-1)?.name : id.name;
   return name != null && isComponentName(name);
 }
@@ -469,16 +453,15 @@ function hasValidHierarchy(node, context, hint) {
   return boundaryNode == null || boundaryNode.type !== AST_NODE_TYPES.JSXExpressionContainer;
 }
 function getComponentFlag(initPath) {
-  let flag = ERFunctionComponentFlag.None;
+  let flag = ERComponentFlag.None;
   if (initPath != null && AST8.hasCallInFunctionInitPath("memo", initPath)) {
-    flag |= ERFunctionComponentFlag.Memo;
+    flag |= ERComponentFlag.Memo;
   }
   if (initPath != null && AST8.hasCallInFunctionInitPath("forwardRef", initPath)) {
-    flag |= ERFunctionComponentFlag.ForwardRef;
+    flag |= ERComponentFlag.ForwardRef;
   }
   return flag;
 }
-var displayNameAssignmentSelector = "AssignmentExpression[type][operator='='][left.type='MemberExpression'][left.property.name='displayName']";
 function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT, options = {}) {
   const { collectDisplayName = false, collectHookCalls = false } = options;
   const jsxCtx = { getScope: (node) => context.sourceCode.getScope(node) };
@@ -496,7 +479,7 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT, options =
       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 && !JSX4.isJSXValue(r.argument, jsxCtx, hint);
+      return context.sourceCode.getScope(r).block === entry.node && r.argument != null && !JSX3.isJSXValue(r.argument, jsxCtx, hint);
     });
     if (shouldDrop) {
       components.delete(entry.key);
@@ -522,16 +505,16 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT, options =
         return;
       }
       const { body } = entry.node;
-      const isComponent = hasNoneOrValidComponentName(entry.node, context) && JSX4.isJSXValue(body, jsxCtx, hint) && hasValidHierarchy(entry.node, context, hint);
+      const isComponent = hasNoneOrValidComponentName(entry.node, context) && JSX3.isJSXValue(body, jsxCtx, hint) && hasValidHierarchy(entry.node, context, hint);
       if (!isComponent) {
         return;
       }
       const initPath = AST8.getFunctionInitPath(entry.node);
-      const id2 = getFunctionComponentIdentifier(entry.node, context);
-      const name = getComponentNameFromIdentifier(id2);
+      const id = getFunctionComponentIdentifier(entry.node, context);
+      const name = getComponentNameFromIdentifier(id);
       const key = getId();
       components.set(key, {
-        id: id2,
+        id,
         key,
         kind: "function",
         name,
@@ -544,8 +527,9 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT, options =
       });
     },
     ...collectDisplayName ? {
-      [displayNameAssignmentSelector](node) {
+      [COMPONENT_DISPLAY_NAME_ASSIGNMENT_SELECTOR](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 component = [...components.values()].findLast(({ name }) => name != null && name === componentName);
         if (component == null) {
@@ -571,17 +555,17 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT, options =
       if (entry == null) {
         return;
       }
-      const isComponent = hasNoneOrValidComponentName(entry.node, context) && JSX4.isJSXValue(node.argument, jsxCtx, hint) && hasValidHierarchy(entry.node, context, hint);
+      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 });
       const initPath = AST8.getFunctionInitPath(entry.node);
-      const id2 = getFunctionComponentIdentifier(entry.node, context);
-      const name = getComponentNameFromIdentifier(id2);
+      const id = getFunctionComponentIdentifier(entry.node, context);
+      const name = getComponentNameFromIdentifier(id);
       components.set(entry.key, {
-        id: id2,
+        id,
         key: entry.key,
         kind: "function",
         name,
@@ -608,16 +592,16 @@ function useComponentCollectorLegacy() {
     if (!isClassComponent(node)) {
       return;
     }
-    const id2 = AST8.getClassIdentifier(node);
+    const id = AST8.getClassIdentifier(node);
     const key = getId();
-    const flag = isPureComponent(node) ? ERClassComponentFlag.PureComponent : ERClassComponentFlag.None;
+    const flag = isPureComponent(node) ? ERComponentFlag.PureComponent : ERComponentFlag.None;
     components.set(
       key,
       {
-        id: id2,
+        id,
         key,
         kind: "class",
-        name: id2?.name,
+        name: id?.name,
         node,
         // TODO: Get displayName of class component
         displayName: _,
@@ -644,12 +628,12 @@ function isRenderFunctionLoose(node, context) {
   if (AST8.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 JSX4.isJSXValue(
+  return JSX3.isJSXValue(
     body,
     {
       getScope: (node2) => context.sourceCode.getScope(node2)
     },
-    JSX4.JSXValueHint.SkipNullLiteral | JSX4.JSXValueHint.SkipUndefined | JSX4.JSXValueHint.StrictLogical | JSX4.JSXValueHint.StrictConditional
+    JSX3.JSXValueHint.SkipNullLiteral | JSX3.JSXValueHint.SkipUndefined | JSX3.JSXValueHint.StrictLogical | JSX3.JSXValueHint.StrictConditional
   );
 }
 function isRenderPropLoose(node, context) {
@@ -689,4 +673,4 @@ function isFunctionOfUseEffectCleanup(node) {
   return nearFunction === nearFunctionOfReturn && isFunctionOfUseEffectSetup(nearFunction);
 }
-export { DEFAULT_COMPONENT_HINT, ERClassComponentFlag, ERComponentHint, ERFunctionComponentFlag, ERPhaseRelevance, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getElementNameOnJsxAndHtml, getFunctionComponentIdentifier, getId, hasNoneOrValidComponentName, isCallFromReact, isCallFromReactMember, isChildrenCount, isChildrenCountCall, isChildrenForEach, isChildrenForEachCall, isChildrenMap, isChildrenMapCall, isChildrenOfCreateElement, isChildrenOnly, isChildrenOnlyCall, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCloneElement, isCloneElementCall, isComponentDidCatch, isComponentDidMount, 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, ERComponentFlag, ERComponentHint, ERPhaseRelevance, 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/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "1.24.0-next.9",
+  "version": "1.24.1-beta.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": {
@@ -33,17 +33,17 @@
     "./package.json"
   ],
   "dependencies": {
-    "@typescript-eslint/scope-manager": "^8.20.0",
-    "@typescript-eslint/type-utils": "^8.20.0",
-    "@typescript-eslint/types": "^8.20.0",
-    "@typescript-eslint/utils": "^8.20.0",
+    "@typescript-eslint/scope-manager": "^8.21.0",
+    "@typescript-eslint/type-utils": "^8.21.0",
+    "@typescript-eslint/types": "^8.21.0",
+    "@typescript-eslint/utils": "^8.21.0",
     "birecord": "^0.1.1",
-    "ts-pattern": "^5.6.0",
-    "@eslint-react/ast": "1.24.0-next.9",
-    "@eslint-react/eff": "1.24.0-next.9",
-    "@eslint-react/jsx": "1.24.0-next.9",
-    "@eslint-react/var": "1.24.0-next.9",
-    "@eslint-react/shared": "1.24.0-next.9"
+    "ts-pattern": "^5.6.2",
+    "@eslint-react/ast": "1.24.1-beta.1",
+    "@eslint-react/eff": "1.24.1-beta.1",
+    "@eslint-react/jsx": "1.24.1-beta.1",
+    "@eslint-react/shared": "1.24.1-beta.1",
+    "@eslint-react/var": "1.24.1-beta.1"
   },
   "devDependencies": {
     "tsup": "^8.3.5",