chore: call writeIdempotencyAutofill in a separate loop

Author: trivikr

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsRestXml.java

@@ -150,6 +150,17 @@ protected void serializeInputDocument(
         }
 
         SymbolProvider symbolProvider = context.getSymbolProvider();
+
+        for (HttpBinding binding : documentBindings) {
+            MemberShape memberShape = binding.getMember();
+            // The name of the member to get from the input shape.
+            String memberName = symbolProvider.toMemberName(memberShape);
+            String inputLocation = "input." + memberName;
+
+            // Handle if the member is an idempotency token that should be auto-filled.
+            AwsProtocolUtils.writeIdempotencyAutofill(context, memberShape, inputLocation);
+        }
+
         ShapeId inputShapeId = documentBindings.get(0).getMember().getContainer();
 
         // Start with the XML declaration.
@@ -174,9 +185,6 @@ protected void serializeInputDocument(
             String memberName = symbolProvider.toMemberName(memberShape);
             String inputLocation = "input." + memberName;
 
-            // Handle if the member is an idempotency token that should be auto-filled.
-            AwsProtocolUtils.writeIdempotencyAutofill(context, memberShape, inputLocation);
-
             writer.openBlock("if ($L !== undefined) {", "}", inputLocation, () -> {
                 shapeSerVisitor.serializeNamedMember(context, memberName, memberShape, () -> inputLocation);
             });

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonShapeSerVisitor.java

@@ -90,9 +90,16 @@ public void serializeMap(GenerationContext context, MapShape shape) {
     public void serializeStructure(GenerationContext context, StructureShape shape) {
         TypeScriptWriter writer = context.getWriter();
 
-        writer.write("const bodyParams: any = {};");
         // Use a TreeMap to sort the members.
         Map<String, MemberShape> members = new TreeMap<>(shape.getAllMembers());
+
+        members.forEach((memberName, memberShape) -> {
+            String inputLocation = "input." + memberName;
+            // Handle if the member is an idempotency token that should be auto-filled.
+            AwsProtocolUtils.writeIdempotencyAutofill(context, memberShape, inputLocation);
+        });
+
+        writer.write("const bodyParams: any = {};");
         members.forEach((memberName, memberShape) -> {
             // Use the jsonName trait value if present, otherwise use the member name.
             String locationName = memberShape.getTrait(JsonNameTrait.class)
@@ -101,9 +108,6 @@ public void serializeStructure(GenerationContext context, StructureShape shape)
             Shape target = context.getModel().expectShape(memberShape.getTarget());
             String inputLocation = "input." + memberName;
 
-            // Handle if the member is an idempotency token that should be auto-filled.
-            AwsProtocolUtils.writeIdempotencyAutofill(context, memberShape, inputLocation);
-
             // Generate an if statement to set the bodyParam if the member is set.
             writer.openBlock("if ($L !== undefined) {", "}", inputLocation, () -> {
                 String dataSource = "input." + memberName;

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/QueryShapeSerVisitor.java

@@ -143,16 +143,18 @@ private void serializeUnnamedMemberEntryList(
     protected void serializeStructure(GenerationContext context, StructureShape shape) {
         TypeScriptWriter writer = context.getWriter();
 
+        shape.getAllMembers().forEach((memberName, memberShape) -> {
+            String inputLocation = "input." + memberName;
+            // Handle if the member is an idempotency token that should be auto-filled.
+            AwsProtocolUtils.writeIdempotencyAutofill(context, memberShape, inputLocation);
+        });
+
         // Set up a location to store all of the entry pairs.
         writer.write("const entries: any = {};");
 
         // Serialize every member of the structure if present.
         shape.getAllMembers().forEach((memberName, memberShape) -> {
             String inputLocation = "input." + memberName;
-
-            // Handle if the member is an idempotency token that should be auto-filled.
-            AwsProtocolUtils.writeIdempotencyAutofill(context, memberShape, inputLocation);
-
             writer.openBlock("if ($L !== undefined) {", "}", inputLocation,
                     () -> serializeNamedMember(context, memberName, memberShape, inputLocation));
         });

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/RestJsonProtocolGenerator.java

@@ -102,6 +102,16 @@ public void serializeInputDocument(
 
         SymbolProvider symbolProvider = context.getSymbolProvider();
 
+        for (HttpBinding binding : documentBindings) {
+            MemberShape memberShape = binding.getMember();
+            // The name of the member to get from the input shape.
+            String memberName = symbolProvider.toMemberName(memberShape);
+            String inputLocation = "input." + memberName;
+
+            // Handle if the member is an idempotency token that should be auto-filled.
+            AwsProtocolUtils.writeIdempotencyAutofill(context, memberShape, inputLocation);
+        }
+
         writer.write("const bodyParams: any = {};");
         for (HttpBinding binding : documentBindings) {
             MemberShape memberShape = binding.getMember();
@@ -114,9 +124,6 @@ public void serializeInputDocument(
                     .orElseGet(binding::getLocationName);
             Shape target = context.getModel().expectShape(memberShape.getTarget());
 
-            // Handle if the member is an idempotency token that should be auto-filled.
-            AwsProtocolUtils.writeIdempotencyAutofill(context, memberShape, inputLocation);
-
             // Generate an if statement to set the bodyParam if the member is set.
             writer.openBlock("if ($L !== undefined) {", "}", inputLocation, () -> {
                 // Handle @timestampFormat on members not just the targeted shape.

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/XmlShapeSerVisitor.java

@@ -168,22 +168,23 @@ protected void serializeStructure(GenerationContext context, StructureShape shap
                 .map(XmlNameTrait::getValue)
                 .orElse(shape.getId().getName());
 
-        // Create the structure's node.
-        writer.write("const bodyNode = new __XmlNode($S);", nodeName);
-
         // Serialize every member of the structure if present.
         Map<String, MemberShape> members = shape.getAllMembers();
+
         members.forEach((memberName, memberShape) -> {
             String inputLocation = "input." + memberName;
-
             // Handle if the member is an idempotency token that should be auto-filled.
             AwsProtocolUtils.writeIdempotencyAutofill(context, memberShape, inputLocation);
+        });
 
+        // Create the structure's node.
+        writer.write("const bodyNode = new __XmlNode($S);", nodeName);
+        members.forEach((memberName, memberShape) -> {
+            String inputLocation = "input." + memberName;
             writer.openBlock("if ($L !== undefined) {", "}", inputLocation, () -> {
                 serializeNamedMember(context, memberName, memberShape, () -> inputLocation);
             });
         });
-
         writer.write("return bodyNode;");
     }