@typescript-deploys/pr-build 5.9.0-pr-61420-2 → 5.9.0-pr-61505-16

package/lib/_tsc.js

@@ -18,11 +18,15 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.9";
-var version = `${versionMajorMinor}.0-insiders.20250314`;
+var version = `${versionMajorMinor}.0-insiders.20250401`;
 
 // src/compiler/core.ts
 var emptyArray = [];
 var emptyMap = /* @__PURE__ */ new Map();
+var voidMap = /* @__PURE__ */ new Map();
+voidMap.set = function() {
+  return this;
+};
 function length(array) {
   return array !== void 0 ? array.length : 0;
 }
@@ -44902,6 +44906,8 @@ function getContainerFlags(node) {
     case 185 /* ConstructorType */:
     case 175 /* ClassStaticBlockDeclaration */:
       return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */;
+    case 351 /* JSDocImportTag */:
+      return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */;
     case 218 /* FunctionExpression */:
     case 219 /* ArrowFunction */:
       return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 16 /* IsFunctionExpression */;
@@ -46163,7 +46169,6 @@ function createTypeChecker(host) {
   };
   var cancellationToken;
   var scanner;
-  var fileIndexMap = new Map(host.getSourceFiles().map((file, i) => [file, i]));
   var Symbol13 = objectAllocator.getSymbolConstructor();
   var Type7 = objectAllocator.getTypeConstructor();
   var Signature5 = objectAllocator.getSignatureConstructor();
@@ -46817,6 +46822,7 @@ function createTypeChecker(host) {
   var templateConstraintType = getUnionType([stringType, numberType, booleanType, bigintType, nullType, undefinedType]);
   var numericStringType = getTemplateLiteralType(["", ""], [numberType]);
   var restrictiveMapper = makeFunctionTypeMapper((t) => t.flags & 262144 /* TypeParameter */ ? getRestrictiveTypeParameter(t) : t, () => "(restrictive mapper)");
+  restrictiveMapper.instantiations = voidMap;
   var permissiveMapper = makeFunctionTypeMapper((t) => t.flags & 262144 /* TypeParameter */ ? wildcardType : t, () => "(permissive mapper)");
   var uniqueLiteralType = createIntrinsicType(
     131072 /* Never */,
@@ -46836,6 +46842,7 @@ function createTypeChecker(host) {
     }
     return t;
   }, () => "(unmeasurable reporter)");
+  reportUnreliableMapper.instantiations = voidMap;
   var reportUnmeasurableMapper = makeFunctionTypeMapper((t) => {
     if (outofbandVarianceMarkerHandler && (t === markerSuperType || t === markerSubType || t === markerOtherType)) {
       outofbandVarianceMarkerHandler(
@@ -46845,6 +46852,7 @@ function createTypeChecker(host) {
     }
     return t;
   }, () => "(unreliable reporter)");
+  reportUnmeasurableMapper.instantiations = voidMap;
   var emptyObjectType = createAnonymousType(
     /*symbol*/
     void 0,
@@ -49802,7 +49810,6 @@ function createTypeChecker(host) {
         (result || (result = [])).push(symbol);
       }
     });
-    result == null ? void 0 : result.sort(compareSymbols);
     return result || emptyArray;
   }
   function isNamedMember(member, escapedName) {
@@ -50408,10 +50415,11 @@ function createTypeChecker(host) {
       serializeExistingTypeNode(context, typeNode, addUndefined) {
         return serializeExistingTypeNode(context, typeNode, !!addUndefined);
       },
-      serializeReturnTypeForSignature(syntacticContext, signatureDeclaration) {
+      serializeReturnTypeForSignature(syntacticContext, signatureDeclaration, symbol) {
         const context = syntacticContext;
         const signature = getSignatureFromDeclaration(signatureDeclaration);
-        const returnType = context.enclosingSymbolTypes.get(getSymbolId(getSymbolOfDeclaration(signatureDeclaration))) ?? instantiateType(getReturnTypeOfSignature(signature), context.mapper);
+        symbol ?? (symbol = getSymbolOfDeclaration(signatureDeclaration));
+        const returnType = context.enclosingSymbolTypes.get(getSymbolId(symbol)) ?? instantiateType(getReturnTypeOfSignature(signature), context.mapper);
         return serializeInferredReturnTypeForSignature(context, signature, returnType);
       },
       serializeTypeOfExpression(syntacticContext, expr) {
@@ -50425,7 +50433,7 @@ function createTypeChecker(host) {
         symbol ?? (symbol = getSymbolOfDeclaration(declaration));
         let type = (_a = context.enclosingSymbolTypes) == null ? void 0 : _a.get(getSymbolId(symbol));
         if (type === void 0) {
-          type = symbol && !(symbol.flags & (2048 /* TypeLiteral */ | 131072 /* Signature */)) ? instantiateType(getWidenedLiteralType(getTypeOfSymbol(symbol)), context.mapper) : errorType;
+          type = symbol.flags & 98304 /* Accessor */ && declaration.kind === 178 /* SetAccessor */ ? instantiateType(getWriteTypeOfSymbol(symbol), context.mapper) : symbol && !(symbol.flags & (2048 /* TypeLiteral */ | 131072 /* Signature */)) ? instantiateType(getWidenedLiteralType(getTypeOfSymbol(symbol)), context.mapper) : errorType;
         }
         const addUndefinedForParameter = declaration && (isParameter(declaration) || isJSDocParameterTag(declaration)) && requiresAddingImplicitUndefined(declaration, context.enclosingDeclaration);
         if (addUndefinedForParameter) {
@@ -51574,12 +51582,13 @@ function createTypeChecker(host) {
       if (propertySymbol.flags & 98304 /* Accessor */) {
         const writeType = getWriteTypeOfSymbol(propertySymbol);
         if (propertyType !== writeType && !isErrorType(propertyType) && !isErrorType(writeType)) {
+          const symbolMapper = getSymbolLinks(propertySymbol).mapper;
           const getterDeclaration = getDeclarationOfKind(propertySymbol, 177 /* GetAccessor */);
           const getterSignature = getSignatureFromDeclaration(getterDeclaration);
           typeElements.push(
             setCommentRange2(
               context,
-              signatureToSignatureDeclarationHelper(getterSignature, 177 /* GetAccessor */, context, { name: propertyName }),
+              signatureToSignatureDeclarationHelper(symbolMapper ? instantiateSignature(getterSignature, symbolMapper) : getterSignature, 177 /* GetAccessor */, context, { name: propertyName }),
               getterDeclaration
             )
           );
@@ -51588,7 +51597,7 @@ function createTypeChecker(host) {
           typeElements.push(
             setCommentRange2(
               context,
-              signatureToSignatureDeclarationHelper(setterSignature, 178 /* SetAccessor */, context, { name: propertyName }),
+              signatureToSignatureDeclarationHelper(symbolMapper ? instantiateSignature(setterSignature, symbolMapper) : setterSignature, 178 /* SetAccessor */, context, { name: propertyName }),
               setterDeclaration
             )
           );
@@ -52731,13 +52740,13 @@ function createTypeChecker(host) {
       const addUndefinedForParameter = declaration && (isParameter(declaration) || isJSDocParameterTag(declaration)) && requiresAddingImplicitUndefined(declaration, context.enclosingDeclaration);
       const decl = declaration ?? symbol.valueDeclaration ?? getDeclarationWithTypeAnnotation(symbol) ?? ((_a = symbol.declarations) == null ? void 0 : _a[0]);
       if (decl) {
+        const restore = addSymbolTypeToContext(context, symbol, type);
         if (isAccessor(decl)) {
           result = syntacticNodeBuilder.serializeTypeOfAccessor(decl, symbol, context);
         } else if (hasInferredType(decl) && !nodeIsSynthesized(decl) && !(getObjectFlags(type) & 196608 /* RequiresWidening */)) {
-          const restore = addSymbolTypeToContext(context, symbol, type);
           result = syntacticNodeBuilder.serializeTypeOfDeclaration(decl, symbol, context);
-          restore();
         }
+        restore();
       }
       if (!result) {
         if (addUndefinedForParameter) {
@@ -61689,7 +61698,7 @@ function createTypeChecker(host) {
           context.nonFixingMapper = combineTypeMappers(context.nonFixingMapper, mapper);
         }
         if (!checkTypeDeferred) {
-          inferTypes(context.inferences, checkType, extendsType, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
+          inferTypes(context, context.inferences, checkType, extendsType, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
         }
         combinedMapper = mapper ? combineTypeMappers(context.mapper, mapper) : context.mapper;
       }
@@ -62698,7 +62707,7 @@ function createTypeChecker(host) {
     ) : type;
   }
   function instantiateTypeWithAlias(type, mapper, aliasSymbol, aliasTypeArguments) {
-    var _a;
+    var _a, _b;
     if (!couldContainTypeVariables(type)) {
       return type;
     }
@@ -62707,10 +62716,16 @@ function createTypeChecker(host) {
       error(currentNode, Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
       return errorType;
     }
+    const key = type.id + getAliasId(aliasSymbol, aliasTypeArguments);
+    const cached = (mapper.instantiations ?? (mapper.instantiations = /* @__PURE__ */ new Map())).get(key);
+    if (cached) {
+      return cached;
+    }
     totalInstantiationCount++;
     instantiationCount++;
     instantiationDepth++;
     const result = instantiateTypeWorker(type, mapper, aliasSymbol, aliasTypeArguments);
+    (_b = mapper.instantiations) == null ? void 0 : _b.set(key, result);
     instantiationDepth--;
     return result;
   }
@@ -65333,7 +65348,7 @@ function createTypeChecker(host) {
               0 /* None */,
               isRelatedToWorker
             );
-            inferTypes(ctx.inferences, target2.extendsType, sourceExtends, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
+            inferTypes(ctx, ctx.inferences, target2.extendsType, sourceExtends, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
             sourceExtends = instantiateType(sourceExtends, ctx.mapper);
             mapper = ctx.mapper;
           }
@@ -67213,7 +67228,7 @@ function createTypeChecker(host) {
       map(context.inferences, (inference, i) => () => {
         if (!inference.isFixed) {
           inferFromIntraExpressionSites(context);
-          clearCachedInferences(context.inferences);
+          clearCachedInferences(context, context.inferences);
           inference.isFixed = true;
         }
         return getInferredType(context, i);
@@ -67228,7 +67243,10 @@ function createTypeChecker(host) {
       })
     );
   }
-  function clearCachedInferences(inferences) {
+  function clearCachedInferences(context, inferences) {
+    if (context) {
+      context.nonFixingMapper.instantiations = void 0;
+    }
     for (const inference of inferences) {
       if (!inference.isFixed) {
         inference.inferredType = void 0;
@@ -67243,7 +67261,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.inferences, type, contextualType);
+          inferTypes(context, context.inferences, type, contextualType);
         }
       }
       context.intraExpressionInferenceSites = void 0;
@@ -67387,7 +67405,13 @@ function createTypeChecker(host) {
     const typeParameter = getIndexedAccessType(constraint.type, getTypeParameterFromMappedType(target));
     const templateType = getTemplateTypeFromMappedType(target);
     const inference = createInferenceInfo(typeParameter);
-    inferTypes([inference], sourceType, templateType);
+    inferTypes(
+      /*context*/
+      void 0,
+      [inference],
+      sourceType,
+      templateType
+    );
     return getTypeFromInference(inference) || unknownType;
   }
   function inferReverseMappedType(source, target, constraint) {
@@ -67589,7 +67613,7 @@ function createTypeChecker(host) {
   function isTupleOfSelf(typeParameter, type) {
     return isTupleType(type) && getTupleElementType(type, 0) === getIndexedAccessType(typeParameter, getNumberLiteralType(0)) && !getTypeOfPropertyOfType(type, "1");
   }
-  function inferTypes(inferences, originalSource, originalTarget, priority = 0 /* None */, contravariant = false) {
+  function inferTypes(context, inferences, originalSource, originalTarget, priority = 0 /* None */, contravariant = false) {
     let bivariant = false;
     let propagationType;
     let inferencePriority = 2048 /* MaxValue */;
@@ -67680,16 +67704,16 @@ function createTypeChecker(host) {
               if (contravariant && !bivariant) {
                 if (!contains(inference.contraCandidates, candidate)) {
                   inference.contraCandidates = append(inference.contraCandidates, candidate);
-                  clearCachedInferences(inferences);
+                  clearCachedInferences(context, inferences);
                 }
               } else if (!contains(inference.candidates, candidate)) {
                 inference.candidates = append(inference.candidates, candidate);
-                clearCachedInferences(inferences);
+                clearCachedInferences(context, inferences);
               }
             }
             if (!(priority & 128 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && inference.topLevel && !isTypeParameterAtTopLevel(originalTarget, target)) {
               inference.topLevel = false;
-              clearCachedInferences(inferences);
+              clearCachedInferences(context, inferences);
             }
           }
           inferencePriority = Math.min(inferencePriority, priority);
@@ -68255,6 +68279,7 @@ 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;
+          context.nonFixingMapper.instantiations = void 0;
         }
       }
     }
@@ -74382,7 +74407,7 @@ function createTypeChecker(host) {
     addErrorOrSuggestion(!isUncheckedJS || errorInfo.code !== Diagnostics.Property_0_may_not_exist_on_type_1_Did_you_mean_2.code, resultDiagnostic);
   }
   function containerSeemsToBeEmptyDomElement(containingType) {
-    return compilerOptions.lib && !compilerOptions.lib.includes("dom") && everyContainedType(containingType, (type) => type.symbol && /^(?:EventTarget|Node|(?:HTML[a-zA-Z]*)?Element)$/.test(unescapeLeadingUnderscores(type.symbol.escapedName))) && isEmptyObjectType(containingType);
+    return compilerOptions.lib && !compilerOptions.lib.includes("lib.dom.d.ts") && everyContainedType(containingType, (type) => type.symbol && /^(?:EventTarget|Node|(?:HTML[a-zA-Z]*)?Element)$/.test(unescapeLeadingUnderscores(type.symbol.escapedName))) && isEmptyObjectType(containingType);
   }
   function typeHasStaticProperty(propName, containingType) {
     const prop = containingType.symbol && getPropertyOfType(getTypeOfSymbol(containingType.symbol), propName);
@@ -74437,13 +74462,15 @@ function createTypeChecker(host) {
   function getSuggestionForSymbolNameLookup(symbols, name, meaning) {
     const symbol = getSymbol(symbols, name, meaning);
     if (symbol) return symbol;
-    let candidates = arrayFrom(symbols.values()).sort(compareSymbols);
+    let candidates;
     if (symbols === globals) {
       const primitives = mapDefined(
         ["string", "number", "boolean", "object", "bigint", "symbol"],
         (s) => symbols.has(s.charAt(0).toUpperCase() + s.slice(1)) ? createSymbol(524288 /* TypeAlias */, s) : void 0
       );
-      candidates = concatenate(candidates, primitives);
+      candidates = primitives.concat(arrayFrom(symbols.values()));
+    } else {
+      candidates = arrayFrom(symbols.values());
     }
     return getSpellingSuggestionForName(unescapeLeadingUnderscores(name), candidates, meaning);
   }
@@ -74463,7 +74490,7 @@ function createTypeChecker(host) {
     return result;
   }
   function getSuggestedSymbolForNonexistentModule(name, targetModule) {
-    return targetModule.exports && getSpellingSuggestionForName(idText(name), getExportsOfModuleAsArray(targetModule).sort(compareSymbols), 2623475 /* ModuleMember */);
+    return targetModule.exports && getSpellingSuggestionForName(idText(name), getExportsOfModuleAsArray(targetModule), 2623475 /* ModuleMember */);
   }
   function getSuggestionForNonexistentIndexSignature(objectType, expr, keyedType) {
     function hasProp(name) {
@@ -74827,11 +74854,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.inferences, source, target);
+      inferTypes(context, context.inferences, source, target);
     });
     if (!inferenceContext) {
       applyToReturnTypes(contextualSignature, signature, (source, target) => {
-        inferTypes(context.inferences, source, target, 128 /* ReturnType */);
+        inferTypes(context, context.inferences, source, target, 128 /* ReturnType */);
       });
     }
     return getSignatureInstantiation(signature, getInferredTypes(context), isInJSFile(contextualSignature.declaration));
@@ -74839,7 +74866,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.inferences, checkAttrType, paramType);
+    inferTypes(context, context.inferences, checkAttrType, paramType);
     return getInferredTypes(context);
   }
   function getThisArgumentType(thisArgumentNode) {
@@ -74866,11 +74893,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.inferences, inferenceSourceType, inferenceTargetType, 128 /* ReturnType */);
+            inferTypes(context, context.inferences, inferenceSourceType, inferenceTargetType, 128 /* ReturnType */);
           }
           const returnContext = createInferenceContext(signature.typeParameters, signature, context.flags);
           const returnSourceType = instantiateType(contextualType, outerContext && outerContext.returnMapper);
-          inferTypes(returnContext.inferences, returnSourceType, inferenceTargetType);
+          inferTypes(returnContext, returnContext.inferences, returnSourceType, inferenceTargetType);
           context.returnMapper = some(returnContext.inferences, hasInferenceCandidates) ? getMapperFromContext(cloneInferredPartOfContext(returnContext)) : void 0;
         }
       }
@@ -74886,7 +74913,7 @@ function createTypeChecker(host) {
     const thisType = getThisTypeOfSignature(signature);
     if (thisType && couldContainTypeVariables(thisType)) {
       const thisArgumentNode = getThisArgumentOfCall(node);
-      inferTypes(context.inferences, getThisArgumentType(thisArgumentNode), thisType);
+      inferTypes(context, context.inferences, getThisArgumentType(thisArgumentNode), thisType);
     }
     for (let i = 0; i < argCount; i++) {
       const arg = args[i];
@@ -74894,13 +74921,13 @@ function createTypeChecker(host) {
         const paramType = getTypeAtPosition(signature, i);
         if (couldContainTypeVariables(paramType)) {
           const argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
-          inferTypes(context.inferences, argType, paramType);
+          inferTypes(context, context.inferences, argType, paramType);
         }
       }
     }
     if (restType && couldContainTypeVariables(restType)) {
       const spreadType = getSpreadArgumentType(args, argCount, args.length, restType, context, checkMode);
-      inferTypes(context.inferences, spreadType, restType);
+      inferTypes(context, context.inferences, spreadType, restType);
     }
     return getInferredTypes(context);
   }
@@ -76783,8 +76810,8 @@ function createTypeChecker(host) {
         grammarErrorOnNode(node, Diagnostics.This_syntax_is_reserved_in_files_with_the_mts_or_cts_extension_Use_an_as_expression_instead);
       }
       if (compilerOptions.erasableSyntaxOnly) {
-        const start = node.type.pos - "<".length;
-        const end = skipTrivia(file.text, node.type.end) + ">".length;
+        const start = skipTrivia(file.text, node.pos);
+        const end = node.expression.pos;
         diagnostics.add(createFileDiagnostic(file, start, end - start, Diagnostics.This_syntax_is_not_allowed_when_erasableSyntaxOnly_is_enabled));
       }
     }
@@ -77273,14 +77300,14 @@ function createTypeChecker(host) {
           isOptionalDeclaration(declaration)
         );
         const target = getTypeAtPosition(context, i);
-        inferTypes(inferenceContext.inferences, source, target);
+        inferTypes(inferenceContext, inferenceContext.inferences, source, target);
       }
     }
     const typeNode = signature.declaration && getEffectiveReturnTypeNode(signature.declaration);
     if (typeNode) {
       const source = getTypeFromTypeNode(typeNode);
       const target = getReturnTypeOfSignature(context);
-      inferTypes(inferenceContext.inferences, source, target);
+      inferTypes(inferenceContext, inferenceContext.inferences, source, target);
     }
   }
   function assignContextualParameterTypes(signature, context) {
@@ -79696,6 +79723,7 @@ function createTypeChecker(host) {
               const inferences = map(context.inferences, (info) => createInferenceInfo(info.typeParameter));
               applyToParameterTypes(instantiatedSignature, contextualSignature, (source, target) => {
                 inferTypes(
+                  context,
                   inferences,
                   source,
                   target,
@@ -79707,7 +79735,7 @@ function createTypeChecker(host) {
               });
               if (some(inferences, hasInferenceCandidates)) {
                 applyToReturnTypes(instantiatedSignature, contextualSignature, (source, target) => {
-                  inferTypes(inferences, source, target);
+                  inferTypes(context, inferences, source, target);
                 });
                 if (!hasOverlappingInferences(context.inferences, inferences)) {
                   mergeInferences(context.inferences, inferences);
@@ -89276,33 +89304,6 @@ function createTypeChecker(host) {
     Debug.assert(specifier && nodeIsSynthesized(specifier) && specifier.text === "tslib", `Expected sourceFile.imports[0] to be the synthesized tslib import`);
     return specifier;
   }
-  function compareSymbols(s1, s2) {
-    if (s1 === s2) return 0;
-    if (s1 === void 0) return 1;
-    if (s2 === void 0) return -1;
-    if (length(s1.declarations) !== 0 && length(s2.declarations) !== 0) {
-      const r2 = compareNodes(s1.declarations[0], s2.declarations[0]);
-      if (r2 !== 0) return r2;
-    } else if (length(s1.declarations) !== 0) {
-      return -1;
-    } else if (length(s2.declarations) !== 0) {
-      return 1;
-    }
-    const r = compareComparableValues(s1.escapedName, s2.escapedName);
-    if (r !== 0) return r;
-    return getSymbolId(s1) - getSymbolId(s2);
-  }
-  function compareNodes(n1, n2) {
-    if (n1 === n2) return 0;
-    if (n1 === void 0) return 1;
-    if (n2 === void 0) return -1;
-    const f1 = fileIndexMap.get(getSourceFileOfNode(n1));
-    const f2 = fileIndexMap.get(getSourceFileOfNode(n2));
-    if (f1 !== f2) {
-      return f1 - f2;
-    }
-    return n1.pos - n2.pos;
-  }
 }
 function isNotAccessor(declaration) {
   return !isAccessor(declaration);
@@ -132244,12 +132245,7 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
       return withNewScope(context, node, () => serializeTypeAnnotationOfDeclaration(accessorType, context, node, symbol) ?? inferTypeOfDeclaration(node, symbol, context));
     }
     if (accessorDeclarations.getAccessor) {
-      return withNewScope(context, accessorDeclarations.getAccessor, () => createReturnFromSignature(
-        accessorDeclarations.getAccessor,
-        /*symbol*/
-        void 0,
-        context
-      ));
+      return withNewScope(context, accessorDeclarations.getAccessor, () => createReturnFromSignature(accessorDeclarations.getAccessor, symbol, context));
     }
     return void 0;
   }
@@ -132359,14 +132355,14 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
     }
     return resolver.serializeTypeOfExpression(context, node) ?? factory.createKeywordTypeNode(133 /* AnyKeyword */);
   }
-  function inferReturnTypeOfSignatureSignature(node, context, reportFallback) {
+  function inferReturnTypeOfSignatureSignature(node, context, symbol, reportFallback) {
     if (reportFallback) {
       context.tracker.reportInferenceFallback(node);
     }
     if (context.noInferenceFallback === true) {
       return factory.createKeywordTypeNode(133 /* AnyKeyword */);
     }
-    return resolver.serializeReturnTypeForSignature(context, node) ?? factory.createKeywordTypeNode(133 /* AnyKeyword */);
+    return resolver.serializeReturnTypeForSignature(context, node, symbol) ?? factory.createKeywordTypeNode(133 /* AnyKeyword */);
   }
   function inferAccessorType(node, allAccessors, context, symbol, reportFallback = true) {
     if (node.kind === 177 /* GetAccessor */) {
@@ -132801,7 +132797,7 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
     } else if (isValueSignatureDeclaration(fn)) {
       returnType = typeFromSingleReturnExpression(fn, context);
     }
-    return returnType.type !== void 0 ? returnType.type : inferReturnTypeOfSignatureSignature(fn, context, reportFallback && returnType.reportFallback && !returnTypeNode);
+    return returnType.type !== void 0 ? returnType.type : inferReturnTypeOfSignatureSignature(fn, context, symbol, reportFallback && returnType.reportFallback && !returnTypeNode);
   }
   function typeFromSingleReturnExpression(declaration, context) {
     let candidateExpr;

package/lib/typescript.js

@@ -298,7 +298,6 @@ __export(typescript_exports, {
   commonOptionsWithBuild: () => commonOptionsWithBuild,
   compact: () => compact,
   compareBooleans: () => compareBooleans,
-  compareComparableValues: () => compareComparableValues,
   compareDataObjects: () => compareDataObjects,
   compareDiagnostics: () => compareDiagnostics,
   compareEmitHelpers: () => compareEmitHelpers,
@@ -2271,6 +2270,7 @@ __export(typescript_exports, {
   visitNode: () => visitNode,
   visitNodes: () => visitNodes2,
   visitParameterList: () => visitParameterList,
+  voidMap: () => voidMap,
   walkUpBindingElementsAndPatterns: () => walkUpBindingElementsAndPatterns,
   walkUpOuterExpressions: () => walkUpOuterExpressions,
   walkUpParenthesizedExpressions: () => walkUpParenthesizedExpressions,
@@ -2286,7 +2286,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.9";
-var version = `${versionMajorMinor}.0-insiders.20250314`;
+var version = `${versionMajorMinor}.0-insiders.20250401`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -2297,6 +2297,10 @@ var Comparison = /* @__PURE__ */ ((Comparison3) => {
 // src/compiler/core.ts
 var emptyArray = [];
 var emptyMap = /* @__PURE__ */ new Map();
+var voidMap = /* @__PURE__ */ new Map();
+voidMap.set = function() {
+  return this;
+};
 function length(array) {
   return array !== void 0 ? array.length : 0;
 }
@@ -49413,6 +49417,8 @@ function getContainerFlags(node) {
     case 185 /* ConstructorType */:
     case 175 /* ClassStaticBlockDeclaration */:
       return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */;
+    case 351 /* JSDocImportTag */:
+      return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */;
     case 218 /* FunctionExpression */:
     case 219 /* ArrowFunction */:
       return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 16 /* IsFunctionExpression */;
@@ -50774,7 +50780,6 @@ function createTypeChecker(host) {
   };
   var cancellationToken;
   var scanner2;
-  var fileIndexMap = new Map(host.getSourceFiles().map((file, i) => [file, i]));
   var Symbol48 = objectAllocator.getSymbolConstructor();
   var Type29 = objectAllocator.getTypeConstructor();
   var Signature13 = objectAllocator.getSignatureConstructor();
@@ -51428,6 +51433,7 @@ function createTypeChecker(host) {
   var templateConstraintType = getUnionType([stringType, numberType, booleanType, bigintType, nullType, undefinedType]);
   var numericStringType = getTemplateLiteralType(["", ""], [numberType]);
   var restrictiveMapper = makeFunctionTypeMapper((t) => t.flags & 262144 /* TypeParameter */ ? getRestrictiveTypeParameter(t) : t, () => "(restrictive mapper)");
+  restrictiveMapper.instantiations = voidMap;
   var permissiveMapper = makeFunctionTypeMapper((t) => t.flags & 262144 /* TypeParameter */ ? wildcardType : t, () => "(permissive mapper)");
   var uniqueLiteralType = createIntrinsicType(
     131072 /* Never */,
@@ -51447,6 +51453,7 @@ function createTypeChecker(host) {
     }
     return t;
   }, () => "(unmeasurable reporter)");
+  reportUnreliableMapper.instantiations = voidMap;
   var reportUnmeasurableMapper = makeFunctionTypeMapper((t) => {
     if (outofbandVarianceMarkerHandler && (t === markerSuperType || t === markerSubType || t === markerOtherType)) {
       outofbandVarianceMarkerHandler(
@@ -51456,6 +51463,7 @@ function createTypeChecker(host) {
     }
     return t;
   }, () => "(unreliable reporter)");
+  reportUnmeasurableMapper.instantiations = voidMap;
   var emptyObjectType = createAnonymousType(
     /*symbol*/
     void 0,
@@ -54413,7 +54421,6 @@ function createTypeChecker(host) {
         (result || (result = [])).push(symbol);
       }
     });
-    result == null ? void 0 : result.sort(compareSymbols);
     return result || emptyArray;
   }
   function isNamedMember(member, escapedName) {
@@ -55019,10 +55026,11 @@ function createTypeChecker(host) {
       serializeExistingTypeNode(context, typeNode, addUndefined) {
         return serializeExistingTypeNode(context, typeNode, !!addUndefined);
       },
-      serializeReturnTypeForSignature(syntacticContext, signatureDeclaration) {
+      serializeReturnTypeForSignature(syntacticContext, signatureDeclaration, symbol) {
         const context = syntacticContext;
         const signature = getSignatureFromDeclaration(signatureDeclaration);
-        const returnType = context.enclosingSymbolTypes.get(getSymbolId(getSymbolOfDeclaration(signatureDeclaration))) ?? instantiateType(getReturnTypeOfSignature(signature), context.mapper);
+        symbol ?? (symbol = getSymbolOfDeclaration(signatureDeclaration));
+        const returnType = context.enclosingSymbolTypes.get(getSymbolId(symbol)) ?? instantiateType(getReturnTypeOfSignature(signature), context.mapper);
         return serializeInferredReturnTypeForSignature(context, signature, returnType);
       },
       serializeTypeOfExpression(syntacticContext, expr) {
@@ -55036,7 +55044,7 @@ function createTypeChecker(host) {
         symbol ?? (symbol = getSymbolOfDeclaration(declaration));
         let type = (_a = context.enclosingSymbolTypes) == null ? void 0 : _a.get(getSymbolId(symbol));
         if (type === void 0) {
-          type = symbol && !(symbol.flags & (2048 /* TypeLiteral */ | 131072 /* Signature */)) ? instantiateType(getWidenedLiteralType(getTypeOfSymbol(symbol)), context.mapper) : errorType;
+          type = symbol.flags & 98304 /* Accessor */ && declaration.kind === 178 /* SetAccessor */ ? instantiateType(getWriteTypeOfSymbol(symbol), context.mapper) : symbol && !(symbol.flags & (2048 /* TypeLiteral */ | 131072 /* Signature */)) ? instantiateType(getWidenedLiteralType(getTypeOfSymbol(symbol)), context.mapper) : errorType;
         }
         const addUndefinedForParameter = declaration && (isParameter(declaration) || isJSDocParameterTag(declaration)) && requiresAddingImplicitUndefined(declaration, context.enclosingDeclaration);
         if (addUndefinedForParameter) {
@@ -56185,12 +56193,13 @@ function createTypeChecker(host) {
       if (propertySymbol.flags & 98304 /* Accessor */) {
         const writeType = getWriteTypeOfSymbol(propertySymbol);
         if (propertyType !== writeType && !isErrorType(propertyType) && !isErrorType(writeType)) {
+          const symbolMapper = getSymbolLinks(propertySymbol).mapper;
           const getterDeclaration = getDeclarationOfKind(propertySymbol, 177 /* GetAccessor */);
           const getterSignature = getSignatureFromDeclaration(getterDeclaration);
           typeElements.push(
             setCommentRange2(
               context,
-              signatureToSignatureDeclarationHelper(getterSignature, 177 /* GetAccessor */, context, { name: propertyName }),
+              signatureToSignatureDeclarationHelper(symbolMapper ? instantiateSignature(getterSignature, symbolMapper) : getterSignature, 177 /* GetAccessor */, context, { name: propertyName }),
               getterDeclaration
             )
           );
@@ -56199,7 +56208,7 @@ function createTypeChecker(host) {
           typeElements.push(
             setCommentRange2(
               context,
-              signatureToSignatureDeclarationHelper(setterSignature, 178 /* SetAccessor */, context, { name: propertyName }),
+              signatureToSignatureDeclarationHelper(symbolMapper ? instantiateSignature(setterSignature, symbolMapper) : setterSignature, 178 /* SetAccessor */, context, { name: propertyName }),
               setterDeclaration
             )
           );
@@ -57342,13 +57351,13 @@ function createTypeChecker(host) {
       const addUndefinedForParameter = declaration && (isParameter(declaration) || isJSDocParameterTag(declaration)) && requiresAddingImplicitUndefined(declaration, context.enclosingDeclaration);
       const decl = declaration ?? symbol.valueDeclaration ?? getDeclarationWithTypeAnnotation(symbol) ?? ((_a = symbol.declarations) == null ? void 0 : _a[0]);
       if (decl) {
+        const restore = addSymbolTypeToContext(context, symbol, type);
         if (isAccessor(decl)) {
           result = syntacticNodeBuilder.serializeTypeOfAccessor(decl, symbol, context);
         } else if (hasInferredType(decl) && !nodeIsSynthesized(decl) && !(getObjectFlags(type) & 196608 /* RequiresWidening */)) {
-          const restore = addSymbolTypeToContext(context, symbol, type);
           result = syntacticNodeBuilder.serializeTypeOfDeclaration(decl, symbol, context);
-          restore();
         }
+        restore();
       }
       if (!result) {
         if (addUndefinedForParameter) {
@@ -66300,7 +66309,7 @@ function createTypeChecker(host) {
           context.nonFixingMapper = combineTypeMappers(context.nonFixingMapper, mapper);
         }
         if (!checkTypeDeferred) {
-          inferTypes(context.inferences, checkType, extendsType, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
+          inferTypes(context, context.inferences, checkType, extendsType, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
         }
         combinedMapper = mapper ? combineTypeMappers(context.mapper, mapper) : context.mapper;
       }
@@ -67309,7 +67318,7 @@ function createTypeChecker(host) {
     ) : type;
   }
   function instantiateTypeWithAlias(type, mapper, aliasSymbol, aliasTypeArguments) {
-    var _a;
+    var _a, _b;
     if (!couldContainTypeVariables(type)) {
       return type;
     }
@@ -67318,10 +67327,16 @@ function createTypeChecker(host) {
       error2(currentNode, Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
       return errorType;
     }
+    const key = type.id + getAliasId(aliasSymbol, aliasTypeArguments);
+    const cached = (mapper.instantiations ?? (mapper.instantiations = /* @__PURE__ */ new Map())).get(key);
+    if (cached) {
+      return cached;
+    }
     totalInstantiationCount++;
     instantiationCount++;
     instantiationDepth++;
     const result = instantiateTypeWorker(type, mapper, aliasSymbol, aliasTypeArguments);
+    (_b = mapper.instantiations) == null ? void 0 : _b.set(key, result);
     instantiationDepth--;
     return result;
   }
@@ -69944,7 +69959,7 @@ function createTypeChecker(host) {
               0 /* None */,
               isRelatedToWorker
             );
-            inferTypes(ctx.inferences, target2.extendsType, sourceExtends, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
+            inferTypes(ctx, ctx.inferences, target2.extendsType, sourceExtends, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
             sourceExtends = instantiateType(sourceExtends, ctx.mapper);
             mapper = ctx.mapper;
           }
@@ -71824,7 +71839,7 @@ function createTypeChecker(host) {
       map(context.inferences, (inference, i) => () => {
         if (!inference.isFixed) {
           inferFromIntraExpressionSites(context);
-          clearCachedInferences(context.inferences);
+          clearCachedInferences(context, context.inferences);
           inference.isFixed = true;
         }
         return getInferredType(context, i);
@@ -71839,7 +71854,10 @@ function createTypeChecker(host) {
       })
     );
   }
-  function clearCachedInferences(inferences) {
+  function clearCachedInferences(context, inferences) {
+    if (context) {
+      context.nonFixingMapper.instantiations = void 0;
+    }
     for (const inference of inferences) {
       if (!inference.isFixed) {
         inference.inferredType = void 0;
@@ -71854,7 +71872,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.inferences, type, contextualType);
+          inferTypes(context, context.inferences, type, contextualType);
         }
       }
       context.intraExpressionInferenceSites = void 0;
@@ -71998,7 +72016,13 @@ function createTypeChecker(host) {
     const typeParameter = getIndexedAccessType(constraint.type, getTypeParameterFromMappedType(target));
     const templateType = getTemplateTypeFromMappedType(target);
     const inference = createInferenceInfo(typeParameter);
-    inferTypes([inference], sourceType, templateType);
+    inferTypes(
+      /*context*/
+      void 0,
+      [inference],
+      sourceType,
+      templateType
+    );
     return getTypeFromInference(inference) || unknownType;
   }
   function inferReverseMappedType(source, target, constraint) {
@@ -72200,7 +72224,7 @@ function createTypeChecker(host) {
   function isTupleOfSelf(typeParameter, type) {
     return isTupleType(type) && getTupleElementType(type, 0) === getIndexedAccessType(typeParameter, getNumberLiteralType(0)) && !getTypeOfPropertyOfType(type, "1");
   }
-  function inferTypes(inferences, originalSource, originalTarget, priority = 0 /* None */, contravariant = false) {
+  function inferTypes(context, inferences, originalSource, originalTarget, priority = 0 /* None */, contravariant = false) {
     let bivariant = false;
     let propagationType;
     let inferencePriority = 2048 /* MaxValue */;
@@ -72291,16 +72315,16 @@ function createTypeChecker(host) {
               if (contravariant && !bivariant) {
                 if (!contains(inference.contraCandidates, candidate)) {
                   inference.contraCandidates = append(inference.contraCandidates, candidate);
-                  clearCachedInferences(inferences);
+                  clearCachedInferences(context, inferences);
                 }
               } else if (!contains(inference.candidates, candidate)) {
                 inference.candidates = append(inference.candidates, candidate);
-                clearCachedInferences(inferences);
+                clearCachedInferences(context, inferences);
               }
             }
             if (!(priority & 128 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && inference.topLevel && !isTypeParameterAtTopLevel(originalTarget, target)) {
               inference.topLevel = false;
-              clearCachedInferences(inferences);
+              clearCachedInferences(context, inferences);
             }
           }
           inferencePriority = Math.min(inferencePriority, priority);
@@ -72866,6 +72890,7 @@ 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;
+          context.nonFixingMapper.instantiations = void 0;
         }
       }
     }
@@ -78993,7 +79018,7 @@ function createTypeChecker(host) {
     addErrorOrSuggestion(!isUncheckedJS || errorInfo.code !== Diagnostics.Property_0_may_not_exist_on_type_1_Did_you_mean_2.code, resultDiagnostic);
   }
   function containerSeemsToBeEmptyDomElement(containingType) {
-    return compilerOptions.lib && !compilerOptions.lib.includes("dom") && everyContainedType(containingType, (type) => type.symbol && /^(?:EventTarget|Node|(?:HTML[a-zA-Z]*)?Element)$/.test(unescapeLeadingUnderscores(type.symbol.escapedName))) && isEmptyObjectType(containingType);
+    return compilerOptions.lib && !compilerOptions.lib.includes("lib.dom.d.ts") && everyContainedType(containingType, (type) => type.symbol && /^(?:EventTarget|Node|(?:HTML[a-zA-Z]*)?Element)$/.test(unescapeLeadingUnderscores(type.symbol.escapedName))) && isEmptyObjectType(containingType);
   }
   function typeHasStaticProperty(propName, containingType) {
     const prop = containingType.symbol && getPropertyOfType(getTypeOfSymbol(containingType.symbol), propName);
@@ -79048,13 +79073,15 @@ function createTypeChecker(host) {
   function getSuggestionForSymbolNameLookup(symbols, name, meaning) {
     const symbol = getSymbol2(symbols, name, meaning);
     if (symbol) return symbol;
-    let candidates = arrayFrom(symbols.values()).sort(compareSymbols);
+    let candidates;
     if (symbols === globals) {
       const primitives = mapDefined(
         ["string", "number", "boolean", "object", "bigint", "symbol"],
         (s) => symbols.has(s.charAt(0).toUpperCase() + s.slice(1)) ? createSymbol(524288 /* TypeAlias */, s) : void 0
       );
-      candidates = concatenate(candidates, primitives);
+      candidates = primitives.concat(arrayFrom(symbols.values()));
+    } else {
+      candidates = arrayFrom(symbols.values());
     }
     return getSpellingSuggestionForName(unescapeLeadingUnderscores(name), candidates, meaning);
   }
@@ -79074,7 +79101,7 @@ function createTypeChecker(host) {
     return result;
   }
   function getSuggestedSymbolForNonexistentModule(name, targetModule) {
-    return targetModule.exports && getSpellingSuggestionForName(idText(name), getExportsOfModuleAsArray(targetModule).sort(compareSymbols), 2623475 /* ModuleMember */);
+    return targetModule.exports && getSpellingSuggestionForName(idText(name), getExportsOfModuleAsArray(targetModule), 2623475 /* ModuleMember */);
   }
   function getSuggestionForNonexistentIndexSignature(objectType, expr, keyedType) {
     function hasProp(name) {
@@ -79438,11 +79465,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.inferences, source, target);
+      inferTypes(context, context.inferences, source, target);
     });
     if (!inferenceContext) {
       applyToReturnTypes(contextualSignature, signature, (source, target) => {
-        inferTypes(context.inferences, source, target, 128 /* ReturnType */);
+        inferTypes(context, context.inferences, source, target, 128 /* ReturnType */);
       });
     }
     return getSignatureInstantiation(signature, getInferredTypes(context), isInJSFile(contextualSignature.declaration));
@@ -79450,7 +79477,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.inferences, checkAttrType, paramType);
+    inferTypes(context, context.inferences, checkAttrType, paramType);
     return getInferredTypes(context);
   }
   function getThisArgumentType(thisArgumentNode) {
@@ -79477,11 +79504,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.inferences, inferenceSourceType, inferenceTargetType, 128 /* ReturnType */);
+            inferTypes(context, context.inferences, inferenceSourceType, inferenceTargetType, 128 /* ReturnType */);
           }
           const returnContext = createInferenceContext(signature.typeParameters, signature, context.flags);
           const returnSourceType = instantiateType(contextualType, outerContext && outerContext.returnMapper);
-          inferTypes(returnContext.inferences, returnSourceType, inferenceTargetType);
+          inferTypes(returnContext, returnContext.inferences, returnSourceType, inferenceTargetType);
           context.returnMapper = some(returnContext.inferences, hasInferenceCandidates) ? getMapperFromContext(cloneInferredPartOfContext(returnContext)) : void 0;
         }
       }
@@ -79497,7 +79524,7 @@ function createTypeChecker(host) {
     const thisType = getThisTypeOfSignature(signature);
     if (thisType && couldContainTypeVariables(thisType)) {
       const thisArgumentNode = getThisArgumentOfCall(node);
-      inferTypes(context.inferences, getThisArgumentType(thisArgumentNode), thisType);
+      inferTypes(context, context.inferences, getThisArgumentType(thisArgumentNode), thisType);
     }
     for (let i = 0; i < argCount; i++) {
       const arg = args[i];
@@ -79505,13 +79532,13 @@ function createTypeChecker(host) {
         const paramType = getTypeAtPosition(signature, i);
         if (couldContainTypeVariables(paramType)) {
           const argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
-          inferTypes(context.inferences, argType, paramType);
+          inferTypes(context, context.inferences, argType, paramType);
         }
       }
     }
     if (restType && couldContainTypeVariables(restType)) {
       const spreadType = getSpreadArgumentType(args, argCount, args.length, restType, context, checkMode);
-      inferTypes(context.inferences, spreadType, restType);
+      inferTypes(context, context.inferences, spreadType, restType);
     }
     return getInferredTypes(context);
   }
@@ -81394,8 +81421,8 @@ function createTypeChecker(host) {
         grammarErrorOnNode(node, Diagnostics.This_syntax_is_reserved_in_files_with_the_mts_or_cts_extension_Use_an_as_expression_instead);
       }
       if (compilerOptions.erasableSyntaxOnly) {
-        const start = node.type.pos - "<".length;
-        const end = skipTrivia(file.text, node.type.end) + ">".length;
+        const start = skipTrivia(file.text, node.pos);
+        const end = node.expression.pos;
         diagnostics.add(createFileDiagnostic(file, start, end - start, Diagnostics.This_syntax_is_not_allowed_when_erasableSyntaxOnly_is_enabled));
       }
     }
@@ -81884,14 +81911,14 @@ function createTypeChecker(host) {
           isOptionalDeclaration(declaration)
         );
         const target = getTypeAtPosition(context, i);
-        inferTypes(inferenceContext.inferences, source, target);
+        inferTypes(inferenceContext, inferenceContext.inferences, source, target);
       }
     }
     const typeNode = signature.declaration && getEffectiveReturnTypeNode(signature.declaration);
     if (typeNode) {
       const source = getTypeFromTypeNode(typeNode);
       const target = getReturnTypeOfSignature(context);
-      inferTypes(inferenceContext.inferences, source, target);
+      inferTypes(inferenceContext, inferenceContext.inferences, source, target);
     }
   }
   function assignContextualParameterTypes(signature, context) {
@@ -84307,6 +84334,7 @@ function createTypeChecker(host) {
               const inferences = map(context.inferences, (info) => createInferenceInfo(info.typeParameter));
               applyToParameterTypes(instantiatedSignature, contextualSignature, (source, target) => {
                 inferTypes(
+                  context,
                   inferences,
                   source,
                   target,
@@ -84318,7 +84346,7 @@ function createTypeChecker(host) {
               });
               if (some(inferences, hasInferenceCandidates)) {
                 applyToReturnTypes(instantiatedSignature, contextualSignature, (source, target) => {
-                  inferTypes(inferences, source, target);
+                  inferTypes(context, inferences, source, target);
                 });
                 if (!hasOverlappingInferences(context.inferences, inferences)) {
                   mergeInferences(context.inferences, inferences);
@@ -93887,33 +93915,6 @@ function createTypeChecker(host) {
     Debug.assert(specifier && nodeIsSynthesized(specifier) && specifier.text === "tslib", `Expected sourceFile.imports[0] to be the synthesized tslib import`);
     return specifier;
   }
-  function compareSymbols(s1, s2) {
-    if (s1 === s2) return 0;
-    if (s1 === void 0) return 1;
-    if (s2 === void 0) return -1;
-    if (length(s1.declarations) !== 0 && length(s2.declarations) !== 0) {
-      const r2 = compareNodes(s1.declarations[0], s2.declarations[0]);
-      if (r2 !== 0) return r2;
-    } else if (length(s1.declarations) !== 0) {
-      return -1;
-    } else if (length(s2.declarations) !== 0) {
-      return 1;
-    }
-    const r = compareComparableValues(s1.escapedName, s2.escapedName);
-    if (r !== 0) return r;
-    return getSymbolId(s1) - getSymbolId(s2);
-  }
-  function compareNodes(n1, n2) {
-    if (n1 === n2) return 0;
-    if (n1 === void 0) return 1;
-    if (n2 === void 0) return -1;
-    const f1 = fileIndexMap.get(getSourceFileOfNode(n1));
-    const f2 = fileIndexMap.get(getSourceFileOfNode(n2));
-    if (f1 !== f2) {
-      return f1 - f2;
-    }
-    return n1.pos - n2.pos;
-  }
 }
 function isNotAccessor(declaration) {
   return !isAccessor(declaration);
@@ -137212,12 +137213,7 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
       return withNewScope(context, node, () => serializeTypeAnnotationOfDeclaration(accessorType, context, node, symbol) ?? inferTypeOfDeclaration(node, symbol, context));
     }
     if (accessorDeclarations.getAccessor) {
-      return withNewScope(context, accessorDeclarations.getAccessor, () => createReturnFromSignature(
-        accessorDeclarations.getAccessor,
-        /*symbol*/
-        void 0,
-        context
-      ));
+      return withNewScope(context, accessorDeclarations.getAccessor, () => createReturnFromSignature(accessorDeclarations.getAccessor, symbol, context));
     }
     return void 0;
   }
@@ -137327,14 +137323,14 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
     }
     return resolver.serializeTypeOfExpression(context, node) ?? factory.createKeywordTypeNode(133 /* AnyKeyword */);
   }
-  function inferReturnTypeOfSignatureSignature(node, context, reportFallback) {
+  function inferReturnTypeOfSignatureSignature(node, context, symbol, reportFallback) {
     if (reportFallback) {
       context.tracker.reportInferenceFallback(node);
     }
     if (context.noInferenceFallback === true) {
       return factory.createKeywordTypeNode(133 /* AnyKeyword */);
     }
-    return resolver.serializeReturnTypeForSignature(context, node) ?? factory.createKeywordTypeNode(133 /* AnyKeyword */);
+    return resolver.serializeReturnTypeForSignature(context, node, symbol) ?? factory.createKeywordTypeNode(133 /* AnyKeyword */);
   }
   function inferAccessorType(node, allAccessors, context, symbol, reportFallback = true) {
     if (node.kind === 177 /* GetAccessor */) {
@@ -137769,7 +137765,7 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
     } else if (isValueSignatureDeclaration(fn)) {
       returnType = typeFromSingleReturnExpression(fn, context);
     }
-    return returnType.type !== void 0 ? returnType.type : inferReturnTypeOfSignatureSignature(fn, context, reportFallback && returnType.reportFallback && !returnTypeNode);
+    return returnType.type !== void 0 ? returnType.type : inferReturnTypeOfSignatureSignature(fn, context, symbol, reportFallback && returnType.reportFallback && !returnTypeNode);
   }
   function typeFromSingleReturnExpression(declaration, context) {
     let candidateExpr;
@@ -177413,7 +177409,10 @@ function getSymbolDisplayPartsDocumentationAndSymbolKindWorker(typeChecker, symb
   }
   if (symbolKind !== "" /* unknown */ || symbolFlags & 32 /* Class */ || symbolFlags & 2097152 /* Alias */) {
     if (symbolKind === "getter" /* memberGetAccessorElement */ || symbolKind === "setter" /* memberSetAccessorElement */) {
-      const declaration = find(symbol.declarations, (declaration2) => declaration2.name === location);
+      const declaration = find(
+        symbol.declarations,
+        (declaration2) => declaration2.name === location && declaration2.kind !== 211 /* PropertyAccessExpression */
+      );
       if (declaration) {
         switch (declaration.kind) {
           case 177 /* GetAccessor */:
@@ -182456,7 +182455,6 @@ __export(ts_exports2, {
   commonOptionsWithBuild: () => commonOptionsWithBuild,
   compact: () => compact,
   compareBooleans: () => compareBooleans,
-  compareComparableValues: () => compareComparableValues,
   compareDataObjects: () => compareDataObjects,
   compareDiagnostics: () => compareDiagnostics,
   compareEmitHelpers: () => compareEmitHelpers,
@@ -184429,6 +184427,7 @@ __export(ts_exports2, {
   visitNode: () => visitNode,
   visitNodes: () => visitNodes2,
   visitParameterList: () => visitParameterList,
+  voidMap: () => voidMap,
   walkUpBindingElementsAndPatterns: () => walkUpBindingElementsAndPatterns,
   walkUpOuterExpressions: () => walkUpOuterExpressions,
   walkUpParenthesizedExpressions: () => walkUpParenthesizedExpressions,
@@ -197210,7 +197209,6 @@ if (typeof console !== "undefined") {
   commonOptionsWithBuild,
   compact,
   compareBooleans,
-  compareComparableValues,
   compareDataObjects,
   compareDiagnostics,
   compareEmitHelpers,
@@ -199183,6 +199181,7 @@ if (typeof console !== "undefined") {
   visitNode,
   visitNodes,
   visitParameterList,
+  voidMap,
   walkUpBindingElementsAndPatterns,
   walkUpOuterExpressions,
   walkUpParenthesizedExpressions,

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-61420-2",
+  "version": "5.9.0-pr-61505-16",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [