chore: refactoring & add more tests (#4677)

core/mapping/marshaler.go

@@ -53,6 +53,16 @@ func getTag(field reflect.StructField) (string, bool) {
 	return strings.TrimSpace(tag), false
 }
 
+func insertValue(collector map[string]map[string]any, tag string, key string, val any) {
+	if m, ok := collector[tag]; ok {
+		m[key] = val
+	} else {
+		collector[tag] = map[string]any{
+			key: val,
+		}
+	}
+}
+
 func processMember(field reflect.StructField, value reflect.Value,
 	collector map[string]map[string]any) error {
 	var key string
@@ -83,29 +93,14 @@ func processMember(field reflect.StructField, value reflect.Value,
 		if err != nil {
 			return err
 		}
+
 		for anonTag, anonMap := range anonCollector {
 			for anonKey, anonVal := range anonMap {
-				m, ok := collector[anonTag]
+				insertValue(collector, anonTag, anonKey, anonVal)
-				if ok {
-					m[anonKey] = anonVal
-				} else {
-					m = map[string]any{
-						anonKey: anonVal,
-					}
-				}
-				collector[anonTag] = m
 			}
 		}
 	} else {
-		m, ok := collector[tag]
+		insertValue(collector, tag, key, val)
-		if ok {
-			m[key] = val
-		} else {
-			m = map[string]any{
-				key: val,
-			}
-		}
-		collector[tag] = m
 	}
 
 	return nil

core/mapping/marshaler_test.go

@@ -28,6 +28,7 @@ func TestMarshal(t *testing.T) {
 }
 
 func TestMarshal_Anonymous(t *testing.T) {
+	t.Run("anonymous", func(t *testing.T) {
 		type BaseHeader struct {
 			Token string `header:"token"`
 		}
@@ -118,6 +119,30 @@ func TestMarshal_Anonymous(t *testing.T) {
 		assert.Equal(t, "shanghai", m3["json"]["address"])
 		assert.Equal(t, 20, m3["json"]["age"].(int))
 		assert.Equal(t, "reference", *m3["header"]["ref"].(*string))
+	})
+
+	t.Run("bad anonymous", func(t *testing.T) {
+		type BaseHeader struct {
+			Token string `json:"token,options=[a,b]"`
+		}
+
+		v := struct {
+			Name    string `json:"name"`
+			Address string `json:"address,options=[beijing,shanghai]"`
+			Age     int    `json:"age"`
+			BaseHeader
+		}{
+			Name:    "kevin",
+			Address: "shanghai",
+			Age:     20,
+			BaseHeader: BaseHeader{
+				Token: "c",
+			},
+		}
+
+		_, err := Marshal(v)
+		assert.NotNil(t, err)
+	})
 }
 
 func TestMarshal_Ptr(t *testing.T) {