Merge branch 'master' into scala3-logging-migr

tofu-tf · Apr 10, 2024 · 2278cb6 · 2278cb6
2 parents 409d56c + 1c3699f
commit 2278cb6
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 0 deletions.
diff --git a/modules/core/ce2/src/test/scala/tofu/syntax/FEitherSuite.scala b/modules/core/ce2/src/test/scala/tofu/syntax/FEitherSuite.scala
@@ -406,6 +406,31 @@ class FEitherSuite extends AnyWordSpec with Matchers {
     }
   }
 
+  "EitherFOps#foldIn" should {
+    "map left or right to C" in {
+      defaultRight.foldIn(_.length, c => c * c) mustBe Some(16)
+      defaultLeft.foldIn(c => c * c, _.length) mustBe Some(16)
+    }
+  }
+
+  "EitherFOps#foldF" should {
+    "map left or right to F[C]" in {
+      defaultRight.foldF(s => Some(s.length), c => Some(c * c)) mustBe Some(16)
+      defaultLeft.foldF(c => Some(c * c), s => Some(s.length)) mustBe Some(16)
+    }
+
+    "fold to None" in {
+      defaultRight.foldF(_ => None, _ => None) mustBe None
+      defaultLeft.foldF(_ => None, _ => None) mustBe None
+    }
+
+    "fold on None" in {
+      val emptyF = Option.empty[Either[String, Int]]
+      emptyF.foldF(_ => None, _ => None) mustBe None
+      emptyF.foldIn(_ => 1, _ => 1) mustBe None
+    }
+  }
+
   "EitherFOps#ensure" should {
 
     "return None" in {

diff --git a/modules/kernel/src/main/scala/tofu/syntax/feither.scala b/modules/kernel/src/main/scala/tofu/syntax/feither.scala
@@ -104,6 +104,14 @@ object feither {
       e.flatMap(_.wideLeft[L1].flatTraverse(f))
     }
 
+    def foldIn[C](lMap: L => C, rMap: R => C)(implicit F: Functor[F]): F[C] = {
+      e.map(_.fold(lMap, rMap))
+    }
+
+    def foldF[C](lMap: L => F[C], rMap: R => F[C])(implicit F: Monad[F]): F[C] = {
+      e.flatMap(_.fold(lMap, rMap))
+    }
+
     def swapF(implicit F: Functor[F]): F[Either[R, L]] = {
       F.map(e)(_.swap)
     }

diff --git a/modules/kernel/src/main/scala/tofu/time/TimeZone.scala b/modules/kernel/src/main/scala/tofu/time/TimeZone.scala
@@ -28,6 +28,9 @@ trait TimeZone[F[_]] {
 }
 
 object TimeZone {
+
+  def apply[F[_]](implicit tz: TimeZone[F]): TimeZone[F] = tz
+
   implicit def syncSystem[F[_]](implicit F: Delay[F]): TimeZone[F] = new TimeZone[F] {
     def system: F[ZoneId] = F.delay(ZoneId.systemDefault())