dshellInterpreter 1.2.7.2__tar.gz → 1.2.7.3__tar.gz

{dshellinterpreter-1.2.7.2 → dshellinterpreter-1.2.7.3}/Dshell/DISCORD_COMMANDS/utils/utils_type_validation.py

@@ -117,7 +117,7 @@ def _validate_optional_permission(value, param_name: StrNode, command_name: StrN
     :param command_name: The command name for error messages (optional)
     :raises TypeError: If the value is not None and not a PermissionNode
     """
-    if value is not None and not isinstance(value, PermissionNode):
+    if (value is not None or not isinstance(value, _MissingSentinel)) and not isinstance(value, PermissionNode):
         raise TypeError(f"[{command_name}] -> {param_name} must be a PermissionNode or None, not {type(value).__name__}")
 
 

{dshellinterpreter-1.2.7.2 → dshellinterpreter-1.2.7.3}/Dshell/DshellInterpreteur/dshell_interpreter.py

@@ -88,7 +88,7 @@ class DshellInterpreteur:
             '__message_add_reaction__': None, # Can be overwritten by add vars_env parameter to get the reaction added on message add event reaction
             '__message_remove_reaction__': None, # Can be overwritten by add vars_env parameter to get the reaction removed on message remove event reaction
             '__message_url__': StrNode(message.jump_url) if hasattr(message, 'jump_url') else None,
-            '__last_message__': IntNode(message.channel.last_message_id),
+            '__last_message__': IntNode(message.channel.last_message_id or 1),
 
             '__channel__': IntNode(message.channel.id),
             '__channel_name__': StrNode(message.channel.name),
@@ -102,7 +102,7 @@ class DshellInterpreteur:
             '__guild_members__': ListNode([IntNode(member.id) for member in message.channel.guild.members], bypass_limit_elt=True, editable=False),
             '__guild_member_count__': IntNode(message.channel.guild.member_count),
             '__guild_icon__': StrNode(message.channel.guild.icon.url) if message.channel.guild.icon else None,
-            '__guild_owner_id__': IntNode(message.channel.guild.owner_id),
+            '__guild_owner_id__': IntNode(message.channel.guild.owner_id or 1),
             '__guild_description__': StrNode(message.channel.guild.description),
             '__guild_roles__': ListNode([IntNode(role.id) for role in message.channel.guild.roles], bypass_limit_elt=True, editable=False),
             '__guild_roles_count__': IntNode(len(message.channel.guild.roles)),

{dshellinterpreter-1.2.7.2 → dshellinterpreter-1.2.7.3}/Dshell/DshellPreProcess/dshell_preprocess.py

@@ -6,33 +6,36 @@ class PreProcessorData:
         self.symbol = symbol
         self.value = value
 
-def define(code, pre_processor_data: PreProcessorData) -> str:
+def define(line: str, pre_processor_data: PreProcessorData) -> str:
     """
     Replace all symbol with the current value
-    :param symbol:
-    :param value:
+    :param line: the current line before tokenization
+    :param pre_processor_data: all data for the ##define pre-processor
     :return:
     """
-    return sub(f"(?<![a-zA-Z]){pre_processor_data.symbol}(?![a-zA-Z])", pre_processor_data.value, code)
+    return sub(f"(?<![a-zA-Z]){pre_processor_data.symbol}(?![a-zA-Z])", pre_processor_data.value, line)
 
-def preProcessor(code: str) -> Optional[PreProcessorData]:
+
+def preProcessor(line: str) -> Optional[PreProcessorData]:
     """
-    Execute preprocessor code
-    :param code:
+    Execute preprocessor line
+    :param line: the current line before tokenization
     :return:
     """
-    pre_process_match = search(r"^\s*##([a-zA-Z]+)\s+([a-zA-Z]+)\s+(.*)$", code)
+    pre_process_match = search(r"^\s*##([a-zA-Z]+)\s+([a-zA-Z]+)\s+(.*)$", line)
     if pre_process_match:
         return PreProcessorData(pre_process_match.group(1).lower(), pre_process_match.group(2), pre_process_match.group(3))
     return None
 
-def applyPreProcessor(code: str, pre_processor_data: PreProcessorData):
+def applyPreProcessor(line: str, pre_processor_data: PreProcessorData):
     """
     Apply preprocessor data to code
-    :param code:
+    :param line: the current line before tokenization
     :param pre_processor_data:
     :return:
     """
     match pre_processor_data.instruction:
         case "define":
-            return define(code, pre_processor_data)
+            return define(line, pre_processor_data)
+
+    return None

{dshellinterpreter-1.2.7.2 → dshellinterpreter-1.2.7.3}/Dshell/DshellTokenizer/dshell_keywords.py

@@ -13,6 +13,7 @@ from ..DISCORD_COMMANDS import *
 from ..full_import import Callable
 from ..DshellInterpreteur.dshell_iterators import IntIterator
 
+
 dshell_keyword: set[str] = {
     'if', 'else', 'elif', 'loop', '#end', 'var', '#loop', '#if', 'sleep',
     'param', '#param', 'code', '#code', 'eval', 'return', 'break',

{dshellinterpreter-1.2.7.2 → dshellinterpreter-1.2.7.3}/Dshell/DshellTokenizer/dshell_tokenizer.py

@@ -7,7 +7,7 @@ __all__ = [
 from .dshell_token_type import Token
 from .dshell_token_type import DshellTokenType as DTT
 
-from Dshell.full_import import (Optional,
+from Dshell.full_import import (
                            Pattern,
                            ASCII,
                            DOTALL,
@@ -17,6 +17,7 @@ from Dshell.full_import import (Optional,
                            escape,
                            findall,
                            finditer,
+                           Match,
                            sub)
 
 from .dshell_keywords import (dshell_keyword,
@@ -43,15 +44,15 @@ table_regex: dict[DTT, Pattern] = {
     DTT.STR: compile(r'"((?:[^\\"]|\\.)*)"', flags=DOTALL),
     DTT.EVAL_L_EXPRESSION: compile(r"({)"),
     DTT.EVAL_R_EXPRESSION: compile(r"(})"),
-    DTT.EVAL_L_GROUP: compile(r"(\()"),
+    DTT.EVAL_L_GROUP: compile(rf"(\()"),
     DTT.EVAL_R_GROUP: compile(r"(\))"),
     DTT.EVAL_OUTDATED_GROUP: compile(r"(`)"),
     DTT.LIST_L: compile(r"(\[)"),
     DTT.LIST_R: compile(r"(])"),
     DTT.PARAMETERS: compile(rf"--\*\s*([A-Za-z_]+)\s*", flags=ASCII),
-    DTT.STR_PARAMETER: compile(rf"--\'\s*([A-Za-z_]+)\s*", flags=ASCII),
+    DTT.STR_PARAMETER: compile(rf"--'\s*([A-Za-z_]+)\s*", flags=ASCII),
     DTT.PARAMETER: compile(rf"--\s*([A-Za-z_]+)\s*", flags=ASCII),
-    DTT.MENTION: compile(r'<(?:@!?|@&|#)([0-9]+)>'),
+    DTT.MENTION: compile(r'<(?:@[!&]?|#)([0-9]+)>'),
     DTT.KEYWORD: compile(rf"(?<!\w)(#?{'|'.join(dshell_keyword)})(?!\w)"),
     DTT.DISCORD_KEYWORD: compile(rf"(?<!\w|-)(#?{'|'.join(dshell_discord_keyword)})(?!\w|-)", flags=IGNORECASE),
     DTT.COMMAND: compile(rf"\b({'|'.join(dshell_commands.keys())})\b", flags=IGNORECASE),
@@ -126,6 +127,7 @@ class DshellTokenizer:
                     continue
 
                 for match in finditer(pattern, line):  # iterate the match results to get their positions
+                    match: Match
 
                     if token_type == DTT.COMMENT:  # if we encounter a comment, stop tokenizing the line
                         if len(match.group(0)) == len(line):
@@ -175,7 +177,7 @@ class DshellTokenizer:
 
         commands: str = command.strip()
         temporary_replacement = '[REPLACE]'
-        pattern_find_regrouped_part = compile(fr'({grouping_character}(?:[^\\{grouping_character}]|\\.)*{grouping_character})', flags=DOTALL)
+        pattern_find_regrouped_part = compile(rf'({grouping_character}(?:[^\\{grouping_character}]|\\.)*{grouping_character})', flags=DOTALL)
         between_grouping_character = findall(pattern_find_regrouped_part, commands)  # find parts between quotes and save them
 
         res = sub(pattern_find_regrouped_part,

{dshellinterpreter-1.2.7.2/dshellInterpreter.egg-info → dshellinterpreter-1.2.7.3}/PKG-INFO

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

{dshellinterpreter-1.2.7.2 → dshellinterpreter-1.2.7.3/dshellInterpreter.egg-info}/PKG-INFO

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

{dshellinterpreter-1.2.7.2 → dshellinterpreter-1.2.7.3}/setup.py

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