Support 1.0 open enums

disneystreaming · Oct 5, 2023 · 1895e2c · 1895e2c
1 parent 7a558e8
commit 1895e2c
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 10 deletions.
diff --git a/modules/dynamic/src/smithy4s/dynamic/internals/DynamicModelCompiler.scala b/modules/dynamic/src/smithy4s/dynamic/internals/DynamicModelCompiler.scala
@@ -243,11 +243,19 @@ private[dynamic] object Compiler {
             )
           }
 
-      if (shape.traits.contains(IdRef("alloy#openEnum"))) {
+      update(id, shape.traits, makeStringEnum(id, values, shape.traits))
+    }
+
+    private def makeStringEnum(
+        id: ShapeId,
+        values: List[EnumValue[Int]],
+        traits: Map[IdRef, Document]
+    ) = {
+      if (traits.contains(IdRef("alloy#openEnum"))) {
         // the runtime representation of normal enums is Int, but for open enums it's String to support arbitrary unknown values.
         val mappedValues = values.map(_.map(_.asLeft[String]))
 
-        val theEnum = enumeration[Either[Int, String]](
+        enumeration[Either[Int, String]](
           _.fold(
             mappedValues,
             unknownValueString =>
@@ -262,13 +270,8 @@ private[dynamic] object Compiler {
           EnumTag.OpenStringEnum(_.asRight[Int]),
           mappedValues
         )
-
-        update(id, shape.traits, theEnum)
-      } else {
-        val theEnum = stringEnumeration(values, values)
-
-        update(id, shape.traits, theEnum)
-      }
+      } else
+        stringEnumeration(values, values)
 
     }
 
@@ -356,7 +359,7 @@ private[dynamic] object Compiler {
           update(
             id,
             shape.traits,
-            stringEnumeration(values, values)
+            makeStringEnum(id, values, shape.traits)
           )
         }
         case _ => update(id, shape.traits, string)

diff --git a/modules/dynamic/test/src-jvm/smithy4s/dynamic/EnumSpec.scala b/modules/dynamic/test/src-jvm/smithy4s/dynamic/EnumSpec.scala
@@ -72,6 +72,13 @@ class EnumSpec extends DummyIO.Suite {
       ICE = 42,
       FIRE = 10
     }
+
+    @enum([
+      { value: "Vanilla" },
+      { value: "Ice" }
+    ])
+    @alloy#openEnum
+    string Open10Enum
   """
 
   val compiled = Utils.compile(model)
@@ -262,6 +269,16 @@ class EnumSpec extends DummyIO.Suite {
     }
   }
 
+  test("Smithy 1.0 open string enums can be decoded to UNKNOWN") {
+    compiled.map { index =>
+      val schema = index
+        .getSchema(ShapeId("example", "Open10Enum"))
+        .getOrElse(fail("Error: shape missing"))
+
+      decodeEncodeCheck(schema)(Document.fromString("not a known value"))
+    }
+  }
+
   private def decodeEncodeCheck[A](schema: Schema[A])(input: Document) = {
     val decoded = Document.Decoder
       .fromSchema(schema)