fix: use string join instead of templates (#1354)

smithy-lang · Jul 30, 2024 · 354d175 · 354d175
1 parent 052221a
commit 354d175
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/...ipt-codegen/src/main/java/software/amazon/smithy/typescript/codegen/CommandGenerator.java b/...ipt-codegen/src/main/java/software/amazon/smithy/typescript/codegen/CommandGenerator.java
@@ -493,11 +493,11 @@ private void addCommandSpecificPlugins() {
                         return;
                     }
                     writer.openBlock(", { ", " }", () -> {
-                        writer
-                            .pushState()
-                            .putContext("params", additionalParameters)
-                            .writeInline("${#params}${value:L}, ${/params}")
-                            .popState();
+                        // caution: using String.join instead of templating
+                        // because additionalParameters may contain Smithy syntax.
+                        if (!additionalParameters.isEmpty()) {
+                            writer.writeInline(String.join(", ", additionalParameters) + ", ");
+                        }
                         clientAddParamsWriterConsumers.forEach((key, consumer) -> {
                             writer.writeInline("$L: $C,", key, (Consumer<TypeScriptWriter>) (w -> {
                                 consumer.accept(w, CommandConstructorCodeSection.builder()

diff --git a/.../main/java/software/amazon/smithy/typescript/codegen/ServiceBareBonesClientGenerator.java b/.../main/java/software/amazon/smithy/typescript/codegen/ServiceBareBonesClientGenerator.java
@@ -460,11 +460,11 @@ private void generateConstructor() {
                         }
 
                         writer.openBlock(", {", " }", () -> {
-                            writer
-                                .pushState()
-                                .putContext("params", additionalParameters)
-                                .writeInline("${#params}${value:L}, ${/params}")
-                                .popState();
+                            // caution: using String.join instead of templating
+                            // because additionalParameters may contain Smithy syntax.
+                            if (!additionalParameters.isEmpty()) {
+                                writer.writeInline(String.join(", ", additionalParameters) + ", ");
+                            }
                             clientAddParamsWriterConsumers.forEach((key, consumer) -> {
                                 writer.writeInline("$L: $C,", key, (Consumer<TypeScriptWriter>) (w -> {
                                     consumer.accept(w, ClientBodyExtraCodeSection.builder()