Skip to content

Commit

Permalink
Add -use-number flag to jsontoml util
Browse files Browse the repository at this point in the history
  • Loading branch information
dangra committed Jan 23, 2024
1 parent c447b2f commit 6f8daf8
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 5 deletions.
13 changes: 12 additions & 1 deletion cmd/jsontoml/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package main

import (
"encoding/json"
"flag"
"io"

"github.com/pelletier/go-toml/v2"
Expand All @@ -33,6 +34,10 @@ Reading from a file:
jsontoml file.json > file.toml
`

var (
useNumber = flag.Bool("use-number", false, "Tells the json decoder to unmarshal numbers into json.Number type instead of float64")
)

func main() {
p := cli.Program{
Usage: usage,
Expand All @@ -45,11 +50,17 @@ func convert(r io.Reader, w io.Writer) error {
var v interface{}

d := json.NewDecoder(r)
e := toml.NewEncoder(w)

if useNumber != nil && *useNumber {
d.UseNumber()
e.SetJsonNumber(true)
}

err := d.Decode(&v)
if err != nil {
return err
}

e := toml.NewEncoder(w)
return e.Encode(v)
}
27 changes: 23 additions & 4 deletions cmd/jsontoml/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ import (

func TestConvert(t *testing.T) {
examples := []struct {
name string
input string
expected string
errors bool
name string
input string
expected string
errors bool
useNumber bool
}{
{
name: "valid json",
Expand All @@ -26,6 +27,19 @@ func TestConvert(t *testing.T) {
}`,
expected: `[mytoml]
a = 42.0
`,
},
{
name: "use json number",
useNumber: true,
input: `
{
"mytoml": {
"a": 42
}
}`,
expected: `[mytoml]
a = 42
`,
},
{
Expand All @@ -35,8 +49,13 @@ a = 42.0
},
}

trueValue := true

for _, e := range examples {
b := new(bytes.Buffer)
if e.useNumber {
useNumber = &trueValue
}
err := convert(strings.NewReader(e.input), b)
if e.errors {
require.Error(t, err)
Expand Down

0 comments on commit 6f8daf8

Please sign in to comment.