soia-client 1.1.0__tar.gz → 1.1.2__tar.gz

{soia_client-1.1.0 → soia_client-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: soia-client
-Version: 1.1.0
+Version: 1.1.2
 Author-email: Tyler Fibonacci <gepheum@gmail.com>
 License: MIT License
         

{soia_client-1.1.0 → soia_client-1.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "soia-client"
-version = "1.1.0"
+version = "1.1.2"
 description = ""
 readme = "README.md"
 authors = [{ name = "Tyler Fibonacci", email = "gepheum@gmail.com" }]

{soia_client-1.1.0 → soia_client-1.1.2}/soia/_impl/enums.py

@@ -3,12 +3,11 @@ from collections.abc import Callable, Sequence
 from dataclasses import FrozenInstanceError, dataclass
 from typing import Any, Final, Union
 
+from soia import _spec, reflection
 from soia._impl.function_maker import BodyBuilder, Expr, ExprLike, Line, make_function
 from soia._impl.repr import repr_impl
 from soia._impl.type_adapter import TypeAdapter
 
-from soia import _spec, reflection
-
 
 class EnumAdapter(TypeAdapter):
     __slots__ = (
@@ -139,6 +138,13 @@ class EnumAdapter(TypeAdapter):
             kind="enum",
             id=record_id,
             fields=tuple(
+                reflection.Field(
+                    name=field.name,
+                    number=field.number,
+                    type=None,
+                )
+                for field in self.all_constant_fields if field.number != 0
+            ) + tuple(
                 reflection.Field(
                     name=field.spec.name,
                     number=field.spec.number,

{soia_client-1.1.0 → soia_client-1.1.2}/soia/_impl/structs.py

@@ -429,7 +429,7 @@ def _make_replace_method(
     """
 
     keep_local = Expr.local("KEEP", KEEP)
-    params: Params = []
+    params: Params = ["_self"]
     if fields:
         params.append("*")
     params.extend(
@@ -442,7 +442,7 @@ def _make_replace_method(
 
     def field_to_arg_assigment(attr: str) -> LineSpan:
         return LineSpan.join(
-            f"{attr}=self.{attr} if {attr} is ", keep_local, " else {attr}"
+            f"{attr}=_self.{attr} if {attr} is ", keep_local, f" else {attr}"
         )
 
     builder = BodyBuilder()
@@ -458,7 +458,7 @@ def _make_replace_method(
     )
 
     return make_function(
-        name="partial",
+        name="replace",
         params=params,
         body=builder.build(),
     )

{soia_client-1.1.0 → soia_client-1.1.2}/soia/reflection.py

@@ -109,11 +109,19 @@ class _Serializer(Generic[_T]):
     from_json: Callable[[Any], _T]
 
 
+@dataclass(frozen=True, eq=True)
+class _NoDefault:
+    pass
+
+
+_NO_DEFAULT: Final = _NoDefault()
+
+
 @dataclass(frozen=True)
 class _FieldSerializer(Generic[_T]):
     name: str
     serializer: _Serializer[_T]
-    default: Optional[_T] = None
+    default: _T | _NoDefault = _NO_DEFAULT
 
 
 def _primitive_serializer(check_type_fn: Callable[[Any], _T]) -> _Serializer[_T]:
@@ -144,7 +152,7 @@ def _dataclass_serializer(
         def field_from_json(field: _FieldSerializer) -> Any:
             value_json = json.get(field.name)
             if value_json is None:
-                if field.default is not None:
+                if field.default != _NO_DEFAULT:
                     return field.default
                 else:
                     # Will raise an exception.
@@ -196,6 +204,22 @@ def _forwarding_serializer(
     return _Serializer(to_json, from_json)
 
 
+def _optional_serializer(
+    other_serializer: _Serializer[_T],
+) -> _Serializer[Optional[_T]]:
+    def to_json(input: Optional[_T]) -> Any:
+        if input is None:
+            return None
+        return other_serializer.to_json(input)
+
+    def from_json(json: Any) -> Optional[_T]:
+        if json is None:
+            return None
+        return other_serializer.from_json(json)
+
+    return _Serializer(to_json, from_json)
+
+
 # ==============================================================================
 # INTERNAL: JSON serialization of TypeDescriptor
 # ==============================================================================
@@ -292,9 +316,10 @@ _FIELD_SERIALIZER: Final = _dataclass_serializer(
             "name",
             _primitive_serializer(str),
         ),
-        _FieldSerializer(
+        _FieldSerializer[Optional[Type]](
             "type",
-            _forwarding_serializer(_type_serializer),
+            _optional_serializer(_forwarding_serializer(_type_serializer)),
+            default=None,
         ),
         _FieldSerializer(
             "number",

{soia_client-1.1.0 → soia_client-1.1.2}/soia_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: soia-client
-Version: 1.1.0
+Version: 1.1.2
 Author-email: Tyler Fibonacci <gepheum@gmail.com>
 License: MIT License
         

{soia_client-1.1.0 → soia_client-1.1.2}/tests/test_module_initializer.py

@@ -2,11 +2,10 @@ import dataclasses
 import unittest
 from typing import Any
 
+from soia import KeyedItems, Method, Timestamp, _spec
 from soia._module_initializer import init_module
 from soia.reflection import TypeDescriptor
 
-from soia import KeyedItems, Method, Timestamp, _spec
-
 
 class ModuleInitializerTestCase(unittest.TestCase):
     def init_test_module(self) -> dict[str, Any]:
@@ -369,6 +368,12 @@ class ModuleInitializerTestCase(unittest.TestCase):
         self.assertEqual(point.x, 1.5)
         self.assertEqual(point.y, 0.0)
 
+    def test_replace(self):
+        point_cls = self.init_test_module()["Point"]
+        point = point_cls(x=1.5, y=2.5).replace(y=3.5)
+        self.assertEqual(point.x, 1.5)
+        self.assertEqual(point.y, 3.5)
+
     def test_to_mutable(self):
         point_cls = self.init_test_module()["Point"]
         point = point_cls(x=1.5, y=2.5)
@@ -1195,6 +1200,10 @@ class ModuleInitializerTestCase(unittest.TestCase):
                         "kind": "enum",
                         "id": "my/module.soia:JsonValue",
                         "fields": [
+                            {
+                                "name": "NULL",
+                                "number": 1,
+                            },
                             {
                                 "name": "bool",
                                 "type": {"kind": "primitive", "value": "bool"},