Support for CSS named colors

color.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	"github.com/lucasb-eyer/go-colorful"
+	"github.com/muesli/gamut/palette"
 )
 
 var (
@@ -35,6 +36,10 @@ type ANSI256Color int
 // RGBColor is a hex-encoded color, e.g. "#abcdef".
 type RGBColor string
 
+// CSSNamedColor is a color as defined by the CSS color standards, e.g. "red".
+// Colors are supported through CSS Color Module Level 4.
+type CSSNamedColor string
+
 func ConvertToRGB(c Color) colorful.Color {
 	var hex string
 	switch v := c.(type) {
@@ -91,17 +96,16 @@ func (p Profile) Color(s string) Color {
 	var c Color
 	if strings.HasPrefix(s, "#") {
 		c = RGBColor(s)
-	} else {
-		i, err := strconv.Atoi(s)
-		if err != nil {
-			return nil
-		}
-
+	} else if i, err := strconv.Atoi(s); err == nil {
 		if i < 16 {
 			c = ANSIColor(i)
 		} else {
 			c = ANSI256Color(i)
 		}
+	} else if _, ok := palette.CSS.Color(s); ok {
+		c = CSSNamedColor(s)
+	} else {
+		return nil
 	}
 
 	return p.Convert(c)
@@ -152,6 +156,21 @@ func (c RGBColor) Sequence(bg bool) string {
 	return fmt.Sprintf("%s;2;%d;%d;%d", prefix, uint8(f.R*255), uint8(f.G*255), uint8(f.B*255))
 }
 
+func (c CSSNamedColor) Sequence(bg bool) string {
+	f, ok := palette.CSS.Color(string(c))
+	if !ok {
+		return ""
+	}
+
+	r, g, b, _ := f.RGBA()
+
+	prefix := Foreground
+	if bg {
+		prefix = Background
+	}
+	return fmt.Sprintf("%s;2;%d;%d;%d", prefix, uint8(r), uint8(g), uint8(b))
+}
+
 func xTermColor(s string) (RGBColor, error) {
 	if len(s) < 24 || len(s) > 25 {
 		return RGBColor(""), ErrInvalidColor

color_test.go

@@ -1,6 +1,8 @@
 package termenv
 
-import "testing"
+import (
+	"testing"
+)
 
 func TestXTermColor(t *testing.T) {
 	var tests = []struct {
@@ -57,3 +59,26 @@ func TestXTermColor(t *testing.T) {
 		})
 	}
 }
+
+func TestCSSNamedColor(t *testing.T) {
+	var tests = []struct {
+		name     string
+		expected string
+	}{
+		{
+			"red",
+			"38;2;255;0;0",
+		},
+		{
+			"rebeccapurple",
+			"38;2;102;51;153",
+		},
+	}
+
+	for _, test := range tests {
+		res := CSSNamedColor(test.name).Sequence(false)
+		if res != test.expected {
+			t.Fatalf("wrong color returned, want %v, got %v", test.expected, res)
+		}
+	}
+}

go.mod

@@ -6,5 +6,6 @@ require (
 	github.com/lucasb-eyer/go-colorful v1.0.3
 	github.com/mattn/go-isatty v0.0.12
 	github.com/mattn/go-runewidth v0.0.9
+	github.com/muesli/gamut v0.2.0
 	golang.org/x/sys v0.0.0-20200116001909-b77594299b42
 )

go.sum

@@ -1,8 +1,26 @@
+github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
+github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
+github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
+github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s=
 github.com/lucasb-eyer/go-colorful v1.0.3 h1:QIbQXiugsb+q10B+MI+7DI1oQLdmnep86tWFlaaUAac=
 github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/muesli/clusters v0.0.0-20180605185049-a07a36e67d36/go.mod h1:mw5KDqUj0eLj/6DUNINLVJNoPTFkEuGMHtJsXLviLkY=
+github.com/muesli/clusters v0.0.0-20200529215643-2700303c1762 h1:p4A2Jx7Lm3NV98VRMKlyWd3nqf8obft8NfXlAUmqd3I=
+github.com/muesli/clusters v0.0.0-20200529215643-2700303c1762/go.mod h1:mw5KDqUj0eLj/6DUNINLVJNoPTFkEuGMHtJsXLviLkY=
+github.com/muesli/gamut v0.2.0 h1:IZbl/hQzChTXtqDSXL8CDtjdRt58LivY03bGCm1yDyU=
+github.com/muesli/gamut v0.2.0/go.mod h1:kz1+UJqI1thNtocJlowyqG2o0FNsN0W534VoMVsR9/Y=
+github.com/muesli/kmeans v0.2.1 h1:ja5AnwfyDCVBCANrAfXr2pOh292FQnSeu1lySACDJU0=
+github.com/muesli/kmeans v0.2.1/go.mod h1:eNyybq0tX9/iBEP6EMU4Y7dpmGK0uEhODdZpnG1a/iQ=
+github.com/wcharczuk/go-chart/v2 v2.1.0 h1:tY2slqVQ6bN+yHSnDYwZebLQFkphK4WNrVwnt7CJZ2I=
+github.com/wcharczuk/go-chart/v2 v2.1.0/go.mod h1:yx7MvAVNcP/kN9lKXM/NTce4au4DFN99j6i1OwDclNA=
+github.com/xrash/smetrics v0.0.0-20200730060457-89a2a8a1fb0b h1:tnWgqoOBmInkt5pbLjagwNVjjT4RdJhFHzL1ebCSRh8=
+github.com/xrash/smetrics v0.0.0-20200730060457-89a2a8a1fb0b/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
+golang.org/x/image v0.0.0-20200927104501-e162460cd6b5 h1:QelT11PB4FXiDEXucrfNckHoFxwt8USGY1ajP1ZF5lM=
+golang.org/x/image v0.0.0-20200927104501-e162460cd6b5/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42 h1:vEOn+mP2zCOVzKckCZy6YsCtDblrpj/w7B9nxGNELpg=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=