support marshal embed struct

Author: Tao Wen

generator/decoder.go

@@ -196,6 +196,10 @@ func decodeStructField(structType *ast.StructType) {
 		case *ast.StarExpr: // embed pointer
 			switch y := x.X.(type) {
 			case *ast.Ident:
+				isNotExported := unicode.IsLower(rune(y.Name[0]))
+				if isNotExported {
+					continue
+				}
 				_f("  var val%d %s", i, y.Name)
 				_f("  if %s_json_unmarshal_field(iter, field, &val%d) {", y.Name, i)
 				_f("    out.%s = new(%s)", y.Name, y.Name)
@@ -251,20 +255,8 @@ func decodeStructField(structType *ast.StructType) {
 				_f("  if %s_json_unmarshal_field(iter, field, &out.%s) { return true }", nodeToString(x), x.Sel.Name)
 			}
 		case *ast.Ident: // embed value
-			if x.Name == "string" ||
-				x.Name == "bool" ||
-				x.Name == "int" ||
-				x.Name == "uint" ||
-				x.Name == "int64" ||
-				x.Name == "uint64" ||
-				x.Name == "int32" ||
-				x.Name == "uint32" ||
-				x.Name == "int16" ||
-				x.Name == "uint16" ||
-				x.Name == "int8" ||
-				x.Name == "uint8" ||
-				x.Name == "float64" ||
-				x.Name == "float32" {
+			isNotExported := unicode.IsLower(rune(x.Name[0]))
+			if isNotExported {
 				continue
 			}
 			_f("  if %s_json_unmarshal_field(iter, field, &out.%s) { return true }", x.Name, x.Name)

generator/encoder.go

@@ -187,6 +187,7 @@ func encodeStruct(typeName string, structType *ast.StructType) {
 func encodeStructField(structType *ast.StructType) {
 	for _, field := range structType.Fields.List {
 		if len(field.Names) == 0 {
+			encodeStructEmbedField(field.Type)
 			continue
 		}
 		fieldName := field.Names[0].Name
@@ -216,6 +217,34 @@ func encodeStructField(structType *ast.StructType) {
 	}
 }
 
+func encodeStructEmbedField(fieldType ast.Expr) {
+	switch x := fieldType.(type) {
+	case *ast.Ident:
+		isNotExported := unicode.IsLower(rune(x.Name[0]))
+		if !isNotExported {
+			_f("    %s_json_marshal_field(stream, val.%s)", x.Name, x.Name)
+		}
+	case *ast.StarExpr:
+		switch y := x.X.(type) {
+		case *ast.Ident:
+			isNotExported := unicode.IsLower(rune(y.Name[0]))
+			if isNotExported {
+				return
+			}
+			_f("    if val.%s != nil {", y.Name)
+			_f("      %s_json_marshal_field(stream, *val.%s)", y.Name, y.Name)
+			_l("    }")
+		default:
+			reportError(fmt.Errorf("unknown embed field type: %s", nodeToString(fieldType)))
+			return
+		}
+	case *ast.SelectorExpr:
+	default:
+		reportError(fmt.Errorf("unknown embed field type: %s", nodeToString(fieldType)))
+		return
+	}
+}
+
 func encodeOtherField(typeName string) {
 	_f(`    stream.WriteObjectField("%s")`, typeName)
 	_f("    %s_json_marshal(stream, val)", prefix)

value_tests/WithEmbedStruct_json.go

@@ -45,6 +45,10 @@ func WithEmbedStruct_json_marshal(stream *jsoniter.Stream, val WithEmbedStruct)
     stream.WriteObjectTail()
 }
 func WithEmbedStruct_json_marshal_field(stream *jsoniter.Stream, val WithEmbedStruct) {
+    if val.WithEmbedStructBase1 != nil {
+      WithEmbedStructBase1_json_marshal_field(stream, *val.WithEmbedStructBase1)
+    }
+    WithEmbedStructBase2_json_marshal_field(stream, val.WithEmbedStructBase2)
     stream.WriteObjectField(`Field3`)
     stream.WriteString(val.Field3)
     stream.WriteMore()

value_tests/WithNamelessField_json.go

@@ -40,4 +40,8 @@ func WithNamelessField_json_marshal(stream *jsoniter.Stream, val WithNamelessFie
     stream.WriteObjectTail()
 }
 func WithNamelessField_json_marshal_field(stream *jsoniter.Stream, val WithNamelessField) {
+    WithNamelessField_f1_json_marshal_field(stream, val.WithNamelessField_f1)
+    if val.WithNamelessField_f2 != nil {
+      WithNamelessField_f2_json_marshal_field(stream, *val.WithNamelessField_f2)
+    }
 }

value_tests/struct_test.go

@@ -2,6 +2,7 @@ package value_tests
 
 import (
 	"encoding/json"
+	"strings"
 	"testing"
 
 	jsoniter "github.com/json-iterator/tinygo"
@@ -31,10 +32,13 @@ func Test_struct4(t *testing.T) {
 	jsonAdapter := jsoniter.CreateJsonAdapter(WithEmbedStruct_json{})
 	compareWithStdlib(`{"Field1":"hello","Field2":"world","Field3":"abc","Embed3":"123"}`,
 		jsonAdapter, &val1, &val2)
-	// bytes, _ := jsonAdapter.MarshalIndent(val2, "", "  ")
-	// if !strings.Contains(string(bytes), "Field1") {
-	// 	t.Fatal(string(bytes))
-	// }
+	bytes, _ := jsonAdapter.MarshalIndent(val2, "", "  ")
+	if !strings.Contains(string(bytes), "Field1") {
+		t.Fatal(string(bytes))
+	}
+	if !strings.Contains(string(bytes), "Field2") {
+		t.Fatal(string(bytes))
+	}
 }
 
 func Test_struct5(t *testing.T) {