chore: update Beta Branch (#336)

This merges `master` into `beta`.

.github/CODEOWNERS

@@ -1 +1 @@
-*  @meowgorithm @muesli
+*  @meowgorithm @aymanbagabas

.github/workflows/release.yml

@@ -0,0 +1,29 @@
+name: goreleaser
+
+on:
+  push:
+    tags:
+      - v*.*.*
+
+concurrency:
+  group: goreleaser
+  cancel-in-progress: true
+
+jobs:
+  goreleaser:
+    uses: charmbracelet/meta/.github/workflows/goreleaser.yml@main
+    secrets:
+      docker_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      docker_token: ${{ secrets.DOCKERHUB_TOKEN }}
+      gh_pat: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+      goreleaser_key: ${{ secrets.GORELEASER_KEY }}
+      twitter_consumer_key: ${{ secrets.TWITTER_CONSUMER_KEY }}
+      twitter_consumer_secret: ${{ secrets.TWITTER_CONSUMER_SECRET }}
+      twitter_access_token: ${{ secrets.TWITTER_ACCESS_TOKEN }}
+      twitter_access_token_secret: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
+      mastodon_client_id: ${{ secrets.MASTODON_CLIENT_ID }}
+      mastodon_client_secret: ${{ secrets.MASTODON_CLIENT_SECRET }}
+      mastodon_access_token: ${{ secrets.MASTODON_ACCESS_TOKEN }}
+      discord_webhook_id: ${{ secrets.DISCORD_WEBHOOK_ID }}
+      discord_webhook_token: ${{ secrets.DISCORD_WEBHOOK_TOKEN }}
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json

.goreleaser.yml

@@ -0,0 +1,5 @@
+includes:
+  - from_url:
+      url: charmbracelet/meta/main/goreleaser-lib.yaml
+# yaml-language-server: $schema=https://goreleaser.com/static/schema-pro.json
+

README.md

@@ -455,114 +455,9 @@ fmt.Println(t)
 
 For more on tables see [the docs](https://pkg.go.dev/github.com/charmbracelet/lipgloss?tab=doc) and [examples](https://github.com/charmbracelet/lipgloss/tree/master/examples/table).
 
-## Rendering Trees
-
-Lip Gloss ships with a tree rendering sub-package.
-
-```go
-import "github.com/charmbracelet/lipgloss/tree"
-```
-
-Define a new tree.
-
-```go
-t := tree.New("root", "child 1", "child 2", tree.New("child 3", "child 3.1"))
-```
-
-Print the tree.
-
-```go
-fmt.Println(t)
-
-// root
-// ├── child 1
-// ├── child 2
-// └── child 3
-//     └── child 3.1
-```
-
-### Customization
-
-Trees can be customized via their enumeration function as well as using
-`lipgloss.Style`s.
-
-```go
-style1 := lipgloss.NewStyle().Foreground(lipgloss.Color("99")).MarginRight(1)
-style2 := lipgloss.NewStyle().Foreground(lipgloss.Color("10")).MarginRight(1)
-
-t := tree.New().
-	Items(
-		"Glossier",
-		"Claire’s Boutique",
-		tree.New().
-			Root("Nyx").
-			Items("Qux", "Quux").
-			EnumeratorStyle(style2),
-		"Mac",
-		"Milk",
-	).
-	EnumeratorStyle(style1)
-```
-
-Print the tree:
-
-<p align="center">
-  <img
-    width="600"
-    alt="Tree example"
-    src="https://github.com/charmbracelet/lipgloss/assets/245435/5a875269-f6d6-43fa-9916-5d8360e66964"
-  />
-</p>
-You may also define custom enumerator implementations:
-
-```go
-t := tree.New().
-	Items(
-		"Glossier",
-		"Claire’s Boutique",
-		tree.New().
-			Root("Nyx").
-			Items(
-				"Qux",
-				"Quux",
-			),
-		"Mac",
-		"Milk",
-	).
-	Enumerator(func(tree.Data, int) (string, string) {
-		return "->", "->"
-	})
-```
-
-Print the tree.
-
-<p align="center">
-  <img
-    width="600"
-    alt="Tree example"
-    src="https://github.com/charmbracelet/lipgloss/assets/245435/811e8b39-124f-48bb-b3dd-e015a65b1065"
-  />
-</p>
-
-### Building
-
-If you need, you can also build trees incrementally:
-
-```go
-t := tree.New("")
-
-for i := 0; i < repeat; i++ {
-	t.Item("Lip Gloss")
-}
-```
-
-
 ## Rendering Lists
 
 Lip Gloss ships with a list rendering sub-package.
-Implementation-wise, lists are still trees.
-The `list` package provides many common `Enumerator` implementations, as well as
-some syntactic sugar.
 
 ```go
 import "github.com/charmbracelet/lipgloss/list"
@@ -584,77 +479,89 @@ fmt.Println(l)
 // • C
 ```
 
+Lists have the ability to nest.
+
+```go
+l := list.New(
+  "A", list.New("Artichoke"),
+  "B", list.New("Baking Flour", "Bananas", "Barley", "Bean Sprouts"),
+  "C", list.New("Cashew Apple", "Cashews", "Coconut Milk", "Curry Paste", "Currywurst"),
+  "D", list.New("Dill", "Dragonfruit", "Dried Shrimp"),
+  "E", list.New("Eggs"),
+  "F", list.New("Fish Cake", "Furikake"),
+  "J", list.New("Jicama"),
+  "K", list.New("Kohlrabi"),
+  "L", list.New("Leeks", "Lentils", "Licorice Root"),
+)
+```
+
+Print the list.
+
+```go
+fmt.Println(l)
+```
 
-### Customization
+<p align="center">
+<img width="600" alt="image" src="https://github.com/charmbracelet/lipgloss/assets/42545625/0dc9f440-0748-4151-a3b0-7dcf29dfcdb0">
+</p>
 
 Lists can be customized via their enumeration function as well as using
 `lipgloss.Style`s.
 
 ```go
 enumeratorStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("99")).MarginRight(1)
-itemStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("10")).MarginRight(1)
+itemStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("212")).MarginRight(1)
 
 l := list.New(
-	"Glossier",
-	"Claire’s Boutique",
-	"Nyx",
-	"Mac",
-	"Milk",
+  "Glossier",
+  "Claire’s Boutique",
+  "Nyx",
+  "Mac",
+  "Milk",
 ).
-	Enumerator(list.Roman).
-	EnumeratorStyle(enumeratorStyle).
-	ItemStyle(itemStyle)
+  Enumerator(list.Roman).
+  EnumeratorStyle(enumeratorStyle).
+  ItemStyle(itemStyle)
 ```
 
 Print the list.
 
 <p align="center">
-  <img
-    width="600"
-    alt="List example"
-    src="https://github.com/charmbracelet/lipgloss/assets/245435/8f5e5e0b-7bf9-4e3b-a8ba-3af10825320e"
-  />
+<img width="600" alt="List example" src="https://github.com/charmbracelet/lipgloss/assets/42545625/360494f1-57fb-4e13-bc19-0006efe01561">
 </p>
+
 In addition to the predefined enumerators (`Arabic`, `Alphabet`, `Roman`, `Bullet`, `Tree`),
 you may also define your own custom enumerator:
 
 ```go
-var DuckDuckGooseEnumerator Enumerator = func(l *List, i int) string {
-	if l.At(i) == "Goose" {
-		return "Honk →"
-	}
-	return ""
-}
-```
+l := list.New("Duck", "Duck", "Duck", "Duck", "Goose", "Duck", "Duck")
 
-Use it in a list:
+func DuckDuckGooseEnumerator(l list.Items, i int) string {
+    if l.At(i).Value() == "Goose" {
+        return "Honk →"
+    }
+    return ""
+}
 
-```go
-l := list.New("Duck", "Duck", "Duck", "Duck", "Goose", "Duck", "Duck")
-l.Enumerator(DuckDuckGooseEnumerator)
+l = l.Enumerator(DuckDuckGooseEnumerator)
 ```
 
 Print the list:
 
 <p align="center">
-  <img
-    width="600"
-    alt="image"
-    src="https://github.com/charmbracelet/lipgloss/assets/245435/44e37a5b-5124-4f49-a332-1756a355002e"
-  />
+<img width="600" alt="image" src="https://github.com/charmbracelet/lipgloss/assets/42545625/157aaf30-140d-4948-9bb4-dfba46e5b87e">
 </p>
 
-### Building
-
-If you need, you can also build trees incrementally:
+If you need, you can also build lists incrementally:
 
 ```go
 l := list.New()
 
 for i := 0; i < repeat; i++ {
-	l.Item("Lip Gloss")
+    l.Item("Lip Gloss")
 }
 ```
+
 ---
 
 ## FAQ

examples/go.mod

@@ -4,8 +4,6 @@ go 1.19
 
 replace github.com/charmbracelet/lipgloss => ../
 
-replace github.com/charmbracelet/lipgloss/tree => ../tree
-
 replace github.com/charmbracelet/lipgloss/list => ../list
 
 require (
@@ -23,7 +21,7 @@ require (
 	github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/charmbracelet/keygen v0.5.0 // indirect
-	github.com/charmbracelet/x/ansi v0.1.1 // indirect
+	github.com/charmbracelet/x/ansi v0.1.4 // indirect
 	github.com/charmbracelet/x/conpty v0.1.0 // indirect
 	github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86 // indirect
 	github.com/charmbracelet/x/input v0.1.0 // indirect
@@ -32,7 +30,7 @@ require (
 	github.com/charmbracelet/x/windows v0.1.0 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
 	github.com/gliderlabs/ssh v0.3.4 // indirect
-	github.com/mattn/go-isatty v0.0.18 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect

examples/go.sum

@@ -9,8 +9,8 @@ github.com/charmbracelet/ssh v0.0.0-20240604154955-a40c6a0d028f h1:DnNHMcvpjh51p
 github.com/charmbracelet/ssh v0.0.0-20240604154955-a40c6a0d028f/go.mod h1:LmMZag2g7ILMmWtDmU7dIlctUopwmb73KpPzj0ip1uk=
 github.com/charmbracelet/wish v0.5.0 h1:FkkdNBFqrLABR1ciNrAL2KCxoyWfKhXnIGZw6GfAtPg=
 github.com/charmbracelet/wish v0.5.0/go.mod h1:5GAn5SrDSZ7cgKjnC+3kDmiIo7I6k4/AYiRzC4+tpCk=
-github.com/charmbracelet/x/ansi v0.1.1 h1:CGAduulr6egay/YVbGc8Hsu8deMg1xZ/bkaXTPi1JDk=
-github.com/charmbracelet/x/ansi v0.1.1/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
+github.com/charmbracelet/x/ansi v0.1.4 h1:IEU3D6+dWwPSgZ6HBH+v6oUuZ/nVawMiWj5831KfiLM=
+github.com/charmbracelet/x/ansi v0.1.4/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
 github.com/charmbracelet/x/conpty v0.1.0 h1:4zc8KaIcbiL4mghEON8D72agYtSeIgq8FSThSPQIb+U=
 github.com/charmbracelet/x/conpty v0.1.0/go.mod h1:rMFsDJoDwVmiYM10aD4bH2XiRgwI7NYJtQgl5yskjEQ=
 github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86 h1:JSt3B+U9iqk37QUU2Rvb6DSBYRLtWqFqfxf8l5hOZUA=
@@ -33,8 +33,8 @@ github.com/gliderlabs/ssh v0.3.4 h1:+AXBtim7MTKaLVPgvE+3mhewYRawNLTd+jEEz/wExZw=
 github.com/gliderlabs/ssh v0.3.4/go.mod h1:ZSS+CUoKHDrqVakTfTWUlKSr9MtMFkC4UvtQKD7O914=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
-github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
 github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=