@typescript-deploys/pr-build 5.9.0-pr-61535-10 → 5.9.0-pr-61589-2

package/lib/_tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.9";
-var version = `${versionMajorMinor}.0-insiders.20250416`;
+var version = `${versionMajorMinor}.0-insiders.20250417`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -47203,9 +47203,6 @@ function createTypeChecker(host) {
   var inferenceContextNodes = [];
   var inferenceContexts = [];
   var inferenceContextCount = 0;
-  var activeTypeMappers = [];
-  var activeTypeMappersCaches = [];
-  var activeTypeMappersCount = 0;
   var emptyStringType = getStringLiteralType("");
   var zeroType = getNumberLiteralType(0);
   var zeroBigIntType = getBigIntLiteralType({ negative: false, base10Value: "0" });
@@ -62267,7 +62264,7 @@ function createTypeChecker(host) {
           context.nonFixingMapper = combineTypeMappers(context.nonFixingMapper, mapper);
         }
         if (!checkTypeDeferred) {
-          inferTypes(context, context.inferences, checkType, extendsType, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
+          inferTypes(context.inferences, checkType, extendsType, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
         }
         combinedMapper = mapper ? combineTypeMappers(context.mapper, mapper) : context.mapper;
       }
@@ -63285,25 +63282,10 @@ function createTypeChecker(host) {
       error(currentNode, Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
       return errorType;
     }
-    const index = findActiveMapper(mapper);
-    if (index === -1) {
-      pushActiveMapper(mapper);
-    }
-    const key = type.id + getAliasId(aliasSymbol, aliasTypeArguments);
-    const mapperCache = activeTypeMappersCaches[index !== -1 ? index : activeTypeMappersCount - 1];
-    const cached = mapperCache.get(key);
-    if (cached) {
-      return cached;
-    }
     totalInstantiationCount++;
     instantiationCount++;
     instantiationDepth++;
     const result = instantiateTypeWorker(type, mapper, aliasSymbol, aliasTypeArguments);
-    if (index === -1) {
-      popActiveMapper();
-    } else {
-      mapperCache.set(key, result);
-    }
     instantiationDepth--;
     return result;
   }
@@ -65926,7 +65908,7 @@ function createTypeChecker(host) {
               0 /* None */,
               isRelatedToWorker
             );
-            inferTypes(ctx, ctx.inferences, target2.extendsType, sourceExtends, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
+            inferTypes(ctx.inferences, target2.extendsType, sourceExtends, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
             sourceExtends = instantiateType(sourceExtends, ctx.mapper);
             mapper = ctx.mapper;
           }
@@ -67806,7 +67788,7 @@ function createTypeChecker(host) {
       map(context.inferences, (inference, i) => () => {
         if (!inference.isFixed) {
           inferFromIntraExpressionSites(context);
-          clearCachedInferences(context, context.inferences);
+          clearCachedInferences(context.inferences);
           inference.isFixed = true;
         }
         return getInferredType(context, i);
@@ -67821,10 +67803,7 @@ function createTypeChecker(host) {
       })
     );
   }
-  function clearCachedInferences(context, inferences) {
-    if (context) {
-      clearActiveMapperCache(context.nonFixingMapper);
-    }
+  function clearCachedInferences(inferences) {
     for (const inference of inferences) {
       if (!inference.isFixed) {
         inference.inferredType = void 0;
@@ -67839,7 +67818,7 @@ function createTypeChecker(host) {
       for (const { node, type } of context.intraExpressionInferenceSites) {
         const contextualType = node.kind === 174 /* MethodDeclaration */ ? getContextualTypeForObjectLiteralMethod(node, 2 /* NoConstraints */) : getContextualType(node, 2 /* NoConstraints */);
         if (contextualType) {
-          inferTypes(context, context.inferences, type, contextualType);
+          inferTypes(context.inferences, type, contextualType);
         }
       }
       context.intraExpressionInferenceSites = void 0;
@@ -67983,13 +67962,7 @@ function createTypeChecker(host) {
     const typeParameter = getIndexedAccessType(constraint.type, getTypeParameterFromMappedType(target));
     const templateType = getTemplateTypeFromMappedType(target);
     const inference = createInferenceInfo(typeParameter);
-    inferTypes(
-      /*context*/
-      void 0,
-      [inference],
-      sourceType,
-      templateType
-    );
+    inferTypes([inference], sourceType, templateType);
     return getTypeFromInference(inference) || unknownType;
   }
   function inferReverseMappedType(source, target, constraint) {
@@ -68191,7 +68164,7 @@ function createTypeChecker(host) {
   function isTupleOfSelf(typeParameter, type) {
     return isTupleType(type) && getTupleElementType(type, 0) === getIndexedAccessType(typeParameter, getNumberLiteralType(0)) && !getTypeOfPropertyOfType(type, "1");
   }
-  function inferTypes(context, inferences, originalSource, originalTarget, priority = 0 /* None */, contravariant = false) {
+  function inferTypes(inferences, originalSource, originalTarget, priority = 0 /* None */, contravariant = false) {
     let bivariant = false;
     let propagationType;
     let inferencePriority = 2048 /* MaxValue */;
@@ -68282,16 +68255,16 @@ function createTypeChecker(host) {
               if (contravariant && !bivariant) {
                 if (!contains(inference.contraCandidates, candidate)) {
                   inference.contraCandidates = append(inference.contraCandidates, candidate);
-                  clearCachedInferences(context, inferences);
+                  clearCachedInferences(inferences);
                 }
               } else if (!contains(inference.candidates, candidate)) {
                 inference.candidates = append(inference.candidates, candidate);
-                clearCachedInferences(context, inferences);
+                clearCachedInferences(inferences);
               }
             }
             if (!(priority & 128 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && inference.topLevel && !isTypeParameterAtTopLevel(originalTarget, target)) {
               inference.topLevel = false;
-              clearCachedInferences(context, inferences);
+              clearCachedInferences(inferences);
             }
           }
           inferencePriority = Math.min(inferencePriority, priority);
@@ -68857,7 +68830,6 @@ function createTypeChecker(host) {
         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;
-          clearActiveMapperCache(context.nonFixingMapper);
         }
       }
     }
@@ -70873,15 +70845,31 @@ function createTypeChecker(host) {
       }
       const isRelated = checkDerived ? isTypeDerivedFrom : isTypeSubtypeOf;
       const keyPropertyName = type.flags & 1048576 /* Union */ ? getKeyPropertyName(type) : void 0;
-      const narrowedType = mapType(candidate, (c) => {
-        const discriminant = keyPropertyName && getTypeOfPropertyOfType(c, keyPropertyName);
-        const matching = discriminant && getConstituentTypeForKeyType(type, discriminant);
-        const directlyRelated = mapType(
-          matching || type,
-          checkDerived ? (t) => isTypeDerivedFrom(t, c) ? t : isTypeDerivedFrom(c, t) ? c : neverType : (t) => isTypeStrictSubtypeOf(t, c) ? t : isTypeStrictSubtypeOf(c, t) ? c : isTypeSubtypeOf(t, c) ? t : isTypeSubtypeOf(c, t) ? c : neverType
-        );
-        return directlyRelated.flags & 131072 /* Never */ ? mapType(type, (t) => maybeTypeOfKind(t, 465829888 /* Instantiable */) && isRelated(c, getBaseConstraintOfType(t) || unknownType) ? getIntersectionType([t, c]) : neverType) : directlyRelated;
-      });
+      let matchedCandidates = [];
+      let narrowedType = mapType(type, (t) => mapType(
+        candidate,
+        (c) => {
+          if (keyPropertyName) {
+            const discriminant = keyPropertyName && getTypeOfPropertyOfType(c, keyPropertyName);
+            if (!discriminant || getConstituentTypeForKeyType(type, discriminant) !== t) {
+              return neverType;
+            }
+          }
+          const directlyRelated = checkDerived ? isTypeDerivedFrom(t, c) ? t : isTypeDerivedFrom(c, t) ? c : neverType : isTypeStrictSubtypeOf(t, c) ? t : isTypeStrictSubtypeOf(c, t) ? c : isTypeSubtypeOf(t, c) ? t : isTypeSubtypeOf(c, t) ? c : neverType;
+          if (!(directlyRelated.flags & 131072 /* Never */)) {
+            matchedCandidates = appendIfUnique(matchedCandidates, c);
+          }
+          return directlyRelated;
+        }
+      ));
+      if (matchedCandidates.length !== countTypes(candidate)) {
+        narrowedType = getUnionType([
+          narrowedType,
+          mapType(candidate, (c) => {
+            return !containsType(matchedCandidates, c) ? mapType(type, (t) => maybeTypeOfKind(t, 465829888 /* Instantiable */) && isRelated(c, getBaseConstraintOfType(t) || unknownType) ? getIntersectionType([t, c]) : neverType) : neverType;
+          })
+        ]);
+      }
       return !(narrowedType.flags & 131072 /* Never */) ? narrowedType : isTypeSubtypeOf(candidate, type) ? candidate : isTypeAssignableTo(type, candidate) ? type : isTypeAssignableTo(candidate, type) ? candidate : getIntersectionType([type, candidate]);
     }
     function narrowTypeByCallExpression(type, callExpression, assumeTrue) {
@@ -73121,28 +73109,6 @@ function createTypeChecker(host) {
       }
     }
   }
-  function pushActiveMapper(mapper) {
-    activeTypeMappers[activeTypeMappersCount] = mapper;
-    activeTypeMappersCaches[activeTypeMappersCount] = /* @__PURE__ */ new Map();
-    activeTypeMappersCount++;
-  }
-  function popActiveMapper() {
-    activeTypeMappersCount--;
-  }
-  function findActiveMapper(mapper) {
-    for (let i = activeTypeMappersCount - 1; i >= 0; i--) {
-      if (mapper === activeTypeMappers[i]) {
-        return i;
-      }
-    }
-    return -1;
-  }
-  function clearActiveMapperCache(mapper) {
-    const index = findActiveMapper(mapper);
-    if (index !== -1) {
-      activeTypeMappersCaches[index] = /* @__PURE__ */ new Map();
-    }
-  }
   function getContextualImportAttributeType(node) {
     return getTypeOfPropertyOfContextualType(getGlobalImportAttributesType(
       /*reportErrors*/
@@ -75454,11 +75420,11 @@ function createTypeChecker(host) {
     const mapper = inferenceContext && (restType && restType.flags & 262144 /* TypeParameter */ ? inferenceContext.nonFixingMapper : inferenceContext.mapper);
     const sourceSignature = mapper ? instantiateSignature(contextualSignature, mapper) : contextualSignature;
     applyToParameterTypes(sourceSignature, signature, (source, target) => {
-      inferTypes(context, context.inferences, source, target);
+      inferTypes(context.inferences, source, target);
     });
     if (!inferenceContext) {
       applyToReturnTypes(contextualSignature, signature, (source, target) => {
-        inferTypes(context, context.inferences, source, target, 128 /* ReturnType */);
+        inferTypes(context.inferences, source, target, 128 /* ReturnType */);
       });
     }
     return getSignatureInstantiation(signature, getInferredTypes(context), isInJSFile(contextualSignature.declaration));
@@ -75466,7 +75432,7 @@ function createTypeChecker(host) {
   function inferJsxTypeArguments(node, signature, checkMode, context) {
     const paramType = getEffectiveFirstArgumentForJsxSignature(signature, node);
     const checkAttrType = checkExpressionWithContextualType(node.attributes, paramType, context, checkMode);
-    inferTypes(context, context.inferences, checkAttrType, paramType);
+    inferTypes(context.inferences, checkAttrType, paramType);
     return getInferredTypes(context);
   }
   function getThisArgumentType(thisArgumentNode) {
@@ -75493,11 +75459,11 @@ function createTypeChecker(host) {
             const instantiatedType = instantiateType(contextualType, outerMapper);
             const contextualSignature = getSingleCallSignature(instantiatedType);
             const inferenceSourceType = contextualSignature && contextualSignature.typeParameters ? getOrCreateTypeFromSignature(getSignatureInstantiationWithoutFillingInTypeArguments(contextualSignature, contextualSignature.typeParameters)) : instantiatedType;
-            inferTypes(context, context.inferences, inferenceSourceType, inferenceTargetType, 128 /* ReturnType */);
+            inferTypes(context.inferences, inferenceSourceType, inferenceTargetType, 128 /* ReturnType */);
           }
           const returnContext = createInferenceContext(signature.typeParameters, signature, context.flags);
           const returnSourceType = instantiateType(contextualType, outerContext && outerContext.returnMapper);
-          inferTypes(returnContext, returnContext.inferences, returnSourceType, inferenceTargetType);
+          inferTypes(returnContext.inferences, returnSourceType, inferenceTargetType);
           context.returnMapper = some(returnContext.inferences, hasInferenceCandidates) ? getMapperFromContext(cloneInferredPartOfContext(returnContext)) : void 0;
         }
       }
@@ -75513,7 +75479,7 @@ function createTypeChecker(host) {
     const thisType = getThisTypeOfSignature(signature);
     if (thisType && couldContainTypeVariables(thisType)) {
       const thisArgumentNode = getThisArgumentOfCall(node);
-      inferTypes(context, context.inferences, getThisArgumentType(thisArgumentNode), thisType);
+      inferTypes(context.inferences, getThisArgumentType(thisArgumentNode), thisType);
     }
     for (let i = 0; i < argCount; i++) {
       const arg = args[i];
@@ -75521,13 +75487,13 @@ function createTypeChecker(host) {
         const paramType = getTypeAtPosition(signature, i);
         if (couldContainTypeVariables(paramType)) {
           const argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
-          inferTypes(context, context.inferences, argType, paramType);
+          inferTypes(context.inferences, argType, paramType);
         }
       }
     }
     if (restType && couldContainTypeVariables(restType)) {
       const spreadType = getSpreadArgumentType(args, argCount, args.length, restType, context, checkMode);
-      inferTypes(context, context.inferences, spreadType, restType);
+      inferTypes(context.inferences, spreadType, restType);
     }
     return getInferredTypes(context);
   }
@@ -77900,14 +77866,14 @@ function createTypeChecker(host) {
           isOptionalDeclaration(declaration)
         );
         const target = getTypeAtPosition(context, i);
-        inferTypes(inferenceContext, inferenceContext.inferences, source, target);
+        inferTypes(inferenceContext.inferences, source, target);
       }
     }
     const typeNode = signature.declaration && getEffectiveReturnTypeNode(signature.declaration);
     if (typeNode) {
       const source = getTypeFromTypeNode(typeNode);
       const target = getReturnTypeOfSignature(context);
-      inferTypes(inferenceContext, inferenceContext.inferences, source, target);
+      inferTypes(inferenceContext.inferences, source, target);
     }
   }
   function assignContextualParameterTypes(signature, context) {
@@ -80323,7 +80289,6 @@ function createTypeChecker(host) {
               const inferences = map(context.inferences, (info) => createInferenceInfo(info.typeParameter));
               applyToParameterTypes(instantiatedSignature, contextualSignature, (source, target) => {
                 inferTypes(
-                  context,
                   inferences,
                   source,
                   target,
@@ -80335,7 +80300,7 @@ function createTypeChecker(host) {
               });
               if (some(inferences, hasInferenceCandidates)) {
                 applyToReturnTypes(instantiatedSignature, contextualSignature, (source, target) => {
-                  inferTypes(context, inferences, source, target);
+                  inferTypes(inferences, source, target);
                 });
                 if (!hasOverlappingInferences(context.inferences, inferences)) {
                   mergeInferences(context.inferences, inferences);

package/lib/typescript.js

@@ -2285,7 +2285,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.9";
-var version = `${versionMajorMinor}.0-insiders.20250416`;
+var version = `${versionMajorMinor}.0-insiders.20250417`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -51813,9 +51813,6 @@ function createTypeChecker(host) {
   var inferenceContextNodes = [];
   var inferenceContexts = [];
   var inferenceContextCount = 0;
-  var activeTypeMappers = [];
-  var activeTypeMappersCaches = [];
-  var activeTypeMappersCount = 0;
   var emptyStringType = getStringLiteralType("");
   var zeroType = getNumberLiteralType(0);
   var zeroBigIntType = getBigIntLiteralType({ negative: false, base10Value: "0" });
@@ -66877,7 +66874,7 @@ function createTypeChecker(host) {
           context.nonFixingMapper = combineTypeMappers(context.nonFixingMapper, mapper);
         }
         if (!checkTypeDeferred) {
-          inferTypes(context, context.inferences, checkType, extendsType, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
+          inferTypes(context.inferences, checkType, extendsType, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
         }
         combinedMapper = mapper ? combineTypeMappers(context.mapper, mapper) : context.mapper;
       }
@@ -67895,25 +67892,10 @@ function createTypeChecker(host) {
       error2(currentNode, Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
       return errorType;
     }
-    const index = findActiveMapper(mapper);
-    if (index === -1) {
-      pushActiveMapper(mapper);
-    }
-    const key = type.id + getAliasId(aliasSymbol, aliasTypeArguments);
-    const mapperCache = activeTypeMappersCaches[index !== -1 ? index : activeTypeMappersCount - 1];
-    const cached = mapperCache.get(key);
-    if (cached) {
-      return cached;
-    }
     totalInstantiationCount++;
     instantiationCount++;
     instantiationDepth++;
     const result = instantiateTypeWorker(type, mapper, aliasSymbol, aliasTypeArguments);
-    if (index === -1) {
-      popActiveMapper();
-    } else {
-      mapperCache.set(key, result);
-    }
     instantiationDepth--;
     return result;
   }
@@ -70536,7 +70518,7 @@ function createTypeChecker(host) {
               0 /* None */,
               isRelatedToWorker
             );
-            inferTypes(ctx, ctx.inferences, target2.extendsType, sourceExtends, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
+            inferTypes(ctx.inferences, target2.extendsType, sourceExtends, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
             sourceExtends = instantiateType(sourceExtends, ctx.mapper);
             mapper = ctx.mapper;
           }
@@ -72416,7 +72398,7 @@ function createTypeChecker(host) {
       map(context.inferences, (inference, i) => () => {
         if (!inference.isFixed) {
           inferFromIntraExpressionSites(context);
-          clearCachedInferences(context, context.inferences);
+          clearCachedInferences(context.inferences);
           inference.isFixed = true;
         }
         return getInferredType(context, i);
@@ -72431,10 +72413,7 @@ function createTypeChecker(host) {
       })
     );
   }
-  function clearCachedInferences(context, inferences) {
-    if (context) {
-      clearActiveMapperCache(context.nonFixingMapper);
-    }
+  function clearCachedInferences(inferences) {
     for (const inference of inferences) {
       if (!inference.isFixed) {
         inference.inferredType = void 0;
@@ -72449,7 +72428,7 @@ function createTypeChecker(host) {
       for (const { node, type } of context.intraExpressionInferenceSites) {
         const contextualType = node.kind === 174 /* MethodDeclaration */ ? getContextualTypeForObjectLiteralMethod(node, 2 /* NoConstraints */) : getContextualType2(node, 2 /* NoConstraints */);
         if (contextualType) {
-          inferTypes(context, context.inferences, type, contextualType);
+          inferTypes(context.inferences, type, contextualType);
         }
       }
       context.intraExpressionInferenceSites = void 0;
@@ -72593,13 +72572,7 @@ function createTypeChecker(host) {
     const typeParameter = getIndexedAccessType(constraint.type, getTypeParameterFromMappedType(target));
     const templateType = getTemplateTypeFromMappedType(target);
     const inference = createInferenceInfo(typeParameter);
-    inferTypes(
-      /*context*/
-      void 0,
-      [inference],
-      sourceType,
-      templateType
-    );
+    inferTypes([inference], sourceType, templateType);
     return getTypeFromInference(inference) || unknownType;
   }
   function inferReverseMappedType(source, target, constraint) {
@@ -72801,7 +72774,7 @@ function createTypeChecker(host) {
   function isTupleOfSelf(typeParameter, type) {
     return isTupleType(type) && getTupleElementType(type, 0) === getIndexedAccessType(typeParameter, getNumberLiteralType(0)) && !getTypeOfPropertyOfType(type, "1");
   }
-  function inferTypes(context, inferences, originalSource, originalTarget, priority = 0 /* None */, contravariant = false) {
+  function inferTypes(inferences, originalSource, originalTarget, priority = 0 /* None */, contravariant = false) {
     let bivariant = false;
     let propagationType;
     let inferencePriority = 2048 /* MaxValue */;
@@ -72892,16 +72865,16 @@ function createTypeChecker(host) {
               if (contravariant && !bivariant) {
                 if (!contains(inference.contraCandidates, candidate)) {
                   inference.contraCandidates = append(inference.contraCandidates, candidate);
-                  clearCachedInferences(context, inferences);
+                  clearCachedInferences(inferences);
                 }
               } else if (!contains(inference.candidates, candidate)) {
                 inference.candidates = append(inference.candidates, candidate);
-                clearCachedInferences(context, inferences);
+                clearCachedInferences(inferences);
               }
             }
             if (!(priority & 128 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && inference.topLevel && !isTypeParameterAtTopLevel(originalTarget, target)) {
               inference.topLevel = false;
-              clearCachedInferences(context, inferences);
+              clearCachedInferences(inferences);
             }
           }
           inferencePriority = Math.min(inferencePriority, priority);
@@ -73467,7 +73440,6 @@ function createTypeChecker(host) {
         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;
-          clearActiveMapperCache(context.nonFixingMapper);
         }
       }
     }
@@ -75483,15 +75455,31 @@ function createTypeChecker(host) {
       }
       const isRelated = checkDerived ? isTypeDerivedFrom : isTypeSubtypeOf;
       const keyPropertyName = type.flags & 1048576 /* Union */ ? getKeyPropertyName(type) : void 0;
-      const narrowedType = mapType(candidate, (c) => {
-        const discriminant = keyPropertyName && getTypeOfPropertyOfType(c, keyPropertyName);
-        const matching = discriminant && getConstituentTypeForKeyType(type, discriminant);
-        const directlyRelated = mapType(
-          matching || type,
-          checkDerived ? (t) => isTypeDerivedFrom(t, c) ? t : isTypeDerivedFrom(c, t) ? c : neverType : (t) => isTypeStrictSubtypeOf(t, c) ? t : isTypeStrictSubtypeOf(c, t) ? c : isTypeSubtypeOf(t, c) ? t : isTypeSubtypeOf(c, t) ? c : neverType
-        );
-        return directlyRelated.flags & 131072 /* Never */ ? mapType(type, (t) => maybeTypeOfKind(t, 465829888 /* Instantiable */) && isRelated(c, getBaseConstraintOfType(t) || unknownType) ? getIntersectionType([t, c]) : neverType) : directlyRelated;
-      });
+      let matchedCandidates = [];
+      let narrowedType = mapType(type, (t) => mapType(
+        candidate,
+        (c) => {
+          if (keyPropertyName) {
+            const discriminant = keyPropertyName && getTypeOfPropertyOfType(c, keyPropertyName);
+            if (!discriminant || getConstituentTypeForKeyType(type, discriminant) !== t) {
+              return neverType;
+            }
+          }
+          const directlyRelated = checkDerived ? isTypeDerivedFrom(t, c) ? t : isTypeDerivedFrom(c, t) ? c : neverType : isTypeStrictSubtypeOf(t, c) ? t : isTypeStrictSubtypeOf(c, t) ? c : isTypeSubtypeOf(t, c) ? t : isTypeSubtypeOf(c, t) ? c : neverType;
+          if (!(directlyRelated.flags & 131072 /* Never */)) {
+            matchedCandidates = appendIfUnique(matchedCandidates, c);
+          }
+          return directlyRelated;
+        }
+      ));
+      if (matchedCandidates.length !== countTypes(candidate)) {
+        narrowedType = getUnionType([
+          narrowedType,
+          mapType(candidate, (c) => {
+            return !containsType(matchedCandidates, c) ? mapType(type, (t) => maybeTypeOfKind(t, 465829888 /* Instantiable */) && isRelated(c, getBaseConstraintOfType(t) || unknownType) ? getIntersectionType([t, c]) : neverType) : neverType;
+          })
+        ]);
+      }
       return !(narrowedType.flags & 131072 /* Never */) ? narrowedType : isTypeSubtypeOf(candidate, type) ? candidate : isTypeAssignableTo(type, candidate) ? type : isTypeAssignableTo(candidate, type) ? candidate : getIntersectionType([type, candidate]);
     }
     function narrowTypeByCallExpression(type, callExpression, assumeTrue) {
@@ -77731,28 +77719,6 @@ function createTypeChecker(host) {
       }
     }
   }
-  function pushActiveMapper(mapper) {
-    activeTypeMappers[activeTypeMappersCount] = mapper;
-    activeTypeMappersCaches[activeTypeMappersCount] = /* @__PURE__ */ new Map();
-    activeTypeMappersCount++;
-  }
-  function popActiveMapper() {
-    activeTypeMappersCount--;
-  }
-  function findActiveMapper(mapper) {
-    for (let i = activeTypeMappersCount - 1; i >= 0; i--) {
-      if (mapper === activeTypeMappers[i]) {
-        return i;
-      }
-    }
-    return -1;
-  }
-  function clearActiveMapperCache(mapper) {
-    const index = findActiveMapper(mapper);
-    if (index !== -1) {
-      activeTypeMappersCaches[index] = /* @__PURE__ */ new Map();
-    }
-  }
   function getContextualImportAttributeType(node) {
     return getTypeOfPropertyOfContextualType(getGlobalImportAttributesType(
       /*reportErrors*/
@@ -80064,11 +80030,11 @@ function createTypeChecker(host) {
     const mapper = inferenceContext && (restType && restType.flags & 262144 /* TypeParameter */ ? inferenceContext.nonFixingMapper : inferenceContext.mapper);
     const sourceSignature = mapper ? instantiateSignature(contextualSignature, mapper) : contextualSignature;
     applyToParameterTypes(sourceSignature, signature, (source, target) => {
-      inferTypes(context, context.inferences, source, target);
+      inferTypes(context.inferences, source, target);
     });
     if (!inferenceContext) {
       applyToReturnTypes(contextualSignature, signature, (source, target) => {
-        inferTypes(context, context.inferences, source, target, 128 /* ReturnType */);
+        inferTypes(context.inferences, source, target, 128 /* ReturnType */);
       });
     }
     return getSignatureInstantiation(signature, getInferredTypes(context), isInJSFile(contextualSignature.declaration));
@@ -80076,7 +80042,7 @@ function createTypeChecker(host) {
   function inferJsxTypeArguments(node, signature, checkMode, context) {
     const paramType = getEffectiveFirstArgumentForJsxSignature(signature, node);
     const checkAttrType = checkExpressionWithContextualType(node.attributes, paramType, context, checkMode);
-    inferTypes(context, context.inferences, checkAttrType, paramType);
+    inferTypes(context.inferences, checkAttrType, paramType);
     return getInferredTypes(context);
   }
   function getThisArgumentType(thisArgumentNode) {
@@ -80103,11 +80069,11 @@ function createTypeChecker(host) {
             const instantiatedType = instantiateType(contextualType, outerMapper);
             const contextualSignature = getSingleCallSignature(instantiatedType);
             const inferenceSourceType = contextualSignature && contextualSignature.typeParameters ? getOrCreateTypeFromSignature(getSignatureInstantiationWithoutFillingInTypeArguments(contextualSignature, contextualSignature.typeParameters)) : instantiatedType;
-            inferTypes(context, context.inferences, inferenceSourceType, inferenceTargetType, 128 /* ReturnType */);
+            inferTypes(context.inferences, inferenceSourceType, inferenceTargetType, 128 /* ReturnType */);
           }
           const returnContext = createInferenceContext(signature.typeParameters, signature, context.flags);
           const returnSourceType = instantiateType(contextualType, outerContext && outerContext.returnMapper);
-          inferTypes(returnContext, returnContext.inferences, returnSourceType, inferenceTargetType);
+          inferTypes(returnContext.inferences, returnSourceType, inferenceTargetType);
           context.returnMapper = some(returnContext.inferences, hasInferenceCandidates) ? getMapperFromContext(cloneInferredPartOfContext(returnContext)) : void 0;
         }
       }
@@ -80123,7 +80089,7 @@ function createTypeChecker(host) {
     const thisType = getThisTypeOfSignature(signature);
     if (thisType && couldContainTypeVariables(thisType)) {
       const thisArgumentNode = getThisArgumentOfCall(node);
-      inferTypes(context, context.inferences, getThisArgumentType(thisArgumentNode), thisType);
+      inferTypes(context.inferences, getThisArgumentType(thisArgumentNode), thisType);
     }
     for (let i = 0; i < argCount; i++) {
       const arg = args[i];
@@ -80131,13 +80097,13 @@ function createTypeChecker(host) {
         const paramType = getTypeAtPosition(signature, i);
         if (couldContainTypeVariables(paramType)) {
           const argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
-          inferTypes(context, context.inferences, argType, paramType);
+          inferTypes(context.inferences, argType, paramType);
         }
       }
     }
     if (restType && couldContainTypeVariables(restType)) {
       const spreadType = getSpreadArgumentType(args, argCount, args.length, restType, context, checkMode);
-      inferTypes(context, context.inferences, spreadType, restType);
+      inferTypes(context.inferences, spreadType, restType);
     }
     return getInferredTypes(context);
   }
@@ -82510,14 +82476,14 @@ function createTypeChecker(host) {
           isOptionalDeclaration(declaration)
         );
         const target = getTypeAtPosition(context, i);
-        inferTypes(inferenceContext, inferenceContext.inferences, source, target);
+        inferTypes(inferenceContext.inferences, source, target);
       }
     }
     const typeNode = signature.declaration && getEffectiveReturnTypeNode(signature.declaration);
     if (typeNode) {
       const source = getTypeFromTypeNode(typeNode);
       const target = getReturnTypeOfSignature(context);
-      inferTypes(inferenceContext, inferenceContext.inferences, source, target);
+      inferTypes(inferenceContext.inferences, source, target);
     }
   }
   function assignContextualParameterTypes(signature, context) {
@@ -84933,7 +84899,6 @@ function createTypeChecker(host) {
               const inferences = map(context.inferences, (info) => createInferenceInfo(info.typeParameter));
               applyToParameterTypes(instantiatedSignature, contextualSignature, (source, target) => {
                 inferTypes(
-                  context,
                   inferences,
                   source,
                   target,
@@ -84945,7 +84910,7 @@ function createTypeChecker(host) {
               });
               if (some(inferences, hasInferenceCandidates)) {
                 applyToReturnTypes(instantiatedSignature, contextualSignature, (source, target) => {
-                  inferTypes(context, inferences, source, target);
+                  inferTypes(inferences, source, target);
                 });
                 if (!hasOverlappingInferences(context.inferences, inferences)) {
                   mergeInferences(context.inferences, inferences);

package/package.json

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