dekshell 0.2.44__py3-none-any.whl → 0.2.45__py3-none-any.whl

dekshell/core/markers/__init__.py

@@ -26,9 +26,9 @@ def generate_markers(*args, **kwargs):
         ErrorEchoMarker, EchoNoWrapMarker, EchoMarker,
         InputMarker, InputOnceMarker,
         DelVarMarker,
-        ExecLinesUpdateMarker, ExecLinesMarker, ExecTranslatorMarker, ExecMarker, ExecCmdcallSimpleLinesMarker,
-        ExecCmdcallLinesMarker,
-        ExecCmdcallMarker, ExecCmdcallChainMarker,
+        ExecLinesUpdateMarker, ExecLinesTranslatorMarker, ExecLinesMarker, ExecTranslatorMarker, ExecMarker,
+        ExecCommandOutputChainMarker,
+        ExecCmdcallSimpleLinesMarker, ExecCmdcallLinesMarker, ExecCmdcallMarker, ExecCmdcallChainMarker,
         EnvShellMarker, EnvMarker,
         IfMarker, IfElifMarker, IfElseMarker,
         WhileMarker, WhileElseMarker,

dekshell/core/markers/base/__init__.py

@@ -440,13 +440,28 @@ class TransformerMarker(MarkerBase):
 class MarkerWithEnd(MarkerBase):
     tag_tail = EndMarker
 
-    def get_inner_content(self, context, marker_node, sep='\n', translate=None):
+    def get_inner_content(self, context, marker_node, sep='\n', translate=None, code=False):
         def walk(node, depth):
             if depth != 0:
                 commands.append(self.translate_case(context, node.text_content, translate))
 
         commands = []
         marker_node.walk(walk)
+        if code:
+            if commands:
+                c = commands[0]
+                cc = c.lstrip()
+                tabs = c[:len(c) - len(cc)]
+                result = []
+                for index, line in enumerate(commands):
+                    if not line.startswith(tabs) and line.lstrip():
+                        raise ValueError(
+                            f'Code indent error:\n'
+                            f'lineno=>{marker_node.line_number + index + 1}\n'
+                            f'translated-line=>{line}'
+                        )
+                    result.append(line[len(tabs):])
+                commands = result
         return sep.join(commands)
 
     def eval_codes(self, context, code):

dekshell/core/markers/base/core.py

@@ -223,8 +223,8 @@ class MarkerNode:
                     raise
                 except Exception as e:
                     sys.stderr.write(f"Execute error {node.marker}:\n\
-                    command=> {node.command if node.command_old is None else node.command_old}\n\
-                    line=> {node.line_number}\n\
+                    command=>{node.command if node.command_old is None else node.command_old}\n\
+                    lineno=>{node.line_number}\n\
                     context=>\n\
                     {context}")
                     raise e from None

dekshell/core/markers/exec.py

@@ -25,7 +25,16 @@ class ExecLinesMarker(MarkerWithEnd, MarkerNoTranslator):
     tag_head = cmd_call_eval_prefix * 2
 
     def execute(self, context, command, marker_node, marker_set):
-        code = self.get_inner_content(context, marker_node, translate=False)
+        code = self.get_inner_content(context, marker_node, translate=False, code=True)
+        self.eval_lines(context, code)
+        return []
+
+
+class ExecLinesTranslatorMarker(MarkerWithEnd):
+    tag_head = cmd_call_eval_prefix + cmd_call_eval_trans_prefix
+
+    def execute(self, context, command, marker_node, marker_set):
+        code = self.get_inner_content(context, marker_node, translate=True, code=True)
         self.eval_lines(context, code)
         return []
 
@@ -34,7 +43,7 @@ class ExecLinesUpdateMarker(MarkerWithEnd, MarkerNoTranslator):
     tag_head = cmd_call_eval_prefix * 3
 
     def execute(self, context, command, marker_node, marker_set):
-        code = self.get_inner_content(context, marker_node, translate=False)
+        code = self.get_inner_content(context, marker_node, translate=False, code=True)
         context.update_variables(self.eval_lines(context, code))
         return []
 
@@ -52,6 +61,15 @@ class ExecCmdcallChainMarker(ExecCmdcallMarkerBase):
     tag_head = cmd_call_prefix_chain + cmd_call_prefix_simple
 
 
+class MarkerParseExprBase(MarkerBase):
+    def execute(self, context, command, marker_node, marker_set):
+        self.parse_expression(context, command.lstrip())
+
+
+class ExecCommandOutputChainMarker(MarkerParseExprBase):
+    tag_head = MarkerBase.trans_marker_command_output
+
+
 class ExecCmdcallSimpleLinesMarker(MarkerWithEnd):
     command_append_prefix = cmd_call_prefix_simple
     tag_head = cmd_call_prefix_simple * 3

dekshell/core/markers/var.py

@@ -75,7 +75,7 @@ class AssignExecMarker(MarkerAssignBase, MarkerWithEnd, MarkerNoTranslator):
     tag_head_re_args = cmd_call_eval_prefix * 2
 
     def execute(self, context, command, marker_node, marker_set):
-        code = self.get_inner_content(context, marker_node, translate=False)
+        code = self.get_inner_content(context, marker_node, translate=False, code=True)
         result = self.eval_codes(context, code)
         args = self.split_raw(command, 1, self.tag_head_re_args)
         self.set_var(context, args, 0, result)
@@ -104,7 +104,6 @@ class AssignCommandOutputMarker(MarkerAssignValueParseExprBase):
     tag_head_re_args = re.escape(MarkerBase.trans_marker_command_output)
 
 
-
 class AssignDecodeMarker(MarkerAssignValueParseExprBase):
     tag_head_re_args_raw = MarkerBase.trans_marker_decode
     tag_head_re_args = re.escape(MarkerBase.trans_marker_decode)

{dekshell-0.2.44.dist-info → dekshell-0.2.45.dist-info}/METADATA

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

{dekshell-0.2.44.dist-info → dekshell-0.2.45.dist-info}/RECORD

@@ -1,6 +1,6 @@
-dekshell-0.2.44.dist-info/METADATA,sha256=6Xsby8G1U04hzm55dWk8guaay6q8AGdoHvIcXiFKte0,573
-dekshell-0.2.44.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-dekshell-0.2.44.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
+dekshell-0.2.45.dist-info/METADATA,sha256=rY4WEtfO49dKer-stqUf8iWB7EDBntXkGVxUfmRIp-s,573
+dekshell-0.2.45.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dekshell-0.2.45.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
@@ -8,9 +8,9 @@ dekshell/core/__init__.py,sha256=isDEKwk1odLdvTQNCILCtVNBuXp1uFVPz_uTDNihkVU,554
 dekshell/core/contexts/__init__.py,sha256=ynsfv37azOKfI2UKd0iPl2M6iBW-k5cb1BqSLOWuJpI,482
 dekshell/core/contexts/methods.py,sha256=3Bzfv_t8At5MqR0xD7qT8zye6KQySeXr0HpwuendrdE,11789
 dekshell/core/contexts/properties.py,sha256=TQonN3T_K2cB2uakq_DVVB13B-IFwoM6t2ZkL_OMekw,3365
-dekshell/core/markers/__init__.py,sha256=ov-mU1Bt-JbifBqJAWIywduWvyGI4WkJUx5LGZNVxhg,2178
-dekshell/core/markers/base/__init__.py,sha256=WGxAr7GRDJI4-HRaLFBasTei-aPyApAnlpfbOaKmmvw,17385
-dekshell/core/markers/base/core.py,sha256=6GPz8YVWgOPjGXtS04oa85P5LUDSg4H16rvVgiPz_EA,12556
+dekshell/core/markers/__init__.py,sha256=mK6OiZMWmUTrkAL0Bc1XqRTSb-NNhBgpHb7GLivLAlk,2235
+dekshell/core/markers/base/__init__.py,sha256=uG2r2IWQC8L8R1b8SMVJRJUH3Bj_ACU7AjVZIsI7BWw,18039
+dekshell/core/markers/base/core.py,sha256=SwZuCDYGyhm1HUeeBOjO_SDKRZ7IwQI9at1u6X4pmsE,12556
 dekshell/core/markers/base/shell.py,sha256=fiFsTUDI8pSDDUCk834OI4ajri2qNWFJkLVhmUk2uAs,484
 dekshell/core/markers/commands.py,sha256=mDRj4dSfKbDaZ_ts4lPXd6wftvGFI4VKkRoIzxV7otA,1696
 dekshell/core/markers/comment.py,sha256=U1U3Xc4-giTqSEAPa4E_DmilZM9hs9zG-PCJ9nn4y5U,965
@@ -18,7 +18,7 @@ dekshell/core/markers/define.py,sha256=Xlw_YPOWlmbopVIHhIeAKWSZhHhXmqb3gCbXxvuH4
 dekshell/core/markers/echo.py,sha256=1H61qQbY9tZnrKsdTI_shTmDY5ZaSGipDuBSRptAuZw,660
 dekshell/core/markers/empty.py,sha256=pWKsHlrp6uXWU6blqOs0IgN_3kYm1OmDQiKGPERabAo,79
 dekshell/core/markers/env.py,sha256=hU6irauFrvsUgK9j6jifosiMn0b6mt3aOf5t9oKhxS4,1160
-dekshell/core/markers/exec.py,sha256=3yWpaCpASrMwzqVslDNzBaUVL7Lbn-zWMs-dOxUePZU,2744
+dekshell/core/markers/exec.py,sha256=tcKZzTuGH17UOi6dycgHGjX3mHrvjKLj8Bnga38tE7U,3369
 dekshell/core/markers/for_.py,sha256=wQnK3-o0dQl4A2wx8xgs6V2dzgEjEbnt4MML2fh2x8U,2148
 dekshell/core/markers/function.py,sha256=j8Cz4ouBQi_0dT6Q6pfJie-1rfIZuSIcWzGBlsKCSd8,3850
 dekshell/core/markers/if_.py,sha256=UqEnR0X9bKO7hEKol3MJNWXvP7fuJAGt8zwk3xlBCuk,1118
@@ -27,7 +27,7 @@ dekshell/core/markers/invoke.py,sha256=ESL2DE9DTaq33AnrXpvEudp1qtoeZFKOhLL12OQpc
 dekshell/core/markers/pip_.py,sha256=mxXa_oqcrk4Qz-HvhlkMoirsl-SbM9Fz610leNqP1o0,832
 dekshell/core/markers/redirect.py,sha256=cpTQaXFAuSwprsrhUNP0xTGDmu06HGNQVcwKsETEjas,1981
 dekshell/core/markers/shell.py,sha256=43BDAAzMdmgZmemkW5buh_w4LL1GDGw-s9fNZo6vhag,1929
-dekshell/core/markers/var.py,sha256=ZNhyH6wHz3H6fM7L28dfaI-7_cqJY8m6kGE5hP756i8,6884
+dekshell/core/markers/var.py,sha256=lGKhKP7NcKc5f_kiombR1d_d2TyRYfVDa9mcB3MJxOY,6894
 dekshell/core/markers/while_.py,sha256=Q0SaElyXSrxg-wS_rfCcxMsmw9jf-0SgN1ICn860T4A,1201
 dekshell/core/plugin/__init__.py,sha256=jAB_KnnHJsyJR_zIfBU_HNLngyhcyyqVv05PdlNZtF8,428
 dekshell/core/redirect.py,sha256=6YCJpG0TkQ4WMt7LBtDD_W1T-C-QkLtGRQw0S60qe54,1058
@@ -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.44.dist-info/RECORD,,
+dekshell-0.2.45.dist-info/RECORD,,