fix: embedded struct handling (#630)

getkin · Oct 11, 2022 · fc05f1c · fc05f1c
1 parent b31a4bb
commit fc05f1c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/jsoninfo/field_info.go b/jsoninfo/field_info.go
@@ -35,11 +35,14 @@ iteration:
 
 		// See whether this is an embedded field
 		if f.Anonymous {
-			if f.Tag.Get("json") == "-" {
+			jsonTag := f.Tag.Get("json")
+			if jsonTag == "-" {
 				continue
 			}
-			fields = AppendFields(fields, index, f.Type)
-			continue iteration
+			if jsonTag == "" {
+				fields = AppendFields(fields, index, f.Type)
+				continue iteration
+			}
 		}
 
 		// Ignore certain types

diff --git a/openapi3gen/openapi3gen_test.go b/openapi3gen/openapi3gen_test.go
@@ -18,6 +18,12 @@ import (
 
 func ExampleGenerator_SchemaRefs() {
 	type SomeOtherType string
+	type Embedded struct {
+		Z string `json:"z"`
+	}
+	type Embedded2 struct {
+		A string `json:"a"`
+	}
 	type SomeStruct struct {
 		Bool    bool                      `json:"bool"`
 		Int     int                       `json:"int"`
@@ -38,6 +44,10 @@ func ExampleGenerator_SchemaRefs() {
 			Y string
 		} `json:"structWithoutFields"`
 
+		Embedded `json:"embedded"`
+
+		Embedded2
+
 		Ptr *SomeOtherType `json:"ptr"`
 	}
 
@@ -54,16 +64,27 @@ func ExampleGenerator_SchemaRefs() {
 	}
 	fmt.Printf("schemaRef: %s\n", data)
 	// Output:
-	// g.SchemaRefs: 15
+	// g.SchemaRefs: 16
 	// schemaRef: {
 	//   "properties": {
+	//     "a": {
+	//       "type": "string"
+	//     },
 	//     "bool": {
 	//       "type": "boolean"
 	//     },
 	//     "bytes": {
 	//       "format": "byte",
 	//       "type": "string"
 	//     },
+	//     "embedded": {
+	//       "properties": {
+	//         "z": {
+	//           "type": "string"
+	//         }
+	//       },
+	//       "type": "object"
+	//     },
 	//     "float64": {
 	//       "format": "double",
 	//       "type": "number"