refactor: improve ts expression unwrapping (#951)

Author: Rel1cx

packages/plugins/eslint-plugin-react-x/src/rules/no-access-state-in-setstate.ts

@@ -17,7 +17,7 @@ export const RULE_FEATURES = [
 export type MessageID = CamelCase<typeof RULE_NAME>;
 
 function getName(node: TSESTree.Expression | TSESTree.PrivateIdentifier): string | _ {
-  if (AST.isTypeExpression(node)) {
+  if (AST.isTsOnlyExpression(node)) {
     return getName(node.expression);
   }
   if (node.type === T.Identifier || node.type === T.PrivateIdentifier) {

packages/plugins/eslint-plugin-react-x/src/rules/no-direct-mutation-state.ts

@@ -17,7 +17,7 @@ export const RULE_FEATURES = [
 export type MessageID = CamelCase<typeof RULE_NAME>;
 
 function getName(node: TSESTree.Expression | TSESTree.PrivateIdentifier): string | _ {
-  if (AST.isTypeExpression(node)) {
+  if (AST.isTsOnlyExpression(node)) {
     return getName(node.expression);
   }
   if (node.type === T.Identifier || node.type === T.PrivateIdentifier) {

packages/plugins/eslint-plugin-react-x/src/rules/no-duplicate-key.ts

@@ -71,7 +71,7 @@ export default createRule<[], MessageID>({
             if (!AST.isFunction(iter)) return;
             const arg0 = call?.arguments[0];
             if (call == null || arg0 == null) return;
-            if (AST.unwrapTypeExpression(arg0) !== iter) {
+            if (AST.getEcmaExpression(arg0) !== iter) {
               return;
             }
             keyedEntries.set(call, {

packages/plugins/eslint-plugin-react-x/src/rules/no-unused-class-component-members.ts

@@ -42,7 +42,7 @@ const LIFECYCLE_METHODS = new Set([
 // anywhere that a literal may be used as a key (e.g., member expressions,
 // method definitions, ObjectExpression property keys).
 function getName(node: TSESTree.Expression | TSESTree.PrivateIdentifier): string | _ {
-  if (AST.isTypeExpression(node)) {
+  if (AST.isTsOnlyExpression(node)) {
     return getName(node.expression);
   }
   if (node.type === T.Identifier || node.type === T.PrivateIdentifier) {

packages/plugins/eslint-plugin-react-x/src/rules/no-unused-state.ts

@@ -18,7 +18,7 @@ export const RULE_FEATURES = [
 export type MessageID = CamelCase<typeof RULE_NAME>;
 
 function getName(node: TSESTree.Expression | TSESTree.PrivateIdentifier): string | _ {
-  if (AST.isTypeExpression(node)) {
+  if (AST.isTsOnlyExpression(node)) {
     return getName(node.expression);
   }
   if (node.type === T.Identifier || node.type === T.PrivateIdentifier) {

packages/utilities/ast/src/get-ecma-expression.ts

@@ -0,0 +1,19 @@
+import type { TSESTree } from "@typescript-eslint/types";
+
+import { isTsOnlyExpression } from "./is";
+import type { TSESTreeTSOnlyExpression } from "./types";
+
+/**
+ * Gets the ecma expression from a TS expression.
+ * @param node The TS expression.
+ * @returns The ecma expression within the TS expression.
+ */
+export function getEcmaExpression(node: TSESTree.Node): Exclude<
+  TSESTree.Node,
+  TSESTreeTSOnlyExpression
+> {
+  if (isTsOnlyExpression(node)) {
+    return getEcmaExpression(node.expression);
+  }
+  return node;
+}

packages/utilities/ast/src/get-function-identifier.ts

@@ -11,7 +11,7 @@ import { _ } from "@eslint-react/eff";
 import type { TSESTree } from "@typescript-eslint/types";
 import { AST_NODE_TYPES as T } from "@typescript-eslint/types";
 
-import { isOneOf, isTypeExpression } from "./is";
+import { isOneOf, isTsAssertionExpression } from "./is";
 import type { TSESTreeFunction } from "./types";
 
 export function getFunctionIdentifier(node: TSESTree.Expression | TSESTreeFunction): TSESTree.Identifier | _ {
@@ -55,7 +55,7 @@ export function getFunctionIdentifier(node: TSESTree.Expression | TSESTreeFuncti
     // const MaybeComponent = (() => {})!;
     // const MaybeComponent = (() => {}) as FunctionComponent;
     // const MaybeComponent = (() => {}) satisfies FunctionComponent;
-    case isTypeExpression(node.parent):
+    case isTsAssertionExpression(node.parent):
       return getFunctionIdentifier(node.parent);
   }
   return _;

packages/utilities/ast/src/index.ts

@@ -1,6 +1,7 @@
 export * from "./find-parent-node";
 export * from "./function-init-path";
 export * from "./get-class-identifier";
+export * from "./get-ecma-expression";
 export * from "./get-function-identifier";
 export * from "./get-literal-value-type";
 export * from "./get-nested-call-expressions";
@@ -20,4 +21,3 @@ export * from "./is-this-expression";
 export * from "./to-readable-node-name";
 export * from "./to-readable-node-type";
 export type * from "./types";
-export * from "./unwrap-type-expression";

packages/utilities/ast/src/is-this-expression.ts

@@ -1,9 +1,8 @@
 import type { TSESTree } from "@typescript-eslint/types";
 import { AST_NODE_TYPES as T } from "@typescript-eslint/types";
 
-import { isTypeExpression } from "./is";
+import { getEcmaExpression } from "./get-ecma-expression";
 
 export function isThisExpression(node: TSESTree.Expression) {
-  if (isTypeExpression(node)) return isThisExpression(node.expression);
-  return node.type === T.ThisExpression;
+  return getEcmaExpression(node).type === T.ThisExpression;
 }

packages/utilities/ast/src/is.ts

@@ -154,7 +154,15 @@ export const isLeftHandSideExpressionType = isOneOf([
   T.TSTypeAssertion,
 ]);
 
-export const isTypeExpression = isOneOf([
+export const isTsOnlyExpression = isOneOf([
+  T.TSAsExpression,
+  T.TSTypeAssertion,
+  T.TSNonNullExpression,
+  T.TSSatisfiesExpression,
+  T.TSInstantiationExpression,
+]);
+
+export const isTsAssertionExpression = isOneOf([
   T.TSAsExpression,
   T.TSTypeAssertion,
   T.TSNonNullExpression,