fix: add uuid types when adding uuid

smithy-lang · Oct 8, 2024 · 86e6785 · 86e6785
1 parent 205cefb
commit 86e6785
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/...codegen/src/main/java/software/amazon/smithy/typescript/codegen/TypeScriptDependency.java b/...codegen/src/main/java/software/amazon/smithy/typescript/codegen/TypeScriptDependency.java
@@ -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

diff --git a/...a/software/amazon/smithy/typescript/codegen/integration/HttpBindingProtocolGenerator.java b/...a/software/amazon/smithy/typescript/codegen/integration/HttpBindingProtocolGenerator.java
@@ -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()" : "";
@@ -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);
         }
 

diff --git a/...in/java/software/amazon/smithy/typescript/codegen/protocols/cbor/CborShapeSerVisitor.java b/...in/java/software/amazon/smithy/typescript/codegen/protocols/cbor/CborShapeSerVisitor.java
@@ -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 {