eslint-plugin-react-web-api 3.0.0-next.63 → 3.0.0-next.64

package/dist/index.js

@@ -1,11 +1,11 @@
 import { DEFAULT_ESLINT_REACT_SETTINGS, WEBSITE_URL, defineRuleListener } from "@eslint-react/shared";
 import * as ast from "@eslint-react/ast";
 import * as core from "@eslint-react/core";
-import { dual, or, unit } from "@eslint-react/eff";
-import { findEnclosingAssignmentTarget, isAssignmentTargetEqual, isValueEqual } from "@eslint-react/var";
+import { findEnclosingAssignmentTarget, isAssignmentTargetEqual, isValueEqual, resolve } from "@eslint-react/var";
 import { AST_NODE_TYPES, ESLintUtils } from "@typescript-eslint/utils";
-import { findVariable, getStaticValue } from "@typescript-eslint/utils/ast-utils";
+import { getStaticValue } from "@typescript-eslint/utils/ast-utils";
 import { P, isMatching, match } from "ts-pattern";
+import { dual, or } from "@eslint-react/eff";
 import birecord from "birecord";
 
 //#region \0rolldown/runtime.js
@@ -27,7 +27,7 @@ var __exportAll = (all, no_symbols) => {
 //#endregion
 //#region package.json
 var name$1 = "eslint-plugin-react-web-api";
-var version = "3.0.0-next.63";
+var version = "3.0.0-next.64";
 
 //#endregion
 //#region src/types/component-phase.ts
@@ -52,7 +52,7 @@ const createRule = ESLintUtils.RuleCreator(getDocsUrl);
 const RULE_NAME$3 = "no-leaked-event-listener";
 const defaultOptions = {
 	capture: false,
-	signal: unit
+	signal: null
 };
 function getCallKind$3(node) {
 	switch (true) {
@@ -64,20 +64,21 @@ function getCallKind$3(node) {
 function getFunctionKind$1(node) {
 	return getPhaseKindOfFunction(node) ?? "other";
 }
-function getSignalValueExpression(node, initialScope) {
-	if (node == null) return unit;
+function getSignalValueExpression(context, node) {
+	if (node == null) return null;
 	switch (node.type) {
-		case AST_NODE_TYPES.Identifier: return getSignalValueExpression(resolve$1(findVariable(initialScope, node)), initialScope);
+		case AST_NODE_TYPES.Identifier: return getSignalValueExpression(context, resolve(context, node));
 		case AST_NODE_TYPES.MemberExpression: return node;
-		default: return unit;
+		default: return null;
 	}
 }
-function getOptions(node, initialScope) {
+function getOptions(context, node) {
+	const initialScope = context.sourceCode.getScope(node);
 	function getOpts(node) {
 		switch (node.type) {
 			case AST_NODE_TYPES.Identifier: {
-				const variableNode = resolve$1(findVariable(initialScope, node));
-				if (variableNode?.type === AST_NODE_TYPES.ObjectExpression) return getOpts(variableNode);
+				const initNode = resolve(context, node);
+				if (initNode?.type === AST_NODE_TYPES.ObjectExpression) return getOpts(initNode);
 				return defaultOptions;
 			}
 			case AST_NODE_TYPES.Literal: return {
@@ -95,7 +96,7 @@ function getOptions(node, initialScope) {
 				const pSignal = ast.findProperty(node.properties, "signal");
 				return {
 					capture: vCapture,
-					signal: pSignal?.type === AST_NODE_TYPES.Property ? getSignalValueExpression(pSignal.value, initialScope) : unit
+					signal: pSignal?.type === AST_NODE_TYPES.Property ? getSignalValueExpression(context, pSignal.value) : null
 				};
 			}
 			default: return defaultOptions;
@@ -166,7 +167,7 @@ function create$3(context) {
 				if (node.callee.type === AST_NODE_TYPES.MemberExpression && node.callee.object.type === AST_NODE_TYPES.Identifier && core.isInitializedFromReactNative(node.callee.object.name, context.sourceCode.getScope(node))) return;
 				const [type, listener, options] = node.arguments;
 				if (type == null || listener == null) return;
-				const opts = options == null ? defaultOptions : getOptions(options, context.sourceCode.getScope(options));
+				const opts = options == null ? defaultOptions : getOptions(context, options);
 				const { callee } = node;
 				checkInlineFunction(node, callKind, opts);
 				aEntries.push({
@@ -181,7 +182,7 @@ function create$3(context) {
 			}).with("removeEventListener", (callKind) => {
 				const [type, listener, options] = node.arguments;
 				if (type == null || listener == null) return;
-				const opts = options == null ? defaultOptions : getOptions(options, context.sourceCode.getScope(options));
+				const opts = options == null ? defaultOptions : getOptions(context, options);
 				const { callee } = node;
 				checkInlineFunction(node, callKind, opts);
 				rEntries.push({
@@ -222,13 +223,6 @@ function create$3(context) {
 		}
 	});
 }
-function resolve$1(v) {
-	if (v == null) return unit;
-	const def = v.defs.at(0);
-	if (def == null) return unit;
-	if ("init" in def.node && def.node.init != null && !("declarations" in def.node.init)) return def.node.init;
-	return unit;
-}
 
 //#endregion
 //#region src/rules/no-leaked-interval/no-leaked-interval.ts
@@ -348,7 +342,7 @@ function isNewResizeObserver(node) {
 }
 function isFromObserver(context, node) {
 	switch (true) {
-		case node.type === AST_NODE_TYPES.Identifier: return isNewResizeObserver(resolve(findVariable(context.sourceCode.getScope(node), node)));
+		case node.type === AST_NODE_TYPES.Identifier: return isNewResizeObserver(resolve(context, node));
 		case node.type === AST_NODE_TYPES.MemberExpression: return isFromObserver(context, node.object);
 		default: return false;
 	}
@@ -481,13 +475,6 @@ function create$1(context) {
 		}
 	});
 }
-function resolve(v) {
-	if (v == null) return unit;
-	const def = v.defs.at(0);
-	if (def == null) return unit;
-	if ("init" in def.node && def.node.init != null && !("declarations" in def.node.init)) return def.node.init;
-	return unit;
-}
 
 //#endregion
 //#region src/rules/no-leaked-timeout/no-leaked-timeout.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-web-api",
-  "version": "3.0.0-next.63",
+  "version": "3.0.0-next.64",
   "description": "ESLint React's ESLint plugin for interacting with Web APIs",
   "keywords": [
     "react",
@@ -43,11 +43,11 @@
     "@typescript-eslint/utils": "canary",
     "birecord": "^0.1.1",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "3.0.0-next.63",
-    "@eslint-react/core": "3.0.0-next.63",
-    "@eslint-react/eff": "3.0.0-next.63",
-    "@eslint-react/var": "3.0.0-next.63",
-    "@eslint-react/shared": "3.0.0-next.63"
+    "@eslint-react/ast": "3.0.0-next.64",
+    "@eslint-react/core": "3.0.0-next.64",
+    "@eslint-react/shared": "3.0.0-next.64",
+    "@eslint-react/eff": "3.0.0-next.64",
+    "@eslint-react/var": "3.0.0-next.64"
   },
   "devDependencies": {
     "@types/react": "^19.2.14",