omlish 0.0.0.dev373__py3-none-any.whl → 0.0.0.dev375__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev373'
-__revision__ = '0a27e61ad530198ac027dde9d0b88d9bd995d0b5'
+__version__ = '0.0.0.dev375'
+__revision__ = '5e3b55f993cef1d0198721ee8b5d9f827c357fe9'
 
 
 #

omlish/collections/__init__.py

@@ -37,10 +37,6 @@ from .coerce import (  # noqa
     seq_or_none,
 )
 
-from .errors import (  # noqa
-    DuplicateKeyError,
-)
-
 from .frozen import (  # noqa
     Frozen,
     FrozenDict,

omlish/collections/mappings.py

@@ -66,9 +66,27 @@ class TypeMap(ta.Generic[T]):
     def get(self, ty: type[T]) -> T | None:
         return self._dct.get(ty)
 
-    def __getitem__(self, ty: type[T]) -> ta.Sequence[T]:
+    def __getitem__(self, ty: type[T]) -> T:
         return self._dct[ty]
 
+    _any_dct: dict[type | tuple[type, ...], tuple[T, ...]]
+
+    def get_any(self, cls: type | tuple[type, ...]) -> ta.Sequence[T]:
+        try:
+            any_dct = self._any_dct
+        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
+
 
 class DynamicTypeMap(ta.Generic[V]):
     def __init__(self, items: ta.Iterable[V] = (), *, weak: bool = False) -> None:

omlish/collections/utils.py

@@ -1,7 +1,6 @@
 import typing as ta
 
 from .. import lang
-from .errors import DuplicateKeyError
 from .identity import IdentityKeyDict
 from .identity import IdentitySet
 
@@ -48,7 +47,7 @@ def unique(
         k = key(e)
         if k in seen:
             if strict:
-                raise DuplicateKeyError(k, e)
+                raise lang.DuplicateKeyError(k, e)
         else:
             seen.add(k)
             ret.append(e)
@@ -88,7 +87,7 @@ def make_map(
     for k, v in kvs:
         if k in d:
             if strict:
-                raise DuplicateKeyError(k)
+                raise lang.DuplicateKeyError(k)
         else:
             d[k] = v
     return d

omlish/funcs/builders.py

@@ -0,0 +1,162 @@
+# ruff: noqa: UP006 UP045
+# @omlish-lite
+import abc
+import io
+import os.path
+import sys
+import typing as ta
+
+from ..lite.cached import cached_nullary
+from ..lite.check import check
+from ..os.paths import is_path_in_dir
+
+
+##
+
+
+class FnBuilder(abc.ABC):
+    @abc.abstractmethod
+    def build_fn(
+            self,
+            name: str,
+            src: str,
+            ns: ta.Optional[ta.Mapping[str, ta.Any]] = None,
+    ) -> ta.Callable:
+        ...
+
+
+#
+
+
+class SimpleFnBuilder(FnBuilder):
+    def build_fn(
+            self,
+            name: str,
+            src: str,
+            ns: ta.Optional[ta.Mapping[str, ta.Any]] = None,
+    ) -> ta.Callable:
+        ns = dict(ns or {})
+        exec(src, ns)
+        return ns[name]
+
+
+build_fn = SimpleFnBuilder().build_fn
+
+
+#
+
+
+class DebugFnBuilder(FnBuilder):
+    def __init__(
+            self,
+            *,
+            mod_name_prefix: ta.Optional[str] = None,
+            src_dir: ta.Optional[str] = None,
+    ) -> None:
+        super().__init__()
+
+        if mod_name_prefix is None:
+            mod_name_prefix = f'_{self.__class__.__name__}_{id(self):x}_'
+        self._mod_name_prefix = mod_name_prefix
+
+        self._given_src_dir = src_dir
+
+        self._num_fns = 0
+        self._mod_names: ta.Set[str] = set()
+        self._installed_sys_path = False
+
+    @cached_nullary
+    def _src_dir(self) -> str:
+        if self._given_src_dir is not None:
+            return self._given_src_dir
+        else:
+            return __import__('tempfile').mkdtemp(prefix=f'_{self.__class__.__name__}_{os.getpid()}__')  # noqa
+
+    @cached_nullary
+    def _install_sys_path(self) -> None:
+        if (src_dir := self._src_dir()) not in sys.path:
+            self._installed_sys_path = True
+            sys.path.append(src_dir)
+
+    def uninstall_sys_path(self) -> None:
+        if self._installed_sys_path:
+            while True:
+                try:
+                    sys.path.remove(self._src_dir())
+                except ValueError:
+                    break
+            self._installed_sys_path = True
+
+    def _gen_mod_name(
+            self,
+            fn_num: int,
+            fn_name: str,
+            *,
+            suffix: ta.Optional[str] = None,
+    ) -> str:
+        mod_name = f'{self._mod_name_prefix}{fn_num}__{fn_name}{suffix or ""}'
+
+        check.not_in(mod_name, self._mod_names)
+        check.not_in(mod_name, sys.modules)
+
+        self._mod_names.add(mod_name)
+
+        return mod_name
+
+    def _build_mod(
+            self,
+            mod_name: str,
+            mod_src: str,
+    ) -> ta.Any:
+        self._install_sys_path()
+
+        src_dir = self._src_dir()
+        src_file = os.path.join(src_dir, f'{mod_name}.py')
+        check.state(is_path_in_dir(src_dir, src_file))
+
+        with open(src_file, 'w') as f:
+            f.write(mod_src)
+
+        mod = __import__(mod_name)
+
+        check.equal(mod.__file__, src_file)
+
+        return mod
+
+    def build_fn(
+            self,
+            name: str,
+            src: str,
+            ns: ta.Optional[ta.Mapping[str, ta.Any]] = None,
+    ) -> ta.Callable:
+        fn_num = self._num_fns
+        self._num_fns += 1
+
+        mod_name = self._gen_mod_name(fn_num, name)
+
+        src_preamble: ta.List[str] = []
+
+        if ns:
+            ns_mod_name = self._gen_mod_name(fn_num, name, suffix='__ns')
+            ns_mod = self._build_mod(ns_mod_name, '')
+
+            for k, v in ns.items():
+                setattr(ns_mod, k, v)
+
+            src_preamble.append(f'from {ns_mod_name} import (')
+            for k in sorted(ns):
+                src_preamble.append(f'    {k},')
+            src_preamble.append(')')
+
+        src_sb = io.StringIO()
+        if src_preamble:
+            src_sb.write('\n'.join(src_preamble))
+            src_sb.write('\n\n')
+        src_sb.write(src)
+        if not src.endswith('\n'):
+            src_sb.write('\n')
+
+        mod = self._build_mod(mod_name, src_sb.getvalue())
+
+        fn = mod.__dict__[name]
+        return fn

omlish/funcs/match.py

@@ -1,4 +1,6 @@
 """
+Analogous to scala's partial functions ( https://www.scala-lang.org/api/current/scala/PartialFunction.html ).
+
 TODO:
  - unify MatchFnClass with dispatch.method?
   - __call__ = mfs.method(); @__call__.register(lambda: ...) def _call_... ?

omlish/lang/__init__.py

@@ -173,8 +173,11 @@ from .enums import (  # noqa
     enum_name_repr,
 )
 
+from .errors import (  # noqa
+    DuplicateKeyError,
+)
+
 from .functions import (  # noqa
-    Args,
     VoidError,
     as_async,
     call_with,
@@ -359,6 +362,10 @@ from .typing import (  # noqa
 
 ##
 
+from ..lite.args import (  # noqa
+    Args,
+)
+
 from ..lite.contextmanagers import (  # noqa
     AsyncExitStacked,
     ExitStacked,

omlish/lang/functions.py

@@ -1,4 +1,3 @@
-import dataclasses as dc
 import functools
 import time
 import types
@@ -210,37 +209,6 @@ def periodically(
 ##
 
 
-@dc.dataclass(init=False)
-class Args:
-    args: ta.Sequence[ta.Any]
-    kwargs: ta.Mapping[str, ta.Any]
-
-    def __init__(self, *args: ta.Any, **kwargs: ta.Any) -> None:
-        super().__init__()
-
-        self.args = args
-        self.kwargs = kwargs
-
-    def __bool__(self) -> bool:
-        return bool(self.args) or bool(self.kwargs)
-
-    def update(self, *args: ta.Any, **kwargs: ta.Any) -> 'Args':
-        return Args(
-            *self.args,
-            *args,
-            **{
-                **self.kwargs,
-                **kwargs,
-            },
-        )
-
-    def __call__(self, fn: ta.Callable[..., T]) -> T:
-        return fn(*self.args, **self.kwargs)
-
-
-##
-
-
 def coalesce(*vs: T | None) -> T:
     for v in vs:
         if v is not None:

omlish/lite/__init__.py

@@ -1,5 +1,5 @@
 # @omlish-lite
 """
-These are the 'core' lite modules. These generally have a 'full' equivalent, in which case non-lite code should prefer
+These are the 'core' lite modules. These generally have a 'full' equivalent, in which case standard code should prefer
 that.
 """

omlish/lite/args.py

@@ -0,0 +1,36 @@
+import dataclasses as dc
+import typing as ta
+
+
+T = ta.TypeVar('T')
+
+
+##
+
+
+@dc.dataclass(init=False)
+class Args:
+    args: ta.Sequence[ta.Any]
+    kwargs: ta.Mapping[str, ta.Any]
+
+    def __init__(self, *args: ta.Any, **kwargs: ta.Any) -> None:
+        super().__init__()
+
+        self.args = args
+        self.kwargs = kwargs
+
+    def __bool__(self) -> bool:
+        return bool(self.args) or bool(self.kwargs)
+
+    def update(self, *args: ta.Any, **kwargs: ta.Any) -> 'Args':
+        return Args(
+            *self.args,
+            *args,
+            **{
+                **self.kwargs,
+                **kwargs,
+            },
+        )
+
+    def __call__(self, fn: ta.Callable[..., T]) -> T:
+        return fn(*self.args, **self.kwargs)

omlish/lite/json.py

@@ -12,7 +12,7 @@ JSON_PRETTY_KWARGS: ta.Mapping[str, ta.Any] = dict(
     indent=JSON_PRETTY_INDENT,
 )
 
-json_dump_pretty: ta.Callable[..., bytes] = functools.partial(json.dump, **JSON_PRETTY_KWARGS)  # type: ignore
+json_dump_pretty: ta.Callable[..., None] = functools.partial(json.dump, **JSON_PRETTY_KWARGS)
 json_dumps_pretty: ta.Callable[..., str] = functools.partial(json.dumps, **JSON_PRETTY_KWARGS)
 
 
@@ -26,5 +26,5 @@ JSON_COMPACT_KWARGS: ta.Mapping[str, ta.Any] = dict(
     separators=JSON_COMPACT_SEPARATORS,
 )
 
-json_dump_compact: ta.Callable[..., bytes] = functools.partial(json.dump, **JSON_COMPACT_KWARGS)  # type: ignore
+json_dump_compact: ta.Callable[..., None] = functools.partial(json.dump, **JSON_COMPACT_KWARGS)
 json_dumps_compact: ta.Callable[..., str] = functools.partial(json.dumps, **JSON_COMPACT_KWARGS)

omlish/testing/unittest/loading.py

@@ -43,13 +43,13 @@ import types
 import typing as ta
 import unittest
 
-from .types import Test
+from .types import UnittestTest
 
 
 ##
 
 
-class TestTargetLoader:
+class UnittestTargetLoader:
     def __init__(
             self,
             *,
@@ -81,7 +81,7 @@ class TestTargetLoader:
         pattern: ta.Optional[str] = None
         top: ta.Optional[str] = None
 
-    def load(self, target: Target) -> Test:
+    def load(self, target: Target) -> UnittestTest:
         loader = self._loader
         if loader is None:
             loader = unittest.loader.TestLoader()
@@ -89,8 +89,8 @@ class TestTargetLoader:
         if self._test_name_patterns:
             loader.testNamePatterns = self._test_name_patterns  # type: ignore[assignment]
 
-        if isinstance(target, TestTargetLoader.DiscoveryTarget):
-            return ta.cast(Test, loader.discover(
+        if isinstance(target, UnittestTargetLoader.DiscoveryTarget):
+            return ta.cast(UnittestTest, loader.discover(
                 target.start,  # type: ignore[arg-type]
                 target.pattern,  # type: ignore[arg-type]
                 target.top,
@@ -102,11 +102,11 @@ class TestTargetLoader:
             for part in module.split('.')[1:]:
                 module = getattr(module, part)
 
-        if isinstance(target, TestTargetLoader.ModuleTarget):
-            return ta.cast(Test, loader.loadTestsFromModule(module))
+        if isinstance(target, UnittestTargetLoader.ModuleTarget):
+            return ta.cast(UnittestTest, loader.loadTestsFromModule(module))
 
-        elif isinstance(target, TestTargetLoader.NamesTarget):
-            return ta.cast(Test, loader.loadTestsFromNames(
+        elif isinstance(target, UnittestTargetLoader.NamesTarget):
+            return ta.cast(UnittestTest, loader.loadTestsFromNames(
                 target.test_names,  # type: ignore[arg-type]
                 module,
             ))

omlish/testing/unittest/main.py

@@ -2,6 +2,9 @@
 """
 https://docs.python.org/3/library/unittest.html#command-line-interface
 ~ https://github.com/python/cpython/tree/f66c75f11d3aeeb614600251fd5d3fe1a34b5ff1/Lib/unittest
+
+TODO:
+ - giving it filenames doesn't work
 """
 # PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
 # --------------------------------------------
@@ -46,25 +49,14 @@ import sys
 import types
 import typing as ta
 
-from .loading import TestTargetLoader
-from .running import TestRunner
+from .loading import UnittestTargetLoader
+from .running import UnittestTestRunner
 
 
 ##
 
 
-def _get_attr_dict(obj: ta.Optional[ta.Any], *attrs: str) -> ta.Dict[str, ta.Any]:
-    if obj is None:
-        return {}
-
-    return {
-        a: v
-        for a in attrs
-        if (v := getattr(obj, a, None)) is not None
-    }
-
-
-class TestRunCli:
+class UnittestRunCli:
     def __init__(self) -> None:
         super().__init__()
 
@@ -192,9 +184,22 @@ class TestRunCli:
 
     #
 
+    @staticmethod
+    def _get_attr_dict(obj: ta.Optional[ta.Any], *attrs: str) -> ta.Dict[str, ta.Any]:
+        if obj is None:
+            return {}
+
+        return {
+            a: v
+            for a in attrs
+            if (v := getattr(obj, a, None)) is not None
+        }
+
+    #
+
     IMPORT_PATH_PAT = re.compile(r'[a-zA-Z_][a-zA-Z0-9_]*(?:\.[a-zA-Z_][a-zA-Z0-9_]*)*')
 
-    def _build_target(self, name: str, args: ParsedArgs) -> TestTargetLoader.Target:
+    def _build_target(self, name: str, args: ParsedArgs) -> UnittestTargetLoader.Target:
         is_discovery = False
         if os.path.isdir(name):
             is_discovery = True
@@ -204,12 +209,12 @@ class TestRunCli:
                 is_discovery = True
 
         if not is_discovery:
-            return TestTargetLoader.NamesTarget([name])
+            return UnittestTargetLoader.NamesTarget([name])
 
         else:
-            return TestTargetLoader.DiscoveryTarget(
+            return UnittestTargetLoader.DiscoveryTarget(
                 start=name,
-                **_get_attr_dict(
+                **self._get_attr_dict(
                     args.args,
                     'pattern',
                     'top',
@@ -226,7 +231,7 @@ class TestRunCli:
             *,
             exit: bool = False,  # noqa
     ) -> None:
-        loader = TestTargetLoader(**_get_attr_dict(
+        loader = UnittestTargetLoader(**self._get_attr_dict(
             args.args,
             'test_name_patterns',
         ))
@@ -236,7 +241,7 @@ class TestRunCli:
             for target_arg in (args.args.target if args.args is not None else None) or []  # noqa
         ]
 
-        runner = TestRunner(TestRunner.Args(**_get_attr_dict(
+        runner = UnittestTestRunner(UnittestTestRunner.Args(**self._get_attr_dict(
             args.args,
             'verbosity',
             'failfast',
@@ -263,7 +268,7 @@ class TestRunCli:
 
 
 def _main() -> None:
-    cli = TestRunCli()
+    cli = UnittestRunCli()
     args = cli.parse_args(sys.argv[1:])
     cli.run(args, exit=True)
 

omlish/testing/unittest/running.py

@@ -45,30 +45,13 @@ import typing as ta
 import unittest
 import warnings
 
-from .types import Test
+from .types import UnittestTest
 
 
 ##
 
 
-class _WritelnDecorator:
-    def __init__(self, stream):
-        super().__init__()
-
-        self.stream = stream
-
-    def __getattr__(self, attr):
-        if attr in ('stream', '__getstate__'):
-            raise AttributeError(attr)
-        return getattr(self.stream, attr)
-
-    def writeln(self, arg=None):
-        if arg:
-            self.write(arg)
-        self.write('\n')  # text-mode streams translate to \r\n if needed
-
-
-class TestRunner:
+class UnittestTestRunner:
     """
     A test runner class that displays results in textual form.
 
@@ -98,7 +81,25 @@ class TestRunner:
 
         if stream is None:
             stream = sys.stderr
-        self._stream = _WritelnDecorator(stream)
+        self._stream = UnittestTestRunner._WritelnDecorator(stream)
+
+    #
+
+    class _WritelnDecorator:
+        def __init__(self, stream):
+            super().__init__()
+
+            self.stream = stream
+
+        def __getattr__(self, attr):
+            if attr in ('stream', '__getstate__'):
+                raise AttributeError(attr)
+            return getattr(self.stream, attr)
+
+        def writeln(self, arg=None):
+            if arg:
+                self.write(arg)
+            self.write('\n')  # text-mode streams translate to \r\n if needed
 
     #
 
@@ -179,7 +180,7 @@ class TestRunner:
 
         time_taken = stop_time - start_time
 
-        return TestRunner._InternalRunTestResult(
+        return UnittestTestRunner._InternalRunTestResult(
             result,
             time_taken,
         )
@@ -206,7 +207,7 @@ class TestRunner:
         unexpected_successes: ta.Sequence[str]
 
         @classmethod
-        def merge(cls, results: ta.Iterable['TestRunner.RunResult']) -> 'TestRunner.RunResult':
+        def merge(cls, results: ta.Iterable['UnittestTestRunner.RunResult']) -> 'UnittestTestRunner.RunResult':
             def reduce_attr(fn, a):
                 return fn(getattr(r, a) for r in results)
 
@@ -233,11 +234,11 @@ class TestRunner:
 
         def as_test_and_reasons(l):
             return [
-                TestRunner.RunResult.TestAndReason(result.getDescription(t), r)
+                UnittestTestRunner.RunResult.TestAndReason(result.getDescription(t), r)
                 for t, r in l
             ]
 
-        return TestRunner.RunResult(
+        return UnittestTestRunner.RunResult(
             raw_results=[result],
             time_taken=internal_result.time_taken,
 
@@ -254,11 +255,11 @@ class TestRunner:
 
     #
 
-    def run(self, test: Test) -> RunResult:
+    def run(self, test: UnittestTest) -> RunResult:
         return self._build_run_result(self._internal_run_test(test))
 
-    def run_many(self, tests: ta.Iterable[Test]) -> RunResult:
-        return TestRunner.RunResult.merge([self.run(t) for t in tests])
+    def run_many(self, tests: ta.Iterable[UnittestTest]) -> RunResult:
+        return UnittestTestRunner.RunResult.merge([self.run(t) for t in tests])
 
     #
 

omlish/testing/unittest/types.py

@@ -2,4 +2,4 @@ import typing as ta
 import unittest
 
 
-Test = ta.Callable[[unittest.TestResult], None]  # ta.TypeAlias
+UnittestTest = ta.Callable[[unittest.TestResult], None]  # ta.TypeAlias

omlish/text/minja.py

@@ -10,6 +10,8 @@ import io
 import re
 import typing as ta
 
+from ..funcs.builders import FnBuilder
+from ..funcs.builders import SimpleFnBuilder
 from ..lite.cached import cached_nullary
 from ..lite.check import check
 from ..lite.maybes import Maybe
@@ -49,10 +51,15 @@ class MinjaTemplateParam:
         return cls(name, dfl)
 
 
+class MinjaTemplateFn(ta.Protocol):
+    def __call__(self, **kwargs: ta.Any) -> str:
+        ...
+
+
 class MinjaTemplate:
     def __init__(
             self,
-            fn: ta.Callable,
+            fn: MinjaTemplateFn,
             params: ta.Sequence[MinjaTemplateParam],
     ) -> None:
         super().__init__()
@@ -73,7 +80,7 @@ class MinjaTemplate:
 
 class MinjaTemplateCompiler:
     """
-    Compiles a template string into a Python function. The returned function takes a dictionary 'context' and returns
+    Compiles a template string into a Python fn. The returned fn takes a dictionary 'context' and returns
     the rendered string.
 
     Supported syntax:
@@ -96,6 +103,7 @@ class MinjaTemplateCompiler:
             fragment_processor: ta.Optional[ta.Callable[[MinjaTemplateFragmentKind, str], str]] = None,
             strict_strings: bool = False,
             stringifier: ta.Optional[ta.Callable[[ta.Any], str]] = None,
+            fn_builder: ta.Optional[FnBuilder] = None,
     ) -> None:
         super().__init__()
 
@@ -120,6 +128,10 @@ class MinjaTemplateCompiler:
                 stringifier = lambda o: str(o)
         self._stringifier = stringifier
 
+        if fn_builder is None:
+            fn_builder = SimpleFnBuilder()
+        self._fn_builder = fn_builder
+
         self._stack: ta.List[ta.Literal['for', 'if']] = []
 
     @staticmethod
@@ -210,11 +222,13 @@ class MinjaTemplateCompiler:
             lines.append(f'def {self._RENDER_FN_NAME}():')
         else:
             lines.append(f'def {self._RENDER_FN_NAME}(')
+            lines.append(self._indent('*,'))
             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},'))
+                    dn = f'__minja__default__{p.name}'
+                    ns[dn] = p.default.must()
+                    lines.append(self._indent(f'{p.name}={dn},'))
                 else:
                     lines.append(self._indent(f'{p.name},'))
             lines.append('):')
@@ -269,19 +283,6 @@ class MinjaTemplateCompiler:
 
     #
 
-    @classmethod
-    def _make_fn(
-            cls,
-            name: str,
-            src: str,
-            ns: ta.Optional[ta.Mapping[str, ta.Any]] = None,
-    ) -> ta.Callable:
-        glo: dict = {}
-        if ns:
-            glo.update(ns)
-        exec(src, glo)
-        return glo[name]
-
     def compile(
             self,
             ns: ta.Optional[ta.Mapping[str, ta.Any]] = None,
@@ -294,14 +295,14 @@ class MinjaTemplateCompiler:
                 raise KeyError(k)
             ns[k] = v
 
-        render_fn = self._make_fn(
+        render_fn = self._fn_builder.build_fn(
             self._RENDER_FN_NAME,
             rendered.src,
             ns,
         )
 
         return MinjaTemplate(
-            render_fn,
+            ta.cast(MinjaTemplateFn, check.callable(render_fn)),
             self._params,
         )
 

{omlish-0.0.0.dev373.dist-info → omlish-0.0.0.dev375.dist-info}/METADATA

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

{omlish-0.0.0.dev373.dist-info → omlish-0.0.0.dev375.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=aT8yZ-Zh-9wfHl5Ym5ouiWC1i0cy7Q7RlhzavB6VLPI,8587
-omlish/__about__.py,sha256=a_E5lH9U0Zxuae2uxWKtn3a6hmcIp8G2BThTgUgh_H0,3478
+omlish/__about__.py,sha256=KWPKJkqc48_109D1coX6sQoDWUirvqJQFHZpuq1yU-8,3478
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -76,20 +76,19 @@ omlish/codecs/funcs.py,sha256=or0Jogczuzk7csDTRl-HURMEjl8LXXqxxXYK45xcM5w,855
 omlish/codecs/registry.py,sha256=2FnO5YP7ui1LzkguwESY0MP3WIdwgPTIJTM_4RyTOEg,3896
 omlish/codecs/standard.py,sha256=eiZ4u9ep0XrA4Z_D1zJI0vmWyuN8HLrX4Se_r_Cq_ZM,60
 omlish/codecs/text.py,sha256=MgAzXapiHie-hhLBmcho67WXfWbmhlHz4tNPcHXnWUk,5711
-omlish/collections/__init__.py,sha256=AKf3dEpZar2KTrSaRF0VQ3CRjqUBZObY3zNwYL7lbmY,2690
+omlish/collections/__init__.py,sha256=-CcIq7e8OkQakexxpJOXf2q6LdVqzo7B-quPtwur_BQ,2634
 omlish/collections/abc.py,sha256=p9zhL5oNV5WPyWmMn34fWfkuxPQAjOtL7WQA-Xsyhwk,2628
 omlish/collections/bimap.py,sha256=3szDCscPJlFRtkpyVQNWneg4s50mr6Rd0jdTzVEIcnE,1661
 omlish/collections/coerce.py,sha256=tAls15v_7p5bUN33R7Zbko87KW5toWHl9fRialCqyNY,7030
-omlish/collections/errors.py,sha256=shcS-NCnEUudF8qC_SmO2TQyjivKlS4TDjaz_faqQ0c,44
 omlish/collections/frozen.py,sha256=LMbAHYDENIQk1hvjCTvpnx66m1TalrHa4CSn8n_tsXQ,4142
 omlish/collections/hasheq.py,sha256=uHypfZlHhicQPvx9OOlpT9MSLwfc_mFil-WaxF9dTOo,3732
 omlish/collections/identity.py,sha256=S_W508EkU-AW0TZ7cv1wWUc6EG54vww4XbcfGjDFTgg,4793
-omlish/collections/mappings.py,sha256=iXb7oq1rCQak0KgzblgrzWCJLrkfJAYHFvl9lprOVUI,2804
+omlish/collections/mappings.py,sha256=lAzKP9RONLjFH7emIDoY-6jukuD-Sa7fdxzP7u6qrqU,3261
 omlish/collections/multimaps.py,sha256=8Sqi1iVxUObnL47s8b1esa2TERoiEyyY4RBWF1VjDiw,3820
 omlish/collections/ordered.py,sha256=XV_ufr3QycjQ3nIy9L3BufdBosWD-3wb5xVZEHpZocQ,2467
 omlish/collections/ranked.py,sha256=McB8C2UQfUvrbmxGTpBz1-EZuyCLkBFtktzncMdt8_Y,2287
 omlish/collections/unmodifiable.py,sha256=0ZkA_0paWlkgaU6OupFdSV0yFP--7XoI3lqhs3Ci6ME,4951
-omlish/collections/utils.py,sha256=1LED_KLXsEb39Byhql7BD5ObHoSkFn2OyUdnHsKXKNo,4091
+omlish/collections/utils.py,sha256=JYBYoConWxApqJLOjXR6GuQI76G0KQDjg6kkXrTofUw,4063
 omlish/collections/cache/__init__.py,sha256=D1gO71VcwxFTZP9gAc9isHfg_TEdalwhsJcgGLvS9hg,233
 omlish/collections/cache/descriptor.py,sha256=5SOsKNxnhisJY22l7tujMOI6MGGr6TERzgsfjvGXOyA,5013
 omlish/collections/cache/impl.py,sha256=Y18OcAsNL6dIWuk89UlZBpqq0iBU-P4VDio6eis43Us,14760
@@ -305,8 +304,9 @@ omlish/formats/toml/codec.py,sha256=5HFGWEPd9IFxPlRMRheX8FEDlRIzLe1moHEOj2_PFKU,
 omlish/formats/toml/parser.py,sha256=O2M0penQV3t8NAsq_conJjvTsXI8iivUFuBg2a5J3dU,30643
 omlish/formats/toml/writer.py,sha256=kLLQNEA_Kzd3ue7UXPQ_torOKoaLT82W16Bt99sID-w,3231
 omlish/funcs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omlish/funcs/builders.py,sha256=mJkgvJxM98x5pbMQzRY95tRUsbAfy_ivHtt4fDKfzsM,3984
 omlish/funcs/genmachine.py,sha256=D9dChaliNBIjYE6lJP5ctcVQUCffNBhceyaaLvBJ7ns,2578
-omlish/funcs/match.py,sha256=CTk4aljIAB9DnDpK-v0yfFLjprWjo3hxVr7nThajOZM,6088
+omlish/funcs/match.py,sha256=EPeKojvecnJuDEWaXEYuef0Sx1J6Y0uTL01h4Z8ldxc,6199
 omlish/funcs/pairs.py,sha256=VCkZjDmJGtR76BsejsHNfb4TcpHCtkkmak-zWDFchAo,3904
 omlish/funcs/pipes.py,sha256=E7Sz8Aj8ke_vCs5AMNwg1I36kRdHVGTnzxVQaDyn43U,2490
 omlish/graphs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -419,7 +419,7 @@ omlish/iterators/iterators.py,sha256=RxW35yQ5ed8vBQ22IqpDXFx-i5JiLQdp7-pkMZXhJJ8
 omlish/iterators/recipes.py,sha256=wOwOZg-zWG9Zc3wcAxJFSe2rtavVBYwZOfG09qYEx_4,472
 omlish/iterators/tools.py,sha256=M16LXrJhMdsz5ea2qH0vws30ZvhQuQSCVFSLpRf_gTg,2096
 omlish/iterators/unique.py,sha256=Nw0pSaNEcHAkve0ugfLPvJcirDOn9ECyC5wIL8JlJKI,1395
-omlish/lang/__init__.py,sha256=XgAZGIq1UN2raHvvmDwsd52RePlee_8OxOFdg3U6rP4,6526
+omlish/lang/__init__.py,sha256=1XbAE88POrWtIHreNk47HAcl6Ch15uTH4cJFo2L7wFM,6619
 omlish/lang/attrs.py,sha256=zFiVuGVOq88x45464T_LxDa-ZEq_RD9zJLq2zeVEBDc,5105
 omlish/lang/casing.py,sha256=cFUlbDdXLhwnWwcYx4qnM5c4zGX7hIRUfcjiZbxUD28,4636
 omlish/lang/clsdct.py,sha256=HAGIvBSbCefzRjXriwYSBLO7QHKRv2UsE78jixOb-fA,1828
@@ -429,7 +429,8 @@ omlish/lang/contextmanagers.py,sha256=7mbTG7yIwM2whQBuhja5Tt0C4kfefBUW4Y_AIn5j8i
 omlish/lang/datetimes.py,sha256=01tg21QOx-PWDlm-CSFTalym3vpqF0EKzeinmtcVNoU,379
 omlish/lang/descriptors.py,sha256=zBtgO9LjdSTGHNUgiIqswh78WOVoGH6KzS0NbgB1Wls,6572
 omlish/lang/enums.py,sha256=F9tflHfaAoV2MpyuhZzpfX9-H55M3zNa9hCszsngEo8,111
-omlish/lang/functions.py,sha256=qNqzWF6vI6PGTzKhgkhnNXP8e1gSerb8GsHG3_wVBP8,6386
+omlish/lang/errors.py,sha256=shcS-NCnEUudF8qC_SmO2TQyjivKlS4TDjaz_faqQ0c,44
+omlish/lang/functions.py,sha256=aLdxhmqG0Pj9tBgsKdoCu_q15r82WIkNqDDSPQU19L8,5689
 omlish/lang/generators.py,sha256=a4D5HU_mySs2T2z3xCmE_s3t4QJkj0YRrK4-hhpGd0A,5197
 omlish/lang/imports.py,sha256=y9W9Y-d_cQ35QCLuSIPoa6vnEqSErFCz8b-34IH128U,10552
 omlish/lang/iterables.py,sha256=y1SX2Co3VsOeX2wlfFF7K3rwLvF7Dtre7VY6EpfwAwA,3338
@@ -462,7 +463,8 @@ omlish/lifecycles/controller.py,sha256=U_4mfp3n0zxH3RgFrcAi6yODuLIR5RF-uwB2tEBdX
 omlish/lifecycles/manager.py,sha256=92s1IH_gDP25PM5tFuPMP2hD_6s5fPi_VzZiDS5549g,5449
 omlish/lifecycles/states.py,sha256=6gTdY3hn7-1sJ60lA3GeMx5RVKvXtFBBXE4KEjoO1Hs,1297
 omlish/lifecycles/transitions.py,sha256=3IFdWGtAeoy3XRlIyW7yCKV4e4Iof9ytkqklGMRFYQs,1944
-omlish/lite/__init__.py,sha256=ISLhM4q0LR1XXTCaHdZOZxBRyIsoZqYm4u0bf1BPcVk,148
+omlish/lite/__init__.py,sha256=cyZEpGob7XjU8DohyNxVe5CQRk4CQ5vrHL42OdhQb8w,148
+omlish/lite/args.py,sha256=_py7azSCqPJwA2P1qY0B91sSiORsvYIK7IBO6hPDYK4,739
 omlish/lite/cached.py,sha256=O7ozcoDNFm1Hg2wtpHEqYSp_i_nCLNOP6Ueq_Uk-7mU,1300
 omlish/lite/check.py,sha256=ytCkwZoKfOlJqylL-AGm8C2WfsWJd2q3kFbnZCzX3_M,13844
 omlish/lite/configs.py,sha256=4-1uVxo-aNV7vMKa7PVNhM610eejG1WepB42-Dw2xQI,914
@@ -470,7 +472,7 @@ omlish/lite/contextmanagers.py,sha256=jpMxp5xwooRQJxsQ6J2ll4AJP9O7a5_YrLCGgwUFfD
 omlish/lite/dataclasses.py,sha256=aRSCZz1jN_UI-CWJhN0SJeKxa-79vXNUZ6YOMgG31SE,3610
 omlish/lite/imports.py,sha256=JDYRFxu-ofHEBfd5VV3b27oKOLhtTpuzte1_Nt7yLgw,1352
 omlish/lite/inject.py,sha256=xvmLmtD3_2INnkurJQv76_Rkh9usbApEQrXJ4cvuVAk,29019
-omlish/lite/json.py,sha256=7-02Ny4fq-6YAu5ynvqoijhuYXWpLmfCI19GUeZnb1c,740
+omlish/lite/json.py,sha256=m0Ce9eqUZG23-H7-oOp8n1sf4fzno5vtK4AK_4Vc-Mg,706
 omlish/lite/logs.py,sha256=CWFG0NKGhqNeEgryF5atN2gkPYbUdTINEw_s1phbINM,51
 omlish/lite/marshal.py,sha256=dxiDtmSXt4EBpTprMNkPsOYkRs0W9AC3Kby9UGEjuRo,20400
 omlish/lite/maybes.py,sha256=0p_fzb6yiOjEpvMKaQ53Q6CH1VPW1or7v7Lt1JIKcgM,4359
@@ -791,10 +793,10 @@ omlish/testing/pytest/plugins/switches/plugin.py,sha256=RBxjefl9RDJuSmT_W0lTSd9D
 omlish/testing/pytest/plugins/switches/switches.py,sha256=lj8S9RMwUAW7a93ZqqTjoD4dRVkeGts2sl8Cn-H17hc,1890
 omlish/testing/unittest/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omlish/testing/unittest/__main__.py,sha256=d23loR_cKfTYZwYiqpt_CmKI7dd5WcYFgIYzqMep75E,68
-omlish/testing/unittest/loading.py,sha256=DT6vIZwXBkbEXocaxhrbWj8SqsoP7pyxD5K3bZlAE34,4764
-omlish/testing/unittest/main.py,sha256=OrebAhWqlfNOx5LF-ZIu2KvclneJgBAi13LkvDiZ_yw,8408
-omlish/testing/unittest/running.py,sha256=sifL1gjhn1VR965T9fdZy8NbJpVtpEQety8ngh5Fw7A,11821
-omlish/testing/unittest/types.py,sha256=RvQwU9l2amH2mKv3W3QyPBFg0eXkQ8wWnIJeRXeDdi0,102
+omlish/testing/unittest/loading.py,sha256=JBiCO0iv0moal2fXILic6iojLxsahMNqinIU-jMWbXg,4820
+omlish/testing/unittest/main.py,sha256=R6Kevx8LyUjI2DSaE0IdhPwrO5AOXRNCJ8mYBNXJiUI,8574
+omlish/testing/unittest/running.py,sha256=QBaj1ZNpMPMbPeFDmqRwuA9TMKE6O3b8Ck9QbUfuKWI,11974
+omlish/testing/unittest/types.py,sha256=56ACNtKt-w_cx7Olsy-m1FYvcUHWsjou9ftXB6CWzeY,110
 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
@@ -804,7 +806,7 @@ omlish/text/glyphsplit.py,sha256=ZX9mhwTtmUE8rJpuD1jBO1CTc6xzmBCtbfiHmp5vMM8,381
 omlish/text/indent.py,sha256=BWVVaHs_B1ppwHJJIxKCDG3iCutkYy5e1qr59Z_Suzg,1524
 omlish/text/linecache.py,sha256=hRYlEhD63ZfA6_ZOTkQIcnON-3W56QMAhcG3vEJqj9M,1858
 omlish/text/mangle.py,sha256=k7mYavVgxJ2ENV2wfjw3c9u3hqH5NeVpjoxYbyaYC0Y,2796
-omlish/text/minja.py,sha256=wz4ZkjPTvlVkLBkWyTCoyERyiofBMvDXZZcNsGtk8gU,8999
+omlish/text/minja.py,sha256=7UKNalkWpTG_364OIo7p5ym--uiNPR2RFBW_W8rrO4I,9194
 omlish/text/parts.py,sha256=MpiCUyfpcL4PLb2Etj8V7Yj4qofhy0xVwBrIL6RfNdg,6646
 omlish/text/random.py,sha256=8feS5JE_tSjYlMl-lp0j93kCfzBae9AM2cXlRLebXMA,199
 omlish/text/templating.py,sha256=Nf5BVDgrYBf0WmYwV6SnHPDvl9XVMu8v7MX78pInLTw,3325
@@ -888,9 +890,9 @@ omlish/typedvalues/marshal.py,sha256=AtBz7Jq-BfW8vwM7HSxSpR85JAXmxK2T0xDblmm1HI0
 omlish/typedvalues/of_.py,sha256=UXkxSj504WI2UrFlqdZJbu2hyDwBhL7XVrc2qdR02GQ,1309
 omlish/typedvalues/reflect.py,sha256=PAvKW6T4cW7u--iX80w3HWwZUS3SmIZ2_lQjT65uAyk,1026
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev373.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev373.dist-info/METADATA,sha256=fed55fYjKmKimj_-64adhKjxXvjVgpztmAzJhqRHczs,4416
-omlish-0.0.0.dev373.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev373.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev373.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev373.dist-info/RECORD,,
+omlish-0.0.0.dev375.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev375.dist-info/METADATA,sha256=IhVfzMkNMySdjER4EgktRUN72cnUv-EMyJ5Y3sCZ2Vk,4416
+omlish-0.0.0.dev375.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev375.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev375.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev375.dist-info/RECORD,,