fix: use one level style embed

Author: aymanbagabas

log/command.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"strings"
 
+	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/log"
 )
 
@@ -28,21 +29,24 @@ func (o Options) Run() error {
 	l.SetTimeFormat(o.TimeFormat)
 
 	st := log.DefaultStyles()
-	st.Levels[log.DebugLevel] = o.LevelDebugStyle.ToLipgloss().
-		Inline(true).
-		SetString(strings.ToUpper(log.DebugLevel.String()))
-	st.Levels[log.InfoLevel] = o.LevelInfoStyle.ToLipgloss().
-		Inline(true).
-		SetString(strings.ToUpper(log.InfoLevel.String()))
-	st.Levels[log.WarnLevel] = o.LevelWarnStyle.ToLipgloss().
-		Inline(true).
-		SetString(strings.ToUpper(log.WarnLevel.String()))
-	st.Levels[log.ErrorLevel] = o.LevelErrorStyle.ToLipgloss().
-		Inline(true).
-		SetString(strings.ToUpper(log.ErrorLevel.String()))
-	st.Levels[log.FatalLevel] = o.LevelFatalStyle.ToLipgloss().
-		Inline(true).
-		SetString(strings.ToUpper(log.FatalLevel.String()))
+	defaultColors := map[log.Level]lipgloss.Color{
+		log.DebugLevel: lipgloss.Color("63"),
+		log.InfoLevel:  lipgloss.Color("83"),
+		log.WarnLevel:  lipgloss.Color("192"),
+		log.ErrorLevel: lipgloss.Color("204"),
+		log.FatalLevel: lipgloss.Color("134"),
+	}
+
+	lvlStyle := o.LevelStyle.ToLipgloss()
+	if lvlStyle.GetForeground() == lipgloss.Color("") {
+		lvlStyle = lvlStyle.Foreground(defaultColors[levelToLog[o.Level]])
+	}
+
+	lvl := levelToLog[o.Level]
+	st.Levels[lvl] = lvlStyle.
+		SetString(strings.ToUpper(lvl.String())).
+		Inline(true)
+
 	st.Timestamp = o.TimeStyle.ToLipgloss().
 		Inline(true)
 	st.Prefix = o.PrefixStyle.ToLipgloss().
@@ -104,3 +108,12 @@ type logger struct {
 	printf func(string, ...interface{})
 	print  func(interface{}, ...interface{})
 }
+
+var levelToLog = map[string]log.Level{
+	"none":  log.Level(math.MaxInt32),
+	"debug": log.DebugLevel,
+	"info":  log.InfoLevel,
+	"warn":  log.WarnLevel,
+	"error": log.ErrorLevel,
+	"fatal": log.FatalLevel,
+}

log/options.go

@@ -18,17 +18,13 @@ type Options struct {
 	Time       bool   `help:"Whether to print the time"`
 	TimeFormat string `help:"The time format to use" default:"2006/01/02 15:04:05"`
 
-	LevelDebugStyle style.Styles `embed:"" prefix:"level.debug." help:"The style of the debug level" set:"defaultBold=true" set:"defaultForeground=63" envprefix:"GUM_LOG_LEVEL_DEBUG_"`  //nolint:staticcheck
-	LevelInfoStyle  style.Styles `embed:"" prefix:"level.info." help:"The style of the info level" set:"defaultBold=true" set:"defaultForeground=83" envprefix:"GUM_LOG_LEVEL_INFO_"`     //nolint:staticcheck
-	LevelWarnStyle  style.Styles `embed:"" prefix:"level.warn." help:"The style of the warn level" set:"defaultBold=true" set:"defaultForeground=192" envprefix:"GUM_LOG_LEVEL_WARN_"`    //nolint:staticcheck
-	LevelErrorStyle style.Styles `embed:"" prefix:"level.error." help:"The style of the error level" set:"defaultBold=true" set:"defaultForeground=204" envprefix:"GUM_LOG_LEVEL_ERROR_"` //nolint:staticcheck
-	LevelFatalStyle style.Styles `embed:"" prefix:"level.fatal." help:"The style of the fatal level" set:"defaultBold=true" set:"defaultForeground=134" envprefix:"GUM_LOG_LEVEL_FATAL_"` //nolint:staticcheck
-	TimeStyle       style.Styles `embed:"" prefix:"time." help:"The style of the time" envprefix:"GUM_LOG_TIME_"`
-	PrefixStyle     style.Styles `embed:"" prefix:"prefix." help:"The style of the prefix" set:"defaultBold=true" set:"defaultFaint=true" envprefix:"GUM_LOG_PREFIX_"` //nolint:staticcheck
-	MessageStyle    style.Styles `embed:"" prefix:"message." help:"The style of the message" envprefix:"GUM_LOG_MESSAGE_"`
-	KeyStyle        style.Styles `embed:"" prefix:"key." help:"The style of the key" set:"defaultFaint=true" envprefix:"GUM_LOG_KEY_"`
-	ValueStyle      style.Styles `embed:"" prefix:"value." help:"The style of the value" envprefix:"GUM_LOG_VALUE_"`
-	SeparatorStyle  style.Styles `embed:"" prefix:"separator." help:"The style of the separator" set:"defaultFaint=true" envprefix:"GUM_LOG_SEPARATOR_"`
+	LevelStyle     style.Styles `embed:"" prefix:"level." help:"The style of the level being used" set:"defaultBold=true" envprefix:"GUM_LOG_LEVEL_"` //nolint:staticcheck
+	TimeStyle      style.Styles `embed:"" prefix:"time." help:"The style of the time" envprefix:"GUM_LOG_TIME_"`
+	PrefixStyle    style.Styles `embed:"" prefix:"prefix." help:"The style of the prefix" set:"defaultBold=true" set:"defaultFaint=true" envprefix:"GUM_LOG_PREFIX_"` //nolint:staticcheck
+	MessageStyle   style.Styles `embed:"" prefix:"message." help:"The style of the message" envprefix:"GUM_LOG_MESSAGE_"`
+	KeyStyle       style.Styles `embed:"" prefix:"key." help:"The style of the key" set:"defaultFaint=true" envprefix:"GUM_LOG_KEY_"`
+	ValueStyle     style.Styles `embed:"" prefix:"value." help:"The style of the value" envprefix:"GUM_LOG_VALUE_"`
+	SeparatorStyle style.Styles `embed:"" prefix:"separator." help:"The style of the separator" set:"defaultFaint=true" envprefix:"GUM_LOG_SEPARATOR_"`
 }
 
 // BeforeReset hook. Used to unclutter style flags.