eslint-plugin-react-x 2.11.2 → 2.12.0-beta.0

package/dist/index.js

@@ -67,7 +67,7 @@ const rules$7 = {
 //#endregion
 //#region package.json
 var name$6 = "eslint-plugin-react-x";
-var version = "2.11.2";
+var version = "2.12.0-beta.0";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -125,6 +125,76 @@ const isTruthyStringType = (type) => type.isStringLiteral() && type.value !== ""
 /** @internal */
 const isUnknownType = (type) => isTypeFlagSet(type, ts.TypeFlags.Unknown);
 
+//#endregion
+//#region src/utils/type-name.ts
+/**
+* An enhanced version of getFullyQualifiedName that handles cases that original function does not handle
+* @param checker TypeScript type checker
+* @param symbol Symbol to get fully qualified name for
+* @returns Fully qualified name of the symbol
+*/
+function getFullyQualifiedNameEx(checker, symbol) {
+	let name = symbol.name;
+	let parent = symbol.declarations?.at(0)?.parent;
+	if (parent == null) return checker.getFullyQualifiedName(symbol);
+	while (parent.kind !== ts.SyntaxKind.SourceFile) {
+		switch (true) {
+			case ts.isInterfaceDeclaration(parent):
+				name = `${parent.name.text}.${name}`;
+				break;
+			case ts.isTypeAliasDeclaration(parent):
+				name = `${parent.name.text}.${name}`;
+				break;
+			case ts.isEnumDeclaration(parent):
+				name = `${parent.name.text}.${name}`;
+				break;
+			case ts.isClassDeclaration(parent) && parent.name != null:
+				name = `${parent.name.text}.${name}`;
+				break;
+			case ts.isModuleDeclaration(parent):
+				name = `${parent.name.text}.${name}`;
+				break;
+			case ts.isNamespaceImport(parent):
+				name = `${parent.name.text}.${name}`;
+				break;
+			case ts.isNamespaceExport(parent):
+				name = `${parent.name.text}.${name}`;
+				break;
+			case ts.isEnumMember(parent):
+				name = `${parent.name.getText()}.${name}`;
+				break;
+			case ts.isFunctionDeclaration(parent) && parent.name != null:
+				name = `${parent.name.text}.${name}`;
+				break;
+			case ts.isClassExpression(parent) && parent.name != null:
+				name = `${parent.name.text}.${name}`;
+				break;
+			case ts.isPropertySignature(parent) && ts.isIdentifier(parent.name):
+				name = `${parent.name.text}.${name}`;
+				break;
+			case ts.isPropertyDeclaration(parent) && ts.isIdentifier(parent.name):
+				name = `${parent.name.text}.${name}`;
+				break;
+			case ts.isMethodDeclaration(parent) && ts.isIdentifier(parent.name):
+				name = `${parent.name.text}.${name}`;
+				break;
+			case ts.isMethodSignature(parent) && ts.isIdentifier(parent.name):
+				name = `${parent.name.text}.${name}`;
+				break;
+			case ts.isPropertyAssignment(parent) && ts.isIdentifier(parent.name):
+				name = `${parent.name.text}.${name}`;
+				break;
+			case ts.isTypeLiteralNode(parent):
+			case ts.isMappedTypeNode(parent):
+			case ts.isObjectLiteralExpression(parent):
+			case ts.isIntersectionTypeNode(parent):
+			case ts.isUnionTypeNode(parent): break;
+		}
+		parent = parent.parent;
+	}
+	return name;
+}
+
 //#endregion
 //#region src/utils/type-variant.ts
 /**
@@ -1359,7 +1429,7 @@ function create$35(context) {
 		for (const type of unionConstituents(getConstrainedTypeAtLocation(services, node.argument))) {
 			const key = type.getProperty("key");
 			if (key == null) return;
-			if (isReactInternalKey(checker, key)) return;
+			if (getFullyQualifiedNameEx(checker, key).endsWith("React.Attributes.key")) return;
 			context.report({
 				messageId: "default",
 				node
@@ -1367,21 +1437,6 @@ function create$35(context) {
 		}
 	} };
 }
-/**
-* Check if a symbol is a React internal key
-* @param checker TypeScript type checker
-* @param key Symbol to check
-* @returns True if the symbol is a React internal key, false otherwise
-*/
-function isReactInternalKey(checker, key) {
-	if (checker.getFullyQualifiedName(key) === "React.Attributes.key") return true;
-	let parent = key.declarations?.at(0)?.parent;
-	while (parent != null && parent.kind !== ts.SyntaxKind.SourceFile) {
-		if (ts.isModuleDeclaration(parent) && ts.isIdentifier(parent.name) && parent.name.text === "React") return true;
-		parent = parent.parent;
-	}
-	return false;
-}
 
 //#endregion
 //#region src/rules/no-leaked-conditional-rendering.ts
@@ -1691,7 +1746,7 @@ var no_nested_component_definitions_default = createRule({
 	defaultOptions: []
 });
 function create$29(context) {
-	const hint = core.ComponentDetectionHint.SkipArrayMapCallback | core.ComponentDetectionHint.SkipNullLiteral | core.ComponentDetectionHint.SkipUndefined | core.ComponentDetectionHint.SkipBooleanLiteral | core.ComponentDetectionHint.SkipStringLiteral | core.ComponentDetectionHint.SkipNumberLiteral | core.ComponentDetectionHint.StrictLogical | core.ComponentDetectionHint.StrictConditional;
+	const hint = core.ComponentDetectionHint.DoNotIncludeJsxWithNumberValue | core.ComponentDetectionHint.DoNotIncludeJsxWithBooleanValue | core.ComponentDetectionHint.DoNotIncludeJsxWithStringValue | core.ComponentDetectionHint.DoNotIncludeJsxWithUndefinedValue | core.ComponentDetectionHint.RequireBothSidesOfLogicalExpressionToBeJsx | core.ComponentDetectionHint.RequireBothBranchesOfConditionalExpressionToBeJsx | core.ComponentDetectionHint.DoNotIncludeFunctionDefinedInArrayPattern | core.ComponentDetectionHint.DoNotIncludeFunctionDefinedInArrayExpression | core.ComponentDetectionHint.DoNotIncludeFunctionDefinedAsArrayMapCallback;
 	const fCollector = core.useComponentCollector(context, { hint });
 	const cCollector = core.useComponentCollectorLegacy(context);
 	return defineRuleListener(fCollector.visitor, cCollector.visitor, { "Program:exit"(program) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "2.11.2",
+  "version": "2.12.0-beta.0",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -45,11 +45,11 @@
     "is-immutable-type": "^5.0.1",
     "ts-api-utils": "^2.4.0",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "2.11.2",
-    "@eslint-react/core": "2.11.2",
-    "@eslint-react/eff": "2.11.2",
-    "@eslint-react/shared": "2.11.2",
-    "@eslint-react/var": "2.11.2"
+    "@eslint-react/ast": "2.12.0-beta.0",
+    "@eslint-react/eff": "2.12.0-beta.0",
+    "@eslint-react/core": "2.12.0-beta.0",
+    "@eslint-react/shared": "2.12.0-beta.0",
+    "@eslint-react/var": "2.12.0-beta.0"
   },
   "devDependencies": {
     "@types/react": "^19.2.13",
@@ -58,7 +58,7 @@
     "@local/configs": "0.0.0"
   },
   "peerDependencies": {
-    "eslint": "^8.57.0 || ^9.0.0",
+    "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
     "typescript": ">=4.8.4 <6.0.0"
   },
   "engines": {