eslint-plugin-react-web-api 5.24.6 → 5.24.7

package/dist/index.js

@@ -1,7 +1,7 @@
 import { DEFAULT_ESLINT_REACT_SETTINGS } from "@eslint-react/shared";
 import * as ESLintUtils from "@typescript-eslint/utils/eslint-utils";
 import { Check, Compare, Extract, Traverse } from "@eslint-react/ast";
-import { getFunctionId, isUseEffectCleanupCallback, isUseEffectSetupCallback } from "@eslint-react/core";
+import { getFunctionId, isUseEffectCleanupCallback, isUseEffectSetupCallback, isUseRefLikeCall } from "@eslint-react/core";
 import "@eslint-react/eslint";
 import { isAssignmentTargetEqual, isInitializedFromReactNative, isValueEqual, resolve, resolveEnclosingAssignmentTarget, resolveOrigin } from "@eslint-react/var";
 import { AST_NODE_TYPES } from "@typescript-eslint/types";
@@ -21,7 +21,7 @@ var __exportAll = (all, no_symbols) => {
 //#endregion
 //#region package.json
 var name$1 = "eslint-plugin-react-web-api";
-var version = "5.24.6";
+var version = "5.24.7";
 //#endregion
 //#region src/utils/create-rule.ts
 function getDocsUrl(ruleName) {
@@ -131,6 +131,18 @@ dual(2, (self, predicate) => {
 });
 //#endregion
 //#region src/rules/no-leaked-event-listener/lib.ts
+function isSignalPropertyBinding(context, node) {
+	const defNode = findVariable(context.sourceCode.getScope(node), node)?.defs.at(-1)?.node;
+	if (defNode?.type !== AST_NODE_TYPES.VariableDeclarator || defNode.id.type !== AST_NODE_TYPES.ObjectPattern) return false;
+	for (const prop of defNode.id.properties) {
+		if (prop.type !== AST_NODE_TYPES.Property || prop.computed) continue;
+		const key = Extract.unwrap(prop.key);
+		if (key.type !== AST_NODE_TYPES.Identifier || key.name !== "signal") continue;
+		const value = Extract.unwrap(prop.value);
+		return value.type === AST_NODE_TYPES.Identifier && value.name === node.name;
+	}
+	return false;
+}
 function getSignalValueExpression(context, node) {
 	if (node == null) return null;
 	switch (node.type) {
@@ -138,6 +150,10 @@ function getSignalValueExpression(context, node) {
 			const resolved = resolveOrigin(context, node);
 			const unwrapped = resolved == null ? null : Extract.unwrap(resolved);
 			if (unwrapped != null && Check.isFunction(unwrapped)) return node;
+			if (unwrapped != null && unwrapped.type === AST_NODE_TYPES.NewExpression && isSignalPropertyBinding(context, node)) {
+				const newCallee = Extract.unwrap(unwrapped.callee);
+				if (newCallee.type === AST_NODE_TYPES.Identifier && newCallee.name === "AbortController") return node;
+			}
 			return getSignalValueExpression(context, unwrapped);
 		}
 		case AST_NODE_TYPES.MemberExpression: return node;
@@ -246,10 +262,15 @@ function create$5(context) {
 	const aEntries = [];
 	const rEntries = [];
 	const cleanupCallees = /* @__PURE__ */ new Map();
+	function isGlobalObject(node) {
+		return Check.isIdentifier(node) && (node.name === "window" || node.name === "globalThis" || node.name === "self");
+	}
 	function isSameObject(a, b) {
 		switch (true) {
 			case a.type === AST_NODE_TYPES.MemberExpression && b.type === AST_NODE_TYPES.MemberExpression: return Compare.isEqual(a.object, b.object);
-			default: return false;
+			case a.type === AST_NODE_TYPES.MemberExpression: return isGlobalObject(a.object);
+			case b.type === AST_NODE_TYPES.MemberExpression: return isGlobalObject(b.object);
+			default: return true;
 		}
 	}
 	function isInverseEntry(aEntry, rEntry) {
@@ -365,7 +386,7 @@ function getCallKind$4(node) {
 	if (name != null && isMatching(P.union("fetch", "abort"))(name)) return name;
 	return "other";
 }
-function getControllerFromSignal(context, node) {
+function getControllerFromSignal(context, node, seen = /* @__PURE__ */ new Set()) {
 	node = Extract.unwrap(node);
 	switch (node.type) {
 		case AST_NODE_TYPES.MemberExpression: return {
@@ -373,6 +394,11 @@ function getControllerFromSignal(context, node) {
 			isParamSignal: false
 		};
 		case AST_NODE_TYPES.Identifier: {
+			if (seen.has(node)) return {
+				controller: null,
+				isParamSignal: false
+			};
+			seen.add(node);
 			const resolved = resolveOrigin(context, node);
 			const resolvedUnwrapped = resolved == null ? null : Extract.unwrap(resolved);
 			if (resolvedUnwrapped?.type === AST_NODE_TYPES.MemberExpression) return {
@@ -383,6 +409,7 @@ function getControllerFromSignal(context, node) {
 				controller: node,
 				isParamSignal: true
 			};
+			if (resolvedUnwrapped != null) return getControllerFromSignal(context, resolvedUnwrapped, seen);
 			return {
 				controller: null,
 				isParamSignal: false
@@ -487,12 +514,28 @@ function isFromObserver$1(context, node, name) {
 	switch (true) {
 		case Check.isIdentifier(node): {
 			const initNode = resolve(context, node);
-			return isNewObserver$1(initNode == null ? null : Extract.unwrap(initNode), name);
+			const unwrapped = initNode == null ? null : Extract.unwrap(initNode);
+			if (unwrapped == null) return false;
+			if (isNewObserver$1(unwrapped, name)) return true;
+			if (unwrapped.type === AST_NODE_TYPES.CallExpression && isUseRefLikeCall(unwrapped)) {
+				const arg = unwrapped.arguments.at(0);
+				return arg != null && isNewObserver$1(Extract.unwrap(arg), name);
+			}
+			if (unwrapped.type === AST_NODE_TYPES.MemberExpression) return isFromObserver$1(context, unwrapped, name);
+			return false;
 		}
 		case node.type === AST_NODE_TYPES.MemberExpression: return isFromObserver$1(context, node.object, name);
 		default: return false;
 	}
 }
+function isFromRefCurrent$1(context, node, refId) {
+	let unwrapped = Check.isTypeExpression(node) ? Extract.unwrap(node) : node;
+	if (Check.isIdentifier(unwrapped)) {
+		const initNode = resolve(context, unwrapped);
+		if (initNode != null) unwrapped = Extract.unwrap(initNode);
+	}
+	return unwrapped.type === AST_NODE_TYPES.MemberExpression && !unwrapped.computed && Check.isIdentifier(Extract.unwrap(unwrapped.property), "current") && isAssignmentTargetEqual(context, unwrapped.object, refId);
+}
 //#endregion
 //#region src/rules/no-leaked-intersection-observer/no-leaked-intersection-observer.ts
 const RULE_NAME$3 = "no-leaked-intersection-observer";
@@ -504,6 +547,20 @@ 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 isUseRefInitialValue$1(node) {
+	let child = node;
+	let parent = node.parent;
+	while (Check.isTypeExpression(parent)) {
+		child = parent;
+		parent = parent.parent;
+	}
+	return parent.type === AST_NODE_TYPES.CallExpression && parent.arguments.at(0) === child && isUseRefLikeCall(parent);
+}
+function resolveLocalFunction$1(context, node, id) {
+	const defNode = findVariable(context.sourceCode.getScope(node), id)?.defs.at(-1)?.node;
+	const fn = defNode == null ? null : defNode.type === AST_NODE_TYPES.FunctionDeclaration ? defNode : defNode.type === AST_NODE_TYPES.VariableDeclarator && defNode.init != null ? Extract.unwrap(defNode.init) : null;
+	return fn != null && Check.isFunction(fn) ? fn : null;
+}
 var no_leaked_intersection_observer_default = createRule({
 	meta: {
 		type: "problem",
@@ -524,10 +581,25 @@ function create$3(context) {
 	const oEntries = [];
 	const uEntries = [];
 	const dEntries = [];
+	const returnedCleanups = /* @__PURE__ */ new Set();
+	const cleanupCallees = /* @__PURE__ */ new Set();
+	function isInCleanupPhase(node) {
+		if (Traverse.findParent(node, isUseEffectCleanupCallback) != null) return true;
+		for (const fn of [...returnedCleanups, ...cleanupCallees]) if (Traverse.findParent(node, (n) => n === fn) != null) return true;
+		return false;
+	}
 	return {
 		["CallExpression"](node) {
-			if (Traverse.findParent(node, isUseEffectCallback$3) == null) return;
+			const effectCallback = Traverse.findParent(node, isUseEffectCallback$3);
+			if (effectCallback == null) return;
 			const callee = Extract.unwrap(node.callee);
+			if (callee.type === AST_NODE_TYPES.Identifier) {
+				if (isUseEffectCleanupCallback(effectCallback)) {
+					const fn = resolveLocalFunction$1(context, node, callee);
+					if (fn != null) cleanupCallees.add(fn);
+				}
+				return;
+			}
 			if (callee.type !== AST_NODE_TYPES.MemberExpression) return;
 			const { object } = callee;
 			match(getCallKind$3(context, node)).with("disconnect", () => {
@@ -557,9 +629,9 @@ function create$3(context) {
 			}).otherwise(() => null);
 		},
 		["NewExpression"](node) {
-			const fn = Traverse.findParent(node, and(Check.isFunction, isUseEffectCallback$3));
-			if (fn == null) return;
 			if (!isNewObserver$1(node, "IntersectionObserver")) return;
+			const fn = Traverse.findParent(node, and(Check.isFunction, isUseEffectCallback$3));
+			if (fn == null && !isUseRefInitialValue$1(node)) return;
 			const id = resolveEnclosingAssignmentTarget(node);
 			if (id == null) {
 				context.report({
@@ -574,14 +646,27 @@ function create$3(context) {
 				phaseNode: fn
 			});
 		},
+		["ReturnStatement"](node) {
+			const arg = node.argument == null ? null : Extract.unwrap(node.argument);
+			if (arg == null || arg.type !== AST_NODE_TYPES.Identifier) return;
+			const setupFn = Traverse.findParent(node, Check.isFunction);
+			if (setupFn == null || !isUseEffectSetupCallback(setupFn)) return;
+			const fn = resolveLocalFunction$1(context, node, arg);
+			if (fn != null) returnedCleanups.add(fn);
+		},
 		["Program:exit"]() {
 			for (const { id, node, phaseNode } of observers) {
-				if (dEntries.some((e) => Traverse.findParent(e.node, (n) => n === node) == null && isAssignmentTargetEqual(context, e.observer, id))) continue;
-				const matchedOEntries = oEntries.filter((e) => isAssignmentTargetEqual(context, e.observer, id));
-				const matchedUEntries = uEntries.filter((e) => isAssignmentTargetEqual(context, e.observer, id));
+				const isSameObserver = phaseNode == null ? (observer) => isFromRefCurrent$1(context, observer, id) : (observer) => isAssignmentTargetEqual(context, observer, id);
+				const isInsideObserverCallback = (entryNode) => Traverse.findParent(entryNode, (n) => n === node) != null;
+				if (dEntries.some((e) => !isInsideObserverCallback(e.node) && isInCleanupPhase(e.node) && isSameObserver(e.observer))) continue;
+				const matchedOEntries = oEntries.filter((e) => isSameObserver(e.observer));
+				const matchedUEntries = uEntries.filter((e) => isSameObserver(e.observer));
 				const isDynamic = or(Check.isCallExpression, Check.isConditional);
-				const isPhaseNode = (n) => n === phaseNode;
-				if (matchedOEntries.some((e) => !isPhaseNode(Traverse.findParent(e.node, or(isDynamic, isPhaseNode))))) {
+				if (matchedOEntries.some((e) => {
+					const entryPhaseNode = phaseNode ?? Traverse.findParent(e.node, isUseEffectCallback$3);
+					const isPhaseNode = (n) => n === entryPhaseNode;
+					return !isPhaseNode(Traverse.findParent(e.node, or(isDynamic, isPhaseNode)));
+				})) {
 					context.report({
 						messageId: "expected-disconnect-in-control-flow",
 						node
@@ -589,7 +674,7 @@ function create$3(context) {
 					continue;
 				}
 				for (const oEntry of matchedOEntries) {
-					if (matchedUEntries.some((uEntry) => isAssignmentTargetEqual(context, uEntry.element, oEntry.element))) continue;
+					if (matchedUEntries.some((uEntry) => !isInsideObserverCallback(uEntry.node) && isInCleanupPhase(uEntry.node) && isAssignmentTargetEqual(context, uEntry.element, oEntry.element))) continue;
 					context.report({
 						messageId: "expected-disconnect-or-unobserve-in-cleanup",
 						node: oEntry.node
@@ -676,12 +761,28 @@ function isFromObserver(context, node, name) {
 	switch (true) {
 		case Check.isIdentifier(node): {
 			const initNode = resolve(context, node);
-			return isNewObserver(initNode == null ? null : Extract.unwrap(initNode), name);
+			const unwrapped = initNode == null ? null : Extract.unwrap(initNode);
+			if (unwrapped == null) return false;
+			if (isNewObserver(unwrapped, name)) return true;
+			if (unwrapped.type === AST_NODE_TYPES.CallExpression && isUseRefLikeCall(unwrapped)) {
+				const arg = unwrapped.arguments.at(0);
+				return arg != null && isNewObserver(Extract.unwrap(arg), name);
+			}
+			if (unwrapped.type === AST_NODE_TYPES.MemberExpression) return isFromObserver(context, unwrapped, name);
+			return false;
 		}
 		case node.type === AST_NODE_TYPES.MemberExpression: return isFromObserver(context, node.object, name);
 		default: return false;
 	}
 }
+function isFromRefCurrent(context, node, refId) {
+	let unwrapped = Check.isTypeExpression(node) ? Extract.unwrap(node) : node;
+	if (Check.isIdentifier(unwrapped)) {
+		const initNode = resolve(context, unwrapped);
+		if (initNode != null) unwrapped = Extract.unwrap(initNode);
+	}
+	return unwrapped.type === AST_NODE_TYPES.MemberExpression && !unwrapped.computed && Check.isIdentifier(Extract.unwrap(unwrapped.property), "current") && isAssignmentTargetEqual(context, unwrapped.object, refId);
+}
 //#endregion
 //#region src/rules/no-leaked-resize-observer/no-leaked-resize-observer.ts
 const RULE_NAME$1 = "no-leaked-resize-observer";
@@ -693,6 +794,20 @@ function getCallKind$1(context, node) {
 	if (name != null && isMatching(P.union("observe", "unobserve", "disconnect"))(name) && isFromObserver(context, callee, "ResizeObserver")) return name;
 	return "other";
 }
+function isUseRefInitialValue(node) {
+	let child = node;
+	let parent = node.parent;
+	while (Check.isTypeExpression(parent)) {
+		child = parent;
+		parent = parent.parent;
+	}
+	return parent.type === AST_NODE_TYPES.CallExpression && parent.arguments.at(0) === child && isUseRefLikeCall(parent);
+}
+function resolveLocalFunction(context, node, id) {
+	const defNode = findVariable(context.sourceCode.getScope(node), id)?.defs.at(-1)?.node;
+	const fn = defNode == null ? null : defNode.type === AST_NODE_TYPES.FunctionDeclaration ? defNode : defNode.type === AST_NODE_TYPES.VariableDeclarator && defNode.init != null ? Extract.unwrap(defNode.init) : null;
+	return fn != null && Check.isFunction(fn) ? fn : null;
+}
 var no_leaked_resize_observer_default = createRule({
 	meta: {
 		type: "problem",
@@ -713,10 +828,25 @@ function create$1(context) {
 	const oEntries = [];
 	const uEntries = [];
 	const dEntries = [];
+	const returnedCleanups = /* @__PURE__ */ new Set();
+	const cleanupCallees = /* @__PURE__ */ new Set();
+	function isInCleanupPhase(node) {
+		if (Traverse.findParent(node, isUseEffectCleanupCallback) != null) return true;
+		for (const fn of [...returnedCleanups, ...cleanupCallees]) if (Traverse.findParent(node, (n) => n === fn) != null) return true;
+		return false;
+	}
 	return {
 		["CallExpression"](node) {
-			if (Traverse.findParent(node, isUseEffectCallback$1) == null) return;
+			const effectCallback = Traverse.findParent(node, isUseEffectCallback$1);
+			if (effectCallback == null) return;
 			const callee = Extract.unwrap(node.callee);
+			if (callee.type === AST_NODE_TYPES.Identifier) {
+				if (isUseEffectCleanupCallback(effectCallback)) {
+					const fn = resolveLocalFunction(context, node, callee);
+					if (fn != null) cleanupCallees.add(fn);
+				}
+				return;
+			}
 			if (callee.type !== AST_NODE_TYPES.MemberExpression) return;
 			const { object } = callee;
 			match(getCallKind$1(context, node)).with("disconnect", () => {
@@ -746,9 +876,9 @@ function create$1(context) {
 			}).otherwise(() => null);
 		},
 		["NewExpression"](node) {
-			const fn = Traverse.findParent(node, and(Check.isFunction, isUseEffectCallback$1));
-			if (fn == null) return;
 			if (!isNewObserver(node, "ResizeObserver")) return;
+			const fn = Traverse.findParent(node, and(Check.isFunction, isUseEffectCallback$1));
+			if (fn == null && !isUseRefInitialValue(node)) return;
 			const id = resolveEnclosingAssignmentTarget(node);
 			if (id == null) {
 				context.report({
@@ -763,15 +893,27 @@ function create$1(context) {
 				phaseNode: fn
 			});
 		},
+		["ReturnStatement"](node) {
+			const arg = node.argument == null ? null : Extract.unwrap(node.argument);
+			if (arg == null || arg.type !== AST_NODE_TYPES.Identifier) return;
+			const setupFn = Traverse.findParent(node, Check.isFunction);
+			if (setupFn == null || !isUseEffectSetupCallback(setupFn)) return;
+			const fn = resolveLocalFunction(context, node, arg);
+			if (fn != null) returnedCleanups.add(fn);
+		},
 		["Program:exit"]() {
 			for (const { id, node, phaseNode } of observers) {
-				const isInsideObserverCallback = (e) => Traverse.findParent(e.node, (n) => n === node) != null;
-				if (dEntries.some((e) => !isInsideObserverCallback(e) && isAssignmentTargetEqual(context, e.observer, id))) continue;
-				const matchedOEntries = oEntries.filter((e) => isAssignmentTargetEqual(context, e.observer, id));
-				const matchedUEntries = uEntries.filter((e) => isAssignmentTargetEqual(context, e.observer, id));
+				const isSameObserver = phaseNode == null ? (observer) => isFromRefCurrent(context, observer, id) : (observer) => isAssignmentTargetEqual(context, observer, id);
+				const isInsideObserverCallback = (entryNode) => Traverse.findParent(entryNode, (n) => n === node) != null;
+				if (dEntries.some((e) => !isInsideObserverCallback(e.node) && isInCleanupPhase(e.node) && isSameObserver(e.observer))) continue;
+				const matchedOEntries = oEntries.filter((e) => isSameObserver(e.observer));
+				const matchedUEntries = uEntries.filter((e) => isSameObserver(e.observer));
 				const isDynamic = (node) => node?.type === AST_NODE_TYPES.CallExpression || Check.isConditional(node);
-				const isPhaseNode = (node) => node === phaseNode;
-				if (matchedOEntries.some((e) => !isPhaseNode(Traverse.findParent(e.node, or(isDynamic, isPhaseNode))))) {
+				if (matchedOEntries.some((e) => {
+					const entryPhaseNode = phaseNode ?? Traverse.findParent(e.node, isUseEffectCallback$1);
+					const isPhaseNode = (node) => node === entryPhaseNode;
+					return !isPhaseNode(Traverse.findParent(e.node, or(isDynamic, isPhaseNode)));
+				})) {
 					context.report({
 						messageId: "expected-disconnect-in-control-flow",
 						node
@@ -779,7 +921,7 @@ function create$1(context) {
 					continue;
 				}
 				for (const oEntry of matchedOEntries) {
-					if (matchedUEntries.some((uEntry) => isAssignmentTargetEqual(context, uEntry.element, oEntry.element))) continue;
+					if (matchedUEntries.some((uEntry) => !isInsideObserverCallback(uEntry.node) && isInCleanupPhase(uEntry.node) && isAssignmentTargetEqual(context, uEntry.element, oEntry.element))) continue;
 					context.report({
 						messageId: "expected-disconnect-or-unobserve-in-cleanup",
 						node: oEntry.node

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-web-api",
-  "version": "5.24.6",
+  "version": "5.24.7",
   "description": "ESLint React's ESLint plugin for interacting with Web APIs",
   "keywords": [
     "react",
@@ -37,13 +37,13 @@
     "dist"
   ],
   "dependencies": {
-    "@eslint-react/ast": "5.24.6",
-    "@eslint-react/core": "5.24.6",
-    "@eslint-react/eslint": "5.24.6",
-    "@eslint-react/shared": "5.24.6",
-    "@eslint-react/var": "5.24.6",
-    "@typescript-eslint/types": "^8.71.0",
-    "@typescript-eslint/utils": "^8.71.0",
+    "@eslint-react/ast": "5.24.7",
+    "@eslint-react/core": "5.24.7",
+    "@eslint-react/eslint": "5.24.7",
+    "@eslint-react/shared": "5.24.7",
+    "@eslint-react/var": "5.24.7",
+    "@typescript-eslint/types": "^8.71.1",
+    "@typescript-eslint/utils": "^8.71.1",
     "ts-pattern": "^5.9.0"
   },
   "devDependencies": {