separate options

input/option/helpers.go

@@ -1,35 +1,37 @@
 package option
 
-import "gitoa.ru/go-4devs/console/input"
+import (
+	"gitoa.ru/go-4devs/console/input/flag"
+)
 
-func Bool(name, description string, opts ...func(*input.Option)) input.Option {
-	return input.NewOption(name, description, append(opts, Value(input.ValueBool))...)
+func Bool(name, description string, opts ...func(*Option)) Option {
+	return New(name, description, append(opts, Value(flag.Bool))...)
 }
 
-func Duration(name, description string, opts ...func(*input.Option)) input.Option {
-	return input.NewOption(name, description, append(opts, Value(input.ValueDuration))...)
+func Duration(name, description string, opts ...func(*Option)) Option {
+	return New(name, description, append(opts, Value(flag.Duration))...)
 }
 
-func Float64(name, description string, opts ...func(*input.Option)) input.Option {
-	return input.NewOption(name, description, append(opts, Value(input.ValueFloat64))...)
+func Float64(name, description string, opts ...func(*Option)) Option {
+	return New(name, description, append(opts, Value(flag.Float64))...)
 }
 
-func Int(name, description string, opts ...func(*input.Option)) input.Option {
-	return input.NewOption(name, description, append(opts, Value(input.ValueInt))...)
+func Int(name, description string, opts ...func(*Option)) Option {
+	return New(name, description, append(opts, Value(flag.Int))...)
 }
 
-func Int64(name, description string, opts ...func(*input.Option)) input.Option {
-	return input.NewOption(name, description, append(opts, Value(input.ValueInt64))...)
+func Int64(name, description string, opts ...func(*Option)) Option {
+	return New(name, description, append(opts, Value(flag.Int64))...)
 }
 
-func Time(name, description string, opts ...func(*input.Option)) input.Option {
-	return input.NewOption(name, description, append(opts, Value(input.ValueTime))...)
+func Time(name, description string, opts ...func(*Option)) Option {
+	return New(name, description, append(opts, Value(flag.Time))...)
 }
 
-func Uint(name, description string, opts ...func(*input.Option)) input.Option {
-	return input.NewOption(name, description, append(opts, Value(input.ValueUint))...)
+func Uint(name, description string, opts ...func(*Option)) Option {
+	return New(name, description, append(opts, Value(flag.Uint))...)
 }
 
-func Uint64(name, descriontion string, opts ...func(*input.Option)) input.Option {
-	return input.NewOption(name, descriontion, append(opts, Value(input.ValueUint64))...)
+func Uint64(name, descriontion string, opts ...func(*Option)) Option {
+	return New(name, descriontion, append(opts, Value(flag.Uint64))...)
 }

input/option/option.go

@@ -1,44 +1,100 @@
 package option
 
 import (
-	"gitoa.ru/go-4devs/console/input"
+	"gitoa.ru/go-4devs/console/input/flag"
 	"gitoa.ru/go-4devs/console/input/value"
 )
 
-func Required(o *input.Option) {
-	o.Flag |= input.ValueRequired
+func Required(o *Option) {
+	o.Flag |= flag.Required
 }
 
-func Default(in interface{}) func(*input.Option) {
-	return func(o *input.Option) {
+func Default(in interface{}) func(*Option) {
+	return func(o *Option) {
 		o.Default = value.New(in)
 	}
 }
 
-func Short(s string) func(*input.Option) {
-	return func(o *input.Option) {
+func Short(s string) func(*Option) {
+	return func(o *Option) {
 		o.Short = s
 	}
 }
 
-func Array(o *input.Option) {
-	o.Flag |= input.ValueArray
+func Array(o *Option) {
+	o.Flag |= flag.Array
 }
 
-func Value(flag input.Flag) func(*input.Option) {
-	return func(o *input.Option) {
+func Value(flag flag.Flag) func(*Option) {
+	return func(o *Option) {
 		o.Flag |= flag
 	}
 }
 
-func Flag(in input.Flag) func(*input.Option) {
-	return func(o *input.Option) {
+func Flag(in flag.Flag) func(*Option) {
+	return func(o *Option) {
 		o.Flag = in
 	}
 }
 
-func Valid(f ...func(input.Value) error) func(*input.Option) {
-	return func(o *input.Option) {
+func Valid(f ...func(value.Value) error) func(*Option) {
+	return func(o *Option) {
 		o.Valid = f
 	}
 }
+
+func New(name, description string, opts ...func(*Option)) Option {
+	o := Option{
+		Name:        name,
+		Description: description,
+	}
+
+	for _, opt := range opts {
+		opt(&o)
+	}
+
+	return o
+}
+
+type Option struct {
+	Name        string
+	Description string
+	Short       string
+	Flag        flag.Flag
+	Default     value.Value
+	Valid       []func(value.Value) error
+}
+
+func (o Option) HasShort() bool {
+	return len(o.Short) == 1
+}
+
+func (o Option) HasDefault() bool {
+	return o.Default != nil
+}
+
+func (o Option) IsBool() bool {
+	return o.Flag.IsBool()
+}
+
+func (o Option) IsArray() bool {
+	return o.Flag.IsArray()
+}
+
+func (o Option) IsRequired() bool {
+	return o.Flag.IsRequired()
+}
+
+func (o Option) Validate(v value.Value) error {
+	for _, valid := range o.Valid {
+		if err := valid(v); err != nil {
+			return Error(o.Name, err)
+		}
+	}
+
+	return nil
+}
+
+func Error(name string, err error) error {
+	return err
+}