typescript 5.1.0-dev.20230330 → 5.1.0-dev.20230401

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230330`;
+var version = `${versionMajorMinor}.0-dev.20230401`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -4076,7 +4076,7 @@ function createDynamicPriorityPollingWatchFile(host) {
     queue.pollScheduled = false;
     return queue;
   }
-  function pollPollingIntervalQueue(queue) {
+  function pollPollingIntervalQueue(_timeoutType, queue) {
     queue.pollIndex = pollQueue(queue, queue.pollingInterval, queue.pollIndex, pollingChunkSize[queue.pollingInterval]);
     if (queue.length) {
       scheduleNextPoll(queue.pollingInterval);
@@ -4085,7 +4085,7 @@ function createDynamicPriorityPollingWatchFile(host) {
       queue.pollScheduled = false;
     }
   }
-  function pollLowPollingIntervalQueue(queue) {
+  function pollLowPollingIntervalQueue(_timeoutType, queue) {
     pollQueue(
       changedFilesInLastPoll,
       250 /* Low */,
@@ -4093,7 +4093,7 @@ function createDynamicPriorityPollingWatchFile(host) {
       0,
       changedFilesInLastPoll.length
     );
-    pollPollingIntervalQueue(queue);
+    pollPollingIntervalQueue(_timeoutType, queue);
     if (!queue.pollScheduled && changedFilesInLastPoll.length) {
       scheduleNextPoll(250 /* Low */);
     }
@@ -4150,7 +4150,7 @@ function createDynamicPriorityPollingWatchFile(host) {
     }
   }
   function scheduleNextPoll(pollingInterval) {
-    pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === 250 /* Low */ ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingIntervalQueue(pollingInterval));
+    pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === 250 /* Low */ ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingInterval === 250 /* Low */ ? "pollLowPollingIntervalQueue" : "pollPollingIntervalQueue", pollingIntervalQueue(pollingInterval));
   }
 }
 function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames) {
@@ -4229,7 +4229,7 @@ function createFixedChunkSizePollingWatchFile(host) {
   function scheduleNextPoll() {
     if (!watchedFiles.length || pollScheduled)
       return;
-    pollScheduled = host.setTimeout(pollQueue, 2e3 /* High */);
+    pollScheduled = host.setTimeout(pollQueue, 2e3 /* High */, "pollQueue");
   }
 }
 function createSingleWatcherPerName(cache, useCaseSensitiveFileNames, name, callback, createWatcher) {
@@ -4397,7 +4397,7 @@ function createDirectoryWatcherSupportingRecursive({
       clearTimeout2(timerToUpdateChildWatches);
       timerToUpdateChildWatches = void 0;
     }
-    timerToUpdateChildWatches = setTimeout2(onTimerToUpdateChildWatches, 1e3);
+    timerToUpdateChildWatches = setTimeout2(onTimerToUpdateChildWatches, 1e3, "timerToUpdateChildWatches");
   }
   function onTimerToUpdateChildWatches() {
     timerToUpdateChildWatches = void 0;
@@ -6216,7 +6216,6 @@ var Diagnostics = {
   Constructors_for_derived_classes_must_contain_a_super_call: diag(2377, 1 /* Error */, "Constructors_for_derived_classes_must_contain_a_super_call_2377", "Constructors for derived classes must contain a 'super' call."),
   A_get_accessor_must_return_a_value: diag(2378, 1 /* Error */, "A_get_accessor_must_return_a_value_2378", "A 'get' accessor must return a value."),
   Argument_of_type_0_is_not_assignable_to_parameter_of_type_1_with_exactOptionalPropertyTypes_Colon_true_Consider_adding_undefined_to_the_types_of_the_target_s_properties: diag(2379, 1 /* Error */, "Argument_of_type_0_is_not_assignable_to_parameter_of_type_1_with_exactOptionalPropertyTypes_Colon_tr_2379", "Argument of type '{0}' is not assignable to parameter of type '{1}' with 'exactOptionalPropertyTypes: true'. Consider adding 'undefined' to the types of the target's properties."),
-  The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type: diag(2380, 1 /* Error */, "The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type_2380", "The return type of a 'get' accessor must be assignable to its 'set' accessor type"),
   Overload_signatures_must_all_be_exported_or_non_exported: diag(2383, 1 /* Error */, "Overload_signatures_must_all_be_exported_or_non_exported_2383", "Overload signatures must all be exported or non-exported."),
   Overload_signatures_must_all_be_ambient_or_non_ambient: diag(2384, 1 /* Error */, "Overload_signatures_must_all_be_ambient_or_non_ambient_2384", "Overload signatures must all be ambient or non-ambient."),
   Overload_signatures_must_all_be_public_private_or_protected: diag(2385, 1 /* Error */, "Overload_signatures_must_all_be_public_private_or_protected_2385", "Overload signatures must all be public, private or protected."),
@@ -16220,6 +16219,9 @@ function getAllowSyntheticDefaultImports(compilerOptions) {
 function moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution) {
   return moduleResolution >= 3 /* Node16 */ && moduleResolution <= 99 /* NodeNext */ || moduleResolution === 100 /* Bundler */;
 }
+function shouldResolveJsRequire(compilerOptions) {
+  return !!compilerOptions.noDtsResolution || getEmitModuleResolutionKind(compilerOptions) !== 100 /* Bundler */;
+}
 function getResolvePackageJsonExports(compilerOptions) {
   const moduleResolution = getEmitModuleResolutionKind(compilerOptions);
   if (!moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution)) {
@@ -34132,7 +34134,8 @@ var commandOptionsWithoutBuild = [
     affectsBuildInfo: true,
     category: Diagnostics.Modules,
     description: Diagnostics.Allow_imports_to_include_TypeScript_file_extensions_Requires_moduleResolution_bundler_and_either_noEmit_or_emitDeclarationOnly_to_be_set,
-    defaultValueDescription: false
+    defaultValueDescription: false,
+    transpileOptionValue: void 0
   },
   {
     name: "resolvePackageJsonExports",
@@ -41293,7 +41296,7 @@ function createBinder() {
     }
     if (!isBindingPattern(node.name)) {
       const possibleVariableDecl = node.kind === 258 /* VariableDeclaration */ ? node : node.parent.parent;
-      if (isInJSFile(node) && getEmitModuleResolutionKind(options) !== 100 /* Bundler */ && isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) && !getJSDocTypeTag(node) && !(getCombinedModifierFlags(node) & 1 /* Export */)) {
+      if (isInJSFile(node) && shouldResolveJsRequire(options) && isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) && !getJSDocTypeTag(node) && !(getCombinedModifierFlags(node) & 1 /* Export */)) {
         declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
       } else if (isBlockOrCatchScoped(node)) {
         bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 111551 /* BlockScopedVariableExcludes */);
@@ -44904,7 +44907,7 @@ function createTypeChecker(host) {
     const hasDefaultOnly = isOnlyImportedAsDefault(specifier);
     const hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, specifier);
     if (!exportDefaultSymbol && !hasSyntheticDefault && !hasDefaultOnly) {
-      if (hasExportAssignmentSymbol(moduleSymbol) && !(getAllowSyntheticDefaultImports(compilerOptions) || getESModuleInterop(compilerOptions))) {
+      if (hasExportAssignmentSymbol(moduleSymbol) && !allowSyntheticDefaultImports) {
         const compilerOptionName = moduleKind >= 5 /* ES2015 */ ? "allowSyntheticDefaultImports" : "esModuleInterop";
         const exportEqualsSymbol = moduleSymbol.exports.get("export=" /* ExportEquals */);
         const exportAssignment = exportEqualsSymbol.valueDeclaration;
@@ -45072,7 +45075,7 @@ function createTypeChecker(host) {
     if (!isIdentifier(name)) {
       return void 0;
     }
-    const suppressInteropError = name.escapedText === "default" /* Default */ && !!(compilerOptions.allowSyntheticDefaultImports || getESModuleInterop(compilerOptions));
+    const suppressInteropError = name.escapedText === "default" /* Default */ && allowSyntheticDefaultImports;
     const targetSymbol = resolveESModuleSymbol(
       moduleSymbol,
       moduleSpecifier,
@@ -49714,7 +49717,7 @@ function createTypeChecker(host) {
           return;
         }
         let verbatimTargetName = isShorthandAmbientModuleSymbol(target) && getSomeTargetNameFromDeclarations(symbol.declarations) || unescapeLeadingUnderscores(target.escapedName);
-        if (verbatimTargetName === "export=" /* ExportEquals */ && (getESModuleInterop(compilerOptions) || compilerOptions.allowSyntheticDefaultImports)) {
+        if (verbatimTargetName === "export=" /* ExportEquals */ && allowSyntheticDefaultImports) {
           verbatimTargetName = "default" /* Default */;
         }
         const targetName = getInternalSymbolName(target, verbatimTargetName);
@@ -70937,7 +70940,7 @@ function createTypeChecker(host) {
         return anyType;
       }
     }
-    if (isInJSFile(node) && getEmitModuleResolutionKind(compilerOptions) !== 100 /* Bundler */ && isCommonJsRequire(node)) {
+    if (isInJSFile(node) && shouldResolveJsRequire(compilerOptions) && isCommonJsRequire(node)) {
       return resolveExternalModuleTypeByLiteral(node.arguments[0]);
     }
     const returnType = getReturnTypeOfSignature(signature);
@@ -74642,11 +74645,6 @@ function createTypeChecker(host) {
             error(getter.name, Diagnostics.A_get_accessor_must_be_at_least_as_accessible_as_the_setter);
             error(setter.name, Diagnostics.A_get_accessor_must_be_at_least_as_accessible_as_the_setter);
           }
-          const getterType = getAnnotatedAccessorType(getter);
-          const setterType = getAnnotatedAccessorType(setter);
-          if (getterType && setterType) {
-            checkTypeAssignableTo(getterType, setterType, getter, Diagnostics.The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type);
-          }
         }
       }
       const returnType = getTypeOfAccessors(getSymbolOfDeclaration(node));
@@ -114683,7 +114681,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
         false
       );
     }
-    const shouldProcessRequires = isJavaScriptFile && getEmitModuleResolutionKind(options) !== 100 /* Bundler */;
+    const shouldProcessRequires = isJavaScriptFile && shouldResolveJsRequire(options);
     if (file.flags & 2097152 /* PossiblyContainsDynamicImport */ || shouldProcessRequires) {
       collectDynamicImportOrRequireCalls(file);
     }
@@ -118096,6 +118094,79 @@ function canWatchDirectoryOrFile(dirPath) {
   }
   return true;
 }
+function canWatchAtTypes(atTypes, rootPath) {
+  const dirPath = getDirectoryPath(getDirectoryPath(atTypes));
+  return dirPath === rootPath || canWatchDirectoryOrFile(dirPath);
+}
+function isInDirectoryPath(dir, file) {
+  if (dir === void 0 || file.length <= dir.length) {
+    return false;
+  }
+  return startsWith(file, dir) && file[dir.length] === directorySeparator;
+}
+function canWatchAffectingLocation(filePath) {
+  return canWatchDirectoryOrFile(filePath);
+}
+function getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath, rootDir, rootPath, rootSplitLength, getCurrentDirectory) {
+  if (isInDirectoryPath(rootPath, failedLookupLocationPath)) {
+    failedLookupLocation = isRootedDiskPath(failedLookupLocation) ? normalizePath(failedLookupLocation) : getNormalizedAbsolutePath(failedLookupLocation, getCurrentDirectory());
+    const failedLookupPathSplit = failedLookupLocationPath.split(directorySeparator);
+    const failedLookupSplit = failedLookupLocation.split(directorySeparator);
+    Debug.assert(failedLookupSplit.length === failedLookupPathSplit.length, `FailedLookup: ${failedLookupLocation} failedLookupLocationPath: ${failedLookupLocationPath}`);
+    if (failedLookupPathSplit.length > rootSplitLength + 1) {
+      return {
+        dir: failedLookupSplit.slice(0, rootSplitLength + 1).join(directorySeparator),
+        dirPath: failedLookupPathSplit.slice(0, rootSplitLength + 1).join(directorySeparator)
+      };
+    } else {
+      return {
+        dir: rootDir,
+        dirPath: rootPath,
+        nonRecursive: false
+      };
+    }
+  }
+  return getDirectoryToWatchFromFailedLookupLocationDirectory(
+    getDirectoryPath(getNormalizedAbsolutePath(failedLookupLocation, getCurrentDirectory())),
+    getDirectoryPath(failedLookupLocationPath),
+    rootPath
+  );
+}
+function getDirectoryToWatchFromFailedLookupLocationDirectory(dir, dirPath, rootPath) {
+  while (pathContainsNodeModules(dirPath)) {
+    dir = getDirectoryPath(dir);
+    dirPath = getDirectoryPath(dirPath);
+  }
+  if (isNodeModulesDirectory(dirPath)) {
+    return canWatchDirectoryOrFile(getDirectoryPath(dirPath)) ? { dir, dirPath } : void 0;
+  }
+  let nonRecursive = true;
+  let subDirectoryPath, subDirectory;
+  if (rootPath !== void 0) {
+    while (!isInDirectoryPath(dirPath, rootPath)) {
+      const parentPath = getDirectoryPath(dirPath);
+      if (parentPath === dirPath) {
+        break;
+      }
+      nonRecursive = false;
+      subDirectoryPath = dirPath;
+      subDirectory = dir;
+      dirPath = parentPath;
+      dir = getDirectoryPath(dir);
+    }
+  }
+  return canWatchDirectoryOrFile(dirPath) ? { dir: subDirectory || dir, dirPath: subDirectoryPath || dirPath, nonRecursive } : void 0;
+}
+function getDirectoryToWatchFailedLookupLocationFromTypeRoot(typeRoot, typeRootPath, rootPath, filterCustomPath) {
+  if (isInDirectoryPath(rootPath, typeRootPath)) {
+    return rootPath;
+  }
+  const toWatch = getDirectoryToWatchFromFailedLookupLocationDirectory(typeRoot, typeRootPath, rootPath);
+  return toWatch && filterCustomPath(toWatch.dirPath) ? toWatch.dirPath : void 0;
+}
+function getRootDirectoryOfResolutionCache(rootDirForResolution, getCurrentDirectory) {
+  return rootDirForResolution && removeTrailingDirectorySeparator(getNormalizedAbsolutePath(rootDirForResolution, getCurrentDirectory()));
+}
 function createResolutionCache(resolutionHost, rootDirForResolution, logChangesWhenResolvingModule) {
   let filesWithChangedSetOfUnresolvedImports;
   let filesWithInvalidatedResolutions;
@@ -118130,7 +118201,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   const customFailedLookupPaths = /* @__PURE__ */ new Map();
   const directoryWatchesOfFailedLookups = /* @__PURE__ */ new Map();
   const fileWatchesOfAffectingLocations = /* @__PURE__ */ new Map();
-  const rootDir = rootDirForResolution && removeTrailingDirectorySeparator(getNormalizedAbsolutePath(rootDirForResolution, getCurrentDirectory()));
+  const rootDir = getRootDirectoryOfResolutionCache(rootDirForResolution, getCurrentDirectory);
   const rootPath = rootDir && resolutionHost.toPath(rootDir);
   const rootSplitLength = rootPath !== void 0 ? rootPath.split(directorySeparator).length : 0;
   const typeRootsWatches = /* @__PURE__ */ new Map();
@@ -118163,12 +118234,6 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   function getResolvedTypeReferenceDirective(resolution) {
     return resolution.resolvedTypeReferenceDirective;
   }
-  function isInDirectoryPath(dir, file) {
-    if (dir === void 0 || file.length <= dir.length) {
-      return false;
-    }
-    return startsWith(file, dir) && file[dir.length] === directorySeparator;
-  }
   function clear2() {
     clearMap(directoryWatchesOfFailedLookups, closeFileWatcherOf);
     clearMap(fileWatchesOfAffectingLocations, closeFileWatcherOf);
@@ -118452,55 +118517,6 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   function isNodeModulesAtTypesDirectory(dirPath) {
     return endsWith(dirPath, "/node_modules/@types");
   }
-  function getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath) {
-    if (isInDirectoryPath(rootPath, failedLookupLocationPath)) {
-      failedLookupLocation = isRootedDiskPath(failedLookupLocation) ? normalizePath(failedLookupLocation) : getNormalizedAbsolutePath(failedLookupLocation, getCurrentDirectory());
-      const failedLookupPathSplit = failedLookupLocationPath.split(directorySeparator);
-      const failedLookupSplit = failedLookupLocation.split(directorySeparator);
-      Debug.assert(failedLookupSplit.length === failedLookupPathSplit.length, `FailedLookup: ${failedLookupLocation} failedLookupLocationPath: ${failedLookupLocationPath}`);
-      if (failedLookupPathSplit.length > rootSplitLength + 1) {
-        return {
-          dir: failedLookupSplit.slice(0, rootSplitLength + 1).join(directorySeparator),
-          dirPath: failedLookupPathSplit.slice(0, rootSplitLength + 1).join(directorySeparator)
-        };
-      } else {
-        return {
-          dir: rootDir,
-          dirPath: rootPath,
-          nonRecursive: false
-        };
-      }
-    }
-    return getDirectoryToWatchFromFailedLookupLocationDirectory(
-      getDirectoryPath(getNormalizedAbsolutePath(failedLookupLocation, getCurrentDirectory())),
-      getDirectoryPath(failedLookupLocationPath)
-    );
-  }
-  function getDirectoryToWatchFromFailedLookupLocationDirectory(dir, dirPath) {
-    while (pathContainsNodeModules(dirPath)) {
-      dir = getDirectoryPath(dir);
-      dirPath = getDirectoryPath(dirPath);
-    }
-    if (isNodeModulesDirectory(dirPath)) {
-      return canWatchDirectoryOrFile(getDirectoryPath(dirPath)) ? { dir, dirPath } : void 0;
-    }
-    let nonRecursive = true;
-    let subDirectoryPath, subDirectory;
-    if (rootPath !== void 0) {
-      while (!isInDirectoryPath(dirPath, rootPath)) {
-        const parentPath = getDirectoryPath(dirPath);
-        if (parentPath === dirPath) {
-          break;
-        }
-        nonRecursive = false;
-        subDirectoryPath = dirPath;
-        subDirectory = dir;
-        dirPath = parentPath;
-        dir = getDirectoryPath(dir);
-      }
-    }
-    return canWatchDirectoryOrFile(dirPath) ? { dir: subDirectory || dir, dirPath: subDirectoryPath || dirPath, nonRecursive } : void 0;
-  }
   function isPathWithDefaultFailedLookupExtension(path) {
     return fileExtensionIsOneOf(path, failedLookupDefaultExtensions);
   }
@@ -118539,7 +118555,14 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     if (failedLookupLocations) {
       for (const failedLookupLocation of failedLookupLocations) {
         const failedLookupLocationPath = resolutionHost.toPath(failedLookupLocation);
-        const toWatch = getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath);
+        const toWatch = getDirectoryToWatchFailedLookupLocation(
+          failedLookupLocation,
+          failedLookupLocationPath,
+          rootDir,
+          rootPath,
+          rootSplitLength,
+          getCurrentDirectory
+        );
         if (toWatch) {
           const { dir, dirPath, nonRecursive } = toWatch;
           if (!isPathWithDefaultFailedLookupExtension(failedLookupLocationPath)) {
@@ -118607,7 +118630,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     }
     const paths = /* @__PURE__ */ new Set();
     paths.add(locationToWatch);
-    let actualWatcher = canWatchDirectoryOrFile(resolutionHost.toPath(locationToWatch)) ? resolutionHost.watchAffectingFileLocation(locationToWatch, (fileName, eventKind) => {
+    let actualWatcher = canWatchAffectingLocation(resolutionHost.toPath(locationToWatch)) ? resolutionHost.watchAffectingFileLocation(locationToWatch, (fileName, eventKind) => {
       cachedDirectoryStructureHost == null ? void 0 : cachedDirectoryStructureHost.addOrDeleteFile(fileName, resolutionHost.toPath(locationToWatch), eventKind);
       const packageJsonMap = moduleResolutionCache.getPackageJsonInfoCache().getInternalMap();
       paths.forEach((path) => {
@@ -118675,7 +118698,14 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       let removeAtRoot = false;
       for (const failedLookupLocation of failedLookupLocations) {
         const failedLookupLocationPath = resolutionHost.toPath(failedLookupLocation);
-        const toWatch = getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath);
+        const toWatch = getDirectoryToWatchFailedLookupLocation(
+          failedLookupLocation,
+          failedLookupLocationPath,
+          rootDir,
+          rootPath,
+          rootSplitLength,
+          getCurrentDirectory
+        );
         if (toWatch) {
           const { dirPath } = toWatch;
           const refCount = customFailedLookupPaths.get(failedLookupLocationPath);
@@ -118843,13 +118873,6 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   function closeTypeRootsWatch() {
     clearMap(typeRootsWatches, closeFileWatcher);
   }
-  function getDirectoryToWatchFailedLookupLocationFromTypeRoot(typeRoot, typeRootPath) {
-    if (isInDirectoryPath(rootPath, typeRootPath)) {
-      return rootPath;
-    }
-    const toWatch = getDirectoryToWatchFromFailedLookupLocationDirectory(typeRoot, typeRootPath);
-    return toWatch && directoryWatchesOfFailedLookups.has(toWatch.dirPath) ? toWatch.dirPath : void 0;
-  }
   function createTypeRootsWatch(typeRootPath, typeRoot) {
     return canWatchTypeRootPath(typeRootPath) ? resolutionHost.watchTypeRootsDirectory(typeRoot, (fileOrDirectory) => {
       const fileOrDirectoryPath = resolutionHost.toPath(fileOrDirectory);
@@ -118858,7 +118881,12 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       }
       hasChangedAutomaticTypeDirectiveNames = true;
       resolutionHost.onChangedAutomaticTypeDirectiveNames();
-      const dirPath = getDirectoryToWatchFailedLookupLocationFromTypeRoot(typeRoot, typeRootPath);
+      const dirPath = getDirectoryToWatchFailedLookupLocationFromTypeRoot(
+        typeRoot,
+        typeRootPath,
+        rootPath,
+        (dirPath2) => directoryWatchesOfFailedLookups.has(dirPath2)
+      );
       if (dirPath) {
         scheduleInvalidateResolutionOfFailedLookupLocation(fileOrDirectoryPath, dirPath === fileOrDirectoryPath);
       }
@@ -118884,12 +118912,10 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       closeTypeRootsWatch();
     }
   }
-  function canWatchTypeRootPath(nodeTypesDirectory) {
+  function canWatchTypeRootPath(typeRoot) {
     if (resolutionHost.getCompilationSettings().typeRoots)
       return true;
-    const dir = getDirectoryPath(getDirectoryPath(nodeTypesDirectory));
-    const dirPath = resolutionHost.toPath(dir);
-    return dirPath === rootPath || canWatchDirectoryOrFile(dirPath);
+    return canWatchAtTypes(resolutionHost.toPath(typeRoot), rootPath);
   }
 }
 function resolutionIsSymlink(resolution) {
@@ -119924,7 +119950,7 @@ function createWatchProgram(host) {
     }
     const pending = clearInvalidateResolutionsOfFailedLookupLocations();
     writeLog(`Scheduling invalidateFailedLookup${pending ? ", Cancelled earlier one" : ""}`);
-    timerToInvalidateFailedLookupResolutions = host.setTimeout(invalidateResolutionsOfFailedLookup, 250);
+    timerToInvalidateFailedLookupResolutions = host.setTimeout(invalidateResolutionsOfFailedLookup, 250, "timerToInvalidateFailedLookupResolutions");
   }
   function invalidateResolutionsOfFailedLookup() {
     timerToInvalidateFailedLookupResolutions = void 0;
@@ -119940,7 +119966,7 @@ function createWatchProgram(host) {
       host.clearTimeout(timerToUpdateProgram);
     }
     writeLog("Scheduling update");
-    timerToUpdateProgram = host.setTimeout(updateProgramWithWatchStatus, 250);
+    timerToUpdateProgram = host.setTimeout(updateProgramWithWatchStatus, 250, "timerToUpdateProgram");
   }
   function scheduleProgramReload() {
     Debug.assert(!!configFileName);
@@ -121818,9 +121844,9 @@ function scheduleBuildInvalidatedProject(state, time, changeDetected) {
   if (state.timerToBuildInvalidatedProject) {
     hostWithWatch.clearTimeout(state.timerToBuildInvalidatedProject);
   }
-  state.timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildNextInvalidatedProject, time, state, changeDetected);
+  state.timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildNextInvalidatedProject, time, "timerToBuildInvalidatedProject", state, changeDetected);
 }
-function buildNextInvalidatedProject(state, changeDetected) {
+function buildNextInvalidatedProject(_timeoutType, state, changeDetected) {
   mark("SolutionBuilder::beforeBuild");
   const buildOrder = buildNextInvalidatedProjectWorker(state, changeDetected);
   mark("SolutionBuilder::afterBuild");