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

package/dist/index.d.ts

@@ -1,20 +1,9 @@
-import * as _eslint_react_shared0 from "@eslint-react/shared";
+import { ESLint, Linter } from "eslint";
 
 //#region src/index.d.ts
-declare const _default: {
-  configs: {
-    recommended: {
-      plugins: {};
-      name?: string;
-      rules?: Record<string, _eslint_react_shared0.RuleConfig>;
-      settings?: _eslint_react_shared0.SettingsConfig;
-    };
-  };
-  meta: {
-    name: string;
-    version: string;
-  };
-  rules: Record<string, _eslint_react_shared0.CompatibleRule>;
+type ConfigName = "recommended";
+declare const finalPlugin: ESLint.Plugin & {
+  configs: Record<ConfigName, Linter.Config>;
 };
 //#endregion
-export { _default as default };
+export { finalPlugin as default };

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 } 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, 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";
@@ -24,26 +24,10 @@ var __exportAll = (all, no_symbols) => {
 	return target;
 };
 
-//#endregion
-//#region src/configs/recommended.ts
-var recommended_exports = /* @__PURE__ */ __exportAll({
-	name: () => name$1,
-	rules: () => rules,
-	settings: () => settings
-});
-const name$1 = "react-web-api/recommended";
-const rules = {
-	"react-web-api/no-leaked-event-listener": "warn",
-	"react-web-api/no-leaked-interval": "warn",
-	"react-web-api/no-leaked-resize-observer": "warn",
-	"react-web-api/no-leaked-timeout": "warn"
-};
-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.6";
+var name$1 = "eslint-plugin-react-web-api";
+var version = "3.0.0-next.61";
 
 //#endregion
 //#region src/types/component-phase.ts
@@ -64,7 +48,7 @@ function getDocsUrl(ruleName) {
 const createRule = ESLintUtils.RuleCreator(getDocsUrl);
 
 //#endregion
-//#region src/rules/no-leaked-event-listener.ts
+//#region src/rules/no-leaked-event-listener/no-leaked-event-listener.ts
 const RULE_NAME$3 = "no-leaked-event-listener";
 const defaultOptions = {
 	capture: false,
@@ -83,19 +67,32 @@ 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: {
+			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;
 	}
 }
 function getOptions(node, initialScope) {
-	function findProp(properties, propName) {
-		return findProperty(propName, properties, initialScope);
-	}
 	function getOpts(node) {
 		switch (node.type) {
 			case AST_NODE_TYPES.Identifier: {
-				const variableNode = getVariableDefinitionNode(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;
 			}
@@ -104,14 +101,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
@@ -154,19 +151,19 @@ 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);
 		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 {
+	return defineRuleListener({
 		[":function"](node) {
 			const kind = getFunctionKind$1(node);
 			fEntries.push({
@@ -191,10 +188,10 @@ function create$3(context) {
 				aEntries.push({
 					...opts,
 					type,
-					node,
 					callee,
 					listener,
 					method: "addEventListener",
+					node,
 					phase: fKind
 				});
 			}).with("removeEventListener", (callKind) => {
@@ -206,10 +203,10 @@ function create$3(context) {
 				rEntries.push({
 					...opts,
 					type,
-					node,
 					callee,
 					listener,
 					method: "removeEventListener",
+					node,
 					phase: fKind
 				});
 			}).with("abort", () => {
@@ -224,9 +221,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":
@@ -239,11 +236,11 @@ function create$3(context) {
 				}
 			}
 		}
-	};
+	});
 }
 
 //#endregion
-//#region src/rules/no-leaked-interval.ts
+//#region src/rules/no-leaked-interval/no-leaked-interval.ts
 const RULE_NAME$2 = "no-leaked-interval";
 function getCallKind$2(node) {
 	switch (true) {
@@ -275,7 +272,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({
@@ -302,8 +299,8 @@ function create$2(context) {
 					}
 					sEntries.push({
 						kind: "interval",
-						node,
 						callee: node.callee,
+						node,
 						phase: fEntry.kind,
 						timerId: intervalIdNode
 					});
@@ -317,8 +314,8 @@ function create$2(context) {
 					if (intervalIdNode == null) break;
 					cEntries.push({
 						kind: "interval",
-						node,
 						callee: node.callee,
+						node,
 						phase: fEntry.kind,
 						timerId: intervalIdNode
 					});
@@ -333,34 +330,44 @@ 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;
 				}
 			}
 		}
-	};
+	});
 }
 
 //#endregion
-//#region src/rules/no-leaked-resize-observer.ts
+//#region src/rules/no-leaked-resize-observer/no-leaked-resize-observer.ts
 const RULE_NAME$1 = "no-leaked-resize-observer";
 function isNewResizeObserver(node) {
 	return node?.type === AST_NODE_TYPES.NewExpression && node.callee.type === AST_NODE_TYPES.Identifier && node.callee.name === "ResizeObserver";
 }
 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: {
+			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;
 	}
@@ -397,7 +404,7 @@ function create$1(context) {
 	const oEntries = [];
 	const uEntries = [];
 	const dEntries = [];
-	return {
+	return defineRuleListener({
 		[":function"](node) {
 			const kind = getFunctionKind(node);
 			fEntries.push({
@@ -416,9 +423,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
 				});
@@ -427,10 +434,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
 				});
@@ -439,10 +446,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
 				});
@@ -491,11 +498,11 @@ function create$1(context) {
 				}
 			}
 		}
-	};
+	});
 }
 
 //#endregion
-//#region src/rules/no-leaked-timeout.ts
+//#region src/rules/no-leaked-timeout/no-leaked-timeout.ts
 const RULE_NAME = "no-leaked-timeout";
 function getCallKind(node) {
 	switch (true) {
@@ -527,7 +534,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({
@@ -553,8 +560,8 @@ function create(context) {
 					}
 					sEntries.push({
 						kind: "timeout",
-						node,
 						callee: node.callee,
+						node,
 						phase: fEntry.kind,
 						timerId: timeoutIdNode
 					});
@@ -565,8 +572,8 @@ function create(context) {
 					if (timeoutIdNode == null) break;
 					rEntries.push({
 						kind: "timeout",
-						node,
 						callee: node.callee,
+						node,
 						phase: fEntry.kind,
 						timerId: timeoutIdNode
 					});
@@ -581,30 +588,30 @@ 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;
 				}
 			}
 		}
-	};
+	});
 }
 
 //#endregion
 //#region src/plugin.ts
 const plugin = {
 	meta: {
-		name,
+		name: name$1,
 		version
 	},
 	rules: {
@@ -615,13 +622,30 @@ const plugin = {
 	}
 };
 
+//#endregion
+//#region src/configs/recommended.ts
+var recommended_exports = /* @__PURE__ */ __exportAll({
+	name: () => name,
+	plugins: () => plugins,
+	rules: () => rules,
+	settings: () => settings
+});
+const name = "react-web-api/recommended";
+const rules = {
+	"react-web-api/no-leaked-event-listener": "warn",
+	"react-web-api/no-leaked-interval": "warn",
+	"react-web-api/no-leaked-resize-observer": "warn",
+	"react-web-api/no-leaked-timeout": "warn"
+};
+const plugins = { "react-web-api": plugin };
+const settings = { "react-x": DEFAULT_ESLINT_REACT_SETTINGS };
+
 //#endregion
 //#region src/index.ts
-const { toFlatConfig } = getConfigAdapters("react-web-api", plugin);
-var src_default = {
+const finalPlugin = {
 	...plugin,
-	configs: { ["recommended"]: toFlatConfig(recommended_exports) }
+	configs: { ["recommended"]: recommended_exports }
 };
 
 //#endregion
-export { src_default as default };
+export { finalPlugin as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-web-api",
-  "version": "3.0.0-next.6",
+  "version": "3.0.0-next.61",
   "description": "ESLint React's ESLint plugin for interacting with Web APIs",
   "keywords": [
     "react",
@@ -43,16 +43,17 @@
     "@typescript-eslint/utils": "canary",
     "birecord": "^0.1.1",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/eff": "3.0.0-next.6",
-    "@eslint-react/ast": "3.0.0-next.6",
-    "@eslint-react/shared": "3.0.0-next.6",
-    "@eslint-react/core": "3.0.0-next.6",
-    "@eslint-react/var": "3.0.0-next.6"
+    "@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",
     "@types/react-dom": "^19.2.3",
-    "tsdown": "^0.20.3",
+    "eslint": "^10.0.2",
+    "tsdown": "^0.21.0-beta.2",
     "@local/configs": "0.0.0"
   },
   "peerDependencies": {
@@ -68,6 +69,6 @@
   "scripts": {
     "build": "tsdown",
     "lint:publish": "publint",
-    "lint:ts": "tsc --noEmit"
+    "lint:ts": "tsl"
   }
 }