typescript 5.5.0-dev.20240520 → 5.5.0-dev.20240522

package/lib/typescript.js

@@ -532,6 +532,7 @@ __export(typescript_exports, {
   emitNewLineBeforeLeadingCommentOfPosition: () => emitNewLineBeforeLeadingCommentOfPosition,
   emitNewLineBeforeLeadingComments: () => emitNewLineBeforeLeadingComments,
   emitNewLineBeforeLeadingCommentsOfPosition: () => emitNewLineBeforeLeadingCommentsOfPosition,
+  emitResolverSkipsTypeChecking: () => emitResolverSkipsTypeChecking,
   emitSkippedWithNoDiagnostics: () => emitSkippedWithNoDiagnostics,
   emptyArray: () => emptyArray,
   emptyFileSystemEntries: () => emptyFileSystemEntries,
@@ -2368,7 +2369,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = `${versionMajorMinor}.0-dev.20240520`;
+var version = `${versionMajorMinor}.0-dev.20240522`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -15259,7 +15260,7 @@ function getTextOfJSDocComment(comment) {
 function formatJSDocLink(link) {
   const kind = link.kind === 324 /* JSDocLink */ ? "link" : link.kind === 325 /* JSDocLinkCode */ ? "linkcode" : "linkplain";
   const name = link.name ? entityNameToString(link.name) : "";
-  const space = link.name && link.text.startsWith("://") ? "" : " ";
+  const space = link.name && (link.text === "" || link.text.startsWith("://")) ? "" : " ";
   return `{@${kind} ${name}${space}${link.text}}`;
 }
 function getEffectiveTypeParameterDeclarations(node) {
@@ -48837,13 +48838,14 @@ function getModuleSpecifierWorker(compilerOptions, importingSourceFile, importin
   )) || getLocalModuleSpecifier(toFileName2, info, compilerOptions, host, options.overrideImportMode || getDefaultResolutionModeForFile(importingSourceFile, host, compilerOptions), preferences);
 }
 function tryGetModuleSpecifiersFromCache(moduleSymbol, importingSourceFile, host, userPreferences, options = {}) {
-  return tryGetModuleSpecifiersFromCacheWorker(
+  const result = tryGetModuleSpecifiersFromCacheWorker(
     moduleSymbol,
     importingSourceFile,
     host,
     userPreferences,
     options
-  )[0];
+  );
+  return result[1] && { kind: result[0], moduleSpecifiers: result[1], computedWithoutCache: false };
 }
 function tryGetModuleSpecifiersFromCacheWorker(moduleSymbol, importingSourceFile, host, userPreferences, options = {}) {
   var _a;
@@ -48853,7 +48855,7 @@ function tryGetModuleSpecifiersFromCacheWorker(moduleSymbol, importingSourceFile
   }
   const cache = (_a = host.getModuleSpecifierCache) == null ? void 0 : _a.call(host);
   const cached = cache == null ? void 0 : cache.get(importingSourceFile.path, moduleSourceFile.path, userPreferences, options);
-  return [cached == null ? void 0 : cached.moduleSpecifiers, moduleSourceFile, cached == null ? void 0 : cached.modulePaths, cache];
+  return [cached == null ? void 0 : cached.kind, cached == null ? void 0 : cached.moduleSpecifiers, moduleSourceFile, cached == null ? void 0 : cached.modulePaths, cache];
 }
 function getModuleSpecifiers(moduleSymbol, checker, compilerOptions, importingSourceFile, host, userPreferences, options = {}) {
   return getModuleSpecifiersWithCacheInfo(
@@ -48871,16 +48873,16 @@ function getModuleSpecifiers(moduleSymbol, checker, compilerOptions, importingSo
 function getModuleSpecifiersWithCacheInfo(moduleSymbol, checker, compilerOptions, importingSourceFile, host, userPreferences, options = {}, forAutoImport) {
   let computedWithoutCache = false;
   const ambient = tryGetModuleNameFromAmbientModule(moduleSymbol, checker);
-  if (ambient) return { moduleSpecifiers: [ambient], computedWithoutCache };
-  let [specifiers, moduleSourceFile, modulePaths, cache] = tryGetModuleSpecifiersFromCacheWorker(
+  if (ambient) return { kind: "ambient", moduleSpecifiers: [ambient], computedWithoutCache };
+  let [kind, specifiers, moduleSourceFile, modulePaths, cache] = tryGetModuleSpecifiersFromCacheWorker(
     moduleSymbol,
     importingSourceFile,
     host,
     userPreferences,
     options
   );
-  if (specifiers) return { moduleSpecifiers: specifiers, computedWithoutCache };
-  if (!moduleSourceFile) return { moduleSpecifiers: emptyArray, computedWithoutCache };
+  if (specifiers) return { kind, moduleSpecifiers: specifiers, computedWithoutCache };
+  if (!moduleSourceFile) return { kind: void 0, moduleSpecifiers: emptyArray, computedWithoutCache };
   computedWithoutCache = true;
   modulePaths || (modulePaths = getAllModulePathsWorker(getInfo(importingSourceFile.fileName, host), moduleSourceFile.originalFileName, host, compilerOptions, options));
   const result = computeModuleSpecifiers(
@@ -48892,8 +48894,8 @@ function getModuleSpecifiersWithCacheInfo(moduleSymbol, checker, compilerOptions
     options,
     forAutoImport
   );
-  cache == null ? void 0 : cache.set(importingSourceFile.path, moduleSourceFile.path, userPreferences, options, modulePaths, result);
-  return { moduleSpecifiers: result, computedWithoutCache };
+  cache == null ? void 0 : cache.set(importingSourceFile.path, moduleSourceFile.path, userPreferences, options, result.kind, modulePaths, result.moduleSpecifiers);
+  return result;
 }
 function getLocalModuleSpecifierBetweenFileNames(importingFile, targetFileName, compilerOptions, host, options = {}) {
   const info = getInfo(importingFile.fileName, host);
@@ -48924,8 +48926,7 @@ function computeModuleSpecifiers(modulePaths, compilerOptions, importingSourceFi
     }
   ));
   if (existingSpecifier) {
-    const moduleSpecifiers = [existingSpecifier];
-    return moduleSpecifiers;
+    return { kind: void 0, moduleSpecifiers: [existingSpecifier], computedWithoutCache: true };
   }
   const importedFileIsInNodeModules = some(modulePaths, (p) => p.isInNodeModules);
   let nodeModulesSpecifiers;
@@ -48946,7 +48947,7 @@ function computeModuleSpecifiers(modulePaths, compilerOptions, importingSourceFi
     ) : void 0;
     nodeModulesSpecifiers = append(nodeModulesSpecifiers, specifier);
     if (specifier && modulePath.isRedirect) {
-      return nodeModulesSpecifiers;
+      return { kind: "node_modules", moduleSpecifiers: nodeModulesSpecifiers, computedWithoutCache: true };
     }
     if (!specifier) {
       const local = getLocalModuleSpecifier(
@@ -48975,7 +48976,7 @@ function computeModuleSpecifiers(modulePaths, compilerOptions, importingSourceFi
       }
     }
   }
-  return (pathsSpecifiers == null ? void 0 : pathsSpecifiers.length) ? pathsSpecifiers : (redirectPathsSpecifiers == null ? void 0 : redirectPathsSpecifiers.length) ? redirectPathsSpecifiers : (nodeModulesSpecifiers == null ? void 0 : nodeModulesSpecifiers.length) ? nodeModulesSpecifiers : Debug.checkDefined(relativeSpecifiers);
+  return (pathsSpecifiers == null ? void 0 : pathsSpecifiers.length) ? { kind: "paths", moduleSpecifiers: pathsSpecifiers, computedWithoutCache: true } : (redirectPathsSpecifiers == null ? void 0 : redirectPathsSpecifiers.length) ? { kind: "redirect", moduleSpecifiers: redirectPathsSpecifiers, computedWithoutCache: true } : (nodeModulesSpecifiers == null ? void 0 : nodeModulesSpecifiers.length) ? { kind: "node_modules", moduleSpecifiers: nodeModulesSpecifiers, computedWithoutCache: true } : { kind: "relative", moduleSpecifiers: Debug.checkDefined(relativeSpecifiers), computedWithoutCache: true };
 }
 function getInfo(importingSourceFileName, host) {
   importingSourceFileName = getNormalizedAbsolutePath(importingSourceFileName, host.getCurrentDirectory());
@@ -50885,8 +50886,8 @@ function createTypeChecker(host) {
       void 0
     );
   }
-  function getEmitResolver(sourceFile, cancellationToken2) {
-    getDiagnostics2(sourceFile, cancellationToken2);
+  function getEmitResolver(sourceFile, cancellationToken2, skipDiagnostics) {
+    if (!skipDiagnostics) getDiagnostics2(sourceFile, cancellationToken2);
     return emitResolver;
   }
   function lookupOrIssueError(location, message, ...args) {
@@ -53814,8 +53815,15 @@ function createTypeChecker(host) {
     ).accessibility === 0 /* Accessible */) {
       return { accessibility: 0 /* Accessible */ };
     }
-    return symbol && hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) || {
-      accessibility: 3 /* NotResolved */,
+    if (!symbol) {
+      return {
+        accessibility: 3 /* NotResolved */,
+        errorSymbolName: getTextOfNode(firstIdentifier),
+        errorNode: firstIdentifier
+      };
+    }
+    return hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) || {
+      accessibility: 1 /* NotAccessible */,
       errorSymbolName: getTextOfNode(firstIdentifier),
       errorNode: firstIdentifier
     };
@@ -117448,6 +117456,9 @@ function getFirstProjectOutput(configFile, ignoreCase) {
   if (buildInfoPath) return buildInfoPath;
   return Debug.fail(`project ${configFile.options.configFilePath} expected to have at least one output`);
 }
+function emitResolverSkipsTypeChecking(emitOnly, forceDtsEmit) {
+  return !!forceDtsEmit && !!emitOnly;
+}
 function emitFiles(resolver, host, targetSourceFile, { scriptTransformers, declarationTransformers }, emitOnly, onlyBuildInfo, forceDtsEmit) {
   var compilerOptions = host.getCompilerOptions();
   var sourceMapDataList = compilerOptions.sourceMap || compilerOptions.inlineSourceMap || getAreDeclarationMapsEnabled(compilerOptions) ? [] : void 0;
@@ -117565,7 +117576,7 @@ function emitFiles(resolver, host, targetSourceFile, { scriptTransformers, decla
     const sourceFiles = isSourceFile(sourceFileOrBundle) ? [sourceFileOrBundle] : sourceFileOrBundle.sourceFiles;
     const filesForEmit = forceDtsEmit ? sourceFiles : filter(sourceFiles, isSourceFileNotJson);
     const inputListOrBundle = compilerOptions.outFile ? [factory.createBundle(filesForEmit)] : filesForEmit;
-    if (emitOnly && !getEmitDeclarations(compilerOptions) || compilerOptions.noCheck) {
+    if (emitOnly && !getEmitDeclarations(compilerOptions) || compilerOptions.noCheck || emitResolverSkipsTypeChecking(emitOnly, forceDtsEmit)) {
       filesForEmit.forEach(collectLinkedAliases);
     }
     const declarationTransform = transformNodes(
@@ -124547,17 +124558,25 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       const result = handleNoEmitOptions(program2, sourceFile, writeFileCallback, cancellationToken);
       if (result) return result;
     }
-    const emitResolver = getTypeChecker().getEmitResolver(options.outFile ? void 0 : sourceFile, cancellationToken);
+    const typeChecker2 = getTypeChecker();
+    const emitResolver = typeChecker2.getEmitResolver(
+      options.outFile ? void 0 : sourceFile,
+      cancellationToken,
+      emitResolverSkipsTypeChecking(emitOnly, forceDtsEmit)
+    );
     mark("beforeEmit");
-    const emitResult = emitFiles(
-      emitResolver,
-      getEmitHost(writeFileCallback),
-      sourceFile,
-      getTransformers(options, customTransformers, emitOnly),
-      emitOnly,
-      /*onlyBuildInfo*/
-      false,
-      forceDtsEmit
+    const emitResult = typeChecker2.runWithCancellationToken(
+      cancellationToken,
+      () => emitFiles(
+        emitResolver,
+        getEmitHost(writeFileCallback),
+        sourceFile,
+        getTransformers(options, customTransformers, emitOnly),
+        emitOnly,
+        /*onlyBuildInfo*/
+        false,
+        forceDtsEmit
+      )
     );
     mark("afterEmit");
     measure("Emit", "beforeEmit", "afterEmit");
@@ -125297,7 +125316,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       return file2 || void 0;
     }
     let redirectedPath;
-    if (isReferencedFile(reason) && !useSourceOfProjectReferenceRedirect) {
+    if (!useSourceOfProjectReferenceRedirect) {
       const redirectProject = getProjectReferenceRedirectProject(fileName);
       if (redirectProject) {
         if (redirectProject.commandLine.options.outFile) {
@@ -127534,7 +127553,7 @@ function handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken
     host
   );
 }
-function handleDtsMayChangeOf(state, path, cancellationToken, host) {
+function handleDtsMayChangeOf(state, path, invalidateJsFiles, cancellationToken, host) {
   removeSemanticDiagnosticsOf(state, path);
   if (!state.changedFilesSet.has(path)) {
     const program = Debug.checkDefined(state.program);
@@ -127549,7 +127568,9 @@ function handleDtsMayChangeOf(state, path, cancellationToken, host) {
         /*useFileVersionAsSignature*/
         true
       );
-      if (getEmitDeclarations(state.compilerOptions)) {
+      if (invalidateJsFiles) {
+        addToAffectedFilesPendingEmit(state, path, getBuilderFileEmit(state.compilerOptions));
+      } else if (getEmitDeclarations(state.compilerOptions)) {
         addToAffectedFilesPendingEmit(state, path, state.compilerOptions.declarationMap ? 24 /* AllDts */ : 8 /* Dts */);
       }
     }
@@ -127568,7 +127589,7 @@ function isChangedSignature(state, path) {
   const newSignature = Debug.checkDefined(state.fileInfos.get(path)).signature;
   return newSignature !== oldSignature;
 }
-function handleDtsMayChangeOfGlobalScope(state, filePath, cancellationToken, host) {
+function handleDtsMayChangeOfGlobalScope(state, filePath, invalidateJsFiles, cancellationToken, host) {
   var _a;
   if (!((_a = state.fileInfos.get(filePath)) == null ? void 0 : _a.affectsGlobalScope)) return false;
   BuilderState.getAllFilesExcludingDefaultLibraryFile(
@@ -127580,6 +127601,7 @@ function handleDtsMayChangeOfGlobalScope(state, filePath, cancellationToken, hos
     (file) => handleDtsMayChangeOf(
       state,
       file.resolvedPath,
+      invalidateJsFiles,
       cancellationToken,
       host
     )
@@ -127588,7 +127610,7 @@ function handleDtsMayChangeOfGlobalScope(state, filePath, cancellationToken, hos
   return true;
 }
 function handleDtsMayChangeOfReferencingExportOfAffectedFile(state, affectedFile, cancellationToken, host) {
-  var _a;
+  var _a, _b;
   if (!state.referencedMap || !state.changedFilesSet.has(affectedFile.resolvedPath)) return;
   if (!isChangedSignature(state, affectedFile.resolvedPath)) return;
   if (getIsolatedModules(state.compilerOptions)) {
@@ -127599,8 +127621,22 @@ function handleDtsMayChangeOfReferencingExportOfAffectedFile(state, affectedFile
       const currentPath = queue.pop();
       if (!seenFileNamesMap.has(currentPath)) {
         seenFileNamesMap.set(currentPath, true);
-        if (handleDtsMayChangeOfGlobalScope(state, currentPath, cancellationToken, host)) return;
-        handleDtsMayChangeOf(state, currentPath, cancellationToken, host);
+        if (handleDtsMayChangeOfGlobalScope(
+          state,
+          currentPath,
+          /*invalidateJsFiles*/
+          false,
+          cancellationToken,
+          host
+        )) return;
+        handleDtsMayChangeOf(
+          state,
+          currentPath,
+          /*invalidateJsFiles*/
+          false,
+          cancellationToken,
+          host
+        );
         if (isChangedSignature(state, currentPath)) {
           const currentSourceFile = Debug.checkDefined(state.program).getSourceFileByPath(currentPath);
           queue.push(...BuilderState.getReferencedByPaths(state, currentSourceFile.resolvedPath));
@@ -127609,27 +127645,38 @@ function handleDtsMayChangeOfReferencingExportOfAffectedFile(state, affectedFile
     }
   }
   const seenFileAndExportsOfFile = /* @__PURE__ */ new Set();
-  (_a = state.referencedMap.getKeys(affectedFile.resolvedPath)) == null ? void 0 : _a.forEach((exportedFromPath) => {
-    if (handleDtsMayChangeOfGlobalScope(state, exportedFromPath, cancellationToken, host)) return true;
+  const invalidateJsFiles = !!((_a = affectedFile.symbol) == null ? void 0 : _a.exports) && !!forEachEntry(
+    affectedFile.symbol.exports,
+    (exported) => {
+      if ((exported.flags & 128 /* ConstEnum */) !== 0) return true;
+      const aliased = skipAlias(exported, state.program.getTypeChecker());
+      if (aliased === exported) return false;
+      return (aliased.flags & 128 /* ConstEnum */) !== 0 && some(aliased.declarations, (d) => getSourceFileOfNode(d) === affectedFile);
+    }
+  );
+  (_b = state.referencedMap.getKeys(affectedFile.resolvedPath)) == null ? void 0 : _b.forEach((exportedFromPath) => {
+    if (handleDtsMayChangeOfGlobalScope(state, exportedFromPath, invalidateJsFiles, cancellationToken, host)) return true;
     const references = state.referencedMap.getKeys(exportedFromPath);
     return references && forEachKey(references, (filePath) => handleDtsMayChangeOfFileAndExportsOfFile(
       state,
       filePath,
+      invalidateJsFiles,
       seenFileAndExportsOfFile,
       cancellationToken,
       host
     ));
   });
 }
-function handleDtsMayChangeOfFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, cancellationToken, host) {
+function handleDtsMayChangeOfFileAndExportsOfFile(state, filePath, invalidateJsFiles, seenFileAndExportsOfFile, cancellationToken, host) {
   var _a;
   if (!tryAddToSet(seenFileAndExportsOfFile, filePath)) return void 0;
-  if (handleDtsMayChangeOfGlobalScope(state, filePath, cancellationToken, host)) return true;
-  handleDtsMayChangeOf(state, filePath, cancellationToken, host);
+  if (handleDtsMayChangeOfGlobalScope(state, filePath, invalidateJsFiles, cancellationToken, host)) return true;
+  handleDtsMayChangeOf(state, filePath, invalidateJsFiles, cancellationToken, host);
   (_a = state.referencedMap.getKeys(filePath)) == null ? void 0 : _a.forEach(
     (referencingFilePath) => handleDtsMayChangeOfFileAndExportsOfFile(
       state,
       referencingFilePath,
+      invalidateJsFiles,
       seenFileAndExportsOfFile,
       cancellationToken,
       host
@@ -127668,6 +127715,7 @@ function getBuildInfo2(state) {
   const latestChangedDtsFile = state.latestChangedDtsFile ? relativeToBuildInfoEnsuringAbsolutePath(state.latestChangedDtsFile) : void 0;
   const fileNames = [];
   const fileNameToFileId = /* @__PURE__ */ new Map();
+  const rootFileNames = new Set(state.program.getRootFileNames().map((f) => toPath(f, currentDirectory, state.program.getCanonicalFileName)));
   const root = [];
   if (state.compilerOptions.outFile) {
     const fileInfos2 = arrayFrom(state.fileInfos.entries(), ([key, value]) => {
@@ -127679,6 +127727,7 @@ function getBuildInfo2(state) {
       fileNames,
       fileInfos: fileInfos2,
       root,
+      resolvedRoot: toResolvedRoot(),
       options: convertToProgramBuildInfoCompilerOptions(state.compilerOptions),
       outSignature: state.outSignature,
       latestChangedDtsFile,
@@ -127708,7 +127757,8 @@ function getBuildInfo2(state) {
       if (!isJsonSourceFile(file) && sourceFileMayBeEmitted(file, state.program)) {
         const emitSignature = (_b = state.emitSignatures) == null ? void 0 : _b.get(key);
         if (emitSignature !== actualSignature) {
-          (emitSignatures || (emitSignatures = [])).push(
+          emitSignatures = append(
+            emitSignatures,
             emitSignature === void 0 ? fileId : (
               // There is no emit, encode as false
               // fileId, signature: emptyArray if signature only differs in dtsMap option than our own compilerOptions otherwise EmitSignature
@@ -127755,7 +127805,8 @@ function getBuildInfo2(state) {
         const file = state.program.getSourceFileByPath(path);
         if (!file || !sourceFileMayBeEmitted(file, state.program)) continue;
         const fileId = toFileId(path), pendingEmit = state.affectedFilesPendingEmit.get(path);
-        (affectedFilesPendingEmit || (affectedFilesPendingEmit = [])).push(
+        affectedFilesPendingEmit = append(
+          affectedFilesPendingEmit,
           pendingEmit === fullEmitForOptions ? fileId : (
             // Pending full emit per options
             pendingEmit === 8 /* Dts */ ? [fileId] : (
@@ -127771,7 +127822,7 @@ function getBuildInfo2(state) {
   let changeFileSet;
   if (state.changedFilesSet.size) {
     for (const path of arrayFrom(state.changedFilesSet.keys()).sort(compareStringsCaseSensitive)) {
-      (changeFileSet || (changeFileSet = [])).push(toFileId(path));
+      changeFileSet = append(changeFileSet, toFileId(path));
     }
   }
   const emitDiagnosticsPerFile = convertToProgramBuildInfoDiagnostics(state.emitDiagnosticsPerFile);
@@ -127779,6 +127830,7 @@ function getBuildInfo2(state) {
     fileNames,
     fileInfos,
     root,
+    resolvedRoot: toResolvedRoot(),
     options: convertToProgramBuildInfoCompilerOptions(state.compilerOptions),
     fileIdsList,
     referencedMap,
@@ -127809,8 +127861,8 @@ function getBuildInfo2(state) {
     const key = fileIds.join();
     let fileIdListId = fileNamesToFileIdListId == null ? void 0 : fileNamesToFileIdListId.get(key);
     if (fileIdListId === void 0) {
-      (fileIdsList || (fileIdsList = [])).push(fileIds);
-      (fileNamesToFileIdListId || (fileNamesToFileIdListId = /* @__PURE__ */ new Map())).set(key, fileIdListId = fileIdsList.length);
+      fileIdsList = append(fileIdsList, fileIds);
+      (fileNamesToFileIdListId ?? (fileNamesToFileIdListId = /* @__PURE__ */ new Map())).set(key, fileIdListId = fileIdsList.length);
     }
     return fileIdListId;
   }
@@ -127827,6 +127879,16 @@ function getBuildInfo2(state) {
     root[root.length - 2] = [lastButOne, fileId];
     return root.length = root.length - 1;
   }
+  function toResolvedRoot() {
+    let result;
+    rootFileNames.forEach((path) => {
+      const file = state.program.getSourceFileByPath(path);
+      if (file && path !== file.resolvedPath) {
+        result = append(result, [toFileId(file.resolvedPath), toFileId(path)]);
+      }
+    });
+    return result;
+  }
   function convertToProgramBuildInfoCompilerOptions(options) {
     let result;
     const { optionsNameMap } = getOptionsNameMap();
@@ -127860,7 +127922,8 @@ function getBuildInfo2(state) {
     if (diagnostics) {
       for (const key of arrayFrom(diagnostics.keys()).sort(compareStringsCaseSensitive)) {
         const value = diagnostics.get(key);
-        (result || (result = [])).push(
+        result = append(
+          result,
           value.length ? [
             toFileId(key),
             convertToReusableDiagnostics(value)
@@ -128354,7 +128417,8 @@ function getBuildInfoFileVersionMap(program, buildInfoPath, host) {
   const getCanonicalFileName = createGetCanonicalFileName(host.useCaseSensitiveFileNames());
   const fileInfos = /* @__PURE__ */ new Map();
   let rootIndex = 0;
-  const roots = [];
+  const roots = /* @__PURE__ */ new Map();
+  const resolvedRoots = new Map(program.resolvedRoot);
   program.fileInfos.forEach((fileInfo, index) => {
     const path = toPath(program.fileNames[index], buildInfoDirectory, getCanonicalFileName);
     const version2 = isString(fileInfo) ? fileInfo : fileInfo.version;
@@ -128364,16 +128428,24 @@ function getBuildInfoFileVersionMap(program, buildInfoPath, host) {
       const fileId = index + 1;
       if (isArray(current)) {
         if (current[0] <= fileId && fileId <= current[1]) {
-          roots.push(path);
+          addRoot(fileId, path);
           if (current[1] === fileId) rootIndex++;
         }
       } else if (current === fileId) {
-        roots.push(path);
+        addRoot(fileId, path);
         rootIndex++;
       }
     }
   });
   return { fileInfos, roots };
+  function addRoot(fileId, path) {
+    const root = resolvedRoots.get(fileId);
+    if (root) {
+      roots.set(toPath(program.fileNames[root - 1], buildInfoDirectory, getCanonicalFileName), path);
+    } else {
+      roots.set(path, void 0);
+    }
+  }
 }
 function createRedirectedBuilderProgram(getState, configFileParsingDiagnostics) {
   return {
@@ -132029,13 +132101,15 @@ function getUpToDateStatusWorker(state, project, resolvedPath) {
         reason: `${inputFile} does not exist`
       };
     }
+    const inputPath = buildInfoProgram ? toPath2(state, inputFile) : void 0;
     if (buildInfoTime && buildInfoTime < inputTime) {
       let version2;
       let currentVersion;
       if (buildInfoProgram) {
         if (!buildInfoVersionMap) buildInfoVersionMap = getBuildInfoFileVersionMap(buildInfoProgram, buildInfoPath, host);
-        version2 = buildInfoVersionMap.fileInfos.get(toPath2(state, inputFile));
-        const text = version2 ? state.readFileWithCache(inputFile) : void 0;
+        const resolvedInputPath = buildInfoVersionMap.roots.get(inputPath);
+        version2 = buildInfoVersionMap.fileInfos.get(resolvedInputPath ?? inputPath);
+        const text = version2 ? state.readFileWithCache(resolvedInputPath ?? inputFile) : void 0;
         currentVersion = text !== void 0 ? getSourceFileVersionAsHashFromText(host, text) : void 0;
         if (version2 && version2 === currentVersion) pseudoInputUpToDate = true;
       }
@@ -132051,18 +132125,21 @@ function getUpToDateStatusWorker(state, project, resolvedPath) {
       newestInputFileName = inputFile;
       newestInputFileTime = inputTime;
     }
-    if (buildInfoProgram) seenRoots.add(toPath2(state, inputFile));
+    if (buildInfoProgram) seenRoots.add(inputPath);
   }
   if (buildInfoProgram) {
     if (!buildInfoVersionMap) buildInfoVersionMap = getBuildInfoFileVersionMap(buildInfoProgram, buildInfoPath, host);
-    for (const existingRoot of buildInfoVersionMap.roots) {
-      if (!seenRoots.has(existingRoot)) {
-        return {
-          type: 9 /* OutOfDateRoots */,
-          buildInfoFile: buildInfoPath,
-          inputFile: existingRoot
-        };
-      }
+    const existingRoot = forEachEntry(
+      buildInfoVersionMap.roots,
+      // File was root file when project was built but its not any more
+      (_resolved, existingRoot2) => !seenRoots.has(existingRoot2) ? existingRoot2 : void 0
+    );
+    if (existingRoot) {
+      return {
+        type: 9 /* OutOfDateRoots */,
+        buildInfoFile: buildInfoPath,
+        inputFile: existingRoot
+      };
     }
   }
   if (!buildInfoPath) {
@@ -153690,6 +153767,7 @@ function createImportAdderWorker(sourceFile, program, useAutoImportProvider, pre
       );
       const fix = {
         kind: 3 /* AddNew */,
+        moduleSpecifierKind: "relative",
         moduleSpecifier,
         importKind,
         addAsTypeOnly,
@@ -154032,7 +154110,7 @@ function createImportSpecifierResolver(importingFile, program, host, preferences
       importMap,
       fromCacheOnly
     );
-    const result = getBestFix(fixes, importingFile, program, packageJsonImportFilter, host);
+    const result = getBestFix(fixes, importingFile, program, packageJsonImportFilter, host, preferences);
     return result && { ...result, computedWithoutCacheCount };
   }
 }
@@ -154079,7 +154157,7 @@ function getPromoteTypeOnlyCompletionAction(sourceFile, symbolToken, program, ho
 }
 function getImportFixForSymbol(sourceFile, exportInfos, program, position, isValidTypeOnlyUseSite, useRequire, host, preferences) {
   const packageJsonImportFilter = createPackageJsonImportFilter(sourceFile, preferences, host);
-  return getBestFix(getImportFixes(exportInfos, position, isValidTypeOnlyUseSite, useRequire, program, sourceFile, host, preferences).fixes, sourceFile, program, packageJsonImportFilter, host);
+  return getBestFix(getImportFixes(exportInfos, position, isValidTypeOnlyUseSite, useRequire, program, sourceFile, host, preferences).fixes, sourceFile, program, packageJsonImportFilter, host, preferences);
 }
 function codeFixActionToCodeAction({ description: description3, changes, commands }) {
   return { description: description3, changes, commands };
@@ -154154,7 +154232,7 @@ function tryUseExistingNamespaceImport(existingImports, position) {
     const namespacePrefix = getNamespaceLikeImportText(declaration);
     const moduleSpecifier = namespacePrefix && ((_a = tryGetModuleSpecifierFromDeclaration(declaration)) == null ? void 0 : _a.text);
     if (moduleSpecifier) {
-      return { kind: 0 /* UseNamespace */, namespacePrefix, usagePosition: position, moduleSpecifier };
+      return { kind: 0 /* UseNamespace */, namespacePrefix, usagePosition: position, moduleSpecifierKind: void 0, moduleSpecifier };
     }
   });
 }
@@ -154198,7 +154276,7 @@ function tryAddToExistingImport(existingImports, isValidTypeOnlyUseSite, checker
       return void 0;
     }
     if (declaration.kind === 260 /* VariableDeclaration */) {
-      return (importKind === 0 /* Named */ || importKind === 1 /* Default */) && declaration.name.kind === 206 /* ObjectBindingPattern */ ? { kind: 2 /* AddToExisting */, importClauseOrBindingPattern: declaration.name, importKind, moduleSpecifier: declaration.initializer.arguments[0].text, addAsTypeOnly: 4 /* NotAllowed */ } : void 0;
+      return (importKind === 0 /* Named */ || importKind === 1 /* Default */) && declaration.name.kind === 206 /* ObjectBindingPattern */ ? { kind: 2 /* AddToExisting */, importClauseOrBindingPattern: declaration.name, importKind, moduleSpecifierKind: void 0, moduleSpecifier: declaration.initializer.arguments[0].text, addAsTypeOnly: 4 /* NotAllowed */ } : void 0;
     }
     const { importClause } = declaration;
     if (!importClause || !isStringLiteralLike(declaration.moduleSpecifier)) {
@@ -154228,6 +154306,7 @@ function tryAddToExistingImport(existingImports, isValidTypeOnlyUseSite, checker
       kind: 2 /* AddToExisting */,
       importClauseOrBindingPattern: importClause,
       importKind,
+      moduleSpecifierKind: void 0,
       moduleSpecifier: declaration.moduleSpecifier.text,
       addAsTypeOnly
     };
@@ -154289,7 +154368,7 @@ function getNewImportFixes(program, sourceFile, usagePosition, isValidTypeOnlyUs
   const getChecker = createGetChecker(program, host);
   const moduleResolution = getEmitModuleResolutionKind(compilerOptions);
   const rejectNodeModulesRelativePaths = moduleResolutionUsesNodeModules(moduleResolution);
-  const getModuleSpecifiers2 = fromCacheOnly ? (exportInfo2) => ({ moduleSpecifiers: ts_moduleSpecifiers_exports.tryGetModuleSpecifiersFromCache(exportInfo2.moduleSymbol, sourceFile, moduleSpecifierResolutionHost, preferences), computedWithoutCache: false }) : (exportInfo2, checker) => ts_moduleSpecifiers_exports.getModuleSpecifiersWithCacheInfo(
+  const getModuleSpecifiers2 = fromCacheOnly ? (exportInfo2) => ts_moduleSpecifiers_exports.tryGetModuleSpecifiersFromCache(exportInfo2.moduleSymbol, sourceFile, moduleSpecifierResolutionHost, preferences) : (exportInfo2, checker) => ts_moduleSpecifiers_exports.getModuleSpecifiersWithCacheInfo(
     exportInfo2.moduleSymbol,
     checker,
     compilerOptions,
@@ -154304,7 +154383,7 @@ function getNewImportFixes(program, sourceFile, usagePosition, isValidTypeOnlyUs
   let computedWithoutCacheCount = 0;
   const fixes = flatMap(exportInfo, (exportInfo2, i) => {
     const checker = getChecker(exportInfo2.isFromPackageJson);
-    const { computedWithoutCache, moduleSpecifiers } = getModuleSpecifiers2(exportInfo2, checker);
+    const { computedWithoutCache, moduleSpecifiers, kind: moduleSpecifierKind } = getModuleSpecifiers2(exportInfo2, checker) ?? {};
     const importedSymbolHasValueMeaning = !!(exportInfo2.targetFlags & 111551 /* Value */);
     const addAsTypeOnly = getAddAsTypeOnly(
       isValidTypeOnlyUseSite,
@@ -154321,7 +154400,7 @@ function getNewImportFixes(program, sourceFile, usagePosition, isValidTypeOnlyUs
         return void 0;
       }
       if (!importedSymbolHasValueMeaning && isJs && usagePosition !== void 0) {
-        return { kind: 1 /* JsdocTypeImport */, moduleSpecifier, usagePosition, exportInfo: exportInfo2, isReExport: i > 0 };
+        return { kind: 1 /* JsdocTypeImport */, moduleSpecifierKind, moduleSpecifier, usagePosition, exportInfo: exportInfo2, isReExport: i > 0 };
       }
       const importKind = getImportKind(sourceFile, exportInfo2.exportKind, program);
       let qualification;
@@ -154348,6 +154427,7 @@ function getNewImportFixes(program, sourceFile, usagePosition, isValidTypeOnlyUs
       }
       return {
         kind: 3 /* AddNew */,
+        moduleSpecifierKind,
         moduleSpecifier,
         importKind,
         useRequire,
@@ -154377,7 +154457,7 @@ function newImportInfoFromExistingSpecifier({ declaration, importKind, symbol, t
       checker,
       compilerOptions
     );
-    return { kind: 3 /* AddNew */, moduleSpecifier, importKind, addAsTypeOnly, useRequire };
+    return { kind: 3 /* AddNew */, moduleSpecifierKind: void 0, moduleSpecifier, importKind, addAsTypeOnly, useRequire };
   }
 }
 function getFixInfos(context, errorCode, pos, useAutoImportProvider) {
@@ -154395,18 +154475,18 @@ function getFixInfos(context, errorCode, pos, useAutoImportProvider) {
     info = getFixesInfoForNonUMDImport(context, symbolToken, useAutoImportProvider);
   }
   const packageJsonImportFilter = createPackageJsonImportFilter(context.sourceFile, context.preferences, context.host);
-  return info && sortFixInfo(info, context.sourceFile, context.program, packageJsonImportFilter, context.host);
+  return info && sortFixInfo(info, context.sourceFile, context.program, packageJsonImportFilter, context.host, context.preferences);
 }
-function sortFixInfo(fixes, sourceFile, program, packageJsonImportFilter, host) {
+function sortFixInfo(fixes, sourceFile, program, packageJsonImportFilter, host, preferences) {
   const _toPath = (fileName) => toPath(fileName, host.getCurrentDirectory(), hostGetCanonicalFileName(host));
-  return sort(fixes, (a, b) => compareBooleans(!!a.isJsxNamespaceFix, !!b.isJsxNamespaceFix) || compareValues(a.fix.kind, b.fix.kind) || compareModuleSpecifiers(a.fix, b.fix, sourceFile, program, packageJsonImportFilter.allowsImportingSpecifier, _toPath));
+  return sort(fixes, (a, b) => compareBooleans(!!a.isJsxNamespaceFix, !!b.isJsxNamespaceFix) || compareValues(a.fix.kind, b.fix.kind) || compareModuleSpecifiers(a.fix, b.fix, sourceFile, program, preferences, packageJsonImportFilter.allowsImportingSpecifier, _toPath));
 }
 function getFixInfosWithoutDiagnostic(context, symbolToken, useAutoImportProvider) {
   const info = getFixesInfoForNonUMDImport(context, symbolToken, useAutoImportProvider);
   const packageJsonImportFilter = createPackageJsonImportFilter(context.sourceFile, context.preferences, context.host);
-  return info && sortFixInfo(info, context.sourceFile, context.program, packageJsonImportFilter, context.host);
+  return info && sortFixInfo(info, context.sourceFile, context.program, packageJsonImportFilter, context.host, context.preferences);
 }
-function getBestFix(fixes, sourceFile, program, packageJsonImportFilter, host) {
+function getBestFix(fixes, sourceFile, program, packageJsonImportFilter, host, preferences) {
   if (!some(fixes)) return;
   if (fixes[0].kind === 0 /* UseNamespace */ || fixes[0].kind === 2 /* AddToExisting */) {
     return fixes[0];
@@ -154419,21 +154499,31 @@ function getBestFix(fixes, sourceFile, program, packageJsonImportFilter, host) {
         best,
         sourceFile,
         program,
+        preferences,
         packageJsonImportFilter.allowsImportingSpecifier,
         (fileName) => toPath(fileName, host.getCurrentDirectory(), hostGetCanonicalFileName(host))
       ) === -1 /* LessThan */ ? fix : best
     )
   );
 }
-function compareModuleSpecifiers(a, b, importingFile, program, allowsImportingSpecifier, toPath3) {
+function compareModuleSpecifiers(a, b, importingFile, program, preferences, allowsImportingSpecifier, toPath3) {
   if (a.kind !== 0 /* UseNamespace */ && b.kind !== 0 /* UseNamespace */) {
-    return compareBooleans(allowsImportingSpecifier(b.moduleSpecifier), allowsImportingSpecifier(a.moduleSpecifier)) || compareNodeCoreModuleSpecifiers(a.moduleSpecifier, b.moduleSpecifier, importingFile, program) || compareBooleans(
+    return compareBooleans(
+      b.moduleSpecifierKind !== "node_modules" || allowsImportingSpecifier(b.moduleSpecifier),
+      a.moduleSpecifierKind !== "node_modules" || allowsImportingSpecifier(a.moduleSpecifier)
+    ) || compareModuleSpecifierRelativity(a, b, preferences) || compareNodeCoreModuleSpecifiers(a.moduleSpecifier, b.moduleSpecifier, importingFile, program) || compareBooleans(
       isFixPossiblyReExportingImportingFile(a, importingFile.path, toPath3),
       isFixPossiblyReExportingImportingFile(b, importingFile.path, toPath3)
     ) || compareNumberOfDirectorySeparators(a.moduleSpecifier, b.moduleSpecifier);
   }
   return 0 /* EqualTo */;
 }
+function compareModuleSpecifierRelativity(a, b, preferences) {
+  if (preferences.importModuleSpecifierPreference === "non-relative" || preferences.importModuleSpecifierPreference === "project-relative") {
+    return compareBooleans(a.moduleSpecifierKind === "relative", b.moduleSpecifierKind === "relative");
+  }
+  return 0 /* EqualTo */;
+}
 function isFixPossiblyReExportingImportingFile(fix, importingFilePath, toPath3) {
   var _a;
   if (fix.isReExport && ((_a = fix.exportInfo) == null ? void 0 : _a.moduleFileName) && isIndexFileName(fix.exportInfo.moduleFileName)) {
@@ -177341,13 +177431,6 @@ function pasteEdits(targetFile, pastedText, pasteLocations, copiedFrom, host, pr
   if (pastedText.length !== pasteLocations.length) {
     actualPastedText = pastedText.length === 1 ? pastedText : [pastedText.join("\n")];
   }
-  pasteLocations.forEach((paste, i) => {
-    changes.replaceRangeWithText(
-      targetFile,
-      { pos: paste.pos, end: paste.end },
-      actualPastedText ? actualPastedText[0] : pastedText[i]
-    );
-  });
   const statements = [];
   let newText = targetFile.text;
   for (let i = pasteLocations.length - 1; i >= 0; i--) {
@@ -177395,6 +177478,13 @@ function pasteEdits(targetFile, pastedText, pasteLocations, copiedFrom, host, pr
     }
     importAdder.writeFixes(changes, getQuotePreference(copiedFrom ? copiedFrom.file : targetFile, preferences));
   });
+  pasteLocations.forEach((paste, i) => {
+    changes.replaceRangeWithText(
+      targetFile,
+      { pos: paste.pos, end: paste.end },
+      actualPastedText ? actualPastedText[0] : pastedText[i]
+    );
+  });
 }
 
 // src/server/_namespaces/ts.ts
@@ -177896,6 +177986,7 @@ __export(ts_exports2, {
   emitNewLineBeforeLeadingCommentOfPosition: () => emitNewLineBeforeLeadingCommentOfPosition,
   emitNewLineBeforeLeadingComments: () => emitNewLineBeforeLeadingComments,
   emitNewLineBeforeLeadingCommentsOfPosition: () => emitNewLineBeforeLeadingCommentsOfPosition,
+  emitResolverSkipsTypeChecking: () => emitResolverSkipsTypeChecking,
   emitSkippedWithNoDiagnostics: () => emitSkippedWithNoDiagnostics,
   emptyArray: () => emptyArray,
   emptyFileSystemEntries: () => emptyFileSystemEntries,
@@ -181408,7 +181499,6 @@ var Project3 = class _Project {
     this.compilerOptions = compilerOptions;
     this.compileOnSaveEnabled = compileOnSaveEnabled;
     this.watchOptions = watchOptions;
-    this.rootFiles = [];
     this.rootFilesMap = /* @__PURE__ */ new Map();
     /** @internal */
     this.plugins = [];
@@ -181610,7 +181700,7 @@ var Project3 = class _Project {
     return void 0;
   }
   getScriptFileNames() {
-    if (!this.rootFiles) {
+    if (!this.rootFilesMap.size) {
       return emptyArray;
     }
     let result;
@@ -181632,7 +181722,6 @@ var Project3 = class _Project {
     if (scriptInfo) {
       const existingValue = this.rootFilesMap.get(scriptInfo.path);
       if (existingValue && existingValue.info !== scriptInfo) {
-        this.rootFiles.push(scriptInfo);
         existingValue.info = scriptInfo;
       }
       scriptInfo.attachToProject(this);
@@ -181985,11 +182074,11 @@ var Project3 = class _Project {
     this.closeWatchingTypingLocations();
     this.cleanupProgram();
     forEach(this.externalFiles, (externalFile) => this.detachScriptInfoIfNotRoot(externalFile));
-    for (const root of this.rootFiles) {
-      root.detachFromProject(this);
-    }
+    this.rootFilesMap.forEach((root) => {
+      var _a2;
+      return (_a2 = root.info) == null ? void 0 : _a2.detachFromProject(this);
+    });
     this.projectService.pendingEnsureProjectForOpenFiles = true;
-    this.rootFiles = void 0;
     this.rootFilesMap = void 0;
     this.externalFiles = void 0;
     this.program = void 0;
@@ -182032,28 +182121,32 @@ var Project3 = class _Project {
     }
   }
   isClosed() {
-    return this.rootFiles === void 0;
+    return this.rootFilesMap === void 0;
   }
   hasRoots() {
-    return this.rootFiles && this.rootFiles.length > 0;
+    var _a;
+    return !!((_a = this.rootFilesMap) == null ? void 0 : _a.size);
   }
   /** @internal */
   isOrphan() {
     return false;
   }
   getRootFiles() {
-    return this.rootFiles && this.rootFiles.map((info) => info.fileName);
+    return this.rootFilesMap && arrayFrom(mapDefinedIterator(this.rootFilesMap.values(), (value) => {
+      var _a;
+      return (_a = value.info) == null ? void 0 : _a.fileName;
+    }));
   }
   /** @internal */
   getRootFilesMap() {
     return this.rootFilesMap;
   }
   getRootScriptInfos() {
-    return this.rootFiles;
+    return arrayFrom(mapDefinedIterator(this.rootFilesMap.values(), (value) => value.info));
   }
   getScriptInfos() {
     if (!this.languageServiceEnabled) {
-      return this.rootFiles;
+      return this.getRootScriptInfos();
     }
     return map(this.program.getSourceFiles(), (sourceFile) => {
       const scriptInfo = this.projectService.getScriptInfoForPath(sourceFile.resolvedPath);
@@ -182137,13 +182230,12 @@ var Project3 = class _Project {
     return false;
   }
   isRoot(info) {
-    var _a;
-    return this.rootFilesMap && ((_a = this.rootFilesMap.get(info.path)) == null ? void 0 : _a.info) === info;
+    var _a, _b;
+    return ((_b = (_a = this.rootFilesMap) == null ? void 0 : _a.get(info.path)) == null ? void 0 : _b.info) === info;
   }
   // add a root file to project
   addRoot(info, fileName) {
     Debug.assert(!this.isRoot(info));
-    this.rootFiles.push(info);
     this.rootFilesMap.set(info.path, { fileName: fileName || info.fileName, info });
     info.attachToProject(this);
     this.markAsDirty();
@@ -182409,6 +182501,15 @@ var Project3 = class _Project {
           }
         });
       }
+      this.rootFilesMap.forEach((value, path) => {
+        var _a2;
+        const file = this.program.getSourceFileByPath(path);
+        const info = value.info;
+        if (!file || ((_a2 = value.info) == null ? void 0 : _a2.path) === file.resolvedPath) return;
+        value.info = this.projectService.getScriptInfo(file.fileName);
+        Debug.assert(value.info.isAttached(this));
+        info == null ? void 0 : info.detachFromProject(this);
+      });
       updateMissingFilePathsWatch(
         this.program,
         this.missingFilesMap || (this.missingFilesMap = /* @__PURE__ */ new Map()),
@@ -182801,7 +182902,6 @@ var Project3 = class _Project {
   }
   // remove a root file from project
   removeRoot(info) {
-    orderedRemoveItem(this.rootFiles, info);
     this.rootFilesMap.delete(info.path);
   }
   /** @internal */
@@ -182993,14 +183093,14 @@ var Project3 = class _Project {
   }
   /** @internal */
   runWithTemporaryFileUpdate(rootFile, updatedText, cb) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     const originalProgram = this.program;
-    const originalText = (_b = (_a = this.program) == null ? void 0 : _a.getSourceFile(rootFile)) == null ? void 0 : _b.getText();
-    Debug.assert(this.program && this.program.getSourceFile(rootFile) && originalText);
-    (_c = this.getScriptInfo(rootFile)) == null ? void 0 : _c.editContent(0, this.program.getSourceFile(rootFile).getText().length, updatedText);
+    const rootSourceFile = Debug.checkDefined((_a = this.program) == null ? void 0 : _a.getSourceFile(rootFile), "Expected file to be part of program");
+    const originalText = Debug.checkDefined(rootSourceFile.getText());
+    (_b = this.getScriptInfo(rootFile)) == null ? void 0 : _b.editContent(0, originalText.length, updatedText);
     this.updateGraph();
-    cb(this.program, originalProgram, (_d = this.program) == null ? void 0 : _d.getSourceFile(rootFile));
-    (_e = this.getScriptInfo(rootFile)) == null ? void 0 : _e.editContent(0, this.program.getSourceFile(rootFile).getText().length, originalText);
+    cb(this.program, originalProgram, (_c = this.program) == null ? void 0 : _c.getSourceFile(rootFile));
+    (_d = this.getScriptInfo(rootFile)) == null ? void 0 : _d.editContent(0, this.program.getSourceFile(rootFile).getText().length, originalText);
   }
   /** @internal */
   getCompilerOptionsForNoDtsResolutionProject() {
@@ -185496,6 +185596,7 @@ var _ProjectService = class _ProjectService {
     configFileExistenceInfo.config.watchedDirectoriesStale = void 0;
   }
   updateNonInferredProjectFiles(project, files, propertyReader) {
+    var _a;
     const projectRootFilesMap = project.getRootFilesMap();
     const newRootScriptInfoMap = /* @__PURE__ */ new Map();
     for (const f of files) {
@@ -185507,7 +185608,7 @@ var _ProjectService = class _ProjectService {
         path = normalizedPathToPath(fileName, this.currentDirectory, this.toCanonicalFileName);
         const existingValue = projectRootFilesMap.get(path);
         if (existingValue) {
-          if (existingValue.info) {
+          if (((_a = existingValue.info) == null ? void 0 : _a.path) === path) {
             project.removeFile(
               existingValue.info,
               /*fileExists*/
@@ -187300,8 +187401,9 @@ function createModuleSpecifierCache(host) {
       if (!cache || currentKey !== key(fromFileName, preferences, options)) return void 0;
       return cache.get(toFileName2);
     },
-    set(fromFileName, toFileName2, preferences, options, modulePaths, moduleSpecifiers) {
+    set(fromFileName, toFileName2, preferences, options, kind, modulePaths, moduleSpecifiers) {
       ensureCache(fromFileName, preferences, options).set(toFileName2, createInfo(
+        kind,
         modulePaths,
         moduleSpecifiers,
         /*isBlockedByPackageJsonDependencies*/
@@ -187329,6 +187431,8 @@ function createModuleSpecifierCache(host) {
         info.modulePaths = modulePaths;
       } else {
         cache2.set(toFileName2, createInfo(
+          /*kind*/
+          void 0,
           modulePaths,
           /*moduleSpecifiers*/
           void 0,
@@ -187344,6 +187448,8 @@ function createModuleSpecifierCache(host) {
         info.isBlockedByPackageJsonDependencies = isBlockedByPackageJsonDependencies;
       } else {
         cache2.set(toFileName2, createInfo(
+          /*kind*/
+          void 0,
           /*modulePaths*/
           void 0,
           /*moduleSpecifiers*/
@@ -187377,8 +187483,8 @@ function createModuleSpecifierCache(host) {
   function key(fromFileName, preferences, options) {
     return `${fromFileName},${preferences.importModuleSpecifierEnding},${preferences.importModuleSpecifierPreference},${options.overrideImportMode}`;
   }
-  function createInfo(modulePaths, moduleSpecifiers, isBlockedByPackageJsonDependencies) {
-    return { modulePaths, moduleSpecifiers, isBlockedByPackageJsonDependencies };
+  function createInfo(kind, modulePaths, moduleSpecifiers, isBlockedByPackageJsonDependencies) {
+    return { kind, modulePaths, moduleSpecifiers, isBlockedByPackageJsonDependencies };
   }
 }
 
@@ -192287,6 +192393,7 @@ if (typeof console !== "undefined") {
   emitNewLineBeforeLeadingCommentOfPosition,
   emitNewLineBeforeLeadingComments,
   emitNewLineBeforeLeadingCommentsOfPosition,
+  emitResolverSkipsTypeChecking,
   emitSkippedWithNoDiagnostics,
   emptyArray,
   emptyFileSystemEntries,