Adding pointers to optional attributes (#102)

Author: eleenmohd-wk

genGo.go

@@ -193,22 +193,26 @@ func (gen *CodeGenerator) GoComplexType(v *ComplexType) {
 		}
 
 		for _, attribute := range v.Attributes {
+			fieldType := genGoFieldType(getBasefromSimpleType(trimNSPrefix(attribute.Type), gen.ProtoTree))
 			var optional string
 			if attribute.Optional {
-				optional = `,omitempty`
+				if !strings.HasPrefix(fieldType, `*`) {
+					fieldType = "*" + fieldType
+				} else {
+					optional = `,omitempty`
+				}
 			}
-			fieldType := genGoFieldType(getBasefromSimpleType(trimNSPrefix(attribute.Type), gen.ProtoTree))
 			if fieldType == "time.Time" {
 				gen.ImportTime = true
 			}
 			content += fmt.Sprintf("\t%sAttr\t%s\t`xml:\"%s,attr%s\"`\n", genGoFieldName(attribute.Name, false), fieldType, attribute.Name, optional)
 		}
 		for _, group := range v.Groups {
-			var plural string
+			fieldType := genGoFieldType(getBasefromSimpleType(trimNSPrefix(group.Ref), gen.ProtoTree))
 			if group.Plural {
-				plural = "[]"
+				fieldType = "[]" + fieldType
 			}
-			content += fmt.Sprintf("\t%s\t%s%s\n", genGoFieldName(group.Name, false), plural, genGoFieldType(getBasefromSimpleType(trimNSPrefix(group.Ref), gen.ProtoTree)))
+			content += fmt.Sprintf("\t%s\t%s\n", genGoFieldName(group.Name, false), fieldType)
 		}
 
 		for _, element := range v.Elements {

genJava.go

@@ -149,12 +149,12 @@ func (gen *CodeGenerator) JavaComplexType(v *ComplexType) {
 		}
 
 		for _, attribute := range v.Attributes {
-			required := ", required = true"
+			fieldType := genJavaFieldType(getBasefromSimpleType(trimNSPrefix(attribute.Type), gen.ProtoTree))
+			required := `required = true, `
 			if attribute.Optional {
 				required = ""
 			}
-			fieldType := genJavaFieldType(getBasefromSimpleType(trimNSPrefix(attribute.Type), gen.ProtoTree))
-			content += fmt.Sprintf("\t@XmlAttribute(name = \"%s\"%s)\n\tprotected %s %sAttr;\n", attribute.Name, required, fieldType, genJavaFieldName(attribute.Name, false))
+			content += fmt.Sprintf("\t@XmlAttribute(%sname = \"%s\")\n\tprotected %s %sAttr;\n", required, attribute.Name, fieldType, genJavaFieldName(attribute.Name, false))
 		}
 		for _, group := range v.Groups {
 			fieldType := genJavaFieldType(getBasefromSimpleType(trimNSPrefix(group.Ref), gen.ProtoTree))

genTypeScript.go

@@ -151,12 +151,15 @@ func (gen *CodeGenerator) TypeScriptComplexType(v *ComplexType) {
 		}
 
 		for _, attribute := range v.Attributes {
-			var optional string
+			fieldType := genTypeScriptFieldType(
+				getBasefromSimpleType(trimNSPrefix(attribute.Type), gen.ProtoTree),
+				attribute.Plural,
+			)
+			fieldName := genTypeScriptFieldName(attribute.Name, false) + "Attr"
 			if attribute.Optional {
-				optional = ` | null`
+				fieldName += "?"
 			}
-			fieldType := genTypeScriptFieldType(getBasefromSimpleType(trimNSPrefix(attribute.Type), gen.ProtoTree), attribute.Plural)
-			content += fmt.Sprintf("\t%sAttr: %s%s;\n", genTypeScriptFieldName(attribute.Name, false), fieldType, optional)
+			content += fmt.Sprintf("\t%s: %s;\n", fieldName, fieldType)
 		}
 		for _, group := range v.Groups {
 			content += fmt.Sprintf("\t%s: %s;\n", genTypeScriptFieldName(group.Name, false), genTypeScriptFieldType(getBasefromSimpleType(trimNSPrefix(group.Ref), gen.ProtoTree), group.Plural))

test/c/base64.xsd.h

@@ -53,7 +53,7 @@ typedef struct {
 // TopLevel ...
 typedef struct {
 	float CostAttr; // attr, optional
-	char LastUpdatedAttr; // attr, optional
+	char LastUpdatedAttr; // attr
 	MyType7 Nested;
 	char MyType1[];
 	MyType2 MyType2[];

test/go/base64.xsd.go

@@ -64,7 +64,7 @@ public class MyType6 {
 
 // MyType7 ...
 public class MyType7 {
-	@XmlAttribute(name = "origin", required = true)
+	@XmlAttribute(required = true, name = "origin")
 	protected String OriginAttr;
 	@XmlValue
 	protected String value;
@@ -92,7 +92,7 @@ public class MyType10 {
 public class TopLevel extends MyType6  {
 	@XmlAttribute(name = "cost")
 	protected Float CostAttr;
-	@XmlAttribute(name = "LastUpdated")
+	@XmlAttribute(required = true, name = "LastUpdated")
 	protected String LastUpdatedAttr;
 	@XmlElement(name = "nested")
 	protected MyType7 Nested;

test/java/base64.xsd.java

@@ -106,7 +106,7 @@ pub struct TopLevel {
 	#[serde(rename = "cost")]
 	pub cost: Option<f64>,
 	#[serde(rename = "LastUpdated")]
-	pub last_updated: Option<u8>,
+	pub last_updated: u8,
 	#[serde(rename = "nested")]
 	pub nested: Option<MyType7>,
 	#[serde(rename = "myType1")]

test/rs/base64.xsd.rs

@@ -5,13 +5,13 @@ export type MyType1 = Uint8Array;
 
 // MyType2 ...
 export class MyType2 {
-	LengthAttr: number | null;
+	LengthAttr?: number;
 	Value: Uint8Array;
 }
 
 // MyType3 ...
 export class MyType3 {
-	LengthAttr: number | null;
+	LengthAttr?: number;
 	Value: string;
 }
 
@@ -28,8 +28,8 @@ export type MyType5 = string;
 
 // MyType6 ...
 export class MyType6 {
-	CodeAttr: string | null;
-	IdentifierAttr: number | null;
+	CodeAttr?: string;
+	IdentifierAttr?: number;
 }
 
 // MyType7 ...
@@ -55,8 +55,8 @@ export class MyType10 {
 
 // TopLevel ...
 export class TopLevel extends MyType6  {
-	CostAttr: number | null;
-	LastUpdatedAttr: string | null;
+	CostAttr?: number;
+	LastUpdatedAttr: string;
 	Nested?: MyType7;
 	MyType1: Uint8Array;
 	MyType2: Array<MyType2>;

test/ts/base64.xsd.ts

@@ -84,7 +84,7 @@
             </choice>
           </sequence>
           <attribute name="cost" type="double"/>
-          <attribute name="LastUpdated" type="dateTime"/>
+          <attribute name="LastUpdated" type="dateTime" use="required"/>
         </extension>
       </complexContent>
     </complexType>