Skip to content

Commit

Permalink
fix: Proper formatting of generated structures (#894)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jbelkins
jbelkins authored Jan 8, 2025
1 parent 1fa5f6f commit 4c816b5
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 46 deletions.
7 changes: 5 additions & 2 deletions ...-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/StructureGenerator.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,21 +143,24 @@ class StructureGenerator(
val hasMembers = membersSortedByName.isNotEmpty()

if (hasMembers) {
writer.openBlock("public init(", ")") {
writer.write("public init(")
writer.indent {
for ((index, member) in membersSortedByName.withIndex()) {
val (memberName, memberSymbol) = memberShapeDataContainer.getOrElse(member) { Pair(null, null) }
if (memberName == null || memberSymbol == null) continue
val terminator = if (index == membersSortedByName.size - 1) "" else ","
writer.write("\$L: \$D$terminator", memberName, memberSymbol)
}
}
writer.openBlock("{", "}") {
writer.write(") {")
writer.indent {
val path = "properties.".takeIf { error } ?: ""
membersSortedByName.forEach {
val (memberName, _) = memberShapeDataContainer.getOrElse(it) { return@forEach }
writer.write("self.$path\$L = \$L", memberName, memberName)
}
}
writer.write("}")
} else {
writer.write("public init() { }")
}
Expand Down
12 changes: 4 additions & 8 deletions ...swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/ServiceRenamesTests.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ public struct MyTestOperationInput: Swift.Sendable {
public init(
bar: ExampleClientTypes.RenamedGreeting? = nil
)
{
) {
self.bar = bar
}
}
Expand All @@ -54,8 +53,7 @@ public struct MyTestOperationOutput: Swift.Sendable {
public init(
baz: ExampleClientTypes.GreetingStruct? = nil
)
{
) {
self.baz = baz
}
}
Expand Down Expand Up @@ -83,8 +81,7 @@ extension ExampleClientTypes {
public init(
hi: Swift.String? = nil
)
{
) {
self.hi = hi
}
}
Expand Down Expand Up @@ -113,8 +110,7 @@ extension ExampleClientTypes {
public init(
salutation: Swift.String? = nil
)
{
) {
self.salutation = salutation
}
}
Expand Down
3 changes: 1 addition & 2 deletions ...n/software/amazon/smithy/swift/codegen/basicshapes/StructEncodeGenerationIsolatedTests.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ public struct EnumInputInput: Swift.Sendable {
public init(
enumHeader: ExampleClientTypes.MyEnum? = nil,
nestedWithEnum: ExampleClientTypes.NestedEnum? = nil
)
{
) {
self.enumHeader = enumHeader
self.nestedWithEnum = nestedWithEnum
}
Expand Down
36 changes: 12 additions & 24 deletions ...c/test/kotlin/software/amazon/smithy/swift/codegen/basicshapes/StructureGeneratorTests.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ public struct MyStruct: Swift.Sendable {
bar: Swift.Int = 0,
baz: Swift.Int? = nil,
foo: Swift.String? = nil
)
{
) {
self.bar = bar
self.baz = baz
self.foo = foo
Expand Down Expand Up @@ -110,8 +109,7 @@ public struct PrimitiveTypesInput: Swift.Sendable {
primitiveShortVal: Swift.Int16 = 0,
shortVal: Swift.Int16? = nil,
str: Swift.String? = nil
)
{
) {
self.booleanVal = booleanVal
self.byteVal = byteVal
self.doubleVal = doubleVal
Expand Down Expand Up @@ -154,8 +152,7 @@ public struct RecursiveShapesInputOutputNested1: Swift.Sendable {
public init(
foo: Swift.String? = nil,
nested: RecursiveShapesInputOutputNested2? = nil
)
{
) {
self.foo = foo
self.nested = nested
}
Expand All @@ -168,8 +165,7 @@ public struct RecursiveShapesInputOutputNested2: Swift.Sendable {
public init(
bar: Swift.String? = nil,
recursiveMember: RecursiveShapesInputOutputNested1? = nil
)
{
) {
self.bar = bar
self.recursiveMember = recursiveMember
}
Expand All @@ -181,8 +177,7 @@ public struct RecursiveShapesInputOutput: Swift.Sendable {
public init(
nested: RecursiveShapesInputOutputNested1? = nil
)
{
) {
self.nested = nested
}
}
Expand Down Expand Up @@ -211,8 +206,7 @@ public struct RecursiveShapesInputOutputNestedList1: Swift.Sendable {
public init(
foo: Swift.String? = nil,
recursiveList: [RecursiveShapesInputOutputNested2]? = nil
)
{
) {
self.foo = foo
self.recursiveList = recursiveList
}
Expand All @@ -225,8 +219,7 @@ public struct RecursiveShapesInputOutputNested2: Swift.Sendable {
public init(
bar: Swift.String? = nil,
recursiveMember: RecursiveShapesInputOutputNested1? = nil
)
{
) {
self.bar = bar
self.recursiveMember = recursiveMember
}
Expand All @@ -238,8 +231,7 @@ public struct RecursiveShapesInputOutputLists: Swift.Sendable {
public init(
nested: RecursiveShapesInputOutputNested1? = nil
)
{
) {
self.nested = nested
}
}
Expand Down Expand Up @@ -282,8 +274,7 @@ public struct MyError: ClientRuntime.ModeledError, ClientRuntime.ServiceError, C
public init(
baz: Swift.Int? = nil,
message: Swift.String? = nil
)
{
) {
self.properties.baz = baz
self.properties.message = message
}
Expand Down Expand Up @@ -333,8 +324,7 @@ public struct JsonListsInput: Swift.Sendable {
stringList: [Swift.String]? = nil,
stringSet: Swift.Set<Swift.String>? = nil,
timestampList: [Foundation.Date]? = nil
)
{
) {
self.booleanList = booleanList
self.integerList = integerList
self.nestedStringList = nestedStringList
Expand Down Expand Up @@ -382,8 +372,7 @@ public struct JsonMapsInput: Swift.Sendable {
sparseNumberMap: [Swift.String: Swift.Int?]? = nil,
sparseStringMap: [Swift.String: Swift.String?]? = nil,
sparseStructMap: [Swift.String: ExampleClientTypes.GreetingStruct?]? = nil
)
{
) {
self.denseBooleanMap = denseBooleanMap
self.denseNumberMap = denseNumberMap
self.denseStringMap = denseStringMap
Expand Down Expand Up @@ -420,8 +409,7 @@ public struct JsonMapsOutput: Swift.Sendable {
sparseNumberMap: [Swift.String: Swift.Int?]? = nil,
sparseStringMap: [Swift.String: Swift.String?]? = nil,
sparseStructMap: [Swift.String: ExampleClientTypes.GreetingStruct?]? = nil
)
{
) {
self.denseBooleanMap = denseBooleanMap
self.denseNumberMap = denseNumberMap
self.denseStringMap = denseStringMap
Expand Down
12 changes: 4 additions & 8 deletions ...kotlin/software/amazon/smithy/swift/codegen/codegencomponents/RecursiveShapeBoxerTests.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ public struct RecursiveShapesInput: Swift.Sendable {
public init(
nested: ExampleClientTypes.RecursiveShapesInputOutputNested1? = nil
)
{
) {
self.nested = nested
}
}
Expand All @@ -74,8 +73,7 @@ public struct RecursiveShapesOutput: Swift.Sendable {
public init(
nested: ExampleClientTypes.RecursiveShapesInputOutputNested1? = nil
)
{
) {
self.nested = nested
}
}
Expand All @@ -95,8 +93,7 @@ extension ExampleClientTypes {
public init(
foo: Swift.String? = nil,
nested: ExampleClientTypes.RecursiveShapesInputOutputNested2? = nil
)
{
) {
self.foo = foo
self.nested = nested
}
Expand All @@ -116,8 +113,7 @@ extension ExampleClientTypes {
public init(
bar: Swift.String? = nil,
recursiveMember: ExampleClientTypes.RecursiveShapesInputOutputNested1? = nil
)
{
) {
self.bar = bar
self.recursiveMember = recursiveMember
}
Expand Down
3 changes: 1 addition & 2 deletions ...ithy/swift/codegen/protocolspecificserde/awsjson11/NestedListEncodeJSONGenerationTests.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ public struct ListOfMapsOperationInput: Swift.Sendable {
public init(
targetMaps: [[Swift.String: [Swift.String]]]? = nil
)
{
) {
self.targetMaps = targetMaps
}
}
Expand Down

0 comments on commit 4c816b5

Please sign in to comment.