@eslint-react/core 1.53.1-beta.0 → 1.53.1-beta.2

package/dist/index.js

@@ -21,14 +21,22 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 
 //#endregion
-const __eslint_react_ast = __toESM(require("@eslint-react/ast"));
-const __eslint_react_eff = __toESM(require("@eslint-react/eff"));
-const __eslint_react_kit = __toESM(require("@eslint-react/kit"));
-const __eslint_react_shared = __toESM(require("@eslint-react/shared"));
-const __typescript_eslint_types = __toESM(require("@typescript-eslint/types"));
-const __eslint_react_var = __toESM(require("@eslint-react/var"));
-const ts_pattern = __toESM(require("ts-pattern"));
-const birecord = __toESM(require("birecord"));
+let __eslint_react_ast = require("@eslint-react/ast");
+__eslint_react_ast = __toESM(__eslint_react_ast);
+let __eslint_react_eff = require("@eslint-react/eff");
+__eslint_react_eff = __toESM(__eslint_react_eff);
+let __eslint_react_kit = require("@eslint-react/kit");
+__eslint_react_kit = __toESM(__eslint_react_kit);
+let __eslint_react_shared = require("@eslint-react/shared");
+__eslint_react_shared = __toESM(__eslint_react_shared);
+let __typescript_eslint_types = require("@typescript-eslint/types");
+__typescript_eslint_types = __toESM(__typescript_eslint_types);
+let __eslint_react_var = require("@eslint-react/var");
+__eslint_react_var = __toESM(__eslint_react_var);
+let ts_pattern = require("ts-pattern");
+ts_pattern = __toESM(ts_pattern);
+let birecord = require("birecord");
+birecord = __toESM(birecord);
 
 //#region src/utils/get-instance-id.ts
 /** @internal */
@@ -79,8 +87,7 @@ function isInitializedFromReact(name, importSource, initialScope) {
 		const { init } = node;
 		if (init.type === __typescript_eslint_types.AST_NODE_TYPES.MemberExpression && init.object.type === __typescript_eslint_types.AST_NODE_TYPES.Identifier) return isInitializedFromReact(init.object.name, importSource, initialScope);
 		if (init.type === __typescript_eslint_types.AST_NODE_TYPES.Identifier) return isInitializedFromReact(init.name, importSource, initialScope);
-		const args = getRequireExpressionArguments(init);
-		const arg0 = args?.[0];
+		const arg0 = getRequireExpressionArguments(init)?.[0];
 		if (arg0 == null || !__eslint_react_ast.isLiteral(arg0, "string")) return false;
 		return arg0.value === importSource || arg0.value.startsWith(`${importSource}/`);
 	}
@@ -271,24 +278,22 @@ function useHookCollector() {
 	const onFunctionExit = () => {
 		functionEntries.pop();
 	};
-	const ctx = { getAllHooks(node) {
-		return hooks;
-	} };
-	const listeners = {
-		":function[type]": onFunctionEnter,
-		":function[type]:exit": onFunctionExit,
-		"CallExpression[type]"(node) {
-			if (!isReactHookCall(node)) return;
-			const fEntry = functionEntries.at(-1);
-			if (fEntry?.key == null) return;
-			const hook = hooks.get(fEntry.key);
-			if (hook == null) return;
-			hook.hookCalls.push(node);
-		}
-	};
 	return {
-		ctx,
-		listeners
+		ctx: { getAllHooks(node) {
+			return hooks;
+		} },
+		listeners: {
+			":function[type]": onFunctionEnter,
+			":function[type]:exit": onFunctionExit,
+			"CallExpression[type]"(node) {
+				if (!isReactHookCall(node)) return;
+				const fEntry = functionEntries.at(-1);
+				if (fEntry?.key == null) return;
+				const hook = hooks.get(fEntry.key);
+				if (hook == null) return;
+				hook.hookCalls.push(node);
+			}
+		}
 	};
 }
 
@@ -920,8 +925,7 @@ function useComponentCollector(context, options = {}) {
 		for (let i = rets.length - 1; i >= 0; i--) {
 			const ret = rets[i];
 			if (ret == null) continue;
-			const shouldDrop = context.sourceCode.getScope(ret).block === entry.node && ret.argument != null && !isJsxLike(context.sourceCode, ret.argument, hint);
-			if (shouldDrop) {
+			if (context.sourceCode.getScope(ret).block === entry.node && ret.argument != null && !isJsxLike(context.sourceCode, ret.argument, hint)) {
 				components.delete(entry.key);
 				break;
 			}
@@ -944,8 +948,7 @@ function useComponentCollector(context, options = {}) {
 			const entry = getCurrentEntry();
 			if (entry == null) return;
 			const { body } = entry.node;
-			const isComponent = hasNoneOrLooseComponentName(context, entry.node) && isJsxLike(context.sourceCode, body, hint) && isValidComponentDefinition(context, entry.node, hint);
-			if (!isComponent) return;
+			if (!(hasNoneOrLooseComponentName(context, entry.node) && isJsxLike(context.sourceCode, body, hint) && isValidComponentDefinition(context, entry.node, hint))) return;
 			const initPath = __eslint_react_ast.getFunctionInitPath(entry.node);
 			const id = getFunctionComponentId(context, entry.node);
 			const name = getComponentNameFromId(id);
@@ -980,8 +983,7 @@ function useComponentCollector(context, options = {}) {
 		"ReturnStatement[type]"(node) {
 			const entry = getCurrentEntry();
 			if (entry == null) return;
-			const isComponent = hasNoneOrLooseComponentName(context, entry.node) && isJsxLike(context.sourceCode, node.argument, hint) && isValidComponentDefinition(context, entry.node, hint);
-			if (!isComponent) return;
+			if (!(hasNoneOrLooseComponentName(context, entry.node) && isJsxLike(context.sourceCode, node.argument, hint) && isValidComponentDefinition(context, entry.node, hint))) return;
 			entry.isComponent = true;
 			const initPath = __eslint_react_ast.getFunctionInitPath(entry.node);
 			const id = getFunctionComponentId(context, entry.node);
@@ -1034,13 +1036,12 @@ function useComponentCollectorLegacy() {
 			methods: []
 		});
 	};
-	const listeners = {
-		"ClassDeclaration[type]": collect,
-		"ClassExpression[type]": collect
-	};
 	return {
 		ctx,
-		listeners
+		listeners: {
+			"ClassDeclaration[type]": collect,
+			"ClassExpression[type]": collect
+		}
 	};
 }
 

package/dist/index.mjs

@@ -56,8 +56,7 @@ function isInitializedFromReact(name, importSource, initialScope) {
 		const { init } = node;
 		if (init.type === AST_NODE_TYPES.MemberExpression && init.object.type === AST_NODE_TYPES.Identifier) return isInitializedFromReact(init.object.name, importSource, initialScope);
 		if (init.type === AST_NODE_TYPES.Identifier) return isInitializedFromReact(init.name, importSource, initialScope);
-		const args = getRequireExpressionArguments(init);
-		const arg0 = args?.[0];
+		const arg0 = getRequireExpressionArguments(init)?.[0];
 		if (arg0 == null || !AST.isLiteral(arg0, "string")) return false;
 		return arg0.value === importSource || arg0.value.startsWith(`${importSource}/`);
 	}
@@ -248,24 +247,22 @@ function useHookCollector() {
 	const onFunctionExit = () => {
 		functionEntries.pop();
 	};
-	const ctx = { getAllHooks(node) {
-		return hooks;
-	} };
-	const listeners = {
-		":function[type]": onFunctionEnter,
-		":function[type]:exit": onFunctionExit,
-		"CallExpression[type]"(node) {
-			if (!isReactHookCall(node)) return;
-			const fEntry = functionEntries.at(-1);
-			if (fEntry?.key == null) return;
-			const hook = hooks.get(fEntry.key);
-			if (hook == null) return;
-			hook.hookCalls.push(node);
-		}
-	};
 	return {
-		ctx,
-		listeners
+		ctx: { getAllHooks(node) {
+			return hooks;
+		} },
+		listeners: {
+			":function[type]": onFunctionEnter,
+			":function[type]:exit": onFunctionExit,
+			"CallExpression[type]"(node) {
+				if (!isReactHookCall(node)) return;
+				const fEntry = functionEntries.at(-1);
+				if (fEntry?.key == null) return;
+				const hook = hooks.get(fEntry.key);
+				if (hook == null) return;
+				hook.hookCalls.push(node);
+			}
+		}
 	};
 }
 
@@ -897,8 +894,7 @@ function useComponentCollector(context, options = {}) {
 		for (let i = rets.length - 1; i >= 0; i--) {
 			const ret = rets[i];
 			if (ret == null) continue;
-			const shouldDrop = context.sourceCode.getScope(ret).block === entry.node && ret.argument != null && !isJsxLike(context.sourceCode, ret.argument, hint);
-			if (shouldDrop) {
+			if (context.sourceCode.getScope(ret).block === entry.node && ret.argument != null && !isJsxLike(context.sourceCode, ret.argument, hint)) {
 				components.delete(entry.key);
 				break;
 			}
@@ -921,8 +917,7 @@ function useComponentCollector(context, options = {}) {
 			const entry = getCurrentEntry();
 			if (entry == null) return;
 			const { body } = entry.node;
-			const isComponent = hasNoneOrLooseComponentName(context, entry.node) && isJsxLike(context.sourceCode, body, hint) && isValidComponentDefinition(context, entry.node, hint);
-			if (!isComponent) return;
+			if (!(hasNoneOrLooseComponentName(context, entry.node) && isJsxLike(context.sourceCode, body, hint) && isValidComponentDefinition(context, entry.node, hint))) return;
 			const initPath = AST.getFunctionInitPath(entry.node);
 			const id = getFunctionComponentId(context, entry.node);
 			const name = getComponentNameFromId(id);
@@ -957,8 +952,7 @@ function useComponentCollector(context, options = {}) {
 		"ReturnStatement[type]"(node) {
 			const entry = getCurrentEntry();
 			if (entry == null) return;
-			const isComponent = hasNoneOrLooseComponentName(context, entry.node) && isJsxLike(context.sourceCode, node.argument, hint) && isValidComponentDefinition(context, entry.node, hint);
-			if (!isComponent) return;
+			if (!(hasNoneOrLooseComponentName(context, entry.node) && isJsxLike(context.sourceCode, node.argument, hint) && isValidComponentDefinition(context, entry.node, hint))) return;
 			entry.isComponent = true;
 			const initPath = AST.getFunctionInitPath(entry.node);
 			const id = getFunctionComponentId(context, entry.node);
@@ -1011,13 +1005,12 @@ function useComponentCollectorLegacy() {
 			methods: []
 		});
 	};
-	const listeners = {
-		"ClassDeclaration[type]": collect,
-		"ClassExpression[type]": collect
-	};
 	return {
 		ctx,
-		listeners
+		listeners: {
+			"ClassDeclaration[type]": collect,
+			"ClassExpression[type]": collect
+		}
 	};
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "1.53.1-beta.0",
+  "version": "1.53.1-beta.2",
   "description": "ESLint React's ESLint utility module for static analysis of React core APIs and patterns.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -35,20 +35,20 @@
     "./package.json"
   ],
   "dependencies": {
-    "@typescript-eslint/scope-manager": "^8.42.0",
-    "@typescript-eslint/type-utils": "^8.42.0",
-    "@typescript-eslint/types": "^8.42.0",
-    "@typescript-eslint/utils": "^8.42.0",
+    "@typescript-eslint/scope-manager": "^8.43.0",
+    "@typescript-eslint/type-utils": "^8.43.0",
+    "@typescript-eslint/types": "^8.43.0",
+    "@typescript-eslint/utils": "^8.43.0",
     "birecord": "^0.1.1",
     "ts-pattern": "^5.8.0",
-    "@eslint-react/ast": "1.53.1-beta.0",
-    "@eslint-react/kit": "1.53.1-beta.0",
-    "@eslint-react/shared": "1.53.1-beta.0",
-    "@eslint-react/eff": "1.53.1-beta.0",
-    "@eslint-react/var": "1.53.1-beta.0"
+    "@eslint-react/ast": "1.53.1-beta.2",
+    "@eslint-react/eff": "1.53.1-beta.2",
+    "@eslint-react/kit": "1.53.1-beta.2",
+    "@eslint-react/shared": "1.53.1-beta.2",
+    "@eslint-react/var": "1.53.1-beta.2"
   },
   "devDependencies": {
-    "tsdown": "^0.14.2",
+    "tsdown": "^0.15.0",
     "@local/configs": "0.0.0"
   },
   "engines": {