Skip to content

don't copy union and intersection properties into the augmented property cache #64600

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

Closed
Max Schwenk (maschwenk) wants to merge 1 commit into from
Closed

don't copy union and intersection properties into the augmented property cache #64600

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 11 additions & 13 deletions tsc/internal/checker/checker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21791,25 +21791,23 @@ func (c *Checker) getPropertyOfUnionOrIntersectionType(t *Type, name string, ski
// these partial properties when identifying discriminant properties, but otherwise they are filtered out
// and do not appear to be present in the union type.
func (c *Checker) getUnionOrIntersectionProperty(t *Type, name string, skipObjectFunctionPropertyAugment bool) *ast.Symbol {
var cache ast.SymbolTable
d := t.AsUnionOrIntersectionType()
cache := &d.propertyCache
if skipObjectFunctionPropertyAugment {
cache = ast.GetSymbolTable(&t.AsUnionOrIntersectionType().propertyCacheWithoutFunctionPropertyAugment)
} else {
cache = ast.GetSymbolTable(&t.AsUnionOrIntersectionType().propertyCache)
cache = &d.propertyCacheWithoutFunctionPropertyAugment
}
if prop := cache[name]; prop != nil {
if prop := (*cache)[name]; prop != nil {
return prop
}
// A property found without the function property augment is also the augmented one unless it is partial.
if !skipObjectFunctionPropertyAugment {
if prop := d.propertyCacheWithoutFunctionPropertyAugment[name]; prop != nil && prop.CheckFlags&ast.CheckFlagsPartial == 0 {
return prop
}
}
prop := c.createUnionOrIntersectionProperty(t, name, skipObjectFunctionPropertyAugment)
if prop != nil {
cache[name] = prop
// Propagate an entry from the non-augmented cache to the augmented cache unless the property is partial.
if skipObjectFunctionPropertyAugment && prop.CheckFlags&ast.CheckFlagsPartial == 0 {
augmentedCache := ast.GetSymbolTable(&t.AsUnionOrIntersectionType().propertyCache)
if augmentedCache[name] == nil {
augmentedCache[name] = prop
}
}
ast.GetSymbolTable(cache)[name] = prop
}
return prop
}
Expand Down