A couple of shortcut methods on Func

deps updated

bits/src/main/scala/fluence/codec/bits/BitsCodecs.scala

@@ -29,11 +29,12 @@ object BitsCodecs {
   implicit val byteArrayToVector: PureCodec[Array[Byte], ByteVector] =
     liftB(ByteVector.apply, _.toArray)
 
+  object Base64 {
     // Notice the use of default Base64 alphabet
     implicit val base64ToVector: PureCodec[String, ByteVector] =
-    base64AlphabetToVector(Bases.Alphabets.Base64)
+      alphabetToVector(Bases.Alphabets.Base64)
 
-  def base64AlphabetToVector(alphabet: Bases.Base64Alphabet): PureCodec[String, ByteVector] =
+    def alphabetToVector(alphabet: Bases.Base64Alphabet): PureCodec[String, ByteVector] =
       liftEitherB(
         str ⇒
           ByteVector
@@ -42,5 +43,22 @@ object BitsCodecs {
             .map(CodecError(_)),
         vec ⇒ Right(vec.toBase64(alphabet))
       )
+  }
+
+  object Base58 {
+    // Notice the use of default Base64 alphabet
+    implicit val base58ToVector: PureCodec[String, ByteVector] =
+      alphabetToVector(Bases.Alphabets.Base58)
+
+    def alphabetToVector(alphabet: Bases.Alphabet): PureCodec[String, ByteVector] =
+      liftEitherB(
+        str ⇒
+          ByteVector
+            .fromBase58Descriptive(str, alphabet)
+            .left
+            .map(CodecError(_)),
+        vec ⇒ Right(vec.toBase58(alphabet))
+      )
+  }
 
 }

bits/src/test/scala/fluence/codec/bits/BitsCodecsSpec.scala

@@ -22,6 +22,7 @@ import cats.syntax.compose._
 import org.scalatest.prop.Checkers
 import org.scalatest.{Matchers, WordSpec}
 import scodec.bits.ByteVector
+import BitsCodecs.Base64._
 import BitsCodecs._
 import fluence.codec.PureCodec
 
@@ -32,7 +33,7 @@ class BitsCodecsSpec extends WordSpec with Matchers with Checkers {
       val arrCodec = implicitly[PureCodec[Array[Byte], ByteVector]]
       val b64Codec = implicitly[PureCodec[ByteVector, String]]
 
-      check { (bytes: List[Byte]) ⇒
+      check { bytes: List[Byte] ⇒
         (arrCodec andThen arrCodec.swap).direct.apply[Id](bytes.toArray).value.map(_.toList).contains(bytes) &&
         (arrCodec andThen b64Codec andThen b64Codec.swap andThen arrCodec.swap).direct
           .apply[Id](bytes.toArray)

build.sbt

@@ -14,7 +14,8 @@ val scalaV = scalaVersion := "2.12.8"
 
 val commons = Seq(
   scalaV,
-  version                   := "0.0.4",
+  //crossScalaVersions := Seq(scalaVersion.value, "2.13.0-RC1"),
+  version                   := "0.0.5",
   fork in Test              := true,
   parallelExecution in Test := false,
   organization              := "one.fluence",
@@ -30,10 +31,10 @@ val commons = Seq(
 
 commons
 
-val kindProjector = addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.9")
+val kindProjector = addCompilerPlugin("org.typelevel" % "kind-projector" % "0.10.0" cross CrossVersion.binary)
 
-val Cats1V = "1.5.0"
-val ScodecBitsV = "1.1.9"
+val Cats1V = "1.6.0"
+val ScodecBitsV = "1.1.10"
 val CirceV = "0.11.1"
 val ShapelessV = "2.3.+"
 

core/src/main/scala/fluence/codec/MonadicalEitherArrow.scala

@@ -49,6 +49,7 @@ abstract class MonadicalEitherArrow[E <: Throwable] {
    * @tparam B Successful result type
    */
   abstract class Func[A, B] {
+    f ⇒
 
     /**
      * Run the func on input, using the given monad.
@@ -65,7 +66,7 @@ abstract class MonadicalEitherArrow[E <: Throwable] {
      * @param F All internal maps and composes, as well as errors, are to be executed with this MonadError.
      *          Error type should be a supertype for this arrow's error E.
      */
-    def runF[F[_]](input: A)(implicit F: MonadError[F, EE] forSome {type EE >: E}): F[B] =
+    def runF[F[_]](input: A)(implicit F: MonadError[F, EE] forSome { type EE >: E }): F[B] =
       runEither(input).flatMap(F.fromEither)
 
     /**
@@ -76,13 +77,37 @@ abstract class MonadicalEitherArrow[E <: Throwable] {
      */
     def apply[F[_]: Monad](input: A): EitherT[F, E, B]
 
+    /**
+     * Shortcut for function composition
+     *
+     * @param other Other function to run after
+     * @tparam C Resulting input type
+     * @return Composed function
+     */
+    def on[C](other: Func[C, A]): Func[C, B] =
+      catsMonadicalEitherArrowChoice.compose(this, other)
+
+    /**
+     * Convert this Func into another one, lifting the error
+     *
+     * @param m Another instance of MonadicalEitherArrow
+     * @param convertE Convert error
+     * @tparam EE Error type
+     * @return Converted function
+     */
+    def to[EE <: Throwable](m: MonadicalEitherArrow[EE])(implicit convertE: E ⇒ EE): m.Func[A, B] =
+      new m.Func[A, B] {
+        override def apply[F[_]: Monad](input: A): EitherT[F, EE, B] =
+          f[F](input).leftMap(convertE)
+      }
+
     /**
      * Converts this Func to Kleisli, using MonadError to execute upon and to lift errors into.
      *
      * @param F All internal maps and composes, as well as errors, are to be executed with this MonadError.
      *           Error type should be a supertype for this arrow's error E.
      */
-    def toKleisli[F[_]](implicit F: MonadError[F, EE] forSome {type EE >: E}): Kleisli[F, A, B] =
+    def toKleisli[F[_]](implicit F: MonadError[F, EE] forSome { type EE >: E }): Kleisli[F, A, B] =
       Kleisli(input ⇒ runF[F](input))
 
     /**
@@ -200,9 +225,9 @@ abstract class MonadicalEitherArrow[E <: Throwable] {
    *
    * @param f Function to lift
    */
-  def liftFuncPoint[A, B](f: A ⇒ Point[B]): Func[A,B] =
-    new Func[A,B]{
-      override def apply[F[_] : Monad](input: A): EitherT[F, E, B] =
+  def liftFuncPoint[A, B](f: A ⇒ Point[B]): Func[A, B] =
+    new Func[A, B] {
+      override def apply[F[_]: Monad](input: A): EitherT[F, E, B] =
         f(input).apply[F](())
     }
 
@@ -251,14 +276,14 @@ abstract class MonadicalEitherArrow[E <: Throwable] {
    */
   implicit object catsMonadicalEitherPointMonad extends MonadError[Point, E] {
     override def flatMap[A, B](fa: Point[A])(f: A ⇒ Point[B]): Point[B] =
-      new Func[Unit, B]{
-        override def apply[F[_] : Monad](input: Unit): EitherT[F, E, B] =
+      new Func[Unit, B] {
+        override def apply[F[_]: Monad](input: Unit): EitherT[F, E, B] =
           fa[F](()).flatMap(f(_).apply[F](()))
       }
 
     override def tailRecM[A, B](a: A)(f: A ⇒ Point[Either[A, B]]): Point[B] =
-      new Func[Unit, B]{
-        override def apply[F[_] : Monad](input: Unit): EitherT[F, E, B] =
+      new Func[Unit, B] {
+        override def apply[F[_]: Monad](input: Unit): EitherT[F, E, B] =
           Monad[EitherT[F, E, ?]].tailRecM(a)(f(_).apply[F](()))
       }
 
@@ -266,8 +291,8 @@ abstract class MonadicalEitherArrow[E <: Throwable] {
       liftFuncEither(_ ⇒ Left(e))
 
     override def handleErrorWith[A](fa: Point[A])(f: E ⇒ Point[A]): Point[A] =
-      new Func[Unit, A]{
-        override def apply[F[_] : Monad](input: Unit): EitherT[F, E, A] =
+      new Func[Unit, A] {
+        override def apply[F[_]: Monad](input: Unit): EitherT[F, E, A] =
           fa[F](()).leftFlatMap(e ⇒ f(e).apply[F](()))
       }
 
@@ -300,7 +325,7 @@ abstract class MonadicalEitherArrow[E <: Throwable] {
   /**
    * Lifts point functions into Bijection.
    */
-  def liftPointB[A,B](direct: A ⇒ Point[B], inverse: B ⇒ Point[A]): Bijection[A,B] =
+  def liftPointB[A, B](direct: A ⇒ Point[B], inverse: B ⇒ Point[A]): Bijection[A, B] =
     Bijection(liftFuncPoint(direct), liftFuncPoint(inverse))
 
   /**

core/src/test/scala/fluence/codec/PureCodecPointLawsSpec.scala

@@ -24,6 +24,7 @@ import cats.laws.discipline.{MonadErrorTests, SemigroupalTests}
 import cats.tests.CatsSuite
 import fluence.codec
 import org.scalacheck.Arbitrary
+import org.scalacheck.Arbitrary._
 import org.scalacheck.ScalacheckShapeless._
 
 class PureCodecPointLawsSpec extends CatsSuite {

project/plugins.sbt

@@ -1,16 +1,16 @@
-addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.5.1")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.0")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.15")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.20")
 
-addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.0.0")
+addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.2.0")
 
-addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.19")
+addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.20")
 
-addSbtPlugin("org.scala-js"       % "sbt-scalajs"              % "0.6.26")
+addSbtPlugin("org.scala-js"       % "sbt-scalajs"              % "0.6.27")
 addSbtPlugin("org.portable-scala" % "sbt-crossproject"         % "0.6.0")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")
 
-addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.13.1")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.14.0")
 
 addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2")