typescript 5.1.0-dev.20230419 → 5.1.0-dev.20230421

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-dev.20230419`;
+      version = `${versionMajorMinor}.0-dev.20230421`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -34847,7 +34847,9 @@ ${lanes.join("\n")}
               const usedBrace = parseOptional(19 /* OpenBraceToken */);
               const pos = getNodePos();
               const expression = parsePropertyAccessEntityNameExpression();
+              scanner2.setInJSDocType(true);
               const typeArguments = tryParseTypeArguments();
+              scanner2.setInJSDocType(false);
               const node = factory2.createExpressionWithTypeArguments(expression, typeArguments);
               const res = finishNode(node, pos);
               if (usedBrace) {
@@ -39501,13 +39503,12 @@ ${lanes.join("\n")}
       nonRelativeNameResolutionCache.update(options2);
     }
   }
-  function createModuleResolutionCache(currentDirectory, getCanonicalFileName, options) {
+  function createModuleResolutionCache(currentDirectory, getCanonicalFileName, options, packageJsonInfoCache) {
     const result = createModuleOrTypeReferenceResolutionCache(
       currentDirectory,
       getCanonicalFileName,
       options,
-      /*packageJsonInfoCache*/
-      void 0,
+      packageJsonInfoCache,
       getOriginalOrResolvedModuleFileName
     );
     result.getOrCreateCacheForModuleName = (nonRelativeName, mode, redirectedReference) => result.getOrCreateCacheForNonRelativeName(nonRelativeName, mode, redirectedReference);
@@ -39522,6 +39523,12 @@ ${lanes.join("\n")}
       getOriginalOrResolvedTypeReferenceFileName
     );
   }
+  function getOptionsForLibraryResolution(options) {
+    return { moduleResolution: 2 /* Node10 */, traceResolution: options.traceResolution };
+  }
+  function resolveLibrary(libraryName, resolveFrom, compilerOptions, host, cache) {
+    return resolveModuleName(libraryName, resolveFrom, getOptionsForLibraryResolution(compilerOptions), host, cache);
+  }
   function resolveModuleNameFromCache(moduleName, containingFile, cache, mode) {
     const containingDirectory = getDirectoryPath(containingFile);
     return cache.getFromDirectoryCache(
@@ -56757,7 +56764,8 @@ ${lanes.join("\n")}
             thisParameter = createSymbolWithType(createSymbol(1 /* FunctionScopedVariable */, "this" /* This */), getTypeFromTypeNode(thisTag.typeExpression));
           }
         }
-        const classType = declaration.kind === 175 /* Constructor */ ? getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol)) : void 0;
+        const hostDeclaration = isJSDocSignature(declaration) ? getEffectiveJSDocHost(declaration) : declaration;
+        const classType = hostDeclaration && isConstructorDeclaration(hostDeclaration) ? getDeclaredTypeOfClassOrInterface(getMergedSymbol(hostDeclaration.parent.symbol)) : void 0;
         const typeParameters = classType ? classType.localTypeParameters : getTypeParametersFromDeclaration(declaration);
         if (hasRestParameter(declaration) || isInJSFile(declaration) && maybeAddJsSyntheticRestParameter(declaration, parameters)) {
           flags |= 1 /* HasRestParameter */;
@@ -116109,6 +116117,25 @@ ${lanes.join("\n")}
       });
     }
   }
+  function getInferredLibraryNameResolveFrom(options, currentDirectory, libFileName) {
+    const containingDirectory = options.configFilePath ? getDirectoryPath(options.configFilePath) : currentDirectory;
+    return combinePaths(containingDirectory, `__lib_node_modules_lookup_${libFileName}__.ts`);
+  }
+  function getLibraryNameFromLibFileName(libFileName) {
+    const components = libFileName.split(".");
+    let path = components[1];
+    let i = 2;
+    while (components[i] && components[i] !== "d") {
+      path += (i === 2 ? "/" : "-") + components[i];
+      i++;
+    }
+    return "@typescript/lib-" + path;
+  }
+  function getLibFileNameFromLibReference(libReference) {
+    const libName = toFileNameLowerCase(libReference.fileName);
+    const libFileName = libMap.get(libName);
+    return { libName, libFileName };
+  }
   function isReferencedFile(reason) {
     switch (reason == null ? void 0 : reason.kind) {
       case 3 /* Import */:
@@ -116152,7 +116179,7 @@ ${lanes.join("\n")}
     }
     return { file, pos, end, packageId };
   }
-  function isProgramUptoDate(program, rootFileNames, newOptions, getSourceVersion, fileExists, hasInvalidatedResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences) {
+  function isProgramUptoDate(program, rootFileNames, newOptions, getSourceVersion, fileExists, hasInvalidatedResolutions, hasInvalidatedLibResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences) {
     if (!program || (hasChangedAutomaticTypeDirectiveNames == null ? void 0 : hasChangedAutomaticTypeDirectiveNames()))
       return false;
     if (!arrayIsEqualTo(program.getRootFileNames(), rootFileNames))
@@ -116167,6 +116194,8 @@ ${lanes.join("\n")}
     const currentOptions = program.getCompilerOptions();
     if (!compareDataObjects(currentOptions, newOptions))
       return false;
+    if (program.resolvedLibReferences && forEachEntry(program.resolvedLibReferences, (_value, libFileName) => hasInvalidatedLibResolutions(libFileName)))
+      return false;
     if (currentOptions.configFile && newOptions.configFile)
       return currentOptions.configFile.text === newOptions.configFile.text;
     return true;
@@ -116259,6 +116288,8 @@ ${lanes.join("\n")}
     let fileProcessingDiagnostics;
     let automaticTypeDirectiveNames;
     let automaticTypeDirectiveResolutions;
+    let resolvedLibReferences;
+    let resolvedLibProcessing;
     const maxNodeModuleJsDepth = typeof options.maxNodeModuleJsDepth === "number" ? options.maxNodeModuleJsDepth : 0;
     let currentNodeModulesDepth = 0;
     const modulesWithElidedImports = /* @__PURE__ */ new Map();
@@ -116346,6 +116377,14 @@ ${lanes.join("\n")}
         createTypeReferenceResolutionLoader
       );
     }
+    const hasInvalidatedLibResolutions = host.hasInvalidatedLibResolutions || returnFalse;
+    let actualResolveLibrary;
+    if (host.resolveLibrary) {
+      actualResolveLibrary = host.resolveLibrary.bind(host);
+    } else {
+      const libraryResolutionCache = createModuleResolutionCache(currentDirectory, getCanonicalFileName, options, moduleResolutionCache == null ? void 0 : moduleResolutionCache.getPackageJsonInfoCache());
+      actualResolveLibrary = (libraryName, resolveFrom, options2) => resolveLibrary(libraryName, resolveFrom, options2, host, libraryResolutionCache);
+    }
     const packageIdToSourceFile = /* @__PURE__ */ new Map();
     let sourceFileToPackageName = /* @__PURE__ */ new Map();
     let redirectTargetsMap = createMultiMap();
@@ -116512,6 +116551,7 @@ ${lanes.join("\n")}
       );
     }
     oldProgram = void 0;
+    resolvedLibProcessing = void 0;
     const program = {
       getRootFileNames: () => rootNames,
       getSourceFile,
@@ -116553,6 +116593,7 @@ ${lanes.join("\n")}
       sourceFileToPackageName,
       redirectTargetsMap,
       usesUriStyleNodeCoreModules,
+      resolvedLibReferences,
       isEmittedFile,
       getConfigFileParsingDiagnostics: getConfigFileParsingDiagnostics2,
       getProjectReferences,
@@ -117041,6 +117082,9 @@ ${lanes.join("\n")}
       if (changesAffectingProgramStructure(oldOptions, options)) {
         return 1 /* SafeModules */;
       }
+      if (oldProgram.resolvedLibReferences && forEachEntry(oldProgram.resolvedLibReferences, (resolution, libFileName) => pathForLibFileWorker(libFileName).actual !== resolution.actual)) {
+        return 1 /* SafeModules */;
+      }
       if (host.hasChangedAutomaticTypeDirectiveNames) {
         if (host.hasChangedAutomaticTypeDirectiveNames())
           return 1 /* SafeModules */;
@@ -117077,6 +117121,7 @@ ${lanes.join("\n")}
       sourceFileToPackageName = oldProgram.sourceFileToPackageName;
       redirectTargetsMap = oldProgram.redirectTargetsMap;
       usesUriStyleNodeCoreModules = oldProgram.usesUriStyleNodeCoreModules;
+      resolvedLibReferences = oldProgram.resolvedLibReferences;
       return 2 /* Completely */;
     }
     function getEmitHost(writeFileCallback) {
@@ -117186,7 +117231,7 @@ ${lanes.join("\n")}
       if (!options.lib) {
         return equalityComparer(file.fileName, getDefaultLibraryFileName());
       } else {
-        return some(options.lib, (libFileName) => equalityComparer(file.fileName, pathForLibFile(libFileName)));
+        return some(options.lib, (libFileName) => equalityComparer(file.fileName, resolvedLibReferences.get(libFileName).actual));
       }
     }
     function getTypeChecker() {
@@ -117777,11 +117822,10 @@ ${lanes.join("\n")}
       }
     }
     function getLibFileFromReference(ref) {
-      const libName = toFileNameLowerCase(ref.fileName);
-      const libFileName = libMap.get(libName);
-      if (libFileName) {
-        return getSourceFile(pathForLibFile(libFileName));
-      }
+      var _a2;
+      const { libFileName } = getLibFileNameFromLibReference(ref);
+      const actualFileName = libFileName && ((_a2 = resolvedLibReferences == null ? void 0 : resolvedLibReferences.get(libFileName)) == null ? void 0 : _a2.actual);
+      return actualFileName !== void 0 ? getSourceFile(actualFileName) : void 0;
     }
     function getSourceFileFromReference(referencingFile, ref) {
       return getSourceFileFromReferenceWorker(resolveTripleslashReference(ref.fileName, referencingFile.fileName), getSourceFile);
@@ -118206,25 +118250,55 @@ ${lanes.join("\n")}
       }
     }
     function pathForLibFile(libFileName) {
-      const components = libFileName.split(".");
-      let path = components[1];
-      let i = 2;
-      while (components[i] && components[i] !== "d") {
-        path += (i === 2 ? "/" : "-") + components[i];
-        i++;
-      }
-      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;
-      }
-      return combinePaths(defaultLibraryPath, libFileName);
+      const existing = resolvedLibReferences == null ? void 0 : resolvedLibReferences.get(libFileName);
+      if (existing)
+        return existing.actual;
+      const result = pathForLibFileWorker(libFileName);
+      (resolvedLibReferences ?? (resolvedLibReferences = /* @__PURE__ */ new Map())).set(libFileName, result);
+      return result.actual;
+    }
+    function pathForLibFileWorker(libFileName) {
+      var _a2, _b2, _c2, _d2, _e2;
+      const existing = resolvedLibProcessing == null ? void 0 : resolvedLibProcessing.get(libFileName);
+      if (existing)
+        return existing;
+      if (structureIsReused !== 0 /* Not */ && oldProgram && !hasInvalidatedLibResolutions(libFileName)) {
+        const oldResolution = (_a2 = oldProgram.resolvedLibReferences) == null ? void 0 : _a2.get(libFileName);
+        if (oldResolution) {
+          if (oldResolution.resolution && isTraceEnabled(options, host)) {
+            const libraryName2 = getLibraryNameFromLibFileName(libFileName);
+            const resolveFrom2 = getInferredLibraryNameResolveFrom(options, currentDirectory, libFileName);
+            trace(
+              host,
+              oldResolution.resolution.resolvedModule ? oldResolution.resolution.resolvedModule.packageId ? Diagnostics.Reusing_resolution_of_module_0_from_1_of_old_program_it_was_successfully_resolved_to_2_with_Package_ID_3 : Diagnostics.Reusing_resolution_of_module_0_from_1_of_old_program_it_was_successfully_resolved_to_2 : Diagnostics.Reusing_resolution_of_module_0_from_1_of_old_program_it_was_not_resolved,
+              libraryName2,
+              getNormalizedAbsolutePath(resolveFrom2, currentDirectory),
+              (_b2 = oldResolution.resolution.resolvedModule) == null ? void 0 : _b2.resolvedFileName,
+              ((_c2 = oldResolution.resolution.resolvedModule) == null ? void 0 : _c2.packageId) && packageIdToString(oldResolution.resolution.resolvedModule.packageId)
+            );
+          }
+          (resolvedLibProcessing ?? (resolvedLibProcessing = /* @__PURE__ */ new Map())).set(libFileName, oldResolution);
+          return oldResolution;
+        }
+      }
+      const libraryName = getLibraryNameFromLibFileName(libFileName);
+      const resolveFrom = getInferredLibraryNameResolveFrom(options, currentDirectory, libFileName);
+      (_d2 = tracing) == null ? void 0 : _d2.push(tracing.Phase.Program, "resolveLibrary", { resolveFrom });
+      mark("beforeResolveLibrary");
+      const resolution = actualResolveLibrary(libraryName, resolveFrom, options, libFileName);
+      mark("afterResolveLibrary");
+      measure("ResolveLibrary", "beforeResolveLibrary", "afterResolveLibrary");
+      (_e2 = tracing) == null ? void 0 : _e2.pop();
+      const result = {
+        resolution,
+        actual: resolution.resolvedModule ? resolution.resolvedModule.resolvedFileName : combinePaths(defaultLibraryPath, libFileName)
+      };
+      (resolvedLibProcessing ?? (resolvedLibProcessing = /* @__PURE__ */ new Map())).set(libFileName, result);
+      return result;
     }
     function processLibReferenceDirectives(file) {
       forEach(file.libReferenceDirectives, (libReference, index) => {
-        const libName = toFileNameLowerCase(libReference.fileName);
-        const libFileName = libMap.get(libName);
+        const { libName, libFileName } = getLibFileNameFromLibReference(libReference);
         if (libFileName) {
           processRootFile(
             pathForLibFile(libFileName),
@@ -121381,7 +121455,7 @@ ${lanes.join("\n")}
     let failedLookupChecks;
     let startsWithPathChecks;
     let isInDirectoryChecks;
-    let allResolutionsAreInvalidated = false;
+    let allModuleAndTypeResolutionsAreInvalidated = false;
     const getCurrentDirectory = memoize(() => resolutionHost.getCurrentDirectory());
     const cachedDirectoryStructureHost = resolutionHost.getCachedDirectoryStructureHost();
     const resolvedModuleNames = /* @__PURE__ */ new Map();
@@ -121397,6 +121471,13 @@ ${lanes.join("\n")}
       resolutionHost.getCompilationSettings(),
       moduleResolutionCache.getPackageJsonInfoCache()
     );
+    const resolvedLibraries = /* @__PURE__ */ new Map();
+    const libraryResolutionCache = createModuleResolutionCache(
+      getCurrentDirectory(),
+      resolutionHost.getCanonicalFileName,
+      getOptionsForLibraryResolution(resolutionHost.getCompilationSettings()),
+      moduleResolutionCache.getPackageJsonInfoCache()
+    );
     const directoryWatchesOfFailedLookups = /* @__PURE__ */ new Map();
     const fileWatchesOfAffectingLocations = /* @__PURE__ */ new Map();
     const rootDir = getRootDirectoryOfResolutionCache(rootDirForResolution, getCurrentDirectory);
@@ -121413,6 +121494,7 @@ ${lanes.join("\n")}
       finishCachingPerDirectoryResolution,
       resolveModuleNameLiterals,
       resolveTypeReferenceDirectiveReferences,
+      resolveLibrary: resolveLibrary2,
       resolveSingleModuleNameWithoutWatching,
       removeResolutionsFromProjectReferenceRedirects,
       removeResolutionsOfFile,
@@ -121448,16 +121530,18 @@ ${lanes.join("\n")}
       isInDirectoryChecks = void 0;
       affectingPathChecks = void 0;
       affectingPathChecksForFile = void 0;
-      allResolutionsAreInvalidated = false;
+      allModuleAndTypeResolutionsAreInvalidated = false;
       moduleResolutionCache.clear();
       typeReferenceDirectiveResolutionCache.clear();
       moduleResolutionCache.update(resolutionHost.getCompilationSettings());
       typeReferenceDirectiveResolutionCache.update(resolutionHost.getCompilationSettings());
+      libraryResolutionCache.clear();
       impliedFormatPackageJsons.clear();
+      resolvedLibraries.clear();
       hasChangedAutomaticTypeDirectiveNames = false;
     }
     function onChangesAffectModuleResolution() {
-      allResolutionsAreInvalidated = true;
+      allModuleAndTypeResolutionsAreInvalidated = true;
       moduleResolutionCache.clearAllExceptPackageJsonInfoCache();
       typeReferenceDirectiveResolutionCache.clearAllExceptPackageJsonInfoCache();
       moduleResolutionCache.update(resolutionHost.getCompilationSettings());
@@ -121478,24 +121562,45 @@ ${lanes.join("\n")}
       const value = filesWithInvalidatedNonRelativeUnresolvedImports.get(path);
       return !!value && !!value.length;
     }
-    function createHasInvalidatedResolutions(customHasInvalidatedResolutions) {
+    function createHasInvalidatedResolutions(customHasInvalidatedResolutions, customHasInvalidatedLibResolutions) {
       invalidateResolutionsOfFailedLookupLocations();
       const collected = filesWithInvalidatedResolutions;
       filesWithInvalidatedResolutions = void 0;
-      return (path) => customHasInvalidatedResolutions(path) || allResolutionsAreInvalidated || !!(collected == null ? void 0 : collected.has(path)) || isFileWithInvalidatedNonRelativeUnresolvedImports(path);
+      return {
+        hasInvalidatedResolutions: (path) => customHasInvalidatedResolutions(path) || allModuleAndTypeResolutionsAreInvalidated || !!(collected == null ? void 0 : collected.has(path)) || isFileWithInvalidatedNonRelativeUnresolvedImports(path),
+        hasInvalidatedLibResolutions: (libFileName) => {
+          var _a;
+          return customHasInvalidatedLibResolutions(libFileName) || !!((_a = resolvedLibraries == null ? void 0 : resolvedLibraries.get(libFileName)) == null ? void 0 : _a.isInvalidated);
+        }
+      };
     }
     function startCachingPerDirectoryResolution() {
       moduleResolutionCache.clearAllExceptPackageJsonInfoCache();
       typeReferenceDirectiveResolutionCache.clearAllExceptPackageJsonInfoCache();
+      libraryResolutionCache.clearAllExceptPackageJsonInfoCache();
       nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfNonRelativeModuleResolutions);
       nonRelativeExternalModuleResolutions.clear();
     }
+    function cleanupLibResolutionWatching(newProgram) {
+      resolvedLibraries.forEach((resolution, libFileName) => {
+        var _a;
+        if (!((_a = newProgram == null ? void 0 : newProgram.resolvedLibReferences) == null ? void 0 : _a.has(libFileName))) {
+          stopWatchFailedLookupLocationOfResolution(
+            resolution,
+            resolutionHost.toPath(getInferredLibraryNameResolveFrom(newProgram.getCompilerOptions(), getCurrentDirectory(), libFileName)),
+            getResolvedModule2
+          );
+          resolvedLibraries.delete(libFileName);
+        }
+      });
+    }
     function finishCachingPerDirectoryResolution(newProgram, oldProgram) {
       filesWithInvalidatedNonRelativeUnresolvedImports = void 0;
-      allResolutionsAreInvalidated = false;
+      allModuleAndTypeResolutionsAreInvalidated = false;
       nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfNonRelativeModuleResolutions);
       nonRelativeExternalModuleResolutions.clear();
       if (newProgram !== oldProgram) {
+        cleanupLibResolutionWatching(newProgram);
         newProgram == null ? void 0 : newProgram.getSourceFiles().forEach((newFile) => {
           var _a;
           const expected = isExternalOrCommonJsModule(newFile) ? ((_a = newFile.packageJsonLocations) == null ? void 0 : _a.length) ?? 0 : 0;
@@ -121604,7 +121709,7 @@ ${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) && (allResolutionsAreInvalidated || unmatchedRedirects || !resolution || resolution.isInvalidated || // If the name is unresolved import that was invalidated, recalculate
+        if (!seenNamesInFile.has(name, mode) && (allModuleAndTypeResolutionsAreInvalidated || 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);
@@ -121713,6 +121818,41 @@ ${lanes.join("\n")}
         // Defer non relative resolution watch because we could be using ambient modules
       });
     }
+    function resolveLibrary2(libraryName, resolveFrom, options, libFileName) {
+      var _a;
+      const host = ((_a = resolutionHost.getCompilerHost) == null ? void 0 : _a.call(resolutionHost)) || resolutionHost;
+      let resolution = resolvedLibraries == null ? void 0 : resolvedLibraries.get(libFileName);
+      if (!resolution || resolution.isInvalidated) {
+        const existingResolution = resolution;
+        resolution = resolveLibrary(libraryName, resolveFrom, options, host, libraryResolutionCache);
+        const path = resolutionHost.toPath(resolveFrom);
+        watchFailedLookupLocationsOfExternalModuleResolutions(
+          libraryName,
+          resolution,
+          path,
+          getResolvedModule2,
+          /*deferWatchingNonRelativeResolution*/
+          false
+        );
+        resolvedLibraries.set(libFileName, resolution);
+        if (existingResolution) {
+          stopWatchFailedLookupLocationOfResolution(existingResolution, path, getResolvedModule2);
+        }
+      } else {
+        if (isTraceEnabled(options, host)) {
+          const resolved = getResolvedModule2(resolution);
+          trace(
+            host,
+            (resolved == null ? void 0 : resolved.resolvedFileName) ? resolved.packageId ? Diagnostics.Reusing_resolution_of_module_0_from_1_of_old_program_it_was_successfully_resolved_to_2_with_Package_ID_3 : Diagnostics.Reusing_resolution_of_module_0_from_1_of_old_program_it_was_successfully_resolved_to_2 : Diagnostics.Reusing_resolution_of_module_0_from_1_of_old_program_it_was_not_resolved,
+            libraryName,
+            resolveFrom,
+            resolved == null ? void 0 : resolved.resolvedFileName,
+            (resolved == null ? void 0 : resolved.packageId) && packageIdToString(resolved.packageId)
+          );
+        }
+      }
+      return resolution;
+    }
     function resolveSingleModuleNameWithoutWatching(moduleName, containingFile) {
       const path = resolutionHost.toPath(containingFile);
       const resolutionsInFile = resolvedModuleNames.get(path);
@@ -122035,9 +122175,12 @@ ${lanes.join("\n")}
     }
     function invalidateResolutionsOfFailedLookupLocations() {
       var _a;
-      if (allResolutionsAreInvalidated) {
+      if (allModuleAndTypeResolutionsAreInvalidated) {
         affectingPathChecksForFile = void 0;
         invalidatePackageJsonMap();
+        if (failedLookupChecks || startsWithPathChecks || isInDirectoryChecks || affectingPathChecks) {
+          invalidateResolutions(resolvedLibraries, canInvalidateFailedLookupResolution);
+        }
         failedLookupChecks = void 0;
         startsWithPathChecks = void 0;
         isInDirectoryChecks = void 0;
@@ -122952,9 +123095,11 @@ ${lanes.join("\n")}
     if (!compilerHost.resolveTypeReferenceDirectiveReferences && !compilerHost.resolveTypeReferenceDirectives) {
       compilerHost.resolveTypeReferenceDirectiveReferences = resolutionCache.resolveTypeReferenceDirectiveReferences.bind(resolutionCache);
     }
+    compilerHost.resolveLibrary = !host.resolveLibrary ? resolutionCache.resolveLibrary.bind(resolutionCache) : host.resolveLibrary.bind(host);
     compilerHost.getModuleResolutionCache = host.resolveModuleNameLiterals || host.resolveModuleNames ? maybeBind(host, host.getModuleResolutionCache) : () => resolutionCache.getModuleResolutionCache();
     const userProvidedResolution = !!host.resolveModuleNameLiterals || !!host.resolveTypeReferenceDirectiveReferences || !!host.resolveModuleNames || !!host.resolveTypeReferenceDirectives;
     const customHasInvalidatedResolutions = userProvidedResolution ? maybeBind(host, host.hasInvalidatedResolutions) || returnTrue : returnFalse;
+    const customHasInvalidLibResolutions = host.resolveLibrary ? maybeBind(host, host.hasInvalidatedLibResolutions) || returnTrue : returnFalse;
     builderProgram = readBuilderProgram(compilerOptions, compilerHost);
     synchronizeProgram();
     watchConfigFileWildCardDirectories();
@@ -123019,7 +123164,7 @@ ${lanes.join("\n")}
           resolutionCache.onChangesAffectModuleResolution();
         }
       }
-      const hasInvalidatedResolutions = resolutionCache.createHasInvalidatedResolutions(customHasInvalidatedResolutions);
+      const { hasInvalidatedResolutions, hasInvalidatedLibResolutions } = resolutionCache.createHasInvalidatedResolutions(customHasInvalidatedResolutions, customHasInvalidLibResolutions);
       const {
         originalReadFile,
         originalFileExists,
@@ -123028,7 +123173,7 @@ ${lanes.join("\n")}
         originalWriteFile,
         readFileWithCache
       } = changeCompilerHostLikeToUseCache(compilerHost, toPath3);
-      if (isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, (path) => getSourceVersion(path, readFileWithCache), (fileName) => compilerHost.fileExists(fileName), hasInvalidatedResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
+      if (isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, (path) => getSourceVersion(path, readFileWithCache), (fileName) => compilerHost.fileExists(fileName), hasInvalidatedResolutions, hasInvalidatedLibResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
         if (hasChangedConfigFileParsingErrors) {
           if (reportFileChangeDetectedOnCreateProgram) {
             reportWatchDiagnostic(Diagnostics.File_change_detected_Starting_incremental_compilation);
@@ -123049,7 +123194,7 @@ ${lanes.join("\n")}
         if (reportFileChangeDetectedOnCreateProgram) {
           reportWatchDiagnostic(Diagnostics.File_change_detected_Starting_incremental_compilation);
         }
-        createNewProgram(hasInvalidatedResolutions);
+        createNewProgram(hasInvalidatedResolutions, hasInvalidatedLibResolutions);
       }
       reportFileChangeDetectedOnCreateProgram = false;
       if (host.afterProgramCreate && program !== builderProgram) {
@@ -123062,7 +123207,7 @@ ${lanes.join("\n")}
       compilerHost.writeFile = originalWriteFile;
       return builderProgram;
     }
-    function createNewProgram(hasInvalidatedResolutions) {
+    function createNewProgram(hasInvalidatedResolutions, hasInvalidatedLibResolutions) {
       writeLog("CreatingProgramWith::");
       writeLog(`  roots: ${JSON.stringify(rootFileNames)}`);
       writeLog(`  options: ${JSON.stringify(compilerOptions)}`);
@@ -123073,6 +123218,7 @@ ${lanes.join("\n")}
       hasChangedConfigFileParsingErrors = false;
       resolutionCache.startCachingPerDirectoryResolution();
       compilerHost.hasInvalidatedResolutions = hasInvalidatedResolutions;
+      compilerHost.hasInvalidatedLibResolutions = hasInvalidatedLibResolutions;
       compilerHost.hasChangedAutomaticTypeDirectiveNames = hasChangedAutomaticTypeDirectiveNames;
       const oldProgram = getCurrentProgram();
       builderProgram = createProgram2(rootFileNames, compilerOptions, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
@@ -123657,6 +123803,7 @@ ${lanes.join("\n")}
     compilerHost.getParsedCommandLine = (fileName) => parseConfigFile(state, fileName, toResolvedConfigFilePath(state, fileName));
     compilerHost.resolveModuleNameLiterals = maybeBind(host, host.resolveModuleNameLiterals);
     compilerHost.resolveTypeReferenceDirectiveReferences = maybeBind(host, host.resolveTypeReferenceDirectiveReferences);
+    compilerHost.resolveLibrary = maybeBind(host, host.resolveLibrary);
     compilerHost.resolveModuleNames = maybeBind(host, host.resolveModuleNames);
     compilerHost.resolveTypeReferenceDirectives = maybeBind(host, host.resolveTypeReferenceDirectives);
     compilerHost.getModuleResolutionCache = maybeBind(host, host.getModuleResolutionCache);
@@ -123694,6 +123841,23 @@ ${lanes.join("\n")}
         createTypeReferenceResolutionLoader
       );
     }
+    let libraryResolutionCache;
+    if (!compilerHost.resolveLibrary) {
+      libraryResolutionCache = createModuleResolutionCache(
+        compilerHost.getCurrentDirectory(),
+        compilerHost.getCanonicalFileName,
+        /*options*/
+        void 0,
+        moduleResolutionCache == null ? void 0 : moduleResolutionCache.getPackageJsonInfoCache()
+      );
+      compilerHost.resolveLibrary = (libraryName, resolveFrom, options2) => resolveLibrary(
+        libraryName,
+        resolveFrom,
+        options2,
+        host,
+        libraryResolutionCache
+      );
+    }
     compilerHost.getBuildInfo = (fileName, configFilePath) => getBuildInfo3(
       state,
       fileName,
@@ -123725,6 +123889,7 @@ ${lanes.join("\n")}
       compilerHost,
       moduleResolutionCache,
       typeReferenceDirectiveResolutionCache,
+      libraryResolutionCache,
       // Mutable state
       buildOrder: void 0,
       readFileWithCache: (f) => host.readFile(f),
@@ -123942,7 +124107,7 @@ ${lanes.join("\n")}
   function disableCache(state) {
     if (!state.cache)
       return;
-    const { cache, host, compilerHost, extendedConfigCache, moduleResolutionCache, typeReferenceDirectiveResolutionCache } = state;
+    const { cache, host, compilerHost, extendedConfigCache, moduleResolutionCache, typeReferenceDirectiveResolutionCache, libraryResolutionCache } = state;
     host.readFile = cache.originalReadFile;
     host.fileExists = cache.originalFileExists;
     host.directoryExists = cache.originalDirectoryExists;
@@ -123953,6 +124118,7 @@ ${lanes.join("\n")}
     extendedConfigCache.clear();
     moduleResolutionCache == null ? void 0 : moduleResolutionCache.clear();
     typeReferenceDirectiveResolutionCache == null ? void 0 : typeReferenceDirectiveResolutionCache.clear();
+    libraryResolutionCache == null ? void 0 : libraryResolutionCache.clear();
     state.cache = void 0;
   }
   function clearProjectStatus(state, resolved) {
@@ -129096,10 +129262,10 @@ ${lanes.join("\n")}
         158 /* UniqueKeyword */,
         159 /* UnknownKeyword */
       ];
-      QuotePreference = /* @__PURE__ */ ((QuotePreference5) => {
-        QuotePreference5[QuotePreference5["Single"] = 0] = "Single";
-        QuotePreference5[QuotePreference5["Double"] = 1] = "Double";
-        return QuotePreference5;
+      QuotePreference = /* @__PURE__ */ ((QuotePreference6) => {
+        QuotePreference6[QuotePreference6["Single"] = 0] = "Single";
+        QuotePreference6[QuotePreference6["Double"] = 1] = "Double";
+        return QuotePreference6;
       })(QuotePreference || {});
       displayPartWriter = getDisplayPartWriter();
       lineFeed2 = "\n";
@@ -133868,6 +134034,7 @@ ${lanes.join("\n")}
       const rootFileNames = host.getScriptFileNames().slice();
       const newSettings = host.getCompilationSettings() || getDefaultCompilerOptions2();
       const hasInvalidatedResolutions = host.hasInvalidatedResolutions || returnFalse;
+      const hasInvalidatedLibResolutions = maybeBind(host, host.hasInvalidatedLibResolutions) || returnFalse;
       const hasChangedAutomaticTypeDirectiveNames = maybeBind(host, host.hasChangedAutomaticTypeDirectiveNames);
       const projectReferences = (_b = host.getProjectReferences) == null ? void 0 : _b.call(host);
       let parsedCommandLines;
@@ -133898,6 +134065,7 @@ ${lanes.join("\n")}
         onReleaseOldSourceFile,
         onReleaseParsedCommandLine,
         hasInvalidatedResolutions,
+        hasInvalidatedLibResolutions,
         hasChangedAutomaticTypeDirectiveNames,
         trace: maybeBind(host, host.trace),
         resolveModuleNames: maybeBind(host, host.resolveModuleNames),
@@ -133906,6 +134074,7 @@ ${lanes.join("\n")}
         resolveTypeReferenceDirectives: maybeBind(host, host.resolveTypeReferenceDirectives),
         resolveModuleNameLiterals: maybeBind(host, host.resolveModuleNameLiterals),
         resolveTypeReferenceDirectiveReferences: maybeBind(host, host.resolveTypeReferenceDirectiveReferences),
+        resolveLibrary: maybeBind(host, host.resolveLibrary),
         useSourceOfProjectReferenceRedirect: maybeBind(host, host.useSourceOfProjectReferenceRedirect),
         getParsedCommandLine
       };
@@ -133927,7 +134096,7 @@ ${lanes.join("\n")}
         onUnRecoverableConfigFileDiagnostic: noop
       };
       const documentRegistryBucketKey = documentRegistry.getKeyForCompilationSettings(newSettings);
-      if (isProgramUptoDate(program, rootFileNames, newSettings, (_path, fileName) => host.getScriptVersion(fileName), (fileName) => compilerHost.fileExists(fileName), hasInvalidatedResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
+      if (isProgramUptoDate(program, rootFileNames, newSettings, (_path, fileName) => host.getScriptVersion(fileName), (fileName) => compilerHost.fileExists(fileName), hasInvalidatedResolutions, hasInvalidatedLibResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
         return;
       }
       const options = {
@@ -134231,7 +134400,7 @@ ${lanes.join("\n")}
       const sourceFile = getValidSourceFile(fileName);
       return DocumentHighlights.getDocumentHighlights(program, cancellationToken, sourceFile, position, sourceFilesToSearch);
     }
-    function findRenameLocations(fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename) {
+    function findRenameLocations(fileName, position, findInStrings, findInComments, preferences) {
       synchronizeHostData();
       const sourceFile = getValidSourceFile(fileName);
       const node = getAdjustedRenameLocation(getTouchingPropertyName(sourceFile, position));
@@ -134248,11 +134417,13 @@ ${lanes.join("\n")}
           };
         });
       } else {
+        const quotePreference = getQuotePreference(sourceFile, preferences ?? emptyOptions);
+        const providePrefixAndSuffixTextForRename = typeof preferences === "boolean" ? preferences : preferences == null ? void 0 : preferences.providePrefixAndSuffixTextForRename;
         return getReferencesWorker2(
           node,
           position,
           { findInStrings, findInComments, providePrefixAndSuffixTextForRename, use: ts_FindAllReferences_exports.FindReferencesUse.Rename },
-          (entry, originalNode, checker) => ts_FindAllReferences_exports.toRenameLocation(entry, originalNode, checker, providePrefixAndSuffixTextForRename || false)
+          (entry, originalNode, checker) => ts_FindAllReferences_exports.toRenameLocation(entry, originalNode, checker, providePrefixAndSuffixTextForRename || false, quotePreference)
         );
       }
     }
@@ -134497,6 +134668,7 @@ ${lanes.join("\n")}
       const token = findPrecedingToken(position, sourceFile);
       if (!token || token.parent.kind === 311 /* SourceFile */)
         return void 0;
+      const jsxTagWordPattern = "[a-zA-Z0-9:\\-\\._$]*";
       if (isJsxFragment(token.parent.parent)) {
         const openFragment = token.parent.parent.openingFragment;
         const closeFragment = token.parent.parent.closingFragment;
@@ -134506,7 +134678,10 @@ ${lanes.join("\n")}
         const closePos = closeFragment.getStart(sourceFile) + 2;
         if (position !== openPos && position !== closePos)
           return void 0;
-        return { ranges: [{ start: openPos, length: 0 }, { start: closePos, length: 0 }] };
+        return {
+          ranges: [{ start: openPos, length: 0 }, { start: closePos, length: 0 }],
+          wordPattern: jsxTagWordPattern
+        };
       } else {
         const tag = findAncestor(
           token.parent,
@@ -134532,7 +134707,8 @@ ${lanes.join("\n")}
         if (openingTagText !== closeTag.tagName.getText(sourceFile))
           return void 0;
         return {
-          ranges: [{ start: openTagStart, length: openTagEnd - openTagStart }, { start: closeTagStart, length: closeTagEnd - closeTagStart }]
+          ranges: [{ start: openTagStart, length: openTagEnd - openTagStart }, { start: closeTagStart, length: closeTagEnd - closeTagStart }],
+          wordPattern: jsxTagWordPattern
         };
       }
     }
@@ -134834,10 +135010,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();
@@ -136251,10 +136427,10 @@ ${lanes.join("\n")}
             () => this.languageService.getSmartSelectionRange(fileName, position)
           );
         }
-        findRenameLocations(fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename) {
+        findRenameLocations(fileName, position, findInStrings, findInComments, preferences) {
           return this.forwardJSONCall(
-            `findRenameLocations('${fileName}', ${position}, ${findInStrings}, ${findInComments}, ${providePrefixAndSuffixTextForRename})`,
-            () => this.languageService.findRenameLocations(fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename)
+            `findRenameLocations('${fileName}', ${position}, ${findInStrings}, ${findInComments})`,
+            () => this.languageService.findRenameLocations(fileName, position, findInStrings, findInComments, preferences)
           );
         }
         /// GET BRACE MATCHING
@@ -150024,7 +150200,7 @@ ${lanes.join("\n")}
         ) : isEqualityOperatorKind(previousToken.kind) && isBinaryExpression(parent2) && isEqualityOperatorKind(parent2.operatorToken.kind) ? (
           // completion at `x ===/**/` should be for the right side
           checker.getTypeAtLocation(parent2.left)
-        ) : checker.getContextualType(previousToken);
+        ) : checker.getContextualType(previousToken, 4 /* Completions */) || checker.getContextualType(previousToken);
     }
   }
   function getFirstSymbolInChain(symbol, enclosingDeclaration, checker) {
@@ -151199,7 +151375,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));
@@ -153636,8 +153812,8 @@ ${lanes.join("\n")}
     const { displayParts, symbolKind } = ts_SymbolDisplay_exports.getSymbolDisplayPartsDocumentationAndSymbolKind(checker, symbol, enclosingDeclaration.getSourceFile(), enclosingDeclaration, enclosingDeclaration, meaning);
     return { displayParts, kind: symbolKind };
   }
-  function toRenameLocation(entry, originalNode, checker, providePrefixAndSuffixText) {
-    return { ...entryToDocumentSpan(entry), ...providePrefixAndSuffixText && getPrefixAndSuffixText(entry, originalNode, checker) };
+  function toRenameLocation(entry, originalNode, checker, providePrefixAndSuffixText, quotePreference) {
+    return { ...entryToDocumentSpan(entry), ...providePrefixAndSuffixText && getPrefixAndSuffixText(entry, originalNode, checker, quotePreference) };
   }
   function toReferencedSymbolEntry(entry, symbol) {
     const referenceEntry = toReferenceEntry(entry);
@@ -153673,7 +153849,7 @@ ${lanes.join("\n")}
       };
     }
   }
-  function getPrefixAndSuffixText(entry, originalNode, checker) {
+  function getPrefixAndSuffixText(entry, originalNode, checker, quotePreference) {
     if (entry.kind !== 0 /* Span */ && isIdentifier(originalNode)) {
       const { node, kind } = entry;
       const parent2 = node.parent;
@@ -153704,6 +153880,10 @@ ${lanes.join("\n")}
         return originalNode === entry.node || checker.getSymbolAtLocation(originalNode) === checker.getSymbolAtLocation(entry.node) ? { prefixText: name + " as " } : { suffixText: " as " + name };
       }
     }
+    if (entry.kind !== 0 /* Span */ && isNumericLiteral(entry.node) && isAccessExpression(entry.node.parent)) {
+      const quote2 = getQuoteFromPreference(quotePreference);
+      return { prefixText: quote2, suffixText: quote2 };
+    }
     return emptyOptions;
   }
   function toImplementationLocation(entry, checker) {
@@ -157557,10 +157737,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) {
@@ -170323,34 +170503,49 @@ ${options.prefix}` : "\n" : options.prefix
           updateProjectIfDirty(this);
           return hasOneOrMoreJsAndNoTsFiles(this);
         }
-        static resolveModule(moduleName, initialDir, host, log, logErrors) {
-          const resolvedPath = normalizeSlashes(host.resolvePath(combinePaths(initialDir, "node_modules")));
-          log(`Loading ${moduleName} from ${initialDir} (resolved to ${resolvedPath})`);
-          const result = host.require(resolvedPath, moduleName);
-          if (result.error) {
+        static resolveModule(moduleName, initialDir, host, log) {
+          return Project3.importServicePluginSync({ name: moduleName }, [initialDir], host, log).resolvedModule;
+        }
+        /** @internal */
+        static importServicePluginSync(pluginConfigEntry, searchPaths, host, log) {
+          Debug.assertIsDefined(host.require);
+          let errorLogs;
+          let resolvedModule;
+          for (const initialDir of searchPaths) {
+            const resolvedPath = normalizeSlashes(host.resolvePath(combinePaths(initialDir, "node_modules")));
+            log(`Loading ${pluginConfigEntry.name} from ${initialDir} (resolved to ${resolvedPath})`);
+            const result = host.require(resolvedPath, pluginConfigEntry.name);
+            if (!result.error) {
+              resolvedModule = result.module;
+              break;
+            }
             const err = result.error.stack || result.error.message || JSON.stringify(result.error);
-            (logErrors || log)(`Failed to load module '${moduleName}' from ${resolvedPath}: ${err}`);
-            return void 0;
+            (errorLogs ?? (errorLogs = [])).push(`Failed to load module '${pluginConfigEntry.name}' from ${resolvedPath}: ${err}`);
           }
-          return result.module;
+          return { pluginConfigEntry, resolvedModule, errorLogs };
         }
         /** @internal */
-        static async importServicePluginAsync(moduleName, initialDir, host, log, logErrors) {
+        static async importServicePluginAsync(pluginConfigEntry, searchPaths, host, log) {
           Debug.assertIsDefined(host.importPlugin);
-          const resolvedPath = combinePaths(initialDir, "node_modules");
-          log(`Dynamically importing ${moduleName} from ${initialDir} (resolved to ${resolvedPath})`);
-          let result;
-          try {
-            result = await host.importPlugin(resolvedPath, moduleName);
-          } catch (e) {
-            result = { module: void 0, error: e };
-          }
-          if (result.error) {
+          let errorLogs;
+          let resolvedModule;
+          for (const initialDir of searchPaths) {
+            const resolvedPath = combinePaths(initialDir, "node_modules");
+            log(`Dynamically importing ${pluginConfigEntry.name} from ${initialDir} (resolved to ${resolvedPath})`);
+            let result;
+            try {
+              result = await host.importPlugin(resolvedPath, pluginConfigEntry.name);
+            } catch (e) {
+              result = { module: void 0, error: e };
+            }
+            if (!result.error) {
+              resolvedModule = result.module;
+              break;
+            }
             const err = result.error.stack || result.error.message || JSON.stringify(result.error);
-            (logErrors || log)(`Failed to dynamically import module '${moduleName}' from ${resolvedPath}: ${err}`);
-            return void 0;
+            (errorLogs ?? (errorLogs = [])).push(`Failed to dynamically import module '${pluginConfigEntry.name}' from ${resolvedPath}: ${err}`);
           }
-          return result.module;
+          return { pluginConfigEntry, resolvedModule, errorLogs };
         }
         isKnownTypesPackageName(name) {
           return this.typingsCache.isKnownTypesPackageName(name);
@@ -170477,6 +170672,10 @@ ${options.prefix}` : "\n" : options.prefix
             reusedNames
           );
         }
+        /** @internal */
+        resolveLibrary(libraryName, resolveFrom, options, libFileName) {
+          return this.resolutionCache.resolveLibrary(libraryName, resolveFrom, options, libFileName);
+        }
         directoryExists(path) {
           return this.directoryStructureHost.directoryExists(path);
         }
@@ -171041,7 +171240,9 @@ ${options.prefix}` : "\n" : options.prefix
           Debug.assert(!this.isClosed(), "Called update graph worker of closed project");
           this.writeLog(`Starting updateGraphWorker: Project: ${this.getProjectName()}`);
           const start = timestamp();
-          this.hasInvalidatedResolutions = this.resolutionCache.createHasInvalidatedResolutions(returnFalse);
+          const { hasInvalidatedResolutions, hasInvalidatedLibResolutions } = this.resolutionCache.createHasInvalidatedResolutions(returnFalse, returnFalse);
+          this.hasInvalidatedResolutions = hasInvalidatedResolutions;
+          this.hasInvalidatedLibResolutions = hasInvalidatedLibResolutions;
           this.resolutionCache.startCachingPerDirectoryResolution();
           this.program = this.languageService.getProgram();
           this.dirty = false;
@@ -171458,7 +171659,7 @@ ${options.prefix}` : "\n" : options.prefix
             combinePaths(this.projectService.getExecutingFilePath(), "../../..")
           ];
         }
-        enableGlobalPlugins(options, pluginConfigOverrides) {
+        enableGlobalPlugins(options) {
           if (!this.projectService.globalPlugins.length)
             return;
           const host = this.projectService.host;
@@ -171473,67 +171674,13 @@ ${options.prefix}` : "\n" : options.prefix
             if (options.plugins && options.plugins.some((p) => p.name === globalPluginName))
               continue;
             this.projectService.logger.info(`Loading global plugin ${globalPluginName}`);
-            this.enablePlugin({ name: globalPluginName, global: true }, searchPaths, pluginConfigOverrides);
+            this.enablePlugin({ name: globalPluginName, global: true }, searchPaths);
           }
         }
-        /**
-         * Performs the initial steps of enabling a plugin by finding and instantiating the module for a plugin synchronously using 'require'.
-         *
-         * @internal
-         */
-        beginEnablePluginSync(pluginConfigEntry, searchPaths, pluginConfigOverrides) {
-          Debug.assertIsDefined(this.projectService.host.require);
-          let errorLogs;
-          const log = (message) => this.projectService.logger.info(message);
-          const logError = (message) => {
-            (errorLogs ?? (errorLogs = [])).push(message);
-          };
-          const resolvedModule = firstDefined(searchPaths, (searchPath) => Project3.resolveModule(pluginConfigEntry.name, searchPath, this.projectService.host, log, logError));
-          return { pluginConfigEntry, pluginConfigOverrides, resolvedModule, errorLogs };
-        }
-        /**
-         * Performs the initial steps of enabling a plugin by finding and instantiating the module for a plugin asynchronously using dynamic `import`.
-         *
-         * @internal
-         */
-        async beginEnablePluginAsync(pluginConfigEntry, searchPaths, pluginConfigOverrides) {
-          Debug.assertIsDefined(this.projectService.host.importPlugin);
-          let errorLogs;
-          const log = (message) => this.projectService.logger.info(message);
-          const logError = (message) => {
-            (errorLogs ?? (errorLogs = [])).push(message);
-          };
-          let resolvedModule;
-          for (const searchPath of searchPaths) {
-            resolvedModule = await Project3.importServicePluginAsync(pluginConfigEntry.name, searchPath, this.projectService.host, log, logError);
-            if (resolvedModule !== void 0) {
-              break;
-            }
-          }
-          return { pluginConfigEntry, pluginConfigOverrides, resolvedModule, errorLogs };
-        }
-        /**
-         * Performs the remaining steps of enabling a plugin after its module has been instantiated.
-         *
-         * @internal
-         */
-        endEnablePlugin({ pluginConfigEntry, pluginConfigOverrides, resolvedModule, errorLogs }) {
-          if (resolvedModule) {
-            const configurationOverride = pluginConfigOverrides && pluginConfigOverrides.get(pluginConfigEntry.name);
-            if (configurationOverride) {
-              const pluginName = pluginConfigEntry.name;
-              pluginConfigEntry = configurationOverride;
-              pluginConfigEntry.name = pluginName;
-            }
-            this.enableProxy(resolvedModule, pluginConfigEntry);
-          } else {
-            forEach(errorLogs, (message) => this.projectService.logger.info(message));
-            this.projectService.logger.info(`Couldn't find ${pluginConfigEntry.name}`);
-          }
-        }
-        enablePlugin(pluginConfigEntry, searchPaths, pluginConfigOverrides) {
-          this.projectService.requestEnablePlugin(this, pluginConfigEntry, searchPaths, pluginConfigOverrides);
+        enablePlugin(pluginConfigEntry, searchPaths) {
+          this.projectService.requestEnablePlugin(this, pluginConfigEntry, searchPaths);
         }
+        /** @internal */
         enableProxy(pluginModuleFactory, configEntry) {
           try {
             if (typeof pluginModuleFactory !== "function") {
@@ -171727,7 +171874,7 @@ ${options.prefix}` : "\n" : options.prefix
       };
       InferredProject2 = class extends Project3 {
         /** @internal */
-        constructor(projectService, documentRegistry, compilerOptions, watchOptions, projectRootPath, currentDirectory, pluginConfigOverrides, typeAcquisition) {
+        constructor(projectService, documentRegistry, compilerOptions, watchOptions, projectRootPath, currentDirectory, typeAcquisition) {
           super(
             projectService.newInferredProjectName(),
             0 /* Inferred */,
@@ -171751,7 +171898,7 @@ ${options.prefix}` : "\n" : options.prefix
           if (!projectRootPath && !projectService.useSingleInferredProject) {
             this.canonicalCurrentDirectory = projectService.toCanonicalFileName(this.currentDirectory);
           }
-          this.enableGlobalPlugins(this.getCompilerOptions(), pluginConfigOverrides);
+          this.enableGlobalPlugins(this.getCompilerOptions());
         }
         toggleJsInferredProject(isJsInferredProject) {
           if (isJsInferredProject !== this._isJsInferredProject) {
@@ -172217,7 +172364,7 @@ ${options.prefix}` : "\n" : options.prefix
           return (_a = this.getCurrentProgram()) == null ? void 0 : _a.forEachResolvedProjectReference(cb);
         }
         /** @internal */
-        enablePluginsWithOptions(options, pluginConfigOverrides) {
+        enablePluginsWithOptions(options) {
           var _a;
           this.plugins.length = 0;
           if (!((_a = options.plugins) == null ? void 0 : _a.length) && !this.projectService.globalPlugins.length)
@@ -172235,10 +172382,10 @@ ${options.prefix}` : "\n" : options.prefix
           }
           if (options.plugins) {
             for (const pluginConfigEntry of options.plugins) {
-              this.enablePlugin(pluginConfigEntry, searchPaths, pluginConfigOverrides);
+              this.enablePlugin(pluginConfigEntry, searchPaths);
             }
           }
-          return this.enableGlobalPlugins(options, pluginConfigOverrides);
+          return this.enableGlobalPlugins(options);
         }
         /**
          * Get the errors that dont have any file name associated
@@ -172331,7 +172478,7 @@ ${options.prefix}` : "\n" : options.prefix
       };
       ExternalProject2 = class extends Project3 {
         /** @internal */
-        constructor(externalProjectName, projectService, documentRegistry, compilerOptions, lastFileExceededProgramSize, compileOnSaveEnabled, projectFilePath, pluginConfigOverrides, watchOptions) {
+        constructor(externalProjectName, projectService, documentRegistry, compilerOptions, lastFileExceededProgramSize, compileOnSaveEnabled, projectFilePath, watchOptions) {
           super(
             externalProjectName,
             2 /* External */,
@@ -172349,7 +172496,7 @@ ${options.prefix}` : "\n" : options.prefix
           this.externalProjectName = externalProjectName;
           this.compileOnSaveEnabled = compileOnSaveEnabled;
           this.excludedFiles = [];
-          this.enableGlobalPlugins(this.getCompilerOptions(), pluginConfigOverrides);
+          this.enableGlobalPlugins(this.getCompilerOptions());
         }
         updateGraph() {
           const result = super.updateGraph();
@@ -173711,7 +173858,6 @@ ${options.prefix}` : "\n" : options.prefix
             options.compileOnSave === void 0 ? true : options.compileOnSave,
             /*projectFilePath*/
             void 0,
-            this.currentPluginConfigOverrides,
             watchOptionsAndErrors == null ? void 0 : watchOptionsAndErrors.watchOptions
           );
           project.setProjectErrors(watchOptionsAndErrors == null ? void 0 : watchOptionsAndErrors.errors);
@@ -173860,7 +174006,7 @@ ${options.prefix}` : "\n" : options.prefix
             project.enableLanguageService();
             this.watchWildcards(configFilename, configFileExistenceInfo, project);
           }
-          project.enablePluginsWithOptions(compilerOptions, this.currentPluginConfigOverrides);
+          project.enablePluginsWithOptions(compilerOptions);
           const filesToAdd = parsedCommandLine.fileNames.concat(project.getExternalFiles());
           this.updateRootAndOptionsOfNonInferredProject(project, filesToAdd, fileNamePropertyReader, compilerOptions, parsedCommandLine.typeAcquisition, parsedCommandLine.compileOnSave, parsedCommandLine.watchOptions);
           (_b = tracing) == null ? void 0 : _b.pop();
@@ -174201,7 +174347,7 @@ ${options.prefix}` : "\n" : options.prefix
             typeAcquisition = this.typeAcquisitionForInferredProjects;
           }
           watchOptionsAndErrors = watchOptionsAndErrors || void 0;
-          const project = new InferredProject2(this, this.documentRegistry, compilerOptions, watchOptionsAndErrors == null ? void 0 : watchOptionsAndErrors.watchOptions, projectRootPath, currentDirectory, this.currentPluginConfigOverrides, typeAcquisition);
+          const project = new InferredProject2(this, this.documentRegistry, compilerOptions, watchOptionsAndErrors == null ? void 0 : watchOptionsAndErrors.watchOptions, projectRootPath, currentDirectory, typeAcquisition);
           project.setProjectErrors(watchOptionsAndErrors == null ? void 0 : watchOptionsAndErrors.errors);
           if (isSingleInferredProject) {
             this.inferredProjects.unshift(project);
@@ -175428,8 +175574,11 @@ Dynamic files must always be opened with service's current directory or service
           }
           return false;
         }
-        /** @internal */
-        requestEnablePlugin(project, pluginConfigEntry, searchPaths, pluginConfigOverrides) {
+        /**
+         * Performs the initial steps of enabling a plugin by finding and instantiating the module for a plugin either asynchronously or synchronously
+         * @internal
+         */
+        requestEnablePlugin(project, pluginConfigEntry, searchPaths) {
           if (!this.host.importPlugin && !this.host.require) {
             this.logger.info("Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded");
             return;
@@ -175440,7 +175589,12 @@ Dynamic files must always be opened with service's current directory or service
             return;
           }
           if (this.host.importPlugin) {
-            const importPromise = project.beginEnablePluginAsync(pluginConfigEntry, searchPaths, pluginConfigOverrides);
+            const importPromise = Project3.importServicePluginAsync(
+              pluginConfigEntry,
+              searchPaths,
+              this.host,
+              (s) => this.logger.info(s)
+            );
             this.pendingPluginEnablements ?? (this.pendingPluginEnablements = /* @__PURE__ */ new Map());
             let promises = this.pendingPluginEnablements.get(project);
             if (!promises)
@@ -175448,7 +175602,31 @@ Dynamic files must always be opened with service's current directory or service
             promises.push(importPromise);
             return;
           }
-          project.endEnablePlugin(project.beginEnablePluginSync(pluginConfigEntry, searchPaths, pluginConfigOverrides));
+          this.endEnablePlugin(project, Project3.importServicePluginSync(
+            pluginConfigEntry,
+            searchPaths,
+            this.host,
+            (s) => this.logger.info(s)
+          ));
+        }
+        /**
+         * Performs the remaining steps of enabling a plugin after its module has been instantiated.
+         * @internal
+         */
+        endEnablePlugin(project, { pluginConfigEntry, resolvedModule, errorLogs }) {
+          var _a;
+          if (resolvedModule) {
+            const configurationOverride = (_a = this.currentPluginConfigOverrides) == null ? void 0 : _a.get(pluginConfigEntry.name);
+            if (configurationOverride) {
+              const pluginName = pluginConfigEntry.name;
+              pluginConfigEntry = configurationOverride;
+              pluginConfigEntry.name = pluginName;
+            }
+            project.enableProxy(resolvedModule, pluginConfigEntry);
+          } else {
+            forEach(errorLogs, (message) => this.logger.info(message));
+            this.logger.info(`Couldn't find ${pluginConfigEntry.name}`);
+          }
         }
         /** @internal */
         hasNewPluginEnablementRequests() {
@@ -175502,7 +175680,7 @@ Dynamic files must always be opened with service's current directory or service
             return;
           }
           for (const result of results) {
-            project.endEnablePlugin(result);
+            this.endEnablePlugin(project, result);
           }
           this.delayUpdateProjectGraph(project);
         }
@@ -175870,14 +176048,14 @@ ${json}${newLine}`;
   function createDocumentSpanSet() {
     return createSet(({ textSpan }) => textSpan.start + 100003 * textSpan.length, documentSpansEqual);
   }
-  function getRenameLocationsWorker(projects, defaultProject, initialLocation, findInStrings, findInComments, { providePrefixAndSuffixTextForRename }) {
+  function getRenameLocationsWorker(projects, defaultProject, initialLocation, findInStrings, findInComments, preferences) {
     const perProjectResults = getPerProjectReferences(
       projects,
       defaultProject,
       initialLocation,
       /*isForRename*/
       true,
-      (project, position) => project.getLanguageService().findRenameLocations(position.fileName, position.pos, findInStrings, findInComments, providePrefixAndSuffixTextForRename),
+      (project, position) => project.getLanguageService().findRenameLocations(position.fileName, position.pos, findInStrings, findInComments, preferences),
       (renameLocation, cb) => cb(documentSpanLocation(renameLocation))
     );
     if (isArray(perProjectResults)) {
@@ -180659,6 +180837,7 @@ ${e.message}`;
     getImportNeedsImportStarHelper: () => getImportNeedsImportStarHelper,
     getIndentSize: () => getIndentSize,
     getIndentString: () => getIndentString,
+    getInferredLibraryNameResolveFrom: () => getInferredLibraryNameResolveFrom,
     getInitializedVariables: () => getInitializedVariables,
     getInitializerOfBinaryExpression: () => getInitializerOfBinaryExpression,
     getInitializerOfBindingOrAssignmentElement: () => getInitializerOfBindingOrAssignmentElement,
@@ -180779,6 +180958,7 @@ ${e.message}`;
     getOperatorAssociativity: () => getOperatorAssociativity,
     getOperatorPrecedence: () => getOperatorPrecedence,
     getOptionFromName: () => getOptionFromName,
+    getOptionsForLibraryResolution: () => getOptionsForLibraryResolution,
     getOptionsNameMap: () => getOptionsNameMap,
     getOrCreateEmitNode: () => getOrCreateEmitNode,
     getOrCreateExternalHelpersModuleNameIfNeeded: () => getOrCreateExternalHelpersModuleNameIfNeeded,
@@ -181890,6 +182070,7 @@ ${e.message}`;
     resolutionExtensionIsTSOrJson: () => resolutionExtensionIsTSOrJson,
     resolveConfigFileProjectName: () => resolveConfigFileProjectName,
     resolveJSModule: () => resolveJSModule,
+    resolveLibrary: () => resolveLibrary,
     resolveModuleName: () => resolveModuleName,
     resolveModuleNameFromCache: () => resolveModuleNameFromCache,
     resolvePackageNameToPackageJson: () => resolvePackageNameToPackageJson,
@@ -183034,6 +183215,7 @@ ${e.message}`;
     getImportNeedsImportStarHelper: () => getImportNeedsImportStarHelper,
     getIndentSize: () => getIndentSize,
     getIndentString: () => getIndentString,
+    getInferredLibraryNameResolveFrom: () => getInferredLibraryNameResolveFrom,
     getInitializedVariables: () => getInitializedVariables,
     getInitializerOfBinaryExpression: () => getInitializerOfBinaryExpression,
     getInitializerOfBindingOrAssignmentElement: () => getInitializerOfBindingOrAssignmentElement,
@@ -183154,6 +183336,7 @@ ${e.message}`;
     getOperatorAssociativity: () => getOperatorAssociativity,
     getOperatorPrecedence: () => getOperatorPrecedence,
     getOptionFromName: () => getOptionFromName,
+    getOptionsForLibraryResolution: () => getOptionsForLibraryResolution,
     getOptionsNameMap: () => getOptionsNameMap,
     getOrCreateEmitNode: () => getOrCreateEmitNode,
     getOrCreateExternalHelpersModuleNameIfNeeded: () => getOrCreateExternalHelpersModuleNameIfNeeded,
@@ -184265,6 +184448,7 @@ ${e.message}`;
     resolutionExtensionIsTSOrJson: () => resolutionExtensionIsTSOrJson,
     resolveConfigFileProjectName: () => resolveConfigFileProjectName,
     resolveJSModule: () => resolveJSModule,
+    resolveLibrary: () => resolveLibrary,
     resolveModuleName: () => resolveModuleName,
     resolveModuleNameFromCache: () => resolveModuleNameFromCache,
     resolvePackageNameToPackageJson: () => resolvePackageNameToPackageJson,