Skip to content

Fixed contextually typed expando members #704

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
wants to merge 3 commits into from
Closed

Fixed contextually typed expando members #704

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
096812e
Fixed contextually typed expando members
Andarist Mar 25, 2025
112f834
Merge remote-tracking branch 'origin/main' into fix/contextual-expandp
Andarist Mar 25, 2025
5a9e3da
code tweaks
Andarist Mar 25, 2025
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
10 changes: 7 additions & 3 deletions internal/binder/binder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,9 +987,13 @@ func (b *Binder) bindFunctionPropertyAssignment(node *ast.Node) {
case ast.IsFunctionDeclaration(symbol.ValueDeclaration):
funcSymbol = symbol
case ast.IsVariableDeclaration(symbol.ValueDeclaration) && symbol.ValueDeclaration.Parent.Flags&ast.NodeFlagsConst != 0:
initializer := symbol.ValueDeclaration.Initializer()
if initializer != nil && ast.IsFunctionExpressionOrArrowFunction(initializer) {
funcSymbol = initializer.Symbol()
if symbol.ValueDeclaration.Type() != nil {
funcSymbol = symbol
} else {
initializer := symbol.ValueDeclaration.Initializer()
if initializer != nil && ast.IsFunctionExpressionOrArrowFunction(initializer) {
funcSymbol = initializer.Parent.Symbol()
}
}
}
if funcSymbol != nil {
Expand Down
83 changes: 80 additions & 3 deletions internal/checker/checker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13399,6 +13399,20 @@
return nil
}

func (c *Checker) getFunctionExpressionParentSymbolOrSymbol(symbol *ast.Symbol) *ast.Symbol {
declaration := symbol.ValueDeclaration
if declaration == nil {
return symbol
}
if declaration.Kind == ast.KindArrowFunction || declaration.Kind == ast.KindFunctionExpression {
parentSymbol := c.getSymbolOfNode(declaration.Parent)
if parentSymbol != nil {
return parentSymbol
}
}
return symbol
}

func (c *Checker) recordMergedSymbol(target *ast.Symbol, source *ast.Symbol) {
c.mergedSymbols[source] = target
}
Expand Down Expand Up @@ -14516,7 +14530,7 @@
}
}
if isStatic {
for member := range symbol.AssignmentDeclarationMembers.Keys() {
for member := range c.getFunctionExpressionParentSymbolOrSymbol(symbol).AssignmentDeclarationMembers.Keys() {
if c.hasLateBindableName(member) {
if lateSymbols == nil {
lateSymbols = make(ast.SymbolTable)
Expand Down Expand Up @@ -15389,8 +15403,33 @@

func (c *Checker) getTypeOfFuncClassEnumModule(symbol *ast.Symbol) *Type {
links := c.valueSymbolLinks.Get(symbol)
originalLinks := links
if links.resolvedType == nil {
expando := c.getSymbolOfExpando(symbol.ValueDeclaration)
if expando != nil {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this ports Strada's mergeJSSymbols - but since JS is not really involved here right now, I decided to just inline its relevant parts here (at least for the time being)

target := symbol
source := expando
inferred := core.IfElse(target.Flags&ast.SymbolFlagsTransient != 0, target, nil)
if inferred == nil {
inferred = c.cloneSymbol(target)
}
if len(source.Exports) != 0 {
if inferred.Exports == nil {
inferred.Exports = make(ast.SymbolTable)
}
c.mergeSymbolTable(inferred.Exports, source.Exports, false, nil)
}
if len(source.Members) != 0 {
if inferred.Members == nil {
inferred.Members = make(ast.SymbolTable)
}
c.mergeSymbolTable(inferred.Members, source.Members, false, nil)
}
symbol = inferred
links = c.valueSymbolLinks.Get(inferred)
}
links.resolvedType = c.getTypeOfFuncClassEnumModuleWorker(symbol)
originalLinks.resolvedType = links.resolvedType
}
return links.resolvedType
}
Expand Down Expand Up @@ -16541,13 +16580,21 @@
}

func (c *Checker) getWidenedTypeForAssignmentDeclaration(symbol *ast.Symbol) *Type {
var annotatedType *Type
var types []*Type
for _, declaration := range symbol.Declarations {
if ast.IsBinaryExpression(declaration) {
types = core.AppendIfUnique(types, c.checkExpressionForMutableLocation(declaration.AsBinaryExpression().Right, CheckModeNormal))
annotatedType = c.getAnnotatedTypeForAssignmentDeclaration(symbol)
if annotatedType == nil {
types = core.AppendIfUnique(types, c.checkExpressionForMutableLocation(declaration.AsBinaryExpression().Right, CheckModeNormal))
}
}
}
return c.getWidenedType(c.getUnionType(types))
t := annotatedType
if t == nil {
t = c.getUnionType(types)
}
return c.getWidenedType(t)
}

func (c *Checker) widenTypeForVariableLikeDeclaration(t *Type, declaration *ast.Node, reportErrors bool) *Type {
Expand Down Expand Up @@ -29590,3 +29637,33 @@
}
return c.emitResolver
}

func (c *Checker) getSymbolOfExpando(node *ast.Node) *ast.Symbol {
if node == nil || node.Parent == nil {
return nil
}
if ast.IsVariableDeclaration(node.Parent) && node.Parent.AsVariableDeclaration().Initializer == node {
if !ast.IsInJSFile(node) && !(ast.IsVarConstLike(node.Parent) && ast.IsFunctionLikeDeclaration(node)) {
return nil
}
return c.getSymbolOfDeclaration(node.Parent)

}
return nil
}

func (c *Checker) getAnnotatedTypeForAssignmentDeclaration(symbol *ast.Symbol) *Type {
if symbol.Parent != nil && symbol.Parent.ValueDeclaration != nil {
possiblyAnnotatedSymbol := c.getFunctionExpressionParentSymbolOrSymbol(symbol.Parent)
if possiblyAnnotatedSymbol != nil && possiblyAnnotatedSymbol.ValueDeclaration != nil && possiblyAnnotatedSymbol.ValueDeclaration.Kind != ast.KindFunctionDeclaration {
typeNode := possiblyAnnotatedSymbol.ValueDeclaration.Type()
if typeNode != nil {
annotationSymbol := c.getPropertyOfType(c.getTypeFromTypeNode(typeNode), symbol.Name)
if annotationSymbol != nil {
return c.getNonMissingTypeOfSymbol(annotationSymbol)
}
}
}
}
return nil
}
2 changes: 1 addition & 1 deletion testdata/baselines/reference/submodule/compiler/expandoFunctionContextualTypes.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ interface StatelessComponent<P> {

const MyComponent: StatelessComponent<MyComponentProps> = () => null as any;
>MyComponent : StatelessComponent<MyComponentProps>
>() => null as any : { (): any; defaultProps: { color: "red"; }; }
>() => null as any : { (): any; defaultProps: Partial<MyComponentProps>; }
>null as any : any

MyComponent.defaultProps = {
Expand Down
9 changes: 0 additions & 9 deletions testdata/baselines/reference/submodule/compiler/expandoFunctionContextualTypes.types.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,3 @@
}

interface StatelessComponent<P> {
@@= skipped -11, +11 lines =@@

const MyComponent: StatelessComponent<MyComponentProps> = () => null as any;
>MyComponent : StatelessComponent<MyComponentProps>
->() => null as any : { (): any; defaultProps: Partial<MyComponentProps>; }
+>() => null as any : { (): any; defaultProps: { color: "red"; }; }
>null as any : any

MyComponent.defaultProps = {
31 changes: 0 additions & 31 deletions ...ata/baselines/reference/submodule/conformance/propertyAssignmentUseParentType1.errors.txt
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions ...aselines/reference/submodule/conformance/propertyAssignmentUseParentType1.errors.txt.diff
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions testdata/baselines/reference/submodule/conformance/propertyAssignmentUseParentType1.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ interface N {
}
export const interfaced: N = () => true;
>interfaced : N
>() => true : { (): true; num: number; }
>() => true : { (): true; num: 123; }
>true : true

interfaced.num = 123;
Expand All @@ -21,7 +21,7 @@ interfaced.num = 123;
export const inlined: { (): boolean; nun: 456 } = () => true;
>inlined : { (): boolean; nun: 456; }
>nun : 456
>() => true : { (): true; nun: number; }
>() => true : { (): true; nun: 456; }
>true : true

inlined.nun = 456;
Expand Down
20 changes: 0 additions & 20 deletions ...ata/baselines/reference/submodule/conformance/propertyAssignmentUseParentType1.types.diff
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment30.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ interface Combo {
}
const c: Combo = () => 1
>c : Combo
>() => 1 : { (): number; p: {}; }
>() => 1 : { (): number; p: { [s: string]: number; }; }
>1 : 1

// should not be an expando object, but contextually typed by Combo.p
Expand Down
11 changes: 11 additions & 0 deletions testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment30.types.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- old.typeFromPropertyAssignment30.types
+++ new.typeFromPropertyAssignment30.types
@@= skipped -8, +8 lines =@@
}
const c: Combo = () => 1
>c : Combo
->() => 1 : { (): number; p: {}; }
+>() => 1 : { (): number; p: { [s: string]: number; }; }
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have not investigated why this is different but I genuinely feel like this is an improvement. It's not even a user-facing - or I don't know how to position my cursor in this example to get such quick info.

If we think about types alone then we can test how this behaves if we start assigning properties to p (TS playground):

interface Combo {
  (): number;
  p?: { [s: string]: number };
}
const c: Combo = () => 1;
c.p = {};

c.p.testOk = 1; // ok
c.p.testError = "foo"; // error

So it's not really correct, in my eyes, to say that p has {} type. At any stage of the process. Either we know here about everything about expando members or we shouldn't know anything (if this would print a flow type or smth).

If I get the .types print for the above in Strada I end up with this:

interface Combo {
  (): number;
  p?: { [s: string]: number };
>p : { [s: string]: number; } | undefined
>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>s : string
>  : ^^^^^^
}
const c: Combo = () => 1;
>c : Combo
>  : ^^^^^
>() => 1 : { (): number; p: {}; }
>        : ^^^^^^^^^^^^^^^^^^^^^^
>1 : 1
>  : ^

c.p = {};
>c.p = {} : {}
>         : ^^
>c.p : { [s: string]: number; }
>    : ^^^^^^^^^^^^^^^^^^^^^^^^
>c : Combo
>  : ^^^^^
>p : { [s: string]: number; }
>  : ^^^^^^^^^^^^^^^^^^^^^^^^
>{} : {}
>   : ^^

c.p.testOk = 1;
>c.p.testOk = 1 : 1
>               : ^
>c.p.testOk : number
>           : ^^^^^^
>c.p : { [s: string]: number; }
>    : ^^^^^^^^^^^^^^^^^^^^^^^^
>c : Combo
>  : ^^^^^
>p : { [s: string]: number; }
>  : ^^^^^^^^^^^^^^^^^^^^^^^^
>testOk : number
>       : ^^^^^^
>1 : 1
>  : ^

c.p.testError = "foo";
>c.p.testError = "foo" : "foo"
>                      : ^^^^^
>c.p.testError : number
>              : ^^^^^^
>c.p : { [s: string]: number; }
>    : ^^^^^^^^^^^^^^^^^^^^^^^^
>c : Combo
>  : ^^^^^
>p : { [s: string]: number; }
>  : ^^^^^^^^^^^^^^^^^^^^^^^^
>testError : number
>          : ^^^^^^
>"foo" : "foo"
>      : ^^^^^

>1 : 1

// should not be an expando object, but contextually typed by Combo.p
Loading