@typescript-deploys/pr-build 5.8.0-pr-60576-12 → 5.8.0-pr-60718-25

package/lib/_tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.8";
-var version = `${versionMajorMinor}.0-insiders.20241204`;
+var version = `${versionMajorMinor}.0-insiders.20241211`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -6850,6 +6850,8 @@ var Diagnostics = {
   Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next: diag(4124, 1 /* Error */, "Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_w_4124", "Compiler option '{0}' of value '{1}' is unstable. Use nightly TypeScript to silence this error. Try updating with 'npm install -D typescript@next'."),
   Each_declaration_of_0_1_differs_in_its_value_where_2_was_expected_but_3_was_given: diag(4125, 1 /* Error */, "Each_declaration_of_0_1_differs_in_its_value_where_2_was_expected_but_3_was_given_4125", "Each declaration of '{0}.{1}' differs in its value, where '{2}' was expected but '{3}' was given."),
   One_value_of_0_1_is_the_string_2_and_the_other_is_assumed_to_be_an_unknown_numeric_value: diag(4126, 1 /* Error */, "One_value_of_0_1_is_the_string_2_and_the_other_is_assumed_to_be_an_unknown_numeric_value_4126", "One value of '{0}.{1}' is the string '{2}', and the other is assumed to be an unknown numeric value."),
+  This_member_cannot_have_an_override_modifier_because_its_name_is_dynamic: diag(4127, 1 /* Error */, "This_member_cannot_have_an_override_modifier_because_its_name_is_dynamic_4127", "This member cannot have an 'override' modifier because its name is dynamic."),
+  This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_its_name_is_dynamic: diag(4128, 1 /* Error */, "This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_its_name_is_dynamic_4128", "This member cannot have a JSDoc comment with an '@override' tag because its name is dynamic."),
   The_current_host_does_not_support_the_0_option: diag(5001, 1 /* Error */, "The_current_host_does_not_support_the_0_option_5001", "The current host does not support the '{0}' option."),
   Cannot_find_the_common_subdirectory_path_for_the_input_files: diag(5009, 1 /* Error */, "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", "Cannot find the common subdirectory path for the input files."),
   File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: diag(5010, 1 /* Error */, "File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0_5010", "File specification cannot end in a recursive directory wildcard ('**'): '{0}'."),
@@ -40736,9 +40738,7 @@ function tryFileLookup(fileName, onlyRecordFailures, state) {
 }
 function loadNodeModuleFromDirectory(extensions, candidate, onlyRecordFailures, state, considerPackageJson = true) {
   const packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, onlyRecordFailures, state) : void 0;
-  const packageJsonContent = packageInfo && packageInfo.contents.packageJsonContent;
-  const versionPaths = packageInfo && getVersionPathsOfPackageJsonInfo(packageInfo, state);
-  return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths), state);
+  return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo), state);
 }
 function getTemporaryModuleResolutionState(packageJsonInfoCache, host, options) {
   return {
@@ -40845,13 +40845,14 @@ function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
     (_f = state.failedLookupLocations) == null ? void 0 : _f.push(packageJsonPath);
   }
 }
-function loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, jsonContent, versionPaths) {
+function loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJson) {
+  const versionPaths = packageJson && getVersionPathsOfPackageJsonInfo(packageJson, state);
   let packageFile;
-  if (jsonContent) {
+  if (packageJson && arePathsEqual(packageJson == null ? void 0 : packageJson.packageDirectory, candidate, state.host)) {
     if (state.isConfigLookup) {
-      packageFile = readPackageJsonTSConfigField(jsonContent, candidate, state);
+      packageFile = readPackageJsonTSConfigField(packageJson.contents.packageJsonContent, packageJson.packageDirectory, state);
     } else {
-      packageFile = extensions & 4 /* Declaration */ && readPackageJsonTypesFields(jsonContent, candidate, state) || extensions & (3 /* ImplementationFiles */ | 4 /* Declaration */) && readPackageJsonMainField(jsonContent, candidate, state) || void 0;
+      packageFile = extensions & 4 /* Declaration */ && readPackageJsonTypesFields(packageJson.contents.packageJsonContent, packageJson.packageDirectory, state) || extensions & (3 /* ImplementationFiles */ | 4 /* Declaration */) && readPackageJsonMainField(packageJson.contents.packageJsonContent, packageJson.packageDirectory, state) || void 0;
     }
   }
   const loader = (extensions2, candidate2, onlyRecordFailures2, state2) => {
@@ -40870,7 +40871,7 @@ function loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFail
     const features = state2.features;
     const candidateIsFromPackageJsonField = state2.candidateIsFromPackageJsonField;
     state2.candidateIsFromPackageJsonField = true;
-    if ((jsonContent == null ? void 0 : jsonContent.type) !== "module") {
+    if ((packageJson == null ? void 0 : packageJson.contents.packageJsonContent.type) !== "module") {
       state2.features &= ~32 /* EsmMode */;
     }
     const result = nodeLoadModuleByRelativeName(
@@ -41473,8 +41474,7 @@ function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, node
       candidate,
       !nodeModulesDirectoryExists,
       state,
-      packageInfo.contents.packageJsonContent,
-      getVersionPathsOfPackageJsonInfo(packageInfo, state)
+      packageInfo
     );
     return withPackageId(packageInfo, fromDirectory, state);
   }
@@ -41484,8 +41484,7 @@ function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, node
       candidate2,
       onlyRecordFailures,
       state2,
-      packageInfo && packageInfo.contents.packageJsonContent,
-      packageInfo && getVersionPathsOfPackageJsonInfo(packageInfo, state2)
+      packageInfo
     );
     if (!pathAndExtension && packageInfo && (packageInfo.contents.packageJsonContent.exports === void 0 || packageInfo.contents.packageJsonContent.exports === null) && state2.features & 32 /* EsmMode */) {
       pathAndExtension = loadModuleFromFile(extensions2, combinePaths(candidate2, "index.js"), onlyRecordFailures, state2);
@@ -46800,6 +46799,12 @@ function createTypeChecker(host) {
     /*isReadonly*/
     true
   );
+  var anyBaseTypeIndexInfo = createIndexInfo(
+    stringType,
+    anyType,
+    /*isReadonly*/
+    false
+  );
   var iterationTypesCache = /* @__PURE__ */ new Map();
   var noIterationTypes = {
     get yieldType() {
@@ -56742,12 +56747,7 @@ function createTypeChecker(host) {
         addInheritedMembers(members, getPropertiesOfType(instantiatedBaseType));
         callSignatures = concatenate(callSignatures, getSignaturesOfType(instantiatedBaseType, 0 /* Call */));
         constructSignatures = concatenate(constructSignatures, getSignaturesOfType(instantiatedBaseType, 1 /* Construct */));
-        const inheritedIndexInfos = instantiatedBaseType !== anyType ? getIndexInfosOfType(instantiatedBaseType) : [createIndexInfo(
-          stringType,
-          anyType,
-          /*isReadonly*/
-          false
-        )];
+        const inheritedIndexInfos = instantiatedBaseType !== anyType ? getIndexInfosOfType(instantiatedBaseType) : [anyBaseTypeIndexInfo];
         indexInfos = concatenate(indexInfos, filter(inheritedIndexInfos, (info) => !findIndexInfo(indexInfos, info.keyType)));
       }
     }
@@ -57273,12 +57273,7 @@ function createTypeChecker(host) {
         members = createSymbolTable(getNamedOrIndexSignatureMembers(members));
         addInheritedMembers(members, getPropertiesOfType(baseConstructorType));
       } else if (baseConstructorType === anyType) {
-        baseConstructorIndexInfo = createIndexInfo(
-          stringType,
-          anyType,
-          /*isReadonly*/
-          false
-        );
+        baseConstructorIndexInfo = anyBaseTypeIndexInfo;
       }
     }
     const indexSymbol = getIndexSymbolFromSymbolTable(members);
@@ -68439,14 +68434,20 @@ function createTypeChecker(host) {
     }
     return false;
   }
-  function isDiscriminantProperty(type, name) {
+  function isDiscriminantProperty(type, name, considerNonUniformPrimitivePropDiscriminant = true) {
+    var _a;
     if (type && type.flags & 1048576 /* Union */) {
       const prop = getUnionOrIntersectionProperty(type, name);
       if (prop && getCheckFlags(prop) & 2 /* SyntheticProperty */) {
-        if (prop.links.isDiscriminantProperty === void 0) {
-          prop.links.isDiscriminantProperty = (prop.links.checkFlags & 192 /* Discriminant */) === 192 /* Discriminant */ && !isGenericType(getTypeOfSymbol(prop));
+        const propType = getTypeOfSymbol(prop);
+        const transientSymbol = prop;
+        (_a = transientSymbol.links).isDiscriminantProperty ?? (_a.isDiscriminantProperty = /* @__PURE__ */ new Map());
+        let isDiscriminant = transientSymbol.links.isDiscriminantProperty.get(considerNonUniformPrimitivePropDiscriminant);
+        if (typeof isDiscriminant === "undefined") {
+          isDiscriminant = ((transientSymbol.links.checkFlags & 192 /* Discriminant */) === 192 /* Discriminant */ || !!(considerNonUniformPrimitivePropDiscriminant && transientSymbol.links.checkFlags & 64 /* HasNonUniformType */ && someType(propType, (t) => !!(t.flags & 402784252 /* Primitive */)))) && !isGenericType(propType);
+          transientSymbol.links.isDiscriminantProperty.set(considerNonUniformPrimitivePropDiscriminant, isDiscriminant);
         }
-        return !!prop.links.isDiscriminantProperty;
+        return isDiscriminant;
       }
     }
     return false;
@@ -68454,7 +68455,12 @@ function createTypeChecker(host) {
   function findDiscriminantProperties(sourceProperties, target) {
     let result;
     for (const sourceProperty of sourceProperties) {
-      if (isDiscriminantProperty(target, sourceProperty.escapedName)) {
+      if (isDiscriminantProperty(
+        target,
+        sourceProperty.escapedName,
+        /*considerNonUniformPrimitivePropDiscriminant*/
+        false
+      )) {
         if (result) {
           result.push(sourceProperty);
           continue;
@@ -70677,12 +70683,13 @@ function createTypeChecker(host) {
       const jsxFactoryRefErr = diagnostics && compilerOptions.jsx === 2 /* React */ ? Diagnostics.This_JSX_tag_requires_0_to_be_in_scope_but_it_could_not_be_found : void 0;
       const jsxFactoryNamespace = getJsxNamespace(node);
       const jsxFactoryLocation = isJsxOpeningLikeElement(node) ? node.tagName : node;
+      const shouldFactoryRefErr = compilerOptions.jsx !== 1 /* Preserve */ && compilerOptions.jsx !== 3 /* ReactNative */;
       let jsxFactorySym;
       if (!(isJsxOpeningFragment(node) && jsxFactoryNamespace === "null")) {
         jsxFactorySym = resolveName(
           jsxFactoryLocation,
           jsxFactoryNamespace,
-          compilerOptions.jsx === 1 /* Preserve */ || compilerOptions.jsx === 3 /* ReactNative */ ? 111551 /* Value */ & ~384 /* Enum */ : 111551 /* Value */,
+          shouldFactoryRefErr ? 111551 /* Value */ : 111551 /* Value */ & ~384 /* Enum */,
           jsxFactoryRefErr,
           /*isUse*/
           true
@@ -70696,12 +70703,13 @@ function createTypeChecker(host) {
       }
       if (isJsxOpeningFragment(node)) {
         const file = getSourceFileOfNode(node);
-        const localJsxNamespace = getLocalJsxNamespace(file);
-        if (localJsxNamespace) {
+        const entity = getJsxFactoryEntity(file);
+        if (entity) {
+          const localJsxNamespace = getFirstIdentifier(entity).escapedText;
           resolveName(
             jsxFactoryLocation,
             localJsxNamespace,
-            compilerOptions.jsx === 1 /* Preserve */ || compilerOptions.jsx === 3 /* ReactNative */ ? 111551 /* Value */ & ~384 /* Enum */ : 111551 /* Value */,
+            shouldFactoryRefErr ? 111551 /* Value */ : 111551 /* Value */ & ~384 /* Enum */,
             jsxFactoryRefErr,
             /*isUse*/
             true
@@ -74276,6 +74284,13 @@ function createTypeChecker(host) {
     return getIntersectionType(x);
   }
   function reportNonexistentProperty(propNode, containingType, isUncheckedJS) {
+    const links = getNodeLinks(propNode);
+    const cache = links.nonExistentPropCheckCache || (links.nonExistentPropCheckCache = /* @__PURE__ */ new Set());
+    const key = `${getTypeId(containingType)}|${isUncheckedJS}`;
+    if (cache.has(key)) {
+      return;
+    }
+    cache.add(key);
     let errorInfo;
     let relatedInfo;
     if (!isPrivateIdentifier(propNode) && containingType.flags & 1048576 /* Union */ && !(containingType.flags & 402784252 /* Primitive */)) {
@@ -76239,12 +76254,14 @@ function createTypeChecker(host) {
     const sourceFileLinks = getNodeLinks(getSourceFileOfNode(node));
     if (sourceFileLinks.jsxFragmentType !== void 0) return sourceFileLinks.jsxFragmentType;
     const jsxFragmentFactoryName = getJsxNamespace(node);
-    if (jsxFragmentFactoryName === "null") return sourceFileLinks.jsxFragmentType = anyType;
+    const shouldResolveFactoryReference = (compilerOptions.jsx === 2 /* React */ || compilerOptions.jsxFragmentFactory !== void 0) && jsxFragmentFactoryName !== "null";
+    if (!shouldResolveFactoryReference) return sourceFileLinks.jsxFragmentType = anyType;
+    const shouldModuleRefErr = compilerOptions.jsx !== 1 /* Preserve */ && compilerOptions.jsx !== 3 /* ReactNative */;
     const jsxFactoryRefErr = diagnostics ? Diagnostics.Using_JSX_fragments_requires_fragment_factory_0_to_be_in_scope_but_it_could_not_be_found : void 0;
     const jsxFactorySymbol = getJsxNamespaceContainerForImplicitImport(node) ?? resolveName(
       node,
       jsxFragmentFactoryName,
-      compilerOptions.jsx === 1 /* Preserve */ || compilerOptions.jsx === 3 /* ReactNative */ ? 111551 /* Value */ & ~384 /* Enum */ : 111551 /* Value */,
+      shouldModuleRefErr ? 111551 /* Value */ : 111551 /* Value */ & ~384 /* Enum */,
       /*nameNotFoundMessage*/
       jsxFactoryRefErr,
       /*isUse*/
@@ -84099,6 +84116,13 @@ function createTypeChecker(host) {
   function checkMemberForOverrideModifier(node, staticType, baseStaticType, baseWithThis, type, typeWithThis, memberHasOverrideModifier, memberHasAbstractModifier, memberIsStatic, memberIsParameterProperty, member, errorNode) {
     const isJs = isInJSFile(node);
     const nodeInAmbientContext = !!(node.flags & 33554432 /* Ambient */);
+    if (memberHasOverrideModifier && (member == null ? void 0 : member.valueDeclaration) && isClassElement(member.valueDeclaration) && member.valueDeclaration.name && isNonBindableDynamicName(member.valueDeclaration.name)) {
+      error(
+        errorNode,
+        isJs ? Diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_its_name_is_dynamic : Diagnostics.This_member_cannot_have_an_override_modifier_because_its_name_is_dynamic
+      );
+      return 2 /* HasInvalidOverride */;
+    }
     if (baseWithThis && (memberHasOverrideModifier || compilerOptions.noImplicitOverride)) {
       const thisType = memberIsStatic ? staticType : typeWithThis;
       const baseType = memberIsStatic ? baseStaticType : baseWithThis;
@@ -87433,6 +87457,7 @@ function createTypeChecker(host) {
           result || (result = []);
           for (const info of infoList) {
             if (info.declaration) continue;
+            if (info === anyBaseTypeIndexInfo) continue;
             const node = nodeBuilder.indexInfoToIndexSignatureDeclaration(info, enclosing, flags, internalFlags, tracker);
             if (node && infoList === staticInfos) {
               (node.modifiers || (node.modifiers = factory.createNodeArray())).unshift(factory.createModifier(126 /* StaticKeyword */));

package/lib/typescript.d.ts

@@ -4989,7 +4989,7 @@ declare namespace ts {
         readonly modifiers?: NodeArray<Modifier>;
         readonly equalsGreaterThanToken: EqualsGreaterThanToken;
         readonly body: ConciseBody;
-        readonly name: never;
+        readonly name?: never;
     }
     interface LiteralLikeNode extends Node {
         text: string;

package/lib/typescript.js

@@ -2278,7 +2278,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.8";
-var version = `${versionMajorMinor}.0-insiders.20241204`;
+var version = `${versionMajorMinor}.0-insiders.20241211`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -10229,6 +10229,8 @@ var Diagnostics = {
   Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next: diag(4124, 1 /* Error */, "Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_w_4124", "Compiler option '{0}' of value '{1}' is unstable. Use nightly TypeScript to silence this error. Try updating with 'npm install -D typescript@next'."),
   Each_declaration_of_0_1_differs_in_its_value_where_2_was_expected_but_3_was_given: diag(4125, 1 /* Error */, "Each_declaration_of_0_1_differs_in_its_value_where_2_was_expected_but_3_was_given_4125", "Each declaration of '{0}.{1}' differs in its value, where '{2}' was expected but '{3}' was given."),
   One_value_of_0_1_is_the_string_2_and_the_other_is_assumed_to_be_an_unknown_numeric_value: diag(4126, 1 /* Error */, "One_value_of_0_1_is_the_string_2_and_the_other_is_assumed_to_be_an_unknown_numeric_value_4126", "One value of '{0}.{1}' is the string '{2}', and the other is assumed to be an unknown numeric value."),
+  This_member_cannot_have_an_override_modifier_because_its_name_is_dynamic: diag(4127, 1 /* Error */, "This_member_cannot_have_an_override_modifier_because_its_name_is_dynamic_4127", "This member cannot have an 'override' modifier because its name is dynamic."),
+  This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_its_name_is_dynamic: diag(4128, 1 /* Error */, "This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_its_name_is_dynamic_4128", "This member cannot have a JSDoc comment with an '@override' tag because its name is dynamic."),
   The_current_host_does_not_support_the_0_option: diag(5001, 1 /* Error */, "The_current_host_does_not_support_the_0_option_5001", "The current host does not support the '{0}' option."),
   Cannot_find_the_common_subdirectory_path_for_the_input_files: diag(5009, 1 /* Error */, "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", "Cannot find the common subdirectory path for the input files."),
   File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: diag(5010, 1 /* Error */, "File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0_5010", "File specification cannot end in a recursive directory wildcard ('**'): '{0}'."),
@@ -45107,9 +45109,7 @@ function tryFileLookup(fileName, onlyRecordFailures, state) {
 }
 function loadNodeModuleFromDirectory(extensions, candidate, onlyRecordFailures, state, considerPackageJson = true) {
   const packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, onlyRecordFailures, state) : void 0;
-  const packageJsonContent = packageInfo && packageInfo.contents.packageJsonContent;
-  const versionPaths = packageInfo && getVersionPathsOfPackageJsonInfo(packageInfo, state);
-  return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths), state);
+  return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo), state);
 }
 function getEntrypointsFromPackageJsonInfo(packageJsonInfo, options, host, cache, resolveJs) {
   if (!resolveJs && packageJsonInfo.contents.resolvedEntrypoints !== void 0) {
@@ -45127,8 +45127,7 @@ function getEntrypointsFromPackageJsonInfo(packageJsonInfo, options, host, cache
     /*onlyRecordFailures*/
     false,
     loadPackageJsonMainState,
-    packageJsonInfo.contents.packageJsonContent,
-    getVersionPathsOfPackageJsonInfo(packageJsonInfo, loadPackageJsonMainState)
+    packageJsonInfo
   );
   entrypoints = append(entrypoints, mainResolution == null ? void 0 : mainResolution.path);
   if (features & 8 /* Exports */ && packageJsonInfo.contents.packageJsonContent.exports) {
@@ -45331,13 +45330,14 @@ function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
     (_f = state.failedLookupLocations) == null ? void 0 : _f.push(packageJsonPath);
   }
 }
-function loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, jsonContent, versionPaths) {
+function loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJson) {
+  const versionPaths = packageJson && getVersionPathsOfPackageJsonInfo(packageJson, state);
   let packageFile;
-  if (jsonContent) {
+  if (packageJson && arePathsEqual(packageJson == null ? void 0 : packageJson.packageDirectory, candidate, state.host)) {
     if (state.isConfigLookup) {
-      packageFile = readPackageJsonTSConfigField(jsonContent, candidate, state);
+      packageFile = readPackageJsonTSConfigField(packageJson.contents.packageJsonContent, packageJson.packageDirectory, state);
     } else {
-      packageFile = extensions & 4 /* Declaration */ && readPackageJsonTypesFields(jsonContent, candidate, state) || extensions & (3 /* ImplementationFiles */ | 4 /* Declaration */) && readPackageJsonMainField(jsonContent, candidate, state) || void 0;
+      packageFile = extensions & 4 /* Declaration */ && readPackageJsonTypesFields(packageJson.contents.packageJsonContent, packageJson.packageDirectory, state) || extensions & (3 /* ImplementationFiles */ | 4 /* Declaration */) && readPackageJsonMainField(packageJson.contents.packageJsonContent, packageJson.packageDirectory, state) || void 0;
     }
   }
   const loader = (extensions2, candidate2, onlyRecordFailures2, state2) => {
@@ -45356,7 +45356,7 @@ function loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFail
     const features = state2.features;
     const candidateIsFromPackageJsonField = state2.candidateIsFromPackageJsonField;
     state2.candidateIsFromPackageJsonField = true;
-    if ((jsonContent == null ? void 0 : jsonContent.type) !== "module") {
+    if ((packageJson == null ? void 0 : packageJson.contents.packageJsonContent.type) !== "module") {
       state2.features &= ~32 /* EsmMode */;
     }
     const result = nodeLoadModuleByRelativeName(
@@ -45959,8 +45959,7 @@ function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, node
       candidate,
       !nodeModulesDirectoryExists,
       state,
-      packageInfo.contents.packageJsonContent,
-      getVersionPathsOfPackageJsonInfo(packageInfo, state)
+      packageInfo
     );
     return withPackageId(packageInfo, fromDirectory, state);
   }
@@ -45970,8 +45969,7 @@ function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, node
       candidate2,
       onlyRecordFailures,
       state2,
-      packageInfo && packageInfo.contents.packageJsonContent,
-      packageInfo && getVersionPathsOfPackageJsonInfo(packageInfo, state2)
+      packageInfo
     );
     if (!pathAndExtension && packageInfo && (packageInfo.contents.packageJsonContent.exports === void 0 || packageInfo.contents.packageJsonContent.exports === null) && state2.features & 32 /* EsmMode */) {
       pathAndExtension = loadModuleFromFile(extensions2, combinePaths(candidate2, "index.js"), onlyRecordFailures, state2);
@@ -51404,6 +51402,12 @@ function createTypeChecker(host) {
     /*isReadonly*/
     true
   );
+  var anyBaseTypeIndexInfo = createIndexInfo(
+    stringType,
+    anyType,
+    /*isReadonly*/
+    false
+  );
   var iterationTypesCache = /* @__PURE__ */ new Map();
   var noIterationTypes = {
     get yieldType() {
@@ -61346,12 +61350,7 @@ function createTypeChecker(host) {
         addInheritedMembers(members, getPropertiesOfType(instantiatedBaseType));
         callSignatures = concatenate(callSignatures, getSignaturesOfType(instantiatedBaseType, 0 /* Call */));
         constructSignatures = concatenate(constructSignatures, getSignaturesOfType(instantiatedBaseType, 1 /* Construct */));
-        const inheritedIndexInfos = instantiatedBaseType !== anyType ? getIndexInfosOfType(instantiatedBaseType) : [createIndexInfo(
-          stringType,
-          anyType,
-          /*isReadonly*/
-          false
-        )];
+        const inheritedIndexInfos = instantiatedBaseType !== anyType ? getIndexInfosOfType(instantiatedBaseType) : [anyBaseTypeIndexInfo];
         indexInfos = concatenate(indexInfos, filter(inheritedIndexInfos, (info) => !findIndexInfo(indexInfos, info.keyType)));
       }
     }
@@ -61877,12 +61876,7 @@ function createTypeChecker(host) {
         members = createSymbolTable(getNamedOrIndexSignatureMembers(members));
         addInheritedMembers(members, getPropertiesOfType(baseConstructorType));
       } else if (baseConstructorType === anyType) {
-        baseConstructorIndexInfo = createIndexInfo(
-          stringType,
-          anyType,
-          /*isReadonly*/
-          false
-        );
+        baseConstructorIndexInfo = anyBaseTypeIndexInfo;
       }
     }
     const indexSymbol = getIndexSymbolFromSymbolTable(members);
@@ -73043,14 +73037,20 @@ function createTypeChecker(host) {
     }
     return false;
   }
-  function isDiscriminantProperty(type, name) {
+  function isDiscriminantProperty(type, name, considerNonUniformPrimitivePropDiscriminant = true) {
+    var _a;
     if (type && type.flags & 1048576 /* Union */) {
       const prop = getUnionOrIntersectionProperty(type, name);
       if (prop && getCheckFlags(prop) & 2 /* SyntheticProperty */) {
-        if (prop.links.isDiscriminantProperty === void 0) {
-          prop.links.isDiscriminantProperty = (prop.links.checkFlags & 192 /* Discriminant */) === 192 /* Discriminant */ && !isGenericType(getTypeOfSymbol(prop));
+        const propType = getTypeOfSymbol(prop);
+        const transientSymbol = prop;
+        (_a = transientSymbol.links).isDiscriminantProperty ?? (_a.isDiscriminantProperty = /* @__PURE__ */ new Map());
+        let isDiscriminant = transientSymbol.links.isDiscriminantProperty.get(considerNonUniformPrimitivePropDiscriminant);
+        if (typeof isDiscriminant === "undefined") {
+          isDiscriminant = ((transientSymbol.links.checkFlags & 192 /* Discriminant */) === 192 /* Discriminant */ || !!(considerNonUniformPrimitivePropDiscriminant && transientSymbol.links.checkFlags & 64 /* HasNonUniformType */ && someType(propType, (t) => !!(t.flags & 402784252 /* Primitive */)))) && !isGenericType(propType);
+          transientSymbol.links.isDiscriminantProperty.set(considerNonUniformPrimitivePropDiscriminant, isDiscriminant);
         }
-        return !!prop.links.isDiscriminantProperty;
+        return isDiscriminant;
       }
     }
     return false;
@@ -73058,7 +73058,12 @@ function createTypeChecker(host) {
   function findDiscriminantProperties(sourceProperties, target) {
     let result;
     for (const sourceProperty of sourceProperties) {
-      if (isDiscriminantProperty(target, sourceProperty.escapedName)) {
+      if (isDiscriminantProperty(
+        target,
+        sourceProperty.escapedName,
+        /*considerNonUniformPrimitivePropDiscriminant*/
+        false
+      )) {
         if (result) {
           result.push(sourceProperty);
           continue;
@@ -75281,12 +75286,13 @@ function createTypeChecker(host) {
       const jsxFactoryRefErr = diagnostics && compilerOptions.jsx === 2 /* React */ ? Diagnostics.This_JSX_tag_requires_0_to_be_in_scope_but_it_could_not_be_found : void 0;
       const jsxFactoryNamespace = getJsxNamespace(node);
       const jsxFactoryLocation = isJsxOpeningLikeElement(node) ? node.tagName : node;
+      const shouldFactoryRefErr = compilerOptions.jsx !== 1 /* Preserve */ && compilerOptions.jsx !== 3 /* ReactNative */;
       let jsxFactorySym;
       if (!(isJsxOpeningFragment(node) && jsxFactoryNamespace === "null")) {
         jsxFactorySym = resolveName(
           jsxFactoryLocation,
           jsxFactoryNamespace,
-          compilerOptions.jsx === 1 /* Preserve */ || compilerOptions.jsx === 3 /* ReactNative */ ? 111551 /* Value */ & ~384 /* Enum */ : 111551 /* Value */,
+          shouldFactoryRefErr ? 111551 /* Value */ : 111551 /* Value */ & ~384 /* Enum */,
           jsxFactoryRefErr,
           /*isUse*/
           true
@@ -75300,12 +75306,13 @@ function createTypeChecker(host) {
       }
       if (isJsxOpeningFragment(node)) {
         const file = getSourceFileOfNode(node);
-        const localJsxNamespace = getLocalJsxNamespace(file);
-        if (localJsxNamespace) {
+        const entity = getJsxFactoryEntity(file);
+        if (entity) {
+          const localJsxNamespace = getFirstIdentifier(entity).escapedText;
           resolveName(
             jsxFactoryLocation,
             localJsxNamespace,
-            compilerOptions.jsx === 1 /* Preserve */ || compilerOptions.jsx === 3 /* ReactNative */ ? 111551 /* Value */ & ~384 /* Enum */ : 111551 /* Value */,
+            shouldFactoryRefErr ? 111551 /* Value */ : 111551 /* Value */ & ~384 /* Enum */,
             jsxFactoryRefErr,
             /*isUse*/
             true
@@ -78880,6 +78887,13 @@ function createTypeChecker(host) {
     return getIntersectionType(x);
   }
   function reportNonexistentProperty(propNode, containingType, isUncheckedJS) {
+    const links = getNodeLinks(propNode);
+    const cache = links.nonExistentPropCheckCache || (links.nonExistentPropCheckCache = /* @__PURE__ */ new Set());
+    const key = `${getTypeId(containingType)}|${isUncheckedJS}`;
+    if (cache.has(key)) {
+      return;
+    }
+    cache.add(key);
     let errorInfo;
     let relatedInfo;
     if (!isPrivateIdentifier(propNode) && containingType.flags & 1048576 /* Union */ && !(containingType.flags & 402784252 /* Primitive */)) {
@@ -80843,12 +80857,14 @@ function createTypeChecker(host) {
     const sourceFileLinks = getNodeLinks(getSourceFileOfNode(node));
     if (sourceFileLinks.jsxFragmentType !== void 0) return sourceFileLinks.jsxFragmentType;
     const jsxFragmentFactoryName = getJsxNamespace(node);
-    if (jsxFragmentFactoryName === "null") return sourceFileLinks.jsxFragmentType = anyType;
+    const shouldResolveFactoryReference = (compilerOptions.jsx === 2 /* React */ || compilerOptions.jsxFragmentFactory !== void 0) && jsxFragmentFactoryName !== "null";
+    if (!shouldResolveFactoryReference) return sourceFileLinks.jsxFragmentType = anyType;
+    const shouldModuleRefErr = compilerOptions.jsx !== 1 /* Preserve */ && compilerOptions.jsx !== 3 /* ReactNative */;
     const jsxFactoryRefErr = diagnostics ? Diagnostics.Using_JSX_fragments_requires_fragment_factory_0_to_be_in_scope_but_it_could_not_be_found : void 0;
     const jsxFactorySymbol = getJsxNamespaceContainerForImplicitImport(node) ?? resolveName(
       node,
       jsxFragmentFactoryName,
-      compilerOptions.jsx === 1 /* Preserve */ || compilerOptions.jsx === 3 /* ReactNative */ ? 111551 /* Value */ & ~384 /* Enum */ : 111551 /* Value */,
+      shouldModuleRefErr ? 111551 /* Value */ : 111551 /* Value */ & ~384 /* Enum */,
       /*nameNotFoundMessage*/
       jsxFactoryRefErr,
       /*isUse*/
@@ -88703,6 +88719,13 @@ function createTypeChecker(host) {
   function checkMemberForOverrideModifier(node, staticType, baseStaticType, baseWithThis, type, typeWithThis, memberHasOverrideModifier, memberHasAbstractModifier, memberIsStatic, memberIsParameterProperty, member, errorNode) {
     const isJs = isInJSFile(node);
     const nodeInAmbientContext = !!(node.flags & 33554432 /* Ambient */);
+    if (memberHasOverrideModifier && (member == null ? void 0 : member.valueDeclaration) && isClassElement(member.valueDeclaration) && member.valueDeclaration.name && isNonBindableDynamicName(member.valueDeclaration.name)) {
+      error2(
+        errorNode,
+        isJs ? Diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_its_name_is_dynamic : Diagnostics.This_member_cannot_have_an_override_modifier_because_its_name_is_dynamic
+      );
+      return 2 /* HasInvalidOverride */;
+    }
     if (baseWithThis && (memberHasOverrideModifier || compilerOptions.noImplicitOverride)) {
       const thisType = memberIsStatic ? staticType : typeWithThis;
       const baseType = memberIsStatic ? baseStaticType : baseWithThis;
@@ -92037,6 +92060,7 @@ function createTypeChecker(host) {
           result || (result = []);
           for (const info of infoList) {
             if (info.declaration) continue;
+            if (info === anyBaseTypeIndexInfo) continue;
             const node = nodeBuilder.indexInfoToIndexSignatureDeclaration(info, enclosing, flags, internalFlags, tracker);
             if (node && infoList === staticInfos) {
               (node.modifiers || (node.modifiers = factory.createNodeArray())).unshift(factory.createModifier(126 /* StaticKeyword */));
@@ -157315,6 +157339,7 @@ var errorCodes19 = [
   Diagnostics.Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_save_dev_types_Slashnode.code,
   Diagnostics.Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_save_dev_types_Slashnode_and_then_add_node_to_the_types_field_in_your_tsconfig.code,
   Diagnostics.Cannot_find_namespace_0_Did_you_mean_1.code,
+  Diagnostics.Cannot_extend_an_interface_0_Did_you_mean_implements.code,
   Diagnostics.This_JSX_tag_requires_0_to_be_in_scope_but_it_could_not_be_found.code
 ];
 registerCodeFix({

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.8.0-pr-60576-12",
+  "version": "5.8.0-pr-60718-25",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [