eslint-plugin-react-x 2.3.10-next.4 → 2.3.11-next.0

package/dist/index.js

@@ -34,7 +34,7 @@ var __export = (all, symbols) => {
 //#endregion
 //#region package.json
 var name$6 = "eslint-plugin-react-x";
-var version = "2.3.10-next.4";
+var version = "2.3.11-next.0";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -946,8 +946,7 @@ function create$44(context) {
 	return {
 		...listeners,
 		"Program:exit"(program) {
-			const components = ctx.getAllComponents(program);
-			for (const { name: name$7 = "anonymous", node: component } of components.values()) {
+			for (const { name: name$7 = "anonymous", node: component } of ctx.getAllComponents(program)) {
 				if (component.body.body.some((m) => isComponentDidCatch(m) || isGetDerivedStateFromError(m))) continue;
 				context.report({
 					messageId: "noClassComponent",
@@ -1011,8 +1010,7 @@ function create$42(context) {
 	return {
 		...listeners,
 		"Program:exit"(program) {
-			const components = ctx.getAllComponents(program);
-			for (const { node: component } of components.values()) {
+			for (const { node: component } of ctx.getAllComponents(program)) {
 				const { body } = component.body;
 				for (const member of body) if (isComponentWillMount(member)) context.report({
 					messageId: "noComponentWillMount",
@@ -1052,8 +1050,7 @@ function create$41(context) {
 	return {
 		...listeners,
 		"Program:exit"(program) {
-			const components = ctx.getAllComponents(program);
-			for (const { node: component } of components.values()) {
+			for (const { node: component } of ctx.getAllComponents(program)) {
 				const { body } = component.body;
 				for (const member of body) if (isComponentWillReceiveProps(member)) context.report({
 					messageId: "noComponentWillReceiveProps",
@@ -1093,8 +1090,7 @@ function create$40(context) {
 	return {
 		...listeners,
 		"Program:exit"(program) {
-			const components = ctx.getAllComponents(program);
-			for (const { node: component } of components.values()) {
+			for (const { node: component } of ctx.getAllComponents(program)) {
 				const { body } = component.body;
 				for (const member of body) if (isComponentWillUpdate(member)) context.report({
 					messageId: "noComponentWillUpdate",
@@ -1561,18 +1557,15 @@ function create$31(context) {
 	return {
 		...listeners,
 		"Program:exit"(program) {
-			const components = ctx.getAllComponents(program);
-			for (const { node, displayName, flag } of components.values()) {
+			for (const { node, displayName, flag } of ctx.getAllComponents(program)) {
+				const id = AST.getFunctionId(node);
 				const isMemoOrForwardRef = (flag & (ComponentFlag.ForwardRef | ComponentFlag.Memo)) > 0n;
-				if (AST.getFunctionId(node) != null) continue;
+				if (id != null) continue;
 				if (!isMemoOrForwardRef) continue;
-				if (displayName == null) {
-					const id = AST.getFunctionId(node);
-					context.report({
-						messageId: "noMissingComponentDisplayName",
-						node: id ?? node
-					});
-				}
+				if (displayName == null) context.report({
+					messageId: "noMissingComponentDisplayName",
+					node
+				});
 			}
 		}
 	};
@@ -1815,21 +1808,21 @@ var no_nested_component_definitions_default = createRule({
 	defaultOptions: []
 });
 function create$27(context) {
-	const collector = useComponentCollector(context, { hint: ComponentDetectionHint.SkipArrayMapArgument | ComponentDetectionHint.SkipNullLiteral | ComponentDetectionHint.SkipUndefined | ComponentDetectionHint.SkipBooleanLiteral | ComponentDetectionHint.SkipStringLiteral | ComponentDetectionHint.SkipNumberLiteral | ComponentDetectionHint.StrictLogical | ComponentDetectionHint.StrictConditional });
-	const collectorLegacy = useComponentCollectorLegacy();
+	const fCollector = useComponentCollector(context, { hint: ComponentDetectionHint.SkipArrayMapArgument | ComponentDetectionHint.SkipNullLiteral | ComponentDetectionHint.SkipUndefined | ComponentDetectionHint.SkipBooleanLiteral | ComponentDetectionHint.SkipStringLiteral | ComponentDetectionHint.SkipNumberLiteral | ComponentDetectionHint.StrictLogical | ComponentDetectionHint.StrictConditional });
+	const cCollector = useComponentCollectorLegacy();
 	return {
-		...collector.listeners,
-		...collectorLegacy.listeners,
+		...fCollector.listeners,
+		...cCollector.listeners,
 		"Program:exit"(program) {
-			const functionComponents = [...collector.ctx.getAllComponents(program).values()];
-			const classComponents = [...collectorLegacy.ctx.getAllComponents(program).values()];
+			const fComponents = [...fCollector.ctx.getAllComponents(program)];
+			const cComponents = [...cCollector.ctx.getAllComponents(program)];
 			const isFunctionComponent = (node) => {
-				return AST.isFunction(node) && functionComponents.some((component) => component.node === node);
+				return AST.isFunction(node) && fComponents.some((component) => component.node === node);
 			};
 			const isClassComponent$1 = (node) => {
-				return AST.isClass(node) && classComponents.some((component) => component.node === node);
+				return AST.isClass(node) && cComponents.some((component) => component.node === node);
 			};
-			for (const { name: name$7, node: component } of functionComponents) {
+			for (const { name: name$7, node: component } of fComponents) {
 				if (name$7 == null) continue;
 				if (isDirectValueOfRenderPropertyLoose(component)) continue;
 				if (isInsideJSXAttributeValue(component)) {
@@ -1875,7 +1868,7 @@ function create$27(context) {
 					}
 				});
 			}
-			for (const { name: name$7 = "unknown", node: component } of classComponents) {
+			for (const { name: name$7 = "unknown", node: component } of cComponents) {
 				if (AST.findParentNode(component, (n) => isClassComponent$1(n) || isFunctionComponent(n)) == null) continue;
 				context.report({
 					messageId: "noNestedComponentDefinitions",
@@ -1951,8 +1944,8 @@ function create$26(context) {
 			if (lazyCall != null) lazyComponentDeclarations.add(lazyCall);
 		},
 		"Program:exit"(program) {
-			const functionComponents = [...collector.ctx.getAllComponents(program).values()];
-			const classComponents = [...collectorLegacy.ctx.getAllComponents(program).values()];
+			const functionComponents = collector.ctx.getAllComponents(program);
+			const classComponents = collectorLegacy.ctx.getAllComponents(program);
 			for (const lazy of lazyComponentDeclarations) if (AST.findParentNode(lazy, (n) => {
 				if (AST.isJSX(n)) return true;
 				if (n.type === AST_NODE_TYPES.CallExpression) return isReactHookCall(n) || isCreateElementCall(context, n) || isCreateContextCall(context, n);
@@ -2038,8 +2031,7 @@ function create$24(context) {
 	return {
 		...listeners,
 		"Program:exit"(program) {
-			const components = ctx.getAllComponents(program);
-			for (const { name: name$7 = "PureComponent", node: component, flag } of components.values()) {
+			for (const { name: name$7 = "PureComponent", node: component, flag } of ctx.getAllComponents(program)) {
 				if ((flag & ComponentFlag.PureComponent) === 0n) continue;
 				const { body } = component.body;
 				for (const member of body) if (isShouldComponentUpdate(member)) context.report({
@@ -2449,8 +2441,7 @@ function create$16(context) {
 	return {
 		...listeners,
 		"Program:exit"(program) {
-			const allHooks = ctx.getAllHooks(program);
-			for (const { id, name: name$7, node, hookCalls } of allHooks.values()) {
+			for (const { id, name: name$7, node, hookCalls } of ctx.getAllHooks(program)) {
 				if (hookCalls.length > 0) continue;
 				if (AST.isFunctionEmpty(node)) continue;
 				if (WELL_KNOWN_HOOKS.includes(name$7)) continue;
@@ -2490,8 +2481,7 @@ function create$15(context) {
 	return {
 		...listeners,
 		"Program:exit"(program) {
-			const components = ctx.getAllComponents(program);
-			for (const { node: component } of components.values()) {
+			for (const { node: component } of ctx.getAllComponents(program)) {
 				const { body } = component.body;
 				for (const member of body) if (isUnsafeComponentWillMount(member)) context.report({
 					messageId: "noUnsafeComponentWillMount",
@@ -2526,8 +2516,7 @@ function create$14(context) {
 	return {
 		...listeners,
 		"Program:exit"(program) {
-			const components = ctx.getAllComponents(program);
-			for (const { node: component } of components.values()) {
+			for (const { node: component } of ctx.getAllComponents(program)) {
 				const { body } = component.body;
 				for (const member of body) if (isUnsafeComponentWillReceiveProps(member)) context.report({
 					messageId: "noUnsafeComponentWillReceiveProps",
@@ -2562,8 +2551,7 @@ function create$13(context) {
 	return {
 		...listeners,
 		"Program:exit"(program) {
-			const components = ctx.getAllComponents(program);
-			for (const { node: component } of components.values()) {
+			for (const { node: component } of ctx.getAllComponents(program)) {
 				const { body } = component.body;
 				for (const member of body) if (isUnsafeComponentWillUpdate(member)) context.report({
 					messageId: "noUnsafeComponentWillUpdate",
@@ -2616,8 +2604,7 @@ function create$12(context) {
 			getOrElseUpdate(constructions, functionEntry.node, () => []).push(construction);
 		},
 		"Program:exit"(program) {
-			const components = ctx.getAllComponents(program).values();
-			for (const { node: component } of components) for (const construction of constructions.get(component) ?? []) {
+			for (const { node: component } of ctx.getAllComponents(program)) for (const construction of constructions.get(component) ?? []) {
 				const { kind, node: constructionNode } = construction;
 				const suggestion = kind === "function" ? "Consider wrapping it in a useCallback hook." : "Consider wrapping it in a useMemo hook.";
 				context.report({
@@ -2686,8 +2673,7 @@ function create$11(context, [options]) {
 			getOrElseUpdate(declarators, functionEntry.node, () => []).push(node);
 		},
 		"Program:exit"(program) {
-			const components = ctx.getAllComponents(program);
-			for (const { node: component } of components.values()) {
+			for (const { node: component } of ctx.getAllComponents(program)) {
 				const { params } = component;
 				const [props] = params;
 				if (props == null) continue;
@@ -2862,10 +2848,9 @@ function create$9(context) {
 		...listeners,
 		"Program:exit"(program) {
 			const checker = services.program.getTypeChecker();
-			const components = ctx.getAllComponents(program);
 			const totalDeclaredProps = /* @__PURE__ */ new Set();
 			const totalUsedProps = /* @__PURE__ */ new Set();
-			for (const [, component] of components) {
+			for (const component of ctx.getAllComponents(program)) {
 				const [props] = component.node.params;
 				if (props == null) continue;
 				const usedPropKeys = /* @__PURE__ */ new Set();
@@ -3347,23 +3332,23 @@ var prefer_destructuring_assignment_default = createRule({
 });
 function create$4(context) {
 	const { ctx, listeners } = useComponentCollector(context);
-	const memberExpressionWithNames = [];
+	const exprs = [];
 	return {
 		...listeners,
 		MemberExpression(node) {
 			if (isMemberExpressionWithObjectName(node)) {
 				const scope = context.sourceCode.getScope(node);
-				memberExpressionWithNames.push([scope, node]);
+				exprs.push([scope, node]);
 			}
 		},
 		"Program:exit"(program) {
-			const components = [...ctx.getAllComponents(program).values()];
+			const componentBlocks = new Set(ctx.getAllComponents(program).map((component) => component.node));
 			function isFunctionComponent(block) {
 				if (!AST.isFunction(block)) return false;
 				const id = AST.getFunctionId(block);
-				return id != null && isComponentNameLoose(id.name) && components.some((component) => component.node === block);
+				return id != null && isComponentNameLoose(id.name) && componentBlocks.has(block);
 			}
-			for (const [initialScope, memberExpression] of memberExpressionWithNames) {
+			for (const [initialScope, expr] of exprs) {
 				let scope = initialScope;
 				let isComponent = isFunctionComponent(scope.block);
 				while (!isComponent && scope.upper != null && scope.upper !== scope) {
@@ -3373,18 +3358,13 @@ function create$4(context) {
 				if (!isComponent) continue;
 				const component = scope.block;
 				if (!("params" in component)) continue;
-				const [props, ctx$1] = component.params;
-				const isMatch = (node) => node != null && node.type === AST_NODE_TYPES.Identifier && node.name === memberExpression.object.name;
+				const props = component.params.at(0);
+				const isMatch = (node) => node != null && node.type === AST_NODE_TYPES.Identifier && node.name === expr.object.name;
 				if (isMatch(props)) context.report({
 					messageId: "preferDestructuringAssignment",
-					node: memberExpression,
+					node: expr,
 					data: { name: "props" }
 				});
-				if (isMatch(ctx$1)) context.report({
-					messageId: "preferDestructuringAssignment",
-					node: memberExpression,
-					data: { name: "context" }
-				});
 			}
 		}
 	};
@@ -3456,8 +3436,7 @@ function create$2(context) {
 	return {
 		...listeners,
 		"Program:exit"(program) {
-			const components = ctx.getAllComponents(program);
-			for (const [, component] of components) {
+			for (const component of ctx.getAllComponents(program)) {
 				const [props] = component.node.params;
 				if (component.id == null || component.name == null) continue;
 				if (props == null) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "2.3.10-next.4",
+  "version": "2.3.11-next.0",
   "description": "A set of composable ESLint rules for for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -46,16 +46,16 @@
     "string-ts": "^2.3.1",
     "ts-api-utils": "^2.1.0",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "2.3.10-next.4",
-    "@eslint-react/core": "2.3.10-next.4",
-    "@eslint-react/shared": "2.3.10-next.4",
-    "@eslint-react/eff": "2.3.10-next.4",
-    "@eslint-react/var": "2.3.10-next.4"
+    "@eslint-react/core": "2.3.11-next.0",
+    "@eslint-react/eff": "2.3.11-next.0",
+    "@eslint-react/shared": "2.3.11-next.0",
+    "@eslint-react/var": "2.3.11-next.0",
+    "@eslint-react/ast": "2.3.11-next.0"
   },
   "devDependencies": {
     "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
-    "tsdown": "^0.17.0-beta.4",
+    "tsdown": "^0.17.0-beta.5",
     "@local/configs": "0.0.0"
   },
   "peerDependencies": {