typescript 5.1.0-dev.20230331 → 5.1.0-dev.20230402

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.20230331`;
+var version = `${versionMajorMinor}.0-dev.20230402`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -6193,7 +6193,7 @@ var Diagnostics = {
   Conversion_of_type_0_to_type_1_may_be_a_mistake_because_neither_type_sufficiently_overlaps_with_the_other_If_this_was_intentional_convert_the_expression_to_unknown_first: diag(2352, 1 /* Error */, "Conversion_of_type_0_to_type_1_may_be_a_mistake_because_neither_type_sufficiently_overlaps_with_the__2352", "Conversion of type '{0}' to type '{1}' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first."),
   Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: diag(2353, 1 /* Error */, "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'."),
   This_syntax_requires_an_imported_helper_but_module_0_cannot_be_found: diag(2354, 1 /* Error */, "This_syntax_requires_an_imported_helper_but_module_0_cannot_be_found_2354", "This syntax requires an imported helper but module '{0}' cannot be found."),
-  A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value: diag(2355, 1 /* Error */, "A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_2355", "A function whose declared type is neither 'void' nor 'any' must return a value."),
+  A_function_whose_declared_type_is_neither_undefined_void_nor_any_must_return_a_value: diag(2355, 1 /* Error */, "A_function_whose_declared_type_is_neither_undefined_void_nor_any_must_return_a_value_2355", "A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value."),
   An_arithmetic_operand_must_be_of_type_any_number_bigint_or_an_enum_type: diag(2356, 1 /* Error */, "An_arithmetic_operand_must_be_of_type_any_number_bigint_or_an_enum_type_2356", "An arithmetic operand must be of type 'any', 'number', 'bigint' or an enum type."),
   The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access: diag(2357, 1 /* Error */, "The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access_2357", "The operand of an increment or decrement operator must be a variable or a property access."),
   The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: diag(2358, 1 /* Error */, "The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_paramete_2358", "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter."),
@@ -6633,7 +6633,6 @@ var Diagnostics = {
   Type_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: diag(2844, 1 /* Error */, "Type_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2844", "Type of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor."),
   This_condition_will_always_return_0: diag(2845, 1 /* Error */, "This_condition_will_always_return_0_2845", "This condition will always return '{0}'."),
   A_declaration_file_cannot_be_imported_without_import_type_Did_you_mean_to_import_an_implementation_file_0_instead: diag(2846, 1 /* Error */, "A_declaration_file_cannot_be_imported_without_import_type_Did_you_mean_to_import_an_implementation_f_2846", "A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file '{0}' instead?"),
-  A_function_whose_declared_type_is_neither_undefined_void_nor_any_must_return_a_value: diag(2847, 1 /* Error */, "A_function_whose_declared_type_is_neither_undefined_void_nor_any_must_return_a_value_2847", "A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value."),
   The_right_hand_side_of_an_instanceof_expression_must_not_be_an_instantiation_expression: diag(2848, 1 /* Error */, "The_right_hand_side_of_an_instanceof_expression_must_not_be_an_instantiation_expression_2848", "The right-hand side of an 'instanceof' expression must not be an instantiation expression."),
   Target_signature_provides_too_few_arguments_Expected_0_or_more_but_got_1: diag(2849, 1 /* Error */, "Target_signature_provides_too_few_arguments_Expected_0_or_more_but_got_1_2849", "Target signature provides too few arguments. Expected {0} or more, but got {1}."),
   Import_declaration_0_is_using_private_name_1: diag(4e3, 1 /* Error */, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
@@ -16219,6 +16218,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)) {
@@ -34131,7 +34133,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",
@@ -41292,7 +41295,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 */);
@@ -44903,7 +44906,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;
@@ -45071,7 +45074,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,
@@ -49713,7 +49716,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);
@@ -53489,7 +53492,7 @@ function createTypeChecker(host) {
   }
   function isConstTypeVariable(type) {
     var _a2;
-    return !!(type.flags & 262144 /* TypeParameter */ && some((_a2 = type.symbol) == null ? void 0 : _a2.declarations, (d) => hasSyntacticModifier(d, 2048 /* Const */)) || isGenericTupleType(type) && findIndex(getTypeArguments(type), (t, i) => !!(type.target.elementFlags[i] & 8 /* Variadic */) && isConstTypeVariable(t)) >= 0 || type.flags & 8388608 /* IndexedAccess */ && isConstTypeVariable(type.objectType));
+    return !!(type && (type.flags & 262144 /* TypeParameter */ && some((_a2 = type.symbol) == null ? void 0 : _a2.declarations, (d) => hasSyntacticModifier(d, 2048 /* Const */)) || type.flags & 1048576 /* Union */ && some(type.types, isConstTypeVariable) || type.flags & 8388608 /* IndexedAccess */ && isConstTypeVariable(type.objectType) || type.flags & 16777216 /* Conditional */ && isConstTypeVariable(getConstraintOfConditionalType(type)) || type.flags & 33554432 /* Substitution */ && isConstTypeVariable(type.baseType) || isGenericTupleType(type) && findIndex(getTypeArguments(type), (t, i) => !!(type.target.elementFlags[i] & 8 /* Variadic */) && isConstTypeVariable(t)) >= 0));
   }
   function getConstraintOfIndexedAccess(type) {
     return hasNonCircularBaseConstraint(type) ? getConstraintFromIndexedAccess(type) : void 0;
@@ -70936,7 +70939,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);
@@ -72012,7 +72015,16 @@ function createTypeChecker(host) {
         return functionFlags & 2 /* Async */ ? createPromiseReturnType(func, neverType) : neverType;
       }
       if (types.length === 0) {
-        return functionFlags & 2 /* Async */ ? createPromiseReturnType(func, voidType) : voidType;
+        const contextualReturnType = getContextualReturnType(
+          func,
+          /*contextFlags*/
+          void 0
+        );
+        const returnType2 = contextualReturnType && (unwrapReturnType(contextualReturnType, functionFlags) || voidType).flags & 32768 /* Undefined */ ? undefinedType : voidType;
+        return functionFlags & 2 /* Async */ ? createPromiseReturnType(func, returnType2) : (
+          // Async function
+          returnType2
+        );
       }
       returnType = getUnionType(types, 2 /* Subtype */);
     }
@@ -72234,7 +72246,7 @@ function createTypeChecker(host) {
     function checkAllCodePathsInNonVoidFunctionReturnOrThrowDiagnostics() {
       const functionFlags = getFunctionFlags(func);
       const type = returnType && unwrapReturnType(returnType, functionFlags);
-      if (type && maybeTypeOfKind(type, 32768 /* Undefined */ | 16384 /* Void */ | 1 /* Any */ | 2 /* Unknown */)) {
+      if (type && (maybeTypeOfKind(type, 16384 /* Void */) || type.flags & (1 /* Any */ | 32768 /* Undefined */))) {
         return;
       }
       if (func.kind === 171 /* MethodSignature */ || nodeIsMissing(func.body) || func.body.kind !== 239 /* Block */ || !functionHasImplicitReturn(func)) {
@@ -72245,12 +72257,8 @@ function createTypeChecker(host) {
       if (type && type.flags & 131072 /* Never */) {
         error(errorNode, Diagnostics.A_function_returning_never_cannot_have_a_reachable_end_point);
       } else if (type && !hasExplicitReturn) {
-        if (strictNullChecks) {
-          error(errorNode, Diagnostics.A_function_whose_declared_type_is_neither_undefined_void_nor_any_must_return_a_value);
-        } else {
-          error(errorNode, Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value);
-        }
-      } else if (type && strictNullChecks) {
+        error(errorNode, Diagnostics.A_function_whose_declared_type_is_neither_undefined_void_nor_any_must_return_a_value);
+      } else if (type && strictNullChecks && !isTypeAssignableTo(undefinedType, type)) {
         error(errorNode, Diagnostics.Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined);
       } else if (compilerOptions.noImplicitReturns) {
         if (!type) {
@@ -72258,7 +72266,7 @@ function createTypeChecker(host) {
             return;
           }
           const inferredReturnType = getReturnTypeOfSignature(getSignatureFromDeclaration(func));
-          if (isUnwrappedReturnTypeVoidOrAny(func, inferredReturnType)) {
+          if (isUnwrappedReturnTypeUndefinedVoidOrAny(func, inferredReturnType)) {
             return;
           }
         }
@@ -73724,11 +73732,7 @@ function createTypeChecker(host) {
   }
   function isConstContext(node) {
     const parent = node.parent;
-    return isAssertionExpression(parent) && isConstTypeReference(parent.type) || isJSDocTypeAssertion(parent) && isConstTypeReference(getJSDocTypeAssertionType(parent)) || isValidConstAssertionArgument(node) && isConstTypeParameterContext(node) || (isParenthesizedExpression(parent) || isArrayLiteralExpression(parent) || isSpreadElement(parent)) && isConstContext(parent) || (isPropertyAssignment(parent) || isShorthandPropertyAssignment(parent) || isTemplateSpan(parent)) && isConstContext(parent.parent);
-  }
-  function isConstTypeParameterContext(node) {
-    const contextualType = getContextualType(node, 0 /* None */);
-    return !!contextualType && someType(contextualType, isConstTypeVariable);
+    return isAssertionExpression(parent) && isConstTypeReference(parent.type) || isJSDocTypeAssertion(parent) && isConstTypeReference(getJSDocTypeAssertionType(parent)) || isValidConstAssertionArgument(node) && isConstTypeVariable(getContextualType(node, 0 /* None */)) || (isParenthesizedExpression(parent) || isArrayLiteralExpression(parent) || isSpreadElement(parent)) && isConstContext(parent) || (isPropertyAssignment(parent) || isShorthandPropertyAssignment(parent) || isTemplateSpan(parent)) && isConstContext(parent.parent);
   }
   function checkExpressionForMutableLocation(node, checkMode, forceTuple) {
     const type = checkExpression(node, checkMode, forceTuple);
@@ -77411,9 +77415,9 @@ function createTypeChecker(host) {
     }
     return isAsync ? getAwaitedTypeNoAlias(returnType) || errorType : returnType;
   }
-  function isUnwrappedReturnTypeVoidOrAny(func, returnType) {
-    const unwrappedReturnType = unwrapReturnType(returnType, getFunctionFlags(func));
-    return !!unwrappedReturnType && maybeTypeOfKind(unwrappedReturnType, 16384 /* Void */ | 3 /* AnyOrUnknown */);
+  function isUnwrappedReturnTypeUndefinedVoidOrAny(func, returnType) {
+    const type = unwrapReturnType(returnType, getFunctionFlags(func));
+    return !!(type && (maybeTypeOfKind(type, 16384 /* Void */) || type.flags & (1 /* Any */ | 32768 /* Undefined */)));
   }
   function checkReturnStatement(node) {
     var _a2;
@@ -77455,7 +77459,7 @@ function createTypeChecker(host) {
           checkTypeAssignableToAndOptionallyElaborate(unwrappedExprType, unwrappedReturnType, node, node.expression);
         }
       }
-    } else if (container.kind !== 174 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(container, returnType)) {
+    } else if (container.kind !== 174 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeUndefinedVoidOrAny(container, returnType)) {
       error(node, Diagnostics.Not_all_code_paths_return_a_value);
     }
   }
@@ -114677,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);
     }
@@ -118090,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;
@@ -118124,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();
@@ -118157,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);
@@ -118446,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);
   }
@@ -118533,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)) {
@@ -118601,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) => {
@@ -118669,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);
@@ -118837,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);
@@ -118852,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);
       }
@@ -118878,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) {