Improvements to class name mapping in DefType when using values with …

…a space.
typelevel · Feb 19, 2024 · f649f91 · f649f91
1 parent d3a439c
commit f649f91
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 34 deletions.
diff --git a/core/shared/src/main/scala/fabric/Json.scala b/core/shared/src/main/scala/fabric/Json.scala
@@ -544,20 +544,16 @@ case class Str(value: String, reference: Option[Any] = None) extends Json {
   override def isEmpty: Boolean = value.isEmpty
 
   override def asType[V <: Json](`type`: JsonType[V]): V = `type` match {
-    case JsonType.Bool => Try(Bool(value.toBoolean)).toOption
-        .map(_.asInstanceOf[V])
-        .getOrElse(
-          throw ConversionException(
-            s"$value is a Str and can't be converted to Bool"
-          )
+    case JsonType.Bool => Try(Bool(value.toBoolean)).toOption.getOrElse(
+        throw ConversionException(
+          s"$value is a Str and can't be converted to Bool"
         )
-    case JsonType.NumInt => Try(NumInt(value.toLong)).toOption
-        .map(_.asInstanceOf[V])
-        .getOrElse(
-          throw ConversionException(
-            s"$value is a Str and can't be converted to NumInt"
-          )
+      )
+    case JsonType.NumInt => Try(NumInt(value.toLong)).toOption.getOrElse(
+        throw ConversionException(
+          s"$value is a Str and can't be converted to NumInt"
         )
+      )
     case JsonType.NumDec | JsonType.Num => Try(NumDec(BigDecimal(value))).toOption
         .map(_.asInstanceOf[V])
         .getOrElse(

diff --git a/core/shared/src/main/scala/fabric/rw/RW.scala b/core/shared/src/main/scala/fabric/rw/RW.scala
@@ -46,7 +46,7 @@ object RW extends CompileRW {
 
   def enumeration[T](
     list: List[T],
-    asString: T => String = (t: T) => t.getClass.getSimpleName.replace("$", ""),
+    asString: T => String = (t: T) => defaultClassNameMapping(t.getClass.getName),
     caseSensitive: Boolean = false
   ): RW[T] = new RW[T] {
     private def fixString(s: String): String = if (caseSensitive) s else s.toLowerCase
@@ -131,7 +131,7 @@ object RW extends CompileRW {
     )
   }
 
-  def cleanClassName(className: String): String = className.replace("$", ".") match {
+  def cleanClassName(className: String): String = className.replace("$u0020", " ").replace("$", ".") match {
     case s if s.endsWith(".") => s.substring(0, s.length - 1)
     case s => s
   }

diff --git a/core/shared/src/test/scala/spec/RWSpecAuto.scala b/core/shared/src/test/scala/spec/RWSpecAuto.scala
@@ -131,13 +131,19 @@ class RWSpecAuto extends AnyWordSpec with Matchers {
         )
       )
     }
-    // TODO: Enable once Scala 3 support for sealed traits is working
-//    "supporting sealed traits" in {
-//      val car: VehicleType = VehicleType.Car
-//      car.json should be(Str("Car"))
-//      "SUV".json.as[VehicleType] should be(VehicleType.SUV)
-//    }
-
+    "supporting sealed traits" in {
+      val car: VehicleType = VehicleType.Car
+      car.json should be(Str("Car"))
+      "SUV".json.as[VehicleType] should be(VehicleType.SUV)
+      VehicleType.rw.definition.asInstanceOf[DefType.Enum].values should be(
+        List[Json](
+          "Car",
+          "SUV",
+          "Truck",
+          "Mini Van"
+        )
+      )
+    }
     "work properly with nulls and defaults" in {
       val json = obj(
         "offset" -> Null,

diff --git a/core/shared/src/test/scala/spec/VehicleType.scala b/core/shared/src/test/scala/spec/VehicleType.scala
@@ -19,16 +19,18 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-//package spec
-//
-//import fabric.rw.RW
-//
-//trait VehicleType
-//
-//object VehicleType {
-//  implicit val rw: RW[VehicleType] = RW.gen
-//
-//  case object Car extends VehicleType
-//  case object SUV extends VehicleType
-//  case object Truck extends VehicleType
-//}
+package spec
+
+import fabric.rw.RW
+
+trait VehicleType
+
+object VehicleType {
+  // TODO: Switch to RW.gen once Scala 3 has support for sealed traits
+  implicit val rw: RW[VehicleType] = RW.enumeration(List(Car, SUV, Truck, `Mini Van`))
+
+  case object Car extends VehicleType
+  case object SUV extends VehicleType
+  case object Truck extends VehicleType
+  case object `Mini Van` extends VehicleType
+}