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.
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
Check nested weak types in intersections on target side of relation #51140
Merged
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
52e9cae
Check nested weak types in intersections on target side of relation
ahejlsberg 72a0f3b
Add regression tests
ahejlsberg f0f853e
Move logic from isRelatedTo to structuredTypeRelatedTo
ahejlsberg 0c690b0
Fix lint error
ahejlsberg d899a4e
Add additional test
ahejlsberg File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
tests/baselines/reference/nestedExcessPropertyChecking.errors.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| tests/cases/compiler/nestedExcessPropertyChecking.ts(6,7): error TS2322: Type 'C1' is not assignable to type 'A1 & B1'. | ||
| Types of property 'x' are incompatible. | ||
| Type '{ c: string; }' has no properties in common with type '{ a?: string | undefined; } & { b?: string | undefined; }'. | ||
| tests/cases/compiler/nestedExcessPropertyChecking.ts(13,7): error TS2559: Type 'C2' has no properties in common with type 'A2 & B2'. | ||
| tests/cases/compiler/nestedExcessPropertyChecking.ts(25,22): error TS2559: Type 'false' has no properties in common with type 'OverridesInput'. | ||
| tests/cases/compiler/nestedExcessPropertyChecking.ts(35,9): error TS2559: Type 'false' has no properties in common with type 'OverridesInput'. | ||
|
|
||
|
|
||
| ==== tests/cases/compiler/nestedExcessPropertyChecking.ts (4 errors) ==== | ||
| type A1 = { x: { a?: string } }; | ||
| type B1 = { x: { b?: string } }; | ||
|
|
||
| type C1 = { x: { c: string } }; | ||
|
|
||
| const ab1: A1 & B1 = {} as C1; // Error | ||
| ~~~ | ||
| !!! error TS2322: Type 'C1' is not assignable to type 'A1 & B1'. | ||
| !!! error TS2322: Types of property 'x' are incompatible. | ||
| !!! error TS2322: Type '{ c: string; }' has no properties in common with type '{ a?: string | undefined; } & { b?: string | undefined; }'. | ||
|
|
||
| type A2 = { a?: string }; | ||
| type B2 = { b?: string }; | ||
|
|
||
| type C2 = { c: string }; | ||
|
|
||
| const ab2: A2 & B2 = {} as C2; // Error | ||
| ~~~ | ||
| !!! error TS2559: Type 'C2' has no properties in common with type 'A2 & B2'. | ||
|
|
||
| // Repros from #51043 | ||
|
|
||
| type OverridesInput = { | ||
| someProp?: 'A' | 'B' | ||
| } | ||
|
|
||
| const foo1: Partial<{ something: any }> & { variables: { | ||
| overrides?: OverridesInput; | ||
| } & Partial<{ | ||
| overrides?: OverridesInput; | ||
| }>} = { variables: { overrides: false } }; // Error | ||
| ~~~~~~~~~ | ||
| !!! error TS2559: Type 'false' has no properties in common with type 'OverridesInput'. | ||
| !!! related TS6500 tests/cases/compiler/nestedExcessPropertyChecking.ts:22:5: The expected type comes from property 'overrides' which is declared here on type '{ overrides?: OverridesInput | undefined; } & Partial<{ overrides?: OverridesInput | undefined; }>' | ||
|
|
||
|
|
||
| interface Unrelated { _?: any } | ||
|
|
||
| interface VariablesA { overrides?: OverridesInput; } | ||
| interface VariablesB { overrides?: OverridesInput; } | ||
|
|
||
| const foo2: Unrelated & { variables: VariablesA & VariablesB } = { | ||
| variables: { | ||
| overrides: false // Error | ||
| ~~~~~~~~~ | ||
| !!! error TS2559: Type 'false' has no properties in common with type 'OverridesInput'. | ||
| !!! related TS6500 tests/cases/compiler/nestedExcessPropertyChecking.ts:30:24: The expected type comes from property 'overrides' which is declared here on type 'VariablesA & VariablesB' | ||
| } | ||
| }; | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| //// [nestedExcessPropertyChecking.ts] | ||
| type A1 = { x: { a?: string } }; | ||
| type B1 = { x: { b?: string } }; | ||
|
|
||
| type C1 = { x: { c: string } }; | ||
|
|
||
| const ab1: A1 & B1 = {} as C1; // Error | ||
|
|
||
| type A2 = { a?: string }; | ||
| type B2 = { b?: string }; | ||
|
|
||
| type C2 = { c: string }; | ||
|
|
||
| const ab2: A2 & B2 = {} as C2; // Error | ||
|
|
||
| // Repros from #51043 | ||
|
|
||
| type OverridesInput = { | ||
| someProp?: 'A' | 'B' | ||
| } | ||
|
|
||
| const foo1: Partial<{ something: any }> & { variables: { | ||
| overrides?: OverridesInput; | ||
| } & Partial<{ | ||
| overrides?: OverridesInput; | ||
| }>} = { variables: { overrides: false } }; // Error | ||
|
|
||
|
|
||
| interface Unrelated { _?: any } | ||
|
|
||
| interface VariablesA { overrides?: OverridesInput; } | ||
| interface VariablesB { overrides?: OverridesInput; } | ||
|
|
||
| const foo2: Unrelated & { variables: VariablesA & VariablesB } = { | ||
| variables: { | ||
| overrides: false // Error | ||
| } | ||
| }; | ||
|
|
||
|
|
||
| //// [nestedExcessPropertyChecking.js] | ||
| "use strict"; | ||
| var ab1 = {}; // Error | ||
| var ab2 = {}; // Error | ||
| var foo1 = { variables: { overrides: false } }; // Error | ||
| var foo2 = { | ||
| variables: { | ||
| overrides: false // Error | ||
| } | ||
| }; |
100 changes: 100 additions & 0 deletions
100
tests/baselines/reference/nestedExcessPropertyChecking.symbols
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| === tests/cases/compiler/nestedExcessPropertyChecking.ts === | ||
| type A1 = { x: { a?: string } }; | ||
| >A1 : Symbol(A1, Decl(nestedExcessPropertyChecking.ts, 0, 0)) | ||
| >x : Symbol(x, Decl(nestedExcessPropertyChecking.ts, 0, 11)) | ||
| >a : Symbol(a, Decl(nestedExcessPropertyChecking.ts, 0, 16)) | ||
|
|
||
| type B1 = { x: { b?: string } }; | ||
| >B1 : Symbol(B1, Decl(nestedExcessPropertyChecking.ts, 0, 32)) | ||
| >x : Symbol(x, Decl(nestedExcessPropertyChecking.ts, 1, 11)) | ||
| >b : Symbol(b, Decl(nestedExcessPropertyChecking.ts, 1, 16)) | ||
|
|
||
| type C1 = { x: { c: string } }; | ||
| >C1 : Symbol(C1, Decl(nestedExcessPropertyChecking.ts, 1, 32)) | ||
| >x : Symbol(x, Decl(nestedExcessPropertyChecking.ts, 3, 11)) | ||
| >c : Symbol(c, Decl(nestedExcessPropertyChecking.ts, 3, 16)) | ||
|
|
||
| const ab1: A1 & B1 = {} as C1; // Error | ||
| >ab1 : Symbol(ab1, Decl(nestedExcessPropertyChecking.ts, 5, 5)) | ||
| >A1 : Symbol(A1, Decl(nestedExcessPropertyChecking.ts, 0, 0)) | ||
| >B1 : Symbol(B1, Decl(nestedExcessPropertyChecking.ts, 0, 32)) | ||
| >C1 : Symbol(C1, Decl(nestedExcessPropertyChecking.ts, 1, 32)) | ||
|
|
||
| type A2 = { a?: string }; | ||
| >A2 : Symbol(A2, Decl(nestedExcessPropertyChecking.ts, 5, 30)) | ||
| >a : Symbol(a, Decl(nestedExcessPropertyChecking.ts, 7, 11)) | ||
|
|
||
| type B2 = { b?: string }; | ||
| >B2 : Symbol(B2, Decl(nestedExcessPropertyChecking.ts, 7, 25)) | ||
| >b : Symbol(b, Decl(nestedExcessPropertyChecking.ts, 8, 11)) | ||
|
|
||
| type C2 = { c: string }; | ||
| >C2 : Symbol(C2, Decl(nestedExcessPropertyChecking.ts, 8, 25)) | ||
| >c : Symbol(c, Decl(nestedExcessPropertyChecking.ts, 10, 11)) | ||
|
|
||
| const ab2: A2 & B2 = {} as C2; // Error | ||
| >ab2 : Symbol(ab2, Decl(nestedExcessPropertyChecking.ts, 12, 5)) | ||
| >A2 : Symbol(A2, Decl(nestedExcessPropertyChecking.ts, 5, 30)) | ||
| >B2 : Symbol(B2, Decl(nestedExcessPropertyChecking.ts, 7, 25)) | ||
| >C2 : Symbol(C2, Decl(nestedExcessPropertyChecking.ts, 8, 25)) | ||
|
|
||
| // Repros from #51043 | ||
|
|
||
| type OverridesInput = { | ||
| >OverridesInput : Symbol(OverridesInput, Decl(nestedExcessPropertyChecking.ts, 12, 30)) | ||
|
|
||
| someProp?: 'A' | 'B' | ||
| >someProp : Symbol(someProp, Decl(nestedExcessPropertyChecking.ts, 16, 23)) | ||
| } | ||
|
|
||
| const foo1: Partial<{ something: any }> & { variables: { | ||
| >foo1 : Symbol(foo1, Decl(nestedExcessPropertyChecking.ts, 20, 5)) | ||
| >Partial : Symbol(Partial, Decl(lib.es5.d.ts, --, --)) | ||
| >something : Symbol(something, Decl(nestedExcessPropertyChecking.ts, 20, 21)) | ||
| >variables : Symbol(variables, Decl(nestedExcessPropertyChecking.ts, 20, 43)) | ||
|
|
||
| overrides?: OverridesInput; | ||
| >overrides : Symbol(overrides, Decl(nestedExcessPropertyChecking.ts, 20, 56)) | ||
| >OverridesInput : Symbol(OverridesInput, Decl(nestedExcessPropertyChecking.ts, 12, 30)) | ||
|
|
||
| } & Partial<{ | ||
| >Partial : Symbol(Partial, Decl(lib.es5.d.ts, --, --)) | ||
|
|
||
| overrides?: OverridesInput; | ||
| >overrides : Symbol(overrides, Decl(nestedExcessPropertyChecking.ts, 22, 13)) | ||
| >OverridesInput : Symbol(OverridesInput, Decl(nestedExcessPropertyChecking.ts, 12, 30)) | ||
|
|
||
| }>} = { variables: { overrides: false } }; // Error | ||
| >variables : Symbol(variables, Decl(nestedExcessPropertyChecking.ts, 24, 7)) | ||
| >overrides : Symbol(overrides, Decl(nestedExcessPropertyChecking.ts, 24, 20)) | ||
|
|
||
|
|
||
| interface Unrelated { _?: any } | ||
| >Unrelated : Symbol(Unrelated, Decl(nestedExcessPropertyChecking.ts, 24, 42)) | ||
| >_ : Symbol(Unrelated._, Decl(nestedExcessPropertyChecking.ts, 27, 21)) | ||
|
|
||
| interface VariablesA { overrides?: OverridesInput; } | ||
| >VariablesA : Symbol(VariablesA, Decl(nestedExcessPropertyChecking.ts, 27, 31)) | ||
| >overrides : Symbol(VariablesA.overrides, Decl(nestedExcessPropertyChecking.ts, 29, 22)) | ||
| >OverridesInput : Symbol(OverridesInput, Decl(nestedExcessPropertyChecking.ts, 12, 30)) | ||
|
|
||
| interface VariablesB { overrides?: OverridesInput; } | ||
| >VariablesB : Symbol(VariablesB, Decl(nestedExcessPropertyChecking.ts, 29, 52)) | ||
| >overrides : Symbol(VariablesB.overrides, Decl(nestedExcessPropertyChecking.ts, 30, 22)) | ||
| >OverridesInput : Symbol(OverridesInput, Decl(nestedExcessPropertyChecking.ts, 12, 30)) | ||
|
|
||
| const foo2: Unrelated & { variables: VariablesA & VariablesB } = { | ||
| >foo2 : Symbol(foo2, Decl(nestedExcessPropertyChecking.ts, 32, 5)) | ||
| >Unrelated : Symbol(Unrelated, Decl(nestedExcessPropertyChecking.ts, 24, 42)) | ||
| >variables : Symbol(variables, Decl(nestedExcessPropertyChecking.ts, 32, 25)) | ||
| >VariablesA : Symbol(VariablesA, Decl(nestedExcessPropertyChecking.ts, 27, 31)) | ||
| >VariablesB : Symbol(VariablesB, Decl(nestedExcessPropertyChecking.ts, 29, 52)) | ||
|
|
||
| variables: { | ||
| >variables : Symbol(variables, Decl(nestedExcessPropertyChecking.ts, 32, 66)) | ||
|
|
||
| overrides: false // Error | ||
| >overrides : Symbol(overrides, Decl(nestedExcessPropertyChecking.ts, 33, 16)) | ||
| } | ||
| }; | ||
|
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe the problem with
isUnitTypeis that it doesn't consider enum literal types.https://github.com/microsoft/TypeScript/pull/50423/files#r954112029
So we won't catch assignability from an enum literal to a weak type with no overlap.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Enum literal types are definitely considered unit types. It's a bit subtle,
isUnitTypechecks forTypeFlags.Unit, which includesTypeFlags.Literal, which includesTypeFlags.StringLiteralandTypeFlags.NumberLiteral. For enum literal types, theTypeFlags.EnumLiteralflag is always combined with one of the latter two, soisUnitTypewill always betrue.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just to be sure, I verified both of your examples generate errors.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great! Can you add that as a test case?