moving structs and styling to separate packages (#106)

Author: digitalghost-dev

cmd/ability.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"github.com/digitalghost-dev/poke-cli/connections"
 	"github.com/digitalghost-dev/poke-cli/flags"
+	"github.com/digitalghost-dev/poke-cli/styling"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 	"os"
@@ -14,13 +15,13 @@ import (
 func AbilityCommand() {
 
 	flag.Usage = func() {
-		helpMessage := helpBorder.Render(
+		helpMessage := styling.HelpBorder.Render(
 			"Get details about a specific ability.\n\n",
-			styleBold.Render("USAGE:"),
-			fmt.Sprintf("\n\t%s %s %s %s", "poke-cli", styleBold.Render("ability"), "<ability-name>", "[flag]"),
-			fmt.Sprintf("\n\t%-30s", styleItalic.Render("Use a hyphen when typing a name with a space.")),
+			styling.StyleBold.Render("USAGE:"),
+			fmt.Sprintf("\n\t%s %s %s %s", "poke-cli", styling.StyleBold.Render("ability"), "<ability-name>", "[flag]"),
+			fmt.Sprintf("\n\t%-30s", styling.StyleItalic.Render("Use a hyphen when typing a name with a space.")),
 			"\n\n",
-			styleBold.Render("FLAGS:"),
+			styling.StyleBold.Render("FLAGS:"),
 			fmt.Sprintf("\n\t%-30s %s", "-p, --pokemon", "Prints Pokémon that learn this ability."),
 			fmt.Sprintf("\n\t%-30s %s", "-h, --help", "Prints the help menu."),
 		)
@@ -69,7 +70,7 @@ func AbilityCommand() {
 	}
 
 	capitalizedEffect := cases.Title(language.English).String(strings.Replace(abilityName, "-", " ", -1))
-	fmt.Println(styleBold.Render(capitalizedEffect))
+	fmt.Println(styling.StyleBold.Render(capitalizedEffect))
 	fmt.Println("Effect:", englishShortEffect)
 
 	if *pokemonFlag || *shortPokemonFlag {

cmd/natures.go

@@ -5,19 +5,17 @@ import (
 	"fmt"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/lipgloss/table"
+	"github.com/digitalghost-dev/poke-cli/styling"
 	"os"
 )
 
 func NaturesCommand() {
 
 	flag.Usage = func() {
-		helpMessage := helpBorder.Render(
-			"Get details about Pokémon natures.\n\n",
-			styleBold.Render("USAGE:"),
-			fmt.Sprintf("\n\t%s %s %s", "poke-cli", styleBold.Render("natures"), "[flag]"),
-			"\n\n",
-			styleBold.Render("FLAGS:"),
-			fmt.Sprintf("\n\t%-30s %s", "-h, --help", "Prints out the help menu."),
+		helpMessage := styling.HelpBorder.Render(
+			"Get details about all natures.\n\n",
+			styling.StyleBold.Render("USAGE:"),
+			fmt.Sprintf("\n\t%s %s", "poke-cli", styling.StyleBold.Render("natures")),
 		)
 		fmt.Println(helpMessage)
 	}
@@ -32,20 +30,20 @@ func NaturesCommand() {
 	fmt.Println("Natures affect the growth of a Pokémon.\n" +
 		"Each nature increases one of its stats by 10% and decreases one by 10%.\n" +
 		"Five natures increase and decrease the same stat and therefore have no effect.\n\n" +
-		styleBold.Render("Nature Chart:"))
+		styling.StyleBold.Render("Nature Chart:"))
 
 	chart := [][]string{
-		{" ", red.Render("-Attack"), red.Render("-Defense"), red.Render("-Sp. Atk"), red.Render("-Sp. Def"), red.Render("Speed")},
-		{green.Render("+Attack"), "Hardy", "Lonely", "Adamant", "Naughty", "Brave"},
-		{green.Render("+Defense"), "Bold", "Docile", "Impish", "Lax", "Relaxed"},
-		{green.Render("+Sp. Atk"), "Modest", "Mild", "Bashful", "Rash", "Quiet"},
-		{green.Render("+Sp. Def"), "Calm", "Gentle", "Careful", "Quirky", "Sassy"},
-		{green.Render("Speed"), "Timid", "Hasty", "Jolly", "Naive", "Serious"},
+		{" ", styling.Red.Render("-Attack"), styling.Red.Render("-Defense"), styling.Red.Render("-Sp. Atk"), styling.Red.Render("-Sp. Def"), styling.Red.Render("Speed")},
+		{styling.Green.Render("+Attack"), "Hardy", "Lonely", "Adamant", "Naughty", "Brave"},
+		{styling.Green.Render("+Defense"), "Bold", "Docile", "Impish", "Lax", "Relaxed"},
+		{styling.Green.Render("+Sp. Atk"), "Modest", "Mild", "Bashful", "Rash", "Quiet"},
+		{styling.Green.Render("+Sp. Def"), "Calm", "Gentle", "Careful", "Quirky", "Sassy"},
+		{styling.Green.Render("Speed"), "Timid", "Hasty", "Jolly", "Naive", "Serious"},
 	}
 
 	t := table.New().
 		Border(lipgloss.NormalBorder()).
-		BorderStyle(lipgloss.NewStyle().Foreground(gray)).
+		BorderStyle(lipgloss.NewStyle().Foreground(styling.Gray)).
 		BorderRow(true).
 		BorderColumn(true).
 		Rows(chart...).

cmd/pokemon.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"github.com/digitalghost-dev/poke-cli/connections"
 	"github.com/digitalghost-dev/poke-cli/flags"
+	"github.com/digitalghost-dev/poke-cli/styling"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 	"math"
@@ -15,16 +16,16 @@ import (
 // PokemonCommand processes the Pokémon command
 func PokemonCommand() {
 
-	hintMessage := styleItalic.Render("options: [sm, md, lg]")
+	hintMessage := styling.StyleItalic.Render("options: [sm, md, lg]")
 
 	flag.Usage = func() {
-		helpMessage := helpBorder.Render(
+		helpMessage := styling.HelpBorder.Render(
 			"Get details about a specific Pokémon.\n\n",
-			styleBold.Render("USAGE:"),
-			fmt.Sprintf("\n\t%s %s %s %s", "poke-cli", styleBold.Render("pokemon"), "<pokemon-name>", "[flag]"),
-			fmt.Sprintf("\n\t%-30s", styleItalic.Render("Use a hyphen when typing a name with a space.")),
+			styling.StyleBold.Render("USAGE:"),
+			fmt.Sprintf("\n\t%s %s %s %s", "poke-cli", styling.StyleBold.Render("pokemon"), "<pokemon-name>", "[flag]"),
+			fmt.Sprintf("\n\t%-30s", styling.StyleItalic.Render("Use a hyphen when typing a name with a space.")),
 			"\n\n",
-			styleBold.Render("FLAGS:"),
+			styling.StyleBold.Render("FLAGS:"),
 			fmt.Sprintf("\n\t%-30s %s", "-a, --abilities", "Prints the Pokémon's abilities."),
 			fmt.Sprintf("\n\t%-30s %s", "-i=xx, --image=xx", "Prints out the Pokémon's default sprite."),
 			fmt.Sprintf("\n\t%5s%-15s", "", hintMessage),
@@ -42,15 +43,15 @@ func PokemonCommand() {
 	// Pre-parse validation for empty image flag values
 	for _, arg := range args {
 		if strings.HasPrefix(arg, "-i=") && len(arg) == 3 {
-			fmt.Println(errorBorder.Render(errorColor.Render("Error!"), "\nThe image flag (-i or --image) requires a non-empty value.\nValid sizes are: lg, md, sm."))
+			fmt.Println(styling.ErrorBorder.Render(styling.ErrorColor.Render("Error!"), "\nThe image flag (-i or --image) requires a non-empty value.\nValid sizes are: lg, md, sm."))
 			os.Exit(1)
 		}
 		if strings.HasPrefix(arg, "--image=") && len(arg) == 8 {
-			fmt.Println(errorBorder.Render(errorColor.Render("Error!"), "\nThe image flag (-i or --image) requires a non-empty value.\nValid sizes are: lg, md, sm."))
+			fmt.Println(styling.ErrorBorder.Render(styling.ErrorColor.Render("Error!"), "\nThe image flag (-i or --image) requires a non-empty value.\nValid sizes are: lg, md, sm."))
 			os.Exit(1)
 		}
 		if strings.HasPrefix(arg, "-image=") && len(arg) == 7 {
-			fmt.Println(errorBorder.Render(errorColor.Render("Error!"), "\nThe image flag (-i or --image) requires a non-empty value.\nValid sizes are: lg, md, sm."))
+			fmt.Println(styling.ErrorBorder.Render(styling.ErrorColor.Render("Error!"), "\nThe image flag (-i or --image) requires a non-empty value.\nValid sizes are: lg, md, sm."))
 			os.Exit(1)
 		}
 	}

cmd/types.go

@@ -8,6 +8,7 @@ import (
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/x/term"
 	"github.com/digitalghost-dev/poke-cli/connections"
+	"github.com/digitalghost-dev/poke-cli/styling"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 	"os"
@@ -48,9 +49,9 @@ func (m model) View() string {
 	}
 	// Otherwise, display the table
 	return "Select a type!\n" +
-		typesTableBorder.Render(m.table.View()) +
+		styling.TypesTableBorder.Render(m.table.View()) +
 		"\n" +
-		keyMenu.Render("↑ (move up) • ↓ (move down)\nctrl+c | esc (quit) • enter (select)")
+		styling.KeyMenu.Render("↑ (move up) • ↓ (move down)\nctrl+c | esc (quit) • enter (select)")
 }
 
 // Function to display type details after a type is selected
@@ -69,11 +70,11 @@ func displayTypeDetails(typesName string, endpoint string) {
 
 	// Format selected type
 	selectedType := cases.Title(language.English).String(typeName)
-	coloredType := lipgloss.NewStyle().Foreground(lipgloss.Color(getTypeColor(typeName))).Render(selectedType)
+	coloredType := lipgloss.NewStyle().Foreground(lipgloss.Color(styling.GetTypeColor(typeName))).Render(selectedType)
 
 	fmt.Printf("You selected the %s type.\nNumber of Pokémon with type: %d\nNumber of moves with type: %d\n", coloredType, len(typesStruct.Pokemon), len(typesStruct.Moves))
 	fmt.Println("----------")
-	fmt.Println(styleBold.Render("Damage Chart:"))
+	fmt.Println(styling.StyleBold.Render("Damage Chart:"))
 
 	physicalWidth, _, _ := term.GetSize(uintptr(int(os.Stdout.Fd())))
 	doc := strings.Builder{}
@@ -82,7 +83,7 @@ func displayTypeDetails(typesName string, endpoint string) {
 	buildListItems := func(items []struct{ Name, URL string }) string {
 		var itemList []string
 		for _, item := range items {
-			color := getTypeColor(item.Name)
+			color := styling.GetTypeColor(item.Name)
 			coloredStyle := lipgloss.NewStyle().Foreground(lipgloss.Color(color))
 			coloredItem := coloredStyle.Render(cases.Title(language.English).String(item.Name))
 			itemList = append(itemList, listItem(coloredItem))
@@ -187,12 +188,12 @@ func tableGeneration(endpoint string) table.Model {
 func TypesCommand() {
 
 	flag.Usage = func() {
-		helpMessage := helpBorder.Render(
+		helpMessage := styling.HelpBorder.Render(
 			"Get details about a specific typing.\n\n",
-			styleBold.Render("USAGE:"),
-			fmt.Sprintf("\n\t%s %s %s", "poke-cli", styleBold.Render("types"), "[flag]"),
+			styling.StyleBold.Render("USAGE:"),
+			fmt.Sprintf("\n\t%s %s %s", "poke-cli", styling.StyleBold.Render("types"), "[flag]"),
 			"\n\n",
-			styleBold.Render("FLAGS:"),
+			styling.StyleBold.Render("FLAGS:"),
 			fmt.Sprintf("\n\t%-30s %s", "-h, --help", "Prints out the help menu."),
 		)
 		fmt.Println(helpMessage)

cmd/validateargs.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"flag"
 	"fmt"
+	"github.com/digitalghost-dev/poke-cli/styling"
 	"os"
 )
 
@@ -21,12 +22,12 @@ func ValidateAbilityArgs(args []string) error {
 	handleHelpFlag(args)
 
 	if len(args) > 4 {
-		errMessage := errorBorder.Render(errorColor.Render("Error!"), "\nToo many arguments")
+		errMessage := styling.ErrorBorder.Render(styling.ErrorColor.Render("Error!"), "\nToo many arguments")
 		return fmt.Errorf("%s", errMessage)
 	}
 
 	if len(args) == 2 {
-		errMessage := errorBorder.Render(errorColor.Render("Error!"), "\nPlease specify an ability")
+		errMessage := styling.ErrorBorder.Render(styling.ErrorColor.Render("Error!"), "\nPlease specify an ability")
 		return fmt.Errorf("%s", errMessage)
 	}
 
@@ -38,17 +39,17 @@ func ValidateNaturesArgs(args []string) error {
 	handleHelpFlag(args)
 
 	if len(args) > 3 {
-		errMessage := errorBorder.Render(errorColor.Render("Error!"), "\nToo many arguments")
+		errMessage := styling.ErrorBorder.Render(styling.ErrorColor.Render("Error!"), "\nToo many arguments")
 		return fmt.Errorf("%s", errMessage)
 	}
 
 	// Check if there are exactly 3 arguments and the third argument is neither '-h' nor '--help'
 	// If true, return an error message since only '-h' and '--help' are allowed after 'types'
 	if len(args) == 3 && (args[2] != "-h" && args[2] != "--help") {
-		errorTitle := errorColor.Render("Error!")
+		errorTitle := styling.ErrorColor.Render("Error!")
 		errorString := "\nThe only currently available options\nafter [natures] command are '-h' or '--help'"
 		finalErrorMessage := errorTitle + errorString
-		renderedError := errorBorder.Render(finalErrorMessage)
+		renderedError := styling.ErrorBorder.Render(finalErrorMessage)
 		return fmt.Errorf("%s", renderedError)
 	}
 
@@ -61,8 +62,8 @@ func ValidatePokemonArgs(args []string) error {
 
 	// Check if the number of arguments is less than 3
 	if len(args) < 3 {
-		errMessage := errorBorder.Render(
-			errorColor.Render("Error!"),
+		errMessage := styling.ErrorBorder.Render(
+			styling.ErrorColor.Render("Error!"),
 			"\nPlease declare a Pokémon's name after the [pokemon] command",
 			"\nRun 'poke-cli pokemon -h' for more details",
 			"\nerror: insufficient arguments",
@@ -72,8 +73,8 @@ func ValidatePokemonArgs(args []string) error {
 
 	// Check if there are too many arguments
 	if len(args) > 7 {
-		errMessage := errorBorder.Render(
-			errorColor.Render("Error!"),
+		errMessage := styling.ErrorBorder.Render(
+			styling.ErrorColor.Render("Error!"),
 			"\nToo many arguments",
 		)
 		return fmt.Errorf("%s", errMessage)
@@ -84,34 +85,34 @@ func ValidatePokemonArgs(args []string) error {
 		for _, arg := range args[3:] {
 			// Check for single `-` or `--` which are invalid
 			if arg == "-" || arg == "--" {
-				errorTitle := errorColor.Render("Error!")
+				errorTitle := styling.ErrorColor.Render("Error!")
 				errorString := fmt.Sprintf(
 					"\nInvalid argument '%s'. Single '-' or '--' is not allowed.\nPlease use valid flags.",
 					arg,
 				)
 				finalErrorMessage := errorTitle + errorString
-				renderedError := errorBorder.Render(finalErrorMessage)
+				renderedError := styling.ErrorBorder.Render(finalErrorMessage)
 				return fmt.Errorf("%s", renderedError)
 			}
 
 			// Check if the argument starts with a flag prefix but is invalid
 			if arg[0] != '-' {
-				errorTitle := errorColor.Render("Error!")
+				errorTitle := styling.ErrorColor.Render("Error!")
 				errorString := fmt.Sprintf(
 					"\nInvalid argument '%s'.\nOnly flags are allowed after declaring a Pokémon's name",
 					arg,
 				)
 				finalErrorMessage := errorTitle + errorString
-				renderedError := errorBorder.Render(finalErrorMessage)
+				renderedError := styling.ErrorBorder.Render(finalErrorMessage)
 				return fmt.Errorf("%s", renderedError)
 			}
 		}
 	}
 
 	// Add a check for invalid Pokémon names (e.g., names starting with `-`)
 	if len(args[2]) > 0 && args[2][0] == '-' {
-		errMessage := errorBorder.Render(
-			errorColor.Render("Error!"),
+		errMessage := styling.ErrorBorder.Render(
+			styling.ErrorColor.Render("Error!"),
 			"\nPokémon not found. Perhaps a typo in the name?",
 		)
 		return fmt.Errorf("%s", errMessage)
@@ -126,17 +127,17 @@ func ValidateTypesArgs(args []string) error {
 	handleHelpFlag(args)
 
 	if len(args) > 3 {
-		errMessage := errorBorder.Render(errorColor.Render("Error!"), "\nToo many arguments")
+		errMessage := styling.ErrorBorder.Render(styling.ErrorColor.Render("Error!"), "\nToo many arguments")
 		return fmt.Errorf("%s", errMessage)
 	}
 
 	// Check if there are exactly 3 arguments and the third argument is neither '-h' nor '--help'
 	// If true, return an error message since only '-h' and '--help' are allowed after 'types'
 	if len(args) == 3 && (args[2] != "-h" && args[2] != "--help") {
-		errorTitle := errorColor.Render("Error!")
+		errorTitle := styling.ErrorColor.Render("Error!")
 		errorString := "\nThe only currently available options\nafter [types] command are '-h' or '--help'"
 		finalErrorMessage := errorTitle + errorString
-		renderedError := errorBorder.Render(finalErrorMessage)
+		renderedError := styling.ErrorBorder.Render(finalErrorMessage)
 		return fmt.Errorf("%s", renderedError)
 	}