typescript 5.1.0-dev.20230418 → 5.1.0-dev.20230420

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230418`;
+var version = `${versionMajorMinor}.0-dev.20230420`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -16601,7 +16601,7 @@ function getScriptKindFromFileName(fileName) {
 var supportedTSExtensions = [[".ts" /* Ts */, ".tsx" /* Tsx */, ".d.ts" /* Dts */], [".cts" /* Cts */, ".d.cts" /* Dcts */], [".mts" /* Mts */, ".d.mts" /* Dmts */]];
 var supportedTSExtensionsFlat = flatten(supportedTSExtensions);
 var supportedTSExtensionsWithJson = [...supportedTSExtensions, [".json" /* Json */]];
-var supportedTSExtensionsForExtractExtension = [".d.ts" /* Dts */, ".d.cts" /* Dcts */, ".d.mts" /* Dmts */, ".cts" /* Cts */, ".mts" /* Mts */, ".ts" /* Ts */, ".tsx" /* Tsx */, ".cts" /* Cts */, ".mts" /* Mts */];
+var supportedTSExtensionsForExtractExtension = [".d.ts" /* Dts */, ".d.cts" /* Dcts */, ".d.mts" /* Dmts */, ".cts" /* Cts */, ".mts" /* Mts */, ".ts" /* Ts */, ".tsx" /* Tsx */];
 var supportedJSExtensions = [[".js" /* Js */, ".jsx" /* Jsx */], [".mjs" /* Mjs */], [".cjs" /* Cjs */]];
 var supportedJSExtensionsFlat = flatten(supportedJSExtensions);
 var allSupportedExtensions = [[".ts" /* Ts */, ".tsx" /* Tsx */, ".d.ts" /* Dts */, ".js" /* Js */, ".jsx" /* Jsx */], [".cts" /* Cts */, ".d.cts" /* Dcts */, ".cjs" /* Cjs */], [".mts" /* Mts */, ".d.mts" /* Dmts */, ".mjs" /* Mjs */]];
@@ -110666,7 +110666,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     }
   }
   function emitEmbeddedStatement(parent, node) {
-    if (isBlock(node) || getEmitFlags(parent) & 1 /* SingleLine */) {
+    if (isBlock(node) || getEmitFlags(parent) & 1 /* SingleLine */ || preserveSourceNewlines && !getLeadingLineTerminatorCount(parent, node, 0 /* None */)) {
       writeSpace();
       emit(node);
     } else {
@@ -113530,7 +113530,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     automaticTypeDirectiveResolutions = createModeAwareCache();
     if (automaticTypeDirectiveNames.length) {
       (_k = tracing) == null ? void 0 : _k.push(tracing.Phase.Program, "processTypeReferences", { count: automaticTypeDirectiveNames.length });
-      const containingDirectory = options.configFilePath ? getDirectoryPath(options.configFilePath) : host.getCurrentDirectory();
+      const containingDirectory = options.configFilePath ? getDirectoryPath(options.configFilePath) : currentDirectory;
       const containingFilename = combinePaths(containingDirectory, inferredTypesContainingFile);
       const resolutions = resolveTypeReferenceDirectiveNamesReusingOldState(automaticTypeDirectiveNames, containingFilename);
       for (let i = 0; i < automaticTypeDirectiveNames.length; i++) {
@@ -115321,8 +115321,9 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       path += (i === 2 ? "/" : "-") + components[i];
       i++;
     }
-    const resolveFrom = combinePaths(currentDirectory, `__lib_node_modules_lookup_${libFileName}__.ts`);
-    const localOverrideModuleResult = resolveModuleName("@typescript/lib-" + path, resolveFrom, { moduleResolution: 2 /* Node10 */ }, host, moduleResolutionCache);
+    const containingDirectory = options.configFilePath ? getDirectoryPath(options.configFilePath) : currentDirectory;
+    const resolveFrom = combinePaths(containingDirectory, `__lib_node_modules_lookup_${libFileName}__.ts`);
+    const localOverrideModuleResult = resolveModuleName("@typescript/lib-" + path, resolveFrom, { moduleResolution: 2 /* Node10 */, traceResolution: options.traceResolution }, host, moduleResolutionCache);
     if (localOverrideModuleResult == null ? void 0 : localOverrideModuleResult.resolvedModule) {
       return localOverrideModuleResult.resolvedModule.resolvedFileName;
     }
@@ -115457,7 +115458,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
         void 0
       );
     } else {
-      const basePath = getNormalizedAbsolutePath(getDirectoryPath(refPath), host.getCurrentDirectory());
+      const basePath = getNormalizedAbsolutePath(getDirectoryPath(refPath), currentDirectory);
       sourceFile = host.getSourceFile(refPath, 100 /* JSON */);
       addFileToFilesByName(
         sourceFile,
@@ -118298,6 +118299,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   let failedLookupChecks;
   let startsWithPathChecks;
   let isInDirectoryChecks;
+  let allResolutionsAreInvalidated = false;
   const getCurrentDirectory = memoize(() => resolutionHost.getCurrentDirectory());
   const cachedDirectoryStructureHost = resolutionHost.getCachedDirectoryStructureHost();
   const resolvedModuleNames = /* @__PURE__ */ new Map();
@@ -118340,7 +118342,8 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     isFileWithInvalidatedNonRelativeUnresolvedImports,
     updateTypeRootsWatch,
     closeTypeRootsWatch,
-    clear: clear2
+    clear: clear2,
+    onChangesAffectModuleResolution
   };
   function getResolvedModule2(resolution) {
     return resolution.resolvedModule;
@@ -118363,6 +118366,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     isInDirectoryChecks = void 0;
     affectingPathChecks = void 0;
     affectingPathChecksForFile = void 0;
+    allResolutionsAreInvalidated = false;
     moduleResolutionCache.clear();
     typeReferenceDirectiveResolutionCache.clear();
     moduleResolutionCache.update(resolutionHost.getCompilationSettings());
@@ -118370,6 +118374,13 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     impliedFormatPackageJsons.clear();
     hasChangedAutomaticTypeDirectiveNames = false;
   }
+  function onChangesAffectModuleResolution() {
+    allResolutionsAreInvalidated = true;
+    moduleResolutionCache.clearAllExceptPackageJsonInfoCache();
+    typeReferenceDirectiveResolutionCache.clearAllExceptPackageJsonInfoCache();
+    moduleResolutionCache.update(resolutionHost.getCompilationSettings());
+    typeReferenceDirectiveResolutionCache.update(resolutionHost.getCompilationSettings());
+  }
   function startRecordingFilesWithChangedResolutions() {
     filesWithChangedSetOfUnresolvedImports = [];
   }
@@ -118389,7 +118400,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     invalidateResolutionsOfFailedLookupLocations();
     const collected = filesWithInvalidatedResolutions;
     filesWithInvalidatedResolutions = void 0;
-    return (path) => customHasInvalidatedResolutions(path) || !!(collected == null ? void 0 : collected.has(path)) || isFileWithInvalidatedNonRelativeUnresolvedImports(path);
+    return (path) => customHasInvalidatedResolutions(path) || allResolutionsAreInvalidated || !!(collected == null ? void 0 : collected.has(path)) || isFileWithInvalidatedNonRelativeUnresolvedImports(path);
   }
   function startCachingPerDirectoryResolution() {
     moduleResolutionCache.clearAllExceptPackageJsonInfoCache();
@@ -118399,6 +118410,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   }
   function finishCachingPerDirectoryResolution(newProgram, oldProgram) {
     filesWithInvalidatedNonRelativeUnresolvedImports = void 0;
+    allResolutionsAreInvalidated = false;
     nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfNonRelativeModuleResolutions);
     nonRelativeExternalModuleResolutions.clear();
     if (newProgram !== oldProgram) {
@@ -118510,8 +118522,8 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       const name = loader.nameAndMode.getName(entry);
       const mode = loader.nameAndMode.getMode(entry, containingSourceFile);
       let resolution = resolutionsInFile.get(name, mode);
-      if (!seenNamesInFile.has(name, mode) && unmatchedRedirects || !resolution || resolution.isInvalidated || // If the name is unresolved import that was invalidated, recalculate
-      hasInvalidatedNonRelativeUnresolvedImport && !isExternalModuleNameRelative(name) && shouldRetryResolution(resolution)) {
+      if (!seenNamesInFile.has(name, mode) && (allResolutionsAreInvalidated || unmatchedRedirects || !resolution || resolution.isInvalidated || // If the name is unresolved import that was invalidated, recalculate
+      hasInvalidatedNonRelativeUnresolvedImport && !isExternalModuleNameRelative(name) && shouldRetryResolution(resolution))) {
         const existingResolution = resolution;
         resolution = loader.resolve(name, mode);
         if (resolutionHost.onDiscoveredSymlink && resolutionIsSymlink(resolution)) {
@@ -118933,8 +118945,23 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     }
     resolutionHost.scheduleInvalidateResolutionsOfFailedLookupLocations();
   }
+  function invalidatePackageJsonMap() {
+    const packageJsonMap = moduleResolutionCache.getPackageJsonInfoCache().getInternalMap();
+    if (packageJsonMap && (failedLookupChecks || startsWithPathChecks || isInDirectoryChecks)) {
+      packageJsonMap.forEach((_value, path) => isInvalidatedFailedLookup(path) ? packageJsonMap.delete(path) : void 0);
+    }
+  }
   function invalidateResolutionsOfFailedLookupLocations() {
     var _a;
+    if (allResolutionsAreInvalidated) {
+      affectingPathChecksForFile = void 0;
+      invalidatePackageJsonMap();
+      failedLookupChecks = void 0;
+      startsWithPathChecks = void 0;
+      isInDirectoryChecks = void 0;
+      affectingPathChecks = void 0;
+      return true;
+    }
     let invalidated = false;
     if (affectingPathChecksForFile) {
       (_a = resolutionHost.getCurrentProgram()) == null ? void 0 : _a.getSourceFiles().forEach((f) => {
@@ -118949,10 +118976,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       return invalidated;
     }
     invalidated = invalidateResolutions(resolutionsWithFailedLookups, canInvalidateFailedLookupResolution) || invalidated;
-    const packageJsonMap = moduleResolutionCache.getPackageJsonInfoCache().getInternalMap();
-    if (packageJsonMap && (failedLookupChecks || startsWithPathChecks || isInDirectoryChecks)) {
-      packageJsonMap.forEach((_value, path) => isInvalidatedFailedLookup(path) ? packageJsonMap.delete(path) : void 0);
-    }
+    invalidatePackageJsonMap();
     failedLookupChecks = void 0;
     startsWithPathChecks = void 0;
     isInDirectoryChecks = void 0;
@@ -119871,7 +119895,8 @@ function createWatchProgram(host) {
     if (hasChangedCompilerOptions) {
       newLine = updateNewLine();
       if (program && changesAffectModuleResolution(program.getCompilerOptions(), compilerOptions)) {
-        resolutionCache.clear();
+        debugger;
+        resolutionCache.onChangesAffectModuleResolution();
       }
     }
     const hasInvalidatedResolutions = resolutionCache.createHasInvalidatedResolutions(customHasInvalidatedResolutions);

package/lib/tsserver.js

@@ -2301,7 +2301,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230418`;
+var version = `${versionMajorMinor}.0-dev.20230420`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -20751,7 +20751,7 @@ function getScriptKindFromFileName(fileName) {
 var supportedTSExtensions = [[".ts" /* Ts */, ".tsx" /* Tsx */, ".d.ts" /* Dts */], [".cts" /* Cts */, ".d.cts" /* Dcts */], [".mts" /* Mts */, ".d.mts" /* Dmts */]];
 var supportedTSExtensionsFlat = flatten(supportedTSExtensions);
 var supportedTSExtensionsWithJson = [...supportedTSExtensions, [".json" /* Json */]];
-var supportedTSExtensionsForExtractExtension = [".d.ts" /* Dts */, ".d.cts" /* Dcts */, ".d.mts" /* Dmts */, ".cts" /* Cts */, ".mts" /* Mts */, ".ts" /* Ts */, ".tsx" /* Tsx */, ".cts" /* Cts */, ".mts" /* Mts */];
+var supportedTSExtensionsForExtractExtension = [".d.ts" /* Dts */, ".d.cts" /* Dcts */, ".d.mts" /* Dmts */, ".cts" /* Cts */, ".mts" /* Mts */, ".ts" /* Ts */, ".tsx" /* Tsx */];
 var supportedJSExtensions = [[".js" /* Js */, ".jsx" /* Jsx */], [".mjs" /* Mjs */], [".cjs" /* Cjs */]];
 var supportedJSExtensionsFlat = flatten(supportedJSExtensions);
 var allSupportedExtensions = [[".ts" /* Ts */, ".tsx" /* Tsx */, ".d.ts" /* Dts */, ".js" /* Js */, ".jsx" /* Jsx */], [".cts" /* Cts */, ".d.cts" /* Dcts */, ".cjs" /* Cjs */], [".mts" /* Mts */, ".d.mts" /* Dmts */, ".mjs" /* Mjs */]];
@@ -115502,7 +115502,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     }
   }
   function emitEmbeddedStatement(parent2, node) {
-    if (isBlock(node) || getEmitFlags(parent2) & 1 /* SingleLine */) {
+    if (isBlock(node) || getEmitFlags(parent2) & 1 /* SingleLine */ || preserveSourceNewlines && !getLeadingLineTerminatorCount(parent2, node, 0 /* None */)) {
       writeSpace();
       emit(node);
     } else {
@@ -118420,7 +118420,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     automaticTypeDirectiveResolutions = createModeAwareCache();
     if (automaticTypeDirectiveNames.length) {
       (_k = tracing) == null ? void 0 : _k.push(tracing.Phase.Program, "processTypeReferences", { count: automaticTypeDirectiveNames.length });
-      const containingDirectory = options.configFilePath ? getDirectoryPath(options.configFilePath) : host.getCurrentDirectory();
+      const containingDirectory = options.configFilePath ? getDirectoryPath(options.configFilePath) : currentDirectory;
       const containingFilename = combinePaths(containingDirectory, inferredTypesContainingFile);
       const resolutions = resolveTypeReferenceDirectiveNamesReusingOldState(automaticTypeDirectiveNames, containingFilename);
       for (let i = 0; i < automaticTypeDirectiveNames.length; i++) {
@@ -120211,8 +120211,9 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       path += (i === 2 ? "/" : "-") + components[i];
       i++;
     }
-    const resolveFrom = combinePaths(currentDirectory, `__lib_node_modules_lookup_${libFileName}__.ts`);
-    const localOverrideModuleResult = resolveModuleName("@typescript/lib-" + path, resolveFrom, { moduleResolution: 2 /* Node10 */ }, host, moduleResolutionCache);
+    const containingDirectory = options.configFilePath ? getDirectoryPath(options.configFilePath) : currentDirectory;
+    const resolveFrom = combinePaths(containingDirectory, `__lib_node_modules_lookup_${libFileName}__.ts`);
+    const localOverrideModuleResult = resolveModuleName("@typescript/lib-" + path, resolveFrom, { moduleResolution: 2 /* Node10 */, traceResolution: options.traceResolution }, host, moduleResolutionCache);
     if (localOverrideModuleResult == null ? void 0 : localOverrideModuleResult.resolvedModule) {
       return localOverrideModuleResult.resolvedModule.resolvedFileName;
     }
@@ -120347,7 +120348,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
         void 0
       );
     } else {
-      const basePath = getNormalizedAbsolutePath(getDirectoryPath(refPath), host.getCurrentDirectory());
+      const basePath = getNormalizedAbsolutePath(getDirectoryPath(refPath), currentDirectory);
       sourceFile = host.getSourceFile(refPath, 100 /* JSON */);
       addFileToFilesByName(
         sourceFile,
@@ -123223,6 +123224,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   let failedLookupChecks;
   let startsWithPathChecks;
   let isInDirectoryChecks;
+  let allResolutionsAreInvalidated = false;
   const getCurrentDirectory = memoize(() => resolutionHost.getCurrentDirectory());
   const cachedDirectoryStructureHost = resolutionHost.getCachedDirectoryStructureHost();
   const resolvedModuleNames = /* @__PURE__ */ new Map();
@@ -123265,7 +123267,8 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     isFileWithInvalidatedNonRelativeUnresolvedImports,
     updateTypeRootsWatch,
     closeTypeRootsWatch,
-    clear: clear2
+    clear: clear2,
+    onChangesAffectModuleResolution
   };
   function getResolvedModule2(resolution) {
     return resolution.resolvedModule;
@@ -123288,6 +123291,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     isInDirectoryChecks = void 0;
     affectingPathChecks = void 0;
     affectingPathChecksForFile = void 0;
+    allResolutionsAreInvalidated = false;
     moduleResolutionCache.clear();
     typeReferenceDirectiveResolutionCache.clear();
     moduleResolutionCache.update(resolutionHost.getCompilationSettings());
@@ -123295,6 +123299,13 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     impliedFormatPackageJsons.clear();
     hasChangedAutomaticTypeDirectiveNames = false;
   }
+  function onChangesAffectModuleResolution() {
+    allResolutionsAreInvalidated = true;
+    moduleResolutionCache.clearAllExceptPackageJsonInfoCache();
+    typeReferenceDirectiveResolutionCache.clearAllExceptPackageJsonInfoCache();
+    moduleResolutionCache.update(resolutionHost.getCompilationSettings());
+    typeReferenceDirectiveResolutionCache.update(resolutionHost.getCompilationSettings());
+  }
   function startRecordingFilesWithChangedResolutions() {
     filesWithChangedSetOfUnresolvedImports = [];
   }
@@ -123314,7 +123325,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     invalidateResolutionsOfFailedLookupLocations();
     const collected = filesWithInvalidatedResolutions;
     filesWithInvalidatedResolutions = void 0;
-    return (path) => customHasInvalidatedResolutions(path) || !!(collected == null ? void 0 : collected.has(path)) || isFileWithInvalidatedNonRelativeUnresolvedImports(path);
+    return (path) => customHasInvalidatedResolutions(path) || allResolutionsAreInvalidated || !!(collected == null ? void 0 : collected.has(path)) || isFileWithInvalidatedNonRelativeUnresolvedImports(path);
   }
   function startCachingPerDirectoryResolution() {
     moduleResolutionCache.clearAllExceptPackageJsonInfoCache();
@@ -123324,6 +123335,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   }
   function finishCachingPerDirectoryResolution(newProgram, oldProgram) {
     filesWithInvalidatedNonRelativeUnresolvedImports = void 0;
+    allResolutionsAreInvalidated = false;
     nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfNonRelativeModuleResolutions);
     nonRelativeExternalModuleResolutions.clear();
     if (newProgram !== oldProgram) {
@@ -123435,8 +123447,8 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       const name = loader.nameAndMode.getName(entry);
       const mode = loader.nameAndMode.getMode(entry, containingSourceFile);
       let resolution = resolutionsInFile.get(name, mode);
-      if (!seenNamesInFile.has(name, mode) && unmatchedRedirects || !resolution || resolution.isInvalidated || // If the name is unresolved import that was invalidated, recalculate
-      hasInvalidatedNonRelativeUnresolvedImport && !isExternalModuleNameRelative(name) && shouldRetryResolution(resolution)) {
+      if (!seenNamesInFile.has(name, mode) && (allResolutionsAreInvalidated || unmatchedRedirects || !resolution || resolution.isInvalidated || // If the name is unresolved import that was invalidated, recalculate
+      hasInvalidatedNonRelativeUnresolvedImport && !isExternalModuleNameRelative(name) && shouldRetryResolution(resolution))) {
         const existingResolution = resolution;
         resolution = loader.resolve(name, mode);
         if (resolutionHost.onDiscoveredSymlink && resolutionIsSymlink(resolution)) {
@@ -123858,8 +123870,23 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     }
     resolutionHost.scheduleInvalidateResolutionsOfFailedLookupLocations();
   }
+  function invalidatePackageJsonMap() {
+    const packageJsonMap = moduleResolutionCache.getPackageJsonInfoCache().getInternalMap();
+    if (packageJsonMap && (failedLookupChecks || startsWithPathChecks || isInDirectoryChecks)) {
+      packageJsonMap.forEach((_value, path) => isInvalidatedFailedLookup(path) ? packageJsonMap.delete(path) : void 0);
+    }
+  }
   function invalidateResolutionsOfFailedLookupLocations() {
     var _a;
+    if (allResolutionsAreInvalidated) {
+      affectingPathChecksForFile = void 0;
+      invalidatePackageJsonMap();
+      failedLookupChecks = void 0;
+      startsWithPathChecks = void 0;
+      isInDirectoryChecks = void 0;
+      affectingPathChecks = void 0;
+      return true;
+    }
     let invalidated = false;
     if (affectingPathChecksForFile) {
       (_a = resolutionHost.getCurrentProgram()) == null ? void 0 : _a.getSourceFiles().forEach((f) => {
@@ -123874,10 +123901,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       return invalidated;
     }
     invalidated = invalidateResolutions(resolutionsWithFailedLookups, canInvalidateFailedLookupResolution) || invalidated;
-    const packageJsonMap = moduleResolutionCache.getPackageJsonInfoCache().getInternalMap();
-    if (packageJsonMap && (failedLookupChecks || startsWithPathChecks || isInDirectoryChecks)) {
-      packageJsonMap.forEach((_value, path) => isInvalidatedFailedLookup(path) ? packageJsonMap.delete(path) : void 0);
-    }
+    invalidatePackageJsonMap();
     failedLookupChecks = void 0;
     startsWithPathChecks = void 0;
     isInDirectoryChecks = void 0;
@@ -124821,7 +124845,8 @@ function createWatchProgram(host) {
     if (hasChangedCompilerOptions) {
       newLine = updateNewLine();
       if (program && changesAffectModuleResolution(program.getCompilerOptions(), compilerOptions)) {
-        resolutionCache.clear();
+        debugger;
+        resolutionCache.onChangesAffectModuleResolution();
       }
     }
     const hasInvalidatedResolutions = resolutionCache.createHasInvalidatedResolutions(customHasInvalidatedResolutions);
@@ -137056,10 +137081,10 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
   function getSmartSelectionRange2(fileName, position) {
     return ts_SmartSelectionRange_exports.getSmartSelectionRange(position, syntaxTreeCache.getCurrentSourceFile(fileName));
   }
-  function getApplicableRefactors2(fileName, positionOrRange, preferences = emptyOptions, triggerReason, kind) {
+  function getApplicableRefactors2(fileName, positionOrRange, preferences = emptyOptions, triggerReason, kind, includeInteractiveActions) {
     synchronizeHostData();
     const file = getValidSourceFile(fileName);
-    return ts_refactor_exports.getApplicableRefactors(getRefactorContext(file, positionOrRange, preferences, emptyOptions, triggerReason, kind));
+    return ts_refactor_exports.getApplicableRefactors(getRefactorContext(file, positionOrRange, preferences, emptyOptions, triggerReason, kind), includeInteractiveActions);
   }
   function getEditsForRefactor2(fileName, formatOptions, positionOrRange, refactorName13, actionName2, preferences = emptyOptions) {
     synchronizeHostData();
@@ -152143,7 +152168,7 @@ function getCompletionData(program, log, sourceFile, compilerOptions, position,
         return true;
       }
     }
-    return isDeclarationName(contextToken2) && !isShorthandPropertyAssignment(contextToken2.parent) && !isJsxAttribute(contextToken2.parent) && !((isClassLike(contextToken2.parent) || isInterfaceDeclaration(contextToken2.parent)) && (contextToken2 !== previousToken || position > previousToken.end));
+    return isDeclarationName(contextToken2) && !isShorthandPropertyAssignment(contextToken2.parent) && !isJsxAttribute(contextToken2.parent) && !((isClassLike(contextToken2.parent) || isInterfaceDeclaration(contextToken2.parent) || isTypeParameterDeclaration(contextToken2.parent)) && (contextToken2 !== previousToken || position > previousToken.end));
   }
   function isPreviousPropertyDeclarationTerminated(contextToken2, position2) {
     return contextToken2.kind !== 64 /* EqualsToken */ && (contextToken2.kind === 27 /* SemicolonToken */ || !positionsAreOnSameLine(contextToken2.end, position2, sourceFile));
@@ -158334,10 +158359,10 @@ var refactors = /* @__PURE__ */ new Map();
 function registerRefactor(name, refactor) {
   refactors.set(name, refactor);
 }
-function getApplicableRefactors(context) {
+function getApplicableRefactors(context, includeInteractiveActions) {
   return arrayFrom(flatMapIterator(refactors.values(), (refactor) => {
     var _a;
-    return context.cancellationToken && context.cancellationToken.isCancellationRequested() || !((_a = refactor.kinds) == null ? void 0 : _a.some((kind) => refactorKindBeginsWith(kind, context.kind))) ? void 0 : refactor.getAvailableActions(context);
+    return context.cancellationToken && context.cancellationToken.isCancellationRequested() || !((_a = refactor.kinds) == null ? void 0 : _a.some((kind) => refactorKindBeginsWith(kind, context.kind))) ? void 0 : refactor.getAvailableActions(context, includeInteractiveActions);
   }));
 }
 function getEditsForRefactor(context, refactorName13, actionName2) {
@@ -173946,7 +173971,7 @@ var Project3 = class {
       if (changesAffectModuleResolution(oldOptions, compilerOptions)) {
         this.cachedUnresolvedImportsPerFile.clear();
         this.lastCachedUnresolvedImportsList = void 0;
-        this.resolutionCache.clear();
+        this.resolutionCache.onChangesAffectModuleResolution();
         this.moduleSpecifierCache.clear();
       }
       this.markAsDirty();
@@ -174416,13 +174441,18 @@ var InferredProject2 = class extends Project3 {
         /*isJsInferredProject*/
         true
       );
+    } else if (this.isOrphan() && this._isJsInferredProject && !info.isJavaScript()) {
+      this.toggleJsInferredProject(
+        /*isJsInferredProject*/
+        false
+      );
     }
     super.addRoot(info);
   }
   removeRoot(info) {
     this.projectService.stopWatchingConfigFilesForInferredProjectRoot(info);
     super.removeRoot(info);
-    if (this._isJsInferredProject && info.isJavaScript()) {
+    if (!this.isOrphan() && this._isJsInferredProject && info.isJavaScript()) {
       if (every(this.getRootScriptInfos(), (rootInfo) => !rootInfo.isJavaScript())) {
         this.toggleJsInferredProject(
           /*isJsInferredProject*/
@@ -179524,7 +179554,7 @@ var Session3 = class {
     }));
     this.host = opts.host;
     this.cancellationToken = opts.cancellationToken;
-    this.typingsInstaller = opts.typingsInstaller;
+    this.typingsInstaller = opts.typingsInstaller || nullTypingsInstaller;
     this.byteLength = opts.byteLength;
     this.hrtime = opts.hrtime;
     this.logger = opts.logger;

package/lib/tsserverlibrary.d.ts

@@ -501,6 +501,14 @@ declare namespace ts {
             type GetApplicableRefactorsRequestArgs = FileLocationOrRangeRequestArgs & {
                 triggerReason?: RefactorTriggerReason;
                 kind?: string;
+                /**
+                 * Include refactor actions that require additional arguments to be passed when
+                 * calling 'GetEditsForRefactor'. When true, clients should inspect the
+                 * `isInteractive` property of each returned `RefactorActionInfo`
+                 * and ensure they are able to collect the appropriate arguments for any
+                 * interactive refactor before offering it.
+                 */
+                includeInteractiveActions?: boolean;
             };
             type RefactorTriggerReason = "implicit" | "invoked";
             /**
@@ -557,6 +565,11 @@ declare namespace ts {
                  * The hierarchical dotted name of the refactor action.
                  */
                 kind?: string;
+                /**
+                 * Indicates that the action requires additional arguments to be passed
+                 * when calling 'GetEditsForRefactor'.
+                 */
+                isInteractive?: boolean;
             }
             interface GetEditsForRefactorRequest extends Request {
                 command: CommandTypes.GetEditsForRefactor;
@@ -3554,7 +3567,7 @@ declare namespace ts {
             cancellationToken: HostCancellationToken;
             useSingleInferredProject: boolean;
             useInferredProjectPerProjectRoot: boolean;
-            typingsInstaller: ITypingsInstaller;
+            typingsInstaller?: ITypingsInstaller;
             eventHandler?: ProjectServiceEventHandler;
             suppressDiagnosticEvents?: boolean;
             throttleWaitMilliseconds?: number;
@@ -3826,7 +3839,7 @@ declare namespace ts {
             cancellationToken: ServerCancellationToken;
             useSingleInferredProject: boolean;
             useInferredProjectPerProjectRoot: boolean;
-            typingsInstaller: ITypingsInstaller;
+            typingsInstaller?: ITypingsInstaller;
             byteLength: (buf: string, encoding?: BufferEncoding) => number;
             hrtime: (start?: [
                 number,
@@ -10129,7 +10142,13 @@ declare namespace ts {
         applyCodeActionCommand(fileName: string, action: CodeActionCommand[]): Promise<ApplyCodeActionCommandResult[]>;
         /** @deprecated `fileName` will be ignored */
         applyCodeActionCommand(fileName: string, action: CodeActionCommand | CodeActionCommand[]): Promise<ApplyCodeActionCommandResult | ApplyCodeActionCommandResult[]>;
-        getApplicableRefactors(fileName: string, positionOrRange: number | TextRange, preferences: UserPreferences | undefined, triggerReason?: RefactorTriggerReason, kind?: string): ApplicableRefactorInfo[];
+        /**
+         * @param includeInteractiveActions Include refactor actions that require additional arguments to be
+         * passed when calling `getEditsForRefactor`. When true, clients should inspect the `isInteractive`
+         * property of each returned `RefactorActionInfo` and ensure they are able to collect the appropriate
+         * arguments for any interactive action before offering it.
+         */
+        getApplicableRefactors(fileName: string, positionOrRange: number | TextRange, preferences: UserPreferences | undefined, triggerReason?: RefactorTriggerReason, kind?: string, includeInteractiveActions?: boolean): ApplicableRefactorInfo[];
         getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string, preferences: UserPreferences | undefined): RefactorEditInfo | undefined;
         organizeImports(args: OrganizeImportsArgs, formatOptions: FormatCodeSettings, preferences: UserPreferences | undefined): readonly FileTextChanges[];
         getEditsForFileRename(oldFilePath: string, newFilePath: string, formatOptions: FormatCodeSettings, preferences: UserPreferences | undefined): readonly FileTextChanges[];
@@ -10401,6 +10420,11 @@ declare namespace ts {
          * The hierarchical dotted name of the refactor action.
          */
         kind?: string;
+        /**
+         * Indicates that the action requires additional arguments to be passed
+         * when calling `getEditsForRefactor`.
+         */
+        isInteractive?: boolean;
     }
     /**
      * A set of edits to make in response to a refactor action, plus an optional

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-dev.20230418`;
+      version = `${versionMajorMinor}.0-dev.20230420`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -19288,7 +19288,7 @@ ${lanes.join("\n")}
       supportedTSExtensions = [[".ts" /* Ts */, ".tsx" /* Tsx */, ".d.ts" /* Dts */], [".cts" /* Cts */, ".d.cts" /* Dcts */], [".mts" /* Mts */, ".d.mts" /* Dmts */]];
       supportedTSExtensionsFlat = flatten(supportedTSExtensions);
       supportedTSExtensionsWithJson = [...supportedTSExtensions, [".json" /* Json */]];
-      supportedTSExtensionsForExtractExtension = [".d.ts" /* Dts */, ".d.cts" /* Dcts */, ".d.mts" /* Dmts */, ".cts" /* Cts */, ".mts" /* Mts */, ".ts" /* Ts */, ".tsx" /* Tsx */, ".cts" /* Cts */, ".mts" /* Mts */];
+      supportedTSExtensionsForExtractExtension = [".d.ts" /* Dts */, ".d.cts" /* Dcts */, ".d.mts" /* Dmts */, ".cts" /* Cts */, ".mts" /* Mts */, ".ts" /* Ts */, ".tsx" /* Tsx */];
       supportedJSExtensions = [[".js" /* Js */, ".jsx" /* Jsx */], [".mjs" /* Mjs */], [".cjs" /* Cjs */]];
       supportedJSExtensionsFlat = flatten(supportedJSExtensions);
       allSupportedExtensions = [[".ts" /* Ts */, ".tsx" /* Tsx */, ".d.ts" /* Dts */, ".js" /* Js */, ".jsx" /* Jsx */], [".cts" /* Cts */, ".d.cts" /* Dcts */, ".cjs" /* Cjs */], [".mts" /* Mts */, ".d.mts" /* Dmts */, ".mjs" /* Mjs */]];
@@ -113561,7 +113561,7 @@ ${lanes.join("\n")}
       }
     }
     function emitEmbeddedStatement(parent2, node) {
-      if (isBlock(node) || getEmitFlags(parent2) & 1 /* SingleLine */) {
+      if (isBlock(node) || getEmitFlags(parent2) & 1 /* SingleLine */ || preserveSourceNewlines && !getLeadingLineTerminatorCount(parent2, node, 0 /* None */)) {
         writeSpace();
         emit(node);
       } else {
@@ -116422,7 +116422,7 @@ ${lanes.join("\n")}
       automaticTypeDirectiveResolutions = createModeAwareCache();
       if (automaticTypeDirectiveNames.length) {
         (_k = tracing) == null ? void 0 : _k.push(tracing.Phase.Program, "processTypeReferences", { count: automaticTypeDirectiveNames.length });
-        const containingDirectory = options.configFilePath ? getDirectoryPath(options.configFilePath) : host.getCurrentDirectory();
+        const containingDirectory = options.configFilePath ? getDirectoryPath(options.configFilePath) : currentDirectory;
         const containingFilename = combinePaths(containingDirectory, inferredTypesContainingFile);
         const resolutions = resolveTypeReferenceDirectiveNamesReusingOldState(automaticTypeDirectiveNames, containingFilename);
         for (let i = 0; i < automaticTypeDirectiveNames.length; i++) {
@@ -118213,8 +118213,9 @@ ${lanes.join("\n")}
         path += (i === 2 ? "/" : "-") + components[i];
         i++;
       }
-      const resolveFrom = combinePaths(currentDirectory, `__lib_node_modules_lookup_${libFileName}__.ts`);
-      const localOverrideModuleResult = resolveModuleName("@typescript/lib-" + path, resolveFrom, { moduleResolution: 2 /* Node10 */ }, host, moduleResolutionCache);
+      const containingDirectory = options.configFilePath ? getDirectoryPath(options.configFilePath) : currentDirectory;
+      const resolveFrom = combinePaths(containingDirectory, `__lib_node_modules_lookup_${libFileName}__.ts`);
+      const localOverrideModuleResult = resolveModuleName("@typescript/lib-" + path, resolveFrom, { moduleResolution: 2 /* Node10 */, traceResolution: options.traceResolution }, host, moduleResolutionCache);
       if (localOverrideModuleResult == null ? void 0 : localOverrideModuleResult.resolvedModule) {
         return localOverrideModuleResult.resolvedModule.resolvedFileName;
       }
@@ -118349,7 +118350,7 @@ ${lanes.join("\n")}
           void 0
         );
       } else {
-        const basePath = getNormalizedAbsolutePath(getDirectoryPath(refPath), host.getCurrentDirectory());
+        const basePath = getNormalizedAbsolutePath(getDirectoryPath(refPath), currentDirectory);
         sourceFile = host.getSourceFile(refPath, 100 /* JSON */);
         addFileToFilesByName(
           sourceFile,
@@ -121380,6 +121381,7 @@ ${lanes.join("\n")}
     let failedLookupChecks;
     let startsWithPathChecks;
     let isInDirectoryChecks;
+    let allResolutionsAreInvalidated = false;
     const getCurrentDirectory = memoize(() => resolutionHost.getCurrentDirectory());
     const cachedDirectoryStructureHost = resolutionHost.getCachedDirectoryStructureHost();
     const resolvedModuleNames = /* @__PURE__ */ new Map();
@@ -121422,7 +121424,8 @@ ${lanes.join("\n")}
       isFileWithInvalidatedNonRelativeUnresolvedImports,
       updateTypeRootsWatch,
       closeTypeRootsWatch,
-      clear: clear2
+      clear: clear2,
+      onChangesAffectModuleResolution
     };
     function getResolvedModule2(resolution) {
       return resolution.resolvedModule;
@@ -121445,6 +121448,7 @@ ${lanes.join("\n")}
       isInDirectoryChecks = void 0;
       affectingPathChecks = void 0;
       affectingPathChecksForFile = void 0;
+      allResolutionsAreInvalidated = false;
       moduleResolutionCache.clear();
       typeReferenceDirectiveResolutionCache.clear();
       moduleResolutionCache.update(resolutionHost.getCompilationSettings());
@@ -121452,6 +121456,13 @@ ${lanes.join("\n")}
       impliedFormatPackageJsons.clear();
       hasChangedAutomaticTypeDirectiveNames = false;
     }
+    function onChangesAffectModuleResolution() {
+      allResolutionsAreInvalidated = true;
+      moduleResolutionCache.clearAllExceptPackageJsonInfoCache();
+      typeReferenceDirectiveResolutionCache.clearAllExceptPackageJsonInfoCache();
+      moduleResolutionCache.update(resolutionHost.getCompilationSettings());
+      typeReferenceDirectiveResolutionCache.update(resolutionHost.getCompilationSettings());
+    }
     function startRecordingFilesWithChangedResolutions() {
       filesWithChangedSetOfUnresolvedImports = [];
     }
@@ -121471,7 +121482,7 @@ ${lanes.join("\n")}
       invalidateResolutionsOfFailedLookupLocations();
       const collected = filesWithInvalidatedResolutions;
       filesWithInvalidatedResolutions = void 0;
-      return (path) => customHasInvalidatedResolutions(path) || !!(collected == null ? void 0 : collected.has(path)) || isFileWithInvalidatedNonRelativeUnresolvedImports(path);
+      return (path) => customHasInvalidatedResolutions(path) || allResolutionsAreInvalidated || !!(collected == null ? void 0 : collected.has(path)) || isFileWithInvalidatedNonRelativeUnresolvedImports(path);
     }
     function startCachingPerDirectoryResolution() {
       moduleResolutionCache.clearAllExceptPackageJsonInfoCache();
@@ -121481,6 +121492,7 @@ ${lanes.join("\n")}
     }
     function finishCachingPerDirectoryResolution(newProgram, oldProgram) {
       filesWithInvalidatedNonRelativeUnresolvedImports = void 0;
+      allResolutionsAreInvalidated = false;
       nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfNonRelativeModuleResolutions);
       nonRelativeExternalModuleResolutions.clear();
       if (newProgram !== oldProgram) {
@@ -121592,8 +121604,8 @@ ${lanes.join("\n")}
         const name = loader.nameAndMode.getName(entry);
         const mode = loader.nameAndMode.getMode(entry, containingSourceFile);
         let resolution = resolutionsInFile.get(name, mode);
-        if (!seenNamesInFile.has(name, mode) && unmatchedRedirects || !resolution || resolution.isInvalidated || // If the name is unresolved import that was invalidated, recalculate
-        hasInvalidatedNonRelativeUnresolvedImport && !isExternalModuleNameRelative(name) && shouldRetryResolution(resolution)) {
+        if (!seenNamesInFile.has(name, mode) && (allResolutionsAreInvalidated || unmatchedRedirects || !resolution || resolution.isInvalidated || // If the name is unresolved import that was invalidated, recalculate
+        hasInvalidatedNonRelativeUnresolvedImport && !isExternalModuleNameRelative(name) && shouldRetryResolution(resolution))) {
           const existingResolution = resolution;
           resolution = loader.resolve(name, mode);
           if (resolutionHost.onDiscoveredSymlink && resolutionIsSymlink(resolution)) {
@@ -122015,8 +122027,23 @@ ${lanes.join("\n")}
       }
       resolutionHost.scheduleInvalidateResolutionsOfFailedLookupLocations();
     }
+    function invalidatePackageJsonMap() {
+      const packageJsonMap = moduleResolutionCache.getPackageJsonInfoCache().getInternalMap();
+      if (packageJsonMap && (failedLookupChecks || startsWithPathChecks || isInDirectoryChecks)) {
+        packageJsonMap.forEach((_value, path) => isInvalidatedFailedLookup(path) ? packageJsonMap.delete(path) : void 0);
+      }
+    }
     function invalidateResolutionsOfFailedLookupLocations() {
       var _a;
+      if (allResolutionsAreInvalidated) {
+        affectingPathChecksForFile = void 0;
+        invalidatePackageJsonMap();
+        failedLookupChecks = void 0;
+        startsWithPathChecks = void 0;
+        isInDirectoryChecks = void 0;
+        affectingPathChecks = void 0;
+        return true;
+      }
       let invalidated = false;
       if (affectingPathChecksForFile) {
         (_a = resolutionHost.getCurrentProgram()) == null ? void 0 : _a.getSourceFiles().forEach((f) => {
@@ -122031,10 +122058,7 @@ ${lanes.join("\n")}
         return invalidated;
       }
       invalidated = invalidateResolutions(resolutionsWithFailedLookups, canInvalidateFailedLookupResolution) || invalidated;
-      const packageJsonMap = moduleResolutionCache.getPackageJsonInfoCache().getInternalMap();
-      if (packageJsonMap && (failedLookupChecks || startsWithPathChecks || isInDirectoryChecks)) {
-        packageJsonMap.forEach((_value, path) => isInvalidatedFailedLookup(path) ? packageJsonMap.delete(path) : void 0);
-      }
+      invalidatePackageJsonMap();
       failedLookupChecks = void 0;
       startsWithPathChecks = void 0;
       isInDirectoryChecks = void 0;
@@ -122991,7 +123015,8 @@ ${lanes.join("\n")}
       if (hasChangedCompilerOptions) {
         newLine = updateNewLine();
         if (program && changesAffectModuleResolution(program.getCompilerOptions(), compilerOptions)) {
-          resolutionCache.clear();
+          debugger;
+          resolutionCache.onChangesAffectModuleResolution();
         }
       }
       const hasInvalidatedResolutions = resolutionCache.createHasInvalidatedResolutions(customHasInvalidatedResolutions);
@@ -134809,10 +134834,10 @@ ${lanes.join("\n")}
     function getSmartSelectionRange2(fileName, position) {
       return ts_SmartSelectionRange_exports.getSmartSelectionRange(position, syntaxTreeCache.getCurrentSourceFile(fileName));
     }
-    function getApplicableRefactors2(fileName, positionOrRange, preferences = emptyOptions, triggerReason, kind) {
+    function getApplicableRefactors2(fileName, positionOrRange, preferences = emptyOptions, triggerReason, kind, includeInteractiveActions) {
       synchronizeHostData();
       const file = getValidSourceFile(fileName);
-      return ts_refactor_exports.getApplicableRefactors(getRefactorContext(file, positionOrRange, preferences, emptyOptions, triggerReason, kind));
+      return ts_refactor_exports.getApplicableRefactors(getRefactorContext(file, positionOrRange, preferences, emptyOptions, triggerReason, kind), includeInteractiveActions);
     }
     function getEditsForRefactor2(fileName, formatOptions, positionOrRange, refactorName13, actionName2, preferences = emptyOptions) {
       synchronizeHostData();
@@ -151174,7 +151199,7 @@ ${lanes.join("\n")}
           return true;
         }
       }
-      return isDeclarationName(contextToken2) && !isShorthandPropertyAssignment(contextToken2.parent) && !isJsxAttribute(contextToken2.parent) && !((isClassLike(contextToken2.parent) || isInterfaceDeclaration(contextToken2.parent)) && (contextToken2 !== previousToken || position > previousToken.end));
+      return isDeclarationName(contextToken2) && !isShorthandPropertyAssignment(contextToken2.parent) && !isJsxAttribute(contextToken2.parent) && !((isClassLike(contextToken2.parent) || isInterfaceDeclaration(contextToken2.parent) || isTypeParameterDeclaration(contextToken2.parent)) && (contextToken2 !== previousToken || position > previousToken.end));
     }
     function isPreviousPropertyDeclarationTerminated(contextToken2, position2) {
       return contextToken2.kind !== 64 /* EqualsToken */ && (contextToken2.kind === 27 /* SemicolonToken */ || !positionsAreOnSameLine(contextToken2.end, position2, sourceFile));
@@ -157532,10 +157557,10 @@ ${lanes.join("\n")}
   function registerRefactor(name, refactor) {
     refactors.set(name, refactor);
   }
-  function getApplicableRefactors(context) {
+  function getApplicableRefactors(context, includeInteractiveActions) {
     return arrayFrom(flatMapIterator(refactors.values(), (refactor) => {
       var _a;
-      return context.cancellationToken && context.cancellationToken.isCancellationRequested() || !((_a = refactor.kinds) == null ? void 0 : _a.some((kind) => refactorKindBeginsWith(kind, context.kind))) ? void 0 : refactor.getAvailableActions(context);
+      return context.cancellationToken && context.cancellationToken.isCancellationRequested() || !((_a = refactor.kinds) == null ? void 0 : _a.some((kind) => refactorKindBeginsWith(kind, context.kind))) ? void 0 : refactor.getAvailableActions(context, includeInteractiveActions);
     }));
   }
   function getEditsForRefactor(context, refactorName13, actionName2) {
@@ -171307,7 +171332,7 @@ ${options.prefix}` : "\n" : options.prefix
             if (changesAffectModuleResolution(oldOptions, compilerOptions)) {
               this.cachedUnresolvedImportsPerFile.clear();
               this.lastCachedUnresolvedImportsList = void 0;
-              this.resolutionCache.clear();
+              this.resolutionCache.onChangesAffectModuleResolution();
               this.moduleSpecifierCache.clear();
             }
             this.markAsDirty();
@@ -171755,13 +171780,18 @@ ${options.prefix}` : "\n" : options.prefix
               /*isJsInferredProject*/
               true
             );
+          } else if (this.isOrphan() && this._isJsInferredProject && !info.isJavaScript()) {
+            this.toggleJsInferredProject(
+              /*isJsInferredProject*/
+              false
+            );
           }
           super.addRoot(info);
         }
         removeRoot(info) {
           this.projectService.stopWatchingConfigFilesForInferredProjectRoot(info);
           super.removeRoot(info);
-          if (this._isJsInferredProject && info.isJavaScript()) {
+          if (!this.isOrphan() && this._isJsInferredProject && info.isJavaScript()) {
             if (every(this.getRootScriptInfos(), (rootInfo) => !rootInfo.isJavaScript())) {
               this.toggleJsInferredProject(
                 /*isJsInferredProject*/
@@ -176958,7 +176988,7 @@ ${json}${newLine}`;
           }));
           this.host = opts.host;
           this.cancellationToken = opts.cancellationToken;
-          this.typingsInstaller = opts.typingsInstaller;
+          this.typingsInstaller = opts.typingsInstaller || nullTypingsInstaller;
           this.byteLength = opts.byteLength;
           this.hrtime = opts.hrtime;
           this.logger = opts.logger;

package/lib/typescript.d.ts

@@ -6198,7 +6198,13 @@ declare namespace ts {
         applyCodeActionCommand(fileName: string, action: CodeActionCommand[]): Promise<ApplyCodeActionCommandResult[]>;
         /** @deprecated `fileName` will be ignored */
         applyCodeActionCommand(fileName: string, action: CodeActionCommand | CodeActionCommand[]): Promise<ApplyCodeActionCommandResult | ApplyCodeActionCommandResult[]>;
-        getApplicableRefactors(fileName: string, positionOrRange: number | TextRange, preferences: UserPreferences | undefined, triggerReason?: RefactorTriggerReason, kind?: string): ApplicableRefactorInfo[];
+        /**
+         * @param includeInteractiveActions Include refactor actions that require additional arguments to be
+         * passed when calling `getEditsForRefactor`. When true, clients should inspect the `isInteractive`
+         * property of each returned `RefactorActionInfo` and ensure they are able to collect the appropriate
+         * arguments for any interactive action before offering it.
+         */
+        getApplicableRefactors(fileName: string, positionOrRange: number | TextRange, preferences: UserPreferences | undefined, triggerReason?: RefactorTriggerReason, kind?: string, includeInteractiveActions?: boolean): ApplicableRefactorInfo[];
         getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string, preferences: UserPreferences | undefined): RefactorEditInfo | undefined;
         organizeImports(args: OrganizeImportsArgs, formatOptions: FormatCodeSettings, preferences: UserPreferences | undefined): readonly FileTextChanges[];
         getEditsForFileRename(oldFilePath: string, newFilePath: string, formatOptions: FormatCodeSettings, preferences: UserPreferences | undefined): readonly FileTextChanges[];
@@ -6470,6 +6476,11 @@ declare namespace ts {
          * The hierarchical dotted name of the refactor action.
          */
         kind?: string;
+        /**
+         * Indicates that the action requires additional arguments to be passed
+         * when calling `getEditsForRefactor`.
+         */
+        isInteractive?: boolean;
     }
     /**
      * A set of edits to make in response to a refactor action, plus an optional

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-dev.20230418`;
+      version = `${versionMajorMinor}.0-dev.20230420`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -19288,7 +19288,7 @@ ${lanes.join("\n")}
       supportedTSExtensions = [[".ts" /* Ts */, ".tsx" /* Tsx */, ".d.ts" /* Dts */], [".cts" /* Cts */, ".d.cts" /* Dcts */], [".mts" /* Mts */, ".d.mts" /* Dmts */]];
       supportedTSExtensionsFlat = flatten(supportedTSExtensions);
       supportedTSExtensionsWithJson = [...supportedTSExtensions, [".json" /* Json */]];
-      supportedTSExtensionsForExtractExtension = [".d.ts" /* Dts */, ".d.cts" /* Dcts */, ".d.mts" /* Dmts */, ".cts" /* Cts */, ".mts" /* Mts */, ".ts" /* Ts */, ".tsx" /* Tsx */, ".cts" /* Cts */, ".mts" /* Mts */];
+      supportedTSExtensionsForExtractExtension = [".d.ts" /* Dts */, ".d.cts" /* Dcts */, ".d.mts" /* Dmts */, ".cts" /* Cts */, ".mts" /* Mts */, ".ts" /* Ts */, ".tsx" /* Tsx */];
       supportedJSExtensions = [[".js" /* Js */, ".jsx" /* Jsx */], [".mjs" /* Mjs */], [".cjs" /* Cjs */]];
       supportedJSExtensionsFlat = flatten(supportedJSExtensions);
       allSupportedExtensions = [[".ts" /* Ts */, ".tsx" /* Tsx */, ".d.ts" /* Dts */, ".js" /* Js */, ".jsx" /* Jsx */], [".cts" /* Cts */, ".d.cts" /* Dcts */, ".cjs" /* Cjs */], [".mts" /* Mts */, ".d.mts" /* Dmts */, ".mjs" /* Mjs */]];
@@ -113561,7 +113561,7 @@ ${lanes.join("\n")}
       }
     }
     function emitEmbeddedStatement(parent2, node) {
-      if (isBlock(node) || getEmitFlags(parent2) & 1 /* SingleLine */) {
+      if (isBlock(node) || getEmitFlags(parent2) & 1 /* SingleLine */ || preserveSourceNewlines && !getLeadingLineTerminatorCount(parent2, node, 0 /* None */)) {
         writeSpace();
         emit(node);
       } else {
@@ -116422,7 +116422,7 @@ ${lanes.join("\n")}
       automaticTypeDirectiveResolutions = createModeAwareCache();
       if (automaticTypeDirectiveNames.length) {
         (_k = tracing) == null ? void 0 : _k.push(tracing.Phase.Program, "processTypeReferences", { count: automaticTypeDirectiveNames.length });
-        const containingDirectory = options.configFilePath ? getDirectoryPath(options.configFilePath) : host.getCurrentDirectory();
+        const containingDirectory = options.configFilePath ? getDirectoryPath(options.configFilePath) : currentDirectory;
         const containingFilename = combinePaths(containingDirectory, inferredTypesContainingFile);
         const resolutions = resolveTypeReferenceDirectiveNamesReusingOldState(automaticTypeDirectiveNames, containingFilename);
         for (let i = 0; i < automaticTypeDirectiveNames.length; i++) {
@@ -118213,8 +118213,9 @@ ${lanes.join("\n")}
         path += (i === 2 ? "/" : "-") + components[i];
         i++;
       }
-      const resolveFrom = combinePaths(currentDirectory, `__lib_node_modules_lookup_${libFileName}__.ts`);
-      const localOverrideModuleResult = resolveModuleName("@typescript/lib-" + path, resolveFrom, { moduleResolution: 2 /* Node10 */ }, host, moduleResolutionCache);
+      const containingDirectory = options.configFilePath ? getDirectoryPath(options.configFilePath) : currentDirectory;
+      const resolveFrom = combinePaths(containingDirectory, `__lib_node_modules_lookup_${libFileName}__.ts`);
+      const localOverrideModuleResult = resolveModuleName("@typescript/lib-" + path, resolveFrom, { moduleResolution: 2 /* Node10 */, traceResolution: options.traceResolution }, host, moduleResolutionCache);
       if (localOverrideModuleResult == null ? void 0 : localOverrideModuleResult.resolvedModule) {
         return localOverrideModuleResult.resolvedModule.resolvedFileName;
       }
@@ -118349,7 +118350,7 @@ ${lanes.join("\n")}
           void 0
         );
       } else {
-        const basePath = getNormalizedAbsolutePath(getDirectoryPath(refPath), host.getCurrentDirectory());
+        const basePath = getNormalizedAbsolutePath(getDirectoryPath(refPath), currentDirectory);
         sourceFile = host.getSourceFile(refPath, 100 /* JSON */);
         addFileToFilesByName(
           sourceFile,
@@ -121380,6 +121381,7 @@ ${lanes.join("\n")}
     let failedLookupChecks;
     let startsWithPathChecks;
     let isInDirectoryChecks;
+    let allResolutionsAreInvalidated = false;
     const getCurrentDirectory = memoize(() => resolutionHost.getCurrentDirectory());
     const cachedDirectoryStructureHost = resolutionHost.getCachedDirectoryStructureHost();
     const resolvedModuleNames = /* @__PURE__ */ new Map();
@@ -121422,7 +121424,8 @@ ${lanes.join("\n")}
       isFileWithInvalidatedNonRelativeUnresolvedImports,
       updateTypeRootsWatch,
       closeTypeRootsWatch,
-      clear: clear2
+      clear: clear2,
+      onChangesAffectModuleResolution
     };
     function getResolvedModule2(resolution) {
       return resolution.resolvedModule;
@@ -121445,6 +121448,7 @@ ${lanes.join("\n")}
       isInDirectoryChecks = void 0;
       affectingPathChecks = void 0;
       affectingPathChecksForFile = void 0;
+      allResolutionsAreInvalidated = false;
       moduleResolutionCache.clear();
       typeReferenceDirectiveResolutionCache.clear();
       moduleResolutionCache.update(resolutionHost.getCompilationSettings());
@@ -121452,6 +121456,13 @@ ${lanes.join("\n")}
       impliedFormatPackageJsons.clear();
       hasChangedAutomaticTypeDirectiveNames = false;
     }
+    function onChangesAffectModuleResolution() {
+      allResolutionsAreInvalidated = true;
+      moduleResolutionCache.clearAllExceptPackageJsonInfoCache();
+      typeReferenceDirectiveResolutionCache.clearAllExceptPackageJsonInfoCache();
+      moduleResolutionCache.update(resolutionHost.getCompilationSettings());
+      typeReferenceDirectiveResolutionCache.update(resolutionHost.getCompilationSettings());
+    }
     function startRecordingFilesWithChangedResolutions() {
       filesWithChangedSetOfUnresolvedImports = [];
     }
@@ -121471,7 +121482,7 @@ ${lanes.join("\n")}
       invalidateResolutionsOfFailedLookupLocations();
       const collected = filesWithInvalidatedResolutions;
       filesWithInvalidatedResolutions = void 0;
-      return (path) => customHasInvalidatedResolutions(path) || !!(collected == null ? void 0 : collected.has(path)) || isFileWithInvalidatedNonRelativeUnresolvedImports(path);
+      return (path) => customHasInvalidatedResolutions(path) || allResolutionsAreInvalidated || !!(collected == null ? void 0 : collected.has(path)) || isFileWithInvalidatedNonRelativeUnresolvedImports(path);
     }
     function startCachingPerDirectoryResolution() {
       moduleResolutionCache.clearAllExceptPackageJsonInfoCache();
@@ -121481,6 +121492,7 @@ ${lanes.join("\n")}
     }
     function finishCachingPerDirectoryResolution(newProgram, oldProgram) {
       filesWithInvalidatedNonRelativeUnresolvedImports = void 0;
+      allResolutionsAreInvalidated = false;
       nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfNonRelativeModuleResolutions);
       nonRelativeExternalModuleResolutions.clear();
       if (newProgram !== oldProgram) {
@@ -121592,8 +121604,8 @@ ${lanes.join("\n")}
         const name = loader.nameAndMode.getName(entry);
         const mode = loader.nameAndMode.getMode(entry, containingSourceFile);
         let resolution = resolutionsInFile.get(name, mode);
-        if (!seenNamesInFile.has(name, mode) && unmatchedRedirects || !resolution || resolution.isInvalidated || // If the name is unresolved import that was invalidated, recalculate
-        hasInvalidatedNonRelativeUnresolvedImport && !isExternalModuleNameRelative(name) && shouldRetryResolution(resolution)) {
+        if (!seenNamesInFile.has(name, mode) && (allResolutionsAreInvalidated || unmatchedRedirects || !resolution || resolution.isInvalidated || // If the name is unresolved import that was invalidated, recalculate
+        hasInvalidatedNonRelativeUnresolvedImport && !isExternalModuleNameRelative(name) && shouldRetryResolution(resolution))) {
           const existingResolution = resolution;
           resolution = loader.resolve(name, mode);
           if (resolutionHost.onDiscoveredSymlink && resolutionIsSymlink(resolution)) {
@@ -122015,8 +122027,23 @@ ${lanes.join("\n")}
       }
       resolutionHost.scheduleInvalidateResolutionsOfFailedLookupLocations();
     }
+    function invalidatePackageJsonMap() {
+      const packageJsonMap = moduleResolutionCache.getPackageJsonInfoCache().getInternalMap();
+      if (packageJsonMap && (failedLookupChecks || startsWithPathChecks || isInDirectoryChecks)) {
+        packageJsonMap.forEach((_value, path) => isInvalidatedFailedLookup(path) ? packageJsonMap.delete(path) : void 0);
+      }
+    }
     function invalidateResolutionsOfFailedLookupLocations() {
       var _a;
+      if (allResolutionsAreInvalidated) {
+        affectingPathChecksForFile = void 0;
+        invalidatePackageJsonMap();
+        failedLookupChecks = void 0;
+        startsWithPathChecks = void 0;
+        isInDirectoryChecks = void 0;
+        affectingPathChecks = void 0;
+        return true;
+      }
       let invalidated = false;
       if (affectingPathChecksForFile) {
         (_a = resolutionHost.getCurrentProgram()) == null ? void 0 : _a.getSourceFiles().forEach((f) => {
@@ -122031,10 +122058,7 @@ ${lanes.join("\n")}
         return invalidated;
       }
       invalidated = invalidateResolutions(resolutionsWithFailedLookups, canInvalidateFailedLookupResolution) || invalidated;
-      const packageJsonMap = moduleResolutionCache.getPackageJsonInfoCache().getInternalMap();
-      if (packageJsonMap && (failedLookupChecks || startsWithPathChecks || isInDirectoryChecks)) {
-        packageJsonMap.forEach((_value, path) => isInvalidatedFailedLookup(path) ? packageJsonMap.delete(path) : void 0);
-      }
+      invalidatePackageJsonMap();
       failedLookupChecks = void 0;
       startsWithPathChecks = void 0;
       isInDirectoryChecks = void 0;
@@ -122991,7 +123015,8 @@ ${lanes.join("\n")}
       if (hasChangedCompilerOptions) {
         newLine = updateNewLine();
         if (program && changesAffectModuleResolution(program.getCompilerOptions(), compilerOptions)) {
-          resolutionCache.clear();
+          debugger;
+          resolutionCache.onChangesAffectModuleResolution();
         }
       }
       const hasInvalidatedResolutions = resolutionCache.createHasInvalidatedResolutions(customHasInvalidatedResolutions);
@@ -134823,10 +134848,10 @@ ${lanes.join("\n")}
     function getSmartSelectionRange2(fileName, position) {
       return ts_SmartSelectionRange_exports.getSmartSelectionRange(position, syntaxTreeCache.getCurrentSourceFile(fileName));
     }
-    function getApplicableRefactors2(fileName, positionOrRange, preferences = emptyOptions, triggerReason, kind) {
+    function getApplicableRefactors2(fileName, positionOrRange, preferences = emptyOptions, triggerReason, kind, includeInteractiveActions) {
       synchronizeHostData();
       const file = getValidSourceFile(fileName);
-      return ts_refactor_exports.getApplicableRefactors(getRefactorContext(file, positionOrRange, preferences, emptyOptions, triggerReason, kind));
+      return ts_refactor_exports.getApplicableRefactors(getRefactorContext(file, positionOrRange, preferences, emptyOptions, triggerReason, kind), includeInteractiveActions);
     }
     function getEditsForRefactor2(fileName, formatOptions, positionOrRange, refactorName13, actionName2, preferences = emptyOptions) {
       synchronizeHostData();
@@ -151188,7 +151213,7 @@ ${lanes.join("\n")}
           return true;
         }
       }
-      return isDeclarationName(contextToken2) && !isShorthandPropertyAssignment(contextToken2.parent) && !isJsxAttribute(contextToken2.parent) && !((isClassLike(contextToken2.parent) || isInterfaceDeclaration(contextToken2.parent)) && (contextToken2 !== previousToken || position > previousToken.end));
+      return isDeclarationName(contextToken2) && !isShorthandPropertyAssignment(contextToken2.parent) && !isJsxAttribute(contextToken2.parent) && !((isClassLike(contextToken2.parent) || isInterfaceDeclaration(contextToken2.parent) || isTypeParameterDeclaration(contextToken2.parent)) && (contextToken2 !== previousToken || position > previousToken.end));
     }
     function isPreviousPropertyDeclarationTerminated(contextToken2, position2) {
       return contextToken2.kind !== 64 /* EqualsToken */ && (contextToken2.kind === 27 /* SemicolonToken */ || !positionsAreOnSameLine(contextToken2.end, position2, sourceFile));
@@ -157546,10 +157571,10 @@ ${lanes.join("\n")}
   function registerRefactor(name, refactor) {
     refactors.set(name, refactor);
   }
-  function getApplicableRefactors(context) {
+  function getApplicableRefactors(context, includeInteractiveActions) {
     return arrayFrom(flatMapIterator(refactors.values(), (refactor) => {
       var _a;
-      return context.cancellationToken && context.cancellationToken.isCancellationRequested() || !((_a = refactor.kinds) == null ? void 0 : _a.some((kind) => refactorKindBeginsWith(kind, context.kind))) ? void 0 : refactor.getAvailableActions(context);
+      return context.cancellationToken && context.cancellationToken.isCancellationRequested() || !((_a = refactor.kinds) == null ? void 0 : _a.some((kind) => refactorKindBeginsWith(kind, context.kind))) ? void 0 : refactor.getAvailableActions(context, includeInteractiveActions);
     }));
   }
   function getEditsForRefactor(context, refactorName13, actionName2) {

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230418`;
+var version = `${versionMajorMinor}.0-dev.20230420`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -11483,7 +11483,7 @@ function getScriptKindFromFileName(fileName) {
 var supportedTSExtensions = [[".ts" /* Ts */, ".tsx" /* Tsx */, ".d.ts" /* Dts */], [".cts" /* Cts */, ".d.cts" /* Dcts */], [".mts" /* Mts */, ".d.mts" /* Dmts */]];
 var supportedTSExtensionsFlat = flatten(supportedTSExtensions);
 var supportedTSExtensionsWithJson = [...supportedTSExtensions, [".json" /* Json */]];
-var supportedTSExtensionsForExtractExtension = [".d.ts" /* Dts */, ".d.cts" /* Dcts */, ".d.mts" /* Dmts */, ".cts" /* Cts */, ".mts" /* Mts */, ".ts" /* Ts */, ".tsx" /* Tsx */, ".cts" /* Cts */, ".mts" /* Mts */];
+var supportedTSExtensionsForExtractExtension = [".d.ts" /* Dts */, ".d.cts" /* Dcts */, ".d.mts" /* Dmts */, ".cts" /* Cts */, ".mts" /* Mts */, ".ts" /* Ts */, ".tsx" /* Tsx */];
 var supportedJSExtensions = [[".js" /* Js */, ".jsx" /* Jsx */], [".mjs" /* Mjs */], [".cjs" /* Cjs */]];
 var supportedJSExtensionsFlat = flatten(supportedJSExtensions);
 var allSupportedExtensions = [[".ts" /* Ts */, ".tsx" /* Tsx */, ".d.ts" /* Dts */, ".js" /* Js */, ".jsx" /* Jsx */], [".cts" /* Cts */, ".d.cts" /* Dcts */, ".cjs" /* Cjs */], [".mts" /* Mts */, ".d.mts" /* Dmts */, ".mjs" /* Mjs */]];

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.1.0-dev.20230418",
+    "version": "5.1.0-dev.20230420",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -113,5 +113,5 @@
         "node": "14.21.1",
         "npm": "8.19.3"
     },
-    "gitHead": "3d3b2c724eb7adb8afbd44d2e3ad48fa8b0e8a84"
+    "gitHead": "484994735758d34da8e8259d1371c20f8de26a4f"
 }