@eslint-react/ast 1.28.1-beta.3 → 1.28.1-beta.5

package/dist/index.js

@@ -4,7 +4,6 @@ var eff = require('@eslint-react/eff');
 var types = require('@typescript-eslint/types');
 var utils = require('@typescript-eslint/utils');
 var typescriptEstree = require('@typescript-eslint/typescript-estree');
-var tsPattern = require('ts-pattern');
 var stringTs = require('string-ts');
 
 // src/find-parent-node.ts
@@ -228,14 +227,27 @@ var isLeftHandSideExpressionType = isOneOf([
   types.AST_NODE_TYPES.TSNonNullExpression,
   types.AST_NODE_TYPES.TSTypeAssertion
 ]);
-var isTypeExpression = isOneOf([
+var isTsOnlyExpression = isOneOf([
+  types.AST_NODE_TYPES.TSAsExpression,
+  types.AST_NODE_TYPES.TSTypeAssertion,
+  types.AST_NODE_TYPES.TSNonNullExpression,
+  types.AST_NODE_TYPES.TSSatisfiesExpression,
+  types.AST_NODE_TYPES.TSInstantiationExpression
+]);
+var isTsAssertionExpression = isOneOf([
   types.AST_NODE_TYPES.TSAsExpression,
   types.AST_NODE_TYPES.TSTypeAssertion,
   types.AST_NODE_TYPES.TSNonNullExpression,
   types.AST_NODE_TYPES.TSSatisfiesExpression
 ]);
 
-// src/get-function-identifier.ts
+// src/get-ecma-expression.ts
+function getEcmaExpression(node) {
+  if (isTsOnlyExpression(node)) {
+    return getEcmaExpression(node.expression);
+  }
+  return node;
+}
 function getFunctionIdentifier(node) {
   switch (true) {
     // function MaybeComponent() {}
@@ -264,7 +276,7 @@ function getFunctionIdentifier(node) {
     // const MaybeComponent = (() => {})!;
     // const MaybeComponent = (() => {}) as FunctionComponent;
     // const MaybeComponent = (() => {}) satisfies FunctionComponent;
-    case isTypeExpression(node.parent):
+    case isTsAssertionExpression(node.parent):
       return getFunctionIdentifier(node.parent);
   }
   return eff._;
@@ -358,8 +370,7 @@ function getNestedExpressionsOfType(type) {
     return expressions;
   };
 }
-
-// src/get-nested-call-expressions.ts
+var getNestedNewExpressions = getNestedExpressionsOfType(typescriptEstree.AST_NODE_TYPES.NewExpression);
 var getNestedCallExpressions = getNestedExpressionsOfType(typescriptEstree.AST_NODE_TYPES.CallExpression);
 function getNestedIdentifiers(node) {
   const identifiers = [];
@@ -424,7 +435,6 @@ function getNestedIdentifiers(node) {
   }
   return identifiers;
 }
-var getNestedNewExpressions = getNestedExpressionsOfType(typescriptEstree.AST_NODE_TYPES.NewExpression);
 function getNestedReturnStatements(node) {
   const returnStatements = [];
   const functionNode = isFunction(node) ? node : findParentNode(node, isFunction);
@@ -455,9 +465,6 @@ function getTopLevelIdentifier(node) {
 function isEmptyFunction(node) {
   return node.body.type === types.AST_NODE_TYPES.BlockStatement && node.body.body.length === 0;
 }
-function isKeyLiteralLike(node, property) {
-  return tsPattern.match(property).with({ type: types.AST_NODE_TYPES.Literal }, eff.constTrue).with({ type: types.AST_NODE_TYPES.TemplateLiteral, expressions: [] }, eff.constTrue).with({ type: types.AST_NODE_TYPES.Identifier }, () => !node.computed).otherwise(eff.constFalse);
-}
 function isKindOfLiteral(node, kind) {
   if (node.type !== types.AST_NODE_TYPES.Literal) return false;
   switch (kind) {
@@ -537,8 +544,7 @@ var isNodeEqual = eff.dual(2, (a, b) => {
   }
 });
 function isThisExpression(node) {
-  if (isTypeExpression(node)) return isThisExpression(node.expression);
-  return node.type === types.AST_NODE_TYPES.ThisExpression;
+  return getEcmaExpression(node).type === types.AST_NODE_TYPES.ThisExpression;
 }
 function toReadableNodeName(node, getText) {
   switch (node.type) {
@@ -575,16 +581,9 @@ function toReadableNodeType(node) {
   return stringTs.toLowerCase(stringTs.delimiterCase(node.type, " "));
 }
 
-// src/unwrap-type-expression.ts
-function unwrapTypeExpression(node) {
-  if (isTypeExpression(node)) {
-    return unwrapTypeExpression(node.expression);
-  }
-  return node;
-}
-
 exports.findParentNode = findParentNode;
 exports.getClassIdentifier = getClassIdentifier;
+exports.getEcmaExpression = getEcmaExpression;
 exports.getFunctionIdentifier = getFunctionIdentifier;
 exports.getFunctionInitPath = getFunctionInitPath;
 exports.getLiteralValueType = getLiteralValueType;
@@ -608,7 +607,6 @@ exports.isJSX = isJSX;
 exports.isJSXElement = isJSXElement;
 exports.isJSXFragment = isJSXFragment;
 exports.isJSXTagNameExpression = isJSXTagNameExpression;
-exports.isKeyLiteralLike = isKeyLiteralLike;
 exports.isKindOfLiteral = isKindOfLiteral;
 exports.isLeftHandSideExpression = isLeftHandSideExpression;
 exports.isLeftHandSideExpressionType = isLeftHandSideExpressionType;
@@ -620,8 +618,8 @@ exports.isNodeEqual = isNodeEqual;
 exports.isOneOf = isOneOf;
 exports.isProperty = isProperty;
 exports.isThisExpression = isThisExpression;
+exports.isTsAssertionExpression = isTsAssertionExpression;
+exports.isTsOnlyExpression = isTsOnlyExpression;
 exports.isTypeDeclaration = isTypeDeclaration;
-exports.isTypeExpression = isTypeExpression;
 exports.toReadableNodeName = toReadableNodeName;
 exports.toReadableNodeType = toReadableNodeType;
-exports.unwrapTypeExpression = unwrapTypeExpression;

package/dist/index.mjs

@@ -1,8 +1,7 @@
-import { or, dual, _, constTrue, constFalse } from '@eslint-react/eff';
+import { or, dual, _ } 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';
-import { match } from 'ts-pattern';
 import { toLowerCase, delimiterCase, replace } from 'string-ts';
 
 // src/find-parent-node.ts
@@ -226,14 +225,27 @@ var isLeftHandSideExpressionType = isOneOf([
   AST_NODE_TYPES.TSNonNullExpression,
   AST_NODE_TYPES.TSTypeAssertion
 ]);
-var isTypeExpression = isOneOf([
+var isTsOnlyExpression = isOneOf([
+  AST_NODE_TYPES.TSAsExpression,
+  AST_NODE_TYPES.TSTypeAssertion,
+  AST_NODE_TYPES.TSNonNullExpression,
+  AST_NODE_TYPES.TSSatisfiesExpression,
+  AST_NODE_TYPES.TSInstantiationExpression
+]);
+var isTsAssertionExpression = isOneOf([
   AST_NODE_TYPES.TSAsExpression,
   AST_NODE_TYPES.TSTypeAssertion,
   AST_NODE_TYPES.TSNonNullExpression,
   AST_NODE_TYPES.TSSatisfiesExpression
 ]);
 
-// src/get-function-identifier.ts
+// src/get-ecma-expression.ts
+function getEcmaExpression(node) {
+  if (isTsOnlyExpression(node)) {
+    return getEcmaExpression(node.expression);
+  }
+  return node;
+}
 function getFunctionIdentifier(node) {
   switch (true) {
     // function MaybeComponent() {}
@@ -262,7 +274,7 @@ function getFunctionIdentifier(node) {
     // const MaybeComponent = (() => {})!;
     // const MaybeComponent = (() => {}) as FunctionComponent;
     // const MaybeComponent = (() => {}) satisfies FunctionComponent;
-    case isTypeExpression(node.parent):
+    case isTsAssertionExpression(node.parent):
       return getFunctionIdentifier(node.parent);
   }
   return _;
@@ -356,8 +368,7 @@ function getNestedExpressionsOfType(type) {
     return expressions;
   };
 }
-
-// src/get-nested-call-expressions.ts
+var getNestedNewExpressions = getNestedExpressionsOfType(AST_NODE_TYPES$1.NewExpression);
 var getNestedCallExpressions = getNestedExpressionsOfType(AST_NODE_TYPES$1.CallExpression);
 function getNestedIdentifiers(node) {
   const identifiers = [];
@@ -422,7 +433,6 @@ function getNestedIdentifiers(node) {
   }
   return identifiers;
 }
-var getNestedNewExpressions = getNestedExpressionsOfType(AST_NODE_TYPES$1.NewExpression);
 function getNestedReturnStatements(node) {
   const returnStatements = [];
   const functionNode = isFunction(node) ? node : findParentNode(node, isFunction);
@@ -453,9 +463,6 @@ function getTopLevelIdentifier(node) {
 function isEmptyFunction(node) {
   return node.body.type === AST_NODE_TYPES.BlockStatement && node.body.body.length === 0;
 }
-function isKeyLiteralLike(node, property) {
-  return match(property).with({ type: AST_NODE_TYPES.Literal }, constTrue).with({ type: AST_NODE_TYPES.TemplateLiteral, expressions: [] }, constTrue).with({ type: AST_NODE_TYPES.Identifier }, () => !node.computed).otherwise(constFalse);
-}
 function isKindOfLiteral(node, kind) {
   if (node.type !== AST_NODE_TYPES.Literal) return false;
   switch (kind) {
@@ -535,8 +542,7 @@ var isNodeEqual = dual(2, (a, b) => {
   }
 });
 function isThisExpression(node) {
-  if (isTypeExpression(node)) return isThisExpression(node.expression);
-  return node.type === AST_NODE_TYPES.ThisExpression;
+  return getEcmaExpression(node).type === AST_NODE_TYPES.ThisExpression;
 }
 function toReadableNodeName(node, getText) {
   switch (node.type) {
@@ -573,12 +579,4 @@ function toReadableNodeType(node) {
   return toLowerCase(delimiterCase(node.type, " "));
 }
 
-// src/unwrap-type-expression.ts
-function unwrapTypeExpression(node) {
-  if (isTypeExpression(node)) {
-    return unwrapTypeExpression(node.expression);
-  }
-  return node;
-}
-
-export { findParentNode, getClassIdentifier, getFunctionIdentifier, getFunctionInitPath, getLiteralValueType, getNestedCallExpressions, getNestedExpressionsOfType, getNestedIdentifiers, getNestedNewExpressions, getNestedReturnStatements, getTopLevelIdentifier, hasCallInFunctionInitPath, is, isArrayTupleType, isClass, isConditional, isControlFlow, isDestructuringPattern, isEmptyFunction, isFunction, isFunctionType, isJSX, isJSXElement, isJSXFragment, isJSXTagNameExpression, isKeyLiteralLike, isKindOfLiteral, isLeftHandSideExpression, isLeftHandSideExpressionType, isLoop, isMapCallLoose, isMethodOrProperty, isMultiLine, isNodeEqual, isOneOf, isProperty, isThisExpression, isTypeDeclaration, isTypeExpression, toReadableNodeName, toReadableNodeType, unwrapTypeExpression };
+export { findParentNode, getClassIdentifier, getEcmaExpression, getFunctionIdentifier, getFunctionInitPath, getLiteralValueType, getNestedCallExpressions, getNestedExpressionsOfType, getNestedIdentifiers, getNestedNewExpressions, getNestedReturnStatements, getTopLevelIdentifier, hasCallInFunctionInitPath, is, isArrayTupleType, isClass, isConditional, isControlFlow, isDestructuringPattern, isEmptyFunction, isFunction, isFunctionType, isJSX, isJSXElement, isJSXFragment, isJSXTagNameExpression, isKindOfLiteral, isLeftHandSideExpression, isLeftHandSideExpressionType, isLoop, isMapCallLoose, isMethodOrProperty, isMultiLine, isNodeEqual, isOneOf, isProperty, isThisExpression, isTsAssertionExpression, isTsOnlyExpression, isTypeDeclaration, toReadableNodeName, toReadableNodeType };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/ast",
-  "version": "1.28.1-beta.3",
+  "version": "1.28.1-beta.5",
   "description": "ESLint React's TSESTree AST utility module.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -40,7 +40,7 @@
     "@typescript-eslint/utils": "^8.25.0",
     "string-ts": "^2.2.1",
     "ts-pattern": "^5.6.2",
-    "@eslint-react/eff": "1.28.1-beta.3"
+    "@eslint-react/eff": "1.28.1-beta.5"
   },
   "devDependencies": {
     "tsup": "^8.4.0",