chore: reduce generated code for strings

Author: JordonPhillips

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

@@ -28,8 +28,10 @@
 import software.amazon.smithy.model.shapes.StructureShape;
 import software.amazon.smithy.model.shapes.UnionShape;
 import software.amazon.smithy.model.traits.JsonNameTrait;
+import software.amazon.smithy.model.traits.MediaTypeTrait;
 import software.amazon.smithy.model.traits.SparseTrait;
 import software.amazon.smithy.model.traits.TimestampFormatTrait.Format;
+import software.amazon.smithy.typescript.codegen.CodegenUtils;
 import software.amazon.smithy.typescript.codegen.TypeScriptWriter;
 import software.amazon.smithy.typescript.codegen.integration.DocumentMemberDeserVisitor;
 import software.amazon.smithy.typescript.codegen.integration.DocumentShapeDeserVisitor;
@@ -132,7 +134,7 @@ protected void deserializeStructure(GenerationContext context, StructureShape sh
                         .orElse(memberName);
                 Shape target = context.getModel().expectShape(memberShape.getTarget());
 
-                if (target.isBooleanShape() || target instanceof NumberShape) {
+                if (usesExpect(target)) {
                     // Booleans and numbers will call expectBoolean/expectNumber which will handle
                     // null/undefined properly.
                     writer.write("$L: $L,", memberName, target.accept(getMemberVisitor("output." + locationName)));
@@ -146,6 +148,16 @@ protected void deserializeStructure(GenerationContext context, StructureShape sh
         });
     }
 
+    private boolean usesExpect(Shape shape) {
+        if (shape.isStringShape()) {
+            if (shape.hasTrait(MediaTypeTrait.class)) {
+                return !CodegenUtils.isJsonMediaType(shape.expectTrait(MediaTypeTrait.class).getValue());
+            }
+            return true;
+        }
+        return shape.isBooleanShape() || shape instanceof NumberShape;
+    }
+
     @Override
     protected void deserializeUnion(GenerationContext context, UnionShape shape) {
         TypeScriptWriter writer = context.getWriter();
@@ -161,7 +173,7 @@ protected void deserializeUnion(GenerationContext context, UnionShape shape) {
                     .orElse(memberName);
 
             String memberValue = target.accept(getMemberVisitor("output." + locationName));
-            if (target.isBooleanShape() || target instanceof NumberShape) {
+            if (usesExpect(target)) {
                 // Booleans and numbers will call expectBoolean/expectNumber which will handle
                 // null/undefined properly.
                 writer.openBlock("if ((val = $L) !== undefined) {", "}", memberValue, () -> {

packages/smithy-client/src/parse-utils.ts

@@ -22,7 +22,7 @@ export function expectBoolean(value: any): boolean | undefined {
  * @returns The value if it's a number, undefined if it's null/undefined,
  *   otherwise an error is thrown.
  */
-export function expectNumber(value: any): number {
+export function expectNumber(value: any): number | undefined {
   if (value === null || value === undefined) {
     return undefined;
   }
@@ -39,7 +39,7 @@ export function expectNumber(value: any): number {
  * @returns The value if it's a string, undefined if it's null/undefined,
  *   otherwise an error is thrown.
  */
-export function expectString(value: any): string {
+export function expectString(value: any): string | undefined {
   if (value === null || value === undefined) {
     return undefined;
   }