feat: added SingleLineSeparator field to MultilineSeparator struct

Author: ralvarezdev

logger.go

@@ -60,14 +60,22 @@ type (
 
 // DefaultLogMessageFormat is the default log message format
 var DefaultLogMessageFormat = LogMessageFormat{
-	StatusSeparator:  gologgerstrings.NewRepeatedContentSeparator(gologgerstrings.SpaceSeparator),
-	DetailsSeparator: gologgerstrings.NewMultilineSeparator(gologgerstrings.NewLineSeparator, 1),
+	StatusSeparator: gologgerstrings.NewRepeatedContentSeparator(gologgerstrings.SpaceSeparator),
+	DetailsSeparator: gologgerstrings.NewMultilineSeparator(
+		gologgerstrings.SpaceSeparator,
+		gologgerstrings.NewLineSeparator,
+		1,
+	),
 }
 
 // DefaultLogErrorFormat is the default log error format
 var DefaultLogErrorFormat = LogErrorFormat{
 	StatusSeparator: gologgerstrings.NewRepeatedContentSeparator(gologgerstrings.SpaceSeparator),
-	ErrorsSeparator: gologgerstrings.NewMultilineSeparator(gologgerstrings.NewLineSeparator, 1),
+	ErrorsSeparator: gologgerstrings.NewMultilineSeparator(
+		gologgerstrings.SpaceSeparator,
+		gologgerstrings.NewLineSeparator,
+		1,
+	),
 }
 
 // DefaultLoggerFormat is the default logger format
@@ -116,7 +124,8 @@ func CopyLogErrorFormat(format *LogErrorFormat) *LogErrorFormat {
 
 // NewLoggerFormat creates a new logger format
 func NewLoggerFormat(
-	nameSeparator *gologgerstrings.ContentSeparator, messageSeparator gologgerstrings.Separator,
+	nameSeparator *gologgerstrings.ContentSeparator,
+	messageSeparator gologgerstrings.Separator,
 ) *LoggerFormat {
 	return &LoggerFormat{
 		NameSeparator:    nameSeparator,
@@ -144,12 +153,20 @@ func NewLogMessage(
 		format = &DefaultLogMessageFormat
 	}
 
-	return &LogMessage{title: title, status: status, details: details, format: CopyLogMessageFormat(format)}
+	return &LogMessage{
+		title:   title,
+		status:  status,
+		details: details,
+		format:  CopyLogMessageFormat(format),
+	}
 }
 
 // FormatDetails gets the formatted details
 func (l *LogMessage) FormatDetails() string {
-	return gologgerstrings.FormatStringArray(l.format.DetailsSeparator, &l.details)
+	return gologgerstrings.FormatStringArray(
+		l.format.DetailsSeparator,
+		&l.details,
+	)
 }
 
 // String gets the string representation of a log message
@@ -158,7 +175,10 @@ func (l *LogMessage) String() string {
 
 	// Format status
 	if l.status != gologgerstatus.StatusNone {
-		formattedLog = append(formattedLog, gologgerstrings.FormatStatus(l.status, l.format.StatusSeparator))
+		formattedLog = append(
+			formattedLog,
+			gologgerstrings.FormatStatus(l.status, l.format.StatusSeparator),
+		)
 	}
 
 	// Add title
@@ -175,13 +195,21 @@ func (l *LogMessage) String() string {
 }
 
 // NewLogError creates a new log error
-func NewLogError(title string, format *LogErrorFormat, errors ...error) *LogError {
+func NewLogError(
+	title string,
+	format *LogErrorFormat,
+	errors ...error,
+) *LogError {
 	// Check if the format is nil
 	if format == nil {
 		format = &DefaultLogErrorFormat
 	}
 
-	return &LogError{title: title, errors: errors, format: CopyLogErrorFormat(format)}
+	return &LogError{
+		title:  title,
+		errors: errors,
+		format: CopyLogErrorFormat(format),
+	}
 }
 
 // FormatErrors gets the formatted errors
@@ -196,7 +224,10 @@ func (l *LogError) String() string {
 	// Format status
 	formattedLog = append(
 		formattedLog,
-		gologgerstrings.FormatStatus(gologgerstatus.StatusFailed, l.format.StatusSeparator),
+		gologgerstrings.FormatStatus(
+			gologgerstatus.StatusFailed,
+			l.format.StatusSeparator,
+		),
 	)
 
 	// Add message
@@ -233,7 +264,10 @@ func (d *DefaultLogger) FormatLogMessage(logMessage *LogMessage) string {
 		return d.formattedName
 	}
 
-	return strings.Join([]string{d.formattedName, logMessage.String()}, string(d.format.MessageSeparator))
+	return strings.Join(
+		[]string{d.formattedName, logMessage.String()},
+		string(d.format.MessageSeparator),
+	)
 }
 
 // LogMessage logs a message

strings/strings.go

@@ -17,8 +17,9 @@ type (
 
 	// MultilineSeparator is the separator for the multiline content
 	MultilineSeparator struct {
-		LineSeparator Separator
-		TabSize       int
+		SingleLineSeparator Separator
+		LineSeparator       Separator
+		TabSize             int
 	}
 )
 
@@ -44,10 +45,14 @@ func NewRepeatedContentSeparator(separator Separator) *ContentSeparator {
 }
 
 // NewMultilineSeparator creates a new multiline separator
-func NewMultilineSeparator(lineSeparator Separator, tabSize int) *MultilineSeparator {
+func NewMultilineSeparator(
+	singleLineSeparator, lineSeparator Separator,
+	tabSize int,
+) *MultilineSeparator {
 	return &MultilineSeparator{
-		LineSeparator: lineSeparator,
-		TabSize:       tabSize,
+		SingleLineSeparator: singleLineSeparator,
+		LineSeparator:       lineSeparator,
+		TabSize:             tabSize,
 	}
 }
 
@@ -57,9 +62,15 @@ func (m *MultilineSeparator) TabSeparator() Separator {
 }
 
 // AddCharacters adds some characters to a string
-func AddCharacters(content, leftCharacters, rightCharacters string, contentSeparator *ContentSeparator) string {
+func AddCharacters(
+	content, leftCharacters, rightCharacters string,
+	contentSeparator *ContentSeparator,
+) string {
 	if contentSeparator == nil {
-		return strings.Join([]string{leftCharacters, content, rightCharacters}, "")
+		return strings.Join(
+			[]string{leftCharacters, content, rightCharacters},
+			"",
+		)
 	}
 
 	return strings.Join(
@@ -89,33 +100,36 @@ func AddParentheses(name string, contentSeparator *ContentSeparator) string {
 }
 
 // FormatStatus gets the formatted status
-func FormatStatus(status gologgerstatus.Status, contentSeparator *ContentSeparator) string {
+func FormatStatus(
+	status gologgerstatus.Status,
+	contentSeparator *ContentSeparator,
+) string {
 	return AddBrackets(status.String(), contentSeparator)
 }
 
 // FormatStringArray returns a string with all the strings in the array formatted
-func FormatStringArray(multilineSeparator *MultilineSeparator, stringArray *[]string) string {
+func FormatStringArray(
+	multilineSeparator *MultilineSeparator,
+	stringArray *[]string,
+) string {
 	if stringArray == nil || len(*stringArray) == 0 {
 		return ""
 	}
 
-	// Separators
-	lineSeparator := multilineSeparator.LineSeparator
-	tabSeparator := multilineSeparator.TabSeparator()
-	lineAndTabSeparator := lineSeparator + tabSeparator
-
 	// Check if there is only one element
 	if len(*stringArray) == 1 {
 		return AddBrackets(
 			(*stringArray)[0],
-			NewContentSeparator(
-				lineAndTabSeparator,
-				lineSeparator,
-			),
+			NewRepeatedContentSeparator(multilineSeparator.SingleLineSeparator),
 		)
 	} else {
 		var formattedDetails strings.Builder
 
+		// Separators
+		lineSeparator := multilineSeparator.LineSeparator
+		tabSeparator := multilineSeparator.TabSeparator()
+		lineAndTabSeparator := lineSeparator + tabSeparator
+
 		// Add formatted details
 		formattedDetails.WriteString(string(tabSeparator))
 		for i, str := range *stringArray {
@@ -126,7 +140,10 @@ func FormatStringArray(multilineSeparator *MultilineSeparator, stringArray *[]st
 			}
 		}
 
-		return AddBrackets(formattedDetails.String(), NewRepeatedContentSeparator(lineSeparator))
+		return AddBrackets(
+			formattedDetails.String(),
+			NewRepeatedContentSeparator(lineSeparator),
+		)
 	}
 }
 
@@ -145,7 +162,10 @@ func MapErrorArrayToStringArray(errorArray *[]error) *[]string {
 }
 
 // FormatErrorArray returns a string with all the errors in the array formatted
-func FormatErrorArray(multilineSeparator *MultilineSeparator, errorArray *[]error) string {
+func FormatErrorArray(
+	multilineSeparator *MultilineSeparator,
+	errorArray *[]error,
+) string {
 	mappedErrorArray := MapErrorArrayToStringArray(errorArray)
 	return FormatStringArray(multilineSeparator, mappedErrorArray)
 }