Skip to content

Commit 72faecc

Browse files
authored
fix: add uuid types when adding uuid (#1428)
1 parent 205cefb commit 72faecc

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public enum TypeScriptDependency implements Dependency {
7979

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

82+
UUID_TYPES("dependencies", "@types/uuid", "^9.0.1", false),
8283
UUID("dependencies", "uuid", "^9.0.1", false),
8384

8485
// Conditionally added when httpChecksumRequired trait exists

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,9 @@ private void writeRequestQueryParam(
881881

882882
boolean isIdempotencyToken = binding.getMember().hasTrait(IdempotencyTokenTrait.class);
883883
if (isIdempotencyToken) {
884-
writer.addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
884+
writer
885+
.addDependency(TypeScriptDependency.UUID_TYPES)
886+
.addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
885887
}
886888
boolean isRequired = binding.getMember().isRequired();
887889
String idempotencyComponent = (isIdempotencyToken && !isRequired) ? " ?? generateIdempotencyToken()" : "";
@@ -1013,6 +1015,7 @@ private void writeNormalHeader(GenerationContext context, HttpBinding binding) {
10131015
boolean isIdempotencyToken = binding.getMember().hasTrait(IdempotencyTokenTrait.class);
10141016
if (isIdempotencyToken) {
10151017
context.getWriter()
1018+
.addDependency(TypeScriptDependency.UUID_TYPES)
10161019
.addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
10171020
}
10181021

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/protocols/cbor/CborShapeSerVisitor.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,9 @@ protected void serializeStructure(ProtocolGenerator.GenerationContext context, S
127127
boolean isUnaryCall = UnaryFunctionCall.check(valueExpression);
128128

129129
if (memberShape.hasTrait(IdempotencyTokenTrait.class)) {
130-
writer.addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
130+
writer
131+
.addDependency(TypeScriptDependency.UUID_TYPES)
132+
.addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
131133

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

0 commit comments

Comments
 (0)