eslint-plugin-react-web-api 3.0.0-next.57 → 3.0.0-next.59

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, findProperty, findVariable, getVariableInitializer, isAssignmentTargetEqual, isValueEqual } from "@eslint-react/var";
+import { findEnclosingAssignmentTarget, findVariable, getVariableInitializer, 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.57";
+var version = "3.0.0-next.59";
 
 //#endregion
 //#region src/types/component-phase.ts
@@ -73,9 +73,6 @@ function getSignalValueExpression(node, initialScope) {
 	}
 }
 function getOptions(node, initialScope) {
-	function findProp(properties, propName) {
-		return findProperty(propName, properties, initialScope);
-	}
 	function getOpts(node) {
 		switch (node.type) {
 			case AST_NODE_TYPES.Identifier: {
@@ -88,14 +85,14 @@ function getOptions(node, initialScope) {
 				capture: Boolean(node.value)
 			};
 			case AST_NODE_TYPES.ObjectExpression: {
-				const vCapture = match(findProp(node.properties, "capture")).with(P.nullish, () => false).with({ type: AST_NODE_TYPES.Property }, (prop) => {
+				const vCapture = match(ast.findProperty(node.properties, "capture")).with(P.nullish, () => false).with({ type: AST_NODE_TYPES.Property }, (prop) => {
 					const value = prop.value;
 					switch (value.type) {
 						case AST_NODE_TYPES.Literal: return Boolean(value.value);
 						default: return Boolean(getStaticValue(value, initialScope)?.value);
 					}
 				}).otherwise(() => false);
-				const pSignal = findProp(node.properties, "signal");
+				const pSignal = ast.findProperty(node.properties, "signal");
 				return {
 					capture: vCapture,
 					signal: pSignal?.type === AST_NODE_TYPES.Property ? getSignalValueExpression(pSignal.value, initialScope) : unit
@@ -145,9 +142,9 @@ function create$3(context) {
 		if (!ast.isFunction(listener)) return;
 		if (options.signal != null) return;
 		context.report({
+			data: { eventMethodKind: callKind },
 			messageId: "unexpectedInlineFunction",
-			node: listener,
-			data: { eventMethodKind: callKind }
+			node: listener
 		});
 	}
 	return defineRuleListener({
@@ -175,10 +172,10 @@ function create$3(context) {
 				aEntries.push({
 					...opts,
 					type,
-					node,
 					callee,
 					listener,
 					method: "addEventListener",
+					node,
 					phase: fKind
 				});
 			}).with("removeEventListener", (callKind) => {
@@ -190,10 +187,10 @@ function create$3(context) {
 				rEntries.push({
 					...opts,
 					type,
-					node,
 					callee,
 					listener,
 					method: "removeEventListener",
+					node,
 					phase: fKind
 				});
 			}).with("abort", () => {
@@ -208,9 +205,9 @@ function create$3(context) {
 					case "setup":
 					case "cleanup":
 						context.report({
+							data: { effectMethodKind: "useEffect" },
 							messageId: "expectedRemoveEventListenerInCleanup",
-							node: aEntry.node,
-							data: { effectMethodKind: "useEffect" }
+							node: aEntry.node
 						});
 						continue;
 					case "mount":
@@ -286,8 +283,8 @@ function create$2(context) {
 					}
 					sEntries.push({
 						kind: "interval",
-						node,
 						callee: node.callee,
+						node,
 						phase: fEntry.kind,
 						timerId: intervalIdNode
 					});
@@ -301,8 +298,8 @@ function create$2(context) {
 					if (intervalIdNode == null) break;
 					cEntries.push({
 						kind: "interval",
-						node,
 						callee: node.callee,
+						node,
 						phase: fEntry.kind,
 						timerId: intervalIdNode
 					});
@@ -317,17 +314,17 @@ function create$2(context) {
 					case "setup":
 					case "cleanup":
 						context.report({
+							data: { kind: "useEffect" },
 							messageId: "expectedClearIntervalInCleanup",
-							node: sEntry.node,
-							data: { kind: "useEffect" }
+							node: sEntry.node
 						});
 						continue;
 					case "mount":
 					case "unmount":
 						context.report({
+							data: { kind: "componentDidMount" },
 							messageId: "expectedClearIntervalInUnmount",
-							node: sEntry.node,
-							data: { kind: "componentDidMount" }
+							node: sEntry.node
 						});
 						continue;
 				}
@@ -400,9 +397,9 @@ function create$1(context) {
 			match(getCallKind$1(context, node)).with("disconnect", () => {
 				dEntries.push({
 					kind: "ResizeObserver",
-					node,
 					callee: node.callee,
 					method: "disconnect",
+					node,
 					observer: object,
 					phase: fKind
 				});
@@ -411,10 +408,10 @@ function create$1(context) {
 				if (element == null) return;
 				oEntries.push({
 					kind: "ResizeObserver",
-					node,
 					callee: node.callee,
 					element,
 					method: "observe",
+					node,
 					observer: object,
 					phase: fKind
 				});
@@ -423,10 +420,10 @@ function create$1(context) {
 				if (element == null) return;
 				uEntries.push({
 					kind: "ResizeObserver",
-					node,
 					callee: node.callee,
 					element,
 					method: "unobserve",
+					node,
 					observer: object,
 					phase: fKind
 				});
@@ -537,8 +534,8 @@ function create(context) {
 					}
 					sEntries.push({
 						kind: "timeout",
-						node,
 						callee: node.callee,
+						node,
 						phase: fEntry.kind,
 						timerId: timeoutIdNode
 					});
@@ -549,8 +546,8 @@ function create(context) {
 					if (timeoutIdNode == null) break;
 					rEntries.push({
 						kind: "timeout",
-						node,
 						callee: node.callee,
+						node,
 						phase: fEntry.kind,
 						timerId: timeoutIdNode
 					});
@@ -565,17 +562,17 @@ function create(context) {
 					case "setup":
 					case "cleanup":
 						context.report({
+							data: { kind: "useEffect" },
 							messageId: "expectedClearTimeoutInCleanup",
-							node: sEntry.node,
-							data: { kind: "useEffect" }
+							node: sEntry.node
 						});
 						continue;
 					case "mount":
 					case "unmount":
 						context.report({
+							data: { kind: "componentDidMount" },
 							messageId: "expectedClearTimeoutInUnmount",
-							node: sEntry.node,
-							data: { kind: "componentDidMount" }
+							node: sEntry.node
 						});
 						continue;
 				}

package/package.json

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