fix(num): preserve num-types in ast (zio#747)

guizmaii · Oct 13, 2022 · 73523a5 · 73523a5
1 parent 07982a7
commit 73523a5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/zio-json/shared/src/main/scala/zio/json/JsonEncoder.scala b/zio-json/shared/src/main/scala/zio/json/JsonEncoder.scala
@@ -193,18 +193,18 @@ object JsonEncoder extends GeneratedTupleEncoders with EncoderLowPriority1 {
 
   implicit val boolean: JsonEncoder[Boolean] = explicit(_.toString, Json.Bool.apply)
   implicit val symbol: JsonEncoder[Symbol]   = string.contramap(_.name)
-  implicit val byte: JsonEncoder[Byte]       = explicit(_.toString, n => Json.Num(new java.math.BigDecimal(n.toInt)))
-  implicit val short: JsonEncoder[Short]     = explicit(_.toString, n => Json.Num(new java.math.BigDecimal(n.toInt)))
-  implicit val int: JsonEncoder[Int]         = explicit(_.toString, n => Json.Num(new java.math.BigDecimal(n)))
-  implicit val long: JsonEncoder[Long]       = explicit(_.toString, n => Json.Num(new java.math.BigDecimal(n)))
+  implicit val byte: JsonEncoder[Byte]       = explicit(_.toString, n => Json.Num(n))
+  implicit val short: JsonEncoder[Short]     = explicit(_.toString, n => Json.Num(n))
+  implicit val int: JsonEncoder[Int]         = explicit(_.toString, n => Json.Num(n))
+  implicit val long: JsonEncoder[Long]       = explicit(_.toString, n => Json.Num(n))
   implicit val bigInteger: JsonEncoder[java.math.BigInteger] =
     explicit(_.toString, n => Json.Num(new java.math.BigDecimal(n)))
   implicit val scalaBigInt: JsonEncoder[BigInt] =
     explicit(_.toString, n => Json.Num(new java.math.BigDecimal(n.bigInteger)))
   implicit val double: JsonEncoder[Double] =
-    explicit(SafeNumbers.toString, n => Json.Num(new java.math.BigDecimal(n)))
+    explicit(SafeNumbers.toString, n => Json.Num(n))
   implicit val float: JsonEncoder[Float] =
-    explicit(SafeNumbers.toString, n => Json.Num(new java.math.BigDecimal(n.toDouble)))
+    explicit(SafeNumbers.toString, n => Json.Num(n))
   implicit val bigDecimal: JsonEncoder[java.math.BigDecimal] = explicit(_.toString, Json.Num.apply)
   implicit val scalaBigDecimal: JsonEncoder[BigDecimal]      = explicit(_.toString, n => Json.Num(n.bigDecimal))
 

diff --git a/zio-json/shared/src/main/scala/zio/json/ast/ast.scala b/zio-json/shared/src/main/scala/zio/json/ast/ast.scala
@@ -339,7 +339,7 @@ object Json {
     def apply(value: Int): Num        = Num(BigDecimal(value).bigDecimal)
     def apply(value: Long): Num       = Num(BigDecimal(value).bigDecimal)
     def apply(value: BigDecimal): Num = Num(value.bigDecimal)
-    def apply(value: Float): Num      = Num(BigDecimal(value.toDouble).bigDecimal)
+    def apply(value: Float): Num      = Num(BigDecimal(value).bigDecimal)
     def apply(value: Double): Num     = Num(BigDecimal(value).bigDecimal)
 
     implicit val decoder: JsonDecoder[Num] = new JsonDecoder[Num] {

diff --git a/zio-json/shared/src/test/scala/zio/json/EncoderSpec.scala b/zio-json/shared/src/test/scala/zio/json/EncoderSpec.scala
@@ -332,8 +332,8 @@ object EncoderSpec extends ZIOSpecDefault {
             assert((1: Int).toJsonAST)(isRight(equalTo(Json.Num(1)))) &&
             assert(1L.toJsonAST)(isRight(equalTo(Json.Num(1)))) &&
             assert(new java.math.BigInteger("1").toJsonAST)(isRight(equalTo(Json.Num(1)))) &&
-            assert(1.0f.toJsonAST)(isRight(equalTo(Json.Num(1)))) &&
-            assert(1.0d.toJsonAST)(isRight(equalTo(Json.Num(1))))
+            assert(1.0f.toJsonAST)(isRight(equalTo(Json.Num(1.0f)))) &&
+            assert(1.0d.toJsonAST)(isRight(equalTo(Json.Num(1.0))))
           }
         ),
         test("options") {
@@ -379,7 +379,7 @@ object EncoderSpec extends ZIOSpecDefault {
 
           assert(OnlyString("foo").toJsonAST)(isRight(equalTo(Json.Obj("s" -> Json.Str("foo"))))) &&
           assert(CoupleOfThings(-1, Some(10.0f), false).toJsonAST)(
-            isRight(equalTo(Json.Obj("j" -> Json.Num(-1), "f" -> Json.Num(10), "b" -> Json.Bool(false))))
+            isRight(equalTo(Json.Obj("j" -> Json.Num(-1), "f" -> Json.Num(10.0f), "b" -> Json.Bool(false))))
           ) &&
           assert(CoupleOfThings(0, None, true).toJsonAST)(
             isRight(equalTo(Json.Obj("j" -> Json.Num(0), "b" -> Json.Bool(true))))