@eslint-react/var 2.8.1-next.4 → 2.8.2-next.0

package/dist/index.js

@@ -1,9 +1,9 @@
 import { dual, identity, unit } from "@eslint-react/eff";
 import { AST_NODE_TYPES } from "@typescript-eslint/types";
-import * as AST from "@eslint-react/ast";
+import * as ast from "@eslint-react/ast";
 import { P, match } from "ts-pattern";
 import { DefinitionType, ScopeType } from "@typescript-eslint/scope-manager";
-import * as ASTUtils from "@typescript-eslint/utils/ast-utils";
+import * as astUtils from "@typescript-eslint/utils/ast-utils";
 import { getStaticValue } from "@typescript-eslint/utils/ast-utils";
 
 //#region src/find-enclosing-assignment-target.ts
@@ -43,7 +43,7 @@ function getVariables(initialScope) {
 }
 const findVariable = dual(2, (nameOrNode, initialScope) => {
 	if (nameOrNode == null) return unit;
-	return ASTUtils.findVariable(initialScope, nameOrNode) ?? unit;
+	return astUtils.findVariable(initialScope, nameOrNode) ?? unit;
 });
 
 //#endregion
@@ -81,7 +81,7 @@ function findImportSource(name, initialScope) {
 		if (init.type === AST_NODE_TYPES.MemberExpression && init.object.type === AST_NODE_TYPES.Identifier) return findImportSource(init.object.name, initialScope);
 		if (init.type === AST_NODE_TYPES.Identifier) return findImportSource(init.name, initialScope);
 		const arg0 = getRequireExpressionArguments(init)?.[0];
-		if (arg0 == null || !AST.isLiteral(arg0, "string")) return unit;
+		if (arg0 == null || !ast.isLiteral(arg0, "string")) return unit;
 		return arg0.value;
 	}
 	if (parent?.type === AST_NODE_TYPES.ImportDeclaration) return parent.source.value;
@@ -106,7 +106,7 @@ function getVariableDefinitionNodeLoose(variable, at) {
 	const node = getVariableDefinitionNode(variable, at);
 	if (node != null) return node;
 	const def = variable.defs.at(at);
-	if (def?.type === DefinitionType.Parameter && AST.isFunction(def.node)) return def.node;
+	if (def?.type === DefinitionType.Parameter && ast.isFunction(def.node)) return def.node;
 	return unit;
 }
 
@@ -227,8 +227,8 @@ const thisBlockTypes = [
 * @returns `true` if node value equal
 */
 function isNodeValueEqual(a, b, initialScopes) {
-	a = AST.isTypeExpression(a) ? AST.getUnderlyingExpression(a) : a;
-	b = AST.isTypeExpression(b) ? AST.getUnderlyingExpression(b) : b;
+	a = ast.isTypeExpression(a) ? ast.getUnderlyingExpression(a) : a;
+	b = ast.isTypeExpression(b) ? ast.getUnderlyingExpression(b) : b;
 	const [aScope, bScope] = initialScopes;
 	switch (true) {
 		case a === b: return true;
@@ -246,12 +246,12 @@ function isNodeValueEqual(a, b, initialScopes) {
 			const aDefParentParent = aDef?.parent?.parent;
 			const bDefParentParent = bDef?.parent?.parent;
 			switch (true) {
-				case aVarNodeParent?.type === AST_NODE_TYPES.CallExpression && bVarNodeParent?.type === AST_NODE_TYPES.CallExpression && AST.isFunction(aVarNode) && AST.isFunction(bVarNode): {
-					if (!AST.isNodeEqual(aVarNodeParent.callee, bVarNodeParent.callee)) return false;
+				case aVarNodeParent?.type === AST_NODE_TYPES.CallExpression && bVarNodeParent?.type === AST_NODE_TYPES.CallExpression && ast.isFunction(aVarNode) && ast.isFunction(bVarNode): {
+					if (!ast.isNodeEqual(aVarNodeParent.callee, bVarNodeParent.callee)) return false;
 					const aParams = aVarNode.params;
 					const bParams = bVarNode.params;
-					const aPos = aParams.findIndex((x) => AST.isNodeEqual(x, a));
-					const bPos = bParams.findIndex((x) => AST.isNodeEqual(x, b));
+					const aPos = aParams.findIndex((x) => ast.isNodeEqual(x, a));
+					const bPos = bParams.findIndex((x) => ast.isNodeEqual(x, b));
 					return aPos !== -1 && bPos !== -1 && aPos === bPos;
 				}
 				case aDefParentParent?.type === AST_NODE_TYPES.ForOfStatement && bDefParentParent?.type === AST_NODE_TYPES.ForOfStatement: {
@@ -260,15 +260,15 @@ function isNodeValueEqual(a, b, initialScopes) {
 					if (aLeft.type !== bLeft.type) return false;
 					const aRight = aDefParentParent.right;
 					const bRight = bDefParentParent.right;
-					return AST.isNodeEqual(aRight, bRight);
+					return ast.isNodeEqual(aRight, bRight);
 				}
 				default: return aVar != null && bVar != null && aVar === bVar;
 			}
 		}
-		case a.type === AST_NODE_TYPES.MemberExpression && b.type === AST_NODE_TYPES.MemberExpression: return AST.isNodeEqual(a.property, b.property) && isNodeValueEqual(a.object, b.object, initialScopes);
+		case a.type === AST_NODE_TYPES.MemberExpression && b.type === AST_NODE_TYPES.MemberExpression: return ast.isNodeEqual(a.property, b.property) && isNodeValueEqual(a.object, b.object, initialScopes);
 		case a.type === AST_NODE_TYPES.ThisExpression && b.type === AST_NODE_TYPES.ThisExpression:
 			if (aScope.block === bScope.block) return true;
-			return AST.findParentNode(a, AST.isOneOf(thisBlockTypes)) === AST.findParentNode(b, AST.isOneOf(thisBlockTypes));
+			return ast.findParentNode(a, ast.isOneOf(thisBlockTypes)) === ast.findParentNode(b, ast.isOneOf(thisBlockTypes));
 		default: {
 			const aStatic = getStaticValue(a, aScope);
 			const bStatic = getStaticValue(b, bScope);
@@ -281,7 +281,7 @@ function isNodeValueEqual(a, b, initialScopes) {
 //#region src/is-assignment-target-equal.ts
 /** @internal */
 function isAssignmentTargetEqual(context, a, b) {
-	return AST.isNodeEqual(a, b) || isNodeValueEqual(a, b, [context.sourceCode.getScope(a), context.sourceCode.getScope(b)]);
+	return ast.isNodeEqual(a, b) || isNodeValueEqual(a, b, [context.sourceCode.getScope(a), context.sourceCode.getScope(b)]);
 }
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/var",
-  "version": "2.8.1-next.4",
+  "version": "2.8.2-next.0",
   "description": "ESLint React's TSESTree AST utility module for static analysis of variables.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -34,9 +34,9 @@
     "@typescript-eslint/types": "^8.54.0",
     "@typescript-eslint/utils": "^8.54.0",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "2.8.1-next.4",
-    "@eslint-react/eff": "2.8.1-next.4",
-    "@eslint-react/shared": "2.8.1-next.4"
+    "@eslint-react/ast": "2.8.2-next.0",
+    "@eslint-react/eff": "2.8.2-next.0",
+    "@eslint-react/shared": "2.8.2-next.0"
   },
   "devDependencies": {
     "tsdown": "^0.20.1",