omlish 0.0.0.dev288__py3-none-any.whl → 0.0.0.dev289__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev288'
-__revision__ = 'e2dff59656486617fd3e4b01cd91263482b1dfa1'
+__version__ = '0.0.0.dev289'
+__revision__ = 'a15065b33f3bb10b44da2a9c680deade2370d3b9'
 
 
 #

omlish/diag/pycharm.py

@@ -1,7 +1,6 @@
 import dataclasses as dc
 import json
 import os.path
-import plistlib
 import re
 import shutil
 import subprocess
@@ -13,10 +12,15 @@ from .. import lang
 
 
 if ta.TYPE_CHECKING:
-    docker = lang.proxy_import('..docker')
-else:
+    import plistlib
+
     from .. import docker
 
+else:
+    plistlib = lang.proxy_import('plistlib')
+
+    docker = lang.proxy_import('..docker')
+
 
 ##
 

omlish/text/minja.py

@@ -18,19 +18,6 @@ from ..lite.maybes import Maybe
 ##
 
 
-class MinjaTemplate:
-    def __init__(self, fn: ta.Callable) -> None:
-        super().__init__()
-
-        self._fn = fn
-
-    def __call__(self, **kwargs: ta.Any) -> str:
-        return self._fn(**kwargs)
-
-
-##
-
-
 @dc.dataclass(frozen=True)
 class MinjaTemplateParam:
     name: str
@@ -59,6 +46,28 @@ class MinjaTemplateParam:
         return cls(name, dfl)
 
 
+class MinjaTemplate:
+    def __init__(
+            self,
+            fn: ta.Callable,
+            params: ta.Sequence[MinjaTemplateParam],
+    ) -> None:
+        super().__init__()
+
+        self._fn = fn
+        self._params = params
+
+    @property
+    def params(self) -> ta.Sequence[MinjaTemplateParam]:
+        return self._params
+
+    def __call__(self, **kwargs: ta.Any) -> str:
+        return self._fn(**kwargs)
+
+
+##
+
+
 class MinjaTemplateCompiler:
     """
     Compiles a template string into a Python function. The returned function takes a dictionary 'context' and returns
@@ -261,7 +270,10 @@ class MinjaTemplateCompiler:
             rendered.ns,
         )
 
-        return MinjaTemplate(render_fn)
+        return MinjaTemplate(
+            render_fn,
+            self._params,
+        )
 
 
 ##

omlish/text/templating.py

@@ -1,3 +1,7 @@
+"""
+TODO:
+ - find_vars
+"""
 import abc
 import dataclasses as dc
 import string

{omlish-0.0.0.dev288.dist-info → omlish-0.0.0.dev289.dist-info}/METADATA

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

{omlish-0.0.0.dev288.dist-info → omlish-0.0.0.dev289.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=pjGUyLHaoWpPqRP3jz2u1fC1qoRc2lvrEcpU_Ax2tdg,8253
-omlish/__about__.py,sha256=g-UF2LN-CeZcgCNLTow-TkCSBCCJjs6HkfC_hRBUQ8o,3444
+omlish/__about__.py,sha256=HbhZmTysZ2WI-rCErh6ZBDj_chq-_Q4au1A12QYY1v4,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
@@ -277,7 +277,7 @@ omlish/diag/lsof.py,sha256=DnowqvKYah-WCuBHS3DAcZCvlsWJdM9kYNFq97UZDDA,9127
 omlish/diag/procfs.py,sha256=KaGTAA2Gj8eEEp7MjClRe4aimwzd-HDABThFzvq2cBQ,9684
 omlish/diag/procstats.py,sha256=UkqxREqfd-38xPYZ9T1SIJISz5ARQCEhTtOZrxtm2dE,777
 omlish/diag/ps.py,sha256=b7ai9O4mGZliNFvBu6PdQfMmct4qpcMTygEf1ISHBLQ,1666
-omlish/diag/pycharm.py,sha256=7-r_F-whXt8v-0dehxAX-MeMFPM3iZXX9IfeL0GfUtk,4643
+omlish/diag/pycharm.py,sha256=Z2W-Viqw5xq08ZC4z36skpozfYw_qNNhWQx_GYr2D0k,4695
 omlish/diag/pydevd.py,sha256=UN55ZjkWLCVyHxE2CNRRYamuvSKfzWsn0D5oczRTXO4,7536
 omlish/diag/threads.py,sha256=1-x02VCDZ407gfbtXm1pWK-ubqhqfePm9PMqkHCVoqk,3642
 omlish/diag/_pycharm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -816,10 +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=e7XiY8IvF4Df-7hxhdC_qizHm9T4SIbFJR7enUg_Zmc,7252
+omlish/text/minja.py,sha256=FH2xcZUby-yB1CQwCUGmpvHmE1nCmfNX1h0Nm6ix8ck,7515
 omlish/text/parts.py,sha256=Q9NvoyEGQKIWgiPD4D_Qc66cWAuyEKE033dT9m7c3Wk,6662
 omlish/text/random.py,sha256=8feS5JE_tSjYlMl-lp0j93kCfzBae9AM2cXlRLebXMA,199
-omlish/text/templating.py,sha256=DE_-JysSr92hJ6ITA4BRoUGsocasYTfXAZLsyyAGLgw,2427
+omlish/text/templating.py,sha256=azhKpvkDR2uby8k3AJ8Y6GpdKVQUb7Xt_cGbDz6dkTM,2454
 omlish/text/go/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/text/go/quoting.py,sha256=N9EYdnFdEX_A8fOviH-1w4jwV3XOQ7VU2WsoUNubYVY,9137
 omlish/typedvalues/__init__.py,sha256=c3IQmRneMmH6JRcafprqmBILWD89b-IyIll6MgahGCI,562
@@ -830,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.dev288.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev288.dist-info/METADATA,sha256=4tffbaEGdkT2GjI6KS2xO1j0e9LNg6UZKItk6VkJw4A,4316
-omlish-0.0.0.dev288.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-omlish-0.0.0.dev288.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev288.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev288.dist-info/RECORD,,
+omlish-0.0.0.dev289.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev289.dist-info/METADATA,sha256=qBFa2LeCS8dTuxmfIIrmiUFQBzIm5bR_MqfY2GlweLc,4316
+omlish-0.0.0.dev289.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+omlish-0.0.0.dev289.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev289.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev289.dist-info/RECORD,,