Revert "Support for value classes"

softwaremill · Dec 22, 2022 · f5df7e6 · f5df7e6
1 parent 465a30f
commit f5df7e6
Show file tree

Hide file tree

Showing 8 changed files with 209 additions and 645 deletions.
diff --git a/src/core/impl.scala b/src/core/impl.scala
@@ -7,59 +7,6 @@ import scala.reflect.*
 import Macro.*
 
 object CaseClassDerivation:
-
-  inline def valueClassDerivation[TC[_], V]: CaseClass[TC, V] =
-
-    val theParam: CaseClass.Param[TC, V] =
-      Macro.ValueClassDerivation.getValueClassParam[TC, V]
-
-    new CaseClass[TC, V](
-      typeInfo = typeInfo[V],
-      isObject = isObject[V],
-      isValueClass = true,
-      params = IArray.from(theParam :: Nil),
-      annotations = IArray.from(anns[V]),
-      inheritedAnnotations = IArray.from(inheritedAnns[V]),
-      typeAnnotations = IArray.from(typeAnns[V])
-    ):
-
-      def rawConstruct(fieldValues: Seq[Any]): V =
-        Macro.ValueClassDerivation.rawContructByMacro[V](fieldValues.toList)
-
-      def construct[PType: ClassTag](makeParam: Param => PType): V =
-        Macro.ValueClassDerivation.rawContructByMacro[V](
-          params.map(makeParam).toList
-        )
-
-      def constructEither[Err, PType: ClassTag](
-          makeParam: Param => Either[Err, PType]
-      ): Either[List[Err], V] =
-        params
-          .map(makeParam)
-          .foldLeft[Either[List[Err], Array[PType]]](Right(Array())) {
-            case (Left(errs), Left(err))    => Left(errs ++ List(err))
-            case (Right(acc), Right(param)) => Right(acc ++ Array(param))
-            case (errs @ Left(_), _)        => errs
-            case (_, Left(err))             => Left(List(err))
-          }
-          .map { params =>
-            Macro.ValueClassDerivation.rawContructByMacro[V](params.toList)
-          }
-
-      def constructMonadic[M[_]: Monadic, PType: ClassTag](
-          makeParam: Param => M[PType]
-      ): M[V] =
-        val m = summon[Monadic[M]]
-        m.map {
-          params.map(makeParam).foldLeft(m.point(Array())) { (accM, paramM) =>
-            m.flatMap(accM) { acc =>
-              m.map(paramM)(acc ++ List(_))
-            }
-          }
-        } { params =>
-          Macro.ValueClassDerivation.rawContructByMacro[V](params.toList)
-        }
-
   inline def fromMirror[Typeclass[_], A](
       product: Mirror.ProductOf[A]
   ): CaseClass[Typeclass, A] =
@@ -150,7 +97,6 @@ object CaseClassDerivation:
             defaults,
             idx + 1
           )
-
 end CaseClassDerivation
 
 trait SealedTraitDerivation:

diff --git a/src/core/interface.scala b/src/core/interface.scala
@@ -44,7 +44,6 @@ object CaseClass:
     override def toString: String = s"Param($label)"
 
   object Param:
-
     def apply[F[_], T, P](
         name: String,
         idx: Int,
@@ -64,7 +63,7 @@ object CaseClass:
       ):
         type PType = P
         def default: Option[PType] = defaultVal.value
-        def typeclass: F[PType] = cbn.value
+        def typeclass = cbn.value
         override def inheritedAnnotations = inheritedAnns
         def deref(value: T): P =
           value.asInstanceOf[Product].productElement(idx).asInstanceOf[P]