eslint-plugin-react-x 3.0.0-beta.69 → 3.0.0-beta.70

package/dist/index.js

@@ -1,6 +1,7 @@
 import { DEFAULT_ESLINT_REACT_SETTINGS, IMPURE_CTORS, IMPURE_FUNCS, WEBSITE_URL, defineRuleListener, getSettingsFromContext, report, toRegExp } from "@eslint-react/shared";
 import * as ast from "@eslint-react/ast";
 import * as core from "@eslint-react/core";
+import { JsxEmit, JsxInspector } from "@eslint-react/core";
 import { ESLintUtils } from "@typescript-eslint/utils";
 import { P, isMatching, match } from "ts-pattern";
 import ts from "typescript";
@@ -147,7 +148,7 @@ const rules$7 = {
 //#endregion
 //#region package.json
 var name$6 = "eslint-plugin-react-x";
-var version = "3.0.0-beta.69";
+var version = "3.0.0-beta.70";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -1540,11 +1541,8 @@ var jsx_key_before_spread_default = createRule({
 	defaultOptions: []
 });
 function create$59(context) {
-	const { jsx } = {
-		...core.getJsxConfigFromContext(context),
-		...core.getJsxConfigFromAnnotation(context)
-	};
-	if (jsx !== core.JsxEmit.ReactJSX && jsx !== core.JsxEmit.ReactJSXDev) return {};
+	const { jsx } = JsxInspector.from(context).jsxConfig;
+	if (jsx !== JsxEmit.ReactJSX && jsx !== JsxEmit.ReactJSXDev) return {};
 	return defineRuleListener({ JSXOpeningElement(node) {
 		let firstSpreadPropIndex = null;
 		for (const [index, prop] of node.attributes.entries()) {
@@ -1649,9 +1647,10 @@ var jsx_shorthand_boolean_default = createRule({
 });
 function create$56(context) {
 	const policy = context.options[0] ?? defaultOptions$4[0];
+	const jsx = JsxInspector.from(context);
 	return defineRuleListener({ JSXAttribute(node) {
 		const { value } = node;
-		const propName = core.getJsxAttributeName(context, node);
+		const propName = jsx.getAttributeName(node);
 		switch (true) {
 			case policy === 1 && value?.type === AST_NODE_TYPES.JSXExpressionContainer && value.expression.type === AST_NODE_TYPES.Literal && value.expression.value === true:
 				context.report({
@@ -1695,13 +1694,10 @@ var jsx_shorthand_fragment_default = createRule({
 });
 function create$55(context) {
 	const policy = context.options[0] ?? defaultOptions$3[0];
-	const jsxConfig = {
-		...core.getJsxConfigFromContext(context),
-		...core.getJsxConfigFromAnnotation(context)
-	};
-	const { jsxFragmentFactory } = jsxConfig;
+	const jsx = JsxInspector.from(context);
+	const { jsxFragmentFactory } = jsx.jsxConfig;
 	return match(policy).with(1, () => defineRuleListener({ JSXElement(node) {
-		if (!core.isJsxFragmentElement(context, node, jsxConfig)) return;
+		if (!jsx.isFragmentElement(node)) return;
 		if (node.openingElement.attributes.length > 0) return;
 		context.report({
 			data: { message: "Use fragment shorthand syntax instead of 'Fragment' component." },
@@ -1741,11 +1737,8 @@ var jsx_uses_react_default = createRule({
 	defaultOptions: []
 });
 function create$54(context) {
-	const { jsx, jsxFactory, jsxFragmentFactory } = {
-		...core.getJsxConfigFromContext(context),
-		...core.getJsxConfigFromAnnotation(context)
-	};
-	if (jsx === core.JsxEmit.ReactJSX || jsx === core.JsxEmit.ReactJSXDev) return {};
+	const { jsx, jsxFactory, jsxFragmentFactory } = JsxInspector.from(context).jsxConfig;
+	if (jsx === JsxEmit.ReactJSX || jsx === JsxEmit.ReactJSXDev) return {};
 	function handleJsxElement(node) {
 		context.sourceCode.markVariableAsUsed(jsxFactory, node);
 		debugReport(context, node, jsxFactory);
@@ -2110,8 +2103,9 @@ var no_children_prop_default = createRule({
 	defaultOptions: []
 });
 function create$46(context) {
+	const jsx = JsxInspector.from(context);
 	return defineRuleListener({ JSXElement(node) {
-		const childrenProp = core.getJsxAttribute(context, node)("children");
+		const childrenProp = jsx.findAttribute(node, "children");
 		if (childrenProp != null) context.report({
 			messageId: "default",
 			node: childrenProp
@@ -2316,8 +2310,9 @@ function create$39(context) {
 	if (!context.sourceCode.text.includes("Provider")) return {};
 	const { version } = getSettingsFromContext(context);
 	if (compare(version, "19.0.0", "<")) return {};
+	const jsx = JsxInspector.from(context);
 	return defineRuleListener({ JSXElement(node) {
-		const parts = core.getJsxElementType(context, node).split(".");
+		const parts = jsx.getElementType(node).split(".");
 		const selfName = parts.pop();
 		const contextFullName = parts.join(".");
 		const contextSelfName = parts.pop();
@@ -2797,9 +2792,10 @@ var no_missing_key_default = createRule({
 	defaultOptions: []
 });
 function create$30(ctx) {
+	const jsx = JsxInspector.from(ctx);
 	let inChildrenToArray = false;
 	function check(node) {
-		if (node.type === AST_NODE_TYPES.JSXElement) return core.getJsxAttribute(ctx, node)("key") == null ? {
+		if (node.type === AST_NODE_TYPES.JSXElement) return !jsx.hasAttribute(node, "key") ? {
 			messageId: "default",
 			node
 		} : null;
@@ -2834,7 +2830,7 @@ function create$30(ctx) {
 			const elements = node.elements.filter(ast.is(AST_NODE_TYPES.JSXElement));
 			if (elements.length === 0) return;
 			const scope = ctx.sourceCode.getScope(node);
-			for (const el of elements) if (core.getJsxAttribute(ctx, el, scope)("key") == null) ctx.report({
+			for (const el of elements) if (!jsx.hasAttribute(el, "key", scope)) ctx.report({
 				messageId: "default",
 				node: el
 			});
@@ -3002,7 +2998,7 @@ function create$28(context) {
 * @returns `true` if the node is inside JSX attribute value
 */
 function isInsideJSXAttributeValue(node) {
-	return node.parent.type === AST_NODE_TYPES.JSXAttribute || core.findParentJsxAttribute(node, (n) => n.value?.type === AST_NODE_TYPES.JSXExpressionContainer) != null;
+	return node.parent.type === AST_NODE_TYPES.JSXAttribute || JsxInspector.findParentAttribute(node, (n) => n.value?.type === AST_NODE_TYPES.JSXExpressionContainer) != null;
 }
 /**
 * Check whether a given node is declared inside a class component's render block
@@ -3495,9 +3491,10 @@ function create$16(context) {
 	const isReact18OrBelow = compare(version, "19.0.0", "<");
 	const { ctx, visitor } = core.useComponentCollector(context);
 	const constructions = /* @__PURE__ */ new WeakMap();
+	const jsx = JsxInspector.from(context);
 	return defineRuleListener(visitor, {
 		JSXOpeningElement(node) {
-			const selfName = core.getJsxElementType(context, node.parent).split(".").at(-1);
+			const selfName = jsx.getElementType(node.parent).split(".").at(-1);
 			if (selfName == null) return;
 			if (!isContextName(selfName, isReact18OrBelow)) return;
 			const functionEntry = ctx.getCurrentEntry();
@@ -4047,15 +4044,12 @@ var no_useless_fragment_default = createRule({
 });
 function create$10(context, [option]) {
 	const { allowEmptyFragment = false, allowExpressions = true } = option;
-	const jsxConfig = {
-		...core.getJsxConfigFromContext(context),
-		...core.getJsxConfigFromAnnotation(context)
-	};
+	const jsx = JsxInspector.from(context);
 	/**
 	* Check if a fragment node is useless and should be reported
 	*/
 	function checkNode(context, node) {
-		if (core.isJsxHostElement(context, node.parent)) context.report({
+		if (jsx.isHostElement(node.parent)) context.report({
 			data: { reason: "placed inside a host component" },
 			fix: getFix(context, node),
 			messageId: "default",
@@ -4073,7 +4067,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) ?? null): return;
+			case allowExpressions && !isChildElement && node.children.length === 1 && JsxInspector.isJsxText(node.children.at(0) ?? null): return;
 			case !allowExpressions && isChildElement:
 				context.report({
 					data: { reason: "contains less than two children" },
@@ -4113,15 +4107,15 @@ function create$10(context, [option]) {
 	* Check if it's safe to automatically fix the fragment
 	*/
 	function canFix(context, node) {
-		if (node.parent.type === AST_NODE_TYPES.JSXElement || node.parent.type === AST_NODE_TYPES.JSXFragment) return core.isJsxHostElement(context, node.parent);
+		if (node.parent.type === AST_NODE_TYPES.JSXElement || node.parent.type === AST_NODE_TYPES.JSXFragment) return jsx.isHostElement(node.parent);
 		if (node.children.length === 0) return false;
-		return !node.children.some((child) => core.isJsxText(child) && !isWhiteSpace(child) || ast.is(AST_NODE_TYPES.JSXExpressionContainer)(child));
+		return !node.children.some((child) => JsxInspector.isJsxText(child) && !isWhiteSpace(child) || ast.is(AST_NODE_TYPES.JSXExpressionContainer)(child));
 	}
 	return defineRuleListener({
 		JSXElement(node) {
-			if (!core.isJsxFragmentElement(context, node, jsxConfig)) return;
-			if (core.getJsxAttribute(context, node)("key") != null) return;
-			if (core.getJsxAttribute(context, node)("ref") != null) return;
+			if (!jsx.isFragmentElement(node)) return;
+			if (jsx.hasAttribute(node, "key")) return;
+			if (jsx.hasAttribute(node, "ref")) return;
 			checkNode(context, node);
 		},
 		JSXFragment(node) {
@@ -4139,7 +4133,7 @@ function isWhiteSpace(node) {
 * Check if a node is padding spaces (whitespace with line breaks)
 */
 function isPaddingSpaces(node) {
-	return core.isJsxText(node) && isWhiteSpace(node) && node.raw.includes("\n");
+	return JsxInspector.isJsxText(node) && isWhiteSpace(node) && node.raw.includes("\n");
 }
 /**
 * Trim whitespace like React would in JSX
@@ -7213,12 +7207,12 @@ function create(context) {
 			if (controlledProp == null) continue;
 			if (!attributes.has(controlledProp)) continue;
 			context.report({
-				node: attrNode,
-				messageId: "noControlledAndUncontrolledTogether",
 				data: {
 					controlled: controlledProp,
 					uncontrolled: propName
-				}
+				},
+				messageId: "noControlledAndUncontrolledTogether",
+				node: attrNode
 			});
 		}
 	} });
@@ -7466,10 +7460,10 @@ const settings = { ...settings$1 };
 const finalPlugin = {
 	...plugin,
 	configs: {
-		["disable-experimental"]: disable_experimental_exports,
-		["disable-type-checked"]: disable_type_checked_exports,
 		["disable-conflict-eslint-plugin-react"]: disable_conflict_eslint_plugin_react_exports,
 		["disable-conflict-eslint-plugin-react-hooks"]: disable_conflict_eslint_plugin_react_hooks_exports,
+		["disable-experimental"]: disable_experimental_exports,
+		["disable-type-checked"]: disable_type_checked_exports,
 		["recommended"]: recommended_exports,
 		["recommended-type-checked"]: recommended_type_checked_exports,
 		["recommended-typescript"]: recommended_typescript_exports,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "3.0.0-beta.69",
+  "version": "3.0.0-beta.70",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -45,11 +45,11 @@
     "string-ts": "^2.3.1",
     "ts-api-utils": "^2.4.0",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "3.0.0-beta.69",
-    "@eslint-react/core": "3.0.0-beta.69",
-    "@eslint-react/eff": "3.0.0-beta.69",
-    "@eslint-react/shared": "3.0.0-beta.69",
-    "@eslint-react/var": "3.0.0-beta.69"
+    "@eslint-react/ast": "3.0.0-beta.70",
+    "@eslint-react/core": "3.0.0-beta.70",
+    "@eslint-react/shared": "3.0.0-beta.70",
+    "@eslint-react/eff": "3.0.0-beta.70",
+    "@eslint-react/var": "3.0.0-beta.70"
   },
   "devDependencies": {
     "@types/react": "^19.2.14",