Support Smithy 1.9.x (#367)

Author: JordonPhillips

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/HttpProtocolTestGenerator.java

@@ -847,7 +847,10 @@ public Void arrayNode(ArrayNode node) {
                 Shape wrapperShape = this.workingShape;
                 node.getElements().forEach(element -> {
                     // Swap the working shape to the member of the collection.
-                    this.workingShape = model.expectShape(((CollectionShape) wrapperShape).getMember().getTarget());
+                    // This isn't necessary if the shape is a document.
+                    if (wrapperShape instanceof CollectionShape) {
+                        this.workingShape = model.expectShape(((CollectionShape) wrapperShape).getMember().getTarget());
+                    }
                     writer.call(() -> element.accept(this)).write("\n");
                 });
                 this.workingShape = wrapperShape;
@@ -1039,7 +1042,10 @@ public Void arrayNode(ArrayNode node) {
                 Shape wrapperShape = this.workingShape;
                 node.getElements().forEach(element -> {
                     // Swap the working shape to the member of the collection.
-                    this.workingShape = model.expectShape(((CollectionShape) wrapperShape).getMember().getTarget());
+                    // This isn't necessary if the shape is a document.
+                    if (wrapperShape instanceof CollectionShape) {
+                        this.workingShape = model.expectShape(((CollectionShape) wrapperShape).getMember().getTarget());
+                    }
                     writer.call(() -> element.accept(this)).write("\n");
                 });
                 this.workingShape = wrapperShape;
@@ -1134,6 +1140,21 @@ public Void stringNode(StringNode node) {
             // Handle blobs needing to be converted from strings to their input type of UInt8Array.
             if (workingShape.isBlobShape()) {
                 writer.write("Uint8Array.from($S, c => c.charCodeAt(0)),", node.getValue());
+            } else if (workingShape.isFloatShape() || workingShape.isDoubleShape()) {
+                switch (node.getValue()) {
+                    case "NaN":
+                        writer.write("NaN,");
+                        break;
+                    case "Infinity":
+                        writer.write("Infinity,");
+                        break;
+                    case "-Infinity":
+                        writer.write("-Infinity,");
+                        break;
+                    default:
+                        throw new CodegenException(String.format(
+                                "Unexpected string value for `%s`: \"%s\"", workingShape.getId(), node.getValue()));
+                }
             } else {
                 writer.write("$S,", node.getValue());
             }

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/DocumentMemberDeserVisitor.java

@@ -150,19 +150,24 @@ public String longShape(LongShape shape) {
 
     @Override
     public String floatShape(FloatShape shape) {
-        return expectNumber();
+        return handleFloat();
     }
 
     @Override
     public String doubleShape(DoubleShape shape) {
-        return expectNumber();
+        return handleFloat();
     }
 
     private String expectNumber() {
         context.getWriter().addImport("expectNumber", "__expectNumber", "@aws-sdk/smithy-client");
         return "__expectNumber(" + dataSource + ")";
     }
 
+    private String handleFloat() {
+        context.getWriter().addImport("handleFloat", "__handleFloat", "@aws-sdk/smithy-client");
+        return "__handleFloat(" + dataSource + ")";
+    }
+
     @Override
     public String stringShape(StringShape shape) {
         return HttpProtocolGeneratorUtils.getStringOutputParam(context, shape, dataSource);

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/DocumentMemberSerVisitor.java

@@ -148,12 +148,17 @@ public String longShape(LongShape shape) {
 
     @Override
     public String floatShape(FloatShape shape) {
-        return serializeUnmodified();
+        return handleFloat();
     }
 
     @Override
     public String doubleShape(DoubleShape shape) {
-        return serializeUnmodified();
+        return handleFloat();
+    }
+
+    private String handleFloat() {
+        context.getWriter().addImport("serializeFloat", "__serializeFloat", "@aws-sdk/smithy-client");
+        return "__serializeFloat(" + dataSource + ")";
     }
 
     @Override

smithy-typescript-codegen/src/test/java/software/amazon/smithy/typescript/codegen/integration/DocumentMemberDeserVisitorTest.java

@@ -70,8 +70,8 @@ public static Collection<Object[]> validMemberTargetTypes() {
         return ListUtils.of(new Object[][]{
                 {BooleanShape.builder().id(id).build(), "__expectBoolean(" + DATA_SOURCE + ")"},
                 {ByteShape.builder().id(id).build(), "__expectNumber(" + DATA_SOURCE + ")"},
-                {DoubleShape.builder().id(id).build(), "__expectNumber(" + DATA_SOURCE + ")"},
-                {FloatShape.builder().id(id).build(), "__expectNumber(" + DATA_SOURCE + ")"},
+                {DoubleShape.builder().id(id).build(), "__handleFloat(" + DATA_SOURCE + ")"},
+                {FloatShape.builder().id(id).build(), "__handleFloat(" + DATA_SOURCE + ")"},
                 {IntegerShape.builder().id(id).build(), "__expectNumber(" + DATA_SOURCE + ")"},
                 {LongShape.builder().id(id).build(), "__expectNumber(" + DATA_SOURCE + ")"},
                 {ShortShape.builder().id(id).build(), "__expectNumber(" + DATA_SOURCE + ")"},

smithy-typescript-codegen/src/test/java/software/amazon/smithy/typescript/codegen/integration/DocumentMemberSerVisitorTest.java

@@ -74,8 +74,8 @@ public static Collection<Object[]> validMemberTargetTypes() {
                 {BigDecimalShape.builder().id(id).build(), DATA_SOURCE + ".toJSON()"},
                 {BigIntegerShape.builder().id(id).build(), DATA_SOURCE + ".toJSON()"},
                 {ByteShape.builder().id(id).build(), DATA_SOURCE},
-                {DoubleShape.builder().id(id).build(), DATA_SOURCE},
-                {FloatShape.builder().id(id).build(), DATA_SOURCE},
+                {DoubleShape.builder().id(id).build(), "__serializeFloat(" + DATA_SOURCE + ")"},
+                {FloatShape.builder().id(id).build(), "__serializeFloat(" + DATA_SOURCE + ")"},
                 {IntegerShape.builder().id(id).build(), DATA_SOURCE},
                 {LongShape.builder().id(id).build(), DATA_SOURCE},
                 {ShortShape.builder().id(id).build(), DATA_SOURCE},