eslint-plugin-react-x 3.0.0-beta.63 → 3.0.0-beta.64

package/dist/index.js

@@ -5,13 +5,13 @@ import { ESLintUtils } from "@typescript-eslint/utils";
 import { P, isMatching, match } from "ts-pattern";
 import ts from "typescript";
 import { AST_NODE_TYPES } from "@typescript-eslint/types";
-import { constFalse, constTrue, constVoid, flow, getOrElseUpdate, identity, not, unit } from "@eslint-react/eff";
+import { computeObjectType, findEnclosingAssignmentTarget, isAssignmentTargetEqual, resolve } from "@eslint-react/var";
 import { DefinitionType } from "@typescript-eslint/scope-manager";
 import { findVariable, getStaticValue, isIdentifier, isVariableDeclarator } from "@typescript-eslint/utils/ast-utils";
+import { constFalse, constTrue, constVoid, flow, getOrElseUpdate, identity, not } from "@eslint-react/eff";
 import { compare } from "compare-versions";
 import { getConstrainedTypeAtLocation } from "@typescript-eslint/type-utils";
 import { unionConstituents } from "ts-api-utils";
-import { computeObjectType, findEnclosingAssignmentTarget, isAssignmentTargetEqual } from "@eslint-react/var";
 import { snakeCase } from "string-ts";
 
 //#region \0rolldown/runtime.js
@@ -69,7 +69,7 @@ const rules$7 = {
 //#endregion
 //#region package.json
 var name$6 = "eslint-plugin-react-x";
-var version = "3.0.0-beta.63";
+var version = "3.0.0-beta.64";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -1289,7 +1289,7 @@ function create$61(context) {
 	* @returns True if `id` is a state variable, false otherwise.
 	*/
 	function isStateValue(id) {
-		const initNode = resolve$4(findVariable(context.sourceCode.getScope(id), id));
+		const initNode = resolve(context, id);
 		if (initNode == null || initNode.type !== AST_NODE_TYPES.CallExpression) return false;
 		if (!isUseStateCall(initNode)) return false;
 		const declarator = initNode.parent;
@@ -1388,13 +1388,6 @@ function create$61(context) {
 		}
 	});
 }
-function resolve$4(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 def.node;
-}
 
 //#endregion
 //#region src/rules/jsx-dollar/jsx-dollar.ts
@@ -1839,18 +1832,18 @@ function getIndexParamPosition(methodName) {
 }
 function getMapIndexParamName(context, node) {
 	const { callee } = node;
-	if (callee.type !== AST_NODE_TYPES.MemberExpression) return unit;
-	if (callee.property.type !== AST_NODE_TYPES.Identifier) return unit;
+	if (callee.type !== AST_NODE_TYPES.MemberExpression) return null;
+	if (callee.property.type !== AST_NODE_TYPES.Identifier) return null;
 	const { name } = callee.property;
 	const indexPosition = getIndexParamPosition(name);
-	if (indexPosition === -1) return unit;
+	if (indexPosition === -1) return null;
 	const callbackArg = node.arguments[core.isChildrenMap(context, callee) || core.isChildrenForEach(context, callee) ? 1 : 0];
-	if (callbackArg == null) return unit;
-	if (!ast.isOneOf([AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression])(callbackArg)) return unit;
+	if (callbackArg == null) return null;
+	if (!ast.isOneOf([AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression])(callbackArg)) return null;
 	const { params } = callbackArg;
-	if (params.length < indexPosition + 1) return unit;
+	if (params.length < indexPosition + 1) return null;
 	const param = params.at(indexPosition);
-	return param != null && "name" in param ? param.name : unit;
+	return param != null && "name" in param ? param.name : null;
 }
 function getIdentifiersFromBinaryExpression(side) {
 	if (side.type === AST_NODE_TYPES.Identifier) return [side];
@@ -2574,12 +2567,12 @@ function create$33(context) {
 	/**
 	* Recursively inspects a node to find potential leaked conditional rendering
 	* @param node The AST node to inspect
-	* @returns A report descriptor if a problem is found, otherwise `unit`
+	* @returns A report descriptor if a problem is found, otherwise `null`
 	*/
 	function getReportDescriptor(node) {
-		if (node == null) return unit;
+		if (node == null) return null;
 		if (ast.is(AST_NODE_TYPES.JSXExpressionContainer)(node)) return getReportDescriptor(node.expression);
-		if (ast.isJSX(node)) return unit;
+		if (ast.isJSX(node)) return null;
 		if (ast.isTypeExpression(node)) return getReportDescriptor(node.expression);
 		return match(node).with({
 			type: AST_NODE_TYPES.LogicalExpression,
@@ -2603,8 +2596,8 @@ function create$33(context) {
 			return getReportDescriptor(consequent) ?? getReportDescriptor(alternate);
 		}).with({ type: AST_NODE_TYPES.Identifier }, (n) => {
 			const variableDefNode = findVariable(context.sourceCode.getScope(n), n.name)?.defs.at(0)?.node;
-			return match(variableDefNode).with({ init: P.select({ type: P.not(AST_NODE_TYPES.VariableDeclaration) }) }, getReportDescriptor).otherwise(() => unit);
-		}).otherwise(() => unit);
+			return match(variableDefNode).with({ init: P.select({ type: P.not(AST_NODE_TYPES.VariableDeclaration) }) }, getReportDescriptor).otherwise(() => null);
+		}).otherwise(() => null);
 	}
 	return defineRuleListener({ JSXExpressionContainer: flow(getReportDescriptor, report(context)) });
 }
@@ -3145,13 +3138,13 @@ function create$22(context) {
 		const [cbk, ...rest] = context.sourceCode.getDeclaredVariables(node);
 		if (cbk == null || rest.length > 0) return;
 		const checkForUsageInsideUseEffectReport = checkForUsageInsideUseEffect$1(context.sourceCode, init);
-		const scope = context.sourceCode.getScope(init);
+		context.sourceCode.getScope(init);
 		const component = context.sourceCode.getScope(init).block;
 		if (!ast.isFunction(component)) return;
 		const [arg0, arg1] = init.arguments;
 		if (arg0 == null || arg1 == null) return;
 		if (!match(arg1).with({ type: AST_NODE_TYPES.ArrayExpression }, (n) => n.elements.length === 0).with({ type: AST_NODE_TYPES.Identifier }, (n) => {
-			const initNode = resolve$3(findVariable(scope, n.name));
+			const initNode = resolve(context, n);
 			if (initNode?.type !== AST_NODE_TYPES.ArrayExpression) return false;
 			return initNode.elements.length === 0;
 		}).otherwise(() => false)) {
@@ -3162,7 +3155,7 @@ function create$22(context) {
 			if (n.body.type === AST_NODE_TYPES.ArrowFunctionExpression) return n.body;
 			return n;
 		}).with({ type: AST_NODE_TYPES.FunctionExpression }, identity).with({ type: AST_NODE_TYPES.Identifier }, (n) => {
-			const initNode = resolve$3(findVariable(scope, n.name));
+			const initNode = resolve(context, n);
 			if (initNode?.type !== AST_NODE_TYPES.ArrowFunctionExpression && initNode?.type !== AST_NODE_TYPES.FunctionExpression) return null;
 			return initNode;
 		}).otherwise(() => null);
@@ -3181,17 +3174,17 @@ function create$22(context) {
 	} });
 }
 function checkForUsageInsideUseEffect$1(sourceCode, node) {
-	if (!/use\w*Effect/u.test(sourceCode.text)) return;
-	if (!isVariableDeclarator(node.parent)) return;
-	if (!isIdentifier(node.parent.id)) return;
+	if (!/use\w*Effect/u.test(sourceCode.text)) return null;
+	if (!isVariableDeclarator(node.parent)) return null;
+	if (!isIdentifier(node.parent.id)) return null;
 	const usages = (sourceCode.getDeclaredVariables(node.parent)[0]?.references ?? []).filter((ref) => ref.init !== true);
-	if (usages.length === 0) return;
+	if (usages.length === 0) return null;
 	const effectSet = /* @__PURE__ */ new Set();
 	for (const usage of usages) {
 		const effect = ast.findParentNode(usage.identifier, core.isUseEffectLikeCall);
-		if (effect == null) return;
+		if (effect == null) return null;
 		effectSet.add(effect);
-		if (effectSet.size > 1) return;
+		if (effectSet.size > 1) return null;
 	}
 	return {
 		data: { name: node.parent.id.name },
@@ -3199,13 +3192,6 @@ function checkForUsageInsideUseEffect$1(sourceCode, node) {
 		node
 	};
 }
-function resolve$3(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 def.node;
-}
 
 //#endregion
 //#region src/rules/no-unnecessary-use-memo/no-unnecessary-use-memo.ts
@@ -3232,8 +3218,7 @@ function create$21(context) {
 		const [mem, ...rest] = context.sourceCode.getDeclaredVariables(node);
 		if (mem == null || rest.length > 0) return;
 		const checkForUsageInsideUseEffectReport = checkForUsageInsideUseEffect(context.sourceCode, init);
-		const scope = context.sourceCode.getScope(init);
-		const component = scope.block;
+		const component = context.sourceCode.getScope(init).block;
 		if (!ast.isFunction(component)) return;
 		const [arg0, arg1] = init.arguments;
 		if (arg0 == null || arg1 == null) return;
@@ -3242,7 +3227,7 @@ function create$21(context) {
 			return;
 		}
 		if (!match(arg1).with({ type: AST_NODE_TYPES.ArrayExpression }, (n) => n.elements.length === 0).with({ type: AST_NODE_TYPES.Identifier }, (n) => {
-			const initNode = resolve$2(findVariable(scope, n.name));
+			const initNode = resolve(context, n);
 			if (initNode?.type !== AST_NODE_TYPES.ArrayExpression) return false;
 			return initNode.elements.length === 0;
 		}).otherwise(() => false)) {
@@ -3253,9 +3238,9 @@ function create$21(context) {
 			if (n.body.type === AST_NODE_TYPES.ArrowFunctionExpression) return n.body;
 			return n;
 		}).with({ type: AST_NODE_TYPES.FunctionExpression }, identity).with({ type: AST_NODE_TYPES.Identifier }, (n) => {
-			const variableNode = resolve$2(findVariable(scope, n.name));
-			if (variableNode?.type !== AST_NODE_TYPES.ArrowFunctionExpression && variableNode?.type !== AST_NODE_TYPES.FunctionExpression) return null;
-			return variableNode;
+			const initNode = resolve(context, n);
+			if (initNode?.type !== AST_NODE_TYPES.ArrowFunctionExpression && initNode?.type !== AST_NODE_TYPES.FunctionExpression) return null;
+			return initNode;
 		}).otherwise(() => null);
 		if (arg0Node == null) return;
 		function getChildScopes(scope) {
@@ -3272,17 +3257,17 @@ function create$21(context) {
 	} });
 }
 function checkForUsageInsideUseEffect(sourceCode, node) {
-	if (!/use\w*Effect/u.test(sourceCode.text)) return;
-	if (!isVariableDeclarator(node.parent)) return;
-	if (!isIdentifier(node.parent.id)) return;
+	if (!/use\w*Effect/u.test(sourceCode.text)) return null;
+	if (!isVariableDeclarator(node.parent)) return null;
+	if (!isIdentifier(node.parent.id)) return null;
 	const usages = (sourceCode.getDeclaredVariables(node.parent)[0]?.references ?? []).filter((ref) => ref.init !== true);
-	if (usages.length === 0) return;
+	if (usages.length === 0) return null;
 	const effectSet = /* @__PURE__ */ new Set();
 	for (const usage of usages) {
 		const effect = ast.findParentNode(usage.identifier, core.isUseEffectLikeCall);
-		if (effect == null) return;
+		if (effect == null) return null;
 		effectSet.add(effect);
-		if (effectSet.size > 1) return;
+		if (effectSet.size > 1) return null;
 	}
 	return {
 		data: { name: node.parent.id.name },
@@ -3290,13 +3275,6 @@ function checkForUsageInsideUseEffect(sourceCode, node) {
 		node
 	};
 }
-function resolve$2(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 def.node;
-}
 
 //#endregion
 //#region src/rules/no-unnecessary-use-prefix/no-unnecessary-use-prefix.ts
@@ -3452,7 +3430,7 @@ function create$16(context) {
 			const value = attribute.value;
 			if (value?.type !== AST_NODE_TYPES.JSXExpressionContainer) return;
 			const valueExpression = value.expression;
-			const construction = computeObjectType(valueExpression, context.sourceCode.getScope(valueExpression));
+			const construction = computeObjectType(context, valueExpression);
 			if (construction == null) return;
 			if (core.isHookCall(construction.node)) return;
 			getOrElseUpdate(constructions, functionEntry.node, () => []).push(construction);
@@ -3539,7 +3517,7 @@ function create$15(context, [options]) {
 					if (prop.type !== AST_NODE_TYPES.Property || prop.value.type !== AST_NODE_TYPES.AssignmentPattern) continue;
 					const { value } = prop;
 					const { right } = value;
-					const construction = computeObjectType(value, context.sourceCode.getScope(value));
+					const construction = computeObjectType(context, value);
 					if (construction == null) continue;
 					if (core.isHookCall(construction.node)) continue;
 					if (safePatterns.length > 0) {
@@ -3831,7 +3809,7 @@ function create$12(context) {
 		if (currentClass == null || !core.isClassComponent(currentClass)) return;
 		if (node.static) {
 			if (core.isGetDerivedStateFromProps(node) && isMatching({ params: [P.nonNullable, ...P.array()] })(node.value)) {
-				const defNode = stateDefs.get(currentClass)?.node;
+				const defNode = stateDefs.get(currentClass)?.node ?? null;
 				stateDefs.set(currentClass, {
 					isUsed: true,
 					node: defNode
@@ -3879,7 +3857,7 @@ function create$12(context) {
 			if (currentMethod == null || currentMethod.static) return;
 			if (currentMethod === constructorStack.at(-1)) return;
 			if (!currentClass.body.body.includes(currentMethod)) return;
-			const defNode = stateDefs.get(currentClass)?.node;
+			const defNode = stateDefs.get(currentClass)?.node ?? null;
 			stateDefs.set(currentClass, {
 				isUsed: true,
 				node: defNode
@@ -3903,7 +3881,7 @@ function create$12(context) {
 				if (prop.type === AST_NODE_TYPES.Property && isKeyLiteral(prop, prop.key)) return ast.getPropertyName(prop.key) === "state";
 				return false;
 			})) return;
-			const defNode = stateDefs.get(currentClass)?.node;
+			const defNode = stateDefs.get(currentClass)?.node ?? null;
 			stateDefs.set(currentClass, {
 				isUsed: true,
 				node: defNode
@@ -4016,7 +3994,7 @@ function create$10(context, [option]) {
 		}
 		const isChildElement = ast.isOneOf([AST_NODE_TYPES.JSXElement, AST_NODE_TYPES.JSXFragment])(node.parent);
 		switch (true) {
-			case allowExpressions && !isChildElement && node.children.length === 1 && core.isJsxText(node.children.at(0)): return;
+			case allowExpressions && !isChildElement && node.children.length === 1 && core.isJsxText(node.children.at(0) ?? null): return;
 			case !allowExpressions && isChildElement:
 				context.report({
 					data: { reason: "contains less than two children" },
@@ -6566,7 +6544,7 @@ function create$5(context) {
 		}
 	}
 	function isIdFromUseStateCall(id, at) {
-		const initNode = resolve$1(findVariable(context.sourceCode.getScope(id), id));
+		const initNode = resolve(context, id);
 		if (initNode == null) return false;
 		if (initNode.type !== AST_NODE_TYPES.CallExpression) return false;
 		if (!isUseStateCall(initNode)) return false;
@@ -6688,8 +6666,8 @@ function create$5(context) {
 			}
 		},
 		"Program:exit"() {
-			const getSetStateCalls = (id, initialScope) => {
-				const node = resolve$1(findVariable(initialScope, id));
+			const getSetStateCalls = (context, id) => {
+				const node = resolve(context, id);
 				switch (node?.type) {
 					case AST_NODE_TYPES.ArrowFunctionExpression:
 					case AST_NODE_TYPES.FunctionDeclaration:
@@ -6705,8 +6683,7 @@ function create$5(context) {
 			});
 			for (const { callee } of trackedFnCalls) {
 				if (!("name" in callee)) continue;
-				const { name } = callee;
-				const setStateCalls = getSetStateCalls(name, context.sourceCode.getScope(callee));
+				const setStateCalls = getSetStateCalls(context, callee);
 				for (const setStateCall of setStateCalls) context.report({
 					data: { name: getCallName(setStateCall) },
 					messageId: "default",
@@ -6714,7 +6691,7 @@ function create$5(context) {
 				});
 			}
 			for (const id of setupFnIds) {
-				const setStateCalls = getSetStateCalls(id.name, context.sourceCode.getScope(id));
+				const setStateCalls = getSetStateCalls(context, id);
 				for (const setStateCall of setStateCalls) context.report({
 					data: { name: getCallName(setStateCall) },
 					messageId: "default",
@@ -6724,17 +6701,6 @@ function create$5(context) {
 		}
 	});
 }
-function resolve$1(v) {
-	if (v == null) return unit;
-	const def = v.defs.at(0);
-	if (def == null) return unit;
-	switch (true) {
-		case def.type === DefinitionType.FunctionName && def.node.type === AST_NODE_TYPES.FunctionDeclaration: return def.node;
-		case def.type === DefinitionType.ClassName && def.node.type === AST_NODE_TYPES.ClassDeclaration: return def.node;
-		case "init" in def.node && def.node.init != null && !("declarations" in def.node.init): return def.node.init;
-		default: return unit;
-	}
-}
 
 //#endregion
 //#region src/rules/set-state-in-render/set-state-in-render.ts
@@ -6759,7 +6725,7 @@ function create$4(context) {
 		return core.isUseStateLikeCall(node, additionalStateHooks);
 	}
 	function isIdFromUseStateCall(topLevelId, at) {
-		const initNode = resolve(findVariable(context.sourceCode.getScope(topLevelId), topLevelId));
+		const initNode = resolve(context, topLevelId);
 		if (initNode == null) return false;
 		if (initNode.type !== AST_NODE_TYPES.CallExpression) return false;
 		if (!isUseStateCall(initNode)) return false;
@@ -6872,13 +6838,6 @@ function create$4(context) {
 		}
 	});
 }
-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 def.node;
-}
 
 //#endregion
 //#region src/rules/unsupported-syntax/unsupported-syntax.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "3.0.0-beta.63",
+  "version": "3.0.0-beta.64",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -45,18 +45,18 @@
     "string-ts": "^2.3.1",
     "ts-api-utils": "^2.4.0",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "3.0.0-beta.63",
-    "@eslint-react/eff": "3.0.0-beta.63",
-    "@eslint-react/core": "3.0.0-beta.63",
-    "@eslint-react/shared": "3.0.0-beta.63",
-    "@eslint-react/var": "3.0.0-beta.63"
+    "@eslint-react/ast": "3.0.0-beta.64",
+    "@eslint-react/eff": "3.0.0-beta.64",
+    "@eslint-react/core": "3.0.0-beta.64",
+    "@eslint-react/shared": "3.0.0-beta.64",
+    "@eslint-react/var": "3.0.0-beta.64"
   },
   "devDependencies": {
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "eslint": "^10.0.2",
     "tsdown": "^0.21.0-beta.2",
-    "tsl-dx": "^0.8.0",
+    "tsl-dx": "^0.9.0",
     "@local/configs": "0.0.0"
   },
   "peerDependencies": {