Add validation to BoundResult

ilotoki0804 · Aug 31, 2024 · a054bc5 · a054bc5
1 parent a103590
commit a054bc5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/fieldenum/enums.py b/src/fieldenum/enums.py
@@ -201,6 +201,15 @@ def bound(self) -> type[E]: ...
     def __bool__(self) -> bool:
         return isinstance(self, BoundResult.Success)
 
+    def __post_init__(self):
+        if not issubclass(self.bound, BaseException):
+            raise IncompatibleBoundError(f"{self.bound} is not an exception.")
+
+        if isinstance(self, Failed) and not isinstance(self.error, self.bound):
+            raise IncompatibleBoundError(
+                f"Bound {self.bound.__qualname__!r} is not compatible with existing error: {type(self.error).__qualname__}."
+            )
+
     @overload
     def unwrap(self) -> R: ...
 
@@ -241,10 +250,6 @@ def rebound[NewBound: BaseException](self, bound: type[NewBound], /) -> BoundRes
                 return BoundResult.Success(value, bound)
 
             case BoundResult.Failed(error, _):
-                if not isinstance(error, bound):
-                    raise IncompatibleBoundError(
-                        f"New bound {bound.__qualname__!r} is incompatible with existing error: {type(error).__qualname__}."
-                    )
                 return BoundResult.Failed(error, bound)
 
             case other:
@@ -275,10 +280,6 @@ def map[NewReturn](self, func: Callable[[R], BoundResult[NewReturn, Any] | NewRe
                 return BoundResult.Success(ok, bound)
 
             case BoundResult.Failed(error, _):
-                if not isinstance(error, bound):
-                    raise IncompatibleBoundError(
-                        f"Bound {bound.__qualname__!r} is not compatible with existing error: {type(error).__qualname__}."
-                    )
                 return BoundResult.Failed(error, bound)
 
             case other:

diff --git a/tests/test_enums.py b/tests/test_enums.py
@@ -75,7 +75,7 @@ def test_bound_result():
         BoundResult.Failed(ValueError("error"), ValueError).unwrap()
     assert BoundResult.Failed(Exception("err"), Exception).unwrap(34556) == 34556
     assert BoundResult.Success(False, Exception)
-    assert not BoundResult.Failed(True, Exception)
+    assert not BoundResult.Failed(Exception("Some exception."), Exception)
 
     assert BoundResult.Success(2342, Exception).map_as_is(str) == BoundResult.Success("2342", Exception)
     error = ValueError(123)