111

Author: lvan100

gen/generator/golang/type.go

@@ -263,20 +263,15 @@ func convertEnums(ctx Context, doc tidl.Document) ([]Enum, error) {
 		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:  jsonName,
+				Name:  f.Name,
 				Value: int64(i),
 			})
 		}
 		ret = append(ret, Enum{
-			Name:   name,
+			Name:   t.Name + "Type",
 			Fields: fields,
 		})
 	}
@@ -639,8 +634,10 @@ func parseBinding(arr []tidl.Annotation) (*Binding, error) {
 func genFieldTag(fieldName, typeName string, arr []tidl.Annotation, binding *Binding) (string, error) {
 	var tags []string
 
+	var jsonTag string
+	var jsonName = fieldName
+
 	// Generate JSON tag
-	jsonTag := fieldName
 	if a, ok := tidl.GetAnnotation(arr, "json"); ok {
 		if a.Value == nil {
 			return "", fmt.Errorf("annotation json value is nil")
@@ -656,23 +653,27 @@ func genFieldTag(fieldName, typeName string, arr []tidl.Annotation, binding *Bin
 	omitEmpty := strings.HasPrefix(typeName, "*")
 
 	for s := range strings.SplitSeq(jsonTag, ",") {
-		switch strings.TrimSpace(s) {
+		switch s = strings.TrimSpace(s); s {
 		case "omitempty":
 			omitEmpty = true
 		case "non-omitempty":
 			omitEmpty = false
 		case "omitzero":
 			omitZero = true
+		default:
+			if v, ok := strings.CutPrefix(s, "name="); ok {
+				jsonName = strings.TrimSpace(v)
+			}
 		}
 	}
 
 	if omitEmpty {
-		jsonTag += ",omitempty"
+		jsonName += ",omitempty"
 	}
 	if omitZero {
-		jsonTag += ",omitzero"
+		jsonName += ",omitzero"
 	}
-	tags = append(tags, fmt.Sprintf("json:\"%s\"", jsonTag))
+	tags = append(tags, fmt.Sprintf("json:\"%s\"", jsonName))
 
 	// Generate binding tag
 	if binding != nil {

gen/testdata/manager/go/proto/manager.go

@@ -118,10 +118,10 @@ type CreateManagerReq {
 
 // Update existing manager
 type UpdateManagerReq {
-    string id (path="id")
+    string ID (json="name=id", path="id")
     string? name
     int? age (validate="$ >= MIN_AGE && $ <= MAX_AGE")
-    bool? vip
+    bool? vip (json="non-omitempty")
     float? salary (validate="$ >= SALARY_MIN && $ <= SALARY_MAX")
     string? role
     ManagerLevel? level