tpl/collections: Fix apply with namespaced template funcs

We changed the signature to `func(...interface{}) (interface{}, error)` some time ago, but sadly we had no test for this for `apply`. Now we do.

Fixes #9393

diff --git a/hugolib/template_test.go b/hugolib/template_test.go
index 2908fdf71a182fffd7c4cd7785ffd491b5767af1..f9d54d8dc0477ae275e78366c1c3aed297ebe6a2 100644 (file)
--- a/hugolib/template_test.go
+++ b/hugolib/template_test.go
@@ -460,7 +460,6 @@ complex: 80: 80
 
 // Issue 7528
 func TestPartialWithZeroedArgs(t *testing.T) {
-
        b := newTestSitesBuilder(t)
        b.WithTemplatesAdded("index.html",
                ` 
@@ -483,7 +482,6 @@ X123X
 X123X
 X123X
 `)
-
 }
 
 func TestPartialCached(t *testing.T) {
@@ -757,3 +755,20 @@ This is single main
 `,
        )
 }
+
+// Issue 9393.
+func TestApplyWithNamespace(t *testing.T) {
+       b := newTestSitesBuilder(t)
+
+       b.WithTemplates(
+               "index.html", `
+{{ $b := slice " a " "     b "   "       c" }}         
+{{ $a := apply $b "strings.Trim" "." " " }}
+a: {{ $a }}
+`,
+       ).WithContent("p1.md", "")
+
+       b.Build(BuildCfg{})
+
+       b.AssertFileContent("public/index.html", `a: [a b c]`)
+}

diff --git a/tpl/collections/apply.go b/tpl/collections/apply.go
index 86554def1c15819cf98fc704f9861fbff40f9971..6eedb4b63515d5b08f29bff8230b2c693dda1d12 100644 (file)
--- a/tpl/collections/apply.go
+++ b/tpl/collections/apply.go
@@ -111,15 +111,25 @@ func (ns *Namespace) lookupFunc(fname string) (reflect.Value, bool) {
 
        ss := strings.SplitN(fname, ".", 2)
 
-       // namespace
+       // Namespace
        nv, found := ns.lookupFunc(ss[0])
        if !found {
                return reflect.Value{}, false
        }
 
+       fn, ok := nv.Interface().(func(...interface{}) (interface{}, error))
+       if !ok {
+               return reflect.Value{}, false
+       }
+       v, err := fn()
+       if err != nil {
+               panic(err)
+       }
+       nv = reflect.ValueOf(v)
+
        // method
        m := nv.MethodByName(ss[1])
-       // if reflect.DeepEqual(m, reflect.Value{}) {
+
        if m.Kind() == reflect.Invalid {
                return reflect.Value{}, false
        }