@eslint-react/core 4.0.2-beta.2 → 4.0.2-beta.4

package/dist/index.d.ts

@@ -295,7 +295,7 @@ declare namespace getComponentCollectorLegacy {
   };
 }
 /**
- * Get an api and visitor object for the rule to collect class componentss
+ * Get an api and visitor object for the rule to collect class components
  * @param context The ESLint rule context
  * @returns The api and visitor of the collector
  */
@@ -308,6 +308,7 @@ declare function getComponentCollectorLegacy(context: RuleContext): getComponent
  * @returns `true` if the node is a class component, `false` otherwise
  */
 declare function isClassComponent(node: TSESTree.Node): node is ast.TSESTreeClass;
+declare function isClassComponent(node: TSESTree.Node, context: RuleContext): node is ast.TSESTreeClass;
 /**
  * Check if a node is a React PureComponent
  * @param node The AST node to check
@@ -376,7 +377,7 @@ declare function isRenderMethodCallback(node: ast.TSESTreeFunction): boolean;
  * @param node The node to check
  * @internal
  */
-declare function isThisSetState(node: TSESTree.CallExpression): boolean;
+declare function isThisSetStateCall(node: TSESTree.CallExpression): boolean;
 /**
  * Check whether the given node is an assignment to this.state
  * @param node The node to check
@@ -439,6 +440,12 @@ declare function isFunctionWithLooseComponentName(context: RuleContext, fn: ast.
  * @returns `true` if the node is a call expression for a component wrapper
  */
 declare function isComponentWrapperCall(context: RuleContext, node: TSESTree.Node): boolean;
+/**
+ * Check if the node is a callback function passed to a component wrapper
+ * @param context The ESLint rule context
+ * @param node The node to check
+ * @returns `true` if the node is a callback function passed to a component wrapper
+ */
 /**
  * Check if the node is a call expression for a component wrapper loosely
  * @param context The ESLint rule context
@@ -520,7 +527,7 @@ interface HookSemanticNode extends SemanticNode {
   /** The other hooks called by the hook */
   hookCalls: TSESTree.CallExpression[];
   /** The directives used in the function (ex: "use strict", "use client", etc.) */
-  directives: TSESTree.StringLiteral[];
+  directives: ast.TSESTreeDirective[];
 }
 //#endregion
 //#region src/hook/hook-collector.d.ts
@@ -553,20 +560,13 @@ declare function isHookId(id: TSESTree.Node): id is TSESTree.Identifier | TSESTr
  * @param node The function node to check
  * @returns True if the function is a React Hook, false otherwise
  */
-declare function isHook(node: ast.TSESTreeFunction | null): boolean;
+declare function isHookDefinition(node: ast.TSESTreeFunction | null): boolean;
 /**
  * Check if the given node is a React Hook call by its name.
  * @param node The node to check.
  * @returns `true` if the node is a React Hook call, `false` otherwise.
  */
 declare function isHookCall(node: TSESTree.Node | null): node is TSESTree.CallExpression;
-/**
- * Check if a node is a call to a specific React hook.
- * Returns a function that accepts a hook name to check against.
- * @param node The AST node to check
- * @returns A function that takes a hook name and returns boolean
- */
-declare function isHookCallWithName(node: TSESTree.Node | null): (name: string) => boolean;
 /**
  * Detect useEffect calls and variations (useLayoutEffect, etc.) using a regex pattern
  * @param node The AST node to check
@@ -611,4 +611,4 @@ declare const REACT_BUILTIN_HOOK_NAMES: readonly ["use", "useActionState", "useC
  */
 declare function isHookName(name: string): boolean;
 //#endregion
-export { ClassComponentSemanticNode, ClientFunctionSemanticNode, ComponentDetectionHint, ComponentFlag, ComponentSemanticNode, DEFAULT_COMPONENT_DETECTION_HINT, FunctionComponentSemanticNode, FunctionKind, FunctionSemanticNode, HookSemanticNode, REACT_BUILTIN_HOOK_NAMES, SemanticFunc, SemanticNode, ServerFunctionSemanticNode, findImportSource, getComponentCollector, getComponentCollectorLegacy, getComponentFlagFromInitPath, getFunctionComponentId, getHookCollector, isAssignmentToThisState, isCaptureOwnerStack, isCaptureOwnerStackCall, isChildrenCount, isChildrenCountCall, isChildrenForEach, isChildrenForEachCall, isChildrenMap, isChildrenMapCall, isChildrenOnly, isChildrenOnlyCall, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCloneElement, isCloneElementCall, isComponentDefinition, isComponentDidCatch, isComponentDidMount, isComponentDidMountCallback, isComponentDidUpdate, isComponentName, isComponentNameLoose, isComponentWillMount, isComponentWillReceiveProps, isComponentWillUnmount, isComponentWillUnmountCallback, isComponentWillUpdate, isComponentWrapperCall, isComponentWrapperCallLoose, isComponentWrapperCallback, isComponentWrapperCallbackLoose, isCreateContext, isCreateContextCall, isCreateElement, isCreateElementCall, isCreateRef, isCreateRefCall, isForwardRef, isForwardRefCall, isFunctionWithLooseComponentName, isGetChildContext, isGetDefaultProps, isGetDerivedStateFromError, isGetDerivedStateFromProps, isGetInitialState, isGetSnapshotBeforeUpdate, isHook, isHookCall, isHookCallWithName, isHookId, isHookName, isInitializedFromReact, isInitializedFromReactNative, isLazy, isLazyCall, isMemo, isMemoCall, isPureComponent, isReactAPI, isReactAPICall, isRender, isRenderMethodCallback, isRenderMethodLike, isShouldComponentUpdate, isThisSetState, isUnsafeComponentWillMount, isUnsafeComponentWillReceiveProps, isUnsafeComponentWillUpdate, isUseActionStateCall, isUseCall, isUseCallbackCall, isUseContextCall, isUseDebugValueCall, isUseDeferredValueCall, isUseEffectCall, isUseEffectCleanupCallback, isUseEffectLikeCall, isUseEffectSetupCallback, isUseFormStatusCall, isUseIdCall, isUseImperativeHandleCall, isUseInsertionEffectCall, isUseLayoutEffectCall, isUseMemoCall, isUseOptimisticCall, isUseReducerCall, isUseRefCall, isUseStateCall, isUseStateLikeCall, isUseSyncExternalStoreCall, isUseTransitionCall };
+export { ClassComponentSemanticNode, ClientFunctionSemanticNode, ComponentDetectionHint, ComponentFlag, ComponentSemanticNode, DEFAULT_COMPONENT_DETECTION_HINT, FunctionComponentSemanticNode, FunctionKind, FunctionSemanticNode, HookSemanticNode, REACT_BUILTIN_HOOK_NAMES, SemanticFunc, SemanticNode, ServerFunctionSemanticNode, findImportSource, getComponentCollector, getComponentCollectorLegacy, getComponentFlagFromInitPath, getFunctionComponentId, getHookCollector, isAssignmentToThisState, isCaptureOwnerStack, isCaptureOwnerStackCall, isChildrenCount, isChildrenCountCall, isChildrenForEach, isChildrenForEachCall, isChildrenMap, isChildrenMapCall, isChildrenOnly, isChildrenOnlyCall, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCloneElement, isCloneElementCall, isComponentDefinition, isComponentDidCatch, isComponentDidMount, isComponentDidMountCallback, isComponentDidUpdate, isComponentName, isComponentNameLoose, isComponentWillMount, isComponentWillReceiveProps, isComponentWillUnmount, isComponentWillUnmountCallback, isComponentWillUpdate, isComponentWrapperCall, isComponentWrapperCallLoose, isComponentWrapperCallback, isComponentWrapperCallbackLoose, isCreateContext, isCreateContextCall, isCreateElement, isCreateElementCall, isCreateRef, isCreateRefCall, isForwardRef, isForwardRefCall, isFunctionWithLooseComponentName, isGetChildContext, isGetDefaultProps, isGetDerivedStateFromError, isGetDerivedStateFromProps, isGetInitialState, isGetSnapshotBeforeUpdate, isHookCall, isHookDefinition, isHookId, isHookName, isInitializedFromReact, isInitializedFromReactNative, isLazy, isLazyCall, isMemo, isMemoCall, isPureComponent, isReactAPI, isReactAPICall, isRender, isRenderMethodCallback, isRenderMethodLike, isShouldComponentUpdate, isThisSetStateCall, isUnsafeComponentWillMount, isUnsafeComponentWillReceiveProps, isUnsafeComponentWillUpdate, isUseActionStateCall, isUseCall, isUseCallbackCall, isUseContextCall, isUseDebugValueCall, isUseDeferredValueCall, isUseEffectCall, isUseEffectCleanupCallback, isUseEffectLikeCall, isUseEffectSetupCallback, isUseFormStatusCall, isUseIdCall, isUseImperativeHandleCall, isUseInsertionEffectCall, isUseLayoutEffectCall, isUseMemoCall, isUseOptimisticCall, isUseReducerCall, isUseRefCall, isUseStateCall, isUseStateLikeCall, isUseSyncExternalStoreCall, isUseTransitionCall };

package/dist/index.js

@@ -185,13 +185,18 @@ function getRequireExpressionArguments(node) {
 * @returns The import source or null if not found
 */
 function findImportSource(name, initialScope) {
+	return findImportSourceImpl(name, initialScope, /* @__PURE__ */ new Set());
+}
+function findImportSourceImpl(name, initialScope, visited) {
+	if (visited.has(name)) return null;
+	visited.add(name);
 	const latestDef = findVariable(initialScope, name)?.defs.at(-1);
 	if (latestDef == null) return null;
 	const { node, parent } = latestDef;
 	if (node.type === AST_NODE_TYPES.VariableDeclarator && node.init != null) {
 		const { init } = node;
-		if (init.type === AST_NODE_TYPES.MemberExpression && init.object.type === AST_NODE_TYPES.Identifier) return findImportSource(init.object.name, initialScope);
-		if (init.type === AST_NODE_TYPES.Identifier) return findImportSource(init.name, initialScope);
+		if (init.type === AST_NODE_TYPES.MemberExpression && init.object.type === AST_NODE_TYPES.Identifier) return findImportSourceImpl(init.object.name, initialScope, visited);
+		if (init.type === AST_NODE_TYPES.Identifier) return findImportSourceImpl(init.name, initialScope, visited);
 		const arg0 = getRequireExpressionArguments(init)?.[0];
 		if (arg0 == null || !ast.isLiteral(arg0, "string")) return null;
 		return arg0.value;
@@ -243,7 +248,7 @@ function isReactAPI(api) {
 		const getText = (n) => context.sourceCode.getText(n);
 		const name = ast.getFullyQualifiedName(node, getText);
 		if (name === api) return true;
-		if (name.substring(name.indexOf(".") + 1) === api) return true;
+		if (name.endsWith(`.${api}`)) return true;
 		return false;
 	};
 	return dual(2, func);
@@ -328,7 +333,7 @@ function isHookName(name) {
 * @param node The function node to check
 * @returns True if the function is a React Hook, false otherwise
 */
-function isHook(node) {
+function isHookDefinition(node) {
 	if (node == null) return false;
 	const id = ast.getFunctionId(node);
 	switch (id?.type) {
@@ -507,17 +512,19 @@ function getHookCollector(context) {
 
 //#endregion
 //#region src/component/component-detection-legacy.ts
-/**
-* Check if a node is a React class component
-* @param node The AST node to check
-* @returns `true` if the node is a class component, `false` otherwise
-*/
-function isClassComponent(node) {
+function isClassComponent(node, context) {
 	if ("superClass" in node && node.superClass != null) {
 		const re = /^(?:Pure)?Component$/u;
 		switch (true) {
-			case node.superClass.type === AST_NODE_TYPES.Identifier: return re.test(node.superClass.name);
-			case node.superClass.type === AST_NODE_TYPES.MemberExpression && node.superClass.property.type === AST_NODE_TYPES.Identifier: return re.test(node.superClass.property.name);
+			case node.superClass.type === AST_NODE_TYPES.Identifier:
+				if (!re.test(node.superClass.name)) return false;
+				if (context == null) return true;
+				return isInitializedFromReact(node.superClass.name, context.sourceCode.getScope(node), "react");
+			case node.superClass.type === AST_NODE_TYPES.MemberExpression && node.superClass.property.type === AST_NODE_TYPES.Identifier:
+				if (!re.test(node.superClass.property.name)) return false;
+				if (context == null) return true;
+				if (node.superClass.object.type === AST_NODE_TYPES.Identifier) return isInitializedFromReact(node.superClass.object.name, context.sourceCode.getScope(node), "react");
+				return true;
 		}
 	}
 	return false;
@@ -592,7 +599,7 @@ function isComponentWillUnmountCallback(node) {
 * @returns `true` if node is a render function, `false` if not
 */
 function isRenderMethodLike(node) {
-	return ast.isMethodOrProperty(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name.startsWith("render") && node.parent.parent.type === AST_NODE_TYPES.ClassDeclaration;
+	return ast.isMethodOrProperty(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name.startsWith("render") && ast.isOneOf([AST_NODE_TYPES.ClassDeclaration, AST_NODE_TYPES.ClassExpression])(node.parent.parent);
 }
 /**
 * Check if the given node is a function within a render method of a class component
@@ -617,7 +624,7 @@ function isRenderMethodCallback(node) {
 * @param node The node to check
 * @internal
 */
-function isThisSetState(node) {
+function isThisSetStateCall(node) {
 	const { callee } = node;
 	return callee.type === AST_NODE_TYPES.MemberExpression && ast.isThisExpressionLoose(callee.object) && callee.property.type === AST_NODE_TYPES.Identifier && callee.property.name === "setState";
 }
@@ -644,6 +651,12 @@ function isComponentWrapperCall(context, node) {
 	return isMemoCall(context, node) || isForwardRefCall(context, node);
 }
 /**
+* Check if the node is a callback function passed to a component wrapper
+* @param context The ESLint rule context
+* @param node The node to check
+* @returns `true` if the node is a callback function passed to a component wrapper
+*/
+/**
 * Check if the node is a call expression for a component wrapper loosely
 * @param context The ESLint rule context
 * @param node The node to check
@@ -852,7 +865,7 @@ function getComponentCollector(context, options = {}) {
 		const initPath = ast.getFunctionInitPath(node);
 		const directives = ast.getFunctionDirectives(node);
 		const entry = {
-			id: getFunctionComponentId(context, node),
+			id,
 			key,
 			kind: "component",
 			name,
@@ -925,7 +938,7 @@ function getComponentCollector(context, options = {}) {
 //#region src/component/component-collector-legacy.ts
 const idGen = new IdGenerator("class-component:");
 /**
-* Get an api and visitor object for the rule to collect class componentss
+* Get an api and visitor object for the rule to collect class components
 * @param context The ESLint rule context
 * @returns The api and visitor of the collector
 */
@@ -963,4 +976,4 @@ function getComponentCollectorLegacy(context) {
 }
 
 //#endregion
-export { ComponentDetectionHint, ComponentFlag, DEFAULT_COMPONENT_DETECTION_HINT, REACT_BUILTIN_HOOK_NAMES, findImportSource, getComponentCollector, getComponentCollectorLegacy, getComponentFlagFromInitPath, getFunctionComponentId, getHookCollector, isAssignmentToThisState, isCaptureOwnerStack, isCaptureOwnerStackCall, isChildrenCount, isChildrenCountCall, isChildrenForEach, isChildrenForEachCall, isChildrenMap, isChildrenMapCall, isChildrenOnly, isChildrenOnlyCall, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCloneElement, isCloneElementCall, isComponentDefinition, isComponentDidCatch, isComponentDidMount, isComponentDidMountCallback, isComponentDidUpdate, isComponentName, isComponentNameLoose, isComponentWillMount, isComponentWillReceiveProps, isComponentWillUnmount, isComponentWillUnmountCallback, isComponentWillUpdate, isComponentWrapperCall, isComponentWrapperCallLoose, isComponentWrapperCallback, isComponentWrapperCallbackLoose, isCreateContext, isCreateContextCall, isCreateElement, isCreateElementCall, isCreateRef, isCreateRefCall, isForwardRef, isForwardRefCall, isFunctionWithLooseComponentName, isGetChildContext, isGetDefaultProps, isGetDerivedStateFromError, isGetDerivedStateFromProps, isGetInitialState, isGetSnapshotBeforeUpdate, isHook, isHookCall, isHookCallWithName, isHookId, isHookName, isInitializedFromReact, isInitializedFromReactNative, isLazy, isLazyCall, isMemo, isMemoCall, isPureComponent, isReactAPI, isReactAPICall, isRender, isRenderMethodCallback, isRenderMethodLike, isShouldComponentUpdate, isThisSetState, isUnsafeComponentWillMount, isUnsafeComponentWillReceiveProps, isUnsafeComponentWillUpdate, isUseActionStateCall, isUseCall, isUseCallbackCall, isUseContextCall, isUseDebugValueCall, isUseDeferredValueCall, isUseEffectCall, isUseEffectCleanupCallback, isUseEffectLikeCall, isUseEffectSetupCallback, isUseFormStatusCall, isUseIdCall, isUseImperativeHandleCall, isUseInsertionEffectCall, isUseLayoutEffectCall, isUseMemoCall, isUseOptimisticCall, isUseReducerCall, isUseRefCall, isUseStateCall, isUseStateLikeCall, isUseSyncExternalStoreCall, isUseTransitionCall };
+export { ComponentDetectionHint, ComponentFlag, DEFAULT_COMPONENT_DETECTION_HINT, REACT_BUILTIN_HOOK_NAMES, findImportSource, getComponentCollector, getComponentCollectorLegacy, getComponentFlagFromInitPath, getFunctionComponentId, getHookCollector, isAssignmentToThisState, isCaptureOwnerStack, isCaptureOwnerStackCall, isChildrenCount, isChildrenCountCall, isChildrenForEach, isChildrenForEachCall, isChildrenMap, isChildrenMapCall, isChildrenOnly, isChildrenOnlyCall, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCloneElement, isCloneElementCall, isComponentDefinition, isComponentDidCatch, isComponentDidMount, isComponentDidMountCallback, isComponentDidUpdate, isComponentName, isComponentNameLoose, isComponentWillMount, isComponentWillReceiveProps, isComponentWillUnmount, isComponentWillUnmountCallback, isComponentWillUpdate, isComponentWrapperCall, isComponentWrapperCallLoose, isComponentWrapperCallback, isComponentWrapperCallbackLoose, isCreateContext, isCreateContextCall, isCreateElement, isCreateElementCall, isCreateRef, isCreateRefCall, isForwardRef, isForwardRefCall, isFunctionWithLooseComponentName, isGetChildContext, isGetDefaultProps, isGetDerivedStateFromError, isGetDerivedStateFromProps, isGetInitialState, isGetSnapshotBeforeUpdate, isHookCall, isHookDefinition, isHookId, isHookName, isInitializedFromReact, isInitializedFromReactNative, isLazy, isLazyCall, isMemo, isMemoCall, isPureComponent, isReactAPI, isReactAPICall, isRender, isRenderMethodCallback, isRenderMethodLike, isShouldComponentUpdate, isThisSetStateCall, isUnsafeComponentWillMount, isUnsafeComponentWillReceiveProps, isUnsafeComponentWillUpdate, isUseActionStateCall, isUseCall, isUseCallbackCall, isUseContextCall, isUseDebugValueCall, isUseDeferredValueCall, isUseEffectCall, isUseEffectCleanupCallback, isUseEffectLikeCall, isUseEffectSetupCallback, isUseFormStatusCall, isUseIdCall, isUseImperativeHandleCall, isUseInsertionEffectCall, isUseLayoutEffectCall, isUseMemoCall, isUseOptimisticCall, isUseReducerCall, isUseRefCall, isUseStateCall, isUseStateLikeCall, isUseSyncExternalStoreCall, isUseTransitionCall };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "4.0.2-beta.2",
+  "version": "4.0.2-beta.4",
   "description": "ESLint React's ESLint utility module for static analysis of React core APIs and patterns.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -34,13 +34,13 @@
     "@typescript-eslint/types": "^8.57.2",
     "@typescript-eslint/utils": "^8.57.2",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "4.0.2-beta.2",
-    "@eslint-react/jsx": "4.0.2-beta.2",
-    "@eslint-react/var": "4.0.2-beta.2",
-    "@eslint-react/shared": "4.0.2-beta.2"
+    "@eslint-react/ast": "4.0.2-beta.4",
+    "@eslint-react/shared": "4.0.2-beta.4",
+    "@eslint-react/var": "4.0.2-beta.4",
+    "@eslint-react/jsx": "4.0.2-beta.4"
   },
   "devDependencies": {
-    "tsdown": "^0.21.6",
+    "tsdown": "^0.21.7",
     "@local/configs": "0.0.0",
     "@local/eff": "3.0.0-beta.72"
   },