Make `Group` a type (#202) This changes `Group` to be a type instead of a function, which means it can support both grouping `[]Node` as well as doing variadic-ish slice things like `Group{n1, n2}`. This also means that `Map` can just return a `Group`. Special thanks to @deitrix for this simple and elegant solution that, for some reason or another, has had me perplexed for a long time. Fixes #201.
1 file changed, 11 insertions(+), 17 deletions(-)
changed files
M gomponents.go → gomponents.go
@@ -113,8 +113,8 @@ } // Rendering groups like this is still important even though a group can render itself, // since otherwise attributes will sometimes be ignored. - if g, ok := c.(group); ok { - for _, groupC := range g.children { + if g, ok := c.(Group); ok { + for _, groupC := range g { renderChild(w, groupC, t) } return@@ -246,8 +246,8 @@ return err }) } -// Map a slice of anything to a slice of Nodes. -func Map[T any](ts []T, cb func(T) Node) []Node { +// Map a slice of anything to a [Group] (which is just a slice of [Node]s). +func Map[T any](ts []T, cb func(T) Node) Group { var nodes []Node for _, t := range ts { nodes = append(nodes, cb(t))@@ -255,27 +255,21 @@ } return nodes } -type group struct { - children []Node -} +// Group a slice of [Node]s into one Node, while still being usable like a regular slice of [Node]s. +// A [Group] can render directly, but if any of the direct children are [AttributeType], they will be ignored, +// to not produce invalid HTML. +type Group []Node // String satisfies [fmt.Stringer]. -func (g group) String() string { +func (g Group) String() string { var b strings.Builder _ = g.Render(&b) return b.String() } // Render satisfies [Node]. -func (g group) Render(w io.Writer) error { - return render(w, nil, g.children...) -} - -// Group a slice of Nodes into one Node. Useful for grouping the result of [Map] into one [Node]. -// A [Group] can render directly, but if any of the direct children are [AttributeType], they will be ignored, -// to not produce invalid HTML. -func Group(children []Node) Node { - return group{children: children} +func (g Group) Render(w io.Writer) error { + return render(w, nil, g...) } // If condition is true, return the given [Node]. Otherwise, return nil.