common/maps: Do not return error on params dot access on incompatible types

This error was introduced in 0.56 and has shown some site breakage in the wild.

Fixes #6121

diff --git a/common/maps/params.go b/common/maps/params.go
index 0b81057b148fd20aae2bf474b94ebecfd2b0d9eb..2d62ad752ec5d19ba53a9763046a3525237a0671 100644 (file)
--- a/common/maps/params.go
+++ b/common/maps/params.go
@@ -16,8 +16,6 @@ package maps
 import (
        "strings"
 
-       "github.com/pkg/errors"
-
        "github.com/spf13/cast"
 )
 
@@ -72,7 +70,7 @@ func traverseNestedParams(keySegments []string, lookupFn func(key string) interf
                v, key, owner := traverseParams(rest, m)
                return v, key, owner, nil
        default:
-               return nil, "", nil, errors.Errorf("unsupported Params type: %T", result)
+               return nil, "", nil, nil
        }
 }
 

diff --git a/common/maps/params_test.go b/common/maps/params_test.go
index 89b149617c511a5872c880919e59ae76a4bce289..7443553f1e3b2fcf12e7450e043c6f7b10b1bc5a 100644 (file)
--- a/common/maps/params_test.go
+++ b/common/maps/params_test.go
@@ -22,10 +22,14 @@ import (
 func TestGetNestedParam(t *testing.T) {
 
        m := map[string]interface{}{
+               "string":          "value",
                "first":           1,
                "with_underscore": 2,
                "nested": map[string]interface{}{
                        "color": "blue",
+                       "nestednested": map[string]interface{}{
+                               "color": "green",
+                       },
                },
        }
 
@@ -41,5 +45,7 @@ func TestGetNestedParam(t *testing.T) {
        assert.Equal(1, must("First", "_", m))
        assert.Equal(2, must("with_underscore", "_", m))
        assert.Equal("blue", must("nested_color", "_", m))
+       assert.Equal("green", must("nested.nestednested.color", ".", m))
+       assert.Nil(must("string.name", ".", m))
 
 }

diff --git a/hugolib/page_test.go b/hugolib/page_test.go
index e754a5e4f91672c58a26ea69251561730ad74b6c..3a0a76c3d201720eea370854ac904dde08f890ab 100644 (file)
--- a/hugolib/page_test.go
+++ b/hugolib/page_test.go
@@ -1543,3 +1543,58 @@ title: Scratch Me!
        b.AssertFileContent("public/index.html", "B: bv")
        b.AssertFileContent("public/scratchme/index.html", "C: cv")
 }
+
+func TestPageParam(t *testing.T) {
+       t.Parallel()
+
+       b := newTestSitesBuilder(t).WithConfigFile("toml", `
+
+baseURL = "https://example.org"
+
+[params]
+[params.author]
+  name = "Kurt Vonnegut"
+
+`)
+       b.WithTemplatesAdded("index.html", `
+
+{{ $withParam := .Site.GetPage "withparam" }}
+{{ $noParam := .Site.GetPage "noparam" }}
+{{ $withStringParam := .Site.GetPage "withstringparam" }}
+
+Author page: {{ $withParam.Param "author.name" }}
+Author page string: {{ $withStringParam.Param "author.name" }}|
+Author site config:  {{ $noParam.Param "author.name" }}
+
+`,
+       )
+
+       b.WithContent("withparam.md", `
++++
+title = "With Param!"
+[author]
+  name = "Ernest Miller Hemingway"
+
++++
+
+`,
+
+               "noparam.md", `
+---
+title: "No Param!"
+---
+`, "withstringparam.md", `
++++
+title = "With string Param!"
+author = "Jo Nesbø"
+
++++
+
+`)
+       b.Build(BuildCfg{})
+
+       b.AssertFileContent("public/index.html", "Author page: Ernest Miller Hemingway")
+       b.AssertFileContent("public/index.html", "Author page string: |")
+       b.AssertFileContent("public/index.html", "Author site config:  Kurt Vonnegut")
+
+}