@eslint-react/var 4.2.0-beta.1 → 4.2.0-beta.2

package/dist/index.d.ts

@@ -43,11 +43,10 @@ declare function computeObjectType(context: RuleContext, node: TSESTree.Node | n
 /**
  * Finds the enclosing assignment target (variable, property, etc.) for a given node
  *
- * @todo Verify correctness and completeness of this function
  * @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.ClassExpression | TSESTree.ConditionalExpression | 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.TSInstantiationExpression | TSESTree.TSNonNullExpression | TSESTree.TSSatisfiesExpression | TSESTree.TSTypeAssertion | TSESTree.UnaryExpressionBitwiseNot | TSESTree.UnaryExpressionDelete | TSESTree.UnaryExpressionMinus | TSESTree.UnaryExpressionNot | TSESTree.UnaryExpressionPlus | TSESTree.UnaryExpressionTypeof | TSESTree.UnaryExpressionVoid | TSESTree.UpdateExpression | TSESTree.YieldExpression | null;
+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`
  */

package/dist/index.js

@@ -117,14 +117,10 @@ function computeObjectType(context, node) {
 			if (initNode == null) return null;
 			return computeObjectType(context, initNode);
 		}
-		case AST_NODE_TYPES.MemberExpression:
-			if (!("object" in node)) return null;
-			return computeObjectType(context, node.object);
+		case AST_NODE_TYPES.MemberExpression: return computeObjectType(context, node.object);
 		case AST_NODE_TYPES.AssignmentExpression:
-		case AST_NODE_TYPES.AssignmentPattern:
-			if (!("right" in node)) return null;
-			return computeObjectType(context, node.right);
-		case AST_NODE_TYPES.LogicalExpression: return computeObjectType(context, node.right);
+		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;
@@ -147,6 +143,24 @@ function computeObjectType(context, node) {
 					node
 				};
 			}
+			if (node.callee.type === AST_NODE_TYPES.MemberExpression && isIdentifier(node.callee.object) && isIdentifier(node.callee.property)) {
+				const objName = node.callee.object.name;
+				const methodName = node.callee.property.name;
+				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,
@@ -163,7 +177,6 @@ function computeObjectType(context, node) {
 /**
 * Finds the enclosing assignment target (variable, property, etc.) for a given node
 *
-* @todo Verify correctness and completeness of this function
 * @param node The starting node
 * @returns The enclosing assignment target node, or null if not found
 */
@@ -172,7 +185,8 @@ function findEnclosingAssignmentTarget(node) {
 		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.BlockStatement || node.type === AST_NODE_TYPES.Program || node.parent === node: return null;
+		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);
 	}
 }
@@ -226,12 +240,14 @@ function isValueEqual(context, a, b) {
 					if (aLeft.type !== bLeft.type) return false;
 					const aRight = aDefParentParent.right;
 					const bRight = bDefParentParent.right;
-					return ast.isNodeEqual(aRight, bRight);
+					if (!ast.isNodeEqual(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 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) : ast.isNodeEqual(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));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/var",
-  "version": "4.2.0-beta.1",
+  "version": "4.2.0-beta.2",
   "description": "ESLint React's TSESTree AST utility module for static analysis of variables.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -34,14 +34,14 @@
     "@typescript-eslint/types": "^8.58.0",
     "@typescript-eslint/utils": "^8.58.0",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "4.2.0-beta.1",
-    "@eslint-react/shared": "4.2.0-beta.1"
+    "@eslint-react/ast": "4.2.0-beta.2",
+    "@eslint-react/shared": "4.2.0-beta.2"
   },
   "devDependencies": {
     "@typescript-eslint/typescript-estree": "^8.58.0",
     "tsdown": "^0.21.7",
-    "@local/eff": "3.0.0-beta.72",
-    "@local/configs": "0.0.0"
+    "@local/configs": "0.0.0",
+    "@local/eff": "3.0.0-beta.72"
   },
   "peerDependencies": {
     "eslint": "^10.0.0",