eslint-plugin-react-x 5.24.5 → 5.24.7

package/dist/index.js

@@ -135,7 +135,7 @@ const rules$6 = {
 //#endregion
 //#region package.json
 var name$6 = "eslint-plugin-react-x";
-var version = "5.24.5";
+var version = "5.24.7";
 //#endregion
 //#region src/utils/create-rule.ts
 function getDocsUrl(ruleName) {
@@ -1335,15 +1335,16 @@ function resolveToFunctionNode(context, node, seen = /* @__PURE__ */ new Set())
 	const resolved = resolveOrigin(context, expr);
 	return resolved == null ? null : resolveToFunctionNode(context, resolved, seen);
 }
-function resolveVariableOrigin(context, variable, seen = /* @__PURE__ */ new Set()) {
+function resolveVariableOrigin(context, variable, mode = "alias", seen = /* @__PURE__ */ new Set()) {
 	if (seen.has(variable)) return variable;
 	seen.add(variable);
 	const def = variable.defs.length === 1 ? variable.defs[0] : null;
 	if (def?.type !== DefinitionType.Variable || def.node.init == null) return variable;
+	if (mode === "binding" && def.node.id.type === AST_NODE_TYPES.Identifier) return variable;
 	const init = Extract.unwrap(def.node.init);
 	if (!Check.isIdentifier(init)) return variable;
 	const source = findVariable(context.sourceCode.getScope(init), init);
-	return source == null ? variable : resolveVariableOrigin(context, source, seen);
+	return source == null ? variable : resolveVariableOrigin(context, source, mode, seen);
 }
 function isRefLikeName$1(name) {
 	return name === "ref" || name.endsWith("Ref");
@@ -1467,10 +1468,10 @@ function createFactCollector$5() {
 }
 //#endregion
 //#region src/rules/immutability/origins.ts
-function classifyFrozenOrigin(context, variable, components, seen = /* @__PURE__ */ new Set()) {
+function classifyFrozenOrigin(context, variable, components, mode = "alias", seen = /* @__PURE__ */ new Set()) {
 	if (seen.has(variable)) return null;
 	seen.add(variable);
-	const origin = resolveVariableOrigin(context, variable);
+	const origin = resolveVariableOrigin(context, variable, mode);
 	const def = origin.defs.length === 1 ? origin.defs[0] : null;
 	if (def == null) return null;
 	if (isComponentPropsDefinition(def, components)) return {
@@ -1485,7 +1486,7 @@ function classifyFrozenOrigin(context, variable, components, seen = /* @__PURE__
 		if (root == null || !Check.isIdentifier(root)) return null;
 		const source = findVariable(context.sourceCode.getScope(root), root);
 		if (source == null) return null;
-		const inner = classifyFrozenOrigin(context, source, components, seen);
+		const inner = classifyFrozenOrigin(context, source, components, mode, seen);
 		return inner == null ? null : {
 			kind: "iterator",
 			name: origin.name,
@@ -1515,7 +1516,7 @@ function classifyFrozenOrigin(context, variable, components, seen = /* @__PURE__
 				if (!Check.isIdentifier(argument)) continue;
 				const source = findVariable(context.sourceCode.getScope(argument), argument);
 				if (source == null) continue;
-				const inner = classifyFrozenOrigin(context, source, components, seen);
+				const inner = classifyFrozenOrigin(context, source, components, mode, seen);
 				if (inner != null) return {
 					kind: "shallow-copy",
 					name: origin.name,
@@ -1570,7 +1571,7 @@ function inferDirectMutations(context, mutations, components) {
 		if (isRefMutation(context, mutation)) continue;
 		const variable = findVariable(context.sourceCode.getScope(mutation.root), mutation.root);
 		if (variable == null) continue;
-		const origin = classifyFrozenOrigin(context, variable, components);
+		const origin = classifyFrozenOrigin(context, variable, components, mutation.kind === "binding" ? "binding" : "alias");
 		if (origin == null) continue;
 		if (mutation.kind === "binding") {
 			switch (origin.kind) {
@@ -3463,7 +3464,7 @@ function collectUsedPropKeysOfParameter(context, usedPropKeys, parameter) {
 function collectUsedPropKeysOfObjectPattern(context, usedPropKeys, objectPattern) {
 	for (const property of objectPattern.properties) switch (property.type) {
 		case AST_NODE_TYPES.Property: {
-			const key = getKeyOfExpression(property.key);
+			const key = getKeyOfExpression(property.key, property.computed);
 			if (key == null) return false;
 			usedPropKeys.add(key);
 			break;
@@ -3494,7 +3495,7 @@ function collectUsedPropKeysOfReference(context, usedPropKeys, ref) {
 	switch (parent.type) {
 		case AST_NODE_TYPES.MemberExpression:
 			if (parent.object === valueNode) {
-				const key = getKeyOfExpression(parent.property);
+				const key = getKeyOfExpression(parent.property, parent.computed);
 				if (key == null) return false;
 				usedPropKeys.add(key);
 				return true;
@@ -3504,9 +3505,9 @@ function collectUsedPropKeysOfReference(context, usedPropKeys, ref) {
 	}
 	return false;
 }
-function getKeyOfExpression(expr) {
+function getKeyOfExpression(expr, computed = false) {
 	switch (expr.type) {
-		case AST_NODE_TYPES.Identifier: return expr.name;
+		case AST_NODE_TYPES.Identifier: return computed ? null : expr.name;
 		case AST_NODE_TYPES.Literal: if (isString(expr.value)) return expr.value;
 	}
 	return null;
@@ -6509,7 +6510,9 @@ function createSetStateResolver$1(context) {
 		if (initNode.type !== AST_NODE_TYPES.CallExpression) return false;
 		if (!isUseStateCall(initNode)) return false;
 		const variableNodeParent = initNode.parent;
-		if (!hasProperty(variableNodeParent, "id") || variableNodeParent.id?.type !== AST_NODE_TYPES.ArrayPattern) return true;
+		if (!hasProperty(variableNodeParent, "id")) return true;
+		if (variableNodeParent.id?.type === AST_NODE_TYPES.ObjectPattern) return variableNodeParent.id.properties.some((p) => p.type === AST_NODE_TYPES.Property && p.key.type === AST_NODE_TYPES.Literal && p.key.value === (at ?? 1) && Check.isIdentifier(p.value, id.name));
+		if (variableNodeParent.id?.type !== AST_NODE_TYPES.ArrayPattern) return true;
 		return variableNodeParent.id.elements.findIndex((e) => e != null && Check.isIdentifier(e, id.name)) === at;
 	}
 	function isSetStateCall(node) {
@@ -6763,9 +6766,9 @@ function create$5(context) {
 //#endregion
 //#region src/rules/set-state-in-render/helpers.ts
 const isComponentOrHookName = or(core.isFunctionComponentName, core.isHookName);
-function isComponentOrHookLikeFunction(node) {
+function isComponentOrHookLikeFunction(context, node) {
 	const id = core.getFunctionId(node);
-	if (id == null) return false;
+	if (id == null) return core.isFunctionComponentWrapperCallback(context, node);
 	if (Check.isIdentifier(id)) return isComponentOrHookName(id.name);
 	if (id.type === AST_NODE_TYPES.MemberExpression && Check.isIdentifier(id.property)) return isComponentOrHookName(id.property.name);
 	return false;
@@ -6786,18 +6789,19 @@ function isInsideConditional(node, stopAt) {
 }
 //#endregion
 //#region src/rules/set-state-in-render/collect.ts
-function createFactCollector$2(additionalStateHooks) {
+function createFactCollector$2(context) {
+	const { additionalStateHooks } = getSettingsFromContext(context);
 	const facts = {
 		calls: [],
 		earlyReturns: []
 	};
 	const functionEntries = [];
-	const componentFnRef = { current: null };
+	const componentFnStack = [];
 	function isUseStateCall(node) {
 		return core.isUseStateLikeCall(node, additionalStateHooks);
 	}
 	function getFunctionKind(node) {
-		if (isComponentOrHookLikeFunction(node)) return "component";
+		if (isComponentOrHookLikeFunction(context, node)) return "component";
 		const parent = Traverse.findParent(node, not(Check.isTypeExpression)) ?? node.parent;
 		if (parent.type === AST_NODE_TYPES.CallExpression && parent.callee !== node) return "callback";
 		return "other";
@@ -6811,10 +6815,10 @@ function createFactCollector$2(additionalStateHooks) {
 					kind,
 					node
 				});
-				if (kind === "component") componentFnRef.current = node;
+				if (kind === "component") componentFnStack.push(node);
 			},
 			":function:exit"(node) {
-				if (functionEntries.at(-1)?.kind === "component" && componentFnRef.current === node) componentFnRef.current = null;
+				if (functionEntries.at(-1)?.kind === "component" && componentFnStack.at(-1) === node) componentFnStack.pop();
 				functionEntries.pop();
 			},
 			CallExpression(node) {
@@ -6822,14 +6826,14 @@ function createFactCollector$2(additionalStateHooks) {
 				if (entry == null) return;
 				if (isUseStateCall(node)) return;
 				facts.calls.push({
-					componentFunction: componentFnRef.current,
+					componentFunction: componentFnStack.at(-1) ?? null,
 					enclosingFunction: entry.node,
 					enclosingFunctionKind: entry.kind,
 					node
 				});
 			},
 			ReturnStatement(node) {
-				const componentFn = componentFnRef.current;
+				const componentFn = componentFnStack.at(-1);
 				if (componentFn == null) return;
 				const entry = functionEntries.at(-1);
 				if (entry == null || entry.node !== componentFn) return;
@@ -6862,7 +6866,9 @@ function createSetStateResolver(context) {
 		if (initNode.type !== AST_NODE_TYPES.CallExpression) return false;
 		if (!isUseStateCall(initNode)) return false;
 		const variableNodeParent = initNode.parent;
-		if (!hasProperty(variableNodeParent, "id") || variableNodeParent.id?.type !== AST_NODE_TYPES.ArrayPattern) return true;
+		if (!hasProperty(variableNodeParent, "id")) return true;
+		if (variableNodeParent.id?.type === AST_NODE_TYPES.ObjectPattern) return variableNodeParent.id.properties.some((p) => p.type === AST_NODE_TYPES.Property && p.key.type === AST_NODE_TYPES.Literal && p.key.value === (at ?? 1) && Check.isIdentifier(p.value, id.name));
+		if (variableNodeParent.id?.type !== AST_NODE_TYPES.ArrayPattern) return true;
 		return variableNodeParent.id.elements.findIndex((e) => e != null && Check.isIdentifier(e, id.name)) === at;
 	}
 	function isSetStateCall(node) {
@@ -6926,8 +6932,7 @@ var set_state_in_render_default = createRule({
 	create: create$4
 });
 function create$4(context) {
-	const { additionalStateHooks } = getSettingsFromContext(context);
-	const facts = createFactCollector$2(additionalStateHooks);
+	const facts = createFactCollector$2(context);
 	return merge(facts.visitor, { "Program:exit"() {
 		for (const violation of inferViolations$1(context, facts.facts)) context.report({
 			data: { name: violation.name },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "5.24.5",
+  "version": "5.24.7",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -36,16 +36,16 @@
     "dist"
   ],
   "dependencies": {
-    "@eslint-react/ast": "5.24.5",
-    "@eslint-react/core": "5.24.5",
-    "@eslint-react/eslint": "5.24.5",
-    "@eslint-react/jsx": "5.24.5",
-    "@eslint-react/shared": "5.24.5",
-    "@eslint-react/var": "5.24.5",
-    "@typescript-eslint/scope-manager": "^8.71.0",
-    "@typescript-eslint/types": "^8.71.0",
-    "@typescript-eslint/typescript-estree": "^8.71.0",
-    "@typescript-eslint/utils": "^8.71.0",
+    "@eslint-react/ast": "5.24.7",
+    "@eslint-react/core": "5.24.7",
+    "@eslint-react/eslint": "5.24.7",
+    "@eslint-react/jsx": "5.24.7",
+    "@eslint-react/shared": "5.24.7",
+    "@eslint-react/var": "5.24.7",
+    "@typescript-eslint/scope-manager": "^8.71.1",
+    "@typescript-eslint/types": "^8.71.1",
+    "@typescript-eslint/typescript-estree": "^8.71.1",
+    "@typescript-eslint/utils": "^8.71.1",
     "compare-versions": "^6.1.1",
     "string-ts": "^2.3.1",
     "ts-api-utils": "^2.5.0",