eslint-plugin-react-web-api 3.0.0-next.60 → 3.0.0-next.61

package/dist/index.js

@@ -2,7 +2,7 @@ import { DEFAULT_ESLINT_REACT_SETTINGS, WEBSITE_URL, defineRuleListener } from "
 import * as ast from "@eslint-react/ast";
 import * as core from "@eslint-react/core";
 import { dual, or, unit } from "@eslint-react/eff";
-import { findEnclosingAssignmentTarget, findVariable, getVariableInitializer, isAssignmentTargetEqual, isValueEqual } from "@eslint-react/var";
+import { findEnclosingAssignmentTarget, findVariable, isAssignmentTargetEqual, isValueEqual } from "@eslint-react/var";
 import { AST_NODE_TYPES, ESLintUtils } from "@typescript-eslint/utils";
 import { getStaticValue } from "@typescript-eslint/utils/ast-utils";
 import { P, isMatching, match } from "ts-pattern";
@@ -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.60";
+var version = "3.0.0-next.61";
 
 //#endregion
 //#region src/types/component-phase.ts
@@ -67,7 +67,16 @@ function getFunctionKind$1(node) {
 function getSignalValueExpression(node, initialScope) {
 	if (node == null) return unit;
 	switch (node.type) {
-		case AST_NODE_TYPES.Identifier: return getSignalValueExpression(getVariableInitializer(findVariable(node, initialScope), 0), initialScope);
+		case AST_NODE_TYPES.Identifier: {
+			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;
+			}
+			return getSignalValueExpression(resolve(findVariable(node, initialScope)), initialScope);
+		}
 		case AST_NODE_TYPES.MemberExpression: return node;
 		default: return unit;
 	}
@@ -76,7 +85,14 @@ function getOptions(node, initialScope) {
 	function getOpts(node) {
 		switch (node.type) {
 			case AST_NODE_TYPES.Identifier: {
-				const variableNode = getVariableInitializer(findVariable(node, initialScope), 0);
+				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;
+				}
+				const variableNode = resolve(findVariable(node, initialScope));
 				if (variableNode?.type === AST_NODE_TYPES.ObjectExpression) return getOpts(variableNode);
 				return defaultOptions;
 			}
@@ -341,7 +357,17 @@ function isNewResizeObserver(node) {
 }
 function isFromObserver(context, node) {
 	switch (true) {
-		case node.type === AST_NODE_TYPES.Identifier: return isNewResizeObserver(getVariableInitializer(findVariable(node, context.sourceCode.getScope(node)), 0));
+		case node.type === AST_NODE_TYPES.Identifier: {
+			const variable = findVariable(node, context.sourceCode.getScope(node));
+			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;
+			}
+			return isNewResizeObserver(resolve(variable));
+		}
 		case node.type === AST_NODE_TYPES.MemberExpression: return isFromObserver(context, node.object);
 		default: return false;
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-web-api",
-  "version": "3.0.0-next.60",
+  "version": "3.0.0-next.61",
   "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.60",
-    "@eslint-react/shared": "3.0.0-next.60",
-    "@eslint-react/eff": "3.0.0-next.60",
-    "@eslint-react/var": "3.0.0-next.60",
-    "@eslint-react/core": "3.0.0-next.60"
+    "@eslint-react/ast": "3.0.0-next.61",
+    "@eslint-react/core": "3.0.0-next.61",
+    "@eslint-react/shared": "3.0.0-next.61",
+    "@eslint-react/eff": "3.0.0-next.61",
+    "@eslint-react/var": "3.0.0-next.61"
   },
   "devDependencies": {
     "@types/react": "^19.2.14",