handle embed struct

Author: Tao Wen

generator/encoder.go

@@ -225,6 +225,7 @@ func encodeStructEmbedField(fieldType ast.Expr) {
 			_f("    %s_json_marshal_field(stream, val.%s)", x.Name, x.Name)
 		}
 	case *ast.StarExpr:
+		// TODO: handle nil pointer
 		switch y := x.X.(type) {
 		case *ast.Ident:
 			isNotExported := unicode.IsLower(rune(y.Name[0]))
@@ -234,11 +235,46 @@ func encodeStructEmbedField(fieldType ast.Expr) {
 			_f("    if val.%s != nil {", y.Name)
 			_f("      %s_json_marshal_field(stream, *val.%s)", y.Name, y.Name)
 			_l("    }")
+		case *ast.SelectorExpr:
+			if y.Sel.Name == "Number" {
+				_l(`  stream.WriteObjectField("Number")`)
+				_l(`  stream.WriteRawOrNull((string)(*val.Number))`)
+				_l(`  stream.WriteMore()`)
+			} else if y.Sel.Name == "RawMessage" {
+				reportError(fmt.Errorf("embed json.RawMessage is not supported"))
+				return
+			} else {
+				alias := nodeToString(y.X)
+				if path, ok := allImports[alias]; ok {
+					referencedImports[alias] = path
+				} else {
+					reportError(fmt.Errorf("unknown import: %s", alias))
+					return
+				}
+				_f("  %s_json_marshal_field(stream, *val.%s)", nodeToString(y), y.Sel.Name)
+			}
 		default:
 			reportError(fmt.Errorf("unknown embed field type: %s", nodeToString(fieldType)))
 			return
 		}
 	case *ast.SelectorExpr:
+		if x.Sel.Name == "Number" {
+			_l(`  stream.WriteObjectField("Number")`)
+			_l(`  stream.WriteRawOrNull((string)(val.Number))`)
+			_l(`  stream.WriteMore()`)
+		} else if x.Sel.Name == "RawMessage" {
+			reportError(fmt.Errorf("embed json.RawMessage is not supported"))
+			return
+		} else {
+			alias := nodeToString(x.X)
+			if path, ok := allImports[alias]; ok {
+				referencedImports[alias] = path
+			} else {
+				reportError(fmt.Errorf("unknown import: %s", alias))
+				return
+			}
+			_f("  %s_json_marshal_field(stream, val.%s)", nodeToString(x), x.Sel.Name)
+		}
 	default:
 		reportError(fmt.Errorf("unknown embed field type: %s", nodeToString(fieldType)))
 		return

value_tests/EmbedNumberStruct_json.go

@@ -34,4 +34,7 @@ func EmbedNumberStruct_json_marshal(stream *jsoniter.Stream, val EmbedNumberStru
     stream.WriteObjectTail()
 }
 func EmbedNumberStruct_json_marshal_field(stream *jsoniter.Stream, val EmbedNumberStruct) {
+  stream.WriteObjectField("Number")
+  stream.WriteRawOrNull((string)(val.Number))
+  stream.WriteMore()
 }

value_tests/struct_test.go

@@ -65,6 +65,11 @@ func Test_struct7(t *testing.T) {
 	if val1.Number != json.Number("100") {
 		t.Fatal(val1.Number)
 	}
+	jsonAdapter := jsoniter.CreateJsonAdapter(EmbedNumberStruct_json{})
+	bytes, _ := jsonAdapter.MarshalIndent(val1, "", "  ")
+	if !strings.Contains(string(bytes), "Number") {
+		t.Fatal(string(bytes))
+	}
 }
 
 func Test_struct8(t *testing.T) {

value_tests/sub/EmbedOtherPkgNamedArray_json.go

@@ -35,4 +35,5 @@ func EmbedOtherPkgNamedArray_json_marshal(stream *jsoniter.Stream, val EmbedOthe
     stream.WriteObjectTail()
 }
 func EmbedOtherPkgNamedArray_json_marshal_field(stream *jsoniter.Stream, val EmbedOtherPkgNamedArray) {
+  value_tests.NamedArray_json_marshal_field(stream, val.NamedArray)
 }

value_tests/sub/EmbedViaPtr_json.go

@@ -40,4 +40,5 @@ func EmbedViaPtr_json_marshal(stream *jsoniter.Stream, val EmbedViaPtr) {
     stream.WriteObjectTail()
 }
 func EmbedViaPtr_json_marshal_field(stream *jsoniter.Stream, val EmbedViaPtr) {
+  value_tests.NamedArray_json_marshal_field(stream, *val.NamedArray)
 }

value_tests/sub/array_test.go

@@ -3,6 +3,7 @@ package sub
 import (
 	"encoding/json"
 	"fmt"
+	"strings"
 	"testing"
 
 	jsoniter "github.com/json-iterator/tinygo"
@@ -42,11 +43,21 @@ func Test_EmbedOtherPkgNamedArray(t *testing.T) {
 	var val1 EmbedOtherPkgNamedArray
 	var val2 EmbedOtherPkgNamedArray
 	compareWithStdlib(input, jsoniter.CreateJsonAdapter(EmbedOtherPkgNamedArray_json{}), &val1, &val2)
+	jsonAdapter := jsoniter.CreateJsonAdapter(EmbedOtherPkgNamedArray_json{})
+	bytes, _ := jsonAdapter.MarshalIndent(val1, "", "  ")
+	if !strings.Contains(string(bytes), "NamedArray") {
+		t.Fatal(string(bytes))
+	}
 }
 
 func Test_EmbedViaPtr(t *testing.T) {
 	input := `{ "NamedArray": ["hello","world"] }`
 	var val1 EmbedViaPtr
 	var val2 EmbedViaPtr
 	compareWithStdlib(input, jsoniter.CreateJsonAdapter(EmbedViaPtr_json{}), &val1, &val2)
+	jsonAdapter := jsoniter.CreateJsonAdapter(EmbedViaPtr_json{})
+	bytes, _ := jsonAdapter.MarshalIndent(val1, "", "  ")
+	if !strings.Contains(string(bytes), "NamedArray") {
+		t.Fatal(string(bytes))
+	}
 }