Fix field doc placement

Author: tkrajina

typescriptify/typescriptify.go

@@ -587,7 +587,7 @@ func (t *TypeScriptify) convertType(depth int, typeOf reflect.Type, customCode m
 		var err error
 		fldOpts := t.getFieldOptions(typeOf, field)
 		if fldOpts.TSDoc != "" {
-			result += "\t/** " + fldOpts.TSDoc + " */\n"
+			builder.addFieldDefinitionLine("/** " + fldOpts.TSDoc + " */")
 		}
 		if fldOpts.TSTransform != "" {
 			t.logf(depth, "- simple field %s.%s", typeOf.Name(), field.Name)
@@ -805,6 +805,10 @@ func (t *typeScriptClassBuilder) addInitializerFieldLine(fld, initializer string
 	t.constructorBody = append(t.constructorBody, fmt.Sprint(t.indent, t.indent, "this.", fld, " = ", initializer, ";"))
 }
 
+func (t *typeScriptClassBuilder) addFieldDefinitionLine(line string) {
+	t.fields = append(t.fields, t.indent+line)
+}
+
 func (t *typeScriptClassBuilder) addField(fld, fldType string) {
 	t.fields = append(t.fields, fmt.Sprint(t.indent, fld, ": ", fldType, ";"))
 }

typescriptify/typescriptify_test.go

@@ -995,7 +995,8 @@ export class WithoutAnnotation {
 func TestTypescriptifyComment(t *testing.T) {
 	t.Parallel()
 	type Person struct {
-		Name string `json:"name" ts_doc:"This is a comment"`
+		Age  int    `json:"age" ts_doc:"Age comment"`
+		Name string `json:"name" ts_doc:"Name comment"`
 	}
 
 	converter := New()
@@ -1005,7 +1006,9 @@ func TestTypescriptifyComment(t *testing.T) {
 	converter.CreateConstructor = false
 
 	desiredResult := `export class Person {
-	/** This is a comment */
+	/** Age comment */
+	age: number;
+	/** Name comment */
 	name: string;
 }`
 	testConverter(t, converter, false, desiredResult, nil)