From 8685813d26f68f79df976240a7b45ea8415c1c35 Mon Sep 17 00:00:00 2001
From: Brad Zacher <brad.zacher@gmail.com>
Date: Sun, 30 Oct 2022 23:01:50 -0700
Subject: [PATCH 1/2] fix(ast-spec): add TSQualifiedName to TypeNode union

---
 packages/ast-spec/src/unions/TypeNode.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/ast-spec/src/unions/TypeNode.ts b/packages/ast-spec/src/unions/TypeNode.ts
index 461281cd4ce3..f1859d7d3478 100644
--- 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

From 44fd8cdbdff7f9af4909aae735120b8b7732c634 Mon Sep 17 00:00:00 2001
From: Brad Zacher <brad.zacher@gmail.com>
Date: Mon, 31 Oct 2022 21:39:18 +1030
Subject: [PATCH 2/2] fix rule with missing type

---
 packages/eslint-plugin/src/rules/sort-type-constituents.ts  | 1 +
 .../src/rules/sort-type-union-intersection-members.ts       | 1 +
 .../tests/rules/sort-type-constituents.test.ts              | 6 +++++-
 .../rules/sort-type-union-intersection-members.test.ts      | 6 +++++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/eslint-plugin/src/rules/sort-type-constituents.ts b/packages/eslint-plugin/src/rules/sort-type-constituents.ts
index 92b5e44c6f98..1abeddcf8231 100644
--- 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
index 2a83b4b0525b..1fbf91b9ae89 100644
--- 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
index b9989c2cf875..2587375060ed 100644
--- 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
index 38ae67f18043..a24959d8b6a6 100644
--- 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: [
         {

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/typescript-eslint/typescript-eslint/pull/5906.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/typescript-eslint/typescript-eslint/pull/5906.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/typescript-eslint/typescript-eslint/pull/5906.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/typescript-eslint/typescript-eslint/pull/5906.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>