eslint-plugin-react-web-api 5.20.8 → 5.21.1

package/dist/index.js

@@ -1,5 +1,5 @@
 import { DEFAULT_ESLINT_REACT_SETTINGS } from "@eslint-react/shared";
-import { ESLintUtils } from "@typescript-eslint/utils";
+import * as ESLintUtils from "@typescript-eslint/utils/eslint-utils";
 import { Check, Compare, Extract, Traverse } from "@eslint-react/ast";
 import { isUseEffectCleanupCallback, isUseEffectSetupCallback } from "@eslint-react/core";
 import "@eslint-react/eslint";
@@ -27,7 +27,7 @@ var __exportAll = (all, no_symbols) => {
 //#endregion
 //#region package.json
 var name$1 = "eslint-plugin-react-web-api";
-var version = "5.20.8";
+var version = "5.21.1";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -96,11 +96,6 @@ function getCallKind$5(node) {
 	if (name != null && isMatching(P.union("addEventListener", "removeEventListener"))(name)) return name;
 	return "other";
 }
-function getFunctionKind$5(node) {
-	if (isUseEffectSetupCallback(node)) return "setup";
-	if (isUseEffectCleanupCallback(node)) return "cleanup";
-	return "other";
-}
 var no_leaked_event_listener_default = createRule({
 	meta: {
 		type: "problem",
@@ -118,7 +113,6 @@ var no_leaked_event_listener_default = createRule({
 function create$5(context) {
 	if (!context.sourceCode.text.includes("addEventListener")) return {};
 	if (!/use\w*Effect/u.test(context.sourceCode.text)) return {};
-	const fEntries = [];
 	const aEntries = [];
 	const rEntries = [];
 	function isSameObject(a, b) {
@@ -144,15 +138,10 @@ function create$5(context) {
 		});
 	}
 	return {
-		[":function"](node) {
-			fEntries.push(getFunctionKind$5(node));
-		},
-		[":function:exit"]() {
-			fEntries.pop();
-		},
 		["CallExpression"](node) {
-			const fKind = fEntries.findLast((kind) => kind !== "other");
-			if (fKind == null) return;
+			const fn = Traverse.findParent(node, (n) => isUseEffectSetupCallback(n) || isUseEffectCleanupCallback(n));
+			if (fn == null) return;
+			const fKind = isUseEffectSetupCallback(fn) ? "setup" : "cleanup";
 			const callee = Extract.unwrap(node.callee);
 			match(getCallKind$5(node)).with("addEventListener", (callKind) => {
 				if (callee.type === AST_NODE_TYPES.MemberExpression && Check.isIdentifier(callee.object) && isInitializedFromReactNative(callee.object.name, context.sourceCode.getScope(node))) return;
@@ -223,11 +212,6 @@ function getCallKind$4(node) {
 	if (name != null && isMatching(P.union("fetch", "abort"))(name)) return name;
 	return "other";
 }
-function getFunctionKind$4(node) {
-	if (isUseEffectSetupCallback(node)) return "setup";
-	if (isUseEffectCleanupCallback(node)) return "cleanup";
-	return "other";
-}
 function getControllerFromSignal(context, node) {
 	node = Extract.unwrap(node);
 	switch (node.type) {
@@ -297,19 +281,13 @@ var no_leaked_fetch_default = createRule({
 function create$4(context) {
 	if (!context.sourceCode.text.includes("fetch")) return {};
 	if (!/use\w*Effect/u.test(context.sourceCode.text)) return {};
-	const fEntries = [];
 	const fetchEntries = [];
 	const abortEntries = [];
 	return {
-		[":function"](node) {
-			fEntries.push(getFunctionKind$4(node));
-		},
-		[":function:exit"]() {
-			fEntries.pop();
-		},
 		["CallExpression"](node) {
 			match(getCallKind$4(node)).with("fetch", () => {
-				if (fEntries.at(-1) !== "setup") return;
+				const fn = Traverse.findParent(node, Check.isFunction);
+				if (fn == null || !isUseEffectSetupCallback(fn)) return;
 				const { controller, isParamSignal } = getFetchController(context, node);
 				fetchEntries.push({
 					controller,
@@ -317,7 +295,8 @@ function create$4(context) {
 					node
 				});
 			}).with("abort", () => {
-				if (fEntries.findLast((kind) => kind !== "other") !== "cleanup") return;
+				const fn = Traverse.findParent(node, (n) => isUseEffectSetupCallback(n) || isUseEffectCleanupCallback(n));
+				if (fn == null || !isUseEffectCleanupCallback(fn)) return;
 				const controller = getAbortController(node);
 				if (controller == null) return;
 				abortEntries.push({
@@ -851,11 +830,6 @@ function getCallKind$3(context, node) {
 	if (name != null && isMatching(P.union("observe", "unobserve", "disconnect"))(name) && isFromObserver$1(context, callee, "IntersectionObserver")) return name;
 	return "other";
 }
-function getFunctionKind$3(node) {
-	if (isUseEffectSetupCallback(node)) return "setup";
-	if (isUseEffectCleanupCallback(node)) return "cleanup";
-	return "other";
-}
 var no_leaked_intersection_observer_default = createRule({
 	meta: {
 		type: "problem",
@@ -873,24 +847,13 @@ var no_leaked_intersection_observer_default = createRule({
 });
 function create$3(context) {
 	if (!context.sourceCode.text.includes("IntersectionObserver")) return {};
-	const fEntries = [];
 	const observers = [];
 	const oEntries = [];
 	const uEntries = [];
 	const dEntries = [];
 	return {
-		[":function"](node) {
-			const kind = getFunctionKind$3(node);
-			fEntries.push({
-				kind,
-				node
-			});
-		},
-		[":function:exit"]() {
-			fEntries.pop();
-		},
 		["CallExpression"](node) {
-			if (fEntries.findLast((x) => x.kind !== "other")?.kind == null) return;
+			if (!(Traverse.findParent(node, (n) => isUseEffectSetupCallback(n) || isUseEffectCleanupCallback(n)) != null)) return;
 			const callee = Extract.unwrap(node.callee);
 			if (callee.type !== AST_NODE_TYPES.MemberExpression) return;
 			const { object } = callee;
@@ -921,8 +884,8 @@ function create$3(context) {
 			}).otherwise(() => null);
 		},
 		["NewExpression"](node) {
-			const fEntry = fEntries.findLast((x) => x.kind !== "other");
-			if (fEntry == null) return;
+			const fn = Traverse.findParent(node, (n) => Check.isFunction(n) && (isUseEffectSetupCallback(n) || isUseEffectCleanupCallback(n)));
+			if (fn == null) return;
 			if (!isNewObserver$1(node, "IntersectionObserver")) return;
 			const id = resolveEnclosingAssignmentTarget(node);
 			if (id == null) {
@@ -935,7 +898,7 @@ function create$3(context) {
 			observers.push({
 				id,
 				node,
-				phaseNode: fEntry.node
+				phaseNode: fn
 			});
 		},
 		["Program:exit"]() {
@@ -973,11 +936,6 @@ function getCallKind$2(node) {
 	if (name != null && isMatching(P.union("setInterval", "clearInterval"))(name)) return name;
 	return "other";
 }
-function getFunctionKind$2(node) {
-	if (isUseEffectSetupCallback(node)) return "setup";
-	if (isUseEffectCleanupCallback(node)) return "cleanup";
-	return "other";
-}
 var no_leaked_interval_default = createRule({
 	meta: {
 		type: "problem",
@@ -994,21 +952,14 @@ var no_leaked_interval_default = createRule({
 });
 function create$2(context) {
 	if (!context.sourceCode.text.includes("setInterval")) return {};
-	const fEntries = [];
 	const sEntries = [];
 	const cEntries = [];
 	function isInverseEntry(a, b) {
 		return isAssignmentTargetEqual(context, a.timerId, b.timerId);
 	}
 	return {
-		[":function"](node) {
-			fEntries.push(getFunctionKind$2(node));
-		},
-		[":function:exit"]() {
-			fEntries.pop();
-		},
 		["CallExpression"](node) {
-			if (fEntries.findLast((kind) => kind !== "other") == null) return;
+			if (Traverse.findParent(node, (n) => isUseEffectSetupCallback(n) || isUseEffectCleanupCallback(n)) == null) return;
 			match(getCallKind$2(node)).with("setInterval", () => {
 				const intervalIdNode = resolveEnclosingAssignmentTarget(node);
 				if (intervalIdNode == null) {
@@ -1072,11 +1023,6 @@ function getCallKind$1(context, node) {
 	if (name != null && isMatching(P.union("observe", "unobserve", "disconnect"))(name) && isFromObserver(context, callee, "ResizeObserver")) return name;
 	return "other";
 }
-function getFunctionKind$1(node) {
-	if (isUseEffectSetupCallback(node)) return "setup";
-	if (isUseEffectCleanupCallback(node)) return "cleanup";
-	return "other";
-}
 var no_leaked_resize_observer_default = createRule({
 	meta: {
 		type: "problem",
@@ -1094,24 +1040,13 @@ var no_leaked_resize_observer_default = createRule({
 });
 function create$1(context) {
 	if (!context.sourceCode.text.includes("ResizeObserver")) return {};
-	const fEntries = [];
 	const observers = [];
 	const oEntries = [];
 	const uEntries = [];
 	const dEntries = [];
 	return {
-		[":function"](node) {
-			const kind = getFunctionKind$1(node);
-			fEntries.push({
-				kind,
-				node
-			});
-		},
-		[":function:exit"]() {
-			fEntries.pop();
-		},
 		["CallExpression"](node) {
-			if (fEntries.findLast((x) => x.kind !== "other")?.kind == null) return;
+			if (!(Traverse.findParent(node, (n) => isUseEffectSetupCallback(n) || isUseEffectCleanupCallback(n)) != null)) return;
 			const callee = Extract.unwrap(node.callee);
 			if (callee.type !== AST_NODE_TYPES.MemberExpression) return;
 			const { object } = callee;
@@ -1142,8 +1077,8 @@ function create$1(context) {
 			}).otherwise(() => null);
 		},
 		["NewExpression"](node) {
-			const fEntry = fEntries.findLast((x) => x.kind !== "other");
-			if (fEntry == null) return;
+			const fn = Traverse.findParent(node, (n) => Check.isFunction(n) && (isUseEffectSetupCallback(n) || isUseEffectCleanupCallback(n)));
+			if (fn == null) return;
 			if (!isNewObserver(node, "ResizeObserver")) return;
 			const id = resolveEnclosingAssignmentTarget(node);
 			if (id == null) {
@@ -1156,7 +1091,7 @@ function create$1(context) {
 			observers.push({
 				id,
 				node,
-				phaseNode: fEntry.node
+				phaseNode: fn
 			});
 		},
 		["Program:exit"]() {
@@ -1194,11 +1129,6 @@ function getCallKind(node) {
 	if (name != null && isMatching(P.union("setTimeout", "clearTimeout"))(name)) return name;
 	return "other";
 }
-function getFunctionKind(node) {
-	if (isUseEffectSetupCallback(node)) return "setup";
-	if (isUseEffectCleanupCallback(node)) return "cleanup";
-	return "other";
-}
 var no_leaked_timeout_default = createRule({
 	meta: {
 		type: "problem",
@@ -1215,21 +1145,14 @@ var no_leaked_timeout_default = createRule({
 });
 function create(context) {
 	if (!context.sourceCode.text.includes("setTimeout")) return {};
-	const fEntries = [];
 	const sEntries = [];
 	const cEntries = [];
 	function isInverseEntry(a, b) {
 		return isAssignmentTargetEqual(context, a.timerId, b.timerId);
 	}
 	return {
-		[":function"](node) {
-			fEntries.push(getFunctionKind(node));
-		},
-		[":function:exit"]() {
-			fEntries.pop();
-		},
 		["CallExpression"](node) {
-			if (fEntries.findLast((kind) => kind !== "other") == null) return;
+			if (Traverse.findParent(node, (n) => isUseEffectSetupCallback(n) || isUseEffectCleanupCallback(n)) == null) return;
 			match(getCallKind(node)).with("setTimeout", () => {
 				const timeoutIdNode = resolveEnclosingAssignmentTarget(node);
 				if (timeoutIdNode == null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-web-api",
-  "version": "5.20.8",
+  "version": "5.21.1",
   "description": "ESLint React's ESLint plugin for interacting with Web APIs",
   "keywords": [
     "react",
@@ -37,13 +37,13 @@
     "dist"
   ],
   "dependencies": {
-    "@eslint-react/ast": "5.20.8",
-    "@eslint-react/core": "5.20.8",
-    "@eslint-react/eslint": "5.20.8",
-    "@eslint-react/shared": "5.20.8",
-    "@eslint-react/var": "5.20.8",
-    "@typescript-eslint/types": "^8.70.0",
-    "@typescript-eslint/utils": "^8.70.0",
+    "@eslint-react/ast": "5.21.1",
+    "@eslint-react/core": "5.21.1",
+    "@eslint-react/eslint": "5.21.1",
+    "@eslint-react/shared": "5.21.1",
+    "@eslint-react/var": "5.21.1",
+    "@typescript-eslint/types": "^8.70.1",
+    "@typescript-eslint/utils": "^8.70.1",
     "ts-pattern": "^5.9.0"
   },
   "devDependencies": {
@@ -60,6 +60,11 @@
     "eslint": "*",
     "typescript": "*"
   },
+  "peerDependenciesMeta": {
+    "eslint": {
+      "optional": true
+    }
+  },
   "engines": {
     "node": ">=22.0.0"
   },