eslint-plugin-react-web-api 5.28.0 → 5.28.1

package/dist/index.js

@@ -21,7 +21,7 @@ var __exportAll = (all, no_symbols) => {
 //#endregion
 //#region package.json
 var name$1 = "eslint-plugin-react-web-api";
-var version = "5.28.0";
+var version = "5.28.1";
 //#endregion
 //#region src/utils/create-rule.ts
 function getDocsUrl(ruleName) {
@@ -353,8 +353,10 @@ function create$5(context) {
 			for (const aEntry of aEntries) {
 				if (aEntry.signal != null) continue;
 				if (rEntries.some((rEntry) => isInverseEntry(aEntry, rEntry))) continue;
+				const effect = aEntry.effect;
+				const effectMethodKind = effect != null && effect.type === AST_NODE_TYPES.CallExpression ? Extract.getCalleeName(effect) ?? "useEffect" : "useEffect";
 				context.report({
-					data: { effectMethodKind: "useEffect" },
+					data: { effectMethodKind },
 					messageId: "expected-remove-event-listener-in-cleanup",
 					node: aEntry.node
 				});
@@ -693,6 +695,11 @@ function getCallKind$2(node) {
 	if (name != null && isMatching(P.union("setInterval", "clearInterval"))(name)) return name;
 	return "other";
 }
+function getEffectKind$1(fn) {
+	const call = Traverse.findParent(Extract.unwrap(fn), (n) => !Check.isTypeOrChainExpression(n));
+	if (call?.type !== AST_NODE_TYPES.CallExpression) return "useEffect";
+	return Extract.getCalleeName(call) ?? "useEffect";
+}
 var no_leaked_interval_default = createRule({
 	meta: {
 		type: "problem",
@@ -715,7 +722,8 @@ function create$2(context) {
 	}
 	return {
 		["CallExpression"](node) {
-			if (Traverse.findParent(node, isUseEffectCallback$2) == null) return;
+			const fn = Traverse.findParent(node, isUseEffectCallback$2);
+			if (fn == null) return;
 			match(getCallKind$2(node)).with("setInterval", () => {
 				const intervalIdNode = resolveEnclosingAssignmentTarget(node);
 				if (intervalIdNode == null) {
@@ -726,6 +734,7 @@ function create$2(context) {
 					return;
 				}
 				sEntries.push({
+					effectKind: getEffectKind$1(fn),
 					node,
 					timerId: intervalIdNode
 				});
@@ -733,6 +742,7 @@ function create$2(context) {
 				const [intervalIdNode] = node.arguments;
 				if (intervalIdNode == null) return;
 				cEntries.push({
+					effectKind: getEffectKind$1(fn),
 					node,
 					timerId: intervalIdNode
 				});
@@ -742,7 +752,7 @@ function create$2(context) {
 			for (const sEntry of sEntries) {
 				if (cEntries.some((cEntry) => isInverseEntry(sEntry, cEntry))) continue;
 				context.report({
-					data: { kind: "useEffect" },
+					data: { kind: sEntry.effectKind },
 					messageId: "expected-clear-interval-in-cleanup",
 					node: sEntry.node
 				});
@@ -940,6 +950,11 @@ function getCallKind(node) {
 	if (name != null && isMatching(P.union("setTimeout", "clearTimeout"))(name)) return name;
 	return "other";
 }
+function getEffectKind(fn) {
+	const call = Traverse.findParent(Extract.unwrap(fn), (n) => !Check.isTypeOrChainExpression(n));
+	if (call?.type !== AST_NODE_TYPES.CallExpression) return "useEffect";
+	return Extract.getCalleeName(call) ?? "useEffect";
+}
 var no_leaked_timeout_default = createRule({
 	meta: {
 		type: "problem",
@@ -962,7 +977,8 @@ function create(context) {
 	}
 	return {
 		["CallExpression"](node) {
-			if (Traverse.findParent(node, isUseEffectCallback) == null) return;
+			const fn = Traverse.findParent(node, isUseEffectCallback);
+			if (fn == null) return;
 			match(getCallKind(node)).with("setTimeout", () => {
 				const timeoutIdNode = resolveEnclosingAssignmentTarget(node);
 				if (timeoutIdNode == null) {
@@ -973,6 +989,7 @@ function create(context) {
 					return;
 				}
 				sEntries.push({
+					effectKind: getEffectKind(fn),
 					node,
 					timerId: timeoutIdNode
 				});
@@ -980,6 +997,7 @@ function create(context) {
 				const [timeoutIdNode] = node.arguments;
 				if (timeoutIdNode == null) return;
 				cEntries.push({
+					effectKind: getEffectKind(fn),
 					node,
 					timerId: timeoutIdNode
 				});
@@ -989,7 +1007,7 @@ function create(context) {
 			for (const sEntry of sEntries) {
 				if (cEntries.some((cEntry) => isInverseEntry(sEntry, cEntry))) continue;
 				context.report({
-					data: { kind: "useEffect" },
+					data: { kind: sEntry.effectKind },
 					messageId: "expected-clear-timeout-in-cleanup",
 					node: sEntry.node
 				});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-web-api",
-  "version": "5.28.0",
+  "version": "5.28.1",
   "description": "ESLint React's ESLint plugin for interacting with Web APIs",
   "keywords": [
     "react",
@@ -37,11 +37,11 @@
     "dist"
   ],
   "dependencies": {
-    "@eslint-react/ast": "5.28.0",
-    "@eslint-react/core": "5.28.0",
-    "@eslint-react/eslint": "5.28.0",
-    "@eslint-react/shared": "5.28.0",
-    "@eslint-react/var": "5.28.0",
+    "@eslint-react/ast": "5.28.1",
+    "@eslint-react/core": "5.28.1",
+    "@eslint-react/eslint": "5.28.1",
+    "@eslint-react/shared": "5.28.1",
+    "@eslint-react/var": "5.28.1",
     "@typescript-eslint/types": "^8.71.2",
     "@typescript-eslint/utils": "^8.71.2",
     "ts-pattern": "^5.9.2"
@@ -55,7 +55,7 @@
     "@types/react": "^19.3.0",
     "@types/react-dom": "^19.3.0",
     "dedent": "^1.7.2",
-    "eslint": "^10.12.0",
+    "eslint": "^10.13.0",
     "tsdown": "^0.23.1",
     "typescript": "6.0.3"
   },