FIX generics like type JSON[K,V string] map[K]V (#1509)

Co-authored-by: hepei <[email protected]>
swaggo · Mar 23, 2023 · 122a2e2 · 122a2e2
1 parent f475da2
commit 122a2e2
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 4 deletions.
diff --git a/generics.go b/generics.go
@@ -192,6 +192,12 @@ func (pkgDefs *PackagesDefinitions) resolveGenericType(file *ast.File, expr ast.
 			Len:    astExpr.Len,
 			Lbrack: astExpr.Lbrack,
 		}
+	case *ast.MapType:
+		return &ast.MapType{
+			Map:   astExpr.Map,
+			Key:   pkgDefs.resolveGenericType(file, astExpr.Key, genericParamTypeDefs),
+			Value: pkgDefs.resolveGenericType(file, astExpr.Value, genericParamTypeDefs),
+		}
 	case *ast.StarExpr:
 		return &ast.StarExpr{
 			Star: astExpr.Star,

diff --git a/testdata/generics_basic/expected.json b/testdata/generics_basic/expected.json
@@ -277,6 +277,18 @@
         "types.Hello": {
             "type": "object",
             "properties": {
+                "arrayField": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "mapField": {
+                    "$ref": "#/definitions/types.MapField-string-float64"
+                },
+                "mapFieldNestedStruct": {
+                    "$ref": "#/definitions/types.MapFieldNestedStruct-string"
+                },
                 "myNewArrayField": {
                     "type": "array",
                     "items": {
@@ -297,6 +309,41 @@
                 },
                 "myStringField2": {
                     "type": "string"
+                },
+                "originArrayField": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "originMapField": {
+                    "type": "object",
+                    "additionalProperties": {
+                        "type": "number"
+                    }
+                }
+            }
+        },
+        "types.MapField-string-float64": {
+            "type": "object",
+            "additionalProperties": {
+                "type": "number"
+            }
+        },
+        "types.MapFieldNestedStruct-string": {
+            "type": "object",
+            "additionalProperties": {
+                "$ref": "#/definitions/types.MapFieldValue"
+            }
+        },
+        "types.MapFieldValue": {
+            "type": "object",
+            "properties": {
+                "f": {
+                    "type": "number"
+                },
+                "s": {
+                    "type": "string"
                 }
             }
         },

diff --git a/testdata/generics_basic/types/string.go b/testdata/generics_basic/types/string.go
@@ -14,9 +14,22 @@ type TrippleField[T1 any, T2 any] struct {
 	Value2 T2
 }
 
+type ArrayField[T any] []T
+type MapField[K comparable, V any] map[K]V
+type MapFieldValue struct {
+	S string
+	F float64
+}
+type MapFieldNestedStruct[K comparable] map[K]MapFieldValue
+
 type Hello struct {
-	MyStringField1    Field[*string]                `json:"myStringField1"`
-	MyStringField2    Field[string]                 `json:"myStringField2"`
-	MyArrayField      DoubleField[*string, string]  `json:"myNewField"`
-	MyArrayDepthField TrippleField[*string, string] `json:"myNewArrayField"`
+	MyStringField1       Field[*string]                `json:"myStringField1"`
+	MyStringField2       Field[string]                 `json:"myStringField2"`
+	MyArrayField         DoubleField[*string, string]  `json:"myNewField"`
+	MyArrayDepthField    TrippleField[*string, string] `json:"myNewArrayField"`
+	ArrayField           ArrayField[string]            `json:"arrayField"`
+	MapField             MapField[string, float64]     `json:"mapField"`
+	OriginArrayField     []string                      `json:"originArrayField"`
+	OriginMapField       map[string]float64            `json:"originMapField"`
+	MapFieldNestedStruct MapFieldNestedStruct[string]  `json:"mapFieldNestedStruct"`
 }