fix(type-utils): checking of type aliases' type names by `typeMatches…

…Specifier` (#6820) * fix(specifierNameMatches): check aliasSymbol if it exists * test: type aliases
typescript-eslint · Apr 2, 2023 · 7ca2c90 · 7ca2c90
1 parent 79de27d
commit 7ca2c90
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 22 deletions.
diff --git a/packages/type-utils/src/TypeOrValueSpecifier.ts b/packages/type-utils/src/TypeOrValueSpecifier.ts
@@ -120,7 +120,7 @@ function specifierNameMatches(type: ts.Type, name: string | string[]): boolean {
   if (typeof name === 'string') {
     name = [name];
   }
-  const symbol = type.getSymbol();
+  const symbol = type.aliasSymbol ?? type.getSymbol();
   if (symbol === undefined) {
     return false;
   }

diff --git a/packages/type-utils/tests/TypeOrValueSpecifier.test.ts b/packages/type-utils/tests/TypeOrValueSpecifier.test.ts
@@ -176,28 +176,42 @@ describe('TypeOrValueSpecifier', () => {
       runTestNegative,
     );
 
-    it.each<[string, TypeOrValueSpecifier]>([
+    it.each<[string, TypeOrValueSpecifier]>(
       [
-        'interface Foo {prop: string}; type Test = Foo;',
-        { from: 'file', name: 'Foo' },
-      ],
-      [
-        'interface Foo {prop: string}; type Test = Foo;',
-        { from: 'file', name: ['Foo', 'Bar'] },
-      ],
-      [
-        'interface Foo {prop: string}; type Test = Foo;',
-        { from: 'file', name: 'Foo', path: 'tests/fixtures/file.ts' },
-      ],
-      [
-        'interface Foo {prop: string}; type Test = Foo;',
-        {
-          from: 'file',
-          name: ['Foo', 'Bar'],
-          path: 'tests/fixtures/file.ts',
-        },
-      ],
-    ])('matches a matching file specifier: %s', runTestPositive);
+        [
+          'interface Foo {prop: string}; type Test = Foo;',
+          'type Foo = {prop: string}; type Test = Foo;',
+        ].map((test): [string, TypeOrValueSpecifier] => [
+          test,
+          { from: 'file', name: 'Foo' },
+        ]),
+        [
+          'interface Foo {prop: string}; type Test = Foo;',
+          'type Foo = {prop: string}; type Test = Foo;',
+        ].map((test): [string, TypeOrValueSpecifier] => [
+          test,
+          { from: 'file', name: ['Foo', 'Bar'] },
+        ]),
+        [
+          'interface Foo {prop: string}; type Test = Foo;',
+          'type Foo = {prop: string}; type Test = Foo;',
+        ].map((test): [string, TypeOrValueSpecifier] => [
+          test,
+          { from: 'file', name: 'Foo', path: 'tests/fixtures/file.ts' },
+        ]),
+        [
+          'interface Foo {prop: string}; type Test = Foo;',
+          'type Foo = {prop: string}; type Test = Foo;',
+        ].map((test): [string, TypeOrValueSpecifier] => [
+          test,
+          {
+            from: 'file',
+            name: ['Foo', 'Bar'],
+            path: 'tests/fixtures/file.ts',
+          },
+        ]),
+      ].flat(),
+    )('matches a matching file specifier: %s', runTestPositive);
 
     it.each<[string, TypeOrValueSpecifier]>([
       [