Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(JsonCodec): codec derivation on nested types #1139

Merged
merged 1 commit into from
Aug 15, 2024
Merged

fix(JsonCodec): codec derivation on nested types #1139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions zio-json/shared/src/main/scala-2.12/zio/json/JsonCodecVersionSpecific.scala
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions zio-json/shared/src/main/scala-2.13/zio/json/JsonCodecVersionSpecific.scala
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions zio-json/shared/src/main/scala-2.x/JsonCodecVersionSpecific.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package zio.json

trait JsonCodecVersionSpecific
2 changes: 0 additions & 2 deletions zio-json/shared/src/main/scala-3/zio/json/JsonCodecVersionSpecific.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,4 @@ package zio.json
private[json] trait JsonCodecVersionSpecific {
inline def derived[A: deriving.Mirror.Of]: JsonCodec[A] = DeriveJsonCodec.gen[A]

given fromEncoderDecoder[A](using encoder: JsonEncoder[A], decoder: JsonDecoder[A]): JsonCodec[A] =
JsonCodec(encoder, decoder)
}
3 changes: 3 additions & 0 deletions zio-json/shared/src/main/scala/zio/json/JsonCodec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ final case class JsonCodec[A](encoder: JsonEncoder[A], decoder: JsonDecoder[A])
object JsonCodec extends GeneratedTupleCodecs with CodecLowPriority0 with JsonCodecVersionSpecific {
def apply[A](implicit jsonCodec: JsonCodec[A]): JsonCodec[A] = jsonCodec

implicit def fromEncoderDecoder[A](encoder: JsonEncoder[A], decoder: JsonDecoder[A]): JsonCodec[A] =
JsonCodec(encoder, decoder)

private def orElseEither[A, B](A: JsonCodec[A], B: JsonCodec[B]): JsonCodec[Either[A, B]] =
JsonCodec(
JsonEncoder.orElseEither[A, B](A.encoder, B.encoder),
Expand Down
Loading