typescript 5.1.0-dev.20230330 → 5.1.0-dev.20230401

package/lib/tsserver.js

@@ -257,6 +257,8 @@ __export(server_exports, {
   canJsonReportNoInputFiles: () => canJsonReportNoInputFiles,
   canProduceDiagnostics: () => canProduceDiagnostics,
   canUsePropertyAccess: () => canUsePropertyAccess,
+  canWatchAffectingLocation: () => canWatchAffectingLocation,
+  canWatchAtTypes: () => canWatchAtTypes,
   canWatchDirectoryOrFile: () => canWatchDirectoryOrFile,
   cartesianProduct: () => cartesianProduct,
   cast: () => cast,
@@ -704,6 +706,8 @@ __export(server_exports, {
   getDiagnosticText: () => getDiagnosticText,
   getDiagnosticsWithinSpan: () => getDiagnosticsWithinSpan,
   getDirectoryPath: () => getDirectoryPath,
+  getDirectoryToWatchFailedLookupLocation: () => getDirectoryToWatchFailedLookupLocation,
+  getDirectoryToWatchFailedLookupLocationFromTypeRoot: () => getDirectoryToWatchFailedLookupLocationFromTypeRoot,
   getDocumentPositionMapper: () => getDocumentPositionMapper,
   getESModuleInterop: () => getESModuleInterop,
   getEditsForFileRename: () => getEditsForFileRename,
@@ -973,6 +977,7 @@ __export(server_exports, {
   getRestParameterElementType: () => getRestParameterElementType,
   getRightMostAssignedExpression: () => getRightMostAssignedExpression,
   getRootDeclaration: () => getRootDeclaration,
+  getRootDirectoryOfResolutionCache: () => getRootDirectoryOfResolutionCache,
   getRootLength: () => getRootLength,
   getScriptKind: () => getScriptKind,
   getScriptKindFromFileName: () => getScriptKindFromFileName,
@@ -2070,6 +2075,7 @@ __export(server_exports, {
   setValueDeclaration: () => setValueDeclaration,
   shouldAllowImportingTsExtension: () => shouldAllowImportingTsExtension,
   shouldPreserveConstEnums: () => shouldPreserveConstEnums,
+  shouldResolveJsRequire: () => shouldResolveJsRequire,
   shouldUseUriStyleNodeCoreModules: () => shouldUseUriStyleNodeCoreModules,
   showModuleSpecifier: () => showModuleSpecifier,
   signatureHasLiteralTypes: () => signatureHasLiteralTypes,
@@ -2286,7 +2292,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230330`;
+var version = `${versionMajorMinor}.0-dev.20230401`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -7548,7 +7554,7 @@ function createDynamicPriorityPollingWatchFile(host) {
     queue.pollScheduled = false;
     return queue;
   }
-  function pollPollingIntervalQueue(queue) {
+  function pollPollingIntervalQueue(_timeoutType, queue) {
     queue.pollIndex = pollQueue(queue, queue.pollingInterval, queue.pollIndex, pollingChunkSize[queue.pollingInterval]);
     if (queue.length) {
       scheduleNextPoll(queue.pollingInterval);
@@ -7557,7 +7563,7 @@ function createDynamicPriorityPollingWatchFile(host) {
       queue.pollScheduled = false;
     }
   }
-  function pollLowPollingIntervalQueue(queue) {
+  function pollLowPollingIntervalQueue(_timeoutType, queue) {
     pollQueue(
       changedFilesInLastPoll,
       250 /* Low */,
@@ -7565,7 +7571,7 @@ function createDynamicPriorityPollingWatchFile(host) {
       0,
       changedFilesInLastPoll.length
     );
-    pollPollingIntervalQueue(queue);
+    pollPollingIntervalQueue(_timeoutType, queue);
     if (!queue.pollScheduled && changedFilesInLastPoll.length) {
       scheduleNextPoll(250 /* Low */);
     }
@@ -7622,7 +7628,7 @@ function createDynamicPriorityPollingWatchFile(host) {
     }
   }
   function scheduleNextPoll(pollingInterval) {
-    pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === 250 /* Low */ ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingIntervalQueue(pollingInterval));
+    pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === 250 /* Low */ ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingInterval === 250 /* Low */ ? "pollLowPollingIntervalQueue" : "pollPollingIntervalQueue", pollingIntervalQueue(pollingInterval));
   }
 }
 function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames) {
@@ -7701,7 +7707,7 @@ function createFixedChunkSizePollingWatchFile(host) {
   function scheduleNextPoll() {
     if (!watchedFiles.length || pollScheduled)
       return;
-    pollScheduled = host.setTimeout(pollQueue, 2e3 /* High */);
+    pollScheduled = host.setTimeout(pollQueue, 2e3 /* High */, "pollQueue");
   }
 }
 function createSingleWatcherPerName(cache, useCaseSensitiveFileNames, name, callback, createWatcher) {
@@ -7869,7 +7875,7 @@ function createDirectoryWatcherSupportingRecursive({
       clearTimeout2(timerToUpdateChildWatches);
       timerToUpdateChildWatches = void 0;
     }
-    timerToUpdateChildWatches = setTimeout2(onTimerToUpdateChildWatches, 1e3);
+    timerToUpdateChildWatches = setTimeout2(onTimerToUpdateChildWatches, 1e3, "timerToUpdateChildWatches");
   }
   function onTimerToUpdateChildWatches() {
     timerToUpdateChildWatches = void 0;
@@ -9709,7 +9715,6 @@ var Diagnostics = {
   Constructors_for_derived_classes_must_contain_a_super_call: diag(2377, 1 /* Error */, "Constructors_for_derived_classes_must_contain_a_super_call_2377", "Constructors for derived classes must contain a 'super' call."),
   A_get_accessor_must_return_a_value: diag(2378, 1 /* Error */, "A_get_accessor_must_return_a_value_2378", "A 'get' accessor must return a value."),
   Argument_of_type_0_is_not_assignable_to_parameter_of_type_1_with_exactOptionalPropertyTypes_Colon_true_Consider_adding_undefined_to_the_types_of_the_target_s_properties: diag(2379, 1 /* Error */, "Argument_of_type_0_is_not_assignable_to_parameter_of_type_1_with_exactOptionalPropertyTypes_Colon_tr_2379", "Argument of type '{0}' is not assignable to parameter of type '{1}' with 'exactOptionalPropertyTypes: true'. Consider adding 'undefined' to the types of the target's properties."),
-  The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type: diag(2380, 1 /* Error */, "The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type_2380", "The return type of a 'get' accessor must be assignable to its 'set' accessor type"),
   Overload_signatures_must_all_be_exported_or_non_exported: diag(2383, 1 /* Error */, "Overload_signatures_must_all_be_exported_or_non_exported_2383", "Overload signatures must all be exported or non-exported."),
   Overload_signatures_must_all_be_ambient_or_non_ambient: diag(2384, 1 /* Error */, "Overload_signatures_must_all_be_ambient_or_non_ambient_2384", "Overload signatures must all be ambient or non-ambient."),
   Overload_signatures_must_all_be_public_private_or_protected: diag(2385, 1 /* Error */, "Overload_signatures_must_all_be_public_private_or_protected_2385", "Overload signatures must all be public, private or protected."),
@@ -20329,6 +20334,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)) {
@@ -38508,7 +38516,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",
@@ -45887,7 +45896,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 */);
@@ -49546,7 +49555,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;
@@ -49714,7 +49723,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,
@@ -54356,7 +54365,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);
@@ -75579,7 +75588,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);
@@ -79284,11 +79293,6 @@ function createTypeChecker(host) {
             error(getter.name, Diagnostics.A_get_accessor_must_be_at_least_as_accessible_as_the_setter);
             error(setter.name, Diagnostics.A_get_accessor_must_be_at_least_as_accessible_as_the_setter);
           }
-          const getterType = getAnnotatedAccessorType(getter);
-          const setterType = getAnnotatedAccessorType(setter);
-          if (getterType && setterType) {
-            checkTypeAssignableTo(getterType, setterType, getter, Diagnostics.The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type);
-          }
         }
       }
       const returnType = getTypeOfAccessors(getSymbolOfDeclaration(node));
@@ -119561,7 +119565,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);
     }
@@ -123006,6 +123010,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;
@@ -123040,7 +123117,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();
@@ -123073,12 +123150,6 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   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);
@@ -123362,55 +123433,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);
   }
@@ -123449,7 +123471,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)) {
@@ -123517,7 +123546,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) => {
@@ -123585,7 +123614,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);
@@ -123753,13 +123789,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);
@@ -123768,7 +123797,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);
       }
@@ -123794,12 +123828,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) {
@@ -124859,7 +124891,7 @@ function createWatchProgram(host) {
     }
     const pending = clearInvalidateResolutionsOfFailedLookupLocations();
     writeLog(`Scheduling invalidateFailedLookup${pending ? ", Cancelled earlier one" : ""}`);
-    timerToInvalidateFailedLookupResolutions = host.setTimeout(invalidateResolutionsOfFailedLookup, 250);
+    timerToInvalidateFailedLookupResolutions = host.setTimeout(invalidateResolutionsOfFailedLookup, 250, "timerToInvalidateFailedLookupResolutions");
   }
   function invalidateResolutionsOfFailedLookup() {
     timerToInvalidateFailedLookupResolutions = void 0;
@@ -124875,7 +124907,7 @@ function createWatchProgram(host) {
       host.clearTimeout(timerToUpdateProgram);
     }
     writeLog("Scheduling update");
-    timerToUpdateProgram = host.setTimeout(updateProgramWithWatchStatus, 250);
+    timerToUpdateProgram = host.setTimeout(updateProgramWithWatchStatus, 250, "timerToUpdateProgram");
   }
   function scheduleProgramReload() {
     Debug.assert(!!configFileName);
@@ -126780,9 +126812,9 @@ function scheduleBuildInvalidatedProject(state, time, changeDetected) {
   if (state.timerToBuildInvalidatedProject) {
     hostWithWatch.clearTimeout(state.timerToBuildInvalidatedProject);
   }
-  state.timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildNextInvalidatedProject, time, state, changeDetected);
+  state.timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildNextInvalidatedProject, time, "timerToBuildInvalidatedProject", state, changeDetected);
 }
-function buildNextInvalidatedProject(state, changeDetected) {
+function buildNextInvalidatedProject(_timeoutType, state, changeDetected) {
   mark("SolutionBuilder::beforeBuild");
   const buildOrder = buildNextInvalidatedProjectWorker(state, changeDetected);
   mark("SolutionBuilder::afterBuild");
@@ -130727,7 +130759,7 @@ function createCacheableExportInfoMap(host) {
       // 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;
@@ -139396,7 +139428,7 @@ function getIdentifiersFromErrorSpanExpression(expression, checker) {
 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
@@ -142176,7 +142208,6 @@ function createImportAdderWorker(sourceFile, program, useAutoImportProvider, pre
         importClauseOrBindingPattern,
         defaultImport,
         arrayFrom(namedImports.entries(), ([name, addAsTypeOnly]) => ({ addAsTypeOnly, name })),
-        compilerOptions,
         preferences
       );
     });
@@ -142374,7 +142405,19 @@ function getAddAsTypeOnly(isValidTypeOnlyUseSite, isForNewImportDeclaration, sym
   return 1 /* Allowed */;
 }
 function tryAddToExistingImport(existingImports, isValidTypeOnlyUseSite, checker, compilerOptions) {
-  return firstDefined(existingImports, ({ declaration, importKind, symbol, targetFlags }) => {
+  let best;
+  for (const existingImport of existingImports) {
+    const fix = getAddToExistingImportFix(existingImport);
+    if (!fix)
+      continue;
+    const isTypeOnly = isTypeOnlyImportDeclaration(fix.importClauseOrBindingPattern);
+    if (fix.addAsTypeOnly !== 4 /* NotAllowed */ && isTypeOnly || fix.addAsTypeOnly === 4 /* NotAllowed */ && !isTypeOnly) {
+      return fix;
+    }
+    best != null ? best : best = fix;
+  }
+  return best;
+  function getAddToExistingImportFix({ declaration, importKind, symbol, targetFlags }) {
     if (importKind === 3 /* CommonJS */ || importKind === 2 /* Namespace */ || declaration.kind === 269 /* ImportEqualsDeclaration */) {
       return void 0;
     }
@@ -142382,11 +142425,13 @@ function tryAddToExistingImport(existingImports, isValidTypeOnlyUseSite, checker
       return (importKind === 0 /* Named */ || importKind === 1 /* Default */) && declaration.name.kind === 204 /* ObjectBindingPattern */ ? { kind: 2 /* AddToExisting */, importClauseOrBindingPattern: declaration.name, importKind, moduleSpecifier: declaration.initializer.arguments[0].text, addAsTypeOnly: 4 /* NotAllowed */ } : void 0;
     }
     const { importClause } = declaration;
-    if (!importClause || !isStringLiteralLike(declaration.moduleSpecifier))
+    if (!importClause || !isStringLiteralLike(declaration.moduleSpecifier)) {
       return void 0;
+    }
     const { name, namedBindings } = importClause;
-    if (importClause.isTypeOnly && !(importKind === 0 /* Named */ && namedBindings))
+    if (importClause.isTypeOnly && !(importKind === 0 /* Named */ && namedBindings)) {
       return void 0;
+    }
     const addAsTypeOnly = getAddAsTypeOnly(
       isValidTypeOnlyUseSite,
       /*isForNewImportDeclaration*/
@@ -142397,10 +142442,12 @@ function tryAddToExistingImport(existingImports, isValidTypeOnlyUseSite, checker
       compilerOptions
     );
     if (importKind === 1 /* Default */ && (name || // Cannot add a default import to a declaration that already has one
-    addAsTypeOnly === 2 /* Required */ && namedBindings))
+    addAsTypeOnly === 2 /* Required */ && namedBindings)) {
       return void 0;
-    if (importKind === 0 /* Named */ && (namedBindings == null ? void 0 : namedBindings.kind) === 272 /* NamespaceImport */)
+    }
+    if (importKind === 0 /* Named */ && (namedBindings == null ? void 0 : namedBindings.kind) === 272 /* NamespaceImport */) {
       return void 0;
+    }
     return {
       kind: 2 /* AddToExisting */,
       importClauseOrBindingPattern: importClause,
@@ -142408,7 +142455,7 @@ function tryAddToExistingImport(existingImports, isValidTypeOnlyUseSite, checker
       moduleSpecifier: declaration.moduleSpecifier.text,
       addAsTypeOnly
     };
-  });
+  }
 }
 function createExistingImportMap(checker, importingFile, compilerOptions) {
   let importMap;
@@ -142837,7 +142884,6 @@ function codeActionForFixWorker(changes, sourceFile, symbolName2, fix, includeSy
         importClauseOrBindingPattern,
         importKind === 1 /* Default */ ? { name: symbolName2, addAsTypeOnly } : void 0,
         importKind === 0 /* Named */ ? [{ name: symbolName2, addAsTypeOnly }] : emptyArray,
-        compilerOptions,
         preferences
       );
       const moduleSpecifierWithoutQuotes = stripQuotes(moduleSpecifier);
@@ -142939,7 +142985,7 @@ function promoteFromTypeOnly(changes, aliasDeclaration, compilerOptions, sourceF
     }
   }
 }
-function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImports, compilerOptions, preferences) {
+function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImports, preferences) {
   var _a2;
   if (clause.kind === 204 /* ObjectBindingPattern */) {
     if (defaultImport) {
@@ -142957,7 +143003,6 @@ function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImpor
   }
   const promoteFromTypeOnly2 = clause.isTypeOnly && some([defaultImport, ...namedImports], (i) => (i == null ? void 0 : i.addAsTypeOnly) === 4 /* NotAllowed */);
   const existingSpecifiers = clause.namedBindings && ((_a2 = tryCast(clause.namedBindings, isNamedImports)) == null ? void 0 : _a2.elements);
-  const convertExistingToTypeOnly = promoteFromTypeOnly2 && importNameElisionDisabled(compilerOptions);
   if (defaultImport) {
     Debug.assert(!clause.name, "Cannot add a default import to an import clause that already has one");
     changes.insertNodeAt(sourceFile, clause.getStart(sourceFile), factory.createIdentifier(defaultImport.name), { suffix: ", " });
@@ -142988,7 +143033,7 @@ function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImpor
     const specifierSort = (existingSpecifiers == null ? void 0 : existingSpecifiers.length) && ts_OrganizeImports_exports.detectImportSpecifierSorting(existingSpecifiers, preferences);
     if (specifierSort && !(ignoreCaseForSorting && specifierSort === 1 /* CaseSensitive */)) {
       for (const spec of newSpecifiers) {
-        const insertionIndex = convertExistingToTypeOnly && !spec.isTypeOnly ? 0 : ts_OrganizeImports_exports.getImportSpecifierInsertionIndex(existingSpecifiers, spec, comparer);
+        const insertionIndex = promoteFromTypeOnly2 && !spec.isTypeOnly ? 0 : ts_OrganizeImports_exports.getImportSpecifierInsertionIndex(existingSpecifiers, spec, comparer);
         changes.insertImportSpecifierAtIndex(sourceFile, spec, clause.namedBindings, insertionIndex);
       }
     } else if (existingSpecifiers == null ? void 0 : existingSpecifiers.length) {
@@ -143008,7 +143053,7 @@ function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImpor
   }
   if (promoteFromTypeOnly2) {
     changes.delete(sourceFile, getTypeKeywordOfTypeOnlyImport(clause, sourceFile));
-    if (convertExistingToTypeOnly && existingSpecifiers) {
+    if (existingSpecifiers) {
       for (const specifier of existingSpecifiers) {
         changes.insertModifierBefore(sourceFile, 155 /* TypeKeyword */, specifier);
       }
@@ -154629,7 +154674,7 @@ var Core;
        */
       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) {
@@ -163470,7 +163515,7 @@ function getSmartSelectionRange(pos, sourceFile) {
     if (start2 !== end) {
       const textSpan = createTextSpanFromBounds(start2, 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 } };
       }
@@ -168521,6 +168566,8 @@ __export(ts_exports2, {
   canJsonReportNoInputFiles: () => canJsonReportNoInputFiles,
   canProduceDiagnostics: () => canProduceDiagnostics,
   canUsePropertyAccess: () => canUsePropertyAccess,
+  canWatchAffectingLocation: () => canWatchAffectingLocation,
+  canWatchAtTypes: () => canWatchAtTypes,
   canWatchDirectoryOrFile: () => canWatchDirectoryOrFile,
   cartesianProduct: () => cartesianProduct,
   cast: () => cast,
@@ -168968,6 +169015,8 @@ __export(ts_exports2, {
   getDiagnosticText: () => getDiagnosticText,
   getDiagnosticsWithinSpan: () => getDiagnosticsWithinSpan,
   getDirectoryPath: () => getDirectoryPath,
+  getDirectoryToWatchFailedLookupLocation: () => getDirectoryToWatchFailedLookupLocation,
+  getDirectoryToWatchFailedLookupLocationFromTypeRoot: () => getDirectoryToWatchFailedLookupLocationFromTypeRoot,
   getDocumentPositionMapper: () => getDocumentPositionMapper,
   getESModuleInterop: () => getESModuleInterop,
   getEditsForFileRename: () => getEditsForFileRename,
@@ -169237,6 +169286,7 @@ __export(ts_exports2, {
   getRestParameterElementType: () => getRestParameterElementType,
   getRightMostAssignedExpression: () => getRightMostAssignedExpression,
   getRootDeclaration: () => getRootDeclaration,
+  getRootDirectoryOfResolutionCache: () => getRootDirectoryOfResolutionCache,
   getRootLength: () => getRootLength,
   getScriptKind: () => getScriptKind,
   getScriptKindFromFileName: () => getScriptKindFromFileName,
@@ -170334,6 +170384,7 @@ __export(ts_exports2, {
   setValueDeclaration: () => setValueDeclaration,
   shouldAllowImportingTsExtension: () => shouldAllowImportingTsExtension,
   shouldPreserveConstEnums: () => shouldPreserveConstEnums,
+  shouldResolveJsRequire: () => shouldResolveJsRequire,
   shouldUseUriStyleNodeCoreModules: () => shouldUseUriStyleNodeCoreModules,
   showModuleSpecifier: () => showModuleSpecifier,
   signatureHasLiteralTypes: () => signatureHasLiteralTypes,
@@ -170889,7 +170940,7 @@ var ThrottledOperations = class {
     if (pendingTimeout) {
       this.host.clearTimeout(pendingTimeout);
     }
-    this.pendingTimeouts.set(operationId, this.host.setTimeout(ThrottledOperations.run, delay, this, operationId, cb));
+    this.pendingTimeouts.set(operationId, this.host.setTimeout(ThrottledOperations.run, delay, operationId, this, cb));
     if (this.logger) {
       this.logger.info(`Scheduled: ${operationId}${pendingTimeout ? ", Cancelled earlier one" : ""}`);
     }
@@ -170901,7 +170952,7 @@ var ThrottledOperations = class {
     this.host.clearTimeout(pendingTimeout);
     return this.pendingTimeouts.delete(operationId);
   }
-  static run(self, operationId, cb) {
+  static run(operationId, self, cb) {
     var _a2, _b;
     (_a2 = perfLogger) == null ? void 0 : _a2.logStartScheduledOperation(operationId);
     self.pendingTimeouts.delete(operationId);
@@ -177543,21 +177594,21 @@ var MultistepOperation = class {
     this.setTimerHandle(void 0);
     this.setImmediateId(void 0);
   }
-  immediate(action) {
+  immediate(actionType, action) {
     const requestId = this.requestId;
     Debug.assert(requestId === this.operationHost.getCurrentRequestId(), "immediate: incorrect request id");
     this.setImmediateId(this.operationHost.getServerHost().setImmediate(() => {
       this.immediateId = void 0;
       this.operationHost.executeWithRequestId(requestId, () => this.executeAction(action));
-    }));
+    }, actionType));
   }
-  delay(ms, action) {
+  delay(actionType, ms, action) {
     const requestId = this.requestId;
     Debug.assert(requestId === this.operationHost.getCurrentRequestId(), "delay: incorrect request id");
     this.setTimerHandle(this.operationHost.getServerHost().setTimeout(() => {
       this.timerHandle = void 0;
       this.operationHost.executeWithRequestId(requestId, () => this.executeAction(action));
-    }, ms));
+    }, ms, actionType));
   }
   executeAction(action) {
     var _a2, _b, _c, _d, _e, _f;
@@ -178871,7 +178922,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
     const goNext = () => {
       index++;
       if (checkList.length > index) {
-        next.delay(followMs, checkOne);
+        next.delay("checkOne", followMs, checkOne);
       }
     };
     const checkOne = () => {
@@ -178899,7 +178950,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
         goNext();
         return;
       }
-      next.immediate(() => {
+      next.immediate("semanticCheck", () => {
         this.semanticCheck(fileName, project);
         if (this.changeSeq !== seq) {
           return;
@@ -178908,14 +178959,14 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
           goNext();
           return;
         }
-        next.immediate(() => {
+        next.immediate("suggestionCheck", () => {
           this.suggestionCheck(fileName, project);
           goNext();
         });
       });
     };
     if (checkList.length > index && this.changeSeq === seq) {
-      next.delay(ms, checkOne);
+      next.delay("checkOne", ms, checkOne);
     }
   }
   cleanProjects(caption, projects) {
@@ -182487,6 +182538,8 @@ start(initializeNodeSystem(), require("os").platform());
   canJsonReportNoInputFiles,
   canProduceDiagnostics,
   canUsePropertyAccess,
+  canWatchAffectingLocation,
+  canWatchAtTypes,
   canWatchDirectoryOrFile,
   cartesianProduct,
   cast,
@@ -182934,6 +182987,8 @@ start(initializeNodeSystem(), require("os").platform());
   getDiagnosticText,
   getDiagnosticsWithinSpan,
   getDirectoryPath,
+  getDirectoryToWatchFailedLookupLocation,
+  getDirectoryToWatchFailedLookupLocationFromTypeRoot,
   getDocumentPositionMapper,
   getESModuleInterop,
   getEditsForFileRename,
@@ -183203,6 +183258,7 @@ start(initializeNodeSystem(), require("os").platform());
   getRestParameterElementType,
   getRightMostAssignedExpression,
   getRootDeclaration,
+  getRootDirectoryOfResolutionCache,
   getRootLength,
   getScriptKind,
   getScriptKindFromFileName,
@@ -184300,6 +184356,7 @@ start(initializeNodeSystem(), require("os").platform());
   setValueDeclaration,
   shouldAllowImportingTsExtension,
   shouldPreserveConstEnums,
+  shouldResolveJsRequire,
   shouldUseUriStyleNodeCoreModules,
   showModuleSpecifier,
   signatureHasLiteralTypes,