dycw-utilities 0.110.4__tar.gz → 0.110.5__tar.gz

{dycw_utilities-0.110.4 → dycw_utilities-0.110.5}/PKG-INFO

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

{dycw_utilities-0.110.4 → dycw_utilities-0.110.5}/pyproject.toml

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

{dycw_utilities-0.110.4 → dycw_utilities-0.110.5}/src/tests/test_parse.py

@@ -61,11 +61,11 @@ from utilities.version import Version
 
 
 class TestSerializeAndParseObject:
-    @given(value=booleans())
-    def test_bool(self, *, value: bool) -> None:
-        serialized = serialize_object(value)
+    @given(bool_=booleans())
+    def test_bool(self, *, bool_: bool) -> None:
+        serialized = serialize_object(bool_)
         result = parse_object(bool, serialized)
-        assert result is value
+        assert result is bool_
 
     @given(date=dates())
     def test_date(self, *, date: dt.date) -> None:
@@ -79,11 +79,11 @@ class TestSerializeAndParseObject:
         result = parse_object(dt.datetime, serialized)
         assert result == datetime
 
-    @given(value=dictionaries(dates(), zoned_datetimes()))
-    def test_dict(self, *, value: dict[dt.date, dt.datetime]) -> None:
-        serialized = serialize_object(value)
+    @given(mapping=dictionaries(dates(), zoned_datetimes()))
+    def test_dict(self, *, mapping: dict[dt.date, dt.datetime]) -> None:
+        serialized = serialize_object(mapping)
         result = parse_object(dict[dt.date, dt.datetime], serialized)
-        assert result == value
+        assert result == mapping
 
     @given(duration=datetime_durations(two_way=True))
     def test_duration(self, *, duration: Duration) -> None:
@@ -97,22 +97,22 @@ class TestSerializeAndParseObject:
         result = parse_object(TruthEnum, serialized)
         assert result is truth
 
-    @given(value=integers())
-    def test_extra_type(self, *, value: int) -> None:
-        serialized = serialize_object(value)
+    @given(int_=integers())
+    def test_extra_type(self, *, int_: int) -> None:
+        serialized = serialize_object(int_)
         result = parse_object(
             DataClassFutureInt,
             serialized,
             extra={DataClassFutureInt: lambda text: DataClassFutureInt(int_=int(text))},
         )
-        expected = DataClassFutureInt(int_=value)
+        expected = DataClassFutureInt(int_=int_)
         assert result == expected
 
-    @given(value=floats())
-    def test_float(self, *, value: float) -> None:
-        serialized = serialize_object(value)
+    @given(float_=floats())
+    def test_float(self, *, float_: float) -> None:
+        serialized = serialize_object(float_)
         result = parse_object(float, serialized)
-        assert is_equal(result, value)
+        assert is_equal(result, float_)
 
     @given(values=frozensets(dates()))
     def test_frozenset(self, *, values: frozenset[dt.date]) -> None:
@@ -120,11 +120,11 @@ class TestSerializeAndParseObject:
         result = parse_object(frozenset[dt.date], serialized)
         assert result == values
 
-    @given(value=integers())
-    def test_int(self, *, value: int) -> None:
-        serialized = serialize_object(value)
+    @given(int_=integers())
+    def test_int(self, *, int_: int) -> None:
+        serialized = serialize_object(int_)
         result = parse_object(int, serialized)
-        assert result == value
+        assert result == int_
 
     @given(values=lists(dates()))
     def test_list(self, *, values: list[dt.date]) -> None:
@@ -193,11 +193,11 @@ class TestSerializeAndParseObject:
         result = parse_object(int | None, serialized)
         assert result is None
 
-    @given(value=integers())
-    def test_nullable_int_int(self, *, value: int) -> None:
-        serialized = serialize_object(value)
+    @given(int_=integers())
+    def test_nullable_int_int(self, *, int_: int) -> None:
+        serialized = serialize_object(int_)
         result = parse_object(int | None, serialized)
-        assert result == value
+        assert result == int_
 
     def test_sentinel(self) -> None:
         serialized = serialize_object(sentinel)
@@ -238,58 +238,58 @@ class TestSerializeAndParseObject:
         result = parse_object(TrueOrFalseFutureTypeLit, truth)
         assert result == truth
 
-    @given(value=integers())
-    def test_type_union_with_extra(self, *, value: int) -> None:
+    @given(int_=integers())
+    def test_type_union_with_extra(self, *, int_: int) -> None:
         def parser(text: str, /) -> DataClassFutureIntEvenOrOddTypeUnion:
-            value = int(text)
-            match value % 2:
+            int_ = int(text)
+            match int_ % 2:
                 case 0:
-                    return DataClassFutureIntEven(even_int=value)
+                    return DataClassFutureIntEven(even_int=int_)
                 case 1:
-                    return DataClassFutureIntOdd(odd_int=value)
+                    return DataClassFutureIntOdd(odd_int=int_)
                 case _:
-                    raise ImpossibleCaseError(case=[f"{value=}"])
+                    raise ImpossibleCaseError(case=[f"{int_=}"])
 
-        serialized = serialize_object(value)
+        serialized = serialize_object(int_)
         result = parse_object(
             DataClassFutureIntEvenOrOddTypeUnion,
             serialized,
             extra={DataClassFutureIntEvenOrOddTypeUnion: parser},
         )
-        match value % 2:
+        match int_ % 2:
             case 0:
-                expected = DataClassFutureIntEven(even_int=value)
+                expected = DataClassFutureIntEven(even_int=int_)
             case 1:
-                expected = DataClassFutureIntOdd(odd_int=value)
+                expected = DataClassFutureIntOdd(odd_int=int_)
             case _:
-                raise ImpossibleCaseError(case=[f"{value=}"])
+                raise ImpossibleCaseError(case=[f"{int_=}"])
         assert result == expected
 
-    @given(value=integers())
-    def test_union_with_extra(self, *, value: int) -> None:
+    @given(int_=integers())
+    def test_union_with_extra(self, *, int_: int) -> None:
         def parser(text: str, /) -> DataClassFutureIntEvenOrOddUnion:
-            value = int(text)
-            match value % 2:
+            int_ = int(text)
+            match int_ % 2:
                 case 0:
-                    return DataClassFutureIntEven(even_int=value)
+                    return DataClassFutureIntEven(even_int=int_)
                 case 1:
-                    return DataClassFutureIntOdd(odd_int=value)
+                    return DataClassFutureIntOdd(odd_int=int_)
                 case _:
-                    raise ImpossibleCaseError(case=[f"{value=}"])
+                    raise ImpossibleCaseError(case=[f"{int_=}"])
 
-        serialized = serialize_object(value)
+        serialized = serialize_object(int_)
         result = parse_object(
             DataClassFutureIntEvenOrOddUnion,
             serialized,
             extra={DataClassFutureIntEvenOrOddUnion: parser},
         )
-        match value % 2:
+        match int_ % 2:
             case 0:
-                expected = DataClassFutureIntEven(even_int=value)
+                expected = DataClassFutureIntEven(even_int=int_)
             case 1:
-                expected = DataClassFutureIntOdd(odd_int=value)
+                expected = DataClassFutureIntOdd(odd_int=int_)
             case _:
-                raise ImpossibleCaseError(case=[f"{value=}"])
+                raise ImpossibleCaseError(case=[f"{int_=}"])
         assert result == expected
 
     @given(version=versions())
@@ -355,15 +355,15 @@ class TestParseObject:
         ):
             _ = parse_object(DataClassFutureInt, "invalid", extra={})
 
-    @given(value=integers())
-    def test_error_extra_non_unique(self, *, value: int) -> None:
+    @given(int_=integers())
+    def test_error_extra_non_unique(self, *, int_: int) -> None:
         with raises(
             _ParseObjectExtraNonUniqueError,
             match="Unable to parse <class '.*'> since `extra` must contain exactly one parent class; got <function .*>, <function .*> and perhaps more",
         ):
             _ = parse_object(
                 DataClassFutureIntChild,
-                serialize_object(value),
+                serialize_object(int_),
                 extra={
                     DataClassFutureIntParentFirst: lambda text: DataClassFutureIntChild(
                         int1=int(text), int2=0
@@ -531,6 +531,63 @@ class TestParseObject:
 
 
 class TestSerializeObject:
+    @given(int_=integers())
+    def test_type_with_extra(self, *, int_: int) -> None:
+        obj = DataClassFutureInt(int_=int_)
+
+        def serializer(obj: DataClassFutureInt, /) -> str:
+            return str(obj.int_)
+
+        serialized = serialize_object(obj, extra={DataClassFutureInt: serializer})
+        expected = str(int_)
+        assert serialized == expected
+
+    @given(int_=integers())
+    def test_type_union_with_extra(self, *, int_: int) -> None:
+        match int_ % 2:
+            case 0:
+                obj = DataClassFutureIntEven(even_int=int_)
+            case 1:
+                obj = DataClassFutureIntOdd(odd_int=int_)
+            case _:
+                raise ImpossibleCaseError(case=[f"{int_=}"])
+
+        def serializer(obj: DataClassFutureIntEvenOrOddTypeUnion, /) -> str:
+            match obj:
+                case DataClassFutureIntEven():
+                    return str(obj.even_int)
+                case DataClassFutureIntOdd():
+                    return str(obj.odd_int)
+
+        serialized = serialize_object(
+            obj, extra={DataClassFutureIntEvenOrOddTypeUnion: serializer}
+        )
+        expected = str(int_)
+        assert serialized == expected
+
+    @given(int_=integers())
+    def test_union_with_extra(self, *, int_: int) -> None:
+        match int_ % 2:
+            case 0:
+                obj = DataClassFutureIntEven(even_int=int_)
+            case 1:
+                obj = DataClassFutureIntOdd(odd_int=int_)
+            case _:
+                raise ImpossibleCaseError(case=[f"{int_=}"])
+
+        def serializer(obj: DataClassFutureIntEvenOrOddUnion, /) -> str:
+            match obj:
+                case DataClassFutureIntEven():
+                    return str(obj.even_int)
+                case DataClassFutureIntOdd():
+                    return str(obj.odd_int)
+
+        serialized = serialize_object(
+            obj, extra={DataClassFutureIntEvenOrOddUnion: serializer}
+        )
+        expected = str(int_)
+        assert serialized == expected
+
     def test_error_extra_empty(self) -> None:
         with raises(
             _SerializeObjectSerializeError,

{dycw_utilities-0.110.4 → dycw_utilities-0.110.5}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.110.4"
+__version__ = "0.110.5"

{dycw_utilities-0.110.4 → dycw_utilities-0.110.5}/src/utilities/parse.py

@@ -539,7 +539,12 @@ 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(obj, c))
+        serializer = one(
+            s
+            for c, s in extra.items()
+            if (isinstance(c, type) and isinstance(obj, c))
+            or isinstance(obj, get_args(c))
+        )
     except OneEmptyError:
         raise _SerializeObjectSerializeError(obj=obj) from None
     except OneNonUniqueError as error:

{dycw_utilities-0.110.4 → dycw_utilities-0.110.5}/src/utilities/types.py

@@ -232,7 +232,7 @@ class SupportsRound(Protocol[_T_co]):
 
 # parse
 type ParseObjectExtra = Mapping[Any, Callable[[str], Any]]
-type SerializeObjectExtra = Mapping[type[Any], Callable[[Any], str]]
+type SerializeObjectExtra = Mapping[Any, Callable[[Any], str]]
 
 
 # pathlib