omdev 0.0.0.dev452__tar.gz → 0.0.0.dev454__tar.gz

{omdev-0.0.0.dev452/omdev.egg-info → omdev-0.0.0.dev454}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev452
+Version: 0.0.0.dev454
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev452
+Requires-Dist: omlish==0.0.0.dev454
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.23; extra == "all"

{omdev-0.0.0.dev452 → omdev-0.0.0.dev454}/omdev/packaging/marshal.py

@@ -8,7 +8,6 @@ import typing as ta
 from omlish import lang
 from omlish import marshal as msh
 from omlish import reflect as rfl
-from omlish.funcs import match as mfs
 
 from .requires import RequiresMarkerItem
 from .requires import RequiresMarkerList
@@ -43,10 +42,11 @@ class RequiresMarkerListMarshaler(msh.Marshaler):
         return [inner(e) for e in o]
 
 
-class RequiresMarkerListMarshalerFactory(msh.MarshalerFactoryMatchClass):
-    @mfs.simple(lambda _, ctx, rty: rty is MarshalRequiresMarkerList)
-    def _build(self, ctx: msh.MarshalContext, rty: rfl.Type) -> msh.Marshaler:
-        return RequiresMarkerListMarshaler(
+class RequiresMarkerListMarshalerFactory(msh.MarshalerFactory):
+    def make_marshaler(self, ctx: msh.MarshalContext, rty: rfl.Type) -> ta.Callable[[], msh.Marshaler] | None:
+        if rty is not MarshalRequiresMarkerList:
+            return None
+        return lambda: RequiresMarkerListMarshaler(
             ctx.make(RequiresMarkerItem),
             ctx.make(RequiresNode),
         )

{omdev-0.0.0.dev452 → omdev-0.0.0.dev454}/omdev/scripts/ci.py

@@ -49,6 +49,7 @@ import io
 import itertools
 import json
 import logging
+import operator
 import os
 import os.path
 import re
@@ -1515,6 +1516,36 @@ def dataclass_repr_omit_falsey(obj: ta.Any) -> str:
 ##
 
 
+def dataclass_descriptor_method(*bind_attrs: str, bind_owner: bool = False) -> ta.Callable:
+    if not bind_attrs:
+        def __get__(self, instance, owner=None):  # noqa
+            return self
+
+    elif bind_owner:
+        def __get__(self, instance, owner=None):  # noqa
+            # Guaranteed to return a new instance even with no attrs
+            return dc.replace(self, **{
+                a: v.__get__(instance, owner) if (v := getattr(self, a)) is not None else None
+                for a in bind_attrs
+            })
+
+    else:
+        def __get__(self, instance, owner=None):  # noqa
+            if instance is None:
+                return self
+
+            # Guaranteed to return a new instance even with no attrs
+            return dc.replace(self, **{
+                a: v.__get__(instance, owner) if (v := getattr(self, a)) is not None else None
+                for a in bind_attrs
+            })
+
+    return __get__
+
+
+##
+
+
 def dataclass_kw_only_init():
     def inner(cls):
         if not isinstance(cls, type) and dc.is_dataclass(cls):
@@ -4775,6 +4806,13 @@ class _EmptyMaybe(_Maybe[T]):
 Maybe._empty = _EmptyMaybe()  # noqa
 
 
+##
+
+
+setattr(Maybe, 'just', _JustMaybe)  # noqa
+setattr(Maybe, 'empty', functools.partial(operator.attrgetter('_empty'), Maybe))
+
+
 ########################################
 # ../../../omlish/lite/runtime.py
 

{omdev-0.0.0.dev452 → omdev-0.0.0.dev454}/omdev/scripts/interp.py

@@ -27,6 +27,7 @@ import inspect
 import itertools
 import json
 import logging
+import operator
 import os
 import os.path
 import re
@@ -2687,6 +2688,13 @@ class _EmptyMaybe(_Maybe[T]):
 Maybe._empty = _EmptyMaybe()  # noqa
 
 
+##
+
+
+setattr(Maybe, 'just', _JustMaybe)  # noqa
+setattr(Maybe, 'empty', functools.partial(operator.attrgetter('_empty'), Maybe))
+
+
 ########################################
 # ../../../omlish/lite/runtime.py
 

{omdev-0.0.0.dev452 → omdev-0.0.0.dev454}/omdev/scripts/lib/inject.py

@@ -13,6 +13,7 @@ import contextvars
 import dataclasses as dc
 import functools
 import inspect
+import operator
 import sys
 import threading
 import types
@@ -953,6 +954,13 @@ class _EmptyMaybe(_Maybe[T]):
 Maybe._empty = _EmptyMaybe()  # noqa
 
 
+##
+
+
+setattr(Maybe, 'just', _JustMaybe)  # noqa
+setattr(Maybe, 'empty', functools.partial(operator.attrgetter('_empty'), Maybe))
+
+
 ########################################
 # inject.py
 

{omdev-0.0.0.dev452 → omdev-0.0.0.dev454}/omdev/scripts/pyproject.py

@@ -53,6 +53,7 @@ import itertools
 import json
 import logging
 import multiprocessing as mp
+import operator
 import os
 import os.path
 import re
@@ -5284,6 +5285,13 @@ class _EmptyMaybe(_Maybe[T]):
 Maybe._empty = _EmptyMaybe()  # noqa
 
 
+##
+
+
+setattr(Maybe, 'just', _JustMaybe)  # noqa
+setattr(Maybe, 'empty', functools.partial(operator.attrgetter('_empty'), Maybe))
+
+
 ########################################
 # ../../../omlish/lite/runtime.py
 

{omdev-0.0.0.dev452 → omdev-0.0.0.dev454/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev452
+Version: 0.0.0.dev454
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev452
+Requires-Dist: omlish==0.0.0.dev454
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.23; extra == "all"

{omdev-0.0.0.dev452 → omdev-0.0.0.dev454}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev452
+omlish==0.0.0.dev454
 
 [all]
 black~=25.1

{omdev-0.0.0.dev452 → omdev-0.0.0.dev454}/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.dev452'
+version = '0.0.0.dev454'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev452',
+    'omlish == 0.0.0.dev454',
 ]
 
 [project.optional-dependencies]