chore(private): add 'uuid' import only when necessary (#7369)

trivikr · web-flow · commit ef48329aba9a · 2025-09-23T16:23:21.000-07:00
diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsEc2.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsEc2.java
@@ -104,7 +104,6 @@ public void generateSharedComponents(GenerationContext context) {
         AwsProtocolUtils.generateXmlParseBody(context);
         AwsProtocolUtils.generateXmlParseErrorBody(context);
         AwsProtocolUtils.generateBuildFormUrlencodedString(context);
-        AwsProtocolUtils.addItempotencyAutofillImport(context);
 
         TypeScriptWriter writer = context.getWriter();
 
diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsProtocolUtils.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsProtocolUtils.java
@@ -238,29 +238,6 @@ static boolean writeXmlNamespace(GenerationContext context, Shape shape, String
         return true;
     }
 
-    /**
-     * Imports a UUID v4 generating function used for auto-filling idempotency tokens.
-     *
-     * @param context The generation context.
-     */
-    static void addItempotencyAutofillImport(GenerationContext context) {
-        // servers do not autogenerate idempotency tokens during deserialization
-        if (!context.getSettings().generateClient()) {
-            return;
-        }
-        context.getModel().shapes(MemberShape.class)
-                .filter(memberShape -> memberShape.hasTrait(IdempotencyTokenTrait.class))
-                .findFirst()
-                .ifPresent(memberShape -> {
-                    TypeScriptWriter writer = context.getWriter();
-
-                    // Include the uuid package and import the v4 function as our more clearly named alias.
-                    writer.addDependency(TypeScriptDependency.UUID);
-                    writer.addDependency(TypeScriptDependency.UUID_TYPES);
-                    writer.addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
-                });
-    }
-
     /**
      * Writes a statement that auto-fills the value of a member that is an idempotency
      * token if it is undefined at the time of serialization.
@@ -273,6 +250,10 @@ static void writeIdempotencyAutofill(GenerationContext context, MemberShape memb
         if (memberShape.hasTrait(IdempotencyTokenTrait.class)) {
             TypeScriptWriter writer = context.getWriter();
 
+            writer.addDependency(TypeScriptDependency.UUID);
+            writer.addDependency(TypeScriptDependency.UUID_TYPES);
+            writer.addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
+
             writer.openBlock("if ($L === undefined) {", "}", inputLocation, () ->
                     writer.write("$L = generateIdempotencyToken();", inputLocation));
         }
diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsQuery.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsQuery.java
@@ -109,7 +109,6 @@ public void generateSharedComponents(GenerationContext context) {
         AwsProtocolUtils.generateXmlParseBody(context);
         AwsProtocolUtils.generateXmlParseErrorBody(context);
         AwsProtocolUtils.generateBuildFormUrlencodedString(context);
-        AwsProtocolUtils.addItempotencyAutofillImport(context);
 
         TypeScriptWriter writer = context.getWriter();
 
diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsRestXml.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsRestXml.java
@@ -104,7 +104,6 @@ public void generateSharedComponents(GenerationContext context) {
         super.generateSharedComponents(context);
         AwsProtocolUtils.generateXmlParseBody(context);
         AwsProtocolUtils.generateXmlParseErrorBody(context);
-        AwsProtocolUtils.addItempotencyAutofillImport(context);
 
         TypeScriptWriter writer = context.getWriter();
         writer.addDependency(AwsDependency.XML_BUILDER);
diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonRpcProtocolGenerator.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonRpcProtocolGenerator.java
@@ -64,7 +64,6 @@ public void generateSharedComponents(GenerationContext context) {
         super.generateSharedComponents(context);
         AwsProtocolUtils.generateJsonParseBody(context);
         AwsProtocolUtils.generateJsonParseErrorBody(context);
-        AwsProtocolUtils.addItempotencyAutofillImport(context);
 
         TypeScriptWriter writer = context.getWriter();
         writer.addUseImports(getApplicationProtocol().getResponseType());
diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonShapeSerVisitor.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonShapeSerVisitor.java
@@ -170,6 +170,9 @@ public void serializeStructure(GenerationContext context, StructureShape shape)
 
                 if (hasJsonName) {
                     if (memberShape.hasTrait(IdempotencyTokenTrait.class)) {
+                        writer.addDependency(TypeScriptDependency.UUID);
+                        writer.addDependency(TypeScriptDependency.UUID_TYPES);
+                        writer.addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
                         writer.write("'$L': [true, _ => _ ?? generateIdempotencyToken(), `$L`],", wireName, memberName);
                     } else {
                         if (valueProvider.equals("_ => _")) {
@@ -183,6 +186,9 @@ public void serializeStructure(GenerationContext context, StructureShape shape)
                     }
                 } else {
                     if (memberShape.hasTrait(IdempotencyTokenTrait.class)) {
+                        writer.addDependency(TypeScriptDependency.UUID);
+                        writer.addDependency(TypeScriptDependency.UUID_TYPES);
+                        writer.addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
                         writer.write("'$L': [true, _ => _ ?? generateIdempotencyToken()],", memberName);
                     } else {
                         if (valueProvider.equals("_ => _")) {
diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/RestJsonProtocolGenerator.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/RestJsonProtocolGenerator.java
@@ -83,7 +83,6 @@ public void generateSharedComponents(GenerationContext context) {
         super.generateSharedComponents(context);
         AwsProtocolUtils.generateJsonParseBody(context);
         AwsProtocolUtils.generateJsonParseErrorBody(context);
-        AwsProtocolUtils.addItempotencyAutofillImport(context);
 
         TypeScriptWriter writer = context.getWriter();
         writer.addUseImports(getApplicationProtocol().getResponseType());
@@ -351,6 +350,9 @@ private void serializeDocumentBody(GenerationContext context, List<HttpBinding>
 
                 if (hasJsonName) {
                     if (memberShape.hasTrait(IdempotencyTokenTrait.class)) {
+                        writer.addDependency(TypeScriptDependency.UUID);
+                        writer.addDependency(TypeScriptDependency.UUID_TYPES);
+                        writer.addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
                         writer.write("'$L': [true,_ => _ ?? generateIdempotencyToken(),`$L`],",
                             wireName, memberName);
                     } else {
@@ -362,6 +364,9 @@ private void serializeDocumentBody(GenerationContext context, List<HttpBinding>
                     }
                 } else {
                     if (memberShape.hasTrait(IdempotencyTokenTrait.class)) {
+                        writer.addDependency(TypeScriptDependency.UUID);
+                        writer.addDependency(TypeScriptDependency.UUID_TYPES);
+                        writer.addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
                         writer.write("'$L': [true, _ => _ ?? generateIdempotencyToken()],", wireName);
                     } else {
                         if (valueProvider.equals("_ => _")) {
diff --git a/private/aws-echo-service/package.json b/private/aws-echo-service/package.json
@@ -51,9 +51,7 @@
     "@smithy/util-middleware": "^4.1.1",
     "@smithy/util-retry": "^4.1.2",
     "@smithy/util-utf8": "^4.1.0",
-    "@types/uuid": "^9.0.1",
-    "tslib": "^2.6.2",
-    "uuid": "^9.0.1"
+    "tslib": "^2.6.2"
   },
   "devDependencies": {
     "@tsconfig/node18": "18.2.4",
diff --git a/private/aws-echo-service/src/protocols/Aws_restJson1.ts b/private/aws-echo-service/src/protocols/Aws_restJson1.ts
@@ -24,7 +24,6 @@ import {
   ResponseMetadata as __ResponseMetadata,
   SerdeContext as __SerdeContext,
 } from "@smithy/types";
-import { v4 as generateIdempotencyToken } from "uuid";
 
 /**
  * serializeAws_restJson1EchoCommand
diff --git a/private/aws-protocoltests-json-10/package.json b/private/aws-protocoltests-json-10/package.json
@@ -57,9 +57,7 @@
     "@smithy/util-middleware": "^4.1.1",
     "@smithy/util-retry": "^4.1.2",
     "@smithy/util-utf8": "^4.1.0",
-    "@types/uuid": "^9.0.1",
-    "tslib": "^2.6.2",
-    "uuid": "^9.0.1"
+    "tslib": "^2.6.2"
   },
   "devDependencies": {
     "@tsconfig/node18": "18.2.4",
diff --git a/private/aws-protocoltests-json-10/src/protocols/Aws_json1_0.ts b/private/aws-protocoltests-json-10/src/protocols/Aws_json1_0.ts
@@ -36,7 +36,6 @@ import {
   ResponseMetadata as __ResponseMetadata,
   SerdeContext as __SerdeContext,
 } from "@smithy/types";
-import { v4 as generateIdempotencyToken } from "uuid";
 
 import {
   ContentTypeParametersCommandInput,
diff --git a/private/aws-protocoltests-json-machinelearning/package.json b/private/aws-protocoltests-json-machinelearning/package.json
@@ -57,9 +57,7 @@
     "@smithy/util-middleware": "^4.1.1",
     "@smithy/util-retry": "^4.1.2",
     "@smithy/util-utf8": "^4.1.0",
-    "@types/uuid": "^9.0.1",
-    "tslib": "^2.6.2",
-    "uuid": "^9.0.1"
+    "tslib": "^2.6.2"
   },
   "devDependencies": {
     "@tsconfig/node18": "18.2.4",
diff --git a/private/aws-protocoltests-json-machinelearning/src/protocols/Aws_json1_1.ts b/private/aws-protocoltests-json-machinelearning/src/protocols/Aws_json1_1.ts
@@ -16,7 +16,6 @@ import {
   ResponseMetadata as __ResponseMetadata,
   SerdeContext as __SerdeContext,
 } from "@smithy/types";
-import { v4 as generateIdempotencyToken } from "uuid";
 
 import { PredictCommandInput, PredictCommandOutput } from "../commands/PredictCommand";
 import { MachineLearningServiceException as __BaseException } from "../models/MachineLearningServiceException";
diff --git a/private/aws-protocoltests-json/package.json b/private/aws-protocoltests-json/package.json
@@ -57,9 +57,7 @@
     "@smithy/util-middleware": "^4.1.1",
     "@smithy/util-retry": "^4.1.2",
     "@smithy/util-utf8": "^4.1.0",
-    "@types/uuid": "^9.0.1",
-    "tslib": "^2.6.2",
-    "uuid": "^9.0.1"
+    "tslib": "^2.6.2"
   },
   "devDependencies": {
     "@tsconfig/node18": "18.2.4",
diff --git a/private/aws-protocoltests-json/src/protocols/Aws_json1_1.ts b/private/aws-protocoltests-json/src/protocols/Aws_json1_1.ts
@@ -39,7 +39,6 @@ import {
   ResponseMetadata as __ResponseMetadata,
   SerdeContext as __SerdeContext,
 } from "@smithy/types";
-import { v4 as generateIdempotencyToken } from "uuid";
 
 import {
   ContentTypeParametersCommandInput,
diff --git a/private/aws-protocoltests-restjson-apigateway/package.json b/private/aws-protocoltests-restjson-apigateway/package.json
@@ -57,9 +57,7 @@
     "@smithy/util-middleware": "^4.1.1",
     "@smithy/util-retry": "^4.1.2",
     "@smithy/util-utf8": "^4.1.0",
-    "@types/uuid": "^9.0.1",
-    "tslib": "^2.6.2",
-    "uuid": "^9.0.1"
+    "tslib": "^2.6.2"
   },
   "devDependencies": {
     "@tsconfig/node18": "18.2.4",
diff --git a/private/aws-protocoltests-restjson-apigateway/src/protocols/Aws_restJson1.ts b/private/aws-protocoltests-restjson-apigateway/src/protocols/Aws_restJson1.ts
@@ -23,7 +23,6 @@ import {
   ResponseMetadata as __ResponseMetadata,
   SerdeContext as __SerdeContext,
 } from "@smithy/types";
-import { v4 as generateIdempotencyToken } from "uuid";
 
 import { GetRestApisCommandInput, GetRestApisCommandOutput } from "../commands/GetRestApisCommand";
 import { APIGatewayServiceException as __BaseException } from "../models/APIGatewayServiceException";
diff --git a/private/aws-protocoltests-restjson-glacier/package.json b/private/aws-protocoltests-restjson-glacier/package.json
@@ -59,9 +59,7 @@
     "@smithy/util-middleware": "^4.1.1",
     "@smithy/util-retry": "^4.1.2",
     "@smithy/util-utf8": "^4.1.0",
-    "@types/uuid": "^9.0.1",
-    "tslib": "^2.6.2",
-    "uuid": "^9.0.1"
+    "tslib": "^2.6.2"
   },
   "devDependencies": {
     "@tsconfig/node18": "18.2.4",
diff --git a/private/aws-protocoltests-restjson-glacier/src/protocols/Aws_restJson1.ts b/private/aws-protocoltests-restjson-glacier/src/protocols/Aws_restJson1.ts
@@ -18,7 +18,6 @@ import {
   ResponseMetadata as __ResponseMetadata,
   SerdeContext as __SerdeContext,
 } from "@smithy/types";
-import { v4 as generateIdempotencyToken } from "uuid";
 
 import { UploadArchiveCommandInput, UploadArchiveCommandOutput } from "../commands/UploadArchiveCommand";
 import {
diff --git a/private/weather-legacy-auth/package.json b/private/weather-legacy-auth/package.json
@@ -55,9 +55,7 @@
     "@smithy/util-middleware": "^4.1.1",
     "@smithy/util-retry": "^4.1.2",
     "@smithy/util-utf8": "^4.1.0",
-    "@types/uuid": "^9.0.1",
-    "tslib": "^2.6.2",
-    "uuid": "^9.0.1"
+    "tslib": "^2.6.2"
   },
   "devDependencies": {
     "@tsconfig/node18": "18.2.4",
diff --git a/private/weather-legacy-auth/src/protocols/Aws_restJson1.ts b/private/weather-legacy-auth/src/protocols/Aws_restJson1.ts
@@ -47,7 +47,6 @@ import {
   ResponseMetadata as __ResponseMetadata,
   SerdeContext as __SerdeContext,
 } from "@smithy/types";
-import { v4 as generateIdempotencyToken } from "uuid";
 
 /**
  * serializeAws_restJson1OnlyCustomAuthCommand
diff --git a/private/weather/package.json b/private/weather/package.json
@@ -55,9 +55,7 @@
     "@smithy/util-middleware": "^4.1.1",
     "@smithy/util-retry": "^4.1.2",
     "@smithy/util-utf8": "^4.1.0",
-    "@types/uuid": "^9.0.1",
-    "tslib": "^2.6.2",
-    "uuid": "^9.0.1"
+    "tslib": "^2.6.2"
   },
   "devDependencies": {
     "@tsconfig/node18": "18.2.4",
diff --git a/private/weather/src/protocols/Aws_restJson1.ts b/private/weather/src/protocols/Aws_restJson1.ts
@@ -47,7 +47,6 @@ import {
   ResponseMetadata as __ResponseMetadata,
   SerdeContext as __SerdeContext,
 } from "@smithy/types";
-import { v4 as generateIdempotencyToken } from "uuid";
 
 /**
  * serializeAws_restJson1OnlyCustomAuthCommand
diff --git a/scripts/generate-clients/config.js b/scripts/generate-clients/config.js
@@ -1,7 +1,7 @@
 // Update this commit when taking up new changes from smithy-typescript.
 module.exports = {
   // Use full commit hash as we explicitly fetch it.
-  SMITHY_TS_COMMIT: "db1947fae12619ba48a32c1ae4398d3a0a6d845d",
+  SMITHY_TS_COMMIT: "568d71789cca2c66ab7c84686a9071c32f8c395c",
 };
 
 if (module.exports.SMITHY_TS_COMMIT.length < 40) {
diff --git a/yarn.lock b/yarn.lock
@@ -200,13 +200,11 @@ __metadata:
     "@smithy/util-utf8": "npm:^4.1.0"
     "@tsconfig/node18": "npm:18.2.4"
     "@types/node": "npm:^18.19.69"
-    "@types/uuid": "npm:^9.0.1"
     concurrently: "npm:7.0.0"
     downlevel-dts: "npm:0.10.1"
     rimraf: "npm:3.0.2"
     tslib: "npm:^2.6.2"
     typescript: "npm:~5.8.3"
-    uuid: "npm:^9.0.1"
   languageName: unknown
   linkType: soft
 
@@ -444,13 +442,11 @@ __metadata:
     "@smithy/util-utf8": "npm:^4.1.0"
     "@tsconfig/node18": "npm:18.2.4"
     "@types/node": "npm:^18.19.69"
-    "@types/uuid": "npm:^9.0.1"
     concurrently: "npm:7.0.0"
     downlevel-dts: "npm:0.10.1"
     rimraf: "npm:3.0.2"
     tslib: "npm:^2.6.2"
     typescript: "npm:~5.8.3"
-    uuid: "npm:^9.0.1"
     vitest: "npm:^3.2.4"
   languageName: unknown
   linkType: soft
@@ -500,13 +496,11 @@ __metadata:
     "@smithy/util-utf8": "npm:^4.1.0"
     "@tsconfig/node18": "npm:18.2.4"
     "@types/node": "npm:^18.19.69"
-    "@types/uuid": "npm:^9.0.1"
     concurrently: "npm:7.0.0"
     downlevel-dts: "npm:0.10.1"
     rimraf: "npm:3.0.2"
     tslib: "npm:^2.6.2"
     typescript: "npm:~5.8.3"
-    uuid: "npm:^9.0.1"
     vitest: "npm:^3.2.4"
   languageName: unknown
   linkType: soft
@@ -664,13 +658,11 @@ __metadata:
     "@smithy/util-utf8": "npm:^4.1.0"
     "@tsconfig/node18": "npm:18.2.4"
     "@types/node": "npm:^18.19.69"
-    "@types/uuid": "npm:^9.0.1"
     concurrently: "npm:7.0.0"
     downlevel-dts: "npm:0.10.1"
     rimraf: "npm:3.0.2"
     tslib: "npm:^2.6.2"
     typescript: "npm:~5.8.3"
-    uuid: "npm:^9.0.1"
     vitest: "npm:^3.2.4"
   languageName: unknown
   linkType: soft
@@ -830,13 +822,11 @@ __metadata:
     "@smithy/util-utf8": "npm:^4.1.0"
     "@tsconfig/node18": "npm:18.2.4"
     "@types/node": "npm:^18.19.69"
-    "@types/uuid": "npm:^9.0.1"
     concurrently: "npm:7.0.0"
     downlevel-dts: "npm:0.10.1"
     rimraf: "npm:3.0.2"
     tslib: "npm:^2.6.2"
     typescript: "npm:~5.8.3"
-    uuid: "npm:^9.0.1"
     vitest: "npm:^3.2.4"
   languageName: unknown
   linkType: soft
@@ -888,13 +878,11 @@ __metadata:
     "@smithy/util-utf8": "npm:^4.1.0"
     "@tsconfig/node18": "npm:18.2.4"
     "@types/node": "npm:^18.19.69"
-    "@types/uuid": "npm:^9.0.1"
     concurrently: "npm:7.0.0"
     downlevel-dts: "npm:0.10.1"
     rimraf: "npm:3.0.2"
     tslib: "npm:^2.6.2"
     typescript: "npm:~5.8.3"
-    uuid: "npm:^9.0.1"
     vitest: "npm:^3.2.4"
   languageName: unknown
   linkType: soft
@@ -24918,13 +24906,11 @@ __metadata:
     "@smithy/util-utf8": "npm:^4.1.0"
     "@tsconfig/node18": "npm:18.2.4"
     "@types/node": "npm:^18.19.69"
-    "@types/uuid": "npm:^9.0.1"
     concurrently: "npm:7.0.0"
     downlevel-dts: "npm:0.10.1"
     rimraf: "npm:3.0.2"
     tslib: "npm:^2.6.2"
     typescript: "npm:~5.8.3"
-    uuid: "npm:^9.0.1"
   languageName: unknown
   linkType: soft
 
@@ -24972,13 +24958,11 @@ __metadata:
     "@smithy/util-utf8": "npm:^4.1.0"
     "@tsconfig/node18": "npm:18.2.4"
     "@types/node": "npm:^18.19.69"
-    "@types/uuid": "npm:^9.0.1"
     concurrently: "npm:7.0.0"
     downlevel-dts: "npm:0.10.1"
     rimraf: "npm:3.0.2"
     tslib: "npm:^2.6.2"
     typescript: "npm:~5.8.3"
-    uuid: "npm:^9.0.1"
   languageName: unknown
   linkType: soft
 
