Update zio-json to 0.7.6 and zio-schema-json to 1.6.1

plokhotnyuk · plokhotnyuk · commit af168b8c19f8 · 2025-01-24T16:33:30.000+01:00
diff --git a/build.sbt b/build.sbt
@@ -243,8 +243,8 @@ lazy val `jsoniter-scala-benchmark` = crossProject(JVMPlatform, JSPlatform)
       "com.disneystreaming.smithy4s" %%% "smithy4s-json" % "0.18.29",
       "com.evolutiongaming" %%% "play-json-jsoniter" % "0.10.3" intransitive(),
       "org.playframework" %%% "play-json" % "3.0.4",
-      "dev.zio" %%% "zio-json" % "0.7.4",
-      "dev.zio" %%% "zio-schema-json" % "1.5.0",
+      "dev.zio" %%% "zio-json" % "0.7.6",
+      "dev.zio" %%% "zio-schema-json" % "1.6.1",
       "io.circe" %%% "circe-generic" % "0.14.10",
       "io.circe" %%% "circe-jawn" % "0.14.10",
       "com.lihaoyi" %%% "upickle" % "4.1.0",
diff --git a/jsoniter-scala-benchmark/js/src/main/scala-2/com/github/plokhotnyuk/jsoniter_scala/benchmark/Main.scala b/jsoniter-scala-benchmark/js/src/main/scala-2/com/github/plokhotnyuk/jsoniter_scala/benchmark/Main.scala
@@ -1420,9 +1420,8 @@ object Main {
       B("playJsonJsoniter")(benchmark.playJsonJsoniter()),
       B("smithy4sJson")(benchmark.smithy4sJson()),
       B("uPickle")(benchmark.uPickle()),
-      B("zioJson")(benchmark.zioJson())
-      //FIXME: zio-schema-json parses only 127 levels of nesting instead of 128
-      //B("zioSchemaJson")(benchmark.zioSchemaJson())
+      B("zioJson")(benchmark.zioJson()),
+      B("zioSchemaJson")(benchmark.zioSchemaJson())
     ))
   }, {
     val benchmark = new NestedStructsWriting { size = 128; setup() }
diff --git a/jsoniter-scala-benchmark/js/src/main/scala-3/com/github/plokhotnyuk/jsoniter_scala/benchmark/Main.scala b/jsoniter-scala-benchmark/js/src/main/scala-3/com/github/plokhotnyuk/jsoniter_scala/benchmark/Main.scala
@@ -1319,9 +1319,8 @@ object Main {
       B("playJsonJsoniter")(benchmark.playJsonJsoniter()),
       B("smithy4sJson")(benchmark.smithy4sJson()),
       B("uPickle")(benchmark.uPickle()),
-      B("zioJson")(benchmark.zioJson())
-      //FIXME: zio-schema-json parses only 127 levels of nesting instead of 128
-      //B("zioSchemaJson")(benchmark.zioSchemaJson())
+      B("zioJson")(benchmark.zioJson()),
+      B("zioSchemaJson")(benchmark.zioSchemaJson())
     ))
   }, {
     val benchmark = new NestedStructsWriting { size = 128; setup() }
diff --git a/jsoniter-scala-benchmark/js/src/test/scala-2/com/github/plokhotnyuk/jsoniter_scala/benchmark/NestedStructsReadingSpec.scala b/jsoniter-scala-benchmark/js/src/test/scala-2/com/github/plokhotnyuk/jsoniter_scala/benchmark/NestedStructsReadingSpec.scala
@@ -20,8 +20,7 @@ class NestedStructsReadingSpec extends BenchmarkSpecBase {
       benchmark.smithy4sJson() shouldBe benchmark.obj
       benchmark.uPickle() shouldBe benchmark.obj
       benchmark.zioJson() shouldBe benchmark.obj
-      //FIXME: zio-schema-json parses only 127 levels of nesting instead of 128
-      //benchmark.zioSchemaJson() shouldBe benchmark.obj
+      benchmark.zioSchemaJson() shouldBe benchmark.obj
     }
     "fail on invalid input" in {
       val b = benchmark
@@ -35,8 +34,7 @@ class NestedStructsReadingSpec extends BenchmarkSpecBase {
       intercept[Throwable](b.smithy4sJson())
       intercept[Throwable](b.uPickle())
       intercept[Throwable](b.zioJson())
-      //FIXME: zio-schema-json parses only 127 levels of nesting instead of 128
-      //intercept[Throwable](b.zioJson())
+      intercept[Throwable](b.zioSchemaJson())
     }
   }
 }
diff --git a/jsoniter-scala-benchmark/js/src/test/scala-3/com/github/plokhotnyuk/jsoniter_scala/benchmark/NestedStructsReadingSpec.scala b/jsoniter-scala-benchmark/js/src/test/scala-3/com/github/plokhotnyuk/jsoniter_scala/benchmark/NestedStructsReadingSpec.scala
@@ -19,8 +19,7 @@ class NestedStructsReadingSpec extends BenchmarkSpecBase {
       benchmark.smithy4sJson() shouldBe benchmark.obj
       benchmark.uPickle() shouldBe benchmark.obj
       benchmark.zioJson() shouldBe benchmark.obj
-      //FIXME: zio-schema-json parses only 127 levels of nesting instead of 128
-      //benchmark.zioSchemaJson() shouldBe benchmark.obj
+      benchmark.zioSchemaJson() shouldBe benchmark.obj
     }
     "fail on invalid input" in {
       val b = benchmark
@@ -33,8 +32,7 @@ class NestedStructsReadingSpec extends BenchmarkSpecBase {
       intercept[Throwable](b.smithy4sJson())
       intercept[Throwable](b.uPickle())
       intercept[Throwable](b.zioJson())
-      //FIXME: zio-schema-json parses only 127 levels of nesting instead of 128
-      //intercept[Throwable](b.zioSchemaJson())
+      intercept[Throwable](b.zioSchemaJson())
     }
   }
 }
diff --git a/jsoniter-scala-benchmark/jvm/src/test/scala-2/com/github/plokhotnyuk/jsoniter_scala/benchmark/NestedStructsReadingSpec.scala b/jsoniter-scala-benchmark/jvm/src/test/scala-2/com/github/plokhotnyuk/jsoniter_scala/benchmark/NestedStructsReadingSpec.scala
@@ -26,8 +26,7 @@ class NestedStructsReadingSpec extends BenchmarkSpecBase {
       benchmark.uPickle() shouldBe benchmark.obj
       benchmark.weePickle() shouldBe benchmark.obj
       benchmark.zioJson() shouldBe benchmark.obj
-      //FIXME: zio-schema-json parses only 127 levels of nesting instead of 128
-      //benchmark.zioSchemaJson() shouldBe benchmark.obj
+      benchmark.zioSchemaJson() shouldBe benchmark.obj
     }
     "fail on invalid input" in {
       val b = benchmark
@@ -48,8 +47,7 @@ class NestedStructsReadingSpec extends BenchmarkSpecBase {
       intercept[Throwable](b.uPickle())
       intercept[Throwable](b.weePickle())
       intercept[Throwable](b.zioJson())
-      //FIXME: zio-schema-json parses only 127 levels of nesting instead of 128
-      //intercept[Throwable](b.zioSchemaJson())
+      intercept[Throwable](b.zioSchemaJson())
     }
   }
 }
diff --git a/jsoniter-scala-benchmark/jvm/src/test/scala-3/com/github/plokhotnyuk/jsoniter_scala/benchmark/NestedStructsReadingSpec.scala b/jsoniter-scala-benchmark/jvm/src/test/scala-3/com/github/plokhotnyuk/jsoniter_scala/benchmark/NestedStructsReadingSpec.scala
@@ -24,8 +24,7 @@ class NestedStructsReadingSpec extends BenchmarkSpecBase {
       benchmark.uPickle() shouldBe benchmark.obj
       benchmark.weePickle() shouldBe benchmark.obj
       benchmark.zioJson() shouldBe benchmark.obj
-      //FIXME: zio-schema-json parses only 127 levels of nesting instead of 128
-      //benchmark.zioSchemaJson() shouldBe benchmark.obj
+      benchmark.zioSchemaJson() shouldBe benchmark.obj
     }
     "fail on invalid input" in {
       val b = benchmark
@@ -44,8 +43,7 @@ class NestedStructsReadingSpec extends BenchmarkSpecBase {
       intercept[Throwable](b.uPickle())
       intercept[Throwable](b.weePickle())
       intercept[Throwable](b.zioJson())
-      //FIXME: zio-schema-json parses only 127 levels of nesting instead of 128
-      //intercept[Throwable](b.zioSchemaJson())
+      intercept[Throwable](b.zioSchemaJson())
     }
   }
 }
diff --git a/jsoniter-scala-benchmark/shared/src/main/scala-2/com/github/plokhotnyuk/jsoniter_scala/benchmark/NestedStructsReading.scala b/jsoniter-scala-benchmark/shared/src/main/scala-2/com/github/plokhotnyuk/jsoniter_scala/benchmark/NestedStructsReading.scala
@@ -134,13 +134,12 @@ class NestedStructsReading extends NestedStructsBenchmark {
 
     new String(jsonBytes, UTF_8).fromJson[NestedStructs].fold(sys.error, identity)
   }
-/* FIXME: zio-schema-json parses only 127 levels of nesting instead of 128
+
   @Benchmark
   def zioSchemaJson(): NestedStructs = {
     import com.github.plokhotnyuk.jsoniter_scala.benchmark.ZioSchemaJsonCodecs._
     import java.nio.charset.StandardCharsets.UTF_8
 
     nestedStructsCodec.decodeJson(new String(jsonBytes, UTF_8)).fold(sys.error, identity)
   }
-*/
 }
diff --git a/jsoniter-scala-benchmark/shared/src/main/scala-3/com/github/plokhotnyuk/jsoniter_scala/benchmark/NestedStructsReading.scala b/jsoniter-scala-benchmark/shared/src/main/scala-3/com/github/plokhotnyuk/jsoniter_scala/benchmark/NestedStructsReading.scala
@@ -121,13 +121,12 @@ class NestedStructsReading extends NestedStructsBenchmark {
 
     new String(jsonBytes, UTF_8).fromJson[NestedStructs].fold(sys.error, identity)
   }
-/* FIXME: zio-schema-json parses only 127 levels of nesting instead of 128
+
   @Benchmark
   def zioSchemaJson(): NestedStructs = {
     import com.github.plokhotnyuk.jsoniter_scala.benchmark.ZioSchemaJsonCodecs._
     import java.nio.charset.StandardCharsets.UTF_8
 
     nestedStructsCodec.decodeJson(new String(jsonBytes, UTF_8)).fold(sys.error, identity)
   }
-*/
 }
diff --git a/jsoniter-scala-benchmark/shared/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/benchmark/ZioJsonCodecs.scala b/jsoniter-scala-benchmark/shared/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/benchmark/ZioJsonCodecs.scala
@@ -9,7 +9,6 @@ import scala.collection.immutable.ArraySeq
 import scala.reflect.ClassTag
 
 object ZioJsonCodecs {
-  implicit val config: JsonCodecConfiguration = JsonCodecConfiguration(explicitEmptyCollections = false)
   implicit val adtC3c: JsonCodec[ADTBase] = DeriveJsonCodec.gen
   implicit val geoJsonC3c: JsonCodec[GeoJSON.GeoJSON] = {
     implicit val c1: JsonCodec[GeoJSON.SimpleGeometry] = DeriveJsonCodec.gen

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,7 @@ class NestedStructsReadingSpec extends BenchmarkSpecBase {`
`20`	`20`	`benchmark.smithy4sJson() shouldBe benchmark.obj`
`21`	`21`	`benchmark.uPickle() shouldBe benchmark.obj`
`22`	`22`	`benchmark.zioJson() shouldBe benchmark.obj`
`23`		`- //FIXME: zio-schema-json parses only 127 levels of nesting instead of 128`
`24`		`- //benchmark.zioSchemaJson() shouldBe benchmark.obj`
	`23`	`+ benchmark.zioSchemaJson() shouldBe benchmark.obj`
`25`	`24`	`}`
`26`	`25`	`"fail on invalid input" in {`
`27`	`26`	`val b = benchmark`
`@@ -35,8 +34,7 @@ class NestedStructsReadingSpec extends BenchmarkSpecBase {`
`35`	`34`	`intercept[Throwable](b.smithy4sJson())`
`36`	`35`	`intercept[Throwable](b.uPickle())`
`37`	`36`	`intercept[Throwable](b.zioJson())`
`38`		`- //FIXME: zio-schema-json parses only 127 levels of nesting instead of 128`
`39`		`- //intercept[Throwable](b.zioJson())`
	`37`	`+ intercept[Throwable](b.zioSchemaJson())`
`40`	`38`	`}`
`41`	`39`	`}`
`42`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,7 @@ class NestedStructsReadingSpec extends BenchmarkSpecBase {`
`19`	`19`	`benchmark.smithy4sJson() shouldBe benchmark.obj`
`20`	`20`	`benchmark.uPickle() shouldBe benchmark.obj`
`21`	`21`	`benchmark.zioJson() shouldBe benchmark.obj`
`22`		`- //FIXME: zio-schema-json parses only 127 levels of nesting instead of 128`
`23`		`- //benchmark.zioSchemaJson() shouldBe benchmark.obj`
	`22`	`+ benchmark.zioSchemaJson() shouldBe benchmark.obj`
`24`	`23`	`}`
`25`	`24`	`"fail on invalid input" in {`
`26`	`25`	`val b = benchmark`
`@@ -33,8 +32,7 @@ class NestedStructsReadingSpec extends BenchmarkSpecBase {`
`33`	`32`	`intercept[Throwable](b.smithy4sJson())`
`34`	`33`	`intercept[Throwable](b.uPickle())`
`35`	`34`	`intercept[Throwable](b.zioJson())`
`36`		`- //FIXME: zio-schema-json parses only 127 levels of nesting instead of 128`
`37`		`- //intercept[Throwable](b.zioSchemaJson())`
	`35`	`+ intercept[Throwable](b.zioSchemaJson())`
`38`	`36`	`}`
`39`	`37`	`}`
`40`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,7 @@ class NestedStructsReadingSpec extends BenchmarkSpecBase {`
`26`	`26`	`benchmark.uPickle() shouldBe benchmark.obj`
`27`	`27`	`benchmark.weePickle() shouldBe benchmark.obj`
`28`	`28`	`benchmark.zioJson() shouldBe benchmark.obj`
`29`		`- //FIXME: zio-schema-json parses only 127 levels of nesting instead of 128`
`30`		`- //benchmark.zioSchemaJson() shouldBe benchmark.obj`
	`29`	`+ benchmark.zioSchemaJson() shouldBe benchmark.obj`
`31`	`30`	`}`
`32`	`31`	`"fail on invalid input" in {`
`33`	`32`	`val b = benchmark`
`@@ -48,8 +47,7 @@ class NestedStructsReadingSpec extends BenchmarkSpecBase {`
`48`	`47`	`intercept[Throwable](b.uPickle())`
`49`	`48`	`intercept[Throwable](b.weePickle())`
`50`	`49`	`intercept[Throwable](b.zioJson())`
`51`		`- //FIXME: zio-schema-json parses only 127 levels of nesting instead of 128`
`52`		`- //intercept[Throwable](b.zioSchemaJson())`
	`50`	`+ intercept[Throwable](b.zioSchemaJson())`
`53`	`51`	`}`
`54`	`52`	`}`
`55`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,7 @@ class NestedStructsReadingSpec extends BenchmarkSpecBase {`
`24`	`24`	`benchmark.uPickle() shouldBe benchmark.obj`
`25`	`25`	`benchmark.weePickle() shouldBe benchmark.obj`
`26`	`26`	`benchmark.zioJson() shouldBe benchmark.obj`
`27`		`- //FIXME: zio-schema-json parses only 127 levels of nesting instead of 128`
`28`		`- //benchmark.zioSchemaJson() shouldBe benchmark.obj`
	`27`	`+ benchmark.zioSchemaJson() shouldBe benchmark.obj`
`29`	`28`	`}`
`30`	`29`	`"fail on invalid input" in {`
`31`	`30`	`val b = benchmark`
`@@ -44,8 +43,7 @@ class NestedStructsReadingSpec extends BenchmarkSpecBase {`
`44`	`43`	`intercept[Throwable](b.uPickle())`
`45`	`44`	`intercept[Throwable](b.weePickle())`
`46`	`45`	`intercept[Throwable](b.zioJson())`
`47`		`- //FIXME: zio-schema-json parses only 127 levels of nesting instead of 128`
`48`		`- //intercept[Throwable](b.zioSchemaJson())`
	`46`	`+ intercept[Throwable](b.zioSchemaJson())`
`49`	`47`	`}`
`50`	`48`	`}`
`51`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,13 +134,12 @@ class NestedStructsReading extends NestedStructsBenchmark {`
`134`	`134`
`135`	`135`	`new String(jsonBytes, UTF_8).fromJson[NestedStructs].fold(sys.error, identity)`
`136`	`136`	`}`
`137`		`-/* FIXME: zio-schema-json parses only 127 levels of nesting instead of 128`
	`137`	`+`
`138`	`138`	`@Benchmark`
`139`	`139`	`def zioSchemaJson(): NestedStructs = {`
`140`	`140`	`import com.github.plokhotnyuk.jsoniter_scala.benchmark.ZioSchemaJsonCodecs._`
`141`	`141`	`import java.nio.charset.StandardCharsets.UTF_8`
`142`	`142`
`143`	`143`	`nestedStructsCodec.decodeJson(new String(jsonBytes, UTF_8)).fold(sys.error, identity)`
`144`	`144`	`}`
`145`		`-*/`
`146`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,13 +121,12 @@ class NestedStructsReading extends NestedStructsBenchmark {`
`121`	`121`
`122`	`122`	`new String(jsonBytes, UTF_8).fromJson[NestedStructs].fold(sys.error, identity)`
`123`	`123`	`}`
`124`		`-/* FIXME: zio-schema-json parses only 127 levels of nesting instead of 128`
	`124`	`+`
`125`	`125`	`@Benchmark`
`126`	`126`	`def zioSchemaJson(): NestedStructs = {`
`127`	`127`	`import com.github.plokhotnyuk.jsoniter_scala.benchmark.ZioSchemaJsonCodecs._`
`128`	`128`	`import java.nio.charset.StandardCharsets.UTF_8`
`129`	`129`
`130`	`130`	`nestedStructsCodec.decodeJson(new String(jsonBytes, UTF_8)).fold(sys.error, identity)`
`131`	`131`	`}`
`132`		`-*/`
`133`	`132`	`}`