soia-client 1.1.1__py3-none-any.whl → 1.1.2__py3-none-any.whl

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/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.1.dist-info → soia_client-1.1.2.dist-info}/METADATA

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

{soia_client-1.1.1.dist-info → soia_client-1.1.2.dist-info}/RECORD

@@ -1,10 +1,10 @@
 soia/__init__.py,sha256=WPhdlu7zKBSWd4DVFWXQKQoptD0gU7xGFm4tbQHrVc8,787
 soia/_module_initializer.py,sha256=1TWnc0qUO7_iljQR2ywVERrrkY5jIkT3zucc-AYZyrQ,4221
 soia/_spec.py,sha256=Y5EHHQa6qNeJc29aaqGrFPnPFXxlL7TED9_AXUGBjf0,3663
-soia/reflection.py,sha256=U5knJGmawARCdcEhNxek4dvx48WLPETLqIqKBPWwT4Q,8771
+soia/reflection.py,sha256=SEFHNlzmWZEOQwoVUTIxzjjnbkiKSwo2rbpSU-qXhC4,9375
 soia/_impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 soia/_impl/arrays.py,sha256=C3j3RZdSvqmogbGAi3EprLkUYMFfO-IJhoCOte5blAw,5477
-soia/_impl/enums.py,sha256=jlg2YYGgMg6BMmSy0v0MBgZmZYzLvVS0j68TxOCiSm8,17039
+soia/_impl/enums.py,sha256=bpRtIWBioTGpy-oVA5Fo25RZH1TFBFzrmCXkuhZuC0k,17297
 soia/_impl/function_maker.py,sha256=MvCDv1WwzKGJzZbNCnJ_8-MP3m1xTIabumXA-9Ydd9M,5639
 soia/_impl/keep.py,sha256=GDeMKKUcvUFXWJVzBPB9CuLkcQb93sWKvo0PcyKUBzg,370
 soia/_impl/keyed_items.py,sha256=EoPrdeLJ8i7zCH-oW-7qOcyadyrzykB6lkrf3xRVmyk,337
@@ -20,8 +20,8 @@ soia/_impl/service_client.py,sha256=0WgiN6Stg548FAdZQMuezZoooe4MYw2frEQ5KUE7xag,
 soia/_impl/structs.py,sha256=1XhjZmqtD7IMURdSVR0DwMdrIhWPZft1eCfwVW84c0E,28230
 soia/_impl/timestamp.py,sha256=upnEkvW-7AaMJ9_nNqntvhJ4pFWWCAXNjEOPtszdwgE,5645
 soia/_impl/type_adapter.py,sha256=RyIyh4Fnt9rMy0HRzC-a2v2JAdZsV9FBzoGEUVygVRE,2101
-soia_client-1.1.1.dist-info/licenses/LICENSE,sha256=SaAftKkX6hfSOiPdENQPS70tifH3PDHgazq8eK2Pwfw,1064
-soia_client-1.1.1.dist-info/METADATA,sha256=WqVO1QsXh3w0mjkhuPC71WcCWlwSOnKeAX40_Mt2zFU,2121
-soia_client-1.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-soia_client-1.1.1.dist-info/top_level.txt,sha256=lsYG9JrvauFe1oIV5zvnwsS9hsx3ztwfK_937op9mxc,5
-soia_client-1.1.1.dist-info/RECORD,,
+soia_client-1.1.2.dist-info/licenses/LICENSE,sha256=SaAftKkX6hfSOiPdENQPS70tifH3PDHgazq8eK2Pwfw,1064
+soia_client-1.1.2.dist-info/METADATA,sha256=gzME6YAXgQaA0ZCoU8Psh7Tf4HlBI-mJhnWnuH4t3l8,2121
+soia_client-1.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+soia_client-1.1.2.dist-info/top_level.txt,sha256=lsYG9JrvauFe1oIV5zvnwsS9hsx3ztwfK_937op9mxc,5
+soia_client-1.1.2.dist-info/RECORD,,