dshellInterpreter 0.2.18.3__tar.gz → 0.2.18.5__tar.gz

{dshellinterpreter-0.2.18.3 → dshellinterpreter-0.2.18.5}/Dshell/DISCORD_COMMANDS/utils/utils_string.py

@@ -138,7 +138,7 @@ async def utils_regex_sub(ctx: Message, regex: str, replace: str, content: str =
 
     return sub(regex, replace, content if content is not None else ctx.content)
 
-async def utils_regex_search(ctx: Message, regex: str, content: str = None) -> bool:
+async def utils_regex_search(ctx: Message, regex: str, content: str = None) -> str:
     """
     Search for a regex in a string.
     :param regex:
@@ -152,4 +152,6 @@ async def utils_regex_search(ctx: Message, regex: str, content: str = None) -> b
     if content is not None and not isinstance(content, str):
         raise Exception(f"Content must be a string, not {type(content)}!")
 
-    return bool(search(regex, content if content is not None else ctx.content))
+    result = search(regex, content if content is not None else ctx.content)
+
+    return result.group() if result else ''

{dshellinterpreter-0.2.18.3 → dshellinterpreter-0.2.18.5}/Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -57,10 +57,10 @@ class DshellInterpreteur:
             '__author_id__': message.author.id,
 
             '__message__': message.content,
-            '__message_author__': message.author.id,
-            '__message_before__': message.content,  # same as __message__, but before edit. Can be overwritten by add vars_env parameter
             '__message_content__': message.content,
             '__message_id__': message.id,
+            '__message_author__': message.author.id,
+            '__message_before__': message.content,  # same as __message__, but before edit. Can be overwritten by add vars_env parameter
             '__message_url__': message.jump_url if hasattr(message, 'jump_url') else None,
             '__last_message__': message.channel.last_message_id,
 
@@ -90,7 +90,7 @@ class DshellInterpreteur:
             '__guild_forum_channels__': ListNode([channel.id for channel in message.channel.guild.forum_channels]),
             '__guild_channels_count__': len(message.channel.guild.channels),
 
-        } if message is not None and not debug else {} # {} is used in debug mode, when ctx is None
+        } if message is not None and not debug else {'__ret__': None}
         if vars_env is not None: # add the variables to the environment
             self.env.update(vars_env)
         self.vars = vars if vars is not None else ''
@@ -179,9 +179,6 @@ class DshellInterpreteur:
                     else:
                         self.env[node.name.value] = build_ui(first_node, self)
 
-                elif isinstance(first_node, LengthNode):
-                    self.env[node.name.value] = length(first_node)
-
                 else:
                     self.env[node.name.value] = eval_expression(node.body, self)
 
@@ -225,8 +222,9 @@ class DshellInterpreteur:
             if token.value in self.env.keys():
                 return self.env[token.value]
             return token.value
-        elif token.type == DTT.CALL_ARGS:
-            return (self.eval_data_token(tok) for tok in token.value)
+        elif token.type == DTT.EVAL_GROUP:
+            self.execute(token.value)
+            return self.env['__ret__']
         elif token.type == DTT.STR:
             for match in findall(rf"\$({'|'.join(self.env.keys())})", token.value):
                 token.value = token.value.replace('$' + match, str(self.env[match]))
@@ -376,8 +374,10 @@ def regroupe_commandes(body: list[Token], interpreter: DshellInterpreteur, norma
     :param interpreter: The Dshell interpreter instance.
     :param normalise: If True, normalises the arguments (make value lowercase).
     """
-    tokens = {'*': [],
-              '--*': {}}  # tokens to return
+    # tokens to return
+    tokens = {'*': [], # not specied parameters
+              '--*': {}, # get all tokens after --* until reach the end. It's evaluated.
+              }
     current_arg = '*'  # the argument keys are the types they belong to. '*' is for all arguments not explicitly specified by a separator and an IDENT
     n = len(body)
     list_tokens: list[dict] = [tokens]
@@ -422,19 +422,6 @@ def regroupe_commandes(body: list[Token], interpreter: DshellInterpreteur, norma
 
     return list_tokens
 
-def length(variable : LengthNode) -> int:
-    """
-    Count characters or items in string/list
-    :param variable:
-    :return:
-    """
-    if not isinstance(variable.body, ListNode) and variable.body.type not in (DTT.STR, DTT.IDENT):
-        raise Exception(f'Length take string, ident or list, not {type(variable.body)} !')
-
-    if isinstance(variable.body, ListNode):
-        return len(variable.body)
-    else:
-        return len(variable.body.value)
 
 def build_embed_args(body: list[Token], fields: list[FieldEmbedNode], interpreter: DshellInterpreteur) -> tuple[dict, list[dict]]:
     """

{dshellinterpreter-0.2.18.3 → dshellinterpreter-0.2.18.5}/Dshell/_DshellParser/ast_nodes.py

@@ -20,6 +20,7 @@ __all__ = [
     'SleepNode',
     'ListNode',
     'PermissionNode',
+    'EvalGroupNode',
     'ParamNode',
     'UiNode',
     'UiButtonNode',
@@ -405,6 +406,30 @@ class SleepNode(ASTNode):
             "body": [token.to_dict() for token in self.body]
         }
 
+class EvalGroupNode(ASTNode):
+    """
+    Node representing a group of evaluations in the AST.
+    This is used to group multiple evaluations together.
+    """
+
+    def __init__(self, body: list[Token]):
+        """
+        :param body: list of tokens representing the body of the evaluation group
+        """
+        self.body = body
+
+    def __repr__(self):
+        return f"<EVAL GROUP> - {self.body}"
+
+    def to_dict(self):
+        """
+        Convert the EvalGroupNode to a dictionary representation.
+        :return: Dictionary representation of the EvalGroupNode.
+        """
+        return {
+            "type": "EvalGroupNode",
+            "body": [token.to_dict() for token in self.body]
+        }
 
 class ParamNode(ASTNode):
     """
@@ -432,7 +457,6 @@ class ParamNode(ASTNode):
             "body": [token.to_dict() for token in self.body]
         }
 
-
 class UiButtonNode(ASTNode):
     """
     Node representing a UI button component in the AST.

{dshellinterpreter-0.2.18.3 → dshellinterpreter-0.2.18.5}/Dshell/_DshellParser/dshell_parser.py

@@ -262,6 +262,8 @@ def parse(token_lines: list[list[Token]], start_node: ASTNode) -> tuple[list[AST
         elif first_token_line.type == DTT.STR:
             last_block.body.append(CommandNode(name='sm', body=ArgsCommandNode([first_token_line])))
 
+        elif first_token_line.type == DTT.EVAL_GROUP:
+            parse([first_token_line.value], last_block)
 
         else:
             last_block.body += tokens_by_line

{dshellinterpreter-0.2.18.3 → dshellinterpreter-0.2.18.5}/Dshell/_DshellTokenizer/dshell_token_type.py

@@ -17,7 +17,6 @@ class DshellTokenType(Enum):
     BOOL = auto(),
     NONE = auto(),
     LIST = auto()
-    CALL_ARGS = auto()
     DICT = auto()
     MENTION = auto()
     IDENT = auto()  # nom de variable, fonction
@@ -30,6 +29,7 @@ class DshellTokenType(Enum):
     MATHS_OPERATOR = auto()  # ==, +, -, *, etc.
     LOGIC_OPERATOR = auto(),
     LOGIC_WORD_OPERATOR = auto()  # and, or, not
+    EVAL_GROUP = auto()  # `code`
     COMMENT = auto()  # lignes commençant par ##
 
 

{dshellinterpreter-0.2.18.3 → dshellinterpreter-0.2.18.5}/Dshell/_DshellTokenizer/dshell_tokenizer.py

@@ -17,6 +17,7 @@ table_regex: dict[DTT, Pattern] = {
     DTT.ENGLOBE_SEPARATOR: compile(rf"--\*\w+\s*(.*?)\s*(?=--|$)"),
     DTT.STR: compile(r'"((?:[^\\"]|\\.)*)"', flags=DOTALL),
     DTT.COMMENT: compile(r"::(.*?)$"),
+    DTT.EVAL_GROUP: compile(r"`(.*?)`"),
     DTT.LIST: compile(r"\[(.*?)\]"),
     DTT.MENTION: compile(r'<(?:@!?|@&|#)([0-9]+)>'),
     DTT.SEPARATOR: compile(rf"(--)"),
@@ -80,7 +81,7 @@ class DshellTokenizer:
 
                         if token_type in (
                                 DTT.LIST,
-                                DTT.CALL_ARGS):  # si c'est un regroupement de donnée, on tokenize ce qu'il contient
+                                DTT.EVAL_GROUP):  # si c'est un regroupement de donnée, on tokenize ce qu'il contient
                             result = self.tokenizer([token.value])
                             token.value = result[0] if len(
                                 result) > 0 else result  # gère si la structure de donnée est vide ou non

{dshellinterpreter-0.2.18.3/dshellInterpreter.egg-info → dshellinterpreter-0.2.18.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 0.2.18.3
+Version: 0.2.18.5
 Summary: A Discord bot interpreter for creating custom commands and automations.
 Home-page: https://github.com/BOXERRMD/Dshell_Interpreter
 Author: Chronos

{dshellinterpreter-0.2.18.3 → dshellinterpreter-0.2.18.5/dshellInterpreter.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 0.2.18.3
+Version: 0.2.18.5
 Summary: A Discord bot interpreter for creating custom commands and automations.
 Home-page: https://github.com/BOXERRMD/Dshell_Interpreter
 Author: Chronos

{dshellinterpreter-0.2.18.3 → dshellinterpreter-0.2.18.5}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name="dshellInterpreter",
-    version="0.2.18.3",
+    version="0.2.18.5",
     author="Chronos",
     author_email="vagabonwalybi@gmail.com",
     description="A Discord bot interpreter for creating custom commands and automations.",