tpl/transform: Revert unmarshal whitespace removal

Fixes #12977
This commit is contained in:
Joe Mooring 2024-10-21 17:46:53 -07:00 committed by Bjørn Erik Pedersen
parent 31d19b505d
commit 5bbe95f9c5
2 changed files with 20 additions and 3 deletions

View file

@ -248,7 +248,7 @@ func TestToMathMacros(t *testing.T) {
-- hugo.toml -- -- hugo.toml --
disableKinds = ['page','rss','section','sitemap','taxonomy','term'] disableKinds = ['page','rss','section','sitemap','taxonomy','term']
-- layouts/index.html -- -- layouts/index.html --
{{ $macros := dict {{ $macros := dict
"\\addBar" "\\bar{#1}" "\\addBar" "\\bar{#1}"
"\\bold" "\\mathbf{#1}" "\\bold" "\\mathbf{#1}"
}} }}
@ -261,3 +261,21 @@ disableKinds = ['page','rss','section','sitemap','taxonomy','term']
<mi>y</mi> <mi>y</mi>
`) `)
} }
// Issue #12977
func TestUnmarshalWithIndentedYAML(t *testing.T) {
t.Parallel()
files := `
-- hugo.toml --
disableKinds = ['page','rss','section','sitemap','taxonomy','term']
-- layouts/index.html --
{{ $yaml := "\n a:\n b: 1\n c:\n d: 2\n" }}
{{ $yaml | transform.Unmarshal | encoding.Jsonify }}
`
b := hugolib.Test(t, files)
b.AssertFileExists("public/index.html", true)
b.AssertFileContent("public/index.html", `{"a":{"b":1},"c":{"d":2}}`)
}

View file

@ -112,9 +112,8 @@ func (ns *Namespace) Unmarshal(args ...any) (any, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("type %T not supported", data) return nil, fmt.Errorf("type %T not supported", data)
} }
dataStr = strings.TrimSpace(dataStr)
if dataStr == "" { if strings.TrimSpace(dataStr) == "" {
return nil, nil return nil, nil
} }