Skip to content

fix: add uuid types when adding uuid #1428

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

Merged
merged 1 commit into from
Oct 8, 2024
Merged

fix: add uuid types when adding uuid #1428

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...codegen/src/main/java/software/amazon/smithy/typescript/codegen/TypeScriptDependency.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public enum TypeScriptDependency implements Dependency {

NODE_CONFIG_PROVIDER("dependencies", "@smithy/node-config-provider", false),

UUID_TYPES("dependencies", "@types/uuid", "^9.0.1", false),
UUID("dependencies", "uuid", "^9.0.1", false),

// Conditionally added when httpChecksumRequired trait exists
Expand Down
5 changes: 4 additions & 1 deletion ...a/software/amazon/smithy/typescript/codegen/integration/HttpBindingProtocolGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,9 @@ private void writeRequestQueryParam(

boolean isIdempotencyToken = binding.getMember().hasTrait(IdempotencyTokenTrait.class);
if (isIdempotencyToken) {
writer.addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
writer
.addDependency(TypeScriptDependency.UUID_TYPES)
.addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
}
boolean isRequired = binding.getMember().isRequired();
String idempotencyComponent = (isIdempotencyToken && !isRequired) ? " ?? generateIdempotencyToken()" : "";
Expand Down Expand Up @@ -1013,6 +1015,7 @@ private void writeNormalHeader(GenerationContext context, HttpBinding binding) {
boolean isIdempotencyToken = binding.getMember().hasTrait(IdempotencyTokenTrait.class);
if (isIdempotencyToken) {
context.getWriter()
.addDependency(TypeScriptDependency.UUID_TYPES)
.addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
}

Expand Down
4 changes: 3 additions & 1 deletion ...in/java/software/amazon/smithy/typescript/codegen/protocols/cbor/CborShapeSerVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,9 @@ protected void serializeStructure(ProtocolGenerator.GenerationContext context, S
boolean isUnaryCall = UnaryFunctionCall.check(valueExpression);

if (memberShape.hasTrait(IdempotencyTokenTrait.class)) {
writer.addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
writer
.addDependency(TypeScriptDependency.UUID_TYPES)
.addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);

writer.write("'$L': [true, _ => _ ?? generateIdempotencyToken()],", memberName);
} else {
Expand Down
Loading