@typescript-deploys/pr-build 6.0.0-pr-53017-35 → 6.0.0-pr-61999-2

package/SECURITY.md

@@ -2,7 +2,7 @@
 
 ## Security
 
-Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet) and [Xamarin](https://github.com/xamarin).
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations.
 
 If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/security.md/definition), please report it to us as described below.
 
@@ -12,9 +12,7 @@ If you believe you have found a security vulnerability in any Microsoft-owned re
 
 Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/security.md/msrc/create-report).
 
-If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/security.md/msrc/pgp).
-
-You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc). 
+You should receive a response within 24 hours. If for some reason you do not, please follow up using the messaging functionality found at the bottom of the Activity tab on your vulnerability report on [https://msrc.microsoft.com/report/vulnerability](https://msrc.microsoft.com/report/vulnerability/) or via email as described in the instructions at the bottom of [https://msrc.microsoft.com/create-report](https://aka.ms/security.md/msrc/create-report). Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc) or on MSRC's [FAQ page for reporting an issue](https://www.microsoft.com/en-us/msrc/faqs-report-an-issue).
 
 Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
 

package/lib/_tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "6.0";
-var version = `${versionMajorMinor}.0-insiders.20251202`;
+var version = `${versionMajorMinor}.0-insiders.20251204`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -47075,32 +47075,6 @@ function createTypeChecker(host) {
     emptyArray
   );
   var unknownUnionType = strictNullChecks ? getUnionType([undefinedType, nullType, unknownEmptyObjectType]) : unknownType;
-  var allKeysUnknownType = createAnonymousType(
-    /*symbol*/
-    void 0,
-    emptySymbols,
-    emptyArray,
-    emptyArray,
-    map(stringNumberSymbolType.types, (t) => createIndexInfo(
-      t,
-      unknownType,
-      /*isReadonly*/
-      false
-    ))
-  );
-  var allKeysAllKeysUnknownType = createAnonymousType(
-    /*symbol*/
-    void 0,
-    emptySymbols,
-    emptyArray,
-    emptyArray,
-    map(stringNumberSymbolType.types, (t) => createIndexInfo(
-      t,
-      allKeysUnknownType,
-      /*isReadonly*/
-      false
-    ))
-  );
   var emptyGenericType = createAnonymousType(
     /*symbol*/
     void 0,
@@ -47319,7 +47293,6 @@ function createTypeChecker(host) {
   var deferredGlobalBigIntType;
   var deferredGlobalNaNSymbol;
   var deferredGlobalRecordSymbol;
-  var deferredGlobalPartialInferenceSymbol;
   var deferredGlobalClassDecoratorContextType;
   var deferredGlobalClassMethodDecoratorContextType;
   var deferredGlobalClassGetterDecoratorContextType;
@@ -58326,8 +58299,15 @@ function createTypeChecker(host) {
       inferredProp.declarations = prop.declarations;
       inferredProp.links.nameType = getSymbolLinks(prop).nameType;
       inferredProp.links.propertyType = getTypeOfSymbol(prop);
-      inferredProp.links.mappedType = type.mappedType;
-      inferredProp.links.constraintType = type.constraintType;
+      if (type.constraintType.type.flags & 8388608 /* IndexedAccess */ && type.constraintType.type.objectType.flags & 262144 /* TypeParameter */ && type.constraintType.type.indexType.flags & 262144 /* TypeParameter */) {
+        const newTypeParam = type.constraintType.type.objectType;
+        const newMappedType = replaceIndexedAccess(type.mappedType, type.constraintType.type, newTypeParam);
+        inferredProp.links.mappedType = newMappedType;
+        inferredProp.links.constraintType = getIndexType(newTypeParam);
+      } else {
+        inferredProp.links.mappedType = type.mappedType;
+        inferredProp.links.constraintType = type.constraintType;
+      }
       members.set(prop.escapedName, inferredProp);
     }
     setStructuredTypeMembers(type, members, emptyArray, emptyArray, indexInfos);
@@ -60896,16 +60876,6 @@ function createTypeChecker(host) {
     ) || unknownSymbol);
     return deferredGlobalRecordSymbol === unknownSymbol ? void 0 : deferredGlobalRecordSymbol;
   }
-  function getGlobalPartialInferenceSymbol() {
-    deferredGlobalPartialInferenceSymbol || (deferredGlobalPartialInferenceSymbol = getGlobalTypeAliasSymbol(
-      "PartialInference",
-      /*arity*/
-      2,
-      /*reportErrors*/
-      false
-    ) || unknownSymbol);
-    return deferredGlobalPartialInferenceSymbol === unknownSymbol ? void 0 : deferredGlobalPartialInferenceSymbol;
-  }
   function createTypeFromGenericGlobalType(genericGlobalType, typeArguments) {
     return genericGlobalType !== emptyGenericType ? createTypeReference(genericGlobalType, typeArguments) : emptyObjectType;
   }
@@ -61905,7 +61875,7 @@ function createTypeChecker(host) {
   }
   function getIndexType(type, indexFlags = 0 /* None */) {
     type = getReducedType(type);
-    return isNoInferType(type) ? getNoInferType(getIndexType(type.baseType, indexFlags)) : shouldDeferIndexType(type, indexFlags) ? getIndexTypeForGenericType(type, indexFlags) : type.flags & 1048576 /* Union */ ? getIntersectionType(map(type.types, (t) => getIndexType(t, indexFlags))) : type.flags & 2097152 /* Intersection */ ? getUnionType(map(type.types, (t) => getIndexType(t, indexFlags))) : getObjectFlags(type) & 32 /* Mapped */ ? getIndexTypeForMappedType(type, indexFlags) : type === wildcardType ? wildcardType : type.flags & 2 /* Unknown */ ? neverType : type.flags & (1 /* Any */ | 131072 /* Never */) ? stringNumberSymbolType : getLiteralTypeFromProperties(type, (indexFlags & 2 /* NoIndexSignatures */ ? 128 /* StringLiteral */ : 402653316 /* StringLike */) | (indexFlags & 1 /* StringsOnly */ ? 0 : 296 /* NumberLike */ | 12288 /* ESSymbolLike */), indexFlags === 0 /* None */);
+    return isNoInferType(type) ? getNoInferType(getIndexType(type.baseType, indexFlags)) : type.flags & 33554432 /* Substitution */ && !isGenericType(type.baseType) && !isGenericType(type.constraint) ? getUnionType([getIndexType(type.baseType, indexFlags), getIndexType(type.constraint, indexFlags)]) : shouldDeferIndexType(type, indexFlags) ? getIndexTypeForGenericType(type, indexFlags) : type.flags & 1048576 /* Union */ ? getIntersectionType(map(type.types, (t) => getIndexType(t, indexFlags))) : type.flags & 2097152 /* Intersection */ ? getUnionType(map(type.types, (t) => getIndexType(t, indexFlags))) : getObjectFlags(type) & 32 /* Mapped */ ? getIndexTypeForMappedType(type, indexFlags) : type === wildcardType ? wildcardType : type.flags & 2 /* Unknown */ ? neverType : type.flags & (1 /* Any */ | 131072 /* Never */) ? stringNumberSymbolType : getLiteralTypeFromProperties(type, (indexFlags & 2 /* NoIndexSignatures */ ? 128 /* StringLiteral */ : 402653316 /* StringLike */) | (indexFlags & 1 /* StringsOnly */ ? 0 : 296 /* NumberLike */ | 12288 /* ESSymbolLike */), indexFlags === 0 /* None */);
   }
   function getExtractStringType(type) {
     const extractTypeAlias = getGlobalExtractSymbol();
@@ -68183,8 +68153,7 @@ function createTypeChecker(host) {
       priority: void 0,
       topLevel: true,
       isFixed: false,
-      impliedArity: void 0,
-      indexes: void 0
+      impliedArity: void 0
     };
   }
   function cloneInferenceInfo(inference) {
@@ -68196,8 +68165,7 @@ function createTypeChecker(host) {
       priority: inference.priority,
       topLevel: inference.topLevel,
       isFixed: inference.isFixed,
-      impliedArity: inference.impliedArity,
-      indexes: inference.indexes && inference.indexes.slice()
+      impliedArity: inference.impliedArity
     };
   }
   function cloneInferredPartOfContext(context) {
@@ -68263,11 +68231,6 @@ function createTypeChecker(host) {
     );
   }
   function inferTypeForHomomorphicMappedType(source, target, constraint) {
-    if (constraint.type.flags & 8388608 /* IndexedAccess */) {
-      const newTypeParam = constraint.type.objectType;
-      target = replaceIndexedAccess(target, constraint.type, newTypeParam);
-      constraint = getIndexType(newTypeParam);
-    }
     const cacheKey = source.id + "," + target.id + "," + constraint.id;
     if (reverseHomomorphicMappedCache.has(cacheKey)) {
       return reverseHomomorphicMappedCache.get(cacheKey);
@@ -68316,23 +68279,11 @@ function createTypeChecker(host) {
     return links.type;
   }
   function inferReverseMappedTypeWorker(sourceType, target, constraint) {
-    const typeParameter = getTypeParameterFromMappedType(target);
-    const inferenceTarget = getIndexedAccessType(constraint.type, typeParameter);
+    const typeParameter = getIndexedAccessType(constraint.type, getTypeParameterFromMappedType(target));
     const templateType = getTemplateTypeFromMappedType(target);
-    const inference = createInferenceInfo(inferenceTarget);
+    const inference = createInferenceInfo(typeParameter);
     inferTypes([inference], sourceType, templateType);
-    const inferredType = getTypeFromInference(inference);
-    if (inferredType) {
-      return inferredType;
-    }
-    if (inference.indexes) {
-      const eraseSelfMapper = makeArrayTypeMapper([constraint.type, typeParameter], [allKeysAllKeysUnknownType, stringNumberSymbolType]);
-      const aggregateInference = instantiateType(getIntersectionType(inference.indexes), eraseSelfMapper);
-      if (!(getReducedType(aggregateInference).flags & 131072 /* Never */)) {
-        return aggregateInference;
-      }
-    }
-    return unknownType;
+    return getTypeFromInference(inference) || unknownType;
   }
   function inferReverseMappedType(source, target, constraint) {
     const cacheKey = source.id + "," + target.id + "," + constraint.id;
@@ -68673,29 +68624,6 @@ function createTypeChecker(host) {
       } else if (source.flags & 8388608 /* IndexedAccess */ && target.flags & 8388608 /* IndexedAccess */) {
         inferFromTypes(source.objectType, target.objectType);
         inferFromTypes(source.indexType, target.indexType);
-      } else if (!(priority & 1 /* NakedTypeVariable */) && target.flags & 8388608 /* IndexedAccess */) {
-        if (isFromInferenceBlockedSource(source)) {
-          return;
-        }
-        const inference = getInferenceInfoForType(getActualTypeVariable(target.objectType));
-        if (inference) {
-          if (getObjectFlags(source) & 262144 /* NonInferrableType */ || source === nonInferrableAnyType) {
-            return;
-          }
-          if (!hasInferenceCandidates(inference)) {
-            const partialInferenceTypeSymbol = getGlobalPartialInferenceSymbol();
-            if (partialInferenceTypeSymbol) {
-              if (target.indexType.flags & 465829888 /* Instantiable */) {
-                const recordSymbol = getGlobalRecordSymbol();
-                if (recordSymbol) {
-                  inference.indexes = append(inference.indexes, getTypeAliasInstantiation(recordSymbol, [target.indexType, source]));
-                }
-              } else {
-                inference.indexes = append(inference.indexes, getTypeAliasInstantiation(partialInferenceTypeSymbol, [source, target.indexType]));
-              }
-            }
-          }
-        }
       } else if (source.flags & 268435456 /* StringMapping */ && target.flags & 268435456 /* StringMapping */) {
         if (source.symbol === target.symbol) {
           inferFromTypes(source.type, target.type);
@@ -69199,66 +69127,9 @@ function createTypeChecker(host) {
           const preferCovariantType = inferredCovariantType && (!inferredContravariantType || !(inferredCovariantType.flags & (131072 /* Never */ | 1 /* Any */)) && some(inference.contraCandidates, (t) => isTypeAssignableTo(inferredCovariantType, t)) && every(context.inferences, (other) => other !== inference && getConstraintOfTypeParameter(other.typeParameter) !== inference.typeParameter || every(other.candidates, (t) => isTypeAssignableTo(t, inferredCovariantType))));
           inferredType = preferCovariantType ? inferredCovariantType : inferredContravariantType;
           fallbackType = preferCovariantType ? inferredContravariantType : inferredCovariantType;
-        } else if (inference.indexes) {
-          const eraseSelfMapper = makeUnaryTypeMapper(inference.typeParameter, allKeysUnknownType);
-          let aggregateInference = instantiateType(getIntersectionType(inference.indexes), mergeTypeMappers(eraseSelfMapper, context.nonFixingMapper));
-          if (getReducedType(aggregateInference).flags & 131072 /* Never */) {
-            aggregateInference = void 0;
-          }
-          const constraint2 = getConstraintOfTypeParameter(inference.typeParameter);
-          if (aggregateInference && constraint2) {
-            const instantiatedConstraint = instantiateType(constraint2, context.nonFixingMapper);
-            let assignableToConstraint = context.compareTypes(aggregateInference, getTypeWithThisArgument(instantiatedConstraint, aggregateInference));
-            if (!assignableToConstraint) {
-              if (instantiatedConstraint.flags & 1048576 /* Union */) {
-                const discriminantProps = findDiscriminantProperties(getPropertiesOfType(aggregateInference), instantiatedConstraint);
-                if (discriminantProps) {
-                  let match;
-                  findDiscriminant:
-                    for (const p of discriminantProps) {
-                      const candidatePropType = getTypeOfPropertyOfType(aggregateInference, p.escapedName);
-                      for (const type of instantiatedConstraint.types) {
-                        const propType = getTypeOfPropertyOfType(type, p.escapedName);
-                        if (propType && candidatePropType && checkTypeAssignableTo(
-                          candidatePropType,
-                          propType,
-                          /*errorNode*/
-                          void 0
-                        )) {
-                          if (match && match !== type) {
-                            match = void 0;
-                            break findDiscriminant;
-                          } else {
-                            match = type;
-                          }
-                        }
-                      }
-                    }
-                  if (match) {
-                    aggregateInference = getSpreadType(
-                      match,
-                      aggregateInference,
-                      /*symbol*/
-                      void 0,
-                      /*propegatedFlags*/
-                      0,
-                      /*readonly*/
-                      false
-                    );
-                    assignableToConstraint = context.compareTypes(aggregateInference, getTypeWithThisArgument(instantiatedConstraint, aggregateInference));
-                  }
-                }
-              }
-              if (!assignableToConstraint) {
-                aggregateInference = void 0;
-              }
-            }
-          }
-          inferredType = aggregateInference;
         } else if (context.flags & 1 /* NoDefault */) {
           inferredType = silentNeverType;
-        }
-        if (!inferredType) {
+        } else {
           const defaultType = getDefaultFromTypeParameter(inference.typeParameter);
           if (defaultType) {
             inferredType = instantiateType(defaultType, mergeTypeMappers(createBackreferenceMapper(context, index), context.nonFixingMapper));
@@ -69271,9 +69142,17 @@ function createTypeChecker(host) {
       const constraint = getConstraintOfTypeParameter(inference.typeParameter);
       if (constraint) {
         const instantiatedConstraint = instantiateType(constraint, context.nonFixingMapper);
-        if (!inferredType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
-          inference.inferredType = fallbackType && context.compareTypes(fallbackType, getTypeWithThisArgument(instantiatedConstraint, fallbackType)) ? fallbackType : instantiatedConstraint;
+        if (inferredType) {
+          const constraintWithThis = getTypeWithThisArgument(instantiatedConstraint, inferredType);
+          if (!context.compareTypes(inferredType, constraintWithThis)) {
+            const filteredByConstraint = inference.priority === 128 /* ReturnType */ ? filterType(inferredType, (t) => !!context.compareTypes(t, constraintWithThis)) : neverType;
+            inferredType = !(filteredByConstraint.flags & 131072 /* Never */) ? filteredByConstraint : void 0;
+          }
+        }
+        if (!inferredType) {
+          inferredType = fallbackType && context.compareTypes(fallbackType, getTypeWithThisArgument(instantiatedConstraint, fallbackType)) ? fallbackType : instantiatedConstraint;
         }
+        inference.inferredType = inferredType;
       }
       clearActiveMapperCaches();
     }

package/lib/lib.es5.d.ts

@@ -1682,15 +1682,6 @@ type NoInfer<T> = intrinsic;
  */
 interface ThisType<T> {}
 
-/**
- * Type instantiated to perform partial inferences from indexed accesses
- */
-type PartialInference<T, Keys extends PropertyKey> = ({
-    [K in Keys]: {
-        [K1 in K]: T;
-    };
-})[Keys];
-
 /**
  * Stores types to be used with WeakSet, WeakMap, WeakRef, and FinalizationRegistry
  */

package/lib/typescript.js

@@ -2286,7 +2286,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "6.0";
-var version = `${versionMajorMinor}.0-insiders.20251202`;
+var version = `${versionMajorMinor}.0-insiders.20251204`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -51703,32 +51703,6 @@ function createTypeChecker(host) {
     emptyArray
   );
   var unknownUnionType = strictNullChecks ? getUnionType([undefinedType, nullType, unknownEmptyObjectType]) : unknownType;
-  var allKeysUnknownType = createAnonymousType(
-    /*symbol*/
-    void 0,
-    emptySymbols,
-    emptyArray,
-    emptyArray,
-    map(stringNumberSymbolType.types, (t) => createIndexInfo(
-      t,
-      unknownType,
-      /*isReadonly*/
-      false
-    ))
-  );
-  var allKeysAllKeysUnknownType = createAnonymousType(
-    /*symbol*/
-    void 0,
-    emptySymbols,
-    emptyArray,
-    emptyArray,
-    map(stringNumberSymbolType.types, (t) => createIndexInfo(
-      t,
-      allKeysUnknownType,
-      /*isReadonly*/
-      false
-    ))
-  );
   var emptyGenericType = createAnonymousType(
     /*symbol*/
     void 0,
@@ -51947,7 +51921,6 @@ function createTypeChecker(host) {
   var deferredGlobalBigIntType;
   var deferredGlobalNaNSymbol;
   var deferredGlobalRecordSymbol;
-  var deferredGlobalPartialInferenceSymbol;
   var deferredGlobalClassDecoratorContextType;
   var deferredGlobalClassMethodDecoratorContextType;
   var deferredGlobalClassGetterDecoratorContextType;
@@ -62954,8 +62927,15 @@ function createTypeChecker(host) {
       inferredProp.declarations = prop.declarations;
       inferredProp.links.nameType = getSymbolLinks(prop).nameType;
       inferredProp.links.propertyType = getTypeOfSymbol(prop);
-      inferredProp.links.mappedType = type.mappedType;
-      inferredProp.links.constraintType = type.constraintType;
+      if (type.constraintType.type.flags & 8388608 /* IndexedAccess */ && type.constraintType.type.objectType.flags & 262144 /* TypeParameter */ && type.constraintType.type.indexType.flags & 262144 /* TypeParameter */) {
+        const newTypeParam = type.constraintType.type.objectType;
+        const newMappedType = replaceIndexedAccess(type.mappedType, type.constraintType.type, newTypeParam);
+        inferredProp.links.mappedType = newMappedType;
+        inferredProp.links.constraintType = getIndexType(newTypeParam);
+      } else {
+        inferredProp.links.mappedType = type.mappedType;
+        inferredProp.links.constraintType = type.constraintType;
+      }
       members.set(prop.escapedName, inferredProp);
     }
     setStructuredTypeMembers(type, members, emptyArray, emptyArray, indexInfos);
@@ -65524,16 +65504,6 @@ function createTypeChecker(host) {
     ) || unknownSymbol);
     return deferredGlobalRecordSymbol === unknownSymbol ? void 0 : deferredGlobalRecordSymbol;
   }
-  function getGlobalPartialInferenceSymbol() {
-    deferredGlobalPartialInferenceSymbol || (deferredGlobalPartialInferenceSymbol = getGlobalTypeAliasSymbol(
-      "PartialInference",
-      /*arity*/
-      2,
-      /*reportErrors*/
-      false
-    ) || unknownSymbol);
-    return deferredGlobalPartialInferenceSymbol === unknownSymbol ? void 0 : deferredGlobalPartialInferenceSymbol;
-  }
   function createTypeFromGenericGlobalType(genericGlobalType, typeArguments) {
     return genericGlobalType !== emptyGenericType ? createTypeReference(genericGlobalType, typeArguments) : emptyObjectType;
   }
@@ -66533,7 +66503,7 @@ function createTypeChecker(host) {
   }
   function getIndexType(type, indexFlags = 0 /* None */) {
     type = getReducedType(type);
-    return isNoInferType(type) ? getNoInferType(getIndexType(type.baseType, indexFlags)) : shouldDeferIndexType(type, indexFlags) ? getIndexTypeForGenericType(type, indexFlags) : type.flags & 1048576 /* Union */ ? getIntersectionType(map(type.types, (t) => getIndexType(t, indexFlags))) : type.flags & 2097152 /* Intersection */ ? getUnionType(map(type.types, (t) => getIndexType(t, indexFlags))) : getObjectFlags(type) & 32 /* Mapped */ ? getIndexTypeForMappedType(type, indexFlags) : type === wildcardType ? wildcardType : type.flags & 2 /* Unknown */ ? neverType : type.flags & (1 /* Any */ | 131072 /* Never */) ? stringNumberSymbolType : getLiteralTypeFromProperties(type, (indexFlags & 2 /* NoIndexSignatures */ ? 128 /* StringLiteral */ : 402653316 /* StringLike */) | (indexFlags & 1 /* StringsOnly */ ? 0 : 296 /* NumberLike */ | 12288 /* ESSymbolLike */), indexFlags === 0 /* None */);
+    return isNoInferType(type) ? getNoInferType(getIndexType(type.baseType, indexFlags)) : type.flags & 33554432 /* Substitution */ && !isGenericType(type.baseType) && !isGenericType(type.constraint) ? getUnionType([getIndexType(type.baseType, indexFlags), getIndexType(type.constraint, indexFlags)]) : shouldDeferIndexType(type, indexFlags) ? getIndexTypeForGenericType(type, indexFlags) : type.flags & 1048576 /* Union */ ? getIntersectionType(map(type.types, (t) => getIndexType(t, indexFlags))) : type.flags & 2097152 /* Intersection */ ? getUnionType(map(type.types, (t) => getIndexType(t, indexFlags))) : getObjectFlags(type) & 32 /* Mapped */ ? getIndexTypeForMappedType(type, indexFlags) : type === wildcardType ? wildcardType : type.flags & 2 /* Unknown */ ? neverType : type.flags & (1 /* Any */ | 131072 /* Never */) ? stringNumberSymbolType : getLiteralTypeFromProperties(type, (indexFlags & 2 /* NoIndexSignatures */ ? 128 /* StringLiteral */ : 402653316 /* StringLike */) | (indexFlags & 1 /* StringsOnly */ ? 0 : 296 /* NumberLike */ | 12288 /* ESSymbolLike */), indexFlags === 0 /* None */);
   }
   function getExtractStringType(type) {
     const extractTypeAlias = getGlobalExtractSymbol();
@@ -72811,8 +72781,7 @@ function createTypeChecker(host) {
       priority: void 0,
       topLevel: true,
       isFixed: false,
-      impliedArity: void 0,
-      indexes: void 0
+      impliedArity: void 0
     };
   }
   function cloneInferenceInfo(inference) {
@@ -72824,8 +72793,7 @@ function createTypeChecker(host) {
       priority: inference.priority,
       topLevel: inference.topLevel,
       isFixed: inference.isFixed,
-      impliedArity: inference.impliedArity,
-      indexes: inference.indexes && inference.indexes.slice()
+      impliedArity: inference.impliedArity
     };
   }
   function cloneInferredPartOfContext(context) {
@@ -72891,11 +72859,6 @@ function createTypeChecker(host) {
     );
   }
   function inferTypeForHomomorphicMappedType(source, target, constraint) {
-    if (constraint.type.flags & 8388608 /* IndexedAccess */) {
-      const newTypeParam = constraint.type.objectType;
-      target = replaceIndexedAccess(target, constraint.type, newTypeParam);
-      constraint = getIndexType(newTypeParam);
-    }
     const cacheKey = source.id + "," + target.id + "," + constraint.id;
     if (reverseHomomorphicMappedCache.has(cacheKey)) {
       return reverseHomomorphicMappedCache.get(cacheKey);
@@ -72944,23 +72907,11 @@ function createTypeChecker(host) {
     return links.type;
   }
   function inferReverseMappedTypeWorker(sourceType, target, constraint) {
-    const typeParameter = getTypeParameterFromMappedType(target);
-    const inferenceTarget = getIndexedAccessType(constraint.type, typeParameter);
+    const typeParameter = getIndexedAccessType(constraint.type, getTypeParameterFromMappedType(target));
     const templateType = getTemplateTypeFromMappedType(target);
-    const inference = createInferenceInfo(inferenceTarget);
+    const inference = createInferenceInfo(typeParameter);
     inferTypes([inference], sourceType, templateType);
-    const inferredType = getTypeFromInference(inference);
-    if (inferredType) {
-      return inferredType;
-    }
-    if (inference.indexes) {
-      const eraseSelfMapper = makeArrayTypeMapper([constraint.type, typeParameter], [allKeysAllKeysUnknownType, stringNumberSymbolType]);
-      const aggregateInference = instantiateType(getIntersectionType(inference.indexes), eraseSelfMapper);
-      if (!(getReducedType(aggregateInference).flags & 131072 /* Never */)) {
-        return aggregateInference;
-      }
-    }
-    return unknownType;
+    return getTypeFromInference(inference) || unknownType;
   }
   function inferReverseMappedType(source, target, constraint) {
     const cacheKey = source.id + "," + target.id + "," + constraint.id;
@@ -73301,29 +73252,6 @@ function createTypeChecker(host) {
       } else if (source.flags & 8388608 /* IndexedAccess */ && target.flags & 8388608 /* IndexedAccess */) {
         inferFromTypes(source.objectType, target.objectType);
         inferFromTypes(source.indexType, target.indexType);
-      } else if (!(priority & 1 /* NakedTypeVariable */) && target.flags & 8388608 /* IndexedAccess */) {
-        if (isFromInferenceBlockedSource(source)) {
-          return;
-        }
-        const inference = getInferenceInfoForType(getActualTypeVariable(target.objectType));
-        if (inference) {
-          if (getObjectFlags(source) & 262144 /* NonInferrableType */ || source === nonInferrableAnyType) {
-            return;
-          }
-          if (!hasInferenceCandidates(inference)) {
-            const partialInferenceTypeSymbol = getGlobalPartialInferenceSymbol();
-            if (partialInferenceTypeSymbol) {
-              if (target.indexType.flags & 465829888 /* Instantiable */) {
-                const recordSymbol = getGlobalRecordSymbol();
-                if (recordSymbol) {
-                  inference.indexes = append(inference.indexes, getTypeAliasInstantiation(recordSymbol, [target.indexType, source]));
-                }
-              } else {
-                inference.indexes = append(inference.indexes, getTypeAliasInstantiation(partialInferenceTypeSymbol, [source, target.indexType]));
-              }
-            }
-          }
-        }
       } else if (source.flags & 268435456 /* StringMapping */ && target.flags & 268435456 /* StringMapping */) {
         if (source.symbol === target.symbol) {
           inferFromTypes(source.type, target.type);
@@ -73827,66 +73755,9 @@ function createTypeChecker(host) {
           const preferCovariantType = inferredCovariantType && (!inferredContravariantType || !(inferredCovariantType.flags & (131072 /* Never */ | 1 /* Any */)) && some(inference.contraCandidates, (t) => isTypeAssignableTo(inferredCovariantType, t)) && every(context.inferences, (other) => other !== inference && getConstraintOfTypeParameter(other.typeParameter) !== inference.typeParameter || every(other.candidates, (t) => isTypeAssignableTo(t, inferredCovariantType))));
           inferredType = preferCovariantType ? inferredCovariantType : inferredContravariantType;
           fallbackType = preferCovariantType ? inferredContravariantType : inferredCovariantType;
-        } else if (inference.indexes) {
-          const eraseSelfMapper = makeUnaryTypeMapper(inference.typeParameter, allKeysUnknownType);
-          let aggregateInference = instantiateType(getIntersectionType(inference.indexes), mergeTypeMappers(eraseSelfMapper, context.nonFixingMapper));
-          if (getReducedType(aggregateInference).flags & 131072 /* Never */) {
-            aggregateInference = void 0;
-          }
-          const constraint2 = getConstraintOfTypeParameter(inference.typeParameter);
-          if (aggregateInference && constraint2) {
-            const instantiatedConstraint = instantiateType(constraint2, context.nonFixingMapper);
-            let assignableToConstraint = context.compareTypes(aggregateInference, getTypeWithThisArgument(instantiatedConstraint, aggregateInference));
-            if (!assignableToConstraint) {
-              if (instantiatedConstraint.flags & 1048576 /* Union */) {
-                const discriminantProps = findDiscriminantProperties(getPropertiesOfType(aggregateInference), instantiatedConstraint);
-                if (discriminantProps) {
-                  let match;
-                  findDiscriminant:
-                    for (const p of discriminantProps) {
-                      const candidatePropType = getTypeOfPropertyOfType(aggregateInference, p.escapedName);
-                      for (const type of instantiatedConstraint.types) {
-                        const propType = getTypeOfPropertyOfType(type, p.escapedName);
-                        if (propType && candidatePropType && checkTypeAssignableTo(
-                          candidatePropType,
-                          propType,
-                          /*errorNode*/
-                          void 0
-                        )) {
-                          if (match && match !== type) {
-                            match = void 0;
-                            break findDiscriminant;
-                          } else {
-                            match = type;
-                          }
-                        }
-                      }
-                    }
-                  if (match) {
-                    aggregateInference = getSpreadType(
-                      match,
-                      aggregateInference,
-                      /*symbol*/
-                      void 0,
-                      /*propegatedFlags*/
-                      0,
-                      /*readonly*/
-                      false
-                    );
-                    assignableToConstraint = context.compareTypes(aggregateInference, getTypeWithThisArgument(instantiatedConstraint, aggregateInference));
-                  }
-                }
-              }
-              if (!assignableToConstraint) {
-                aggregateInference = void 0;
-              }
-            }
-          }
-          inferredType = aggregateInference;
         } else if (context.flags & 1 /* NoDefault */) {
           inferredType = silentNeverType;
-        }
-        if (!inferredType) {
+        } else {
           const defaultType = getDefaultFromTypeParameter(inference.typeParameter);
           if (defaultType) {
             inferredType = instantiateType(defaultType, mergeTypeMappers(createBackreferenceMapper(context, index), context.nonFixingMapper));
@@ -73899,9 +73770,17 @@ function createTypeChecker(host) {
       const constraint = getConstraintOfTypeParameter(inference.typeParameter);
       if (constraint) {
         const instantiatedConstraint = instantiateType(constraint, context.nonFixingMapper);
-        if (!inferredType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
-          inference.inferredType = fallbackType && context.compareTypes(fallbackType, getTypeWithThisArgument(instantiatedConstraint, fallbackType)) ? fallbackType : instantiatedConstraint;
+        if (inferredType) {
+          const constraintWithThis = getTypeWithThisArgument(instantiatedConstraint, inferredType);
+          if (!context.compareTypes(inferredType, constraintWithThis)) {
+            const filteredByConstraint = inference.priority === 128 /* ReturnType */ ? filterType(inferredType, (t) => !!context.compareTypes(t, constraintWithThis)) : neverType;
+            inferredType = !(filteredByConstraint.flags & 131072 /* Never */) ? filteredByConstraint : void 0;
+          }
+        }
+        if (!inferredType) {
+          inferredType = fallbackType && context.compareTypes(fallbackType, getTypeWithThisArgument(instantiatedConstraint, fallbackType)) ? fallbackType : instantiatedConstraint;
         }
+        inference.inferredType = inferredType;
       }
       clearActiveMapperCaches();
     }

package/package.json

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