package/otto
1
0
Fork 0
mirror of https://github.com/robertkrimen/otto.git synced 2025-12-24 12:58:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: number locale support (#472)

Browse Source 
Add support for Number.toLocaleString() which was previously just using
toString.

Default locale is: en-US

Fixes #285
This commit is contained in:
Steven Hartland
2022-11-29 12:57:48 +00:00
committed by GitHub
parent 93fb47cccc
commit 7de4257c77
7 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
array_test.go
View File

@@ -107,7 +107,7 @@ func TestArray_toLocaleString(t *testing.T) {
test(`
[ 3.14159, "abc", undefined, new Date(0) ].toLocaleString();
`, "3.14159,abc,,1970-01-01 00:00:00")
`, "3.142,abc,,1970-01-01 00:00:00")
test(`raise:
[ { toLocaleString: undefined } ].toLocaleString();

14
builtin_number.go
View File

@@ -3,6 +3,10 @@ package otto
import (
"math"
"strconv"
"golang.org/x/text/language"
"golang.org/x/text/message"
"golang.org/x/text/number"
)
// Number
@@ -96,5 +100,13 @@ func builtinNumber_isNaN(call FunctionCall) Value {
}
func builtinNumber_toLocaleString(call FunctionCall) Value {
return builtinNumber_toString(call)
value := call.thisClassObject(classNumber).primitiveValue()
locale := call.Argument(0)
lang := defaultLanguage
if locale.IsDefined() {
lang = language.MustParse(locale.string())
}
p := message.NewPrinter(lang)
return toValue_string(p.Sprintf("%v", number.Decimal(value.value)))
}

1
go.mod
View File

@@ -4,6 +4,7 @@ go 1.18
require (
github.com/stretchr/testify v1.8.1
golang.org/x/text v0.4.0
gopkg.in/readline.v1 v1.0.0-20160726135117-62c6fe619375
gopkg.in/sourcemap.v1 v1.0.5
)

2
go.sum
View File

@@ -14,6 +14,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/readline.v1 v1.0.0-20160726135117-62c6fe619375 h1:hPki/oSSWOLiI9Gc9jyIoj33O3j29fUc9PlLha2yDj0=

9
issue_test.go
View File

@@ -1122,3 +1122,12 @@ func Test_issue177(t *testing.T) {
require.NoError(t, err)
require.Equal(t, float64(9), exp)
}
func Test_issue285(t *testing.T) {
vm := New()
val, err := vm.Run(`(1451).toLocaleString('en-US')`)
require.NoError(t, err)
exp, err := val.Export()
require.NoError(t, err)
require.Equal(t, "1,451", exp)
}

7
locale.go Normal file
View File

@@ -0,0 +1,7 @@
package otto
import "golang.org/x/text/language"
var (
defaultLanguage = language.MustParse("en-US")
)

8
number_test.go
View File

@@ -136,11 +136,11 @@ func TestNumber_toLocaleString(t *testing.T) {
test(`
[
new Number(451).toLocaleString(),
new Number(451).toLocaleString(10),
new Number(451).toLocaleString(8)
new Number(4510).toLocaleString(),
new Number(4510).toLocaleString('en-US'),
new Number(4510).toLocaleString('nl-NL')
];
`, "451,451,703")
`, "4,510,4,510,4.510")
})
}