Switch to tea.Sequentially

Author: ajeetdsouza

db.go

@@ -49,7 +49,7 @@ func (db *db) save() error {
 	if err != nil {
 		return errors.Wrap(err, "could not serialize database")
 	}
-	if err := maybe.WriteFile(dbPath, data, 0o644); err != nil {
+	if err := maybe.WriteFile(dbPath, data, 0644); err != nil {
 		return errors.Wrapf(err, "could not write to database: %s", dbPath)
 	}
 	return nil

go.mod

@@ -4,7 +4,7 @@ go 1.13
 
 require (
 	github.com/adrg/xdg v0.4.0
-	github.com/charmbracelet/bubbletea v0.19.4-0.20220131220437-77e63ac89037
+	github.com/charmbracelet/bubbletea v0.19.4-0.20220202015352-c5d3b1e1544a
 	github.com/charmbracelet/lipgloss v0.4.0
 	github.com/google/renameio v1.0.1
 	github.com/pkg/errors v0.9.1

go.sum

@@ -1,7 +1,7 @@
 github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls=
 github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E=
-github.com/charmbracelet/bubbletea v0.19.4-0.20220131220437-77e63ac89037 h1:dlKlZNPkKgzCW/LeNGY9Al3qOGBiUOy+2Axs5bZS5KY=
-github.com/charmbracelet/bubbletea v0.19.4-0.20220131220437-77e63ac89037/go.mod h1:5nPeULOIxbAMykb3ggwhw1kruS7nP+Y4Za9yEH4J27U=
+github.com/charmbracelet/bubbletea v0.19.4-0.20220202015352-c5d3b1e1544a h1:D4RqRJSEKvggU+aCND2Q/5y/eGpecrJ0QYUcqK4kdp4=
+github.com/charmbracelet/bubbletea v0.19.4-0.20220202015352-c5d3b1e1544a/go.mod h1:5nPeULOIxbAMykb3ggwhw1kruS7nP+Y4Za9yEH4J27U=
 github.com/charmbracelet/lipgloss v0.4.0 h1:768h64EFkGUr8V5yAKV7/Ta0NiVceiPaV+PphaW1K9g=
 github.com/charmbracelet/lipgloss v0.4.0/go.mod h1:vmdkHvce7UzX6xkyf4cca8WlwdQ5RQr8fzta+xl7BOM=
 github.com/containerd/console v1.0.2 h1:Pi6D+aZXM+oUw1czuKgH5IJ+y0jhYcwBJfx5/Ghn9dE=

model.go

@@ -215,7 +215,7 @@ func (m *model) doDeleteChar() tea.Cmd {
 }
 
 // doExit exits the program.
-func (m *model) doExit() tea.Cmd {
+func (*model) doExit() tea.Cmd {
 	return tea.Quit
 }
 
@@ -229,7 +229,7 @@ func (m *model) doResize(msg tea.WindowSizeMsg) tea.Cmd {
 // doWin is called when the user has guessed the word correctly.
 func (m *model) doWin() tea.Cmd {
 	m.gameOver = true
-	return sequentially(
+	return tea.Sequentially(
 		m.withDb(func(db *db) {
 			db.addWin(m.gridRow)
 			m.score = db.score()
@@ -242,7 +242,7 @@ func (m *model) doWin() tea.Cmd {
 func (m *model) doLoss() tea.Cmd {
 	m.gameOver = true
 	msg := fmt.Sprintf("The word was %s. Better luck next time!", string(m.word[:]))
-	return sequentially(
+	return tea.Sequentially(
 		m.withDb(func(db *db) {
 			db.addLoss()
 			m.score = db.score()
@@ -353,7 +353,7 @@ func (m *model) viewKeyboardRow(keys []string) string {
 }
 
 // viewKey renders a key with the given name and color.
-func (_ *model) viewKey(key string, color lipgloss.TerminalColor) string {
+func (*model) viewKey(key string, color lipgloss.TerminalColor) string {
 	return lipgloss.NewStyle().
 		Padding(0, 1).
 		Border(lipgloss.NormalBorder()).
@@ -418,22 +418,6 @@ func (s keyState) color() lipgloss.Color {
 	}
 }
 
-// FIXME: replace with tea.Sequentially
-// https://github.com/charmbracelet/bubbletea/pull/214
-func sequentially(cmds ...tea.Cmd) tea.Cmd {
-	return func() tea.Msg {
-		for _, cmd := range cmds {
-			if cmd == nil {
-				continue
-			}
-			if msg := cmd(); msg != nil {
-				return msg
-			}
-		}
-		return nil
-	}
-}
-
 // isAsciiUpper checks if a rune is between A-Z.
 func isAsciiUpper(r rune) bool {
 	return 'A' <= r && r <= 'Z'