dekshell 0.2.31__py3-none-any.whl → 0.2.33__py3-none-any.whl

dekshell/click/__init__.py

@@ -2,12 +2,13 @@ import sys
 import typer
 from dektools.file import normal_path
 from dektools.output import pprint
-from dektools.escape import str_escaped
+from dektools.escape import str_escape_unicode
 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
 from ..core import shell_command_batch, shell_command_file, shell_command_file_cd
 from ..core.markers.base import MarkerBase
+from ..core.markers.base.core import MarkerContext
 from ..core.contexts import get_all_context
 from ..core.markers import generate_markers
 from ..utils.serializer import serializer, SerializerException
@@ -25,7 +26,9 @@ def get_argv(index=None):
 
 
 def get_kwargs(begin):
-    return pack_context_full(*MarkerBase.cmd2ak(get_argv()[begin:]))
+    args, kwargs = MarkerBase.cmd2ak(get_argv()[begin:])
+    args, kwargs = MarkerBase.cmd_trans_batch(MarkerContext(), *args, **kwargs)
+    return pack_context_full(args, kwargs)
 
 
 @command_mixin(app)
@@ -34,7 +37,7 @@ def rs(args):
         args = serializer.load(args)
     except SerializerException:
         pass
-    shell_command_batch(str_escaped(args), context=pack_context_full())
+    shell_command_batch(str_escape_unicode(args), context=pack_context_full())
 
 
 @app.command(

dekshell/core/__init__.py

@@ -14,15 +14,15 @@ from .markers import generate_markers, CommentConfigMarker
 from .markers.base.core import MarkerBase, MarkerSet
 from ..utils.beep import sound_notify
 from ..utils.shell import shell_bin
-from ..utils.cmd import ak2cmd, pack_context_full
+from ..utils.cmd import pack_context_full
 
 
 def shell_file(__placeholder__filepath, *args, **kwargs):
-    shell_wrapper(f'{shell_bin} rf "{__placeholder__filepath}" {ak2cmd(args, kwargs)}')
+    shell_wrapper(f'{shell_bin} rf "{__placeholder__filepath}" {MarkerBase.ak2cmd(args, kwargs)}')
 
 
 def shell_file_cd(__placeholder__filepath, *args, **kwargs):
-    shell_wrapper(f'{shell_bin} rfc "{__placeholder__filepath}" {ak2cmd(args, kwargs)}')
+    shell_wrapper(f'{shell_bin} rfc "{__placeholder__filepath}" {MarkerBase.ak2cmd(args, kwargs)}')
 
 
 def shell_command_file_cd(filepath, **kwargs):

dekshell/core/contexts/methods.py

@@ -31,7 +31,7 @@ from dektools.shell import shell_wrapper, is_user_admin, shell_timeout, shell_re
 from dektools.match import GeneralMatcher, glob2re, glob_compile, glob_match
 from dektools.cmd.git import git_clean_dir, git_apply, git_parse_modules, git_fetch_min, git_list_remotes, git_head
 from ...utils.beep import sound_notify
-from ...utils.cmd import ak2cmd, pack_context_full
+from ...utils.cmd import pack_context_full
 from ..markers.base.core import MarkerBase, get_inner_vars
 from ..markers.invoke import InvokeMarker, GotoMarker
 from ..redirect import search_bin_by_path_tree
@@ -308,7 +308,7 @@ default_methods = {
 
     'sys': {
         'utf8': lambda: sys.stdout.reconfigure(encoding='utf-8'),
-        'ak': ak2cmd,
+        'ak': MarkerBase.ak2cmd,
     },
 
     'compress': compress_files,

dekshell/core/contexts/properties.py

@@ -14,6 +14,7 @@ from dektools.file import read_text
 from dektools.env import is_on_cicd
 from ...utils.serializer import serializer
 from ..redirect import shell_name
+from ..markers.base.core import get_inner_vars
 
 current_shell = shutil.which(shell_name, path=get_paths()['scripts'])
 current_os = extra_platforms_current_os()
@@ -50,6 +51,26 @@ class _Env:
         return item.upper() in os.environ
 
 
+class _EnvS:
+    def __getattr__(self, item):
+        context = get_inner_vars('__inner_context__', full=True)
+        return context.get_env(item.upper(), '')
+
+    def __getitem__(self, item):
+        context = get_inner_vars('__inner_context__', full=True)
+        default = object()
+        ret = context.get_env(item.upper(), default)
+        if ret is default:
+            raise KeyError(item)
+        return ret
+
+    def __contains__(self, item):
+        context = get_inner_vars('__inner_context__', full=True)
+        default = object()
+        ret = context.get_env(item.upper(), default)
+        return ret is not default
+
+
 default_properties = {
     'meta': {
         'name': package_name,
@@ -82,5 +103,6 @@ default_properties = {
     'obj': serializer,
     'mp': ModuleProxy(),
     'date': DateTime(),
-    'envx': _Env(),
+    'env': _Env(),
+    'envs': _EnvS(),
 }

dekshell/core/markers/base/__init__.py

@@ -1,11 +1,11 @@
 import os
 import re
 import functools
-from dektools.str import deep_format, split_table_line, shlex_split
+from dektools.str import deep_format, split_table_line, shlex_split, shlex_quote
 from dektools.common import classproperty
 from dektools.shell import shell_output, shell_wrapper, shell_exitcode
+from dektools.escape import str_escape_custom
 from ....utils.serializer import serializer
-from ....utils.cmd import cmd2ak
 
 cmd_call_prefix_simple = '>'
 cmd_call_prefix = cmd_call_prefix_simple * 2
@@ -13,6 +13,7 @@ cmd_call_prefix_chain = '*'
 cmd_call_eval_prefix = '='
 cmd_call_eval_trans_prefix = cmd_call_eval_prefix + ':'
 cmd_call_eval_escape = '\\'
+cmd_call_sep = '--'
 
 
 class MarkerBase:
@@ -133,7 +134,7 @@ class MarkerBase:
         else:
             argv = cls.split(s)
             args, kwargs = cls.cmd2ak(argv[1:])
-            args, kwargs = cls.var_map_batch(context, *args, **kwargs)
+            args, kwargs = cls.cmd_trans_batch(context, *args, **kwargs)
         func = argv[0]
         return func, args, kwargs
 
@@ -260,7 +261,7 @@ class MarkerBase:
             else:
                 if body:
                     args, kwargs = cls.cmd2ak(cls.split(body))
-                    args, kwargs = cls.var_map_batch(context, *args, **kwargs)
+                    args, kwargs = cls.cmd_trans_batch(context, *args, **kwargs)
                 else:
                     args, kwargs = [], {}
                 value = f(*args, **kwargs)
@@ -287,21 +288,79 @@ class MarkerBase:
         return locals_
 
     @classmethod
-    def var_map(cls, context, s):
+    def cmd_trans(cls, context, s, trans_sep):
         if s.startswith(cmd_call_eval_prefix):
             return cls.eval(context, s[len(cmd_call_eval_prefix):])
         else:
-            if s.startswith(f'{cmd_call_eval_escape}{cmd_call_eval_prefix}'):
-                s = s[len(cmd_call_eval_escape):]
-            return s
+            def skip(c, index):
+                if trans_sep:
+                    nonlocal sep_skip
+                    if sep_skip:
+                        return True
+                    if c == cmd_call_sep:
+                        if not re.fullmatch(r'[^\W\d]\w*', s[:index - len(cmd_call_eval_escape)]):
+                            sep_skip = True
+                            return True
+                return False
+
+            def process(mapping, index, x, y):
+                if trans_sep:
+                    if x == cmd_call_sep:
+                        nonlocal sep_skip
+                        sep_skip = True
+                else:
+                    nonlocal clear_eval
+                    if not clear_eval and (x is None or x == cmd_call_eval_prefix):
+                        clear_eval = True
+                        mapping.pop(cmd_call_eval_prefix)
+
+            clear_eval = False
+            sep_skip = False
+            targets = [cmd_call_eval_prefix]
+            if trans_sep:
+                targets.append(cmd_call_sep)
+            return str_escape_custom(s, targets, cmd_call_eval_escape, keep=True, process=process, skip=skip)
 
     @classmethod
-    def var_map_batch(cls, context, *args, **kwargs):
-        return [cls.var_map(context, x) for x in args], {k: cls.var_map(context, v) for k, v in kwargs.items()}
+    def cmd_trans_batch(cls, context, *args, **kwargs):
+        return (
+            [cls.cmd_trans(context, x, True) for x in args],
+            {k: cls.cmd_trans(context, v, False) for k, v in kwargs.items()}
+        )
 
     @staticmethod
     def cmd2ak(argv):
-        return cmd2ak(argv)
+        # arg0 =arg1-eval-value \=arg2 arg3\--not-kwarg
+        # k0--v k1--=eval-value k2--\=v
+        args = []
+        kwargs = {}
+        for x in argv:
+            if re.match(r'[^\W\d]\w*' + cmd_call_sep, x):
+                k, v = x.split(cmd_call_sep, 1)
+                kwargs[k] = v
+            else:
+                args.append(x)
+        return args, kwargs
+
+    @staticmethod
+    def ak2cmd(args=None, kwargs=None):
+        result = []
+        if args:
+            for x in args:
+                if isinstance(x, str):
+                    m = re.match(r'[^\W\d]\w*' + cmd_call_sep, x)
+                    if m:
+                        index = m.span()[-1] - len(cmd_call_sep)
+                        x = x[:index] + cmd_call_eval_escape + x[index:]
+                else:
+                    x = f"={repr(x)}"
+                result.append(shlex_quote(x))
+        if kwargs:
+            for k, v in kwargs.items():
+                if not isinstance(v, str):
+                    v = f"={repr(v)}"
+                result.append(shlex_quote(f'{k}--{v}'))
+        return ' '.join(result)
 
 
 class EndMarker(MarkerBase):

dekshell/core/markers/function.py

@@ -71,29 +71,38 @@ class RaiseMarker(MarkerBase):
         self.raise_(args[1])
 
 
-class VarGlobalMarker(MarkerBase):
+class MarkerScope(MarkerBase):
+    scope_sep = ','
+
+    def execute_core(self, command, func):
+        names = self.split_raw(command, 1)[-1]
+        for name in names.split(self.scope_sep):
+            func(name.strip())
+
+
+class VarGlobalMarker(MarkerScope):
     tag_head = "global"
 
     def execute(self, context, command, marker_node, marker_set):
-        context.variables.mark_global(self.split_raw(command, 1)[-1])
+        self.execute_core(command, context.variables.mark_global)
 
 
-class VarNonlocalMarker(MarkerBase):
+class VarNonlocalMarker(MarkerScope):
     tag_head = "nonlocal"
 
     def execute(self, context, command, marker_node, marker_set):
-        context.variables.mark_nonlocal(self.split_raw(command, 1)[-1])
+        self.execute_core(command, context.variables.mark_nonlocal)
 
 
-class EnvGlobalMarker(MarkerBase):
+class EnvGlobalMarker(MarkerScope):
     tag_head = "global$"
 
     def execute(self, context, command, marker_node, marker_set):
-        context.environ.mark_global(self.split_raw(command, 1)[-1])
+        self.execute_core(command, context.environ.mark_global)
 
 
-class EnvNonlocalMarker(MarkerBase):
+class EnvNonlocalMarker(MarkerScope):
     tag_head = "nonlocal$"
 
     def execute(self, context, command, marker_node, marker_set):
-        context.environ.mark_nonlocal(self.split_raw(command, 1)[-1])
+        self.execute_core(command, context.environ.mark_nonlocal)

dekshell/core/markers/redirect.py

@@ -2,7 +2,7 @@ import os
 from dektools.shell import shell_wrapper
 from dektools.attr import DeepObject
 from ...core.redirect import redirect_shell_by_path_tree
-from ...utils.cmd import ak2cmd, key_args, key_kwargs
+from ...utils.cmd import key_args, key_kwargs
 from ..contexts.properties import make_shell_properties, current_shell
 from .base import MarkerBase
 
@@ -37,7 +37,7 @@ class RedirectMarker(MarkerRedirect):
                 fpp = os.path.dirname(fp).replace('/', os.sep)
                 shell = shell_properties['sh']['rfc' if os.getcwd() == fpp else 'rf']
                 args, kwargs = self.eval(context, f'({key_args}, {key_kwargs})')
-                argv = ak2cmd(args, kwargs)
+                argv = self.ak2cmd(args, kwargs)
                 shell_wrapper(f'{shell} {fp} {argv}', env=context.environ_full())
                 return self.exit()
         marker_set.check_stack_error(marker_node)

dekshell/utils/cmd.py

@@ -1,7 +1,4 @@
-import re
 import sys
-from dektools.escape.str import str_escape_one_type
-from dektools.str import shlex_quote
 
 key_arg = '__arg'
 key_args = f'{key_arg}s'
@@ -9,30 +6,6 @@ key_kwargs = '__kwargs'
 key_argv = f'{key_arg}v'
 
 
-def cmd2ak(argv):  # arg0 arg-\-1 k0--kwarg0 k1--kwarg1
-    args = []
-    kwargs = {}
-    for x in argv:
-        if re.match(r'[^\W\d]\w*--', x):
-            k, v = x.split('--', 1)
-            kwargs[k] = v
-        else:
-            args.append(str_escape_one_type(x, '-', '-'))
-    return args, kwargs
-
-
-def ak2cmd(args=None, kwargs=None):
-    result = []
-    if args:
-        for arg in args:
-            arg = arg.replace('--', r'-\-')
-            result.append(shlex_quote(arg))
-    if kwargs:
-        for k, v in kwargs.items():
-            result.append(shlex_quote(f'{k}--{v}'))
-    return ' '.join(result)
-
-
 def pack_context(args, kwargs):
     return {
         **{f'{key_arg}{i}': arg for i, arg in enumerate(args)}, **{key_args: tuple(args), key_kwargs: kwargs}, **kwargs}

{dekshell-0.2.31.dist-info → dekshell-0.2.33.dist-info}/METADATA

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

{dekshell-0.2.31.dist-info → dekshell-0.2.33.dist-info}/RECORD

@@ -1,15 +1,15 @@
-dekshell-0.2.31.dist-info/METADATA,sha256=g-axW4y5shPS9aMpAtNsLb-VPflnb1V52EbKlPGcdBc,573
-dekshell-0.2.31.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-dekshell-0.2.31.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
+dekshell-0.2.33.dist-info/METADATA,sha256=PJWyrsTeOz1Hd2RZ9dZto3UTG18hZBNSoJT-x0naKzs,573
+dekshell-0.2.33.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dekshell-0.2.33.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=rFzB_exzPQaIcbbms5PdHAU3NGdl2MBaYbq9v7g7BOI,1870
-dekshell/core/__init__.py,sha256=acq3wTfUlREzc_9R28ocvJBH7E8cnOQPGpy2dC69fIM,5533
+dekshell/click/__init__.py,sha256=r-AHdO9CEEVvTN20-8Jozr6Zh8XSv_BnktYRwrlhtrE,2046
+dekshell/core/__init__.py,sha256=isDEKwk1odLdvTQNCILCtVNBuXp1uFVPz_uTDNihkVU,5547
 dekshell/core/contexts/__init__.py,sha256=ynsfv37azOKfI2UKd0iPl2M6iBW-k5cb1BqSLOWuJpI,482
-dekshell/core/contexts/methods.py,sha256=A6t58yBoCEfcQ2rRdmwxwznMpOOGFCUrH8u8RoE2Sow,10375
-dekshell/core/contexts/properties.py,sha256=xBUHC6eDmsoPHmOntxPdHNQpZ3iqd7wzkmyTKWm3ZYA,2422
+dekshell/core/contexts/methods.py,sha256=SukHnNNvxnRPySGB6xQNf2eXX-3FaaQBetBJFjN9Fso,10378
+dekshell/core/contexts/properties.py,sha256=wT_gvK89JDU3NDOwiQKz4e2ukrLG6yXUhBsOk8NMQpE,3123
 dekshell/core/markers/__init__.py,sha256=yRQazZ1dxMltFao_RQnDnawSnQcjN_4B930MjJhaZ40,1968
-dekshell/core/markers/base/__init__.py,sha256=mrOgC5glSG60NMpflSi5mb4bXTmDgv2i-ZYUHCef2Nw,13826
+dekshell/core/markers/base/__init__.py,sha256=W5f_Mcn9MLM8kOVqu05NUaDpn3xUNURe_NYerUoH6Js,16021
 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
@@ -20,12 +20,12 @@ dekshell/core/markers/empty.py,sha256=pWKsHlrp6uXWU6blqOs0IgN_3kYm1OmDQiKGPERabA
 dekshell/core/markers/env.py,sha256=6ZtiMNdKFbGR_DBjG6C7A8L_lJsiymN5Y5AbnTzyMrE,1158
 dekshell/core/markers/exec.py,sha256=4_7FRUEgbAtt0_9r8TmOar_Zi6VXxe6E7p3RL6sVgQg,2705
 dekshell/core/markers/for_.py,sha256=uNOEwyDsjffttEBtUYasdlj7FP_sGnQzWuTV5d5esHY,2142
-dekshell/core/markers/function.py,sha256=RPh56_rYbWXCTkNPiJu8zNEj-OE6txKgEw7Im9fBM3c,3592
+dekshell/core/markers/function.py,sha256=V7WZ438RQ0a96wMu9AwWH-dtQMBO9IenaKTWyzRqDUo,3804
 dekshell/core/markers/if_.py,sha256=bBG1fDCZd5alE5FSm0QhgHl6ZJn5awiqZAXnPnO-thc,1112
 dekshell/core/markers/input.py,sha256=O0yvGtt1uhbpE2gOReLseAmshVpZYMW3zV-OabZt0lw,1182
 dekshell/core/markers/invoke.py,sha256=To_U_FscoCbf7osvjC5MQTk2gjH5Mu_-06Kb22YQPTo,1441
 dekshell/core/markers/pip_.py,sha256=mxXa_oqcrk4Qz-HvhlkMoirsl-SbM9Fz610leNqP1o0,832
-dekshell/core/markers/redirect.py,sha256=3vfkRQ2tnQ6rSGGn7csgUlpDi0s2ep5X7JU7NVvo0eI,1984
+dekshell/core/markers/redirect.py,sha256=cpTQaXFAuSwprsrhUNP0xTGDmu06HGNQVcwKsETEjas,1981
 dekshell/core/markers/shell.py,sha256=43BDAAzMdmgZmemkW5buh_w4LL1GDGw-s9fNZo6vhag,1929
 dekshell/core/markers/var.py,sha256=CnmBDQvA5XcQlioczXFhCvIbDc8ex4RIAgDeQvFdIiY,5176
 dekshell/core/markers/while_.py,sha256=e7lI5jsIM-qxNHMY_wUyCMvvesdXQibR5Ez2jNO9csc,1195
@@ -33,8 +33,8 @@ dekshell/core/plugin/__init__.py,sha256=jAB_KnnHJsyJR_zIfBU_HNLngyhcyyqVv05PdlNZ
 dekshell/core/redirect.py,sha256=6YCJpG0TkQ4WMt7LBtDD_W1T-C-QkLtGRQw0S60qe54,1058
 dekshell/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dekshell/utils/beep.py,sha256=teuQgHbWDr8BD1xCJ4Pt79X6N1-eq1tTlyGunK6wBIM,120
-dekshell/utils/cmd.py,sha256=A0lEixQ7Ui0UxmeuymniyqCZXss9qQdX1C0COM7EEkQ,1234
+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.31.dist-info/RECORD,,
+dekshell-0.2.33.dist-info/RECORD,,