Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: list loop panic for enum checks #22

Closed
wants to merge 2 commits into from
Closed

fix: list loop panic for enum checks #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a78683d
optimize: avoid IsValid()
HeyJavaBean Dec 27, 2023
b2fddf9
fix: fix list loop panic
HeyJavaBean Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions validator/generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ import (

var Version string

var ValidMethodName string = "IsValid"

type generator struct {
config *config.Config
request *plugin.Request
Expand Down Expand Up @@ -67,9 +69,22 @@ func newGenerator(req *plugin.Request) (*generator, error) {
}
g.utils = golang.NewCodeUtils(lf)
g.utils.HandleOptions(req.GeneratorParameters)
if parseExtend(req.PluginParameters) {
ValidMethodName = "IsStructValid"
}

return g, nil
}

func parseExtend(params []string) bool {
for _, parameter := range params {
if strings.HasPrefix(parameter, "avoid_name") {
return true
}
}
return false
}

func (g *generator) write(str string) {
g.buffer.WriteString(str)
}
Expand Down Expand Up @@ -194,7 +209,7 @@ func (g *generator) generateBody(ast *tp.Thrift, resolver *golang.Resolver) erro
if err != nil {
return err
}
g.writeLinef("func (p *%s) IsValid() error {\n", st.GoName().String())
g.writeLinef("func (p *%s) "+ValidMethodName+"() error {\n", st.GoName().String())
g.indent()
for _, vc := range vcs {
switch vc.ValidationType {
Expand Down Expand Up @@ -278,7 +293,7 @@ func (g *generator) generateStructLikeFieldValidation(vc *ValidateContext) error
}
}
if !skip {
g.writeLinef("if err := %s.IsValid(); err != nil {\n", vc.Target)
g.writeLinef("if err := %s."+ValidMethodName+"(); err != nil {\n", vc.Target)
g.indent()
g.writeLinef("return fmt.Errorf(\"field %s not valid, %%w\", err)", vc.FieldName)
g.unindent()
Expand Down Expand Up @@ -840,6 +855,7 @@ func (g *generator) generateListValidation(vc *ValidateContext) error {

vc.ValCtx.WithTarget(elemName)
vt := &ValidateContext{
AST: vc.AST,
FieldName: elemName,
RawFieldName: elemName,
Resolver: vc.Resolver,
Expand Down
4 changes: 2 additions & 2 deletions validator/validator_tpl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package validator
var StructLikeValidate = `
{{define "StructLikeValidate"}}
{{- $TypeName := .Name | Identify}}
func (p *{{$TypeName}}) IsValid() bool {
func (p *{{$TypeName}}) ` + ValidMethodName + `() bool {
{{- ctxs := MkValidateContexts .Fields}}
{{- range .ctxs}}
{{template "FieldValidate" .}}
Expand Down Expand Up @@ -49,7 +49,7 @@ var FieldValidateStructLike = `

{{- else if eq . Annotation $StructLikeAnnotation.NotNil}}
{{- end}}
if !{{.Target}}.IsValid({{.Source}}) {
if !{{.Target}}.` + ValidMethodName + `({{.Source}}) {
return false
}
{{- end}}{{/* "FieldValidateStructLike" */}}
Expand Down
2 changes: 1 addition & 1 deletion version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ func init() {
}

const (
Version = "v0.1.4"
Version = "v0.2.3"
)
Loading