fixed some bugs in swift client

matryer · matryer · commit 414ea937bd89 · 2020-11-13T13:35:24.000Z
diff --git a/otohttp/templates/client.swift.plush b/otohttp/templates/client.swift.plush
@@ -61,7 +61,7 @@ class OtoClient {
 <%= for (object) in def.Objects { %>
 <%= format_comment_text(object.Comment) %>struct <%= object.Name %>: Encodable, Decodable {
 <%= for (field) in object.Fields { %>
-	<%= format_comment_text(field.Comment) %>	var <%= camelize_down(field.Name) %>: <%= field.Type.SwiftType %>?
+	<%= format_comment_text(field.Comment) %>	var <%= camelize_down(field.Name) %>: <%= if (field.Type.IsObject) { %><%= field.Type.TypeName %><% } else { %> <%= field.Type.SwiftType %><% } %>?
 <% } %>
 }
 <% } %>

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class OtoClient {`
`61`	`61`	`<%= for (object) in def.Objects { %>`
`62`	`62`	`<%= format_comment_text(object.Comment) %>struct <%= object.Name %>: Encodable, Decodable {`
`63`	`63`	`<%= for (field) in object.Fields { %>`
`64`		`- <%= format_comment_text(field.Comment) %> var <%= camelize_down(field.Name) %>: <%= field.Type.SwiftType %>?`
	`64`	`+ <%= format_comment_text(field.Comment) %> var <%= camelize_down(field.Name) %>: <%= if (field.Type.IsObject) { %><%= field.Type.TypeName %><% } else { %> <%= field.Type.SwiftType %><% } %>?`
`65`	`65`	`<% } %>`
`66`	`66`	`}`
`67`	`67`	`<% } %>`