@eslint-react/var 1.24.0-beta.0 → 1.24.0-beta.16

package/dist/index.d.mts

@@ -2,6 +2,8 @@ import { _ } from '@eslint-react/eff';
 import { Scope, Variable } from '@typescript-eslint/scope-manager';
 import { TSESTree } from '@typescript-eslint/types';
 
+declare function findPropertyInProperties(name: string, properties: (TSESTree.Property | TSESTree.RestElement | TSESTree.SpreadElement)[], initialScope: Scope, seen?: Set<string>): (typeof properties)[number] | _;
+
 declare const findVariable: {
     (initialScope: Scope): (nameOrNode: string | TSESTree.Identifier | _) => Variable | _;
     (nameOrNode: string | TSESTree.Identifier | _, initialScope: Scope): Variable | _;
@@ -41,7 +43,7 @@ declare function isNodeValueEqual(a: TSESTree.Node, b: TSESTree.Node, initialSco
     bScope: Scope
 ]): boolean;
 
-type StaticValue = {
+type LazyValue = {
     kind: "lazy";
     node: TSESTree.Node;
     initialScope: Scope | _;
@@ -55,7 +57,7 @@ type StaticValue = {
     value: unknown;
     initialScope: Scope | _;
 };
-declare function toResolved(sv: StaticValue): {
+declare function toStaticValue(lazyValue: LazyValue): {
     readonly kind: "none";
     readonly node: TSESTree.Node;
     readonly initialScope: Scope | undefined;
@@ -108,4 +110,4 @@ declare const ValueConstructionHint: {
  */
 declare function getValueConstruction(node: TSESTree.Node | _, initialScope: Scope, hint?: bigint): ValueConstruction | _;
 
-export { type StaticValue, type ValueConstruction, ValueConstructionHint, findVariable, getChidScopes, getValueConstruction, getVariableDeclaratorId, getVariableNode, getVariables, isInitializedFromSource, isNodeValueEqual, toResolved };
+export { type LazyValue, type ValueConstruction, ValueConstructionHint, findPropertyInProperties, findVariable, getChidScopes, getValueConstruction, getVariableDeclaratorId, getVariableNode, getVariables, isInitializedFromSource, isNodeValueEqual, toStaticValue };

package/dist/index.d.ts

@@ -2,6 +2,8 @@ import { _ } from '@eslint-react/eff';
 import { Scope, Variable } from '@typescript-eslint/scope-manager';
 import { TSESTree } from '@typescript-eslint/types';
 
+declare function findPropertyInProperties(name: string, properties: (TSESTree.Property | TSESTree.RestElement | TSESTree.SpreadElement)[], initialScope: Scope, seen?: Set<string>): (typeof properties)[number] | _;
+
 declare const findVariable: {
     (initialScope: Scope): (nameOrNode: string | TSESTree.Identifier | _) => Variable | _;
     (nameOrNode: string | TSESTree.Identifier | _, initialScope: Scope): Variable | _;
@@ -41,7 +43,7 @@ declare function isNodeValueEqual(a: TSESTree.Node, b: TSESTree.Node, initialSco
     bScope: Scope
 ]): boolean;
 
-type StaticValue = {
+type LazyValue = {
     kind: "lazy";
     node: TSESTree.Node;
     initialScope: Scope | _;
@@ -55,7 +57,7 @@ type StaticValue = {
     value: unknown;
     initialScope: Scope | _;
 };
-declare function toResolved(sv: StaticValue): {
+declare function toStaticValue(lazyValue: LazyValue): {
     readonly kind: "none";
     readonly node: TSESTree.Node;
     readonly initialScope: Scope | undefined;
@@ -108,4 +110,4 @@ declare const ValueConstructionHint: {
  */
 declare function getValueConstruction(node: TSESTree.Node | _, initialScope: Scope, hint?: bigint): ValueConstruction | _;
 
-export { type StaticValue, type ValueConstruction, ValueConstructionHint, findVariable, getChidScopes, getValueConstruction, getVariableDeclaratorId, getVariableNode, getVariables, isInitializedFromSource, isNodeValueEqual, toResolved };
+export { type LazyValue, type ValueConstruction, ValueConstructionHint, findPropertyInProperties, findVariable, getChidScopes, getValueConstruction, getVariableDeclaratorId, getVariableNode, getVariables, isInitializedFromSource, isNodeValueEqual, toStaticValue };

package/dist/index.js

@@ -1,8 +1,8 @@
 'use strict';
 
+var types = require('@typescript-eslint/types');
 var eff = require('@eslint-react/eff');
 var ASTUtils = require('@typescript-eslint/utils/ast-utils');
-var types = require('@typescript-eslint/types');
 var AST3 = require('@eslint-react/ast');
 var scopeManager = require('@typescript-eslint/scope-manager');
 
@@ -27,11 +27,67 @@ function _interopNamespace(e) {
 var ASTUtils__namespace = /*#__PURE__*/_interopNamespace(ASTUtils);
 var AST3__namespace = /*#__PURE__*/_interopNamespace(AST3);
 
-// src/find-variable.ts
+// src/find-property-in-properties.ts
 var findVariable2 = eff.dual(2, (nameOrNode, initialScope) => {
-  if (nameOrNode === eff._) return eff._;
+  if (nameOrNode == null) return eff._;
   return ASTUtils__namespace.findVariable(initialScope, nameOrNode) ?? eff._;
 });
+function getVariableNode(variable, at) {
+  if (variable == null) return eff._;
+  const def = variable.defs.at(at);
+  if (def == null) return eff._;
+  switch (true) {
+    case (def.type === scopeManager.DefinitionType.FunctionName && def.node.type === types.AST_NODE_TYPES.FunctionDeclaration):
+      return def.node;
+    case (def.type === scopeManager.DefinitionType.ClassName && def.node.type === types.AST_NODE_TYPES.ClassDeclaration):
+      return def.node;
+    case (def.type === scopeManager.DefinitionType.Parameter && AST3__namespace.isFunction(def.node)):
+      return def.node;
+    case ("init" in def.node && def.node.init != null && !("declarations" in def.node.init)):
+      return def.node.init;
+    default:
+      return eff._;
+  }
+}
+
+// src/find-property-in-properties.ts
+function findPropertyInProperties(name, properties, initialScope, seen = /* @__PURE__ */ new Set()) {
+  return properties.findLast((prop) => {
+    if (prop.type === types.AST_NODE_TYPES.Property) {
+      return "name" in prop.key && prop.key.name === name;
+    }
+    if (prop.type === types.AST_NODE_TYPES.SpreadElement) {
+      switch (prop.argument.type) {
+        case types.AST_NODE_TYPES.Identifier: {
+          if (seen.has(prop.argument.name)) return false;
+          const variable = findVariable2(prop.argument.name, initialScope);
+          const variableNode = getVariableNode(variable, 0);
+          if (variableNode?.type === types.AST_NODE_TYPES.ObjectExpression) {
+            seen.add(prop.argument.name);
+            return findPropertyInProperties(
+              name,
+              variableNode.properties,
+              initialScope,
+              seen
+            ) != null;
+          }
+          return false;
+        }
+        case types.AST_NODE_TYPES.ObjectExpression: {
+          return findPropertyInProperties(
+            name,
+            prop.argument.properties,
+            initialScope,
+            seen
+          ) != null;
+        }
+        default:
+          return false;
+      }
+    }
+    return false;
+  });
+}
 
 // src/get-child-scopes.ts
 function getChidScopes(scope) {
@@ -42,7 +98,7 @@ function getChidScopes(scope) {
   return scopes;
 }
 function getVariableDeclaratorId(node, prev) {
-  if (node === eff._) return eff._;
+  if (node == null) return eff._;
   switch (true) {
     case (node.type === types.AST_NODE_TYPES.VariableDeclarator && node.init === prev):
       return node.id;
@@ -54,23 +110,6 @@ function getVariableDeclaratorId(node, prev) {
       return getVariableDeclaratorId(node.parent, node);
   }
 }
-function getVariableNode(variable, at) {
-  if (variable === eff._) return eff._;
-  const def = variable.defs.at(at);
-  if (def === eff._) return eff._;
-  switch (true) {
-    case (def.type === scopeManager.DefinitionType.FunctionName && def.node.type === types.AST_NODE_TYPES.FunctionDeclaration):
-      return def.node;
-    case (def.type === scopeManager.DefinitionType.ClassName && def.node.type === types.AST_NODE_TYPES.ClassDeclaration):
-      return def.node;
-    case (def.type === scopeManager.DefinitionType.Parameter && AST3__namespace.isFunction(def.node)):
-      return def.node;
-    case ("init" in def.node && def.node.init != null && !("declarations" in def.node.init)):
-      return def.node.init;
-    default:
-      return eff._;
-  }
-}
 function getVariables(initialScope) {
   let scope = initialScope;
   const variables = [...scope.variables];
@@ -82,7 +121,7 @@ function getVariables(initialScope) {
 }
 function isInitializedFromSource(name, source, initialScope) {
   const latestDef = findVariable2(name, initialScope)?.defs.at(-1);
-  if (latestDef === eff._) return false;
+  if (latestDef == null) return false;
   const { node, parent } = latestDef;
   if (node.type === types.AST_NODE_TYPES.VariableDeclarator && node.init != null) {
     const { init } = node;
@@ -114,13 +153,13 @@ function getRequireExpressionArguments(node) {
   }
   return eff._;
 }
-function toResolved(sv) {
-  const { kind, node, initialScope } = sv;
+function toStaticValue(lazyValue) {
+  const { kind, node, initialScope } = lazyValue;
   if (kind !== "lazy") {
-    return sv;
+    return lazyValue;
   }
-  const resolvedValue = initialScope === eff._ ? ASTUtils.getStaticValue(node) : ASTUtils.getStaticValue(node, initialScope);
-  return resolvedValue == null ? { kind: "none", node, initialScope } : { kind: "some", node, initialScope, value: resolvedValue.value };
+  const staticValue = initialScope == null ? ASTUtils.getStaticValue(node) : ASTUtils.getStaticValue(node, initialScope);
+  return staticValue == null ? { kind: "none", node, initialScope } : { kind: "some", node, initialScope, value: staticValue.value };
 }
 
 // src/is-node-value-equal.ts
@@ -175,7 +214,7 @@ function isNodeValueEqual(a, b, initialScopes) {
           return AST3__namespace.isNodeEqual(aRight, bRight);
         }
         default: {
-          return aVar !== eff._ && bVar !== eff._ && aVar === bVar;
+          return aVar != null && bVar != null && aVar === bVar;
         }
       }
     }
@@ -191,8 +230,8 @@ function isNodeValueEqual(a, b, initialScopes) {
       return aFunction === bFunction;
     }
     default: {
-      const aStatic = toResolved({ kind: "lazy", node: a, initialScope: aScope });
-      const bStatic = toResolved({ kind: "lazy", node: b, initialScope: bScope });
+      const aStatic = toStaticValue({ kind: "lazy", node: a, initialScope: aScope });
+      const bStatic = toStaticValue({ kind: "lazy", node: b, initialScope: bScope });
       return aStatic.kind !== "none" && bStatic.kind !== "none" && aStatic.value === bStatic.value;
     }
   }
@@ -202,7 +241,7 @@ var ValueConstructionHint = {
   StrictCallExpression: 1n << 0n
 };
 function getValueConstruction(node, initialScope, hint = ValueConstructionHint.None) {
-  if (node === eff._) return eff._;
+  if (node == null) return eff._;
   switch (node.type) {
     case types.AST_NODE_TYPES.JSXElement:
     case types.AST_NODE_TYPES.JSXFragment: {
@@ -241,12 +280,12 @@ function getValueConstruction(node, initialScope, hint = ValueConstructionHint.N
     }
     case types.AST_NODE_TYPES.LogicalExpression: {
       const lvc = getValueConstruction(node.left, initialScope, hint);
-      if (lvc === eff._) return eff._;
+      if (lvc == null) return eff._;
       return getValueConstruction(node.right, initialScope, hint);
     }
     case types.AST_NODE_TYPES.ConditionalExpression: {
       const cvc = getValueConstruction(node.consequent, initialScope, hint);
-      if (cvc === eff._) return eff._;
+      if (cvc == null) return eff._;
       return getValueConstruction(node.alternate, initialScope, hint);
     }
     case types.AST_NODE_TYPES.Identifier: {
@@ -273,6 +312,7 @@ function getValueConstruction(node, initialScope, hint = ValueConstructionHint.N
 }
 
 exports.ValueConstructionHint = ValueConstructionHint;
+exports.findPropertyInProperties = findPropertyInProperties;
 exports.findVariable = findVariable2;
 exports.getChidScopes = getChidScopes;
 exports.getValueConstruction = getValueConstruction;
@@ -281,4 +321,4 @@ exports.getVariableNode = getVariableNode;
 exports.getVariables = getVariables;
 exports.isInitializedFromSource = isInitializedFromSource;
 exports.isNodeValueEqual = isNodeValueEqual;
-exports.toResolved = toResolved;
+exports.toStaticValue = toStaticValue;

package/dist/index.mjs

@@ -1,15 +1,71 @@
+import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import { dual, _ } from '@eslint-react/eff';
 import * as ASTUtils from '@typescript-eslint/utils/ast-utils';
 import { getStaticValue } from '@typescript-eslint/utils/ast-utils';
-import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import * as AST3 from '@eslint-react/ast';
 import { DefinitionType, ScopeType } from '@typescript-eslint/scope-manager';
 
-// src/find-variable.ts
+// src/find-property-in-properties.ts
 var findVariable2 = dual(2, (nameOrNode, initialScope) => {
-  if (nameOrNode === _) return _;
+  if (nameOrNode == null) return _;
   return ASTUtils.findVariable(initialScope, nameOrNode) ?? _;
 });
+function getVariableNode(variable, at) {
+  if (variable == null) return _;
+  const def = variable.defs.at(at);
+  if (def == null) return _;
+  switch (true) {
+    case (def.type === DefinitionType.FunctionName && def.node.type === AST_NODE_TYPES.FunctionDeclaration):
+      return def.node;
+    case (def.type === DefinitionType.ClassName && def.node.type === AST_NODE_TYPES.ClassDeclaration):
+      return def.node;
+    case (def.type === DefinitionType.Parameter && AST3.isFunction(def.node)):
+      return def.node;
+    case ("init" in def.node && def.node.init != null && !("declarations" in def.node.init)):
+      return def.node.init;
+    default:
+      return _;
+  }
+}
+
+// src/find-property-in-properties.ts
+function findPropertyInProperties(name, properties, initialScope, seen = /* @__PURE__ */ new Set()) {
+  return properties.findLast((prop) => {
+    if (prop.type === AST_NODE_TYPES.Property) {
+      return "name" in prop.key && prop.key.name === name;
+    }
+    if (prop.type === AST_NODE_TYPES.SpreadElement) {
+      switch (prop.argument.type) {
+        case AST_NODE_TYPES.Identifier: {
+          if (seen.has(prop.argument.name)) return false;
+          const variable = findVariable2(prop.argument.name, initialScope);
+          const variableNode = getVariableNode(variable, 0);
+          if (variableNode?.type === AST_NODE_TYPES.ObjectExpression) {
+            seen.add(prop.argument.name);
+            return findPropertyInProperties(
+              name,
+              variableNode.properties,
+              initialScope,
+              seen
+            ) != null;
+          }
+          return false;
+        }
+        case AST_NODE_TYPES.ObjectExpression: {
+          return findPropertyInProperties(
+            name,
+            prop.argument.properties,
+            initialScope,
+            seen
+          ) != null;
+        }
+        default:
+          return false;
+      }
+    }
+    return false;
+  });
+}
 
 // src/get-child-scopes.ts
 function getChidScopes(scope) {
@@ -20,7 +76,7 @@ function getChidScopes(scope) {
   return scopes;
 }
 function getVariableDeclaratorId(node, prev) {
-  if (node === _) return _;
+  if (node == null) return _;
   switch (true) {
     case (node.type === AST_NODE_TYPES.VariableDeclarator && node.init === prev):
       return node.id;
@@ -32,23 +88,6 @@ function getVariableDeclaratorId(node, prev) {
       return getVariableDeclaratorId(node.parent, node);
   }
 }
-function getVariableNode(variable, at) {
-  if (variable === _) return _;
-  const def = variable.defs.at(at);
-  if (def === _) return _;
-  switch (true) {
-    case (def.type === DefinitionType.FunctionName && def.node.type === AST_NODE_TYPES.FunctionDeclaration):
-      return def.node;
-    case (def.type === DefinitionType.ClassName && def.node.type === AST_NODE_TYPES.ClassDeclaration):
-      return def.node;
-    case (def.type === DefinitionType.Parameter && AST3.isFunction(def.node)):
-      return def.node;
-    case ("init" in def.node && def.node.init != null && !("declarations" in def.node.init)):
-      return def.node.init;
-    default:
-      return _;
-  }
-}
 function getVariables(initialScope) {
   let scope = initialScope;
   const variables = [...scope.variables];
@@ -60,7 +99,7 @@ function getVariables(initialScope) {
 }
 function isInitializedFromSource(name, source, initialScope) {
   const latestDef = findVariable2(name, initialScope)?.defs.at(-1);
-  if (latestDef === _) return false;
+  if (latestDef == null) return false;
   const { node, parent } = latestDef;
   if (node.type === AST_NODE_TYPES.VariableDeclarator && node.init != null) {
     const { init } = node;
@@ -92,13 +131,13 @@ function getRequireExpressionArguments(node) {
   }
   return _;
 }
-function toResolved(sv) {
-  const { kind, node, initialScope } = sv;
+function toStaticValue(lazyValue) {
+  const { kind, node, initialScope } = lazyValue;
   if (kind !== "lazy") {
-    return sv;
+    return lazyValue;
   }
-  const resolvedValue = initialScope === _ ? getStaticValue(node) : getStaticValue(node, initialScope);
-  return resolvedValue == null ? { kind: "none", node, initialScope } : { kind: "some", node, initialScope, value: resolvedValue.value };
+  const staticValue = initialScope == null ? getStaticValue(node) : getStaticValue(node, initialScope);
+  return staticValue == null ? { kind: "none", node, initialScope } : { kind: "some", node, initialScope, value: staticValue.value };
 }
 
 // src/is-node-value-equal.ts
@@ -153,7 +192,7 @@ function isNodeValueEqual(a, b, initialScopes) {
           return AST3.isNodeEqual(aRight, bRight);
         }
         default: {
-          return aVar !== _ && bVar !== _ && aVar === bVar;
+          return aVar != null && bVar != null && aVar === bVar;
         }
       }
     }
@@ -169,8 +208,8 @@ function isNodeValueEqual(a, b, initialScopes) {
       return aFunction === bFunction;
     }
     default: {
-      const aStatic = toResolved({ kind: "lazy", node: a, initialScope: aScope });
-      const bStatic = toResolved({ kind: "lazy", node: b, initialScope: bScope });
+      const aStatic = toStaticValue({ kind: "lazy", node: a, initialScope: aScope });
+      const bStatic = toStaticValue({ kind: "lazy", node: b, initialScope: bScope });
       return aStatic.kind !== "none" && bStatic.kind !== "none" && aStatic.value === bStatic.value;
     }
   }
@@ -180,7 +219,7 @@ var ValueConstructionHint = {
   StrictCallExpression: 1n << 0n
 };
 function getValueConstruction(node, initialScope, hint = ValueConstructionHint.None) {
-  if (node === _) return _;
+  if (node == null) return _;
   switch (node.type) {
     case AST_NODE_TYPES.JSXElement:
     case AST_NODE_TYPES.JSXFragment: {
@@ -219,12 +258,12 @@ function getValueConstruction(node, initialScope, hint = ValueConstructionHint.N
     }
     case AST_NODE_TYPES.LogicalExpression: {
       const lvc = getValueConstruction(node.left, initialScope, hint);
-      if (lvc === _) return _;
+      if (lvc == null) return _;
       return getValueConstruction(node.right, initialScope, hint);
     }
     case AST_NODE_TYPES.ConditionalExpression: {
       const cvc = getValueConstruction(node.consequent, initialScope, hint);
-      if (cvc === _) return _;
+      if (cvc == null) return _;
       return getValueConstruction(node.alternate, initialScope, hint);
     }
     case AST_NODE_TYPES.Identifier: {
@@ -250,4 +289,4 @@ function getValueConstruction(node, initialScope, hint = ValueConstructionHint.N
   }
 }
 
-export { ValueConstructionHint, findVariable2 as findVariable, getChidScopes, getValueConstruction, getVariableDeclaratorId, getVariableNode, getVariables, isInitializedFromSource, isNodeValueEqual, toResolved };
+export { ValueConstructionHint, findPropertyInProperties, findVariable2 as findVariable, getChidScopes, getValueConstruction, getVariableDeclaratorId, getVariableNode, getVariables, isInitializedFromSource, isNodeValueEqual, toStaticValue };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/var",
-  "version": "1.24.0-beta.0",
+  "version": "1.24.0-beta.16",
   "description": "ESLint React's TSESTree AST utility module for static analysis of variables",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -33,14 +33,13 @@
     "./package.json"
   ],
   "dependencies": {
-    "@typescript-eslint/scope-manager": "^8.19.1",
-    "@typescript-eslint/types": "^8.19.1",
-    "@typescript-eslint/utils": "^8.19.1",
+    "@typescript-eslint/scope-manager": "^8.20.0",
+    "@typescript-eslint/types": "^8.20.0",
+    "@typescript-eslint/utils": "^8.20.0",
     "string-ts": "^2.2.0",
     "ts-pattern": "^5.6.0",
-    "@eslint-react/ast": "1.24.0-beta.0",
-    "@eslint-react/types": "1.24.0-beta.0",
-    "@eslint-react/eff": "1.24.0-beta.0"
+    "@eslint-react/ast": "1.24.0-beta.16",
+    "@eslint-react/eff": "1.24.0-beta.16"
   },
   "devDependencies": {
     "tsup": "^8.3.5",