111

Author: lvan100

gen/generator/golang/type.go

@@ -265,8 +265,12 @@ func convertEnums(ctx Context, doc tidl.Document) ([]Enum, error) {
 		}
 		var fields []EnumField
 		for i, f := range t.Fields {
+			fieldName, err := getJSONName(f.Name, f.Annotations)
+			if err != nil {
+				return nil, err
+			}
 			fields = append(fields, EnumField{
-				Name:  f.Name,
+				Name:  fieldName,
 				Value: int64(i),
 			})
 		}
@@ -634,8 +638,9 @@ 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
+	var jsonName string
+	var omitZero bool
+	omitEmpty := strings.HasPrefix(typeName, "*")
 
 	// Generate JSON tag
 	if a, ok := tidl.GetAnnotation(arr, "json"); ok {
@@ -646,27 +651,30 @@ func genFieldTag(fieldName, typeName string, arr []tidl.Annotation, binding *Bin
 		if s == "" {
 			return "", fmt.Errorf("annotation json value is empty")
 		}
-		jsonTag = strings.Trim(s, "\"") // Remove quotes
-	}
-
-	omitZero := false
-	omitEmpty := strings.HasPrefix(typeName, "*")
-
-	for s := range strings.SplitSeq(jsonTag, ",") {
-		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)
+		s = strings.Trim(s, "\"") // Remove quotes
+		for i, v := range strings.Split(s, ",") {
+			v = strings.TrimSpace(v)
+			if i == 0 {
+				if v != "" {
+					jsonName = v
+				}
+				continue
+			}
+			switch v {
+			case "omitempty":
+				omitEmpty = true
+			case "non-omitempty":
+				omitEmpty = false
+			case "omitzero":
+				omitZero = true
+			default: // for linter
 			}
 		}
 	}
 
+	if jsonName == "" {
+		jsonName += fieldName
+	}
 	if omitEmpty {
 		jsonName += ",omitempty"
 	}

gen/testdata/manager/idl/manager.idl

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

gen/testdata/manager/idl/stream.idl

@@ -12,8 +12,8 @@ type StreamResp {
 
 oneof Payload {
     string text_data
-    int? number_data
-    bool boolean_data
+    int? numberData (json="number_data")
+    bool boolean_data (json="")
 }
 
 rpc Stream(StreamReq) stream<StreamResp> {