commands: Handle floats without decimals in hugo config

Updates #11345
This commit is contained in:
Bjørn Erik Pedersen 2023-08-07 19:56:02 +02:00
parent d139f30234
commit 7d74cd0cc8
2 changed files with 27 additions and 0 deletions

View file

@ -23,6 +23,7 @@ import (
"time" "time"
"github.com/bep/simplecobra" "github.com/bep/simplecobra"
"github.com/gohugoio/hugo/common/maps"
"github.com/gohugoio/hugo/config/allconfig" "github.com/gohugoio/hugo/config/allconfig"
"github.com/gohugoio/hugo/modules" "github.com/gohugoio/hugo/modules"
"github.com/gohugoio/hugo/parser" "github.com/gohugoio/hugo/parser"
@ -92,6 +93,7 @@ func (c *configCommand) Run(ctx context.Context, cd *simplecobra.Commandeer, arg
if err := json.Unmarshal(buf.Bytes(), &m); err != nil { if err := json.Unmarshal(buf.Bytes(), &m); err != nil {
return err return err
} }
maps.ConvertFloat64WithNoDecimalsToInt(m)
switch format { switch format {
case "yaml": case "yaml":
return parser.InterfaceToConfig(m, metadecoders.YAML, os.Stdout) return parser.InterfaceToConfig(m, metadecoders.YAML, os.Stdout)

View file

@ -210,3 +210,28 @@ func (r KeyRenamer) renamePath(parentKeyPath string, m map[string]any) {
} }
} }
} }
// ConvertFloat64WithNoDecimalsToInt converts float64 values with no decimals to int recursively.
func ConvertFloat64WithNoDecimalsToInt(m map[string]any) {
for k, v := range m {
switch vv := v.(type) {
case float64:
if v == float64(int64(vv)) {
m[k] = int64(vv)
}
case map[string]any:
ConvertFloat64WithNoDecimalsToInt(vv)
case []any:
for i, vvv := range vv {
switch vvvv := vvv.(type) {
case float64:
if vvv == float64(int64(vvvv)) {
vv[i] = int64(vvvv)
}
case map[string]any:
ConvertFloat64WithNoDecimalsToInt(vvvv)
}
}
}
}
}