fix(ast-spec): add TSQualifiedName to TypeNode union (#5906)

* fix(ast-spec): add TSQualifiedName to TypeNode union * fix rule with missing type
typescript-eslint · Oct 31, 2022 · 5c316c1 · 5c316c1
1 parent 0520d53
commit 5c316c1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/packages/ast-spec/src/unions/TypeNode.ts b/packages/ast-spec/src/unions/TypeNode.ts
@@ -25,6 +25,7 @@ import type { TSOptionalType } from '../type/TSOptionalType/spec';
 import type { TSPrivateKeyword } from '../type/TSPrivateKeyword/spec';
 import type { TSProtectedKeyword } from '../type/TSProtectedKeyword/spec';
 import type { TSPublicKeyword } from '../type/TSPublicKeyword/spec';
+import type { TSQualifiedName } from '../type/TSQualifiedName/spec';
 import type { TSReadonlyKeyword } from '../type/TSReadonlyKeyword/spec';
 import type { TSRestType } from '../type/TSRestType/spec';
 import type { TSStaticKeyword } from '../type/TSStaticKeyword/spec';
@@ -71,6 +72,7 @@ export type TypeNode =
   | TSPrivateKeyword
   | TSProtectedKeyword
   | TSPublicKeyword
+  | TSQualifiedName
   | TSReadonlyKeyword
   | TSRestType
   | TSStaticKeyword

diff --git a/packages/eslint-plugin/src/rules/sort-type-constituents.ts b/packages/eslint-plugin/src/rules/sort-type-constituents.ts
@@ -60,6 +60,7 @@ function getGroup(node: TSESTree.TypeNode): Group {
     case AST_NODE_TYPES.TSIndexedAccessType:
     case AST_NODE_TYPES.TSInferType:
     case AST_NODE_TYPES.TSTypeReference:
+    case AST_NODE_TYPES.TSQualifiedName:
       return Group.named;
 
     case AST_NODE_TYPES.TSMappedType:

diff --git a/packages/eslint-plugin/src/rules/sort-type-union-intersection-members.ts b/packages/eslint-plugin/src/rules/sort-type-union-intersection-members.ts
@@ -60,6 +60,7 @@ function getGroup(node: TSESTree.TypeNode): Group {
     case AST_NODE_TYPES.TSIndexedAccessType:
     case AST_NODE_TYPES.TSInferType:
     case AST_NODE_TYPES.TSTypeReference:
+    case AST_NODE_TYPES.TSQualifiedName:
       return Group.named;
 
     case AST_NODE_TYPES.TSMappedType:

diff --git a/packages/eslint-plugin/tests/rules/sort-type-constituents.test.ts b/packages/eslint-plugin/tests/rules/sort-type-constituents.test.ts
@@ -45,6 +45,8 @@ const valid = (operator: '|' | '&'): TSESLint.ValidTestCase<Options>[] => [
 type T =
   ${operator} A
   ${operator} B
+  ${operator} C.D
+  ${operator} D.E
   ${operator} intrinsic
   ${operator} number[]
   ${operator} string[]
@@ -220,6 +222,8 @@ type T =
   ${operator} readonly number[]
   ${operator} string[]
   ${operator} number[]
+  ${operator} D.E
+  ${operator} C.D
   ${operator} B
   ${operator} A
   ${operator} undefined
@@ -229,7 +233,7 @@ type T =
       `,
       output: `
 type T =
-  A ${operator} B ${operator} number[] ${operator} string[] ${operator} any ${operator} string ${operator} readonly number[] ${operator} readonly string[] ${operator} 'a' ${operator} 'b' ${operator} "a" ${operator} "b" ${operator} (() => string) ${operator} (() => void) ${operator} { a: string } ${operator} { b: string } ${operator} [1, 2, 3] ${operator} [1, 2, 4] ${operator} null ${operator} undefined;
+  A ${operator} B ${operator} C.D ${operator} D.E ${operator} number[] ${operator} string[] ${operator} any ${operator} string ${operator} readonly number[] ${operator} readonly string[] ${operator} 'a' ${operator} 'b' ${operator} "a" ${operator} "b" ${operator} (() => string) ${operator} (() => void) ${operator} { a: string } ${operator} { b: string } ${operator} [1, 2, 3] ${operator} [1, 2, 4] ${operator} null ${operator} undefined;
       `,
       errors: [
         {

diff --git a/packages/eslint-plugin/tests/rules/sort-type-union-intersection-members.test.ts b/packages/eslint-plugin/tests/rules/sort-type-union-intersection-members.test.ts
@@ -45,6 +45,8 @@ const valid = (operator: '|' | '&'): TSESLint.ValidTestCase<Options>[] => [
 type T =
   ${operator} A
   ${operator} B
+  ${operator} C.D
+  ${operator} D.E
   ${operator} intrinsic
   ${operator} number[]
   ${operator} string[]
@@ -220,6 +222,8 @@ type T =
   ${operator} readonly number[]
   ${operator} string[]
   ${operator} number[]
+  ${operator} D.E
+  ${operator} C.D
   ${operator} B
   ${operator} A
   ${operator} undefined
@@ -229,7 +233,7 @@ type T =
       `,
       output: `
 type T =
-  A ${operator} B ${operator} number[] ${operator} string[] ${operator} any ${operator} string ${operator} readonly number[] ${operator} readonly string[] ${operator} 'a' ${operator} 'b' ${operator} "a" ${operator} "b" ${operator} (() => string) ${operator} (() => void) ${operator} { a: string } ${operator} { b: string } ${operator} [1, 2, 3] ${operator} [1, 2, 4] ${operator} null ${operator} undefined;
+  A ${operator} B ${operator} C.D ${operator} D.E ${operator} number[] ${operator} string[] ${operator} any ${operator} string ${operator} readonly number[] ${operator} readonly string[] ${operator} 'a' ${operator} 'b' ${operator} "a" ${operator} "b" ${operator} (() => string) ${operator} (() => void) ${operator} { a: string } ${operator} { b: string } ${operator} [1, 2, 3] ${operator} [1, 2, 4] ${operator} null ${operator} undefined;
       `,
       errors: [
         {