@eslint-react/core 2.11.2 → 2.12.0-beta.0

package/dist/index.d.ts

@@ -84,42 +84,24 @@ type ComponentDetectionHint = bigint;
  * Hints for component collector
  */
 declare const ComponentDetectionHint: {
-  /**
-   * Skip function component defined on object method
-   */
-  readonly SkipObjectMethod: bigint;
-  /**
-   * Skip function component defined on class method
-   */
-  readonly SkipClassMethod: bigint;
-  /**
-   * Skip function component defined on class property
-   */
-  readonly SkipClassProperty: bigint;
-  /**
-   * Skip function component defined in array pattern
-   */
-  readonly SkipArrayPattern: bigint;
-  /**
-   * Skip function component defined in array expression
-   */
-  readonly SkipArrayExpression: bigint;
-  /**
-   * Skip function component defined as array map callback
-   */
-  readonly SkipArrayMapCallback: bigint;
+  readonly DoNotIncludeFunctionDefinedOnObjectMethod: bigint;
+  readonly DoNotIncludeFunctionDefinedOnClassMethod: bigint;
+  readonly DoNotIncludeFunctionDefinedOnClassProperty: bigint;
+  readonly DoNotIncludeFunctionDefinedInArrayPattern: bigint;
+  readonly DoNotIncludeFunctionDefinedInArrayExpression: bigint;
+  readonly DoNotIncludeFunctionDefinedAsArrayMapCallback: bigint;
   readonly None: 0n;
-  readonly SkipUndefined: bigint;
-  readonly SkipNullLiteral: bigint;
-  readonly SkipBooleanLiteral: bigint;
-  readonly SkipStringLiteral: bigint;
-  readonly SkipNumberLiteral: bigint;
-  readonly SkipBigIntLiteral: bigint;
-  readonly SkipEmptyArray: bigint;
-  readonly SkipCreateElement: bigint;
-  readonly StrictArray: bigint;
-  readonly StrictLogical: bigint;
-  readonly StrictConditional: bigint;
+  readonly DoNotIncludeJsxWithNullValue: bigint;
+  readonly DoNotIncludeJsxWithNumberValue: bigint;
+  readonly DoNotIncludeJsxWithBigIntValue: bigint;
+  readonly DoNotIncludeJsxWithStringValue: bigint;
+  readonly DoNotIncludeJsxWithBooleanValue: bigint;
+  readonly DoNotIncludeJsxWithUndefinedValue: bigint;
+  readonly DoNotIncludeJsxWithEmptyArrayValue: bigint;
+  readonly DoNotIncludeJsxWithCreateElementValue: bigint;
+  readonly RequireAllArrayElementsToBeJsx: bigint;
+  readonly RequireBothSidesOfLogicalExpressionToBeJsx: bigint;
+  readonly RequireBothBranchesOfConditionalExpressionToBeJsx: bigint;
 };
 /**
  * Default component detection hint
@@ -561,7 +543,7 @@ type FindEnclosingComponentOrHookFilter = (n: TSESTree.Node, name: string | null
  * @param test Optional test function to customize component or hook identification
  * @returns The enclosing component or hook node, or `null` if none is ASAST.
  */
-declare function findEnclosingComponentOrHook(node: TSESTree.Node | unit, test?: FindEnclosingComponentOrHookFilter): TSESTree.ArrowFunctionExpression | TSESTree.FunctionDeclarationWithName | TSESTree.FunctionDeclarationWithOptionalName | TSESTree.FunctionExpression | undefined;
+declare function findEnclosingComponentOrHook(node: TSESTree.Node | unit, test?: FindEnclosingComponentOrHookFilter): TSESTree.ArrowFunctionExpression | TSESTree.FunctionExpression | TSESTree.FunctionDeclarationWithName | TSESTree.FunctionDeclarationWithOptionalName | undefined;
 //#endregion
 //#region src/hierarchy/is-inside-component-or-hook.d.ts
 /**
@@ -759,7 +741,7 @@ declare function resolveJsxAttributeValue(context: RuleContext, attribute: ast.T
   readonly toStatic: () => string | number | bigint | boolean | RegExp | null;
 } | {
   readonly kind: "expression";
-  readonly node: TSESTree.JSXEmptyExpression | TSESTree.Expression;
+  readonly node: TSESTree.Expression | TSESTree.JSXEmptyExpression;
   readonly toStatic: () => unknown;
 } | {
   readonly kind: "element";
@@ -767,7 +749,7 @@ declare function resolveJsxAttributeValue(context: RuleContext, attribute: ast.T
   readonly toStatic: () => undefined;
 } | {
   readonly kind: "spreadChild";
-  readonly node: TSESTree.JSXEmptyExpression | TSESTree.Expression;
+  readonly node: TSESTree.Expression | TSESTree.JSXEmptyExpression;
   readonly toStatic: () => undefined;
 } | {
   readonly kind: "spreadProps";
@@ -815,17 +797,17 @@ declare function getJsxConfigFromAnnotation(context: RuleContext): JsxConfig;
 type JsxDetectionHint = bigint;
 declare const JsxDetectionHint: {
   readonly None: 0n;
-  readonly SkipUndefined: bigint;
-  readonly SkipNullLiteral: bigint;
-  readonly SkipBooleanLiteral: bigint;
-  readonly SkipStringLiteral: bigint;
-  readonly SkipNumberLiteral: bigint;
-  readonly SkipBigIntLiteral: bigint;
-  readonly SkipEmptyArray: bigint;
-  readonly SkipCreateElement: bigint;
-  readonly StrictArray: bigint;
-  readonly StrictLogical: bigint;
-  readonly StrictConditional: bigint;
+  readonly DoNotIncludeJsxWithNullValue: bigint;
+  readonly DoNotIncludeJsxWithNumberValue: bigint;
+  readonly DoNotIncludeJsxWithBigIntValue: bigint;
+  readonly DoNotIncludeJsxWithStringValue: bigint;
+  readonly DoNotIncludeJsxWithBooleanValue: bigint;
+  readonly DoNotIncludeJsxWithUndefinedValue: bigint;
+  readonly DoNotIncludeJsxWithEmptyArrayValue: bigint;
+  readonly DoNotIncludeJsxWithCreateElementValue: bigint;
+  readonly RequireAllArrayElementsToBeJsx: bigint;
+  readonly RequireBothSidesOfLogicalExpressionToBeJsx: bigint;
+  readonly RequireBothBranchesOfConditionalExpressionToBeJsx: bigint;
 };
 /**
  * Default JSX detection configuration

package/dist/index.js

@@ -513,23 +513,23 @@ function getJsxConfigFromAnnotation(context) {
 //#region src/jsx/jsx-detection.ts
 const JsxDetectionHint = {
 	None: 0n,
-	SkipUndefined: 1n << 0n,
-	SkipNullLiteral: 1n << 1n,
-	SkipBooleanLiteral: 1n << 2n,
-	SkipStringLiteral: 1n << 3n,
-	SkipNumberLiteral: 1n << 4n,
-	SkipBigIntLiteral: 1n << 5n,
-	SkipEmptyArray: 1n << 6n,
-	SkipCreateElement: 1n << 7n,
-	StrictArray: 1n << 8n,
-	StrictLogical: 1n << 9n,
-	StrictConditional: 1n << 10n
+	DoNotIncludeJsxWithNullValue: 1n << 0n,
+	DoNotIncludeJsxWithNumberValue: 1n << 1n,
+	DoNotIncludeJsxWithBigIntValue: 1n << 2n,
+	DoNotIncludeJsxWithStringValue: 1n << 3n,
+	DoNotIncludeJsxWithBooleanValue: 1n << 4n,
+	DoNotIncludeJsxWithUndefinedValue: 1n << 5n,
+	DoNotIncludeJsxWithEmptyArrayValue: 1n << 6n,
+	DoNotIncludeJsxWithCreateElementValue: 1n << 7n,
+	RequireAllArrayElementsToBeJsx: 1n << 8n,
+	RequireBothSidesOfLogicalExpressionToBeJsx: 1n << 9n,
+	RequireBothBranchesOfConditionalExpressionToBeJsx: 1n << 10n
 };
 /**
 * Default JSX detection configuration
 * Skips undefined and boolean literals (common in React)
 */
-const DEFAULT_JSX_DETECTION_HINT = 0n | JsxDetectionHint.SkipUndefined | JsxDetectionHint.SkipBooleanLiteral;
+const DEFAULT_JSX_DETECTION_HINT = 0n | JsxDetectionHint.DoNotIncludeJsxWithNumberValue | JsxDetectionHint.DoNotIncludeJsxWithBigIntValue | JsxDetectionHint.DoNotIncludeJsxWithBooleanValue | JsxDetectionHint.DoNotIncludeJsxWithStringValue | JsxDetectionHint.DoNotIncludeJsxWithUndefinedValue;
 /**
 * Check if a node is a `JSXText` or a `Literal` node
 * @param node The AST node to check
@@ -555,26 +555,26 @@ function isJsxLike(code, node, hint = DEFAULT_JSX_DETECTION_HINT) {
 	switch (node.type) {
 		case AST_NODE_TYPES.Literal:
 			switch (typeof node.value) {
-				case "boolean": return !(hint & JsxDetectionHint.SkipBooleanLiteral);
-				case "string": return !(hint & JsxDetectionHint.SkipStringLiteral);
-				case "number": return !(hint & JsxDetectionHint.SkipNumberLiteral);
-				case "bigint": return !(hint & JsxDetectionHint.SkipBigIntLiteral);
+				case "boolean": return !(hint & JsxDetectionHint.DoNotIncludeJsxWithBooleanValue);
+				case "string": return !(hint & JsxDetectionHint.DoNotIncludeJsxWithStringValue);
+				case "number": return !(hint & JsxDetectionHint.DoNotIncludeJsxWithNumberValue);
+				case "bigint": return !(hint & JsxDetectionHint.DoNotIncludeJsxWithBigIntValue);
 			}
-			if (node.value == null) return !(hint & JsxDetectionHint.SkipNullLiteral);
+			if (node.value == null) return !(hint & JsxDetectionHint.DoNotIncludeJsxWithNullValue);
 			return false;
-		case AST_NODE_TYPES.TemplateLiteral: return !(hint & JsxDetectionHint.SkipStringLiteral);
+		case AST_NODE_TYPES.TemplateLiteral: return !(hint & JsxDetectionHint.DoNotIncludeJsxWithStringValue);
 		case AST_NODE_TYPES.ArrayExpression:
-			if (node.elements.length === 0) return !(hint & JsxDetectionHint.SkipEmptyArray);
-			if (hint & JsxDetectionHint.StrictArray) return node.elements.every((n) => isJsxLike(code, n, hint));
+			if (node.elements.length === 0) return !(hint & JsxDetectionHint.DoNotIncludeJsxWithEmptyArrayValue);
+			if (hint & JsxDetectionHint.RequireAllArrayElementsToBeJsx) return node.elements.every((n) => isJsxLike(code, n, hint));
 			return node.elements.some((n) => isJsxLike(code, n, hint));
 		case AST_NODE_TYPES.LogicalExpression:
-			if (hint & JsxDetectionHint.StrictLogical) return isJsxLike(code, node.left, hint) && isJsxLike(code, node.right, hint);
+			if (hint & JsxDetectionHint.RequireBothSidesOfLogicalExpressionToBeJsx) return isJsxLike(code, node.left, hint) && isJsxLike(code, node.right, hint);
 			return isJsxLike(code, node.left, hint) || isJsxLike(code, node.right, hint);
 		case AST_NODE_TYPES.ConditionalExpression: {
 			function leftHasJSX(node) {
 				if (Array.isArray(node.consequent)) {
-					if (node.consequent.length === 0) return !(hint & JsxDetectionHint.SkipEmptyArray);
-					if (hint & JsxDetectionHint.StrictArray) return node.consequent.every((n) => isJsxLike(code, n, hint));
+					if (node.consequent.length === 0) return !(hint & JsxDetectionHint.DoNotIncludeJsxWithEmptyArrayValue);
+					if (hint & JsxDetectionHint.RequireAllArrayElementsToBeJsx) return node.consequent.every((n) => isJsxLike(code, n, hint));
 					return node.consequent.some((n) => isJsxLike(code, n, hint));
 				}
 				return isJsxLike(code, node.consequent, hint);
@@ -582,12 +582,12 @@ function isJsxLike(code, node, hint = DEFAULT_JSX_DETECTION_HINT) {
 			function rightHasJSX(node) {
 				return isJsxLike(code, node.alternate, hint);
 			}
-			if (hint & JsxDetectionHint.StrictConditional) return leftHasJSX(node) && rightHasJSX(node);
+			if (hint & JsxDetectionHint.RequireBothBranchesOfConditionalExpressionToBeJsx) return leftHasJSX(node) && rightHasJSX(node);
 			return leftHasJSX(node) || rightHasJSX(node);
 		}
 		case AST_NODE_TYPES.SequenceExpression: return isJsxLike(code, node.expressions.at(-1), hint);
 		case AST_NODE_TYPES.CallExpression:
-			if (hint & JsxDetectionHint.SkipCreateElement) return false;
+			if (hint & JsxDetectionHint.DoNotIncludeJsxWithCreateElementValue) return false;
 			switch (node.callee.type) {
 				case AST_NODE_TYPES.Identifier: return node.callee.name === "createElement";
 				case AST_NODE_TYPES.MemberExpression: return node.callee.property.type === AST_NODE_TYPES.Identifier && node.callee.property.name === "createElement";
@@ -595,7 +595,7 @@ function isJsxLike(code, node, hint = DEFAULT_JSX_DETECTION_HINT) {
 			return false;
 		case AST_NODE_TYPES.Identifier: {
 			const { name } = node;
-			if (name === "undefined") return !(hint & JsxDetectionHint.SkipUndefined);
+			if (name === "undefined") return !(hint & JsxDetectionHint.DoNotIncludeJsxWithUndefinedValue);
 			if (ast.isJSXTagNameExpression(node)) return true;
 			return isJsxLike(code, getVariableDefinitionNode(findVariable(name, code.getScope(node)), 0), hint);
 		}
@@ -672,17 +672,17 @@ function findParentJsxAttribute(node, test = constTrue) {
 */
 const ComponentDetectionHint = {
 	...JsxDetectionHint,
-	SkipObjectMethod: 1n << 64n,
-	SkipClassMethod: 1n << 65n,
-	SkipClassProperty: 1n << 66n,
-	SkipArrayPattern: 1n << 67n,
-	SkipArrayExpression: 1n << 68n,
-	SkipArrayMapCallback: 1n << 69n
+	DoNotIncludeFunctionDefinedOnObjectMethod: 1n << 64n,
+	DoNotIncludeFunctionDefinedOnClassMethod: 1n << 65n,
+	DoNotIncludeFunctionDefinedOnClassProperty: 1n << 66n,
+	DoNotIncludeFunctionDefinedInArrayPattern: 1n << 67n,
+	DoNotIncludeFunctionDefinedInArrayExpression: 1n << 68n,
+	DoNotIncludeFunctionDefinedAsArrayMapCallback: 1n << 69n
 };
 /**
 * Default component detection hint
 */
-const DEFAULT_COMPONENT_DETECTION_HINT = 0n | ComponentDetectionHint.SkipArrayExpression | ComponentDetectionHint.SkipArrayMapCallback | ComponentDetectionHint.SkipArrayPattern | ComponentDetectionHint.SkipBooleanLiteral | ComponentDetectionHint.SkipEmptyArray | ComponentDetectionHint.SkipNumberLiteral | ComponentDetectionHint.SkipStringLiteral | ComponentDetectionHint.SkipUndefined | ComponentDetectionHint.StrictArray | ComponentDetectionHint.StrictConditional | ComponentDetectionHint.StrictLogical;
+const DEFAULT_COMPONENT_DETECTION_HINT = 0n | ComponentDetectionHint.DoNotIncludeJsxWithBigIntValue | ComponentDetectionHint.DoNotIncludeJsxWithBooleanValue | ComponentDetectionHint.DoNotIncludeJsxWithNumberValue | ComponentDetectionHint.DoNotIncludeJsxWithStringValue | ComponentDetectionHint.DoNotIncludeJsxWithUndefinedValue | ComponentDetectionHint.DoNotIncludeFunctionDefinedAsArrayMapCallback | ComponentDetectionHint.DoNotIncludeFunctionDefinedInArrayExpression | ComponentDetectionHint.DoNotIncludeFunctionDefinedInArrayPattern | ComponentDetectionHint.RequireAllArrayElementsToBeJsx | ComponentDetectionHint.RequireBothBranchesOfConditionalExpressionToBeJsx | ComponentDetectionHint.RequireBothSidesOfLogicalExpressionToBeJsx;
 
 //#endregion
 //#region src/component/component-is.ts
@@ -859,12 +859,12 @@ function isRenderMethodCallback(node) {
 */
 function shouldExcludeBasedOnHint(node, hint) {
 	switch (true) {
-		case hint & ComponentDetectionHint.SkipObjectMethod && ast.isOneOf([AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression])(node) && node.parent.type === AST_NODE_TYPES.Property && node.parent.parent.type === AST_NODE_TYPES.ObjectExpression: return true;
-		case hint & ComponentDetectionHint.SkipClassMethod && ast.isOneOf([AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression])(node) && node.parent.type === AST_NODE_TYPES.MethodDefinition: return true;
-		case hint & ComponentDetectionHint.SkipClassProperty && ast.isOneOf([AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression])(node) && node.parent.type === AST_NODE_TYPES.Property: return true;
-		case hint & ComponentDetectionHint.SkipArrayPattern && node.parent.type === AST_NODE_TYPES.ArrayPattern: return true;
-		case hint & ComponentDetectionHint.SkipArrayExpression && node.parent.type === AST_NODE_TYPES.ArrayExpression: return true;
-		case hint & ComponentDetectionHint.SkipArrayMapCallback && node.parent.type === AST_NODE_TYPES.CallExpression && node.parent.callee.type === AST_NODE_TYPES.MemberExpression && node.parent.callee.property.type === AST_NODE_TYPES.Identifier && node.parent.callee.property.name === "map": return true;
+		case hint & ComponentDetectionHint.DoNotIncludeFunctionDefinedOnObjectMethod && ast.isOneOf([AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression])(node) && node.parent.type === AST_NODE_TYPES.Property && node.parent.parent.type === AST_NODE_TYPES.ObjectExpression: return true;
+		case hint & ComponentDetectionHint.DoNotIncludeFunctionDefinedOnClassMethod && ast.isOneOf([AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression])(node) && node.parent.type === AST_NODE_TYPES.MethodDefinition: return true;
+		case hint & ComponentDetectionHint.DoNotIncludeFunctionDefinedOnClassProperty && ast.isOneOf([AST_NODE_TYPES.ArrowFunctionExpression, AST_NODE_TYPES.FunctionExpression])(node) && node.parent.type === AST_NODE_TYPES.Property: return true;
+		case hint & ComponentDetectionHint.DoNotIncludeFunctionDefinedInArrayPattern && node.parent.type === AST_NODE_TYPES.ArrayPattern: return true;
+		case hint & ComponentDetectionHint.DoNotIncludeFunctionDefinedInArrayExpression && node.parent.type === AST_NODE_TYPES.ArrayExpression: return true;
+		case hint & ComponentDetectionHint.DoNotIncludeFunctionDefinedAsArrayMapCallback && node.parent.type === AST_NODE_TYPES.CallExpression && node.parent.callee.type === AST_NODE_TYPES.MemberExpression && node.parent.callee.property.type === AST_NODE_TYPES.Identifier && node.parent.callee.property.name === "map": return true;
 	}
 	return false;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "2.11.2",
+  "version": "2.12.0-beta.0",
   "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,17 +34,17 @@
     "@typescript-eslint/types": "^8.54.0",
     "@typescript-eslint/utils": "^8.54.0",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "2.11.2",
-    "@eslint-react/shared": "2.11.2",
-    "@eslint-react/var": "2.11.2",
-    "@eslint-react/eff": "2.11.2"
+    "@eslint-react/ast": "2.12.0-beta.0",
+    "@eslint-react/var": "2.12.0-beta.0",
+    "@eslint-react/shared": "2.12.0-beta.0",
+    "@eslint-react/eff": "2.12.0-beta.0"
   },
   "devDependencies": {
     "tsdown": "^0.20.3",
     "@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": {