fix: use partial record for enum keyed types

smithy-lang · Oct 19, 2023 · 60bdd84 · 60bdd84
1 parent 5e9fd6c
commit 60bdd84
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git a/.changeset/thirty-turtles-notice.md b/.changeset/thirty-turtles-notice.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
@@ -612,10 +612,19 @@ private void writeConstraintValidatorType(TypeScriptWriter writer, Shape shape)
             writer.writeInline("Iterable<$T>", getSymbolForValidatedType(collectionMemberTargetShape));
         } else if (shape.isMapShape()) {
             MapShape mapShape = shape.asMapShape().get();
-            writer.writeInline("Record<$T, $T>",
-                getSymbolForValidatedType(mapShape.getKey()),
-                getSymbolForValidatedType(mapShape.getValue())
-            );
+            String keyType = getSymbolForValidatedType(mapShape.getKey()).toString();
+
+            if (keyType.equals("string")) {
+                writer.writeInline("Record<$T, $T>",
+                    getSymbolForValidatedType(mapShape.getKey()),
+                    getSymbolForValidatedType(mapShape.getValue())
+                );
+            } else {
+                writer.writeInline("Partial<Record<$T, $T>>",
+                    getSymbolForValidatedType(mapShape.getKey()),
+                    getSymbolForValidatedType(mapShape.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
@@ -195,10 +195,17 @@ public Symbol setShape(SetShape shape) {
     public Symbol mapShape(MapShape shape) {
         Symbol key = toSymbol(shape.getKey());
         Symbol value = toSymbol(shape.getValue());
-        return createSymbolBuilder(shape, format("Record<%s, %s>", key.getName(), value.getName()), null)
-                .addReference(key)
-                .addReference(value)
-                .build();
+
+        boolean stringKey = key.toString().equals("string");
+
+        return createSymbolBuilder(
+            shape,
+            format(stringKey ? "Record<%s, %s>" : "Partial<Record<%s, %s>>", key.getName(), value.getName()),
+        null
+        )
+            .addReference(key)
+            .addReference(value)
+            .build();
     }
 
     @Override