typescript 5.8.1-rc → 5.8.3

package/lib/_tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.8";
-var version = "5.8.1-rc";
+var version = "5.8.3";
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -50405,10 +50405,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) {
@@ -50422,7 +50423,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) {
@@ -50482,6 +50483,7 @@ function createTypeChecker(host) {
         const context = syntacticContext;
         if (context.bundled || context.enclosingFile !== getSourceFileOfNode(lit)) {
           let name = lit.text;
+          const originalName = name;
           const nodeSymbol = getNodeLinks(parent).resolvedSymbol;
           const meaning = parent.isTypeOf ? 111551 /* Value */ : 788968 /* Type */;
           const parentSymbol = nodeSymbol && isSymbolAccessible(
@@ -50511,7 +50513,9 @@ function createTypeChecker(host) {
               context.tracker.reportLikelyUnsafeImportRequiredError(name);
             }
           }
-          return name;
+          if (name !== originalName) {
+            return name;
+          }
         }
       },
       canReuseTypeNode(context, typeNode) {
@@ -51568,12 +51572,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
             )
           );
@@ -51582,7 +51587,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
             )
           );
@@ -52725,13 +52730,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) {
@@ -52885,10 +52890,7 @@ function createTypeChecker(host) {
           /*context*/
           void 0
         );
-        if (updated !== node2) {
-          setTextRange2(context, updated, node2);
-        }
-        return updated;
+        return setTextRange2(context, updated, node2);
       }
     }
     function serializeTypeName(context, node, isTypeOf, typeArguments) {
@@ -76781,6 +76783,11 @@ function createTypeChecker(host) {
       if (file && fileExtensionIsOneOf(file.fileName, [".cts" /* Cts */, ".mts" /* Mts */])) {
         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 = 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));
+      }
     }
     return checkAssertionWorker(node, checkMode);
   }
@@ -85063,11 +85070,10 @@ function createTypeChecker(host) {
       return;
     }
     checkGrammarModifiers(node);
-    const isImportEquals = isInternalModuleImportEqualsDeclaration(node);
-    if (compilerOptions.erasableSyntaxOnly && isImportEquals && !(node.flags & 33554432 /* Ambient */)) {
+    if (compilerOptions.erasableSyntaxOnly && !(node.flags & 33554432 /* Ambient */)) {
       error(node, Diagnostics.This_syntax_is_not_allowed_when_erasableSyntaxOnly_is_enabled);
     }
-    if (isImportEquals || checkExternalImportOrExportDeclaration(node)) {
+    if (isInternalModuleImportEqualsDeclaration(node) || checkExternalImportOrExportDeclaration(node)) {
       checkImportBinding(node);
       markLinkedReferences(node, 6 /* ExportImportEquals */);
       if (node.moduleReference.kind !== 283 /* ExternalModuleReference */) {
@@ -85187,6 +85193,9 @@ function createTypeChecker(host) {
     if (checkGrammarModuleElementContext(node, illegalContextMessage)) {
       return;
     }
+    if (compilerOptions.erasableSyntaxOnly && node.isExportEquals && !(node.flags & 33554432 /* Ambient */)) {
+      error(node, Diagnostics.This_syntax_is_not_allowed_when_erasableSyntaxOnly_is_enabled);
+    }
     const container = node.parent.kind === 307 /* SourceFile */ ? node.parent : node.parent.parent;
     if (container.kind === 267 /* ModuleDeclaration */ && !isAmbientModule(container)) {
       if (node.isExportEquals) {
@@ -131860,9 +131869,11 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
         if (!resolver.canReuseTypeNode(context, node)) {
           return resolver.serializeExistingTypeNode(context, node);
         }
+        const specifier = rewriteModuleSpecifier2(node, node.argument.literal);
+        const literal = specifier === node.argument.literal ? reuseNode(context, node.argument.literal) : specifier;
         return factory.updateImportTypeNode(
           node,
-          factory.updateLiteralTypeNode(node.argument, rewriteModuleSpecifier2(node, node.argument.literal)),
+          literal === node.argument.literal ? reuseNode(context, node.argument) : factory.createLiteralTypeNode(literal),
           visitNode(node.attributes, visitExistingNodeTreeSymbols, isImportAttributes),
           visitNode(node.qualifier, visitExistingNodeTreeSymbols, isEntityName),
           visitNodes2(node.typeArguments, visitExistingNodeTreeSymbols, isTypeNode),
@@ -132017,10 +132028,7 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
       }
       function rewriteModuleSpecifier2(parent, lit) {
         const newName = resolver.getModuleSpecifierOverride(context, parent, lit);
-        if (newName) {
-          return setOriginalNode(factory.createStringLiteral(newName), lit);
-        }
-        return visitNode(lit, visitExistingNodeTreeSymbols, isStringLiteral);
+        return newName ? setOriginalNode(factory.createStringLiteral(newName), lit) : lit;
       }
     }
   }
@@ -132187,12 +132195,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;
   }
@@ -132302,14 +132305,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 */) {
@@ -132599,18 +132602,17 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
     );
   }
   function reuseTypeParameters(typeParameters, context) {
-    return typeParameters == null ? void 0 : typeParameters.map(
-      (tp) => {
-        var _a;
-        return factory.updateTypeParameterDeclaration(
-          tp,
-          (_a = tp.modifiers) == null ? void 0 : _a.map((m) => reuseNode(context, m)),
-          reuseNode(context, tp.name),
-          serializeExistingTypeNodeWithFallback(tp.constraint, context),
-          serializeExistingTypeNodeWithFallback(tp.default, context)
-        );
-      }
-    );
+    return typeParameters == null ? void 0 : typeParameters.map((tp) => {
+      var _a;
+      const { node: tpName } = resolver.trackExistingEntityName(context, tp.name);
+      return factory.updateTypeParameterDeclaration(
+        tp,
+        (_a = tp.modifiers) == null ? void 0 : _a.map((m) => reuseNode(context, m)),
+        tpName,
+        serializeExistingTypeNodeWithFallback(tp.constraint, context),
+        serializeExistingTypeNodeWithFallback(tp.default, context)
+      );
+    });
   }
   function typeFromObjectLiteralMethod(method, name, context, isConstContext) {
     const returnType = createReturnFromSignature(
@@ -132745,7 +132747,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

@@ -2285,7 +2285,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.8";
-var version = "5.8.1-rc";
+var version = "5.8.3";
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -55015,10 +55015,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) {
@@ -55032,7 +55033,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) {
@@ -55092,6 +55093,7 @@ function createTypeChecker(host) {
         const context = syntacticContext;
         if (context.bundled || context.enclosingFile !== getSourceFileOfNode(lit)) {
           let name = lit.text;
+          const originalName = name;
           const nodeSymbol = getNodeLinks(parent2).resolvedSymbol;
           const meaning = parent2.isTypeOf ? 111551 /* Value */ : 788968 /* Type */;
           const parentSymbol = nodeSymbol && isSymbolAccessible(
@@ -55121,7 +55123,9 @@ function createTypeChecker(host) {
               context.tracker.reportLikelyUnsafeImportRequiredError(name);
             }
           }
-          return name;
+          if (name !== originalName) {
+            return name;
+          }
         }
       },
       canReuseTypeNode(context, typeNode) {
@@ -56178,12 +56182,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
             )
           );
@@ -56192,7 +56197,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
             )
           );
@@ -57335,13 +57340,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) {
@@ -57495,10 +57500,7 @@ function createTypeChecker(host) {
           /*context*/
           void 0
         );
-        if (updated !== node2) {
-          setTextRange2(context, updated, node2);
-        }
-        return updated;
+        return setTextRange2(context, updated, node2);
       }
     }
     function serializeTypeName(context, node, isTypeOf, typeArguments) {
@@ -81391,6 +81393,11 @@ function createTypeChecker(host) {
       if (file && fileExtensionIsOneOf(file.fileName, [".cts" /* Cts */, ".mts" /* Mts */])) {
         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 = 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));
+      }
     }
     return checkAssertionWorker(node, checkMode);
   }
@@ -89673,11 +89680,10 @@ function createTypeChecker(host) {
       return;
     }
     checkGrammarModifiers(node);
-    const isImportEquals = isInternalModuleImportEqualsDeclaration(node);
-    if (compilerOptions.erasableSyntaxOnly && isImportEquals && !(node.flags & 33554432 /* Ambient */)) {
+    if (compilerOptions.erasableSyntaxOnly && !(node.flags & 33554432 /* Ambient */)) {
       error2(node, Diagnostics.This_syntax_is_not_allowed_when_erasableSyntaxOnly_is_enabled);
     }
-    if (isImportEquals || checkExternalImportOrExportDeclaration(node)) {
+    if (isInternalModuleImportEqualsDeclaration(node) || checkExternalImportOrExportDeclaration(node)) {
       checkImportBinding(node);
       markLinkedReferences(node, 6 /* ExportImportEquals */);
       if (node.moduleReference.kind !== 283 /* ExternalModuleReference */) {
@@ -89797,6 +89803,9 @@ function createTypeChecker(host) {
     if (checkGrammarModuleElementContext(node, illegalContextMessage)) {
       return;
     }
+    if (compilerOptions.erasableSyntaxOnly && node.isExportEquals && !(node.flags & 33554432 /* Ambient */)) {
+      error2(node, Diagnostics.This_syntax_is_not_allowed_when_erasableSyntaxOnly_is_enabled);
+    }
     const container = node.parent.kind === 307 /* SourceFile */ ? node.parent : node.parent.parent;
     if (container.kind === 267 /* ModuleDeclaration */ && !isAmbientModule(container)) {
       if (node.isExportEquals) {
@@ -136827,9 +136836,11 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
         if (!resolver.canReuseTypeNode(context, node)) {
           return resolver.serializeExistingTypeNode(context, node);
         }
+        const specifier = rewriteModuleSpecifier2(node, node.argument.literal);
+        const literal = specifier === node.argument.literal ? reuseNode(context, node.argument.literal) : specifier;
         return factory.updateImportTypeNode(
           node,
-          factory.updateLiteralTypeNode(node.argument, rewriteModuleSpecifier2(node, node.argument.literal)),
+          literal === node.argument.literal ? reuseNode(context, node.argument) : factory.createLiteralTypeNode(literal),
           visitNode(node.attributes, visitExistingNodeTreeSymbols, isImportAttributes),
           visitNode(node.qualifier, visitExistingNodeTreeSymbols, isEntityName),
           visitNodes2(node.typeArguments, visitExistingNodeTreeSymbols, isTypeNode),
@@ -136984,10 +136995,7 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
       }
       function rewriteModuleSpecifier2(parent2, lit) {
         const newName = resolver.getModuleSpecifierOverride(context, parent2, lit);
-        if (newName) {
-          return setOriginalNode(factory.createStringLiteral(newName), lit);
-        }
-        return visitNode(lit, visitExistingNodeTreeSymbols, isStringLiteral);
+        return newName ? setOriginalNode(factory.createStringLiteral(newName), lit) : lit;
       }
     }
   }
@@ -137154,12 +137162,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;
   }
@@ -137269,14 +137272,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 */) {
@@ -137566,18 +137569,17 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
     );
   }
   function reuseTypeParameters(typeParameters, context) {
-    return typeParameters == null ? void 0 : typeParameters.map(
-      (tp) => {
-        var _a;
-        return factory.updateTypeParameterDeclaration(
-          tp,
-          (_a = tp.modifiers) == null ? void 0 : _a.map((m) => reuseNode(context, m)),
-          reuseNode(context, tp.name),
-          serializeExistingTypeNodeWithFallback(tp.constraint, context),
-          serializeExistingTypeNodeWithFallback(tp.default, context)
-        );
-      }
-    );
+    return typeParameters == null ? void 0 : typeParameters.map((tp) => {
+      var _a;
+      const { node: tpName } = resolver.trackExistingEntityName(context, tp.name);
+      return factory.updateTypeParameterDeclaration(
+        tp,
+        (_a = tp.modifiers) == null ? void 0 : _a.map((m) => reuseNode(context, m)),
+        tpName,
+        serializeExistingTypeNodeWithFallback(tp.constraint, context),
+        serializeExistingTypeNodeWithFallback(tp.default, context)
+      );
+    });
   }
   function typeFromObjectLiteralMethod(method, name, context, isConstContext) {
     const returnType = createReturnFromSignature(
@@ -137712,7 +137714,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/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.8.1-rc",
+    "version": "5.8.3",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -116,5 +116,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "420ff069f7e1844c0b94f591acbd4aa68846e295"
+    "gitHead": "68cead182cc24afdc3f1ce7c8ff5853aba14b65a"
 }