Replace 'uuid' with '@smithy/uuid'

trivikr · trivikr · commit 1623bf2e89a5 · 2025-09-23T16:17:53.000Z
diff --git a/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/TypeScriptDependency.java b/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/TypeScriptDependency.java
@@ -79,8 +79,14 @@ public enum TypeScriptDependency implements Dependency {
 
     NODE_CONFIG_PROVIDER("dependencies", "@smithy/node-config-provider", false),
 
+    /**
+     * @deprecated use `@smithy/uuid`.
+     */
+    @Deprecated
     UUID_TYPES("dependencies", "@types/uuid", "^9.0.1", false),
+    @Deprecated
     UUID("dependencies", "uuid", "^9.0.1", false),
+    SMITHY_UUID("dependencies", "@smithy/uuid", true),
 
     // Conditionally added when httpChecksumRequired trait exists
     MD5_BROWSER("dependencies", "@smithy/md5-js", false),
diff --git a/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/HttpBindingProtocolGenerator.java b/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/HttpBindingProtocolGenerator.java
@@ -875,8 +875,7 @@ private void writeRequestQueryParam(
         boolean isIdempotencyToken = binding.getMember().hasTrait(IdempotencyTokenTrait.class);
         if (isIdempotencyToken) {
             writer
-                .addDependency(TypeScriptDependency.UUID_TYPES)
-                .addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
+                .addImport("v4", "generateIdempotencyToken", TypeScriptDependency.SMITHY_UUID);
         }
         boolean isRequired = binding.getMember().isRequired();
         String idempotencyComponent = (isIdempotencyToken && !isRequired) ? " ?? generateIdempotencyToken()" : "";
@@ -1007,8 +1006,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);
+                .addImport("v4", "generateIdempotencyToken", TypeScriptDependency.SMITHY_UUID);
         }
 
         boolean headerAssertion = headerValue.endsWith("!");
diff --git a/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/protocols/cbor/CborShapeSerVisitor.java b/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/protocols/cbor/CborShapeSerVisitor.java
@@ -128,8 +128,7 @@ protected void serializeStructure(ProtocolGenerator.GenerationContext context, S
 
                 if (memberShape.hasTrait(IdempotencyTokenTrait.class)) {
                     writer
-                        .addDependency(TypeScriptDependency.UUID_TYPES)
-                        .addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
+                        .addImport("v4", "generateIdempotencyToken", TypeScriptDependency.SMITHY_UUID);
 
                     writer.write("'$L': [true, _ => _ ?? generateIdempotencyToken()],", memberName);
                 } else {
