@eslint-react/jsx 5.2.2-beta.0 → 5.2.3-beta.0

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { JSXAttributeLike, JSXElementLike } from "@eslint-react/ast";
+import { TSESTreeJSXAttributeLike, TSESTreeJSXElementLike } from "@eslint-react/ast";
 import { TSESTree } from "@typescript-eslint/types";
 import { RuleContext } from "@eslint-react/eslint";
 
@@ -29,7 +29,7 @@ import { RuleContext } from "@eslint-react/eslint";
  * }
  * ```
  */
-declare function findAttribute(context: RuleContext, element: TSESTree.JSXElement, name: string): JSXAttributeLike | undefined;
+declare function findAttribute(context: RuleContext, element: TSESTree.JSXElement, name: string): TSESTreeJSXAttributeLike | undefined;
 //#endregion
 //#region src/find-parent-attribute.d.ts
 /**
@@ -237,7 +237,7 @@ declare function getAttributeValue(context: RuleContext, element: TSESTree.JSXEl
  * const meaningful = getChildren(node);
  * ```
  */
-declare function getChildren(element: JSXElementLike): TSESTree.JSXChild[];
+declare function getChildren(element: TSESTreeJSXElementLike): TSESTree.JSXChild[];
 //#endregion
 //#region src/get-element-type.d.ts
 /**
@@ -251,7 +251,7 @@ declare function getChildren(element: JSXElementLike): TSESTree.JSXChild[];
  * @param node - A `JSXElement` or `JSXFragment` node.
  * @returns The fully-qualified element type string.
  */
-declare function getElementFullType(node: JSXElementLike): string;
+declare function getElementFullType(node: TSESTreeJSXElementLike): string;
 /**
  * Get the **self name** (last dot-separated segment) of a JSX element type.
  *
@@ -262,7 +262,7 @@ declare function getElementFullType(node: JSXElementLike): string;
  * @param node - A `JSXElement` or `JSXFragment` node.
  * @returns The last segment of the element type, or `""` for fragments.
  */
-declare function getElementSelfType(node: JSXElementLike): string;
+declare function getElementSelfType(node: TSESTreeJSXElementLike): string;
 //#endregion
 //#region src/has-any-attribute.d.ts
 /**
@@ -346,7 +346,7 @@ declare function hasAttribute(context: RuleContext, element: TSESTree.JSXElement
  * }
  * ```
  */
-declare function hasChildren(element: JSXElementLike): boolean;
+declare function hasChildren(element: TSESTreeJSXElementLike): boolean;
 //#endregion
 //#region src/has-every-attribute.d.ts
 /**
@@ -385,7 +385,7 @@ declare function hasEveryAttribute(context: RuleContext, element: TSESTree.JSXEl
  *                  given strings
  * - `function`   — receives the element type string and returns a boolean
  */
-type ElementTest = string | readonly string[] | ((elementType: string, node: JSXElementLike) => boolean);
+type ElementTest = string | readonly string[] | ((elementType: string, node: TSESTreeJSXElementLike) => boolean);
 /**
  * Check whether a node is a `JSXElement` (or `JSXFragment`) and optionally
  * matches a given test.
@@ -418,7 +418,7 @@ type ElementTest = string | readonly string[] | ((elementType: string, node: JSX
  * if (isElement(node, (type) => type.endsWith(".Provider"))) { … }
  * ```
  */
-declare function isElement(node: TSESTree.Node | null | undefined, test?: ElementTest): node is JSXElementLike;
+declare function isElement(node: TSESTree.Node | null | undefined, test?: ElementTest): node is TSESTreeJSXElementLike;
 //#endregion
 //#region src/is-fragment-element.d.ts
 /**
@@ -448,7 +448,7 @@ declare function isElement(node: TSESTree.Node | null | undefined, test?: Elemen
  * if (isFragmentElement(node, config.jsxFragmentFactory)) { … }
  * ```
  */
-declare function isFragmentElement(node: TSESTree.Node, jsxFragmentFactory?: string): node is JSXElementLike;
+declare function isFragmentElement(node: TSESTree.Node, jsxFragmentFactory?: string): node is TSESTreeJSXElementLike;
 //#endregion
 //#region src/is-host-element.d.ts
 /**
@@ -678,6 +678,6 @@ declare function getJsxConfig(context: RuleContext): Required<JsxConfig>;
  * }
  * ```
  */
-declare function resolveAttributeValue(context: RuleContext, attribute: JSXAttributeLike): JsxAttributeValue;
+declare function resolveAttributeValue(context: RuleContext, attribute: TSESTreeJSXAttributeLike): JsxAttributeValue;
 //#endregion
 export { DEFAULT_JSX_DETECTION_HINT, ElementTest, JsxAttributeValue, JsxConfig, JsxDetectionHint, JsxEmit, findAttribute, findParentAttribute, getAttributeName, getAttributeStaticValue, getAttributeValue, getChildren, getElementFullType, getElementSelfType, getJsxConfig, getJsxConfigFromAnnotation, getJsxConfigFromCompilerOptions, hasAnyAttribute, hasAttribute, hasChildren, hasEveryAttribute, isElement, isFragmentElement, isHostElement, isJsxLike, isJsxText, isWhitespace, isWhitespaceText, resolveAttributeValue };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { Check, Traverse } from "@eslint-react/ast";
+import { Check, Extract, Traverse } from "@eslint-react/ast";
 import { resolve } from "@eslint-react/var";
 import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/types";
 import { getStaticValue } from "@typescript-eslint/utils/ast-utils";
@@ -62,15 +62,25 @@ function getAttributeName(node) {
 * ```
 */
 function findAttribute(context, element, name) {
+	function findProperty(of, named) {
+		for (const property of of) {
+			if (property.type === AST_NODE_TYPES.Property && Extract.propertyName(property.key) === named) return property;
+			if (property.type === AST_NODE_TYPES.SpreadElement && property.argument.type === AST_NODE_TYPES.ObjectExpression) {
+				const found = findProperty(property.argument.properties, named);
+				if (found != null) return found;
+			}
+		}
+		return null;
+	}
 	return element.openingElement.attributes.findLast((attr) => {
 		if (attr.type === AST_NODE_TYPES.JSXAttribute) return getAttributeName(attr) === name;
 		switch (attr.argument.type) {
 			case AST_NODE_TYPES.Identifier: {
 				const initNode = resolve(context, attr.argument);
-				if (initNode?.type === AST_NODE_TYPES.ObjectExpression) return Traverse.findProperty(initNode.properties, name) != null;
+				if (initNode?.type === AST_NODE_TYPES.ObjectExpression) return findProperty(initNode.properties, name) != null;
 				return false;
 			}
-			case AST_NODE_TYPES.ObjectExpression: return Traverse.findProperty(attr.argument.properties, name) != null;
+			case AST_NODE_TYPES.ObjectExpression: return findProperty(attr.argument.properties, name) != null;
 		}
 		return false;
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/jsx",
-  "version": "5.2.2-beta.0",
+  "version": "5.2.3-beta.0",
   "description": "ESLint React's TSESTree JSX utility module for static analysis of JSX patterns.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -30,16 +30,16 @@
     "./package.json"
   ],
   "dependencies": {
-    "@typescript-eslint/types": "^8.58.1",
-    "@typescript-eslint/utils": "^8.58.1",
+    "@typescript-eslint/types": "^8.58.2",
+    "@typescript-eslint/utils": "^8.58.2",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "5.2.2-beta.0",
-    "@eslint-react/var": "5.2.2-beta.0",
-    "@eslint-react/eslint": "5.2.2-beta.0",
-    "@eslint-react/shared": "5.2.2-beta.0"
+    "@eslint-react/eslint": "5.2.3-beta.0",
+    "@eslint-react/ast": "5.2.3-beta.0",
+    "@eslint-react/shared": "5.2.3-beta.0",
+    "@eslint-react/var": "5.2.3-beta.0"
   },
   "devDependencies": {
-    "tsdown": "^0.21.7",
+    "tsdown": "^0.21.8",
     "@local/configs": "0.0.0"
   },
   "peerDependencies": {