@eslint-react/ast 1.24.0-next.0 → 1.24.0-next.11

package/dist/index.d.mts

@@ -5,39 +5,24 @@ import { SyntaxKind } from 'typescript';
 import { AST_NODE_TYPES as AST_NODE_TYPES$1 } from '@typescript-eslint/typescript-estree';
 
 /**
- * Find the first parent node that satisfies the test
- * @param node The node to start searching
- * @param test The test function
- * @returns The first parent node that satisfies the test or undefined if not found
- */
-declare const findParentNode: {
-    (node: TSESTree.Node | _, test: (node: TSESTree.Node) => boolean): TSESTree.Node | _;
-    (test: (node: TSESTree.Node) => boolean): (node: TSESTree.Node) => TSESTree.Node | _;
-};
-
-/**
- * Find the first parent node that satisfies the test
- * @param node The node to start searching
- * @param predicate The type guard function
- * @returns The first parent node that satisfies the test or undefined if not found
+ * Find the parent node that satisfies the predicate function
+ * @param node The AST node
+ * @param predicate The predicate function
+ * @returns The parent node that satisfies the predicate or `undefined` if not found
  */
-declare const findParentNodeGuard: {
-    <T extends TSESTree.Node>(node: TSESTree.Node | _, predicate: (node: TSESTree.Node) => node is T): T | _;
-    <T extends TSESTree.Node>(predicate: (node: TSESTree.Node) => node is T): (node: TSESTree.Node | _) => T | _;
-};
-
+declare function findParentNode<A extends TSESTree.Node>(node: TSESTree.Node | _, predicate: (n: TSESTree.Node) => n is A): A | _;
 /**
- * Find the first parent node that satisfies the test and stops at the stop node
- * @param node The node to start searching
- * @param stopNode The node to stop searching
- * @param predicate The test function
- * @returns The first parent node that satisfies the test or undefined if not found
+ * Find the parent node that satisfies the test function
+ * @param node The AST node
+ * @param test The test function
+ * @returns The parent node that satisfies the test or `undefined` if not found
  */
-declare function findParentNodeStop(node: TSESTree.Node | _, stopNode: TSESTree.Node, predicate: (node: TSESTree.Node) => boolean): TSESTree.Node | _;
+declare function findParentNode(node: TSESTree.Node | _, test: (node: TSESTree.Node) => boolean): TSESTree.Node | _;
 
 type TSESTreeFunction = TSESTree$1.ArrowFunctionExpression | TSESTree$1.FunctionDeclaration | TSESTree$1.FunctionExpression;
 type TSESTreeFunctionType = TSESTree$1.TSCallSignatureDeclaration | TSESTree$1.TSConstructSignatureDeclaration | TSESTree$1.TSDeclareFunction | TSESTree$1.TSEmptyBodyFunctionExpression | TSESTree$1.TSFunctionType | TSESTree$1.TSMethodSignature | TSESTreeFunction;
 type TSESTreeClass = TSESTree$1.ClassDeclaration | TSESTree$1.ClassExpression;
+type TSESTreeMethodOrProperty = TSESTree$1.PropertyDefinition | TSESTree$1.MethodDefinition;
 type TSESTreeLoop = TSESTree$1.DoWhileStatement | TSESTree$1.ForInStatement | TSESTree$1.ForOfStatement | TSESTree$1.ForStatement | TSESTree$1.WhileStatement;
 type TSESTreeArrayTupleType = TSESTree$1.TSArrayType | TSESTree$1.TSTupleType;
 type TSESTreeProperty = TSESTree$1.PropertyDefinition | TSESTree$1.TSIndexSignature | TSESTree$1.TSParameterProperty | TSESTree$1.TSPropertySignature;
@@ -144,7 +129,7 @@ readonly [TSESTree.FunctionDeclaration]
     TSESTreeFunction
 ];
 declare function getFunctionInitPath(node: TSESTreeFunction): FunctionInitPath | _;
-declare function hasCallInFunctionInitPath(callName: string): (initPath: FunctionInitPath) => boolean;
+declare function hasCallInFunctionInitPath(callName: string, initPath: FunctionInitPath): boolean;
 
 /**
  * Gets class identifier from ClassDeclaration or ClassExpression
@@ -2358,6 +2343,7 @@ declare const isOneOf: <NodeTypes extends readonly AST_NODE_TYPES$2[]>(nodeTypes
 declare const isFunction: (node: TSESTree$1.Node | null | undefined) => node is TSESTree$1.ArrowFunctionExpression | TSESTree$1.FunctionDeclarationWithName | TSESTree$1.FunctionDeclarationWithOptionalName | TSESTree$1.FunctionExpression;
 declare const isFunctionType: (node: TSESTree$1.Node | null | undefined) => node is TSESTree$1.ArrowFunctionExpression | TSESTree$1.FunctionDeclarationWithName | TSESTree$1.FunctionDeclarationWithOptionalName | TSESTree$1.FunctionExpression | TSESTree$1.TSCallSignatureDeclaration | TSESTree$1.TSConstructSignatureDeclaration | TSESTree$1.TSDeclareFunctionNoDeclare | TSESTree$1.TSDeclareFunctionWithDeclare | TSESTree$1.TSEmptyBodyFunctionExpression | TSESTree$1.TSFunctionType | TSESTree$1.TSMethodSignatureComputedName | TSESTree$1.TSMethodSignatureNonComputedName;
 declare const isClass: (node: TSESTree$1.Node | null | undefined) => node is TSESTree$1.ClassDeclarationWithName | TSESTree$1.ClassDeclarationWithOptionalName | TSESTree$1.ClassExpression;
+declare const isMethodOrProperty: (node: TSESTree$1.Node | null | undefined) => node is TSESTree$1.MethodDefinitionComputedName | TSESTree$1.MethodDefinitionNonComputedName | TSESTree$1.PropertyDefinitionComputedName | TSESTree$1.PropertyDefinitionNonComputedName;
 declare const isLoop: (node: TSESTree$1.Node | null | undefined) => node is TSESTree$1.DoWhileStatement | TSESTree$1.ForInStatement | TSESTree$1.ForOfStatement | TSESTree$1.ForStatement | TSESTree$1.WhileStatement;
 declare const isControlFlow: (data: TSESTree$1.Node | null | undefined) => data is TSESTree$1.DoWhileStatement | TSESTree$1.ForInStatement | TSESTree$1.ForOfStatement | TSESTree$1.ForStatement | TSESTree$1.IfStatement | TSESTree$1.SwitchStatement | TSESTree$1.WhileStatement;
 declare const isConditional: (data: TSESTree$1.Node | null | undefined) => data is TSESTree$1.ConditionalExpression | TSESTree$1.DoWhileStatement | TSESTree$1.ForInStatement | TSESTree$1.ForOfStatement | TSESTree$1.ForStatement | TSESTree$1.IfStatement | TSESTree$1.LogicalExpression | TSESTree$1.SwitchStatement | TSESTree$1.WhileStatement;
@@ -2445,4 +2431,4 @@ type ReadableNodeType = ReturnType<typeof toReadableNodeType>;
 
 declare function unwrapTypeExpression(node: TSESTree.Node): TSESTree.Node;
 
-export { type FunctionInitPath, type ReadableNodeType, type TSESTreeArrayTupleType, type TSESTreeClass, type TSESTreeDestructuringPattern, type TSESTreeFunction, type TSESTreeFunctionType, type TSESTreeJSX, type TSESTreeLoop, type TSESTreeProperty, type TSESTreeTypeDeclaration, findParentNode, findParentNodeGuard, findParentNodeStop, getClassIdentifier, getFunctionIdentifier, getFunctionInitPath, getIdentifiersFromBinaryExpression, getLiteralValueType, getNestedCallExpressions, getNestedExpressionsOfType, getNestedIdentifiers, getNestedNewExpressions, getNestedReturnStatements, getTopLevelIdentifier, hasCallInFunctionInitPath, is, isArrayTupleType, isClass, isConditional, isControlFlow, isDestructuringPattern, isEmptyFunction, isFunction, isFunctionOfClassMethod, isFunctionOfClassProperty, isFunctionOfImmediatelyInvoked, isFunctionOfObjectMethod, isFunctionType, isJSX, isJSXElement, isJSXFragment, isJSXTagNameExpression, isKeyLiteralLike, isLeftHandSideExpression, isLeftHandSideExpressionType, isLoop, isMapCallLoose, isMultiLine, isNodeEqual, isOneOf, isProperty, isRegExpLiteral, isStringLiteral, isThisExpression, isTypeDeclaration, isTypeExpression, toReadableNodeName, toReadableNodeType, unwrapTypeExpression };
+export { type FunctionInitPath, type ReadableNodeType, type TSESTreeArrayTupleType, type TSESTreeClass, type TSESTreeDestructuringPattern, type TSESTreeFunction, type TSESTreeFunctionType, type TSESTreeJSX, type TSESTreeLoop, type TSESTreeMethodOrProperty, type TSESTreeProperty, type TSESTreeTypeDeclaration, findParentNode, getClassIdentifier, getFunctionIdentifier, getFunctionInitPath, getIdentifiersFromBinaryExpression, getLiteralValueType, getNestedCallExpressions, getNestedExpressionsOfType, getNestedIdentifiers, getNestedNewExpressions, getNestedReturnStatements, getTopLevelIdentifier, hasCallInFunctionInitPath, is, isArrayTupleType, isClass, isConditional, isControlFlow, isDestructuringPattern, isEmptyFunction, isFunction, isFunctionOfClassMethod, isFunctionOfClassProperty, isFunctionOfImmediatelyInvoked, isFunctionOfObjectMethod, isFunctionType, isJSX, isJSXElement, isJSXFragment, isJSXTagNameExpression, isKeyLiteralLike, isLeftHandSideExpression, isLeftHandSideExpressionType, isLoop, isMapCallLoose, isMethodOrProperty, isMultiLine, isNodeEqual, isOneOf, isProperty, isRegExpLiteral, isStringLiteral, isThisExpression, isTypeDeclaration, isTypeExpression, toReadableNodeName, toReadableNodeType, unwrapTypeExpression };

package/dist/index.d.ts

@@ -5,39 +5,24 @@ import { SyntaxKind } from 'typescript';
 import { AST_NODE_TYPES as AST_NODE_TYPES$1 } from '@typescript-eslint/typescript-estree';
 
 /**
- * Find the first parent node that satisfies the test
- * @param node The node to start searching
- * @param test The test function
- * @returns The first parent node that satisfies the test or undefined if not found
- */
-declare const findParentNode: {
-    (node: TSESTree.Node | _, test: (node: TSESTree.Node) => boolean): TSESTree.Node | _;
-    (test: (node: TSESTree.Node) => boolean): (node: TSESTree.Node) => TSESTree.Node | _;
-};
-
-/**
- * Find the first parent node that satisfies the test
- * @param node The node to start searching
- * @param predicate The type guard function
- * @returns The first parent node that satisfies the test or undefined if not found
+ * Find the parent node that satisfies the predicate function
+ * @param node The AST node
+ * @param predicate The predicate function
+ * @returns The parent node that satisfies the predicate or `undefined` if not found
  */
-declare const findParentNodeGuard: {
-    <T extends TSESTree.Node>(node: TSESTree.Node | _, predicate: (node: TSESTree.Node) => node is T): T | _;
-    <T extends TSESTree.Node>(predicate: (node: TSESTree.Node) => node is T): (node: TSESTree.Node | _) => T | _;
-};
-
+declare function findParentNode<A extends TSESTree.Node>(node: TSESTree.Node | _, predicate: (n: TSESTree.Node) => n is A): A | _;
 /**
- * Find the first parent node that satisfies the test and stops at the stop node
- * @param node The node to start searching
- * @param stopNode The node to stop searching
- * @param predicate The test function
- * @returns The first parent node that satisfies the test or undefined if not found
+ * Find the parent node that satisfies the test function
+ * @param node The AST node
+ * @param test The test function
+ * @returns The parent node that satisfies the test or `undefined` if not found
  */
-declare function findParentNodeStop(node: TSESTree.Node | _, stopNode: TSESTree.Node, predicate: (node: TSESTree.Node) => boolean): TSESTree.Node | _;
+declare function findParentNode(node: TSESTree.Node | _, test: (node: TSESTree.Node) => boolean): TSESTree.Node | _;
 
 type TSESTreeFunction = TSESTree$1.ArrowFunctionExpression | TSESTree$1.FunctionDeclaration | TSESTree$1.FunctionExpression;
 type TSESTreeFunctionType = TSESTree$1.TSCallSignatureDeclaration | TSESTree$1.TSConstructSignatureDeclaration | TSESTree$1.TSDeclareFunction | TSESTree$1.TSEmptyBodyFunctionExpression | TSESTree$1.TSFunctionType | TSESTree$1.TSMethodSignature | TSESTreeFunction;
 type TSESTreeClass = TSESTree$1.ClassDeclaration | TSESTree$1.ClassExpression;
+type TSESTreeMethodOrProperty = TSESTree$1.PropertyDefinition | TSESTree$1.MethodDefinition;
 type TSESTreeLoop = TSESTree$1.DoWhileStatement | TSESTree$1.ForInStatement | TSESTree$1.ForOfStatement | TSESTree$1.ForStatement | TSESTree$1.WhileStatement;
 type TSESTreeArrayTupleType = TSESTree$1.TSArrayType | TSESTree$1.TSTupleType;
 type TSESTreeProperty = TSESTree$1.PropertyDefinition | TSESTree$1.TSIndexSignature | TSESTree$1.TSParameterProperty | TSESTree$1.TSPropertySignature;
@@ -144,7 +129,7 @@ readonly [TSESTree.FunctionDeclaration]
     TSESTreeFunction
 ];
 declare function getFunctionInitPath(node: TSESTreeFunction): FunctionInitPath | _;
-declare function hasCallInFunctionInitPath(callName: string): (initPath: FunctionInitPath) => boolean;
+declare function hasCallInFunctionInitPath(callName: string, initPath: FunctionInitPath): boolean;
 
 /**
  * Gets class identifier from ClassDeclaration or ClassExpression
@@ -2358,6 +2343,7 @@ declare const isOneOf: <NodeTypes extends readonly AST_NODE_TYPES$2[]>(nodeTypes
 declare const isFunction: (node: TSESTree$1.Node | null | undefined) => node is TSESTree$1.ArrowFunctionExpression | TSESTree$1.FunctionDeclarationWithName | TSESTree$1.FunctionDeclarationWithOptionalName | TSESTree$1.FunctionExpression;
 declare const isFunctionType: (node: TSESTree$1.Node | null | undefined) => node is TSESTree$1.ArrowFunctionExpression | TSESTree$1.FunctionDeclarationWithName | TSESTree$1.FunctionDeclarationWithOptionalName | TSESTree$1.FunctionExpression | TSESTree$1.TSCallSignatureDeclaration | TSESTree$1.TSConstructSignatureDeclaration | TSESTree$1.TSDeclareFunctionNoDeclare | TSESTree$1.TSDeclareFunctionWithDeclare | TSESTree$1.TSEmptyBodyFunctionExpression | TSESTree$1.TSFunctionType | TSESTree$1.TSMethodSignatureComputedName | TSESTree$1.TSMethodSignatureNonComputedName;
 declare const isClass: (node: TSESTree$1.Node | null | undefined) => node is TSESTree$1.ClassDeclarationWithName | TSESTree$1.ClassDeclarationWithOptionalName | TSESTree$1.ClassExpression;
+declare const isMethodOrProperty: (node: TSESTree$1.Node | null | undefined) => node is TSESTree$1.MethodDefinitionComputedName | TSESTree$1.MethodDefinitionNonComputedName | TSESTree$1.PropertyDefinitionComputedName | TSESTree$1.PropertyDefinitionNonComputedName;
 declare const isLoop: (node: TSESTree$1.Node | null | undefined) => node is TSESTree$1.DoWhileStatement | TSESTree$1.ForInStatement | TSESTree$1.ForOfStatement | TSESTree$1.ForStatement | TSESTree$1.WhileStatement;
 declare const isControlFlow: (data: TSESTree$1.Node | null | undefined) => data is TSESTree$1.DoWhileStatement | TSESTree$1.ForInStatement | TSESTree$1.ForOfStatement | TSESTree$1.ForStatement | TSESTree$1.IfStatement | TSESTree$1.SwitchStatement | TSESTree$1.WhileStatement;
 declare const isConditional: (data: TSESTree$1.Node | null | undefined) => data is TSESTree$1.ConditionalExpression | TSESTree$1.DoWhileStatement | TSESTree$1.ForInStatement | TSESTree$1.ForOfStatement | TSESTree$1.ForStatement | TSESTree$1.IfStatement | TSESTree$1.LogicalExpression | TSESTree$1.SwitchStatement | TSESTree$1.WhileStatement;
@@ -2445,4 +2431,4 @@ type ReadableNodeType = ReturnType<typeof toReadableNodeType>;
 
 declare function unwrapTypeExpression(node: TSESTree.Node): TSESTree.Node;
 
-export { type FunctionInitPath, type ReadableNodeType, type TSESTreeArrayTupleType, type TSESTreeClass, type TSESTreeDestructuringPattern, type TSESTreeFunction, type TSESTreeFunctionType, type TSESTreeJSX, type TSESTreeLoop, type TSESTreeProperty, type TSESTreeTypeDeclaration, findParentNode, findParentNodeGuard, findParentNodeStop, getClassIdentifier, getFunctionIdentifier, getFunctionInitPath, getIdentifiersFromBinaryExpression, getLiteralValueType, getNestedCallExpressions, getNestedExpressionsOfType, getNestedIdentifiers, getNestedNewExpressions, getNestedReturnStatements, getTopLevelIdentifier, hasCallInFunctionInitPath, is, isArrayTupleType, isClass, isConditional, isControlFlow, isDestructuringPattern, isEmptyFunction, isFunction, isFunctionOfClassMethod, isFunctionOfClassProperty, isFunctionOfImmediatelyInvoked, isFunctionOfObjectMethod, isFunctionType, isJSX, isJSXElement, isJSXFragment, isJSXTagNameExpression, isKeyLiteralLike, isLeftHandSideExpression, isLeftHandSideExpressionType, isLoop, isMapCallLoose, isMultiLine, isNodeEqual, isOneOf, isProperty, isRegExpLiteral, isStringLiteral, isThisExpression, isTypeDeclaration, isTypeExpression, toReadableNodeName, toReadableNodeType, unwrapTypeExpression };
+export { type FunctionInitPath, type ReadableNodeType, type TSESTreeArrayTupleType, type TSESTreeClass, type TSESTreeDestructuringPattern, type TSESTreeFunction, type TSESTreeFunctionType, type TSESTreeJSX, type TSESTreeLoop, type TSESTreeMethodOrProperty, type TSESTreeProperty, type TSESTreeTypeDeclaration, findParentNode, getClassIdentifier, getFunctionIdentifier, getFunctionInitPath, getIdentifiersFromBinaryExpression, getLiteralValueType, getNestedCallExpressions, getNestedExpressionsOfType, getNestedIdentifiers, getNestedNewExpressions, getNestedReturnStatements, getTopLevelIdentifier, hasCallInFunctionInitPath, is, isArrayTupleType, isClass, isConditional, isControlFlow, isDestructuringPattern, isEmptyFunction, isFunction, isFunctionOfClassMethod, isFunctionOfClassProperty, isFunctionOfImmediatelyInvoked, isFunctionOfObjectMethod, isFunctionType, isJSX, isJSXElement, isJSXFragment, isJSXTagNameExpression, isKeyLiteralLike, isLeftHandSideExpression, isLeftHandSideExpressionType, isLoop, isMapCallLoose, isMethodOrProperty, isMultiLine, isNodeEqual, isOneOf, isProperty, isRegExpLiteral, isStringLiteral, isThisExpression, isTypeDeclaration, isTypeExpression, toReadableNodeName, toReadableNodeType, unwrapTypeExpression };

package/dist/index.js

@@ -8,38 +8,16 @@ var tsPattern = require('ts-pattern');
 var stringTs = require('string-ts');
 
 // src/find-parent-node.ts
-var findParentNode = eff.dual(2, (node, test) => {
-  if (node === eff._) return eff._;
+function findParentNode(node, test) {
+  if (node == null) return eff._;
   let parent = node.parent;
-  while (parent && parent.type !== types.AST_NODE_TYPES.Program) {
+  while (parent != null && parent.type !== types.AST_NODE_TYPES.Program) {
     if (test(parent)) {
       return parent;
     }
     parent = parent.parent;
   }
   return eff._;
-});
-var findParentNodeGuard = eff.dual(2, (node, predicate) => {
-  if (node === eff._) return eff._;
-  let parent = node.parent;
-  while (parent) {
-    if (predicate(parent)) {
-      return parent;
-    }
-    parent = parent.parent;
-  }
-  return eff._;
-});
-function findParentNodeStop(node, stopNode, predicate) {
-  if (node === eff._) return eff._;
-  let parent = node.parent;
-  while (parent && parent !== stopNode && parent.type !== types.AST_NODE_TYPES.Program) {
-    if (predicate(parent)) {
-      return parent;
-    }
-    parent = parent.parent;
-  }
-  return eff._;
 }
 function getFunctionInitPath(node) {
   const { parent } = node;
@@ -97,25 +75,23 @@ function getFunctionInitPath(node) {
   }
   return eff._;
 }
-function hasCallInFunctionInitPath(callName) {
-  return (initPath) => {
-    return initPath.some((n) => {
-      if (n.type !== types.AST_NODE_TYPES.CallExpression) {
+function hasCallInFunctionInitPath(callName, initPath) {
+  return initPath.some((n) => {
+    if (n.type !== types.AST_NODE_TYPES.CallExpression) {
+      return false;
+    }
+    switch (n.callee.type) {
+      case types.AST_NODE_TYPES.Identifier:
+        return n.callee.name === callName;
+      case types.AST_NODE_TYPES.MemberExpression:
+        return "name" in n.callee.property && n.callee.property.name === callName;
+      default:
         return false;
-      }
-      switch (n.callee.type) {
-        case types.AST_NODE_TYPES.Identifier:
-          return n.callee.name === callName;
-        case types.AST_NODE_TYPES.MemberExpression:
-          return "name" in n.callee.property && n.callee.property.name === callName;
-        default:
-          return false;
-      }
-    });
-  };
+    }
+  });
 }
 function getClassIdentifier(node) {
-  if (node.id) return node.id;
+  if (node.id != null) return node.id;
   if (node.parent.type === types.AST_NODE_TYPES.VariableDeclarator && node.parent.id.type === types.AST_NODE_TYPES.Identifier) {
     return node.parent.id;
   }
@@ -140,6 +116,10 @@ var isFunctionType = isOneOf([
   types.AST_NODE_TYPES.TSMethodSignature
 ]);
 var isClass = isOneOf([types.AST_NODE_TYPES.ClassDeclaration, types.AST_NODE_TYPES.ClassExpression]);
+var isMethodOrProperty = isOneOf([
+  types.AST_NODE_TYPES.PropertyDefinition,
+  types.AST_NODE_TYPES.MethodDefinition
+]);
 var isLoop = isOneOf([
   types.AST_NODE_TYPES.DoWhileStatement,
   types.AST_NODE_TYPES.ForInStatement,
@@ -331,7 +311,7 @@ function getNestedExpressionsOfType(type) {
       const chunk = boundGetNestedExpressionsOfType(node.right);
       expressions.push(...chunk);
     }
-    if ("test" in node && node.test) {
+    if ("test" in node && node.test != null) {
       const chunk = boundGetNestedExpressionsOfType(node.test);
       expressions.push(...chunk);
     }
@@ -339,7 +319,7 @@ function getNestedExpressionsOfType(type) {
       const chunk = Array.isArray(node.consequent) ? node.consequent.map(boundGetNestedExpressionsOfType).flat(1) : boundGetNestedExpressionsOfType(node.consequent);
       expressions.push(...chunk);
     }
-    if ("alternate" in node && node.alternate) {
+    if ("alternate" in node && node.alternate != null) {
       const chunk = Array.isArray(node.alternate) ? node.alternate.map(boundGetNestedExpressionsOfType).flat(1) : boundGetNestedExpressionsOfType(node.alternate);
       expressions.push(...chunk);
     }
@@ -459,13 +439,13 @@ function getNestedIdentifiers(node) {
 var getNestedNewExpressions = getNestedExpressionsOfType(typescriptEstree.AST_NODE_TYPES.NewExpression);
 function getNestedReturnStatements(node) {
   const returnStatements = [];
-  const functionNode = isFunction(node) ? node : findParentNodeGuard(node, isFunction);
+  const functionNode = isFunction(node) ? node : findParentNode(node, isFunction);
   typescriptEstree.simpleTraverse(node, {
     enter(node2) {
       if (node2.type !== types.AST_NODE_TYPES.ReturnStatement) {
         return;
       }
-      const parentFunction = findParentNodeGuard(node2, isFunction);
+      const parentFunction = findParentNode(node2, isFunction);
       if (parentFunction !== functionNode) {
         return;
       }
@@ -627,8 +607,6 @@ function unwrapTypeExpression(node) {
 }
 
 exports.findParentNode = findParentNode;
-exports.findParentNodeGuard = findParentNodeGuard;
-exports.findParentNodeStop = findParentNodeStop;
 exports.getClassIdentifier = getClassIdentifier;
 exports.getFunctionIdentifier = getFunctionIdentifier;
 exports.getFunctionInitPath = getFunctionInitPath;
@@ -663,6 +641,7 @@ exports.isLeftHandSideExpression = isLeftHandSideExpression;
 exports.isLeftHandSideExpressionType = isLeftHandSideExpressionType;
 exports.isLoop = isLoop;
 exports.isMapCallLoose = isMapCallLoose;
+exports.isMethodOrProperty = isMethodOrProperty;
 exports.isMultiLine = isMultiLine;
 exports.isNodeEqual = isNodeEqual;
 exports.isOneOf = isOneOf;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { dual, _, or, returnTrue, returnFalse } from '@eslint-react/eff';
+import { or, dual, _, returnTrue, returnFalse } from '@eslint-react/eff';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import { ASTUtils } from '@typescript-eslint/utils';
 import { AST_NODE_TYPES as AST_NODE_TYPES$1, simpleTraverse } from '@typescript-eslint/typescript-estree';
@@ -6,38 +6,16 @@ import { match } from 'ts-pattern';
 import { toLowerCase, delimiterCase, replace } from 'string-ts';
 
 // src/find-parent-node.ts
-var findParentNode = dual(2, (node, test) => {
-  if (node === _) return _;
+function findParentNode(node, test) {
+  if (node == null) return _;
   let parent = node.parent;
-  while (parent && parent.type !== AST_NODE_TYPES.Program) {
+  while (parent != null && parent.type !== AST_NODE_TYPES.Program) {
     if (test(parent)) {
       return parent;
     }
     parent = parent.parent;
   }
   return _;
-});
-var findParentNodeGuard = dual(2, (node, predicate) => {
-  if (node === _) return _;
-  let parent = node.parent;
-  while (parent) {
-    if (predicate(parent)) {
-      return parent;
-    }
-    parent = parent.parent;
-  }
-  return _;
-});
-function findParentNodeStop(node, stopNode, predicate) {
-  if (node === _) return _;
-  let parent = node.parent;
-  while (parent && parent !== stopNode && parent.type !== AST_NODE_TYPES.Program) {
-    if (predicate(parent)) {
-      return parent;
-    }
-    parent = parent.parent;
-  }
-  return _;
 }
 function getFunctionInitPath(node) {
   const { parent } = node;
@@ -95,25 +73,23 @@ function getFunctionInitPath(node) {
   }
   return _;
 }
-function hasCallInFunctionInitPath(callName) {
-  return (initPath) => {
-    return initPath.some((n) => {
-      if (n.type !== AST_NODE_TYPES.CallExpression) {
+function hasCallInFunctionInitPath(callName, initPath) {
+  return initPath.some((n) => {
+    if (n.type !== AST_NODE_TYPES.CallExpression) {
+      return false;
+    }
+    switch (n.callee.type) {
+      case AST_NODE_TYPES.Identifier:
+        return n.callee.name === callName;
+      case AST_NODE_TYPES.MemberExpression:
+        return "name" in n.callee.property && n.callee.property.name === callName;
+      default:
         return false;
-      }
-      switch (n.callee.type) {
-        case AST_NODE_TYPES.Identifier:
-          return n.callee.name === callName;
-        case AST_NODE_TYPES.MemberExpression:
-          return "name" in n.callee.property && n.callee.property.name === callName;
-        default:
-          return false;
-      }
-    });
-  };
+    }
+  });
 }
 function getClassIdentifier(node) {
-  if (node.id) return node.id;
+  if (node.id != null) return node.id;
   if (node.parent.type === AST_NODE_TYPES.VariableDeclarator && node.parent.id.type === AST_NODE_TYPES.Identifier) {
     return node.parent.id;
   }
@@ -138,6 +114,10 @@ var isFunctionType = isOneOf([
   AST_NODE_TYPES.TSMethodSignature
 ]);
 var isClass = isOneOf([AST_NODE_TYPES.ClassDeclaration, AST_NODE_TYPES.ClassExpression]);
+var isMethodOrProperty = isOneOf([
+  AST_NODE_TYPES.PropertyDefinition,
+  AST_NODE_TYPES.MethodDefinition
+]);
 var isLoop = isOneOf([
   AST_NODE_TYPES.DoWhileStatement,
   AST_NODE_TYPES.ForInStatement,
@@ -329,7 +309,7 @@ function getNestedExpressionsOfType(type) {
       const chunk = boundGetNestedExpressionsOfType(node.right);
       expressions.push(...chunk);
     }
-    if ("test" in node && node.test) {
+    if ("test" in node && node.test != null) {
       const chunk = boundGetNestedExpressionsOfType(node.test);
       expressions.push(...chunk);
     }
@@ -337,7 +317,7 @@ function getNestedExpressionsOfType(type) {
       const chunk = Array.isArray(node.consequent) ? node.consequent.map(boundGetNestedExpressionsOfType).flat(1) : boundGetNestedExpressionsOfType(node.consequent);
       expressions.push(...chunk);
     }
-    if ("alternate" in node && node.alternate) {
+    if ("alternate" in node && node.alternate != null) {
       const chunk = Array.isArray(node.alternate) ? node.alternate.map(boundGetNestedExpressionsOfType).flat(1) : boundGetNestedExpressionsOfType(node.alternate);
       expressions.push(...chunk);
     }
@@ -457,13 +437,13 @@ function getNestedIdentifiers(node) {
 var getNestedNewExpressions = getNestedExpressionsOfType(AST_NODE_TYPES$1.NewExpression);
 function getNestedReturnStatements(node) {
   const returnStatements = [];
-  const functionNode = isFunction(node) ? node : findParentNodeGuard(node, isFunction);
+  const functionNode = isFunction(node) ? node : findParentNode(node, isFunction);
   simpleTraverse(node, {
     enter(node2) {
       if (node2.type !== AST_NODE_TYPES.ReturnStatement) {
         return;
       }
-      const parentFunction = findParentNodeGuard(node2, isFunction);
+      const parentFunction = findParentNode(node2, isFunction);
       if (parentFunction !== functionNode) {
         return;
       }
@@ -624,4 +604,4 @@ function unwrapTypeExpression(node) {
   return node;
 }
 
-export { findParentNode, findParentNodeGuard, findParentNodeStop, getClassIdentifier, getFunctionIdentifier, getFunctionInitPath, getIdentifiersFromBinaryExpression, getLiteralValueType, getNestedCallExpressions, getNestedExpressionsOfType, getNestedIdentifiers, getNestedNewExpressions, getNestedReturnStatements, getTopLevelIdentifier, hasCallInFunctionInitPath, is, isArrayTupleType, isClass, isConditional, isControlFlow, isDestructuringPattern, isEmptyFunction, isFunction, isFunctionOfClassMethod, isFunctionOfClassProperty, isFunctionOfImmediatelyInvoked, isFunctionOfObjectMethod, isFunctionType, isJSX, isJSXElement, isJSXFragment, isJSXTagNameExpression, isKeyLiteralLike, isLeftHandSideExpression, isLeftHandSideExpressionType, isLoop, isMapCallLoose, isMultiLine, isNodeEqual, isOneOf, isProperty, isRegExpLiteral, isStringLiteral, isThisExpression, isTypeDeclaration, isTypeExpression, toReadableNodeName, toReadableNodeType, unwrapTypeExpression };
+export { findParentNode, getClassIdentifier, getFunctionIdentifier, getFunctionInitPath, getIdentifiersFromBinaryExpression, getLiteralValueType, getNestedCallExpressions, getNestedExpressionsOfType, getNestedIdentifiers, getNestedNewExpressions, getNestedReturnStatements, getTopLevelIdentifier, hasCallInFunctionInitPath, is, isArrayTupleType, isClass, isConditional, isControlFlow, isDestructuringPattern, isEmptyFunction, isFunction, isFunctionOfClassMethod, isFunctionOfClassProperty, isFunctionOfImmediatelyInvoked, isFunctionOfObjectMethod, isFunctionType, isJSX, isJSXElement, isJSXFragment, isJSXTagNameExpression, isKeyLiteralLike, isLeftHandSideExpression, isLeftHandSideExpressionType, isLoop, isMapCallLoose, isMethodOrProperty, isMultiLine, isNodeEqual, isOneOf, isProperty, isRegExpLiteral, isStringLiteral, isThisExpression, isTypeDeclaration, isTypeExpression, toReadableNodeName, toReadableNodeType, unwrapTypeExpression };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/ast",
-  "version": "1.24.0-next.0",
+  "version": "1.24.0-next.11",
   "description": "ESLint React's TSESTree AST utility module.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -33,13 +33,12 @@
     "./package.json"
   ],
   "dependencies": {
-    "@typescript-eslint/types": "^8.19.1",
-    "@typescript-eslint/typescript-estree": "^8.19.1",
-    "@typescript-eslint/utils": "^8.19.1",
+    "@typescript-eslint/types": "^8.20.0",
+    "@typescript-eslint/typescript-estree": "^8.20.0",
+    "@typescript-eslint/utils": "^8.20.0",
     "string-ts": "^2.2.0",
     "ts-pattern": "^5.6.0",
-    "@eslint-react/eff": "1.24.0-next.0",
-    "@eslint-react/types": "1.24.0-next.0"
+    "@eslint-react/eff": "1.24.0-next.11"
   },
   "devDependencies": {
     "tsup": "^8.3.5",