From b645fe8c30e505411a655e0e3fa2d19ab3ae6898 Mon Sep 17 00:00:00 2001
From: Julian Thurner <julianthurner@web.de>
Date: Tue, 13 May 2025 15:09:05 +0200
Subject: [PATCH] Refactored monad chaining methods

---
 src/DotNext/Optional.cs                   | 114 ++++++++++
 src/DotNext/Result.cs                     | 251 ++++++++++++++++++++++
 src/DotNext/Threading/Tasks/Conversion.cs |  50 +++++
 3 files changed, 415 insertions(+)

diff --git a/src/DotNext/Optional.cs b/src/DotNext/Optional.cs
index 25718a18a..0a4bd169d 100644
--- a/src/DotNext/Optional.cs
+++ b/src/DotNext/Optional.cs
@@ -8,6 +8,7 @@
 
 namespace DotNext;
 
+using System.Threading.Tasks;
 using Runtime.CompilerServices;
 using Intrinsics = Runtime.Intrinsics;
 
@@ -58,6 +59,18 @@ public static async Task<T> Flatten<T>(this Task<Optional<T>> task)
     public static async Task<Optional<TOutput>> Convert<TInput, TOutput>(this Task<Optional<TInput>> task, Converter<TInput, TOutput> converter)
         => (await task.ConfigureAwait(false)).Convert(converter);
 
+    /// <summary>
+    /// If a value is present, apply the provided mapping function to it, and if the result is
+    /// non-null, return an Optional describing the result. Otherwise returns <see cref="Optional{T}.None"/>.
+    /// </summary>
+    /// <typeparam name="TInput">The type of stored in the Optional container.</typeparam>
+    /// <typeparam name="TOutput">The type of the result of the mapping function.</typeparam>
+    /// <param name="task">The task containing Optional value.</param>
+    /// <param name="converter">A mapping function to be applied to the value, if present.</param>
+    /// <returns>An Optional describing the result of applying a mapping function to the value of this Optional, if a value is present, otherwise <see cref="Optional{T}.None"/>.</returns>
+    public static async Task<Optional<TOutput>> Convert<TInput, TOutput>(this Task<Optional<TInput>> task, Converter<TInput, Optional<TOutput>> converter)
+        => (await task.ConfigureAwait(false)).Convert(converter);
+
     /// <summary>
     /// If a value is present, apply the provided mapping function to it, and if the result is
     /// non-null, return an Optional describing the result. Otherwise, returns <see cref="Optional{T}.None"/>.
@@ -79,6 +92,66 @@ public static async Task<Optional<TOutput>> Convert<TInput, TOutput>(this Task<O
                 : Optional<TOutput>.None;
     }
 
+    /// <summary>
+    /// If a value is present, apply the provided mapping function to it, and if the result is
+    /// non-null, return an Optional describing the result. Otherwise returns <see cref="Optional{T}.None"/>.
+    /// </summary>
+    /// <typeparam name="TInput">The type of stored in the Optional container.</typeparam>
+    /// <typeparam name="TOutput">The type of the result of the mapping function.</typeparam>
+    /// <param name="task">The task containing Optional value.</param>
+    /// <param name="converter">A mapping function to be applied to the value, if present.</param>
+    /// <param name="token">The token that can be used to cancel the operation.</param>
+    /// <returns>An Optional describing the result of applying a mapping function to the value of this Optional, if a value is present, otherwise <see cref="Optional{T}.None"/>.</returns>
+    public static async Task<Optional<TOutput>> Convert<TInput, TOutput>(this Task<Optional<TInput>> task,
+        Func<TInput, CancellationToken, Task<Optional<TOutput>>> converter, CancellationToken token = default)
+    {
+        var optional = await task.ConfigureAwait(false);
+        return optional.HasValue
+            ? await converter.Invoke(optional.ValueOrDefault, token).ConfigureAwait(false)
+            : optional.IsNull && Intrinsics.IsNullable<TOutput>()
+                ? new(default)
+                : Optional<TOutput>.None;
+    }
+
+    /// <summary>
+    /// Creates <see cref="Result{T}"/> from <see cref="Optional{T}"/> instance.
+    /// </summary>
+    /// <param name="optional">The optional value.</param>
+    /// <returns>The converted optional value.</returns>
+    public static Result<T> ToResult<T>(this in Optional<T> optional)
+        => Result<T>.FromOptional(optional);
+
+    /// <summary>
+    /// Creates <see cref="Result{T}"/> from <see cref="Optional{T}"/> instance.
+    /// </summary>
+    /// <param name="task">The task containing Optional value.</param>
+    /// <returns>The converted optional value.</returns>
+    public static async Task<Result<T>> ToResult<T>(this Task<Optional<T>> task)
+        => Result<T>.FromOptional(await task.ConfigureAwait(false));
+
+    /// <summary>
+    /// Creates <see cref="Result{T, TError}"/> from <see cref="Optional{T}"/> instance.
+    /// </summary>
+    /// <param name="optional">The optional value.</param>
+    /// <param name="error">The error code to apply if the value is not present.</param>
+    /// <returns>The converted optional value.</returns>
+    public static Result<T, TError> ToResult<T, TError>(this in Optional<T> optional, TError error)
+        where TError : struct, Enum
+        => optional.HasValue ? new(optional.Value) : new(error);
+
+    /// <summary>
+    /// Creates <see cref="Result{T, TError}"/> from <see cref="Optional{T}"/> instance.
+    /// </summary>
+    /// <param name="task">The task containing Optional value.</param>
+    /// <param name="error">The error code to apply if the value is not present.</param>
+    /// <returns>The converted optional value.</returns>
+    public static async Task<Result<T, TError>> ToResult<T, TError>(this Task<Optional<T>> task, TError error)
+        where TError : struct, Enum
+    {
+        var optional = await task.ConfigureAwait(false);
+        return optional.HasValue ? new(optional.Value) : new(error);
+    }
+
     /// <summary>
     /// If a value is present, returns the value, otherwise throw exception.
     /// </summary>
@@ -609,6 +682,47 @@ public Optional<TResult> Convert<TResult>(Converter<T, Optional<TResult>> mapper
     public unsafe Optional<TResult> Convert<TResult>(delegate*<T, Optional<TResult>> mapper)
         => ConvertOptional<TResult, Supplier<T, Optional<TResult>>>(mapper);
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private async Task<Optional<TResult>> ConvertTask<TResult>(Func<T, CancellationToken, Task<TResult>> converter, CancellationToken token = default)
+        => HasValue ? await converter.Invoke(value, token).ConfigureAwait(false) : Optional<TResult>.None;
+
+    /// <summary>
+    /// If a value is present, apply the provided mapping function to it, and if the result is
+    /// non-null, return an Optional describing the result. Otherwise, returns <see cref="None"/>.
+    /// </summary>
+    /// <typeparam name="TResult">The type of the result of the mapping function.</typeparam>
+    /// <param name="mapper">A mapping function to be applied to the value, if present.</param>
+    /// <param name="token">The token that can be used to cancel the operation.</param>
+    /// <returns>An Optional describing the result of applying a mapping function to the value of this Optional, if a value is present, otherwise <see cref="None"/>.</returns>
+    public Task<Optional<TResult>> Convert<TResult>(Func<T, CancellationToken, Task<TResult>> mapper, CancellationToken token = default)
+        => ConvertTask(mapper, token);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private Task<Optional<TResult>> ConvertOptionalTask<TResult, TConverter>(TConverter converter)
+        where TConverter : struct, ISupplier<T, Task<Optional<TResult>>>
+        => HasValue ? converter.Invoke(value) : Task.FromResult(Optional<TResult>.None);
+
+    /// <summary>
+    /// If a value is present, apply the provided mapping function to it, and if the result is
+    /// non-null, return an Optional describing the result. Otherwise, returns <see cref="None"/>.
+    /// </summary>
+    /// <typeparam name="TResult">The type of the result of the mapping function.</typeparam>
+    /// <param name="mapper">A mapping function to be applied to the value, if present.</param>
+    /// <returns>An Optional describing the result of applying a mapping function to the value of this Optional, if a value is present, otherwise <see cref="None"/>.</returns>
+    public Task<Optional<TResult>> Convert<TResult>(Converter<T, Task<Optional<TResult>>> mapper)
+        => ConvertOptionalTask<TResult, DelegatingConverter<T, Task<Optional<TResult>>>>(mapper);
+
+    /// <summary>
+    /// If a value is present, apply the provided mapping function to it, and if the result is
+    /// non-null, return an Optional describing the result. Otherwise returns <see cref="None"/>.
+    /// </summary>
+    /// <typeparam name="TResult">The type of the result of the mapping function.</typeparam>
+    /// <param name="mapper">A mapping function to be applied to the value, if present.</param>
+    /// <returns>An Optional describing the result of applying a mapping function to the value of this Optional, if a value is present, otherwise <see cref="None"/>.</returns>
+    [CLSCompliant(false)]
+    public unsafe Task<Optional<TResult>> Convert<TResult>(delegate*<T, Task<Optional<TResult>>> mapper)
+        => ConvertOptionalTask<TResult, Supplier<T, Task<Optional<TResult>>>>(mapper);
+
     /// <inheritdoc cref="IFunctional{TDelegate}.ToDelegate()"/>
     Func<object?> IFunctional<Func<object?>>.ToDelegate() => Func.Constant<object?>(kind is NotEmptyValue ? value : null);
 
diff --git a/src/DotNext/Result.cs b/src/DotNext/Result.cs
index 6985974d1..d0a0d9599 100644
--- a/src/DotNext/Result.cs
+++ b/src/DotNext/Result.cs
@@ -7,6 +7,8 @@
 
 namespace DotNext;
 
+using System;
+using DotNext.Threading.Tasks;
 using Runtime.CompilerServices;
 using Intrinsics = Runtime.Intrinsics;
 
@@ -75,6 +77,98 @@ public static class Result
     /// <param name="e">The exception to be placed to the container.</param>
     /// <returns>The exception encapsulated by <see cref="Result{T}"/>.</returns>
     public static Result<T> FromException<T>(Exception e) => new(e);
+
+    /// <summary>
+    /// Creates a new instance of <see cref="Result{T, TError}"/> from the specified exception.
+    /// </summary>
+    /// <typeparam name="T">The type of the value.</typeparam>
+    /// <typeparam name="TError">The type of the error code. Default value must represent the successful result.</typeparam>
+    /// <param name="e">The error to be placed to the container.</param>
+    /// <returns>The exception encapsulated by <see cref="Result{T}"/>.</returns>
+    public static Result<T, TError> FromError<T, TError>(TError e)
+        where TError : struct, Enum
+        => new(e);
+
+    /// <summary>
+    /// If successful result is present, apply the provided mapping function hiding any exception
+    /// caused by the converter.
+    /// </summary>
+    /// <param name="task">The task containing Result value.</param>
+    /// <param name="converter">A mapping function to be applied to the value, if present.</param>
+    /// <typeparam name="T">The type of the value.</typeparam>
+    /// <typeparam name="TResult">The type of the result of the mapping function.</typeparam>
+    /// <returns>The conversion result.</returns>
+    public static AwaitableResult<TResult> Convert<T, TResult>(this AwaitableResult<T> task, Converter<T, TResult> converter)
+    {
+        async Task<TResult> ConvertInternal()
+        {
+            var result = await task.ConfigureAwait(false);
+            var conversionResult = result.Convert(converter);
+            return conversionResult.IsSuccessful ? conversionResult.Value : throw conversionResult.Error;
+        }
+
+        return ConvertInternal().SuspendException();
+    }
+
+    /// <summary>
+    /// If successful result is present, apply the provided mapping function. If not,
+    /// forward the exception.
+    /// </summary>
+    /// <param name="task">The task containing Result value.</param>
+    /// <param name="converter">A mapping function to be applied to the value, if present.</param>
+    /// <typeparam name="T">The type of the value.</typeparam>
+    /// <typeparam name="TResult">The type of the result of the mapping function.</typeparam>
+    /// <returns>The conversion result.</returns>
+    public static AwaitableResult<TResult> Convert<T, TResult>(this AwaitableResult<T> task, Converter<T, Result<TResult>> converter)
+    {
+        async Task<TResult> ConvertInternal()
+        {
+            var result = await task.ConfigureAwait(false);
+            var conversionResult = result.Convert(converter);
+            return conversionResult.IsSuccessful ? conversionResult.Value : throw conversionResult.Error;
+        }
+
+        return ConvertInternal().SuspendException();
+    }
+
+    /// <summary>
+    /// If successful result is present, apply the provided mapping function. If not,
+    /// forward the exception.
+    /// </summary>
+    /// <param name="task">The task containing Result value.</param>
+    /// <param name="converter">A mapping function to be applied to the value, if present.</param>
+    /// <param name="token">The token that can be used to cancel the operation.</param>
+    /// <typeparam name="T">The type of the value.</typeparam>
+    /// <typeparam name="TResult">The type of the result of the mapping function.</typeparam>
+    /// <returns>The conversion result.</returns>
+    public static AwaitableResult<TResult> Convert<T, TResult>(this AwaitableResult<T> task,
+        Func<T, CancellationToken, Task<TResult>> converter, CancellationToken token = default)
+    {
+        async Task<TResult> ConvertInternal()
+        {
+            var result = await task.ConfigureAwait(false);
+            return result.IsSuccessful
+                ? await converter.Invoke(result.ValueOrDefault!, token).ConfigureAwait(false)
+                : throw result.Error;
+        }
+
+        return ConvertInternal().SuspendException();
+    }
+
+    /// <summary>
+    /// Converts the awaitable Result into a task holding <see cref="Optional{T}"/>.
+    /// </summary>
+    /// <returns>A task holding an Option monad representing value in this monad.</returns>
+    public static async Task<Optional<T>> TryGet<T>(this AwaitableResult<T> awaitableResult)
+        => (await awaitableResult.ConfigureAwait(false)).TryGet();
+
+    /// <summary>
+    /// Converts the awaitable Result into a task holding <see cref="Optional{T}"/>.
+    /// </summary>
+    /// <returns>A task holding an Option monad representing value in this monad.</returns>
+    public static async Task<Optional<T>> TryGet<T, TError>(this AwaitableResult<T, TError> awaitableResult)
+        where TError: struct, Enum
+        => (await awaitableResult.ConfigureAwait(false)).TryGet();
 }
 
 /// <summary>
@@ -202,6 +296,77 @@ private Result<TResult> Convert<TResult, TConverter>(TConverter converter)
         return result;
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private Result<TResult> ConvertResult<TResult, TConverter>(TConverter converter)
+        where TConverter : struct, ISupplier<T, Result<TResult>>
+    {
+        Result<TResult> result;
+        if (exception is null)
+        {
+            try
+            {
+                result = converter.Invoke(value);
+            }
+            catch (Exception e)
+            {
+                result = new(e);
+            }
+        }
+        else
+        {
+            result = new(exception);
+        }
+
+        return result;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private AwaitableResult<TResult> ConvertTask<TResult>(Func<T, CancellationToken, Task<TResult>> converter, CancellationToken token = default)
+    {
+        AwaitableResult<TResult> result;
+        if (exception is null)
+        {
+            try
+            {
+                result = converter.Invoke(value, token).SuspendException();
+            }
+            catch (Exception e)
+            {
+                result = new(Task.FromException<TResult>(e));
+            }
+        }
+        else
+        {
+            result = new(Task.FromException<TResult>(exception.SourceException));
+        }
+
+        return result;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private AwaitableResult<TResult> ConvertAwaitableResult<TResult, TConverter>(TConverter converter)
+        where TConverter : struct, ISupplier<T, AwaitableResult<TResult>>
+    {
+        AwaitableResult<TResult> result;
+        if (exception is null)
+        {
+            var valueCopy = value;
+            async Task<TResult> GetConversionResult()
+            {
+                var conversionResult = await converter.Invoke(valueCopy).ConfigureAwait(false);
+                return conversionResult.IsSuccessful ? conversionResult.Value : throw conversionResult.Error;
+            }
+
+            result = new(GetConversionResult());
+        }
+        else
+        {
+            result = new(Task.FromException<TResult>(exception.SourceException));
+        }
+
+        return result;
+    }
+
     /// <summary>
     /// If the successful result is present, apply the provided mapping function hiding any exception
     /// caused by the converter.
@@ -212,6 +377,37 @@ private Result<TResult> Convert<TResult, TConverter>(TConverter converter)
     public Result<TResult> Convert<TResult>(Converter<T, TResult> converter)
         => Convert<TResult, DelegatingConverter<T, TResult>>(converter);
 
+    /// <summary>
+    /// If successful result is present, apply the provided mapping function. If not,
+    /// forward the exception.
+    /// </summary>
+    /// <param name="converter">A mapping function to be applied to the value, if present.</param>
+    /// <typeparam name="TResult">The type of the result of the mapping function.</typeparam>
+    /// <returns>The conversion result.</returns>
+    public Result<TResult> Convert<TResult>(Converter<T, Result<TResult>> converter)
+        => ConvertResult<TResult, DelegatingConverter<T, Result<TResult>>>(converter);
+
+    /// <summary>
+    /// If successful result is present, apply the provided mapping function. If not,
+    /// forward the exception.
+    /// </summary>
+    /// <param name="converter">A mapping function to be applied to the value, if present.</param>
+    /// <typeparam name="TResult">The type of the result of the mapping function.</typeparam>
+    /// <param name="token">The token that can be used to cancel the operation.</param>
+    /// <returns>The conversion result.</returns>
+    public AwaitableResult<TResult> Convert<TResult>(Func<T, CancellationToken, Task<TResult>> converter, CancellationToken token = default)
+        => ConvertTask(converter, token);
+
+    /// <summary>
+    /// If successful result is present, apply the provided mapping function. If not,
+    /// forward the exception.
+    /// </summary>
+    /// <param name="converter">A mapping function to be applied to the value, if present.</param>
+    /// <typeparam name="TResult">The type of the result of the mapping function.</typeparam>
+    /// <returns>The conversion result.</returns>
+    public AwaitableResult<TResult> Convert<TResult>(Converter<T, AwaitableResult<TResult>> converter)
+        => ConvertAwaitableResult<TResult, DelegatingConverter<T, AwaitableResult<TResult>>>(converter);
+
     /// <summary>
     /// If the successful result is present, apply the provided mapping function hiding any exception
     /// caused by the converter.
@@ -223,6 +419,28 @@ public Result<TResult> Convert<TResult>(Converter<T, TResult> converter)
     public unsafe Result<TResult> Convert<TResult>(delegate*<T, TResult> converter)
         => Convert<TResult, Supplier<T, TResult>>(converter);
 
+    /// <summary>
+    /// If successful result is present, apply the provided mapping function. If not,
+    /// forward the exception.
+    /// </summary>
+    /// <param name="converter">A mapping function to be applied to the value, if present.</param>
+    /// <typeparam name="TResult">The type of the result of the mapping function.</typeparam>
+    /// <returns>The conversion result.</returns>
+    [CLSCompliant(false)]
+    public unsafe Result<TResult> Convert<TResult>(delegate*<T, Result<TResult>> converter)
+        => ConvertResult<TResult, Supplier<T, Result<TResult>>>(converter);
+
+    /// <summary>
+    /// If successful result is present, apply the provided mapping function. If not,
+    /// forward the exception.
+    /// </summary>
+    /// <param name="converter">A mapping function to be applied to the value, if present.</param>
+    /// <typeparam name="TResult">The type of the result of the mapping function.</typeparam>
+    /// <returns>The conversion result.</returns>
+    [CLSCompliant(false)]
+    public unsafe AwaitableResult<TResult> Convert<TResult>(delegate*<T, AwaitableResult<TResult>> converter)
+        => ConvertAwaitableResult<TResult, Supplier<T, AwaitableResult<TResult>>>(converter);
+
     /// <summary>
     /// Attempts to extract value from the container if it is present.
     /// </summary>
@@ -323,6 +541,13 @@ public ValueTask<T> AsTask()
             { } error => ValueTask.FromException<T>(error),
         };
 
+    /// <summary>
+    /// Converts this result to <see cref="AwaitableResult{TResult}"/>.
+    /// </summary>
+    /// <returns>The awaitable Result representing the result.</returns>
+    public AwaitableResult<T> ToAwaitable()
+        => IsSuccessful ? new(Task.FromResult(value)) : new(Task.FromException<T>(Error));
+
     /// <summary>
     /// Converts the result to <see cref="Task{TResult}"/>.
     /// </summary>
@@ -534,6 +759,11 @@ private Result<TResult, TError> Convert<TResult, TConverter>(TConverter converte
         where TConverter : struct, ISupplier<T, TResult>
         => IsSuccessful ? new(converter.Invoke(value)) : new(Error);
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private Result<TResult, TError> ConvertResult<TResult, TConverter>(TConverter converter)
+        where TConverter : struct, ISupplier<T, Result<TResult, TError>>
+        => IsSuccessful ? converter.Invoke(value) : new(Error);
+
     /// <summary>
     /// If the successful result is present, apply the provided mapping function hiding any exception
     /// caused by the converter.
@@ -544,6 +774,16 @@ private Result<TResult, TError> Convert<TResult, TConverter>(TConverter converte
     public Result<TResult, TError> Convert<TResult>(Converter<T, TResult> converter)
         => Convert<TResult, DelegatingConverter<T, TResult>>(converter);
 
+    /// <summary>
+    /// If successful result is present, apply the provided mapping function. If not,
+    /// forward the error.
+    /// </summary>
+    /// <param name="converter">A mapping function to be applied to the value, if present.</param>
+    /// <typeparam name="TResult">The type of the result of the mapping function.</typeparam>
+    /// <returns>The conversion result.</returns>
+    public Result<TResult, TError> Convert<TResult>(Converter<T, Result<TResult, TError>> converter)
+        => ConvertResult<TResult, DelegatingConverter<T, Result<TResult, TError>>>(converter);
+
     /// <summary>
     /// If the successful result is present, apply the provided mapping function hiding any exception
     /// caused by the converter.
@@ -555,6 +795,17 @@ public Result<TResult, TError> Convert<TResult>(Converter<T, TResult> converter)
     public unsafe Result<TResult, TError> Convert<TResult>(delegate*<T, TResult> converter)
         => Convert<TResult, Supplier<T, TResult>>(converter);
 
+    /// <summary>
+    /// If successful result is present, apply the provided mapping function. If not,
+    /// forward the error.
+    /// </summary>
+    /// <param name="converter">A mapping function to be applied to the value, if present.</param>
+    /// <typeparam name="TResult">The type of the result of the mapping function.</typeparam>
+    /// <returns>The conversion result.</returns>
+    [CLSCompliant(false)]
+    public unsafe Result<TResult, TError> Convert<TResult>(delegate*<T, Result<TResult, TError>> converter)
+        => ConvertResult<TResult, Supplier<T, Result<TResult, TError>>>(converter);
+
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private T OrInvoke<TSupplier>(TSupplier defaultFunc)
         where TSupplier : struct, ISupplier<T>
diff --git a/src/DotNext/Threading/Tasks/Conversion.cs b/src/DotNext/Threading/Tasks/Conversion.cs
index 80be9e90c..f6f8cbbf1 100644
--- a/src/DotNext/Threading/Tasks/Conversion.cs
+++ b/src/DotNext/Threading/Tasks/Conversion.cs
@@ -3,6 +3,7 @@
 
 namespace DotNext.Threading.Tasks;
 
+using System.Threading.Tasks;
 using Runtime.CompilerServices;
 
 /// <summary>
@@ -20,6 +21,16 @@ public static class Conversion
     public static Task<TOutput> Convert<TInput, TOutput>(this Task<TInput> task)
         where TInput : TOutput => task.Convert(Converter.Identity<TInput, TOutput>());
 
+    /// <summary>
+    /// Converts one type of <see cref="AwaitableResult{T}"/> into another.
+    /// </summary>
+    /// <typeparam name="TInput">The source Result type.</typeparam>
+    /// <typeparam name="TOutput">The target Result type.</typeparam>
+    /// <param name="awaitableResult">The awaitable Result to convert.</param>
+    /// <returns>The converted task.</returns>
+    public static AwaitableResult<TOutput> Convert<TInput, TOutput>(this AwaitableResult<TInput> awaitableResult)
+        where TInput : TOutput => awaitableResult.Convert(Converter.Identity<TInput, TOutput>());
+
     /// <summary>
     /// Converts one type of task into another.
     /// </summary>
@@ -31,6 +42,25 @@ public static Task<TOutput> Convert<TInput, TOutput>(this Task<TInput> task)
     public static async Task<TOutput> Convert<TInput, TOutput>(this Task<TInput> task, Converter<TInput, TOutput> converter)
         => converter(await task.ConfigureAwait(false));
 
+    /// <summary>
+    /// Converts one type of <see cref="AwaitableResult{T}"/> into another.
+    /// </summary>
+    /// <typeparam name="TInput">The source Result type.</typeparam>
+    /// <typeparam name="TOutput">The target Result type.</typeparam>
+    /// <param name="awaitableResult">The awaitable Result to convert.</param>
+    /// <param name="converter">Non-blocking conversion function.</param>
+    /// <returns>The converted task.</returns>
+    public static AwaitableResult<TOutput> Convert<TInput, TOutput>(this AwaitableResult<TInput> awaitableResult, Converter<TInput, TOutput> converter)
+    {
+        async Task<TOutput> ConvertInternal()
+        {
+            var result = await awaitableResult.ConfigureAwait(false);
+            return result.IsSuccessful ? converter(result.Value) : throw result.Error;
+        }
+
+        return ConvertInternal().SuspendException();
+    }
+
     /// <summary>
     /// Converts value type into nullable value type.
     /// </summary>
@@ -53,6 +83,26 @@ public static async Task<TOutput> Convert<TInput, TOutput>(this Task<TInput> tas
     public static async Task<TOutput> Convert<TInput, TOutput>(this Task<TInput> task, Converter<TInput, Task<TOutput>> converter)
         => await converter(await task.ConfigureAwait(false)).ConfigureAwait(false);
 
+    /// <summary>
+    /// Converts one type of <see cref="AwaitableResult{T}"/> into another.
+    /// </summary>
+    /// <typeparam name="TInput">The source Result type.</typeparam>
+    /// <typeparam name="TOutput">The target Result type.</typeparam>
+    /// <param name="awaitableResult">The awaitable Result to convert.</param>
+    /// <param name="converter">Asynchronous conversion function.</param>
+    /// <returns>The converted task.</returns>
+    public static AwaitableResult<TOutput> Convert<TInput, TOutput>(this AwaitableResult<TInput> awaitableResult, Converter<TInput, AwaitableResult<TOutput>> converter)
+    {
+        async Task<TOutput> ConvertInternal()
+        {
+            var result = await awaitableResult.ConfigureAwait(false);
+            var conversionResult = result.IsSuccessful ? await converter(result.Value).ConfigureAwait(false) : throw result.Error;
+            return conversionResult.IsSuccessful ? conversionResult.Value : throw conversionResult.Error;
+        }
+
+        return ConvertInternal().SuspendException();
+    }
+
     /// <summary>
     /// Allows to convert <see cref="Task{TResult}"/> of unknown result type into dynamically
     /// typed task which result can be obtained as <see cref="object"/>