Either Bimonad and tests

diagram.drawio

@@ -1 +1 @@
-<mxfile host="Electron" modified="2023-11-10T09:00:49.425Z" agent="5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/18.0.0 Chrome/100.0.4896.143 Electron/18.2.0 Safari/537.36" etag="0HwG-3LoDtaVi8Qi3jfV" version="18.0.0" type="device" pages="2"><diagram id="tPDxc9v9lSpUtl4Dx5MV" name="Initial Big Picture">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</diagram><diagram id="tC56nJd8TbMdIFzj_9b9" name="Tasks">3Zldc6IwFIZ/jTO7F92BIIiXar92tp3ujrbb7l0kAbIGwoQo2l+/QaF8BGe6U21qrwxvEiDPeT1wQs+aROsrDpPwliFMe8BA65513gPABENX/uTKZqcMzcFOCDhBxaBKmJJnXIhGoS4JwmljoGCMCpI0RY/FMfZEQ4Ocs6w5zGe0edUEBlgRph6kqvqbIBHuVBcMKv0akyAsr2w6w11PBMvBxUrSECKW1STromdNOGNi14rWE0xzeCWX3bzLPb0vN8ZxLF4z4Rf5hSxnNb/7M8ses4enK+qTs+IsK0iXxYJ7wKHyfONQdjlB3prBdJGWsjx/1VOKSVuY87Yi59VGbXmITQlZ4PX2kiKiUjBlMxWcLfCEUcalErNYjhz7hNKWlCbQI3EgBbs6mrFECmeShzXOQiLwVOr5pTLpUamxFeY+3cYiJAjhWGqcLWOEc1TGyx3W2ZagMJc3W5MK1leYRVjwjRxS9DpF2Avfm1ZxnFUuMoeFFtYdVPoFFs4NXk5dBVc2ivj+R6yBEuvzHGI7GBUJcw+/WpwOAGrQBAW6QIEOUM6xOFkKp584RrnLdKMC9kdj1VdYzRhi2kH1rY8GylZATXFEAgkmgXT7rCJi8zZu9fTYAxaysYv6Si6VPS6YW45zlH9vXztoRwF9C4MIHhSt7/vA87rQImfu2AdC65hNthbQzXaw38Snb11Lu3Vd1bosZnLK6Xu3r927QwXu93glsy6UawTGDZSFwgliBk3MpjHUzbkMfA305TL2hFz+6WJuudkxtFNWC7fm+wQ9OGnXw92k567dtw9VNbVI26Z20mrZNEoSuvlEbtafM9SSK2dMPCjICn8e0gP9pNWCrUb6gvOTTtOtp6Hrasetln0PkBIEhQQJjBEN8JzDo6RrLcSH+omr9d8YegvK9O/etLPBu25K3M9/DEckMXyyvk+eB/zv5vGpY/d3SqKE4oY1ZzgVh/WmlvLOfs8K5PJ6NH5OfWORBDPAQrS8u8k6aI92mz4l4vbe+ZcIJnLGJOEMLT0BvurJEAryjsC8vkIx3/MZ2BkH9YWuXgnuicU3IoPxGfgD7fzVl71bFkN0iPz8JlTt3fVjbgjJw+rL37av9v3UuvgH</diagram></mxfile>
+<mxfile host="Electron" modified="2023-11-16T11:43:56.111Z" agent="5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/18.0.0 Chrome/100.0.4896.143 Electron/18.2.0 Safari/537.36" etag="444dfJYiJO0FIwbymHir" version="18.0.0" type="device" pages="2"><diagram id="tPDxc9v9lSpUtl4Dx5MV" name="Initial Big Picture">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</diagram><diagram id="6xRRs3RZ4DW2yEBKhSM9" name="Page-2">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</diagram></mxfile>

src/main/scala/mycats/instances/Either.scala

@@ -1,17 +1,10 @@
 package mycats.instances
+import mycats.lib.morphisms.bi.BiFunctor
 import mycats.lib.morphisms.error.MonadError
 import mycats.lib.obj.Semigroup
 
 object Either {
-  implicit def eitherMonadErrorInstance[E](implicit semiOfE:Semigroup[E]) = new MonadError[({type F[C] = Either[E,C]})#F,E] {
-
-    override def ensure[A](fa:  Either[E, A])(error:  =>E)(predicate:  A => Boolean): Either[E, A] = ensureOr(fa)(_=>error)(predicate)
-
-    override def ensureOr[A](fa:  Either[E, A])(error:  A => E)(predicate:  A => Boolean): Either[E, A] = fa match {
-      case p@Right(value) if predicate(value) => p
-      case Right(value) => Left(error(value))
-      case p=>p
-    }
+  implicit def eitherMonadErrorInstance[E] = new MonadError[({type F[C] = Either[E,C]})#F,E] with BiFunctor[Either] {
 
     override def adaptError[A](fa:  Either[E, A])(pf:  PartialFunction[E, E]): Either[E, A] = fa match {
       case Left(value) => Left(pf.orElse[E,E]({case e=>e})(value))
@@ -36,10 +29,15 @@ object Either {
       case (Right(f),Right(a))=>Right(f(a))
       case (Left(f),_)=>Left(f)
       case (_,Left(a))=>Left(a)
-      case (Left(f),Left(a))=>Left(semiOfE.combine(f,a))
 
     }
 
     override def map[A, B](fa:  Either[E, A])(f:  A => B): Either[E, B] = flatMap(fa)(f andThen pure)
-  }
+
+    override def bimap[A, B, C, D](fab:  Either[A, B])(fac:  A => C)(fbd:  B => D): Either[C, D] =
+      fab match {
+        case Left(value) => Left(fac(value))
+        case Right(value) => Right(fbd(value))
+      }
+    }
 }

src/main/scala/mycats/lib/morphisms/error/MonadError.scala

@@ -2,8 +2,9 @@ package mycats.lib.morphisms.error
 import mycats.lib.morphisms.Monad
 
 trait MonadError[F[_],E] extends ApplicativeError[F,E] with Monad[F]{
-  def ensure[A](fa:F[A])(error: =>E)(predicate:A=>Boolean):F[A]
-  def ensureOr[A](fa:F[A])(error: A=>E)(predicate:A=>Boolean):F[A]
+  def ensure[A](fa:F[A])(error: =>E)(predicate:A=>Boolean):F[A] = ???
+  def ensureOr[A](fa:F[A])(error: A=>E)(predicate:A=>Boolean):F[A] =
+    flatMap[A,A](fa)(v => if(predicate(v)) pure(v) else raiseError[A](error(v)))
 
   def adaptError[A](fa:F[A])(pf:PartialFunction[E,E]):F[A]
   def rethrow[A,EE<:E](fa:F[Either[EE,A]]):F[A]