@eslint-react/var 1.28.0-next.1 → 1.28.0-next.3

package/dist/index.d.mts

@@ -24,15 +24,6 @@ declare function getVariableNode(variable: Variable | _, at: number): _ | TSESTr
  */
 declare function getVariables(initialScope: Scope): Variable[];
 
-/**
- * Check if an identifier is initialized from the given source
- * @param name The top-level identifier's name
- * @param source The import source to check against
- * @param initialScope Initial scope to search for the identifier
- * @returns Whether the identifier is initialized from the given source
- */
-declare function isInitializedFromSource(name: string, source: string, initialScope: Scope): boolean;
-
 /**
  * Determines whether node value equals to another node value
  * @param a node to compare
@@ -117,4 +108,4 @@ declare const ValueConstructionHint: {
  */
 declare function getValueConstruction(node: TSESTree.Node | _, initialScope: Scope, hint?: bigint): ValueConstruction | _;
 
-export { type LazyValue, type ValueConstruction, ValueConstructionHint, findPropertyInProperties, findVariable, getChidScopes, getValueConstruction, getVariableDeclaratorId, getVariableId, getVariableNode, getVariables, isInitializedFromSource, isNodeValueEqual, isVariableIdEqual, toStaticValue };
+export { type LazyValue, type ValueConstruction, ValueConstructionHint, findPropertyInProperties, findVariable, getChidScopes, getValueConstruction, getVariableDeclaratorId, getVariableId, getVariableNode, getVariables, isNodeValueEqual, isVariableIdEqual, toStaticValue };

package/dist/index.d.ts

@@ -24,15 +24,6 @@ declare function getVariableNode(variable: Variable | _, at: number): _ | TSESTr
  */
 declare function getVariables(initialScope: Scope): Variable[];
 
-/**
- * Check if an identifier is initialized from the given source
- * @param name The top-level identifier's name
- * @param source The import source to check against
- * @param initialScope Initial scope to search for the identifier
- * @returns Whether the identifier is initialized from the given source
- */
-declare function isInitializedFromSource(name: string, source: string, initialScope: Scope): boolean;
-
 /**
  * Determines whether node value equals to another node value
  * @param a node to compare
@@ -117,4 +108,4 @@ declare const ValueConstructionHint: {
  */
 declare function getValueConstruction(node: TSESTree.Node | _, initialScope: Scope, hint?: bigint): ValueConstruction | _;
 
-export { type LazyValue, type ValueConstruction, ValueConstructionHint, findPropertyInProperties, findVariable, getChidScopes, getValueConstruction, getVariableDeclaratorId, getVariableId, getVariableNode, getVariables, isInitializedFromSource, isNodeValueEqual, isVariableIdEqual, toStaticValue };
+export { type LazyValue, type ValueConstruction, ValueConstructionHint, findPropertyInProperties, findVariable, getChidScopes, getValueConstruction, getVariableDeclaratorId, getVariableId, getVariableNode, getVariables, isNodeValueEqual, isVariableIdEqual, toStaticValue };

package/dist/index.js

@@ -3,7 +3,7 @@
 var types = require('@typescript-eslint/types');
 var eff = require('@eslint-react/eff');
 var ASTUtils = require('@typescript-eslint/utils/ast-utils');
-var AST3 = require('@eslint-react/ast');
+var AST2 = require('@eslint-react/ast');
 var scopeManager = require('@typescript-eslint/scope-manager');
 
 function _interopNamespace(e) {
@@ -25,7 +25,7 @@ function _interopNamespace(e) {
 }
 
 var ASTUtils__namespace = /*#__PURE__*/_interopNamespace(ASTUtils);
-var AST3__namespace = /*#__PURE__*/_interopNamespace(AST3);
+var AST2__namespace = /*#__PURE__*/_interopNamespace(AST2);
 
 // src/find-property-in-properties.ts
 var findVariable2 = eff.dual(2, (nameOrNode, initialScope) => {
@@ -41,7 +41,7 @@ function getVariableNode(variable, at) {
       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)):
+    case (def.type === scopeManager.DefinitionType.Parameter && AST2__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;
@@ -133,40 +133,6 @@ function getVariables(initialScope) {
   }
   return variables.reverse();
 }
-function isInitializedFromSource(name, source, initialScope) {
-  const latestDef = findVariable2(name, initialScope)?.defs.at(-1);
-  if (latestDef == null) return false;
-  const { node, parent } = latestDef;
-  if (node.type === types.AST_NODE_TYPES.VariableDeclarator && node.init != null) {
-    const { init } = node;
-    if (init.type === types.AST_NODE_TYPES.MemberExpression && init.object.type === types.AST_NODE_TYPES.Identifier) {
-      return isInitializedFromSource(init.object.name, source, initialScope);
-    }
-    if (init.type === types.AST_NODE_TYPES.Identifier) {
-      return isInitializedFromSource(init.name, source, initialScope);
-    }
-    const args = getRequireExpressionArguments(init);
-    const arg0 = args?.[0];
-    if (arg0 == null || !AST3__namespace.isStringLiteral(arg0)) {
-      return false;
-    }
-    return arg0.value === source || arg0.value.startsWith(`${source}/`);
-  }
-  return parent?.type === types.AST_NODE_TYPES.ImportDeclaration && parent.source.value === source;
-}
-function getRequireExpressionArguments(node) {
-  switch (true) {
-    // require('source')
-    case (node.type === types.AST_NODE_TYPES.CallExpression && node.callee.type === types.AST_NODE_TYPES.Identifier && node.callee.name === "require"): {
-      return node.arguments;
-    }
-    // require('source').variable
-    case node.type === types.AST_NODE_TYPES.MemberExpression: {
-      return getRequireExpressionArguments(node.object);
-    }
-  }
-  return eff._;
-}
 function toStaticValue(lazyValue) {
   const { kind, node, initialScope } = lazyValue;
   if (kind !== "lazy") {
@@ -207,14 +173,14 @@ function isNodeValueEqual(a, b, initialScopes) {
       const aDefParentParent = aDef?.parent?.parent;
       const bDefParentParent = bDef?.parent?.parent;
       switch (true) {
-        case (aVarNodeParent?.type === types.AST_NODE_TYPES.CallExpression && bVarNodeParent?.type === types.AST_NODE_TYPES.CallExpression && AST3__namespace.isFunction(aVarNode) && AST3__namespace.isFunction(bVarNode)): {
-          if (!AST3__namespace.isNodeEqual(aVarNodeParent.callee, bVarNodeParent.callee)) {
+        case (aVarNodeParent?.type === types.AST_NODE_TYPES.CallExpression && bVarNodeParent?.type === types.AST_NODE_TYPES.CallExpression && AST2__namespace.isFunction(aVarNode) && AST2__namespace.isFunction(bVarNode)): {
+          if (!AST2__namespace.isNodeEqual(aVarNodeParent.callee, bVarNodeParent.callee)) {
             return false;
           }
           const aParams = aVarNode.params;
           const bParams = bVarNode.params;
-          const aPos = aParams.findIndex((x) => AST3__namespace.isNodeEqual(x, a));
-          const bPos = bParams.findIndex((x) => AST3__namespace.isNodeEqual(x, b));
+          const aPos = aParams.findIndex((x) => AST2__namespace.isNodeEqual(x, a));
+          const bPos = bParams.findIndex((x) => AST2__namespace.isNodeEqual(x, b));
           return aPos !== -1 && bPos !== -1 && aPos === bPos;
         }
         case (aDefParentParent?.type === types.AST_NODE_TYPES.ForOfStatement && bDefParentParent?.type === types.AST_NODE_TYPES.ForOfStatement): {
@@ -225,7 +191,7 @@ function isNodeValueEqual(a, b, initialScopes) {
           }
           const aRight = aDefParentParent.right;
           const bRight = bDefParentParent.right;
-          return AST3__namespace.isNodeEqual(aRight, bRight);
+          return AST2__namespace.isNodeEqual(aRight, bRight);
         }
         default: {
           return aVar != null && bVar != null && aVar === bVar;
@@ -233,14 +199,14 @@ function isNodeValueEqual(a, b, initialScopes) {
       }
     }
     case (a.type === types.AST_NODE_TYPES.MemberExpression && b.type === types.AST_NODE_TYPES.MemberExpression): {
-      return AST3__namespace.isNodeEqual(a.property, b.property) && isNodeValueEqual(a.object, b.object, initialScopes);
+      return AST2__namespace.isNodeEqual(a.property, b.property) && isNodeValueEqual(a.object, b.object, initialScopes);
     }
     case (a.type === types.AST_NODE_TYPES.ThisExpression && b.type === types.AST_NODE_TYPES.ThisExpression): {
       if (aScope.block === bScope.block) {
         return true;
       }
-      const aFunction = AST3__namespace.findParentNode(a, AST3__namespace.isOneOf(thisBlockTypes));
-      const bFunction = AST3__namespace.findParentNode(b, AST3__namespace.isOneOf(thisBlockTypes));
+      const aFunction = AST2__namespace.findParentNode(a, AST2__namespace.isOneOf(thisBlockTypes));
+      const bFunction = AST2__namespace.findParentNode(b, AST2__namespace.isOneOf(thisBlockTypes));
       return aFunction === bFunction;
     }
     default: {
@@ -251,7 +217,7 @@ function isNodeValueEqual(a, b, initialScopes) {
   }
 }
 function isVariableIdEqual(a, b, initialScopes) {
-  return AST3__namespace.isNodeEqual(a, b) || isNodeValueEqual(a, b, initialScopes);
+  return AST2__namespace.isNodeEqual(a, b) || isNodeValueEqual(a, b, initialScopes);
 }
 var ValueConstructionHint = {
   None: 0n,
@@ -337,7 +303,6 @@ exports.getVariableDeclaratorId = getVariableDeclaratorId;
 exports.getVariableId = getVariableId;
 exports.getVariableNode = getVariableNode;
 exports.getVariables = getVariables;
-exports.isInitializedFromSource = isInitializedFromSource;
 exports.isNodeValueEqual = isNodeValueEqual;
 exports.isVariableIdEqual = isVariableIdEqual;
 exports.toStaticValue = toStaticValue;

package/dist/index.mjs

@@ -2,7 +2,7 @@ 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 * as AST3 from '@eslint-react/ast';
+import * as AST2 from '@eslint-react/ast';
 import { DefinitionType, ScopeType } from '@typescript-eslint/scope-manager';
 
 // src/find-property-in-properties.ts
@@ -19,7 +19,7 @@ function getVariableNode(variable, at) {
       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)):
+    case (def.type === DefinitionType.Parameter && AST2.isFunction(def.node)):
       return def.node;
     case ("init" in def.node && def.node.init != null && !("declarations" in def.node.init)):
       return def.node.init;
@@ -111,40 +111,6 @@ function getVariables(initialScope) {
   }
   return variables.reverse();
 }
-function isInitializedFromSource(name, source, initialScope) {
-  const latestDef = findVariable2(name, initialScope)?.defs.at(-1);
-  if (latestDef == null) return false;
-  const { node, parent } = latestDef;
-  if (node.type === AST_NODE_TYPES.VariableDeclarator && node.init != null) {
-    const { init } = node;
-    if (init.type === AST_NODE_TYPES.MemberExpression && init.object.type === AST_NODE_TYPES.Identifier) {
-      return isInitializedFromSource(init.object.name, source, initialScope);
-    }
-    if (init.type === AST_NODE_TYPES.Identifier) {
-      return isInitializedFromSource(init.name, source, initialScope);
-    }
-    const args = getRequireExpressionArguments(init);
-    const arg0 = args?.[0];
-    if (arg0 == null || !AST3.isStringLiteral(arg0)) {
-      return false;
-    }
-    return arg0.value === source || arg0.value.startsWith(`${source}/`);
-  }
-  return parent?.type === AST_NODE_TYPES.ImportDeclaration && parent.source.value === source;
-}
-function getRequireExpressionArguments(node) {
-  switch (true) {
-    // require('source')
-    case (node.type === AST_NODE_TYPES.CallExpression && node.callee.type === AST_NODE_TYPES.Identifier && node.callee.name === "require"): {
-      return node.arguments;
-    }
-    // require('source').variable
-    case node.type === AST_NODE_TYPES.MemberExpression: {
-      return getRequireExpressionArguments(node.object);
-    }
-  }
-  return _;
-}
 function toStaticValue(lazyValue) {
   const { kind, node, initialScope } = lazyValue;
   if (kind !== "lazy") {
@@ -185,14 +151,14 @@ 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 && AST3.isFunction(aVarNode) && AST3.isFunction(bVarNode)): {
-          if (!AST3.isNodeEqual(aVarNodeParent.callee, bVarNodeParent.callee)) {
+        case (aVarNodeParent?.type === AST_NODE_TYPES.CallExpression && bVarNodeParent?.type === AST_NODE_TYPES.CallExpression && AST2.isFunction(aVarNode) && AST2.isFunction(bVarNode)): {
+          if (!AST2.isNodeEqual(aVarNodeParent.callee, bVarNodeParent.callee)) {
             return false;
           }
           const aParams = aVarNode.params;
           const bParams = bVarNode.params;
-          const aPos = aParams.findIndex((x) => AST3.isNodeEqual(x, a));
-          const bPos = bParams.findIndex((x) => AST3.isNodeEqual(x, b));
+          const aPos = aParams.findIndex((x) => AST2.isNodeEqual(x, a));
+          const bPos = bParams.findIndex((x) => AST2.isNodeEqual(x, b));
           return aPos !== -1 && bPos !== -1 && aPos === bPos;
         }
         case (aDefParentParent?.type === AST_NODE_TYPES.ForOfStatement && bDefParentParent?.type === AST_NODE_TYPES.ForOfStatement): {
@@ -203,7 +169,7 @@ function isNodeValueEqual(a, b, initialScopes) {
           }
           const aRight = aDefParentParent.right;
           const bRight = bDefParentParent.right;
-          return AST3.isNodeEqual(aRight, bRight);
+          return AST2.isNodeEqual(aRight, bRight);
         }
         default: {
           return aVar != null && bVar != null && aVar === bVar;
@@ -211,14 +177,14 @@ function isNodeValueEqual(a, b, initialScopes) {
       }
     }
     case (a.type === AST_NODE_TYPES.MemberExpression && b.type === AST_NODE_TYPES.MemberExpression): {
-      return AST3.isNodeEqual(a.property, b.property) && isNodeValueEqual(a.object, b.object, initialScopes);
+      return AST2.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;
       }
-      const aFunction = AST3.findParentNode(a, AST3.isOneOf(thisBlockTypes));
-      const bFunction = AST3.findParentNode(b, AST3.isOneOf(thisBlockTypes));
+      const aFunction = AST2.findParentNode(a, AST2.isOneOf(thisBlockTypes));
+      const bFunction = AST2.findParentNode(b, AST2.isOneOf(thisBlockTypes));
       return aFunction === bFunction;
     }
     default: {
@@ -229,7 +195,7 @@ function isNodeValueEqual(a, b, initialScopes) {
   }
 }
 function isVariableIdEqual(a, b, initialScopes) {
-  return AST3.isNodeEqual(a, b) || isNodeValueEqual(a, b, initialScopes);
+  return AST2.isNodeEqual(a, b) || isNodeValueEqual(a, b, initialScopes);
 }
 var ValueConstructionHint = {
   None: 0n,
@@ -306,4 +272,4 @@ function getValueConstruction(node, initialScope, hint = ValueConstructionHint.N
   }
 }
 
-export { ValueConstructionHint, findPropertyInProperties, findVariable2 as findVariable, getChidScopes, getValueConstruction, getVariableDeclaratorId, getVariableId, getVariableNode, getVariables, isInitializedFromSource, isNodeValueEqual, isVariableIdEqual, toStaticValue };
+export { ValueConstructionHint, findPropertyInProperties, findVariable2 as findVariable, getChidScopes, getValueConstruction, getVariableDeclaratorId, getVariableId, getVariableNode, getVariables, isNodeValueEqual, isVariableIdEqual, toStaticValue };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/var",
-  "version": "1.28.0-next.1",
+  "version": "1.28.0-next.3",
   "description": "ESLint React's TSESTree AST utility module for static analysis of variables.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -40,8 +40,8 @@
     "@typescript-eslint/utils": "^8.25.0",
     "string-ts": "^2.2.1",
     "ts-pattern": "^5.6.2",
-    "@eslint-react/ast": "1.28.0-next.1",
-    "@eslint-react/eff": "1.28.0-next.1"
+    "@eslint-react/ast": "1.28.0-next.3",
+    "@eslint-react/eff": "1.28.0-next.3"
   },
   "devDependencies": {
     "tsup": "^8.3.6",