@eslint-react/var 5.17.1 → 5.17.2

package/dist/index.d.ts

@@ -1,44 +1,6 @@
-import { Scope } from "@typescript-eslint/scope-manager";
 import { TSESTree } from "@typescript-eslint/types";
+import { Scope } from "@typescript-eslint/scope-manager";
 import { RuleContext } from "@eslint-react/eslint";
-//#region src/compute-object-type.d.ts
-/**
- * Represents the type classification of an object node.
- */
-type ObjectType = {
-  kind: "jsx";
-  node: TSESTree.JSXElement | TSESTree.JSXFragment;
-} | {
-  kind: "array";
-  node: TSESTree.ArrayExpression | TSESTree.CallExpression;
-} | {
-  kind: "plain";
-  node: TSESTree.ObjectExpression | TSESTree.CallExpression;
-} | {
-  kind: "class";
-  node: TSESTree.ClassExpression;
-} | {
-  kind: "instance";
-  node: TSESTree.NewExpression | TSESTree.ThisExpression;
-} | {
-  kind: "function";
-  node: TSESTree.FunctionDeclaration | TSESTree.FunctionExpression | TSESTree.ArrowFunctionExpression;
-} | {
-  kind: "regexp";
-  node: TSESTree.RegExpLiteral | TSESTree.CallExpression;
-} | {
-  kind: "unknown";
-  node: TSESTree.Node;
-  reason?: string;
-};
-/**
- * Detect the ObjectType of a given node.
- * @param context The context of the rule.
- * @param node The node to check.
- * @returns The ObjectType of the node, or undefined if not detected.
- */
-declare function computeObjectType(context: RuleContext, node: TSESTree.Node | null): ObjectType | null;
-//#endregion
 //#region src/get-require-expression-arguments.d.ts
 /**
  * Get the arguments of a require expression.
@@ -144,4 +106,42 @@ type AssignmentTarget = ReturnType<typeof resolveEnclosingAssignmentTarget>;
 //#region src/resolve-import-source.d.ts
 declare function resolveImportSource(name: string, initialScope: Scope, seen?: Set<string>): string | null;
 //#endregion
-export { AssignmentTarget, ObjectType, computeObjectType, getRequireExpressionArguments, isAssignmentTargetEqual, isInitializedFromReact, isInitializedFromReactNative, isValueEqual, resolve, resolveEnclosingAssignmentTarget, resolveImportSource };
+//#region src/resolve-object-type.d.ts
+/**
+ * Represents the type classification of an object node.
+ */
+type ObjectType = {
+  kind: "jsx";
+  node: TSESTree.JSXElement | TSESTree.JSXFragment;
+} | {
+  kind: "array";
+  node: TSESTree.ArrayExpression | TSESTree.CallExpression;
+} | {
+  kind: "plain";
+  node: TSESTree.ObjectExpression | TSESTree.CallExpression;
+} | {
+  kind: "class";
+  node: TSESTree.ClassExpression;
+} | {
+  kind: "instance";
+  node: TSESTree.NewExpression | TSESTree.ThisExpression;
+} | {
+  kind: "function";
+  node: TSESTree.FunctionDeclaration | TSESTree.FunctionExpression | TSESTree.ArrowFunctionExpression;
+} | {
+  kind: "regexp";
+  node: TSESTree.RegExpLiteral | TSESTree.CallExpression;
+} | {
+  kind: "unknown";
+  node: TSESTree.Node;
+  reason?: string;
+};
+/**
+ * Detect the ObjectType of a given node.
+ * @param context The context of the rule.
+ * @param node The node to check.
+ * @returns The ObjectType of the node, or undefined if not detected.
+ */
+declare function resolveObjectType(context: RuleContext, node: TSESTree.Node | null): ObjectType | null;
+//#endregion
+export { AssignmentTarget, ObjectType, getRequireExpressionArguments, isAssignmentTargetEqual, isInitializedFromReact, isInitializedFromReactNative, isValueEqual, resolve, resolveEnclosingAssignmentTarget, resolveImportSource, resolveObjectType };

package/dist/index.js

@@ -1,9 +1,27 @@
 import { Check, Compare, Extract, Traverse } from "@eslint-react/ast";
-import { DefinitionType } from "@typescript-eslint/scope-manager";
 import { AST_NODE_TYPES } from "@typescript-eslint/types";
 import { findVariable, getStaticValue } from "@typescript-eslint/utils/ast-utils";
+import { DefinitionType } from "@typescript-eslint/scope-manager";
 import { P, isMatching } from "ts-pattern";
 
+//#region src/get-require-expression-arguments.ts
+/**
+* Get the arguments of a require expression.
+* @param node The node to match.
+* @returns The require expression arguments or null if the node is not a require expression.
+* @internal
+*/
+function getRequireExpressionArguments(node) {
+	const unwrapped = Extract.unwrap(node);
+	if (unwrapped.type === AST_NODE_TYPES.CallExpression) {
+		const callee = Extract.unwrap(unwrapped.callee);
+		if (callee.type === AST_NODE_TYPES.Identifier && callee.name === "require") return unwrapped.arguments;
+	}
+	if (unwrapped.type === AST_NODE_TYPES.MemberExpression) return getRequireExpressionArguments(unwrapped.object);
+	return null;
+}
+
+//#endregion
 //#region src/resolve.ts
 /**
 * Resolves an identifier to the AST node that represents its value,
@@ -63,135 +81,6 @@ function resolve(context, node, options) {
 	}
 }
 
-//#endregion
-//#region src/compute-object-type.ts
-/**
-* Detect the ObjectType of a given node.
-* @param context The context of the rule.
-* @param node The node to check.
-* @returns The ObjectType of the node, or undefined if not detected.
-*/
-function computeObjectType(context, node) {
-	if (node == null) return null;
-	switch (node.type) {
-		case AST_NODE_TYPES.JSXElement:
-		case AST_NODE_TYPES.JSXFragment: return {
-			kind: "jsx",
-			node
-		};
-		case AST_NODE_TYPES.ArrayExpression: return {
-			kind: "array",
-			node
-		};
-		case AST_NODE_TYPES.ObjectExpression: return {
-			kind: "plain",
-			node
-		};
-		case AST_NODE_TYPES.ClassExpression: return {
-			kind: "class",
-			node
-		};
-		case AST_NODE_TYPES.NewExpression:
-		case AST_NODE_TYPES.ThisExpression: return {
-			kind: "instance",
-			node
-		};
-		case AST_NODE_TYPES.FunctionDeclaration:
-		case AST_NODE_TYPES.FunctionExpression:
-		case AST_NODE_TYPES.ArrowFunctionExpression: return {
-			kind: "function",
-			node
-		};
-		case AST_NODE_TYPES.Literal:
-			if ("regex" in node) return {
-				kind: "regexp",
-				node
-			};
-			return null;
-		case AST_NODE_TYPES.Identifier: {
-			if ((context.sourceCode.getScope(node).set.get(node.name)?.defs.at(-1))?.type === DefinitionType.Parameter) return null;
-			const initNode = resolve(context, node, {
-				at: -1,
-				localOnly: true
-			});
-			if (initNode == null) return null;
-			return computeObjectType(context, initNode);
-		}
-		case AST_NODE_TYPES.MemberExpression: return computeObjectType(context, node.object);
-		case AST_NODE_TYPES.AssignmentExpression:
-		case AST_NODE_TYPES.AssignmentPattern: return computeObjectType(context, node.right);
-		case AST_NODE_TYPES.LogicalExpression: return computeObjectType(context, node.left) ?? computeObjectType(context, node.right);
-		case AST_NODE_TYPES.ConditionalExpression: return computeObjectType(context, node.consequent) ?? computeObjectType(context, node.alternate);
-		case AST_NODE_TYPES.SequenceExpression:
-			if (node.expressions.length === 0) return null;
-			return computeObjectType(context, node.expressions[node.expressions.length - 1] ?? null);
-		case AST_NODE_TYPES.CallExpression: {
-			const callee = Extract.unwrap(node.callee);
-			switch (true) {
-				case Check.isIdentifier(callee, "Boolean"): return null;
-				case Check.isIdentifier(callee, "String"): return null;
-				case Check.isIdentifier(callee, "Number"): return null;
-				case Check.isIdentifier(callee, "Object"): return {
-					kind: "plain",
-					node
-				};
-				case Check.isIdentifier(callee, "Array"): return {
-					kind: "array",
-					node
-				};
-				case Check.isIdentifier(callee, "RegExp"): return {
-					kind: "regexp",
-					node
-				};
-			}
-			if (callee.type === AST_NODE_TYPES.MemberExpression && callee.object.type === AST_NODE_TYPES.Identifier) {
-				const objName = callee.object.name;
-				const methodName = Extract.getCalleeName(node);
-				switch (objName) {
-					case "Array":
-						if (methodName === "from" || methodName === "of") return {
-							kind: "array",
-							node
-						};
-						break;
-					case "Object":
-						if (methodName === "create" || methodName === "assign" || methodName === "fromEntries") return {
-							kind: "plain",
-							node
-						};
-						break;
-				}
-			}
-			return {
-				kind: "unknown",
-				node,
-				reason: "call-expression"
-			};
-		}
-		default:
-			if (!("expression" in node) || typeof node.expression !== "object") return null;
-			return computeObjectType(context, node.expression);
-	}
-}
-
-//#endregion
-//#region src/get-require-expression-arguments.ts
-/**
-* Get the arguments of a require expression.
-* @param node The node to match.
-* @returns The require expression arguments or null if the node is not a require expression.
-* @internal
-*/
-function getRequireExpressionArguments(node) {
-	const unwrapped = Extract.unwrap(node);
-	if (unwrapped.type === AST_NODE_TYPES.CallExpression) {
-		const callee = Extract.unwrap(unwrapped.callee);
-		if (callee.type === AST_NODE_TYPES.Identifier && callee.name === "require") return unwrapped.arguments;
-	}
-	if (unwrapped.type === AST_NODE_TYPES.MemberExpression) return getRequireExpressionArguments(unwrapped.object);
-	return null;
-}
-
 //#endregion
 //#region src/is-value-equal.ts
 const thisBlockTypes = [
@@ -350,4 +239,115 @@ function resolveEnclosingAssignmentTarget(node) {
 }
 
 //#endregion
-export { computeObjectType, getRequireExpressionArguments, isAssignmentTargetEqual, isInitializedFromReact, isInitializedFromReactNative, isValueEqual, resolve, resolveEnclosingAssignmentTarget, resolveImportSource };
+//#region src/resolve-object-type.ts
+/**
+* Detect the ObjectType of a given node.
+* @param context The context of the rule.
+* @param node The node to check.
+* @returns The ObjectType of the node, or undefined if not detected.
+*/
+function resolveObjectType(context, node) {
+	if (node == null) return null;
+	switch (node.type) {
+		case AST_NODE_TYPES.JSXElement:
+		case AST_NODE_TYPES.JSXFragment: return {
+			kind: "jsx",
+			node
+		};
+		case AST_NODE_TYPES.ArrayExpression: return {
+			kind: "array",
+			node
+		};
+		case AST_NODE_TYPES.ObjectExpression: return {
+			kind: "plain",
+			node
+		};
+		case AST_NODE_TYPES.ClassExpression: return {
+			kind: "class",
+			node
+		};
+		case AST_NODE_TYPES.NewExpression:
+		case AST_NODE_TYPES.ThisExpression: return {
+			kind: "instance",
+			node
+		};
+		case AST_NODE_TYPES.FunctionDeclaration:
+		case AST_NODE_TYPES.FunctionExpression:
+		case AST_NODE_TYPES.ArrowFunctionExpression: return {
+			kind: "function",
+			node
+		};
+		case AST_NODE_TYPES.Literal:
+			if ("regex" in node) return {
+				kind: "regexp",
+				node
+			};
+			return null;
+		case AST_NODE_TYPES.Identifier: {
+			if ((context.sourceCode.getScope(node).set.get(node.name)?.defs.at(-1))?.type === DefinitionType.Parameter) return null;
+			const initNode = resolve(context, node, {
+				at: -1,
+				localOnly: true
+			});
+			if (initNode == null) return null;
+			return resolveObjectType(context, initNode);
+		}
+		case AST_NODE_TYPES.MemberExpression: return resolveObjectType(context, node.object);
+		case AST_NODE_TYPES.AssignmentExpression:
+		case AST_NODE_TYPES.AssignmentPattern: return resolveObjectType(context, node.right);
+		case AST_NODE_TYPES.LogicalExpression: return resolveObjectType(context, node.left) ?? resolveObjectType(context, node.right);
+		case AST_NODE_TYPES.ConditionalExpression: return resolveObjectType(context, node.consequent) ?? resolveObjectType(context, node.alternate);
+		case AST_NODE_TYPES.SequenceExpression:
+			if (node.expressions.length === 0) return null;
+			return resolveObjectType(context, node.expressions[node.expressions.length - 1] ?? null);
+		case AST_NODE_TYPES.CallExpression: {
+			const callee = Extract.unwrap(node.callee);
+			switch (true) {
+				case Check.isIdentifier(callee, "Boolean"): return null;
+				case Check.isIdentifier(callee, "String"): return null;
+				case Check.isIdentifier(callee, "Number"): return null;
+				case Check.isIdentifier(callee, "Object"): return {
+					kind: "plain",
+					node
+				};
+				case Check.isIdentifier(callee, "Array"): return {
+					kind: "array",
+					node
+				};
+				case Check.isIdentifier(callee, "RegExp"): return {
+					kind: "regexp",
+					node
+				};
+			}
+			if (callee.type === AST_NODE_TYPES.MemberExpression && callee.object.type === AST_NODE_TYPES.Identifier) {
+				const objName = callee.object.name;
+				const methodName = Extract.getCalleeName(node);
+				switch (objName) {
+					case "Array":
+						if (methodName === "from" || methodName === "of") return {
+							kind: "array",
+							node
+						};
+						break;
+					case "Object":
+						if (methodName === "create" || methodName === "assign" || methodName === "fromEntries") return {
+							kind: "plain",
+							node
+						};
+						break;
+				}
+			}
+			return {
+				kind: "unknown",
+				node,
+				reason: "call-expression"
+			};
+		}
+		default:
+			if (!("expression" in node) || typeof node.expression !== "object") return null;
+			return resolveObjectType(context, node.expression);
+	}
+}
+
+//#endregion
+export { getRequireExpressionArguments, isAssignmentTargetEqual, isInitializedFromReact, isInitializedFromReactNative, isValueEqual, resolve, resolveEnclosingAssignmentTarget, resolveImportSource, resolveObjectType };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/var",
-  "version": "5.17.1",
+  "version": "5.17.2",
   "description": "ESLint React's TSESTree AST utility module for static analysis of variables.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -33,18 +33,19 @@
     "@typescript-eslint/types": "^8.64.0",
     "@typescript-eslint/utils": "^8.64.0",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "5.17.1",
-    "@eslint-react/eslint": "5.17.1"
+    "@eslint-react/ast": "5.17.2",
+    "@eslint-react/eslint": "5.17.2"
   },
   "devDependencies": {
     "@typescript-eslint/parser": "^8.64.0",
     "@typescript-eslint/typescript-estree": "^8.64.0",
     "eslint": "^10.7.0",
-    "tsdown": "^0.22.8",
+    "tsdown": "^0.22.9",
     "typescript": "6.0.3",
     "vitest": "^4.1.10",
-    "@local/configs": "0.0.0",
-    "@local/eff": "0.0.0"
+    "@local/eff": "0.0.0",
+    "@local/testkit": "0.0.0",
+    "@local/configs": "0.0.0"
   },
   "peerDependencies": {
     "eslint": "*",