@eslint-react/core 3.0.0-next.70 → 3.0.0-next.71

package/dist/index.d.ts

@@ -627,14 +627,14 @@ declare function isHookName(name: string): boolean;
 type JsxAttributeValue = {
   kind: "missing";
   node: TSESTree.JSXEmptyExpression;
-  toStatic(): "{}";
+  toStatic(): null;
 } | {
   kind: "boolean";
   toStatic(): true;
 } | {
   kind: "element";
   node: TSESTree.JSXElement;
-  toStatic(): unknown;
+  toStatic(): null;
 } | {
   kind: "literal";
   node: TSESTree.Literal;
@@ -647,12 +647,12 @@ type JsxAttributeValue = {
   kind: "spreadProps";
   getProperty(name: string): unknown;
   node: TSESTree.JSXSpreadAttribute["argument"];
-  toStatic(): unknown;
+  toStatic(): null;
 } | {
   kind: "spreadChild";
   getChildren(at: number): unknown;
   node: TSESTree.JSXSpreadChild["expression"];
-  toStatic(): unknown;
+  toStatic(): null;
 };
 //#endregion
 //#region src/jsx/jsx-config.d.ts
@@ -786,9 +786,8 @@ declare class JsxInspector {
    * later props win), or `undefined` if not found.
    * @param node The JSX element to search for the attribute.
    * @param name The name of the attribute to find (e.g. `"className"`).
-   * @param initialScope An optional scope to use for resolving spread attributes. If not provided,
    */
-  findAttribute(node: TSESTree.JSXElement, name: string, initialScope?: Scope): ast.TSESTreeJSXAttributeLike | undefined;
+  findAttribute(node: TSESTree.JSXElement, name: string): ast.TSESTreeJSXAttributeLike | undefined;
   /**
    * Get the stringified name of a `JSXAttribute` node
    * (e.g. `"className"`, `"aria-label"`, `"xml:space"`).
@@ -810,10 +809,9 @@ declare class JsxInspector {
    * cannot be statically determined.
    * @param node The JSX element to search for the attribute.
    * @param name The name of the attribute to resolve (e.g. `"className"`).
-   * @param initialScope An optional scope to use for resolving spread attributes. If not provided, the scope will be determined from the context of the attribute node.
    * @returns The static value of the attribute, or `undefined` if not found or not statically resolvable.
    */
-  getAttributeStaticValue(node: TSESTree.JSXElement, name: string, initialScope?: Scope): unknown;
+  getAttributeStaticValue(node: TSESTree.JSXElement, name: string): unknown;
   /**
    * **All-in-one helper** – find an attribute by name on an element *and*
    * resolve its value in a single call.
@@ -821,10 +819,9 @@ declare class JsxInspector {
    * Returns `undefined` when the attribute is not present.
    * @param node The JSX element to search for the attribute.
    * @param name The name of the attribute to find and resolve (e.g. `"className"`).
-   * @param initialScope An optional scope to use for resolving spread attributes. If not provided, the scope will be determined from the context of the attribute node.
    * @returns A descriptor of the attribute's value that can be further inspected, or `undefined` if the attribute is not found.
    */
-  getAttributeValue(node: TSESTree.JSXElement, name: string, initialScope?: Scope): JsxAttributeValue | undefined;
+  getAttributeValue(node: TSESTree.JSXElement, name: string): JsxAttributeValue | undefined;
   /**
    * Get the **self name** (last segment) of a JSX element type.
    *
@@ -848,10 +845,9 @@ declare class JsxInspector {
    * Shorthand: check whether an attribute exists on the element.
    * @param node The JSX element to check for the attribute.
    * @param name The name of the attribute to check for (e.g. `"className"`).
-   * @param initialScope An optional scope to use for resolving spread attributes. If not provided, the scope will be determined from the context of the attribute node.
    * @returns `true` if the attribute exists on the element, `false` otherwise.
    */
-  hasAttribute(node: TSESTree.JSXElement, name: string, initialScope?: Scope): boolean;
+  hasAttribute(node: TSESTree.JSXElement, name: string): boolean;
   /**
    * Whether the node is a React **Fragment** element (either `<Fragment>` /
    * `<React.Fragment>` or the shorthand `<>` syntax).
@@ -887,7 +883,7 @@ declare class JsxInspector {
   } | {
     readonly kind: "missing";
     readonly node: TSESTree.JSXEmptyExpression;
-    readonly toStatic: () => "{}";
+    readonly toStatic: () => null;
     readonly getChildren?: never;
   } | {
     readonly kind: "expression";
@@ -901,14 +897,14 @@ declare class JsxInspector {
     readonly getChildren?: never;
   } | {
     readonly kind: "spreadChild";
-    readonly getChildren: (_at: number) => null;
     readonly node: TSESTree.JSXEmptyExpression | TSESTree.Expression;
-    readonly toStatic: () => unknown;
+    readonly toStatic: () => null;
+    readonly getChildren: (_at: number) => null;
   } | {
     readonly kind: "spreadProps";
-    readonly getProperty: (name: string) => unknown;
     readonly node: TSESTree.Expression;
-    readonly toStatic: () => unknown;
+    readonly toStatic: () => null;
+    readonly getProperty: (name: string) => unknown;
   };
 }
 //#endregion

package/dist/index.js

@@ -596,10 +596,8 @@ var JsxInspector = class JsxInspector {
 	* later props win), or `undefined` if not found.
 	* @param node The JSX element to search for the attribute.
 	* @param name The name of the attribute to find (e.g. `"className"`).
-	* @param initialScope An optional scope to use for resolving spread attributes. If not provided,
 	*/
-	findAttribute(node, name, initialScope) {
-		initialScope ?? this.context.sourceCode.getScope(node);
+	findAttribute(node, name) {
 		return node.openingElement.attributes.findLast((attr) => {
 			if (attr.type === AST_NODE_TYPES.JSXAttribute) return stringifyJsx(attr.name) === name;
 			switch (attr.argument.type) {
@@ -636,11 +634,10 @@ var JsxInspector = class JsxInspector {
 	* cannot be statically determined.
 	* @param node The JSX element to search for the attribute.
 	* @param name The name of the attribute to resolve (e.g. `"className"`).
-	* @param initialScope An optional scope to use for resolving spread attributes. If not provided, the scope will be determined from the context of the attribute node.
 	* @returns The static value of the attribute, or `undefined` if not found or not statically resolvable.
 	*/
-	getAttributeStaticValue(node, name, initialScope) {
-		const attr = this.findAttribute(node, name, initialScope);
+	getAttributeStaticValue(node, name) {
+		const attr = this.findAttribute(node, name);
 		if (attr == null) return void 0;
 		const resolved = this.resolveAttributeValue(attr);
 		if (resolved.kind === "spreadProps") return resolved.getProperty(name);
@@ -653,11 +650,10 @@ var JsxInspector = class JsxInspector {
 	* Returns `undefined` when the attribute is not present.
 	* @param node The JSX element to search for the attribute.
 	* @param name The name of the attribute to find and resolve (e.g. `"className"`).
-	* @param initialScope An optional scope to use for resolving spread attributes. If not provided, the scope will be determined from the context of the attribute node.
 	* @returns A descriptor of the attribute's value that can be further inspected, or `undefined` if the attribute is not found.
 	*/
-	getAttributeValue(node, name, initialScope) {
-		const attr = this.findAttribute(node, name, initialScope);
+	getAttributeValue(node, name) {
+		const attr = this.findAttribute(node, name);
 		if (attr == null) return void 0;
 		return this.resolveAttributeValue(attr);
 	}
@@ -689,11 +685,10 @@ var JsxInspector = class JsxInspector {
 	* Shorthand: check whether an attribute exists on the element.
 	* @param node The JSX element to check for the attribute.
 	* @param name The name of the attribute to check for (e.g. `"className"`).
-	* @param initialScope An optional scope to use for resolving spread attributes. If not provided, the scope will be determined from the context of the attribute node.
 	* @returns `true` if the attribute exists on the element, `false` otherwise.
 	*/
-	hasAttribute(node, name, initialScope) {
-		return this.findAttribute(node, name, initialScope) != null;
+	hasAttribute(node, name) {
+		return this.findAttribute(node, name) != null;
 	}
 	/**
 	* Whether the node is a React **Fragment** element (either `<Fragment>` /
@@ -725,11 +720,11 @@ var JsxInspector = class JsxInspector {
 	* @returns A descriptor of the attribute's value that can be further inspected.
 	*/
 	resolveAttributeValue(attribute) {
-		const initialScope = this.context.sourceCode.getScope(attribute);
-		if (attribute.type === AST_NODE_TYPES.JSXAttribute) return this.#resolveJsxAttribute(attribute, initialScope);
-		return this.#resolveJsxSpreadAttribute(attribute, initialScope);
+		if (attribute.type === AST_NODE_TYPES.JSXAttribute) return this.#resolveJsxAttribute(attribute);
+		return this.#resolveJsxSpreadAttribute(attribute);
 	}
-	#resolveJsxAttribute(node, initialScope) {
+	#resolveJsxAttribute(node) {
+		const scope = this.context.sourceCode.getScope(node);
 		if (node.value == null) return {
 			kind: "boolean",
 			toStatic() {
@@ -753,14 +748,14 @@ var JsxInspector = class JsxInspector {
 					kind: "missing",
 					node: expr,
 					toStatic() {
-						return "{}";
+						return null;
 					}
 				};
 				return {
 					kind: "expression",
 					node: expr,
 					toStatic() {
-						return getStaticValue(expr, initialScope)?.value;
+						return getStaticValue(expr, scope)?.value;
 					}
 				};
 			}
@@ -771,30 +766,30 @@ var JsxInspector = class JsxInspector {
 					return null;
 				}
 			};
-			case AST_NODE_TYPES.JSXSpreadChild: {
-				const expr = node.value.expression;
+			case AST_NODE_TYPES.JSXSpreadChild:
+				node.value.expression;
 				return {
 					kind: "spreadChild",
-					getChildren(_at) {
-						return null;
-					},
 					node: node.value.expression,
 					toStatic() {
-						return getStaticValue(expr, initialScope)?.value;
+						return null;
+					},
+					getChildren(_at) {
+						return null;
 					}
 				};
-			}
 		}
 	}
-	#resolveJsxSpreadAttribute(node, initialScope) {
+	#resolveJsxSpreadAttribute(node) {
+		const scope = this.context.sourceCode.getScope(node);
 		return {
 			kind: "spreadProps",
-			getProperty(name) {
-				return match(getStaticValue(node.argument, initialScope)?.value).with({ [name]: P.select(P.any) }, identity).otherwise(() => null);
-			},
 			node: node.argument,
 			toStatic() {
-				return getStaticValue(node.argument, initialScope)?.value;
+				return null;
+			},
+			getProperty(name) {
+				return match(getStaticValue(node.argument, scope)?.value).with({ [name]: P.select(P.any) }, identity).otherwise(() => null);
 			}
 		};
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "3.0.0-next.70",
+  "version": "3.0.0-next.71",
   "description": "ESLint React's ESLint utility module for static analysis of React core APIs and patterns.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -34,10 +34,10 @@
     "@typescript-eslint/types": "canary",
     "@typescript-eslint/utils": "canary",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "3.0.0-next.70",
-    "@eslint-react/eff": "3.0.0-next.70",
-    "@eslint-react/var": "3.0.0-next.70",
-    "@eslint-react/shared": "3.0.0-next.70"
+    "@eslint-react/ast": "3.0.0-next.71",
+    "@eslint-react/eff": "3.0.0-next.71",
+    "@eslint-react/shared": "3.0.0-next.71",
+    "@eslint-react/var": "3.0.0-next.71"
   },
   "devDependencies": {
     "tsdown": "^0.21.0-beta.2",