dekshell 0.2.35__py3-none-any.whl → 0.2.37__py3-none-any.whl

dekshell/core/contexts/properties.py

@@ -14,7 +14,7 @@ from dektools.time import DateTime
 from dektools.file import read_text
 from dektools.env import is_on_cicd
 from dektools.ps.process import process_attrs
-from dektools.extraction.filter.utils import Method, MethodSimple, AttrProxy
+from dektools.context.utils import Method, MethodSimple, AttrProxy
 from ...utils.serializer import serializer
 from ..redirect import shell_name
 from ..markers.base.core import get_inner_vars

dekshell/core/markers/base/__init__.py

@@ -34,15 +34,15 @@ class MarkerBase:
     trans_marker_encode = '/'
     trans_marker_env = '$$'
     trans_marker_env_full = '$'
-    trans_marker__set = '|'.join((re.escape(x) for x in [
-        trans_marker_command_rc_silence,
-        trans_marker_command_rc,
-        trans_marker_command_output,
-        trans_marker_decode,
-        trans_marker_encode,
-        trans_marker_env,
-        trans_marker_env_full,
-    ]))
+    # trans_marker__set = '|'.join((re.escape(x) for x in [
+    #     trans_marker_command_rc_silence,
+    #     trans_marker_command_rc,
+    #     trans_marker_command_output,
+    #     trans_marker_decode,
+    #     trans_marker_encode,
+    #     trans_marker_env,
+    #     trans_marker_env_full,
+    # ]))
     trans_marker__as_var = '='
     trans_marker__ignore = '?'
     trans_marker__begin = "{"
@@ -151,18 +151,23 @@ class MarkerBase:
 
     @classmethod
     def _translate(cls, context, s):
-        def handler(expression, marker, _):
+        def handler(expression, _, __):
+            expression = expression.lstrip()
             as_var = False
             ignore = False
-            m = re.match(
-                r'(%s|%s)*' % (re.escape(cls.trans_marker__as_var), re.escape(cls.trans_marker__ignore)), expression)
-            if m:
-                index = m.span()[1]
-                mm = expression[:index]
-                as_var = cls.trans_marker__as_var in mm
-                ignore = cls.trans_marker__ignore in mm
-                expression = expression[index:]
-            value = handler_core(expression, ignore, marker)
+            while True:
+                change = 0
+                if not as_var and expression.startswith(cls.trans_marker__as_var):
+                    expression = expression[len(cls.trans_marker__as_var):].lstrip()
+                    as_var = True
+                    change +=1
+                if not ignore and expression.startswith(cls.trans_marker__ignore):
+                    expression = expression[len(cls.trans_marker__ignore):].lstrip()
+                    ignore = True
+                    change +=1
+                if change in (0, 2):
+                    break
+            value = handler_core(expression, ignore)
             if as_var:
                 return context.add_variable_temp(value)
             return value
@@ -176,24 +181,30 @@ class MarkerBase:
                 else:
                     raise
 
-        def handler_core(expression, ignore, marker):
-            key = marker[len(cls.trans_marker__begin):]
-            if key.startswith(cls.trans_marker_command_rc_silence):
+        def handler_core(expression, ignore):
+            if expression.startswith(cls.trans_marker_command_rc_silence):
+                expression = expression[len(cls.trans_marker_command_rc_silence):]
                 return shell_exitcode(expression, env=context.environ_full())
-            elif key.startswith(cls.trans_marker_command_rc):
+            elif expression.startswith(cls.trans_marker_command_rc):
+                expression = expression[len(cls.trans_marker_command_rc):]
                 return shell_wrapper(expression, check=False, env=context.environ_full())
-            elif key.startswith(cls.trans_marker_command_output):
+            elif expression.startswith(cls.trans_marker_command_output):
+                expression = expression[len(cls.trans_marker_command_output):]
                 return shell_output(expression, env=context.environ_full())
-            elif key.startswith(cls.trans_marker_env):
+            elif expression.startswith(cls.trans_marker_env):
+                expression = expression[len(cls.trans_marker_env):]
                 return os.getenv(expression.strip(), default_value)
-            elif key.startswith(cls.trans_marker_env_full):
+            elif expression.startswith(cls.trans_marker_env_full):
+                expression = expression[len(cls.trans_marker_env_full):]
                 return context.get_env(expression.strip(), default_value)
-            elif key.startswith(cls.trans_marker_decode):
+            elif expression.startswith(cls.trans_marker_decode):
+                expression = expression[len(cls.trans_marker_decode):]
                 value = evaluate(expression, ignore, empty_value)
                 if value is empty_value:
                     return default_value
                 return serializer.load(value)
-            elif key.startswith(cls.trans_marker_encode):
+            elif expression.startswith(cls.trans_marker_encode):
+                expression = expression[len(cls.trans_marker_encode):]
                 value = evaluate(expression, ignore, empty_value)
                 if value is empty_value:
                     return default_value
@@ -205,7 +216,9 @@ class MarkerBase:
         default_value = ''
 
         translate = deep_format(
-            s, f"{re.escape(cls.trans_marker__begin)}({cls.trans_marker__set})?",
+            s,
+            # f"{re.escape(cls.trans_marker__begin)}({cls.trans_marker__set})?",
+            f"{re.escape(cls.trans_marker__begin)}",
             re.escape(cls.trans_marker__end), handler, cls.trans_marker__escape)
         return translate
 

{dekshell-0.2.35.dist-info → dekshell-0.2.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dekshell
-Version: 0.2.35
+Version: 0.2.37
 Author-Email: sanzenwin <sanzenwin@gmail.com>
 License: MIT
 Requires-Python: >=3.8

{dekshell-0.2.35.dist-info → dekshell-0.2.37.dist-info}/RECORD

@@ -1,15 +1,15 @@
-dekshell-0.2.35.dist-info/METADATA,sha256=hDvwRVi1ZNokJ-7ORpier5GMGRIADdI1qi8DJyFoU5c,573
-dekshell-0.2.35.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-dekshell-0.2.35.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
+dekshell-0.2.37.dist-info/METADATA,sha256=hLoHPx1Bk_khnud7HIp4MmP75nyOyNr3O5Ab5B80ORQ,573
+dekshell-0.2.37.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dekshell-0.2.37.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
 dekshell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dekshell/click/__entry__.py,sha256=CMuxUzXoEe4TcHFZwv-MNFwHnu1HSZCDpXFpqQ814uM,42
 dekshell/click/__init__.py,sha256=r-AHdO9CEEVvTN20-8Jozr6Zh8XSv_BnktYRwrlhtrE,2046
 dekshell/core/__init__.py,sha256=isDEKwk1odLdvTQNCILCtVNBuXp1uFVPz_uTDNihkVU,5547
 dekshell/core/contexts/__init__.py,sha256=ynsfv37azOKfI2UKd0iPl2M6iBW-k5cb1BqSLOWuJpI,482
 dekshell/core/contexts/methods.py,sha256=KxCVtJV3NXFKuCB-MYnQ2EJgFoegRwx5gtTGsmN-64g,10548
-dekshell/core/contexts/properties.py,sha256=R6TBvQAH4IIkLZV8wfroUXguy9cxYsKmPEE_FCV2dA8,3417
+dekshell/core/contexts/properties.py,sha256=Q6eg90Upe321Si69MKjZR6mYzDbbMJ9u3JjwvXpDfIM,3407
 dekshell/core/markers/__init__.py,sha256=yRQazZ1dxMltFao_RQnDnawSnQcjN_4B930MjJhaZ40,1968
-dekshell/core/markers/base/__init__.py,sha256=W5f_Mcn9MLM8kOVqu05NUaDpn3xUNURe_NYerUoH6Js,16021
+dekshell/core/markers/base/__init__.py,sha256=CsbNYGQ2Od3XdekR9RFMJ7mo9Roj-LlXS62SY50fiAY,16826
 dekshell/core/markers/base/core.py,sha256=InsUA3md2gC6GyXQsvARfeNTrfbVD3gGOYxTM8VqqPA,11679
 dekshell/core/markers/base/shell.py,sha256=fiFsTUDI8pSDDUCk834OI4ajri2qNWFJkLVhmUk2uAs,484
 dekshell/core/markers/commands.py,sha256=mDRj4dSfKbDaZ_ts4lPXd6wftvGFI4VKkRoIzxV7otA,1696
@@ -37,4 +37,4 @@ dekshell/utils/cmd.py,sha256=K9FbXgHcGFchHA58xI0_t4YK4yb8XkWbxsNoztYRx3Y,518
 dekshell/utils/pkg.py,sha256=TgYqRqawoJfjkxt6UAHnp9ttmpjuHiWRFbqxADOS1VE,1337
 dekshell/utils/serializer.py,sha256=aIdF2Wzo-qHmIshv46jn1XD0X66vQ1JFdU-g3ZFbH2w,386
 dekshell/utils/shell.py,sha256=0NoA2-SOOMinbmZZipwzL-npBbzPOdWEfdPVYqq5G5g,92
-dekshell-0.2.35.dist-info/RECORD,,
+dekshell-0.2.37.dist-info/RECORD,,