From 92894d36af57cd8493ee726588ab657201d8a772 Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Thu, 12 May 2022 16:43:44 -0700
Subject: [PATCH] Make watch/FS testing code friendlier for project loading in
 module transformation (#49087)

---
 src/compiler/watch.ts                     | 16 ++++++++++++++++
 src/harness/virtualFileSystemWithWatch.ts |  2 +-
 src/server/tsconfig.json                  |  1 -
 src/server/watchType.ts                   | 19 -------------------
 4 files changed, 17 insertions(+), 21 deletions(-)
 delete mode 100644 src/server/watchType.ts

diff --git a/src/compiler/watch.ts b/src/compiler/watch.ts
index c925046d67a..7d2c6818d33 100644
--- a/src/compiler/watch.ts
+++ b/src/compiler/watch.ts
@@ -513,6 +513,13 @@ namespace ts {
         ExtendedConfigOfReferencedProject: "Extended config file of referenced project",
         WildcardDirectoryOfReferencedProject: "Wild card directory of referenced project",
         PackageJson: "package.json file",
+        ClosedScriptInfo: "Closed Script info",
+        ConfigFileForInferredRoot: "Config file for the inferred project root",
+        NodeModules: "node_modules for closed script infos and package.jsons affecting module specifier cache",
+        MissingSourceMapFile: "Missing source map file",
+        NoopConfigFileForInferredRoot: "Noop Config file for the inferred project root",
+        MissingGeneratedFile: "Missing generated file",
+        NodeModulesForModuleSpecifierCache: "node_modules for module specifier cache invalidation",
     };
 
     export interface WatchTypeRegistry {
@@ -527,6 +534,15 @@ namespace ts {
         ExtendedConfigOfReferencedProject: "Extended config file of referenced project",
         WildcardDirectoryOfReferencedProject: "Wild card directory of referenced project",
         PackageJson: "package.json file",
+
+        // Additional tsserver specific watch information
+        ClosedScriptInfo: "Closed Script info",
+        ConfigFileForInferredRoot: "Config file for the inferred project root",
+        NodeModules: "node_modules for closed script infos and package.jsons affecting module specifier cache",
+        MissingSourceMapFile: "Missing source map file",
+        NoopConfigFileForInferredRoot: "Noop Config file for the inferred project root",
+        MissingGeneratedFile: "Missing generated file",
+        NodeModulesForModuleSpecifierCache: "node_modules for module specifier cache invalidation",
     }
 
     interface WatchFactory<X, Y = undefined> extends ts.WatchFactory<X, Y> {
diff --git a/src/harness/virtualFileSystemWithWatch.ts b/src/harness/virtualFileSystemWithWatch.ts
index 829d6e8fa41..24640a8fc51 100644
--- a/src/harness/virtualFileSystemWithWatch.ts
+++ b/src/harness/virtualFileSystemWithWatch.ts
@@ -97,7 +97,7 @@ interface Array<T> { length: number; [n: number]: T; }`
         symLink: string;
     }
 
-    type FSEntry = FsFile | FsFolder | FsSymLink;
+    export type FSEntry = FsFile | FsFolder | FsSymLink;
 
     function isFsFolder(s: FSEntry | undefined): s is FsFolder {
         return !!s && isArray((s as FsFolder).entries);
diff --git a/src/server/tsconfig.json b/src/server/tsconfig.json
index b0a2f59ba77..4e8dd18dcdb 100644
--- a/src/server/tsconfig.json
+++ b/src/server/tsconfig.json
@@ -17,7 +17,6 @@
         "types.ts",
         "utilitiesPublic.ts",
         "utilities.ts",
-        "watchType.ts",
         "protocol.ts",
         "scriptInfo.ts",
         "typingsCache.ts",
diff --git a/src/server/watchType.ts b/src/server/watchType.ts
deleted file mode 100644
index 7893de0e26b..00000000000
--- a/src/server/watchType.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/* @internal */
-namespace ts {
-    // Additional tsserver specific watch information
-    export interface WatchTypeRegistry {
-        ClosedScriptInfo: "Closed Script info",
-        ConfigFileForInferredRoot: "Config file for the inferred project root",
-        NodeModules: "node_modules for closed script infos and package.jsons affecting module specifier cache",
-        MissingSourceMapFile: "Missing source map file",
-        NoopConfigFileForInferredRoot: "Noop Config file for the inferred project root",
-        MissingGeneratedFile: "Missing generated file",
-        NodeModulesForModuleSpecifierCache: "node_modules for module specifier cache invalidation",
-    }
-    WatchType.ClosedScriptInfo = "Closed Script info";
-    WatchType.ConfigFileForInferredRoot = "Config file for the inferred project root";
-    WatchType.NodeModules = "node_modules for closed script infos and package.jsons affecting module specifier cache";
-    WatchType.MissingSourceMapFile = "Missing source map file";
-    WatchType.NoopConfigFileForInferredRoot = "Noop Config file for the inferred project root";
-    WatchType.MissingGeneratedFile = "Missing generated file";
-}