omlish 0.0.0.dev417__tar.gz → 0.0.0.dev418__tar.gz

{omlish-0.0.0.dev417/omlish.egg-info → omlish-0.0.0.dev418}/PKG-INFO

@@ -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 → omlish-0.0.0.dev418}/omlish/__about__.py

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

{omlish-0.0.0.dev417 → omlish-0.0.0.dev418}/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-0.0.0.dev417 → omlish-0.0.0.dev418}/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-0.0.0.dev417 → omlish-0.0.0.dev418}/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-0.0.0.dev418/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-0.0.0.dev417 → omlish-0.0.0.dev418}/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-0.0.0.dev417 → omlish-0.0.0.dev418}/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-0.0.0.dev417 → omlish-0.0.0.dev418}/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-0.0.0.dev418/omlish/typedvalues/__init__.py

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

{omlish-0.0.0.dev417 → omlish-0.0.0.dev418/omlish.egg-info}/PKG-INFO

@@ -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 → omlish-0.0.0.dev418}/omlish.egg-info/SOURCES.txt

@@ -541,6 +541,7 @@ omlish/marshal/base/__init__.py
 omlish/marshal/base/configs.py
 omlish/marshal/base/contexts.py
 omlish/marshal/base/errors.py
+omlish/marshal/base/funcs.py
 omlish/marshal/base/options.py
 omlish/marshal/base/overrides.py
 omlish/marshal/base/registries.py
@@ -556,7 +557,6 @@ omlish/marshal/composite/optionals.py
 omlish/marshal/composite/special.py
 omlish/marshal/composite/wrapped.py
 omlish/marshal/factories/__init__.py
-omlish/marshal/factories/func.py
 omlish/marshal/factories/invalidate.py
 omlish/marshal/factories/match.py
 omlish/marshal/factories/multi.py

{omlish-0.0.0.dev417 → omlish-0.0.0.dev418}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev417'
+version = '0.0.0.dev418'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',

omlish-0.0.0.dev417/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)

omlish-0.0.0.dev417/omlish/typedvalues/__init__.py

@@ -1,54 +0,0 @@
-from .accessor import (  # noqa
-    TypedValuesAccessor,
-)
-
-from .collection import (  # noqa
-    DuplicateUniqueTypedValueError,
-
-    TypedValues,
-
-    collect,
-    as_collection,
-)
-
-from .consumer import (  # noqa
-    UnconsumedTypedValuesError,
-
-    TypedValuesConsumer,
-
-    consume,
-)
-
-from .generic import (  # noqa
-    TypedValueGeneric,
-)
-
-from .holder import (  # noqa
-    TypedValueHolder,
-)
-
-from .of_ import (  # noqa
-    of,
-)
-
-from .reflect import (  # noqa
-    reflect_typed_values_impls,
-)
-
-from .values import (  # noqa
-    TypedValue,
-
-    UniqueTypedValue,
-
-    ScalarTypedValue,
-
-    UniqueScalarTypedValue,
-)
-
-
-##
-
-
-from .. import marshal as _msh
-
-_msh.register_global_module_import('.marshal', __package__)