111

Author: lvan100

gen/generator/golang/main.go

@@ -20,6 +20,7 @@ import (
 	"go/format"
 	"os"
 	"sort"
+	"strings"
 
 	"github.com/go-spring/gs-http-gen/gen/generator"
 	"github.com/go-spring/gs-http-gen/lib/tidl"
@@ -86,3 +87,18 @@ func formatFile(fileName string, b []byte) error {
 	}
 	return os.WriteFile(fileName, b, os.ModePerm)
 }
+
+// formatComment generates the comment string
+func formatComment(c tidl.Comments) string {
+	var comment string
+	for _, s := range c.Above {
+		comment += s.Text[0]
+	}
+	if c.Right != nil {
+		if c.Above != nil {
+			comment += "\n"
+		}
+		comment += strings.Join(c.Right.Text, "\n")
+	}
+	return comment
+}

gen/generator/golang/server.go

@@ -88,6 +88,12 @@ const {{$c.Name}} {{$c.Type}} = {{$c.Value}}
 		}
 	)
 
+	// OneOf{{$e.Name}} is usually used for validation.
+	func OneOf{{$e.Name}}(i {{$e.Name}}) bool {
+		_, ok := {{$e.Name}}_name[i]
+		return ok
+	}
+
 	// {{$e.Name}}AsString wraps {{$e.Name}} to encode/decode as a JSON string
 	type {{$e.Name}}AsString {{$e.Name}}
 
@@ -108,13 +114,6 @@ const {{$c.Name}} {{$c.Type}} = {{$c.Value}}
 		}
 		return fmt.Errorf("invalid {{$e.Name}} value: %q", str)
 	}
-
-	// OneOf{{$e.Name}} is usually used for validation.
-	func OneOf{{$e.Name}}(i {{$e.Name}}) bool {
-		_, ok := {{$e.Name}}_name[i]
-		return ok
-	}
-
 {{end}}
 
 {{range $s := .Structs}}
@@ -201,21 +200,6 @@ func (g *Generator) genType(ctx Context, fileName string, doc tidl.Document) err
 	return formatFile(fileName, buf.Bytes())
 }
 
-// genComment generates the comment string
-func genComment(c tidl.Comments) string {
-	var comment string
-	for _, s := range c.Above {
-		comment += s.Text[0]
-	}
-	if c.Right != nil {
-		if c.Above != nil {
-			comment += "\n"
-		}
-		comment += strings.Join(c.Right.Text, "\n")
-	}
-	return comment
-}
-
 // Const represents a Go constant
 type Const struct {
 	Type    string
@@ -228,17 +212,16 @@ type Const struct {
 func convertConsts(ctx Context, doc tidl.Document) ([]Const, error) {
 	var ret []Const
 	for _, c := range doc.Consts {
-		typeName, err := getTypeName(ctx, tidl.BaseType{
-			Name: c.Type,
-		}, nil)
+		t := tidl.BaseType{Name: c.Type}
+		typeName, err := getTypeName(ctx, t, nil)
 		if err != nil {
 			return nil, err
 		}
 		ret = append(ret, Const{
 			Name:    c.Name,
 			Type:    typeName,
 			Value:   c.Value,
-			Comment: genComment(c.Comments),
+			Comment: formatComment(c.Comments),
 		})
 	}
 	return ret, nil
@@ -267,24 +250,28 @@ func convertEnums(ctx Context, doc tidl.Document) ([]Enum, error) {
 			fields = append(fields, EnumField{
 				Name:    f.Name,
 				Value:   f.Value,
-				Comment: genComment(f.Comments),
+				Comment: formatComment(f.Comments),
 			})
 		}
 		ret = append(ret, Enum{
 			Name:    e.Name,
 			Fields:  fields,
-			Comment: genComment(e.Comments),
+			Comment: formatComment(e.Comments),
 		})
 	}
 	for _, t := range doc.Types {
-		if !t.OneOf {
+		if !t.OneOf { // skip oneof
 			continue
 		}
 		name := t.Name + "Type"
 		var fields []EnumField
 		for i, f := range t.Fields {
+			jsonName, err := getJSONName(f.Name, f.Annotations)
+			if err != nil {
+				return nil, err
+			}
 			fields = append(fields, EnumField{
-				Name:  tidl.ToPascal(f.Name),
+				Name:  jsonName,
 				Value: int64(i),
 			})
 		}
@@ -296,6 +283,25 @@ func convertEnums(ctx Context, doc tidl.Document) ([]Enum, error) {
 	return ret, nil
 }
 
+// getJSONName returns the JSON name for a field.
+func getJSONName(fieldName string, arr []tidl.Annotation) (string, error) {
+	if a, ok := tidl.GetAnnotation(arr, "json"); ok {
+		if a.Value == nil {
+			return "", fmt.Errorf("annotation json value is nil")
+		}
+		s := strings.TrimSpace(*a.Value)
+		if s == "" {
+			return "", fmt.Errorf("annotation json value is empty")
+		}
+		s = strings.Trim(s, "\"") // Remove quotes
+		s = strings.TrimSpace(strings.SplitN(s, ",", 2)[0])
+		if s != "" {
+			return s, nil
+		}
+	}
+	return fieldName, nil
+}
+
 // TypeKind represents kind of a Go field type
 type TypeKind int
 
@@ -493,7 +499,7 @@ func convertType(ctx Context, t tidl.Type) (Type, error) {
 			Tag:      fieldTag,
 			Validate: validate,
 			Binding:  binding,
-			Comment:  genComment(f.Comments),
+			Comment:  formatComment(f.Comments),
 		})
 	}
 	return r, nil