chore: reduce code for bools/numbers

Author: JordonPhillips

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

@@ -23,6 +23,7 @@
 import software.amazon.smithy.model.shapes.DocumentShape;
 import software.amazon.smithy.model.shapes.MapShape;
 import software.amazon.smithy.model.shapes.MemberShape;
+import software.amazon.smithy.model.shapes.NumberShape;
 import software.amazon.smithy.model.shapes.Shape;
 import software.amazon.smithy.model.shapes.StructureShape;
 import software.amazon.smithy.model.shapes.UnionShape;
@@ -131,10 +132,16 @@ protected void deserializeStructure(GenerationContext context, StructureShape sh
                         .orElse(memberName);
                 Shape target = context.getModel().expectShape(memberShape.getTarget());
 
-                writer.write("$1L: (output.$2L !== undefined && output.$2L !== null)"
-                        + " ? $3L: undefined,", memberName, locationName,
-                        // Dispatch to the output value provider for any additional handling.
-                        target.accept(getMemberVisitor("output." + locationName)));
+                if (target.isBooleanShape() || target instanceof NumberShape) {
+                    // Booleans and numbers will call expectBoolean/expectNumber which will handle
+                    // null/undefined properly.
+                    writer.write("$L: $L,", memberName, target.accept(getMemberVisitor("output." + locationName)));
+                } else {
+                    writer.write("$1L: (output.$2L !== undefined && output.$2L !== null)"
+                                    + " ? $3L: undefined,", memberName, locationName,
+                            // Dispatch to the output value provider for any additional handling.
+                            target.accept(getMemberVisitor("output." + locationName)));
+                }
             });
         });
     }
@@ -152,13 +159,23 @@ protected void deserializeUnion(GenerationContext context, UnionShape shape) {
             String locationName = memberShape.getTrait(JsonNameTrait.class)
                     .map(JsonNameTrait::getValue)
                     .orElse(memberName);
-            writer.openBlock("if (output.$L !== undefined && output.$L !== null) {", "}", locationName, locationName,
-                    () -> {
-                writer.openBlock("return {", "};", () -> {
-                    // Dispatch to the output value provider for any additional handling.
-                    writer.write("$L: $L", memberName, target.accept(getMemberVisitor("output." + locationName)));
+
+            String memberValue = target.accept(getMemberVisitor("output." + locationName));
+            if (target.isBooleanShape() || target instanceof NumberShape) {
+                // Booleans and numbers will call expectBoolean/expectNumber which will handle
+                // null/undefined properly.
+                writer.openBlock("if ((val = $L) !== undefined) {", "}", memberValue, () -> {
+                    writer.write("return { $L: val }", memberName);
                 });
-            });
+            } else {
+                writer.openBlock("if (output.$L !== undefined && output.$L !== null) {", "}", locationName,
+                    locationName, () -> {
+                        writer.openBlock("return {", "};", () -> {
+                            // Dispatch to the output value provider for any additional handling.
+                            writer.write("$L: $L", memberName, memberValue);
+                        });
+                    });
+            }
         });
         // Or write to the unknown member the element in the output.
         writer.write("return { $$unknown: Object.entries(output)[0] };");

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

@@ -51,6 +51,8 @@ describe("expectBoolean", () => {
   it("accepts booleans", () => {
     expect(expectBoolean(true)).toEqual(true);
     expect(expectBoolean(false)).toEqual(false);
+    expect(expectBoolean(null)).toEqual(undefined);
+    expect(expectBoolean(undefined)).toEqual(undefined);
   });
 
   it("rejects non-booleans", () => {
@@ -64,8 +66,6 @@ describe("expectBoolean", () => {
     expect(() => expectBoolean(NaN)).toThrowError();
     expect(() => expectBoolean({})).toThrowError();
     expect(() => expectBoolean([])).toThrowError();
-    expect(() => expectBoolean(null)).toThrowError();
-    expect(() => expectBoolean(undefined)).toThrowError();
   });
 });
 
@@ -76,6 +76,8 @@ describe("expectNumber", () => {
     expect(expectNumber(Infinity)).toEqual(Infinity);
     expect(expectNumber(-Infinity)).toEqual(-Infinity);
     expect(expectNumber(NaN)).toEqual(NaN);
+    expect(expectNumber(null)).toEqual(undefined);
+    expect(expectNumber(undefined)).toEqual(undefined);
   });
 
   it("rejects non-numbers", () => {
@@ -88,14 +90,14 @@ describe("expectNumber", () => {
     expect(() => expectNumber(false)).toThrowError();
     expect(() => expectNumber([])).toThrowError();
     expect(() => expectNumber({})).toThrowError();
-    expect(() => expectNumber(null)).toThrowError();
-    expect(() => expectNumber(undefined)).toThrowError();
   });
 });
 
 describe("expectString", () => {
   it("accepts strings", () => {
     expect(expectString("foo")).toEqual("foo");
+    expect(expectString(null)).toEqual(undefined);
+    expect(expectString(undefined)).toEqual(undefined);
   });
 
   it("rejects non-strings", () => {
@@ -107,7 +109,5 @@ describe("expectString", () => {
     expect(() => expectString(false)).toThrowError();
     expect(() => expectString([])).toThrowError();
     expect(() => expectString({})).toThrowError();
-    expect(() => expectString(null)).toThrowError();
-    expect(() => expectString(undefined)).toThrowError();
   });
 });

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

@@ -19,9 +19,13 @@ export const parseBoolean = (value: string): boolean => {
  * Asserts a value is a boolean and returns it.
  *
  * @param value A value that is expected to be a boolean.
- * @returns The value if it is a boolean, otherwise an error is thrown.
+ * @returns The value if it's a boolean, undefined if it's null/undefined,
+ *   otherwise an error is thrown.
  */
-export function expectBoolean(value: any): boolean {
+export function expectBoolean(value: any): boolean | undefined {
+  if (value === null || value === undefined) {
+    return undefined;
+  }
   if (typeof value === "boolean") {
     return value;
   }
@@ -32,9 +36,13 @@ export function expectBoolean(value: any): boolean {
  * Asserts a value is a number and returns it.
  *
  * @param value A value that is expected to be a number.
- * @returns The value if it is a number, otherwise an error is thrown.
+ * @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 {
+  if (value === null || value === undefined) {
+    return undefined;
+  }
   if (typeof value === "number") {
     return value;
   }
@@ -45,9 +53,13 @@ export function expectNumber(value: any): number {
  * Asserts a value is a string and returns it.
  *
  * @param value A value that is expected to be a string.
- * @returns The value if it is a string, otherwise an error is thrown.
+ * @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 {
+  if (value === null || value === undefined) {
+    return undefined;
+  }
   if (typeof value === "string") {
     return value;
   }