omlish 0.0.0.dev285__py3-none-any.whl → 0.0.0.dev287__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev285'
-__revision__ = 'e95058137e322e352c2579564d041f21cdf1220c'
+__version__ = '0.0.0.dev287'
+__revision__ = 'b5569962801bfa1ab3457339502eb364ee51bb0e'
 
 
 #
@@ -106,6 +106,10 @@ class Project(ProjectBase):
             'duckdb ~= 1.2',
         ],
 
+        'templates': [
+            'jinja2 ~= 3.1',
+        ],
+
         'testing': [
             'pytest ~= 8.3',
         ],

omlish/collections/persistent/treapmap.py

@@ -70,11 +70,11 @@ class TreapMap(PersistentMap[K, V]):
         return n.value
 
     def __iter__(self) -> ta.Iterator[tuple[K, V]]:
-        i = self.iterate()
+        i = self.items()
         while i.has_next():
             yield i.next()
 
-    def iterate(self) -> 'TreapMapIterator[K, V]':
+    def items(self) -> 'TreapMapIterator[K, V]':
         i = TreapMapIterator(
             _st=[],
             _n=self._n,
@@ -84,7 +84,7 @@ class TreapMap(PersistentMap[K, V]):
             i._n = n.left  # noqa
         return i
 
-    def iterate_from(self, k: K) -> 'TreapMapIterator[K, V]':
+    def items_from(self, k: K) -> 'TreapMapIterator[K, V]':
         lst = treap.place(self._n, (k, None), self._c)  # type: ignore
         i = TreapMapIterator(
             _st=lst,
@@ -92,7 +92,7 @@ class TreapMap(PersistentMap[K, V]):
         )
         return i
 
-    def reverse_iterate(self) -> 'TreapMapReverseIterator[K, V]':
+    def items_desc(self) -> 'TreapMapReverseIterator[K, V]':
         i = TreapMapReverseIterator(
             _st=[],
             _n=self._n,
@@ -102,7 +102,7 @@ class TreapMap(PersistentMap[K, V]):
             i._n = n.right  # noqa
         return i
 
-    def reverse_iterate_from(self, k: K) -> 'TreapMapReverseIterator[K, V]':
+    def items_from_desc(self, k: K) -> 'TreapMapReverseIterator[K, V]':
         lst = treap.place(self._n, (k, None), self._c, desc=True)  # type: ignore
         i = TreapMapReverseIterator(
             _st=lst,

omlish/collections/ranked.py

@@ -15,7 +15,10 @@ class RankedSeq(ta.Sequence[T]):
         super().__init__()
 
         self._lst = list(it)
-        self._ranks: ta.Mapping[T, int] = (IdentityKeyDict if identity else dict)((e, i) for i, e in enumerate(self._lst))  # noqa
+        self._ranks: ta.Mapping[T, int] = (
+            (IdentityKeyDict if identity else dict)
+            ((e, i) for i, e in enumerate(self._lst))
+        )
         if len(self._ranks) != len(self._lst):
             raise ValueError(f'{len(self._ranks)} != {len(self._lst)}')
 
@@ -51,7 +54,10 @@ class RankedSetSeq(ta.Sequence[ta.AbstractSet[T]]):
         super().__init__()
 
         self._lst = [(IdentitySet if identity else set)(e) for e in it]
-        self._ranks: ta.Mapping[T, int] = (IdentityKeyDict if identity else dict)((e, i) for i, es in enumerate(self._lst) for e in es)  # noqa
+        self._ranks: ta.Mapping[T, int] = (
+            (IdentityKeyDict if identity else dict)
+            ((e, i) for i, es in enumerate(self._lst) for e in es)
+        )
         if len(self._ranks) != sum(map(len, self._lst)):
             raise ValueError(f'{len(self._ranks)} != {sum(map(len, self._lst))}')
 

omlish/collections/sorted/skiplist.py

@@ -182,7 +182,7 @@ class SkipList(SortedCollection[T]):
             yield cur.value  # type: ignore
             cur = cur.next[0]
 
-    def riter(self, base: T | None = None) -> ta.Iterable[T]:
+    def iter_desc(self, base: T | None = None) -> ta.Iterable[T]:
         if base is not None:
             cur = self._find(base)
             while cur is not self._head and self._compare(base, cur.value) < 0:  # type: ignore

omlish/collections/sorted/sorted.py

@@ -51,7 +51,7 @@ class SortedCollection(lang.Abstract, ta.Collection[T]):
         raise NotImplementedError
 
     @abc.abstractmethod
-    def riter(self, base: T | None = None) -> ta.Iterable[T]:
+    def iter_desc(self, base: T | None = None) -> ta.Iterable[T]:
         raise NotImplementedError
 
 
@@ -61,15 +61,15 @@ class SortedMapping(ta.Mapping[K, V]):
         raise NotImplementedError
 
     @abc.abstractmethod
-    def ritems(self) -> ta.Iterator[tuple[K, V]]:
+    def items_desc(self) -> ta.Iterator[tuple[K, V]]:
         raise NotImplementedError
 
     @abc.abstractmethod
-    def itemsfrom(self, key: K) -> ta.Iterator[tuple[K, V]]:
+    def items_from(self, key: K) -> ta.Iterator[tuple[K, V]]:
         raise NotImplementedError
 
     @abc.abstractmethod
-    def ritemsfrom(self, key: K) -> ta.Iterator[tuple[K, V]]:
+    def items_from_desc(self, key: K) -> ta.Iterator[tuple[K, V]]:
         raise NotImplementedError
 
 
@@ -115,11 +115,11 @@ class SortedListDict(SortedMutableMapping[K, V]):
     def items(self) -> ta.Iterator[tuple[K, V]]:  # type: ignore
         yield from self._impl.iter()
 
-    def ritems(self) -> ta.Iterator[tuple[K, V]]:
-        yield from self._impl.riter()
+    def items_desc(self) -> ta.Iterator[tuple[K, V]]:
+        yield from self._impl.iter_desc()
 
-    def itemsfrom(self, key: K) -> ta.Iterator[tuple[K, V]]:
+    def items_from(self, key: K) -> ta.Iterator[tuple[K, V]]:
         yield from self._impl.iter((key, None))
 
-    def ritemsfrom(self, key: K) -> ta.Iterator[tuple[K, V]]:
-        yield from self._impl.riter((key, None))
+    def items_from_desc(self, key: K) -> ta.Iterator[tuple[K, V]]:
+        yield from self._impl.iter_desc((key, None))

omlish/dataclasses/generation/processor.py

@@ -36,6 +36,10 @@ class PlanOnly(ta.NamedTuple):
     b: bool
 
 
+class Verbose(ta.NamedTuple):
+    b: bool
+
+
 @register_processor_type(priority=ProcessorPriority.GENERATION)
 class GeneratorProcessor(Processor):
     class Mode(abc.ABC):
@@ -67,10 +71,11 @@ class GeneratorProcessor(Processor):
                 gp.ops(),
             )
 
-            # print(gp.prepare().plans.render())
-            # print()
-            # print(comp.src)
-            # print()
+            if (vo := gp._ctx.option(Verbose)) is not None and vo.b:  # noqa
+                print(gp.prepare().plans.render(), file=sys.stderr)
+                print(file=sys.stderr)
+                print(comp.src, file=sys.stderr)
+                print(file=sys.stderr)
 
             ns: dict = {}
             ns.update(compiler.style.globals_ns())  # noqa

omlish/dataclasses/internals.py

@@ -75,9 +75,12 @@ class StdFieldType(enum.Enum):
     INIT_VAR = dc._FIELD_INITVAR  # type: ignore  # noqa
 
 
+STD_FIELD_TYPE_MAP: ta.Mapping[ta.Any, StdFieldType] = {v.value: v for v in StdFieldType}
+
+
 def std_field_type(f: dc.Field) -> StdFieldType:
     if (ft := getattr(f, '_field_type')) is not None:
-        return StdFieldType(ft)
+        return STD_FIELD_TYPE_MAP[ft]
     else:
         return StdFieldType.INSTANCE
 

omlish/dataclasses/processing/driving.py

@@ -1,8 +1,7 @@
 import typing as ta
 
 from .. import concerns as _concerns  # noqa  # imported for registration
-from ..generation import processor as _generation_processor  # noqa  # imported for registration
-from ..generation.processor import PlanOnly
+from ..generation import processor as gp
 from ..specs import ClassSpec
 from .base import ProcessingContext
 from .base import Processor
@@ -18,10 +17,15 @@ def drive_cls_processing(
         cs: ClassSpec,
         *,
         plan_only: bool = False,
+        verbose: bool = False,
 ) -> type:
     options: list[ta.Any] = []
     if plan_only:
-        options.append(PlanOnly(True))
+        options.append(gp.PlanOnly(True))
+    if verbose:
+        options.append(gp.Verbose(True))
+
+    #
 
     ctx = ProcessingContext(
         cls,

omlish/dispatch/__init__.py

@@ -1,3 +1,12 @@
-from .dispatch import Dispatcher  # noqa
-from .functions import function  # noqa
-from .methods import method  # noqa
+from .dispatch import (  # noqa
+    Dispatcher,
+)
+
+from .functions import (  # noqa
+    function,
+)
+
+from .methods import (  # noqa
+    install_method,
+    method,
+)

omlish/dispatch/functions.py

@@ -6,6 +6,9 @@ from .dispatch import Dispatcher
 from .impls import get_impl_func_cls_set
 
 
+##
+
+
 # USE_EXTENSION = True
 USE_EXTENSION = False
 

omlish/dispatch/impls.py

@@ -5,8 +5,8 @@ TODO:
  - multidispatch? never solved..
   - just generic on tuple[A0, A1, ...]
 """
+import inspect
 import typing as ta
-import weakref
 
 from .. import c3
 from .. import check
@@ -19,15 +19,7 @@ T = ta.TypeVar('T')
 ##
 
 
-_IMPL_FUNC_CLS_SET_CACHE: ta.MutableMapping[ta.Callable, frozenset[type]] = weakref.WeakKeyDictionary()
-
-
-def get_impl_func_cls_set(func: ta.Callable) -> frozenset[type]:
-    try:
-        return _IMPL_FUNC_CLS_SET_CACHE[func]
-    except KeyError:
-        pass
-
+def get_impl_func_cls_set(func: ta.Callable, *, arg_offset: int = 0) -> frozenset[type]:
     ann = getattr(func, '__annotations__', {})
     if not ann:
         raise TypeError(f'Invalid impl func: {func!r}')
@@ -39,8 +31,11 @@ def get_impl_func_cls_set(func: ta.Callable) -> frozenset[type]:
             return check.isinstance(a, type)
 
     # Exclude 'return' to support difficult to handle return types - they are unimportant.
-    # TODO: only get hints for first arg - requires inspection, which requires chopping off `self`, which can be tricky.
-    _, cls = next(iter(rfl.get_filtered_type_hints(func, exclude=['return']).items()))
+    th_dct = rfl.get_filtered_type_hints(func, exclude=['return'])
+
+    ps = inspect.signature(func).parameters
+    p = list(ps.values())[arg_offset]
+    cls = th_dct[p.name]
 
     rty = rfl.type_(cls)
     if isinstance(rty, rfl.Union):
@@ -48,10 +43,12 @@ def get_impl_func_cls_set(func: ta.Callable) -> frozenset[type]:
     else:
         ret = frozenset([erase(rty)])
 
-    _IMPL_FUNC_CLS_SET_CACHE[func] = ret
     return ret
 
 
+##
+
+
 def find_impl(cls: type, registry: ta.Mapping[type, T]) -> T | None:
     mro = c3.compose_mro(cls, registry.keys())
 

omlish/dispatch/methods.py

@@ -18,14 +18,25 @@ from .impls import get_impl_func_cls_set
 T = ta.TypeVar('T')
 
 
+##
+
+
 class Method:
-    def __init__(self, func: ta.Callable) -> None:
+    def __init__(
+            self,
+            func: ta.Callable,
+            *,
+            installable: bool = False,
+    ) -> None:
+        super().__init__()
+
         if not callable(func) and not hasattr(func, '__get__'):  # type: ignore
             raise TypeError(f'{func!r} is not callable or a descriptor')
 
         self._func = func
+        self._installable = installable
 
-        self._impls: ta.MutableSet[ta.Callable] = weakref.WeakSet()
+        self._impls: ta.MutableMapping[ta.Callable, frozenset[type] | None] = weakref.WeakKeyDictionary()
 
         # bpo-45678: special-casing for classmethod/staticmethod in Python <=3.9, as functools.update_wrapper doesn't
         # work properly in singledispatchmethod.__get__ if it is applied to an unbound classmethod/staticmethod
@@ -48,6 +59,15 @@ class Method:
 
         self._dispatch_func_cache_remove = dispatch_func_cache_remove
 
+        self._owner: type | None = None
+        self._name: str | None = None
+
+    def __set_name__(self, owner, name):
+        if self._owner is None:
+            self._owner = owner
+        if self._name is None:
+            self._name = name
+
     def __repr__(self) -> str:
         return f'<{type(self).__module__}.{type(self).__qualname__}:{self._func} at 0x{id(self):x}>'
 
@@ -61,7 +81,7 @@ class Method:
         setattr(wrapper, '__isabstractmethod__', self._is_abstractmethod)  # noqa
         return wrapper
 
-    def register(self, impl: T) -> T:
+    def register(self, impl: T, cls_set: frozenset[type] | None = None) -> T:
         # bpo-39679: in Python <= 3.9, classmethods and staticmethods don't inherit __annotations__ of the wrapped
         # function (fixed in 3.10+ as a side-effect of bpo-43682) but we need that for annotation-derived
         # singledispatches. So we add that just-in-time here.
@@ -70,7 +90,7 @@ class Method:
 
         check.callable(impl)
         if impl not in self._impls:
-            self._impls.add(impl)  # type: ignore
+            self._impls[impl] = cls_set  # type: ignore
             self._dispatch_func_cache.clear()
 
         return impl
@@ -85,14 +105,23 @@ class Method:
                 hash(att)
             except TypeError:
                 continue
-            if att in self._impls:
-                try:
-                    ex_nam = seen[att]
-                except KeyError:
-                    pass
-                else:
-                    raise TypeError(f'Duplicate impl: {owner_cls} {instance_cls} {nam} {ex_nam}')
-                disp.register(nam, get_impl_func_cls_set(att))
+
+            if att not in self._impls:
+                continue
+            cls_set = self._impls[att]
+
+            if cls_set is None:
+                cls_set = get_impl_func_cls_set(att, arg_offset=1)
+                self._impls[att] = cls_set
+
+            try:
+                ex_nam = seen[att]
+            except KeyError:
+                pass
+            else:
+                raise TypeError(f'Duplicate impl: {owner_cls} {instance_cls} {nam} {ex_nam}')
+
+            disp.register(nam, cls_set)
 
         return disp
 
@@ -106,9 +135,11 @@ class Method:
         def __call__(self, *args, **kwargs):  # noqa
             if not args:
                 raise TypeError(f'{func_name} requires at least 1 positional argument')
+
             if (impl_att := dispatch(type_(args[0]))) is not None:
                 fn = getattr_(self, impl_att)
                 return fn(*args, **kwargs)
+
             return base_func.__get__(self)(*args, **kwargs)  # noqa
 
         self.update_wrapper(__call__)
@@ -148,5 +179,29 @@ class Method:
         return func.__get__(instance)(*args, **kwargs)  # noqa
 
 
-def method(func):  # noqa
-    return Method(func)
+def method(func=None, /, *, installable=False):  # noqa
+    kw = dict(installable=installable)
+    if func is None:
+        return functools.partial(Method, **kw)
+    return Method(func, **kw)
+
+
+def install_method(mth: ta.Any, *, name: str | None = None) -> ta.Callable[[T], T]:
+    mth = check.isinstance(mth, Method)
+    if not mth._installable:  # noqa
+        raise TypeError(f'Method not installable: {mth}')
+
+    def inner(fn):
+        a = name
+        if a is None:
+            a = fn.__name__
+
+        cls: type = check.not_none(mth._owner)  # noqa
+        check.arg(not hasattr(cls, a))
+        setattr(cls, a, fn)
+
+        mth.register(fn)
+
+        return fn
+
+    return inner

omlish/iterators/iterators.py

@@ -5,6 +5,9 @@ import typing as ta
 T = ta.TypeVar('T')
 
 
+##
+
+
 _MISSING = object()
 
 

omlish/iterators/recipes.py

@@ -9,6 +9,9 @@ import typing as ta
 T = ta.TypeVar('T')
 
 
+##
+
+
 def sliding_window(it: ta.Iterable[T], n: int) -> ta.Iterator[tuple[T, ...]]:
     # sliding_window('ABCDEFG', 4) -> ABCD BCDE CDEF DEFG
     iterator = iter(it)

omlish/iterators/tools.py

@@ -11,6 +11,9 @@ T = ta.TypeVar('T')
 U = ta.TypeVar('U')
 
 
+##
+
+
 def unzip(it: ta.Iterable[T], width: int | None = None) -> list:
     if width is None:
         if not isinstance(it, PeekIterator):

omlish/iterators/unique.py

@@ -7,6 +7,9 @@ from .. import lang
 T = ta.TypeVar('T')
 
 
+##
+
+
 @dc.dataclass()
 class UniqueStats:
     key: ta.Any

omlish/lang/__init__.py

@@ -1,11 +1,14 @@
 from .attrs import (  # noqa
     AttrOps,
+    AttributePresentError,
     DictAttrOps,
     STD_ATTR_OPS,
+    SetAttrIfPresent,
     StdAttrOps,
     TRANSIENT_ATTR_OPS,
     TransientAttrOps,
     TransientDict,
+    set_attr,
     transient_delattr,
     transient_getattr,
     transient_setattr,
@@ -130,6 +133,7 @@ from .functions import (  # noqa
     Args,
     VoidError,
     as_async,
+    call_with,
     coalesce,
     constant,
     finally_,

omlish/lang/attrs.py

@@ -1,8 +1,76 @@
 import abc
 import collections.abc
+import functools
 import typing as ta
 
 
+T = ta.TypeVar('T')
+
+
+##
+
+
+class AttributePresentError(Exception):
+    pass
+
+
+SetAttrIfPresent: ta.TypeAlias = ta.Literal['overwrite', 'leave', 'raise']
+
+
+_NO_SET_ATTR_VALUE = object()
+
+
+@ta.overload
+def set_attr(
+        obj: ta.Any,
+        name: str,
+        *,
+        if_present: SetAttrIfPresent = 'overwrite',
+) -> ta.Callable[[T], T]:
+    ...
+
+
+@ta.overload
+def set_attr(
+        obj: ta.Any,
+        name: str,
+        value: T,
+        *,
+        if_present: SetAttrIfPresent = 'overwrite',
+) -> T:
+    ...
+
+
+def set_attr(
+        obj,
+        name,
+        value=_NO_SET_ATTR_VALUE,
+        *,
+        if_present='overwrite',
+):
+    if value is _NO_SET_ATTR_VALUE:
+        return functools.partial(
+            set_attr,
+            obj,
+            name,
+            if_present=if_present,
+        )
+
+    if hasattr(obj, name):
+        if if_present == 'overwrite':
+            pass
+        elif if_present == 'leave':
+            return value
+        elif if_present == 'raise':
+            raise AttributePresentError(name)
+        else:
+            raise ValueError(if_present)
+
+    setattr(obj, name, value)
+
+    return value
+
+
 ##
 
 
@@ -24,7 +92,7 @@ class AttrOps(abc.ABC):
         raise NotImplementedError
 
 
-##
+#
 
 
 class StdAttrOps(AttrOps):
@@ -44,7 +112,7 @@ class StdAttrOps(AttrOps):
 STD_ATTR_OPS = StdAttrOps()
 
 
-##
+#
 
 
 class DictAttrOps(AttrOps):

omlish/lang/functions.py

@@ -22,7 +22,14 @@ def is_lambda(f: ta.Any) -> bool:
 ##
 
 
-def maybe_call(obj: ta.Any, att: str, *args, default: ta.Any = None, **kwargs) -> ta.Any:
+def call_with(fn: ta.Any, *args: ta.Any, **kwargs: ta.Any) -> ta.Callable[[T], T]:
+    def inner(obj):
+        fn(obj, *args, **kwargs)
+        return obj
+    return inner
+
+
+def maybe_call(obj: ta.Any, att: str, *args, default: ta.Any = None, **kwargs: ta.Any) -> ta.Any:
     try:
         fn = getattr(obj, att)
     except AttributeError:

omlish/lang/maybes.py

@@ -1,6 +1,9 @@
 import abc
 import typing as ta
 
+from ..lite.maybes import Maybe as _LiteMaybe
+from ..lite.maybes import as_maybe as _as_lite_maybe
+
 
 T = ta.TypeVar('T')
 U = ta.TypeVar('U')
@@ -123,6 +126,9 @@ class _Maybe(Maybe[T], tuple):
         raise exception_supplier()
 
 
+#
+
+
 def just(v: T) -> Maybe[T]:
     return tuple.__new__(_Maybe, (v,))  # noqa
 
@@ -138,3 +144,14 @@ def maybe(o: T | None) -> Maybe[T]:
     if o is None:
         return _empty  # noqa
     return just(o)
+
+
+##
+
+
+@_as_lite_maybe.register
+def _(obj: Maybe) -> _LiteMaybe:
+    if obj.present:
+        return _LiteMaybe.just(obj.must())
+    else:
+        return _LiteMaybe.empty()

omlish/lite/maybes.py

@@ -1,10 +1,14 @@
 import abc
+import functools
 import typing as ta
 
 
 T = ta.TypeVar('T')
 
 
+##
+
+
 class Maybe(ta.Generic[T]):
     @property
     @abc.abstractmethod
@@ -43,3 +47,16 @@ class _Maybe(Maybe[T], tuple):
 
 
 Maybe._empty = tuple.__new__(_Maybe, ())  # noqa
+
+
+##
+
+
+@functools.singledispatch
+def as_maybe(obj: ta.Any) -> Maybe:
+    raise TypeError(obj)
+
+
+@as_maybe.register
+def _(obj: Maybe) -> Maybe:
+    return obj

omlish/text/minja.py

@@ -5,12 +5,14 @@ TODO:
  - raw
  - blocks / inheritance
 """
+import dataclasses as dc
 import io
 import re
 import typing as ta
 
 from ..lite.cached import cached_nullary
 from ..lite.check import check
+from ..lite.maybes import Maybe
 
 
 ##
@@ -29,6 +31,34 @@ class MinjaTemplate:
 ##
 
 
+@dc.dataclass(frozen=True)
+class MinjaTemplateParam:
+    name: str
+    default: Maybe[ta.Any] = Maybe.empty()
+
+    def __post_init__(self) -> None:
+        check.arg(self.name.isidentifier())
+
+    @classmethod
+    def of(cls, obj: ta.Union[str, 'MinjaTemplateParam']) -> 'MinjaTemplateParam':
+        if isinstance(obj, MinjaTemplateParam):
+            return obj
+        elif isinstance(obj, str):
+            return MinjaTemplateParam.new(obj)
+        else:
+            raise TypeError(obj)
+
+    @classmethod
+    def new(cls, name: str, *defaults: ta.Any) -> 'MinjaTemplateParam':
+        dfl: Maybe[ta.Any]
+        if defaults:
+            [dv] = defaults
+            dfl = Maybe.just(dv)
+        else:
+            dfl = Maybe.empty()
+        return cls(name, dfl)
+
+
 class MinjaTemplateCompiler:
     """
     Compiles a template string into a Python function. The returned function takes a dictionary 'context' and returns
@@ -43,23 +73,28 @@ class MinjaTemplateCompiler:
     - {# comment #}: Ignored completely.
     """
 
-    DEFAULT_INDENT: str = '  '
+    DEFAULT_INDENT: str = ' ' * 4
 
     def __init__(
             self,
             src: str,
-            args: ta.Sequence[str],
+            params: ta.Sequence[ta.Union[str, MinjaTemplateParam]],
             *,
             indent: str = DEFAULT_INDENT,
     ) -> None:
         super().__init__()
 
+        check.not_isinstance(params, str)
+
         self._src = check.isinstance(src, str)
-        self._args = check.not_isinstance(args, str)
+        self._params = [
+            MinjaTemplateParam.of(p)
+            for p in params
+        ]
+        check.unique(p.name for p in self._params)
         self._indent_str: str = check.non_empty_str(indent)
 
         self._stack: ta.List[ta.Literal['for', 'if']] = []
-        self._lines: ta.List[str] = []
 
     #
 
@@ -124,41 +159,63 @@ class MinjaTemplateCompiler:
 
     _RENDER_FN_NAME = '__render'
 
+    class Rendered(ta.NamedTuple):
+        src: str
+        ns: ta.Dict[str, ta.Any]
+
     @cached_nullary
-    def render(self) -> ta.Tuple[str, ta.Mapping[str, ta.Any]]:
+    def render(self) -> Rendered:
+        lines: ta.List[str] = []
+
+        ns: ta.Dict[str, ta.Any] = {
+            '__StringIO': io.StringIO,
+        }
+
         parts = self._split_tags(self._src)
 
-        self._lines.append(f'def {self._RENDER_FN_NAME}({", ".join(self._args)}):')
-        self._lines.append(self._indent('__output = __StringIO()'))
+        if not self._params:
+            lines.append(f'def {self._RENDER_FN_NAME}():')
+        else:
+            lines.append(f'def {self._RENDER_FN_NAME}(')
+            for p in self._params:
+                if p.default.present:
+                    check.not_in(p.name, ns)
+                    ns[p.name] = p.default.must()
+                    lines.append(self._indent(f'{p.name}={p.name},'))
+                else:
+                    lines.append(self._indent(f'{p.name},'))
+            lines.append('):')
+
+        lines.append(self._indent('__output = __StringIO()'))
 
         for g, s in parts:
             if g == '{':
                 expr = s.strip()
-                self._lines.append(self._indent(f'__output.write(str({expr}))'))
+                lines.append(self._indent(f'__output.write(str({expr}))'))
 
             elif g == '%':
                 stmt = s.strip()
 
                 if stmt.startswith('for '):
-                    self._lines.append(self._indent(stmt + ':'))
+                    lines.append(self._indent(stmt + ':'))
                     self._stack.append('for')
                 elif stmt.startswith('endfor'):
                     check.equal(self._stack.pop(), 'for')
 
                 elif stmt.startswith('if '):
-                    self._lines.append(self._indent(stmt + ':'))
+                    lines.append(self._indent(stmt + ':'))
                     self._stack.append('if')
                 elif stmt.startswith('elif '):
                     check.equal(self._stack[-1], 'if')
-                    self._lines.append(self._indent(stmt + ':', -1))
+                    lines.append(self._indent(stmt + ':', -1))
                 elif stmt.strip() == 'else':
                     check.equal(self._stack[-1], 'if')
-                    self._lines.append(self._indent('else:', -1))
+                    lines.append(self._indent('else:', -1))
                 elif stmt.startswith('endif'):
                     check.equal(self._stack.pop(), 'if')
 
                 else:
-                    self._lines.append(self._indent(stmt))
+                    lines.append(self._indent(stmt))
 
             elif g == '#':
                 pass
@@ -166,20 +223,16 @@ class MinjaTemplateCompiler:
             elif not g:
                 if s:
                     safe_text = s.replace('"""', '\\"""')
-                    self._lines.append(self._indent(f'__output.write("""{safe_text}""")'))
+                    lines.append(self._indent(f'__output.write("""{safe_text}""")'))
 
             else:
                 raise KeyError(g)
 
         check.empty(self._stack)
 
-        self._lines.append(self._indent('return __output.getvalue()'))
-
-        ns = {
-            '__StringIO': io.StringIO,
-        }
+        lines.append(self._indent('return __output.getvalue()'))
 
-        return ('\n'.join(self._lines), ns)
+        return self.Rendered('\n'.join(lines), ns)
 
     #
 
@@ -200,12 +253,12 @@ class MinjaTemplateCompiler:
 
     @cached_nullary
     def compile(self) -> MinjaTemplate:
-        render_src, render_ns = self.render()
+        rendered = self.render()
 
         render_fn = self._make_fn(
             self._RENDER_FN_NAME,
-            render_src,
-            render_ns,
+            rendered.src,
+            rendered.ns,
         )
 
         return MinjaTemplate(render_fn)
@@ -214,8 +267,11 @@ class MinjaTemplateCompiler:
 ##
 
 
-def compile_minja_template(src: str, args: ta.Sequence[str] = ()) -> MinjaTemplate:
-    return MinjaTemplateCompiler(src, args).compile()
+def compile_minja_template(
+        src: str,
+        params: ta.Sequence[ta.Union[str, MinjaTemplateParam]] = (),
+) -> MinjaTemplate:
+    return MinjaTemplateCompiler(src, params).compile()
 
 
 def render_minja_template(src: str, **kwargs: ta.Any) -> str:

omlish/text/templating.py

@@ -0,0 +1,116 @@
+import abc
+import dataclasses as dc
+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
+else:
+    jinja2 = lang.proxy_import('jinja2')
+
+
+##
+
+
+class Templater(lang.Abstract):
+    @dc.dataclass(frozen=True)
+    class Context:
+        env: ta.Mapping[str, ta.Any] | None = None
+
+    @abc.abstractmethod
+    def render(self, ctx: Context) -> str:
+        raise NotImplementedError
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class FormatTemplater(Templater):
+    """https://docs.python.org/3/library/string.html#format-specification-mini-language"""
+
+    fmt: str
+
+    def render(self, ctx: Templater.Context) -> str:
+        return self.fmt.format(**(ctx.env or {}))
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class Pep292Templater(Templater):
+    """https://peps.python.org/pep-0292/"""
+
+    tmpl: string.Template
+
+    def render(self, ctx: Templater.Context) -> str:
+        return self.tmpl.substitute(ctx.env or {})
+
+    @classmethod
+    def from_string(cls, src: str) -> 'Pep292Templater':
+        return cls(string.Template(src))
+
+##
+
+
+@dc.dataclass(frozen=True)
+class MinjaTemplater(Templater):
+    tmpl: MinjaTemplate
+
+    ENV_IDENT: ta.ClassVar[str] = 'env'
+
+    def render(self, ctx: Templater.Context) -> str:
+        return self.tmpl(**{self.ENV_IDENT: ctx.env or {}})
+
+    @classmethod
+    def from_string(
+            cls,
+            src: str,
+            **ns: ta.Any,
+    ) -> 'MinjaTemplater':
+        tmpl = compile_minja_template(
+            src,
+            [
+                MinjaTemplateParam(cls.ENV_IDENT),
+                *[
+                    MinjaTemplateParam.new(k, v)
+                    for k, v in ns.items()
+                ],
+            ],
+        )
+
+        return cls(tmpl)
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class JinjaTemplater(Templater):
+    tmpl: jinja2.Template
+
+    def render(self, ctx: Templater.Context) -> str:
+        return self.tmpl.render(**(ctx.env or {}))
+
+    @classmethod
+    def from_string(
+            cls,
+            src: str,
+            *,
+            env: jinja2.Environment | None = None,
+            **kwargs: ta.Any,
+    ) -> 'JinjaTemplater':
+        if env is None:
+            env = jinja2.Environment()
+        tmpl = env.from_string(src)
+        return cls(
+            tmpl,
+            **kwargs,
+        )

{omlish-0.0.0.dev285.dist-info → omlish-0.0.0.dev287.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev285
+Version: 0.0.0.dev287
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -42,6 +42,7 @@ Requires-Dist: asyncpg~=0.30; extra == "all"
 Requires-Dist: apsw~=3.49; extra == "all"
 Requires-Dist: sqlean.py~=3.47; extra == "all"
 Requires-Dist: duckdb~=1.2; extra == "all"
+Requires-Dist: jinja2~=3.1; extra == "all"
 Requires-Dist: pytest~=8.3; extra == "all"
 Requires-Dist: anyio~=4.9; extra == "all"
 Requires-Dist: sniffio~=1.3; extra == "all"
@@ -88,6 +89,8 @@ Requires-Dist: asyncpg~=0.30; extra == "sqldrivers"
 Requires-Dist: apsw~=3.49; extra == "sqldrivers"
 Requires-Dist: sqlean.py~=3.47; extra == "sqldrivers"
 Requires-Dist: duckdb~=1.2; extra == "sqldrivers"
+Provides-Extra: templates
+Requires-Dist: jinja2~=3.1; extra == "templates"
 Provides-Extra: testing
 Requires-Dist: pytest~=8.3; extra == "testing"
 Provides-Extra: plus

{omlish-0.0.0.dev285.dist-info → omlish-0.0.0.dev287.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=pjGUyLHaoWpPqRP3jz2u1fC1qoRc2lvrEcpU_Ax2tdg,8253
-omlish/__about__.py,sha256=HdBvgJvGybfoC0HT12EdWHXOYyK8r8Y4UmpMPI4FqC0,3380
+omlish/__about__.py,sha256=i-F-KstjC74KdNV4E5DhZUVUlbu5XeNyaWrDZaDrQtw,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
@@ -153,7 +153,7 @@ omlish/collections/hasheq.py,sha256=swOBPEnU_C0SU3VqWJX9mr0BfZLD0A-4Ke9Vahj3fE4,
 omlish/collections/identity.py,sha256=xtoczgBPYzr6r2lJS-eti2kEnN8rVDvNGDCG3TA6vRo,3405
 omlish/collections/mappings.py,sha256=iXb7oq1rCQak0KgzblgrzWCJLrkfJAYHFvl9lprOVUI,2804
 omlish/collections/ordered.py,sha256=7zTbrAt12rf6i33XHkQERKar258fJacaw_WbtGEBgWo,2338
-omlish/collections/ranked.py,sha256=rg6DL36oOUiG5JQEAkGnT8b6f9mSndQlIovtt8GQj_w,2229
+omlish/collections/ranked.py,sha256=McB8C2UQfUvrbmxGTpBz1-EZuyCLkBFtktzncMdt8_Y,2287
 omlish/collections/unmodifiable.py,sha256=X7kKhPFdZF4m28SfLDxZL-riWlhbZffdPv35aTP30YM,4753
 omlish/collections/utils.py,sha256=voqecDPFuqSLN8IwJDKyy-HnecEU4JYOXxd1HAaEuMY,2900
 omlish/collections/cache/__init__.py,sha256=D1gO71VcwxFTZP9gAc9isHfg_TEdalwhsJcgGLvS9hg,233
@@ -170,10 +170,10 @@ omlish/collections/kv/wrappers.py,sha256=nUtoiArK1Fu2TgxFrqZU69bEoAxKJ_nA7qMeeih
 omlish/collections/persistent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/collections/persistent/persistent.py,sha256=6CuzeZjZMqBLflU-CuWu32SrtZXFrJOV-H_UUuYoTkg,880
 omlish/collections/persistent/treap.py,sha256=o7vhnn8kHde_Plk0sojlJZkkKwp8hpj2IekhcvbYqHs,7739
-omlish/collections/persistent/treapmap.py,sha256=dBCZHouClUhvUBnSR5k97AAu09EQVRWdUOwwc1CHPmg,5809
+omlish/collections/persistent/treapmap.py,sha256=lLxjHeR5pFFperrlw3tKIpe20xtszETG3_26EMAwhB4,5793
 omlish/collections/sorted/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/collections/sorted/skiplist.py,sha256=tybcD8OslDBCc86Z1qKb4GRkbhMY26qorPzPIeqFmKk,6031
-omlish/collections/sorted/sorted.py,sha256=UhjJce7ulO_FUB6dFOhKpEg9Bcgxr2m6VXeCNtbLjSM,3324
+omlish/collections/sorted/skiplist.py,sha256=4BqAAxOAb0VM33bny-rdrFM9d2jVbyxsN7yHz3jrqG4,6035
+omlish/collections/sorted/sorted.py,sha256=IWQm5uyxuskCoX1fCtlBcYlGKdyxQQNMwnTj__eoZS8,3356
 omlish/concurrent/__init__.py,sha256=9p-s8MvBEYDqHIoYU3OYoe-Nni22QdkW7nhZGEukJTM,197
 omlish/concurrent/executors.py,sha256=mF-rjJWzNFxwB1-_H7rHuwoImpl4FtNM6W3wcqM3NEE,1291
 omlish/concurrent/futures.py,sha256=870tx8ELI8THvMnTrQoYIlEFKO9hM4KUrlehckJqKBU,4238
@@ -206,7 +206,7 @@ omlish/dataclasses/__init__.py,sha256=xo5rJYrQ2JE5jcX4fHv5e9bC6RIXFd-K8yurUP20oO
 omlish/dataclasses/debug.py,sha256=giBiv6aXvX0IagwNCW64qBzNjfOFr3-VmgDy_KYlb-k,29
 omlish/dataclasses/errors.py,sha256=tyv3WR6az66uGGiq9FIuCHvy1Ef-G7zeMY7mMG6hy2Y,2527
 omlish/dataclasses/inspect.py,sha256=BlpPghVCU3w_YDnONEqqE99YHzJM2q3eoqe39YX25Ko,4596
-omlish/dataclasses/internals.py,sha256=qFSDQzBtukvYO5QMoZx83nwyNA53S-8jJyB9l1e1oZ0,2975
+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
@@ -249,7 +249,7 @@ omlish/dataclasses/generation/mangling.py,sha256=AUtTMjAAuQ_kUfE-CypnpRsiM10EAkM
 omlish/dataclasses/generation/manifests.py,sha256=tRLO59eysC13z_lbPxaErPy-xM3BIBRpj8MhmbYoGnE,309
 omlish/dataclasses/generation/ops.py,sha256=dWse_SsoXtpDqXzDPJOqBeb9G5F7RrEChfGl4iTL0QE,1718
 omlish/dataclasses/generation/plans.py,sha256=c3TRwa20quN-DrM-eI2KoTG4XVyL3n12RcwZoJxEgB0,536
-omlish/dataclasses/generation/processor.py,sha256=Va-8RV19jIzqreXCUeP4nFMPglAfIxeIaGOzgYTU_IY,4496
+omlish/dataclasses/generation/processor.py,sha256=_rt_GHdx_pi5seRMzIu6DvLEx4MYGsG8CKykxqDiu1s,4689
 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
@@ -259,7 +259,7 @@ omlish/dataclasses/metaclass/meta.py,sha256=0MQG7Sl1y8QccGRgLOC0VoLDTMBG6VoyT-wZ
 omlish/dataclasses/metaclass/specs.py,sha256=djzkHK95h06Cgrx8rr3SGkv2gOvL-fPOhWOBWbbN8h4,789
 omlish/dataclasses/processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/dataclasses/processing/base.py,sha256=wkPDfeojZ2mg72yifMW7VNpJBEgEbaC3Qr_bd8_aV5E,1827
-omlish/dataclasses/processing/driving.py,sha256=k3SrbY1fAvRegYs_OorOeh3f5j6O7NEmL7yL7RnwVic,1033
+omlish/dataclasses/processing/driving.py,sha256=AwT4kvh_GdSDfYVLBjBdkVmbO7U5LK95A_K3qTK01MY,1031
 omlish/dataclasses/processing/priority.py,sha256=57jdwUZ29Z9ZtKWIzyar4raNLHNrWd0c29ZLv2hcfjo,260
 omlish/dataclasses/processing/registry.py,sha256=iNDHwW1gsq8gTMi4XvNBBzab0OYdSKvDLQw9gCBt2FI,1884
 omlish/dataclasses/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -286,13 +286,13 @@ omlish/diag/replserver/__init__.py,sha256=uLo6V2aQ29v9z3IMELlPDSlG3_2iOT4-_X8Vni
 omlish/diag/replserver/__main__.py,sha256=LmU41lQ58bm1h4Mx7S8zhE_uEBSC6kPcp9mn5JRpulA,32
 omlish/diag/replserver/console.py,sha256=XzBDVhYlr8FY6ym4OwoaIHuFOHnGK3dTYlMDIOMUUlA,7410
 omlish/diag/replserver/server.py,sha256=pqJZXKnD-Cc03hnL_FNqGYaW9kH-IM3e11vCyDAcBD8,5374
-omlish/dispatch/__init__.py,sha256=GsiGJ91NKiQptSROtnCSkrZExBkvfDwYvdoTu5dBqF0,117
+omlish/dispatch/__init__.py,sha256=UwVT6SSk5HKk9xF9vc_UJD8BDSIQWSw98Ldx-G-6PC0,166
 omlish/dispatch/_dispatch2.py,sha256=70k1tKKvuhxtAu6v4skECfHKIKVWrmlt7G_JKLUsKEs,1966
 omlish/dispatch/_dispatch3.py,sha256=9Zjd7bINAC3keiaBdssc4v5dY0-8OI6XooV2DR9U7Z0,2818
 omlish/dispatch/dispatch.py,sha256=KA5l49AiGLRjp4J7RDJW9RiDp9WUD1ewR1AOPEF8g38,3062
-omlish/dispatch/functions.py,sha256=8Qvj62XKn9SKfiqoVQdBD3wVRE4JUWpZDqs0oouuDIw,1519
-omlish/dispatch/impls.py,sha256=JP67zSvDWG4XFOmKPrhWHxRV9WnyAPAsjQHvbmEJh4c,2136
-omlish/dispatch/methods.py,sha256=oFtKljPnTMG0DVUBdEkf81-0RzEbgHhS4J_63HYJfKU,5492
+omlish/dispatch/functions.py,sha256=cwNzGIg2ZIalEgn9I03cnJVbMTHjWloyDTaowlO3UPs,1524
+omlish/dispatch/impls.py,sha256=K_okKvpZml4NkTHJmTVyMQSrIaIJcqTEgkreGwukaOw,1895
+omlish/dispatch/methods.py,sha256=7jNKvwGNW9CJRTMDZyedmrWJN7Y9-ToI7YOAQ8VJu5Q,6786
 omlish/docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/docker/all.py,sha256=xXRgJgLGPwAtr7bDMJ_Dp9jTfOwfGvohNhc6LsoELJc,514
 omlish/docker/cli.py,sha256=gtb9kitVfGnd4cr587NsVVk8D5Ok5y5SAsqD_SwGrSA,2565
@@ -455,12 +455,12 @@ omlish/io/fdio/kqueue.py,sha256=YgGBQibkAUYODYDiGl7Enjtx1oQsJXuDsBLBXgqlLQw,3832
 omlish/io/fdio/manager.py,sha256=q4wWf7nKrNtjx6yPEvrVnFt4UtK_BTvVlquEGw7poEo,1250
 omlish/io/fdio/pollers.py,sha256=yNadAt3W5wd90PFmd3vD77bq5QwoVb2A6SM2JjZpKRs,5507
 omlish/iterators/__init__.py,sha256=yMavf5FofiS1EU4UFuWPXiFZ03W0H-y7MuMxW8FUaEE,358
-omlish/iterators/iterators.py,sha256=iTQQwBE6Wzoy36dnbPIws17zbjE3zNN4KwVw4Fzh-gY,3154
-omlish/iterators/recipes.py,sha256=53mkexitMhkwXQZbL6DrhpT0WePQ_56uXd5Jaw3DfzI,467
-omlish/iterators/tools.py,sha256=Pi4ybXytUXVZ3xwK89xpPImQfYYId9p1vIFQvVqVLqA,2551
-omlish/iterators/unique.py,sha256=0jAX3kwzVfRNhe0Tmh7kVP_Q2WBIn8POo_O-rgFV0rQ,1390
-omlish/lang/__init__.py,sha256=2lnwSSQ_AFbsi5OJLAAWRWJ5xY2kSLWdIzZMW6mfr4s,5238
-omlish/lang/attrs.py,sha256=fofCKN0X8TMu1yGqHpLpNLih9r9HWl3D3Vn3b6O791w,3891
+omlish/iterators/iterators.py,sha256=RxW35yQ5ed8vBQ22IqpDXFx-i5JiLQdp7-pkMZXhJJ8,3159
+omlish/iterators/recipes.py,sha256=wOwOZg-zWG9Zc3wcAxJFSe2rtavVBYwZOfG09qYEx_4,472
+omlish/iterators/tools.py,sha256=c4hArZEVV8y9_dFfmRwakusv1cWJLT4MkTkGRjnGN5U,2556
+omlish/iterators/unique.py,sha256=Nw0pSaNEcHAkve0ugfLPvJcirDOn9ECyC5wIL8JlJKI,1395
+omlish/lang/__init__.py,sha256=hv6BlnJfD7gHFyOGXl1lgbo3vHkmsivqy462JwA04tM,5316
+omlish/lang/attrs.py,sha256=i7euRF81uNF8QDmUVXSK_BtqLGshaMi4VVdUnMjiMwg,5050
 omlish/lang/clsdct.py,sha256=HAGIvBSbCefzRjXriwYSBLO7QHKRv2UsE78jixOb-fA,1828
 omlish/lang/collections.py,sha256=aGi0j6VzVe2nz4l357Y4RD5_XNl8OJbmM5qM6BclrrY,1895
 omlish/lang/comparison.py,sha256=MOwEG0Yny-jBPHO9kQto9FSRyeNpQW24UABsghkrHxY,1356
@@ -468,11 +468,11 @@ omlish/lang/contextmanagers.py,sha256=UPH6daYwSP9cH5AfSVsJyEHk1UURMGhVPM5ZRhp_Hv
 omlish/lang/datetimes.py,sha256=mrTtA67JYpfQwSlzdPcBtvm6dAyYM_dXNnlxFwFQH0M,228
 omlish/lang/descriptors.py,sha256=zBtgO9LjdSTGHNUgiIqswh78WOVoGH6KzS0NbgB1Wls,6572
 omlish/lang/enums.py,sha256=F9tflHfaAoV2MpyuhZzpfX9-H55M3zNa9hCszsngEo8,111
-omlish/lang/functions.py,sha256=kSdVUJZmRcncMdU43rcQLZ5E2NMcRz6X6pppwLNHiWk,5762
+omlish/lang/functions.py,sha256=bg2IxTFmd_J22qF3XWIRBvSIpLwPRiH_KxGXcm0QVrc,5944
 omlish/lang/generators.py,sha256=5tbjVAywiZH6oAdj1sJLRMtIkC9y3rAkecLT7Z3m7_g,5251
 omlish/lang/imports.py,sha256=aC1u2eTrxHhhxShKbJvXswe3aJ7K76vT4YK8LrsvRWU,10476
 omlish/lang/iterables.py,sha256=HOjcxOwyI5bBApDLsxRAGGhTTmw7fdZl2kEckxRVl-0,1994
-omlish/lang/maybes.py,sha256=IPlfurHCebyDamB2scqP-JmUODN1TWr7ZL1T7qz6Jzo,3421
+omlish/lang/maybes.py,sha256=pb1YrxmpXy-hWKmWR89GxXqZq1MoUD1uuTaTX30peh0,3697
 omlish/lang/objects.py,sha256=q1T26cxLkejU5XMl5iEVC9IIhjib0VBpe7JCo2bz2Ws,5411
 omlish/lang/outcomes.py,sha256=mpFy_VoM-b74L1aCFsjsZVUHx_icZ1AHMOKeVesjOp4,8628
 omlish/lang/params.py,sha256=QmNVBfJsfxjDG5ilDPgHV7sK4UwRztkSQdLTo0umb8I,6648
@@ -508,7 +508,7 @@ omlish/lite/inject.py,sha256=-tTsOqqef-Ix5Tgl2DP_JAsNWJQDFUptERl3lk14Uzs,29007
 omlish/lite/json.py,sha256=7-02Ny4fq-6YAu5ynvqoijhuYXWpLmfCI19GUeZnb1c,740
 omlish/lite/logs.py,sha256=CWFG0NKGhqNeEgryF5atN2gkPYbUdTINEw_s1phbINM,51
 omlish/lite/marshal.py,sha256=4DCbLoimLwJakihpvMjJ_kpc7v9aZQY8P3-gkoqEGUE,18471
-omlish/lite/maybes.py,sha256=7OlHJ8Q2r4wQ-aRbZSlJY7x0e8gDvufFdlohGEIJ3P4,833
+omlish/lite/maybes.py,sha256=I7b2dJFkDll4B_QDlI6iKJG8fy91L6_Tj_s5eB3KI7Q,1013
 omlish/lite/pycharm.py,sha256=pUOJevrPClSqTCEOkQBO11LKX2003tfDcp18a03QFrc,1163
 omlish/lite/reflect.py,sha256=pzOY2PPuHH0omdtglkN6DheXDrGopdL3PtTJnejyLFU,2189
 omlish/lite/reprs.py,sha256=QI5VBtvq_TW1TojWL25c04QfOABLi8Smt5jc5J-bArc,2008
@@ -816,9 +816,10 @@ omlish/text/glyphsplit.py,sha256=HI8TWDUaF_tJG5RnIdIjtUH_lYnjYZ7KZBANSxOXGZc,380
 omlish/text/indent.py,sha256=LOQgHskHMLVrRC6HLL9uIWay517dpvPEYQK0Igm-wm8,1341
 omlish/text/linecache.py,sha256=hRYlEhD63ZfA6_ZOTkQIcnON-3W56QMAhcG3vEJqj9M,1858
 omlish/text/mangle.py,sha256=d7j2_HPxoxF5VrLD1TShOSfnhBLH_-lQe_OH2kl0yHg,2790
-omlish/text/minja.py,sha256=jZC-fp3Xuhx48ppqsf2Sf1pHbC0t8XBB7UpUUoOk2Qw,5751
+omlish/text/minja.py,sha256=e7XiY8IvF4Df-7hxhdC_qizHm9T4SIbFJR7enUg_Zmc,7252
 omlish/text/parts.py,sha256=Q9NvoyEGQKIWgiPD4D_Qc66cWAuyEKE033dT9m7c3Wk,6662
 omlish/text/random.py,sha256=8feS5JE_tSjYlMl-lp0j93kCfzBae9AM2cXlRLebXMA,199
+omlish/text/templating.py,sha256=UyYIs0wMigCDws0XfO3mYkJFH0-tO1IBaxWL7v2J3pw,2417
 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
@@ -829,9 +830,9 @@ omlish/typedvalues/holder.py,sha256=4SwRezsmuDDEO5gENGx8kTm30pblF5UktoEAu02i-Gk,
 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.dev285.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev285.dist-info/METADATA,sha256=i6luxJ7Bytyt00Qr_PwO9pmz0PIFJcjUNOnpdl-6g0U,4198
-omlish-0.0.0.dev285.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-omlish-0.0.0.dev285.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev285.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev285.dist-info/RECORD,,
+omlish-0.0.0.dev287.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev287.dist-info/METADATA,sha256=2lOtfXV-sPk2hcxlOFk_TruhqdiAsg_MTdrhMSxI0o0,4316
+omlish-0.0.0.dev287.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+omlish-0.0.0.dev287.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev287.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev287.dist-info/RECORD,,