@eslint-react/ast 1.23.2 → 1.23.3-beta.2

package/dist/index.d.mts

@@ -2381,14 +2381,14 @@ declare function isEmptyFunction(node: TSESTreeFunction): boolean;
  * @param node The node to check.
  * @returns `true` if the node is a function expression or arrow function expression of a class method, `false` otherwise.
  */
-declare const isFunctionOfClassMethod: (node: TSESTree.Node) => boolean;
+declare function isFunctionOfClassMethod(node: TSESTree.Node): node is TSESTree.ArrowFunctionExpression | TSESTree.FunctionExpression;
 
 /**
  * Checks if the given node is a function expression or arrow function expression of a class property.
  * @param node The node to check.
  * @returns `true` if the node is a function expression or arrow function expression of a class property, `false` otherwise.
  */
-declare const isFunctionOfClassProperty: (node: TSESTree.Node) => boolean;
+declare function isFunctionOfClassProperty(node: TSESTree.Node): node is TSESTree.ArrowFunctionExpression | TSESTree.FunctionExpression;
 
 declare function isFunctionOfImmediatelyInvoked(node: TSESTreeFunction): boolean;
 
@@ -2397,7 +2397,7 @@ declare function isFunctionOfImmediatelyInvoked(node: TSESTreeFunction): boolean
  * @param node The node to check.
  * @returns `true` if the node is a function expression or arrow function expression of a object method, `false` otherwise.
  */
-declare const isFunctionOfObjectMethod: (node: TSESTree.Node) => boolean;
+declare function isFunctionOfObjectMethod(node: TSESTree.Node): boolean;
 
 declare function isKeyLiteralLike(node: TSESTree.MemberExpression | TSESTree.MethodDefinition | TSESTree.Property | TSESTree.PropertyDefinition, property: TSESTree.Node): boolean;
 

package/dist/index.d.ts

@@ -2381,14 +2381,14 @@ declare function isEmptyFunction(node: TSESTreeFunction): boolean;
  * @param node The node to check.
  * @returns `true` if the node is a function expression or arrow function expression of a class method, `false` otherwise.
  */
-declare const isFunctionOfClassMethod: (node: TSESTree.Node) => boolean;
+declare function isFunctionOfClassMethod(node: TSESTree.Node): node is TSESTree.ArrowFunctionExpression | TSESTree.FunctionExpression;
 
 /**
  * Checks if the given node is a function expression or arrow function expression of a class property.
  * @param node The node to check.
  * @returns `true` if the node is a function expression or arrow function expression of a class property, `false` otherwise.
  */
-declare const isFunctionOfClassProperty: (node: TSESTree.Node) => boolean;
+declare function isFunctionOfClassProperty(node: TSESTree.Node): node is TSESTree.ArrowFunctionExpression | TSESTree.FunctionExpression;
 
 declare function isFunctionOfImmediatelyInvoked(node: TSESTreeFunction): boolean;
 
@@ -2397,7 +2397,7 @@ declare function isFunctionOfImmediatelyInvoked(node: TSESTreeFunction): boolean
  * @param node The node to check.
  * @returns `true` if the node is a function expression or arrow function expression of a object method, `false` otherwise.
  */
-declare const isFunctionOfObjectMethod: (node: TSESTree.Node) => boolean;
+declare function isFunctionOfObjectMethod(node: TSESTree.Node): boolean;
 
 declare function isKeyLiteralLike(node: TSESTree.MemberExpression | TSESTree.MethodDefinition | TSESTree.Property | TSESTree.PropertyDefinition, property: TSESTree.Node): boolean;
 

package/dist/index.js

@@ -41,7 +41,9 @@ function findParentNodeStop(node, stopNode, predicate) {
 }
 function getFunctionInitPath(node) {
   const { parent } = node;
-  if (node.type === types.AST_NODE_TYPES.FunctionDeclaration) return eff.O.some([node]);
+  if (node.type === types.AST_NODE_TYPES.FunctionDeclaration) {
+    return eff.O.some([node]);
+  }
   if (parent.type === types.AST_NODE_TYPES.VariableDeclarator) {
     return eff.O.some([
       parent.parent,
@@ -101,8 +103,12 @@ function hasCallInFunctionInitPath(callName) {
       eff.O.exists((nodes) => {
         return nodes.some(
           (n) => {
-            if (n.type !== types.AST_NODE_TYPES.CallExpression) return false;
-            if (n.callee.type === types.AST_NODE_TYPES.Identifier) return n.callee.name === callName;
+            if (n.type !== types.AST_NODE_TYPES.CallExpression) {
+              return false;
+            }
+            if (n.callee.type === types.AST_NODE_TYPES.Identifier) {
+              return n.callee.name === callName;
+            }
             return "property" in n.callee && "name" in n.callee.property && n.callee.property.name === callName;
           }
         );
@@ -111,7 +117,9 @@ function hasCallInFunctionInitPath(callName) {
   };
 }
 function getClassIdentifier(node) {
-  if (node.id) return eff.O.fromNullable(node.id);
+  if (node.id) {
+    return eff.O.fromNullable(node.id);
+  }
   if (node.parent.type === types.AST_NODE_TYPES.VariableDeclarator && node.parent.id.type === types.AST_NODE_TYPES.Identifier) {
     return eff.O.fromNullable(node.parent.id);
   }
@@ -286,7 +294,9 @@ function getFunctionIdentifier(node) {
   return eff.O.none();
 }
 function getIdentifiersFromBinaryExpression(side) {
-  if (side.type === types.AST_NODE_TYPES.Identifier) return [side];
+  if (side.type === types.AST_NODE_TYPES.Identifier) {
+    return [side];
+  }
   if (side.type === types.AST_NODE_TYPES.BinaryExpression) {
     return [
       ...getIdentifiersFromBinaryExpression(side.left),
@@ -453,9 +463,13 @@ function getNestedReturnStatements(node) {
   const functionNode = isFunction(node) ? node : eff.O.getOrNull(findParentNodeGuard(node, isFunction));
   typescriptEstree.simpleTraverse(node, {
     enter(node2) {
-      if (node2.type !== types.AST_NODE_TYPES.ReturnStatement) return;
+      if (node2.type !== types.AST_NODE_TYPES.ReturnStatement) {
+        return;
+      }
       const parentFunction = eff.O.getOrNull(findParentNodeGuard(node2, isFunction));
-      if (parentFunction !== functionNode) return;
+      if (parentFunction !== functionNode) {
+        return;
+      }
       returnStatements.push(node2);
     }
   });
@@ -474,43 +488,31 @@ function getTopLevelIdentifier(node) {
 function isEmptyFunction(node) {
   return node.body.type === types.AST_NODE_TYPES.BlockStatement && node.body.body.length === 0;
 }
-var isFunctionOfClassMethod = tsPattern.isMatching({
-  type: tsPattern.P.union([types.AST_NODE_TYPES.FunctionExpression, types.AST_NODE_TYPES.ArrowFunctionExpression]),
-  parent: {
-    type: types.AST_NODE_TYPES.MethodDefinition,
-    parent: {
-      type: types.AST_NODE_TYPES.ClassBody
-    }
-  }
-});
-var isFunctionOfClassProperty = tsPattern.isMatching({
-  type: tsPattern.P.union([types.AST_NODE_TYPES.FunctionExpression, types.AST_NODE_TYPES.ArrowFunctionExpression]),
-  parent: {
-    type: types.AST_NODE_TYPES.Property,
-    parent: {
-      type: types.AST_NODE_TYPES.ClassBody
-    }
-  }
-});
+function isFunctionOfClassMethod(node) {
+  return (node.type === types.AST_NODE_TYPES.FunctionExpression || node.type === types.AST_NODE_TYPES.ArrowFunctionExpression) && node.parent.type === types.AST_NODE_TYPES.MethodDefinition;
+}
+function isFunctionOfClassProperty(node) {
+  return (node.type === types.AST_NODE_TYPES.FunctionExpression || node.type === types.AST_NODE_TYPES.ArrowFunctionExpression) && node.parent.type === types.AST_NODE_TYPES.Property;
+}
 function isFunctionOfImmediatelyInvoked(node) {
   return node.type !== types.AST_NODE_TYPES.FunctionDeclaration && node.parent.type === types.AST_NODE_TYPES.CallExpression && node.parent.callee === node;
 }
-var isFunctionOfObjectMethod = tsPattern.isMatching({
-  type: tsPattern.P.union([types.AST_NODE_TYPES.FunctionExpression, types.AST_NODE_TYPES.ArrowFunctionExpression]),
-  parent: {
-    type: types.AST_NODE_TYPES.Property,
-    parent: {
-      type: types.AST_NODE_TYPES.ObjectExpression
-    }
-  }
-});
+function isFunctionOfObjectMethod(node) {
+  return (node.type === types.AST_NODE_TYPES.FunctionExpression || node.type === types.AST_NODE_TYPES.ArrowFunctionExpression) && node.parent.type === types.AST_NODE_TYPES.Property && node.parent.parent.type === types.AST_NODE_TYPES.ObjectExpression;
+}
 function isKeyLiteralLike(node, property) {
   return tsPattern.match(property).with({ type: types.AST_NODE_TYPES.Literal }, eff.F.constTrue).with({ type: types.AST_NODE_TYPES.TemplateLiteral, expressions: [] }, eff.F.constTrue).with({ type: types.AST_NODE_TYPES.Identifier }, () => !node.computed).otherwise(eff.F.constFalse);
 }
 function isMapCallLoose(node) {
-  if (node.type !== types.AST_NODE_TYPES.CallExpression) return false;
-  if (node.callee.type !== types.AST_NODE_TYPES.MemberExpression) return false;
-  if (node.callee.property.type !== types.AST_NODE_TYPES.Identifier) return false;
+  if (node.type !== types.AST_NODE_TYPES.CallExpression) {
+    return false;
+  }
+  if (node.callee.type !== types.AST_NODE_TYPES.MemberExpression) {
+    return false;
+  }
+  if (node.callee.property.type !== types.AST_NODE_TYPES.Identifier) {
+    return false;
+  }
   const { name } = node.callee.property;
   return name === "map" || name.endsWith("Map");
 }
@@ -530,9 +532,15 @@ var isNodeEqual = eff.F.dual(2, (a, b) => {
     case (a.type === types.AST_NODE_TYPES.TemplateElement && b.type === types.AST_NODE_TYPES.TemplateElement):
       return a.value.raw === b.value.raw;
     case (a.type === types.AST_NODE_TYPES.TemplateLiteral && b.type === types.AST_NODE_TYPES.TemplateLiteral):
-      if (a.quasis.length !== b.quasis.length || a.expressions.length !== b.expressions.length) return false;
-      if (!types$1.zip(a.quasis, b.quasis).every(([a2, b2]) => isNodeEqual(a2, b2))) return false;
-      if (!types$1.zip(a.expressions, b.expressions).every(([a2, b2]) => isNodeEqual(a2, b2))) return false;
+      if (a.quasis.length !== b.quasis.length || a.expressions.length !== b.expressions.length) {
+        return false;
+      }
+      if (!types$1.zip(a.quasis, b.quasis).every(([a2, b2]) => isNodeEqual(a2, b2))) {
+        return false;
+      }
+      if (!types$1.zip(a.expressions, b.expressions).every(([a2, b2]) => isNodeEqual(a2, b2))) {
+        return false;
+      }
       return true;
     case (a.type === types.AST_NODE_TYPES.Identifier && b.type === types.AST_NODE_TYPES.Identifier):
       return a.name === b.name;
@@ -541,8 +549,12 @@ var isNodeEqual = eff.F.dual(2, (a, b) => {
     case (a.type === types.AST_NODE_TYPES.MemberExpression && b.type === types.AST_NODE_TYPES.MemberExpression):
       return isNodeEqual(a.property, b.property) && isNodeEqual(a.object, b.object);
     case (a.type === types.AST_NODE_TYPES.JSXAttribute && b.type === types.AST_NODE_TYPES.JSXAttribute): {
-      if (a.name.name !== b.name.name) return false;
-      if (a.value === null || b.value === null) return a.value === b.value;
+      if (a.name.name !== b.name.name) {
+        return false;
+      }
+      if (a.value === null || b.value === null) {
+        return a.value === b.value;
+      }
       return isNodeEqual(a.value, b.value);
     }
     case (a.type === types.AST_NODE_TYPES.ThisExpression && b.type === types.AST_NODE_TYPES.ThisExpression):
@@ -587,16 +599,22 @@ function toReadableNodeName(node, getText) {
 }
 function toReadableNodeType(node) {
   if (node.type === types.AST_NODE_TYPES.Literal) {
-    if ("regex" in node) return "RegExp literal";
+    if ("regex" in node) {
+      return "RegExp literal";
+    }
     return `${getLiteralValueType(node.value)} literal`;
   }
-  if (isJSX(node)) return `JSX ${stringTs.toLowerCase(stringTs.delimiterCase(stringTs.replace(node.type, "JSX", ""), " "))}`;
+  if (isJSX(node)) {
+    return `JSX ${stringTs.toLowerCase(stringTs.delimiterCase(stringTs.replace(node.type, "JSX", ""), " "))}`;
+  }
   return stringTs.toLowerCase(stringTs.delimiterCase(node.type, " "));
 }
 
 // src/unwrap-type-expression.ts
 function unwrapTypeExpression(node) {
-  if (isTypeExpression(node)) return unwrapTypeExpression(node.expression);
+  if (isTypeExpression(node)) {
+    return unwrapTypeExpression(node.expression);
+  }
   return node;
 }
 

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { F, O, or, isString } from '@eslint-react/eff';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import { ASTUtils } from '@typescript-eslint/utils';
-import { isMatching, P, match } from 'ts-pattern';
+import { match, P } from 'ts-pattern';
 import { AST_NODE_TYPES as AST_NODE_TYPES$1, simpleTraverse } from '@typescript-eslint/typescript-estree';
 import { zip } from '@eslint-react/types';
 import { toLowerCase, delimiterCase, replace } from 'string-ts';
@@ -39,7 +39,9 @@ function findParentNodeStop(node, stopNode, predicate) {
 }
 function getFunctionInitPath(node) {
   const { parent } = node;
-  if (node.type === AST_NODE_TYPES.FunctionDeclaration) return O.some([node]);
+  if (node.type === AST_NODE_TYPES.FunctionDeclaration) {
+    return O.some([node]);
+  }
   if (parent.type === AST_NODE_TYPES.VariableDeclarator) {
     return O.some([
       parent.parent,
@@ -99,8 +101,12 @@ function hasCallInFunctionInitPath(callName) {
       O.exists((nodes) => {
         return nodes.some(
           (n) => {
-            if (n.type !== AST_NODE_TYPES.CallExpression) return false;
-            if (n.callee.type === AST_NODE_TYPES.Identifier) return n.callee.name === callName;
+            if (n.type !== AST_NODE_TYPES.CallExpression) {
+              return false;
+            }
+            if (n.callee.type === AST_NODE_TYPES.Identifier) {
+              return n.callee.name === callName;
+            }
             return "property" in n.callee && "name" in n.callee.property && n.callee.property.name === callName;
           }
         );
@@ -109,7 +115,9 @@ function hasCallInFunctionInitPath(callName) {
   };
 }
 function getClassIdentifier(node) {
-  if (node.id) return O.fromNullable(node.id);
+  if (node.id) {
+    return O.fromNullable(node.id);
+  }
   if (node.parent.type === AST_NODE_TYPES.VariableDeclarator && node.parent.id.type === AST_NODE_TYPES.Identifier) {
     return O.fromNullable(node.parent.id);
   }
@@ -284,7 +292,9 @@ function getFunctionIdentifier(node) {
   return O.none();
 }
 function getIdentifiersFromBinaryExpression(side) {
-  if (side.type === AST_NODE_TYPES.Identifier) return [side];
+  if (side.type === AST_NODE_TYPES.Identifier) {
+    return [side];
+  }
   if (side.type === AST_NODE_TYPES.BinaryExpression) {
     return [
       ...getIdentifiersFromBinaryExpression(side.left),
@@ -451,9 +461,13 @@ function getNestedReturnStatements(node) {
   const functionNode = isFunction(node) ? node : O.getOrNull(findParentNodeGuard(node, isFunction));
   simpleTraverse(node, {
     enter(node2) {
-      if (node2.type !== AST_NODE_TYPES.ReturnStatement) return;
+      if (node2.type !== AST_NODE_TYPES.ReturnStatement) {
+        return;
+      }
       const parentFunction = O.getOrNull(findParentNodeGuard(node2, isFunction));
-      if (parentFunction !== functionNode) return;
+      if (parentFunction !== functionNode) {
+        return;
+      }
       returnStatements.push(node2);
     }
   });
@@ -472,43 +486,31 @@ function getTopLevelIdentifier(node) {
 function isEmptyFunction(node) {
   return node.body.type === AST_NODE_TYPES.BlockStatement && node.body.body.length === 0;
 }
-var isFunctionOfClassMethod = isMatching({
-  type: P.union([AST_NODE_TYPES.FunctionExpression, AST_NODE_TYPES.ArrowFunctionExpression]),
-  parent: {
-    type: AST_NODE_TYPES.MethodDefinition,
-    parent: {
-      type: AST_NODE_TYPES.ClassBody
-    }
-  }
-});
-var isFunctionOfClassProperty = isMatching({
-  type: P.union([AST_NODE_TYPES.FunctionExpression, AST_NODE_TYPES.ArrowFunctionExpression]),
-  parent: {
-    type: AST_NODE_TYPES.Property,
-    parent: {
-      type: AST_NODE_TYPES.ClassBody
-    }
-  }
-});
+function isFunctionOfClassMethod(node) {
+  return (node.type === AST_NODE_TYPES.FunctionExpression || node.type === AST_NODE_TYPES.ArrowFunctionExpression) && node.parent.type === AST_NODE_TYPES.MethodDefinition;
+}
+function isFunctionOfClassProperty(node) {
+  return (node.type === AST_NODE_TYPES.FunctionExpression || node.type === AST_NODE_TYPES.ArrowFunctionExpression) && node.parent.type === AST_NODE_TYPES.Property;
+}
 function isFunctionOfImmediatelyInvoked(node) {
   return node.type !== AST_NODE_TYPES.FunctionDeclaration && node.parent.type === AST_NODE_TYPES.CallExpression && node.parent.callee === node;
 }
-var isFunctionOfObjectMethod = isMatching({
-  type: P.union([AST_NODE_TYPES.FunctionExpression, AST_NODE_TYPES.ArrowFunctionExpression]),
-  parent: {
-    type: AST_NODE_TYPES.Property,
-    parent: {
-      type: AST_NODE_TYPES.ObjectExpression
-    }
-  }
-});
+function isFunctionOfObjectMethod(node) {
+  return (node.type === AST_NODE_TYPES.FunctionExpression || node.type === AST_NODE_TYPES.ArrowFunctionExpression) && node.parent.type === AST_NODE_TYPES.Property && node.parent.parent.type === AST_NODE_TYPES.ObjectExpression;
+}
 function isKeyLiteralLike(node, property) {
   return match(property).with({ type: AST_NODE_TYPES.Literal }, F.constTrue).with({ type: AST_NODE_TYPES.TemplateLiteral, expressions: [] }, F.constTrue).with({ type: AST_NODE_TYPES.Identifier }, () => !node.computed).otherwise(F.constFalse);
 }
 function isMapCallLoose(node) {
-  if (node.type !== AST_NODE_TYPES.CallExpression) return false;
-  if (node.callee.type !== AST_NODE_TYPES.MemberExpression) return false;
-  if (node.callee.property.type !== AST_NODE_TYPES.Identifier) return false;
+  if (node.type !== AST_NODE_TYPES.CallExpression) {
+    return false;
+  }
+  if (node.callee.type !== AST_NODE_TYPES.MemberExpression) {
+    return false;
+  }
+  if (node.callee.property.type !== AST_NODE_TYPES.Identifier) {
+    return false;
+  }
   const { name } = node.callee.property;
   return name === "map" || name.endsWith("Map");
 }
@@ -528,9 +530,15 @@ var isNodeEqual = F.dual(2, (a, b) => {
     case (a.type === AST_NODE_TYPES.TemplateElement && b.type === AST_NODE_TYPES.TemplateElement):
       return a.value.raw === b.value.raw;
     case (a.type === AST_NODE_TYPES.TemplateLiteral && b.type === AST_NODE_TYPES.TemplateLiteral):
-      if (a.quasis.length !== b.quasis.length || a.expressions.length !== b.expressions.length) return false;
-      if (!zip(a.quasis, b.quasis).every(([a2, b2]) => isNodeEqual(a2, b2))) return false;
-      if (!zip(a.expressions, b.expressions).every(([a2, b2]) => isNodeEqual(a2, b2))) return false;
+      if (a.quasis.length !== b.quasis.length || a.expressions.length !== b.expressions.length) {
+        return false;
+      }
+      if (!zip(a.quasis, b.quasis).every(([a2, b2]) => isNodeEqual(a2, b2))) {
+        return false;
+      }
+      if (!zip(a.expressions, b.expressions).every(([a2, b2]) => isNodeEqual(a2, b2))) {
+        return false;
+      }
       return true;
     case (a.type === AST_NODE_TYPES.Identifier && b.type === AST_NODE_TYPES.Identifier):
       return a.name === b.name;
@@ -539,8 +547,12 @@ var isNodeEqual = F.dual(2, (a, b) => {
     case (a.type === AST_NODE_TYPES.MemberExpression && b.type === AST_NODE_TYPES.MemberExpression):
       return isNodeEqual(a.property, b.property) && isNodeEqual(a.object, b.object);
     case (a.type === AST_NODE_TYPES.JSXAttribute && b.type === AST_NODE_TYPES.JSXAttribute): {
-      if (a.name.name !== b.name.name) return false;
-      if (a.value === null || b.value === null) return a.value === b.value;
+      if (a.name.name !== b.name.name) {
+        return false;
+      }
+      if (a.value === null || b.value === null) {
+        return a.value === b.value;
+      }
       return isNodeEqual(a.value, b.value);
     }
     case (a.type === AST_NODE_TYPES.ThisExpression && b.type === AST_NODE_TYPES.ThisExpression):
@@ -585,16 +597,22 @@ function toReadableNodeName(node, getText) {
 }
 function toReadableNodeType(node) {
   if (node.type === AST_NODE_TYPES.Literal) {
-    if ("regex" in node) return "RegExp literal";
+    if ("regex" in node) {
+      return "RegExp literal";
+    }
     return `${getLiteralValueType(node.value)} literal`;
   }
-  if (isJSX(node)) return `JSX ${toLowerCase(delimiterCase(replace(node.type, "JSX", ""), " "))}`;
+  if (isJSX(node)) {
+    return `JSX ${toLowerCase(delimiterCase(replace(node.type, "JSX", ""), " "))}`;
+  }
   return toLowerCase(delimiterCase(node.type, " "));
 }
 
 // src/unwrap-type-expression.ts
 function unwrapTypeExpression(node) {
-  if (isTypeExpression(node)) return unwrapTypeExpression(node.expression);
+  if (isTypeExpression(node)) {
+    return unwrapTypeExpression(node.expression);
+  }
   return node;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/ast",
-  "version": "1.23.2",
+  "version": "1.23.3-beta.2",
   "description": "ESLint React's TSESTree AST utility module.",
   "homepage": "https://github.com/rEl1cx/eslint-react",
   "bugs": {
@@ -13,6 +13,7 @@
   },
   "license": "MIT",
   "author": "Eva1ent<rel1cx@proton.me>",
+  "sideEffects": false,
   "exports": {
     ".": {
       "import": {
@@ -27,6 +28,7 @@
     "./package.json": "./package.json"
   },
   "main": "dist/index.js",
+  "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
   "files": [
     "dist",
@@ -38,8 +40,8 @@
     "@typescript-eslint/utils": "^8.19.1",
     "string-ts": "^2.2.0",
     "ts-pattern": "^5.6.0",
-    "@eslint-react/eff": "1.23.2",
-    "@eslint-react/types": "1.23.2"
+    "@eslint-react/eff": "1.23.3-beta.2",
+    "@eslint-react/types": "1.23.3-beta.2"
   },
   "devDependencies": {
     "tsup": "^8.3.5",
@@ -49,8 +51,6 @@
     "bun": ">=1.0.15",
     "node": ">=18.18.0"
   },
-  "sideEffects": false,
-  "module": "dist/index.mjs",
   "scripts": {
     "build": "tsup",
     "lint:publish": "publint",