typescript 5.1.0-dev.20230420 → 5.1.0-dev.20230421

package/lib/tsserver.js

@@ -787,6 +787,7 @@ __export(server_exports, {
   getImportNeedsImportStarHelper: () => getImportNeedsImportStarHelper,
   getIndentSize: () => getIndentSize,
   getIndentString: () => getIndentString,
+  getInferredLibraryNameResolveFrom: () => getInferredLibraryNameResolveFrom,
   getInitializedVariables: () => getInitializedVariables,
   getInitializerOfBinaryExpression: () => getInitializerOfBinaryExpression,
   getInitializerOfBindingOrAssignmentElement: () => getInitializerOfBindingOrAssignmentElement,
@@ -907,6 +908,7 @@ __export(server_exports, {
   getOperatorAssociativity: () => getOperatorAssociativity,
   getOperatorPrecedence: () => getOperatorPrecedence,
   getOptionFromName: () => getOptionFromName,
+  getOptionsForLibraryResolution: () => getOptionsForLibraryResolution,
   getOptionsNameMap: () => getOptionsNameMap,
   getOrCreateEmitNode: () => getOrCreateEmitNode,
   getOrCreateExternalHelpersModuleNameIfNeeded: () => getOrCreateExternalHelpersModuleNameIfNeeded,
@@ -2018,6 +2020,7 @@ __export(server_exports, {
   resolutionExtensionIsTSOrJson: () => resolutionExtensionIsTSOrJson,
   resolveConfigFileProjectName: () => resolveConfigFileProjectName,
   resolveJSModule: () => resolveJSModule,
+  resolveLibrary: () => resolveLibrary,
   resolveModuleName: () => resolveModuleName,
   resolveModuleNameFromCache: () => resolveModuleNameFromCache,
   resolvePackageNameToPackageJson: () => resolvePackageNameToPackageJson,
@@ -2301,7 +2304,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230420`;
+var version = `${versionMajorMinor}.0-dev.20230421`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -36748,7 +36751,9 @@ var Parser;
         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) {
@@ -41616,13 +41621,12 @@ function createModuleOrTypeReferenceResolutionCache(currentDirectory, getCanonic
     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);
@@ -41637,6 +41641,12 @@ function createTypeReferenceDirectiveResolutionCache(currentDirectory, getCanoni
     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(
@@ -58963,7 +58973,8 @@ function createTypeChecker(host) {
           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 */;
@@ -118013,6 +118024,25 @@ function forEachProjectReference(projectReferences, resolvedProjectReferences, c
   }
 }
 var inferredTypesContainingFile = "__inferred type names__.ts";
+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 */:
@@ -118056,7 +118086,7 @@ function getReferencedFileLocation(getSourceFileByPath, ref) {
   }
   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))
@@ -118071,6 +118101,8 @@ function isProgramUptoDate(program, rootFileNames, newOptions, getSourceVersion,
   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;
@@ -118257,6 +118289,8 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
   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();
@@ -118344,6 +118378,14 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       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();
@@ -118510,6 +118552,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     );
   }
   oldProgram = void 0;
+  resolvedLibProcessing = void 0;
   const program = {
     getRootFileNames: () => rootNames,
     getSourceFile,
@@ -118551,6 +118594,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     sourceFileToPackageName,
     redirectTargetsMap,
     usesUriStyleNodeCoreModules,
+    resolvedLibReferences,
     isEmittedFile,
     getConfigFileParsingDiagnostics: getConfigFileParsingDiagnostics2,
     getProjectReferences,
@@ -119039,6 +119083,9 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     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 */;
@@ -119075,6 +119122,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     sourceFileToPackageName = oldProgram.sourceFileToPackageName;
     redirectTargetsMap = oldProgram.redirectTargetsMap;
     usesUriStyleNodeCoreModules = oldProgram.usesUriStyleNodeCoreModules;
+    resolvedLibReferences = oldProgram.resolvedLibReferences;
     return 2 /* Completely */;
   }
   function getEmitHost(writeFileCallback) {
@@ -119184,7 +119232,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     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() {
@@ -119775,11 +119823,10 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     }
   }
   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);
@@ -120204,25 +120251,55 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     }
   }
   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;
+    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;
+      }
     }
-    return combinePaths(defaultLibraryPath, libFileName);
+    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),
@@ -123224,7 +123301,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   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();
@@ -123240,6 +123317,13 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     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);
@@ -123256,6 +123340,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     finishCachingPerDirectoryResolution,
     resolveModuleNameLiterals,
     resolveTypeReferenceDirectiveReferences,
+    resolveLibrary: resolveLibrary2,
     resolveSingleModuleNameWithoutWatching,
     removeResolutionsFromProjectReferenceRedirects,
     removeResolutionsOfFile,
@@ -123291,16 +123376,18 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     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());
@@ -123321,24 +123408,45 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     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;
@@ -123447,7 +123555,7 @@ 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) && (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);
@@ -123556,6 +123664,41 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       // 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);
@@ -123878,9 +124021,12 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   }
   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;
@@ -124782,9 +124928,11 @@ function createWatchProgram(host) {
   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();
@@ -124849,7 +124997,7 @@ function createWatchProgram(host) {
         resolutionCache.onChangesAffectModuleResolution();
       }
     }
-    const hasInvalidatedResolutions = resolutionCache.createHasInvalidatedResolutions(customHasInvalidatedResolutions);
+    const { hasInvalidatedResolutions, hasInvalidatedLibResolutions } = resolutionCache.createHasInvalidatedResolutions(customHasInvalidatedResolutions, customHasInvalidLibResolutions);
     const {
       originalReadFile,
       originalFileExists,
@@ -124858,7 +125006,7 @@ function createWatchProgram(host) {
       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);
@@ -124879,7 +125027,7 @@ function createWatchProgram(host) {
       if (reportFileChangeDetectedOnCreateProgram) {
         reportWatchDiagnostic(Diagnostics.File_change_detected_Starting_incremental_compilation);
       }
-      createNewProgram(hasInvalidatedResolutions);
+      createNewProgram(hasInvalidatedResolutions, hasInvalidatedLibResolutions);
     }
     reportFileChangeDetectedOnCreateProgram = false;
     if (host.afterProgramCreate && program !== builderProgram) {
@@ -124892,7 +125040,7 @@ function createWatchProgram(host) {
     compilerHost.writeFile = originalWriteFile;
     return builderProgram;
   }
-  function createNewProgram(hasInvalidatedResolutions) {
+  function createNewProgram(hasInvalidatedResolutions, hasInvalidatedLibResolutions) {
     writeLog("CreatingProgramWith::");
     writeLog(`  roots: ${JSON.stringify(rootFileNames)}`);
     writeLog(`  options: ${JSON.stringify(compilerOptions)}`);
@@ -124903,6 +125051,7 @@ function createWatchProgram(host) {
     hasChangedConfigFileParsingErrors = false;
     resolutionCache.startCachingPerDirectoryResolution();
     compilerHost.hasInvalidatedResolutions = hasInvalidatedResolutions;
+    compilerHost.hasInvalidatedLibResolutions = hasInvalidatedLibResolutions;
     compilerHost.hasChangedAutomaticTypeDirectiveNames = hasChangedAutomaticTypeDirectiveNames;
     const oldProgram = getCurrentProgram();
     builderProgram = createProgram2(rootFileNames, compilerOptions, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
@@ -125476,6 +125625,7 @@ function createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, optio
   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);
@@ -125513,6 +125663,23 @@ function createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, optio
       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,
@@ -125544,6 +125711,7 @@ function createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, optio
     compilerHost,
     moduleResolutionCache,
     typeReferenceDirectiveResolutionCache,
+    libraryResolutionCache,
     // Mutable state
     buildOrder: void 0,
     readFileWithCache: (f) => host.readFile(f),
@@ -125761,7 +125929,7 @@ function enableCache(state) {
 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;
@@ -125772,6 +125940,7 @@ function disableCache(state) {
   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) {
@@ -129529,10 +129698,10 @@ function makeImport(defaultImport, namedImports, moduleSpecifier, quotePreferenc
 function makeStringLiteral(text, quotePreference) {
   return factory.createStringLiteral(text, quotePreference === 0 /* Single */);
 }
-var QuotePreference = /* @__PURE__ */ ((QuotePreference5) => {
-  QuotePreference5[QuotePreference5["Single"] = 0] = "Single";
-  QuotePreference5[QuotePreference5["Double"] = 1] = "Double";
-  return QuotePreference5;
+var QuotePreference = /* @__PURE__ */ ((QuotePreference6) => {
+  QuotePreference6[QuotePreference6["Single"] = 0] = "Single";
+  QuotePreference6[QuotePreference6["Double"] = 1] = "Double";
+  return QuotePreference6;
 })(QuotePreference || {});
 function quotePreferenceFromString(str, sourceFile) {
   return isStringDoubleQuoted(str, sourceFile) ? 1 /* Double */ : 0 /* Single */;
@@ -136115,6 +136284,7 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
     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;
@@ -136145,6 +136315,7 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
       onReleaseOldSourceFile,
       onReleaseParsedCommandLine,
       hasInvalidatedResolutions,
+      hasInvalidatedLibResolutions,
       hasChangedAutomaticTypeDirectiveNames,
       trace: maybeBind(host, host.trace),
       resolveModuleNames: maybeBind(host, host.resolveModuleNames),
@@ -136153,6 +136324,7 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
       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
     };
@@ -136174,7 +136346,7 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
       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 = {
@@ -136478,7 +136650,7 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
     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));
@@ -136495,11 +136667,13 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
         };
       });
     } 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)
       );
     }
   }
@@ -136744,6 +136918,7 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
     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;
@@ -136753,7 +136928,10 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
       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,
@@ -136779,7 +136957,8 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
       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
       };
     }
   }
@@ -137807,10 +137986,10 @@ var LanguageServiceShimObject = class extends ShimBase {
       () => 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
@@ -150993,7 +151172,7 @@ function getContextualType(previousToken, position, sourceFile, checker) {
       ) : 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) {
@@ -154545,8 +154724,8 @@ function getDefinitionKindAndDisplayParts(symbol, checker, node) {
   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);
@@ -154582,7 +154761,7 @@ function entryToDocumentSpan(entry) {
     };
   }
 }
-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;
@@ -154613,6 +154792,10 @@ function getPrefixAndSuffixText(entry, originalNode, checker) {
       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) {
@@ -169577,6 +169760,7 @@ __export(ts_exports2, {
   getImportNeedsImportStarHelper: () => getImportNeedsImportStarHelper,
   getIndentSize: () => getIndentSize,
   getIndentString: () => getIndentString,
+  getInferredLibraryNameResolveFrom: () => getInferredLibraryNameResolveFrom,
   getInitializedVariables: () => getInitializedVariables,
   getInitializerOfBinaryExpression: () => getInitializerOfBinaryExpression,
   getInitializerOfBindingOrAssignmentElement: () => getInitializerOfBindingOrAssignmentElement,
@@ -169697,6 +169881,7 @@ __export(ts_exports2, {
   getOperatorAssociativity: () => getOperatorAssociativity,
   getOperatorPrecedence: () => getOperatorPrecedence,
   getOptionFromName: () => getOptionFromName,
+  getOptionsForLibraryResolution: () => getOptionsForLibraryResolution,
   getOptionsNameMap: () => getOptionsNameMap,
   getOrCreateEmitNode: () => getOrCreateEmitNode,
   getOrCreateExternalHelpersModuleNameIfNeeded: () => getOrCreateExternalHelpersModuleNameIfNeeded,
@@ -170808,6 +170993,7 @@ __export(ts_exports2, {
   resolutionExtensionIsTSOrJson: () => resolutionExtensionIsTSOrJson,
   resolveConfigFileProjectName: () => resolveConfigFileProjectName,
   resolveJSModule: () => resolveJSModule,
+  resolveLibrary: () => resolveLibrary,
   resolveModuleName: () => resolveModuleName,
   resolveModuleNameFromCache: () => resolveModuleNameFromCache,
   resolvePackageNameToPackageJson: () => resolvePackageNameToPackageJson,
@@ -172962,34 +173148,49 @@ var Project3 = class {
     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);
@@ -173116,6 +173317,10 @@ var Project3 = class {
       reusedNames
     );
   }
+  /** @internal */
+  resolveLibrary(libraryName, resolveFrom, options, libFileName) {
+    return this.resolutionCache.resolveLibrary(libraryName, resolveFrom, options, libFileName);
+  }
   directoryExists(path) {
     return this.directoryStructureHost.directoryExists(path);
   }
@@ -173680,7 +173885,9 @@ var Project3 = class {
     Debug.assert(!this.isClosed(), "Called update graph worker of closed project");
     this.writeLog(`Starting updateGraphWorker: Project: ${this.getProjectName()}`);
     const start2 = 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;
@@ -174097,7 +174304,7 @@ var Project3 = class {
       combinePaths(this.projectService.getExecutingFilePath(), "../../..")
     ];
   }
-  enableGlobalPlugins(options, pluginConfigOverrides) {
+  enableGlobalPlugins(options) {
     if (!this.projectService.globalPlugins.length)
       return;
     const host = this.projectService.host;
@@ -174112,67 +174319,13 @@ var Project3 = class {
       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") {
@@ -174388,7 +174541,7 @@ function extractUnresolvedImportsFromSourceFile(file, ambientModules, cachedUnre
 }
 var 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 */,
@@ -174412,7 +174565,7 @@ var InferredProject2 = class extends Project3 {
     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) {
@@ -174878,7 +175031,7 @@ var ConfiguredProject2 = class extends Project3 {
     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)
@@ -174896,10 +175049,10 @@ var ConfiguredProject2 = class extends Project3 {
     }
     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
@@ -174992,7 +175145,7 @@ var ConfiguredProject2 = class extends Project3 {
 };
 var 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 */,
@@ -175010,7 +175163,7 @@ var ExternalProject2 = class extends Project3 {
     this.externalProjectName = externalProjectName;
     this.compileOnSaveEnabled = compileOnSaveEnabled;
     this.excludedFiles = [];
-    this.enableGlobalPlugins(this.getCompilerOptions(), pluginConfigOverrides);
+    this.enableGlobalPlugins(this.getCompilerOptions());
   }
   updateGraph() {
     const result = super.updateGraph();
@@ -176346,7 +176499,6 @@ var _ProjectService = class {
       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);
@@ -176495,7 +176647,7 @@ var _ProjectService = class {
       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();
@@ -176836,7 +176988,7 @@ var _ProjectService = class {
       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);
@@ -178063,8 +178215,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;
@@ -178075,7 +178230,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)
@@ -178083,7 +178243,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() {
@@ -178137,7 +178321,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);
   }
@@ -178599,14 +178783,14 @@ function combineProjectOutput(defaultValue, getValue, projects, action) {
 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)) {
@@ -182753,13 +182937,6 @@ function initializeNodeSystem() {
       return (_a = global.gc) == null ? void 0 : _a.call(global);
     };
   }
-  sys2.require = (initialDir, moduleName) => {
-    try {
-      return { module: require(resolveJSModule(moduleName, initialDir, sys2)), error: void 0 };
-    } catch (error) {
-      return { module: void 0, error };
-    }
-  };
   let cancellationToken;
   try {
     const factory2 = require("./cancellationToken");
@@ -184017,6 +184194,7 @@ start(initializeNodeSystem(), require("os").platform());
   getImportNeedsImportStarHelper,
   getIndentSize,
   getIndentString,
+  getInferredLibraryNameResolveFrom,
   getInitializedVariables,
   getInitializerOfBinaryExpression,
   getInitializerOfBindingOrAssignmentElement,
@@ -184137,6 +184315,7 @@ start(initializeNodeSystem(), require("os").platform());
   getOperatorAssociativity,
   getOperatorPrecedence,
   getOptionFromName,
+  getOptionsForLibraryResolution,
   getOptionsNameMap,
   getOrCreateEmitNode,
   getOrCreateExternalHelpersModuleNameIfNeeded,
@@ -185248,6 +185427,7 @@ start(initializeNodeSystem(), require("os").platform());
   resolutionExtensionIsTSOrJson,
   resolveConfigFileProjectName,
   resolveJSModule,
+  resolveLibrary,
   resolveModuleName,
   resolveModuleNameFromCache,
   resolvePackageNameToPackageJson,