-
Notifications
You must be signed in to change notification settings - Fork 12.5k
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
add types for set methods proposal #57230
Merged
Merged
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
b1ea83a
add types for set methods proposal
bakkot d9efe96
run/commit all baselines
bakkot 82378a9
update types
bakkot 6239762
update baselines
bakkot 6ceb395
fix description of symmetricDifference
bakkot 9e5aca4
fix type for keys
bakkot 6754d3b
Merge branch 'main' into set-methods
bakkot b523126
update baseline
bakkot 41aea33
add new methods to ReadonlySet
bakkot 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 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 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 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 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 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 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 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,111 @@ | ||
| setMethods.ts(13,17): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'SetLike<number>'. | ||
| Type 'undefined[]' is missing the following properties from type 'SetLike<number>': has, size | ||
| setMethods.ts(15,17): error TS2345: Argument of type 'Set<string>' is not assignable to parameter of type 'SetLike<number>'. | ||
| The types returned by 'keys()[Symbol.iterator]().next(...)' are incompatible between these types. | ||
| Type 'IteratorResult<string, any>' is not assignable to type 'IteratorResult<number, any>'. | ||
| Type 'IteratorYieldResult<string>' is not assignable to type 'IteratorResult<number, any>'. | ||
| Type 'IteratorYieldResult<string>' is not assignable to type 'IteratorYieldResult<number>'. | ||
| Type 'string' is not assignable to type 'number'. | ||
| setMethods.ts(19,24): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'SetLike<number>'. | ||
| setMethods.ts(21,24): error TS2345: Argument of type 'Set<string>' is not assignable to parameter of type 'SetLike<number>'. | ||
| setMethods.ts(25,22): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'SetLike<number>'. | ||
| setMethods.ts(27,22): error TS2345: Argument of type 'Set<string>' is not assignable to parameter of type 'SetLike<number>'. | ||
| setMethods.ts(31,31): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'SetLike<number>'. | ||
| setMethods.ts(33,31): error TS2345: Argument of type 'Set<string>' is not assignable to parameter of type 'SetLike<number>'. | ||
| setMethods.ts(37,22): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'SetLike<number>'. | ||
| setMethods.ts(39,22): error TS2345: Argument of type 'Set<string>' is not assignable to parameter of type 'SetLike<number>'. | ||
| setMethods.ts(43,24): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'SetLike<number>'. | ||
| setMethods.ts(45,24): error TS2345: Argument of type 'Set<string>' is not assignable to parameter of type 'SetLike<number>'. | ||
| setMethods.ts(49,26): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'SetLike<number>'. | ||
| setMethods.ts(51,26): error TS2345: Argument of type 'Set<string>' is not assignable to parameter of type 'SetLike<number>'. | ||
|
|
||
|
|
||
| ==== setMethods.ts (14 errors) ==== | ||
| let numberSet = new Set([0, 1, 2]); | ||
|
|
||
| let stringSet = new Set(["a", "b"]); | ||
|
|
||
| let numberMap = new Map([[4, {}], [5, {}]]); | ||
|
|
||
| let numberSetLike = { | ||
| size: 1, | ||
| *keys() { yield 3 }, | ||
| has(x) { return x === 3 }, | ||
| }; | ||
|
|
||
| numberSet.union([]); | ||
| ~~ | ||
| !!! error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'SetLike<number>'. | ||
| !!! error TS2345: Type 'undefined[]' is missing the following properties from type 'SetLike<number>': has, size | ||
| numberSet.union(new Set); | ||
| numberSet.union(stringSet); | ||
| ~~~~~~~~~ | ||
| !!! error TS2345: Argument of type 'Set<string>' is not assignable to parameter of type 'SetLike<number>'. | ||
| !!! error TS2345: The types returned by 'keys()[Symbol.iterator]().next(...)' are incompatible between these types. | ||
| !!! error TS2345: Type 'IteratorResult<string, any>' is not assignable to type 'IteratorResult<number, any>'. | ||
| !!! error TS2345: Type 'IteratorYieldResult<string>' is not assignable to type 'IteratorResult<number, any>'. | ||
| !!! error TS2345: Type 'IteratorYieldResult<string>' is not assignable to type 'IteratorYieldResult<number>'. | ||
| !!! error TS2345: Type 'string' is not assignable to type 'number'. | ||
| numberSet.union(numberMap); | ||
| numberSet.union(numberSetLike); | ||
|
|
||
| numberSet.intersection([]); | ||
| ~~ | ||
| !!! error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'SetLike<number>'. | ||
| numberSet.intersection(new Set); | ||
| numberSet.intersection(stringSet); | ||
| ~~~~~~~~~ | ||
| !!! error TS2345: Argument of type 'Set<string>' is not assignable to parameter of type 'SetLike<number>'. | ||
| numberSet.intersection(numberMap); | ||
| numberSet.intersection(numberSetLike); | ||
|
|
||
| numberSet.difference([]); | ||
| ~~ | ||
| !!! error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'SetLike<number>'. | ||
| numberSet.difference(new Set); | ||
| numberSet.difference(stringSet); | ||
| ~~~~~~~~~ | ||
| !!! error TS2345: Argument of type 'Set<string>' is not assignable to parameter of type 'SetLike<number>'. | ||
| numberSet.difference(numberMap); | ||
| numberSet.difference(numberSetLike); | ||
|
|
||
| numberSet.symmetricDifference([]); | ||
| ~~ | ||
| !!! error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'SetLike<number>'. | ||
| numberSet.symmetricDifference(new Set); | ||
| numberSet.symmetricDifference(stringSet); | ||
| ~~~~~~~~~ | ||
| !!! error TS2345: Argument of type 'Set<string>' is not assignable to parameter of type 'SetLike<number>'. | ||
| numberSet.symmetricDifference(numberMap); | ||
| numberSet.symmetricDifference(numberSetLike); | ||
|
|
||
| numberSet.isSubsetOf([]); | ||
| ~~ | ||
| !!! error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'SetLike<number>'. | ||
| numberSet.isSubsetOf(new Set); | ||
| numberSet.isSubsetOf(stringSet); | ||
| ~~~~~~~~~ | ||
| !!! error TS2345: Argument of type 'Set<string>' is not assignable to parameter of type 'SetLike<number>'. | ||
| numberSet.isSubsetOf(numberMap); | ||
| numberSet.isSubsetOf(numberSetLike); | ||
|
|
||
| numberSet.isSupersetOf([]); | ||
| ~~ | ||
| !!! error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'SetLike<number>'. | ||
| numberSet.isSupersetOf(new Set); | ||
| numberSet.isSupersetOf(stringSet); | ||
| ~~~~~~~~~ | ||
| !!! error TS2345: Argument of type 'Set<string>' is not assignable to parameter of type 'SetLike<number>'. | ||
| numberSet.isSupersetOf(numberMap); | ||
| numberSet.isSupersetOf(numberSetLike); | ||
|
|
||
| numberSet.isDisjointFrom([]); | ||
| ~~ | ||
| !!! error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'SetLike<number>'. | ||
| numberSet.isDisjointFrom(new Set); | ||
| numberSet.isDisjointFrom(stringSet); | ||
| ~~~~~~~~~ | ||
| !!! error TS2345: Argument of type 'Set<string>' is not assignable to parameter of type 'SetLike<number>'. | ||
| numberSet.isDisjointFrom(numberMap); | ||
| numberSet.isDisjointFrom(numberSetLike); | ||
|
|
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,102 @@ | ||
| //// [tests/cases/compiler/setMethods.ts] //// | ||
|
|
||
| //// [setMethods.ts] | ||
| let numberSet = new Set([0, 1, 2]); | ||
|
|
||
| let stringSet = new Set(["a", "b"]); | ||
|
|
||
| let numberMap = new Map([[4, {}], [5, {}]]); | ||
|
|
||
| let numberSetLike = { | ||
| size: 1, | ||
| *keys() { yield 3 }, | ||
| has(x) { return x === 3 }, | ||
| }; | ||
|
|
||
| numberSet.union([]); | ||
| numberSet.union(new Set); | ||
| numberSet.union(stringSet); | ||
| numberSet.union(numberMap); | ||
| numberSet.union(numberSetLike); | ||
|
|
||
| numberSet.intersection([]); | ||
| numberSet.intersection(new Set); | ||
| numberSet.intersection(stringSet); | ||
| numberSet.intersection(numberMap); | ||
| numberSet.intersection(numberSetLike); | ||
|
|
||
| numberSet.difference([]); | ||
| numberSet.difference(new Set); | ||
| numberSet.difference(stringSet); | ||
| numberSet.difference(numberMap); | ||
| numberSet.difference(numberSetLike); | ||
|
|
||
| numberSet.symmetricDifference([]); | ||
| numberSet.symmetricDifference(new Set); | ||
| numberSet.symmetricDifference(stringSet); | ||
| numberSet.symmetricDifference(numberMap); | ||
| numberSet.symmetricDifference(numberSetLike); | ||
|
|
||
| numberSet.isSubsetOf([]); | ||
| numberSet.isSubsetOf(new Set); | ||
| numberSet.isSubsetOf(stringSet); | ||
| numberSet.isSubsetOf(numberMap); | ||
| numberSet.isSubsetOf(numberSetLike); | ||
|
|
||
| numberSet.isSupersetOf([]); | ||
| numberSet.isSupersetOf(new Set); | ||
| numberSet.isSupersetOf(stringSet); | ||
| numberSet.isSupersetOf(numberMap); | ||
| numberSet.isSupersetOf(numberSetLike); | ||
|
|
||
| numberSet.isDisjointFrom([]); | ||
| numberSet.isDisjointFrom(new Set); | ||
| numberSet.isDisjointFrom(stringSet); | ||
| numberSet.isDisjointFrom(numberMap); | ||
| numberSet.isDisjointFrom(numberSetLike); | ||
|
|
||
|
|
||
| //// [setMethods.js] | ||
| let numberSet = new Set([0, 1, 2]); | ||
| let stringSet = new Set(["a", "b"]); | ||
| let numberMap = new Map([[4, {}], [5, {}]]); | ||
| let numberSetLike = { | ||
| size: 1, | ||
| *keys() { yield 3; }, | ||
| has(x) { return x === 3; }, | ||
| }; | ||
| numberSet.union([]); | ||
| numberSet.union(new Set); | ||
| numberSet.union(stringSet); | ||
| numberSet.union(numberMap); | ||
| numberSet.union(numberSetLike); | ||
| numberSet.intersection([]); | ||
| numberSet.intersection(new Set); | ||
| numberSet.intersection(stringSet); | ||
| numberSet.intersection(numberMap); | ||
| numberSet.intersection(numberSetLike); | ||
| numberSet.difference([]); | ||
| numberSet.difference(new Set); | ||
| numberSet.difference(stringSet); | ||
| numberSet.difference(numberMap); | ||
| numberSet.difference(numberSetLike); | ||
| numberSet.symmetricDifference([]); | ||
| numberSet.symmetricDifference(new Set); | ||
| numberSet.symmetricDifference(stringSet); | ||
| numberSet.symmetricDifference(numberMap); | ||
| numberSet.symmetricDifference(numberSetLike); | ||
| numberSet.isSubsetOf([]); | ||
| numberSet.isSubsetOf(new Set); | ||
| numberSet.isSubsetOf(stringSet); | ||
| numberSet.isSubsetOf(numberMap); | ||
| numberSet.isSubsetOf(numberSetLike); | ||
| numberSet.isSupersetOf([]); | ||
| numberSet.isSupersetOf(new Set); | ||
| numberSet.isSupersetOf(stringSet); | ||
| numberSet.isSupersetOf(numberMap); | ||
| numberSet.isSupersetOf(numberSetLike); | ||
| numberSet.isDisjointFrom([]); | ||
| numberSet.isDisjointFrom(new Set); | ||
| numberSet.isDisjointFrom(stringSet); | ||
| numberSet.isDisjointFrom(numberMap); | ||
| numberSet.isDisjointFrom(numberSetLike); |
Oops, something went wrong.
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.
At first glance, this looks a lot like
ReadonlySet. I know that these methods only need a subset of functionality, but it might be worth using that instead.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.
You need the
keysmethod, so I don't think that works unless that gets added ReadonlySet as well. (And users shouldn't have to implementforEachfor their own set-likes, though that isn't as big a deal since that probably doesn't come up as much.)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.
Wait, no,
keysis already there, just in a different file, whoops.Still, I think it would be kind of annoying not to be able to do
set.union({ keys(){ return array.keys() }, size: array.size, has: () => {} })or similar. Not the end of the world, but I'd prefer to keepSetLikeunless there's a reason to switch toReadonlySet.