tpl/transform: Include options in cache key

See #5555

diff --git a/parser/metadecoders/decoder.go b/parser/metadecoders/decoder.go
index 2f3c27d4571f6d2e66c4e9665c6ae984d08238a1..b2d8307b632f14f15fe6c355452bd02a976a4ad7 100644 (file)
--- a/parser/metadecoders/decoder.go
+++ b/parser/metadecoders/decoder.go
@@ -18,6 +18,7 @@ import (
        "encoding/csv"
        "encoding/json"
        "fmt"
+       "strings"
 
        "github.com/gohugoio/hugo/common/herrors"
 
@@ -39,6 +40,14 @@ type Decoder struct {
        Comment rune
 }
 
+// OptionsKey is used in cache keys.
+func (d Decoder) OptionsKey() string {
+       var sb strings.Builder
+       sb.WriteRune(d.Delimiter)
+       sb.WriteRune(d.Comment)
+       return sb.String()
+}
+
 // Default is a Decoder in its default configuration.
 var Default = Decoder{
        Delimiter: ',',

diff --git a/tpl/transform/unmarshal.go b/tpl/transform/unmarshal.go
index bc83869756e502fdfedbe6dfe9a190549b77a3f9..c27a21a9e7625ce71748b6a216383efeea2b4b75 100644 (file)
--- a/tpl/transform/unmarshal.go
+++ b/tpl/transform/unmarshal.go
@@ -62,6 +62,10 @@ func (ns *Namespace) Unmarshal(args ...interface{}) (interface{}, error) {
                        return nil, errors.New("no Key set in Resource")
                }
 
+               if decoder != metadecoders.Default {
+                       key += decoder.OptionsKey()
+               }
+
                return ns.cache.GetOrCreate(key, func() (interface{}, error) {
                        f := metadecoders.FormatFromMediaType(r.MediaType())
                        if f == "" {