Merge pull request #1 from kyoh86/variadic-functions

morikuni · web-flow · commit 39771216ff4c · 2017-01-13T12:34:06.000+09:00
Append variadic parameters to some functions
diff --git a/ansi.go b/ansi.go
@@ -2,6 +2,7 @@ package aec
 
 import (
 	"fmt"
+	"strings"
 )
 
 const esc = "\x1b["
@@ -15,8 +16,8 @@ var empty = newAnsi("")
 type ANSI interface {
 	fmt.Stringer
 
-	// With adapts a given ANSI.
-	With(ANSI) ANSI
+	// With adapts given ANSIs.
+	With(...ANSI) ANSI
 
 	// Apply wraps given string in ANSI.
 	Apply(string) string
@@ -29,10 +30,8 @@ func newAnsi(s string) *ansiImpl {
 	return &r
 }
 
-func (a *ansiImpl) With(ansi ANSI) ANSI {
-	s := a.String() + ansi.String()
-	r := ansiImpl(s)
-	return &r
+func (a *ansiImpl) With(ansi ...ANSI) ANSI {
+	return concat(append([]ANSI{a}, ansi...))
 }
 
 func (a *ansiImpl) Apply(s string) string {
@@ -42,3 +41,19 @@ func (a *ansiImpl) Apply(s string) string {
 func (a *ansiImpl) String() string {
 	return string(*a)
 }
+
+// Apply wraps given string in ANSIs.
+func Apply(s string, ansi ...ANSI) string {
+	if len(ansi) == 0 {
+		return s
+	}
+	return concat(ansi).Apply(s)
+}
+
+func concat(ansi []ANSI) ANSI {
+	strs := make([]string, 0, len(ansi))
+	for _, p := range ansi {
+		strs = append(strs, p.String())
+	}
+	return newAnsi(strings.Join(strs, ""))
+}
diff --git a/builder.go b/builder.go
@@ -9,13 +9,13 @@ type Builder struct {
 var EmptyBuilder *Builder
 
 // NewBuilder creates a Builder from existing ANSI.
-func NewBuilder(a ANSI) *Builder {
-	return &Builder{a}
+func NewBuilder(a ...ANSI) *Builder {
+	return &Builder{concat(a)}
 }
 
 // With is a syntax for With.
-func (builder *Builder) With(a ANSI) *Builder {
-	return NewBuilder(builder.ANSI.With(a))
+func (builder *Builder) With(a ...ANSI) *Builder {
+	return NewBuilder(builder.ANSI.With(a...))
 }
 
 // Up is a syntax for Up.
