eslint-plugin-react-web-api 2.7.4-beta.2 → 2.7.4-beta.5

package/dist/index.js

@@ -1,8 +1,8 @@
 import { DEFAULT_ESLINT_REACT_SETTINGS, WEBSITE_URL, getConfigAdapters } from "@eslint-react/shared";
 import * as AST from "@eslint-react/ast";
-import { ComponentPhaseRelevance, findEnclosingAssignmentTarget, getPhaseKindOfFunction, isInitializedFromReactNative, isInstanceIdEqual, isInversePhase } from "@eslint-react/core";
+import { ComponentPhaseRelevance, getPhaseKindOfFunction, isInitializedFromReactNative, isInversePhase } from "@eslint-react/core";
 import { or, unit } from "@eslint-react/eff";
-import { findAssignmentTarget, findProperty, findVariable, getVariableDefinitionNode, isNodeValueEqual } from "@eslint-react/var";
+import { findEnclosingAssignmentTarget, findProperty, findVariable, getVariableDefinitionNode, isAssignmentTargetEqual, isNodeValueEqual } 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";
@@ -42,7 +42,7 @@ const settings = { "react-x": DEFAULT_ESLINT_REACT_SETTINGS };
 //#endregion
 //#region package.json
 var name = "eslint-plugin-react-web-api";
-var version = "2.7.4-beta.2";
+var version = "2.7.4-beta.5";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -269,7 +269,7 @@ function create$2(context) {
 	const sEntries = [];
 	const cEntries = [];
 	function isInverseEntry(a, b) {
-		return isInstanceIdEqual(context, a.timerId, b.timerId);
+		return isAssignmentTargetEqual(context, a.timerId, b.timerId);
 	}
 	return {
 		[":function"](node) {
@@ -288,7 +288,7 @@ function create$2(context) {
 					const fEntry = fEntries.findLast((x) => x.kind !== "other");
 					if (fEntry == null) break;
 					if (!ComponentPhaseRelevance.has(fEntry.kind)) break;
-					const intervalIdNode = findAssignmentTarget(node);
+					const intervalIdNode = findEnclosingAssignmentTarget(node);
 					if (intervalIdNode == null) {
 						context.report({
 							messageId: "expectedIntervalId",
@@ -466,9 +466,9 @@ function create$1(context) {
 		},
 		["Program:exit"]() {
 			for (const { id, node, phaseNode } of observers) {
-				if (dEntries.some((e) => isInstanceIdEqual(context, e.observer, id))) continue;
-				const oentries = oEntries.filter((e) => isInstanceIdEqual(context, e.observer, id));
-				const uentries = uEntries.filter((e) => isInstanceIdEqual(context, e.observer, id));
+				if (dEntries.some((e) => isAssignmentTargetEqual(context, e.observer, id))) continue;
+				const oentries = oEntries.filter((e) => isAssignmentTargetEqual(context, e.observer, id));
+				const uentries = uEntries.filter((e) => isAssignmentTargetEqual(context, e.observer, id));
 				const isDynamic = (node$1) => node$1?.type === AST_NODE_TYPES.CallExpression || AST.isConditional(node$1);
 				const isPhaseNode = (node$1) => node$1 === phaseNode;
 				if (oentries.some((e) => !isPhaseNode(AST.findParentNode(e.node, or(isDynamic, isPhaseNode))))) {
@@ -479,7 +479,7 @@ function create$1(context) {
 					continue;
 				}
 				for (const oEntry of oentries) {
-					if (uentries.some((uEntry) => isInstanceIdEqual(context, uEntry.element, oEntry.element))) continue;
+					if (uentries.some((uEntry) => isAssignmentTargetEqual(context, uEntry.element, oEntry.element))) continue;
 					context.report({
 						messageId: "expectedDisconnectOrUnobserveInCleanup",
 						node: oEntry.node
@@ -521,7 +521,7 @@ function create(context) {
 	const sEntries = [];
 	const rEntries = [];
 	function isInverseEntry(a, b) {
-		return isInstanceIdEqual(context, a.timerId, b.timerId);
+		return isAssignmentTargetEqual(context, a.timerId, b.timerId);
 	}
 	return {
 		[":function"](node) {
@@ -539,7 +539,7 @@ function create(context) {
 			if (!ComponentPhaseRelevance.has(fEntry?.kind)) return;
 			switch (getCallKind(node)) {
 				case "setTimeout": {
-					const timeoutIdNode = findAssignmentTarget(node);
+					const timeoutIdNode = findEnclosingAssignmentTarget(node);
 					if (timeoutIdNode == null) {
 						context.report({
 							messageId: "expectedTimeoutId",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-web-api",
-  "version": "2.7.4-beta.2",
+  "version": "2.7.4-beta.5",
   "description": "ESLint React's ESLint plugin for interacting with Web APIs",
   "keywords": [
     "react",
@@ -43,11 +43,11 @@
     "@typescript-eslint/utils": "^8.53.1",
     "string-ts": "^2.3.1",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "2.7.4-beta.2",
-    "@eslint-react/core": "2.7.4-beta.2",
-    "@eslint-react/eff": "2.7.4-beta.2",
-    "@eslint-react/shared": "2.7.4-beta.2",
-    "@eslint-react/var": "2.7.4-beta.2"
+    "@eslint-react/ast": "2.7.4-beta.5",
+    "@eslint-react/eff": "2.7.4-beta.5",
+    "@eslint-react/shared": "2.7.4-beta.5",
+    "@eslint-react/core": "2.7.4-beta.5",
+    "@eslint-react/var": "2.7.4-beta.5"
   },
   "devDependencies": {
     "@types/react": "^19.2.9",