all repos — gomponents @ f387a7123040d9414350bf783bdeff17ac0572c7

HTML components in pure Go

Add generic Map implementation (#108) Instead of waiting for a good time to switch the `Map` implementation, I've decided to just offer two implementations: one for Go versions before 1.18, and one for 1.18 and onwards. This is achieved using build tags in the source files. This is obviously a breaking change for consumers of this library that use Go 1.18 and onwards. See #88

Markus Wüstenberg
commit

f387a7123040d9414350bf783bdeff17ac0572c7

parent

3334d6c7d049cec57ad36f9d5cb0d491faf54a5d

M examples/simple/simple.goexamples/simple/simple.go
@@ -1,3 +1,6 @@
+//go:build go1.18 +// +build go1.18 + package main import (
@@ -58,8 +61,8 @@ return Div(
Ul( NavbarLink("/", "Home", currentPath), - g.Group(g.Map(len(links), func(i int) g.Node { - return NavbarLink(links[i].Path, links[i].Name, currentPath) + g.Group(g.Map(links, func(pl PageLink) g.Node { + return NavbarLink(pl.Path, pl.Name, currentPath) })), ),
M examples/tailwindcss/tailwindcss.goexamples/tailwindcss/tailwindcss.go
@@ -1,3 +1,6 @@
+//go:build go1.18 +// +build go1.18 + package main import (
@@ -81,8 +84,8 @@ Div(Class("flex items-center space-x-4 h-16"),
NavbarLink("/", "Home", currentPath == "/"), // We can Map custom slices to Nodes - g.Group(g.Map(len(links), func(i int) g.Node { - return NavbarLink(links[i].Path, links[i].Name, currentPath == links[i].Path) + g.Group(g.Map(links, func(pl PageLink) g.Node { + return NavbarLink(pl.Path, pl.Name, currentPath == pl.Path) })), ), ),
M go.modgo.mod
@@ -1,3 +1,3 @@
module "github.com/maragudk/gomponents" -go 1.15 +go 1.18
M gomponents.gogomponents.go
@@ -244,15 +244,6 @@ func Group(children []Node) Node {
return group{children: children} } -// Map something enumerable to a list of Nodes. -func Map(length int, cb func(i int) Node) []Node { - var nodes []Node - for i := 0; i < length; i++ { - nodes = append(nodes, cb(i)) - } - return nodes -} - // If condition is true, return the given Node. Otherwise, return nil. // This helper function is good for inlining elements conditionally. func If(condition bool, n Node) Node {
A gomponents_generic.go
@@ -0,0 +1,13 @@
+//go:build go1.18 +// +build go1.18 + +package gomponents + +// Map a slice of anything to a slice of Nodes. +func Map[T any](ts []T, cb func(T) Node) []Node { + var nodes []Node + for _, t := range ts { + nodes = append(nodes, cb(t)) + } + return nodes +}
A gomponents_generic_test.go
@@ -0,0 +1,34 @@
+//go:build go1.18 +// +build go1.18 + +package gomponents_test + +import ( + "os" + "testing" + + g "github.com/maragudk/gomponents" + "github.com/maragudk/gomponents/internal/assert" +) + +func TestMap(t *testing.T) { + t.Run("maps slices to nodes", func(t *testing.T) { + items := []string{"hat", "partyhat", "turtlehat"} + lis := g.Map(items, func(i string) g.Node { + return g.El("li", g.Text(i)) + }) + + list := g.El("ul", lis...) + + assert.Equal(t, `<ul><li>hat</li><li>partyhat</li><li>turtlehat</li></ul>`, list) + }) +} + +func ExampleMap() { + items := []string{"party hat", "super hat"} + e := g.El("ul", g.Group(g.Map(items, func(i string) g.Node { + return g.El("li", g.Text(i)) + }))) + _ = e.Render(os.Stdout) + // Output: <ul><li>party hat</li><li>super hat</li></ul> +}
A gomponents_non_generic.go
@@ -0,0 +1,13 @@
+//go:build !go1.18 +// +build !go1.18 + +package gomponents + +// Map something enumerable to a list of Nodes. +func Map(length int, cb func(i int) Node) []Node { + var nodes []Node + for i := 0; i < length; i++ { + nodes = append(nodes, cb(i)) + } + return nodes +}
A gomponents_non_generic_test.go
@@ -0,0 +1,34 @@
+//go:build !go1.18 +// +build !go1.18 + +package gomponents_test + +import ( + "os" + "testing" + + g "github.com/maragudk/gomponents" + "github.com/maragudk/gomponents/internal/assert" +) + +func TestMap(t *testing.T) { + t.Run("maps slices to nodes", func(t *testing.T) { + items := []string{"hat", "partyhat", "turtlehat"} + lis := g.Map(len(items), func(i int) g.Node { + return g.El("li", g.Text(items[i])) + }) + + list := g.El("ul", lis...) + + assert.Equal(t, `<ul><li>hat</li><li>partyhat</li><li>turtlehat</li></ul>`, list) + }) +} + +func ExampleMap() { + items := []string{"party hat", "super hat"} + e := g.El("ul", g.Group(g.Map(len(items), func(i int) g.Node { + return g.El("li", g.Text(items[i])) + }))) + _ = e.Render(os.Stdout) + // Output: <ul><li>party hat</li><li>super hat</li></ul> +}
M gomponents_test.gogomponents_test.go
@@ -133,7 +133,7 @@ e := g.El("div", g.El("br"), g.Attr("class", "hat"))
assert.Equal(t, `<div class="hat"><br></div>`, e) }) - t.Run("renders outside if node does not implement placer", func(t *testing.T) { + t.Run("renders outside if node does not implement nodeTypeDescriber", func(t *testing.T) { e := g.El("div", outsider{}) assert.Equal(t, `<div>outsider</div>`, e) })
@@ -246,28 +246,6 @@ if !panicked {
t.FailNow() } }) -} - -func TestMap(t *testing.T) { - t.Run("maps slices to nodes", func(t *testing.T) { - items := []string{"hat", "partyhat", "turtlehat"} - lis := g.Map(len(items), func(i int) g.Node { - return g.El("li", g.Text(items[i])) - }) - - list := g.El("ul", lis...) - - assert.Equal(t, `<ul><li>hat</li><li>partyhat</li><li>turtlehat</li></ul>`, list) - }) -} - -func ExampleMap() { - items := []string{"party hat", "super hat"} - e := g.El("ul", g.Group(g.Map(len(items), func(i int) g.Node { - return g.El("li", g.Text(items[i])) - }))) - _ = e.Render(os.Stdout) - // Output: <ul><li>party hat</li><li>super hat</li></ul> } func TestIf(t *testing.T) {