Skip to content

Add 'uuid' import only when necessary #1708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 23, 2025
Merged

Add 'uuid' import only when necessary #1708

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions ...a/software/amazon/smithy/typescript/codegen/integration/HttpBindingProtocolGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,13 +873,15 @@ private void writeRequestQueryParam(
Shape target = model.expectShape(binding.getMember().getTarget());

boolean isIdempotencyToken = binding.getMember().hasTrait(IdempotencyTokenTrait.class);
if (isIdempotencyToken) {
boolean isRequired = binding.getMember().isRequired();

String idempotencyComponent = "";
if (isIdempotencyToken && !isRequired) {
writer
.addDependency(TypeScriptDependency.UUID_TYPES)
.addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
idempotencyComponent = " ?? generateIdempotencyToken()";
}
boolean isRequired = binding.getMember().isRequired();
String idempotencyComponent = (isIdempotencyToken && !isRequired) ? " ?? generateIdempotencyToken()" : "";
String memberAssertionComponent = (idempotencyComponent.isEmpty() ? "!" : "");

String queryValue = getInputValue(
Expand Down Expand Up @@ -1004,24 +1006,22 @@ private void writeNormalHeader(GenerationContext context, HttpBinding binding) {
binding.getMember(),
target
);
boolean isIdempotencyToken = binding.getMember().hasTrait(IdempotencyTokenTrait.class);
if (isIdempotencyToken) {
context.getWriter()
.addDependency(TypeScriptDependency.UUID_TYPES)
.addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
}

boolean headerAssertion = headerValue.endsWith("!");
String headerBaseValue = (headerAssertion
? headerValue.substring(0, headerValue.length() - 1)
: headerValue);
boolean isIdempotencyToken = binding.getMember().hasTrait(IdempotencyTokenTrait.class);

if (!Objects.equals(memberLocation + "!", headerValue)) {
String defaultValue = "";
if (headerBuffer.containsKey(headerKey)) {
String s = headerBuffer.get(headerKey);
defaultValue = " || " + s.substring(s.indexOf(": ") + 2, s.length() - 1);
} else if (isIdempotencyToken) {
context.getWriter()
.addDependency(TypeScriptDependency.UUID_TYPES)
.addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
defaultValue = " ?? generateIdempotencyToken()";
}

Expand All @@ -1046,6 +1046,9 @@ private void writeNormalHeader(GenerationContext context, HttpBinding binding) {
String s = headerBuffer.get(headerKey);
constructedHeaderValue += " || " + s.substring(s.indexOf(": ") + 2, s.length() - 1);
} else if (isIdempotencyToken) {
context.getWriter()
.addDependency(TypeScriptDependency.UUID_TYPES)
.addImport("v4", "generateIdempotencyToken", TypeScriptDependency.UUID);
constructedHeaderValue += " ?? generateIdempotencyToken()";
} else {
constructedHeaderValue = headerValue;
Expand Down
Loading