Support optional fields as pointers (#96)

Author: matthinrichsen-wf

genGo.go

@@ -212,19 +212,23 @@ func (gen *CodeGenerator) GoComplexType(v *ComplexType) {
 		}
 
 		for _, element := range v.Elements {
-			var plural string
+			fieldType := genGoFieldType(getBasefromSimpleType(trimNSPrefix(element.Type), gen.ProtoTree))
+
 			if element.Plural {
-				plural = "[]"
+				fieldType = "[]" + fieldType
 			}
 			var optional string
 			if element.Optional {
-				optional = `,omitempty`
+				if !element.Plural && !strings.HasPrefix(fieldType, `*`) {
+					fieldType = "*" + fieldType
+				} else {
+					optional = `,omitempty`
+				}
 			}
-			fieldType := genGoFieldType(getBasefromSimpleType(trimNSPrefix(element.Type), gen.ProtoTree))
 			if fieldType == "time.Time" {
 				gen.ImportTime = true
 			}
-			content += fmt.Sprintf("\t%s\t%s%s\t`xml:\"%s%s\"`\n", genGoFieldName(element.Name, false), plural, fieldType, element.Name, optional)
+			content += fmt.Sprintf("\t%s\t%s\t`xml:\"%s%s\"`\n", genGoFieldName(element.Name, false), fieldType, element.Name, optional)
 		}
 		if len(v.Base) > 0 {
 			// If the type is a built-in type, generate a Value field as chardata.

genJava.go

@@ -169,7 +169,11 @@ func (gen *CodeGenerator) JavaComplexType(v *ComplexType) {
 			if element.Plural {
 				fieldType = fmt.Sprintf("List<%s>", fieldType)
 			}
-			content += fmt.Sprintf("\t@XmlElement(required = true, name = \"%s\")\n\tprotected %s %s;\n", element.Name, fieldType, genJavaFieldName(element.Name, false))
+			required := `required = true, `
+			if element.Optional {
+				required = ""
+			}
+			content += fmt.Sprintf("\t@XmlElement(%sname = \"%s\")\n\tprotected %s %s;\n", required, element.Name, fieldType, genJavaFieldName(element.Name, false))
 		}
 
 		if len(v.Base) > 0 && isBuiltInJavaType(v.Base) {

genTypeScript.go

@@ -164,7 +164,11 @@ func (gen *CodeGenerator) TypeScriptComplexType(v *ComplexType) {
 
 		for _, element := range v.Elements {
 			fieldType := genTypeScriptFieldType(getBasefromSimpleType(trimNSPrefix(element.Type), gen.ProtoTree), element.Plural)
-			content += fmt.Sprintf("\t%s: %s;\n", genTypeScriptFieldName(element.Name, false), fieldType)
+			fieldName := genTypeScriptFieldName(element.Name, false)
+			if element.Optional {
+				fieldName += `?`
+			}
+			content += fmt.Sprintf("\t%s: %s;\n", fieldName, fieldType)
 		}
 
 		if len(v.Base) > 0 && isBuiltInTypeScriptType(v.Base) {

test/c/base64.xsd.h

@@ -18,6 +18,7 @@ typedef struct {
 	char Title;
 	char Blob[];
 	char Timestamp;
+	char Metadata;
 } MyType4;
 
 // MyType5 ...

test/go/base64.xsd.go

@@ -43,6 +43,8 @@ public class MyType4 {
 	protected List<Byte> Blob;
 	@XmlElement(required = true, name = "timestamp")
 	protected String Timestamp;
+	@XmlElement(name = "metadata")
+	protected String Metadata;
 }
 
 // MyType5 ...
@@ -92,7 +94,7 @@ public class TopLevel extends MyType6  {
 	protected Float CostAttr;
 	@XmlAttribute(name = "LastUpdated")
 	protected String LastUpdatedAttr;
-	@XmlElement(required = true, name = "nested")
+	@XmlElement(name = "nested")
 	protected MyType7 Nested;
 	@XmlElement(required = true, name = "myType1")
 	protected List<List<Byte>> MyType1;

test/java/base64.xsd.java

@@ -43,6 +43,8 @@ pub struct MyType4 {
 	pub blob: String,
 	#[serde(rename = "timestamp")]
 	pub timestamp: u8,
+	#[serde(rename = "metadata")]
+	pub metadata: Option<String>,
 }
 
 

test/rs/base64.xsd.rs

@@ -20,6 +20,7 @@ export class MyType4 {
 	Title: string;
 	Blob: Uint8Array;
 	Timestamp: string;
+	Metadata?: string;
 }
 
 // MyType5 ...
@@ -56,7 +57,7 @@ export class MyType10 {
 export class TopLevel extends MyType6  {
 	CostAttr: number | null;
 	LastUpdatedAttr: string | null;
-	Nested: MyType7;
+	Nested?: MyType7;
 	MyType1: Uint8Array;
 	MyType2: Array<MyType2>;
 }

test/ts/base64.xsd.ts

@@ -26,6 +26,7 @@
       <element name="title" type="string"/>
       <element name="blob" type="base64Binary"/>
       <element name="timestamp" type="dateTime"/>
+      <element name="metadata" type="string" minOccurs="0"/>
     </sequence>
   </complexType>