dekshell 0.2.26__py3-none-any.whl → 0.2.28__py3-none-any.whl

dekshell/click/__entry__.py

@@ -3,7 +3,3 @@ from . import app
 
 def main():
     app()
-
-
-if __name__ == '__main__':
-    main()

dekshell/core/markers/__init__.py

@@ -39,7 +39,7 @@ def generate_markers(*args, **kwargs):
         FunctionMarker, CallMarker, ReturnMarker, EnvGlobalMarker, EnvNonlocalMarker,
         VarGlobalMarker, VarNonlocalMarker,
         EndMarker, BreakMarker, ContinueMarker,
-        CommentMultiLineMarker, CommentMarker, CommentShebangMarker, CommentConfigMarker,
+        CommentMultiLineMarker, CommentMarker, CommentShebangMarker, CommentConfigMarker, TextContentMarker,
         PipMarker,
         CommandsMarker,
         RedirectMarker, ShiftMarker,

dekshell/core/markers/base/__init__.py

@@ -74,6 +74,9 @@ class MarkerBase:
             return bool(re.match(r, command))
         return False
 
+    def text_content(self, command):
+        return command
+
     def transform(self, parent):
         return self
 
@@ -354,10 +357,13 @@ class MarkerWithEnd(MarkerBase):
     tag_tail = EndMarker
 
     def get_inner_content(self, context, marker_node, sep='\n', translate=None):
+        def walk(node, depth):
+            if depth != 0:
+                commands.append(self.translate_case(context, node.text_content, translate))
+
         commands = []
-        marker_node.walk(lambda node, depth: commands.extend([] if depth == 0 else [node.command]))
-        text = sep.join(commands)
-        return self.translate_case(context, text, translate)
+        marker_node.walk(walk)
+        return sep.join(commands)
 
     def eval_codes(self, context, code):
         if not code:

dekshell/core/markers/base/core.py

@@ -142,6 +142,10 @@ class MarkerNode:
     def __repr__(self):
         return f'Node({self.marker.__class__.__name__},line={self.line_number})'
 
+    @property
+    def text_content(self):
+        return self.marker.text_content(self.command)
+
     @property
     def debug_info(self):
         def walk(node):

dekshell/core/markers/comment.py

@@ -33,3 +33,10 @@ class CommentConfigMarker(MarkerCommentBase):
             if end == -1:
                 end = None
             return content[begin:end].strip()
+
+
+class TextContentMarker(MarkerCommentBase):
+    tag_head = "/"
+
+    def text_content(self, command):
+        return command[len(self.tag_head):]

dekshell/core/markers/var.py

@@ -42,16 +42,18 @@ class AssignRawStrMarker(AssignStrMarker, MarkerNoTranslator):
 
 class AssignMultiLineStrMarker(MarkerAssignBase, MarkerWithEnd):
     tag_head_re_args = '::'
+    _translate_type = None
 
     def execute(self, context, command, marker_node, marker_set):
-        text = self.get_inner_content(context, marker_node)
-        args = self.split_raw(command, 1, self.tag_head_re_args)
-        self.set_var(context, args, 0, text)
+        text = self.get_inner_content(context, marker_node, translate=self._translate_type)
+        var_name = command[:re.search(self.tag_head_re_args, command).span()[0]]
+        self.set_var_raw(context, var_name.strip(), text)
         return []
 
 
 class AssignMultiLineRawStrMarker(AssignMultiLineStrMarker, MarkerNoTranslator):
     tag_head_re_args = re.escape(r'\::')
+    _translate_type = False
 
 
 class AssignEvalMarker(MarkerAssignValueBase, MarkerNoTranslator):
@@ -72,7 +74,7 @@ class AssignExecMarker(MarkerAssignBase, MarkerWithEnd, MarkerNoTranslator):
     tag_head_re_args = '=='
 
     def execute(self, context, command, marker_node, marker_set):
-        code = self.get_inner_content(context, marker_node)
+        code = self.get_inner_content(context, marker_node, translate=False)
         result = self.eval_codes(context, code)
         args = self.split_raw(command, 1, self.tag_head_re_args)
         self.set_var(context, args, 0, result)

{dekshell-0.2.26.dist-info → dekshell-0.2.28.dist-info}/METADATA

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

{dekshell-0.2.26.dist-info → dekshell-0.2.28.dist-info}/RECORD

@@ -1,19 +1,19 @@
-dekshell-0.2.26.dist-info/METADATA,sha256=jKY1znFqUZbTul0uoKqPFnEz0J-3F3FgvypZomH-sQM,573
-dekshell-0.2.26.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-dekshell-0.2.26.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
+dekshell-0.2.28.dist-info/METADATA,sha256=TM4EKPhD61p--WPgJ-nnOTdYLF5dOGjujW-iVFA2fIU,573
+dekshell-0.2.28.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dekshell-0.2.28.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
 dekshell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dekshell/click/__entry__.py,sha256=fFvrYPXiTLxLS7XLPLPHy_DYTcNE7XL_LZUcVHfIrjA,82
+dekshell/click/__entry__.py,sha256=CMuxUzXoEe4TcHFZwv-MNFwHnu1HSZCDpXFpqQ814uM,42
 dekshell/click/__init__.py,sha256=rFzB_exzPQaIcbbms5PdHAU3NGdl2MBaYbq9v7g7BOI,1870
 dekshell/core/__init__.py,sha256=7d3AjVUGIjXIXRYYiJ03rz5ZONTTojmGfgwpjGmKqtU,5448
 dekshell/core/contexts/__init__.py,sha256=ynsfv37azOKfI2UKd0iPl2M6iBW-k5cb1BqSLOWuJpI,482
 dekshell/core/contexts/methods.py,sha256=ksoOgBHDRM6uiGHw3ubCk4x7ExJKvJ6H3eGhaM-SNDE,9722
 dekshell/core/contexts/properties.py,sha256=esr51c6wDTDsuFXF2uj7WfyIGSq9H0dzqDqWzeMTNQE,2382
-dekshell/core/markers/__init__.py,sha256=_HJsxjjsyYbL7Pj6jhoeJ1WJI92qwCbdl-BKvQcGHlA,1949
-dekshell/core/markers/base/__init__.py,sha256=8WQ1b4J9JBjcPmgAPz5gmXbUf2WgGG41XrktRAvoW-A,13744
-dekshell/core/markers/base/core.py,sha256=LW1KiJBaRhXFOswpChRB9K7VvGQdY1H84wcr-8L9i-k,11582
+dekshell/core/markers/__init__.py,sha256=yRQazZ1dxMltFao_RQnDnawSnQcjN_4B930MjJhaZ40,1968
+dekshell/core/markers/base/__init__.py,sha256=mrOgC5glSG60NMpflSi5mb4bXTmDgv2i-ZYUHCef2Nw,13826
+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
-dekshell/core/markers/comment.py,sha256=28iccgLs_0bRdXLhHyQR2I_kzlWdeMSqqNUFW-2vkes,818
+dekshell/core/markers/comment.py,sha256=U1U3Xc4-giTqSEAPa4E_DmilZM9hs9zG-PCJ9nn4y5U,965
 dekshell/core/markers/define.py,sha256=LpMSfz9ziXq2aFJ6oMpUFFo93TpBx7GxKYNzCeht4fQ,516
 dekshell/core/markers/echo.py,sha256=1H61qQbY9tZnrKsdTI_shTmDY5ZaSGipDuBSRptAuZw,660
 dekshell/core/markers/empty.py,sha256=pWKsHlrp6uXWU6blqOs0IgN_3kYm1OmDQiKGPERabAo,79
@@ -27,7 +27,7 @@ dekshell/core/markers/invoke.py,sha256=To_U_FscoCbf7osvjC5MQTk2gjH5Mu_-06Kb22YQP
 dekshell/core/markers/pip_.py,sha256=mxXa_oqcrk4Qz-HvhlkMoirsl-SbM9Fz610leNqP1o0,832
 dekshell/core/markers/redirect.py,sha256=3vfkRQ2tnQ6rSGGn7csgUlpDi0s2ep5X7JU7NVvo0eI,1984
 dekshell/core/markers/shell.py,sha256=43BDAAzMdmgZmemkW5buh_w4LL1GDGw-s9fNZo6vhag,1929
-dekshell/core/markers/var.py,sha256=_7Z4gMxm63Q0eVgg71hFSy1nGUz7Tf5Kp02ek16c3Cc,5043
+dekshell/core/markers/var.py,sha256=CnmBDQvA5XcQlioczXFhCvIbDc8ex4RIAgDeQvFdIiY,5176
 dekshell/core/markers/while_.py,sha256=e7lI5jsIM-qxNHMY_wUyCMvvesdXQibR5Ez2jNO9csc,1195
 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=A0lEixQ7Ui0UxmeuymniyqCZXss9qQdX1C0COM7EEkQ,1234
 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.26.dist-info/RECORD,,
+dekshell-0.2.28.dist-info/RECORD,,