From 62567ea4ef1639fc318b59d6498c8ccb48295f95 Mon Sep 17 00:00:00 2001
From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com>
Date: Tue, 23 Sep 2025 23:05:24 +0000
Subject: [PATCH] Replace 'uuid' with '@smithy/uuid'

---
 .../smithy/typescript/codegen/TypeScriptDependency.java  | 5 +++--
 .../integration/HttpBindingProtocolGenerator.java        | 9 +++------
 .../codegen/protocols/cbor/CborShapeSerVisitor.java      | 4 +---
 3 files changed, 7 insertions(+), 11 deletions(-)

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
index 36e2d5e8f97..b92c872119b 100644
--- 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,9 @@ 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),
+    @Deprecated UUID_TYPES("dependencies", "@types/uuid", "^9.0.1", false),
+    @Deprecated UUID("dependencies", "uuid", "^9.0.1", false),
+    SMITHY_UUID("dependencies", "@smithy/uuid", false),
 
     // 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
index 2a374d3849a..edf9506d025 100644
--- 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
@@ -878,8 +878,7 @@ private void writeRequestQueryParam(
         String idempotencyComponent = "";
         if (isIdempotencyToken && !isRequired) {
             writer
-                .addDependency(TypeScriptDependency.UUID_TYPES)
-                .addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
+                .addImport("v4", "generateIdempotencyToken", TypeScriptDependency.SMITHY_UUID);
             idempotencyComponent = " ?? generateIdempotencyToken()";
         }
         String memberAssertionComponent = (idempotencyComponent.isEmpty() ? "!" : "");
@@ -1020,8 +1019,7 @@ private void writeNormalHeader(GenerationContext context, HttpBinding binding) {
                 defaultValue = " || " + s.substring(s.indexOf(": ") + 2, s.length() - 1);
             } else if (isIdempotencyToken) {
                 context.getWriter()
-                    .addDependency(TypeScriptDependency.UUID_TYPES)
-                    .addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
+                    .addImport("v4", "generateIdempotencyToken", TypeScriptDependency.SMITHY_UUID);
                 defaultValue = " ?? generateIdempotencyToken()";
             }
 
@@ -1047,8 +1045,7 @@ private void writeNormalHeader(GenerationContext context, HttpBinding binding) {
                 constructedHeaderValue += " || " + s.substring(s.indexOf(": ") + 2, s.length() - 1);
             } else if (isIdempotencyToken) {
                 context.getWriter()
-                    .addDependency(TypeScriptDependency.UUID_TYPES)
-                    .addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
+                    .addImport("v4", "generateIdempotencyToken", TypeScriptDependency.SMITHY_UUID);
                 constructedHeaderValue += " ?? generateIdempotencyToken()";
             } else {
                 constructedHeaderValue = headerValue;
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
index 5cafafbe009..73e3889f466 100644
--- 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,9 +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 {
                     if (valueProvider.equals("_ => _")) {