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

Clean up type params #409

Merged
merged 1 commit into from
Oct 27, 2022
Merged

Clean up type params #409

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
2 changes: 1 addition & 1 deletion csv/generic/shared/src/main/scala-2/fs2/data/csv/generic/internal/DerivedCsvRowDecoder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ object DerivedCsvRowDecoder {
gen: LabelledGeneric.Aux[T, Repr],
defaults: Default.AsOptions.Aux[T, DefaultRepr],
annotations: Annotations.Aux[CsvName, T, AnnoRepr],
cc: Lazy[MapShapedCsvRowDecoder.WithDefaults[T, Repr, DefaultRepr, AnnoRepr]]): DerivedCsvRowDecoder[T] =
cc: Lazy[MapShapedCsvRowDecoder.WithDefaults[Repr, DefaultRepr, AnnoRepr]]): DerivedCsvRowDecoder[T] =
new DerivedCsvRowDecoder[T] {
def apply(row: CsvRow[String]): DecoderResult[T] =
cc.value.fromWithDefault(row, defaults(), annotations()).map(gen.from(_))
Expand Down
2 changes: 1 addition & 1 deletion csv/generic/shared/src/main/scala-2/fs2/data/csv/generic/internal/DerivedCsvRowEncoder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ object DerivedCsvRowEncoder {
final implicit def productWriter[T, Repr <: HList, AnnoRepr <: HList](implicit
gen: LabelledGeneric.Aux[T, Repr],
annotations: Annotations.Aux[CsvName, T, AnnoRepr],
cc: Lazy[MapShapedCsvRowEncoder.WithAnnotations[T, Repr, AnnoRepr]]): DerivedCsvRowEncoder[T] =
cc: Lazy[MapShapedCsvRowEncoder.WithAnnotations[Repr, AnnoRepr]]): DerivedCsvRowEncoder[T] =
(elem: T) => cc.value.fromWithAnnotation(gen.to(elem), annotations())

}
42 changes: 13 additions & 29 deletions ...eneric/shared/src/main/scala-2/fs2/data/csv/generic/internal/MapShapedCsvRowDecoder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,31 +26,20 @@ trait MapShapedCsvRowDecoder[Repr] extends CsvRowDecoder[Repr, String]

object MapShapedCsvRowDecoder extends LowPriorityMapShapedCsvRowDecoder1 {

implicit def hnilRowDecoder[Wrapped]: WithDefaults[Wrapped, HNil, HNil, HNil] =
new WithDefaults[Wrapped, HNil, HNil, HNil] {
implicit val hnilRowDecoder: WithDefaults[HNil, HNil, HNil] =
new WithDefaults[HNil, HNil, HNil] {
def fromWithDefault(row: CsvRow[String], default: HNil, annotation: HNil): DecoderResult[HNil] =
Right(HNil)
}

implicit def optionHconsRowDecoder[Wrapped,
Key <: Symbol,
Head,
Tail <: HList,
DefaultTail <: HList,
Anno,
AnnoTail <: HList](implicit
implicit def optionHconsRowDecoder[Key <: Symbol, Head, Tail <: HList, DefaultTail <: HList, Anno, AnnoTail <: HList](
implicit
witness: Witness.Aux[Key],
Head: CellDecoder[Head],
ev: <:<[Anno, Option[CsvName]],
Tail: Lazy[WithDefaults[Wrapped, Tail, DefaultTail, AnnoTail]])
: WithDefaults[Wrapped,
FieldType[Key, Option[Head]] :: Tail,
Option[Option[Head]] :: DefaultTail,
Anno :: AnnoTail] =
new WithDefaults[Wrapped,
FieldType[Key, Option[Head]] :: Tail,
Option[Option[Head]] :: DefaultTail,
Anno :: AnnoTail] {
Tail: Lazy[WithDefaults[Tail, DefaultTail, AnnoTail]])
: WithDefaults[FieldType[Key, Option[Head]] :: Tail, Option[Option[Head]] :: DefaultTail, Anno :: AnnoTail] =
new WithDefaults[FieldType[Key, Option[Head]] :: Tail, Option[Option[Head]] :: DefaultTail, Anno :: AnnoTail] {
def fromWithDefault(row: CsvRow[String],
default: Option[Option[Head]] :: DefaultTail,
anno: Anno :: AnnoTail): DecoderResult[FieldType[Key, Option[Head]] :: Tail] = {
Expand All @@ -69,23 +58,18 @@ object MapShapedCsvRowDecoder extends LowPriorityMapShapedCsvRowDecoder1 {

private[generic] trait LowPriorityMapShapedCsvRowDecoder1 {

trait WithDefaults[Wrapped, Repr, DefaultRepr, AnnoRepr] {
trait WithDefaults[Repr, DefaultRepr, AnnoRepr] {
def fromWithDefault(row: CsvRow[String], default: DefaultRepr, annotation: AnnoRepr): DecoderResult[Repr]
}

implicit def hconsRowDecoder[Wrapped,
Key <: Symbol,
Head,
Tail <: HList,
DefaultTail <: HList,
Anno,
AnnoTail <: HList](implicit
implicit def hconsRowDecoder[Key <: Symbol, Head, Tail <: HList, DefaultTail <: HList, Anno, AnnoTail <: HList](
implicit
witness: Witness.Aux[Key],
Head: CellDecoder[Head],
ev: <:<[Anno, Option[CsvName]],
Tail: Lazy[WithDefaults[Wrapped, Tail, DefaultTail, AnnoTail]])
: WithDefaults[Wrapped, FieldType[Key, Head] :: Tail, Option[Head] :: DefaultTail, Anno :: AnnoTail] =
new WithDefaults[Wrapped, FieldType[Key, Head] :: Tail, Option[Head] :: DefaultTail, Anno :: AnnoTail] {
Tail: Lazy[WithDefaults[Tail, DefaultTail, AnnoTail]])
: WithDefaults[FieldType[Key, Head] :: Tail, Option[Head] :: DefaultTail, Anno :: AnnoTail] =
new WithDefaults[FieldType[Key, Head] :: Tail, Option[Head] :: DefaultTail, Anno :: AnnoTail] {
def fromWithDefault(row: CsvRow[String],
default: Option[Head] :: DefaultTail,
anno: Anno :: AnnoTail): DecoderResult[FieldType[Key, Head] :: Tail] = {
Expand Down
18 changes: 6 additions & 12 deletions ...eneric/shared/src/main/scala-2/fs2/data/csv/generic/internal/MapShapedCsvRowEncoder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,33 +26,27 @@ trait MapShapedCsvRowEncoder[Repr] extends CsvRowEncoder[Repr, String]

object MapShapedCsvRowEncoder extends LowPrioMapShapedCsvRowEncoderImplicits {

implicit def lastElemRowEncoder[Wrapped, Repr, Anno, Key <: Symbol](implicit
implicit def lastElemRowEncoder[Repr, Anno, Key <: Symbol](implicit
Last: CellEncoder[Repr],
ev: <:<[Anno, Option[CsvName]],
witness: Witness.Aux[Key]): WithAnnotations[Wrapped, FieldType[Key, Repr] :: HNil, Anno :: HNil] =
witness: Witness.Aux[Key]): WithAnnotations[FieldType[Key, Repr] :: HNil, Anno :: HNil] =
(row: Repr :: HNil, annotation: Anno :: HNil) =>
CsvRow.unsafe(NonEmptyList.one(Last(row.head)),
NonEmptyList.one(annotation.head.fold(witness.value.name)(_.name)))

}

private[generic] trait LowPrioMapShapedCsvRowEncoderImplicits {
trait WithAnnotations[Wrapped, Repr, AnnoRepr] {
trait WithAnnotations[Repr, AnnoRepr] {
def fromWithAnnotation(row: Repr, annotation: AnnoRepr): CsvRow[String]
}

implicit def hconsRowEncoder[Wrapped,
Key <: Symbol,
Head,
Tail <: HList,
DefaultTail <: HList,
Anno,
AnnoTail <: HList](implicit
implicit def hconsRowEncoder[Key <: Symbol, Head, Tail <: HList, DefaultTail <: HList, Anno, AnnoTail <: HList](
implicit
witness: Witness.Aux[Key],
Head: CellEncoder[Head],
ev: <:<[Anno, Option[CsvName]],
Tail: Lazy[WithAnnotations[Wrapped, Tail, AnnoTail]])
: WithAnnotations[Wrapped, FieldType[Key, Head] :: Tail, Anno :: AnnoTail] =
Tail: Lazy[WithAnnotations[Tail, AnnoTail]]): WithAnnotations[FieldType[Key, Head] :: Tail, Anno :: AnnoTail] =
(row: FieldType[Key, Head] :: Tail, annotation: Anno :: AnnoTail) => {
val tailRow = Tail.value.fromWithAnnotation(row.tail, annotation.tail)
CsvRow.unsafe(NonEmptyList(Head(row.head), tailRow.values.toList),
Expand Down