parser/metadecoders: Add CSV lazyQuotes option to transform.Unmarshal

If true, a quote may appear in an unquoted field and a non-doubled quote
may appear in a quoted field. It defaults to false.

Closes #11884

diff --git a/docs/content/en/functions/transform/Unmarshal.md b/docs/content/en/functions/transform/Unmarshal.md
index 02524509b74f9a046b04edc9302c011709bca54a..e24f763814069ec361685603335f9f95cf005176 100644 (file)
--- a/docs/content/en/functions/transform/Unmarshal.md
+++ b/docs/content/en/functions/transform/Unmarshal.md
@@ -125,6 +125,9 @@ delimiter
 comment
 : (`string`) The comment character used in the CSV. If set, lines beginning with the comment character without preceding whitespace are ignored.
 
+lazyQuotes
+: (`bool`) If true, a quote may appear in an unquoted field and a non-doubled quote may appear in a quoted field. Default is `false`.
+
 ```go-html-template
 {{ $csv := "a;b;c" | transform.Unmarshal (dict "delimiter" ";") }}
 ```

diff --git a/parser/metadecoders/decoder.go b/parser/metadecoders/decoder.go
index 40b3a336cede1d5889ef46a23c5a3a05782327f0..35368e5a531e624cb4de18c65bcfc8300e26946e 100644 (file)
--- a/parser/metadecoders/decoder.go
+++ b/parser/metadecoders/decoder.go
@@ -20,6 +20,7 @@ import (
        "fmt"
        "log"
        "regexp"
+       "strconv"
        "strings"
 
        "github.com/gohugoio/hugo/common/herrors"
@@ -41,6 +42,10 @@ type Decoder struct {
        // Comment, if not 0, is the comment character used in the CSV decoder. Lines beginning with the
        // Comment character without preceding whitespace are ignored.
        Comment rune
+
+       // If true, a quote may appear in an unquoted field and a non-doubled quote
+       // may appear in a quoted field. It defaults to false.
+       LazyQuotes bool
 }
 
 // OptionsKey is used in cache keys.
@@ -48,6 +53,7 @@ func (d Decoder) OptionsKey() string {
        var sb strings.Builder
        sb.WriteRune(d.Delimiter)
        sb.WriteRune(d.Comment)
+       sb.WriteString(strconv.FormatBool(d.LazyQuotes))
        return sb.String()
 }
 
@@ -205,6 +211,7 @@ func (d Decoder) unmarshalCSV(data []byte, v any) error {
        r := csv.NewReader(bytes.NewReader(data))
        r.Comma = d.Delimiter
        r.Comment = d.Comment
+       r.LazyQuotes = d.LazyQuotes
 
        records, err := r.ReadAll()
        if err != nil {

diff --git a/tpl/transform/integration_test.go b/tpl/transform/integration_test.go
index 3ba65c715114a3b1cac956487e093eadf425ce1b..f035ec71964eea53d27686024e73079bf53512d8 100644 (file)
--- a/tpl/transform/integration_test.go
+++ b/tpl/transform/integration_test.go
@@ -107,3 +107,29 @@ disableKinds = ['page','rss','section','sitemap','taxonomy','term']
        _, err := b.BuildE()
        b.Assert(err.Error(), qt.Contains, "error calling highlight: invalid Highlight option: 0")
 }
+
+// Issue #11884
+func TestUnmarshalCSVLazyDecoding(t *testing.T) {
+       t.Parallel()
+
+       files := `
+-- hugo.toml --
+disableKinds = ['page','rss','section','sitemap','taxonomy','term']
+-- assets/pets.csv --
+name,description,age
+Spot,a nice dog,3
+Rover,"a big dog",5
+Felix,a "malicious" cat,7
+Bella,"an "evil" cat",9
+Scar,"a "dead cat",11
+-- layouts/index.html --
+{{ $opts := dict "lazyQuotes" true }}
+{{ $data := resources.Get "pets.csv" | transform.Unmarshal $opts }}
+{{ printf "%v" $data | safeHTML }}
+  `
+       b := hugolib.Test(t, files)
+
+       b.AssertFileContent("public/index.html", `
+[[name description age] [Spot a nice dog 3] [Rover a big dog 5] [Felix a "malicious" cat 7] [Bella an "evil" cat 9] [Scar a "dead cat 11]]
+       `)
+}