charm templates: change up method signatures for easier use

cmd/charm-test/main.go

@@ -54,12 +54,19 @@ func main() {
 		charm.TextWarning.S(dur.Truncate(time.Second).String()),
 	)
 
-	if err := charm.TemplateBuffered(charm.NewTextBox().Success(), heredoc.Doc(`
+	if err := charm.TemplateBufferedE(charm.NewTextBox().Success(), heredoc.Doc(`
 		{{ success checkmark }} Successfully built {{ success  .img }} in {{ warning (duration .dur) }}`,
 	), map[string]any{
 		"img": img,
 		"dur": dur,
 	}); err != nil {
 		panic(err)
 	}
+
+	charm.TemplateBuffered(charm.NewTextBox().Success(), heredoc.Doc(`
+		{{ success checkmark }} Successfully built {{ success  .img }} in {{ warning (duration .dur) }}`,
+	), map[string]any{
+		"img": img,
+		"dur": dur,
+	})
 }

commands/apps_dev.go

@@ -298,16 +298,14 @@ func RunAppsDevBuild(c *CmdConfig) error {
 	// 	charm.TextSuccess.S(res.BuildDuration.Truncate(time.Second).String()),
 	// )
 
-	if err := charm.TemplateBuffered(
+	charm.TemplateBuffered(
 		charm.NewTextBox().Success(),
 		`{{ success checkmark }} Successfully built {{ success .img }} in {{ warning (duration .dur) }}`,
 		map[string]any{
 			"img": res.Image,
 			"dur": res.BuildDuration,
 		},
-	); err != nil {
-		return err
-	}
+	)
 	return nil
 }
 

commands/charm/list.go

@@ -2,13 +2,14 @@ package charm
 
 import (
 	"github.com/charmbracelet/bubbles/list"
+	"github.com/charmbracelet/bubbles/paginator"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 )
 
 var (
 	// ListDefaultStyle is the default list style.
-	ListDefaultStyle = Style{lipgloss.NewStyle().Margin(1, 2)}
+	ListDefaultStyle = Style{lipgloss.NewStyle().Margin(1, 1)}
 )
 
 // List is a component used to select an item from a list.
@@ -31,8 +32,12 @@ func NewList(items []list.Item) *List {
 	// TODO: accept an optional sample item for the height
 	delegate.SetHeight(3)
 
+	model := list.New(items, delegate, 0, 0)
+	model.Paginator.Type = paginator.Arabic
+	model.Paginator.ArabicFormat = "page %d of %d"
+
 	return &List{
-		model: list.New(items, delegate, 0, 0),
+		model: model,
 		Style: ListDefaultStyle,
 	}
 }

commands/charm/template.go

@@ -62,8 +62,8 @@ func Template(w io.Writer, content string, data any) error {
 	return tmpl.Execute(w, data)
 }
 
-// TemplateBuffered executes a template and writes the result to the given writer once.
-func TemplateBuffered(w io.Writer, content string, data any) error {
+// TemplateBufferedE executes a template and writes the result to the given writer once.
+func TemplateBufferedE(w io.Writer, content string, data any) error {
 	var buf bytes.Buffer
 	err := Template(&buf, content, data)
 	if err != nil {
@@ -73,8 +73,17 @@ func TemplateBuffered(w io.Writer, content string, data any) error {
 	return err
 }
 
-// TemplateString executes a template and returns it as a string.
-func TemplateString(content string, data any) (string, error) {
+// TemplateBuffered executes a template and writes the result to the given writer once. If an error occurs, it is written
+// to the writer instead.
+func TemplateBuffered(w io.Writer, content string, data any) {
+	err := TemplateBufferedE(w, content, data)
+	if err != nil {
+		w.Write([]byte(err.Error()))
+	}
+}
+
+// TemplateStringE executes a template and returns it as a string.
+func TemplateStringE(content string, data any) (string, error) {
 	var buf bytes.Buffer
 	err := Template(&buf, content, data)
 	if err != nil {
@@ -83,6 +92,15 @@ func TemplateString(content string, data any) (string, error) {
 	return buf.String(), nil
 }
 
+// TemplateString executes a template and returns it as a string. If an error occurs, the error text is returned instead.
+func TemplateString(content string, data any) string {
+	res, err := TemplateStringE(content, data)
+	if err != nil {
+		return err.Error()
+	}
+	return res
+}
+
 // TemplatePrint executes a template and prints it directly to stdout.
 func TemplatePrint(content string, data any) error {
 	return Template(os.Stdout, content, data)