Skip to content

Create declaration emit diagnostic selectors on demand #64723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Gavin Kline (gwkline) wants to merge 2 commits into
base: main
Choose a base branch
from
+745 −62
Draft

Create declaration emit diagnostic selectors on demand #64723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf0278b
Create declaration emit diagnostic selectors on demand
gwkline Oct 10, 2026
4ca431b
Add test for declaration emit errors in each declaration context
gwkline Oct 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions tsc/internal/transformers/declarations/diagnostics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,24 @@ import (

type GetSymbolAccessibilityDiagnostic = func(symbolAccessibilityResult printer.SymbolAccessibilityResult) *SymbolAccessibilityDiagnostic

// symbolAccessibilityDiagnosticContext selects the diagnostic reported when a declaration uses a
// symbol that cannot be named. Nearly every visited declaration establishes a context and almost
// none of them report an error, so the selector for a declaration node is created only on demand.
type symbolAccessibilityDiagnosticContext struct {
node *ast.Node // declaration whose selector is created when needed
fn GetSymbolAccessibilityDiagnostic // explicit selector, used instead of node when set
}

func (ctx symbolAccessibilityDiagnosticContext) get(symbolAccessibilityResult printer.SymbolAccessibilityResult) *SymbolAccessibilityDiagnostic {
if ctx.fn != nil {
return ctx.fn(symbolAccessibilityResult)
}
if ctx.node != nil {
return createGetSymbolAccessibilityDiagnosticForNode(ctx.node)(symbolAccessibilityResult)
}
return nil
}

type SymbolAccessibilityDiagnostic struct {
errorNode *ast.Node
diagnosticMessage *diagnostics.Message
Expand Down
20 changes: 10 additions & 10 deletions tsc/internal/transformers/declarations/tracker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ func (s *SymbolTrackerImpl) handleSymbolAccessibilityError(symbolAccessibilityRe
// The checker should issue errors on unresolvable names, skip the declaration emit error for using a private/unreachable name for those
} else if symbolAccessibilityResult.Accessibility != printer.SymbolAccessibilityNotResolved {
// Report error
errorInfo := s.state.getSymbolAccessibilityDiagnostic(symbolAccessibilityResult)
errorInfo := s.state.diagnosticContext.get(symbolAccessibilityResult)
if errorInfo != nil {
info := *errorInfo
diagNode := symbolAccessibilityResult.ErrorNode
Expand All @@ -237,15 +237,15 @@ func createDiagnosticForNode(node *ast.Node, message *diagnostics.Message, args
}

type SymbolTrackerSharedState struct {
lateMarkedStatements []*ast.Node
diagnostics []*ast.Diagnostic
getSymbolAccessibilityDiagnostic GetSymbolAccessibilityDiagnostic
errorNameNode *ast.Node
isolatedDeclarations bool
stripInternal bool
currentSourceFile *ast.SourceFile
resolver printer.EmitResolver
reportExpandoFunctionErrors func(node *ast.Node)
lateMarkedStatements []*ast.Node
diagnostics []*ast.Diagnostic
diagnosticContext symbolAccessibilityDiagnosticContext
errorNameNode *ast.Node
isolatedDeclarations bool
stripInternal bool
currentSourceFile *ast.SourceFile
resolver printer.EmitResolver
reportExpandoFunctionErrors func(node *ast.Node)
}

func (s *SymbolTrackerSharedState) addDiagnostic(diag *ast.Diagnostic) {
Expand Down
115 changes: 63 additions & 52 deletions tsc/internal/transformers/declarations/transform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ func (tx *DeclarationTransformer) visitSourceFile(node *ast.SourceFile) *ast.Nod
tx.needsScopeFixMarker = false
tx.resultHasScopeMarker = false
tx.enclosingDeclaration = node.AsNode()
tx.state.getSymbolAccessibilityDiagnostic = throwDiagnostic
tx.state.diagnosticContext = symbolAccessibilityDiagnosticContext{fn: throwDiagnostic}
tx.resultHasExternalModuleIndicator = false
tx.suppressNewDiagnosticContexts = false
tx.state.lateMarkedStatements = make([]*ast.Node, 0)
Expand Down Expand Up @@ -542,26 +542,37 @@ func (tx *DeclarationTransformer) getTypeReferences() (result []*ast.FileReferen
return result
}

func (tx *DeclarationTransformer) setupDiagnosticContext(input *ast.Node) (bool, func()) {
// savedDiagnosticContext is the state that restoreDiagnosticContext reinstates once a declaration has been visited.
type savedDiagnosticContext struct {
diagnosticContext symbolAccessibilityDiagnosticContext
errorNameNode *ast.Node
suppressNewDiagnosticContexts bool
}

func (tx *DeclarationTransformer) setupDiagnosticContext(input *ast.Node) (bool, savedDiagnosticContext) {
canProduceDiagnostic := canProduceDiagnostics(input)
oldWithinObjectLiteralType := tx.suppressNewDiagnosticContexts
saved := savedDiagnosticContext{
diagnosticContext: tx.state.diagnosticContext,
errorNameNode: tx.state.errorNameNode,
suppressNewDiagnosticContexts: tx.suppressNewDiagnosticContexts,
}
shouldEnterSuppressNewDiagnosticsContextContext := (input.Kind == ast.KindTypeLiteral || input.Kind == ast.KindMappedType) && !(input.Parent.Kind == ast.KindTypeAliasDeclaration || input.Parent.Kind == ast.KindJSTypeAliasDeclaration)

oldDiag := tx.state.getSymbolAccessibilityDiagnostic
if canProduceDiagnostic && !tx.suppressNewDiagnosticContexts {
tx.state.getSymbolAccessibilityDiagnostic = createGetSymbolAccessibilityDiagnosticForNode(input)
tx.state.diagnosticContext = symbolAccessibilityDiagnosticContext{node: input}
}
oldName := tx.state.errorNameNode

if shouldEnterSuppressNewDiagnosticsContextContext {
tx.suppressNewDiagnosticContexts = true
}

return canProduceDiagnostic, func() {
tx.state.getSymbolAccessibilityDiagnostic = oldDiag
tx.state.errorNameNode = oldName
tx.suppressNewDiagnosticContexts = oldWithinObjectLiteralType
}
return canProduceDiagnostic, saved
}

func (tx *DeclarationTransformer) restoreDiagnosticContext(saved savedDiagnosticContext) {
tx.state.diagnosticContext = saved.diagnosticContext
tx.state.errorNameNode = saved.errorNameNode
tx.suppressNewDiagnosticContexts = saved.suppressNewDiagnosticContexts
}

func (tx *DeclarationTransformer) visitDeclarationSubtree(input *ast.Node) *ast.Node {
Expand Down Expand Up @@ -610,8 +621,8 @@ func (tx *DeclarationTransformer) visitDeclarationSubtree(input *ast.Node) *ast.
tx.enclosingDeclaration = input
}

canProduceDiagnostic, cleanupDiagnosticContext := tx.setupDiagnosticContext(input)
defer cleanupDiagnosticContext()
canProduceDiagnostic, savedDiagnosticContext := tx.setupDiagnosticContext(input)
defer tx.restoreDiagnosticContext(savedDiagnosticContext)

var result *ast.Node

Expand Down Expand Up @@ -700,16 +711,16 @@ func (tx *DeclarationTransformer) visitDeclarationSubtree(input *ast.Node) *ast.
}

func (tx *DeclarationTransformer) checkName(node *ast.Node) {
oldDiag := tx.state.getSymbolAccessibilityDiagnostic
oldDiag := tx.state.diagnosticContext
if !tx.suppressNewDiagnosticContexts {
tx.state.getSymbolAccessibilityDiagnostic = createGetSymbolAccessibilityDiagnosticForNodeName(node)
tx.state.diagnosticContext = symbolAccessibilityDiagnosticContext{fn: createGetSymbolAccessibilityDiagnosticForNodeName(node)}
}
tx.state.errorNameNode = node.Name()
debug.Assert(ast.HasDynamicName(node)) // Should only be called with dynamic names
entityName := node.Name().Expression()
tx.checkEntityNameVisibility(entityName, tx.enclosingDeclaration)
if !tx.suppressNewDiagnosticContexts {
tx.state.getSymbolAccessibilityDiagnostic = oldDiag
tx.state.diagnosticContext = oldDiag
}
tx.state.errorNameNode = nil
}
Expand Down Expand Up @@ -1230,12 +1241,12 @@ func (tx *DeclarationTransformer) transformExportAssignment(input *ast.Node, ass
return exportAssignment
}

tx.state.getSymbolAccessibilityDiagnostic = func(_ printer.SymbolAccessibilityResult) *SymbolAccessibilityDiagnostic {
tx.state.diagnosticContext = symbolAccessibilityDiagnosticContext{fn: func(_ printer.SymbolAccessibilityResult) *SymbolAccessibilityDiagnostic {
return &SymbolAccessibilityDiagnostic{
diagnosticMessage: diagnostics.Default_export_of_the_module_has_or_is_using_private_name_0,
errorNode: input,
}
}
}}
tx.tracker.PushErrorFallbackNode(assignment)

// Check if the expression is a class expression - emit as a class declaration + export assignment
Expand Down Expand Up @@ -1468,12 +1479,12 @@ func (tx *DeclarationTransformer) transformCommonJSExportWorker(input *ast.Node,
if name.Text() == "default" {
// const _default: Type; export default _default;
newId := tx.Factory().NewUniqueNameEx("_default", printer.AutoGenerateOptions{Flags: printer.GeneratedIdentifierFlagsOptimistic})
tx.state.getSymbolAccessibilityDiagnostic = func(_ printer.SymbolAccessibilityResult) *SymbolAccessibilityDiagnostic {
tx.state.diagnosticContext = symbolAccessibilityDiagnosticContext{fn: func(_ printer.SymbolAccessibilityResult) *SymbolAccessibilityDiagnostic {
return &SymbolAccessibilityDiagnostic{
diagnosticMessage: diagnostics.Default_export_of_the_module_has_or_is_using_private_name_0,
errorNode: input,
}
}
}}
tx.tracker.PushErrorFallbackNode(input)
type_ := tx.ensureType(input, false)
varDecl := tx.Factory().NewVariableDeclaration(newId, nil, type_, nil)
Expand Down Expand Up @@ -1509,12 +1520,12 @@ func (tx *DeclarationTransformer) transformCommonJSExportWorker(input *ast.Node,
}
// const _exported: Type; export {_exported as "name"};
newId := tx.Factory().NewUniqueNameEx("_exported", printer.AutoGenerateOptions{Flags: printer.GeneratedIdentifierFlagsOptimistic})
tx.state.getSymbolAccessibilityDiagnostic = func(_ printer.SymbolAccessibilityResult) *SymbolAccessibilityDiagnostic {
tx.state.diagnosticContext = symbolAccessibilityDiagnosticContext{fn: func(_ printer.SymbolAccessibilityResult) *SymbolAccessibilityDiagnostic {
return &SymbolAccessibilityDiagnostic{
diagnosticMessage: diagnostics.Default_export_of_the_module_has_or_is_using_private_name_0,
errorNode: input,
}
}
}}
tx.tracker.PushErrorFallbackNode(input)
type_ := tx.ensureType(input, false)
varDecl := tx.Factory().NewVariableDeclaration(newId, nil, type_, nil)
Expand Down Expand Up @@ -1668,11 +1679,11 @@ func (tx *DeclarationTransformer) ensureType(node *ast.Node, ignorePrivate bool)

oldErrorNameNode := tx.state.errorNameNode
tx.state.errorNameNode = node.Name()
var oldDiag GetSymbolAccessibilityDiagnostic
var oldDiag symbolAccessibilityDiagnosticContext
if !tx.suppressNewDiagnosticContexts {
oldDiag = tx.state.getSymbolAccessibilityDiagnostic
oldDiag = tx.state.diagnosticContext
if canProduceDiagnostics(node) {
tx.state.getSymbolAccessibilityDiagnostic = createGetSymbolAccessibilityDiagnosticForNode(node)
tx.state.diagnosticContext = symbolAccessibilityDiagnosticContext{node: node}
}
}
var typeNode *ast.Node
Expand All @@ -1691,7 +1702,7 @@ func (tx *DeclarationTransformer) ensureType(node *ast.Node, ignorePrivate bool)

tx.state.errorNameNode = oldErrorNameNode
if !tx.suppressNewDiagnosticContexts {
tx.state.getSymbolAccessibilityDiagnostic = oldDiag
tx.state.diagnosticContext = oldDiag
}
if typeNode == nil {
return tx.Factory().NewKeywordTypeNode(ast.KindAnyKeyword)
Expand Down Expand Up @@ -1754,10 +1765,10 @@ func (tx *DeclarationTransformer) transformTopLevelDeclaration(input *ast.Node)
}

canProduceDiagnostic := canProduceDiagnostics(input)
oldDiag := tx.state.getSymbolAccessibilityDiagnostic
oldDiag := tx.state.diagnosticContext
oldName := tx.state.errorNameNode
if canProduceDiagnostic {
tx.state.getSymbolAccessibilityDiagnostic = createGetSymbolAccessibilityDiagnosticForNode(input)
tx.state.diagnosticContext = symbolAccessibilityDiagnosticContext{node: input}
}
saveNeedsDeclare := tx.needsDeclare

Expand All @@ -1783,7 +1794,7 @@ func (tx *DeclarationTransformer) transformTopLevelDeclaration(input *ast.Node)
}

tx.enclosingDeclaration = previousEnclosingDeclaration
tx.state.getSymbolAccessibilityDiagnostic = oldDiag
tx.state.diagnosticContext = oldDiag
tx.needsDeclare = saveNeedsDeclare
tx.state.errorNameNode = oldName
return result
Expand Down Expand Up @@ -1932,12 +1943,12 @@ func (tx *DeclarationTransformer) buildClassMembers(classNode *ast.Node, extraMe
ctor := ast.GetFirstConstructorWithBody(classNode)
var parameterProperties []*ast.Node
if ctor != nil {
oldDiag := tx.state.getSymbolAccessibilityDiagnostic
oldDiag := tx.state.diagnosticContext
for _, param := range ctor.AsConstructorDeclaration().Parameters.Nodes {
if !ast.HasSyntacticModifier(param, ast.ModifierFlagsParameterPropertyModifier) || tx.shouldStripInternal(param) {
continue
}
tx.state.getSymbolAccessibilityDiagnostic = createGetSymbolAccessibilityDiagnosticForNode(param)
tx.state.diagnosticContext = symbolAccessibilityDiagnosticContext{node: param}
if param.Name().Kind == ast.KindIdentifier {
updated := tx.Factory().NewPropertyDeclaration(
tx.ensureModifiers(param),
Expand All @@ -1953,7 +1964,7 @@ func (tx *DeclarationTransformer) buildClassMembers(classNode *ast.Node, extraMe
parameterProperties = append(parameterProperties, tx.walkBindingPattern(param.Name().AsBindingPattern(), param)...)
}
}
tx.state.getSymbolAccessibilityDiagnostic = oldDiag
tx.state.diagnosticContext = oldDiag
}

// When the class has at least one private identifier, create a unique constant identifier to retain the nominal typing behavior
Expand Down Expand Up @@ -2016,13 +2027,13 @@ func (tx *DeclarationTransformer) transformClassDeclaration(input *ast.ClassDecl
oldId = input.Name().Text()
}
newId := tx.Factory().NewUniqueNameEx(oldId+"_base", printer.AutoGenerateOptions{Flags: printer.GeneratedIdentifierFlagsOptimistic})
tx.state.getSymbolAccessibilityDiagnostic = func(_ printer.SymbolAccessibilityResult) *SymbolAccessibilityDiagnostic {
tx.state.diagnosticContext = symbolAccessibilityDiagnosticContext{fn: func(_ printer.SymbolAccessibilityResult) *SymbolAccessibilityDiagnostic {
return &SymbolAccessibilityDiagnostic{
diagnosticMessage: diagnostics.X_extends_clause_of_exported_class_0_has_or_is_using_private_name_1,
errorNode: extendsClause,
typeName: input.Name(),
}
}
}}

varDecl := tx.Factory().NewVariableDeclaration(
newId,
Expand Down Expand Up @@ -2365,11 +2376,11 @@ func (tx *DeclarationTransformer) ensureTypeParams(node *ast.Node, params *ast.T
}
oldErrorNameNode := tx.state.errorNameNode
tx.state.errorNameNode = node.Name()
var oldDiag GetSymbolAccessibilityDiagnostic
var oldDiag symbolAccessibilityDiagnosticContext
if !tx.suppressNewDiagnosticContexts {
oldDiag = tx.state.getSymbolAccessibilityDiagnostic
oldDiag = tx.state.diagnosticContext
if canProduceDiagnostics(node) {
tx.state.getSymbolAccessibilityDiagnostic = createGetSymbolAccessibilityDiagnosticForNode(node)
tx.state.diagnosticContext = symbolAccessibilityDiagnosticContext{node: node}
}
}

Expand All @@ -2384,7 +2395,7 @@ func (tx *DeclarationTransformer) ensureTypeParams(node *ast.Node, params *ast.T

tx.state.errorNameNode = oldErrorNameNode
if !tx.suppressNewDiagnosticContexts {
tx.state.getSymbolAccessibilityDiagnostic = oldDiag
tx.state.diagnosticContext = oldDiag
}
return typeParameters
}
Expand All @@ -2401,9 +2412,9 @@ func (tx *DeclarationTransformer) updateParamList(node *ast.Node, params *ast.Pa
}

func (tx *DeclarationTransformer) ensureParameter(p *ast.ParameterDeclaration) *ast.Node {
oldDiag := tx.state.getSymbolAccessibilityDiagnostic
oldDiag := tx.state.diagnosticContext
if !tx.suppressNewDiagnosticContexts {
tx.state.getSymbolAccessibilityDiagnostic = createGetSymbolAccessibilityDiagnosticForNode(p.AsNode())
tx.state.diagnosticContext = symbolAccessibilityDiagnosticContext{node: p.AsNode()}
}
var questionToken *ast.TokenNode
if tx.resolver.IsOptionalParameter(p.AsNode()) {
Expand All @@ -2422,7 +2433,7 @@ func (tx *DeclarationTransformer) ensureParameter(p *ast.ParameterDeclaration) *
tx.ensureType(p.AsNode(), true),
tx.ensureNoInitializer(p.AsNode()),
)
tx.state.getSymbolAccessibilityDiagnostic = oldDiag
tx.state.diagnosticContext = oldDiag
return result
}

Expand Down Expand Up @@ -2468,10 +2479,10 @@ func (tx *DeclarationTransformer) transformImportEqualsDeclaration(decl *ast.Imp
tx.Factory().UpdateExternalModuleReference(decl.ModuleReference.AsExternalModuleReference(), tx.rewriteModuleSpecifier(decl.AsNode(), specifier)),
)
} else {
oldDiag := tx.state.getSymbolAccessibilityDiagnostic
tx.state.getSymbolAccessibilityDiagnostic = createGetSymbolAccessibilityDiagnosticForNode(decl.AsNode())
oldDiag := tx.state.diagnosticContext
tx.state.diagnosticContext = symbolAccessibilityDiagnosticContext{node: decl.AsNode()}
tx.checkEntityNameVisibility(decl.ModuleReference, tx.enclosingDeclaration)
tx.state.getSymbolAccessibilityDiagnostic = oldDiag
tx.state.diagnosticContext = oldDiag
return decl.AsNode()
}
}
Expand Down Expand Up @@ -2679,8 +2690,8 @@ func (tx *DeclarationTransformer) stripDeclareModifiers(node *ast.Node) *ast.Nod

func (tx *DeclarationTransformer) visitCJSExportAssignments(expression *ast.Node) *ast.Node {
if expression != nil {
_, cleanupDiagnosticContext := tx.setupDiagnosticContext(expression)
defer cleanupDiagnosticContext()
_, savedDiagnosticContext := tx.setupDiagnosticContext(expression)
defer tx.restoreDiagnosticContext(savedDiagnosticContext)
switch ast.GetAssignmentDeclarationKind(expression) {
case ast.JSDeclarationKindModuleExports:
if tx.state.currentSourceFile.CommonJSModuleIndicator != nil {
Expand All @@ -2699,8 +2710,8 @@ func (tx *DeclarationTransformer) visitCJSExportAssignments(expression *ast.Node

func (tx *DeclarationTransformer) visitNestedExpression(expression *ast.Node) *ast.Node {
if expression != nil {
_, cleanupDiagnosticContext := tx.setupDiagnosticContext(expression)
defer cleanupDiagnosticContext()
_, savedDiagnosticContext := tx.setupDiagnosticContext(expression)
defer tx.restoreDiagnosticContext(savedDiagnosticContext)
switch ast.GetAssignmentDeclarationKind(expression) {
case ast.JSDeclarationKindProperty:
tx.transformExpandoAssignment(expression.AsBinaryExpression())
Expand Down Expand Up @@ -2796,8 +2807,8 @@ func (tx *DeclarationTransformer) transformExpandoAssignment(node *ast.BinaryExp
localName = tx.Factory().NewGeneratedNameForNode(node.AsNode())
}

_, cleanupDiagnosticContext := tx.setupDiagnosticContext(node.AsNode())
defer cleanupDiagnosticContext()
_, savedDiagnosticContext := tx.setupDiagnosticContext(node.AsNode())
defer tx.restoreDiagnosticContext(savedDiagnosticContext)

preexistingExpandoHasExport := core.Some(tx.expandoMembers[hostId], ast.IsExportDeclaration)

Expand Down Expand Up @@ -2896,8 +2907,8 @@ func (tx *DeclarationTransformer) transformExpandoHost(name *ast.Node, declarati
modifierFlags ^= ast.ModifierFlagsExport
}

_, cleanupDiagnosticContext := tx.setupDiagnosticContext(declaration)
defer cleanupDiagnosticContext()
_, savedDiagnosticContext := tx.setupDiagnosticContext(declaration)
defer tx.restoreDiagnosticContext(savedDiagnosticContext)

modifiers := tx.Factory().NewModifierList(ast.CreateModifiersFromModifierFlags(modifierFlags, tx.Factory().NewModifier))
replacement := make([]*ast.Node, 0)
Expand Down
Loading