typescript 5.5.0-dev.20240519 → 5.5.0-dev.20240521

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = `${versionMajorMinor}.0-dev.20240519`;
+var version = `${versionMajorMinor}.0-dev.20240521`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -120263,7 +120263,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) {
@@ -122608,6 +122608,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]) => {
@@ -122619,6 +122620,7 @@ function getBuildInfo2(state) {
       fileNames,
       fileInfos: fileInfos2,
       root,
+      resolvedRoot: toResolvedRoot(),
       options: convertToProgramBuildInfoCompilerOptions(state.compilerOptions),
       outSignature: state.outSignature,
       latestChangedDtsFile,
@@ -122648,7 +122650,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
@@ -122695,7 +122698,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] : (
@@ -122711,7 +122715,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);
@@ -122719,6 +122723,7 @@ function getBuildInfo2(state) {
     fileNames,
     fileInfos,
     root,
+    resolvedRoot: toResolvedRoot(),
     options: convertToProgramBuildInfoCompilerOptions(state.compilerOptions),
     fileIdsList,
     referencedMap,
@@ -122749,8 +122754,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;
   }
@@ -122767,6 +122772,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();
@@ -122800,7 +122815,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)
@@ -123289,7 +123305,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;
@@ -123299,16 +123316,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 {
@@ -126904,13 +126929,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;
       }
@@ -126926,18 +126953,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) {

package/lib/typescript.d.ts

@@ -2756,7 +2756,6 @@ declare namespace ts {
             private compilerOptions;
             compileOnSaveEnabled: boolean;
             protected watchOptions: WatchOptions | undefined;
-            private rootFiles;
             private rootFilesMap;
             private program;
             private externalFiles;
@@ -2837,7 +2836,7 @@ declare namespace ts {
             private detachScriptInfoIfNotRoot;
             isClosed(): boolean;
             hasRoots(): boolean;
-            getRootFiles(): ts.server.NormalizedPath[];
+            getRootFiles(): NormalizedPath[];
             getRootScriptInfos(): ts.server.ScriptInfo[];
             getScriptInfos(): ScriptInfo[];
             getExcludedFiles(): readonly NormalizedPath[];

package/lib/typescript.js

@@ -2368,7 +2368,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = `${versionMajorMinor}.0-dev.20240519`;
+var version = `${versionMajorMinor}.0-dev.20240521`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -125297,7 +125297,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) {
@@ -127668,6 +127668,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 +127680,7 @@ function getBuildInfo2(state) {
       fileNames,
       fileInfos: fileInfos2,
       root,
+      resolvedRoot: toResolvedRoot(),
       options: convertToProgramBuildInfoCompilerOptions(state.compilerOptions),
       outSignature: state.outSignature,
       latestChangedDtsFile,
@@ -127708,7 +127710,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 +127758,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 +127775,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 +127783,7 @@ function getBuildInfo2(state) {
     fileNames,
     fileInfos,
     root,
+    resolvedRoot: toResolvedRoot(),
     options: convertToProgramBuildInfoCompilerOptions(state.compilerOptions),
     fileIdsList,
     referencedMap,
@@ -127809,8 +127814,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 +127832,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 +127875,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 +128370,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 +128381,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 +132054,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 +132078,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) {
@@ -181408,7 +181438,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 +181639,7 @@ var Project3 = class _Project {
     return void 0;
   }
   getScriptFileNames() {
-    if (!this.rootFiles) {
+    if (!this.rootFilesMap.size) {
       return emptyArray;
     }
     let result;
@@ -181632,7 +181661,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 +182013,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 +182060,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 +182169,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 +182440,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 +182841,6 @@ var Project3 = class _Project {
   }
   // remove a root file from project
   removeRoot(info) {
-    orderedRemoveItem(this.rootFiles, info);
     this.rootFilesMap.delete(info.path);
   }
   /** @internal */
@@ -185496,6 +185535,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 +185547,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*/

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.5.0-dev.20240519",
+    "version": "5.5.0-dev.20240521",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -110,5 +110,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "79a851426c514a12a75b342e8dd2460ee6615f73"
+    "gitHead": "ba78807aa10e062e2fa2cd24f89109b4aff38c59"
 }