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

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-dev.20230331`;
+      version = `${versionMajorMinor}.0-dev.20230402`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -7509,7 +7509,7 @@ ${lanes.join("\n")}
         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."),
@@ -7949,7 +7949,6 @@ ${lanes.join("\n")}
         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}'."),
@@ -18055,6 +18054,9 @@ ${lanes.join("\n")}
   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)) {
@@ -38030,7 +38032,8 @@ ${lanes.join("\n")}
           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",
@@ -43786,7 +43789,7 @@ ${lanes.join("\n")}
       }
       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 */);
@@ -47353,7 +47356,7 @@ ${lanes.join("\n")}
       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;
@@ -47521,7 +47524,7 @@ ${lanes.join("\n")}
       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,
@@ -52163,7 +52166,7 @@ ${lanes.join("\n")}
             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);
@@ -55939,7 +55942,7 @@ ${lanes.join("\n")}
     }
     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;
@@ -73386,7 +73389,7 @@ ${lanes.join("\n")}
           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);
@@ -74462,7 +74465,16 @@ ${lanes.join("\n")}
           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 */);
       }
@@ -74684,7 +74696,7 @@ ${lanes.join("\n")}
       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)) {
@@ -74695,12 +74707,8 @@ ${lanes.join("\n")}
         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) {
@@ -74708,7 +74716,7 @@ ${lanes.join("\n")}
               return;
             }
             const inferredReturnType = getReturnTypeOfSignature(getSignatureFromDeclaration(func));
-            if (isUnwrappedReturnTypeVoidOrAny(func, inferredReturnType)) {
+            if (isUnwrappedReturnTypeUndefinedVoidOrAny(func, inferredReturnType)) {
               return;
             }
           }
@@ -76174,11 +76182,7 @@ ${lanes.join("\n")}
     }
     function isConstContext(node) {
       const parent2 = node.parent;
-      return isAssertionExpression(parent2) && isConstTypeReference(parent2.type) || isJSDocTypeAssertion(parent2) && isConstTypeReference(getJSDocTypeAssertionType(parent2)) || isValidConstAssertionArgument(node) && isConstTypeParameterContext(node) || (isParenthesizedExpression(parent2) || isArrayLiteralExpression(parent2) || isSpreadElement(parent2)) && isConstContext(parent2) || (isPropertyAssignment(parent2) || isShorthandPropertyAssignment(parent2) || isTemplateSpan(parent2)) && isConstContext(parent2.parent);
-    }
-    function isConstTypeParameterContext(node) {
-      const contextualType = getContextualType2(node, 0 /* None */);
-      return !!contextualType && someType(contextualType, isConstTypeVariable);
+      return isAssertionExpression(parent2) && isConstTypeReference(parent2.type) || isJSDocTypeAssertion(parent2) && isConstTypeReference(getJSDocTypeAssertionType(parent2)) || isValidConstAssertionArgument(node) && isConstTypeVariable(getContextualType2(node, 0 /* None */)) || (isParenthesizedExpression(parent2) || isArrayLiteralExpression(parent2) || isSpreadElement(parent2)) && isConstContext(parent2) || (isPropertyAssignment(parent2) || isShorthandPropertyAssignment(parent2) || isTemplateSpan(parent2)) && isConstContext(parent2.parent);
     }
     function checkExpressionForMutableLocation(node, checkMode, forceTuple) {
       const type = checkExpression(node, checkMode, forceTuple);
@@ -79861,9 +79865,9 @@ ${lanes.join("\n")}
       }
       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;
@@ -79905,7 +79909,7 @@ ${lanes.join("\n")}
             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);
       }
     }
@@ -117571,7 +117575,7 @@ ${lanes.join("\n")}
           false
         );
       }
-      const shouldProcessRequires = isJavaScriptFile && getEmitModuleResolutionKind(options) !== 100 /* Bundler */;
+      const shouldProcessRequires = isJavaScriptFile && shouldResolveJsRequire(options);
       if (file.flags & 2097152 /* PossiblyContainsDynamicImport */ || shouldProcessRequires) {
         collectDynamicImportOrRequireCalls(file);
       }
@@ -121171,6 +121175,79 @@ ${lanes.join("\n")}
     }
     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;
@@ -121205,7 +121282,7 @@ ${lanes.join("\n")}
     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();
@@ -121238,12 +121315,6 @@ ${lanes.join("\n")}
     function getResolvedTypeReferenceDirective2(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);
@@ -121527,55 +121598,6 @@ ${lanes.join("\n")}
     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);
     }
@@ -121614,7 +121636,14 @@ ${lanes.join("\n")}
       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)) {
@@ -121682,7 +121711,7 @@ ${lanes.join("\n")}
       }
       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) => {
@@ -121750,7 +121779,14 @@ ${lanes.join("\n")}
         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);
@@ -121918,13 +121954,6 @@ ${lanes.join("\n")}
     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);
@@ -121933,7 +121962,12 @@ ${lanes.join("\n")}
         }
         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);
         }
@@ -121959,12 +121993,10 @@ ${lanes.join("\n")}
         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) {
@@ -129047,7 +129079,7 @@ ${lanes.join("\n")}
         // Adding or removing imports from node could change the outcome of that guess, so could change the suggestions list.
         typeAcquisitionEnabled && consumesNodeCoreModules(oldSourceFile) !== consumesNodeCoreModules(newSourceFile) || // Module agumentation and ambient module changes can add or remove exports available to be auto-imported.
         // Changes elsewhere in the file can change the *type* of an export in a module augmentation,
-        // but type info is gathered in getCompletionEntryDetails, which doesn’t use the cache.
+        // but type info is gathered in getCompletionEntryDetails, which doesn't use the cache.
         !arrayIsEqualTo(oldSourceFile.moduleAugmentations, newSourceFile.moduleAugmentations) || !ambientModuleDeclarationsAreEqual(oldSourceFile, newSourceFile)) {
           cache.clear();
           return true;
@@ -137812,7 +137844,7 @@ ${lanes.join("\n")}
   function symbolReferenceIsAlsoMissingAwait(reference, diagnostics, sourceFile, checker) {
     const errorNode = isPropertyAccessExpression(reference.parent) ? reference.parent.name : isBinaryExpression(reference.parent) ? reference.parent : reference;
     const diagnostic = find(diagnostics, (diagnostic2) => diagnostic2.start === errorNode.getStart(sourceFile) && diagnostic2.start + diagnostic2.length === errorNode.getEnd());
-    return diagnostic && contains(errorCodes3, diagnostic.code) || // A Promise is usually not correct in a binary expression (it’s not valid
+    return diagnostic && contains(errorCodes3, diagnostic.code) || // A Promise is usually not correct in a binary expression (it's not valid
     // in an arithmetic expression and an equality comparison seems unusual),
     // but if the other side of the binary expression has an error, the side
     // is typed `any` which will squash the error that would identify this
@@ -142645,7 +142677,6 @@ ${lanes.join("\n")}
       return void 0;
     const declaration = findAncestor(node.parent, isFunctionLikeDeclaration);
     switch (errorCode) {
-      case Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value.code:
       case Diagnostics.A_function_whose_declared_type_is_neither_undefined_void_nor_any_must_return_a_value.code:
         if (!declaration || !declaration.body || !declaration.type || !rangeContainsRange(declaration.type, node))
           return void 0;
@@ -142753,7 +142784,6 @@ ${lanes.join("\n")}
       fixRemoveBracesFromArrowFunctionBody = "fixRemoveBracesFromArrowFunctionBody";
       fixIdWrapTheBlockWithParen = "fixWrapTheBlockWithParen";
       errorCodes26 = [
-        Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value.code,
         Diagnostics.A_function_whose_declared_type_is_neither_undefined_void_nor_any_must_return_a_value.code,
         Diagnostics.Type_0_is_not_assignable_to_type_1.code,
         Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1.code
@@ -153769,7 +153799,7 @@ ${lanes.join("\n")}
              */
             this.markSeenReExportRHS = nodeSeenTracker();
             this.symbolIdToReferences = [];
-            // Source file ID → symbol ID → Whether the symbol has been searched for in the source file.
+            // Source file ID -> symbol ID -> Whether the symbol has been searched for in the source file.
             this.sourceFileToSeenSymbols = [];
           }
           includesSourceFile(sourceFile) {
@@ -162913,7 +162943,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       if (start !== end) {
         const textSpan = createTextSpanFromBounds(start, end);
         if (!selectionRange || // Skip ranges that are identical to the parent
-        !textSpansEqual(textSpan, selectionRange.textSpan) && // Skip ranges that don’t contain the original position
+        !textSpansEqual(textSpan, selectionRange.textSpan) && // Skip ranges that don't contain the original position
         textSpanIntersectsWithPosition(textSpan, pos)) {
           selectionRange = { textSpan, ...selectionRange && { parent: selectionRange } };
         }
@@ -179132,6 +179162,8 @@ ${e.message}`;
     canJsonReportNoInputFiles: () => canJsonReportNoInputFiles,
     canProduceDiagnostics: () => canProduceDiagnostics,
     canUsePropertyAccess: () => canUsePropertyAccess,
+    canWatchAffectingLocation: () => canWatchAffectingLocation,
+    canWatchAtTypes: () => canWatchAtTypes,
     canWatchDirectoryOrFile: () => canWatchDirectoryOrFile,
     cartesianProduct: () => cartesianProduct,
     cast: () => cast,
@@ -179579,6 +179611,8 @@ ${e.message}`;
     getDiagnosticText: () => getDiagnosticText,
     getDiagnosticsWithinSpan: () => getDiagnosticsWithinSpan,
     getDirectoryPath: () => getDirectoryPath,
+    getDirectoryToWatchFailedLookupLocation: () => getDirectoryToWatchFailedLookupLocation,
+    getDirectoryToWatchFailedLookupLocationFromTypeRoot: () => getDirectoryToWatchFailedLookupLocationFromTypeRoot,
     getDocumentPositionMapper: () => getDocumentPositionMapper,
     getESModuleInterop: () => getESModuleInterop,
     getEditsForFileRename: () => getEditsForFileRename,
@@ -179848,6 +179882,7 @@ ${e.message}`;
     getRestParameterElementType: () => getRestParameterElementType,
     getRightMostAssignedExpression: () => getRightMostAssignedExpression,
     getRootDeclaration: () => getRootDeclaration,
+    getRootDirectoryOfResolutionCache: () => getRootDirectoryOfResolutionCache,
     getRootLength: () => getRootLength,
     getScriptKind: () => getScriptKind,
     getScriptKindFromFileName: () => getScriptKindFromFileName,
@@ -180945,6 +180980,7 @@ ${e.message}`;
     setValueDeclaration: () => setValueDeclaration,
     shouldAllowImportingTsExtension: () => shouldAllowImportingTsExtension,
     shouldPreserveConstEnums: () => shouldPreserveConstEnums,
+    shouldResolveJsRequire: () => shouldResolveJsRequire,
     shouldUseUriStyleNodeCoreModules: () => shouldUseUriStyleNodeCoreModules,
     showModuleSpecifier: () => showModuleSpecifier,
     signatureHasLiteralTypes: () => signatureHasLiteralTypes,
@@ -181491,6 +181527,8 @@ ${e.message}`;
     canJsonReportNoInputFiles: () => canJsonReportNoInputFiles,
     canProduceDiagnostics: () => canProduceDiagnostics,
     canUsePropertyAccess: () => canUsePropertyAccess,
+    canWatchAffectingLocation: () => canWatchAffectingLocation,
+    canWatchAtTypes: () => canWatchAtTypes,
     canWatchDirectoryOrFile: () => canWatchDirectoryOrFile,
     cartesianProduct: () => cartesianProduct,
     cast: () => cast,
@@ -181938,6 +181976,8 @@ ${e.message}`;
     getDiagnosticText: () => getDiagnosticText,
     getDiagnosticsWithinSpan: () => getDiagnosticsWithinSpan,
     getDirectoryPath: () => getDirectoryPath,
+    getDirectoryToWatchFailedLookupLocation: () => getDirectoryToWatchFailedLookupLocation,
+    getDirectoryToWatchFailedLookupLocationFromTypeRoot: () => getDirectoryToWatchFailedLookupLocationFromTypeRoot,
     getDocumentPositionMapper: () => getDocumentPositionMapper,
     getESModuleInterop: () => getESModuleInterop,
     getEditsForFileRename: () => getEditsForFileRename,
@@ -182207,6 +182247,7 @@ ${e.message}`;
     getRestParameterElementType: () => getRestParameterElementType,
     getRightMostAssignedExpression: () => getRightMostAssignedExpression,
     getRootDeclaration: () => getRootDeclaration,
+    getRootDirectoryOfResolutionCache: () => getRootDirectoryOfResolutionCache,
     getRootLength: () => getRootLength,
     getScriptKind: () => getScriptKind,
     getScriptKindFromFileName: () => getScriptKindFromFileName,
@@ -183304,6 +183345,7 @@ ${e.message}`;
     setValueDeclaration: () => setValueDeclaration,
     shouldAllowImportingTsExtension: () => shouldAllowImportingTsExtension,
     shouldPreserveConstEnums: () => shouldPreserveConstEnums,
+    shouldResolveJsRequire: () => shouldResolveJsRequire,
     shouldUseUriStyleNodeCoreModules: () => shouldUseUriStyleNodeCoreModules,
     showModuleSpecifier: () => showModuleSpecifier,
     signatureHasLiteralTypes: () => signatureHasLiteralTypes,