[kit] fix desc.Parser issues

Author: ehsannm

contrib/swagger/swagger.go

@@ -65,13 +65,13 @@ func (sg *Generator) WriteSwagTo(w io.Writer, descs ...desc.ServiceDesc) error {
 			spec.NewTag(ps.Origin.Name, ps.Origin.Description, nil),
 		)
 
-		for _, c := range ps.Contracts {
-			sg.addSwagOp(swag, ps.Origin.Name, c)
-		}
-
 		for _, m := range ps.Messages() {
 			sg.addSwagDefinition(swag, m)
 		}
+
+		for _, c := range ps.Contracts {
+			sg.addSwagOp(swag, ps.Origin.Name, c)
+		}
 	}
 
 	swaggerJSON, err := swag.MarshalJSON()
@@ -203,35 +203,45 @@ func (sg *Generator) addSwagDefinition(swag *spec.Swagger, m desc.ParsedMessage)
 		var wrapFuncChain schemaWrapperChain
 		wrapFuncChain = wrapFuncChain[:0]
 
-		kind := p.Kind
+		var (
+			kind = p.Kind
+			name string
+		)
+
 		switch kind {
 		case desc.Map:
 			wrapFuncChain.Add(spec.MapProperty)
 		case desc.Array:
 			wrapFuncChain.Add(spec.ArrayProperty)
+		case desc.Object:
+			name = p.Message.Name
 		}
 
 		e := p.Element
 		for e != nil {
+			kind = e.Kind
 			switch e.Kind {
 			case desc.Map:
 				wrapFuncChain.Add(spec.MapProperty)
 			case desc.Array:
 				wrapFuncChain.Add(spec.ArrayProperty)
+			case desc.Object:
+				name = e.Message.Name
 			}
 			e = e.Element
 		}
 
 		switch kind {
 		case desc.Object:
-			def.SetProperty(p.Name, wrapFuncChain.Apply(spec.RefProperty(fmt.Sprintf("#/definitions/%s", p.Message.Name))))
+			def.SetProperty(p.Name, wrapFuncChain.Apply(spec.RefProperty(fmt.Sprintf("#/definitions/%s", name))))
 		case desc.String:
 			def.SetProperty(p.Name, wrapFuncChain.Apply(spec.StringProperty()))
 		case desc.Float:
 			def.SetProperty(p.Name, wrapFuncChain.Apply(spec.Float64Property()))
 		case desc.Integer:
 			def.SetProperty(p.Name, wrapFuncChain.Apply(spec.Int64Property()))
 		default:
+			fmt.Println(p.Name, kind)
 			def.SetProperty(p.Name, wrapFuncChain.Apply(spec.StringProperty()))
 		}
 	}

kit/desc/parser.go

@@ -99,14 +99,14 @@ func (ps *ParsedService) parseContract(c Contract) []ParsedContract {
 
 func (ps *ParsedService) parseMessage(m kit.Message, enc kit.Encoding) ParsedMessage {
 	mt := reflect.TypeOf(m)
-	pm := ParsedMessage{
-		Name: mt.Name(),
-	}
-
 	if mt.Kind() == reflect.Ptr {
 		mt = mt.Elem()
 	}
 
+	pm := ParsedMessage{
+		Name: mt.Name(),
+	}
+
 	if mt.Kind() != reflect.Struct {
 		return pm
 	}
@@ -155,7 +155,7 @@ func (ps *ParsedService) parseMessage(m kit.Message, enc kit.Encoding) ParsedMes
 					pe.Element = &ParsedElement{}
 					pe = pe.Element
 				case Object:
-					pm := ps.parseMessage(ft, enc)
+					pm := ps.parseMessage(reflect.New(ft).Interface(), enc)
 					pe.Message = &pm
 					keepGoing = false
 				default:

kit/desc/parser_test.go

@@ -61,8 +61,8 @@ var _ = Describe("DescParser", func() {
 				SetName("c1").
 				NamedSelector("s1", newREST(kit.JSON, "/path1", "GET")).
 				NamedSelector("s2", newREST(kit.JSON, "/path2", "POST")).
-				In(NestedMessage{}).
-				Out(FlatMessage{}),
+				In(&NestedMessage{}).
+				Out(&FlatMessage{}),
 		)
 
 	It("should parse the description", func() {
@@ -93,11 +93,23 @@ var _ = Describe("DescParser", func() {
 		Expect(contract0.Request.Message.Fields[0].Name).To(Equal("a"))
 		Expect(contract0.Request.Message.Fields[0].Kind).To(Equal(desc.String))
 
-		Expect(contract0.Request.Message.Fields[1].Name).To(Equal("b"))
-		Expect(contract0.Request.Message.Fields[1].Kind).To(Equal(desc.Object))
-		Expect(contract0.Request.Message.Fields[1].Message.Fields).To(HaveLen(6))
-		Expect(contract0.Request.Message.Fields[1].Message.Fields[0].Name).To(Equal("a"))
-		Expect(contract0.Request.Message.Fields[1].Message.Fields[0].Kind).To(Equal(desc.String))
+		b := contract0.Request.Message.Fields[1]
+		Expect(b.Name).To(Equal("b"))
+		Expect(b.Kind).To(Equal(desc.Object))
+		Expect(b.Message.Name).To(Equal("FlatMessage"))
+		Expect(b.Message.Fields).To(HaveLen(6))
+		Expect(b.Message.Fields[0].Name).To(Equal("a"))
+		Expect(b.Message.Fields[0].Kind).To(Equal(desc.String))
+
+		ba := contract0.Request.Message.Fields[2]
+		Expect(ba.Name).To(Equal("ba"))
+		Expect(ba.Kind).To(Equal(desc.Array))
+		Expect(ba.Message).To(BeNil())
+		Expect(ba.Element.Kind).To(Equal(desc.Object))
+		Expect(ba.Element.Message.Name).To(Equal("FlatMessage"))
+		Expect(ba.Element.Message.Fields).To(HaveLen(6))
+		Expect(ba.Element.Message.Fields[0].Name).To(Equal("a"))
+		Expect(ba.Element.Message.Fields[0].Kind).To(Equal(desc.String))
 
 		g := contract0.Responses[0].Message.Fields[4]
 		Expect(g.Name).To(Equal("g"))