fix: trailing comma not allowed in ruleset

*Issue #, if available:* #633 *Description of changes:* This will generate a valid TypeScript file for `src/endpoint/ruleset.ts`.
smithy-lang · Nov 10, 2022 · ccbb330 · ccbb330
1 parent 42ca023
commit ccbb330
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...main/java/software/amazon/smithy/typescript/codegen/endpointsV2/EndpointsV2Generator.java b/...main/java/software/amazon/smithy/typescript/codegen/endpointsV2/EndpointsV2Generator.java
@@ -189,7 +189,7 @@ private void generateEndpointRuleset() {
                 writer.addImport("RuleSetObject", null, "@aws-sdk/util-endpoints");
                 writer.openBlock(
                     "export const ruleSet: RuleSetObject = ",
-                    "",
+                    ";",
                     () -> {
                         new RuleSetSerializer(
                             endpointRuleSetTrait.getRuleSet(),

diff --git a/...rc/main/java/software/amazon/smithy/typescript/codegen/endpointsV2/RuleSetSerializer.java b/...rc/main/java/software/amazon/smithy/typescript/codegen/endpointsV2/RuleSetSerializer.java
@@ -33,7 +33,17 @@ public RuleSetSerializer(Node ruleSet, TypeScriptWriter writer) {
      * Write the ruleset as a TS object.
      */
     public void generate() {
-        traverse(ruleSet);
+        ObjectNode objectNode = ruleSet.expectObjectNode();
+        writer.openBlock(
+            "{",
+            "}",
+            () -> {
+                objectNode.getMembers().forEach((k, v) -> {
+                    writer.writeInline("\"" + k + "\": ");
+                    traverse(v);
+                });
+            }
+        );
     }
 
     private void traverse(Node node) {