@typescript-deploys/pr-build 5.1.0-pr-53420-2 → 5.1.0-pr-53487-5

package/lib/tsc.js

@@ -118065,6 +118065,8 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     resolutionHost.getCompilationSettings(),
     moduleResolutionCache.getPackageJsonInfoCache()
   );
+  const failedLookupDefaultExtensions = [".ts" /* Ts */, ".tsx" /* Tsx */, ".js" /* Js */, ".jsx" /* Jsx */, ".json" /* Json */];
+  const customFailedLookupPaths = /* @__PURE__ */ new Map();
   const directoryWatchesOfFailedLookups = /* @__PURE__ */ new Map();
   const fileWatchesOfAffectingLocations = /* @__PURE__ */ new Map();
   const rootDir = rootDirForResolution && removeTrailingDirectorySeparator(getNormalizedAbsolutePath(rootDirForResolution, getCurrentDirectory()));
@@ -118109,6 +118111,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   function clear2() {
     clearMap(directoryWatchesOfFailedLookups, closeFileWatcherOf);
     clearMap(fileWatchesOfAffectingLocations, closeFileWatcherOf);
+    customFailedLookupPaths.clear();
     nonRelativeExternalModuleResolutions.clear();
     closeTypeRootsWatch();
     resolvedModuleNames.clear();
@@ -118418,7 +118421,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       dirPath = getDirectoryPath(dirPath);
     }
     if (isNodeModulesDirectory(dirPath)) {
-      return canWatchDirectoryOrFile(dirPath) ? { dir, dirPath } : void 0;
+      return canWatchDirectoryOrFile(getDirectoryPath(dirPath)) ? { dir, dirPath } : void 0;
     }
     let nonRecursive = true;
     let subDirectoryPath, subDirectory;
@@ -118437,6 +118440,9 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     }
     return canWatchDirectoryOrFile(dirPath) ? { dir: subDirectory || dir, dirPath: subDirectoryPath || dirPath, nonRecursive } : void 0;
   }
+  function isPathWithDefaultFailedLookupExtension(path) {
+    return fileExtensionIsOneOf(path, failedLookupDefaultExtensions);
+  }
   function watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, filePath, getResolutionWithResolvedFileName) {
     var _a2, _b;
     if (resolution.refCount) {
@@ -118475,6 +118481,10 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
         const toWatch = getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath);
         if (toWatch) {
           const { dir, dirPath, nonRecursive } = toWatch;
+          if (!isPathWithDefaultFailedLookupExtension(failedLookupLocationPath)) {
+            const refCount = customFailedLookupPaths.get(failedLookupLocationPath) || 0;
+            customFailedLookupPaths.set(failedLookupLocationPath, refCount + 1);
+          }
           if (dirPath === rootPath) {
             Debug.assert(!nonRecursive);
             setAtRoot = true;
@@ -118509,10 +118519,6 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       );
     }
   }
-  function isInRootPathOrCanWatchDirectoryOrFile(locationToWatch) {
-    const path = resolutionHost.toPath(locationToWatch);
-    return isInDirectoryPath(rootPath, path) || canWatchDirectoryOrFile(path);
-  }
   function createFileWatcherOfAffectingLocation(affectingLocation, forResolution) {
     const fileWatcher = fileWatchesOfAffectingLocations.get(affectingLocation);
     if (fileWatcher) {
@@ -118540,7 +118546,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     }
     const paths = /* @__PURE__ */ new Set();
     paths.add(locationToWatch);
-    let actualWatcher = isInRootPathOrCanWatchDirectoryOrFile(locationToWatch) ? resolutionHost.watchAffectingFileLocation(locationToWatch, (fileName, eventKind) => {
+    let actualWatcher = canWatchDirectoryOrFile(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) => {
@@ -118611,6 +118617,15 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
         const toWatch = getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath);
         if (toWatch) {
           const { dirPath } = toWatch;
+          const refCount = customFailedLookupPaths.get(failedLookupLocationPath);
+          if (refCount) {
+            if (refCount === 1) {
+              customFailedLookupPaths.delete(failedLookupLocationPath);
+            } else {
+              Debug.assert(refCount > 1);
+              customFailedLookupPaths.set(failedLookupLocationPath, refCount - 1);
+            }
+          }
           if (dirPath === rootPath) {
             removeAtRoot = true;
           } else {
@@ -118708,10 +118723,10 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
         (failedLookupChecks || (failedLookupChecks = /* @__PURE__ */ new Set())).add(fileOrDirectoryPath);
         (startsWithPathChecks || (startsWithPathChecks = /* @__PURE__ */ new Set())).add(fileOrDirectoryPath);
       } else {
-        if (isEmittedFileOfProgram(resolutionHost.getCurrentProgram(), fileOrDirectoryPath)) {
+        if (!isPathWithDefaultFailedLookupExtension(fileOrDirectoryPath) && !customFailedLookupPaths.has(fileOrDirectoryPath)) {
           return false;
         }
-        if (fileExtensionIs(fileOrDirectoryPath, ".map")) {
+        if (isEmittedFileOfProgram(resolutionHost.getCurrentProgram(), fileOrDirectoryPath)) {
           return false;
         }
         (failedLookupChecks || (failedLookupChecks = /* @__PURE__ */ new Set())).add(fileOrDirectoryPath);
@@ -118808,10 +118823,12 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       closeTypeRootsWatch();
     }
   }
-  function canWatchTypeRootPath(typeRoot) {
-    return !!resolutionHost.getCompilationSettings().typeRoots || // Otherwise we'll only watch this path if it falls within `rootDir` or
-    // the path is not disqualified by other criteria ("not `C:\Users\Name\Dir`").
-    isInRootPathOrCanWatchDirectoryOrFile(getDirectoryPath(typeRoot));
+  function canWatchTypeRootPath(nodeTypesDirectory) {
+    if (resolutionHost.getCompilationSettings().typeRoots)
+      return true;
+    const dir = getDirectoryPath(getDirectoryPath(nodeTypesDirectory));
+    const dirPath = resolutionHost.toPath(dir);
+    return dirPath === rootPath || canWatchDirectoryOrFile(dirPath);
   }
 }
 function resolutionIsSymlink(resolution) {

package/lib/tsserver.js

@@ -122960,6 +122960,8 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     resolutionHost.getCompilationSettings(),
     moduleResolutionCache.getPackageJsonInfoCache()
   );
+  const failedLookupDefaultExtensions = [".ts" /* Ts */, ".tsx" /* Tsx */, ".js" /* Js */, ".jsx" /* Jsx */, ".json" /* Json */];
+  const customFailedLookupPaths = /* @__PURE__ */ new Map();
   const directoryWatchesOfFailedLookups = /* @__PURE__ */ new Map();
   const fileWatchesOfAffectingLocations = /* @__PURE__ */ new Map();
   const rootDir = rootDirForResolution && removeTrailingDirectorySeparator(getNormalizedAbsolutePath(rootDirForResolution, getCurrentDirectory()));
@@ -123004,6 +123006,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   function clear2() {
     clearMap(directoryWatchesOfFailedLookups, closeFileWatcherOf);
     clearMap(fileWatchesOfAffectingLocations, closeFileWatcherOf);
+    customFailedLookupPaths.clear();
     nonRelativeExternalModuleResolutions.clear();
     closeTypeRootsWatch();
     resolvedModuleNames.clear();
@@ -123313,7 +123316,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       dirPath = getDirectoryPath(dirPath);
     }
     if (isNodeModulesDirectory(dirPath)) {
-      return canWatchDirectoryOrFile(dirPath) ? { dir, dirPath } : void 0;
+      return canWatchDirectoryOrFile(getDirectoryPath(dirPath)) ? { dir, dirPath } : void 0;
     }
     let nonRecursive = true;
     let subDirectoryPath, subDirectory;
@@ -123332,6 +123335,9 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     }
     return canWatchDirectoryOrFile(dirPath) ? { dir: subDirectory || dir, dirPath: subDirectoryPath || dirPath, nonRecursive } : void 0;
   }
+  function isPathWithDefaultFailedLookupExtension(path) {
+    return fileExtensionIsOneOf(path, failedLookupDefaultExtensions);
+  }
   function watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, filePath, getResolutionWithResolvedFileName) {
     var _a2, _b;
     if (resolution.refCount) {
@@ -123370,6 +123376,10 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
         const toWatch = getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath);
         if (toWatch) {
           const { dir, dirPath, nonRecursive } = toWatch;
+          if (!isPathWithDefaultFailedLookupExtension(failedLookupLocationPath)) {
+            const refCount = customFailedLookupPaths.get(failedLookupLocationPath) || 0;
+            customFailedLookupPaths.set(failedLookupLocationPath, refCount + 1);
+          }
           if (dirPath === rootPath) {
             Debug.assert(!nonRecursive);
             setAtRoot = true;
@@ -123404,10 +123414,6 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       );
     }
   }
-  function isInRootPathOrCanWatchDirectoryOrFile(locationToWatch) {
-    const path = resolutionHost.toPath(locationToWatch);
-    return isInDirectoryPath(rootPath, path) || canWatchDirectoryOrFile(path);
-  }
   function createFileWatcherOfAffectingLocation(affectingLocation, forResolution) {
     const fileWatcher = fileWatchesOfAffectingLocations.get(affectingLocation);
     if (fileWatcher) {
@@ -123435,7 +123441,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     }
     const paths = /* @__PURE__ */ new Set();
     paths.add(locationToWatch);
-    let actualWatcher = isInRootPathOrCanWatchDirectoryOrFile(locationToWatch) ? resolutionHost.watchAffectingFileLocation(locationToWatch, (fileName, eventKind) => {
+    let actualWatcher = canWatchDirectoryOrFile(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) => {
@@ -123506,6 +123512,15 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
         const toWatch = getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath);
         if (toWatch) {
           const { dirPath } = toWatch;
+          const refCount = customFailedLookupPaths.get(failedLookupLocationPath);
+          if (refCount) {
+            if (refCount === 1) {
+              customFailedLookupPaths.delete(failedLookupLocationPath);
+            } else {
+              Debug.assert(refCount > 1);
+              customFailedLookupPaths.set(failedLookupLocationPath, refCount - 1);
+            }
+          }
           if (dirPath === rootPath) {
             removeAtRoot = true;
           } else {
@@ -123603,10 +123618,10 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
         (failedLookupChecks || (failedLookupChecks = /* @__PURE__ */ new Set())).add(fileOrDirectoryPath);
         (startsWithPathChecks || (startsWithPathChecks = /* @__PURE__ */ new Set())).add(fileOrDirectoryPath);
       } else {
-        if (isEmittedFileOfProgram(resolutionHost.getCurrentProgram(), fileOrDirectoryPath)) {
+        if (!isPathWithDefaultFailedLookupExtension(fileOrDirectoryPath) && !customFailedLookupPaths.has(fileOrDirectoryPath)) {
           return false;
         }
-        if (fileExtensionIs(fileOrDirectoryPath, ".map")) {
+        if (isEmittedFileOfProgram(resolutionHost.getCurrentProgram(), fileOrDirectoryPath)) {
           return false;
         }
         (failedLookupChecks || (failedLookupChecks = /* @__PURE__ */ new Set())).add(fileOrDirectoryPath);
@@ -123703,10 +123718,12 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       closeTypeRootsWatch();
     }
   }
-  function canWatchTypeRootPath(typeRoot) {
-    return !!resolutionHost.getCompilationSettings().typeRoots || // Otherwise we'll only watch this path if it falls within `rootDir` or
-    // the path is not disqualified by other criteria ("not `C:\Users\Name\Dir`").
-    isInRootPathOrCanWatchDirectoryOrFile(getDirectoryPath(typeRoot));
+  function canWatchTypeRootPath(nodeTypesDirectory) {
+    if (resolutionHost.getCompilationSettings().typeRoots)
+      return true;
+    const dir = getDirectoryPath(getDirectoryPath(nodeTypesDirectory));
+    const dirPath = resolutionHost.toPath(dir);
+    return dirPath === rootPath || canWatchDirectoryOrFile(dirPath);
   }
 }
 function resolutionIsSymlink(resolution) {
@@ -128742,7 +128759,13 @@ function findPrecedingToken(position, sourceFile, startNode2, excludeJsdoc) {
             sourceFile,
             n.kind
           );
-          return candidate2 && findRightmostToken(candidate2, sourceFile);
+          if (candidate2) {
+            if (isJSDocCommentContainingNode(candidate2) && candidate2.getChildren(sourceFile).length) {
+              return find2(candidate2);
+            }
+            return findRightmostToken(candidate2, sourceFile);
+          }
+          return void 0;
         } else {
           return find2(child);
         }

package/lib/tsserverlibrary.js

@@ -121131,6 +121131,8 @@ ${lanes.join("\n")}
       resolutionHost.getCompilationSettings(),
       moduleResolutionCache.getPackageJsonInfoCache()
     );
+    const failedLookupDefaultExtensions = [".ts" /* Ts */, ".tsx" /* Tsx */, ".js" /* Js */, ".jsx" /* Jsx */, ".json" /* Json */];
+    const customFailedLookupPaths = /* @__PURE__ */ new Map();
     const directoryWatchesOfFailedLookups = /* @__PURE__ */ new Map();
     const fileWatchesOfAffectingLocations = /* @__PURE__ */ new Map();
     const rootDir = rootDirForResolution && removeTrailingDirectorySeparator(getNormalizedAbsolutePath(rootDirForResolution, getCurrentDirectory()));
@@ -121175,6 +121177,7 @@ ${lanes.join("\n")}
     function clear2() {
       clearMap(directoryWatchesOfFailedLookups, closeFileWatcherOf);
       clearMap(fileWatchesOfAffectingLocations, closeFileWatcherOf);
+      customFailedLookupPaths.clear();
       nonRelativeExternalModuleResolutions.clear();
       closeTypeRootsWatch();
       resolvedModuleNames.clear();
@@ -121484,7 +121487,7 @@ ${lanes.join("\n")}
         dirPath = getDirectoryPath(dirPath);
       }
       if (isNodeModulesDirectory(dirPath)) {
-        return canWatchDirectoryOrFile(dirPath) ? { dir, dirPath } : void 0;
+        return canWatchDirectoryOrFile(getDirectoryPath(dirPath)) ? { dir, dirPath } : void 0;
       }
       let nonRecursive = true;
       let subDirectoryPath, subDirectory;
@@ -121503,6 +121506,9 @@ ${lanes.join("\n")}
       }
       return canWatchDirectoryOrFile(dirPath) ? { dir: subDirectory || dir, dirPath: subDirectoryPath || dirPath, nonRecursive } : void 0;
     }
+    function isPathWithDefaultFailedLookupExtension(path) {
+      return fileExtensionIsOneOf(path, failedLookupDefaultExtensions);
+    }
     function watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, filePath, getResolutionWithResolvedFileName) {
       var _a2, _b;
       if (resolution.refCount) {
@@ -121541,6 +121547,10 @@ ${lanes.join("\n")}
           const toWatch = getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath);
           if (toWatch) {
             const { dir, dirPath, nonRecursive } = toWatch;
+            if (!isPathWithDefaultFailedLookupExtension(failedLookupLocationPath)) {
+              const refCount = customFailedLookupPaths.get(failedLookupLocationPath) || 0;
+              customFailedLookupPaths.set(failedLookupLocationPath, refCount + 1);
+            }
             if (dirPath === rootPath) {
               Debug.assert(!nonRecursive);
               setAtRoot = true;
@@ -121575,10 +121585,6 @@ ${lanes.join("\n")}
         );
       }
     }
-    function isInRootPathOrCanWatchDirectoryOrFile(locationToWatch) {
-      const path = resolutionHost.toPath(locationToWatch);
-      return isInDirectoryPath(rootPath, path) || canWatchDirectoryOrFile(path);
-    }
     function createFileWatcherOfAffectingLocation(affectingLocation, forResolution) {
       const fileWatcher = fileWatchesOfAffectingLocations.get(affectingLocation);
       if (fileWatcher) {
@@ -121606,7 +121612,7 @@ ${lanes.join("\n")}
       }
       const paths = /* @__PURE__ */ new Set();
       paths.add(locationToWatch);
-      let actualWatcher = isInRootPathOrCanWatchDirectoryOrFile(locationToWatch) ? resolutionHost.watchAffectingFileLocation(locationToWatch, (fileName, eventKind) => {
+      let actualWatcher = canWatchDirectoryOrFile(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) => {
@@ -121677,6 +121683,15 @@ ${lanes.join("\n")}
           const toWatch = getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath);
           if (toWatch) {
             const { dirPath } = toWatch;
+            const refCount = customFailedLookupPaths.get(failedLookupLocationPath);
+            if (refCount) {
+              if (refCount === 1) {
+                customFailedLookupPaths.delete(failedLookupLocationPath);
+              } else {
+                Debug.assert(refCount > 1);
+                customFailedLookupPaths.set(failedLookupLocationPath, refCount - 1);
+              }
+            }
             if (dirPath === rootPath) {
               removeAtRoot = true;
             } else {
@@ -121774,10 +121789,10 @@ ${lanes.join("\n")}
           (failedLookupChecks || (failedLookupChecks = /* @__PURE__ */ new Set())).add(fileOrDirectoryPath);
           (startsWithPathChecks || (startsWithPathChecks = /* @__PURE__ */ new Set())).add(fileOrDirectoryPath);
         } else {
-          if (isEmittedFileOfProgram(resolutionHost.getCurrentProgram(), fileOrDirectoryPath)) {
+          if (!isPathWithDefaultFailedLookupExtension(fileOrDirectoryPath) && !customFailedLookupPaths.has(fileOrDirectoryPath)) {
             return false;
           }
-          if (fileExtensionIs(fileOrDirectoryPath, ".map")) {
+          if (isEmittedFileOfProgram(resolutionHost.getCurrentProgram(), fileOrDirectoryPath)) {
             return false;
           }
           (failedLookupChecks || (failedLookupChecks = /* @__PURE__ */ new Set())).add(fileOrDirectoryPath);
@@ -121874,10 +121889,12 @@ ${lanes.join("\n")}
         closeTypeRootsWatch();
       }
     }
-    function canWatchTypeRootPath(typeRoot) {
-      return !!resolutionHost.getCompilationSettings().typeRoots || // Otherwise we'll only watch this path if it falls within `rootDir` or
-      // the path is not disqualified by other criteria ("not `C:\Users\Name\Dir`").
-      isInRootPathOrCanWatchDirectoryOrFile(getDirectoryPath(typeRoot));
+    function canWatchTypeRootPath(nodeTypesDirectory) {
+      if (resolutionHost.getCompilationSettings().typeRoots)
+        return true;
+      const dir = getDirectoryPath(getDirectoryPath(nodeTypesDirectory));
+      const dirPath = resolutionHost.toPath(dir);
+      return dirPath === rootPath || canWatchDirectoryOrFile(dirPath);
     }
   }
   function resolutionIsSymlink(resolution) {
@@ -127061,7 +127078,13 @@ ${lanes.join("\n")}
               sourceFile,
               n.kind
             );
-            return candidate2 && findRightmostToken(candidate2, sourceFile);
+            if (candidate2) {
+              if (isJSDocCommentContainingNode(candidate2) && candidate2.getChildren(sourceFile).length) {
+                return find2(candidate2);
+              }
+              return findRightmostToken(candidate2, sourceFile);
+            }
+            return void 0;
           } else {
             return find2(child);
           }

package/lib/typescript.js

@@ -121131,6 +121131,8 @@ ${lanes.join("\n")}
       resolutionHost.getCompilationSettings(),
       moduleResolutionCache.getPackageJsonInfoCache()
     );
+    const failedLookupDefaultExtensions = [".ts" /* Ts */, ".tsx" /* Tsx */, ".js" /* Js */, ".jsx" /* Jsx */, ".json" /* Json */];
+    const customFailedLookupPaths = /* @__PURE__ */ new Map();
     const directoryWatchesOfFailedLookups = /* @__PURE__ */ new Map();
     const fileWatchesOfAffectingLocations = /* @__PURE__ */ new Map();
     const rootDir = rootDirForResolution && removeTrailingDirectorySeparator(getNormalizedAbsolutePath(rootDirForResolution, getCurrentDirectory()));
@@ -121175,6 +121177,7 @@ ${lanes.join("\n")}
     function clear2() {
       clearMap(directoryWatchesOfFailedLookups, closeFileWatcherOf);
       clearMap(fileWatchesOfAffectingLocations, closeFileWatcherOf);
+      customFailedLookupPaths.clear();
       nonRelativeExternalModuleResolutions.clear();
       closeTypeRootsWatch();
       resolvedModuleNames.clear();
@@ -121484,7 +121487,7 @@ ${lanes.join("\n")}
         dirPath = getDirectoryPath(dirPath);
       }
       if (isNodeModulesDirectory(dirPath)) {
-        return canWatchDirectoryOrFile(dirPath) ? { dir, dirPath } : void 0;
+        return canWatchDirectoryOrFile(getDirectoryPath(dirPath)) ? { dir, dirPath } : void 0;
       }
       let nonRecursive = true;
       let subDirectoryPath, subDirectory;
@@ -121503,6 +121506,9 @@ ${lanes.join("\n")}
       }
       return canWatchDirectoryOrFile(dirPath) ? { dir: subDirectory || dir, dirPath: subDirectoryPath || dirPath, nonRecursive } : void 0;
     }
+    function isPathWithDefaultFailedLookupExtension(path) {
+      return fileExtensionIsOneOf(path, failedLookupDefaultExtensions);
+    }
     function watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, filePath, getResolutionWithResolvedFileName) {
       var _a2, _b;
       if (resolution.refCount) {
@@ -121541,6 +121547,10 @@ ${lanes.join("\n")}
           const toWatch = getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath);
           if (toWatch) {
             const { dir, dirPath, nonRecursive } = toWatch;
+            if (!isPathWithDefaultFailedLookupExtension(failedLookupLocationPath)) {
+              const refCount = customFailedLookupPaths.get(failedLookupLocationPath) || 0;
+              customFailedLookupPaths.set(failedLookupLocationPath, refCount + 1);
+            }
             if (dirPath === rootPath) {
               Debug.assert(!nonRecursive);
               setAtRoot = true;
@@ -121575,10 +121585,6 @@ ${lanes.join("\n")}
         );
       }
     }
-    function isInRootPathOrCanWatchDirectoryOrFile(locationToWatch) {
-      const path = resolutionHost.toPath(locationToWatch);
-      return isInDirectoryPath(rootPath, path) || canWatchDirectoryOrFile(path);
-    }
     function createFileWatcherOfAffectingLocation(affectingLocation, forResolution) {
       const fileWatcher = fileWatchesOfAffectingLocations.get(affectingLocation);
       if (fileWatcher) {
@@ -121606,7 +121612,7 @@ ${lanes.join("\n")}
       }
       const paths = /* @__PURE__ */ new Set();
       paths.add(locationToWatch);
-      let actualWatcher = isInRootPathOrCanWatchDirectoryOrFile(locationToWatch) ? resolutionHost.watchAffectingFileLocation(locationToWatch, (fileName, eventKind) => {
+      let actualWatcher = canWatchDirectoryOrFile(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) => {
@@ -121677,6 +121683,15 @@ ${lanes.join("\n")}
           const toWatch = getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath);
           if (toWatch) {
             const { dirPath } = toWatch;
+            const refCount = customFailedLookupPaths.get(failedLookupLocationPath);
+            if (refCount) {
+              if (refCount === 1) {
+                customFailedLookupPaths.delete(failedLookupLocationPath);
+              } else {
+                Debug.assert(refCount > 1);
+                customFailedLookupPaths.set(failedLookupLocationPath, refCount - 1);
+              }
+            }
             if (dirPath === rootPath) {
               removeAtRoot = true;
             } else {
@@ -121774,10 +121789,10 @@ ${lanes.join("\n")}
           (failedLookupChecks || (failedLookupChecks = /* @__PURE__ */ new Set())).add(fileOrDirectoryPath);
           (startsWithPathChecks || (startsWithPathChecks = /* @__PURE__ */ new Set())).add(fileOrDirectoryPath);
         } else {
-          if (isEmittedFileOfProgram(resolutionHost.getCurrentProgram(), fileOrDirectoryPath)) {
+          if (!isPathWithDefaultFailedLookupExtension(fileOrDirectoryPath) && !customFailedLookupPaths.has(fileOrDirectoryPath)) {
             return false;
           }
-          if (fileExtensionIs(fileOrDirectoryPath, ".map")) {
+          if (isEmittedFileOfProgram(resolutionHost.getCurrentProgram(), fileOrDirectoryPath)) {
             return false;
           }
           (failedLookupChecks || (failedLookupChecks = /* @__PURE__ */ new Set())).add(fileOrDirectoryPath);
@@ -121874,10 +121889,12 @@ ${lanes.join("\n")}
         closeTypeRootsWatch();
       }
     }
-    function canWatchTypeRootPath(typeRoot) {
-      return !!resolutionHost.getCompilationSettings().typeRoots || // Otherwise we'll only watch this path if it falls within `rootDir` or
-      // the path is not disqualified by other criteria ("not `C:\Users\Name\Dir`").
-      isInRootPathOrCanWatchDirectoryOrFile(getDirectoryPath(typeRoot));
+    function canWatchTypeRootPath(nodeTypesDirectory) {
+      if (resolutionHost.getCompilationSettings().typeRoots)
+        return true;
+      const dir = getDirectoryPath(getDirectoryPath(nodeTypesDirectory));
+      const dirPath = resolutionHost.toPath(dir);
+      return dirPath === rootPath || canWatchDirectoryOrFile(dirPath);
     }
   }
   function resolutionIsSymlink(resolution) {
@@ -127075,7 +127092,13 @@ ${lanes.join("\n")}
               sourceFile,
               n.kind
             );
-            return candidate2 && findRightmostToken(candidate2, sourceFile);
+            if (candidate2) {
+              if (isJSDocCommentContainingNode(candidate2) && candidate2.getChildren(sourceFile).length) {
+                return find2(candidate2);
+              }
+              return findRightmostToken(candidate2, sourceFile);
+            }
+            return void 0;
           } else {
             return find2(child);
           }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.1.0-pr-53420-2",
+  "version": "5.1.0-pr-53487-5",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -114,5 +114,5 @@
     "node": "14.21.1",
     "npm": "8.19.3"
   },
-  "gitHead": "f0cfb564f63daaba42fe4e155cef57222d49577b"
+  "gitHead": "7685ef5dcb0017eda471fd0cfbc7b8cb8494c789"
 }