use templating, use instance name for plugin

smithy-lang · Jul 30, 2024 · 57294b9 · 57294b9
1 parent b392816
commit 57294b9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 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,7 +493,11 @@ private void addCommandSpecificPlugins() {
                         return;
                     }
                     writer.openBlock(", { ", " }", () -> {
-                        writer.writeInline(String.join(", ", additionalParameters));
+                        writer
+                            .pushState()
+                            .putContext("params", additionalParameters)
+                            .writeInline("${#params}${value:L}, ${/params}")
+                            .popState();
                         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,7 +460,11 @@ private void generateConstructor() {
                         }
 
                         writer.openBlock(", {", " }", () -> {
-                            writer.writeInline(String.join(", ", additionalParameters));
+                            writer
+                                .pushState()
+                                .putContext("params", additionalParameters)
+                                .writeInline("${#params}${value:L}, ${/params}")
+                                .popState();
                             clientAddParamsWriterConsumers.forEach((key, consumer) -> {
                                 writer.writeInline("$L: $C,", key, (Consumer<TypeScriptWriter>) (w -> {
                                     consumer.accept(w, ClientBodyExtraCodeSection.builder()

diff --git a/.../java/software/amazon/smithy/typescript/codegen/integration/AddEventStreamDependency.java b/.../java/software/amazon/smithy/typescript/codegen/integration/AddEventStreamDependency.java
@@ -47,7 +47,7 @@ public final class AddEventStreamDependency implements TypeScriptIntegration {
     @Override
     public List<String> runAfter() {
         return List.of(
-            AddBuiltinPlugins.class.getCanonicalName()
+            new AddBuiltinPlugins().name()
         );
     }