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

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev371'
-__revision__ = 'c37d96ddcd83d914205dd76b0f859b9ca93b0397'
+__version__ = '0.0.0.dev372'
+__revision__ = '033823538cee9fc13c4075a41150dafd56975200'
 
 
 #

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.dev372.dist-info}/METADATA

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

{omlish-0.0.0.dev371.dist-info → omlish-0.0.0.dev372.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=jyzuqevR3mhnjpJ83sR8GtV3f2_ERBb1HkzWCrzvnSA,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
@@ -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.dev372.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev372.dist-info/METADATA,sha256=UoYYCvg_GPym2iiE9ijIaZnB7CxyH_k7EHwVpEQvCYY,4416
+omlish-0.0.0.dev372.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev372.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev372.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev372.dist-info/RECORD,,