-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Disable constraint reduction in intersections created by constraint hoisting #58403
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
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
136 changes: 136 additions & 0 deletions
136
tests/baselines/reference/intersectionConstraintReduction.symbols
This file contains hidden or 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,136 @@ | ||
| //// [tests/cases/compiler/intersectionConstraintReduction.ts] //// | ||
|
|
||
| === intersectionConstraintReduction.ts === | ||
| type Test1<K1 extends keyof any, K2 extends keyof any> = | ||
| >Test1 : Symbol(Test1, Decl(intersectionConstraintReduction.ts, 0, 0)) | ||
| >K1 : Symbol(K1, Decl(intersectionConstraintReduction.ts, 0, 11)) | ||
| >K2 : Symbol(K2, Decl(intersectionConstraintReduction.ts, 0, 32)) | ||
|
|
||
| MustBeKey<Extract<K1, keyof any> & K1 & K2>; | ||
| >MustBeKey : Symbol(MustBeKey, Decl(intersectionConstraintReduction.ts, 4, 48)) | ||
| >Extract : Symbol(Extract, Decl(lib.es5.d.ts, --, --)) | ||
| >K1 : Symbol(K1, Decl(intersectionConstraintReduction.ts, 0, 11)) | ||
| >K1 : Symbol(K1, Decl(intersectionConstraintReduction.ts, 0, 11)) | ||
| >K2 : Symbol(K2, Decl(intersectionConstraintReduction.ts, 0, 32)) | ||
|
|
||
| type Test2<K1 extends keyof any, K2 extends keyof any> = | ||
| >Test2 : Symbol(Test2, Decl(intersectionConstraintReduction.ts, 1, 48)) | ||
| >K1 : Symbol(K1, Decl(intersectionConstraintReduction.ts, 3, 11)) | ||
| >K2 : Symbol(K2, Decl(intersectionConstraintReduction.ts, 3, 32)) | ||
|
|
||
| MustBeKey<K1 & K2 & Extract<K1, keyof any>>; | ||
| >MustBeKey : Symbol(MustBeKey, Decl(intersectionConstraintReduction.ts, 4, 48)) | ||
| >K1 : Symbol(K1, Decl(intersectionConstraintReduction.ts, 3, 11)) | ||
| >K2 : Symbol(K2, Decl(intersectionConstraintReduction.ts, 3, 32)) | ||
| >Extract : Symbol(Extract, Decl(lib.es5.d.ts, --, --)) | ||
| >K1 : Symbol(K1, Decl(intersectionConstraintReduction.ts, 3, 11)) | ||
|
|
||
| type MustBeKey<K extends keyof any> = K; | ||
| >MustBeKey : Symbol(MustBeKey, Decl(intersectionConstraintReduction.ts, 4, 48)) | ||
| >K : Symbol(K, Decl(intersectionConstraintReduction.ts, 6, 15)) | ||
| >K : Symbol(K, Decl(intersectionConstraintReduction.ts, 6, 15)) | ||
|
|
||
| // https://github.com/microsoft/TypeScript/issues/58370 | ||
|
|
||
| type AnyKey = number | string | symbol; | ||
| >AnyKey : Symbol(AnyKey, Decl(intersectionConstraintReduction.ts, 6, 40)) | ||
|
|
||
| type ReturnTypeKeyof<Obj extends object> = Obj extends object | ||
| >ReturnTypeKeyof : Symbol(ReturnTypeKeyof, Decl(intersectionConstraintReduction.ts, 10, 39)) | ||
| >Obj : Symbol(Obj, Decl(intersectionConstraintReduction.ts, 12, 21)) | ||
| >Obj : Symbol(Obj, Decl(intersectionConstraintReduction.ts, 12, 21)) | ||
|
|
||
| ? [keyof Obj] extends [never] | ||
| >Obj : Symbol(Obj, Decl(intersectionConstraintReduction.ts, 12, 21)) | ||
|
|
||
| ? never | ||
| : { [Key in keyof Obj as string]-?: () => Key }[string] | ||
| >Key : Symbol(Key, Decl(intersectionConstraintReduction.ts, 15, 13)) | ||
| >Obj : Symbol(Obj, Decl(intersectionConstraintReduction.ts, 12, 21)) | ||
| >Key : Symbol(Key, Decl(intersectionConstraintReduction.ts, 15, 13)) | ||
|
|
||
| : never; | ||
|
|
||
| type KeyIfSignatureOfObject< | ||
| >KeyIfSignatureOfObject : Symbol(KeyIfSignatureOfObject, Decl(intersectionConstraintReduction.ts, 16, 12)) | ||
|
|
||
| Obj extends object, | ||
| >Obj : Symbol(Obj, Decl(intersectionConstraintReduction.ts, 18, 28)) | ||
|
|
||
| Key extends AnyKey, | ||
| >Key : Symbol(Key, Decl(intersectionConstraintReduction.ts, 19, 23)) | ||
| >AnyKey : Symbol(AnyKey, Decl(intersectionConstraintReduction.ts, 6, 40)) | ||
|
|
||
| ReturnTypeKeys = ReturnTypeKeyof<Obj>, | ||
| >ReturnTypeKeys : Symbol(ReturnTypeKeys, Decl(intersectionConstraintReduction.ts, 20, 23)) | ||
| >ReturnTypeKeyof : Symbol(ReturnTypeKeyof, Decl(intersectionConstraintReduction.ts, 10, 39)) | ||
| >Obj : Symbol(Obj, Decl(intersectionConstraintReduction.ts, 18, 28)) | ||
|
|
||
| > = ReturnTypeKeys extends () => Key ? ((() => Key) extends ReturnTypeKeys ? Key : never) : never; | ||
| >ReturnTypeKeys : Symbol(ReturnTypeKeys, Decl(intersectionConstraintReduction.ts, 20, 23)) | ||
| >Key : Symbol(Key, Decl(intersectionConstraintReduction.ts, 19, 23)) | ||
| >Key : Symbol(Key, Decl(intersectionConstraintReduction.ts, 19, 23)) | ||
| >ReturnTypeKeys : Symbol(ReturnTypeKeys, Decl(intersectionConstraintReduction.ts, 20, 23)) | ||
| >Key : Symbol(Key, Decl(intersectionConstraintReduction.ts, 19, 23)) | ||
|
|
||
| export type Reduced1<Obj extends object, Key extends AnyKey, Value, ObjKeys extends keyof Obj = keyof Obj> = | ||
| >Reduced1 : Symbol(Reduced1, Decl(intersectionConstraintReduction.ts, 22, 98)) | ||
| >Obj : Symbol(Obj, Decl(intersectionConstraintReduction.ts, 24, 21)) | ||
| >Key : Symbol(Key, Decl(intersectionConstraintReduction.ts, 24, 40)) | ||
| >AnyKey : Symbol(AnyKey, Decl(intersectionConstraintReduction.ts, 6, 40)) | ||
| >Value : Symbol(Value, Decl(intersectionConstraintReduction.ts, 24, 60)) | ||
| >ObjKeys : Symbol(ObjKeys, Decl(intersectionConstraintReduction.ts, 24, 67)) | ||
| >Obj : Symbol(Obj, Decl(intersectionConstraintReduction.ts, 24, 21)) | ||
| >Obj : Symbol(Obj, Decl(intersectionConstraintReduction.ts, 24, 21)) | ||
|
|
||
| Key extends KeyIfSignatureOfObject<Obj, Key> | ||
| >Key : Symbol(Key, Decl(intersectionConstraintReduction.ts, 24, 40)) | ||
| >KeyIfSignatureOfObject : Symbol(KeyIfSignatureOfObject, Decl(intersectionConstraintReduction.ts, 16, 12)) | ||
| >Obj : Symbol(Obj, Decl(intersectionConstraintReduction.ts, 24, 21)) | ||
| >Key : Symbol(Key, Decl(intersectionConstraintReduction.ts, 24, 40)) | ||
|
|
||
| ? Key extends ObjKeys | ||
| >Key : Symbol(Key, Decl(intersectionConstraintReduction.ts, 24, 40)) | ||
| >ObjKeys : Symbol(ObjKeys, Decl(intersectionConstraintReduction.ts, 24, 67)) | ||
|
|
||
| ? { [K in Key]: Value } | ||
| >K : Symbol(K, Decl(intersectionConstraintReduction.ts, 27, 17)) | ||
| >Key : Symbol(Key, Decl(intersectionConstraintReduction.ts, 24, 40)) | ||
| >Value : Symbol(Value, Decl(intersectionConstraintReduction.ts, 24, 60)) | ||
|
|
||
| : never | ||
| : never; | ||
|
|
||
| export type Reduced2<Obj extends object, Key extends AnyKey, Value, ObjKeys extends keyof Obj = keyof Obj> = | ||
| >Reduced2 : Symbol(Reduced2, Decl(intersectionConstraintReduction.ts, 29, 16)) | ||
| >Obj : Symbol(Obj, Decl(intersectionConstraintReduction.ts, 31, 21)) | ||
| >Key : Symbol(Key, Decl(intersectionConstraintReduction.ts, 31, 40)) | ||
| >AnyKey : Symbol(AnyKey, Decl(intersectionConstraintReduction.ts, 6, 40)) | ||
| >Value : Symbol(Value, Decl(intersectionConstraintReduction.ts, 31, 60)) | ||
| >ObjKeys : Symbol(ObjKeys, Decl(intersectionConstraintReduction.ts, 31, 67)) | ||
| >Obj : Symbol(Obj, Decl(intersectionConstraintReduction.ts, 31, 21)) | ||
| >Obj : Symbol(Obj, Decl(intersectionConstraintReduction.ts, 31, 21)) | ||
|
|
||
| Key extends AnyKey | ||
| >Key : Symbol(Key, Decl(intersectionConstraintReduction.ts, 31, 40)) | ||
| >AnyKey : Symbol(AnyKey, Decl(intersectionConstraintReduction.ts, 6, 40)) | ||
|
|
||
| ? Key extends KeyIfSignatureOfObject<Obj, Key> | ||
| >Key : Symbol(Key, Decl(intersectionConstraintReduction.ts, 31, 40)) | ||
| >KeyIfSignatureOfObject : Symbol(KeyIfSignatureOfObject, Decl(intersectionConstraintReduction.ts, 16, 12)) | ||
| >Obj : Symbol(Obj, Decl(intersectionConstraintReduction.ts, 31, 21)) | ||
| >Key : Symbol(Key, Decl(intersectionConstraintReduction.ts, 31, 40)) | ||
|
|
||
| ? Key extends ObjKeys | ||
| >Key : Symbol(Key, Decl(intersectionConstraintReduction.ts, 31, 40)) | ||
| >ObjKeys : Symbol(ObjKeys, Decl(intersectionConstraintReduction.ts, 31, 67)) | ||
|
|
||
| ? { [K in Key]: Value } | ||
| >K : Symbol(K, Decl(intersectionConstraintReduction.ts, 35, 20)) | ||
| >Key : Symbol(Key, Decl(intersectionConstraintReduction.ts, 31, 40)) | ||
| >Value : Symbol(Value, Decl(intersectionConstraintReduction.ts, 31, 60)) | ||
|
|
||
| : never | ||
| : never | ||
| : never; | ||
|
|
65 changes: 65 additions & 0 deletions
65
tests/baselines/reference/intersectionConstraintReduction.types
This file contains hidden or 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,65 @@ | ||
| //// [tests/cases/compiler/intersectionConstraintReduction.ts] //// | ||
|
|
||
| === intersectionConstraintReduction.ts === | ||
| type Test1<K1 extends keyof any, K2 extends keyof any> = | ||
| >Test1 : Extract<K1, string | number | symbol> & K1 & K2 | ||
| > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
|
||
| MustBeKey<Extract<K1, keyof any> & K1 & K2>; | ||
|
|
||
| type Test2<K1 extends keyof any, K2 extends keyof any> = | ||
| >Test2 : K1 & K2 & Extract<K1, string | number | symbol> | ||
| > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
|
||
| MustBeKey<K1 & K2 & Extract<K1, keyof any>>; | ||
|
|
||
| type MustBeKey<K extends keyof any> = K; | ||
| >MustBeKey : K | ||
| > : ^ | ||
|
|
||
| // https://github.com/microsoft/TypeScript/issues/58370 | ||
|
|
||
| type AnyKey = number | string | symbol; | ||
| >AnyKey : AnyKey | ||
| > : ^^^^^^ | ||
|
|
||
| type ReturnTypeKeyof<Obj extends object> = Obj extends object | ||
| >ReturnTypeKeyof : ReturnTypeKeyof<Obj> | ||
| > : ^^^^^^^^^^^^^^^^^^^^ | ||
|
|
||
| ? [keyof Obj] extends [never] | ||
| ? never | ||
| : { [Key in keyof Obj as string]-?: () => Key }[string] | ||
| : never; | ||
|
|
||
| type KeyIfSignatureOfObject< | ||
| >KeyIfSignatureOfObject : KeyIfSignatureOfObject<Obj, Key, ReturnTypeKeys> | ||
| > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
|
||
| Obj extends object, | ||
| Key extends AnyKey, | ||
| ReturnTypeKeys = ReturnTypeKeyof<Obj>, | ||
| > = ReturnTypeKeys extends () => Key ? ((() => Key) extends ReturnTypeKeys ? Key : never) : never; | ||
|
|
||
| export type Reduced1<Obj extends object, Key extends AnyKey, Value, ObjKeys extends keyof Obj = keyof Obj> = | ||
| >Reduced1 : Reduced1<Obj, Key, Value, ObjKeys> | ||
| > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
|
||
| Key extends KeyIfSignatureOfObject<Obj, Key> | ||
| ? Key extends ObjKeys | ||
| ? { [K in Key]: Value } | ||
| : never | ||
| : never; | ||
|
|
||
| export type Reduced2<Obj extends object, Key extends AnyKey, Value, ObjKeys extends keyof Obj = keyof Obj> = | ||
| >Reduced2 : Reduced2<Obj, Key, Value, ObjKeys> | ||
| > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
|
||
| Key extends AnyKey | ||
| ? Key extends KeyIfSignatureOfObject<Obj, Key> | ||
| ? Key extends ObjKeys | ||
| ? { [K in Key]: Value } | ||
| : never | ||
| : never | ||
| : never; | ||
|
|
This file contains hidden or 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
This file contains hidden or 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
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.
Is this flag something that should be required, in case we forget to pass it? Happens all the time for the relation intersection state...
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.
No, it's exceedingly rare to need any of these flags (only one place for each flag in entire code base), so I think it's preferable to leave it optional.