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

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 import * as effect_Unify from 'effect/Unify';
 import { Data, O } from '@eslint-react/eff';
 import * as _typescript_eslint_scope_manager from '@typescript-eslint/scope-manager';
-import { Scope, Variable, ScopeManager, Definition } from '@typescript-eslint/scope-manager';
+import { Scope, Variable, ScopeManager } from '@typescript-eslint/scope-manager';
 import { TSESTree } from '@typescript-eslint/types';
 
 type Construction = Data.TaggedEnum<{
@@ -456,13 +456,6 @@ declare function getStaticValue(node: TSESTree.Node, initialScope: Scope): O.Opt
 
 declare function getVariableDeclaratorID(node: TSESTree.Node, prev?: TSESTree.Node): O.Option<TSESTree.BindingName | TSESTree.Expression>;
 
-/**
- * Get the init node of the nth definition of a variable
- * @param at The index number of def in defs
- * @returns A function that takes a variable and returns the init node of the nth definition of that variable
- */
-declare function getVariableDef(at: number): (variable: Variable) => O.Option<Definition>;
-
 /**
  * Get the init node of the nth definition of a variable
  * @param at The index number of def in defs
@@ -498,4 +491,4 @@ declare function isNodeValueEqual(a: TSESTree.Node, b: TSESTree.Node, initialSco
     bScope: Scope
 ]): boolean;
 
-export { Construction, ConstructionHint, findVariable, getChidScopes, getScope, getStaticValue, getVariableDeclaratorID, getVariableDef, getVariableNode, getVariables, inspectConstruction, isInitializedFromSource, isNodeValueEqual };
+export { Construction, ConstructionHint, findVariable, getChidScopes, getScope, getStaticValue, getVariableDeclaratorID, getVariableNode, getVariables, inspectConstruction, isInitializedFromSource, isNodeValueEqual };

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import * as effect_Unify from 'effect/Unify';
 import { Data, O } from '@eslint-react/eff';
 import * as _typescript_eslint_scope_manager from '@typescript-eslint/scope-manager';
-import { Scope, Variable, ScopeManager, Definition } from '@typescript-eslint/scope-manager';
+import { Scope, Variable, ScopeManager } from '@typescript-eslint/scope-manager';
 import { TSESTree } from '@typescript-eslint/types';
 
 type Construction = Data.TaggedEnum<{
@@ -456,13 +456,6 @@ declare function getStaticValue(node: TSESTree.Node, initialScope: Scope): O.Opt
 
 declare function getVariableDeclaratorID(node: TSESTree.Node, prev?: TSESTree.Node): O.Option<TSESTree.BindingName | TSESTree.Expression>;
 
-/**
- * Get the init node of the nth definition of a variable
- * @param at The index number of def in defs
- * @returns A function that takes a variable and returns the init node of the nth definition of that variable
- */
-declare function getVariableDef(at: number): (variable: Variable) => O.Option<Definition>;
-
 /**
  * Get the init node of the nth definition of a variable
  * @param at The index number of def in defs
@@ -498,4 +491,4 @@ declare function isNodeValueEqual(a: TSESTree.Node, b: TSESTree.Node, initialSco
     bScope: Scope
 ]): boolean;
 
-export { Construction, ConstructionHint, findVariable, getChidScopes, getScope, getStaticValue, getVariableDeclaratorID, getVariableDef, getVariableNode, getVariables, inspectConstruction, isInitializedFromSource, isNodeValueEqual };
+export { Construction, ConstructionHint, findVariable, getChidScopes, getScope, getStaticValue, getVariableDeclaratorID, getVariableNode, getVariables, inspectConstruction, isInitializedFromSource, isNodeValueEqual };

package/dist/index.js

@@ -157,16 +157,11 @@ function getVariableDeclaratorID(node, prev) {
       return getVariableDeclaratorID(node.parent, node);
   }
 }
-function getVariableDef(at) {
-  return (variable) => {
-    return eff.O.fromNullable(variable.defs[at]);
-  };
-}
 function getVariableNode(at) {
   return (variable) => {
     return eff.F.pipe(
       eff.O.some(variable),
-      eff.O.flatMap(getVariableDef(at)),
+      eff.O.flatMapNullable((v) => v.defs.at(at)),
       eff.O.flatMapNullable((def) => {
         switch (true) {
           case (def.type === scopeManager.DefinitionType.FunctionName && def.node.type === types.AST_NODE_TYPES.FunctionDeclaration):
@@ -196,8 +191,7 @@ function getVariables(initialScope) {
 function isInitializedFromSource(name, source, initialScope) {
   const maybeLatestDef = eff.O.flatMapNullable(findVariable2(name, initialScope), (v) => v.defs.at(-1));
   if (eff.O.isNone(maybeLatestDef)) return false;
-  const latestDef = maybeLatestDef.value;
-  const { node, parent } = latestDef;
+  const { node, parent } = maybeLatestDef.value;
   if (node.type === types.AST_NODE_TYPES.VariableDeclarator && node.init) {
     const { init } = node;
     if (init.type === types.AST_NODE_TYPES.MemberExpression && init.object.type === types.AST_NODE_TYPES.Identifier) {
@@ -206,27 +200,29 @@ function isInitializedFromSource(name, source, initialScope) {
     if (init.type === types.AST_NODE_TYPES.Identifier) {
       return isInitializedFromSource(init.name, source, initialScope);
     }
-    const maybeRequireExpression = tsPattern.match(init).with({
-      type: types.AST_NODE_TYPES.CallExpression,
-      callee: { type: types.AST_NODE_TYPES.Identifier, name: "require" }
-    }, (exp) => eff.O.some(exp)).with(
-      {
-        type: types.AST_NODE_TYPES.MemberExpression,
-        object: {
-          type: types.AST_NODE_TYPES.CallExpression,
-          callee: { type: types.AST_NODE_TYPES.Identifier, name: "require" }
-        }
-      },
-      ({ object }) => eff.O.some(object)
-    ).otherwise(eff.O.none);
-    if (eff.O.isNone(maybeRequireExpression)) return false;
-    const requireExpression = maybeRequireExpression.value;
-    const [firstArg] = requireExpression.arguments;
-    if (firstArg?.type !== types.AST_NODE_TYPES.Literal || !eff.isString(firstArg.value)) return false;
-    return firstArg.value === source || firstArg.value.startsWith(`${source}/`);
+    return eff.F.pipe(
+      getRequireExpressionArgument(init),
+      eff.O.flatMapNullable((args) => args[0]),
+      eff.O.filter(AST__namespace.isStringLiteral),
+      // check for: `require('source')` or `require('source/...')`
+      eff.O.exists((arg) => arg.value === source || arg.value.startsWith(`${source}/`))
+    );
   }
   return tsPattern.isMatching({ type: "ImportDeclaration", source: { value: source } }, parent);
 }
+function getRequireExpressionArgument(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 eff.O.some(node.arguments);
+    }
+    // require('source').variable
+    case node.type === types.AST_NODE_TYPES.MemberExpression: {
+      return getRequireExpressionArgument(node.object);
+    }
+  }
+  return eff.O.none();
+}
 var thisBlockTypes = [
   types.AST_NODE_TYPES.FunctionDeclaration,
   types.AST_NODE_TYPES.FunctionExpression,
@@ -249,8 +245,8 @@ function isNodeValueEqual(a, b, initialScopes) {
       const bVarNode = eff.O.flatMap(bVar, getVariableNode(0));
       const aVarNodeParent = eff.O.flatMapNullable(aVarNode, (n) => n.parent);
       const bVarNodeParent = eff.O.flatMapNullable(bVarNode, (n) => n.parent);
-      const aDef = eff.O.flatMap(aVar, getVariableDef(0));
-      const bDef = eff.O.flatMap(bVar, getVariableDef(0));
+      const aDef = eff.O.flatMapNullable(aVar, (v) => v.defs.at(0));
+      const bDef = eff.O.flatMapNullable(bVar, (v) => v.defs.at(0));
       const aDefParentParent = eff.O.flatMapNullable(aDef, (d) => d.parent?.parent);
       const bDefParentParent = eff.O.flatMapNullable(bDef, (d) => d.parent?.parent);
       switch (true) {
@@ -318,7 +314,6 @@ exports.getChidScopes = getChidScopes;
 exports.getScope = getScope;
 exports.getStaticValue = getStaticValue2;
 exports.getVariableDeclaratorID = getVariableDeclaratorID;
-exports.getVariableDef = getVariableDef;
 exports.getVariableNode = getVariableNode;
 exports.getVariables = getVariables;
 exports.inspectConstruction = inspectConstruction;

package/dist/index.mjs

@@ -1,8 +1,8 @@
 import * as AST from '@eslint-react/ast';
-import { Data, F, O, isString, Equal, isNullable, isObject } from '@eslint-react/eff';
+import { Data, F, O, Equal, isNullable, isString, isObject } from '@eslint-react/eff';
 import { DefinitionType, ScopeType } from '@typescript-eslint/scope-manager';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
-import { match, isMatching } from 'ts-pattern';
+import { isMatching, match } from 'ts-pattern';
 import * as ASTUtils from '@typescript-eslint/utils/ast-utils';
 
 // src/construction.ts
@@ -134,16 +134,11 @@ function getVariableDeclaratorID(node, prev) {
       return getVariableDeclaratorID(node.parent, node);
   }
 }
-function getVariableDef(at) {
-  return (variable) => {
-    return O.fromNullable(variable.defs[at]);
-  };
-}
 function getVariableNode(at) {
   return (variable) => {
     return F.pipe(
       O.some(variable),
-      O.flatMap(getVariableDef(at)),
+      O.flatMapNullable((v) => v.defs.at(at)),
       O.flatMapNullable((def) => {
         switch (true) {
           case (def.type === DefinitionType.FunctionName && def.node.type === AST_NODE_TYPES.FunctionDeclaration):
@@ -173,8 +168,7 @@ function getVariables(initialScope) {
 function isInitializedFromSource(name, source, initialScope) {
   const maybeLatestDef = O.flatMapNullable(findVariable2(name, initialScope), (v) => v.defs.at(-1));
   if (O.isNone(maybeLatestDef)) return false;
-  const latestDef = maybeLatestDef.value;
-  const { node, parent } = latestDef;
+  const { node, parent } = maybeLatestDef.value;
   if (node.type === AST_NODE_TYPES.VariableDeclarator && node.init) {
     const { init } = node;
     if (init.type === AST_NODE_TYPES.MemberExpression && init.object.type === AST_NODE_TYPES.Identifier) {
@@ -183,27 +177,29 @@ function isInitializedFromSource(name, source, initialScope) {
     if (init.type === AST_NODE_TYPES.Identifier) {
       return isInitializedFromSource(init.name, source, initialScope);
     }
-    const maybeRequireExpression = match(init).with({
-      type: AST_NODE_TYPES.CallExpression,
-      callee: { type: AST_NODE_TYPES.Identifier, name: "require" }
-    }, (exp) => O.some(exp)).with(
-      {
-        type: AST_NODE_TYPES.MemberExpression,
-        object: {
-          type: AST_NODE_TYPES.CallExpression,
-          callee: { type: AST_NODE_TYPES.Identifier, name: "require" }
-        }
-      },
-      ({ object }) => O.some(object)
-    ).otherwise(O.none);
-    if (O.isNone(maybeRequireExpression)) return false;
-    const requireExpression = maybeRequireExpression.value;
-    const [firstArg] = requireExpression.arguments;
-    if (firstArg?.type !== AST_NODE_TYPES.Literal || !isString(firstArg.value)) return false;
-    return firstArg.value === source || firstArg.value.startsWith(`${source}/`);
+    return F.pipe(
+      getRequireExpressionArgument(init),
+      O.flatMapNullable((args) => args[0]),
+      O.filter(AST.isStringLiteral),
+      // check for: `require('source')` or `require('source/...')`
+      O.exists((arg) => arg.value === source || arg.value.startsWith(`${source}/`))
+    );
   }
   return isMatching({ type: "ImportDeclaration", source: { value: source } }, parent);
 }
+function getRequireExpressionArgument(node) {
+  switch (true) {
+    // require('source')
+    case (node.type === AST_NODE_TYPES.CallExpression && node.callee.type === AST_NODE_TYPES.Identifier && node.callee.name === "require"): {
+      return O.some(node.arguments);
+    }
+    // require('source').variable
+    case node.type === AST_NODE_TYPES.MemberExpression: {
+      return getRequireExpressionArgument(node.object);
+    }
+  }
+  return O.none();
+}
 var thisBlockTypes = [
   AST_NODE_TYPES.FunctionDeclaration,
   AST_NODE_TYPES.FunctionExpression,
@@ -226,8 +222,8 @@ function isNodeValueEqual(a, b, initialScopes) {
       const bVarNode = O.flatMap(bVar, getVariableNode(0));
       const aVarNodeParent = O.flatMapNullable(aVarNode, (n) => n.parent);
       const bVarNodeParent = O.flatMapNullable(bVarNode, (n) => n.parent);
-      const aDef = O.flatMap(aVar, getVariableDef(0));
-      const bDef = O.flatMap(bVar, getVariableDef(0));
+      const aDef = O.flatMapNullable(aVar, (v) => v.defs.at(0));
+      const bDef = O.flatMapNullable(bVar, (v) => v.defs.at(0));
       const aDefParentParent = O.flatMapNullable(aDef, (d) => d.parent?.parent);
       const bDefParentParent = O.flatMapNullable(bDef, (d) => d.parent?.parent);
       switch (true) {
@@ -288,4 +284,4 @@ function isNodeValueEqual(a, b, initialScopes) {
   }
 }
 
-export { Construction, ConstructionHint, findVariable2 as findVariable, getChidScopes, getScope, getStaticValue2 as getStaticValue, getVariableDeclaratorID, getVariableDef, getVariableNode, getVariables, inspectConstruction, isInitializedFromSource, isNodeValueEqual };
+export { Construction, ConstructionHint, findVariable2 as findVariable, getChidScopes, getScope, getStaticValue2 as getStaticValue, getVariableDeclaratorID, getVariableNode, getVariables, inspectConstruction, isInitializedFromSource, isNodeValueEqual };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/var",
-  "version": "1.22.1-beta.0",
+  "version": "1.22.1-next.1",
   "description": "ESLint React's TSESTree AST utility module for static analysis of variables",
   "homepage": "https://github.com/rel1cx/eslint-react",
   "bugs": {
@@ -39,9 +39,9 @@
     "@typescript-eslint/types": "^8.18.1",
     "@typescript-eslint/utils": "^8.18.1",
     "ts-pattern": "^5.6.0",
-    "@eslint-react/ast": "1.22.1-beta.0",
-    "@eslint-react/types": "1.22.1-beta.0",
-    "@eslint-react/eff": "1.22.1-beta.0"
+    "@eslint-react/ast": "1.22.1-next.1",
+    "@eslint-react/types": "1.22.1-next.1",
+    "@eslint-react/eff": "1.22.1-next.1"
   },
   "devDependencies": {
     "string-ts": "^2.2.0",