feat(prompt): 支持自定义 err message

支持自定义 err message

Signed-off-by: mritd <[email protected]>

Author: mritd

pkg/commit/ci.go

@@ -11,6 +11,7 @@ import (
 	gitprompt "github.com/mritd/gitflow-toolkit/pkg/prompt"
 	"github.com/mritd/gitflow-toolkit/pkg/util"
 	"github.com/mritd/promptui"
+	"github.com/pkg/errors"
 )
 
 type TypeMessage struct {
@@ -83,11 +84,11 @@ func SelectCommitType() consts.CommitType {
 // 输入影响范围
 func InputScope() string {
 
-	p := gitprompt.NewDefaultPrompt(func(line []rune) bool {
+	p := gitprompt.NewDefaultPrompt(func(line []rune) error {
 		if strings.TrimSpace(string(line)) == "" {
-			return false
+			return errors.New("Input is empty!")
 		} else {
-			return true
+			return nil
 		}
 	}, "Scope:")
 
@@ -98,11 +99,11 @@ func InputScope() string {
 // 输入提交主题
 func InputSubject() string {
 
-	p := gitprompt.NewDefaultPrompt(func(line []rune) bool {
+	p := gitprompt.NewDefaultPrompt(func(line []rune) error {
 		if strings.TrimSpace(string(line)) == "" {
-			return false
+			return errors.New("Input is empty!")
 		} else {
-			return true
+			return nil
 		}
 	}, "Subject:")
 
@@ -112,8 +113,8 @@ func InputSubject() string {
 // 输入完整提交信息
 func InputBody() string {
 
-	p := gitprompt.NewDefaultPrompt(func(line []rune) bool {
-		return true
+	p := gitprompt.NewDefaultPrompt(func(line []rune) error {
+		return nil
 	}, "Body:")
 
 	body := p.Run()
@@ -127,8 +128,8 @@ func InputBody() string {
 // 输入提交关联信息
 func InputFooter() string {
 
-	p := gitprompt.NewDefaultPrompt(func(line []rune) bool {
-		return true
+	p := gitprompt.NewDefaultPrompt(func(line []rune) error {
+		return nil
 	}, "Footer:")
 
 	return p.Run()

pkg/prompt/codes.go

@@ -1,9 +1,9 @@
 package prompt
 
 import (
+	"fmt"
 	"strconv"
 	"strings"
-	"fmt"
 	"text/template"
 )
 
@@ -49,9 +49,12 @@ const (
 var ResetCode = fmt.Sprintf("%s%dm", esc, reset)
 
 const (
-	hideCursor = esc + "?25l"
-	showCursor = esc + "?25h"
-	clearLine  = esc + "2K"
+	hideCursor    = esc + "?25l"
+	showCursor    = esc + "?25h"
+	clearLine     = esc + "2K"
+	moveUp        = esc + "1A"
+	moveDown      = esc + "1B"
+	cleanTerminal = "\033c"
 )
 
 // FuncMap defines template helpers for the output. It can be extended as a

pkg/prompt/prompt.go

@@ -10,19 +10,18 @@ import (
 )
 
 const (
-	DefaultPrompt      = "»"
-	DefaultErrorMsg    = "✘Invalid input!"
-	DefaultQuestionTpl = "{{ . | cyan }} "
-	DefaultPromptTpl   = "{{ . | green }} "
-	DefaultInvalidTpl  = "{{ . | red }} "
-	DefaultValidTpl    = "{{ . | green }} "
-	DefaultErrorMsgTpl = "{{ . | red }} "
+	DefaultPrompt         = "»"
+	DefaultErrorMsgPrefix = "✘ "
+	DefaultQuestionTpl    = "{{ . | cyan }} "
+	DefaultPromptTpl      = "{{ . | green }} "
+	DefaultInvalidTpl     = "{{ . | red }} "
+	DefaultValidTpl       = "{{ . | green }} "
+	DefaultErrorMsgTpl    = "{{ . | red }} "
 )
 
 type Prompt struct {
 	Question  string
 	Prompt    string
-	ErrorMsg  string
 	PromptTpl *Tpl
 	FuncMap   template.FuncMap
 
@@ -39,10 +38,10 @@ type Tpl struct {
 	ValidTpl      string
 	InvalidTpl    string
 	ErrorMsgTpl   string
-	CheckListener func(line []rune) bool
+	CheckListener func(line []rune) error
 }
 
-func NewDefaultTpl(check func(line []rune) bool) *Tpl {
+func NewDefaultTpl(check func(line []rune) error) *Tpl {
 	return &Tpl{
 		QuestionTpl:   DefaultQuestionTpl,
 		PromptTpl:     DefaultPromptTpl,
@@ -53,10 +52,9 @@ func NewDefaultTpl(check func(line []rune) bool) *Tpl {
 	}
 }
 
-func NewDefaultPrompt(check func(line []rune) bool, question string) *Prompt {
+func NewDefaultPrompt(check func(line []rune) error, question string) *Prompt {
 	return &Prompt{
 		Question:  question,
-		ErrorMsg:  DefaultErrorMsg,
 		Prompt:    DefaultPrompt,
 		PromptTpl: NewDefaultTpl(check),
 		FuncMap:   FuncMap,
@@ -104,52 +102,36 @@ func (p *Prompt) Run() string {
 	displayPrompt := append(render(p.prompt, p.Prompt), render(p.question, p.Question)...)
 	validPrompt := append(render(p.valid, p.Prompt), render(p.question, p.Question)...)
 	invalidPrompt := append(render(p.invalid, p.Prompt), render(p.question, p.Question)...)
-	errorMsgPrompt := render(p.errorMsg, p.ErrorMsg)
 
 	l, err := readline.NewEx(&readline.Config{
 		Prompt:                 string(displayPrompt),
 		DisableAutoSaveHistory: true,
 		InterruptPrompt:        "^C",
 		FuncFilterInputRune:    filterInput,
 	})
+	util.CheckAndExit(err)
 
 	l.Config.SetListener(func(line []rune, pos int, key rune) (newLine []rune, newPos int, ok bool) {
-		if p.PromptTpl.CheckListener(line) {
+		if err = p.PromptTpl.CheckListener(line); err != nil {
+			l.SetPrompt(string(invalidPrompt))
+			l.Refresh()
 
+		} else {
 			l.SetPrompt(string(validPrompt))
 			l.Refresh()
-		} else {
 
-			l.SetPrompt(string(invalidPrompt))
-			l.Refresh()
 		}
 		return nil, 0, false
 
 	})
-	if err != nil {
-		panic(err)
-	}
 	defer l.Close()
 	for {
 		s, err := l.Readline()
 		util.CheckAndExit(err)
-		if p.PromptTpl.CheckListener([]rune(s)) {
-			return s
+		if err = p.PromptTpl.CheckListener([]rune(s)); err != nil {
+			fmt.Println(string(render(p.errorMsg, DefaultErrorMsgPrefix+err.Error())))
 		} else {
-			fmt.Println(string(errorMsgPrompt))
+			return s
 		}
 	}
 }
-
-//func Test() {
-//
-//	check := func(line []rune) bool {
-//		if len(line) > 5 {
-//			return false
-//		}
-//		return true
-//	}
-//
-//	p := NewDefaultPrompt(check, "请输入5个字符:")
-//	fmt.Println(p.Run())
-//}