feat(enums): generate enum Record keys when target is enum (#1037)

smithy-lang · Oct 13, 2023 · 85c3faf · 85c3faf
1 parent 6ae9527
commit 85c3faf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.changeset/rich-turtles-relate.md b/.changeset/rich-turtles-relate.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/...degen/src/main/java/software/amazon/smithy/typescript/codegen/StructuredMemberWriter.java b/...degen/src/main/java/software/amazon/smithy/typescript/codegen/StructuredMemberWriter.java
@@ -611,7 +611,10 @@ private void writeConstraintValidatorType(TypeScriptWriter writer, Shape shape)
             Shape collectionMemberTargetShape = model.expectShape(collectionMemberShape.getTarget());
             writer.writeInline("Iterable<$T>", getSymbolForValidatedType(collectionMemberTargetShape));
         } else if (shape.isMapShape()) {
-            writer.writeInline("Record<string, $T>", getSymbolForValidatedType(((MapShape) shape).getValue()));
+            writer.writeInline("Record<$T, $T>",
+                getSymbolForValidatedType(((MapShape) shape).getKey()),
+                getSymbolForValidatedType(((MapShape) shape).getValue())
+            );
         } else if (shape instanceof SimpleShape) {
             writer.writeInline("$T", getSymbolForValidatedType(shape));
         } else {

diff --git a/...script-codegen/src/main/java/software/amazon/smithy/typescript/codegen/SymbolVisitor.java b/...script-codegen/src/main/java/software/amazon/smithy/typescript/codegen/SymbolVisitor.java
@@ -193,9 +193,10 @@ public Symbol setShape(SetShape shape) {
      */
     @Override
     public Symbol mapShape(MapShape shape) {
-        Symbol reference = toSymbol(shape.getValue());
-        return createSymbolBuilder(shape, format("Record<string, %s>", reference.getName()), null)
-                .addReference(reference)
+        Symbol key = toSymbol(shape.getKey());
+        Symbol value = toSymbol(shape.getValue());
+        return createSymbolBuilder(shape, format("Record<%s, %s>", key.getName(), value.getName()), null)
+                .addReference(value)
                 .build();
     }