omlish 0.0.0.dev58__tar.gz → 0.0.0.dev59__tar.gz

{omlish-0.0.0.dev58/omlish.egg-info → omlish-0.0.0.dev59}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev58
+Version: 0.0.0.dev59
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev58 → omlish-0.0.0.dev59}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev58'
-__revision__ = 'aae9a0f7439a053a6e5c2105ff299991d37335ac'
+__version__ = '0.0.0.dev59'
+__revision__ = 'ecad0399fc2d42f679cc344ed7e3c8fd556025ef'
 
 
 #

{omlish-0.0.0.dev58 → omlish-0.0.0.dev59}/omlish/marshal/__init__.py

@@ -39,11 +39,6 @@ from .forbidden import (  # noqa
     ForbiddenTypeUnmarshalerFactory,
 )
 
-from .naming import (  # noqa
-    Naming,
-    translate_name,
-)
-
 from .global_ import (  # noqa
     GLOBAL_REGISTRY,
 
@@ -57,6 +52,16 @@ from .helpers import (  # noqa
     update_object_metadata,
 )
 
+from .naming import (  # noqa
+    Naming,
+    translate_name,
+)
+
+from .nop import (  # noqa
+    NOP_MARSHALER_UNMARSHALER,
+    NopMarshalerUnmarshaler,
+)
+
 from .objects import (  # noqa
     FieldInfo,
     FieldInfos,

omlish-0.0.0.dev59/omlish/marshal/nop.py

@@ -0,0 +1,18 @@
+import typing as ta
+
+from .base import MarshalContext
+from .base import Marshaler
+from .base import UnmarshalContext
+from .base import Unmarshaler
+from .values import Value
+
+
+class NopMarshalerUnmarshaler(Marshaler, Unmarshaler):
+    def marshal(self, ctx: MarshalContext, o: ta.Any) -> Value:
+        return o  # noqa
+
+    def unmarshal(self, ctx: UnmarshalContext, v: Value) -> ta.Any:
+        return v
+
+
+NOP_MARSHALER_UNMARSHALER = NopMarshalerUnmarshaler()

{omlish-0.0.0.dev58 → omlish-0.0.0.dev59}/omlish/marshal/primitives.py

@@ -1,5 +1,10 @@
+"""
+TODO:
+ - field-configurable coercion
+"""
 import typing as ta
 
+from .. import dataclasses as dc
 from .base import MarshalContext
 from .base import Marshaler
 from .base import TypeMapMarshalerFactory
@@ -25,24 +30,29 @@ PRIMITIVE_TYPES: tuple[type, ...] = (
 ##
 
 
+@dc.dataclass(frozen=True)
 class PrimitiveMarshalerUnmarshaler(Marshaler, Unmarshaler):
+    ty: type
+
     def marshal(self, ctx: MarshalContext, o: ta.Any) -> Value:
-        if isinstance(o, PRIMITIVE_TYPES):
+        if isinstance(o, self.ty):
             return o  # type: ignore
+        if isinstance(o, PRIMITIVE_TYPES):
+            return self.ty(o)
         raise TypeError(o)
 
     def unmarshal(self, ctx: UnmarshalContext, v: Value) -> ta.Any:
-        if isinstance(v, PRIMITIVE_TYPES):
+        if isinstance(v, self.ty):
             return v
+        if isinstance(v, PRIMITIVE_TYPES):
+            return self.ty(v)
         raise TypeError(v)
 
 
-PRIMITIVE_MARSHALER_UNMARSHALER = PrimitiveMarshalerUnmarshaler()
-
 PRIMITIVE_MARSHALER_FACTORY = TypeMapMarshalerFactory({  # noqa
-    t: PRIMITIVE_MARSHALER_UNMARSHALER for t in PRIMITIVE_TYPES
+    t: PrimitiveMarshalerUnmarshaler(t) for t in PRIMITIVE_TYPES
 })
 
 PRIMITIVE_UNMARSHALER_FACTORY = TypeMapUnmarshalerFactory({  # noqa
-    t: PRIMITIVE_MARSHALER_UNMARSHALER for t in PRIMITIVE_TYPES
+    t: PrimitiveMarshalerUnmarshaler(t) for t in PRIMITIVE_TYPES
 })

{omlish-0.0.0.dev58 → omlish-0.0.0.dev59/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev58
+Version: 0.0.0.dev59
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev58 → omlish-0.0.0.dev59}/omlish.egg-info/SOURCES.txt

@@ -312,6 +312,7 @@ omlish/marshal/iterables.py
 omlish/marshal/mappings.py
 omlish/marshal/maybes.py
 omlish/marshal/naming.py
+omlish/marshal/nop.py
 omlish/marshal/numbers.py
 omlish/marshal/objects.py
 omlish/marshal/optionals.py

{omlish-0.0.0.dev58 → omlish-0.0.0.dev59}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '~=3.12'
-version = '0.0.0.dev58'
+version = '0.0.0.dev59'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',