Make watch/FS testing code friendlier for project loading in module t…

…ransformation (microsoft#49087)
jakebailey · May 12, 2022 · 92894d3 · 92894d3
1 parent b689cd0
commit 92894d3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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