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

Replace inline anonymous classes with named classes #114

Merged
merged 2 commits into from
Aug 21, 2024
Merged

Replace inline anonymous classes with named classes #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac545c1
Write JS NativeConverter without an anonymous class.
tarao Aug 21, 2024
92f48ac
Write codec without anonymous classes.
tarao Aug 21, 2024
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
39 changes: 23 additions & 16 deletions modules/circe/src/main/scala/com/github/tarao/record4s/circe/Codec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
package com.github.tarao.record4s
package circe

import io.circe.{Decoder, Encoder, HCursor, Json}
import io.circe
import io.circe.{HCursor, Json}

import scala.collection.mutable.Builder
import scala.compiletime.{constValue, erasedValue, summonInline}
Expand All @@ -39,7 +40,7 @@ object Codec {
case _: Json =>
record(labelStr).asInstanceOf[Json]
case _ =>
val enc = summonInline[Encoder[tpe]]
val enc = summonInline[circe.Encoder[tpe]]
enc(record(labelStr).asInstanceOf[tpe])
}
res += (labelStr -> value)
Expand All @@ -49,41 +50,47 @@ object Codec {
private inline def decodeFields[Types, Labels](
c: HCursor,
res: Builder[(String, Any), Map[String, Any]] = Map.newBuilder[String, Any],
): Decoder.Result[Builder[(String, Any), Map[String, Any]]] =
): circe.Decoder.Result[Builder[(String, Any), Map[String, Any]]] =
inline (erasedValue[Types], erasedValue[Labels]) match {
case _: (EmptyTuple, EmptyTuple) =>
Right(res)

case _: (tpe *: types, label *: labels) =>
val labelStr = constValue[label & String]
val dec = summonInline[Decoder[tpe]]
val dec = summonInline[circe.Decoder[tpe]]
c.downField(labelStr).as[tpe](using dec).flatMap { value =>
res += (labelStr -> value)
decodeFields[types, labels](c, res)
}
}

inline given encoder[R <: %](using r: RecordLike[R]): Encoder[R] = {
class Encoder[R <: %](f: R => Json) extends circe.Encoder[R] {
final def apply(record: R): Json = f(record)
}

inline given encoder[R <: %](using r: RecordLike[R]): circe.Encoder[R] = {
type Types = r.ElemTypes
type Labels = r.ElemLabels

new Encoder[R] {
final def apply(record: R): Json = {
val enc = summonInline[Encoder[Map[String, Json]]]
enc(encodeFields[Types, Labels](r.iterableOf(record).toMap).result())
}
Encoder { (record: R) =>
val enc = summonInline[circe.Encoder[Map[String, Json]]]
enc(encodeFields[Types, Labels](r.iterableOf(record).toMap).result())
}
}

inline given decoder[R <: %](using r: RecordLike[R]): Decoder[R] = {
class Decoder[R <: %](f: HCursor => circe.Decoder.Result[R])
extends circe.Decoder[R] {
final def apply(c: HCursor): circe.Decoder.Result[R] = f(c)
}

inline given decoder[R <: %](using r: RecordLike[R]): circe.Decoder[R] = {
type Types = r.ElemTypes
type Labels = r.ElemLabels

new Decoder[R] {
final def apply(c: HCursor): Decoder.Result[R] =
decodeFields[Types, Labels](c).map { b =>
Record.newMapRecord[R](b.result())
}
Decoder { (c: HCursor) =>
decodeFields[Types, Labels](c).map { b =>
Record.newMapRecord[R](b.result())
}
}
}
}
25 changes: 17 additions & 8 deletions modules/core/.js/src/main/scala/com/github/tarao/record4s/RecordPlatformSpecific.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,16 +170,25 @@ trait RecordPlatformSpecific {
type Types = r.ElemTypes
type Labels = r.ElemLabels

new NativeConverter[R] {
extension (record: R) {
def toNative: js.Any =
fieldsToNative[Types, Labels](r.iterableOf(record).toMap)
}

def fromNative(ps: ParseState): R = {
RecordPlatformSpecificJs.Converter[R](
(record: R) => fieldsToNative[Types, Labels](r.iterableOf(record).toMap),
(ps: ParseState) => {
val iterable = nativeToFields[Types, Labels](asDict(ps), ps).result()
Record.newMapRecord[R](iterable)
}
},
)
}
}

object RecordPlatformSpecificJs {
class Converter[R <: %](
jsAnyOf: R => js.Any,
fromParseState: ParseState => R,
) extends NativeConverter[R] {
extension (record: R) {
def toNative: js.Any = jsAnyOf(record)
}

def fromNative(ps: ParseState): R = fromParseState(ps)
}
}