-
Notifications
You must be signed in to change notification settings - Fork 13.4k
fix(Intl): make Intl.Collator.compare a getter that returns a bound function (#62048) #62052
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
Open
ahsansheikh94
wants to merge
2
commits into
microsoft:main
Choose a base branch
from
ahsansheikh94:fix-intl-collator-compare-type
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 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
44 changes: 44 additions & 0 deletions
44
tests/baselines/reference/collatorCompareBoundFunction.errors.txt
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,44 @@ | ||
| error TS2318: Cannot find global type 'Array'. | ||
| error TS2318: Cannot find global type 'Boolean'. | ||
| error TS2318: Cannot find global type 'CallableFunction'. | ||
| error TS2318: Cannot find global type 'Function'. | ||
| error TS2318: Cannot find global type 'IArguments'. | ||
| error TS2318: Cannot find global type 'NewableFunction'. | ||
| error TS2318: Cannot find global type 'Number'. | ||
| error TS2318: Cannot find global type 'Object'. | ||
| error TS2318: Cannot find global type 'RegExp'. | ||
| error TS2318: Cannot find global type 'String'. | ||
| collatorCompareBoundFunction.ts(1,27): error TS2339: Property 'Collator' does not exist on type 'typeof Intl'. | ||
| collatorCompareBoundFunction.ts(14,32): error TS2339: Property 'sort' does not exist on type '{}'. | ||
|
|
||
|
|
||
| !!! error TS2318: Cannot find global type 'Array'. | ||
| !!! error TS2318: Cannot find global type 'Boolean'. | ||
| !!! error TS2318: Cannot find global type 'CallableFunction'. | ||
| !!! error TS2318: Cannot find global type 'Function'. | ||
| !!! error TS2318: Cannot find global type 'IArguments'. | ||
| !!! error TS2318: Cannot find global type 'NewableFunction'. | ||
| !!! error TS2318: Cannot find global type 'Number'. | ||
| !!! error TS2318: Cannot find global type 'Object'. | ||
| !!! error TS2318: Cannot find global type 'RegExp'. | ||
| !!! error TS2318: Cannot find global type 'String'. | ||
| ==== collatorCompareBoundFunction.ts (2 errors) ==== | ||
| const collator = new Intl.Collator(); | ||
| ~~~~~~~~ | ||
| !!! error TS2339: Property 'Collator' does not exist on type 'typeof Intl'. | ||
|
|
||
| // Should be usable as a function with no dynamic `this` | ||
| const cmp: (a: string, b: string) => number = collator.compare; | ||
|
|
||
| // Function expecting a `this: void` bound compare function | ||
| function useCompare(fn: (this: void, a: string, b: string) => number): number { | ||
| return fn("a", "b"); | ||
| } | ||
|
|
||
| useCompare(collator.compare); | ||
|
|
||
| // Should work with Array.prototype.sort | ||
| const sorted = ["z", "ä", "a"].sort(collator.compare); | ||
| ~~~~ | ||
| !!! error TS2339: Property 'sort' does not exist on type '{}'. | ||
|
|
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,31 @@ | ||
| //// [tests/cases/conformance/intl/collatorCompareBoundFunction.ts] //// | ||
|
|
||
| //// [collatorCompareBoundFunction.ts] | ||
| const collator = new Intl.Collator(); | ||
|
|
||
| // Should be usable as a function with no dynamic `this` | ||
| const cmp: (a: string, b: string) => number = collator.compare; | ||
|
|
||
| // Function expecting a `this: void` bound compare function | ||
| function useCompare(fn: (this: void, a: string, b: string) => number): number { | ||
| return fn("a", "b"); | ||
| } | ||
|
|
||
| useCompare(collator.compare); | ||
|
|
||
| // Should work with Array.prototype.sort | ||
| const sorted = ["z", "ä", "a"].sort(collator.compare); | ||
|
|
||
|
|
||
| //// [collatorCompareBoundFunction.js] | ||
| "use strict"; | ||
| const collator = new Intl.Collator(); | ||
| // Should be usable as a function with no dynamic `this` | ||
| const cmp = collator.compare; | ||
| // Function expecting a `this: void` bound compare function | ||
| function useCompare(fn) { | ||
| return fn("a", "b"); | ||
| } | ||
| useCompare(collator.compare); | ||
| // Should work with Array.prototype.sort | ||
| const sorted = ["z", "ä", "a"].sort(collator.compare); |
35 changes: 35 additions & 0 deletions
35
tests/baselines/reference/collatorCompareBoundFunction.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,35 @@ | ||
| //// [tests/cases/conformance/intl/collatorCompareBoundFunction.ts] //// | ||
|
|
||
| === collatorCompareBoundFunction.ts === | ||
| const collator = new Intl.Collator(); | ||
| >collator : Symbol(collator, Decl(collatorCompareBoundFunction.ts, 0, 5)) | ||
| >Intl : Symbol(Intl, Decl(lib.es2022.intl.d.ts, --, --)) | ||
|
|
||
| // Should be usable as a function with no dynamic `this` | ||
| const cmp: (a: string, b: string) => number = collator.compare; | ||
| >cmp : Symbol(cmp, Decl(collatorCompareBoundFunction.ts, 3, 5)) | ||
| >a : Symbol(a, Decl(collatorCompareBoundFunction.ts, 3, 12)) | ||
| >b : Symbol(b, Decl(collatorCompareBoundFunction.ts, 3, 22)) | ||
| >collator : Symbol(collator, Decl(collatorCompareBoundFunction.ts, 0, 5)) | ||
|
|
||
| // Function expecting a `this: void` bound compare function | ||
| function useCompare(fn: (this: void, a: string, b: string) => number): number { | ||
| >useCompare : Symbol(useCompare, Decl(collatorCompareBoundFunction.ts, 3, 63)) | ||
| >fn : Symbol(fn, Decl(collatorCompareBoundFunction.ts, 6, 20)) | ||
| >this : Symbol(this, Decl(collatorCompareBoundFunction.ts, 6, 25)) | ||
| >a : Symbol(a, Decl(collatorCompareBoundFunction.ts, 6, 36)) | ||
| >b : Symbol(b, Decl(collatorCompareBoundFunction.ts, 6, 47)) | ||
|
|
||
| return fn("a", "b"); | ||
| >fn : Symbol(fn, Decl(collatorCompareBoundFunction.ts, 6, 20)) | ||
| } | ||
|
|
||
| useCompare(collator.compare); | ||
| >useCompare : Symbol(useCompare, Decl(collatorCompareBoundFunction.ts, 3, 63)) | ||
| >collator : Symbol(collator, Decl(collatorCompareBoundFunction.ts, 0, 5)) | ||
|
|
||
| // Should work with Array.prototype.sort | ||
| const sorted = ["z", "ä", "a"].sort(collator.compare); | ||
| >sorted : Symbol(sorted, Decl(collatorCompareBoundFunction.ts, 13, 5)) | ||
| >collator : Symbol(collator, Decl(collatorCompareBoundFunction.ts, 0, 5)) | ||
|
|
91 changes: 91 additions & 0 deletions
91
tests/baselines/reference/collatorCompareBoundFunction.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,91 @@ | ||
| //// [tests/cases/conformance/intl/collatorCompareBoundFunction.ts] //// | ||
|
|
||
| === collatorCompareBoundFunction.ts === | ||
| const collator = new Intl.Collator(); | ||
| >collator : any | ||
| > : ^^^ | ||
| >new Intl.Collator() : any | ||
| > : ^^^ | ||
| >Intl.Collator : any | ||
| > : ^^^ | ||
| >Intl : typeof Intl | ||
| > : ^^^^^^^^^^^ | ||
| >Collator : any | ||
| > : ^^^ | ||
|
|
||
| // Should be usable as a function with no dynamic `this` | ||
| const cmp: (a: string, b: string) => number = collator.compare; | ||
| >cmp : (a: string, b: string) => number | ||
| > : ^ ^^ ^^ ^^ ^^^^^ | ||
| >a : string | ||
| > : ^^^^^^ | ||
| >b : string | ||
| > : ^^^^^^ | ||
| >collator.compare : any | ||
| > : ^^^ | ||
| >collator : any | ||
| > : ^^^ | ||
| >compare : any | ||
| > : ^^^ | ||
|
|
||
| // Function expecting a `this: void` bound compare function | ||
| function useCompare(fn: (this: void, a: string, b: string) => number): number { | ||
| >useCompare : (fn: (this: void, a: string, b: string) => number) => number | ||
| > : ^ ^^ ^^^^^ | ||
| >fn : (this: void, a: string, b: string) => number | ||
| > : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^ | ||
| >this : void | ||
| > : ^^^^ | ||
| >a : string | ||
| > : ^^^^^^ | ||
| >b : string | ||
| > : ^^^^^^ | ||
|
|
||
| return fn("a", "b"); | ||
| >fn("a", "b") : number | ||
| > : ^^^^^^ | ||
| >fn : (this: void, a: string, b: string) => number | ||
| > : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^ | ||
| >"a" : "a" | ||
| > : ^^^ | ||
| >"b" : "b" | ||
| > : ^^^ | ||
| } | ||
|
|
||
| useCompare(collator.compare); | ||
| >useCompare(collator.compare) : number | ||
| > : ^^^^^^ | ||
| >useCompare : (fn: (this: void, a: string, b: string) => number) => number | ||
| > : ^ ^^ ^^^^^ | ||
| >collator.compare : any | ||
| > : ^^^ | ||
| >collator : any | ||
| > : ^^^ | ||
| >compare : any | ||
| > : ^^^ | ||
|
|
||
| // Should work with Array.prototype.sort | ||
| const sorted = ["z", "ä", "a"].sort(collator.compare); | ||
| >sorted : any | ||
| > : ^^^ | ||
| >["z", "ä", "a"].sort(collator.compare) : any | ||
| > : ^^^ | ||
| >["z", "ä", "a"].sort : any | ||
| > : ^^^ | ||
| >["z", "ä", "a"] : {} | ||
| > : ^^ | ||
| >"z" : "z" | ||
| > : ^^^ | ||
| >"ä" : "ä" | ||
| > : ^^^ | ||
| >"a" : "a" | ||
| > : ^^^ | ||
| >sort : any | ||
| > : ^^^ | ||
| >collator.compare : any | ||
| > : ^^^ | ||
| >collator : any | ||
| > : ^^^ | ||
| >compare : any | ||
| > : ^^^ | ||
|
|
18 changes: 18 additions & 0 deletions
18
tests/cases/conformance/intl/collatorCompareBoundFunction.ts
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,18 @@ | ||
| // @target: es2022 | ||
| // @lib: es2022.intl | ||
| // @strict: true | ||
|
|
||
| const collator = new Intl.Collator(); | ||
|
|
||
| // Should be usable as a function with no dynamic `this` | ||
| const cmp: (a: string, b: string) => number = collator.compare; | ||
|
|
||
| // Function expecting a `this: void` bound compare function | ||
| function useCompare(fn: (this: void, a: string, b: string) => number): number { | ||
| return fn("a", "b"); | ||
| } | ||
|
|
||
| useCompare(collator.compare); | ||
|
|
||
| // Should work with Array.prototype.sort | ||
| const sorted = ["z", "ä", "a"].sort(collator.compare); |
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.
es2022.intldoesn't reference lib.es5, so Collator isn't actually defined in your test script (check the baselines).Either change this to
or just get rid of the lib option entirely, and use the default.