omlish 0.0.0.dev292__py3-none-any.whl → 0.0.0.dev294__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev292'
-__revision__ = '049add36e73b2356410aa68bca39c19cff8047d2'
+__version__ = '0.0.0.dev294'
+__revision__ = 'a8c5ea178d6688aa3681c24ef971c6e24d1eb392'
 
 
 #

omlish/configs/all.py

@@ -1,4 +1,8 @@
 # ruff: noqa: I001
+from .classes import (  # noqa
+    Configurable,
+)
+
 from .formats import (  # noqa
     ConfigData as Data,
 

omlish/configs/classes.py

@@ -8,6 +8,9 @@ from .. import lang
 ConfigurableConfigT = ta.TypeVar('ConfigurableConfigT', bound='Configurable.Config')
 
 
+##
+
+
 class Configurable(ta.Generic[ConfigurableConfigT], lang.Abstract):
     @dc.dataclass(frozen=True, kw_only=True)
     class Config:

omlish/dataclasses/api/classes/decorator.py

@@ -15,7 +15,9 @@ from ...utils import class_decorator
 from ..fields.building import build_cls_std_fields
 from ..fields.conversion import std_field_to_field_spec
 from .metadata import extract_cls_metadata
+from .params import STD_PARAM_DEFAULTS
 from .params import build_spec_std_params
+from .params import get_class_spec
 
 
 ##
@@ -47,11 +49,19 @@ def dataclass(
         cache_hash: bool | None = None,
         generic_init: bool | None = None,
         override: bool | None = None,
+
         repr_id: bool | None = None,
+        terse_repr: bool | None = None,
+
+        allow_redundant_decorator: bool | None = None,
 
         #
 
         _plan_only: bool = False,
+
+        #
+
+        _kwargs: ta.Mapping[str, ta.Any] | None = None,
 ):
     if isinstance(metadata, ta.Mapping):
         raise TypeError(metadata)
@@ -60,6 +70,27 @@ def dataclass(
 
     cls = check.not_none(cls)
 
+    if STD_PARAMS_ATTR in cls.__dict__:
+        if (xcs := get_class_spec(cls)) is not None and xcs.allow_redundant_decorator:
+            xpd = {
+                a: getattr(xcs, a)
+                for a in STD_PARAM_DEFAULTS
+            }
+
+            dpd = {
+                **STD_PARAM_DEFAULTS,
+                **{k: v for k, v in (_kwargs or {}).items() if k in STD_PARAM_DEFAULTS},
+            }
+
+            if xpd == dpd:
+                check.in_(STD_FIELDS_ATTR, cls.__dict__)
+                return cls
+
+        raise TypeError(cls)
+
+    check.not_in(STD_PARAMS_ATTR, cls.__dict__)
+    check.not_in(STD_FIELDS_ATTR, cls.__dict__)
+
     #
 
     fields = build_cls_std_fields(
@@ -122,7 +153,11 @@ def dataclass(
                 cache_hash=cache_hash,
                 generic_init=generic_init,
                 override=override,
+
                 repr_id=repr_id,
+                terse_repr=terse_repr,
+
+                allow_redundant_decorator=allow_redundant_decorator,
             ),
         },
 
@@ -133,7 +168,6 @@ def dataclass(
     #
 
     std_params = build_spec_std_params(cs)
-    check.not_in(STD_PARAMS_ATTR, cls.__dict__)
     setattr(cls, STD_PARAMS_ATTR, std_params)
 
     #

omlish/dataclasses/api/classes/make.py

@@ -39,7 +39,11 @@ def make_dataclass(  # noqa
         cache_hash: bool | None = None,
         generic_init: bool | None = None,
         override: bool | None = None,
+
         repr_id: bool | None = None,
+        terse_repr: bool | None = None,
+
+        allow_redundant_decorator: bool | None = None,
 ):
     if namespace is None:
         namespace = {}
@@ -105,5 +109,9 @@ def make_dataclass(  # noqa
         cache_hash=cache_hash,
         generic_init=generic_init,
         override=override,
+
         repr_id=repr_id,
+        terse_repr=terse_repr,
+
+        allow_redundant_decorator=allow_redundant_decorator,
     )

omlish/dataclasses/api/classes/params.py

@@ -9,6 +9,26 @@ from ...specs import ClassSpec
 ##
 
 
+STD_PARAM_DEFAULTS: ta.Mapping[str, ta.Any] = dict(
+    init=True,
+    repr=True,  # noqa
+    eq=True,
+    order=False,
+    unsafe_hash=False,
+    frozen=False,
+
+    match_args=True,
+    kw_only=False,
+    slots=False,
+    weakref_slot=False,
+)
+
+STD_PARAM_ATTRS: tuple[str, ...] = tuple(STD_PARAM_DEFAULTS)
+
+
+##
+
+
 class SpecDataclassParams(StdParams):
     __slots__ = (*StdParams.__slots__, '_spec')
 

omlish/dataclasses/concerns/repr.py

@@ -11,25 +11,27 @@ from ..generation.ops import OpRef
 from ..generation.ops import Ref
 from ..generation.registry import register_generator_type
 from ..processing.base import ProcessingContext
+from ..specs import FieldSpec
 from ..specs import FieldType
 from ..specs import ReprFn
+from .fields import InitFields
 
 
 ##
 
 
-@dc.dataclass(frozen=True)
+@dc.dataclass(frozen=True, kw_only=True)
 class ReprPlan(Plan):
-    fields: tuple[str, ...]
+    @dc.dataclass(frozen=True, kw_only=True)
+    class Field:
+        name: str
+        kw_only: bool = False
+        fn: OpRef[ReprFn] | None = None
 
-    @dc.dataclass(frozen=True)
-    class Fn:
-        field: str
-        fn: OpRef[ReprFn]
-
-    fns: tuple[Fn, ...] = ()
+    fields: tuple[Field, ...]
 
     id: bool = False
+    terse: bool = False
 
 
 @register_generator_type(ReprPlan)
@@ -38,22 +40,37 @@ class ReprGenerator(Generator[ReprPlan]):
         if not ctx.cs.repr or '__repr__' in ctx.cls.__dict__:
             return None
 
-        fs = sorted(ctx.cs.fields, key=lambda f: f.repr_priority or 0)
+        ifs = ctx[InitFields]
+        fs: ta.Sequence[FieldSpec]
+        if ctx.cs.terse_repr:
+            # If terse repr will match init param order
+            fs = ifs.all
+        else:
+            # Otherwise default to dc.fields() order
+            fs = sorted(ctx.cs.fields, key=lambda f: f.repr_priority or 0)
 
         orm = {}
-        rfs: list[ReprPlan.Fn] = []
+        rfs: list[ReprPlan.Field] = []
         for i, f in enumerate(fs):
-            if f.repr_fn is None:
+            if not (f.field_type is FieldType.INSTANCE and f.repr):
                 continue
-            r: OpRef = OpRef(f'repr.fns.{i}.fn')
-            orm[r] = f.repr_fn
-            rfs.append(ReprPlan.Fn(f.name, r))
+
+            fnr: OpRef | None = None
+            if f.repr_fn is not None:
+                fnr = OpRef(f'repr.fns.{i}.fn')
+                orm[fnr] = f.repr_fn
+
+            rfs.append(ReprPlan.Field(
+                name=f.name,
+                kw_only=f in ifs.kw_only,
+                fn=fnr,
+            ))
 
         return PlanResult(
             ReprPlan(
-                fields=tuple(f.name for f in fs if f.field_type is FieldType.INSTANCE and f.repr),
-                fns=tuple(rfs),
+                fields=tuple(rfs),
                 id=ctx.cs.repr_id,
+                terse=ctx.cs.terse_repr,
             ),
             orm,
         )
@@ -63,17 +80,20 @@ class ReprGenerator(Generator[ReprPlan]):
 
         part_lines: list[str] = []
 
-        rfd = {rf.field: rf.fn for rf in pl.fns}
         for f in pl.fields:
-            if (rf := rfd.get(f)) is not None:
-                ors.add(rf)
+            pfx = ''
+            if not (pl.terse and not f.kw_only):
+                pfx = f'{f.name}='
+
+            if f.fn is not None:
+                ors.add(f.fn)
                 part_lines.extend([
-                    f'    if (s := {rf.ident()}(self.{f})) is not None:',
-                    f'        parts.append(f"{f}={{s}}")',
+                    f'    if (s := {f.fn.ident()}(self.{f.name})) is not None:',
+                    f'        parts.append(f"{pfx}{{s}}")',
                 ])
             else:
                 part_lines.append(
-                    f'    parts.append(f"{f}={{self.{f}!r}}")',
+                    f'    parts.append(f"{pfx}{{self.{f.name}!r}}")',
                 )
 
         return [

omlish/dataclasses/metaclass/bases.py

@@ -1,5 +1,6 @@
 import typing as ta
 
+from ..api.classes.decorator import dataclass
 from ..concerns.frozen import unchecked_frozen_base
 from .meta import DataMeta
 from .specs import get_metaclass_spec
@@ -16,9 +17,11 @@ T = ta.TypeVar('T')
 class Data(
     eq=False,
     order=False,
+    allow_redundant_decorator=True,
     confer=frozenset([
         'confer',
         'final_subclasses',
+        'allow_redundant_decorator',
     ]),
     metaclass=DataMeta,
 ):
@@ -31,6 +34,9 @@ class Data(
         super().__init_subclass__(**kwargs)
 
 
+#
+
+
 class Frozen(
     Data,
     frozen=True,
@@ -47,6 +53,9 @@ class Frozen(
     pass
 
 
+#
+
+
 class Case(
     Frozen,
     abstract=True,
@@ -57,13 +66,19 @@ class Case(
     pass
 
 
+#
+
+
+@dataclass(frozen=True)
 class Box(
     Frozen,
     ta.Generic[T],
     generic_init=True,
+    terse_repr=True,
     confer=frozenset([
         *get_metaclass_spec(Frozen).confer,
         'generic_init',
+        'terse_repr',
     ]),
 ):
     v: T

omlish/dataclasses/metaclass/confer.py

@@ -17,6 +17,11 @@ CONFER_CLASS_PARAMS: tuple[str, ...] = (
     'cache_hash',
     'generic_init',
     'override',
+
+    'repr_id',
+    'terse_repr',
+
+    'allow_redundant_decorator',
 )
 
 CONFER_METACLASS_PARAMS: tuple[str, ...] = (

omlish/dataclasses/specs.py

@@ -183,7 +183,11 @@ class ClassSpec(lang.Final):
     cache_hash: bool = False
     generic_init: bool = False
     override: bool = False
+
     repr_id: bool = False
+    terse_repr: bool = False
+
+    allow_redundant_decorator: bool = False
 
     ##
     # callbacks

omlish/dataclasses/utils.py

@@ -75,7 +75,7 @@ def class_decorator(fn):
     @functools.wraps(fn)
     def inner(cls=None, *args, **kwargs):
         if cls is None:
-            return lambda cls: fn(cls, *args, **kwargs)  # noqa
+            return lambda cls: fn(cls, *args, _kwargs=kwargs, **kwargs)  # noqa
         return fn(cls, *args, **kwargs)
     return inner
 

omlish/formats/json5/parsing.py

@@ -1,8 +1,7 @@
 # ruff: noqa: N802 N803
 import typing as ta
 
-from omlish import antlr
-
+from ... import antlr
 from ._antlr.Json5Lexer import Json5Lexer  # type: ignore
 from ._antlr.Json5Parser import Json5Parser  # type: ignore
 from ._antlr.Json5Visitor import Json5Visitor  # type: ignore

omlish/secrets/all.py

@@ -15,6 +15,8 @@ from .secrets import (  # noqa
     secret_repr,
 )
 
+ref = SecretRef
+
 
 ##
 

omlish/secrets/secrets.py

@@ -59,6 +59,7 @@ class Secret(lang.NotPicklable, lang.Sensitive, lang.Final):
 
 
 @dc.dataclass(frozen=True)
+@dc.extra_class_params(terse_repr=True)
 class SecretRef:
     key: str
 
@@ -66,10 +67,10 @@ class SecretRef:
 SecretRefOrStr: ta.TypeAlias = SecretRef | str
 
 
-def secret_repr(o: SecretRefOrStr | None) -> str | None:
+def secret_repr(o: Secret | SecretRef | str | None) -> str | None:
     if isinstance(o, str):
         return '...'
-    elif isinstance(o, SecretRef):
+    elif isinstance(o, (Secret, SecretRef)):
         return repr(o)
     elif o is None:
         return None

omlish/text/filecache.py

@@ -131,7 +131,7 @@ class TextFileCache:
 
     #
 
-    def _normalize_path(self, path: str) -> str:
+    def normalize_path(self, path: str) -> str:
         return abs_real_path(path)
 
     #
@@ -217,7 +217,7 @@ class TextFileCache:
             check_stat: bool = False,
             or_raise: bool = False,
     ) -> Entry:
-        path = self._normalize_path(path)
+        path = self.normalize_path(path)
 
         with self._lock:
             return self._get_entry(
@@ -229,7 +229,7 @@ class TextFileCache:
     #
 
     def invalidate(self, path: str) -> bool:
-        path = self._normalize_path(path)
+        path = self.normalize_path(path)
 
         with self._lock:
             return self._dct.pop(path, None) is not None

omlish/typedvalues/__init__.py

@@ -8,6 +8,12 @@ from .collection import (  # noqa
     TypedValues,
 )
 
+from .consumer import (  # noqa
+    UnconsumedTypedValuesError,
+
+    TypedValuesConsumer,
+)
+
 from .generic import (  # noqa
     TypedValueGeneric,
 )
@@ -26,6 +32,8 @@ from .values import (  # noqa
     UniqueTypedValue,
 
     ScalarTypedValue,
+
+    UniqueScalarTypedValue,
 )
 
 

omlish/typedvalues/accessor.py

@@ -6,6 +6,7 @@ TODO:
 import abc
 import typing as ta
 
+from .. import check
 from .. import lang
 from .values import TypedValue  # noqa
 from .values import UniqueTypedValue  # noqa
@@ -22,6 +23,10 @@ UniqueTypedValueU = ta.TypeVar('UniqueTypedValueU', bound='UniqueTypedValue')
 ##
 
 
+class _NOT_SET(lang.Marker):  # noqa
+    pass
+
+
 class TypedValuesAccessor(lang.Abstract, ta.Generic[TypedValueT]):
     def __iter__(self):
         raise TypeError(
@@ -32,7 +37,7 @@ class TypedValuesAccessor(lang.Abstract, ta.Generic[TypedValueT]):
 
     @ta.final
     def __contains__(self, cls: type[TypedValueU]) -> bool:
-        raise NotImplementedError
+        return self._typed_value_contains(cls)
 
     @abc.abstractmethod
     def _typed_value_contains(self, cls):
@@ -97,17 +102,20 @@ class TypedValuesAccessor(lang.Abstract, ta.Generic[TypedValueT]):
         ...
 
     @ta.final
-    def get(self, key, /, default=None):
+    def get(self, key, /, default=_NOT_SET):
         if not isinstance(key, type):
-            if default is not None:
+            if default is not _NOT_SET:
                 raise RuntimeError('Must not provide both an instance key and a default')
             default = key
             key = type(default)
-        return self._typed_value_get(key, default)
-
-    @abc.abstractmethod
-    def _typed_value_get(self, key, /, default=None):
-        raise NotImplementedError
+        elif default is _NOT_SET:
+            default = None
+
+        check.issubclass(key, TypedValue)
+        try:
+            return self._typed_value_getitem(key)
+        except KeyError:
+            return default
 
     #
 

omlish/typedvalues/collection.py

@@ -4,6 +4,7 @@ from .. import check
 from .. import dataclasses as dc
 from .. import lang
 from .accessor import TypedValuesAccessor
+from .consumer import TypedValuesConsumer
 from .values import TypedValue
 from .values import UniqueTypedValue
 
@@ -28,7 +29,12 @@ class TypedValues(
     lang.Final,
     ta.Generic[TypedValueT],
 ):
-    def __init__(self, *tvs: TypedValueT, override: bool = False) -> None:
+    def __init__(
+            self,
+            *tvs: TypedValueT,
+            override: bool = False,
+            check_type: type | tuple[type, ...] | None = None,
+    ) -> None:
         if hasattr(self, '_tup'):
             # When __new__ returns the empty singleton __init__ will still be called.
             if self is not self._EMPTY:
@@ -40,6 +46,8 @@ class TypedValues(
         tmp: list = []
         udct: dict = {}
         for tv in tvs:
+            if check_type is not None:
+                check.isinstance(tv, check_type)
             if isinstance(tv, UniqueTypedValue):
                 utvc = tv._unique_typed_value_cls  # noqa
                 if not override:
@@ -65,7 +73,6 @@ class TypedValues(
                 if idx == len(ulst):
                     lst.append(tv)
                     dct[utvc] = tv
-                    dct[type(tv)] = tv
             else:
                 tv = obj
                 lst.append(tv)
@@ -76,6 +83,10 @@ class TypedValues(
             k: tuple(v) if isinstance(v, list) else v
             for k, v in dct.items()
         }
+        self._dct2: dict[type[TypedValueT], TypedValueT | tuple[TypedValueT, ...]] = {
+            **self._dct,
+            **{type(v): v for v in self._dct.values() if isinstance(v, UniqueTypedValue)},  # type: ignore[misc]
+        }
 
     #
 
@@ -161,29 +172,33 @@ class TypedValues(
 
     #
 
+    def keys(self) -> ta.KeysView[type[TypedValueT]]:
+        return self._dct.keys()
+
+    def values(self) -> ta.ValuesView[TypedValueT | tuple[TypedValueT, ...]]:
+        return self._dct.values()
+
+    def items(self) -> ta.ItemsView[type[TypedValueT], TypedValueT | tuple[TypedValueT, ...]]:
+        return self._dct.items()
+
+    #
+
+    def consume(self) -> TypedValuesConsumer[TypedValueT]:
+        return TypedValuesConsumer(self._dct.items())
+
+    #
+
     def _typed_value_contains(self, cls):
-        return cls in self._dct
+        return cls in self._dct2
 
     def _typed_value_getitem(self, key):
         if isinstance(key, int):
             return self._tup[key]
         elif isinstance(key, type):
-            return self._dct[check.issubclass(key, TypedValue)]
+            return self._dct2[check.issubclass(key, TypedValue)]
         else:
             raise TypeError(key)
 
-    def _typed_value_get(self, key, /, default=None):
-        check.issubclass(key, TypedValue)
-        try:
-            return self._dct[key]
-        except KeyError:
-            if issubclass(key, UniqueTypedValue):
-                return default
-            elif default is not None:
-                return tuple(default)
-            else:
-                return ()
-
     _any_dct: dict[type, tuple[TypedValueT, ...]]
 
     def _typed_value_get_any(self, cls):
@@ -192,10 +207,12 @@ class TypedValues(
         except AttributeError:
             any_dct = {}
             self._any_dct = any_dct
+
         try:
             return any_dct[cls]
         except KeyError:
             pass
+
         ret = tuple(tv for tv in self if isinstance(tv, cls))
         any_dct[cls] = ret
         return ret

omlish/typedvalues/consumer.py

@@ -0,0 +1,175 @@
+# ruff: noqa: UP007
+import dataclasses as dc
+import typing as ta
+
+from .. import check
+from .. import lang
+from .values import ScalarTypedValue
+from .values import TypedValue
+from .values import UniqueTypedValue
+
+
+if ta.TYPE_CHECKING:
+    from . import collection as tvc
+else:
+    tvc = lang.proxy_import('.collection', __package__)
+
+
+TypedValueT = ta.TypeVar('TypedValueT', bound=TypedValue)
+TypedValueU = ta.TypeVar('TypedValueU', bound=TypedValue)
+
+UniqueTypedValueU = ta.TypeVar('UniqueTypedValueU', bound=UniqueTypedValue)
+
+
+##
+
+
+@dc.dataclass()
+class UnconsumedTypedValuesError(Exception):
+    values: ta.Sequence[TypedValue]
+
+
+class _NOT_SET(lang.Marker):  # noqa
+    pass
+
+
+class TypedValuesConsumer(ta.Generic[TypedValueT]):
+    def __init__(
+            self,
+            src: ta.Union[
+                'tvc.TypedValues',
+                ta.Iterable[tuple[type[TypedValueT], TypedValueT | tuple[TypedValueT, ...]]],
+                ta.Mapping[type[TypedValueT], TypedValueT | tuple[TypedValueT, ...]],
+            ],
+    ) -> None:
+        super().__init__()
+
+        kvs: ta.Iterable[tuple[type[TypedValueT], TypedValueT | tuple[TypedValueT, ...]]]
+        if isinstance(src, tvc.TypedValues):
+            kvs = src.items()
+        elif isinstance(src, ta.Mapping):
+            kvs = src.items()
+        else:
+            kvs = src
+
+        dct: dict = {}
+        for k, v in kvs:
+            check.not_in(k, dct)
+            dct[k] = v
+
+        self._dct: dict[type[TypedValueT], TypedValueT | tuple[TypedValueT, ...]] = dct
+
+    #
+
+    def check_empty(self) -> None:
+        if bool(self._dct):
+            raise UnconsumedTypedValuesError(list(self))
+
+    def __enter__(self) -> 'TypedValuesConsumer[TypedValueT]':
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.check_empty()
+
+    #
+
+    def __iter__(self) -> ta.Iterator[TypedValueT]:
+        for v in self._dct.values():
+            if isinstance(v, tuple):
+                yield from v
+            else:
+                yield v
+
+    def __len__(self) -> int:
+        return len(self._dct)
+
+    def __bool__(self) -> bool:
+        return bool(self._dct)
+
+    #
+
+    def keys(self) -> ta.KeysView[type[TypedValueT]]:
+        return self._dct.keys()
+
+    def values(self) -> ta.ValuesView[TypedValueT | tuple[TypedValueT, ...]]:
+        return self._dct.values()
+
+    def items(self) -> ta.ItemsView[type[TypedValueT], TypedValueT | tuple[TypedValueT, ...]]:
+        return self._dct.items()
+
+    #
+
+    @ta.overload
+    def pop(
+            self,
+            tv: UniqueTypedValueU,
+    ) -> UniqueTypedValueU:
+        ...
+
+    @ta.overload
+    def pop(
+            self,
+            cls: type[UniqueTypedValueU],
+            /,
+            default: UniqueTypedValueU,
+    ) -> UniqueTypedValueU:
+        ...
+
+    @ta.overload
+    def pop(
+            self,
+            cls: type[UniqueTypedValueU],
+            /,
+            default: UniqueTypedValueU | None,
+    ) -> UniqueTypedValueU | None:
+        ...
+
+    @ta.overload
+    def pop(
+            self,
+            cls: type[TypedValueU],
+    ) -> ta.Sequence[TypedValueU]:
+        ...
+
+    @ta.overload
+    def pop(
+            self,
+            cls: type[TypedValueU],
+            /,
+            default: ta.Iterable[TypedValueU],
+    ) -> ta.Sequence[TypedValueU]:
+        ...
+
+    def pop(self, key, /, default=_NOT_SET):
+        if not isinstance(key, type):
+            if default is not _NOT_SET:
+                raise RuntimeError('Must not provide both an instance key and a default')
+            default = key
+            key = type(default)
+
+        if (
+                issubclass(key, UniqueTypedValue) and
+                (utvc := key._unique_typed_value_cls) is not key  # noqa
+        ):
+            key = utvc
+
+        try:
+            return self._dct.pop(key)
+        except KeyError:
+            if default is not _NOT_SET:
+                return default
+            else:
+                raise
+
+    #
+
+    def pop_scalar_kwargs(self, **kwargs: type[TypedValueT]) -> dict[str, TypedValueT]:
+        dct: dict[str, TypedValueT] = {}
+        for k, vc in kwargs.items():
+            check.issubclass(vc, ScalarTypedValue)
+            try:
+                v = self.pop(vc)
+            except KeyError:
+                continue
+            dct[k] = v.v  # type: ignore[attr-defined]
+        return dct

omlish/typedvalues/holder.py

@@ -1,16 +1,14 @@
 import abc
 import typing as ta
 
-from .. import check
 from .. import lang
 from .accessor import TypedValuesAccessor
 from .collection import TypedValues
 from .generic import TypedValueGeneric
 from .values import TypedValue
-from .values import UniqueTypedValue
 
 
-TypedValueT = ta.TypeVar('TypedValueT', bound='TypedValue')
+TypedValueT = ta.TypeVar('TypedValueT', bound=TypedValue)
 
 
 ##
@@ -43,17 +41,6 @@ class TypedValueHolder(
         else:
             raise TypeError(key)
 
-    def _typed_value_get(self, key, /, default=None):
-        if (tvs := self._typed_values) is not None:
-            return tvs.get(key, default)
-        check.issubclass(key, TypedValue)
-        if issubclass(key, UniqueTypedValue):
-            return default
-        elif default is not None:
-            return list(default)
-        else:
-            return []
-
     def _typed_value_get_any(self, cls):
         if (tvs := self._typed_values) is not None:
             return tvs.get_any(cls)

omlish/typedvalues/marshal.py

@@ -1,10 +1,9 @@
-from omlish import check
-from omlish import dataclasses as dc
-from omlish import lang
-from omlish import marshal as msh
-from omlish import reflect as rfl
-from omlish.funcs import match as mfs
-
+from .. import check
+from .. import dataclasses as dc
+from .. import lang
+from .. import marshal as msh
+from .. import reflect as rfl
+from ..funcs import match as mfs
 from .collection import TypedValues
 from .reflect import reflect_typed_values_impls
 from .values import ScalarTypedValue

omlish/typedvalues/reflect.py

@@ -1,8 +1,7 @@
 import typing as ta
 
-from omlish import check
-from omlish import reflect as rfl
-
+from .. import check
+from .. import reflect as rfl
 from .values import TypedValue
 
 

omlish/typedvalues/values.py

@@ -1,3 +1,7 @@
+"""
+TODO:
+ - dc.Box, or some other kind of meta
+"""
 import typing as ta
 
 from .. import dataclasses as dc
@@ -17,13 +21,16 @@ class TypedValue(lang.Abstract):
 ##
 
 
+_UNIQUE_BASES: set[type[TypedValue]] = set()
+
+
 class UniqueTypedValue(TypedValue, lang.Abstract):
     _unique_typed_value_cls: ta.ClassVar[type[TypedValue]]
 
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         super().__init_subclass__(**kwargs)
 
-        if UniqueTypedValue in cls.__bases__:
+        if any(ur in cls.__bases__ for ur in _UNIQUE_BASES):
             try:
                 cls._unique_typed_value_cls  # noqa
             except AttributeError:
@@ -35,16 +42,25 @@ class UniqueTypedValue(TypedValue, lang.Abstract):
 ##
 
 
-@dc.dataclass(frozen=True)
-@dc.extra_class_params(generic_init=True)
-class ScalarTypedValue(TypedValue, lang.Abstract, ta.Generic[T]):
-    v: T
-
-    def __repr__(self) -> str:
-        return f'{self.__class__.__name__}({self.v!r})'
-
+class ScalarTypedValue(TypedValue, dc.Box[T], abstract=True):
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         super().__init_subclass__(**kwargs)
 
         if UniqueTypedValue in (mro := cls.__mro__) and mro.index(ScalarTypedValue) > mro.index(UniqueTypedValue):
-            raise TypeError(f'Class {cls} must have UniqueTypedValue before ScalarTypedValue in mro')
+            raise TypeError(f'Class {cls} must not have UniqueTypedValue before ScalarTypedValue in mro')
+
+
+##
+
+
+class UniqueScalarTypedValue(ScalarTypedValue[T], UniqueTypedValue, abstract=True):
+    pass
+
+
+##
+
+
+_UNIQUE_BASES.update([
+    UniqueTypedValue,
+    UniqueScalarTypedValue,
+])

{omlish-0.0.0.dev292.dist-info → omlish-0.0.0.dev294.dist-info}/METADATA

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

{omlish-0.0.0.dev292.dist-info → omlish-0.0.0.dev294.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=pjGUyLHaoWpPqRP3jz2u1fC1qoRc2lvrEcpU_Ax2tdg,8253
-omlish/__about__.py,sha256=35DcIUR8xZ1fV59-t4ejDVrAHFLqGSDxuBoLBDriBvA,3444
+omlish/__about__.py,sha256=h0CCG_UNc66bAsV21kg7z2dMtYQmx6M9HituQ3gMevU,3444
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -179,8 +179,8 @@ omlish/concurrent/executors.py,sha256=mF-rjJWzNFxwB1-_H7rHuwoImpl4FtNM6W3wcqM3NE
 omlish/concurrent/futures.py,sha256=870tx8ELI8THvMnTrQoYIlEFKO9hM4KUrlehckJqKBU,4238
 omlish/concurrent/threadlets.py,sha256=JfirbTDJgy9Ouokz_VmHeAAPS7cih8qMUJrN-owwXD4,2423
 omlish/configs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/configs/all.py,sha256=kziwjzUBkf8AT0w7Pq7JX2jtkQVOQ5R1wJyn6hfTN5k,1055
-omlish/configs/classes.py,sha256=9uelgi9gS5Sf8ZbtydNXhMxjBs7xBxGZgfuK0Vbc2cg,1168
+omlish/configs/all.py,sha256=xTfR7NySnlIeqhk0GlUOncPnWZ97cLhCtRDlN_Ny8og,1107
+omlish/configs/classes.py,sha256=bRQ3NiYWpHNXspu7P52_9d-00P9YQz_cV8zWXTY2BZE,1173
 omlish/configs/formats.py,sha256=RJw4Rzp7vlTd5YyAvpAoruQnk45v8dGPtPWwqH7aYyE,5301
 omlish/configs/nginx.py,sha256=XuX9yyb0_MwkJ8esKiMS9gFkqHUPza_uCprhnWykNy8,2051
 omlish/configs/shadow.py,sha256=-R5nbevC4pFgqDPYOCCIqNcusgXsMWlRIUOEG0HBoJg,2228
@@ -208,15 +208,15 @@ omlish/dataclasses/errors.py,sha256=tyv3WR6az66uGGiq9FIuCHvy1Ef-G7zeMY7mMG6hy2Y,
 omlish/dataclasses/inspect.py,sha256=BlpPghVCU3w_YDnONEqqE99YHzJM2q3eoqe39YX25Ko,4596
 omlish/dataclasses/internals.py,sha256=vIGCZnStgD3ef4drYRtVOrxhxmAPa0vJpo4pXcDcQvM,3073
 omlish/dataclasses/reflection.py,sha256=5N4acL27xwSnQJvoks6ts2JseGfwL_P9D2gM9vqtAFM,2243
-omlish/dataclasses/specs.py,sha256=h9qD2xAijKAS95Iw3GUPx3mj1peoUOlgh7aXtqVfmDU,6073
-omlish/dataclasses/utils.py,sha256=_1B6tEkkcxHVoLBEo34ebR_0E-iZW7W0zFTo27EdSqY,1854
+omlish/dataclasses/specs.py,sha256=r9hpIWy83ODiB1n7wTf7JL5fiCeeT8fWbMvxs7c4e3g,6148
+omlish/dataclasses/utils.py,sha256=gv6za6oJYBr1VaeGd7oXqq9lhBs_sxkpC27XYzJggno,1870
 omlish/dataclasses/api/__init__.py,sha256=GFodt19CKrfuBpdv1EUqVUCPAFIlHPnabE2G8QJElBY,426
 omlish/dataclasses/api/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/dataclasses/api/classes/conversion.py,sha256=x1Ayo5W3t8lVh10KGH_ZBJ_kK7HqcdI2LdJA6mR_WXQ,810
-omlish/dataclasses/api/classes/decorator.py,sha256=4IiMWsCeXD7lubTZC_becVsi8zsIIH8fN2PbP-fFZE0,2990
-omlish/dataclasses/api/classes/make.py,sha256=O3iWvCMHW4XJXmHHDvNsh5rhkPh9VQ-iCPMUGPWETAM,2629
+omlish/dataclasses/api/classes/decorator.py,sha256=q-m05j6VhJ9_00TmrXBvwmv0_TFPTD8OURi1KbKo9-4,3933
+omlish/dataclasses/api/classes/make.py,sha256=Q_8ZVjhhFEUstIZA3Ht_vlGptYjTcJqX48qT57W7SZw,2820
 omlish/dataclasses/api/classes/metadata.py,sha256=2YafXunxqbqnHIdp5gsiGLyH7cWg9FR5wCwcxlLFd20,2685
-omlish/dataclasses/api/classes/params.py,sha256=qmHuGC4vB8o-7cnRXllVz_WNprx2fsyrNzPY2mYC5FM,1680
+omlish/dataclasses/api/classes/params.py,sha256=GmLJotHT4BuXcK9lAwP00boR0_mfM0xITWBFKrk0brY,1994
 omlish/dataclasses/api/fields/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/dataclasses/api/fields/building.py,sha256=YVAJZ2c318vK0YWz9VU8_MdjA5qNjqsI3N85K-bD0TI,3314
 omlish/dataclasses/api/fields/constructor.py,sha256=T2GeczTz9uy2EOTDlU4VJoiXp-I6jvlxnYXChvQqHxk,1533
@@ -237,7 +237,7 @@ omlish/dataclasses/concerns/order.py,sha256=f1JVDkeTWllO9Tu79xKkjHul-_rpsYZXHMTn
 omlish/dataclasses/concerns/override.py,sha256=eegJ4KRs-p3Oj5ipY1eySwXJ3vFyVXG5gWRQZcsmvUQ,2810
 omlish/dataclasses/concerns/params.py,sha256=ZrNGBUp87YkrOMW7bYn0GdYk9PuDHzxdwKn477lqUyE,404
 omlish/dataclasses/concerns/replace.py,sha256=Q11NjVMMHVh9MjJ6osaXNFG5HuGWQM6qDgWK7IN0IIc,1501
-omlish/dataclasses/concerns/repr.py,sha256=Ft8V0aqxNHz29fOAQsRoFTlLybbgGeT2QbSxXJa7Gyc,2855
+omlish/dataclasses/concerns/repr.py,sha256=HHwCqZPGTMhRPsVgbqrZEh30DBV8LcVSXF2oSrqcjvM,3458
 omlish/dataclasses/concerns/slots.py,sha256=xg6346UT_oUlb0kYaWFbeJUKzZcpQx4nJkT86CXfI5c,5922
 omlish/dataclasses/generation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/dataclasses/generation/base.py,sha256=adi68lJogtjx1SoxGJ5hqC-f-CMX2gWi8iALmucIwKo,686
@@ -253,8 +253,8 @@ omlish/dataclasses/generation/processor.py,sha256=_rt_GHdx_pi5seRMzIu6DvLEx4MYGs
 omlish/dataclasses/generation/registry.py,sha256=_Cfvs9QY6f8Pvf9cKUi-OTI-qaDem3z5jcWkSDNk3kQ,1006
 omlish/dataclasses/generation/utils.py,sha256=u6DWRvzxgqrxqyfAGzNOyDvnOJYdMTYyZ7l1oOOiXrI,2089
 omlish/dataclasses/metaclass/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/dataclasses/metaclass/bases.py,sha256=OSvFRx1PZ1HoBzT0YpsXy-AwAdWnNrcQ5p-teTIr7nY,1196
-omlish/dataclasses/metaclass/confer.py,sha256=yj31r3Vi1bdEvBRBjQML5IBzqEtDpzH3xC3LGkUAkKI,1327
+omlish/dataclasses/metaclass/bases.py,sha256=aKxhjk_dx87ssTkEs35y4kPGIhuas4LmM5nlzYzvqhg,1394
+omlish/dataclasses/metaclass/confer.py,sha256=dErYZbTXBKgvGAi2eu3FocxTvd9lNSqv03haKWsNjcg,1395
 omlish/dataclasses/metaclass/meta.py,sha256=0MQG7Sl1y8QccGRgLOC0VoLDTMBG6VoyT-wZdthO1zI,2639
 omlish/dataclasses/metaclass/specs.py,sha256=djzkHK95h06Cgrx8rr3SGkv2gOvL-fPOhWOBWbbN8h4,789
 omlish/dataclasses/processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -344,7 +344,7 @@ omlish/formats/json5/__init__.py,sha256=BsjPz5zJDji3GjQ8x8hWvcl1GYPV_ZIHnE3c2Sr8
 omlish/formats/json5/codec.py,sha256=ldnxCRo0JP1fkGLt0mMxJlLvNxqIF_1KUCcSp1HtI-M,452
 omlish/formats/json5/errors.py,sha256=AHkR9ySjAoQdUrizpqgL8fg0M5oe5mHZkml3KZHEvC4,38
 omlish/formats/json5/literals.py,sha256=rj4-9KFXfgdq5oK_eUkp57cgoMQ8T0gRaG9ga430he4,2429
-omlish/formats/json5/parsing.py,sha256=FrH6CgAYoqHGgJMPfbhNNuvwxi20i5rus9pGHU-BcW0,2346
+omlish/formats/json5/parsing.py,sha256=qYLcPgkMyjsWeolc6nMg-u5_2PMvBy7jtEUIJZoNZhs,2342
 omlish/formats/json5/_antlr/Json5Lexer.py,sha256=8TKxlENDsl6CPfoLR06uQSvhDnzGcY7fKsIhFJ_g6N4,23237
 omlish/formats/json5/_antlr/Json5Listener.py,sha256=fSiOzSS0CMjxaCev3sxZqJlW-buqIyDLwgnuRv-Uh80,2095
 omlish/formats/json5/_antlr/Json5Parser.py,sha256=nbbwoCPvEVRcEh5_t092XLmsXIHnbzONvH0W0g_BYkQ,19677
@@ -619,13 +619,13 @@ omlish/reflect/ops.py,sha256=RJ6jzrM4ieFsXzWyNXWV43O_WgzEaUvlHSc5N2ezW2A,2044
 omlish/reflect/subst.py,sha256=g3q7NmNWsmc67mcchmCE3WFPCMDSBq-FXn4ah-DWL_U,3622
 omlish/reflect/types.py,sha256=Cn9FYGoiCNt0FS0YLiTTAR12WKcesWMapCrVYcb8IDo,9225
 omlish/secrets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/secrets/all.py,sha256=SGB1KrlNrxlNpazEHYy95NTzteLi8ndoEgMhU7luBl8,420
+omlish/secrets/all.py,sha256=kUTuS4pZVskJe1kFN6m1F1br09BNSjX7MUC2RZRndwc,437
 omlish/secrets/crypto.py,sha256=9D21lnvPhStwu8arD4ssT0ih0bDG-nlqIRdVgYL40xA,3708
 omlish/secrets/marshal.py,sha256=u90n1OfRfdpH1T2F0xK_pAPH1ENYL6acFt6XdVd3KvI,1986
 omlish/secrets/openssl.py,sha256=UT_dXJ4zA1s9e-UHoW_NLGHQO7iouUNPnJNkkpuw3JI,6213
 omlish/secrets/pwgen.py,sha256=5k7QMSysUfv9F65TDMdDlrhTIKy6QbMG3KT2HNVmnVg,1712
 omlish/secrets/pwhash.py,sha256=Jctv3QzcMvVPXJsWA3w3LDUlzmyUDGEWG9sLiJz1xaw,4107
-omlish/secrets/secrets.py,sha256=mRajnNFbrHPLSz21OEinE_k-FjirXARIxFLOq2JbPAo,7969
+omlish/secrets/secrets.py,sha256=-U3VeyIswWcYh1zSuvjE2I7QTXyoH7UMzqNJTclnDCs,8029
 omlish/secrets/ssl.py,sha256=_72xTNP6a1Xw0Pweuow9WK5yveqJ7hmjhala9iMnrAk,152
 omlish/secrets/subprocesses.py,sha256=ZdShw4jrGDdyQW8mRMgl106-9qpCEq2J6w_x7ruz1wk,1217
 omlish/secrets/tempssl.py,sha256=X_cAQbeaz-YcH8SzQ0luYTktIGJv4KMpfTD3t9l9Gqk,1879
@@ -813,7 +813,7 @@ omlish/text/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/text/asdl.py,sha256=AS3irh-sag5pqyH3beJif78PjCbOaFso1NeKq-HXuTs,16867
 omlish/text/decoding.py,sha256=sQWGckWzRslRHYKpj1SBeoo6AVqXm5HFlWFRARN1QpM,1286
 omlish/text/delimit.py,sha256=z9uIuWJdbp7M3ku2KQRHo-lzJYZUJCqZTLse1sIUI4Q,4932
-omlish/text/filecache.py,sha256=ls08QSqBlhVXvjDwJpUXiP-U9HLyCstGAxtBOuWJmVY,5414
+omlish/text/filecache.py,sha256=U3sHtHzUYtPeXr8WrSw3eJ1m7zipJf_yu1jExcTcXgY,5411
 omlish/text/glyphsplit.py,sha256=HI8TWDUaF_tJG5RnIdIjtUH_lYnjYZ7KZBANSxOXGZc,3808
 omlish/text/indent.py,sha256=LOQgHskHMLVrRC6HLL9uIWay517dpvPEYQK0Igm-wm8,1341
 omlish/text/linecache.py,sha256=hRYlEhD63ZfA6_ZOTkQIcnON-3W56QMAhcG3vEJqj9M,1858
@@ -824,17 +824,18 @@ omlish/text/random.py,sha256=8feS5JE_tSjYlMl-lp0j93kCfzBae9AM2cXlRLebXMA,199
 omlish/text/templating.py,sha256=azhKpvkDR2uby8k3AJ8Y6GpdKVQUb7Xt_cGbDz6dkTM,2454
 omlish/text/go/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/text/go/quoting.py,sha256=N9EYdnFdEX_A8fOviH-1w4jwV3XOQ7VU2WsoUNubYVY,9137
-omlish/typedvalues/__init__.py,sha256=c3IQmRneMmH6JRcafprqmBILWD89b-IyIll6MgahGCI,562
-omlish/typedvalues/accessor.py,sha256=0k21N-CkjGaY6zCwugsRfOC_CDkqk7wNz4oxO1_6EEA,2919
-omlish/typedvalues/collection.py,sha256=jsXSggmMMvGATcJgQkUXt5Guwq8aquw73_OIC-e6U0I,5300
+omlish/typedvalues/__init__.py,sha256=nzpnoRW_wScMPit5Xz37ky3nKBdzzkgtnQA4SfVHN8E,684
+omlish/typedvalues/accessor.py,sha256=5q-JbIUjhzmW6Ui55YepHc1FDAlV13Whkz_TVNvtQ9Q,3064
+omlish/typedvalues/collection.py,sha256=a6Je_kmz2FlAV2dI92S7c_paXge0QExMynV-fD9oPrs,5823
+omlish/typedvalues/consumer.py,sha256=peDQAgriSyBx_Hc8QHAhEgYy0oSS52qQ_7Tqdssl2AE,4375
 omlish/typedvalues/generic.py,sha256=byWG_gMXhNelckUwdmOoJE9FKkL71Q4BSi4ZLyy0XZ0,788
-omlish/typedvalues/holder.py,sha256=4SwRezsmuDDEO5gENGx8kTm30pblF5UktoEAu02i-Gk,1554
-omlish/typedvalues/marshal.py,sha256=Rr-4DZ90BoD5Z9gT18QhZH2yMA3-gPJBK8GUrGkp8VA,4245
-omlish/typedvalues/reflect.py,sha256=y_7IY8_4cLVRvD3ug-_-cDaO5RtzC1rLVFzkeAPALf8,683
-omlish/typedvalues/values.py,sha256=Q_5IiQM3Vka4wGVd-scaslb4-oCMjFcIOksIrKE-JIM,1229
-omlish-0.0.0.dev292.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev292.dist-info/METADATA,sha256=kDZfh7WmEgxzVyOJP7bSmYSh1RzTqJOv4VdFbKI55fk,4316
-omlish-0.0.0.dev292.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-omlish-0.0.0.dev292.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev292.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev292.dist-info/RECORD,,
+omlish/typedvalues/holder.py,sha256=ZTnHiw-K38ciOBLEdwgrltr7Xp8jjEs_0Lp69DH-G-o,1128
+omlish/typedvalues/marshal.py,sha256=hWHRLcrGav7lvXJDtb9bNI0ickl4SKPQ6F4BbTpqw3A,4219
+omlish/typedvalues/reflect.py,sha256=Ih1YgU-srUjsvBn_P7C66f73_VCvcwqE3ffeBnZBgt4,674
+omlish/typedvalues/values.py,sha256=CEL8xeeneJBe8CrV3NXyZcC6sZ0FR6Cgz2YtaCBug6A,1359
+omlish-0.0.0.dev294.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev294.dist-info/METADATA,sha256=LOvDXgRmMOuG2yUn4QvyNJBuAmrFqRtSTlmKv_rv1Vk,4316
+omlish-0.0.0.dev294.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+omlish-0.0.0.dev294.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev294.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev294.dist-info/RECORD,,