eslint-plugin-react-web-api 3.0.0-next.2 → 3.0.0-next.23

package/dist/index.js

@@ -1,8 +1,8 @@
-import { DEFAULT_ESLINT_REACT_SETTINGS, WEBSITE_URL, getConfigAdapters } from "@eslint-react/shared";
+import { DEFAULT_ESLINT_REACT_SETTINGS, WEBSITE_URL, defineRuleListener, getConfigAdapters } 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, findProperty, findVariable, getVariableDefinitionNode, isAssignmentTargetEqual, isNodeEqual } from "@eslint-react/var";
+import { findEnclosingAssignmentTarget, findProperty, 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";
@@ -43,7 +43,7 @@ const settings = { "react-x": DEFAULT_ESLINT_REACT_SETTINGS };
 //#endregion
 //#region package.json
 var name = "eslint-plugin-react-web-api";
-var version = "3.0.0-next.2";
+var version = "3.0.0-next.23";
 
 //#endregion
 //#region src/types/component-phase.ts
@@ -83,7 +83,7 @@ function getFunctionKind$1(node) {
 function getSignalValueExpression(node, initialScope) {
 	if (node == null) return unit;
 	switch (node.type) {
-		case AST_NODE_TYPES.Identifier: return getSignalValueExpression(getVariableDefinitionNode(findVariable(node, initialScope), 0), initialScope);
+		case AST_NODE_TYPES.Identifier: return getSignalValueExpression(getVariableInitializer(findVariable(node, initialScope), 0), initialScope);
 		case AST_NODE_TYPES.MemberExpression: return node;
 		default: return unit;
 	}
@@ -92,24 +92,10 @@ function getOptions(node, initialScope) {
 	function findProp(properties, propName) {
 		return findProperty(propName, properties, initialScope);
 	}
-	function getPropValue(prop, filter = (a) => true) {
-		if (prop?.type !== AST_NODE_TYPES.Property) return unit;
-		const { value } = prop;
-		let v = value;
-		switch (value.type) {
-			case AST_NODE_TYPES.Literal:
-				v = value.value;
-				break;
-			default:
-				v = getStaticValue(value, initialScope)?.value;
-				break;
-		}
-		return filter(v) ? v : unit;
-	}
 	function getOpts(node) {
 		switch (node.type) {
 			case AST_NODE_TYPES.Identifier: {
-				const variableNode = getVariableDefinitionNode(findVariable(node, initialScope), 0);
+				const variableNode = getVariableInitializer(findVariable(node, initialScope), 0);
 				if (variableNode?.type === AST_NODE_TYPES.ObjectExpression) return getOpts(variableNode);
 				return defaultOptions;
 			}
@@ -118,7 +104,13 @@ function getOptions(node, initialScope) {
 				capture: Boolean(node.value)
 			};
 			case AST_NODE_TYPES.ObjectExpression: {
-				const vCapture = !!getPropValue(findProp(node.properties, "capture"));
+				const vCapture = match(findProp(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");
 				return {
 					capture: vCapture,
@@ -162,7 +154,7 @@ function create$3(context) {
 		const { type: aType, callee: aCallee, capture: aCapture, listener: aListener, phase: aPhase } = aEntry;
 		const { type: rType, callee: rCallee, capture: rCapture, listener: rListener, phase: rPhase } = rEntry;
 		if (!isInversePhase(aPhase, rPhase)) return false;
-		return isSameObject(aCallee, rCallee) && ast.isNodeEqual(aListener, rListener) && isNodeEqual(aType, rType, [context.sourceCode.getScope(aType), context.sourceCode.getScope(rType)]) && aCapture === rCapture;
+		return isSameObject(aCallee, rCallee) && ast.isNodeEqual(aListener, rListener) && isValueEqual(aType, rType, [context.sourceCode.getScope(aType), context.sourceCode.getScope(rType)]) && aCapture === rCapture;
 	}
 	function checkInlineFunction(node, callKind, options) {
 		const listener = node.arguments.at(1);
@@ -174,7 +166,7 @@ function create$3(context) {
 			data: { eventMethodKind: callKind }
 		});
 	}
-	return {
+	return defineRuleListener({
 		[":function"](node) {
 			const kind = getFunctionKind$1(node);
 			fEntries.push({
@@ -247,7 +239,7 @@ function create$3(context) {
 				}
 			}
 		}
-	};
+	});
 }
 
 //#endregion
@@ -283,7 +275,7 @@ function create$2(context) {
 	function isInverseEntry(a, b) {
 		return isAssignmentTargetEqual(context, a.timerId, b.timerId);
 	}
-	return {
+	return defineRuleListener({
 		[":function"](node) {
 			const kind = getPhaseKindOfFunction(node) ?? "other";
 			fEntries.push({
@@ -357,7 +349,7 @@ function create$2(context) {
 				}
 			}
 		}
-	};
+	});
 }
 
 //#endregion
@@ -368,7 +360,7 @@ function isNewResizeObserver(node) {
 }
 function isFromObserver(context, node) {
 	switch (true) {
-		case node.type === AST_NODE_TYPES.Identifier: return isNewResizeObserver(getVariableDefinitionNode(findVariable(node, context.sourceCode.getScope(node)), 0));
+		case node.type === AST_NODE_TYPES.Identifier: return isNewResizeObserver(getVariableInitializer(findVariable(node, context.sourceCode.getScope(node)), 0));
 		case node.type === AST_NODE_TYPES.MemberExpression: return isFromObserver(context, node.object);
 		default: return false;
 	}
@@ -405,7 +397,7 @@ function create$1(context) {
 	const oEntries = [];
 	const uEntries = [];
 	const dEntries = [];
-	return {
+	return defineRuleListener({
 		[":function"](node) {
 			const kind = getFunctionKind(node);
 			fEntries.push({
@@ -499,7 +491,7 @@ function create$1(context) {
 				}
 			}
 		}
-	};
+	});
 }
 
 //#endregion
@@ -535,7 +527,7 @@ function create(context) {
 	function isInverseEntry(a, b) {
 		return isAssignmentTargetEqual(context, a.timerId, b.timerId);
 	}
-	return {
+	return defineRuleListener({
 		[":function"](node) {
 			const kind = getPhaseKindOfFunction(node) ?? "other";
 			fEntries.push({
@@ -605,7 +597,7 @@ function create(context) {
 				}
 			}
 		}
-	};
+	});
 }
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-web-api",
-  "version": "3.0.0-next.2",
+  "version": "3.0.0-next.23",
   "description": "ESLint React's ESLint plugin for interacting with Web APIs",
   "keywords": [
     "react",
@@ -38,16 +38,16 @@
     "./package.json"
   ],
   "dependencies": {
-    "@typescript-eslint/scope-manager": "^8.56.0",
-    "@typescript-eslint/types": "^8.56.0",
-    "@typescript-eslint/utils": "^8.56.0",
+    "@typescript-eslint/scope-manager": "canary",
+    "@typescript-eslint/types": "canary",
+    "@typescript-eslint/utils": "canary",
     "birecord": "^0.1.1",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "3.0.0-next.2",
-    "@eslint-react/core": "3.0.0-next.2",
-    "@eslint-react/var": "3.0.0-next.2",
-    "@eslint-react/shared": "3.0.0-next.2",
-    "@eslint-react/eff": "3.0.0-next.2"
+    "@eslint-react/ast": "3.0.0-next.23",
+    "@eslint-react/eff": "3.0.0-next.23",
+    "@eslint-react/core": "3.0.0-next.23",
+    "@eslint-react/shared": "3.0.0-next.23",
+    "@eslint-react/var": "3.0.0-next.23"
   },
   "devDependencies": {
     "@types/react": "^19.2.14",
@@ -68,6 +68,6 @@
   "scripts": {
     "build": "tsdown",
     "lint:publish": "publint",
-    "lint:ts": "tsc --noEmit"
+    "lint:ts": "tsl"
   }
 }