move default from option to param

definition/generate/view/view.go

@@ -237,7 +237,7 @@ func (v View) Description() string {
 }
 
 func (v View) Default() any {
-	data, ok := option.DataDefaut(v.Params)
+	data, ok := param.Default(v.Params)
 	if !ok {
 		return nil
 	}

definition/option/params.go

@@ -8,7 +8,6 @@ type key int
 
 const (
 	paramHidden key = iota + 1
-	paramDefault
 	paramRequired
 	paramSlice
 	paramBool
@@ -66,9 +65,7 @@ func Slice(v param.Params) param.Params {
 }
 
 func Default(in any) param.Option {
-	return func(v param.Params) param.Params {
+	return param.WithDefault(in)
-		return param.With(v, paramDefault, in)
-	}
 }
 
 // Deprecated: use param.WithDescription.
@@ -77,7 +74,7 @@ func Description(in string) param.Option {
 }
 
 func HasDefaut(fn param.Params) bool {
-	_, ok := fn.Param(paramDefault)
+	_, ok := param.Default(fn)
 
 	return ok
 }
@@ -86,10 +83,9 @@ func DataPosition(fn param.Params) (uint64, bool) {
 	return param.Uint64(paramPos, fn)
 }
 
+// Deprecated: use param.Default.
 func DataDefaut(fn param.Params) (any, bool) {
-	data, ok := fn.Param(paramDefault)
+	return param.Default(fn)
-
-	return data, ok
 }
 
 func IsSlice(fn param.Params) bool {

param/keys.go

@@ -6,6 +6,7 @@ const (
 	paramTimeFormat key = iota + 1
 	paramType
 	paramDescription
+	paramDefault
 )
 
 func WithTimeFormat(format string) Option {
@@ -41,3 +42,15 @@ func Description(fn Params) string {
 
 	return data
 }
+
+func WithDefault(in any) Option {
+	return func(p Params) Params {
+		return With(p, paramDefault, in)
+	}
+}
+
+func Default(p Params) (any, bool) {
+	data, ok := p.Param(paramDefault)
+
+	return data, ok
+}

provider/arg/dump.go

@@ -353,7 +353,7 @@ func (v View) Pos() uint64 {
 }
 
 func (v View) Default() string {
-	data, ok := option.DataDefaut(v.Params)
+	data, ok := param.Default(v.Params)
 	if !ok {
 		return ""
 	}

provider/env/provider.go

@@ -8,7 +8,6 @@ import (
 	"strings"
 
 	"gitoa.ru/go-4devs/config"
-	"gitoa.ru/go-4devs/config/definition/option"
 	"gitoa.ru/go-4devs/config/key"
 	"gitoa.ru/go-4devs/config/param"
 	"gitoa.ru/go-4devs/config/value"
@@ -91,7 +90,7 @@ func (p *Provider) writeOption(w io.Writer, opt config.Option, keys ...string) e
 	case config.Options:
 		err = p.writeOptions(w, one, keys...)
 	default:
-		def, dok := option.DataDefaut(opt)
+		def, dok := param.Default(opt)
 
 		prefix := ""
 		if !dok || key.IsWild(keys...) {

provider/memory/def.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"gitoa.ru/go-4devs/config"
-	"gitoa.ru/go-4devs/config/definition/option"
+	"gitoa.ru/go-4devs/config/param"
 )
 
 const NameDefault = "default"
@@ -27,7 +27,7 @@ func (a *Default) Value(ctx context.Context, key ...string) (config.Value, error
 
 func (a *Default) Bind(_ context.Context, def config.Variables) error {
 	for _, opt := range def.Variables() {
-		if data, ok := option.DataDefaut(opt); ok {
+		if data, ok := param.Default(opt); ok {
 			a.data.SetOption(data, opt.Key()...)
 		}
 	}