typescript 5.3.0-dev.20230922 → 5.3.0-dev.20230923

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-dev.20230922`;
+var version = `${versionMajorMinor}.0-dev.20230923`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -6642,6 +6642,7 @@ var Diagnostics = {
   await_using_statements_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules: diag(2852, 1 /* Error */, "await_using_statements_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules_2852", "'await using' statements are only allowed within async functions and at the top levels of modules."),
   await_using_statements_are_only_allowed_at_the_top_level_of_a_file_when_that_file_is_a_module_but_this_file_has_no_imports_or_exports_Consider_adding_an_empty_export_to_make_this_file_a_module: diag(2853, 1 /* Error */, "await_using_statements_are_only_allowed_at_the_top_level_of_a_file_when_that_file_is_a_module_but_th_2853", "'await using' statements are only allowed at the top level of a file when that file is a module, but this file has no imports or exports. Consider adding an empty 'export {}' to make this file a module."),
   Top_level_await_using_statements_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_node16_or_nodenext_and_the_target_option_is_set_to_es2017_or_higher: diag(2854, 1 /* Error */, "Top_level_await_using_statements_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_sys_2854", "Top-level 'await using' statements are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', or 'nodenext', and the 'target' option is set to 'es2017' or higher."),
+  Class_field_0_defined_by_the_parent_class_is_not_accessible_in_the_child_class_via_super: diag(2855, 1 /* Error */, "Class_field_0_defined_by_the_parent_class_is_not_accessible_in_the_child_class_via_super_2855", "Class field '{0}' defined by the parent class is not accessible in the child class via super."),
   Import_declaration_0_is_using_private_name_1: diag(4e3, 1 /* Error */, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
   Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, 1 /* Error */, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
   Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, 1 /* Error */, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -10805,6 +10806,9 @@ function isAccessor(node) {
 function isAutoAccessorPropertyDeclaration(node) {
   return isPropertyDeclaration(node) && hasAccessorModifier(node);
 }
+function isClassFieldAndNotAutoAccessor(node) {
+  return node.parent && isClassLike(node.parent) && isPropertyDeclaration(node) && !hasAccessorModifier(node);
+}
 function isMethodOrAccessor(node) {
   switch (node.kind) {
     case 174 /* MethodDeclaration */:
@@ -11458,8 +11462,8 @@ function moduleResolutionIsEqualTo(oldResolution, newResolution) {
   return oldResolution === newResolution || oldResolution.resolvedModule === newResolution.resolvedModule || !!oldResolution.resolvedModule && !!newResolution.resolvedModule && oldResolution.resolvedModule.isExternalLibraryImport === newResolution.resolvedModule.isExternalLibraryImport && oldResolution.resolvedModule.extension === newResolution.resolvedModule.extension && oldResolution.resolvedModule.resolvedFileName === newResolution.resolvedModule.resolvedFileName && oldResolution.resolvedModule.originalPath === newResolution.resolvedModule.originalPath && packageIdIsEqual(oldResolution.resolvedModule.packageId, newResolution.resolvedModule.packageId) && oldResolution.node10Result === newResolution.node10Result;
 }
 function createModuleNotFoundChain(sourceFile, host, moduleReference, mode, packageName) {
-  var _a, _b, _c;
-  const node10Result = (_c = (_b = (_a = host.resolvedModules) == null ? void 0 : _a.get(sourceFile.path)) == null ? void 0 : _b.get(moduleReference, mode)) == null ? void 0 : _c.node10Result;
+  var _a;
+  const node10Result = (_a = host.getResolvedModule(sourceFile, moduleReference, mode)) == null ? void 0 : _a.node10Result;
   const result = node10Result ? chainDiagnosticMessages(
     /*details*/
     void 0,
@@ -11501,14 +11505,14 @@ function packageIdToString(packageId) {
 function typeDirectiveIsEqualTo(oldResolution, newResolution) {
   return oldResolution === newResolution || oldResolution.resolvedTypeReferenceDirective === newResolution.resolvedTypeReferenceDirective || !!oldResolution.resolvedTypeReferenceDirective && !!newResolution.resolvedTypeReferenceDirective && oldResolution.resolvedTypeReferenceDirective.resolvedFileName === newResolution.resolvedTypeReferenceDirective.resolvedFileName && !!oldResolution.resolvedTypeReferenceDirective.primary === !!newResolution.resolvedTypeReferenceDirective.primary && oldResolution.resolvedTypeReferenceDirective.originalPath === newResolution.resolvedTypeReferenceDirective.originalPath;
 }
-function hasChangesInResolutions(names, newSourceFile, newResolutions, oldResolutions, comparer, nameAndModeGetter) {
+function hasChangesInResolutions(names, newSourceFile, newResolutions, getOldResolution, comparer, nameAndModeGetter) {
   Debug.assert(names.length === newResolutions.length);
   for (let i = 0; i < names.length; i++) {
     const newResolution = newResolutions[i];
     const entry = names[i];
     const name = nameAndModeGetter.getName(entry);
     const mode = nameAndModeGetter.getMode(entry, newSourceFile);
-    const oldResolution = oldResolutions && oldResolutions.get(name, mode);
+    const oldResolution = getOldResolution(name, mode);
     const changed = oldResolution ? !newResolution || !comparer(oldResolution, newResolution) : newResolution;
     if (changed) {
       return true;
@@ -16474,11 +16478,11 @@ function createSymlinkCache(cwd, getCanonicalFileName) {
         (symlinkedDirectories || (symlinkedDirectories = /* @__PURE__ */ new Map())).set(symlinkPath, real);
       }
     },
-    setSymlinksFromResolutions(resolvedModules, resolvedTypeReferenceDirectiveNames, typeReferenceDirectives) {
+    setSymlinksFromResolutions(forEachResolvedModule, forEachResolvedTypeReferenceDirective, typeReferenceDirectives) {
       Debug.assert(!hasProcessedResolutions);
       hasProcessedResolutions = true;
-      resolvedModules == null ? void 0 : resolvedModules.forEach((cache) => cache.forEach((resolution) => processResolution(this, resolution.resolvedModule)));
-      resolvedTypeReferenceDirectiveNames == null ? void 0 : resolvedTypeReferenceDirectiveNames.forEach((cache) => cache.forEach((resolution) => processResolution(this, resolution.resolvedTypeReferenceDirective)));
+      forEachResolvedModule((resolution) => processResolution(this, resolution.resolvedModule));
+      forEachResolvedTypeReferenceDirective((resolution) => processResolution(this, resolution.resolvedTypeReferenceDirective));
       typeReferenceDirectives.forEach((resolution) => processResolution(this, resolution.resolvedTypeReferenceDirective));
     },
     hasProcessedResolutions: () => hasProcessedResolutions
@@ -46298,7 +46302,7 @@ function createTypeChecker(host) {
     return isStringLiteralLike(moduleReferenceExpression) ? resolveExternalModule(location, moduleReferenceExpression.text, moduleNotFoundError, moduleReferenceExpression, isForAugmentation) : void 0;
   }
   function resolveExternalModule(location, moduleReference, moduleNotFoundError, errorNode, isForAugmentation = false) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     if (startsWith(moduleReference, "@types/")) {
       const diag2 = Diagnostics.Cannot_import_type_declaration_files_Consider_importing_0_instead_of_1;
       const withoutAtTypePrefix = removePrefix(moduleReference, "@types/");
@@ -46316,7 +46320,7 @@ function createTypeChecker(host) {
     const contextSpecifier = isStringLiteralLike(location) ? location : ((_a = findAncestor(location, isImportCall)) == null ? void 0 : _a.arguments[0]) || ((_b = findAncestor(location, isImportDeclaration)) == null ? void 0 : _b.moduleSpecifier) || ((_c = findAncestor(location, isExternalModuleImportEqualsDeclaration)) == null ? void 0 : _c.moduleReference.expression) || ((_d = findAncestor(location, isExportDeclaration)) == null ? void 0 : _d.moduleSpecifier) || ((_e = isModuleDeclaration(location) ? location : location.parent && isModuleDeclaration(location.parent) && location.parent.name === location ? location.parent : void 0) == null ? void 0 : _e.name) || ((_f = isLiteralImportTypeNode(location) ? location : void 0) == null ? void 0 : _f.argument.literal);
     const mode = contextSpecifier && isStringLiteralLike(contextSpecifier) ? getModeForUsageLocation(currentSourceFile, contextSpecifier) : currentSourceFile.impliedNodeFormat;
     const moduleResolutionKind = getEmitModuleResolutionKind(compilerOptions);
-    const resolvedModule = (_i = (_h = (_g = host.resolvedModules) == null ? void 0 : _g.get(currentSourceFile.path)) == null ? void 0 : _h.get(moduleReference, mode)) == null ? void 0 : _i.resolvedModule;
+    const resolvedModule = (_g = host.getResolvedModule(currentSourceFile, moduleReference, mode)) == null ? void 0 : _g.resolvedModule;
     const resolutionDiagnostic = resolvedModule && getResolutionDiagnostic(compilerOptions, resolvedModule, currentSourceFile);
     const sourceFile = resolvedModule && (!resolutionDiagnostic || resolutionDiagnostic === Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set) && host.getSourceFile(resolvedModule.resolvedFileName);
     if (sourceFile) {
@@ -46324,7 +46328,7 @@ function createTypeChecker(host) {
         error(errorNode, resolutionDiagnostic, moduleReference, resolvedModule.resolvedFileName);
       }
       if (resolvedModule.resolvedUsingTsExtension && isDeclarationFileName(moduleReference)) {
-        const importOrExport = ((_j = findAncestor(location, isImportDeclaration)) == null ? void 0 : _j.importClause) || findAncestor(location, or(isImportEqualsDeclaration, isExportDeclaration));
+        const importOrExport = ((_h = findAncestor(location, isImportDeclaration)) == null ? void 0 : _h.importClause) || findAncestor(location, or(isImportEqualsDeclaration, isExportDeclaration));
         if (importOrExport && !importOrExport.isTypeOnly || findAncestor(location, isImportCall)) {
           error(
             errorNode,
@@ -46333,7 +46337,7 @@ function createTypeChecker(host) {
           );
         }
       } else if (resolvedModule.resolvedUsingTsExtension && !shouldAllowImportingTsExtension(compilerOptions, currentSourceFile.fileName)) {
-        const importOrExport = ((_k = findAncestor(location, isImportDeclaration)) == null ? void 0 : _k.importClause) || findAncestor(location, or(isImportEqualsDeclaration, isExportDeclaration));
+        const importOrExport = ((_i = findAncestor(location, isImportDeclaration)) == null ? void 0 : _i.importClause) || findAncestor(location, or(isImportEqualsDeclaration, isExportDeclaration));
         if (!((importOrExport == null ? void 0 : importOrExport.isTypeOnly) || findAncestor(location, isImportTypeNode))) {
           const tsExtension = Debug.checkDefined(tryExtractTSExtension(moduleReference));
           error(errorNode, Diagnostics.An_import_path_can_only_end_with_a_0_extension_when_allowImportingTsExtensions_is_enabled, tsExtension);
@@ -46354,7 +46358,7 @@ function createTypeChecker(host) {
         if (moduleResolutionKind === 3 /* Node16 */ || moduleResolutionKind === 99 /* NodeNext */) {
           const isSyncImport = currentSourceFile.impliedNodeFormat === 1 /* CommonJS */ && !findAncestor(location, isImportCall) || !!findAncestor(location, isImportEqualsDeclaration);
           const overrideClauseHost = findAncestor(location, (l) => isImportTypeNode(l) || isExportDeclaration(l) || isImportDeclaration(l));
-          const overrideClause = overrideClauseHost && isImportTypeNode(overrideClauseHost) ? (_l = overrideClauseHost.assertions) == null ? void 0 : _l.assertClause : overrideClauseHost == null ? void 0 : overrideClauseHost.assertClause;
+          const overrideClause = overrideClauseHost && isImportTypeNode(overrideClauseHost) ? (_j = overrideClauseHost.assertions) == null ? void 0 : _j.assertClause : overrideClauseHost == null ? void 0 : overrideClauseHost.assertClause;
           if (isSyncImport && sourceFile.impliedNodeFormat === 99 /* ESNext */ && !getResolutionModeOverrideForClause(overrideClause)) {
             if (findAncestor(location, isImportEqualsDeclaration)) {
               error(errorNode, Diagnostics.Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_cannot_be_imported_with_require_Use_an_ECMAScript_import_instead, moduleReference);
@@ -46461,7 +46465,7 @@ function createTypeChecker(host) {
           error(errorNode, Diagnostics.Cannot_find_module_0_Consider_using_resolveJsonModule_to_import_module_with_json_extension, moduleReference);
         } else if (mode === 99 /* ESNext */ && resolutionIsNode16OrNext && isExtensionlessRelativePathImport) {
           const absoluteRef = getNormalizedAbsolutePath(moduleReference, getDirectoryPath(currentSourceFile.path));
-          const suggestedExt = (_m = suggestedExtensions.find(([actualExt, _importExt]) => host.fileExists(absoluteRef + actualExt))) == null ? void 0 : _m[1];
+          const suggestedExt = (_k = suggestedExtensions.find(([actualExt, _importExt]) => host.fileExists(absoluteRef + actualExt))) == null ? void 0 : _k[1];
           if (suggestedExt) {
             error(errorNode, Diagnostics.Relative_import_paths_need_explicit_file_extensions_in_ECMAScript_imports_when_moduleResolution_is_node16_or_nodenext_Did_you_mean_0, moduleReference + suggestedExt);
           } else {
@@ -69135,6 +69139,7 @@ function createTypeChecker(host) {
     return checkPropertyAccessibilityAtLocation(node, isSuper, writing, type, prop, errorNode);
   }
   function checkPropertyAccessibilityAtLocation(location, isSuper, writing, containingType, prop, errorNode) {
+    var _a;
     const flags = getDeclarationModifierFlagsFromSymbol(prop, writing);
     if (isSuper) {
       if (languageVersion < 2 /* ES2015 */) {
@@ -69151,6 +69156,12 @@ function createTypeChecker(host) {
         }
         return false;
       }
+      if (!(flags & 32 /* Static */) && ((_a = prop.declarations) == null ? void 0 : _a.some(isClassFieldAndNotAutoAccessor))) {
+        if (errorNode) {
+          error(errorNode, Diagnostics.Class_field_0_defined_by_the_parent_class_is_not_accessible_in_the_child_class_via_super, symbolToString(prop));
+        }
+        return false;
+      }
     }
     if (flags & 256 /* Abstract */ && symbolHasNonMethodDeclaration(prop) && (isThisProperty(location) || isThisInitializedObjectBindingExpression(location) || isObjectBindingPattern(location.parent) && isThisInitializedDeclaration(location.parent.parent))) {
       const declaringClassDeclaration = getClassLikeDeclarationOfSymbol(getParentOfSymbol(prop));
@@ -69556,11 +69567,17 @@ function createTypeChecker(host) {
     return getFlowTypeOfAccessExpression(node, prop, propType, right, checkMode);
   }
   function isUncheckedJSSuggestion(node, suggestion, excludeClasses) {
+    var _a;
     const file = getSourceFileOfNode(node);
     if (file) {
       if (compilerOptions.checkJs === void 0 && file.checkJsDirective === void 0 && (file.scriptKind === 1 /* JS */ || file.scriptKind === 2 /* JSX */)) {
         const declarationFile = forEach(suggestion == null ? void 0 : suggestion.declarations, getSourceFileOfNode);
-        return !(file !== declarationFile && !!declarationFile && isGlobalSourceFile(declarationFile)) && !(excludeClasses && suggestion && suggestion.flags & 32 /* Class */) && !(!!node && excludeClasses && isPropertyAccessExpression(node) && node.expression.kind === 110 /* ThisKeyword */);
+        const suggestionHasNoExtendsOrDecorators = !(suggestion == null ? void 0 : suggestion.valueDeclaration) || !isClassLike(suggestion.valueDeclaration) || ((_a = suggestion.valueDeclaration.heritageClauses) == null ? void 0 : _a.length) || classOrConstructorParameterIsDecorated(
+          /*useLegacyDecorators*/
+          false,
+          suggestion.valueDeclaration
+        );
+        return !(file !== declarationFile && !!declarationFile && isGlobalSourceFile(declarationFile)) && !(excludeClasses && suggestion && suggestion.flags & 32 /* Class */ && suggestionHasNoExtendsOrDecorators) && !(!!node && excludeClasses && isPropertyAccessExpression(node) && node.expression.kind === 110 /* ThisKeyword */ && suggestionHasNoExtendsOrDecorators);
       }
     }
     return false;
@@ -109266,6 +109283,7 @@ function emitFiles(resolver, host, targetSourceFile, { scriptTransformers, decla
       inlineSourceMap: compilerOptions.inlineSourceMap,
       extendedDiagnostics: compilerOptions.extendedDiagnostics,
       onlyPrintJsDocStyle: true,
+      omitBraceSourceMapPositions: true,
       writeBundleFileInfo: !!bundleBuildInfo,
       recordInternalSection: !!bundleBuildInfo,
       relativeToBuildInfo
@@ -109676,6 +109694,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     onAfterEmitToken
   } = handlers;
   var extendedDiagnostics = !!printerOptions.extendedDiagnostics;
+  var omitBraceSourcePositions = !!printerOptions.omitBraceSourceMapPositions;
   var newLine = getNewLineCharacter(printerOptions);
   var moduleKind = getEmitModuleKind(printerOptions);
   var bundledHelpers = /* @__PURE__ */ new Map();
@@ -111671,7 +111690,11 @@ function createPrinter(printerOptions = {}, handlers = {}) {
         decreaseIndent();
       }
     }
-    pos = writeTokenText(token, writer2, pos);
+    if (!omitBraceSourcePositions && (token === 19 /* OpenBraceToken */ || token === 20 /* CloseBraceToken */)) {
+      pos = writeToken(token, pos, writer2, contextNode);
+    } else {
+      pos = writeTokenText(token, writer2, pos);
+    }
     if (isSimilarNode && contextNode.end !== pos) {
       const isJsxExprContext = contextNode.kind === 294 /* JsxExpression */;
       emitTrailingCommentsOfPosition(
@@ -115394,14 +115417,14 @@ function isReferenceFileLocation(location) {
   return location.pos !== void 0;
 }
 function getReferencedFileLocation(program, ref) {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d;
   const file = Debug.checkDefined(program.getSourceFileByPath(ref.file));
   const { kind, index } = ref;
   let pos, end, packageId, resolutionMode;
   switch (kind) {
     case 3 /* Import */:
       const importLiteral = getModuleNameStringLiteralAt(file, index);
-      packageId = (_d = (_c = (_b = (_a = program.resolvedModules) == null ? void 0 : _a.get(file.path)) == null ? void 0 : _b.get(importLiteral.text, getModeForResolutionAtIndex(file, index))) == null ? void 0 : _c.resolvedModule) == null ? void 0 : _d.packageId;
+      packageId = (_b = (_a = program.getResolvedModule(file, importLiteral.text, getModeForResolutionAtIndex(file, index))) == null ? void 0 : _a.resolvedModule) == null ? void 0 : _b.packageId;
       if (importLiteral.pos === -1)
         return { file, packageId, text: importLiteral.text };
       pos = skipTrivia(file.text, importLiteral.pos);
@@ -115412,7 +115435,7 @@ function getReferencedFileLocation(program, ref) {
       break;
     case 5 /* TypeReferenceDirective */:
       ({ pos, end, resolutionMode } = file.typeReferenceDirectives[index]);
-      packageId = (_h = (_g = (_f = (_e = program.resolvedTypeReferenceDirectiveNames) == null ? void 0 : _e.get(file.path)) == null ? void 0 : _f.get(toFileNameLowerCase(file.typeReferenceDirectives[index].fileName), resolutionMode || file.impliedNodeFormat)) == null ? void 0 : _g.resolvedTypeReferenceDirective) == null ? void 0 : _h.packageId;
+      packageId = (_d = (_c = program.getResolvedTypeReferenceDirective(file, toFileNameLowerCase(file.typeReferenceDirectives[index].fileName), resolutionMode || file.impliedNodeFormat)) == null ? void 0 : _c.resolvedTypeReferenceDirective) == null ? void 0 : _d.packageId;
       break;
     case 7 /* LibReferenceDirective */:
       ({ pos, end } = file.libReferenceDirectives[index]);
@@ -115940,6 +115963,10 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     resolvedModules,
     resolvedTypeReferenceDirectiveNames,
     resolvedLibReferences,
+    getResolvedModule,
+    getResolvedTypeReferenceDirective,
+    forEachResolvedModule,
+    forEachResolvedTypeReferenceDirective,
     getCurrentPackagesMap: () => packageMap,
     typesPackageExists,
     packageBundlesTypes,
@@ -115983,19 +116010,35 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
   measure("Program", "beforeProgram", "afterProgram");
   (_p = tracing) == null ? void 0 : _p.pop();
   return program;
+  function getResolvedModule(file, moduleName, mode) {
+    var _a2;
+    return (_a2 = resolvedModules == null ? void 0 : resolvedModules.get(file.path)) == null ? void 0 : _a2.get(moduleName, mode);
+  }
+  function getResolvedTypeReferenceDirective(file, typeDirectiveName, mode) {
+    var _a2;
+    return (_a2 = resolvedTypeReferenceDirectiveNames == null ? void 0 : resolvedTypeReferenceDirectiveNames.get(file.path)) == null ? void 0 : _a2.get(typeDirectiveName, mode);
+  }
+  function forEachResolvedModule(callback, file) {
+    forEachResolution(resolvedModules, callback, file);
+  }
+  function forEachResolvedTypeReferenceDirective(callback, file) {
+    forEachResolution(resolvedTypeReferenceDirectiveNames, callback, file);
+  }
+  function forEachResolution(resolutionCache, callback, file) {
+    var _a2;
+    if (file)
+      (_a2 = resolutionCache == null ? void 0 : resolutionCache.get(file.path)) == null ? void 0 : _a2.forEach((resolution, name, mode) => callback(resolution, name, mode, file.path));
+    else
+      resolutionCache == null ? void 0 : resolutionCache.forEach((resolutions, filePath) => resolutions.forEach((resolution, name, mode) => callback(resolution, name, mode, filePath)));
+  }
   function getPackagesMap() {
     if (packageMap)
       return packageMap;
     packageMap = /* @__PURE__ */ new Map();
-    files.forEach(
-      (sf) => {
-        var _a2;
-        return (_a2 = resolvedModules == null ? void 0 : resolvedModules.get(sf.path)) == null ? void 0 : _a2.forEach(({ resolvedModule }) => {
-          if (resolvedModule == null ? void 0 : resolvedModule.packageId)
-            packageMap.set(resolvedModule.packageId.name, resolvedModule.extension === ".d.ts" /* Dts */ || !!packageMap.get(resolvedModule.packageId.name));
-        });
-      }
-    );
+    forEachResolvedModule(({ resolvedModule }) => {
+      if (resolvedModule == null ? void 0 : resolvedModule.packageId)
+        packageMap.set(resolvedModule.packageId.name, resolvedModule.extension === ".d.ts" /* Dts */ || !!packageMap.get(resolvedModule.packageId.name));
+    });
     return packageMap;
   }
   function typesPackageExists(packageName) {
@@ -116127,7 +116170,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     return classifiableNames;
   }
   function resolveModuleNamesReusingOldState(moduleNames, file) {
-    var _a2, _b2;
     if (structureIsReused === 0 /* Not */ && !file.ambientModuleNames.length) {
       return resolveModuleNamesWorker(
         moduleNames,
@@ -116145,7 +116187,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       const moduleName = moduleNames[i];
       if (file === oldSourceFile && !hasInvalidatedResolutions(file.path)) {
         const mode = getModeForUsageLocation(file, moduleName);
-        const oldResolution = (_b2 = (_a2 = oldProgram == null ? void 0 : oldProgram.resolvedModules) == null ? void 0 : _a2.get(file.path)) == null ? void 0 : _b2.get(moduleName.text, mode);
+        const oldResolution = oldProgram == null ? void 0 : oldProgram.getResolvedModule(file, moduleName.text, mode);
         if (oldResolution == null ? void 0 : oldResolution.resolvedModule) {
           if (isTraceEnabled(options, host)) {
             trace(
@@ -116192,8 +116234,8 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     Debug.assert(j === resolutions.length);
     return result;
     function moduleNameResolvesToAmbientModuleInNonModifiedFile(moduleName) {
-      var _a3, _b3, _c2;
-      const resolutionToFile = (_c2 = (_b3 = (_a3 = oldProgram == null ? void 0 : oldProgram.resolvedModules) == null ? void 0 : _a3.get(file.path)) == null ? void 0 : _b3.get(moduleName.text, getModeForUsageLocation(file, moduleName))) == null ? void 0 : _c2.resolvedModule;
+      var _a2;
+      const resolutionToFile = (_a2 = oldProgram == null ? void 0 : oldProgram.getResolvedModule(file, moduleName.text, getModeForUsageLocation(file, moduleName))) == null ? void 0 : _a2.resolvedModule;
       const resolvedFile = resolutionToFile && oldProgram.getSourceFile(resolutionToFile.resolvedFileName);
       if (resolutionToFile && resolvedFile) {
         return false;
@@ -116209,7 +116251,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     }
   }
   function resolveTypeReferenceDirectiveNamesReusingOldState(typeDirectiveNames, containingFile) {
-    var _a2, _b2;
+    var _a2;
     if (structureIsReused === 0 /* Not */) {
       return resolveTypeReferenceDirectiveNamesWorker(
         typeDirectiveNames,
@@ -116229,7 +116271,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       if (canReuseResolutions) {
         const typeDirectiveName = getTypeReferenceResolutionName(entry);
         const mode = getModeForFileReference(entry, containingSourceFile == null ? void 0 : containingSourceFile.impliedNodeFormat);
-        const oldResolution = (_b2 = !isString(containingFile) ? (_a2 = oldProgram == null ? void 0 : oldProgram.resolvedTypeReferenceDirectiveNames) == null ? void 0 : _a2.get(containingFile.path) : oldProgram == null ? void 0 : oldProgram.getAutomaticTypeDirectiveResolutions()) == null ? void 0 : _b2.get(typeDirectiveName, mode);
+        const oldResolution = !isString(containingFile) ? oldProgram == null ? void 0 : oldProgram.getResolvedTypeReferenceDirective(containingFile, typeDirectiveName, mode) : (_a2 = oldProgram == null ? void 0 : oldProgram.getAutomaticTypeDirectiveResolutions()) == null ? void 0 : _a2.get(typeDirectiveName, mode);
         if (oldResolution == null ? void 0 : oldResolution.resolvedTypeReferenceDirective) {
           if (isTraceEnabled(options, host)) {
             trace(
@@ -116289,7 +116331,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     );
   }
   function tryReuseStructureFromOldProgram() {
-    var _a2, _b2, _c2;
+    var _a2;
     if (!oldProgram) {
       return 0 /* Not */;
     }
@@ -116409,20 +116451,29 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       const moduleNames = getModuleNames(newSourceFile);
       const resolutions = resolveModuleNamesReusingOldState(moduleNames, newSourceFile);
       (resolvedModulesProcessing ?? (resolvedModulesProcessing = /* @__PURE__ */ new Map())).set(newSourceFile.path, resolutions);
-      const oldResolutions = (_b2 = oldProgram.resolvedModules) == null ? void 0 : _b2.get(newSourceFile.path);
-      const resolutionsChanged = hasChangesInResolutions(moduleNames, newSourceFile, resolutions, oldResolutions, moduleResolutionIsEqualTo, moduleResolutionNameAndModeGetter);
+      const resolutionsChanged = hasChangesInResolutions(
+        moduleNames,
+        newSourceFile,
+        resolutions,
+        (name, mode) => oldProgram.getResolvedModule(newSourceFile, name, mode),
+        moduleResolutionIsEqualTo,
+        moduleResolutionNameAndModeGetter
+      );
       if (resolutionsChanged)
         structureIsReused = 1 /* SafeModules */;
       const typesReferenceDirectives = newSourceFile.typeReferenceDirectives;
       const typeReferenceResolutions = resolveTypeReferenceDirectiveNamesReusingOldState(typesReferenceDirectives, newSourceFile);
       (resolvedTypeReferenceDirectiveNamesProcessing ?? (resolvedTypeReferenceDirectiveNamesProcessing = /* @__PURE__ */ new Map())).set(newSourceFile.path, typeReferenceResolutions);
-      const oldTypeResolutions = (_c2 = oldProgram.resolvedTypeReferenceDirectiveNames) == null ? void 0 : _c2.get(newSourceFile.path);
-      const typeReferenceResolutionsChanged = hasChangesInResolutions(typesReferenceDirectives, newSourceFile, typeReferenceResolutions, oldTypeResolutions, typeDirectiveIsEqualTo, typeReferenceResolutionNameAndModeGetter);
-      if (typeReferenceResolutionsChanged) {
+      const typeReferenceResolutionsChanged = hasChangesInResolutions(
+        typesReferenceDirectives,
+        newSourceFile,
+        typeReferenceResolutions,
+        (name, mode) => oldProgram == null ? void 0 : oldProgram.getResolvedTypeReferenceDirective(newSourceFile, name, mode),
+        typeDirectiveIsEqualTo,
+        typeReferenceResolutionNameAndModeGetter
+      );
+      if (typeReferenceResolutionsChanged)
         structureIsReused = 1 /* SafeModules */;
-      } else if (oldTypeResolutions) {
-        (resolvedTypeReferenceDirectiveNamesProcessing ?? (resolvedTypeReferenceDirectiveNamesProcessing = /* @__PURE__ */ new Map())).set(newSourceFile.path, oldTypeResolutions);
-      }
     }
     if (structureIsReused !== 2 /* Completely */) {
       return structureIsReused;
@@ -118569,7 +118620,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       symlinks = createSymlinkCache(currentDirectory, getCanonicalFileName);
     }
     if (files && !symlinks.hasProcessedResolutions()) {
-      symlinks.setSymlinksFromResolutions(resolvedModules, resolvedTypeReferenceDirectiveNames, automaticTypeDirectiveResolutions);
+      symlinks.setSymlinksFromResolutions(forEachResolvedModule, forEachResolvedTypeReferenceDirective, automaticTypeDirectiveResolutions);
     }
     return symlinks;
   }
@@ -118923,7 +118974,6 @@ var BuilderState;
     return toPath(program.getProjectReferenceRedirect(fileName) || fileName, sourceFileDirectory, getCanonicalFileName);
   }
   function getReferencedFiles(program, sourceFile, getCanonicalFileName) {
-    var _a;
     let referencedFiles;
     if (sourceFile.imports && sourceFile.imports.length > 0) {
       const checker = program.getTypeChecker();
@@ -118939,17 +118989,14 @@ var BuilderState;
         addReferencedFile(referencedPath);
       }
     }
-    const resolvedTypeReferenceDirectiveNames = (_a = program.resolvedTypeReferenceDirectiveNames) == null ? void 0 : _a.get(sourceFile.path);
-    if (resolvedTypeReferenceDirectiveNames) {
-      resolvedTypeReferenceDirectiveNames.forEach(({ resolvedTypeReferenceDirective }) => {
-        if (!resolvedTypeReferenceDirective) {
-          return;
-        }
-        const fileName = resolvedTypeReferenceDirective.resolvedFileName;
-        const typeFilePath = getReferencedFileFromFileName(program, fileName, sourceFileDirectory, getCanonicalFileName);
-        addReferencedFile(typeFilePath);
-      });
-    }
+    program.forEachResolvedTypeReferenceDirective(({ resolvedTypeReferenceDirective }) => {
+      if (!resolvedTypeReferenceDirective) {
+        return;
+      }
+      const fileName = resolvedTypeReferenceDirective.resolvedFileName;
+      const typeFilePath = getReferencedFileFromFileName(program, fileName, sourceFileDirectory, getCanonicalFileName);
+      addReferencedFile(typeFilePath);
+    }, sourceFile);
     if (sourceFile.moduleAugmentations.length) {
       const checker = program.getTypeChecker();
       for (const moduleName of sourceFile.moduleAugmentations) {
@@ -120667,6 +120714,47 @@ function getRootDirectoryOfResolutionCache(rootDirForResolution, getCurrentDirec
   const normalized = getNormalizedAbsolutePath(rootDirForResolution, getCurrentDirectory());
   return !isDiskPathRoot(normalized) ? removeTrailingDirectorySeparator(normalized) : normalized;
 }
+function createModuleResolutionLoaderUsingGlobalCache(containingFile, redirectedReference, options, resolutionHost, moduleResolutionCache) {
+  return {
+    nameAndMode: moduleResolutionNameAndModeGetter,
+    resolve: (moduleName, resoluionMode) => resolveModuleNameUsingGlobalCache(
+      resolutionHost,
+      moduleResolutionCache,
+      moduleName,
+      containingFile,
+      options,
+      redirectedReference,
+      resoluionMode
+    )
+  };
+}
+function resolveModuleNameUsingGlobalCache(resolutionHost, moduleResolutionCache, moduleName, containingFile, compilerOptions, redirectedReference, mode) {
+  var _a;
+  const host = ((_a = resolutionHost.getCompilerHost) == null ? void 0 : _a.call(resolutionHost)) || resolutionHost;
+  const primaryResult = resolveModuleName(moduleName, containingFile, compilerOptions, host, moduleResolutionCache, redirectedReference, mode);
+  if (!resolutionHost.getGlobalCache) {
+    return primaryResult;
+  }
+  const globalCache = resolutionHost.getGlobalCache();
+  if (globalCache !== void 0 && !isExternalModuleNameRelative(moduleName) && !(primaryResult.resolvedModule && extensionIsTS(primaryResult.resolvedModule.extension))) {
+    const { resolvedModule, failedLookupLocations, affectingLocations, resolutionDiagnostics } = loadModuleFromGlobalCache(
+      Debug.checkDefined(resolutionHost.globalCacheResolutionModuleName)(moduleName),
+      resolutionHost.projectName,
+      compilerOptions,
+      host,
+      globalCache,
+      moduleResolutionCache
+    );
+    if (resolvedModule) {
+      primaryResult.resolvedModule = resolvedModule;
+      primaryResult.failedLookupLocations = updateResolutionField(primaryResult.failedLookupLocations, failedLookupLocations);
+      primaryResult.affectingLocations = updateResolutionField(primaryResult.affectingLocations, affectingLocations);
+      primaryResult.resolutionDiagnostics = updateResolutionField(primaryResult.resolutionDiagnostics, resolutionDiagnostics);
+      return primaryResult;
+    }
+  }
+  return primaryResult;
+}
 function createResolutionCache(resolutionHost, rootDirForResolution, logChangesWhenResolvingModule) {
   let filesWithChangedSetOfUnresolvedImports;
   let filesWithInvalidatedResolutions;
@@ -120713,6 +120801,16 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   const rootPathComponents = getPathComponents(rootPath);
   const typeRootsWatches = /* @__PURE__ */ new Map();
   return {
+    rootDirForResolution,
+    resolvedModuleNames,
+    resolvedTypeReferenceDirectives,
+    resolvedLibraries,
+    resolvedFileToResolution,
+    resolutionsWithFailedLookups,
+    resolutionsWithOnlyAffectingLocations,
+    directoryWatchesOfFailedLookups,
+    fileWatchesOfAffectingLocations,
+    watchFailedLookupLocationsOfExternalModuleResolutions,
     getModuleResolutionCache: () => moduleResolutionCache,
     startRecordingFilesWithChangedResolutions,
     finishRecordingFilesWithChangedResolutions,
@@ -120815,7 +120913,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       if (!((_a = newProgram == null ? void 0 : newProgram.resolvedLibReferences) == null ? void 0 : _a.has(libFileName))) {
         stopWatchFailedLookupLocationOfResolution(
           resolution,
-          resolutionHost.toPath(getInferredLibraryNameResolveFrom(newProgram.getCompilerOptions(), getCurrentDirectory(), libFileName)),
+          resolutionHost.toPath(getInferredLibraryNameResolveFrom(resolutionHost.getCompilationSettings(), getCurrentDirectory(), libFileName)),
           getResolvedModule
         );
         resolvedLibraries.delete(libFileName);
@@ -120857,58 +120955,22 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
         }
       });
     }
-    directoryWatchesOfFailedLookups.forEach((watcher, path) => {
-      if (watcher.refCount === 0) {
-        directoryWatchesOfFailedLookups.delete(path);
-        watcher.watcher.close();
-      }
-    });
-    fileWatchesOfAffectingLocations.forEach((watcher, path) => {
-      if (watcher.files === 0 && watcher.resolutions === 0) {
-        fileWatchesOfAffectingLocations.delete(path);
-        watcher.watcher.close();
-      }
-    });
+    directoryWatchesOfFailedLookups.forEach(closeDirectoryWatchesOfFailedLookup);
+    fileWatchesOfAffectingLocations.forEach(closeFileWatcherOfAffectingLocation);
     hasChangedAutomaticTypeDirectiveNames = false;
   }
-  function resolveModuleName2(moduleName, containingFile, compilerOptions, redirectedReference, mode) {
-    var _a;
-    const host = ((_a = resolutionHost.getCompilerHost) == null ? void 0 : _a.call(resolutionHost)) || resolutionHost;
-    const primaryResult = resolveModuleName(moduleName, containingFile, compilerOptions, host, moduleResolutionCache, redirectedReference, mode);
-    if (!resolutionHost.getGlobalCache) {
-      return primaryResult;
-    }
-    const globalCache = resolutionHost.getGlobalCache();
-    if (globalCache !== void 0 && !isExternalModuleNameRelative(moduleName) && !(primaryResult.resolvedModule && extensionIsTS(primaryResult.resolvedModule.extension))) {
-      const { resolvedModule, failedLookupLocations, affectingLocations, resolutionDiagnostics } = loadModuleFromGlobalCache(
-        Debug.checkDefined(resolutionHost.globalCacheResolutionModuleName)(moduleName),
-        resolutionHost.projectName,
-        compilerOptions,
-        host,
-        globalCache,
-        moduleResolutionCache
-      );
-      if (resolvedModule) {
-        primaryResult.resolvedModule = resolvedModule;
-        primaryResult.failedLookupLocations = updateResolutionField(primaryResult.failedLookupLocations, failedLookupLocations);
-        primaryResult.affectingLocations = updateResolutionField(primaryResult.affectingLocations, affectingLocations);
-        primaryResult.resolutionDiagnostics = updateResolutionField(primaryResult.resolutionDiagnostics, resolutionDiagnostics);
-        return primaryResult;
-      }
+  function closeDirectoryWatchesOfFailedLookup(watcher, path) {
+    if (watcher.refCount === 0) {
+      directoryWatchesOfFailedLookups.delete(path);
+      watcher.watcher.close();
     }
-    return primaryResult;
   }
-  function createModuleResolutionLoader2(containingFile, redirectedReference, options) {
-    return {
-      nameAndMode: moduleResolutionNameAndModeGetter,
-      resolve: (moduleName, resoluionMode) => resolveModuleName2(
-        moduleName,
-        containingFile,
-        options,
-        redirectedReference,
-        resoluionMode
-      )
-    };
+  function closeFileWatcherOfAffectingLocation(watcher, path) {
+    var _a;
+    if (watcher.files === 0 && watcher.resolutions === 0 && !((_a = watcher.symlinks) == null ? void 0 : _a.size)) {
+      fileWatchesOfAffectingLocations.delete(path);
+      watcher.watcher.close();
+    }
   }
   function resolveNamesWithLocalCache({
     entries,
@@ -120945,9 +121007,11 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
           resolutionHost.onDiscoveredSymlink();
         }
         resolutionsInFile.set(name, mode, resolution);
-        watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, path, getResolutionWithResolvedFileName, deferWatchingNonRelativeResolution);
-        if (existingResolution) {
-          stopWatchFailedLookupLocationOfResolution(existingResolution, path, getResolutionWithResolvedFileName);
+        if (resolution !== existingResolution) {
+          watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, path, getResolutionWithResolvedFileName, deferWatchingNonRelativeResolution);
+          if (existingResolution) {
+            stopWatchFailedLookupLocationOfResolution(existingResolution, path, getResolutionWithResolvedFileName);
+          }
         }
         if (logChanges && filesWithChangedSetOfUnresolvedImports && !resolutionIsEqualTo(existingResolution, resolution)) {
           filesWithChangedSetOfUnresolvedImports.push(path);
@@ -121036,10 +121100,12 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       options,
       reusedNames,
       perFileCache: resolvedModuleNames,
-      loader: createModuleResolutionLoader2(
+      loader: createModuleResolutionLoaderUsingGlobalCache(
         containingFile,
         redirectedReference,
-        options
+        options,
+        resolutionHost,
+        moduleResolutionCache
       ),
       getResolutionWithResolvedFileName: getResolvedModule,
       shouldRetryResolution: (resolution) => !resolution.resolvedModule || !resolutionExtensionIsTSOrJson(resolution.resolvedModule.extension),
@@ -121093,7 +121159,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     );
     if (resolution && !resolution.isInvalidated)
       return resolution;
-    return resolveModuleName2(moduleName, containingFile, resolutionHost.getCompilationSettings());
+    return resolveModuleNameUsingGlobalCache(resolutionHost, moduleResolutionCache, moduleName, containingFile, resolutionHost.getCompilationSettings());
   }
   function isNodeModulesAtTypesDirectory(dirPath) {
     return endsWith(dirPath, "/node_modules/@types");
@@ -121193,52 +121259,63 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       return;
     }
     let locationToWatch = affectingLocation;
+    let isSymlink = false;
+    let symlinkWatcher;
     if (resolutionHost.realpath) {
       locationToWatch = resolutionHost.realpath(affectingLocation);
       if (affectingLocation !== locationToWatch) {
-        const fileWatcher2 = fileWatchesOfAffectingLocations.get(locationToWatch);
-        if (fileWatcher2) {
-          if (forResolution)
-            fileWatcher2.resolutions++;
-          else
-            fileWatcher2.files++;
-          fileWatcher2.paths.add(affectingLocation);
-          fileWatchesOfAffectingLocations.set(affectingLocation, fileWatcher2);
-          return;
-        }
-      }
-    }
-    const paths = /* @__PURE__ */ new Set();
-    paths.add(locationToWatch);
-    let actualWatcher = canWatchAffectingLocation(resolutionHost.toPath(locationToWatch)) ? resolutionHost.watchAffectingFileLocation(locationToWatch, (fileName, eventKind) => {
-      cachedDirectoryStructureHost == null ? void 0 : cachedDirectoryStructureHost.addOrDeleteFile(fileName, resolutionHost.toPath(locationToWatch), eventKind);
-      const packageJsonMap = moduleResolutionCache.getPackageJsonInfoCache().getInternalMap();
-      paths.forEach((path) => {
-        if (watcher.resolutions)
-          (affectingPathChecks ?? (affectingPathChecks = /* @__PURE__ */ new Set())).add(path);
-        if (watcher.files)
-          (affectingPathChecksForFile ?? (affectingPathChecksForFile = /* @__PURE__ */ new Set())).add(path);
-        packageJsonMap == null ? void 0 : packageJsonMap.delete(resolutionHost.toPath(path));
-      });
-      resolutionHost.scheduleInvalidateResolutionsOfFailedLookupLocations();
-    }) : noopFileWatcher;
-    const watcher = {
-      watcher: actualWatcher !== noopFileWatcher ? {
-        close: () => {
-          actualWatcher.close();
-          actualWatcher = noopFileWatcher;
-        }
-      } : actualWatcher,
-      resolutions: forResolution ? 1 : 0,
-      files: forResolution ? 0 : 1,
-      paths
-    };
-    fileWatchesOfAffectingLocations.set(locationToWatch, watcher);
-    if (affectingLocation !== locationToWatch) {
+        isSymlink = true;
+        symlinkWatcher = fileWatchesOfAffectingLocations.get(locationToWatch);
+      }
+    }
+    const resolutions = forResolution ? 1 : 0;
+    const files = forResolution ? 0 : 1;
+    if (!isSymlink || !symlinkWatcher) {
+      const watcher = {
+        watcher: canWatchAffectingLocation(resolutionHost.toPath(locationToWatch)) ? resolutionHost.watchAffectingFileLocation(locationToWatch, (fileName, eventKind) => {
+          cachedDirectoryStructureHost == null ? void 0 : cachedDirectoryStructureHost.addOrDeleteFile(fileName, resolutionHost.toPath(locationToWatch), eventKind);
+          invalidateAffectingFileWatcher(locationToWatch, moduleResolutionCache.getPackageJsonInfoCache().getInternalMap());
+          resolutionHost.scheduleInvalidateResolutionsOfFailedLookupLocations();
+        }) : noopFileWatcher,
+        resolutions: isSymlink ? 0 : resolutions,
+        files: isSymlink ? 0 : files,
+        symlinks: void 0
+      };
+      fileWatchesOfAffectingLocations.set(locationToWatch, watcher);
+      if (isSymlink)
+        symlinkWatcher = watcher;
+    }
+    if (isSymlink) {
+      Debug.assert(!!symlinkWatcher);
+      const watcher = {
+        watcher: {
+          close: () => {
+            var _a;
+            const symlinkWatcher2 = fileWatchesOfAffectingLocations.get(locationToWatch);
+            if (((_a = symlinkWatcher2 == null ? void 0 : symlinkWatcher2.symlinks) == null ? void 0 : _a.delete(affectingLocation)) && !symlinkWatcher2.symlinks.size && !symlinkWatcher2.resolutions && !symlinkWatcher2.files) {
+              fileWatchesOfAffectingLocations.delete(locationToWatch);
+              symlinkWatcher2.watcher.close();
+            }
+          }
+        },
+        resolutions,
+        files,
+        symlinks: void 0
+      };
       fileWatchesOfAffectingLocations.set(affectingLocation, watcher);
-      paths.add(affectingLocation);
+      (symlinkWatcher.symlinks ?? (symlinkWatcher.symlinks = /* @__PURE__ */ new Set())).add(affectingLocation);
     }
   }
+  function invalidateAffectingFileWatcher(path, packageJsonMap) {
+    var _a;
+    const watcher = fileWatchesOfAffectingLocations.get(path);
+    if (watcher == null ? void 0 : watcher.resolutions)
+      (affectingPathChecks ?? (affectingPathChecks = /* @__PURE__ */ new Set())).add(path);
+    if (watcher == null ? void 0 : watcher.files)
+      (affectingPathChecksForFile ?? (affectingPathChecksForFile = /* @__PURE__ */ new Set())).add(path);
+    (_a = watcher == null ? void 0 : watcher.symlinks) == null ? void 0 : _a.forEach((path2) => invalidateAffectingFileWatcher(path2, packageJsonMap));
+    packageJsonMap == null ? void 0 : packageJsonMap.delete(resolutionHost.toPath(path));
+  }
   function watchFailedLookupLocationOfNonRelativeModuleResolutions(resolutions, name) {
     const program = resolutionHost.getCurrentProgram();
     if (!program || !program.getTypeChecker().tryFindAmbientModuleWithoutAugmentations(name)) {
@@ -121260,7 +121337,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       directoryWatchesOfFailedLookups.set(dirPath, { watcher: createDirectoryWatcher(dir, dirPath, nonRecursive), refCount: 1, nonRecursive });
     }
   }
-  function stopWatchFailedLookupLocation(failedLookupLocation, removeAtRoot) {
+  function stopWatchFailedLookupLocation(failedLookupLocation, removeAtRoot, syncDirWatcherRemove) {
     const failedLookupLocationPath = resolutionHost.toPath(failedLookupLocation);
     const toWatch = getDirectoryToWatchFailedLookupLocation(
       failedLookupLocation,
@@ -121275,12 +121352,12 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       if (dirPath === rootPath) {
         removeAtRoot = true;
       } else {
-        removeDirectoryWatcher(dirPath);
+        removeDirectoryWatcher(dirPath, syncDirWatcherRemove);
       }
     }
     return removeAtRoot;
   }
-  function stopWatchFailedLookupLocationOfResolution(resolution, filePath, getResolutionWithResolvedFileName) {
+  function stopWatchFailedLookupLocationOfResolution(resolution, filePath, getResolutionWithResolvedFileName, syncDirWatcherRemove) {
     Debug.checkDefined(resolution.files).delete(filePath);
     resolution.refCount--;
     if (resolution.refCount) {
@@ -121298,13 +121375,13 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       let removeAtRoot = false;
       if (failedLookupLocations) {
         for (const failedLookupLocation of failedLookupLocations) {
-          removeAtRoot = stopWatchFailedLookupLocation(failedLookupLocation, removeAtRoot);
+          removeAtRoot = stopWatchFailedLookupLocation(failedLookupLocation, removeAtRoot, syncDirWatcherRemove);
         }
       }
       if (node10Result)
-        removeAtRoot = stopWatchFailedLookupLocation(node10Result, removeAtRoot);
+        removeAtRoot = stopWatchFailedLookupLocation(node10Result, removeAtRoot, syncDirWatcherRemove);
       if (removeAtRoot)
-        removeDirectoryWatcher(rootPath);
+        removeDirectoryWatcher(rootPath, syncDirWatcherRemove);
     } else if (affectingLocations == null ? void 0 : affectingLocations.length) {
       resolutionsWithOnlyAffectingLocations.delete(resolution);
     }
@@ -121312,12 +121389,16 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       for (const affectingLocation of affectingLocations) {
         const watcher = fileWatchesOfAffectingLocations.get(affectingLocation);
         watcher.resolutions--;
+        if (syncDirWatcherRemove)
+          closeFileWatcherOfAffectingLocation(watcher, affectingLocation);
       }
     }
   }
-  function removeDirectoryWatcher(dirPath) {
+  function removeDirectoryWatcher(dirPath, syncDirWatcherRemove) {
     const dirWatcher = directoryWatchesOfFailedLookups.get(dirPath);
     dirWatcher.refCount--;
+    if (syncDirWatcherRemove)
+      closeDirectoryWatchesOfFailedLookup(dirWatcher, dirPath);
   }
   function createDirectoryWatcher(directory, dirPath, nonRecursive) {
     return resolutionHost.watchDirectoryOfFailedLookupLocation(directory, (fileOrDirectory) => {
@@ -121328,10 +121409,17 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       scheduleInvalidateResolutionOfFailedLookupLocation(fileOrDirectoryPath, dirPath === fileOrDirectoryPath);
     }, nonRecursive ? 0 /* None */ : 1 /* Recursive */);
   }
-  function removeResolutionsOfFileFromCache(cache, filePath, getResolutionWithResolvedFileName) {
+  function removeResolutionsOfFileFromCache(cache, filePath, getResolutionWithResolvedFileName, syncDirWatcherRemove) {
     const resolutions = cache.get(filePath);
     if (resolutions) {
-      resolutions.forEach((resolution) => stopWatchFailedLookupLocationOfResolution(resolution, filePath, getResolutionWithResolvedFileName));
+      resolutions.forEach(
+        (resolution) => stopWatchFailedLookupLocationOfResolution(
+          resolution,
+          filePath,
+          getResolutionWithResolvedFileName,
+          syncDirWatcherRemove
+        )
+      );
       cache.delete(filePath);
     }
   }
@@ -121346,9 +121434,9 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       return;
     resolvedProjectReference.commandLine.fileNames.forEach((f) => removeResolutionsOfFile(resolutionHost.toPath(f)));
   }
-  function removeResolutionsOfFile(filePath) {
-    removeResolutionsOfFileFromCache(resolvedModuleNames, filePath, getResolvedModule);
-    removeResolutionsOfFileFromCache(resolvedTypeReferenceDirectives, filePath, getResolvedTypeReferenceDirective);
+  function removeResolutionsOfFile(filePath, syncDirWatcherRemove) {
+    removeResolutionsOfFileFromCache(resolvedModuleNames, filePath, getResolvedModule, syncDirWatcherRemove);
+    removeResolutionsOfFileFromCache(resolvedTypeReferenceDirectives, filePath, getResolvedTypeReferenceDirective, syncDirWatcherRemove);
   }
   function invalidateResolutions(resolutions, canInvalidate) {
     if (!resolutions)
@@ -122310,7 +122398,7 @@ function createWatchProgram(host) {
   watchConfigFileWildCardDirectories();
   if (configFileName)
     updateExtendedConfigFilesWatches(toPath3(configFileName), compilerOptions, watchOptions, WatchType.ExtendedConfigFile);
-  return configFileName ? { getCurrentProgram: getCurrentBuilderProgram, getProgram: updateProgram, close } : { getCurrentProgram: getCurrentBuilderProgram, getProgram: updateProgram, updateRootFileNames, close };
+  return configFileName ? { getCurrentProgram: getCurrentBuilderProgram, getProgram: updateProgram, close, getResolutionCache } : { getCurrentProgram: getCurrentBuilderProgram, getProgram: updateProgram, updateRootFileNames, close, getResolutionCache };
   function close() {
     clearInvalidateResolutionsOfFailedLookupLocations();
     resolutionCache.clear();
@@ -122350,6 +122438,9 @@ function createWatchProgram(host) {
       parsedConfigs = void 0;
     }
   }
+  function getResolutionCache() {
+    return resolutionCache;
+  }
   function getCurrentBuilderProgram() {
     return builderProgram;
   }