@eslint-react/jsx 5.15.0 → 5.16.0

package/dist/index.d.ts

@@ -26,6 +26,7 @@ declare function collapseMultilineText(text: string): string | null;
  *
  * Spread attributes are resolved when possible: if the spread argument is an identifier
  * that resolves to an object expression, the object's properties are searched for a matching key.
+ * Nested object expressions and nested spread identifiers are also resolved.
  * @param context The ESLint rule context (needed for variable resolution in spread attributes)
  * @param element The `JSXElement` node to search
  * @param name The attribute name to look for (ex: "className")

package/dist/index.js

@@ -66,17 +66,32 @@ function getAttributeName(node) {
 *
 * Spread attributes are resolved when possible: if the spread argument is an identifier
 * that resolves to an object expression, the object's properties are searched for a matching key.
+* Nested object expressions and nested spread identifiers are also resolved.
 * @param context The ESLint rule context (needed for variable resolution in spread attributes)
 * @param element The `JSXElement` node to search
 * @param name The attribute name to look for (ex: "className")
 * @returns The matching `JSXAttribute` or `JSXSpreadAttribute`, or `undefined` when not found
 */
 function findAttribute(context, element, name) {
-	function findProperty(properties, name) {
+	function findProperty(properties, name, seen = /* @__PURE__ */ new Set()) {
 		for (const property of properties) {
 			if (property.type === AST_NODE_TYPES.Property && !property.computed && property.key.type === AST_NODE_TYPES.Identifier && property.key.name === name) return property;
-			if (property.type === AST_NODE_TYPES.SpreadElement && property.argument.type === AST_NODE_TYPES.ObjectExpression) {
-				const found = findProperty(property.argument.properties, name);
+			if (property.type !== AST_NODE_TYPES.SpreadElement) continue;
+			const argument = property.argument;
+			if (argument.type === AST_NODE_TYPES.Identifier) {
+				const initNode = resolve(context, argument);
+				if (initNode?.type === AST_NODE_TYPES.ObjectExpression) {
+					if (seen.has(initNode)) continue;
+					seen.add(initNode);
+					const found = findProperty(initNode.properties, name, seen);
+					if (found != null) return found;
+				}
+				continue;
+			}
+			if (argument.type === AST_NODE_TYPES.ObjectExpression) {
+				if (seen.has(argument)) continue;
+				seen.add(argument);
+				const found = findProperty(argument.properties, name, seen);
 				if (found != null) return found;
 			}
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/jsx",
-  "version": "5.15.0",
+  "version": "5.16.0",
   "description": "ESLint React's TSESTree JSX utility module for static analysis of JSX patterns.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -32,10 +32,10 @@
     "@typescript-eslint/types": "^8.64.0",
     "@typescript-eslint/utils": "^8.64.0",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "5.15.0",
-    "@eslint-react/eslint": "5.15.0",
-    "@eslint-react/var": "5.15.0",
-    "@eslint-react/shared": "5.15.0"
+    "@eslint-react/ast": "5.16.0",
+    "@eslint-react/eslint": "5.16.0",
+    "@eslint-react/shared": "5.16.0",
+    "@eslint-react/var": "5.16.0"
   },
   "devDependencies": {
     "eslint": "^10.7.0",