- async map error

bluehands · Feb 9, 2024 · 3d2915a · 3d2915a
1 parent 15bf5b4
commit 3d2915a
Show file tree

Hide file tree

Showing 11 changed files with 106 additions and 22 deletions.
diff --git a/Source/FunicularSwitch.Generators.Templates/ResultType.cs b/Source/FunicularSwitch.Generators.Templates/ResultType.cs
@@ -317,8 +317,14 @@ public static Task<MyResult<T1>> Map<T, T1>(
             Func<T, Task<T1>> bind)
             => Bind(result, async v => MyResult.Ok(await bind(v).ConfigureAwait(false)));
 
-        public static MyResult<T> MapError<T>(this MyResult<T> result, Func<MyError, MyError> mapError) =>
-            result.Match(ok => ok, error => MyResult.Error<T>(mapError(error)));
+        public static MyResult<T> MapError<T>(this MyResult<T> result, Func<MyError, MyError> mapError)
+        {
+            if (result is MyResult<T>.Error_ e)
+                return MyResult.Error<T>(mapError(e.Details));
+            return result;
+        }
+
+        public static async Task<MyResult<T>> MapError<T>(this Task<MyResult<T>> result, Func<MyError, MyError> mapError) => (await result.ConfigureAwait(false)).MapError(mapError);
 
         #endregion
 

diff --git a/...tch.Generators/FunicularSwitch.Generators.ResultTypeGenerator/FunicularSwitch.Result.g.cs b/...tch.Generators/FunicularSwitch.Generators.ResultTypeGenerator/FunicularSwitch.Result.g.cs
@@ -317,8 +317,14 @@ public static Task<Result<T1>> Map<T, T1>(
             Func<T, Task<T1>> bind)
             => Bind(result, async v => Result.Ok(await bind(v).ConfigureAwait(false)));
 
-        public static Result<T> MapError<T>(this Result<T> result, Func<String, String> mapError) =>
-            result.Match(ok => ok, error => Result.Error<T>(mapError(error)));
+        public static Result<T> MapError<T>(this Result<T> result, Func<String, String> mapError)
+        {
+            if (result is Result<T>.Error_ e)
+                return Result.Error<T>(mapError(e.Details));
+            return result;
+        }
+
+        public static async Task<Result<T>> MapError<T>(this Task<Result<T>> result, Func<String, String> mapError) => (await result.ConfigureAwait(false)).MapError(mapError);
 
         #endregion
 

diff --git a/...h.Generators.ResultTypeGenerator/FunicularSwitch.Generators.Consumer.OperationResult.g.cs b/...h.Generators.ResultTypeGenerator/FunicularSwitch.Generators.Consumer.OperationResult.g.cs
@@ -317,8 +317,14 @@ public static Task<OperationResult<T1>> Map<T, T1>(
             Func<T, Task<T1>> bind)
             => Bind(result, async v => OperationResult.Ok(await bind(v).ConfigureAwait(false)));
 
-        public static OperationResult<T> MapError<T>(this OperationResult<T> result, Func<Error, Error> mapError) =>
-            result.Match(ok => ok, error => OperationResult.Error<T>(mapError(error)));
+        public static OperationResult<T> MapError<T>(this OperationResult<T> result, Func<Error, Error> mapError)
+        {
+            if (result is OperationResult<T>.Error_ e)
+                return OperationResult.Error<T>(mapError(e.Details));
+            return result;
+        }
+
+        public static async Task<OperationResult<T>> MapError<T>(this Task<OperationResult<T>> result, Func<Error, Error> mapError) => (await result.ConfigureAwait(false)).MapError(mapError);
 
         #endregion
 

diff --git a/...ularSwitch.Generators.ResultTypeGenerator/FunicularSwitch.Generators.Consumer.Result.g.cs b/...ularSwitch.Generators.ResultTypeGenerator/FunicularSwitch.Generators.Consumer.Result.g.cs
@@ -317,8 +317,14 @@ public static Task<Result<T1>> Map<T, T1>(
             Func<T, Task<T1>> bind)
             => Bind(result, async v => Result.Ok(await bind(v).ConfigureAwait(false)));
 
-        public static Result<T> MapError<T>(this Result<T> result, Func<String, String> mapError) =>
-            result.Match(ok => ok, error => Result.Error<T>(mapError(error)));
+        public static Result<T> MapError<T>(this Result<T> result, Func<String, String> mapError)
+        {
+            if (result is Result<T>.Error_ e)
+                return Result.Error<T>(mapError(e.Details));
+            return result;
+        }
+
+        public static async Task<Result<T>> MapError<T>(this Task<Result<T>> result, Func<String, String> mapError) => (await result.ConfigureAwait(false)).MapError(mapError);
 
         #endregion
 

diff --git a/Source/Tests/FunicularSwitch.Generators.Consumer/ResultSpecs.cs b/Source/Tests/FunicularSwitch.Generators.Consumer/ResultSpecs.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using FluentAssertions;
@@ -60,11 +61,28 @@ public void EqualityOperators()
         [TestMethod]
         public void Map()
         {
-            Result.Ok(42).Map(r => r * 2).Should().Equal(Result.Ok(84));
+            Blubs(() => Console.Write("Hallo"));
+
+            Result.Ok(42).Map(r =>
+            {
+                return r * 2;
+            }).Should().Equal(Result.Ok(84));
             var error = Result.Error<int>("oh no");
             error.Map(r => r * 2).Should().Equal(error);
         }
 
+        [DebuggerNonUserCode]
+        void Blubs(Action bla)
+        {
+            Blubs2([DebuggerNonUserCode]() => bla());
+        }
+
+        [DebuggerNonUserCode]
+        void Blubs2(Action bla)
+        {
+            bla();
+        }
+
         [TestMethod]
         public void Bind()
         {

diff --git a/...ult_type_generator.For_enum_error_type#FunicularSwitch.Test.OperationResult.g.verified.cs b/...ult_type_generator.For_enum_error_type#FunicularSwitch.Test.OperationResult.g.verified.cs
@@ -318,8 +318,14 @@ public static Task<OperationResult<T1>> Map<T, T1>(
             Func<T, Task<T1>> bind)
             => Bind(result, async v => OperationResult.Ok(await bind(v).ConfigureAwait(false)));
 
-        public static OperationResult<T> MapError<T>(this OperationResult<T> result, Func<MyError, MyError> mapError) =>
-            result.Match(ok => ok, error => OperationResult.Error<T>(mapError(error)));
+        public static OperationResult<T> MapError<T>(this OperationResult<T> result, Func<MyError, MyError> mapError)
+        {
+            if (result is OperationResult<T>.Error_ e)
+                return OperationResult.Error<T>(mapError(e.Details));
+            return result;
+        }
+
+        public static async Task<OperationResult<T>> MapError<T>(this Task<OperationResult<T>> result, Func<MyError, MyError> mapError) => (await result.ConfigureAwait(false)).MapError(mapError);
 
         #endregion
 

diff --git a/...s/Run_result_type_generator.For_enum_error_type#FunicularSwitch.Test.Result.g.verified.cs b/...s/Run_result_type_generator.For_enum_error_type#FunicularSwitch.Test.Result.g.verified.cs
@@ -318,8 +318,14 @@ public static Task<Result<T1>> Map<T, T1>(
             Func<T, Task<T1>> bind)
             => Bind(result, async v => Result.Ok(await bind(v).ConfigureAwait(false)));
 
-        public static Result<T> MapError<T>(this Result<T> result, Func<String, String> mapError) =>
-            result.Match(ok => ok, error => Result.Error<T>(mapError(error)));
+        public static Result<T> MapError<T>(this Result<T> result, Func<String, String> mapError)
+        {
+            if (result is Result<T>.Error_ e)
+                return Result.Error<T>(mapError(e.Details));
+            return result;
+        }
+
+        public static async Task<Result<T>> MapError<T>(this Task<Result<T>> result, Func<String, String> mapError) => (await result.ConfigureAwait(false)).MapError(mapError);
 
         #endregion
 

diff --git a/....For_error_type_in_different_namespace#FunicularSwitch.Test.OperationResult.g.verified.cs b/....For_error_type_in_different_namespace#FunicularSwitch.Test.OperationResult.g.verified.cs
@@ -319,8 +319,14 @@ public static Task<OperationResult<T1>> Map<T, T1>(
             Func<T, Task<T1>> bind)
             => Bind(result, async v => OperationResult.Ok(await bind(v).ConfigureAwait(false)));
 
-        public static OperationResult<T> MapError<T>(this OperationResult<T> result, Func<MyError, MyError> mapError) =>
-            result.Match(ok => ok, error => OperationResult.Error<T>(mapError(error)));
+        public static OperationResult<T> MapError<T>(this OperationResult<T> result, Func<MyError, MyError> mapError)
+        {
+            if (result is OperationResult<T>.Error_ e)
+                return OperationResult.Error<T>(mapError(e.Details));
+            return result;
+        }
+
+        public static async Task<OperationResult<T>> MapError<T>(this Task<OperationResult<T>> result, Func<MyError, MyError> mapError) => (await result.ConfigureAwait(false)).MapError(mapError);
 
         #endregion
 

diff --git a/...pe_generator.For_error_type_with_merge#FunicularSwitch.Test.OperationResult.g.verified.cs b/...pe_generator.For_error_type_with_merge#FunicularSwitch.Test.OperationResult.g.verified.cs
@@ -318,8 +318,14 @@ public static Task<OperationResult<T1>> Map<T, T1>(
             Func<T, Task<T1>> bind)
             => Bind(result, async v => OperationResult.Ok(await bind(v).ConfigureAwait(false)));
 
-        public static OperationResult<T> MapError<T>(this OperationResult<T> result, Func<MyError, MyError> mapError) =>
-            result.Match(ok => ok, error => OperationResult.Error<T>(mapError(error)));
+        public static OperationResult<T> MapError<T>(this OperationResult<T> result, Func<MyError, MyError> mapError)
+        {
+            if (result is OperationResult<T>.Error_ e)
+                return OperationResult.Error<T>(mapError(e.Details));
+            return result;
+        }
+
+        public static async Task<OperationResult<T>> MapError<T>(this Task<OperationResult<T>> result, Func<MyError, MyError> mapError) => (await result.ConfigureAwait(false)).MapError(mapError);
 
         #endregion
 

diff --git a/...ype_generator.For_internal_result_type#FunicularSwitch.Test.OperationResult.g.verified.cs b/...ype_generator.For_internal_result_type#FunicularSwitch.Test.OperationResult.g.verified.cs
@@ -318,8 +318,14 @@ public static Task<OperationResult<T1>> Map<T, T1>(
             Func<T, Task<T1>> bind)
             => Bind(result, async v => OperationResult.Ok(await bind(v).ConfigureAwait(false)));
 
-        public static OperationResult<T> MapError<T>(this OperationResult<T> result, Func<MyError, MyError> mapError) =>
-            result.Match(ok => ok, error => OperationResult.Error<T>(mapError(error)));
+        public static OperationResult<T> MapError<T>(this OperationResult<T> result, Func<MyError, MyError> mapError)
+        {
+            if (result is OperationResult<T>.Error_ e)
+                return OperationResult.Error<T>(mapError(e.Details));
+            return result;
+        }
+
+        public static async Task<OperationResult<T>> MapError<T>(this Task<OperationResult<T>> result, Func<MyError, MyError> mapError) => (await result.ConfigureAwait(false)).MapError(mapError);
 
         #endregion
 

diff --git a/Source/Tests/FunicularSwitch.Test/ResultSpecs.cs b/Source/Tests/FunicularSwitch.Test/ResultSpecs.cs
@@ -118,9 +118,7 @@ public void OptionResultConversion()
         errorLogged.Should().BeTrue();
     }
 
-    class Something
-    {
-    }
+    class Something;
 
     [TestMethod]
     public void AsTest()
@@ -302,4 +300,18 @@ public async Task TryTest()
             return Result.Ok(42 / zero);
         }, e => e.Message)).Should().BeOfType<Result<int>.Error_>();
     }
+
+    [TestMethod]
+    public async Task MapErrorTest()
+    {
+        Result.Error<int>("error").MapError(e => e + "2").Should().BeError().Subject.Should().Be("error2");
+
+        async Task<Result<int>> ProduceError()
+        {
+            await Task.Delay(1);
+            return Result.Error<int>("error");
+        }
+
+        (await ProduceError().MapError(e => e + "2")).Should().BeError().Subject.Should().Be("error2");
+    }
 }