dekshell 0.1.96__py3-none-any.whl → 0.1.98__py3-none-any.whl

dekshell/core/contexts/methods.py

@@ -17,6 +17,7 @@ from dektools.download import download_from_http
 from dektools.time import now
 from dektools.str import shlex_split, shlex_quote
 from ...utils.beep import sound_notify
+from ..markers.base.core import MarkerBase, get_inner_vars
 from ..markers.invoke import InvokeMarker, GotoMarker
 from ..redirect import search_bin_by_path_tree
 
@@ -87,6 +88,20 @@ def _remove_path(path):
             _remove_path(item)
 
 
+_xeval_default = object()
+
+
+def _xeval(expression, default=_xeval_default, translate=False):
+    context = get_inner_vars('__inner_context__', full=True)
+    try:
+        return MarkerBase.eval_mixin(context, expression, translate)
+    except NameError:
+        if default is _xeval_default:
+            raise
+        else:
+            return default
+
+
 path_common_methods = {
     'cd': os.chdir,
     'cwd': lambda: os.getcwd(),
@@ -98,6 +113,7 @@ path_common_methods = {
 }
 
 default_methods = {
+    'xeval': _xeval,
     'echo': lambda *x, **y: print(*x, **dict(flush=True) | y),
     'echos': lambda *x, **y: print(*x, **dict(end='', flush=True) | y),
     'echox': lambda *x, **y: print(*x, **dict(file=sys.stderr, flush=True) | y),

dekshell/core/contexts/properties.py

@@ -20,6 +20,7 @@ def make_shell_properties(shell):
             'rf': f'{shell} rf',
             'rfc': f'{shell} rfc',
             'rs': f'{shell} rs',
+            'ext': '.pysh',
         },
     }
 

dekshell/core/markers/__init__.py

@@ -14,6 +14,7 @@ from .echo import *
 from .pip_ import *
 from .shell import *
 from .redirect import *
+from .input import *
 from .timout import *
 from .empty import *
 
@@ -23,11 +24,12 @@ def generate_markers(*args, **kwargs):
         *args,
         *get_markers_from_modules(**kwargs),
         ErrorEchoMarker, EchoNoWrapMarker, EchoMarker,
+        InputMarker,
         DelVarMarker,
         ExecLinesUpdateMarker, ExecLinesMarker, ExecMarker, ExecCmdcallLinesMarker, ExecCmdcallMarker,
         EnvShellMarker, EnvMarker,
         IfMarker, IfElifMarker, IfElseMarker,
-        WhileMarker,
+        WhileMarker, WhileElseMarker,
         ForMarker, ForElseMarker,
         DefineMarker,
         GotoMarker, InvokeMarker,

dekshell/core/markers/base/__init__.py

@@ -123,6 +123,13 @@ class MarkerBase:
         func = cls.eval(context, func)
         return func(*args, **kwargs)
 
+    @classmethod
+    def translate_case(cls, context, s, case=None):
+        if case is None:
+            return cls.translate(context, s)
+        else:
+            return cls._translate(context, s) if case else s
+
     @classmethod
     def translate(cls, context, s):
         return cls._translate(context, s)
@@ -221,10 +228,10 @@ class MarkerBase:
 
     @classmethod
     def eval_mixin(cls, context, expression, translate=True):
+        __inner_context__ = context  # noqa
         expression = expression.lstrip()
         if expression.startswith(cmd_call_prefix_chain):
-            if translate:
-                expression = cls._translate(context, expression)
+            expression = cls.translate_case(context, expression, translate)
             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]
@@ -235,12 +242,10 @@ class MarkerBase:
                     value = cls.eval(context, func)(value)
             return value
         elif expression.startswith(cmd_call_prefix):
-            if translate:
-                expression = cls._translate(context, expression)
+            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):
-            if translate:
-                expression = cls._translate(context, expression)
+            expression = cls.translate_case(context, expression, translate)
             return cls.cmd_call(context, expression[len(cmd_call_prefix_simple):], True)
         else:
             if expression.startswith(cmd_call_eval_prefix):
@@ -294,7 +299,7 @@ class TransformerMarker(MarkerBase):
 
     def transform(self, parent):
         for target in self.targets:
-            if target.is_type(*parent.final_branch_set):
+            if isinstance(target, tuple(parent.final_branch_set)):
                 return target
         return self.targets[0]
 
@@ -305,13 +310,13 @@ class TransformerMarker(MarkerBase):
         records_target = set()
         for i, marker in enumerate(markers):
             match = marker.get_tag_match()
-            if marker in records_markers:
+            if match in records_markers:
                 records_markers[match].append(marker)
             else:
-                records_markers[match] = []
+                records_markers[match] = [marker]
             if len(records_markers[match]) > 1:
                 records_target.add(match)
-            if marker not in records_index:
+            if match not in records_index:
                 records_index[match] = i
         offset = 0
         for match in sorted(records_target, key=lambda x: records_index[x]):
@@ -324,11 +329,11 @@ class TransformerMarker(MarkerBase):
 class MarkerWithEnd(MarkerBase):
     tag_tail = EndMarker
 
-    def get_inner_content(self, context, marker_node):
+    def get_inner_content(self, context, marker_node, sep='\n', translate=None):
         commands = []
         marker_node.walk(lambda node, depth: commands.extend([] if depth == 0 else [node.command]))
-        text = '\n'.join(commands)
-        return self.translate(context, text)
+        text = sep.join(commands)
+        return self.translate_case(context, text, translate)
 
     def eval_codes(self, context, code):
         if not code:
@@ -357,7 +362,9 @@ class MarkerWithEnd(MarkerBase):
 
 
 class MarkerNoTranslator(MarkerBase):
-    def translate(self, context, s):
+
+    @classmethod
+    def translate(cls, context, s):
         return s
 
 

dekshell/core/markers/base/core.py

@@ -7,16 +7,37 @@ from dektools.dict import MapChainContext
 from . import MarkerBase, TransformerMarker, ExitException, QuitContextException
 
 
-def get_inner_vars(*var_name_list):
-    depth = 1
-    while True:
-        frame = sys._getframe(depth)
-        if var_name_list[0] in frame.f_globals:
-            result = tuple(frame.f_globals[x] for x in var_name_list)
-            if len(var_name_list) == 1:
-                return result[0]
-            return result
-        depth += 1
+def get_inner_vars(*var_name_list, full=False):
+    def walk(attr):
+        depth = 1
+        while True:
+            try:
+                frame = sys._getframe(depth)
+            except ValueError:
+                return
+            scope = getattr(frame, attr)
+            for i, name in enumerate(var_name_list):
+                if result[i] is unset:
+                    if name in scope:
+                        result[i] = scope[name]
+            if not list_unset():
+                break
+            depth += 1
+
+    def list_unset():
+        return [var_name_list[i] for i, x in enumerate(result) if x is unset]
+
+    unset = object()
+    result = [unset] * len(var_name_list)
+    walk('f_globals')
+    if full and list_unset():
+        walk('f_locals')
+    lu = list_unset()
+    if lu:
+        raise ValueError(f"Can't find: {lu}")
+    if len(result) == 1:
+        return result[0]
+    return tuple(result)
 
 
 class MarkerContext:
@@ -134,7 +155,7 @@ class MarkerNode:
         return obj2str(walk(self))
 
     def is_type(self, *markers_cls):
-        return isinstance(self.marker, tuple(markers_cls))
+        return isinstance(self.marker, markers_cls)
 
     def add_child(self, node):
         node.parent = self
@@ -154,6 +175,7 @@ class MarkerNode:
 
     @classmethod
     def execute_nodes(cls, context, marker_set, nodes):
+        __inner_marker_set__ = marker_set  # noqa
         while nodes:
             node = nodes.pop(0)
             result = node.bubble_continue(context, marker_set, node)

dekshell/core/markers/exec.py

@@ -16,7 +16,7 @@ class ExecLinesMarker(MarkerWithEnd, MarkerNoTranslator):
     tag_head = '=='
 
     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)
         self.eval_lines(context, code)
         return []
 
@@ -25,7 +25,7 @@ class ExecLinesUpdateMarker(MarkerWithEnd, MarkerNoTranslator):
     tag_head = '==='
 
     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)
         context.update_variables(self.eval_lines(context, code))
         return []
 

dekshell/core/markers/function.py

@@ -12,10 +12,10 @@ class CallMarker(MarkerNoTranslator):
 
     def execute_core(self, context, expression):
         if expression.startswith(cmd_call_prefix):
-            expression = self.translate(context, expression)
+            expression = self.translate_case(context, expression, True)
             name, args, kwargs = self.cmd_call_parse(context, expression[len(cmd_call_prefix):], False)
         elif expression.startswith(cmd_call_prefix_simple):
-            expression = self.translate(context, expression)
+            expression = self.translate_case(context, expression, True)
             name, args, kwargs = self.cmd_call_parse(context, expression[len(cmd_call_prefix_simple):], True)
         else:
             name = expression[:expression.find('(')]

dekshell/core/markers/input.py

@@ -0,0 +1,16 @@
+import subprocess
+from dektools.shell import shell_with_input
+from .base import MarkerWithEnd, MarkerNoTranslator
+
+
+class InputMarker(MarkerWithEnd, MarkerNoTranslator):
+    tag_head = 'input'
+
+    def execute(self, context, command, marker_node, marker_set):
+        command_text = self.get_inner_content(context, marker_node, sep='', translate=True).strip()
+        expression = self.split_raw(command, 1, self.tag_head)[1]
+        inputs = self.eval_mixin(context, expression)
+        rc = shell_with_input(command_text, inputs, env=context.environ_full())
+        if rc:
+            raise subprocess.CalledProcessError(rc, command_text)
+        return []

dekshell/core/markers/while_.py

@@ -1,8 +1,13 @@
 from .base import MarkerWithEnd, BreakMarker, ContinueMarker, MarkerNoTranslator
 
 
+class WhileElseMarker(MarkerWithEnd):
+    tag_head = "else"
+
+
 class WhileMarker(MarkerWithEnd, MarkerNoTranslator):
     tag_head = "while"
+    branch_set = {WhileElseMarker}
 
     def bubble_continue(self, context, marker_set, marker_node_self, marker_node_target):
         if marker_node_target.is_type(BreakMarker):
@@ -12,11 +17,13 @@ class WhileMarker(MarkerWithEnd, MarkerNoTranslator):
         return None
 
     def execute(self, context, command, marker_node, marker_set):
+        index_else = self.find_node(marker_node.children, True)
+
         result = self.get_condition_result(context, command)
         if result:
-            return [*marker_node.children, marker_set.node_cls(ContinueMarker(), None, None, marker_node)]
+            return [*marker_node.children[:index_else], marker_set.node_cls(ContinueMarker(), None, None, marker_node)]
         else:
-            return []
+            return marker_node.children[index_else:]
 
     def get_condition_result(self, context, command):
         expression = command.split(self.tag_head, 1)[-1].strip()

{dekshell-0.1.96.dist-info → dekshell-0.1.98.dist-info}/METADATA

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

{dekshell-0.1.96.dist-info → dekshell-0.1.98.dist-info}/RECORD

@@ -1,32 +1,33 @@
-dekshell-0.1.96.dist-info/METADATA,sha256=zBUVdr9cVMpMPq-RSkJXw15pgIlenlR7hmm6saW5KkQ,521
-dekshell-0.1.96.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-dekshell-0.1.96.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
+dekshell-0.1.98.dist-info/METADATA,sha256=NPP9ZnDzxOZgm3U93ABhJZ0ohKxkgTad2gm2hjtlnC8,521
+dekshell-0.1.98.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+dekshell-0.1.98.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=UKK_JnWOaY6gDakc1GMlVHoU04Kj_ot79GVUt_CAVbI,1877
 dekshell/core/__init__.py,sha256=nwHnjVIRHkEuFqPeoGqrydvfRFYt7cY8VGbQVCkEY0g,5204
 dekshell/core/contexts/__init__.py,sha256=ynsfv37azOKfI2UKd0iPl2M6iBW-k5cb1BqSLOWuJpI,482
-dekshell/core/contexts/methods.py,sha256=0T3_aZSbXnzYqxGCymHDqYnxZpTHhMjhY2KTfYhVXcs,5065
-dekshell/core/contexts/properties.py,sha256=e6sLaPiosj1HqvUK3A3W-TXMMwlQHbK9jmIRvLiTrf0,1542
-dekshell/core/markers/__init__.py,sha256=ygIuyKz11F5vJ8C17mbfawsrymcqdK7bc6wmZ15QoeA,1666
-dekshell/core/markers/base/__init__.py,sha256=T2JfxaU0uMjg6RFFjq6OteUxpmmJBF9yqjI6Diy7LsQ,12781
-dekshell/core/markers/base/core.py,sha256=c7Dd_3_KInjHVI9vn2q6cgV5nCfDF3fq4xsGOsJGpeI,10211
+dekshell/core/contexts/methods.py,sha256=377lvp_1FvLE6AgJMfbPDu_yUF4DwWMKsTuB-f268Oo,5498
+dekshell/core/contexts/properties.py,sha256=aLHtyUWedbFPQw33V5vQZTc4TeLMTC-AO6e7PhBZKbk,1570
+dekshell/core/markers/__init__.py,sha256=bmGMbZRqsOohMKjH0AReFxZ-nIPFF6YgPJMFT6gTJEw,1725
+dekshell/core/markers/base/__init__.py,sha256=AQYr7H0F06izu5jhu8EgLYJ2ERzJh0eS38h9gtl6OZs,13067
+dekshell/core/markers/base/core.py,sha256=99aRcSXohpfTW5OSO1CUyvnptr21ueKjizCk-FK6rcM,10830
 dekshell/core/markers/comment.py,sha256=28iccgLs_0bRdXLhHyQR2I_kzlWdeMSqqNUFW-2vkes,818
 dekshell/core/markers/define.py,sha256=LpMSfz9ziXq2aFJ6oMpUFFo93TpBx7GxKYNzCeht4fQ,516
 dekshell/core/markers/echo.py,sha256=1H61qQbY9tZnrKsdTI_shTmDY5ZaSGipDuBSRptAuZw,660
 dekshell/core/markers/empty.py,sha256=xMYoZIxn7Tt1RjFtLhJERisra8jqsGjJ0G7OID0oD3o,776
 dekshell/core/markers/env.py,sha256=6ZtiMNdKFbGR_DBjG6C7A8L_lJsiymN5Y5AbnTzyMrE,1158
-dekshell/core/markers/exec.py,sha256=7dU2He4iGkOG6khkj-xkZXQ6IPD4gC3JeExXGjybQO8,1998
+dekshell/core/markers/exec.py,sha256=zT3mI7bBSgOpBICCjeb-vhAWbra9i8rABuUAVNnuMns,2032
 dekshell/core/markers/for_.py,sha256=uNOEwyDsjffttEBtUYasdlj7FP_sGnQzWuTV5d5esHY,2142
-dekshell/core/markers/function.py,sha256=iqzpu01kvrPP31zXbRl7cQytRW89Q2UMueaBgsWGVV8,3570
+dekshell/core/markers/function.py,sha256=RPh56_rYbWXCTkNPiJu8zNEj-OE6txKgEw7Im9fBM3c,3592
 dekshell/core/markers/if_.py,sha256=bBG1fDCZd5alE5FSm0QhgHl6ZJn5awiqZAXnPnO-thc,1112
+dekshell/core/markers/input.py,sha256=HpqE1_PxrmeAVbWxACu0O7SeBVQpBw-aAmNIX5uWWYs,659
 dekshell/core/markers/invoke.py,sha256=sXXg0p8Dyg4HQwnWFzWgcyhZYGWvNfhDgUumrrUoWkM,1431
 dekshell/core/markers/pip_.py,sha256=mxXa_oqcrk4Qz-HvhlkMoirsl-SbM9Fz610leNqP1o0,832
 dekshell/core/markers/redirect.py,sha256=7r0SpwIDkHkHjEDa26pNq3luOAE69fsFETyv4mKDw5k,1588
 dekshell/core/markers/shell.py,sha256=oU_APU2__BO9-LeDE4uYDXClic8MGmwambD2jujkpVc,984
 dekshell/core/markers/timout.py,sha256=sC1kNfcA_TFuKZFUaRCSnPHZ5az9Ap8rItSu5RwssUM,915
 dekshell/core/markers/var.py,sha256=UEGnKdloRDOSi1KD8aJId9k7WTYkeDIKjsuT7tBJ5Lo,4210
-dekshell/core/markers/while_.py,sha256=ZpwaNDYGYF9HCE6cf3q7tArafI8oGnM7TXhJ-UKwpB0,989
+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
 dekshell/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -35,4 +36,4 @@ dekshell/utils/cmd.py,sha256=_WG7K-CO-WQkI9ERyrhI2d4yT-DX3OjjJWbNzhmsPus,1197
 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.1.96.dist-info/RECORD,,
+dekshell-0.1.98.dist-info/RECORD,,