omlish 0.0.0.dev269__py3-none-any.whl → 0.0.0.dev270__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev269'
-__revision__ = 'af5e4b0620a8094b2e2ddbeb4b54f37eaddc0fc2'
+__version__ = '0.0.0.dev270'
+__revision__ = 'ac26cb82cb30f878a10324fe1bf518f6a0b4b87f'
 
 
 #

omlish/bootstrap/marshal.py

@@ -10,6 +10,7 @@ def _install_standard_marshalling() -> None:
         Bootstrap.Config,
         [msh.Impl(b.Config, n) for n, b in BOOTSTRAP_TYPES_BY_NAME.items()],
     )
-
-    msh.STANDARD_MARSHALER_FACTORIES[0:0] = [msh.PolymorphismMarshalerFactory(cfgs_poly)]
-    msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [msh.PolymorphismUnmarshalerFactory(cfgs_poly)]
+    msh.install_standard_factories(
+        msh.PolymorphismMarshalerFactory(cfgs_poly),
+        msh.PolymorphismUnmarshalerFactory(cfgs_poly),
+    )

omlish/marshal/__init__.py

@@ -2,12 +2,24 @@ from .base import (  # noqa
     Marshaler,
     Unmarshaler,
 
+    MarshalerMaker,
+    UnmarshalerMaker,
+
     MarshalerFactory,
     UnmarshalerFactory,
 
+    MarshalerFactory_,
+    UnmarshalerFactory_,
+
+    SimpleMarshalerFactory,
+    SimpleUnmarshalerFactory,
+
     MarshalerFactoryMatchClass,
     UnmarshalerFactoryMatchClass,
 
+    MultiMarshalerFactory,
+    MultiUnmarshalerFactory,
+
     TypeMapMarshalerFactory,
     TypeMapUnmarshalerFactory,
 
@@ -52,6 +64,8 @@ from .global_ import (  # noqa
 
     global_unmarshaler_factory,
     unmarshal,
+
+    register_global,
 )
 
 from .naming import (  # noqa
@@ -138,6 +152,8 @@ from .standard import (  # noqa
 
     STANDARD_UNMARSHALER_FACTORIES,
     new_standard_unmarshaler_factory,
+
+    install_standard_factories,
 )
 
 from .trivial.forbidden import (  # noqa

omlish/marshal/base.py

@@ -117,19 +117,215 @@ class Unmarshaler(lang.Abstract):
         raise NotImplementedError
 
 
-MarshalerFactory: ta.TypeAlias = mfs.MatchFn[['MarshalContext', rfl.Type], Marshaler]
-UnmarshalerFactory: ta.TypeAlias = mfs.MatchFn[['UnmarshalContext', rfl.Type], Unmarshaler]
+##
+
+
+MarshalerMaker: ta.TypeAlias = mfs.MatchFn[['MarshalContext', rfl.Type], Marshaler]
+UnmarshalerMaker: ta.TypeAlias = mfs.MatchFn[['UnmarshalContext', rfl.Type], Unmarshaler]
+
+
+class MarshalerFactory(lang.Abstract):
+    @property
+    @abc.abstractmethod
+    def make_marshaler(self) -> MarshalerMaker:
+        raise NotImplementedError
+
+
+class UnmarshalerFactory(lang.Abstract):
+    @property
+    @abc.abstractmethod
+    def make_unmarshaler(self) -> UnmarshalerMaker:
+        raise NotImplementedError
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class MarshalerFactory_(MarshalerFactory):  # noqa
+    fn: MarshalerMaker
+
+    @property
+    def make_marshaler(self) -> MarshalerMaker:
+        return self.fn
+
+
+@dc.dataclass(frozen=True)
+class UnmarshalerFactory_(UnmarshalerFactory):  # noqa
+    fn: UnmarshalerMaker
+
+    @property
+    def make_unmarshaler(self) -> UnmarshalerMaker:
+        return self.fn
+
+
+##
+
+
+class SimpleMarshalerFactory(
+    MarshalerFactory,
+    MarshalerMaker,
+    lang.Abstract,
+):
+    @property
+    def make_marshaler(self) -> MarshalerMaker:
+        return self
+
+
+class SimpleUnmarshalerFactory(
+    UnmarshalerFactory,
+    UnmarshalerMaker,
+    lang.Abstract,
+):
+    @property
+    def make_unmarshaler(self) -> UnmarshalerMaker:
+        return self
+
+
+##
+
+
+class MarshalerFactoryMatchClass(
+    MarshalerFactory,
+    mfs.MatchFnClass[['MarshalContext', rfl.Type], Marshaler],
+    lang.Abstract,
+):
+    @property
+    def make_marshaler(self) -> MarshalerMaker:
+        return self
+
+
+class UnmarshalerFactoryMatchClass(
+    UnmarshalerFactory,
+    mfs.MatchFnClass[['UnmarshalContext', rfl.Type], Unmarshaler],
+    lang.Abstract,
+):
+    @property
+    def make_unmarshaler(self) -> UnmarshalerMaker:
+        return self
+
+
+##
+
+
+class MultiMarshalerFactory(MarshalerFactory):
+    def __init__(
+            self,
+            fs: ta.Iterable[MarshalerFactory],
+            *,
+            strict: bool = False,
+    ) -> None:
+        super().__init__()
+
+        self._fs = list(fs)
+        self._mmf: mfs.MultiMatchFn[[MarshalContext, rfl.Type], Marshaler] = mfs.MultiMatchFn(
+            [f.make_marshaler for f in self._fs],
+            strict=strict,
+        )
+
+    @property
+    def make_marshaler(self) -> MarshalerMaker:
+        return self._mmf
+
+
+class MultiUnmarshalerFactory(UnmarshalerFactory):
+    def __init__(
+            self,
+            fs: ta.Iterable[UnmarshalerFactory],
+            *,
+            strict: bool = False,
+    ) -> None:
+        super().__init__()
+
+        self._fs = list(fs)
+        self._mmf: mfs.MultiMatchFn[[UnmarshalContext, rfl.Type], Unmarshaler] = mfs.MultiMatchFn(
+            [f.make_unmarshaler for f in self._fs],
+            strict=strict,
+        )
+
+    @property
+    def make_unmarshaler(self) -> UnmarshalerMaker:
+        return self._mmf
 
-MarshalerFactoryMatchClass: ta.TypeAlias = mfs.MatchFnClass[['MarshalContext', rfl.Type], Marshaler]
-UnmarshalerFactoryMatchClass: ta.TypeAlias = mfs.MatchFnClass[['UnmarshalContext', rfl.Type], Unmarshaler]
 
+##
+
+
+@dc.dataclass(frozen=True)
+class TypeMapMarshalerFactory(
+    TypeMapFactory['MarshalContext', Marshaler],
+    MarshalerFactory,
+):
+    @property
+    def make_marshaler(self) -> MarshalerMaker:
+        return self
+
+
+@dc.dataclass(frozen=True)
+class TypeMapUnmarshalerFactory(
+    TypeMapFactory['UnmarshalContext', Unmarshaler],
+    UnmarshalerFactory,
+):
+    @property
+    def make_unmarshaler(self) -> UnmarshalerMaker:
+        return self
+
+
+# class TypeMapMarshalerFactory(MarshalerFactory):
+#     def __init__(self, m: ta.Mapping[rfl.Type, MarshalerFactory]) -> None:
+#         super().__init__()
 #
+#         self._m = m
+#         self._tmf: TypeMapFactory['MarshalContext', Marshaler] = TypeMapFactory({
+#             t: f.make_marshaler
+#             for t, f in m.items()
+#         })
+#
+#     @property
+#     def make_marshaler(self) -> MarshalerMaker:
+#         return self._tmf
 
-TypeMapMarshalerFactory: ta.TypeAlias = TypeMapFactory['MarshalContext', Marshaler]
-TypeMapUnmarshalerFactory: ta.TypeAlias = TypeMapFactory['UnmarshalContext', Unmarshaler]
 
-TypeCacheMarshalerFactory: ta.TypeAlias = TypeCacheFactory['MarshalContext', Marshaler]
-TypeCacheUnmarshalerFactory: ta.TypeAlias = TypeCacheFactory['UnmarshalContext', Unmarshaler]
+# class TypeMapUnmarshalerFactory(UnmarshalerFactory):
+#     def __init__(self, m: ta.Mapping[rfl.Type, UnmarshalerFactory]) -> None:
+#         super().__init__()
+#
+#         self._m = m
+#         self._tmf: TypeMapFactory[UnmarshalContext, Unmarshaler] = TypeMapFactory({
+#             t: f.make_unmarshaler
+#             for t, f in m.items()
+#         })
+#
+#     @property
+#     def make_unmarshaler(self) -> UnmarshalerMaker:
+#         return self._tmf
+
+
+##
+
+
+class TypeCacheMarshalerFactory(MarshalerFactory):
+    def __init__(self, f: MarshalerFactory) -> None:
+        super().__init__()
+
+        self._f = f
+        self._tcf: TypeCacheFactory[MarshalContext, Marshaler] = TypeCacheFactory(f.make_marshaler)
+
+    @property
+    def make_marshaler(self) -> MarshalerMaker:
+        return self._tcf
+
+
+class TypeCacheUnmarshalerFactory(UnmarshalerFactory):
+    def __init__(self, f: UnmarshalerFactory) -> None:
+        super().__init__()
+
+        self._f = f
+        self._tcf: TypeCacheFactory[UnmarshalContext, Unmarshaler] = TypeCacheFactory(f.make_unmarshaler)
+
+    @property
+    def make_unmarshaler(self) -> UnmarshalerMaker:
+        return self._tcf
 
 
 ##
@@ -182,7 +378,7 @@ class MarshalContext(BaseContext, lang.Final):
     def make(self, o: ta.Any) -> Marshaler:
         rty = self._reflect(o)
         try:
-            return check.not_none(self.factory)(self, rty)  # type: ignore
+            return check.not_none(self.factory).make_marshaler(self, rty)
         except mfs.MatchGuardError:
             raise UnhandledTypeError(rty)  # noqa
 
@@ -194,7 +390,7 @@ class UnmarshalContext(BaseContext, lang.Final):
     def make(self, o: ta.Any) -> Unmarshaler:
         rty = self._reflect(o)
         try:
-            return check.not_none(self.factory)(self, rty)  # type: ignore
+            return check.not_none(self.factory).make_unmarshaler(self, rty)
         except mfs.MatchGuardError:
             raise UnhandledTypeError(rty)  # noqa
 
@@ -207,9 +403,19 @@ class _ProxyMarshaler(_Proxy[Marshaler], Marshaler):
         return self._obj.marshal(ctx, o)
 
 
-class RecursiveMarshalerFactory(RecursiveTypeFactory[MarshalContext, Marshaler], lang.Final):
+class RecursiveMarshalerFactory(MarshalerFactory, lang.Final):
     def __init__(self, f: MarshalerFactory) -> None:
-        super().__init__(f, _ProxyMarshaler._new)  # noqa
+        super().__init__()
+
+        self._f = f
+        self._rtf: RecursiveTypeFactory[MarshalContext, Marshaler] = RecursiveTypeFactory(
+            self._f.make_marshaler,  # noqa
+            _ProxyMarshaler._new,  # noqa
+        )
+
+    @property
+    def make_marshaler(self) -> MarshalerMaker:
+        return self._rtf
 
 
 class _ProxyUnmarshaler(_Proxy[Unmarshaler], Unmarshaler):
@@ -217,9 +423,19 @@ class _ProxyUnmarshaler(_Proxy[Unmarshaler], Unmarshaler):
         return self._obj.unmarshal(ctx, v)
 
 
-class RecursiveUnmarshalerFactory(RecursiveTypeFactory[UnmarshalContext, Unmarshaler], lang.Final):
+class RecursiveUnmarshalerFactory(UnmarshalerFactory, lang.Final):
     def __init__(self, f: UnmarshalerFactory) -> None:
-        super().__init__(f, _ProxyUnmarshaler._new)  # noqa
+        super().__init__()
+
+        self._f = f
+        self._rtf: RecursiveTypeFactory[UnmarshalContext, Unmarshaler] = RecursiveTypeFactory(
+            self._f.make_unmarshaler,  # noqa
+            _ProxyUnmarshaler._new,  # noqa
+        )
+
+    @property
+    def make_unmarshaler(self) -> UnmarshalerMaker:
+        return self._rtf
 
 
 ##

omlish/marshal/composite/iterables.py

@@ -19,6 +19,9 @@ from ..base import UnmarshalerFactoryMatchClass
 from ..values import Value
 
 
+##
+
+
 DEFAULT_ITERABLE_CONCRETE_TYPES: dict[type[collections.abc.Iterable], type[collections.abc.Iterable]] = {
     collections.abc.Iterable: tuple,  # type: ignore
     collections.abc.Sequence: tuple,  # type: ignore

omlish/marshal/composite/literals.py

@@ -5,13 +5,16 @@ from ... import check
 from ... import reflect as rfl
 from ..base import MarshalContext
 from ..base import Marshaler
-from ..base import MarshalerFactory
+from ..base import SimpleMarshalerFactory
+from ..base import SimpleUnmarshalerFactory
 from ..base import UnmarshalContext
 from ..base import Unmarshaler
-from ..base import UnmarshalerFactory
 from ..values import Value
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class LiteralMarshaler(Marshaler):
     e: Marshaler
@@ -21,7 +24,7 @@ class LiteralMarshaler(Marshaler):
         return self.e.marshal(ctx, check.in_(o, self.vs))
 
 
-class LiteralMarshalerFactory(MarshalerFactory):
+class LiteralMarshalerFactory(SimpleMarshalerFactory):
     def guard(self, ctx: MarshalContext, rty: rfl.Type) -> bool:
         return isinstance(rty, rfl.Literal)
 
@@ -40,7 +43,7 @@ class LiteralUnmarshaler(Unmarshaler):
         return check.in_(self.e.unmarshal(ctx, v), self.vs)
 
 
-class LiteralUnmarshalerFactory(UnmarshalerFactory):
+class LiteralUnmarshalerFactory(SimpleUnmarshalerFactory):
     def guard(self, ctx: UnmarshalContext, rty: rfl.Type) -> bool:
         return isinstance(rty, rfl.Literal)
 

omlish/marshal/composite/mappings.py

@@ -14,6 +14,9 @@ from ..base import UnmarshalerFactoryMatchClass
 from ..values import Value
 
 
+##
+
+
 DEFAULT_MAPPING_CONCRETE_TYPES: dict[type[collections.abc.Mapping], type[collections.abc.Mapping]] = {
     collections.abc.Mapping: dict,  # type: ignore
     collections.abc.MutableMapping: dict,  # type: ignore

omlish/marshal/composite/maybes.py

@@ -18,6 +18,9 @@ from ..base import UnmarshalerFactoryMatchClass
 from ..values import Value
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class MaybeMarshaler(Marshaler):
     e: Marshaler

omlish/marshal/composite/newtypes.py

@@ -2,13 +2,16 @@ from ... import check
 from ... import reflect as rfl
 from ..base import MarshalContext
 from ..base import Marshaler
-from ..base import MarshalerFactory
+from ..base import SimpleMarshalerFactory
+from ..base import SimpleUnmarshalerFactory
 from ..base import UnmarshalContext
 from ..base import Unmarshaler
-from ..base import UnmarshalerFactory
 
 
-class NewtypeMarshalerFactory(MarshalerFactory):
+##
+
+
+class NewtypeMarshalerFactory(SimpleMarshalerFactory):
     def guard(self, ctx: MarshalContext, rty: rfl.Type) -> bool:
         return isinstance(rty, rfl.NewType)
 
@@ -16,7 +19,7 @@ class NewtypeMarshalerFactory(MarshalerFactory):
         return ctx.make(check.isinstance(rty, rfl.NewType).ty)
 
 
-class NewtypeUnmarshalerFactory(UnmarshalerFactory):
+class NewtypeUnmarshalerFactory(SimpleUnmarshalerFactory):
     def guard(self, ctx: UnmarshalContext, rty: rfl.Type) -> bool:
         return isinstance(rty, rfl.NewType)
 

omlish/marshal/composite/optionals.py

@@ -5,13 +5,16 @@ from ... import check
 from ... import reflect as rfl
 from ..base import MarshalContext
 from ..base import Marshaler
-from ..base import MarshalerFactory
+from ..base import SimpleMarshalerFactory
+from ..base import SimpleUnmarshalerFactory
 from ..base import UnmarshalContext
 from ..base import Unmarshaler
-from ..base import UnmarshalerFactory
 from ..values import Value
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class OptionalMarshaler(Marshaler):
     e: Marshaler
@@ -22,7 +25,7 @@ class OptionalMarshaler(Marshaler):
         return self.e.marshal(ctx, o)
 
 
-class OptionalMarshalerFactory(MarshalerFactory):
+class OptionalMarshalerFactory(SimpleMarshalerFactory):
     def guard(self, ctx: MarshalContext, rty: rfl.Type) -> bool:
         return isinstance(rty, rfl.Union) and rty.is_optional
 
@@ -40,7 +43,7 @@ class OptionalUnmarshaler(Unmarshaler):
         return self.e.unmarshal(ctx, v)
 
 
-class OptionalUnmarshalerFactory(UnmarshalerFactory):
+class OptionalUnmarshalerFactory(SimpleUnmarshalerFactory):
     def guard(self, ctx: UnmarshalContext, rty: rfl.Type) -> bool:
         return isinstance(rty, rfl.Union) and rty.is_optional
 

omlish/marshal/composite/wrapped.py

@@ -8,6 +8,9 @@ from ..base import Unmarshaler
 from ..values import Value
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class WrappedMarshaler(Marshaler):
     wrapper: ta.Callable[[MarshalContext, ta.Any], ta.Any]

omlish/marshal/global_.py

@@ -6,6 +6,7 @@ from .base import MarshalerFactory
 from .base import UnmarshalContext
 from .base import UnmarshalerFactory
 from .registries import Registry
+from .registries import RegistryItem
 from .standard import new_standard_marshaler_factory
 from .standard import new_standard_unmarshaler_factory
 from .values import Value
@@ -44,3 +45,18 @@ def global_unmarshaler_factory() -> UnmarshalerFactory:
 def unmarshal(v: Value, ty: type[T], **kwargs: ta.Any) -> T:
     uc = UnmarshalContext(GLOBAL_REGISTRY, factory=global_unmarshaler_factory(), **kwargs)
     return uc.make(ty).unmarshal(uc, v)
+
+
+##
+
+
+def register_global(
+        key: ta.Any,
+        *items: RegistryItem,
+        identity: bool = False,
+) -> None:
+    GLOBAL_REGISTRY.register(
+        key,
+        *items,
+        identity=identity,
+    )

omlish/marshal/objects/dataclasses.py

@@ -12,11 +12,11 @@ from ... import reflect as rfl
 from ...lite import marshal as lm
 from ..base import MarshalContext
 from ..base import Marshaler
-from ..base import MarshalerFactory
 from ..base import Option
+from ..base import SimpleMarshalerFactory
+from ..base import SimpleUnmarshalerFactory
 from ..base import UnmarshalContext
 from ..base import Unmarshaler
-from ..base import UnmarshalerFactory
 from ..naming import Naming
 from ..naming import translate_name
 from .marshal import ObjectMarshaler
@@ -183,7 +183,7 @@ class AbstractDataclassFactory(lang.Abstract):
 ##
 
 
-class DataclassMarshalerFactory(AbstractDataclassFactory, MarshalerFactory):
+class DataclassMarshalerFactory(AbstractDataclassFactory, SimpleMarshalerFactory):
     def guard(self, ctx: MarshalContext, rty: rfl.Type) -> bool:
         return isinstance(rty, type) and dc.is_dataclass(rty) and not lang.is_abstract_class(rty)
 
@@ -210,7 +210,7 @@ class DataclassMarshalerFactory(AbstractDataclassFactory, MarshalerFactory):
 ##
 
 
-class DataclassUnmarshalerFactory(AbstractDataclassFactory, UnmarshalerFactory):
+class DataclassUnmarshalerFactory(AbstractDataclassFactory, SimpleUnmarshalerFactory):
     def guard(self, ctx: UnmarshalContext, rty: rfl.Type) -> bool:
         return isinstance(rty, type) and dc.is_dataclass(rty) and not lang.is_abstract_class(rty)
 

omlish/marshal/objects/marshal.py

@@ -6,7 +6,7 @@ from ... import dataclasses as dc
 from ... import reflect as rfl
 from ..base import MarshalContext
 from ..base import Marshaler
-from ..base import MarshalerFactory
+from ..base import SimpleMarshalerFactory
 from ..values import Value
 from .metadata import FieldInfo
 from .metadata import FieldInfos
@@ -86,7 +86,7 @@ class ObjectMarshaler(Marshaler):
 
 
 @dc.dataclass(frozen=True)
-class SimpleObjectMarshalerFactory(MarshalerFactory):
+class SimpleObjectMarshalerFactory(SimpleMarshalerFactory):
     dct: ta.Mapping[type, ta.Sequence[FieldInfo]]
 
     _: dc.KW_ONLY

omlish/marshal/objects/namedtuples.py

@@ -7,11 +7,11 @@ from ... import lang
 from ... import reflect as rfl
 from ..base import MarshalContext
 from ..base import Marshaler
-from ..base import MarshalerFactory
 from ..base import Option
+from ..base import SimpleMarshalerFactory
+from ..base import SimpleUnmarshalerFactory
 from ..base import UnmarshalContext
 from ..base import Unmarshaler
-from ..base import UnmarshalerFactory
 from .marshal import ObjectMarshaler
 from .metadata import FieldInfo
 from .metadata import FieldInfos
@@ -55,7 +55,7 @@ def get_namedtuple_field_infos(
 ##
 
 
-class NamedtupleMarshalerFactory(MarshalerFactory):
+class NamedtupleMarshalerFactory(SimpleMarshalerFactory):
     def guard(self, ctx: MarshalContext, rty: rfl.Type) -> bool:
         return _is_namedtuple(rty)
 
@@ -79,7 +79,7 @@ class NamedtupleMarshalerFactory(MarshalerFactory):
 ##
 
 
-class NamedtupleUnmarshalerFactory(UnmarshalerFactory):
+class NamedtupleUnmarshalerFactory(SimpleUnmarshalerFactory):
     def guard(self, ctx: UnmarshalContext, rty: rfl.Type) -> bool:
         return _is_namedtuple(rty)
 

omlish/marshal/objects/unmarshal.py

@@ -4,9 +4,9 @@ import typing as ta
 from ... import check
 from ... import dataclasses as dc
 from ... import reflect as rfl
+from ..base import SimpleUnmarshalerFactory
 from ..base import UnmarshalContext
 from ..base import Unmarshaler
-from ..base import UnmarshalerFactory
 from ..values import Value
 from .metadata import FieldInfo
 from .metadata import FieldInfos
@@ -118,7 +118,7 @@ class ObjectUnmarshaler(Unmarshaler):
 
 
 @dc.dataclass(frozen=True)
-class SimpleObjectUnmarshalerFactory(UnmarshalerFactory):
+class SimpleObjectUnmarshalerFactory(SimpleUnmarshalerFactory):
     dct: ta.Mapping[type, ta.Sequence[FieldInfo]]
 
     _: dc.KW_ONLY

omlish/marshal/polymorphism/marshal.py

@@ -7,7 +7,7 @@ from ... import lang
 from ... import reflect as rfl
 from ..base import MarshalContext
 from ..base import Marshaler
-from ..base import MarshalerFactory
+from ..base import SimpleMarshalerFactory
 from ..values import Value
 from .metadata import FieldTypeTagging
 from .metadata import Impls
@@ -68,7 +68,7 @@ def make_polymorphism_marshaler(
 
 
 @dc.dataclass(frozen=True)
-class PolymorphismMarshalerFactory(MarshalerFactory):
+class PolymorphismMarshalerFactory(SimpleMarshalerFactory):
     p: Polymorphism
     tt: TypeTagging = WrapperTypeTagging()
 

omlish/marshal/polymorphism/unions.py

@@ -8,10 +8,10 @@ from ... import reflect as rfl
 from ...funcs import match as mfs
 from ..base import MarshalContext
 from ..base import Marshaler
-from ..base import MarshalerFactory
+from ..base import SimpleMarshalerFactory
+from ..base import SimpleUnmarshalerFactory
 from ..base import UnmarshalContext
 from ..base import Unmarshaler
-from ..base import UnmarshalerFactory
 from ..values import Value
 from .marshal import make_polymorphism_marshaler
 from .metadata import Impls
@@ -69,7 +69,7 @@ class PrimitiveUnionMarshaler(Marshaler):
 
 
 @dc.dataclass(frozen=True)
-class PrimitiveUnionMarshalerFactory(MarshalerFactory):
+class PrimitiveUnionMarshalerFactory(SimpleMarshalerFactory):
     tys: ta.Sequence[type] = PRIMITIVE_UNION_TYPES
 
     def guard(self, ctx: MarshalContext, rty: rfl.Type) -> bool:
@@ -94,7 +94,7 @@ class PrimitiveUnionUnmarshaler(Unmarshaler):
 
 
 @dc.dataclass(frozen=True)
-class PrimitiveUnionUnmarshalerFactory(UnmarshalerFactory):
+class PrimitiveUnionUnmarshalerFactory(SimpleUnmarshalerFactory):
     tys: ta.Sequence[type] = PRIMITIVE_UNION_TYPES
 
     def guard(self, ctx: UnmarshalContext, rty: rfl.Type) -> bool:
@@ -140,12 +140,12 @@ class _BasePolymorphismUnionFactory(lang.Abstract):
 
 
 @dc.dataclass(frozen=True)
-class PolymorphismUnionMarshalerFactory(_BasePolymorphismUnionFactory, MarshalerFactory):
+class PolymorphismUnionMarshalerFactory(_BasePolymorphismUnionFactory, SimpleMarshalerFactory):
     def fn(self, ctx: MarshalContext, rty: rfl.Type) -> Marshaler:
         return make_polymorphism_marshaler(self.get_impls(rty), self.tt, ctx)
 
 
 @dc.dataclass(frozen=True)
-class PolymorphismUnionUnmarshalerFactory(_BasePolymorphismUnionFactory, UnmarshalerFactory):
+class PolymorphismUnionUnmarshalerFactory(_BasePolymorphismUnionFactory, SimpleUnmarshalerFactory):
     def fn(self, ctx: UnmarshalContext, rty: rfl.Type) -> Unmarshaler:
         return make_polymorphism_unmarshaler(self.get_impls(rty), self.tt, ctx)

omlish/marshal/polymorphism/unmarshal.py

@@ -6,9 +6,9 @@ import typing as ta
 from ... import check
 from ... import lang
 from ... import reflect as rfl
+from ..base import SimpleUnmarshalerFactory
 from ..base import UnmarshalContext
 from ..base import Unmarshaler
-from ..base import UnmarshalerFactory
 from ..values import Value
 from .metadata import FieldTypeTagging
 from .metadata import Impls
@@ -75,7 +75,7 @@ def make_polymorphism_unmarshaler(
 
 
 @dc.dataclass(frozen=True)
-class PolymorphismUnmarshalerFactory(UnmarshalerFactory):
+class PolymorphismUnmarshalerFactory(SimpleUnmarshalerFactory):
     p: Polymorphism
     tt: TypeTagging = WrapperTypeTagging()
 

omlish/marshal/singular/base64.py

@@ -19,6 +19,9 @@ from ..values import Value
 T = ta.TypeVar('T')
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class Base64MarshalerUnmarshaler(Marshaler, Unmarshaler, ta.Generic[T]):
     ty: type[T]

omlish/marshal/singular/enums.py

@@ -6,13 +6,16 @@ from ... import check
 from ... import reflect as rfl
 from ..base import MarshalContext
 from ..base import Marshaler
-from ..base import MarshalerFactory
+from ..base import SimpleMarshalerFactory
+from ..base import SimpleUnmarshalerFactory
 from ..base import UnmarshalContext
 from ..base import Unmarshaler
-from ..base import UnmarshalerFactory
 from ..values import Value
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class EnumMarshaler(Marshaler):
     ty: type[enum.Enum]
@@ -21,7 +24,7 @@ class EnumMarshaler(Marshaler):
         return o.name
 
 
-class EnumMarshalerFactory(MarshalerFactory):
+class EnumMarshalerFactory(SimpleMarshalerFactory):
     def guard(self, ctx: MarshalContext, rty: rfl.Type) -> bool:
         return isinstance(rty, type) and issubclass(rty, enum.Enum)
 
@@ -39,7 +42,7 @@ class EnumUnmarshaler(Unmarshaler):
         return self.ty[check.isinstance(v, str)]
 
 
-class EnumUnmarshalerFactory(UnmarshalerFactory):
+class EnumUnmarshalerFactory(SimpleUnmarshalerFactory):
     def guard(self, ctx: UnmarshalContext, rty: rfl.Type) -> bool:
         return isinstance(rty, type) and issubclass(rty, enum.Enum)
 

omlish/marshal/singular/numbers.py

@@ -12,6 +12,9 @@ from ..base import Unmarshaler
 from ..values import Value
 
 
+##
+
+
 class ComplexMarshalerUnmarshaler(Marshaler, Unmarshaler):
     def marshal(self, ctx: MarshalContext, o: complex) -> Value:
         return [o.real, o.imag]

omlish/marshal/singular/uuids.py

@@ -11,6 +11,9 @@ from ..base import Unmarshaler
 from ..values import Value
 
 
+##
+
+
 PATTERN = re.compile(r'([0-9A-Fa-f]{8}-([0-9A-Fa-f]{4}-){3}[0-9A-Fa-f]{12})|([0-9A-Fa-f]{32})')
 
 

omlish/marshal/standard.py

@@ -1,5 +1,6 @@
-from ..funcs import match as mfs
 from .base import MarshalerFactory
+from .base import MultiMarshalerFactory
+from .base import MultiUnmarshalerFactory
 from .base import RecursiveMarshalerFactory
 from .base import RecursiveUnmarshalerFactory
 from .base import TypeCacheMarshalerFactory
@@ -65,7 +66,7 @@ STANDARD_MARSHALER_FACTORIES: list[MarshalerFactory] = [
 def new_standard_marshaler_factory() -> MarshalerFactory:
     return TypeCacheMarshalerFactory(
         RecursiveMarshalerFactory(
-            mfs.MultiMatchFn(
+            MultiMarshalerFactory(
                 list(STANDARD_MARSHALER_FACTORIES),
             ),
         ),
@@ -98,8 +99,29 @@ STANDARD_UNMARSHALER_FACTORIES: list[UnmarshalerFactory] = [
 def new_standard_unmarshaler_factory() -> UnmarshalerFactory:
     return TypeCacheUnmarshalerFactory(
         RecursiveUnmarshalerFactory(
-            mfs.MultiMatchFn(
+            MultiUnmarshalerFactory(
                 list(STANDARD_UNMARSHALER_FACTORIES),
             ),
         ),
     )
+
+
+##
+
+
+def install_standard_factories(
+        *factories: MarshalerFactory | UnmarshalerFactory,
+) -> None:
+    for f in factories:
+        k = False
+
+        if isinstance(f, MarshalerFactory):
+            STANDARD_MARSHALER_FACTORIES[0:0] = [f]
+            k = True
+
+        if isinstance(f, UnmarshalerFactory):
+            STANDARD_UNMARSHALER_FACTORIES[0:0] = [f]
+            k = True
+
+        if not k:
+            raise TypeError(f)

omlish/marshal/trivial/any.py

@@ -10,6 +10,9 @@ from ..base import Unmarshaler
 from ..values import Value
 
 
+##
+
+
 class AnyMarshalerUnmarshaler(Marshaler, Unmarshaler):
     def marshal(self, ctx: MarshalContext, o: ta.Any) -> Value:
         return ctx.make(type(o)).marshal(ctx, o)

omlish/marshal/trivial/forbidden.py

@@ -5,6 +5,8 @@ from ... import reflect as rfl
 from ...funcs import match as mfs
 from ..base import MarshalContext
 from ..base import Marshaler
+from ..base import SimpleMarshalerFactory
+from ..base import SimpleUnmarshalerFactory
 from ..base import UnmarshalContext
 from ..base import Unmarshaler
 from ..exceptions import ForbiddenTypeError
@@ -14,6 +16,9 @@ C = ta.TypeVar('C')
 R = ta.TypeVar('R')
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class ForbiddenTypeFactory(mfs.MatchFn[[C, rfl.Type], R]):
     rtys: ta.AbstractSet[rfl.Type]
@@ -26,10 +31,16 @@ class ForbiddenTypeFactory(mfs.MatchFn[[C, rfl.Type], R]):
 
 
 @dc.dataclass(frozen=True)
-class ForbiddenTypeMarshalerFactory(ForbiddenTypeFactory[MarshalContext, Marshaler]):
+class ForbiddenTypeMarshalerFactory(
+    ForbiddenTypeFactory[MarshalContext, Marshaler],
+    SimpleMarshalerFactory,
+):
     pass
 
 
 @dc.dataclass(frozen=True)
-class ForbiddenTypeUnmarshalerFactory(ForbiddenTypeFactory[UnmarshalContext, Unmarshaler]):
+class ForbiddenTypeUnmarshalerFactory(
+    ForbiddenTypeFactory[UnmarshalContext, Unmarshaler],
+    SimpleUnmarshalerFactory,
+):
     pass

omlish/marshal/trivial/nop.py

@@ -7,6 +7,9 @@ from ..base import Unmarshaler
 from ..values import Value
 
 
+##
+
+
 class NopMarshalerUnmarshaler(Marshaler, Unmarshaler):
     def marshal(self, ctx: MarshalContext, o: ta.Any) -> Value:
         return o  # noqa

omlish/secrets/marshal.py

@@ -52,16 +52,14 @@ def marshal_secret_field(f: dc.Field) -> dc.Field:
 
 @lang.static_init
 def _install_standard_marshalling() -> None:
-    msh.STANDARD_MARSHALER_FACTORIES[0:0] = [
+    msh.install_standard_factories(
         msh.ForbiddenTypeMarshalerFactory({Secret}),
+        msh.ForbiddenTypeUnmarshalerFactory({Secret}),
+
         msh.TypeMapMarshalerFactory({
             rfl.type_(SecretRefOrStr): StrOrSecretRefMarshalerUnmarshaler(),
         }),
-    ]
-
-    msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [
-        msh.ForbiddenTypeUnmarshalerFactory({Secret}),
         msh.TypeMapUnmarshalerFactory({
             rfl.type_(SecretRefOrStr): StrOrSecretRefMarshalerUnmarshaler(),
         }),
-    ]
+    )

omlish/specs/jsonrpc/marshal.py

@@ -49,11 +49,10 @@ class NotSpecifiedUnionUnmarshalerFactory(msh.UnmarshalerFactoryMatchClass):
 
 @lang.static_init
 def _install_standard_marshalling() -> None:
-    msh.STANDARD_MARSHALER_FACTORIES[0:0] = [
+    msh.install_standard_factories(
         msh.ForbiddenTypeMarshalerFactory({_NOT_SPECIFIED_RTY}),
-        NotSpecifiedUnionMarshalerFactory(),
-    ]
-    msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [
         msh.ForbiddenTypeUnmarshalerFactory({_NOT_SPECIFIED_RTY}),
+
+        NotSpecifiedUnionMarshalerFactory(),
         NotSpecifiedUnionUnmarshalerFactory(),
-    ]
+    )

omlish/specs/openapi/marshal.py

@@ -59,5 +59,7 @@ class _ReferenceUnionUnmarshalerFactory(msh.UnmarshalerFactoryMatchClass):
 
 @lang.static_init
 def _install_standard_marshalling() -> None:
-    msh.STANDARD_MARSHALER_FACTORIES[0:0] = [_ReferenceUnionMarshalerFactory()]
-    msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [_ReferenceUnionUnmarshalerFactory()]
+    msh.install_standard_factories(
+        _ReferenceUnionMarshalerFactory(),
+        _ReferenceUnionUnmarshalerFactory(),
+    )

omlish/sql/queries/marshal.py

@@ -65,15 +65,19 @@ def _install_standard_marshalling() -> None:
         (BinaryOp, BinaryOps),
         (UnaryOp, UnaryOps),
     ]:
-        msh.STANDARD_MARSHALER_FACTORIES[0:0] = [msh.TypeMapMarshalerFactory({ty: OpMarshalerUnmarshaler(ty, ns)})]
-        msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [msh.TypeMapUnmarshalerFactory({ty: OpMarshalerUnmarshaler(ty, ns)})]
+        msh.install_standard_factories(
+            msh.TypeMapMarshalerFactory({ty: OpMarshalerUnmarshaler(ty, ns)}),
+            msh.TypeMapUnmarshalerFactory({ty: OpMarshalerUnmarshaler(ty, ns)}),
+        )
 
     ets = [
         JoinKind,
         MultiKind,
     ]
-    msh.STANDARD_MARSHALER_FACTORIES[0:0] = [msh.TypeMapMarshalerFactory({t: LowerEnumMarshaler(t) for t in ets})]
-    msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [msh.TypeMapUnmarshalerFactory({t: LowerEnumMarshaler(t) for t in ets})]
+    msh.install_standard_factories(
+        msh.TypeMapMarshalerFactory({t: LowerEnumMarshaler(t) for t in ets}),
+        msh.TypeMapUnmarshalerFactory({t: LowerEnumMarshaler(t) for t in ets}),
+    )
 
     for cls in [
         Expr,
@@ -87,12 +91,16 @@ def _install_standard_marshalling() -> None:
             naming=msh.Naming.SNAKE,
             strip_suffix='auto',
         )
-        msh.STANDARD_MARSHALER_FACTORIES[0:0] = [msh.PolymorphismMarshalerFactory(p)]
-        msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [msh.PolymorphismUnmarshalerFactory(p)]
+        msh.install_standard_factories(
+            msh.PolymorphismMarshalerFactory(p),
+            msh.PolymorphismUnmarshalerFactory(p),
+        )
 
     insert_data_impls = msh.Impls([
         msh.Impl(Values, 'values'),
         msh.Impl(Select, 'select'),
     ])
-    msh.STANDARD_MARSHALER_FACTORIES[0:0] = [msh.PolymorphismUnionMarshalerFactory(insert_data_impls)]
-    msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [msh.PolymorphismUnionUnmarshalerFactory(insert_data_impls)]
+    msh.install_standard_factories(
+        msh.PolymorphismUnionMarshalerFactory(insert_data_impls),
+        msh.PolymorphismUnionUnmarshalerFactory(insert_data_impls),
+    )

omlish/sql/tabledefs/marshal.py

@@ -6,8 +6,10 @@ from .elements import Element
 
 def _install_poly(cls: type) -> None:
     p = msh.polymorphism_from_subclasses(cls, naming=msh.Naming.SNAKE)
-    msh.STANDARD_MARSHALER_FACTORIES[0:0] = [msh.PolymorphismMarshalerFactory(p)]
-    msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [msh.PolymorphismUnmarshalerFactory(p)]
+    msh.install_standard_factories(
+        msh.PolymorphismMarshalerFactory(p),
+        msh.PolymorphismUnmarshalerFactory(p),
+    )
 
 
 @lang.static_init

{omlish-0.0.0.dev269.dist-info → omlish-0.0.0.dev270.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev269
+Version: 0.0.0.dev270
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev269.dist-info → omlish-0.0.0.dev270.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=x26AIwDzScUvnX-p4xlq6Zc5QYrAo0Vmgf1qHc1KL_M,8253
-omlish/__about__.py,sha256=jag6jHk6y3yq9RFvQRWNg-6XGW1SIUXoas_wNb9BHIo,3380
+omlish/__about__.py,sha256=OR-PRiAN7dudUKnLMzl2lt9Y5bh8Gy1c1V-wJvtHqLA,3380
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -133,7 +133,7 @@ omlish/bootstrap/base.py,sha256=d8hqn4hp1XMMi5PgcJBQXPKmW47epu8CxBlqDZiRZb4,1073
 omlish/bootstrap/diag.py,sha256=iemH0nQEHEDzyZztvd_ygGGVpRpgn5UG6naxeQTvXp0,5347
 omlish/bootstrap/harness.py,sha256=VW8YP-yENGyXIuJ8GL_xintArF13nafwpz-iAghPt34,1967
 omlish/bootstrap/main.py,sha256=yZhOHDDlj4xB5a89dRdT8z58FsqqnpoBg1-tvY2CJe4,5903
-omlish/bootstrap/marshal.py,sha256=ZxdAeMNd2qXRZ1HUK89HmEhz8tqlS9OduW34QBscKw0,516
+omlish/bootstrap/marshal.py,sha256=mH6KVQILEG7Qb_mULNRe8DGDSZb99mQr9jve4mhqUfc,481
 omlish/bootstrap/sys.py,sha256=0F0uThMsYdjqUtzrYHr4Xsh_MjscxgWl149i_3tDOqo,8787
 omlish/codecs/__init__.py,sha256=-FDwRJFGagg-fZyQ8wup4GPuR6gHpmaChzthlykn-kY,876
 omlish/codecs/base.py,sha256=FLWf5jgxuyZk-7jH0oC5RzJ5Ls5FLxP0hAowrBVEvqo,2246
@@ -495,47 +495,47 @@ omlish/manifests/base.py,sha256=D1WvJYcBR_njkc0gpALpFCWh1h3agb9qgqphnbbPlm4,935
 omlish/manifests/load.py,sha256=9mdsS3egmSX9pymO-m-y2Fhs4p6ruOdbsYaKT1-1Hwg,6655
 omlish/manifests/static.py,sha256=7YwOVh_Ek9_aTrWsWNO8kWS10_j4K7yv3TpXZSHsvDY,501
 omlish/manifests/types.py,sha256=IOt9dOe0r8okCHSL82ryi3sn4VZ6AT80g_QQR6oZtCE,306
-omlish/marshal/__init__.py,sha256=8jKG43_yJzX6MP0RMUJeLUn-BnWiMXDjpKH5-DnAIT4,3109
-omlish/marshal/base.py,sha256=s1wQRPG2Y6kH0qQXoL3d60ldYaVTqLuFs0NdbYXwAGg,6842
+omlish/marshal/__init__.py,sha256=qVRsRvFVixKxfTV1cEvEaZ8r_ZgqcMnh2CyOZ6TWBOU,3372
+omlish/marshal/base.py,sha256=P64Zn8L2GVi32_6AwLxfwreyFygvc4mBsS-s3ld2Eps,11431
 omlish/marshal/exceptions.py,sha256=jwQWn4LcPnadT2KRI_1JJCOSkwWh0yHnYK9BmSkNN4U,302
 omlish/marshal/factories.py,sha256=Q926jSVjaQLEmStnHLhm_c_vqEysN1LnDCwAsFLIzXw,2970
-omlish/marshal/global_.py,sha256=K76wB1-pdg4VWgiqR7wyxRNYr-voJApexYW2nV-R4DM,1127
+omlish/marshal/global_.py,sha256=sdBC6PbP77iUAYZ9GIYyAFrbmg14bp6iU3f1l5tpOSE,1378
 omlish/marshal/naming.py,sha256=lIklR_Od4x1ghltAgOzqcKhHs-leeSv2YmFhCHO7GIs,613
 omlish/marshal/proxy.py,sha256=puKJpwPpuDlMOIrKMcLTRLJyMiL6n_Xs-p59AuDEymA,543
 omlish/marshal/registries.py,sha256=FvC6qXHCizNB2QmU_N3orxW7iqfGYkiUXYYdTRWS6HA,2353
-omlish/marshal/standard.py,sha256=nuWeto3DGFCUMRKeUusev57ty9c1Fo4P3Y0QogNq8Lo,3781
+omlish/marshal/standard.py,sha256=TADR75Hd9VSUpuN_Tnu74Bzmvby42P2bzwFwUBC0l-Q,4283
 omlish/marshal/values.py,sha256=ssHiWdg_L6M17kAn8GiGdPW7UeQOm3RDikWkvwblf5I,263
 omlish/marshal/composite/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/marshal/composite/iterables.py,sha256=tOMjJ-nyYBrRnAGAlT2scV3iR9QSic8La-1qFcy9yNk,2642
-omlish/marshal/composite/literals.py,sha256=0fTwQVSQJe9L17grcLq5hMuoYD7vHRFgdHR5-Teq0g8,1608
-omlish/marshal/composite/mappings.py,sha256=92oAqYzzTdRNhFDtmukpJd8anoi3pt2nX5XhLTlM_Dg,2799
-omlish/marshal/composite/maybes.py,sha256=4rxTv769Uk4gQGAnE6urVnMscF1vhcnwqP_lm5QzSoM,2211
-omlish/marshal/composite/newtypes.py,sha256=lYCacdR2BlLWMT1kc8o08UjsmJ6aYlAHkrzG8BozWCM,849
-omlish/marshal/composite/optionals.py,sha256=iQgSrb9Xyb_IP81YREAZ0xKYXImLgMILGLBnYL2lFWw,1508
-omlish/marshal/composite/wrapped.py,sha256=F0pMC2WtJaPnOmzLT1FKFo9Tkzy1XbdBm9iROyp-myw,745
+omlish/marshal/composite/iterables.py,sha256=YdkdWNUe_AzdUqiAsr7z3kaDcPeg7Znj3AuQepY_qaA,2647
+omlish/marshal/composite/literals.py,sha256=4V8wrZxWe4UxQhcyMC-746a4U03qsyJ_yV1KKu2D_ks,1637
+omlish/marshal/composite/mappings.py,sha256=HoqUKe4kyCYRdMpQMWW0DLPi0-DEsxt-nk4pCQAcLw4,2804
+omlish/marshal/composite/maybes.py,sha256=NfQ2cIHHIvohTl4iYPYbEvhNVq3L3JCu2GEbt4DM5DA,2216
+omlish/marshal/composite/newtypes.py,sha256=5-te247TiPYf84oFhf59tqIOOByXj8i9KaHT8gn72fU,878
+omlish/marshal/composite/optionals.py,sha256=MnecrmrJYjQvYJipIHNCDq78oH09dOjnw5pvaMKqoeU,1537
+omlish/marshal/composite/wrapped.py,sha256=jOsn3h1vLIqcoSTB-0KObnsdbV8jSVWJYbf7Kg9AUwg,750
 omlish/marshal/objects/__init__.py,sha256=F4wej8L_tedC8ETYxAnmKfdPR9TjsqIus9Z3nZofYuc,182
-omlish/marshal/objects/dataclasses.py,sha256=UAsWiy7_RR3ruwAv11OMZ9c87GH4sNHXOG0URmmMOnk,8491
+omlish/marshal/objects/dataclasses.py,sha256=JKFrQiWn0YSYhcfz9-6rnk6NDoRhXqHdMER560z0h14,8515
 omlish/marshal/objects/helpers.py,sha256=85GZp4h3Yo0GYGmnZpKgNxkWnSk8h2R21nfDLU2DtM0,1110
-omlish/marshal/objects/marshal.py,sha256=rdZsDWKgLBZxV0ZQlwHTJv9iUg0lC57trJHBOFKvuLo,2636
+omlish/marshal/objects/marshal.py,sha256=JarKGecMgaFYSUHUj-ZUYVP9HK6u2rjpBb3DWX9Uhh0,2648
 omlish/marshal/objects/metadata.py,sha256=QVD7DRhXbLda_Edgpc3OD1xT9fthmeaaj6l_nTE1PMM,3307
-omlish/marshal/objects/namedtuples.py,sha256=nW3IA21PJ7D62_orr2qxnRt794N1TcFqwOO2rPOglmw,2842
-omlish/marshal/objects/unmarshal.py,sha256=-83sSgL6WX6C3JfXZr64ZLYi3SsJC9kyiGAbEQbVHQI,3620
+omlish/marshal/objects/namedtuples.py,sha256=8de8L7rwmvr_LLBHHfOl2wHObxc_1yZ8fC_J25yZi7Q,2866
+omlish/marshal/objects/unmarshal.py,sha256=IXIl_iokvVCSWYhkRORrWP_sE1DVklnrUErGWg_3MDc,3632
 omlish/marshal/polymorphism/__init__.py,sha256=e2UTrSL0qp7w_1vkdxDWd7sXlWhep2KPV49-BB64ma8,130
-omlish/marshal/polymorphism/marshal.py,sha256=A-fhr4adRDbis3GwGp2fefwT68YT3A4HyogQbMCH69E,2248
+omlish/marshal/polymorphism/marshal.py,sha256=wVaUxiHMJwyEWfQIE3cuEcJFSMVNJhpdJoa1yRgBPUE,2260
 omlish/marshal/polymorphism/metadata.py,sha256=vINF55KtmdjCmNwu5K8UeYAF99sR_weYoTHCqHe5_eg,3249
-omlish/marshal/polymorphism/unions.py,sha256=YwsK9T3okGiHj88LTFNdUvuH7VkCsD-aTnZseKzhpdA,4350
-omlish/marshal/polymorphism/unmarshal.py,sha256=NnNQrJv85tQGkhC4MfvCTOBw7SXRbNNQOlTBXLiup4A,2439
+omlish/marshal/polymorphism/unions.py,sha256=NDXh2aVCLUFfi10qvIZR39prtHwjndQiVl13XcIKV3k,4386
+omlish/marshal/polymorphism/unmarshal.py,sha256=5jJnDarY85PuGTeL_9bwoeHjNIZnfVN3zr5rVhmNoQc,2451
 omlish/marshal/singular/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/marshal/singular/base64.py,sha256=gQIkFN60lNEuSiu3MDQFoHwMZTtzDbrBRtNpFZ2HXew,1098
+omlish/marshal/singular/base64.py,sha256=NutiLaqJn73CcCY94Nf4aL1WvN2dIkblaTqJEzWkHVc,1103
 omlish/marshal/singular/datetimes.py,sha256=1PDVFF6TGkGxGUno8TaFGRof0DQUookYf_X2Nl8T4V0,3723
-omlish/marshal/singular/enums.py,sha256=0FSRj8fiM9LrRrFtlWrMsjG-ualfirGNSP0H-36J4sA,1481
-omlish/marshal/singular/numbers.py,sha256=12a8HxjDHMTgtJTxO7VY_h5llaPyYB-QEPY09dUFOec,1680
+omlish/marshal/singular/enums.py,sha256=TpdOUXUNEHZjI1fWwq1CFxhmRWQ_YodfFG7Vcszccv8,1510
+omlish/marshal/singular/numbers.py,sha256=wA2m-IPKOwlBI-NIS0dEDizmLXK2pgaEL5FQbr5_HIM,1685
 omlish/marshal/singular/primitives.py,sha256=EZi2AIi_Onw1pekAiL4ujz4w-ASuOGWCu4MUIE_dCnk,1299
-omlish/marshal/singular/uuids.py,sha256=rZoE6NE5z6x_ZRmVMjjR2iK7CR8ijfDOvhMKgmm8Mgk,918
+omlish/marshal/singular/uuids.py,sha256=rBMn2zwbw8tJoObeyg7E-D3l3OymLg-pguNUqLKGRN0,923
 omlish/marshal/trivial/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/marshal/trivial/any.py,sha256=m2eywIbOU3YpR9a33vE2djSnbcpYGDQVwekXXokF4zc,786
-omlish/marshal/trivial/forbidden.py,sha256=7buKYamev2T3Q4RAhCBRzHO700vs8biH0--V5iBDqx4,874
-omlish/marshal/trivial/nop.py,sha256=41bpwsLGeDGqIwzZ7j88lbc4wIYh0EcPROhCU98mQxo,466
+omlish/marshal/trivial/any.py,sha256=YjbHgUtwktXuFfkPCSQIxdwC6tA70CPA3-msAE4slKs,791
+omlish/marshal/trivial/forbidden.py,sha256=xGHKjcZ-ygJWjt58XoOoSDJXRitXBsKpr8a0dBiLwK4,1037
+omlish/marshal/trivial/nop.py,sha256=EoxaCbfkLbDfSGdE_xJbH1ghIeYwaptmqq3OGHKgmAg,471
 omlish/math/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/math/bits.py,sha256=LC3dTgrvodNbfxy9dvlya61eQuDEy0azzQLCvEbFHj4,3476
 omlish/math/floats.py,sha256=UimhOT7KRl8LXTzOI5cQWoX_9h6WNWe_3vcOuO7-h_8,327
@@ -575,7 +575,7 @@ omlish/reflect/types.py,sha256=lYxK_hlC4kVDMKeDYJp0mymSth21quwuFAMAEFBznyE,9151
 omlish/secrets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/secrets/all.py,sha256=zRp3bYkcVG4Aez4hBHKBxc07s6u74IrGQVUB8cfrGxY,281
 omlish/secrets/crypto.py,sha256=9D21lnvPhStwu8arD4ssT0ih0bDG-nlqIRdVgYL40xA,3708
-omlish/secrets/marshal.py,sha256=U9uSRTWzZmumfNZeh_dROwVdGrARsp155TylRbjilP8,2048
+omlish/secrets/marshal.py,sha256=HWhim9pqk0ki9gVlDvnX0UVxnx_cGgWroDMKoprQBfo,1984
 omlish/secrets/openssl.py,sha256=UT_dXJ4zA1s9e-UHoW_NLGHQO7iouUNPnJNkkpuw3JI,6213
 omlish/secrets/pwgen.py,sha256=v-5ztnOTHTAWXLGR-3H6HkMj2nPIZBMbo5xWR3q0rDY,1707
 omlish/secrets/pwhash.py,sha256=Goktn-swmC6PXqfRBnDrH_Lr42vjckT712UyErPjzkw,4102
@@ -629,7 +629,7 @@ omlish/specs/jmespath/scope.py,sha256=UyDsl9rv_c8DCjJBuVIA2ESu1jrgYvuwEKiaJDQKnT
 omlish/specs/jmespath/visitor.py,sha256=yneRMO4qf3k2Mdcm2cPC0ozRgOaudzlxRVRGatztJzs,16569
 omlish/specs/jsonrpc/__init__.py,sha256=QQwr-jkgvwr1ZMlNwl5W1TuHcxx8RuzQVFwWwNhp5sM,515
 omlish/specs/jsonrpc/errors.py,sha256=-Zgmlo6bV6J8w5f8h9axQgLquIFBHDgIwcpufEH5NsE,707
-omlish/specs/jsonrpc/marshal.py,sha256=hM1rPZddoha_87qcQtBWkyaZshCXlPoHPJg6J_nBi9k,1915
+omlish/specs/jsonrpc/marshal.py,sha256=HM736piPGnBZrg8CMLDX-L5fZpegyF6l6JUjzLoSDtk,1852
 omlish/specs/jsonrpc/types.py,sha256=emEiTPWsjsYy0jCC3It1bUEcu9nHp5y7-j73U1D6vl4,2700
 omlish/specs/jsonschema/__init__.py,sha256=qmlpJJlB9TBwvE2qCjRHeecNhEYonpbncXfX0T2L-do,1060
 omlish/specs/jsonschema/types.py,sha256=_H7ma99hD3_Xu42BFGHOXRI5p79tY8WBX8QE36k7lbw,472
@@ -656,7 +656,7 @@ omlish/specs/jsonschema/schemas/draft202012/vocabularies/meta-data.json,sha256=j
 omlish/specs/jsonschema/schemas/draft202012/vocabularies/unevaluated.json,sha256=Lb-8tzmUtnCwl2SSre4f_7RsIWgnhNL1pMpWH54tDLQ,506
 omlish/specs/jsonschema/schemas/draft202012/vocabularies/validation.json,sha256=cBCjHlQfMtK-ch4t40jfdcmzaHaj7TBId_wKvaHTelg,2834
 omlish/specs/openapi/__init__.py,sha256=mIx7Askk3FNxGE1CDLBQUOOrRGYaqW7cPGVW4_nAFF4,187
-omlish/specs/openapi/marshal.py,sha256=Z-E2Knm04C81N8AA8cibCVSl2ImhSpHZVc7yAhmPx88,2135
+omlish/specs/openapi/marshal.py,sha256=XAKKmyuqVKw5y8RE8WlQFfNpmmX8tYIaKipmOWGmFwc,2101
 omlish/specs/openapi/openapi.py,sha256=y4h04jeB7ORJSVrcy7apaBdpwLjIyscv1Ub5SderH2c,12682
 omlish/specs/proto/Protobuf3.g4,sha256=chDrovFsuZaHf5W35WZNts3jOa1ssPwvWiJR4yVIgjw,5552
 omlish/specs/proto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -702,7 +702,7 @@ omlish/sql/queries/binary.py,sha256=dcEzeEn104AMPuQ7QrJU2O-YCN3SUdxB5S4jaWKOUqY,
 omlish/sql/queries/exprs.py,sha256=dG9L218QtJM1HtDYIMWqHimK03N6AL1WONk3FvVRcXY,1480
 omlish/sql/queries/idents.py,sha256=w2RxO6SR3K-u30S259OtnAZaPv7YA70PzY9R7RtuCQ8,891
 omlish/sql/queries/inserts.py,sha256=pSQXDSR1oDUmxjeIYuSbxpAZXvYQ-EJF6a62ON5Un-k,1299
-omlish/sql/queries/marshal.py,sha256=YKt13GgqO03fdTLd9cD8FdR9zdprshrzX5WawLjhAR4,3131
+omlish/sql/queries/marshal.py,sha256=TA-wFmLqiK6fhIYwew-9oKa_dfFaIXwNMIE05WVwDd0,3011
 omlish/sql/queries/multi.py,sha256=7x6x-4jnPzxA6ZasBjnjFuhHFpWt5rGCua3UvuTMIJ0,837
 omlish/sql/queries/names.py,sha256=4sDvgRobMEt_6mDeuYVbCqHzLCOwpXUdEyyB4-QjxKo,1996
 omlish/sql/queries/ops.py,sha256=B7IDfjr2DW5LJhWoNaY1WW90BJhe5ZtmxIELhWXbW-0,129
@@ -718,7 +718,7 @@ omlish/sql/tabledefs/alchemy.py,sha256=MiNfVSgX_Ka6PmVTgAcCmS3ULK5mfVRXD_VC2-9Ti
 omlish/sql/tabledefs/dtypes.py,sha256=egZDi-A17MC-4R_ZKR_3uQf1a6mGm91Gmh0b72O85bQ,362
 omlish/sql/tabledefs/elements.py,sha256=lP_Ch19hKmiGYPQVeC8HpFaKdTYnXi2FfpfwKMxZOck,1674
 omlish/sql/tabledefs/lower.py,sha256=YQf8gl1kxD5Fm-vOxV6G0Feh_D9PP1pYwz_vz6XjTPQ,1405
-omlish/sql/tabledefs/marshal.py,sha256=j-Rz1HsiXmABv39-2VoJdzSSB3kbxqaVevbdkZWMyG8,504
+omlish/sql/tabledefs/marshal.py,sha256=x8XG0fJLQ6hlwyu957xqnUhr71ouKiRGBWVueZUEMZU,470
 omlish/sql/tabledefs/tabledefs.py,sha256=lIhvlt0pk6G7RZAtDFsFXm5j0l9BvRfnP7vNGeydHtE,816
 omlish/subprocesses/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/subprocesses/async_.py,sha256=hPQTWFa3k5CE_s9p1JTY4KdTPOsqLJtq3lGMRznrVpY,2373
@@ -776,9 +776,9 @@ omlish/text/parts.py,sha256=Q9NvoyEGQKIWgiPD4D_Qc66cWAuyEKE033dT9m7c3Wk,6662
 omlish/text/random.py,sha256=8feS5JE_tSjYlMl-lp0j93kCfzBae9AM2cXlRLebXMA,199
 omlish/text/go/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/text/go/quoting.py,sha256=N9EYdnFdEX_A8fOviH-1w4jwV3XOQ7VU2WsoUNubYVY,9137
-omlish-0.0.0.dev269.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev269.dist-info/METADATA,sha256=DeYV2vFwgflMTEP4xoOfMrEKppKYcaL6b71jjjiksIM,4198
-omlish-0.0.0.dev269.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-omlish-0.0.0.dev269.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev269.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev269.dist-info/RECORD,,
+omlish-0.0.0.dev270.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev270.dist-info/METADATA,sha256=yrRv07ARNclD2q_004yblEKJRqGAi5VuRPhmU21-rhU,4198
+omlish-0.0.0.dev270.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+omlish-0.0.0.dev270.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev270.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev270.dist-info/RECORD,,