Make #884 regression test repro correctly; also fix the bug (#999)

cspotcode · web-flow · commit 838bd5503767 · 2020-05-16T06:52:42.000-04:00
* tweak issue #884 regression test so it triggers on master * Simplify while stil reproducing the issue * getScriptFileNames returns rootFileNames, not everything from memory cache
diff --git a/src/index.ts b/src/index.ts
@@ -477,13 +477,13 @@ export function create (rawOptions: CreateOptions = {}): Register {
   // Use full language services when the fast option is disabled.
   if (!transpileOnly) {
     const fileContents = new Map<string, string>()
-    const rootFileNames = config.fileNames.slice()
+    const rootFileNames = new Set(config.fileNames)
     const cachedReadFile = cachedLookup(debugFn('readFile', readFile))
 
     // Use language services by default (TODO: invert next major version).
     if (!options.compilerHost) {
       let projectVersion = 1
-      const fileVersions = new Map(rootFileNames.map(fileName => [fileName, 0]))
+      const fileVersions = new Map(Array.from(rootFileNames).map(fileName => [fileName, 0]))
 
       const getCustomTransformers = () => {
         if (typeof transformers === 'function') {
@@ -497,7 +497,7 @@ export function create (rawOptions: CreateOptions = {}): Register {
       // Create the compiler host for type checking.
       const serviceHost: _ts.LanguageServiceHost = {
         getProjectVersion: () => String(projectVersion),
-        getScriptFileNames: () => Array.from(fileVersions.keys()),
+        getScriptFileNames: () => Array.from(rootFileNames),
         getScriptVersion: (fileName: string) => {
           const version = fileVersions.get(fileName)
           return version ? version.toString() : ''
@@ -533,9 +533,12 @@ export function create (rawOptions: CreateOptions = {}): Register {
       const service = ts.createLanguageService(serviceHost, registry)
 
       const updateMemoryCache = (contents: string, fileName: string) => {
-        // Add to `rootFiles` when discovered for the first time.
-        if (!fileVersions.has(fileName)) {
-          rootFileNames.push(fileName)
+        // Add to `rootFiles` if not already there
+        // This is necessary to force TS to emit output
+        if (!rootFileNames.has(fileName)) {
+          rootFileNames.add(fileName)
+          // Increment project version for every change to rootFileNames.
+          projectVersion++
         }
 
         const previousVersion = fileVersions.get(fileName) || 0
@@ -637,14 +640,14 @@ export function create (rawOptions: CreateOptions = {}): Register {
       // Fallback for older TypeScript releases without incremental API.
       let builderProgram = ts.createIncrementalProgram
         ? ts.createIncrementalProgram({
-          rootNames: rootFileNames.slice(),
+          rootNames: Array.from(rootFileNames),
           options: config.options,
           host: host,
           configFileParsingDiagnostics: config.errors,
           projectReferences: config.projectReferences
         })
         : ts.createEmitAndSemanticDiagnosticsBuilderProgram(
-          rootFileNames.slice(),
+          Array.from(rootFileNames),
           config.options,
           host,
           undefined,
@@ -665,13 +668,13 @@ export function create (rawOptions: CreateOptions = {}): Register {
 
         // Add to `rootFiles` when discovered by compiler for the first time.
         if (sourceFile === undefined) {
-          rootFileNames.push(fileName)
+          rootFileNames.add(fileName)
         }
 
         // Update program when file changes.
         if (sourceFile === undefined || sourceFile.text !== contents) {
           builderProgram = ts.createEmitAndSemanticDiagnosticsBuilderProgram(
-            rootFileNames.slice(),
+            Array.from(rootFileNames),
             config.options,
             host,
             builderProgram,
diff --git a/tests/issue-884/index-2.ts b/tests/issue-884/index-2.ts
@@ -0,0 +1,7 @@
+export {};
+
+const timeout = setTimeout(() => {}, 0);
+
+if (timeout.unref) {
+  timeout.unref();
+}
diff --git a/tests/issue-884/index.ts b/tests/issue-884/index.ts
@@ -1,5 +1,3 @@
-const timeout = setTimeout(() => {}, 0);
-
-if (timeout.unref) {
-  timeout.unref();
-}
+// 2x index files required so that memory cache is populated with all build-in lib and @types
+// declarations *before* this require() call.
+require('./index-2');
