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

omlish/__about__.py

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

omlish/lite/marshal.py

@@ -1,7 +1,6 @@
 """
 TODO:
  - pickle stdlib objs? have to pin to 3.8 pickle protocol, will be cross-version
- - literals
  - Options.sequence_cls = list, mapping_cls = dict, ... - def with_mutable_containers() -> Options
 """
 # ruff: noqa: UP006 UP007 UP045
@@ -24,7 +23,6 @@ from .check import check
 from .reflect import deep_subclasses
 from .reflect import get_literal_type_args
 from .reflect import get_new_type_supertype
-from .reflect import get_optional_alias_arg
 from .reflect import is_generic_alias
 from .reflect import is_literal_type
 from .reflect import is_new_type
@@ -144,6 +142,28 @@ class OptionalObjMarshaler(ObjMarshaler):
         return self.item.unmarshal(o, ctx)
 
 
+@dc.dataclass(frozen=True)
+class PrimitiveUnionObjMarshaler(ObjMarshaler):
+    pt: ta.Tuple[type, ...]
+    x: ta.Optional[ObjMarshaler] = None
+
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        if isinstance(o, self.pt):
+            return o
+        elif self.x is not None:
+            return self.x.marshal(o, ctx)
+        else:
+            raise TypeError(o)
+
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        if isinstance(o, self.pt):
+            return o
+        elif self.x is not None:
+            return self.x.unmarshal(o, ctx)
+        else:
+            raise TypeError(o)
+
+
 @dc.dataclass(frozen=True)
 class LiteralObjMarshaler(ObjMarshaler):
     item: ObjMarshaler
@@ -342,6 +362,13 @@ _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES: ta.Dict[ta.Any, type] = {
     collections.abc.MutableSequence: list,
 }
 
+_OBJ_MARSHALER_PRIMITIVE_TYPES: ta.Set[type] = {
+    int,
+    float,
+    bool,
+    str,
+}
+
 
 ##
 
@@ -490,8 +517,16 @@ class ObjMarshalerManager:
 
         if is_literal_type(ty):
             lvs = frozenset(get_literal_type_args(ty))
+            if None in lvs:
+                is_opt = True
+                lvs -= frozenset([None])
+            else:
+                is_opt = False
             lty = check.single(set(map(type, lvs)))
-            return LiteralObjMarshaler(rec(lty), lvs)
+            lm: ObjMarshaler = LiteralObjMarshaler(rec(lty), lvs)
+            if is_opt:
+                lm = OptionalObjMarshaler(lm)
+            return lm
 
         if is_generic_alias(ty):
             try:
@@ -511,7 +546,31 @@ class ObjMarshalerManager:
                 return IterableObjMarshaler(st, rec(e))
 
             if is_union_alias(ty):
-                return OptionalObjMarshaler(rec(get_optional_alias_arg(ty)))
+                uts = frozenset(ta.get_args(ty))
+                if None in uts or type(None) in uts:
+                    is_opt = True
+                    uts = frozenset(ut for ut in uts if ut not in (None, type(None)))
+                else:
+                    is_opt = False
+
+                um: ObjMarshaler
+                if not uts:
+                    raise TypeError(ty)
+                elif len(uts) == 1:
+                    um = rec(check.single(uts))
+                else:
+                    pt = tuple({ut for ut in uts if ut in _OBJ_MARSHALER_PRIMITIVE_TYPES})
+                    np_uts = {ut for ut in uts if ut not in _OBJ_MARSHALER_PRIMITIVE_TYPES}
+                    if not np_uts:
+                        um = PrimitiveUnionObjMarshaler(pt)
+                    elif len(np_uts) == 1:
+                        um = PrimitiveUnionObjMarshaler(pt, x=rec(check.single(np_uts)))
+                    else:
+                        raise TypeError(ty)
+
+                if is_opt:
+                    um = OptionalObjMarshaler(um)
+                return um
 
         raise TypeError(ty)
 

omlish/text/minja.py

@@ -15,6 +15,9 @@ from ..lite.check import check
 from ..lite.maybes import Maybe
 
 
+MinjaTemplateFragmentKind = ta.Literal['expr', 'stmt', 'for', 'if', 'elif']  # ta.TypeAlias
+
+
 ##
 
 
@@ -90,6 +93,9 @@ class MinjaTemplateCompiler:
             params: ta.Sequence[ta.Union[str, MinjaTemplateParam]],
             *,
             indent: str = DEFAULT_INDENT,
+            fragment_processor: ta.Optional[ta.Callable[[MinjaTemplateFragmentKind, str], str]] = None,
+            strict_strings: bool = False,
+            stringifier: ta.Optional[ta.Callable[[ta.Any], str]] = None,
     ) -> None:
         super().__init__()
 
@@ -103,8 +109,25 @@ class MinjaTemplateCompiler:
         check.unique(p.name for p in self._params)
         self._indent_str: str = check.non_empty_str(indent)
 
+        if fragment_processor is None:
+            fragment_processor = lambda _, s: s  # noqa
+        self._fragment_processor = fragment_processor
+
+        if stringifier is None:
+            if strict_strings:
+                stringifier = self._strict_stringify
+            else:
+                stringifier = lambda o: str(o)
+        self._stringifier = stringifier
+
         self._stack: ta.List[ta.Literal['for', 'if']] = []
 
+    @staticmethod
+    def _strict_stringify(o: ta.Any) -> str:
+        if not isinstance(o, str):
+            raise TypeError(o)
+        return o
+
     #
 
     _TAG_PAT = re.compile(
@@ -166,7 +189,7 @@ class MinjaTemplateCompiler:
 
     #
 
-    _RENDER_FN_NAME = '__render'
+    _RENDER_FN_NAME = '__minja__render'
 
     class Rendered(ta.NamedTuple):
         src: str
@@ -177,7 +200,8 @@ class MinjaTemplateCompiler:
         lines: ta.List[str] = []
 
         ns: ta.Dict[str, ta.Any] = {
-            '__StringIO': io.StringIO,
+            '__minja__StringIO': io.StringIO,
+            '__minja__stringify': self._stringifier,
         }
 
         parts = self._split_tags(self._src)
@@ -195,36 +219,36 @@ class MinjaTemplateCompiler:
                     lines.append(self._indent(f'{p.name},'))
             lines.append('):')
 
-        lines.append(self._indent('__output = __StringIO()'))
+        lines.append(self._indent('__minja__output = __minja__StringIO()'))
 
         for g, s in parts:
             if g == '{':
                 expr = s.strip()
-                lines.append(self._indent(f'__output.write(str({expr}))'))
+                lines.append(self._indent(f'__minja__output.write(__minja__stringify({self._fragment_processor("expr", expr)}))'))  # noqa
 
             elif g == '%':
                 stmt = s.strip()
 
                 if stmt.startswith('for '):
-                    lines.append(self._indent(stmt + ':'))
+                    lines.append(self._indent(f'for {self._fragment_processor("for", stmt[4:])}:'))
                     self._stack.append('for')
                 elif stmt.startswith('endfor'):
                     check.equal(self._stack.pop(), 'for')
 
                 elif stmt.startswith('if '):
-                    lines.append(self._indent(stmt + ':'))
+                    lines.append(self._indent(f'if {self._fragment_processor("if", stmt[3:])}:'))
                     self._stack.append('if')
                 elif stmt.startswith('elif '):
                     check.equal(self._stack[-1], 'if')
-                    lines.append(self._indent(stmt + ':', -1))
+                    lines.append(self._indent(f'elif {self._fragment_processor("elif", stmt[5:])}:', -1))
                 elif stmt.strip() == 'else':
                     check.equal(self._stack[-1], 'if')
                     lines.append(self._indent('else:', -1))
-                elif stmt.startswith('endif'):
+                elif stmt.strip() == 'endif':
                     check.equal(self._stack.pop(), 'if')
 
                 else:
-                    lines.append(self._indent(stmt))
+                    lines.append(self._indent(self._fragment_processor('stmt', stmt)))
 
             elif g == '#':
                 pass
@@ -232,14 +256,14 @@ class MinjaTemplateCompiler:
             elif not g:
                 if s:
                     safe_text = s.replace('"""', '\\"""')
-                    lines.append(self._indent(f'__output.write("""{safe_text}""")'))
+                    lines.append(self._indent(f'__minja__output.write("""{safe_text}""")'))
 
             else:
                 raise KeyError(g)
 
         check.empty(self._stack)
 
-        lines.append(self._indent('return __output.getvalue()'))
+        lines.append(self._indent('return __minja__output.getvalue()'))
 
         return self.Rendered('\n'.join(lines), ns)
 
@@ -258,16 +282,22 @@ class MinjaTemplateCompiler:
         exec(src, glo)
         return glo[name]
 
-    #
-
-    @cached_nullary
-    def compile(self) -> MinjaTemplate:
+    def compile(
+            self,
+            ns: ta.Optional[ta.Mapping[str, ta.Any]] = None,
+    ) -> MinjaTemplate:
         rendered = self.render()
 
+        ns = dict(ns or {})
+        for k, v in rendered.ns.items():
+            if k in ns:
+                raise KeyError(k)
+            ns[k] = v
+
         render_fn = self._make_fn(
             self._RENDER_FN_NAME,
             rendered.src,
-            rendered.ns,
+            ns,
         )
 
         return MinjaTemplate(
@@ -282,8 +312,15 @@ class MinjaTemplateCompiler:
 def compile_minja_template(
         src: str,
         params: ta.Sequence[ta.Union[str, MinjaTemplateParam]] = (),
+        *,
+        ns: ta.Optional[ta.Mapping[str, ta.Any]] = None,
+        **kwargs: ta.Any,
 ) -> MinjaTemplate:
-    return MinjaTemplateCompiler(src, params).compile()
+    return MinjaTemplateCompiler(
+        src,
+        params,
+        **kwargs,
+    ).compile(ns)
 
 
 def render_minja_template(src: str, **kwargs: ta.Any) -> str:

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

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

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

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=aT8yZ-Zh-9wfHl5Ym5ouiWC1i0cy7Q7RlhzavB6VLPI,8587
-omlish/__about__.py,sha256=IuPF6dQwqBF37vj4nM3a2rfw3IW2B0qdP0SrL4-B5BI,3478
+omlish/__about__.py,sha256=a_E5lH9U0Zxuae2uxWKtn3a6hmcIp8G2BThTgUgh_H0,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
@@ -472,7 +472,7 @@ 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/logs.py,sha256=CWFG0NKGhqNeEgryF5atN2gkPYbUdTINEw_s1phbINM,51
-omlish/lite/marshal.py,sha256=43fWY7CyLw3NGKHGxFqkiqKFGzXIHqayMVgfeHT02AU,18477
+omlish/lite/marshal.py,sha256=dxiDtmSXt4EBpTprMNkPsOYkRs0W9AC3Kby9UGEjuRo,20400
 omlish/lite/maybes.py,sha256=0p_fzb6yiOjEpvMKaQ53Q6CH1VPW1or7v7Lt1JIKcgM,4359
 omlish/lite/pycharm.py,sha256=FRHGcCDo42UzZXqNwW_DkhI-6kb_CmJKPiQ8F6mYkLA,1174
 omlish/lite/reflect.py,sha256=pzOY2PPuHH0omdtglkN6DheXDrGopdL3PtTJnejyLFU,2189
@@ -804,7 +804,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=eyOA_zUCzyqaBfiPX-hV2xdK9_cqlDEhbVTkZUTZgQo,7521
+omlish/text/minja.py,sha256=wz4ZkjPTvlVkLBkWyTCoyERyiofBMvDXZZcNsGtk8gU,8999
 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 +888,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.dev371.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev371.dist-info/METADATA,sha256=oPFYGURgWGkPAhtJkRCmiXVNzNFuNn8sXTBZAHZh1TI,4416
-omlish-0.0.0.dev371.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev371.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev371.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev371.dist-info/RECORD,,
+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,,