From e2a2db01bb5cf408f4ff481b1735118f70301d98 Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 25 Jan 2024 19:44:58 +0300 Subject: [PATCH] remove definition --- definition/defenition.go | 29 --- definition/generate/generator.go | 70 ------- definition/generate/helpers.go | 16 -- definition/generate/imports.go | 87 --------- definition/generate/run.go | 38 ---- definition/generate/template.go | 41 ---- definition/generate/view.go | 60 ------ definition/group/group.go | 27 --- definition/group/view.go | 85 -------- definition/option.go | 27 --- definition/option/option.go | 100 ---------- definition/option/tpl/option.tmpl | 33 ---- definition/option/tpl/parse.tmpl | 3 - definition/option/tpl/unmarshal_json.tmpl | 8 - definition/option/tpl/unmarshal_text.tmpl | 8 - definition/option/view.go | 226 ---------------------- definition/option/view_params.go | 6 - definition/proto/proto.go | 27 --- definition/proto/view.go | 76 -------- go.mod | 5 +- go.sum | 2 - 21 files changed, 1 insertion(+), 973 deletions(-) delete mode 100755 definition/defenition.go delete mode 100644 definition/generate/generator.go delete mode 100644 definition/generate/helpers.go delete mode 100644 definition/generate/imports.go delete mode 100644 definition/generate/run.go delete mode 100644 definition/generate/template.go delete mode 100644 definition/generate/view.go delete mode 100755 definition/group/group.go delete mode 100644 definition/group/view.go delete mode 100755 definition/option.go delete mode 100755 definition/option/option.go delete mode 100644 definition/option/tpl/option.tmpl delete mode 100644 definition/option/tpl/parse.tmpl delete mode 100644 definition/option/tpl/unmarshal_json.tmpl delete mode 100644 definition/option/tpl/unmarshal_text.tmpl delete mode 100644 definition/option/view.go delete mode 100644 definition/option/view_params.go delete mode 100644 definition/proto/proto.go delete mode 100644 definition/proto/view.go diff --git a/definition/defenition.go b/definition/defenition.go deleted file mode 100755 index 64385e1..0000000 --- a/definition/defenition.go +++ /dev/null @@ -1,29 +0,0 @@ -package definition - -import ( - "fmt" -) - -func New() Definition { - return Definition{} -} - -type Definition struct { - options Options -} - -func (d *Definition) Add(opts ...Option) *Definition { - d.options = append(d.options, opts...) - - return d -} - -func (d *Definition) View(handle func(Option) error) error { - for idx, opt := range d.options { - if err := handle(opt); err != nil { - return fmt.Errorf("%s[%d]:%w", opt.Kind(), idx, err) - } - } - - return nil -} diff --git a/definition/generate/generator.go b/definition/generate/generator.go deleted file mode 100644 index fdb9e93..0000000 --- a/definition/generate/generator.go +++ /dev/null @@ -1,70 +0,0 @@ -package generate - -import ( - "fmt" - "io" - - "gitoa.ru/go-4devs/config/definition" -) - -type Generator struct { - pkg string - ViewOption - Imp Imports - errs []error - defaultErrors []string -} - -func (g Generator) Pkg() string { - return g.pkg -} - -func (g Generator) Imports() []Import { - return g.Imp.Imports() -} - -func (g Generator) Handle(w io.Writer, data Handler, opt definition.Option) error { - handle := get(opt.Kind()) - - return handle(w, data, opt) -} - -func (g Generator) StructName() string { - return FuncName(g.Prefix + "_" + g.Struct + "_" + g.Suffix) -} - -func (g Generator) Options() ViewOption { - return g.ViewOption -} - -func (g Generator) Keys() []string { - return nil -} - -func (g Generator) DefaultErrors() []string { - if len(g.defaultErrors) > 0 { - return g.defaultErrors - } - - if len(g.ViewOption.Errors.Default) > 0 { - g.Imp.Adds("errors") - } - - g.defaultErrors = make([]string, len(g.ViewOption.Errors.Default)) - for idx, name := range g.ViewOption.Errors.Default { - short, err := g.AddType(name) - if err != nil { - g.errs = append(g.errs, fmt.Errorf("add default error[%d]:%w", idx, err)) - - return nil - } - - g.defaultErrors[idx] = short - } - - return g.defaultErrors -} - -func (g *Generator) AddType(pkg string) (string, error) { - return g.Imp.AddType(pkg) -} diff --git a/definition/generate/helpers.go b/definition/generate/helpers.go deleted file mode 100644 index b3cdf0c..0000000 --- a/definition/generate/helpers.go +++ /dev/null @@ -1,16 +0,0 @@ -package generate - -import ( - "errors" - - "github.com/iancoleman/strcase" -) - -var ( - ErrNotFound = errors.New("not found") - ErrAlreadyExist = errors.New("already exist") -) - -func FuncName(in string) string { - return strcase.ToCamel(in) -} diff --git a/definition/generate/imports.go b/definition/generate/imports.go deleted file mode 100644 index fc40a59..0000000 --- a/definition/generate/imports.go +++ /dev/null @@ -1,87 +0,0 @@ -package generate - -import ( - "fmt" - "strconv" - "strings" -) - -func NewImports() Imports { - return Imports{ - data: make(map[string]string), - } -} - -type Imports struct { - data map[string]string -} - -func (i Imports) Imports() []Import { - imports := make([]Import, 0, len(i.data)) - for name, alias := range i.data { - imports = append(imports, Import{ - Package: name, - Alias: alias, - }) - } - - return imports -} - -func (i *Imports) Short(fullType string) (string, error) { - idx := strings.LastIndexByte(fullType, '.') - if idx == -1 { - return "", fmt.Errorf("unexpected") - } - if alias, ok := i.data[fullType[:idx]]; ok { - return alias + fullType[idx:], nil - } - - return "", fmt.Errorf("%w alias for pkg %v", ErrNotFound, fullType[:idx]) -} - -func (i *Imports) AddType(fullType string) (string, error) { - idx := strings.LastIndexByte(fullType, '.') - if idx == -1 { - return "", fmt.Errorf("unexpected") - } - - imp := i.Add(fullType[:idx]) - - return imp.Alias + fullType[idx:], nil - -} - -func (i *Imports) Adds(pkgs ...string) { - for _, pkg := range pkgs { - i.Add(pkg) - } -} - -func (i *Imports) Add(pkg string) Import { - alias := pkg - idx := strings.LastIndexByte(pkg, '/') - if idx != -1 { - alias = pkg[idx+1:] - } - if al, ok := i.data[pkg]; ok { - return Import{Package: pkg, Alias: al} - } - - for _, al := range i.data { - if al == alias { - alias += strconv.Itoa(len(i.data)) - } - } - i.data[pkg] = alias - - return Import{ - Alias: alias, - Package: pkg, - } -} - -type Import struct { - Alias string - Package string -} diff --git a/definition/generate/run.go b/definition/generate/run.go deleted file mode 100644 index a0a0029..0000000 --- a/definition/generate/run.go +++ /dev/null @@ -1,38 +0,0 @@ -package generate - -import ( - "bytes" - "fmt" - "io" - - "gitoa.ru/go-4devs/config/definition" -) - -func Run(w io.Writer, pkgName string, defs definition.Definition, viewOpt ViewOption) error { - gen := Generator{ - pkg: pkgName, - ViewOption: viewOpt, - Imp: NewImports(), - } - - gen.Imp.Adds("gitoa.ru/go-4devs/config", "fmt", "context") - - var view bytes.Buffer - err := defs.View(func(o definition.Option) error { - return gen.Handle(&view, &gen, o) - }) - if err != nil { - return fmt.Errorf("render options:%w", err) - } - - if err := tpl.Execute(w, gen); err != nil { - return fmt.Errorf("render base:%w", err) - } - - _, cerr := io.Copy(w, &view) - if cerr != nil { - return fmt.Errorf("copy error:%w", cerr) - } - - return nil -} diff --git a/definition/generate/template.go b/definition/generate/template.go deleted file mode 100644 index 34ed076..0000000 --- a/definition/generate/template.go +++ /dev/null @@ -1,41 +0,0 @@ -package generate - -import "text/template" - -var tpl = template.Must(template.New("tpls").Parse(baseTemplate)) - -var baseTemplate = `// Code generated gitoa.ru/go-4devs/config DO NOT EDIT. -package {{.Pkg}} - -import ( - {{range .Imports}} - {{- .Alias }}"{{ .Package }}" - {{end}} -) - -func With{{.StructName}}Log(log func(context.Context, string, ...any)) func(*{{.StructName}}) { - return func(ci *{{.StructName}}) { - ci.log = log - } -} - -func New{{.StructName}}(prov config.Provider, opts ...func(*{{.StructName}})) {{.StructName}} { - i := {{.StructName}}{ - Provider: prov, - log: func(_ context.Context, format string, args ...any) { - fmt.Printf(format, args...) - }, - } - - for _, opt := range opts { - opt(&i) - } - - return i -} - -type {{.StructName}} struct { - config.Provider - log func(context.Context, string, ...any) -} -` diff --git a/definition/generate/view.go b/definition/generate/view.go deleted file mode 100644 index 31f5a68..0000000 --- a/definition/generate/view.go +++ /dev/null @@ -1,60 +0,0 @@ -package generate - -import ( - "fmt" - "io" - "sync" - - "gitoa.ru/go-4devs/config/definition" -) - -var handlers = sync.Map{} - -func Add(kind string, h Handle) error { - _, ok := handlers.Load(kind) - if ok { - return fmt.Errorf("kind %v: %w", kind, ErrAlreadyExist) - } - - handlers.Store(kind, h) - return nil -} - -func get(kind string) Handle { - h, ok := handlers.Load(kind) - if !ok { - return func(w io.Writer, h Handler, o definition.Option) error { - return fmt.Errorf("handler by %v:%w", kind, ErrNotFound) - } - } - - return h.(Handle) -} - -func MustAdd(kind string, h Handle) { - if err := Add(kind, h); err != nil { - panic(err) - } -} - -type Handle func(io.Writer, Handler, definition.Option) error - -type Handler interface { - StructName() string - Handle(io.Writer, Handler, definition.Option) error - Options() ViewOption - Keys() []string - AddType(fullName string) (string, error) - DefaultErrors() []string -} - -type ViewOption struct { - Prefix, Suffix string - Context bool - Struct string - Errors ViewErrors -} - -type ViewErrors struct { - Default []string -} diff --git a/definition/group/group.go b/definition/group/group.go deleted file mode 100755 index 32328c3..0000000 --- a/definition/group/group.go +++ /dev/null @@ -1,27 +0,0 @@ -package group - -import ( - "gitoa.ru/go-4devs/config/definition" -) - -const Kind = "group" - -var _ definition.Option = Group{} - -func New(name, desc string, opts ...definition.Option) Group { - return Group{ - Name: name, - Description: desc, - Options: opts, - } -} - -type Group struct { - Options definition.Options - Name string - Description string -} - -func (o Group) Kind() string { - return Kind -} diff --git a/definition/group/view.go b/definition/group/view.go deleted file mode 100644 index 250ad11..0000000 --- a/definition/group/view.go +++ /dev/null @@ -1,85 +0,0 @@ -package group - -import ( - "fmt" - "io" - "text/template" - - "gitoa.ru/go-4devs/config/definition" - "gitoa.ru/go-4devs/config/definition/generate" -) - -func init() { - generate.MustAdd(Kind, handle) -} - -func handle(w io.Writer, data generate.Handler, option definition.Option) error { - group, ok := option.(Group) - if !ok { - return fmt.Errorf("uexepected type:%T", option) - } - viewData := View{ - Group: group, - ParentName: data.StructName(), - ViewOption: data.Options(), - } - - err := tpl.Execute(w, viewData) - - if err != nil { - return fmt.Errorf("render group:%w", err) - } - - childData := ChildData{ - Handler: data, - structName: viewData.StructName(), - keys: append(data.Keys(), group.Name), - } - for idx, child := range group.Options { - if cerr := data.Handle(w, childData, child); cerr != nil { - return fmt.Errorf("render group child[%d]:%w", idx, cerr) - } - } - - return nil -} - -type ChildData struct { - generate.Handler - structName string - keys []string -} - -func (c ChildData) StructName() string { - return c.structName -} - -func (v ChildData) Keys() []string { - return v.keys -} - -type View struct { - Group - ParentName string - generate.ViewOption -} - -func (v View) FuncName() string { - return generate.FuncName(v.Name) -} - -func (v View) StructName() string { - return generate.FuncName(v.Prefix + v.Name + v.Suffix) -} - -var tpl = template.Must(template.New("tpls").Parse(tplw)) - -var tplw = `type {{.StructName}} struct { - {{.ParentName}} -} - -// {{.FuncName}} {{.Description}}. -func (i {{.ParentName}}) {{.FuncName}}() {{.StructName}} { - return {{.StructName}}{i} -} -` diff --git a/definition/option.go b/definition/option.go deleted file mode 100755 index 9a3bd57..0000000 --- a/definition/option.go +++ /dev/null @@ -1,27 +0,0 @@ -package definition - -type Option interface { - Kind() string -} - -type Options []Option - -func (s Options) Len() int { return len(s) } -func (s Options) Swap(i, j int) { s[i], s[j] = s[j], s[i] } - -type Params []Param - -func (p Params) Get(name string) (any, bool) { - for _, param := range p { - if param.Name == name { - return param.Value, true - } - } - - return nil, false -} - -type Param struct { - Name string - Value any -} diff --git a/definition/option/option.go b/definition/option/option.go deleted file mode 100755 index 1936f2f..0000000 --- a/definition/option/option.go +++ /dev/null @@ -1,100 +0,0 @@ -package option - -import ( - "gitoa.ru/go-4devs/config/definition" -) - -var _ definition.Option = Option{} - -const ( - Kind = "option" -) - -const ( - TypeString = "string" - TypeInt = "int" - TypeInt64 = "int64" - TypeUint = "uint" - TypeUint64 = "uint64" - TypeFloat64 = "float64" - TypeBool = "bool" - TypeTime = "time.Time" - TypeDuration = "time.Duration" -) - -func Default(v any) func(*Option) { - return func(o *Option) { - o.Default = v - } -} - -func New(name, desc string, vtype any, opts ...func(*Option)) Option { - option := Option{ - Name: name, - Description: desc, - Type: vtype, - } - - for _, opt := range opts { - opt(&option) - } - - return option -} - -type Option struct { - Name string - Description string - Type any - Default any - Params definition.Params -} - -func (o Option) WithParams(params ...definition.Param) Option { - return Option{ - Name: o.Name, - Description: o.Description, - Type: o.Type, - Params: append(params, o.Params...), - } -} - -func (o Option) Kind() string { - return Kind -} - -func Time(name, desc string, opts ...func(*Option)) Option { - return New(name, desc, TypeTime, opts...) -} - -func Duration(name, desc string, opts ...func(*Option)) Option { - return New(name, desc, TypeDuration, opts...) -} - -func String(name, desc string, opts ...func(*Option)) Option { - return New(name, desc, TypeString, opts...) -} - -func Int(name, desc string, opts ...func(*Option)) Option { - return New(name, desc, TypeInt, opts...) -} - -func Int64(name, desc string, opts ...func(*Option)) Option { - return New(name, desc, TypeInt64, opts...) -} - -func Uint(name, desc string, opts ...func(*Option)) Option { - return New(name, desc, TypeUint, opts...) -} - -func Uint64(name, desc string, opts ...func(*Option)) Option { - return New(name, desc, TypeUint64, opts...) -} - -func Float64(name, desc string, opts ...func(*Option)) Option { - return New(name, desc, TypeFloat64, opts...) -} - -func Bool(name, desc string, opts ...func(*Option)) Option { - return New(name, desc, TypeBool, opts...) -} diff --git a/definition/option/tpl/option.tmpl b/definition/option/tpl/option.tmpl deleted file mode 100644 index 73f5532..0000000 --- a/definition/option/tpl/option.tmpl +++ /dev/null @@ -1,33 +0,0 @@ -// read{{.FuncName}} {{.Description}}. -func (i {{.StructName}}) read{{.FuncName}}(ctx context.Context) (v {{.Type}},e error) { - val, err := i.Value(ctx, {{ .ParentKeys }}"{{ .Name }}") - if err != nil { - {{if .HasDefault}} - {{$default := .Default}} - {{range .DefaultErrors}} - if errors.Is(err,{{.}}){ - return {{$default}} - } - {{end}} - {{end}} - return v, fmt.Errorf("read {{.Keys}}:%w",err) - } - - {{.Parse "val" "v" .Keys }} -} - -// Read{{.FuncName}} {{.Description}}. -func (i {{.StructName}}) Read{{.FuncName}}(ctx context.Context) ({{.Type}}, error) { - return i.read{{.FuncName}}(ctx) -} - -// {{.FuncName}} {{.Description}}. -func (i {{.StructName}}) {{.FuncName}}({{if .Context}} ctx context.Context {{end}}) {{.Type}} { - {{if not .Context}} ctx := context.Background() {{end}} - val, err := i.read{{.FuncName}}(ctx) - if err != nil { - i.log(ctx, "get {{.Keys}}: %v", err) - } - - return val -} diff --git a/definition/option/tpl/parse.tmpl b/definition/option/tpl/parse.tmpl deleted file mode 100644 index 0cbc58b..0000000 --- a/definition/option/tpl/parse.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -{{block "Parse" .}} -return {{.ValName}}.Parse{{ .FuncType}}() -{{end}} \ No newline at end of file diff --git a/definition/option/tpl/unmarshal_json.tmpl b/definition/option/tpl/unmarshal_json.tmpl deleted file mode 100644 index b54d7fb..0000000 --- a/definition/option/tpl/unmarshal_json.tmpl +++ /dev/null @@ -1,8 +0,0 @@ -{{block "UnmarshalJSON" . }} - pval, perr := {{.ValName}}.ParseString() - if perr != nil { - return {{.Value}}, fmt.Errorf("read {{.Keys}}:%w", perr) - } - - return {{.Value}}, {{.Value}}.UnmarshalJSON([]byte(pval)) -{{end}} \ No newline at end of file diff --git a/definition/option/tpl/unmarshal_text.tmpl b/definition/option/tpl/unmarshal_text.tmpl deleted file mode 100644 index fbb8105..0000000 --- a/definition/option/tpl/unmarshal_text.tmpl +++ /dev/null @@ -1,8 +0,0 @@ -{{block "UnmarshalText" . }} - pval, perr := {{.ValName}}.ParseString() - if perr != nil { - return {{.Value}}, fmt.Errorf("read {{.Keys}}:%w", perr) - } - - return {{.Value}}, {{.Value}}.UnmarshalText([]byte(pval)) -{{end}} \ No newline at end of file diff --git a/definition/option/view.go b/definition/option/view.go deleted file mode 100644 index 777d4e4..0000000 --- a/definition/option/view.go +++ /dev/null @@ -1,226 +0,0 @@ -package option - -import ( - "bytes" - "embed" - "encoding" - "encoding/json" - "fmt" - "io" - "reflect" - "strings" - "text/template" - "time" - - "gitoa.ru/go-4devs/config/definition" - "gitoa.ru/go-4devs/config/definition/generate" -) - -//go:embed tpl/* -var tpls embed.FS - -var tpl = template.Must(template.New("tpls").ParseFS(tpls, "tpl/*.tmpl")) - -func init() { - generate.MustAdd(Kind, Handle(tpl.Lookup("option.tmpl"))) -} - -func Handle(tpl *template.Template) generate.Handle { - return func(w io.Writer, h generate.Handler, o definition.Option) error { - opt, _ := o.(Option) - if err := tpl.Execute(w, View{Option: opt, Handler: h}); err != nil { - return fmt.Errorf("option tpl:%w", err) - } - - return nil - } -} - -type View struct { - Option - generate.Handler -} - -func (v View) Context() bool { - return v.Options().Context -} - -func (v View) FuncName() string { - if funcName, ok := v.Option.Params.Get(ViewParamFunctName); ok { - return funcName.(string) - } - - return generate.FuncName(v.Name) -} - -func (v View) Description() string { - if desc, ok := v.Option.Params.Get(ViewParamDescription); ok { - return desc.(string) - } - - return v.Option.Description -} - -func (v View) Default() string { - switch data := v.Option.Default.(type) { - case time.Time: - return fmt.Sprintf("time.Parse(%q,time.RFC3339Nano)", data.Format(time.RFC3339Nano)) - case time.Duration: - return fmt.Sprintf("time.ParseDuration(%q)", data) - default: - return fmt.Sprintf("%#v, nil", data) - } -} - -func (v View) HasDefault() bool { - return v.Option.Default != nil -} - -func (v View) ParentKeys() string { - if len(v.Handler.Keys()) > 0 { - return `"` + strings.Join(v.Handler.Keys(), `","`) + `",` - } - - return "" -} - -func (v View) Type() string { - slice := "" - if vtype, ok := v.Option.Type.(string); ok { - if strings.Contains(vtype, ".") { - if name, err := v.AddType(vtype); err == nil { - return slice + name - } - } - return vtype - } - - rtype := reflect.TypeOf(v.Option.Type) - - if rtype.PkgPath() == "" { - return rtype.String() - } - - if rtype.Kind() == reflect.Slice { - slice = "[]" - } - - short, err := v.AddType(rtype.PkgPath() + "." + rtype.Name()) - if err != nil { - return err.Error() - } - - return slice + short -} - -func (v View) FuncType() string { - return generate.FuncName(v.Type()) -} - -func (v View) Parse(valName string, value string, keys []string) string { - - h := parser(v.Option.Type) - - data, err := h(ParseData{ - Value: value, - ValName: valName, - Keys: keys, - View: v, - }) - if err != nil { - return err.Error() - } - - return data -} - -var parses = map[string]func(data ParseData) (string, error){ - typesIntreface[0].Name(): func(data ParseData) (string, error) { - var b bytes.Buffer - - err := tpl.ExecuteTemplate(&b, "unmarshal_text.tmpl", data) - if err != nil { - return "", err - } - - return b.String(), nil - }, - typesIntreface[1].Name(): func(data ParseData) (string, error) { - var b bytes.Buffer - - err := tpl.ExecuteTemplate(&b, "unmarshal_json.tmpl", data) - if err != nil { - return "", err - } - - return b.String(), nil - }, - TypeInt: internal, - TypeInt64: internal, - TypeBool: internal, - TypeString: internal, - TypeFloat64: internal, - TypeUint: internal, - TypeUint64: internal, - "time.Duration": func(data ParseData) (string, error) { - return fmt.Sprintf("return %s.ParseDuration()", data.ValName), nil - }, - "time.Time": func(data ParseData) (string, error) { - return fmt.Sprintf("return %s.ParseTime()", data.ValName), nil - }, - "any": func(data ParseData) (string, error) { - return fmt.Sprintf("return %[2]s, %[1]s.Unmarshal(&%[2]s)", data.ValName, data.Value), nil - }, -} - -func internal(data ParseData) (string, error) { - var b bytes.Buffer - err := tpl.ExecuteTemplate(&b, "parse.tmpl", data) - if err != nil { - return "", err - } - - return b.String(), nil -} - -var ( - typesIntreface = [...]reflect.Type{ - reflect.TypeOf((*encoding.TextUnmarshaler)(nil)).Elem(), - reflect.TypeOf((*json.Unmarshaler)(nil)).Elem(), - } -) - -func parser(data any) func(ParseData) (string, error) { - vtype := reflect.TypeOf(data) - name := vtype.Name() - if v, ok := data.(string); ok { - name = v - } - - if vtype.Kind() == reflect.Slice { - return parses["any"] - } - - if h, ok := parses[name]; ok { - return h - } - - for _, extypes := range typesIntreface { - if vtype.Implements(extypes) { - return parses[extypes.Name()] - } - - if vtype.Kind() != reflect.Ptr && reflect.PointerTo(vtype).Implements(extypes) { - return parses[extypes.Name()] - } - } - - return parses["any"] -} - -type ParseData struct { - Value string - ValName string - Keys []string - View -} diff --git a/definition/option/view_params.go b/definition/option/view_params.go deleted file mode 100644 index 36c4ee1..0000000 --- a/definition/option/view_params.go +++ /dev/null @@ -1,6 +0,0 @@ -package option - -const ( - ViewParamFunctName = "view.funcName" - ViewParamDescription = "view.description" -) diff --git a/definition/proto/proto.go b/definition/proto/proto.go deleted file mode 100644 index 439487a..0000000 --- a/definition/proto/proto.go +++ /dev/null @@ -1,27 +0,0 @@ -package proto - -import ( - "gitoa.ru/go-4devs/config/definition" -) - -const Kind = "proto" - -func New(name, desc string, opt definition.Option, opts ...func(*Proto)) Proto { - pr := Proto{ - Name: name, - Description: desc, - Option: opt, - } - - return pr -} - -type Proto struct { - Name string - Description string - Option definition.Option -} - -func (p Proto) Kind() string { - return Kind -} diff --git a/definition/proto/view.go b/definition/proto/view.go deleted file mode 100644 index b046cac..0000000 --- a/definition/proto/view.go +++ /dev/null @@ -1,76 +0,0 @@ -package proto - -import ( - "fmt" - "io" - "strings" - "text/template" - - "gitoa.ru/go-4devs/config/definition" - "gitoa.ru/go-4devs/config/definition/generate" - "gitoa.ru/go-4devs/config/definition/option" -) - -func init() { - generate.MustAdd(Kind, handle) -} - -func handle(w io.Writer, data generate.Handler, opt definition.Option) error { - proto, ok := opt.(Proto) - if !ok { - return fmt.Errorf("uexepected type:%T", opt) - } - if viewOpt, ok := proto.Option.(option.Option); ok { - viewOpt = viewOpt.WithParams( - definition.Param{ - Name: option.ViewParamFunctName, - Value: generate.FuncName(proto.Name) + generate.FuncName(viewOpt.Name), - }, - definition.Param{ - Name: option.ViewParamDescription, - Value: proto.Description + " " + viewOpt.Description, - }, - ) - - return option.Handle(tpl)(w, data, viewOpt) - } - - return fmt.Errorf("not support option type") -} - -var tpl = template.Must(template.New("tpls").Funcs(template.FuncMap{"join": strings.Join}).Parse(templateOption)) - -var templateOption = `// read{{.FuncName}} {{.Description}}. -func (i {{.StructName}}) read{{.FuncName}}(ctx context.Context, key string) (v {{.Type}},e error) { - val, err := i.Value(ctx, {{ .ParentKeys }} key, "{{.Name}}") - if err != nil { - {{if .HasDefault}} - {{$default := .Default}} - {{range .DefaultErrors}} - if errors.Is(err,{{.}}){ - return {{$default}} - } - {{end}} - {{end}} - return v, fmt.Errorf("read {{.Keys}}:%w",err) - } - - {{.Parse "val" "v" .Keys }} -} - -// Read{{.FuncName}} {{.Description}}. -func (i {{.StructName}}) Read{{.FuncName}}(ctx context.Context, key string) ({{.Type}}, error) { - return i.read{{.FuncName}}(ctx, key) -} - -// {{.FuncName}} {{.Description}}. -func (i {{.StructName}}) {{.FuncName}}({{if .Context}} ctx context.Context, {{end}} key string) {{.Type}} { - {{if not .Context}} ctx := context.Background() {{end}} - val, err := i.read{{.FuncName}}(ctx, key) - if err != nil { - i.log(ctx, "get {{.Keys}}: %v", err) - } - - return val -} -` diff --git a/go.mod b/go.mod index 5af0f3c..aa3051c 100644 --- a/go.mod +++ b/go.mod @@ -2,10 +2,7 @@ module gitoa.ru/go-4devs/config go 1.18 -require ( - github.com/iancoleman/strcase v0.3.0 - github.com/stretchr/testify v1.7.0 -) +require github.com/stretchr/testify v1.7.0 require ( github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/go.sum b/go.sum index d062215..c9dded0 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI= -github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=