Release: v10.0.44

CR.Exceptions.AspNet.Tests/Component/LogLevelMapTests.cs

@@ -1,5 +1,4 @@
-using CR.Exceptions.AspNet.Mapping;
-using CR.Exceptions.Tests.Shared;
+using CR.Exceptions.Tests.Shared;
 using Microsoft.Extensions.Logging;
 
 namespace CR.Exceptions.AspNet.Tests.Component;

CR.Exceptions.AspNet.Tests/Component/StatusCodeMapTests.cs

@@ -1,5 +1,4 @@
-using CR.Exceptions.AspNet.Mapping;
-using CR.Exceptions.Tests.Shared;
+using CR.Exceptions.Tests.Shared;
 using Microsoft.AspNetCore.Http;
 
 namespace CR.Exceptions.AspNet.Tests.Component;

CR.Exceptions.AspNet.Tests/Unit/LogLevelMapBuilderTests.cs

@@ -1,5 +1,4 @@
-using CR.Exceptions.AspNet.Mapping;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace CR.Exceptions.AspNet.Tests.Unit;
 

CR.Exceptions.AspNet.Tests/Unit/StatusCodeMapBuilderTests.cs

@@ -1,5 +1,4 @@
-using CR.Exceptions.AspNet.Mapping;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 
 namespace CR.Exceptions.AspNet.Tests.Unit;
 

CR.Exceptions.AspNet/CrExceptionHandler.cs

@@ -1,5 +1,4 @@
-using CR.Exceptions.AspNet.Mapping;
-using Microsoft.AspNetCore.Diagnostics;
+using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;

CR.Exceptions.AspNet/Mapping/LogLevelMap.cs

@@ -1,9 +1,8 @@
-using CR.Exceptions.Mapping;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using System.Collections.Frozen;
 using System.Diagnostics.CodeAnalysis;
 
-namespace CR.Exceptions.AspNet.Mapping;
+namespace CR.Exceptions.AspNet;
 
 public class LogLevelMap : TypeMap<LogLevel>
 {

CR.Exceptions.AspNet/Mapping/LogLevelMapBuilder.cs

@@ -1,7 +1,6 @@
-using CR.Exceptions.Mapping;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 
-namespace CR.Exceptions.AspNet.Mapping;
+namespace CR.Exceptions.AspNet;
 
 public class LogLevelMapBuilder : MapBuilder<Type, LogLevel>
 {

CR.Exceptions.AspNet/Mapping/LogLevelMapBuilderExtensions.cs

@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging;
 
-namespace CR.Exceptions.AspNet.Mapping;
+namespace CR.Exceptions.AspNet;
 
 public static class LogLevelMapBuilderExtensions
 {

CR.Exceptions.AspNet/Mapping/StatusCodeMap.cs

@@ -1,8 +1,7 @@
-using CR.Exceptions.Mapping;
-using System.Collections.Frozen;
+using System.Collections.Frozen;
 using System.Diagnostics.CodeAnalysis;
 
-namespace CR.Exceptions.AspNet.Mapping;
+namespace CR.Exceptions.AspNet;
 
 public class StatusCodeMap : TypeMap<int>
 {

CR.Exceptions.AspNet/Mapping/StatusCodeMapBuilder.cs

@@ -1,7 +1,6 @@
-using CR.Exceptions.Mapping;
-using System.Net;
+using System.Net;
 
-namespace CR.Exceptions.AspNet.Mapping;
+namespace CR.Exceptions.AspNet;
 
 public class StatusCodeMapBuilder : MapBuilder<Type, int>
 {

CR.Exceptions.AspNet/Mapping/StatusCodeMapBuilderExtensions.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Http;
 
-namespace CR.Exceptions.AspNet.Mapping;
+namespace CR.Exceptions.AspNet;
 
 public static class StatusCodeMapBuilderExtensions
 {

CR.Exceptions.AspNet/ServiceCollectionExtensions.cs

@@ -1,5 +1,4 @@
-using CR.Exceptions.AspNet.Mapping;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace CR.Exceptions.AspNet;
 

CR.Exceptions.Tests.Shared/TestUnknownException.cs

@@ -6,5 +6,5 @@ public sealed class TestUnknownException : CrException
 {
     private static readonly ImmutableArray<CrError> _errors = [new("TestUnknownCode", "TestUnknownMessage")];
 
-    public TestUnknownException() : base(_errors, "Test unknown exception message") { }
+    public TestUnknownException(Exception? innerException = null) : base(_errors, "Test unknown exception message", innerException) { }
 }

CR.Exceptions.Tests/Component/ExceptionFactoryTests.cs

@@ -1,5 +1,4 @@
-using CR.Exceptions.Mapping;
-using CR.Exceptions.Tests.Shared;
+using CR.Exceptions.Tests.Shared;
 
 namespace CR.Exceptions.Tests.Component;
 
@@ -9,7 +8,7 @@
     private const string NonExistentCode = "non_existent_code";
 
     [Fact]
     public void TryCreate_ShouldReturn_TrueAndException_WhenCodeExists()
     {
         var factory = GetDefaultFactory(ExistentCode);
         var result = factory.TryCreate(ExistentCode, out var exception);
@@ -20,7 +19,7 @@
     }
 
     [Fact]
     public void TryCreate_ShouldReturn_FalseAndNull_WhenCodeDoesNotExist()
     {
         var factory = GetDefaultFactory("?");
         var result = factory.TryCreate(NonExistentCode, out var exception);
@@ -30,7 +29,7 @@
     }
 
     [Fact]
     public void Create_ShouldReturn_Exception_WhenCodeExists()
     {
         var factory = GetDefaultFactory(ExistentCode);
         var exception = factory.Create(ExistentCode);

CR.Exceptions.Tests/Component/ExceptionTranslatorTests.cs

@@ -1,5 +1,4 @@
-using CR.Exceptions.Mapping;
-using CR.Exceptions.Tests.Shared;
+using CR.Exceptions.Tests.Shared;
 
 namespace CR.Exceptions.Tests.Component;
 
@@ -9,7 +8,7 @@
     private static readonly TestUnknownException NonExistentException = new();
 
     [Fact]
     public void TryTranslate_ShouldReturn_TrueAndException_WhenExceptionExists()
     {
         var translator = GetDefaultTranslator();
         var result = translator.TryTranslate(ExistentException, out var exception);
@@ -20,7 +19,7 @@
     }
 
     [Fact]
     public void TryTranslate_ShouldReturn_FalseAndNull_WhenExceptionDoesNotExist()
     {
         var translator = GetDefaultTranslator();
         var result = translator.TryTranslate(NonExistentException, out var exception);
@@ -30,7 +29,7 @@
     }
 
     [Fact]
     public void Translate_ShouldReturn_Exception_WhenExceptionExists()
     {
         var translator = GetDefaultTranslator();
         var exception = translator.Translate(ExistentException);
@@ -40,7 +39,7 @@
     }
 
     [Fact]
     public void Translate_ShouldThrow_WhenExceptionDoesNotExist()
     {
         var translator = GetDefaultTranslator();
 
@@ -50,7 +49,7 @@
     private static ExceptionTranslator GetDefaultTranslator()
     {
         return new ExceptionTranslatorBuilder()
-            .Map<TestInternalException>(() => new TestUnknownException())
+            .Map<TestInternalException>(ex => new TestUnknownException(ex))
             .Build();
     }
 }

CR.Exceptions.Tests/Unit/ExceptionFactoryBuilderTests.cs

@@ -1,12 +1,11 @@
-using CR.Exceptions.Mapping;
-using CR.Exceptions.Tests.Shared;
+using CR.Exceptions.Tests.Shared;
 
 namespace CR.Exceptions.Tests.Unit;
 
 public sealed class ExceptionFactoryBuilderTests
 {
     [Fact]
     public void Map_ShouldThrow_WhenDuplicateRegistered()
     {
         const string code = "duplicate";
 

CR.Exceptions.Tests/Unit/ExceptionTranslatorBuilderTests.cs

@@ -1,16 +1,15 @@
-using CR.Exceptions.Mapping;
-using CR.Exceptions.Tests.Shared;
+using CR.Exceptions.Tests.Shared;
 
 namespace CR.Exceptions.Tests.Unit;
 
 public sealed class ExceptionTranslatorBuilderTests
 {
     [Fact]
     public void Map_ShouldThrow_WhenDuplicateRegistered()
     {
         var builder = new ExceptionTranslatorBuilder()
-            .Map<TestInternalException>(() => new TestUnknownException());
+            .Map<TestInternalException>(ex => new TestUnknownException(ex));
 
-        Assert.ThrowsAny<ArgumentException>(() => builder.Map<TestInternalException>(() => new TestUnknownException()));
+        Assert.ThrowsAny<ArgumentException>(() => builder.Map<TestInternalException>(ex => new TestUnknownException(ex)));
     }
 }

CR.Exceptions/CrException.cs

@@ -1,5 +1,4 @@
-using CR.Exceptions.Extensions;
-using System.Collections.Immutable;
+using System.Collections.Immutable;
 
 namespace CR.Exceptions;
 

CR.Exceptions/Extensions/ImmutableArrayExtensions.cs

@@ -1,7 +1,7 @@
 using System.Collections.Immutable;
 using System.Runtime.CompilerServices;
 
-namespace CR.Exceptions.Extensions;
+namespace CR.Exceptions;
 
 internal static class ImmutableArrayExtensions
 {

CR.Exceptions/Mapping/ExceptionFactory.cs

@@ -1,16 +1,20 @@
-using CR.Exceptions.Extensions;
-using System.Collections.Frozen;
+using System.Collections.Frozen;
 using System.Diagnostics.CodeAnalysis;
 
-namespace CR.Exceptions.Mapping;
+namespace CR.Exceptions;
 
 public class ExceptionFactory : Map<string, Func<CrException>>
 {
     internal ExceptionFactory(FrozenDictionary<string, Func<CrException>> dictionary) : base(dictionary) { }
 
     public CrException Create(string code)
-        => GetValue(code).ToResult();
+        => ExecuteFactory(GetValue(code));
 
     public bool TryCreate(string code, [MaybeNullWhen(false)] out CrException exception)
-        => (exception = TryGetValue(code, out var factory) ? factory.ToResult() : null) != null;
+        => (exception = TryGetValue(code, out var factory) ? ExecuteFactory(factory) : null) != null;
+
+    private static CrException ExecuteFactory(Func<CrException> factory)
+    {
+        return factory() ?? throw new InvalidOperationException($"{nameof(factory)} '{factory.Method.Name}' returned null.");
+    }
 }

CR.Exceptions/Mapping/ExceptionFactoryBuilder.cs

@@ -1,4 +1,4 @@
-namespace CR.Exceptions.Mapping;
+namespace CR.Exceptions;
 
 public class ExceptionFactoryBuilder : MapBuilder<string, Func<CrException>>
 {

CR.Exceptions/Mapping/ExceptionTranslator.cs

@@ -1,16 +1,22 @@
-using CR.Exceptions.Extensions;
-using System.Collections.Frozen;
+using System.Collections.Frozen;
 using System.Diagnostics.CodeAnalysis;
 
-namespace CR.Exceptions.Mapping;
+namespace CR.Exceptions;
 
-public class ExceptionTranslator : TypeMap<Func<CrException>>
+public class ExceptionTranslator : TypeMap<Func<Exception, CrException>>
 {
-    internal ExceptionTranslator(FrozenDictionary<Type, Func<CrException>> dictionary) : base(dictionary) { }
+    internal ExceptionTranslator(FrozenDictionary<Type, Func<Exception, CrException>> dictionary) : base(dictionary) { }
 
-    public CrException Translate(CrException exception)
-        => GetByHierarchy(exception.GetType()).ToResult();
+    public CrException Translate(Exception exception)
+        => ExecuteTranslator(exception, GetByHierarchy(exception.GetType()));
 
-    public bool TryTranslate(CrException exception, [MaybeNullWhen(false)] out CrException translated)
-        => (translated = TryGetByHierarchy(exception.GetType(), out var translator) ? translator.ToResult() : null) != null;
+    public bool TryTranslate(Exception exception, [MaybeNullWhen(false)] out CrException translated)
+        => (translated = TryGetByHierarchy(exception.GetType(), out var translator) ? ExecuteTranslator(exception, translator) : null) != null;
+
+    private static CrException ExecuteTranslator(Exception innerException, Func<Exception, CrException> translator)
+    {
+        return
+            translator(innerException) ??
+            throw new InvalidOperationException($"{nameof(translator)} '{translator.Method.Name}' returned null.");
+    }
 }

CR.Exceptions/Mapping/ExceptionTranslatorBuilder.cs

@@ -1,8 +1,8 @@
-namespace CR.Exceptions.Mapping;
+namespace CR.Exceptions;
 
-public class ExceptionTranslatorBuilder : MapBuilder<Type, Func<CrException>>
+public class ExceptionTranslatorBuilder : MapBuilder<Type, Func<Exception, CrException>>
 {
-    public ExceptionTranslatorBuilder Map<TException>(Func<CrException> translator) where TException : CrException
+    public ExceptionTranslatorBuilder Map<TException>(Func<Exception, CrException> translator) where TException : Exception
     {
         AddPair(typeof(TException), translator);
         return this;

CR.Exceptions/Mapping/Map.cs

@@ -1,7 +1,7 @@
 using System.Collections.Frozen;
 using System.Diagnostics.CodeAnalysis;
 
-namespace CR.Exceptions.Mapping;
+namespace CR.Exceptions;
 
 public abstract class Map<TKey, TValue> where TKey : notnull
 {
@@ -20,6 +20,6 @@ protected TValue GetValue(TKey key)
     protected bool TryGetValue(TKey key, [MaybeNullWhen(false)] out TValue value)
         => _dictionary.TryGetValue(key, out value);
 
-    protected KeyNotFoundException CreateKeyNotFoundException(TKey key)
+    protected KeyNotFoundException CreateKeyNotFoundException(TKey? key)
         => new($"Key '{key?.ToString() ?? "null"}' in map is not found.");
 }

CR.Exceptions/Mapping/MapBuilder.cs

@@ -1,6 +1,6 @@
 using System.Collections.Frozen;
 
-namespace CR.Exceptions.Mapping;
+namespace CR.Exceptions;
 
 public abstract class MapBuilder<TKey, TValue> where TKey : notnull
 {

CR.Exceptions/Mapping/TypeMap.cs

@@ -1,7 +1,7 @@
 using System.Collections.Frozen;
 using System.Diagnostics.CodeAnalysis;
 
-namespace CR.Exceptions.Mapping;
+namespace CR.Exceptions;
 
 public abstract class TypeMap<TValue> : Map<Type, TValue>
 {

CR.Exceptions/README.md

@@ -61,13 +61,8 @@ Example:
 ```csharp
 public sealed class UserNotFoundException : NotFoundException
 {
-    public UserNotFoundException()
-        : base(
-        [
-            new CrError(
-                "IdentityUserNotFound",
-                "User was not found.")
-        ])
+    public UserNotFoundException() 
+        : base([new CrError("IdentityUserNotFound","User was not found.")])
     {
     }
 }
@@ -124,14 +119,14 @@ Registration:
 ```csharp
 ExceptionTranslator translator = new ExceptionTranslatorBuilder()
     .Map<KeycloakUserNotFoundException>(
-        static () => new UserNotFoundException())
+        static innerException => new UserNotFoundException(innerException))
     .Build();
 ```
 
 Usage:
 
 ```csharp
-catch (KeycloakUserNotFoundException ex)
+catch (Exception ex)
 {
     throw translator.Translate(ex);
 }

Directory.Build.props

@@ -1,4 +1,5 @@
 <Project>
+
   <PropertyGroup>
     <Company>apptade</Company>
     <Authors>apptade</Authors>
@@ -12,4 +13,11 @@
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <NuGetPackagePrefix>CrCore</NuGetPackagePrefix>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <AnalysisLevel>latest</AnalysisLevel>
+    <AnalysisMode>Recommended</AnalysisMode>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+  </PropertyGroup>
+
 </Project>