@typescript-deploys/pr-build 5.6.0-pr-59048-8 → 5.6.0-pr-59059-2

package/lib/tsc.js

@@ -1078,10 +1078,10 @@ function matchedText(pattern, candidate) {
   Debug.assert(isPatternMatch(pattern, candidate));
   return candidate.substring(pattern.prefix.length, candidate.length - pattern.suffix.length);
 }
-function findBestPatternMatch(values, getPattern, candidate, endIndex = values.length) {
+function findBestPatternMatch(values, getPattern, candidate) {
   let matchedValue;
   let longestMatchPrefixLength = -1;
-  for (let i = 0; i < endIndex; i++) {
+  for (let i = 0; i < values.length; i++) {
     const v = values[i];
     const pattern = getPattern(v);
     if (isPatternMatch(pattern, candidate) && pattern.prefix.length > longestMatchPrefixLength) {
@@ -4902,6 +4902,7 @@ var sys = (() => {
       writeFile: writeFile2,
       watchFile: watchFile2,
       watchDirectory,
+      preferNonRecursiveWatch: !fsSupportsRecursiveFsWatch,
       resolvePath: (path) => _path.resolve(path),
       fileExists,
       directoryExists,
@@ -18304,65 +18305,17 @@ var emptyFileSystemEntries = {
   files: emptyArray,
   directories: emptyArray
 };
-var patternOrStringsCache = /* @__PURE__ */ new WeakMap();
 function matchPatternOrExact(patternOrStrings, candidate) {
-  let matchableStringSet;
-  let sortedPatterns;
-  const cacheEntry = patternOrStringsCache.get(patternOrStrings);
-  if (cacheEntry !== void 0) {
-    ({ matchableStringSet, sortedPatterns } = cacheEntry);
-  } else {
-    matchableStringSet = /* @__PURE__ */ new Set();
-    sortedPatterns = [];
-    for (const patternOrString of patternOrStrings) {
-      if (typeof patternOrString === "string") {
-        matchableStringSet.add(patternOrString);
-      } else {
-        sortedPatterns.push(patternOrString);
-      }
-    }
-    sortedPatterns.sort((a, b) => compareStringsCaseSensitive(a.prefix, b.prefix));
-    patternOrStringsCache.set(patternOrStrings, {
-      matchableStringSet,
-      sortedPatterns
-    });
-  }
-  if (matchableStringSet.has(candidate)) {
-    return candidate;
-  }
-  if (sortedPatterns.length === 0) {
-    return void 0;
-  }
-  let index = binarySearchKey(sortedPatterns, candidate, getPatternPrefix, compareStringsCaseSensitive);
-  if (index < 0) {
-    index = ~index;
-  }
-  if (index >= sortedPatterns.length) {
-    index--;
-  }
-  const groupPrefix = sortedPatterns[index].prefix;
-  while (index > 0 && groupPrefix === sortedPatterns[index - 1].prefix) {
-    index--;
-  }
-  for (let i = index; i < sortedPatterns.length; i++) {
-    const currentPattern = sortedPatterns[i];
-    if (currentPattern.prefix !== groupPrefix) {
-      break;
+  const patterns = [];
+  for (const patternOrString of patternOrStrings) {
+    if (patternOrString === candidate) {
+      return candidate;
     }
-    if (isPatternMatch(currentPattern, candidate)) {
-      return currentPattern;
+    if (!isString(patternOrString)) {
+      patterns.push(patternOrString);
     }
   }
-  return findBestPatternMatch(
-    sortedPatterns,
-    (_) => _,
-    candidate,
-    /*endIndex*/
-    index
-  );
-}
-function getPatternPrefix(pattern) {
-  return pattern.prefix;
+  return findBestPatternMatch(patterns, (_) => _, candidate);
 }
 function sliceAfter(arr, value) {
   const index = arr.indexOf(value);
@@ -67644,7 +67597,11 @@ function createTypeChecker(host) {
   }
   function getTypeFactsWorker(type, callerOnlyNeeds) {
     if (type.flags & (2097152 /* Intersection */ | 465829888 /* Instantiable */)) {
-      type = getBaseConstraintOfType(type) || unknownType;
+      const constraintType = getBaseConstraintOfType(type) || unknownType;
+      if (strictNullChecks && type.flags & 465829888 /* Instantiable */ && constraintType === unknownType) {
+        return callerOnlyNeeds;
+      }
+      type = constraintType;
     }
     const flags = type.flags;
     if (flags & (4 /* String */ | 268435456 /* StringMapping */)) {
@@ -67744,7 +67701,7 @@ function createTypeChecker(host) {
       return type;
     }
     const emptyAndOtherUnion = getUnionType([emptyObjectType, otherType]);
-    return mapType(type, (t) => hasTypeFacts(t, targetFacts) ? getIntersectionType([t, !(facts & otherIncludesFacts) && hasTypeFacts(t, otherFacts) ? emptyAndOtherUnion : emptyObjectType]) : t);
+    return mapType(type, (t) => hasTypeFacts(t, targetFacts) ? getIntersectionType([t, (strictNullChecks || !(facts & otherIncludesFacts)) && hasTypeFacts(t, otherFacts) ? emptyAndOtherUnion : emptyObjectType]) : t);
   }
   function recombineUnknownType(type) {
     return type === unknownUnionType ? unknownType : type;
@@ -124354,7 +124311,7 @@ function canWatchAffectedPackageJsonOrNodeModulesOfAtTypes(fileOrDirPath) {
 function canWatchAffectingLocation(filePath) {
   return canWatchAffectedPackageJsonOrNodeModulesOfAtTypes(filePath);
 }
-function getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath, rootDir, rootPath, rootPathComponents, getCurrentDirectory) {
+function getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath, rootDir, rootPath, rootPathComponents, getCurrentDirectory, preferNonRecursiveWatch) {
   const failedLookupPathComponents = getPathComponents(failedLookupLocationPath);
   failedLookupLocation = isRootedDiskPath(failedLookupLocation) ? normalizePath(failedLookupLocation) : getNormalizedAbsolutePath(failedLookupLocation, getCurrentDirectory());
   const failedLookupComponents = getPathComponents(failedLookupLocation);
@@ -124386,10 +124343,11 @@ function getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLoo
     perceivedOsRootLength,
     nodeModulesIndex,
     rootPathComponents,
-    lastNodeModulesIndex
+    lastNodeModulesIndex,
+    preferNonRecursiveWatch
   );
 }
-function getDirectoryToWatchFromFailedLookupLocationDirectory(dirComponents, dirPathComponents, dirPathComponentsLength, perceivedOsRootLength, nodeModulesIndex, rootPathComponents, lastNodeModulesIndex) {
+function getDirectoryToWatchFromFailedLookupLocationDirectory(dirComponents, dirPathComponents, dirPathComponentsLength, perceivedOsRootLength, nodeModulesIndex, rootPathComponents, lastNodeModulesIndex, preferNonRecursiveWatch) {
   if (nodeModulesIndex !== -1) {
     return getDirectoryOfFailedLookupWatch(
       dirComponents,
@@ -124400,11 +124358,13 @@ function getDirectoryToWatchFromFailedLookupLocationDirectory(dirComponents, dir
   }
   let nonRecursive = true;
   let length2 = dirPathComponentsLength;
-  for (let i = 0; i < dirPathComponentsLength; i++) {
-    if (dirPathComponents[i] !== rootPathComponents[i]) {
-      nonRecursive = false;
-      length2 = Math.max(i + 1, perceivedOsRootLength + 1);
-      break;
+  if (!preferNonRecursiveWatch) {
+    for (let i = 0; i < dirPathComponentsLength; i++) {
+      if (dirPathComponents[i] !== rootPathComponents[i]) {
+        nonRecursive = false;
+        length2 = Math.max(i + 1, perceivedOsRootLength + 1);
+        break;
+      }
     }
   }
   return getDirectoryOfFailedLookupWatch(
@@ -124432,7 +124392,7 @@ function getDirectoryOfFailedLookupWatch(dirComponents, dirPathComponents, lengt
     packageDirPath: packageDirLength !== void 0 ? getPathFromPathComponents(dirPathComponents, packageDirLength) : void 0
   };
 }
-function getDirectoryToWatchFailedLookupLocationFromTypeRoot(typeRoot, typeRootPath, rootPath, rootPathComponents, getCurrentDirectory, filterCustomPath) {
+function getDirectoryToWatchFailedLookupLocationFromTypeRoot(typeRoot, typeRootPath, rootPath, rootPathComponents, getCurrentDirectory, preferNonRecursiveWatch, filterCustomPath) {
   const typeRootPathComponents = getPathComponents(typeRootPath);
   if (isInDirectoryPath(rootPathComponents, typeRootPathComponents)) {
     return rootPath;
@@ -124445,7 +124405,8 @@ function getDirectoryToWatchFailedLookupLocationFromTypeRoot(typeRoot, typeRootP
     perceivedOsRootLengthForWatching(typeRootPathComponents, typeRootPathComponents.length),
     typeRootPathComponents.indexOf("node_modules"),
     rootPathComponents,
-    typeRootPathComponents.lastIndexOf("node_modules")
+    typeRootPathComponents.lastIndexOf("node_modules"),
+    preferNonRecursiveWatch
   );
   return toWatch && filterCustomPath(toWatch.dirPath) ? toWatch.dirPath : void 0;
 }
@@ -124954,7 +124915,8 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       rootDir,
       rootPath,
       rootPathComponents,
-      getCurrentDirectory
+      getCurrentDirectory,
+      resolutionHost.preferNonRecursiveWatch
     );
     if (toWatch) {
       const { dir, dirPath, nonRecursive, packageDir, packageDirPath } = toWatch;
@@ -125153,7 +125115,8 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       rootDir,
       rootPath,
       rootPathComponents,
-      getCurrentDirectory
+      getCurrentDirectory,
+      resolutionHost.preferNonRecursiveWatch
     );
     if (toWatch) {
       const { dirPath, packageDirPath } = toWatch;
@@ -125381,6 +125344,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
         rootPath,
         rootPathComponents,
         getCurrentDirectory,
+        resolutionHost.preferNonRecursiveWatch,
         (dirPath2) => directoryWatchesOfFailedLookups.has(dirPath2) || dirPathToSymlinkPackageRefCount.has(dirPath2)
       );
       if (dirPath) {
@@ -125849,7 +125813,8 @@ function createWatchHost(system = sys, reportWatchStatus2) {
     watchFile: maybeBind(system, system.watchFile) || returnNoopFileWatcher,
     watchDirectory: maybeBind(system, system.watchDirectory) || returnNoopFileWatcher,
     setTimeout: maybeBind(system, system.setTimeout) || noop,
-    clearTimeout: maybeBind(system, system.clearTimeout) || noop
+    clearTimeout: maybeBind(system, system.clearTimeout) || noop,
+    preferNonRecursiveWatch: system.preferNonRecursiveWatch
   };
 }
 var WatchType = {
@@ -126155,6 +126120,7 @@ function createWatchProgram(host) {
   compilerHost.toPath = toPath3;
   compilerHost.getCompilationSettings = () => compilerOptions;
   compilerHost.useSourceOfProjectReferenceRedirect = maybeBind(host, host.useSourceOfProjectReferenceRedirect);
+  compilerHost.preferNonRecursiveWatch = host.preferNonRecursiveWatch;
   compilerHost.watchDirectoryOfFailedLookupLocation = (dir, cb, flags) => watchDirectory(dir, cb, flags, watchOptions, WatchType.FailedLookupLocations);
   compilerHost.watchAffectingFileLocation = (file, cb) => watchFile2(file, cb, 2e3 /* High */, watchOptions, WatchType.AffectingFileLocation);
   compilerHost.watchTypeRootsDirectory = (dir, cb, flags) => watchDirectory(dir, cb, flags, watchOptions, WatchType.TypeRoots);

package/lib/typescript.d.ts

@@ -2651,6 +2651,7 @@ declare namespace ts {
         interface ServerHost extends System {
             watchFile(path: string, callback: FileWatcherCallback, pollingInterval?: number, options?: WatchOptions): FileWatcher;
             watchDirectory(path: string, callback: DirectoryWatcherCallback, recursive?: boolean, options?: WatchOptions): FileWatcher;
+            preferNonRecursiveWatch?: boolean;
             setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): any;
             clearTimeout(timeoutId: any): void;
             setImmediate(callback: (...args: any[]) => void, ...args: any[]): any;
@@ -9591,6 +9592,7 @@ declare namespace ts {
         setTimeout?(callback: (...args: any[]) => void, ms: number, ...args: any[]): any;
         /** If provided, will be used to reset existing delayed compilation */
         clearTimeout?(timeoutId: any): void;
+        preferNonRecursiveWatch?: boolean;
     }
     interface ProgramHost<T extends BuilderProgram> {
         /**