Generate code comments and change Array<any> to Uint8Array for TypeSc…

…ript, ref #14
xuri · Jan 21, 2021 · 40ad046 · 40ad046
1 parent a744528
commit 40ad046
Show file tree

Hide file tree

Showing 11 changed files with 167 additions and 60 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 test/**/output
 data/
+**/.DS_Store*
diff --git a/genC.go b/genC.go
@@ -97,7 +97,8 @@ func (gen *CodeGenerator) CSimpleType(v *SimpleType) {
  fieldType := genCFieldType(getBasefromSimpleType(trimNSPrefix(v.Base), gen.ProtoTree))
  content := fmt.Sprintf("%s %s[];\n", genCFieldType(fieldType), genCFieldName(v.Name))
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("\ntypedef %s", gen.StructAST[v.Name])
+ fieldName := genCFieldName(v.Name)
+ gen.Field += fmt.Sprintf("%stypedef %s", genFieldComment(fieldName, v.Doc, "//"), gen.StructAST[v.Name])
  return
  }
  }
@@ -117,7 +118,8 @@ func (gen *CodeGenerator) CSimpleType(v *SimpleType) {
  }
  content += "}"
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("\ntypedef %s %s;\n", gen.StructAST[v.Name], genCFieldName(v.Name))
+ fieldName := genCFieldName(v.Name)
+ gen.Field += fmt.Sprintf("%stypedef %s %s;\n", genFieldComment(fieldName, v.Doc, "//"), gen.StructAST[v.Name], fieldName)
  }
  return
  }
@@ -128,7 +130,8 @@ func (gen *CodeGenerator) CSimpleType(v *SimpleType) {
  plural = "[]"
  }
  gen.StructAST[v.Name] = fmt.Sprintf("%s %s%s", fieldType, genCFieldName(v.Name), plural)
- gen.Field += fmt.Sprintf("\ntypedef %s;\n", gen.StructAST[v.Name])
+ fieldName := genCFieldName(v.Name)
+ gen.Field += fmt.Sprintf("%stypedef %s;\n", genFieldComment(fieldName, v.Doc, "//"), gen.StructAST[v.Name])
  }
  return
 }
@@ -174,7 +177,8 @@ func (gen *CodeGenerator) CComplexType(v *ComplexType) {
  }
  content += "}"
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("\ntypedef %s %s;\n", gen.StructAST[v.Name], genCFieldName(v.Name))
+ fieldName := genCFieldName(v.Name)
+ gen.Field += fmt.Sprintf("%stypedef %s %s;\n", genFieldComment(fieldName, v.Doc, "//"), gen.StructAST[v.Name], fieldName)
  }
  return
 }
@@ -201,7 +205,8 @@ func (gen *CodeGenerator) CGroup(v *Group) {
 
  content += "}"
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("\ntypedef %s %s;\n", gen.StructAST[v.Name], genCFieldName(v.Name))
+ fieldName := genCFieldName(v.Name)
+ gen.Field += fmt.Sprintf("%stypedef %s %s;\n", genFieldComment(fieldName, v.Doc, "//"), gen.StructAST[v.Name], fieldName)
  }
  return
 }
@@ -224,7 +229,8 @@ func (gen *CodeGenerator) CAttributeGroup(v *AttributeGroup) {
  }
  content += "}"
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("\ntypedef %s %s;\n", gen.StructAST[v.Name], genCFieldName(v.Name))
+ fieldName := genCFieldName(v.Name)
+ gen.Field += fmt.Sprintf("%stypedef %s %s;\n", genFieldComment(fieldName, v.Doc, "//"), gen.StructAST[v.Name], fieldName)
  }
 }
 
@@ -250,6 +256,7 @@ func (gen *CodeGenerator) CAttribute(v *Attribute) {
  plural = "[]"
  }
  gen.StructAST[v.Name] = fmt.Sprintf("%s %s%s", fieldType, genCFieldName(v.Name), plural)
- gen.Field += fmt.Sprintf("\ntypedef %s;\n", gen.StructAST[v.Name])
+ fieldName := genCFieldName(v.Name)
+ gen.Field += fmt.Sprintf("%stypedef %s;\n", genFieldComment(fieldName, v.Doc, "//"), gen.StructAST[v.Name])
  }
 }
diff --git a/genGo.go b/genGo.go
@@ -107,10 +107,6 @@ func genGoFieldName(name string) (fieldName string) {
  return
 }
 
-func genGoFieldComment(name string) string {
- return fmt.Sprintf("\r\n// %s ...\r\n", name)
-}
-
 func genGoFieldType(name string) string {
  if _, ok := goBuildinType[name]; ok {
  return name
@@ -140,7 +136,7 @@ func (gen *CodeGenerator) GoSimpleType(v *SimpleType) {
  content := fmt.Sprintf(" []%s\n", genGoFieldType(fieldType))
  gen.StructAST[v.Name] = content
  fieldName := genGoFieldName(v.Name)
- gen.Field += fmt.Sprintf("%stype %s%s", genGoFieldComment(fieldName), fieldName, gen.StructAST[v.Name])
+ gen.Field += fmt.Sprintf("%stype %s%s", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  return
  }
  }
@@ -160,15 +156,15 @@ func (gen *CodeGenerator) GoSimpleType(v *SimpleType) {
  }
  content += "}\n"
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("%stype %s%s", genGoFieldComment(fieldName), fieldName, gen.StructAST[v.Name])
+ gen.Field += fmt.Sprintf("%stype %s%s", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
  }
  if _, ok := gen.StructAST[v.Name]; !ok {
  content := fmt.Sprintf(" %s\n", genGoFieldType(getBasefromSimpleType(trimNSPrefix(v.Base), gen.ProtoTree)))
  gen.StructAST[v.Name] = content
  fieldName := genGoFieldName(v.Name)
- gen.Field += fmt.Sprintf("%stype %s%s", genGoFieldComment(fieldName), fieldName, gen.StructAST[v.Name])
+ gen.Field += fmt.Sprintf("%stype %s%s", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
 }
@@ -223,7 +219,7 @@ func (gen *CodeGenerator) GoComplexType(v *ComplexType) {
  }
  content += "}\n"
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("%stype %s%s", genGoFieldComment(fieldName), fieldName, gen.StructAST[v.Name])
+ gen.Field += fmt.Sprintf("%stype %s%s", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
 }
@@ -255,7 +251,7 @@ func (gen *CodeGenerator) GoGroup(v *Group) {
 
  content += "}\n"
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("%stype %s%s", genGoFieldComment(fieldName), fieldName, gen.StructAST[v.Name])
+ gen.Field += fmt.Sprintf("%stype %s%s", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
 }
@@ -279,7 +275,7 @@ func (gen *CodeGenerator) GoAttributeGroup(v *AttributeGroup) {
  }
  content += "}\n"
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("%stype %s%s", genGoFieldComment(fieldName), fieldName, gen.StructAST[v.Name])
+ gen.Field += fmt.Sprintf("%stype %s%s", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
 }
@@ -294,7 +290,7 @@ func (gen *CodeGenerator) GoElement(v *Element) {
  content := fmt.Sprintf("\t%s%s\n", plural, genGoFieldType(getBasefromSimpleType(trimNSPrefix(v.Type), gen.ProtoTree)))
  gen.StructAST[v.Name] = content
  fieldName := genGoFieldName(v.Name)
- gen.Field += fmt.Sprintf("%stype %s%s", genGoFieldComment(fieldName), fieldName, gen.StructAST[v.Name])
+ gen.Field += fmt.Sprintf("%stype %s%s", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
 }
@@ -309,7 +305,7 @@ func (gen *CodeGenerator) GoAttribute(v *Attribute) {
  content := fmt.Sprintf("\t%s%s\n", plural, genGoFieldType(getBasefromSimpleType(trimNSPrefix(v.Type), gen.ProtoTree)))
  gen.StructAST[v.Name] = content
  fieldName := genGoFieldName(v.Name)
- gen.Field += fmt.Sprintf("%stype %s%s", genGoFieldComment(fieldName), fieldName, gen.StructAST[v.Name])
+ gen.Field += fmt.Sprintf("%stype %s%s", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
 }
diff --git a/genJava.go b/genJava.go
@@ -113,15 +113,17 @@ func (gen *CodeGenerator) JavaSimpleType(v *SimpleType) {
  }
  content += "}\n"
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("\npublic class %s%s", genJavaFieldName(v.Name), gen.StructAST[v.Name])
+ fieldName := genJavaFieldName(v.Name)
+ gen.Field += fmt.Sprintf("%spublic class %s%s", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
  }
  if _, ok := gen.StructAST[v.Name]; !ok {
  fieldType := genJavaFieldType(getBasefromSimpleType(trimNSPrefix(v.Base), gen.ProtoTree))
  content := fmt.Sprintf("\tprotected %s %s;\n", fieldType, genJavaFieldName(v.Name))
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("\n@XmlAccessorType(XmlAccessType.FIELD)\n@XmlAttribute(required = true, name = \"%s\")\npublic class %s {\n%s}\n", v.Name, genJavaFieldName(v.Name), gen.StructAST[v.Name])
+ fieldName := genJavaFieldName(v.Name)
+ gen.Field += fmt.Sprintf("%s@XmlAccessorType(XmlAccessType.FIELD)\n@XmlAttribute(required = true, name = \"%s\")\npublic class %s {\n%s}\n", genFieldComment(fieldName, v.Doc, "//"), v.Name, fieldName, gen.StructAST[v.Name])
  }
  return
 }
@@ -161,7 +163,8 @@ func (gen *CodeGenerator) JavaComplexType(v *ComplexType) {
  }
  content += "}\n"
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("\npublic class %s%s", genJavaFieldName(v.Name), gen.StructAST[v.Name])
+ fieldName := genJavaFieldName(v.Name)
+ gen.Field += fmt.Sprintf("%spublic class %s%s", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
 }
@@ -188,7 +191,8 @@ func (gen *CodeGenerator) JavaGroup(v *Group) {
 
  content += "}\n"
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("\npublic class %s%s", genJavaFieldName(v.Name), gen.StructAST[v.Name])
+ fieldName := genJavaFieldName(v.Name)
+ gen.Field += fmt.Sprintf("%spublic class %s%s", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
 }
@@ -208,7 +212,8 @@ func (gen *CodeGenerator) JavaAttributeGroup(v *AttributeGroup) {
  }
  content += "}\n"
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("\npublic class %s%s", genJavaFieldName(v.Name), gen.StructAST[v.Name])
+ fieldName := genJavaFieldName(v.Name)
+ gen.Field += fmt.Sprintf("%spublic class %s%s", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
 }

diff --git a/genRust.go b/genRust.go
@@ -170,7 +170,8 @@ func (gen *CodeGenerator) RustSimpleType(v *SimpleType) {
  fieldType := genRustFieldType(getBasefromSimpleType(trimNSPrefix(v.Base), gen.ProtoTree))
  content := fmt.Sprintf("\t#[serde(rename = \"%s\")]\n\tpub %s: Vec<%s>,\n", v.Name, genRustFieldName(v.Name), fieldType)
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("\n#[derive(Debug, Deserialize, Serialize, PartialEq)]\npub struct %s {\n%s}\n", genRustStructName(v.Name), gen.StructAST[v.Name])
+ fieldName := genRustStructName(v.Name)
+ gen.Field += fmt.Sprintf("\n%s#[derive(Debug, Deserialize, Serialize, PartialEq)]\npub struct %s {\n%s}\n", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  return
  }
  }
@@ -192,7 +193,8 @@ func (gen *CodeGenerator) RustSimpleType(v *SimpleType) {
  fieldType := genRustFieldType(getBasefromSimpleType(trimNSPrefix(v.Base), gen.ProtoTree))
  content := fmt.Sprintf("\t#[serde(rename = \"%s\")]\n\tpub %s: %s,\n", v.Name, genRustFieldName(v.Name), fieldType)
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("\n#[derive(Debug, Deserialize, Serialize, PartialEq)]\npub struct %s {\n%s}\n", genRustStructName(v.Name), gen.StructAST[v.Name])
+ fieldName := genRustStructName(v.Name)
+ gen.Field += fmt.Sprintf("\n%s#[derive(Debug, Deserialize, Serialize, PartialEq)]\npub struct %s {\n%s}\n", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
 }
@@ -238,7 +240,8 @@ func (gen *CodeGenerator) RustComplexType(v *ComplexType) {
 
  }
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("\n#[derive(Debug, Deserialize, Serialize, PartialEq)]\npub struct %s {\n%s}\n", genRustStructName(v.Name), gen.StructAST[v.Name])
+ fieldName := genRustStructName(v.Name)
+ gen.Field += fmt.Sprintf("\n%s#[derive(Debug, Deserialize, Serialize, PartialEq)]\npub struct %s {\n%s}\n", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
 }
@@ -266,7 +269,8 @@ func (gen *CodeGenerator) RustGroup(v *Group) {
  }
  }
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("\n#[derive(Debug, Deserialize, Serialize, PartialEq)]\npub struct %s {\n%s}\n", genRustStructName(v.Name), gen.StructAST[v.Name])
+ fieldName := genRustStructName(v.Name)
+ gen.Field += fmt.Sprintf("\n%s#[derive(Debug, Deserialize, Serialize, PartialEq)]\npub struct %s {\n%s}\n", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
 }
@@ -284,7 +288,8 @@ func (gen *CodeGenerator) RustAttributeGroup(v *AttributeGroup) {
  }
  }
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("\n#[derive(Debug, Deserialize, Serialize, PartialEq)]\npub struct %s {\n%s}\n", genRustStructName(v.Name), gen.StructAST[v.Name])
+ fieldName := genRustStructName(v.Name)
+ gen.Field += fmt.Sprintf("\n%s#[derive(Debug, Deserialize, Serialize, PartialEq)]\npub struct %s {\n%s}\n", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
 }
@@ -299,7 +304,7 @@ func (gen *CodeGenerator) RustElement(v *Element) {
  } else {
  gen.StructAST[v.Name] = fmt.Sprintf("\t#[serde(rename = \"%s\")]\n\tpub %s: %s,\n", v.Name, fieldName, fieldType)
  }
- gen.Field += fmt.Sprintf("\n#[derive(Debug, Deserialize, Serialize, PartialEq)]\npub struct %s {\n%s}\n", genRustStructName(v.Name), gen.StructAST[v.Name])
+ gen.Field += fmt.Sprintf("\n%s#[derive(Debug, Deserialize, Serialize, PartialEq)]\npub struct %s {\n%s}\n", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
 }
@@ -314,7 +319,7 @@ func (gen *CodeGenerator) RustAttribute(v *Attribute) {
  } else {
  gen.StructAST[v.Name] = fmt.Sprintf("\t#[serde(rename = \"%s\")]\n\tpub %s: %s,\n", v.Name, fieldName, fieldType)
  }
- gen.Field += fmt.Sprintf("\n#[derive(Debug, Deserialize, Serialize, PartialEq)]\npub struct %s {\n%s}\n", genRustStructName(v.Name), gen.StructAST[v.Name])
+ gen.Field += fmt.Sprintf("\n%s#[derive(Debug, Deserialize, Serialize, PartialEq)]\npub struct %s {\n%s}\n", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
 }
diff --git a/genTypeScript.go b/genTypeScript.go
@@ -16,12 +16,13 @@ import (
 )
 
 var typeScriptBuildInType = map[string]bool{
- "boolean": true,
- "number": true,
- "string": true,
- "void": true,
- "null": true,
- "undefined": true,
+ "boolean": true,
+ "number": true,
+ "string": true,
+ "void": true,
+ "null": true,
+ "undefined": true,
+ "Uint8Array": true,
 }
 
 // GenTypeScript generate TypeScript programming language source code for XML
@@ -84,7 +85,8 @@ func (gen *CodeGenerator) TypeScriptSimpleType(v *SimpleType) {
  fieldType := genTypeScriptFieldType(getBasefromSimpleType(trimNSPrefix(v.Base), gen.ProtoTree), true)
  content := fmt.Sprintf(" = %s;\n", fieldType)
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("\nexport type %s%s", genTypeScriptFieldName(v.Name), gen.StructAST[v.Name])
+ fieldName := genTypeScriptFieldName(v.Name)
+ gen.Field += fmt.Sprintf("%sexport type %s%s", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  return
  }
  }
@@ -99,7 +101,8 @@ func (gen *CodeGenerator) TypeScriptSimpleType(v *SimpleType) {
  }
  content += "}\n"
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("\nexport class %s%s", genTypeScriptFieldName(v.Name), gen.StructAST[v.Name])
+ fieldName := genTypeScriptFieldName(v.Name)
+ gen.Field += fmt.Sprintf("%sexport class %s%s", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
  }
@@ -116,13 +119,15 @@ func (gen *CodeGenerator) TypeScriptSimpleType(v *SimpleType) {
  content += fmt.Sprintf("\tEnum%s = '%s',\n", enum, enum)
  }
  }
- gen.Field += fmt.Sprintf("\nexport enum %s {\n%s}\n", genTypeScriptFieldName(v.Name), content)
+ fieldName := genTypeScriptFieldName(v.Name)
+ gen.Field += fmt.Sprintf("%sexport enum %s {\n%s}\n", genFieldComment(fieldName, v.Doc, "//"), fieldName, content)
  return
  }
  if _, ok := gen.StructAST[v.Name]; !ok {
  content := fmt.Sprintf(" %s;\n", genTypeScriptFieldType(getBasefromSimpleType(trimNSPrefix(v.Base), gen.ProtoTree), false))
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("\nexport type %s =%s", genTypeScriptFieldName(v.Name), gen.StructAST[v.Name])
+ fieldName := genTypeScriptFieldName(v.Name)
+ gen.Field += fmt.Sprintf("%sexport type %s =%s", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
 }
@@ -155,7 +160,8 @@ func (gen *CodeGenerator) TypeScriptComplexType(v *ComplexType) {
  }
  content += "}\n"
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("\nexport class %s%s", genTypeScriptFieldName(v.Name), gen.StructAST[v.Name])
+ fieldName := genTypeScriptFieldName(v.Name)
+ gen.Field += fmt.Sprintf("%sexport class %s%s", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
 }
@@ -174,7 +180,8 @@ func (gen *CodeGenerator) TypeScriptGroup(v *Group) {
 
  content += "}\n"
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("\nexport class %s%s", genTypeScriptFieldName(v.Name), gen.StructAST[v.Name])
+ fieldName := genTypeScriptFieldName(v.Name)
+ gen.Field += fmt.Sprintf("%sexport class %s%s", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
 }
@@ -193,7 +200,8 @@ func (gen *CodeGenerator) TypeScriptAttributeGroup(v *AttributeGroup) {
  }
  content += "}\n"
  gen.StructAST[v.Name] = content
- gen.Field += fmt.Sprintf("\nexport class %s%s", genTypeScriptFieldName(v.Name), gen.StructAST[v.Name])
+ fieldName := genTypeScriptFieldName(v.Name)
+ gen.Field += fmt.Sprintf("%sexport class %s%s", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
 }
@@ -202,7 +210,8 @@ func (gen *CodeGenerator) TypeScriptAttributeGroup(v *AttributeGroup) {
 func (gen *CodeGenerator) TypeScriptElement(v *Element) {
  if _, ok := gen.StructAST[v.Name]; !ok {
  gen.StructAST[v.Name] = fmt.Sprintf(" %s;\n", genTypeScriptFieldType(getBasefromSimpleType(trimNSPrefix(v.Type), gen.ProtoTree), v.Plural))
- gen.Field += fmt.Sprintf("\nexport type %s =%s", genTypeScriptFieldName(v.Name), gen.StructAST[v.Name])
+ fieldName := genTypeScriptFieldName(v.Name)
+ gen.Field += fmt.Sprintf("%sexport type %s =%s", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
 }
@@ -211,7 +220,8 @@ func (gen *CodeGenerator) TypeScriptElement(v *Element) {
 func (gen *CodeGenerator) TypeScriptAttribute(v *Attribute) {
  if _, ok := gen.StructAST[v.Name]; !ok {
  gen.StructAST[v.Name] = fmt.Sprintf(" %s;\n", genTypeScriptFieldType(getBasefromSimpleType(trimNSPrefix(v.Type), gen.ProtoTree), v.Plural))
- gen.Field += fmt.Sprintf("\nexport type %s =%s", genTypeScriptFieldName(v.Name), gen.StructAST[v.Name])
+ fieldName := genTypeScriptFieldName(v.Name)
+ gen.Field += fmt.Sprintf("%sexport type %s =%s", genFieldComment(fieldName, v.Doc, "//"), fieldName, gen.StructAST[v.Name])
  }
  return
 }
diff --git a/parser.go b/parser.go
@@ -116,6 +116,10 @@ func (opt *Options) Parse() (err error) {
  if err = callFuncByName(opt, funcName, []reflect.Value{reflect.ValueOf(element), reflect.ValueOf(opt.ProtoTree)}); err != nil {
  return
  }
+ case xml.CharData:
+ if err = opt.OnCharData(string(element), opt.ProtoTree); err != nil {
+ return
+ }
  default:
  }