From 85fff9ebf5a3177d8c4e48d7314e402c0be27cee Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Fri, 21 Mar 2025 21:52:31 +0100 Subject: Add MapIter to map over iterators --- go.mod | 2 +- gomponents.go | 28 ++++++++++++++++++++++++++++ gomponents_test.go | 18 ++++++++++++++++++ 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 8a7823b..0b6bf60 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ module go.alanpearce.eu/gomponents -go 1.18 +go 1.23 diff --git a/gomponents.go b/gomponents.go index 4867152..1848291 100644 --- a/gomponents.go +++ b/gomponents.go @@ -22,6 +22,7 @@ import ( "fmt" "html/template" "io" + "iter" "strings" ) @@ -277,6 +278,33 @@ func MapMap[K comparable, T any](ts map[K]T, cb func(K, T) Node) Group { return nodes } +// Map an iterator of anything to an IterNode (which is just an [iter.Seq] of [Node]-s) +func MapIter[T any](ts iter.Seq[T], cb func(T) Node) IterNode { + return IterNode{ + func(yield func(Node) bool) { + for t := range ts { + if !yield(cb(t)) { + return + } + } + }, + } +} + +type IterNode struct { + iter.Seq[Node] +} + +func (it IterNode) Render(w io.Writer) error { + for node := range it.Seq { + if err := node.Render(w); err != nil { + return err + } + } + + return nil +} + // 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. diff --git a/gomponents_test.go b/gomponents_test.go index 0d1c478..39b5fe6 100644 --- a/gomponents_test.go +++ b/gomponents_test.go @@ -5,6 +5,7 @@ import ( "fmt" "io" "os" + "slices" "strings" "testing" @@ -302,6 +303,23 @@ func ExampleMapMap() { // Output: } +func TestMapIter(t *testing.T) { + items := slices.Values([]string{"party hat", "super hat"}) + e := g.El("ul", g.MapIter(items, func(value string) g.Node { + return g.El("li", g.Text(value)) + })) + assert.Equal(t, ``, e) +} + +func ExampleMapIter() { + items := slices.Values([]string{"party hat", "super hat"}) + e := g.El("ul", g.MapIter(items, func(value string) g.Node { + return g.El("li", g.Text(value)) + })) + _ = e.Render(os.Stdout) + // Output: +} + func TestGroup(t *testing.T) { t.Run("groups multiple nodes into one", func(t *testing.T) { children := []g.Node{g.El("br", g.Attr("id", "hat")), g.El("hr")} -- cgit 1.4.1