dycw-utilities 0.111.0__tar.gz → 0.111.1__tar.gz

{dycw_utilities-0.111.0 → dycw_utilities-0.111.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.111.0
+Version: 0.111.1
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12

{dycw_utilities-0.111.0 → dycw_utilities-0.111.1}/pyproject.toml

@@ -94,7 +94,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.111.0"
+version = "0.111.1"
 
 [project.optional-dependencies]
 test = [
@@ -337,7 +337,7 @@ zzz-test-zoneinfo = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.111.0"
+current_version = "0.111.1"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.111.0 → dycw_utilities-0.111.1}/src/tests/test_parse.py

@@ -300,6 +300,43 @@ class TestSerializeAndParseObject:
 
 
 class TestParseObject:
+    @given(text=sampled_from(["F_a_l_s_e", "T_r_u_e"]))
+    def test_bool_custom(self, *, text: str) -> None:
+        def parser(text: str, /) -> bool:
+            match text:
+                case "F_a_l_s_e":
+                    return False
+                case "T_r_u_e":
+                    return True
+                case _:
+                    raise ImpossibleCaseError(case=[f"{text=}"])
+
+        bool_ = parse_object(bool, text, extra={bool: parser})
+        match text:
+            case "F_a_l_s_e":
+                expected = False
+            case "T_r_u_e":
+                expected = True
+            case _:
+                raise ImpossibleCaseError(case=[f"{text=}"])
+        assert bool_ is expected
+
+    @given(text=sampled_from(["F_a_l_s_e", "T_r_u_e"]))
+    def test_bool_extra_not_used(self, *, text: str) -> None:
+        def parser(text: str, /) -> bool:
+            match text:
+                case "F_a_l_s_e":
+                    return False
+                case "T_r_u_e":
+                    return True
+                case _:
+                    raise ImpossibleCaseError(case=[f"{text=}"])
+
+        with raises(
+            _ParseObjectParseError, match="Unable to parse <class 'bool'>; got '.*'"
+        ):
+            _ = parse_object(bool, text, extra={int: parser})
+
     def test_error_bool(self) -> None:
         with raises(
             _ParseObjectParseError,
@@ -531,6 +568,32 @@ class TestParseObject:
 
 
 class TestSerializeObject:
+    @given(bool_=booleans())
+    def test_bool_custom(self, *, bool_: bool) -> None:
+        def serializer(bool_: bool, /) -> str:  # noqa: FBT001
+            match bool_:
+                case True:
+                    return "1"
+                case False:
+                    return "0"
+
+        serialized = serialize_object(bool_, extra={bool: serializer})
+        match bool_:
+            case True:
+                expected = "1"
+            case False:
+                expected = "0"
+        assert serialized == expected
+
+    @given(bool_=booleans())
+    def test_bool_extra_not_used(self, *, bool_: bool) -> None:
+        def serializer(int_: int, /) -> str:
+            return f"({int_})"
+
+        serialized = serialize_object(bool_, extra={int: serializer})
+        expected = str(bool_)
+        assert serialized == expected
+
     @given(int_=integers())
     def test_type_with_extra(self, *, int_: int) -> None:
         obj = DataClassFutureInt(int_=int_)

{dycw_utilities-0.111.0 → dycw_utilities-0.111.1}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.111.0"
+__version__ = "0.111.1"

{dycw_utilities-0.111.0 → dycw_utilities-0.111.1}/src/utilities/parse.py

@@ -60,15 +60,15 @@ def parse_object(
     extra: ParseObjectExtra | None = None,
 ) -> Any:
     """Parse text."""
+    if extra is not None:
+        return _parse_object_extra(type_, text, extra)
     if type_ is None:
         try:
             return parse_none(text)
         except ParseNoneError:
             raise _ParseObjectParseError(type_=type_, text=text) from None
     if isinstance(type_, type):
-        return _parse_object_type(
-            type_, text, case_sensitive=case_sensitive, extra=extra
-        )
+        return _parse_object_type(type_, text, case_sensitive=case_sensitive)
     if is_dict_type(type_):
         return _parse_object_dict_type(
             type_,
@@ -146,17 +146,12 @@ def parse_object(
             extra=extra,
         )
     if is_union_type(type_):
-        return _parse_object_union_type(type_, text, extra=extra)
+        return _parse_object_union_type(type_, text)
     raise _ParseObjectParseError(type_=type_, text=text) from None
 
 
 def _parse_object_type(
-    cls: type[Any],
-    text: str,
-    /,
-    *,
-    case_sensitive: bool = False,
-    extra: ParseObjectExtra | None = None,
+    cls: type[Any], text: str, /, *, case_sensitive: bool = False
 ) -> Any:
     """Parse text."""
     if issubclass(cls, NoneType):
@@ -226,17 +221,6 @@ def _parse_object_type(
             return parse_timedelta(text)
         except ParseTimedeltaError:
             raise _ParseObjectParseError(type_=cls, text=text) from None
-    if extra is not None:
-        try:
-            parser = one(p for c, p in extra.items() if issubclass(cls, c))
-        except OneEmptyError:
-            pass
-        except OneNonUniqueError as error:
-            raise _ParseObjectExtraNonUniqueError(
-                type_=cls, text=text, first=error.first, second=error.second
-            ) from None
-        else:
-            return parser(text)
     raise _ParseObjectParseError(type_=cls, text=text)
 
 
@@ -296,6 +280,21 @@ def _parse_object_dict_type(
         raise _ParseObjectParseError(type_=type_, text=text) from None
 
 
+def _parse_object_extra(cls: Any, text: str, extra: ParseObjectExtra, /) -> Any:
+    try:
+        parser = one(
+            p for c, p in extra.items() if (cls is c) or is_subclass_gen(cls, c)
+        )
+    except OneEmptyError:
+        raise _ParseObjectParseError(type_=cls, text=text) from None
+    except OneNonUniqueError as error:
+        raise _ParseObjectExtraNonUniqueError(
+            type_=cls, text=text, first=error.first, second=error.second
+        ) from None
+    else:
+        return parser(text)
+
+
 def _parse_object_list_type(
     type_: Any,
     text: str,
@@ -368,9 +367,7 @@ def _parse_object_set_type(
         raise _ParseObjectParseError(type_=type_, text=text) from None
 
 
-def _parse_object_union_type(
-    type_: Any, text: str, /, *, extra: ParseObjectExtra | None = None
-) -> Any:
+def _parse_object_union_type(type_: Any, text: str, /) -> Any:
     if type_ is Number:
         try:
             return parse_number(text)
@@ -383,13 +380,6 @@ def _parse_object_union_type(
             return parse_duration(text)
         except ParseDurationError:
             raise _ParseObjectParseError(type_=type_, text=text) from None
-    if extra is not None:
-        try:
-            parser = one(p for c, p in extra.items() if c is type_)
-        except OneEmptyError:
-            pass
-        else:
-            return parser(text)
     raise _ParseObjectParseError(type_=type_, text=text) from None
 
 
@@ -466,6 +456,9 @@ def serialize_object(
     extra: SerializeObjectExtra | None = None,
 ) -> str:
     """Convert an object to text."""
+    if extra is not None:
+        with suppress(_SerializeObjectSerializeError):
+            return _serialize_object_extra(obj, extra)
     if (obj is None) or isinstance(
         obj, bool | int | float | str | Path | Sentinel | Version
     ):
@@ -504,8 +497,6 @@ def serialize_object(
         return _serialize_object_set(
             obj, list_separator=list_separator, pair_separator=pair_separator
         )
-    if extra is not None:
-        return _serialize_object_extra(obj, extra)
     raise _SerializeObjectSerializeError(obj=obj)
 
 
@@ -537,10 +528,7 @@ def _serialize_object_dict(
 def _serialize_object_extra(obj: Any, extra: SerializeObjectExtra, /) -> str:
     try:
         serializer = one(
-            s
-            for c, s in extra.items()
-            if (isinstance(c, type) and isinstance(obj, c))
-            or isinstance(obj, get_args(c))
+            s for c, s in extra.items() if (obj is c) or is_instance_gen(obj, c)
         )
     except OneEmptyError:
         raise _SerializeObjectSerializeError(obj=obj) from None