omlish 0.0.0.dev417__py3-none-any.whl → 0.0.0.dev418__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev417'
-__revision__ = 'dad70cf0d439b40c7d3457efb0b5ca0d19ce1d99'
+__version__ = '0.0.0.dev418'
+__revision__ = '768aa72e47d914554932c2598e2f832465969997'
 
 
 #

omlish/dataclasses/impl/configs.py

@@ -20,7 +20,7 @@ DEFAULT_PACKAGE_CONFIG = PackageConfig()
 
 
 def init_package(
-        name: str,
+        init_globals: ta.MutableMapping[str, ta.Any],
         *,
         codegen: bool = False,
 ) -> None:

omlish/inject/__init__.py

@@ -1,6 +1,18 @@
 """
 ~> https://github.com/google/guice/commit/70248eafa90cd70a68b293763e53f6aec656e73c
 """
+from .. import dataclasses as _dc
+
+
+_dc.init_package(
+    globals(),
+    codegen=True,
+)
+
+
+##
+
+
 from .binder import (  # noqa
     bind,
     bind_as_fn,

omlish/marshal/__init__.py

@@ -16,7 +16,19 @@ See:
  - https://github.com/Fatal1ty/mashumaro
  - https://github.com/Kotlin/kotlinx.serialization/blob/master/docs/serializers.md#custom-serializers
 """
-from .. import lang as _lang
+from .. import dataclasses as _dc  # noqa
+
+
+_dc.init_package(
+    globals(),
+    codegen=True,
+)
+
+
+##
+
+
+from .. import lang as _lang  # noqa
 
 
 with _lang.auto_proxy_init(globals()) as _api_cap:
@@ -39,6 +51,14 @@ with _lang.auto_proxy_init(globals()) as _api_cap:
         UnhandledTypeError,
     )
 
+    from .base.funcs import (  # noqa
+        FuncMarshaler,
+        FuncUnmarshaler,
+
+        FuncMarshalerFactory,
+        FuncUnmarshalerFactory,
+    )
+
     from .base.options import (  # noqa
         Option,
     )
@@ -63,8 +83,7 @@ with _lang.auto_proxy_init(globals()) as _api_cap:
         MarshalerFactory,
         UnmarshalerFactory,
 
-        MarshalerFactory_,
-        UnmarshalerFactory_,
+        Marshaling,
     )
 
     from .base.values import (  # noqa
@@ -115,11 +134,6 @@ with _lang.auto_proxy_init(globals()) as _api_cap:
         TypeCacheUnmarshalerFactory,
     )
 
-    from .factories.func import (  # noqa
-        FuncMarshaler,
-        FuncUnmarshaler,
-    )
-
     from .factories.recursive import (  # noqa
         RecursiveMarshalerFactory,
         RecursiveUnmarshalerFactory,
@@ -241,11 +255,3 @@ with _lang.auto_proxy_init(globals()) as _api_cap:
 
         install_standard_factories,
     )
-
-
-##
-
-
-from .. import lang as _lang
-
-_lang.trigger_conditional_imports(__package__)

omlish/marshal/base/funcs.py

@@ -0,0 +1,57 @@
+import dataclasses as dc
+import typing as ta
+
+from ... import lang
+from ... import reflect as rfl
+from ...funcs import match as mfs
+from .contexts import MarshalContext
+from .contexts import UnmarshalContext
+from .types import Marshaler
+from .types import MarshalerFactory
+from .types import MarshalerMaker
+from .types import Unmarshaler
+from .types import UnmarshalerFactory
+from .types import UnmarshalerMaker
+from .values import Value
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class FuncMarshaler(Marshaler, lang.Final):
+    fn: ta.Callable[[MarshalContext, ta.Any], Value]
+
+    def marshal(self, ctx: MarshalContext, o: ta.Any) -> Value:
+        return self.fn(ctx, o)
+
+
+@dc.dataclass(frozen=True)
+class FuncUnmarshaler(Unmarshaler, lang.Final):
+    fn: ta.Callable[[UnmarshalContext, Value], ta.Any]
+
+    def unmarshal(self, ctx: UnmarshalContext, v: Value) -> ta.Any:
+        return self.fn(ctx, v)
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class FuncMarshalerFactory(MarshalerFactory):  # noqa
+    guard: ta.Callable[[MarshalContext, rfl.Type], bool]
+    fn: ta.Callable[[MarshalContext, rfl.Type], Marshaler]
+
+    @lang.cached_property
+    def make_marshaler(self) -> MarshalerMaker:
+        return mfs.simple(self.guard, self.fn)
+
+
+@dc.dataclass(frozen=True)
+class FuncUnmarshalerFactory(UnmarshalerFactory):  # noqa
+    guard: ta.Callable[[UnmarshalContext, rfl.Type], bool]
+    fn: ta.Callable[[UnmarshalContext, rfl.Type], Unmarshaler]
+
+    @lang.cached_property
+    def make_unmarshaler(self) -> UnmarshalerMaker:
+        return mfs.simple(self.guard, self.fn)

omlish/marshal/base/types.py

@@ -1,5 +1,4 @@
 import abc
-import dataclasses as dc
 import typing as ta
 
 from ... import lang
@@ -53,27 +52,6 @@ class UnmarshalerFactory(lang.Abstract):
 ##
 
 
-@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 Marshaling(lang.Abstract):
     @abc.abstractmethod
     def config_registry(self) -> ConfigRegistry:

omlish/marshal/objects/dataclasses.py

@@ -1,5 +1,6 @@
 """
 TODO:
+ - clean up yeesh
  - tangled with objects - Field/ObjectMetadata defined over there but unused
 """
 import typing as ta
@@ -158,11 +159,17 @@ def get_dataclass_field_infos(
     return FieldInfos(ret)
 
 
-def _make_field_obj(ctx, ty, obj, fac):
+def _make_field_obj(
+        ctx,
+        ty,
+        obj,
+        fac,
+        fac_attr,
+):
     if obj is not None:
         return obj
     if fac is not None:
-        return fac(ctx, ty)
+        return getattr(fac, fac_attr)(ctx, ty)
     return ctx.make(ty)
 
 
@@ -210,7 +217,16 @@ class DataclassMarshalerFactory(AbstractDataclassFactory, SimpleMarshalerFactory
         fis = self._get_field_infos(ty, ctx.options)
 
         fields = [
-            (fi, _make_field_obj(ctx, fi.type, fi.metadata.marshaler, fi.metadata.marshaler_factory))
+            (
+                fi,
+                _make_field_obj(
+                    ctx,
+                    fi.type,
+                    fi.metadata.marshaler,
+                    fi.metadata.marshaler_factory,
+                    'make_marshaler',
+                ),
+            )
             for fi in fis
             if fi.name not in dc_md.specials.set
         ]
@@ -262,7 +278,16 @@ class DataclassUnmarshalerFactory(AbstractDataclassFactory, SimpleUnmarshalerFac
                     ret.extend(e_ns)
 
             else:
-                tup = (fi, _make_field_obj(ctx, fi.type, fi.metadata.unmarshaler, fi.metadata.unmarshaler_factory))
+                tup = (
+                    fi,
+                    _make_field_obj(
+                        ctx,
+                        fi.type,
+                        fi.metadata.unmarshaler,
+                        fi.metadata.unmarshaler_factory,
+                        'make_unmarshaler',
+                    ),
+                )
 
                 for pfx in prefixes:
                     for un in fi.unmarshal_names:

omlish/text/templating.py

@@ -9,16 +9,18 @@ import string
 import typing as ta
 
 from .. import lang
-from .minja import MinjaTemplate
-from .minja import MinjaTemplateParam
-from .minja import compile_minja_template
 
 
 if ta.TYPE_CHECKING:
     import jinja2
+
+    from . import minja
+
 else:
     jinja2 = lang.proxy_import('jinja2')
 
+    minja = lang.proxy_import('.minja', __package__)
+
 
 ##
 
@@ -97,7 +99,7 @@ pep292_templater = Pep292Templater.from_string
 
 @dc.dataclass(frozen=True)
 class MinjaTemplater(Templater):
-    tmpl: MinjaTemplate
+    tmpl: 'minja.MinjaTemplate'
 
     ENV_IDENT: ta.ClassVar[str] = 'env'
 
@@ -110,12 +112,12 @@ class MinjaTemplater(Templater):
             src: str,
             **ns: ta.Any,
     ) -> 'MinjaTemplater':
-        tmpl = compile_minja_template(
+        tmpl = minja.compile_minja_template(
             src,
             [
-                MinjaTemplateParam(cls.ENV_IDENT),
+                minja.MinjaTemplateParam(cls.ENV_IDENT),
                 *[
-                    MinjaTemplateParam.new(k, v)
+                    minja.MinjaTemplateParam.new(k, v)
                     for k, v in ns.items()
                 ],
             ],

omlish/typedvalues/__init__.py

@@ -1,49 +1,55 @@
-from .accessor import (  # noqa
-    TypedValuesAccessor,
-)
+from .. import lang as _lang
 
-from .collection import (  # noqa
-    DuplicateUniqueTypedValueError,
 
-    TypedValues,
+with _lang.auto_proxy_init(globals()) as _api_cap:
+    ##
 
-    collect,
-    as_collection,
-)
+    from .accessor import (  # noqa
+        TypedValuesAccessor,
+    )
 
-from .consumer import (  # noqa
-    UnconsumedTypedValuesError,
+    from .collection import (  # noqa
+        DuplicateUniqueTypedValueError,
 
-    TypedValuesConsumer,
+        TypedValues,
 
-    consume,
-)
+        collect,
+        as_collection,
+    )
 
-from .generic import (  # noqa
-    TypedValueGeneric,
-)
+    from .consumer import (  # noqa
+        UnconsumedTypedValuesError,
 
-from .holder import (  # noqa
-    TypedValueHolder,
-)
+        TypedValuesConsumer,
 
-from .of_ import (  # noqa
-    of,
-)
+        consume,
+    )
 
-from .reflect import (  # noqa
-    reflect_typed_values_impls,
-)
+    from .generic import (  # noqa
+        TypedValueGeneric,
+    )
 
-from .values import (  # noqa
-    TypedValue,
+    from .holder import (  # noqa
+        TypedValueHolder,
+    )
 
-    UniqueTypedValue,
+    from .of_ import (  # noqa
+        of,
+    )
 
-    ScalarTypedValue,
+    from .reflect import (  # noqa
+        reflect_typed_values_impls,
+    )
 
-    UniqueScalarTypedValue,
-)
+    from .values import (  # noqa
+        TypedValue,
+
+        UniqueTypedValue,
+
+        ScalarTypedValue,
+
+        UniqueScalarTypedValue,
+    )
 
 
 ##
@@ -51,4 +57,5 @@ from .values import (  # noqa
 
 from .. import marshal as _msh
 
+
 _msh.register_global_module_import('.marshal', __package__)

{omlish-0.0.0.dev417.dist-info → omlish-0.0.0.dev418.dist-info}/METADATA

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

{omlish-0.0.0.dev417.dist-info → omlish-0.0.0.dev418.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=FLw7xkPiSXuImZgqSP8BwrEib2R1doSzUPLUkc-QUIA,8410
-omlish/__about__.py,sha256=0el0vFjTIlkrpc6zjf90f8rFr28BJnixdk0MjiU5Syo,3568
+omlish/__about__.py,sha256=E7iojn9stTJMHyoeJLNlAbIfcUFXWRFTEiaSQK7iYOo,3568
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -143,7 +143,7 @@ omlish/dataclasses/inspect.py,sha256=EpVb50CsEUWpn70gkjBa-hI1mr5_VubHTERsofgE-Lw
 omlish/dataclasses/reflection.py,sha256=6BD2FUiOEtpi_2JREWyVzemjbBJdBMUm8XxQ9SVIKGs,2799
 omlish/dataclasses/specs.py,sha256=VOY2uCjxLhemBuLd1VXz5KJXmZ48NL3sMJxzOhXmau8,6191
 omlish/dataclasses/impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/dataclasses/impl/configs.py,sha256=-cioTvHsJ2F-lVNF_Hh-p7vh4y2H0gCjSRVHVzk8yKo,1354
+omlish/dataclasses/impl/configs.py,sha256=zRPlcpsELHHRVs9eJwcVp3fcIajHOS54ebPfxSzGQD8,1389
 omlish/dataclasses/impl/utils.py,sha256=jAD6IIILo70aD_s60CaqRU2YvpZxBKy4K5EG-MTiqVo,1871
 omlish/dataclasses/impl/api/__init__.py,sha256=k5iS9QOwf_f4iOfGffYhnqDOcmEIwEUUTp00u11kIPM,455
 omlish/dataclasses/impl/api/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -358,7 +358,7 @@ omlish/http/coro/server/fdio.py,sha256=qZE4g5y4XESsTObSKyVggI-yzig57gSGJb4Z0rcHv
 omlish/http/coro/server/server.py,sha256=5gvueSCUzqBqQRf0GJ6wGroD9DiWxQNi6N17MlEtBLU,18660
 omlish/http/coro/server/simple.py,sha256=j1RZ3niKrgGM2qFnjdYWn_eniZzay5j49Ca4L3u8vO4,3296
 omlish/http/coro/server/sockets.py,sha256=24gU6wpIZuzYWKQD8UsHyYfTZlbcUFvkqXq5KVgWpQo,2261
-omlish/inject/__init__.py,sha256=Ou6_wAovmxOpbdhGKsV8GbYRH0_S_h0XQSBDPeYpP0g,1978
+omlish/inject/__init__.py,sha256=dRTx6sIuWzUD7enaWRCOoehTz4g26nRblb8N-gpiwUQ,2074
 omlish/inject/binder.py,sha256=woOK7I5fk4K4kDF684Ia003jE_lviGQXacNKAmXqx5M,5114
 omlish/inject/bindings.py,sha256=PlvOnUREjvc6F8nOJdzl1k9SAf80icRB4qWFqDop87M,536
 omlish/inject/eagers.py,sha256=JBY7PcjXt-Rg9scQ1ol9xpcoTLXkXC_Ie9uwTWdzUkA,340
@@ -523,7 +523,7 @@ omlish/manifests/globals.py,sha256=kVqQ-fT4kc7xWzLHoI731GviitFPv2v2yqw-p7t7Exs,2
 omlish/manifests/loading.py,sha256=Br1OyI23pis_FfYju9xoacms608lzB1Zh_IqdVw_7vg,17201
 omlish/manifests/static.py,sha256=9BaPBLkuzxHmg5A-5k9BjjBFINCdmFOIu06dMFgCfz4,497
 omlish/manifests/types.py,sha256=NeOGuIVrcbqjCDbQ3MnCxxHAgHnw0CkWJsBzo230PWE,453
-omlish/marshal/__init__.py,sha256=Na3DSWLemnQtubnQgiRmOcBXIGqg-uv8QdNDsZQCWak,5855
+omlish/marshal/__init__.py,sha256=aGlc6p9MzfGAmtvicXHpxEpuATNOGxHoiO3tmZCpM18,5906
 omlish/marshal/globals.py,sha256=Q6G18hcUwUDDNnpyRPnR5Tn_XZpZCSIEXo09nYSOaNU,2236
 omlish/marshal/naming.py,sha256=Mk5YrbES836_KflNNRoc5Ajd96iMYLQIMERKx1KpT4g,865
 omlish/marshal/standard.py,sha256=6L4FK7QVgVFAf2jkTQlCvN-15DWK49VCNlNwCBea3-8,6674
@@ -531,10 +531,11 @@ omlish/marshal/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 omlish/marshal/base/configs.py,sha256=y_JRghQgu8mJjPspSZcJQLhjevEuJE2kyxCdu3wGKvo,271
 omlish/marshal/base/contexts.py,sha256=greDE5d4xHrY7NWTSwEgrBh_BSeALAqBqx2-xcAMoIg,2256
 omlish/marshal/base/errors.py,sha256=jmN3vl_U_hB6L0wAvuO7ORG27vXF7KEUk-1TxxK2mYA,308
+omlish/marshal/base/funcs.py,sha256=OeSb8T3R0HZmEnAI4lOhI1HPRurTAezzV3TZWdGGK9s,1558
 omlish/marshal/base/options.py,sha256=OoDErPmI0kswnqAtr7QYndlPYhIqIDarx833tKFT2R4,23
 omlish/marshal/base/overrides.py,sha256=543hP4_y2JRThUOamCE0dPfgucbepVV8e_YF-_PJk6U,993
 omlish/marshal/base/registries.py,sha256=lEpnKnIo0AANOk_PQ6nlEOpPcVa554I3zF0EsT8WuXU,3311
-omlish/marshal/base/types.py,sha256=uThTwMRmWkdhzvqvDusUEJKO0rRV6gbRdFlVuSg7rNA,2890
+omlish/marshal/base/types.py,sha256=DBczbVhz9z9zM4uux43KUnCEJUIW_JqVNyXMxPd--Cs,2472
 omlish/marshal/base/values.py,sha256=QF6OateG5kjRPHYza08wscThhg20oryf-aVQrxjfkC0,212
 omlish/marshal/composite/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/marshal/composite/iterables.py,sha256=2VU3sh5TBKMVF1cWPXhDeuELPQzrAYovmTNHzoFLeS4,2704
@@ -546,7 +547,6 @@ omlish/marshal/composite/optionals.py,sha256=A-0GUaTL5585mxdNO_FcpnP2KFmJ64MkAwM
 omlish/marshal/composite/special.py,sha256=325cEkzGw2XoMq6W0CvvO7n2Dx9I3mDsjdlZ2tN4Bfs,1402
 omlish/marshal/composite/wrapped.py,sha256=xC8k21wJOpSkpAn7794hBTPBRw-HPC9sOF3WRlUh_BA,785
 omlish/marshal/factories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/marshal/factories/func.py,sha256=6F5Ud9GdplQNR1CEwkT2n5SRx4glmgcNZBBPTc9QmdM,727
 omlish/marshal/factories/invalidate.py,sha256=Jo0aGNg94LqkexVYnbwxeOscgiLC1ap_kzAgWPvRaKE,3053
 omlish/marshal/factories/match.py,sha256=MALwOa2FyD4PpHfG-iLBdn8-3FMx_wI123RD4xfd79w,893
 omlish/marshal/factories/multi.py,sha256=0chkODC3AGz4wxDq82V69clGRtk1Wjc6O_yOGZxn6bQ,1479
@@ -558,7 +558,7 @@ omlish/marshal/factories/moduleimport/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCe
 omlish/marshal/factories/moduleimport/configs.py,sha256=8g6FSPmyo0IOYSWYp5kqfJACZxL9SvzlHzrSzucNZyg,538
 omlish/marshal/factories/moduleimport/factories.py,sha256=LpiH27t6O8x1x-j9v2P5vD8H9TABgVS8Xe9xE4yPGRg,3136
 omlish/marshal/objects/__init__.py,sha256=F4wej8L_tedC8ETYxAnmKfdPR9TjsqIus9Z3nZofYuc,182
-omlish/marshal/objects/dataclasses.py,sha256=6G1vmhFhJ3LsHxDFDxvSH7q-pZm9_gY4QgNVtebiUzY,9015
+omlish/marshal/objects/dataclasses.py,sha256=JbtI0aciUH6_eqw9qDz2O9NlbndgSvV9Cxn7SrPG7xM,9511
 omlish/marshal/objects/helpers.py,sha256=hj5I1pILt3QFSVkYJNrSO3wiCaalAopEYWPL17Ip4zs,1102
 omlish/marshal/objects/marshal.py,sha256=9Z19aasMNsDn8KBHmUT-XnoP23c5r50CYo0z4IBfUf0,2680
 omlish/marshal/objects/metadata.py,sha256=maGqyQl0GE9xWK17DQjXxhZWRh3nRwH4fgklrA8XVQI,3392
@@ -842,7 +842,7 @@ omlish/text/mangle.py,sha256=k7mYavVgxJ2ENV2wfjw3c9u3hqH5NeVpjoxYbyaYC0Y,2796
 omlish/text/minja.py,sha256=7UKNalkWpTG_364OIo7p5ym--uiNPR2RFBW_W8rrO4I,9194
 omlish/text/parts.py,sha256=MpiCUyfpcL4PLb2Etj8V7Yj4qofhy0xVwBrIL6RfNdg,6646
 omlish/text/random.py,sha256=8feS5JE_tSjYlMl-lp0j93kCfzBae9AM2cXlRLebXMA,199
-omlish/text/templating.py,sha256=Nf5BVDgrYBf0WmYwV6SnHPDvl9XVMu8v7MX78pInLTw,3325
+omlish/text/templating.py,sha256=i-HU7W-GtKdnBhEG3mnSey5ig7vV0q02D3pVzMoOzJY,3318
 omlish/text/antlr/__init__.py,sha256=88bMl_28cfSKslgOkMGYXqALgsHz3KC4LFvAVtzj7k8,89
 omlish/text/antlr/delimit.py,sha256=wvpZ-FlVoGwRjBALKT1in9cIriIwvyFqmHxgliNJEi8,3472
 omlish/text/antlr/dot.py,sha256=-WHO-xDSv-Ir00TZ4sVIwunKYtZkRveaQ4m5FKj_bRs,962
@@ -913,7 +913,7 @@ omlish/text/antlr/_runtime/xpath/XPathLexer.py,sha256=WvGKQjQnu7pX5C4CFKtsCzba2B
 omlish/text/antlr/_runtime/xpath/__init__.py,sha256=lMd_BbXYdlDhZQN_q0TKN978XW5G0pq618F0NaLkpFE,71
 omlish/text/go/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/text/go/quoting.py,sha256=zbcPEDWsdj7GAemtu0x8nwMqpIu2C_5iInSwn6mMWlE,9142
-omlish/typedvalues/__init__.py,sha256=g33z1dvLjoPKcpJllk-UAjjfYlQnkKuTUXg6RzXtdE8,729
+omlish/typedvalues/__init__.py,sha256=F3cUtl4Cm1StZxRBkFIRjuw3wPjEch8HdQZVG3a9AyU,948
 omlish/typedvalues/accessor.py,sha256=2PQVoFrrCTOcZACAQ28GOvF9xhKyKz27GMSfS0xq5Pc,3184
 omlish/typedvalues/collection.py,sha256=CK4Vk9kJqAt2V8o6I4zGyv2u9DKov12uSvsGdqEd2Ws,5793
 omlish/typedvalues/consumer.py,sha256=lDOE-O_sgGbOvbcBg2g5ZRaV2WixnuEYxFsJBaj18oU,4690
@@ -923,9 +923,9 @@ omlish/typedvalues/marshal.py,sha256=AtBz7Jq-BfW8vwM7HSxSpR85JAXmxK2T0xDblmm1HI0
 omlish/typedvalues/of_.py,sha256=UXkxSj504WI2UrFlqdZJbu2hyDwBhL7XVrc2qdR02GQ,1309
 omlish/typedvalues/reflect.py,sha256=PAvKW6T4cW7u--iX80w3HWwZUS3SmIZ2_lQjT65uAyk,1026
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev417.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev417.dist-info/METADATA,sha256=Jw4nZaCngKRs5mMa-qHAGMSF9vX2Yp5_8ufFj3aU_fU,19244
-omlish-0.0.0.dev417.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev417.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev417.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev417.dist-info/RECORD,,
+omlish-0.0.0.dev418.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev418.dist-info/METADATA,sha256=URtPO-TW-SiCQpfOPv3fapEkG9oDcAdN3CIm5RCsbvA,19244
+omlish-0.0.0.dev418.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev418.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev418.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev418.dist-info/RECORD,,

omlish/marshal/factories/func.py

@@ -1,28 +0,0 @@
-import typing as ta
-
-from ... import dataclasses as dc
-from ... import lang
-from ..base.contexts import MarshalContext
-from ..base.contexts import UnmarshalContext
-from ..base.types import Marshaler
-from ..base.types import Unmarshaler
-from ..base.values import Value
-
-
-##
-
-
-@dc.dataclass(frozen=True)
-class FuncMarshaler(Marshaler, lang.Final):
-    fn: ta.Callable[[MarshalContext, ta.Any], Value]
-
-    def marshal(self, ctx: MarshalContext, o: ta.Any) -> Value:
-        return self.fn(ctx, o)
-
-
-@dc.dataclass(frozen=True)
-class FuncUnmarshaler(Unmarshaler, lang.Final):
-    fn: ta.Callable[[UnmarshalContext, Value], ta.Any]
-
-    def unmarshal(self, ctx: UnmarshalContext, v: Value) -> ta.Any:
-        return self.fn(ctx, v)