Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(codegen): fix set deserialization in SSDKs #3322

Merged
merged 1 commit into from Feb 19, 2022
Merged

fix(codegen): fix set deserialization in SSDKs #3322

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 14 additions & 18 deletions ...en/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonShapeDeserVisitor.java
View file
Open in desktop
Expand Up @@ -33,6 +33,7 @@
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.TypeScriptDependency;
import software.amazon.smithy.typescript.codegen.TypeScriptSettings.ArtifactType;
import software.amazon.smithy.typescript.codegen.TypeScriptWriter;
import software.amazon.smithy.typescript.codegen.integration.DocumentMemberDeserVisitor;
Expand Down Expand Up @@ -83,11 +84,7 @@ protected void deserializeCollection(GenerationContext context, CollectionShape
potentialFilter = ".filter((e: any) => e != null)";
}

if (shape.isSetShape()) {
writer.write("const uniqueValues = new Set<any>();");
}

writer.openBlock("return (output || [])$L.map((entry: any) => {", "});", potentialFilter, () -> {
writer.openBlock("const retVal = (output || [])$L.map((entry: any) => {", "});", potentialFilter, () -> {
// Short circuit null values from serialization.
writer.openBlock("if (entry === null) {", "}", () -> {
// In the SSDK we want to be very strict about not accepting nulls in non-sparse lists.
Expand All @@ -99,20 +96,19 @@ protected void deserializeCollection(GenerationContext context, CollectionShape
}
});

if (shape.isSetShape()) {
writer.write("const parsedEntry = $L$L;",
target.accept(getMemberVisitor(shape.getMember(), "entry")),
usesExpect(target) ? " as any" : "");
writer.write("if (uniqueValues.has(parsedEntry)) { throw new "
+ "TypeError('All elements of the set $S must be unique.'); } else { "
+ "uniqueValues.add(parsedEntry)\nreturn parsedEntry; }",
shape.getId());
} else {
// Dispatch to the output value provider for any additional handling.
writer.write("return $L$L;", target.accept(getMemberVisitor(shape.getMember(), "entry")),
usesExpect(target) ? " as any" : "");
}
// Dispatch to the output value provider for any additional handling.
writer.write("return $L$L;", target.accept(getMemberVisitor(shape.getMember(), "entry")),
usesExpect(target) ? " as any" : "");
});
if (shape.isSetShape() && artifactType.equals(ArtifactType.SSDK)) {
writer.addDependency(TypeScriptDependency.SERVER_COMMON);
writer.addImport("findDuplicates", "__findDuplicates", "@aws-smithy/server-common");
writer.openBlock("if (__findDuplicates(retVal).length > 0) {", "}", () -> {
writer.write("throw new TypeError('All elements of the set $S must be unique.');",
shape.getId());
});
}
writer.write("return retVal;");
}

@Override
Expand Down