dekshell 0.1.97__py3-none-any.whl → 0.1.99__py3-none-any.whl

dekshell/click/__init__.py

@@ -1,9 +1,8 @@
-import os
 import sys
 import typer
 from dektools.file import normal_path
 from dektools.output import pprint
-from dektools.str import str_escaped
+from dektools.escape import str_escaped
 from dektools.shell import associate_console_script, get_current_sys_exe
 from dektools.typer import command_mixin, command_version
 from dektools.plugin import iter_plugins

dekshell/core/__init__.py

@@ -8,7 +8,7 @@ from dektools.time import get_tz
 from dektools.format import format_duration
 from dektools.shell import shell_command, shell_wrapper
 from dektools.file import normal_path
-from dektools.str import str_escape_wrap
+from dektools.escape import str_escape_wrap
 from .contexts import get_all_context
 from .markers import generate_markers, CommentConfigMarker
 from .markers.base.core import MarkerBase, MarkerSet

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,11 +113,12 @@ 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),
     'pprint': pprint,
-    'obj2str': obj2str,
+    'o2s': obj2str,
     'now': now,
     'getpass': getpass.getpass,
     'Path': Path,

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):
@@ -328,10 +333,7 @@ class MarkerWithEnd(MarkerBase):
         commands = []
         marker_node.walk(lambda node, depth: commands.extend([] if depth == 0 else [node.command]))
         text = sep.join(commands)
-        if translate is None:
-            return self.translate(context, text)
-        else:
-            return self._translate(context, text) if translate else text
+        return self.translate_case(context, text, translate)
 
     def eval_codes(self, context, code):
         if not code:
@@ -360,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:
@@ -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/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-0.1.97.dist-info → dekshell-0.1.99.dist-info}/METADATA

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

{dekshell-0.1.97.dist-info → dekshell-0.1.99.dist-info}/RECORD

@@ -1,16 +1,16 @@
-dekshell-0.1.97.dist-info/METADATA,sha256=K1wot7YWg72KB90g-0atDjOncRCauRt_lRJ4Y9poNu8,521
-dekshell-0.1.97.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-dekshell-0.1.97.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
+dekshell-0.1.99.dist-info/METADATA,sha256=kR4kKG9cp430mZvPzV9siPtyhzs-gSw8QXR6ftrq8r0,521
+dekshell-0.1.99.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+dekshell-0.1.99.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/click/__init__.py,sha256=rFzB_exzPQaIcbbms5PdHAU3NGdl2MBaYbq9v7g7BOI,1870
+dekshell/core/__init__.py,sha256=Cp--1j2jpJzchXR98HiRp2QAiOHz8HXm8iy6ZChIWmc,5207
 dekshell/core/contexts/__init__.py,sha256=ynsfv37azOKfI2UKd0iPl2M6iBW-k5cb1BqSLOWuJpI,482
-dekshell/core/contexts/methods.py,sha256=0T3_aZSbXnzYqxGCymHDqYnxZpTHhMjhY2KTfYhVXcs,5065
+dekshell/core/contexts/methods.py,sha256=SXuLpAjVv272TZE2_Dwmf7hX4fvS9MSHpaIEsTHPTok,5494
 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=YFl0KGw7MweeDE5PBBpie_IntXxS1gj-uiXWoC-dXJU,12941
-dekshell/core/markers/base/core.py,sha256=AU4XGMWO4jWP2vc7PCOlVvV66rZ25fuQAeYKVqijT7k,10204
+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
@@ -18,7 +18,7 @@ dekshell/core/markers/empty.py,sha256=xMYoZIxn7Tt1RjFtLhJERisra8jqsGjJ0G7OID0oD3
 dekshell/core/markers/env.py,sha256=6ZtiMNdKFbGR_DBjG6C7A8L_lJsiymN5Y5AbnTzyMrE,1158
 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
@@ -36,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.97.dist-info/RECORD,,
+dekshell-0.1.99.dist-info/RECORD,,