@typescript-deploys/pr-build 5.1.0-pr-50092-15 → 5.1.0-pr-53591-4

package/lib/tsc.js

@@ -5294,6 +5294,10 @@ function isAnyDirectorySeparator(charCode) {
 function isRootedDiskPath(path) {
   return getEncodedRootLength(path) > 0;
 }
+function isDiskPathRoot(path) {
+  const rootLength = getEncodedRootLength(path);
+  return rootLength > 0 && rootLength === path.length;
+}
 function pathIsAbsolute(path) {
   return getEncodedRootLength(path) !== 0;
 }
@@ -5442,11 +5446,11 @@ function getPathComponents(path, currentDirectory = "") {
   path = combinePaths(currentDirectory, path);
   return pathComponents(path, getRootLength(path));
 }
-function getPathFromPathComponents(pathComponents2) {
+function getPathFromPathComponents(pathComponents2, length2) {
   if (pathComponents2.length === 0)
     return "";
   const root = pathComponents2[0] && ensureTrailingDirectorySeparator(pathComponents2[0]);
-  return root + pathComponents2.slice(1).join(directorySeparator);
+  return root + pathComponents2.slice(1, length2).join(directorySeparator);
 }
 function normalizeSlashes(path) {
   return path.indexOf("\\") !== -1 ? path.replace(backslashRegExp, directorySeparator) : path;
@@ -118108,60 +118112,62 @@ function removeIgnoredPath(path) {
   }
   return some(ignoredPaths, (searchPath) => stringContains(path, searchPath)) ? void 0 : path;
 }
-function canWatchDirectoryOrFile(dirPath) {
-  const rootLength = getRootLength(dirPath);
-  if (dirPath.length === rootLength) {
-    return false;
-  }
-  let nextDirectorySeparator = dirPath.indexOf(directorySeparator, rootLength);
-  if (nextDirectorySeparator === -1) {
-    return false;
-  }
-  let pathPartForUserCheck = dirPath.substring(rootLength, nextDirectorySeparator + 1);
-  const isNonDirectorySeparatorRoot = rootLength > 1 || dirPath.charCodeAt(0) !== 47 /* slash */;
-  if (isNonDirectorySeparatorRoot && dirPath.search(/[a-zA-Z]:/) !== 0 && // Non dos style paths
-  pathPartForUserCheck.search(/[a-zA-Z]\$\//) === 0) {
-    nextDirectorySeparator = dirPath.indexOf(directorySeparator, nextDirectorySeparator + 1);
-    if (nextDirectorySeparator === -1) {
-      return false;
-    }
-    pathPartForUserCheck = dirPath.substring(rootLength + pathPartForUserCheck.length, nextDirectorySeparator + 1);
-  }
-  if (isNonDirectorySeparatorRoot && pathPartForUserCheck.search(/users\//i) !== 0) {
-    return true;
+function perceivedOsRootLengthForWatching(pathComponents2, length2) {
+  if (length2 <= 1)
+    return 1;
+  let userCheckIndex = 1;
+  let isDosStyle = pathComponents2[0].search(/[a-zA-Z]:/) === 0;
+  if (pathComponents2[0] !== directorySeparator && !isDosStyle && // Non dos style paths
+  pathComponents2[1].search(/[a-zA-Z]\$$/) === 0) {
+    if (length2 === 2)
+      return 2;
+    userCheckIndex = 2;
+    isDosStyle = true;
   }
-  for (let searchIndex = nextDirectorySeparator + 1, searchLevels = 2; searchLevels > 0; searchLevels--) {
-    searchIndex = dirPath.indexOf(directorySeparator, searchIndex) + 1;
-    if (searchIndex === 0) {
-      return false;
-    }
+  if (isDosStyle && !pathComponents2[userCheckIndex].match(/^users$/i)) {
+    return userCheckIndex;
   }
-  return true;
+  return userCheckIndex + 2;
 }
-function canWatchAtTypes(atTypes, rootPath) {
-  const dirPath = getDirectoryPath(getDirectoryPath(atTypes));
-  return dirPath === rootPath || canWatchDirectoryOrFile(dirPath);
+function canWatchDirectoryOrFile(pathComponents2, length2) {
+  if (length2 === void 0)
+    length2 = pathComponents2.length;
+  if (length2 <= 2)
+    return false;
+  const perceivedOsRootLength = perceivedOsRootLengthForWatching(pathComponents2, length2);
+  return length2 > perceivedOsRootLength + 1;
+}
+function canWatchAtTypes(atTypes) {
+  return canWatchAffectedPackageJsonOrNodeModulesOfAtTypes(getDirectoryPath(atTypes));
 }
-function isInDirectoryPath(dir, file) {
-  if (dir === void 0 || file.length <= dir.length) {
+function isInDirectoryPath(dirComponents, fileOrDirComponents) {
+  if (fileOrDirComponents.length < fileOrDirComponents.length)
     return false;
+  for (let i = 0; i < dirComponents.length; i++) {
+    if (fileOrDirComponents[i] !== dirComponents[i])
+      return false;
   }
-  return startsWith(file, dir) && file[dir.length] === directorySeparator;
+  return true;
+}
+function canWatchAffectedPackageJsonOrNodeModulesOfAtTypes(fileOrDirPath) {
+  return canWatchDirectoryOrFile(getPathComponents(fileOrDirPath));
 }
 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)
-      };
+  return canWatchAffectedPackageJsonOrNodeModulesOfAtTypes(filePath);
+}
+function getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath, rootDir, rootPath, rootPathComponents, getCurrentDirectory) {
+  const failedLookupPathComponents = getPathComponents(failedLookupLocationPath);
+  failedLookupLocation = isRootedDiskPath(failedLookupLocation) ? normalizePath(failedLookupLocation) : getNormalizedAbsolutePath(failedLookupLocation, getCurrentDirectory());
+  const failedLookupComponents = getPathComponents(failedLookupLocation);
+  const perceivedOsRootLength = perceivedOsRootLengthForWatching(failedLookupPathComponents, failedLookupPathComponents.length);
+  if (failedLookupPathComponents.length <= perceivedOsRootLength + 1)
+    return void 0;
+  const nodeModulesIndex = failedLookupPathComponents.indexOf("node_modules");
+  if (nodeModulesIndex !== -1 && nodeModulesIndex + 1 <= perceivedOsRootLength + 1)
+    return void 0;
+  if (isInDirectoryPath(rootPathComponents, failedLookupPathComponents)) {
+    if (failedLookupPathComponents.length > rootPathComponents.length + 1) {
+      return getDirectoryOfFailedLookupWatch(failedLookupComponents, failedLookupPathComponents, Math.max(rootPathComponents.length + 1, perceivedOsRootLength + 1));
     } else {
       return {
         dir: rootDir,
@@ -118171,45 +118177,55 @@ function getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLoo
     }
   }
   return getDirectoryToWatchFromFailedLookupLocationDirectory(
-    getDirectoryPath(getNormalizedAbsolutePath(failedLookupLocation, getCurrentDirectory())),
-    getDirectoryPath(failedLookupLocationPath),
-    rootPath
+    failedLookupComponents,
+    failedLookupPathComponents,
+    failedLookupPathComponents.length - 1,
+    perceivedOsRootLength,
+    nodeModulesIndex,
+    rootPathComponents
   );
 }
-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;
+function getDirectoryToWatchFromFailedLookupLocationDirectory(dirComponents, dirPathComponents, dirPathComponentsLength, perceivedOsRootLength, nodeModulesIndex, rootPathComponents) {
+  if (nodeModulesIndex !== -1) {
+    return getDirectoryOfFailedLookupWatch(dirComponents, dirPathComponents, nodeModulesIndex + 1);
   }
   let nonRecursive = true;
-  let subDirectoryPath, subDirectory;
-  if (rootPath !== void 0) {
-    while (!isInDirectoryPath(dirPath, rootPath)) {
-      const parentPath = getDirectoryPath(dirPath);
-      if (parentPath === dirPath) {
-        break;
-      }
+  let length2 = dirPathComponentsLength;
+  for (let i = 0; i < dirPathComponentsLength; i++) {
+    if (dirPathComponents[i] !== rootPathComponents[i]) {
       nonRecursive = false;
-      subDirectoryPath = dirPath;
-      subDirectory = dir;
-      dirPath = parentPath;
-      dir = getDirectoryPath(dir);
+      length2 = Math.max(i + 1, perceivedOsRootLength + 1);
+      break;
     }
   }
-  return canWatchDirectoryOrFile(dirPath) ? { dir: subDirectory || dir, dirPath: subDirectoryPath || dirPath, nonRecursive } : void 0;
+  return getDirectoryOfFailedLookupWatch(dirComponents, dirPathComponents, length2, nonRecursive);
+}
+function getDirectoryOfFailedLookupWatch(dirComponents, dirPathComponents, length2, nonRecursive) {
+  return {
+    dir: getPathFromPathComponents(dirComponents, length2),
+    dirPath: getPathFromPathComponents(dirPathComponents, length2),
+    nonRecursive
+  };
 }
-function getDirectoryToWatchFailedLookupLocationFromTypeRoot(typeRoot, typeRootPath, rootPath, filterCustomPath) {
-  if (isInDirectoryPath(rootPath, typeRootPath)) {
+function getDirectoryToWatchFailedLookupLocationFromTypeRoot(typeRoot, typeRootPath, rootPath, rootPathComponents, getCurrentDirectory, filterCustomPath) {
+  const typeRootPathComponents = getPathComponents(typeRootPath);
+  if (isInDirectoryPath(rootPathComponents, typeRootPathComponents)) {
     return rootPath;
   }
-  const toWatch = getDirectoryToWatchFromFailedLookupLocationDirectory(typeRoot, typeRootPath, rootPath);
+  typeRoot = isRootedDiskPath(typeRoot) ? normalizePath(typeRoot) : getNormalizedAbsolutePath(typeRoot, getCurrentDirectory());
+  const toWatch = getDirectoryToWatchFromFailedLookupLocationDirectory(
+    getPathComponents(typeRoot),
+    typeRootPathComponents,
+    typeRootPathComponents.length,
+    perceivedOsRootLengthForWatching(typeRootPathComponents, typeRootPathComponents.length),
+    typeRootPathComponents.indexOf("node_modules"),
+    rootPathComponents
+  );
   return toWatch && filterCustomPath(toWatch.dirPath) ? toWatch.dirPath : void 0;
 }
 function getRootDirectoryOfResolutionCache(rootDirForResolution, getCurrentDirectory) {
-  return rootDirForResolution && removeTrailingDirectorySeparator(getNormalizedAbsolutePath(rootDirForResolution, getCurrentDirectory()));
+  const normalized = getNormalizedAbsolutePath(rootDirForResolution, getCurrentDirectory());
+  return !isDiskPathRoot(normalized) ? removeTrailingDirectorySeparator(normalized) : normalized;
 }
 function createResolutionCache(resolutionHost, rootDirForResolution, logChangesWhenResolvingModule) {
   let filesWithChangedSetOfUnresolvedImports;
@@ -118241,13 +118257,11 @@ 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 = getRootDirectoryOfResolutionCache(rootDirForResolution, getCurrentDirectory);
-  const rootPath = rootDir && resolutionHost.toPath(rootDir);
-  const rootSplitLength = rootPath !== void 0 ? rootPath.split(directorySeparator).length : 0;
+  const rootPath = resolutionHost.toPath(rootDir);
+  const rootPathComponents = getPathComponents(rootPath);
   const typeRootsWatches = /* @__PURE__ */ new Map();
   return {
     getModuleResolutionCache: () => moduleResolutionCache,
@@ -118281,7 +118295,6 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   function clear2() {
     clearMap(directoryWatchesOfFailedLookups, closeFileWatcherOf);
     clearMap(fileWatchesOfAffectingLocations, closeFileWatcherOf);
-    customFailedLookupPaths.clear();
     nonRelativeExternalModuleResolutions.clear();
     closeTypeRootsWatch();
     resolvedModuleNames.clear();
@@ -118561,9 +118574,6 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   function isNodeModulesAtTypesDirectory(dirPath) {
     return endsWith(dirPath, "/node_modules/@types");
   }
-  function isPathWithDefaultFailedLookupExtension(path) {
-    return fileExtensionIsOneOf(path, failedLookupDefaultExtensions);
-  }
   function watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, filePath, getResolutionWithResolvedFileName) {
     var _a2, _b;
     if (resolution.refCount) {
@@ -118604,15 +118614,11 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
           failedLookupLocationPath,
           rootDir,
           rootPath,
-          rootSplitLength,
+          rootPathComponents,
           getCurrentDirectory
         );
         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;
@@ -118747,20 +118753,11 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
           failedLookupLocationPath,
           rootDir,
           rootPath,
-          rootSplitLength,
+          rootPathComponents,
           getCurrentDirectory
         );
         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 {
@@ -118858,10 +118855,10 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
         (failedLookupChecks || (failedLookupChecks = /* @__PURE__ */ new Set())).add(fileOrDirectoryPath);
         (startsWithPathChecks || (startsWithPathChecks = /* @__PURE__ */ new Set())).add(fileOrDirectoryPath);
       } else {
-        if (!isPathWithDefaultFailedLookupExtension(fileOrDirectoryPath) && !customFailedLookupPaths.has(fileOrDirectoryPath)) {
+        if (isEmittedFileOfProgram(resolutionHost.getCurrentProgram(), fileOrDirectoryPath)) {
           return false;
         }
-        if (isEmittedFileOfProgram(resolutionHost.getCurrentProgram(), fileOrDirectoryPath)) {
+        if (fileExtensionIs(fileOrDirectoryPath, ".map")) {
           return false;
         }
         (failedLookupChecks || (failedLookupChecks = /* @__PURE__ */ new Set())).add(fileOrDirectoryPath);
@@ -118908,7 +118905,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     return (_a2 = resolution.failedLookupLocations) == null ? void 0 : _a2.some((location) => isInvalidatedFailedLookup(resolutionHost.toPath(location)));
   }
   function isInvalidatedFailedLookup(locationPath) {
-    return (failedLookupChecks == null ? void 0 : failedLookupChecks.has(locationPath)) || firstDefinedIterator((startsWithPathChecks == null ? void 0 : startsWithPathChecks.keys()) || [], (fileOrDirectoryPath) => startsWith(locationPath, fileOrDirectoryPath) ? true : void 0) || firstDefinedIterator((isInDirectoryChecks == null ? void 0 : isInDirectoryChecks.keys()) || [], (fileOrDirectoryPath) => isInDirectoryPath(fileOrDirectoryPath, locationPath) ? true : void 0);
+    return (failedLookupChecks == null ? void 0 : failedLookupChecks.has(locationPath)) || firstDefinedIterator((startsWithPathChecks == null ? void 0 : startsWithPathChecks.keys()) || [], (fileOrDirectoryPath) => startsWith(locationPath, fileOrDirectoryPath) ? true : void 0) || firstDefinedIterator((isInDirectoryChecks == null ? void 0 : isInDirectoryChecks.keys()) || [], (dirPath) => locationPath.length > dirPath.length && startsWith(locationPath, dirPath) && (isDiskPathRoot(dirPath) || locationPath[dirPath.length] === directorySeparator) ? true : void 0);
   }
   function canInvalidatedFailedLookupResolutionWithAffectingLocation(resolution) {
     var _a2;
@@ -118929,6 +118926,8 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
         typeRoot,
         typeRootPath,
         rootPath,
+        rootPathComponents,
+        getCurrentDirectory,
         (dirPath2) => directoryWatchesOfFailedLookups.has(dirPath2)
       );
       if (dirPath) {
@@ -118959,7 +118958,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   function canWatchTypeRootPath(typeRoot) {
     if (resolutionHost.getCompilationSettings().typeRoots)
       return true;
-    return canWatchAtTypes(resolutionHost.toPath(typeRoot), rootPath);
+    return canWatchAtTypes(resolutionHost.toPath(typeRoot));
   }
 }
 function resolutionIsSymlink(resolution) {