Add missing OrElse and GetOrElse methods to Result and Either

polyadic · Jul 11, 2023 · 2a57f66 · 2a57f66
1 parent fd8ab52
commit 2a57f66
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 3 deletions.
diff --git a/Funcky/Monads/Either/Either.Convenience.cs b/Funcky/Monads/Either/Either.Convenience.cs
@@ -16,6 +16,16 @@ public Either<TLeft, TRight> Inspect(Action<TRight> inspector)
         return this;
     }
 
+    /// <remarks>Careful! This overload discards the left value.</remarks>
+    [Pure]
+    public Either<TLeft, TRight> OrElse(Either<TLeft, TRight> fallback)
+        => Match(left: _ => fallback, right: Either<TLeft>.Return);
+
+    [Pure]
+    public Either<TLeft, TRight> OrElse(Func<TLeft, Either<TLeft, TRight>> fallback)
+        => Match(left: fallback, right: Either<TLeft>.Return);
+
+    /// <remarks>Careful! This overload discards the left value.</remarks>
     [Pure]
     public TRight GetOrElse(TRight fallback)
         => Match(left: _ => fallback, right: Identity);

diff --git a/Funcky/Monads/Result/Result.Convenience.cs b/Funcky/Monads/Result/Result.Convenience.cs
@@ -13,10 +13,26 @@ public Result<TValidResult> Inspect(Action<TValidResult> inspector)
         return this;
     }
 
+    /// <remarks>Careful! This overload discards the exception.</remarks>
+    [Pure]
+    public Result<TValidResult> OrElse(Result<TValidResult> fallback)
+        => Match(error: _ => fallback, ok: Result.Return);
+
+    [Pure]
+    public Result<TValidResult> OrElse(Func<Exception, Result<TValidResult>> fallback)
+        => Match(error: fallback, ok: Result.Return);
+
+    /// <remarks>Careful! This overload discards the exception.</remarks>
+    [Pure]
+    public TValidResult GetOrElse(TValidResult fallback)
+        => Match(error: _ => fallback, ok: Identity);
+
+    [Pure]
+    public TValidResult GetOrElse(Func<Exception, TValidResult> fallback)
+        => Match(error: fallback, ok: Identity);
+
     public TValidResult GetOrThrow()
-        => Match(
-            ok: Identity,
-            error: ThrowWithOriginalStackTrace);
+        => GetOrElse(ThrowWithOriginalStackTrace);
 
     private static TValidResult ThrowWithOriginalStackTrace(Exception exception)
     {

diff --git a/Funcky/PublicAPI.Unshipped.txt b/Funcky/PublicAPI.Unshipped.txt
@@ -1 +1,7 @@
 #nullable enable
+Funcky.Monads.Either<TLeft, TRight>.OrElse(Funcky.Monads.Either<TLeft, TRight> fallback) -> Funcky.Monads.Either<TLeft, TRight>
+Funcky.Monads.Either<TLeft, TRight>.OrElse(System.Func<TLeft, Funcky.Monads.Either<TLeft, TRight>>! fallback) -> Funcky.Monads.Either<TLeft, TRight>
+Funcky.Monads.Result<TValidResult>.GetOrElse(System.Func<System.Exception!, TValidResult>! fallback) -> TValidResult
+Funcky.Monads.Result<TValidResult>.GetOrElse(TValidResult fallback) -> TValidResult
+Funcky.Monads.Result<TValidResult>.OrElse(Funcky.Monads.Result<TValidResult> fallback) -> Funcky.Monads.Result<TValidResult>
+Funcky.Monads.Result<TValidResult>.OrElse(System.Func<System.Exception!, Funcky.Monads.Result<TValidResult>>! fallback) -> Funcky.Monads.Result<TValidResult>