dekshell 0.2.7__tar.gz → 0.2.9__tar.gz

{dekshell-0.2.7 → dekshell-0.2.9}/PKG-INFO

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

{dekshell-0.2.7 → dekshell-0.2.9}/dekshell/core/contexts/methods.py

@@ -6,8 +6,10 @@ import getpass
 from functools import reduce
 from itertools import chain
 from pathlib import Path
+from io import BytesIO, StringIO
 from dektools.file import sure_dir, write_file, read_text, remove_path, sure_parent_dir, normal_path, \
-    format_path_desc, read_file, split_ext, path_ext, clear_dir, copy_recurse_ignore, path_is_empty,\
+    format_path_desc, read_file, split_ext, path_ext, clear_dir, copy_recurse_ignore, path_is_empty, \
+    read_lines, \
     split_file, combine_split_files, remove_split_files, meta_split_file, tree, iglob, \
     where, where_list, which, which_list
 from dektools.hash import hash_file
@@ -129,8 +131,21 @@ def _install(name):
     shell_wrapper(command)
 
 
+def _io(x=None):
+    if x is None:
+        x = b''
+    return BytesIO(x) if isinstance(x, bytes) else StringIO(x)
+
+
+def _cd(path=None):
+    if path is None:
+        path = os.path.expanduser('~')
+    os.chdir(path)
+    return path
+
+
 path_common_methods = {
-    'cd': os.chdir,
+    'cd': _cd,
     'cwd': lambda: os.getcwd(),
     'which': lambda *x: which(*x) or '',
     'where': lambda *x: where(*x) or '',
@@ -140,6 +155,7 @@ path_common_methods = {
 }
 
 default_methods = {
+    'io': _io,
     'reduce': reduce,
     'chain': chain,
     'xeval': _xeval,
@@ -179,6 +195,7 @@ default_methods = {
         'rm': _remove_path,
         'wf': write_file,
         'rt': read_text,
+        'rl': read_lines,
         'rf': read_file,
         'ci': copy_recurse_ignore,
 

{dekshell-0.2.7 → dekshell-0.2.9}/dekshell/core/markers/__init__.py

@@ -26,7 +26,8 @@ def generate_markers(*args, **kwargs):
         ErrorEchoMarker, EchoNoWrapMarker, EchoMarker,
         InputMarker,
         DelVarMarker,
-        ExecLinesUpdateMarker, ExecLinesMarker, ExecMarker, ExecCmdcallLinesMarker, ExecCmdcallMarker,
+        ExecLinesUpdateMarker, ExecLinesMarker, ExecMarker, ExecCmdcallSimpleLinesMarker, ExecCmdcallLinesMarker,
+        ExecCmdcallMarker, ExecCmdcallChainMarker,
         EnvShellMarker, EnvMarker,
         IfMarker, IfElifMarker, IfElseMarker,
         WhileMarker, WhileElseMarker,
@@ -45,7 +46,7 @@ def generate_markers(*args, **kwargs):
         IgnoreMarker,
         PrefixShellMarker,
         AssignCallMarker, AssignInvokerMarker, AssignGotoMarker, AssignTimeoutMarker, AssignRetryMarker,
-        AssignExecMarker, AssignEvalMarker, AssignCmdcallMarker,
+        AssignExecMarker, AssignEvalMarker, AssignCmdcallMarker, AssignCmdcallChainMarker,
         AssignMultiLineRawStrMarker, AssignMultiLineStrMarker, AssignRawStrMarker, AssignStrMarker,
         EmptyMarker,  # must be at the tail
     ]

{dekshell-0.2.7 → dekshell-0.2.9}/dekshell/core/markers/base/__init__.py

@@ -9,7 +9,7 @@ from ....utils.cmd import cmd2ak
 
 cmd_call_prefix_simple = '>'
 cmd_call_prefix = cmd_call_prefix_simple * 2
-cmd_call_prefix_chain = cmd_call_prefix_simple * 3
+cmd_call_prefix_chain = '*'
 cmd_call_eval_prefix = '='
 cmd_call_eval_escape = '\\'
 
@@ -104,10 +104,25 @@ class MarkerBase:
     def remove_var(context, name):
         context.remove_variable(name)
 
+    @classmethod
+    def cmd_call_split(cls, s, max_item=None):
+        if max_item == 0:
+            return [], s.lstrip()
+        m = re.match(rf'[ \t\f\r]*({cmd_call_prefix_simple}[{cmd_call_prefix_simple}]?)[ \t\f\r]*([^\W\d][\w.]*)', s)
+        if not m:
+            return [], s.lstrip()
+        rest = s[m.span()[1]:]
+        if max_item is not None:
+            max_item -= 1
+        items, body = cls.cmd_call_split(rest, max_item)
+        items = [(m.group(2), m.group(1) == cmd_call_prefix_simple), *items]
+        return items, body
+
     @classmethod
     def cmd_call_parse(cls, context, s, simple):
+        s = s.lstrip()
         if simple:
-            argv = cls.split_raw(s, 1)
+            argv = re.split(r'[ \t\f\r]+', s, 1)
             args = argv[1:]
             kwargs = {}
         else:
@@ -117,12 +132,6 @@ class MarkerBase:
         func = argv[0]
         return func, args, kwargs
 
-    @classmethod
-    def cmd_call(cls, context, s, simple):
-        func, args, kwargs = cls.cmd_call_parse(context, s, simple)
-        func = cls.eval(context, func)
-        return func(*args, **kwargs)
-
     @classmethod
     def translate_case(cls, context, s, case=None):
         if case is None:
@@ -231,22 +240,32 @@ class MarkerBase:
         __inner_context__ = context  # noqa
         expression = expression.lstrip()
         if expression.startswith(cmd_call_prefix_chain):
-            expression = cls.translate_case(context, expression, translate)
+            max_item = None
             expression = expression[len(cmd_call_prefix_chain):]
-            index = re.search(
-                r"%s|%s" % (re.escape(cmd_call_prefix_simple), re.escape(cmd_call_eval_prefix)), expression).span()[0]
-            funcs = cls.split_raw(expression[:index])
-            value = cls.eval_mixin(context, expression[index:], False)
-            for func in reversed(funcs):
-                if func:
-                    value = cls.eval(context, func)(value)
-            return value
-        elif expression.startswith(cmd_call_prefix):
-            expression = cls.translate_case(context, expression, translate)
-            return cls.cmd_call(context, expression[len(cmd_call_prefix):], False)
-        elif expression.startswith(cmd_call_prefix_simple):
+        else:
+            max_item = 1
+        if expression.startswith(cmd_call_prefix_simple):
             expression = cls.translate_case(context, expression, translate)
-            return cls.cmd_call(context, expression[len(cmd_call_prefix_simple):], True)
+        funcs, body = cls.cmd_call_split(expression, max_item)
+        if funcs:
+            func, simple = funcs[-1]
+            f = cls.eval(context, func)
+            if simple:
+                value = f(body)
+            else:
+                if body:
+                    args, kwargs = cls.cmd2ak(cls.split(body))
+                    args, kwargs = cls.var_map_batch(context, *args, **kwargs)
+                else:
+                    args, kwargs = [], {}
+                value = f(*args, **kwargs)
+            for func, simple in reversed(funcs[:-1]):
+                f = cls.eval(context, func)
+                if simple:
+                    value = f(value)
+                else:
+                    value = f(*value)
+            return value
         else:
             if expression.startswith(cmd_call_eval_prefix):
                 expression = expression[len(cmd_call_eval_prefix):]

{dekshell-0.2.7 → dekshell-0.2.9}/dekshell/core/markers/exec.py

@@ -1,4 +1,4 @@
-from .base import MarkerBase, MarkerWithEnd, MarkerNoTranslator, cmd_call_prefix, cmd_call_prefix_simple, \
+from .base import MarkerBase, MarkerWithEnd, MarkerNoTranslator, cmd_call_prefix_simple, \
     cmd_call_prefix_chain
 from .empty import EmptyMarker
 
@@ -30,15 +30,22 @@ class ExecLinesUpdateMarker(MarkerWithEnd, MarkerNoTranslator):
         return []
 
 
-class ExecCmdcallMarker(MarkerBase):
-    tag_head = cmd_call_prefix_simple
-
+class ExecCmdcallMarkerBase(MarkerBase):
     def execute(self, context, command, marker_node, marker_set):
         self.eval_mixin(context, command, False)
 
 
-class ExecCmdcallLinesMarker(MarkerWithEnd):
-    tag_head = f'{cmd_call_prefix_chain}{cmd_call_prefix_simple}'
+class ExecCmdcallMarker(ExecCmdcallMarkerBase):
+    tag_head = cmd_call_prefix_simple
+
+
+class ExecCmdcallChainMarker(ExecCmdcallMarkerBase):
+    tag_head = cmd_call_prefix_chain + cmd_call_prefix_simple
+
+
+class ExecCmdcallSimpleLinesMarker(MarkerWithEnd):
+    command_append_prefix = cmd_call_prefix_simple
+    tag_head = cmd_call_prefix_simple * 3
     cmd_call_marker_cls = ExecCmdcallMarker
     targets_marker_cls = (EmptyMarker,)
 
@@ -49,7 +56,7 @@ class ExecCmdcallLinesMarker(MarkerWithEnd):
             if child.is_type(*self.targets_marker_cls):
                 node = marker_set.node_cls(
                     marker,
-                    self.cmd_call_marker_cls.tag_head + ' ' + child.command,
+                    self.command_append_prefix + ' ' + child.command,
                     child.index,
                     marker_node,
                     child.command
@@ -58,3 +65,8 @@ class ExecCmdcallLinesMarker(MarkerWithEnd):
             else:
                 result.append(child)
         return result
+
+
+class ExecCmdcallLinesMarker(ExecCmdcallSimpleLinesMarker):
+    command_append_prefix = cmd_call_prefix_simple * 2
+    tag_head = cmd_call_prefix_simple * 4

{dekshell-0.2.7 → dekshell-0.2.9}/dekshell/core/markers/var.py

@@ -1,12 +1,12 @@
 import re
-from .base import MarkerBase, MarkerWithEnd, MarkerNoTranslator, cmd_call_prefix_simple
+from .base import MarkerBase, MarkerWithEnd, MarkerNoTranslator, cmd_call_prefix_simple, cmd_call_prefix_chain
 from .function import CallMarker
 from .shell import TimeoutMarker, RetryMarker
 from .invoke import MarkerInvokerBase, InvokeMarker, GotoMarker
 
 
 class MarkerAssignBase(MarkerBase):
-    tag_head_re = r"[^\W\d]\w*[ \t\f\r\n]*%s"
+    tag_head_re = r"[^\W\d]\w*[ \t\f\r]*%s"
 
 
 class MarkerAssignValueBase(MarkerAssignBase):
@@ -73,10 +73,16 @@ class AssignExecMarker(MarkerAssignBase, MarkerWithEnd, MarkerNoTranslator):
 
 
 class AssignCmdcallMarker(MarkerAssignValueBase):
-    tag_head_re_args = cmd_call_prefix_simple
+    tag_head_re_args_raw = cmd_call_prefix_simple
+    tag_head_re_args = re.escape(tag_head_re_args_raw)
 
     def get_value(self, context, marker_node, marker_set, expression):
-        return self.eval_mixin(context, cmd_call_prefix_simple + expression, False)
+        return self.eval_mixin(context, self.tag_head_re_args_raw + expression, False)
+
+
+class AssignCmdcallChainMarker(AssignCmdcallMarker):
+    tag_head_re_args_raw = cmd_call_prefix_chain + cmd_call_prefix_simple
+    tag_head_re_args = re.escape(tag_head_re_args_raw)
 
 
 class AssignCallMarker(MarkerAssignValueBase, CallMarker):

{dekshell-0.2.7 → dekshell-0.2.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dekshell"
-version = "0.2.7"
+version = "0.2.9"
 description = ""
 authors = [
     { name = "sanzenwin", email = "sanzenwin@gmail.com" },