typescript 5.6.0-dev.20240711 → 5.6.0-dev.20240713

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.6";
-var version = `${versionMajorMinor}.0-dev.20240711`;
+var version = `${versionMajorMinor}.0-dev.20240713`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -6761,7 +6761,7 @@ var Diagnostics = {
   Extends_clause_for_inferred_type_0_has_or_is_using_private_name_1: diag(4085, 1 /* Error */, "Extends_clause_for_inferred_type_0_has_or_is_using_private_name_1_4085", "Extends clause for inferred type '{0}' has or is using private name '{1}'."),
   Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: diag(4091, 1 /* Error */, "Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4091", "Parameter '{0}' of index signature from exported interface has or is using name '{1}' from private module '{2}'."),
   Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1: diag(4092, 1 /* Error */, "Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1_4092", "Parameter '{0}' of index signature from exported interface has or is using private name '{1}'."),
-  Property_0_of_exported_class_expression_may_not_be_private_or_protected: diag(4094, 1 /* Error */, "Property_0_of_exported_class_expression_may_not_be_private_or_protected_4094", "Property '{0}' of exported class expression may not be private or protected."),
+  Property_0_of_exported_anonymous_class_type_may_not_be_private_or_protected: diag(4094, 1 /* Error */, "Property_0_of_exported_anonymous_class_type_may_not_be_private_or_protected_4094", "Property '{0}' of exported anonymous class type may not be private or protected."),
   Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: diag(4095, 1 /* Error */, "Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_4095", "Public static method '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named."),
   Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: diag(4096, 1 /* Error */, "Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4096", "Public static method '{0}' of exported class has or is using name '{1}' from private module '{2}'."),
   Public_static_method_0_of_exported_class_has_or_is_using_private_name_1: diag(4097, 1 /* Error */, "Public_static_method_0_of_exported_class_has_or_is_using_private_name_1_4097", "Public static method '{0}' of exported class has or is using private name '{1}'."),
@@ -6999,7 +6999,6 @@ var Diagnostics = {
   Parse_in_strict_mode_and_emit_use_strict_for_each_source_file: diag(6141, 3 /* Message */, "Parse_in_strict_mode_and_emit_use_strict_for_each_source_file_6141", 'Parse in strict mode and emit "use strict" for each source file.'),
   Module_0_was_resolved_to_1_but_jsx_is_not_set: diag(6142, 1 /* Error */, "Module_0_was_resolved_to_1_but_jsx_is_not_set_6142", "Module '{0}' was resolved to '{1}', but '--jsx' is not set."),
   Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1: diag(6144, 3 /* Message */, "Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1_6144", "Module '{0}' was resolved as locally declared ambient module in file '{1}'."),
-  Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified: diag(6145, 3 /* Message */, "Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified_6145", "Module '{0}' was resolved as ambient module declared in '{1}' since this file was not modified."),
   Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h: diag(6146, 3 /* Message */, "Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h_6146", "Specify the JSX factory function to use when targeting 'react' JSX emit, e.g. 'React.createElement' or 'h'."),
   Resolution_for_module_0_was_found_in_cache_from_location_1: diag(6147, 3 /* Message */, "Resolution_for_module_0_was_found_in_cache_from_location_1_6147", "Resolution for module '{0}' was found in cache from location '{1}'."),
   Directory_0_does_not_exist_skipping_all_lookups_in_it: diag(6148, 3 /* Message */, "Directory_0_does_not_exist_skipping_all_lookups_in_it_6148", "Directory '{0}' does not exist, skipping all lookups in it."),
@@ -45519,13 +45518,6 @@ function createTypeChecker(host) {
       /*withAugmentations*/
       true
     ),
-    tryFindAmbientModuleWithoutAugmentations: (moduleName) => {
-      return tryFindAmbientModule(
-        moduleName,
-        /*withAugmentations*/
-        false
-      );
-    },
     getApparentType,
     getUnionType,
     isTypeAssignableTo,
@@ -46068,6 +46060,7 @@ function createTypeChecker(host) {
   };
   var amalgamatedDuplicates;
   var reverseMappedCache = /* @__PURE__ */ new Map();
+  var reverseHomomorphicMappedCache = /* @__PURE__ */ new Map();
   var ambientModulesCache;
   var patternAmbientModules;
   var patternAmbientModuleAugmentations;
@@ -50296,7 +50289,21 @@ function createTypeChecker(host) {
     }
     function shouldUsePlaceholderForProperty(propertySymbol, context) {
       var _a;
-      return !!(getCheckFlags(propertySymbol) & 8192 /* ReverseMapped */) && (contains(context.reverseMappedStack, propertySymbol) || ((_a = context.reverseMappedStack) == null ? void 0 : _a[0]) && !(getObjectFlags(last(context.reverseMappedStack).links.propertyType) & 16 /* Anonymous */));
+      const depth = 3;
+      return !!(getCheckFlags(propertySymbol) & 8192 /* ReverseMapped */) && (contains(context.reverseMappedStack, propertySymbol) || ((_a = context.reverseMappedStack) == null ? void 0 : _a[0]) && !(getObjectFlags(last(context.reverseMappedStack).links.propertyType) & 16 /* Anonymous */) || isDeeplyNestedReverseMappedTypeProperty());
+      function isDeeplyNestedReverseMappedTypeProperty() {
+        var _a2;
+        if ((((_a2 = context.reverseMappedStack) == null ? void 0 : _a2.length) ?? 0) < depth) {
+          return false;
+        }
+        for (let i = 0; i < depth; i++) {
+          const prop = context.reverseMappedStack[context.reverseMappedStack.length - 1 - i];
+          if (prop.links.mappedType.symbol !== propertySymbol.links.mappedType.symbol) {
+            return false;
+          }
+        }
+        return true;
+      }
     }
     function addPropertyToElementList(propertySymbol, context, typeElements) {
       var _a;
@@ -66342,11 +66349,11 @@ function createTypeChecker(host) {
   }
   function inferTypeForHomomorphicMappedType(source, target, constraint) {
     const cacheKey = source.id + "," + target.id + "," + constraint.id;
-    if (reverseMappedCache.has(cacheKey)) {
-      return reverseMappedCache.get(cacheKey);
+    if (reverseHomomorphicMappedCache.has(cacheKey)) {
+      return reverseHomomorphicMappedCache.get(cacheKey);
     }
     const type = createReverseMappedType(source, target, constraint);
-    reverseMappedCache.set(cacheKey, type);
+    reverseHomomorphicMappedCache.set(cacheKey, type);
     return type;
   }
   function isPartiallyInferableType(type) {
@@ -111047,7 +111054,10 @@ function transformDeclarations(context) {
   function reportPrivateInBaseOfClassExpression(propertyName) {
     if (errorNameNode || errorFallbackNode) {
       context.addDiagnostic(
-        createDiagnosticForNode(errorNameNode || errorFallbackNode, Diagnostics.Property_0_of_exported_class_expression_may_not_be_private_or_protected, propertyName)
+        addRelatedInfo(
+          createDiagnosticForNode(errorNameNode || errorFallbackNode, Diagnostics.Property_0_of_exported_anonymous_class_type_may_not_be_private_or_protected, propertyName),
+          ...isVariableDeclaration((errorNameNode || errorFallbackNode).parent) ? [createDiagnosticForNode(errorNameNode || errorFallbackNode, Diagnostics.Add_a_type_annotation_to_the_variable_0, errorDeclarationNameWithFallback())] : []
+        )
       );
     }
   }
@@ -119255,7 +119265,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
   let commonSourceDirectory;
   let typeChecker;
   let classifiableNames;
-  const ambientModuleNameToUnmodifiedFileName = /* @__PURE__ */ new Map();
   let fileReasons = createMultiMap();
   let filesWithReferencesProcessed;
   let fileReasonsToChain;
@@ -119845,35 +119854,9 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       getResolutionFromOldProgram: (name, mode) => oldProgram == null ? void 0 : oldProgram.getResolvedModule(containingFile, name, mode),
       getResolved: getResolvedModuleFromResolution,
       canReuseResolutionsInFile: () => containingFile === (oldProgram == null ? void 0 : oldProgram.getSourceFile(containingFile.fileName)) && !hasInvalidatedResolutions(containingFile.path),
-      isEntryResolvingToAmbientModule: moduleNameResolvesToAmbientModule
+      resolveToOwnAmbientModule: true
     });
   }
-  function moduleNameResolvesToAmbientModule(moduleName, file) {
-    if (contains(file.ambientModuleNames, moduleName.text)) {
-      if (isTraceEnabled(options, host)) {
-        trace(host, Diagnostics.Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1, moduleName.text, getNormalizedAbsolutePath(file.originalFileName, currentDirectory));
-      }
-      return true;
-    } else {
-      return moduleNameResolvesToAmbientModuleInNonModifiedFile(moduleName, file);
-    }
-  }
-  function moduleNameResolvesToAmbientModuleInNonModifiedFile(moduleName, file) {
-    var _a2;
-    const resolutionToFile = (_a2 = oldProgram == null ? void 0 : oldProgram.getResolvedModule(file, moduleName.text, getModeForUsageLocation2(file, moduleName))) == null ? void 0 : _a2.resolvedModule;
-    const resolvedFile = resolutionToFile && oldProgram.getSourceFile(resolutionToFile.resolvedFileName);
-    if (resolutionToFile && resolvedFile) {
-      return false;
-    }
-    const unmodifiedFile = ambientModuleNameToUnmodifiedFileName.get(moduleName.text);
-    if (!unmodifiedFile) {
-      return false;
-    }
-    if (isTraceEnabled(options, host)) {
-      trace(host, Diagnostics.Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified, moduleName.text, unmodifiedFile);
-    }
-    return true;
-  }
   function resolveTypeReferenceDirectiveNamesReusingOldState(typeDirectiveNames, containingFile) {
     const containingSourceFile = !isString(containingFile) ? containingFile : void 0;
     return resolveNamesReusingOldState({
@@ -119901,10 +119884,10 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     getResolutionFromOldProgram,
     getResolved,
     canReuseResolutionsInFile,
-    isEntryResolvingToAmbientModule
+    resolveToOwnAmbientModule
   }) {
     if (!entries.length) return emptyArray;
-    if (structureIsReused === 0 /* Not */ && (!isEntryResolvingToAmbientModule || !containingSourceFile.ambientModuleNames.length)) {
+    if (structureIsReused === 0 /* Not */ && (!resolveToOwnAmbientModule || !containingSourceFile.ambientModuleNames.length)) {
       return resolutionWorker(
         entries,
         containingFile,
@@ -119940,12 +119923,23 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
           continue;
         }
       }
-      if (isEntryResolvingToAmbientModule == null ? void 0 : isEntryResolvingToAmbientModule(entry, containingFile)) {
-        (result ?? (result = new Array(entries.length)))[i] = emptyResolution;
-      } else {
-        (unknownEntries ?? (unknownEntries = [])).push(entry);
-        (unknownEntryIndices ?? (unknownEntryIndices = [])).push(i);
+      if (resolveToOwnAmbientModule) {
+        const name = nameAndModeGetter.getName(entry);
+        if (contains(containingSourceFile.ambientModuleNames, name)) {
+          if (isTraceEnabled(options, host)) {
+            trace(
+              host,
+              Diagnostics.Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1,
+              name,
+              getNormalizedAbsolutePath(containingSourceFile.originalFileName, currentDirectory)
+            );
+          }
+          (result ?? (result = new Array(entries.length)))[i] = emptyResolution;
+          continue;
+        }
       }
+      (unknownEntries ?? (unknownEntries = [])).push(entry);
+      (unknownEntryIndices ?? (unknownEntryIndices = [])).push(i);
     }
     if (!unknownEntries) return result;
     const resolutions = resolutionWorker(unknownEntries, containingFile, reusedNames);
@@ -120079,10 +120073,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       } else if (hasInvalidatedResolutions(oldSourceFile.path)) {
         structureIsReused = 1 /* SafeModules */;
         modifiedSourceFiles.push(newSourceFile);
-      } else {
-        for (const moduleName of oldSourceFile.ambientModuleNames) {
-          ambientModuleNameToUnmodifiedFileName.set(moduleName, oldSourceFile.fileName);
-        }
       }
       newSourceFiles.push(newSourceFile);
     }
@@ -124610,7 +124600,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   let filesWithChangedSetOfUnresolvedImports;
   let filesWithInvalidatedResolutions;
   let filesWithInvalidatedNonRelativeUnresolvedImports;
-  const nonRelativeExternalModuleResolutions = createMultiMap();
+  const nonRelativeExternalModuleResolutions = /* @__PURE__ */ new Set();
   const resolutionsWithFailedLookups = /* @__PURE__ */ new Set();
   const resolutionsWithOnlyAffectingLocations = /* @__PURE__ */ new Set();
   const resolvedFileToResolution = /* @__PURE__ */ new Map();
@@ -124761,8 +124751,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     moduleResolutionCache.clearAllExceptPackageJsonInfoCache();
     typeReferenceDirectiveResolutionCache.clearAllExceptPackageJsonInfoCache();
     libraryResolutionCache.clearAllExceptPackageJsonInfoCache();
-    nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfNonRelativeModuleResolutions);
-    nonRelativeExternalModuleResolutions.clear();
+    watchFailedLookupLocationOfNonRelativeModuleResolutions();
     isSymlinkCache.clear();
   }
   function cleanupLibResolutionWatching(newProgram) {
@@ -124781,8 +124770,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   function finishCachingPerDirectoryResolution(newProgram, oldProgram) {
     filesWithInvalidatedNonRelativeUnresolvedImports = void 0;
     allModuleAndTypeResolutionsAreInvalidated = false;
-    nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfNonRelativeModuleResolutions);
-    nonRelativeExternalModuleResolutions.clear();
+    watchFailedLookupLocationOfNonRelativeModuleResolutions();
     if (newProgram !== oldProgram) {
       cleanupLibResolutionWatching(newProgram);
       newProgram == null ? void 0 : newProgram.getSourceFiles().forEach((newFile) => {
@@ -125045,7 +125033,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     if (!deferWatchingNonRelativeResolution || isExternalModuleNameRelative(name)) {
       watchFailedLookupLocationOfResolution(resolution);
     } else {
-      nonRelativeExternalModuleResolutions.add(name, resolution);
+      nonRelativeExternalModuleResolutions.add(resolution);
     }
     const resolved = getResolutionWithResolvedFileName(resolution);
     if (resolved && resolved.resolvedFileName) {
@@ -125181,17 +125169,9 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     (_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)) {
-      resolutions.forEach(watchFailedLookupLocationOfResolution);
-    } else {
-      resolutions.forEach((resolution) => watchAffectingLocationsOfResolution(
-        resolution,
-        /*addToResolutionsWithOnlyAffectingLocations*/
-        true
-      ));
-    }
+  function watchFailedLookupLocationOfNonRelativeModuleResolutions() {
+    nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfResolution);
+    nonRelativeExternalModuleResolutions.clear();
   }
   function createDirectoryWatcherForPackageDir(dir, dirPath, packageDir, packageDirPath, nonRecursive) {
     Debug.assert(!nonRecursive);

package/lib/typescript.js

@@ -2251,7 +2251,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.6";
-var version = `${versionMajorMinor}.0-dev.20240711`;
+var version = `${versionMajorMinor}.0-dev.20240713`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -10141,7 +10141,7 @@ var Diagnostics = {
   Extends_clause_for_inferred_type_0_has_or_is_using_private_name_1: diag(4085, 1 /* Error */, "Extends_clause_for_inferred_type_0_has_or_is_using_private_name_1_4085", "Extends clause for inferred type '{0}' has or is using private name '{1}'."),
   Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: diag(4091, 1 /* Error */, "Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4091", "Parameter '{0}' of index signature from exported interface has or is using name '{1}' from private module '{2}'."),
   Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1: diag(4092, 1 /* Error */, "Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1_4092", "Parameter '{0}' of index signature from exported interface has or is using private name '{1}'."),
-  Property_0_of_exported_class_expression_may_not_be_private_or_protected: diag(4094, 1 /* Error */, "Property_0_of_exported_class_expression_may_not_be_private_or_protected_4094", "Property '{0}' of exported class expression may not be private or protected."),
+  Property_0_of_exported_anonymous_class_type_may_not_be_private_or_protected: diag(4094, 1 /* Error */, "Property_0_of_exported_anonymous_class_type_may_not_be_private_or_protected_4094", "Property '{0}' of exported anonymous class type may not be private or protected."),
   Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: diag(4095, 1 /* Error */, "Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_4095", "Public static method '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named."),
   Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: diag(4096, 1 /* Error */, "Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4096", "Public static method '{0}' of exported class has or is using name '{1}' from private module '{2}'."),
   Public_static_method_0_of_exported_class_has_or_is_using_private_name_1: diag(4097, 1 /* Error */, "Public_static_method_0_of_exported_class_has_or_is_using_private_name_1_4097", "Public static method '{0}' of exported class has or is using private name '{1}'."),
@@ -10379,7 +10379,6 @@ var Diagnostics = {
   Parse_in_strict_mode_and_emit_use_strict_for_each_source_file: diag(6141, 3 /* Message */, "Parse_in_strict_mode_and_emit_use_strict_for_each_source_file_6141", 'Parse in strict mode and emit "use strict" for each source file.'),
   Module_0_was_resolved_to_1_but_jsx_is_not_set: diag(6142, 1 /* Error */, "Module_0_was_resolved_to_1_but_jsx_is_not_set_6142", "Module '{0}' was resolved to '{1}', but '--jsx' is not set."),
   Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1: diag(6144, 3 /* Message */, "Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1_6144", "Module '{0}' was resolved as locally declared ambient module in file '{1}'."),
-  Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified: diag(6145, 3 /* Message */, "Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified_6145", "Module '{0}' was resolved as ambient module declared in '{1}' since this file was not modified."),
   Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h: diag(6146, 3 /* Message */, "Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h_6146", "Specify the JSX factory function to use when targeting 'react' JSX emit, e.g. 'React.createElement' or 'h'."),
   Resolution_for_module_0_was_found_in_cache_from_location_1: diag(6147, 3 /* Message */, "Resolution_for_module_0_was_found_in_cache_from_location_1_6147", "Resolution for module '{0}' was found in cache from location '{1}'."),
   Directory_0_does_not_exist_skipping_all_lookups_in_it: diag(6148, 3 /* Message */, "Directory_0_does_not_exist_skipping_all_lookups_in_it_6148", "Directory '{0}' does not exist, skipping all lookups in it."),
@@ -50121,13 +50120,6 @@ function createTypeChecker(host) {
       /*withAugmentations*/
       true
     ),
-    tryFindAmbientModuleWithoutAugmentations: (moduleName) => {
-      return tryFindAmbientModule(
-        moduleName,
-        /*withAugmentations*/
-        false
-      );
-    },
     getApparentType,
     getUnionType,
     isTypeAssignableTo,
@@ -50670,6 +50662,7 @@ function createTypeChecker(host) {
   };
   var amalgamatedDuplicates;
   var reverseMappedCache = /* @__PURE__ */ new Map();
+  var reverseHomomorphicMappedCache = /* @__PURE__ */ new Map();
   var ambientModulesCache;
   var patternAmbientModules;
   var patternAmbientModuleAugmentations;
@@ -54898,7 +54891,21 @@ function createTypeChecker(host) {
     }
     function shouldUsePlaceholderForProperty(propertySymbol, context) {
       var _a;
-      return !!(getCheckFlags(propertySymbol) & 8192 /* ReverseMapped */) && (contains(context.reverseMappedStack, propertySymbol) || ((_a = context.reverseMappedStack) == null ? void 0 : _a[0]) && !(getObjectFlags(last(context.reverseMappedStack).links.propertyType) & 16 /* Anonymous */));
+      const depth = 3;
+      return !!(getCheckFlags(propertySymbol) & 8192 /* ReverseMapped */) && (contains(context.reverseMappedStack, propertySymbol) || ((_a = context.reverseMappedStack) == null ? void 0 : _a[0]) && !(getObjectFlags(last(context.reverseMappedStack).links.propertyType) & 16 /* Anonymous */) || isDeeplyNestedReverseMappedTypeProperty());
+      function isDeeplyNestedReverseMappedTypeProperty() {
+        var _a2;
+        if ((((_a2 = context.reverseMappedStack) == null ? void 0 : _a2.length) ?? 0) < depth) {
+          return false;
+        }
+        for (let i = 0; i < depth; i++) {
+          const prop = context.reverseMappedStack[context.reverseMappedStack.length - 1 - i];
+          if (prop.links.mappedType.symbol !== propertySymbol.links.mappedType.symbol) {
+            return false;
+          }
+        }
+        return true;
+      }
     }
     function addPropertyToElementList(propertySymbol, context, typeElements) {
       var _a;
@@ -70944,11 +70951,11 @@ function createTypeChecker(host) {
   }
   function inferTypeForHomomorphicMappedType(source, target, constraint) {
     const cacheKey = source.id + "," + target.id + "," + constraint.id;
-    if (reverseMappedCache.has(cacheKey)) {
-      return reverseMappedCache.get(cacheKey);
+    if (reverseHomomorphicMappedCache.has(cacheKey)) {
+      return reverseHomomorphicMappedCache.get(cacheKey);
     }
     const type = createReverseMappedType(source, target, constraint);
-    reverseMappedCache.set(cacheKey, type);
+    reverseHomomorphicMappedCache.set(cacheKey, type);
     return type;
   }
   function isPartiallyInferableType(type) {
@@ -115831,7 +115838,10 @@ function transformDeclarations(context) {
   function reportPrivateInBaseOfClassExpression(propertyName) {
     if (errorNameNode || errorFallbackNode) {
       context.addDiagnostic(
-        createDiagnosticForNode(errorNameNode || errorFallbackNode, Diagnostics.Property_0_of_exported_class_expression_may_not_be_private_or_protected, propertyName)
+        addRelatedInfo(
+          createDiagnosticForNode(errorNameNode || errorFallbackNode, Diagnostics.Property_0_of_exported_anonymous_class_type_may_not_be_private_or_protected, propertyName),
+          ...isVariableDeclaration((errorNameNode || errorFallbackNode).parent) ? [createDiagnosticForNode(errorNameNode || errorFallbackNode, Diagnostics.Add_a_type_annotation_to_the_variable_0, errorDeclarationNameWithFallback())] : []
+        )
       );
     }
   }
@@ -124093,7 +124103,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
   let commonSourceDirectory;
   let typeChecker;
   let classifiableNames;
-  const ambientModuleNameToUnmodifiedFileName = /* @__PURE__ */ new Map();
   let fileReasons = createMultiMap();
   let filesWithReferencesProcessed;
   let fileReasonsToChain;
@@ -124683,35 +124692,9 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       getResolutionFromOldProgram: (name, mode) => oldProgram == null ? void 0 : oldProgram.getResolvedModule(containingFile, name, mode),
       getResolved: getResolvedModuleFromResolution,
       canReuseResolutionsInFile: () => containingFile === (oldProgram == null ? void 0 : oldProgram.getSourceFile(containingFile.fileName)) && !hasInvalidatedResolutions(containingFile.path),
-      isEntryResolvingToAmbientModule: moduleNameResolvesToAmbientModule
+      resolveToOwnAmbientModule: true
     });
   }
-  function moduleNameResolvesToAmbientModule(moduleName, file) {
-    if (contains(file.ambientModuleNames, moduleName.text)) {
-      if (isTraceEnabled(options, host)) {
-        trace(host, Diagnostics.Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1, moduleName.text, getNormalizedAbsolutePath(file.originalFileName, currentDirectory));
-      }
-      return true;
-    } else {
-      return moduleNameResolvesToAmbientModuleInNonModifiedFile(moduleName, file);
-    }
-  }
-  function moduleNameResolvesToAmbientModuleInNonModifiedFile(moduleName, file) {
-    var _a2;
-    const resolutionToFile = (_a2 = oldProgram == null ? void 0 : oldProgram.getResolvedModule(file, moduleName.text, getModeForUsageLocation2(file, moduleName))) == null ? void 0 : _a2.resolvedModule;
-    const resolvedFile = resolutionToFile && oldProgram.getSourceFile(resolutionToFile.resolvedFileName);
-    if (resolutionToFile && resolvedFile) {
-      return false;
-    }
-    const unmodifiedFile = ambientModuleNameToUnmodifiedFileName.get(moduleName.text);
-    if (!unmodifiedFile) {
-      return false;
-    }
-    if (isTraceEnabled(options, host)) {
-      trace(host, Diagnostics.Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified, moduleName.text, unmodifiedFile);
-    }
-    return true;
-  }
   function resolveTypeReferenceDirectiveNamesReusingOldState(typeDirectiveNames, containingFile) {
     const containingSourceFile = !isString(containingFile) ? containingFile : void 0;
     return resolveNamesReusingOldState({
@@ -124739,10 +124722,10 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     getResolutionFromOldProgram,
     getResolved,
     canReuseResolutionsInFile,
-    isEntryResolvingToAmbientModule
+    resolveToOwnAmbientModule
   }) {
     if (!entries.length) return emptyArray;
-    if (structureIsReused === 0 /* Not */ && (!isEntryResolvingToAmbientModule || !containingSourceFile.ambientModuleNames.length)) {
+    if (structureIsReused === 0 /* Not */ && (!resolveToOwnAmbientModule || !containingSourceFile.ambientModuleNames.length)) {
       return resolutionWorker(
         entries,
         containingFile,
@@ -124778,12 +124761,23 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
           continue;
         }
       }
-      if (isEntryResolvingToAmbientModule == null ? void 0 : isEntryResolvingToAmbientModule(entry, containingFile)) {
-        (result ?? (result = new Array(entries.length)))[i] = emptyResolution;
-      } else {
-        (unknownEntries ?? (unknownEntries = [])).push(entry);
-        (unknownEntryIndices ?? (unknownEntryIndices = [])).push(i);
+      if (resolveToOwnAmbientModule) {
+        const name = nameAndModeGetter.getName(entry);
+        if (contains(containingSourceFile.ambientModuleNames, name)) {
+          if (isTraceEnabled(options, host)) {
+            trace(
+              host,
+              Diagnostics.Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1,
+              name,
+              getNormalizedAbsolutePath(containingSourceFile.originalFileName, currentDirectory)
+            );
+          }
+          (result ?? (result = new Array(entries.length)))[i] = emptyResolution;
+          continue;
+        }
       }
+      (unknownEntries ?? (unknownEntries = [])).push(entry);
+      (unknownEntryIndices ?? (unknownEntryIndices = [])).push(i);
     }
     if (!unknownEntries) return result;
     const resolutions = resolutionWorker(unknownEntries, containingFile, reusedNames);
@@ -124917,10 +124911,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       } else if (hasInvalidatedResolutions(oldSourceFile.path)) {
         structureIsReused = 1 /* SafeModules */;
         modifiedSourceFiles.push(newSourceFile);
-      } else {
-        for (const moduleName of oldSourceFile.ambientModuleNames) {
-          ambientModuleNameToUnmodifiedFileName.set(moduleName, oldSourceFile.fileName);
-        }
       }
       newSourceFiles.push(newSourceFile);
     }
@@ -129509,7 +129499,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   let filesWithChangedSetOfUnresolvedImports;
   let filesWithInvalidatedResolutions;
   let filesWithInvalidatedNonRelativeUnresolvedImports;
-  const nonRelativeExternalModuleResolutions = createMultiMap();
+  const nonRelativeExternalModuleResolutions = /* @__PURE__ */ new Set();
   const resolutionsWithFailedLookups = /* @__PURE__ */ new Set();
   const resolutionsWithOnlyAffectingLocations = /* @__PURE__ */ new Set();
   const resolvedFileToResolution = /* @__PURE__ */ new Map();
@@ -129660,8 +129650,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     moduleResolutionCache.clearAllExceptPackageJsonInfoCache();
     typeReferenceDirectiveResolutionCache.clearAllExceptPackageJsonInfoCache();
     libraryResolutionCache.clearAllExceptPackageJsonInfoCache();
-    nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfNonRelativeModuleResolutions);
-    nonRelativeExternalModuleResolutions.clear();
+    watchFailedLookupLocationOfNonRelativeModuleResolutions();
     isSymlinkCache.clear();
   }
   function cleanupLibResolutionWatching(newProgram) {
@@ -129680,8 +129669,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   function finishCachingPerDirectoryResolution(newProgram, oldProgram) {
     filesWithInvalidatedNonRelativeUnresolvedImports = void 0;
     allModuleAndTypeResolutionsAreInvalidated = false;
-    nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfNonRelativeModuleResolutions);
-    nonRelativeExternalModuleResolutions.clear();
+    watchFailedLookupLocationOfNonRelativeModuleResolutions();
     if (newProgram !== oldProgram) {
       cleanupLibResolutionWatching(newProgram);
       newProgram == null ? void 0 : newProgram.getSourceFiles().forEach((newFile) => {
@@ -129944,7 +129932,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     if (!deferWatchingNonRelativeResolution || isExternalModuleNameRelative(name)) {
       watchFailedLookupLocationOfResolution(resolution);
     } else {
-      nonRelativeExternalModuleResolutions.add(name, resolution);
+      nonRelativeExternalModuleResolutions.add(resolution);
     }
     const resolved = getResolutionWithResolvedFileName(resolution);
     if (resolved && resolved.resolvedFileName) {
@@ -130080,17 +130068,9 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     (_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)) {
-      resolutions.forEach(watchFailedLookupLocationOfResolution);
-    } else {
-      resolutions.forEach((resolution) => watchAffectingLocationsOfResolution(
-        resolution,
-        /*addToResolutionsWithOnlyAffectingLocations*/
-        true
-      ));
-    }
+  function watchFailedLookupLocationOfNonRelativeModuleResolutions() {
+    nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfResolution);
+    nonRelativeExternalModuleResolutions.clear();
   }
   function createDirectoryWatcherForPackageDir(dir, dirPath, packageDir, packageDirPath, nonRecursive) {
     Debug.assert(!nonRecursive);

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.6.0-dev.20240711",
+    "version": "5.6.0-dev.20240713",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -113,5 +113,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "e450c463c610136ee86392f90025e03071334def"
+    "gitHead": "6d3be985c82bead3b41348de76efec8110c677c5"
 }