@eslint-react/var 5.2.1-next.1 → 5.2.2-beta.0

package/dist/index.d.ts

@@ -40,19 +40,6 @@ type ObjectType = {
  */
 declare function computeObjectType(context: RuleContext, node: TSESTree.Node | null): ObjectType | null;
 //#endregion
-//#region src/find-enclosing-assignment-target.d.ts
-/**
- * Finds the enclosing assignment target (variable, property, etc.) for a given node
- *
- * @param node The starting node
- * @returns The enclosing assignment target node, or null if not found
- */
-declare function findEnclosingAssignmentTarget(node: TSESTree.Node): TSESTree.ArrayExpression | TSESTree.ArrayPattern | TSESTree.ArrowFunctionExpression | TSESTree.AssignmentExpression | TSESTree.AwaitExpression | TSESTree.PrivateInExpression | TSESTree.SymmetricBinaryExpression | TSESTree.CallExpression | TSESTree.ChainExpression | TSESTree.ClassDeclarationWithOptionalName | TSESTree.ClassExpression | TSESTree.ConditionalExpression | TSESTree.FunctionDeclarationWithName | TSESTree.FunctionDeclarationWithOptionalName | TSESTree.FunctionExpression | TSESTree.Identifier | TSESTree.ImportExpression | TSESTree.JSXElement | TSESTree.JSXFragment | TSESTree.BigIntLiteral | TSESTree.BooleanLiteral | TSESTree.NullLiteral | TSESTree.NumberLiteral | TSESTree.RegExpLiteral | TSESTree.StringLiteral | TSESTree.LogicalExpression | TSESTree.MemberExpressionComputedName | TSESTree.MemberExpressionNonComputedName | TSESTree.MetaProperty | TSESTree.NewExpression | TSESTree.ObjectExpression | TSESTree.ObjectPattern | TSESTree.PrivateIdentifier | TSESTree.SequenceExpression | TSESTree.Super | TSESTree.TaggedTemplateExpression | TSESTree.TemplateLiteral | TSESTree.ThisExpression | TSESTree.TSAsExpression | TSESTree.TSDeclareFunctionNoDeclare | TSESTree.TSDeclareFunctionWithDeclare | TSESTree.TSEnumDeclaration | TSESTree.TSInstantiationExpression | TSESTree.TSInterfaceDeclaration | TSESTree.TSModuleDeclarationGlobal | TSESTree.TSModuleDeclarationModuleWithIdentifierId | TSESTree.TSModuleDeclarationModuleWithStringIdDeclared | TSESTree.TSModuleDeclarationModuleWithStringIdNotDeclared | TSESTree.TSModuleDeclarationNamespace | TSESTree.TSNonNullExpression | TSESTree.TSSatisfiesExpression | TSESTree.TSTypeAliasDeclaration | TSESTree.TSTypeAssertion | TSESTree.UnaryExpressionBitwiseNot | TSESTree.UnaryExpressionDelete | TSESTree.UnaryExpressionMinus | TSESTree.UnaryExpressionNot | TSESTree.UnaryExpressionPlus | TSESTree.UnaryExpressionTypeof | TSESTree.UnaryExpressionVoid | TSESTree.UpdateExpression | TSESTree.ConstDeclaration | TSESTree.LetOrVarDeclaredDeclaration | TSESTree.LetOrVarNonDeclaredDeclaration | TSESTree.UsingInForOfDeclaration | TSESTree.UsingInNormalContextDeclaration | TSESTree.YieldExpression | null;
-/**
- * Type representing the possible assignment targets returned by `findEnclosingAssignmentTarget`
- */
-type AssignmentTarget = ReturnType<typeof findEnclosingAssignmentTarget>;
-//#endregion
 //#region src/get-require-expression-arguments.d.ts
 /**
  * Get the arguments of a require expression
@@ -120,7 +107,20 @@ declare function resolve(context: RuleContext, node: TSESTree.Identifier, option
   localOnly: boolean;
 }>): TSESTree.Node | null;
 //#endregion
+//#region src/resolve-enclosing-assignment-target.d.ts
+/**
+ * Finds the enclosing assignment target (variable, property, etc.) for a given node
+ *
+ * @param node The starting node
+ * @returns The enclosing assignment target node, or null if not found
+ */
+declare function resolveEnclosingAssignmentTarget(node: TSESTree.Node): TSESTree.ArrayExpression | TSESTree.ArrayPattern | TSESTree.ArrowFunctionExpression | TSESTree.AssignmentExpression | TSESTree.AwaitExpression | TSESTree.PrivateInExpression | TSESTree.SymmetricBinaryExpression | TSESTree.CallExpression | TSESTree.ChainExpression | TSESTree.ClassDeclarationWithOptionalName | TSESTree.ClassExpression | TSESTree.ConditionalExpression | TSESTree.FunctionDeclarationWithName | TSESTree.FunctionDeclarationWithOptionalName | TSESTree.FunctionExpression | TSESTree.Identifier | TSESTree.ImportExpression | TSESTree.JSXElement | TSESTree.JSXFragment | TSESTree.BigIntLiteral | TSESTree.BooleanLiteral | TSESTree.NullLiteral | TSESTree.NumberLiteral | TSESTree.RegExpLiteral | TSESTree.StringLiteral | TSESTree.LogicalExpression | TSESTree.MemberExpressionComputedName | TSESTree.MemberExpressionNonComputedName | TSESTree.MetaProperty | TSESTree.NewExpression | TSESTree.ObjectExpression | TSESTree.ObjectPattern | TSESTree.PrivateIdentifier | TSESTree.SequenceExpression | TSESTree.Super | TSESTree.TaggedTemplateExpression | TSESTree.TemplateLiteral | TSESTree.ThisExpression | TSESTree.TSAsExpression | TSESTree.TSDeclareFunctionNoDeclare | TSESTree.TSDeclareFunctionWithDeclare | TSESTree.TSEnumDeclaration | TSESTree.TSInstantiationExpression | TSESTree.TSInterfaceDeclaration | TSESTree.TSModuleDeclarationGlobal | TSESTree.TSModuleDeclarationModuleWithIdentifierId | TSESTree.TSModuleDeclarationModuleWithStringIdDeclared | TSESTree.TSModuleDeclarationModuleWithStringIdNotDeclared | TSESTree.TSModuleDeclarationNamespace | TSESTree.TSNonNullExpression | TSESTree.TSSatisfiesExpression | TSESTree.TSTypeAliasDeclaration | TSESTree.TSTypeAssertion | TSESTree.UnaryExpressionBitwiseNot | TSESTree.UnaryExpressionDelete | TSESTree.UnaryExpressionMinus | TSESTree.UnaryExpressionNot | TSESTree.UnaryExpressionPlus | TSESTree.UnaryExpressionTypeof | TSESTree.UnaryExpressionVoid | TSESTree.UpdateExpression | TSESTree.ConstDeclaration | TSESTree.LetOrVarDeclaredDeclaration | TSESTree.LetOrVarNonDeclaredDeclaration | TSESTree.UsingInForOfDeclaration | TSESTree.UsingInNormalContextDeclaration | TSESTree.YieldExpression | null;
+/**
+ * Type representing the possible assignment targets returned by `resolveEnclosingAssignmentTarget`
+ */
+type AssignmentTarget = ReturnType<typeof resolveEnclosingAssignmentTarget>;
+//#endregion
 //#region src/resolve-import-source.d.ts
 declare function resolveImportSource(name: string, initialScope: Scope, visited?: Set<string>): string | null;
 //#endregion
-export { AssignmentTarget, ObjectType, computeObjectType, findEnclosingAssignmentTarget, getRequireExpressionArguments, isAssignmentTargetEqual, isValueEqual, resolve, resolveImportSource };
+export { AssignmentTarget, ObjectType, computeObjectType, getRequireExpressionArguments, isAssignmentTargetEqual, isValueEqual, resolve, resolveEnclosingAssignmentTarget, resolveImportSource };

package/dist/index.js

@@ -1,5 +1,4 @@
-import * as ast from "@eslint-react/ast";
-import { isIdentifier } from "@eslint-react/ast";
+import { Check, Compare, Extract, Traverse, isOneOf } 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";
@@ -52,7 +51,7 @@ function resolve(context, node, options) {
 			if ("declarations" in init) return null;
 			return init;
 		}
-		case DefinitionType.Parameter: return ast.isFunction(def.node) ? def.node : null;
+		case DefinitionType.Parameter: return Check.isFunction(def.node) ? def.node : null;
 		case DefinitionType.TSEnumName: return def.node;
 		case DefinitionType.TSEnumMember: return def.node.initializer ?? null;
 		case DefinitionType.ImportBinding: return null;
@@ -128,23 +127,23 @@ function computeObjectType(context, node) {
 			return computeObjectType(context, node.expressions[node.expressions.length - 1] ?? null);
 		case AST_NODE_TYPES.CallExpression:
 			switch (true) {
-				case isIdentifier(node.callee, "Boolean"): return null;
-				case isIdentifier(node.callee, "String"): return null;
-				case isIdentifier(node.callee, "Number"): return null;
-				case isIdentifier(node.callee, "Object"): return {
+				case Check.identifier(node.callee, "Boolean"): return null;
+				case Check.identifier(node.callee, "String"): return null;
+				case Check.identifier(node.callee, "Number"): return null;
+				case Check.identifier(node.callee, "Object"): return {
 					kind: "plain",
 					node
 				};
-				case isIdentifier(node.callee, "Array"): return {
+				case Check.identifier(node.callee, "Array"): return {
 					kind: "array",
 					node
 				};
-				case isIdentifier(node.callee, "RegExp"): return {
+				case Check.identifier(node.callee, "RegExp"): return {
 					kind: "regexp",
 					node
 				};
 			}
-			if (node.callee.type === AST_NODE_TYPES.MemberExpression && isIdentifier(node.callee.object) && isIdentifier(node.callee.property)) {
+			if (node.callee.type === AST_NODE_TYPES.MemberExpression && Check.identifier(node.callee.object) && Check.identifier(node.callee.property)) {
 				const objName = node.callee.object.name;
 				const methodName = node.callee.property.name;
 				switch (objName) {
@@ -173,25 +172,6 @@ function computeObjectType(context, node) {
 	}
 }
 
-//#endregion
-//#region src/find-enclosing-assignment-target.ts
-/**
-* Finds the enclosing assignment target (variable, property, etc.) for a given node
-*
-* @param node The starting node
-* @returns The enclosing assignment target node, or null if not found
-*/
-function findEnclosingAssignmentTarget(node) {
-	switch (true) {
-		case node.type === AST_NODE_TYPES.VariableDeclarator: return node.id;
-		case node.type === AST_NODE_TYPES.AssignmentExpression: return node.left;
-		case node.type === AST_NODE_TYPES.PropertyDefinition: return node.key;
-		case node.type === AST_NODE_TYPES.ExportDefaultDeclaration: return node.declaration;
-		case node.type === AST_NODE_TYPES.BlockStatement || node.type === AST_NODE_TYPES.Program: return null;
-		default: return findEnclosingAssignmentTarget(node.parent);
-	}
-}
-
 //#endregion
 //#region ../../.pkgs/eff/dist/index.js
 /**
@@ -357,8 +337,8 @@ const thisBlockTypes = [
 * @returns `true` if node value equal
 */
 function isValueEqual(context, a, b) {
-	a = ast.isTypeExpression(a) ? ast.getUnderlyingExpression(a) : a;
-	b = ast.isTypeExpression(b) ? ast.getUnderlyingExpression(b) : b;
+	a = Check.isTypeExpression(a) ? Extract.unwrapped(a) : a;
+	b = Check.isTypeExpression(b) ? Extract.unwrapped(b) : b;
 	const [aScope, bScope] = [context.sourceCode.getScope(a), context.sourceCode.getScope(b)];
 	switch (true) {
 		case a === b: return true;
@@ -376,12 +356,12 @@ function isValueEqual(context, a, b) {
 			const aDefParentParent = aDef?.parent?.parent;
 			const bDefParentParent = bDef?.parent?.parent;
 			switch (true) {
-				case aDefNodeParent?.type === AST_NODE_TYPES.CallExpression && bDefNodeParent?.type === AST_NODE_TYPES.CallExpression && ast.isFunction(aDefNode) && ast.isFunction(bDefNode): {
-					if (!ast.isNodeEqual(aDefNodeParent.callee, bDefNodeParent.callee)) return false;
+				case aDefNodeParent?.type === AST_NODE_TYPES.CallExpression && bDefNodeParent?.type === AST_NODE_TYPES.CallExpression && Check.isFunction(aDefNode) && Check.isFunction(bDefNode): {
+					if (!Compare.areEqual(aDefNodeParent.callee, bDefNodeParent.callee)) return false;
 					const aParams = aDefNode.params;
 					const bParams = bDefNode.params;
-					const aPos = aParams.findIndex((x) => ast.isNodeEqual(x, a));
-					const bPos = bParams.findIndex((x) => ast.isNodeEqual(x, b));
+					const aPos = aParams.findIndex((x) => Compare.areEqual(x, a));
+					const bPos = bParams.findIndex((x) => Compare.areEqual(x, b));
 					return aPos !== -1 && bPos !== -1 && aPos === bPos;
 				}
 				case aDefParentParent?.type === AST_NODE_TYPES.ForOfStatement && bDefParentParent?.type === AST_NODE_TYPES.ForOfStatement: {
@@ -390,17 +370,17 @@ function isValueEqual(context, a, b) {
 					if (aLeft.type !== bLeft.type) return false;
 					const aRight = aDefParentParent.right;
 					const bRight = bDefParentParent.right;
-					if (!ast.isNodeEqual(aRight, bRight)) return false;
+					if (!Compare.areEqual(aRight, bRight)) return false;
 					if (aDefParentParent === bDefParentParent) return aVar != null && bVar != null && aVar === bVar;
 					return true;
 				}
 				default: return aVar != null && bVar != null && aVar === bVar;
 			}
 		}
-		case a.type === AST_NODE_TYPES.MemberExpression && b.type === AST_NODE_TYPES.MemberExpression: return (a.computed && b.computed ? isValueEqual(context, a.property, b.property) : ast.isNodeEqual(a.property, b.property)) && isValueEqual(context, a.object, b.object);
+		case a.type === AST_NODE_TYPES.MemberExpression && b.type === AST_NODE_TYPES.MemberExpression: return (a.computed && b.computed ? isValueEqual(context, a.property, b.property) : Compare.areEqual(a.property, b.property)) && isValueEqual(context, a.object, b.object);
 		case a.type === AST_NODE_TYPES.ThisExpression && b.type === AST_NODE_TYPES.ThisExpression:
 			if (aScope.block === bScope.block) return true;
-			return ast.findParent(a, ast.isOneOf(thisBlockTypes)) === ast.findParent(b, ast.isOneOf(thisBlockTypes));
+			return Traverse.findParent(a, isOneOf(thisBlockTypes)) === Traverse.findParent(b, isOneOf(thisBlockTypes));
 		default: {
 			const aStatic = getStaticValue(a, aScope);
 			const bStatic = getStaticValue(b, bScope);
@@ -421,7 +401,26 @@ function isValueEqual(context, a, b) {
 * @internal
 */
 function isAssignmentTargetEqual(context, a, b) {
-	return ast.isNodeEqual(a, b) || isValueEqual(context, a, b);
+	return Compare.areEqual(a, b) || isValueEqual(context, a, b);
+}
+
+//#endregion
+//#region src/resolve-enclosing-assignment-target.ts
+/**
+* Finds the enclosing assignment target (variable, property, etc.) for a given node
+*
+* @param node The starting node
+* @returns The enclosing assignment target node, or null if not found
+*/
+function resolveEnclosingAssignmentTarget(node) {
+	switch (true) {
+		case node.type === AST_NODE_TYPES.VariableDeclarator: return node.id;
+		case node.type === AST_NODE_TYPES.AssignmentExpression: return node.left;
+		case node.type === AST_NODE_TYPES.PropertyDefinition: return node.key;
+		case node.type === AST_NODE_TYPES.ExportDefaultDeclaration: return node.declaration;
+		case node.type === AST_NODE_TYPES.BlockStatement || node.type === AST_NODE_TYPES.Program: return null;
+		default: return resolveEnclosingAssignmentTarget(node.parent);
+	}
 }
 
 //#endregion
@@ -437,7 +436,7 @@ function resolveImportSource(name, initialScope, visited = /* @__PURE__ */ new S
 		if (init.type === AST_NODE_TYPES.MemberExpression && init.object.type === AST_NODE_TYPES.Identifier) return resolveImportSource(init.object.name, initialScope, visited);
 		if (init.type === AST_NODE_TYPES.Identifier) return resolveImportSource(init.name, initialScope, visited);
 		const arg0 = getRequireExpressionArguments(init)?.[0];
-		if (arg0 == null || !ast.isLiteral(arg0, "string")) return null;
+		if (arg0 == null || !Check.literal(arg0, "string")) return null;
 		return arg0.value;
 	}
 	if (parent?.type === AST_NODE_TYPES.ImportDeclaration) return parent.source.value;
@@ -445,4 +444,4 @@ function resolveImportSource(name, initialScope, visited = /* @__PURE__ */ new S
 }
 
 //#endregion
-export { computeObjectType, findEnclosingAssignmentTarget, getRequireExpressionArguments, isAssignmentTargetEqual, isValueEqual, resolve, resolveImportSource };
+export { computeObjectType, getRequireExpressionArguments, isAssignmentTargetEqual, isValueEqual, resolve, resolveEnclosingAssignmentTarget, resolveImportSource };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/var",
-  "version": "5.2.1-next.1",
+  "version": "5.2.2-beta.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.58.1",
     "@typescript-eslint/utils": "^8.58.1",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "5.2.1-next.1",
-    "@eslint-react/eslint": "5.2.1-next.1",
-    "@eslint-react/shared": "5.2.1-next.1"
+    "@eslint-react/ast": "5.2.2-beta.0",
+    "@eslint-react/shared": "5.2.2-beta.0",
+    "@eslint-react/eslint": "5.2.2-beta.0"
   },
   "devDependencies": {
     "@typescript-eslint/typescript-estree": "^8.58.1",