minecraft-datapack-language 16.0.25__tar.gz → 16.0.27__tar.gz

{minecraft_datapack_language-16.0.25 → minecraft_datapack_language-16.0.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 16.0.25
+Version: 16.0.27
 Summary: Compile MDL language with explicit scoping into a Minecraft datapack (1.21+ ready). Features variables, control flow, error handling, and VS Code extension.
 Project-URL: Homepage, https://www.mcmdl.com
 Project-URL: Documentation, https://www.mcmdl.com/docs

minecraft_datapack_language-16.0.27/docs/_data/version.yml

@@ -0,0 +1,3 @@
+current: "16.0.26"
+tag: "v16.0.26"
+updated_at: "2025-09-10T07:06:46Z"

{minecraft_datapack_language-16.0.25 → minecraft_datapack_language-16.0.27}/docs/_includes/head-custom.html

@@ -40,6 +40,10 @@
       {
         pattern: /"([^"\\]|\\.)*"/,
         greedy: true
+      },
+      {
+        pattern: /'([^'\\]|\\.)*'/,
+        greedy: true
       }
     ],
     'raw-block': {
@@ -50,22 +54,65 @@
       }
     },
     'keyword': {
-      pattern: /\b(pack|namespace|function|on_tick|on_load|tag|add|if|else if|else|while|for|in|var|let|const|num|str|list|try|catch|throw|switch|case|default|break|continue|return|import|from|as|recipe|loot_table|advancement|predicate|item_modifier|structure|scope|global)\b/
+      pattern: /\b(pack|namespace|function|on_tick|on_load|tag|if|else|while|scheduledwhile|var|num|exec|with|recipe|loot_table|advancement|predicate|item_modifier|structure)\b/
     },
     'builtin': {
       pattern: /\b(say|tellraw|effect|particle|execute|scoreboard|data|function|tag|tp|kill|summon|give|clear|enchant|gamemode|weather|time|difficulty|gamerule|title|playsound|stopsound|kick|ban|ban-ip|pardon|pardon-ip|whitelist|op|deop|save-all|save-off|save-on|list|me|msg|team|trigger|advancement|recipe|loot|schedule|return|run|fill|setblock|clone|teleport|spreadplayers|worldborder|xp|experience|replaceitem|clear|testfor|testforblock|testforblocks|stats|blockdata|entitydata|setworldspawn|setidletimeout|stop|save|save-all|save-off|save-on|whitelist|ban|ban-ip|pardon|pardon-ip|kick|op|deop|list|me|msg|tell|w|say|broadcast|help|version|reload|debug|seed|defaultgamemode|difficulty|gamemode|gamerule|publish|spawnpoint|setworldspawn|time|toggledownfall|weather|xp|experience|achievement|advancement|bossbar|clear|clone|data|datapack|debug|defaultgamemode|difficulty|effect|enchant|execute|experience|fill|forceload|function|gamemode|gamerule|give|help|item|kick|kill|list|locate|me|msg|op|pardon|particle|playsound|publish|recipe|reload|replaceitem|save|save-all|save-off|save-on|say|schedule|scoreboard|seed|setblock|setidletimeout|setworldspawn|spawnpoint|spreadplayers|stop|summon|tag|team|teleport|tell|tellraw|time|title|toggledownfall|tp|trigger|weather|whitelist|worldborder|xp)\b/
     },
     'selector': {
-      pattern: /\b(@p|@r|@a|@e|@s)\b/
+      pattern: /\b(@p|@r|@a|@e|@s|@initiator|@c|@v|@d|@w)\b/
     },
     'boolean': {
       pattern: /\b(true|false|null|undefined)\b/
     },
     'number': {
-      pattern: /\b\d+\b/
+      pattern: /\b\d+(?:\.\d+)?\b/
+    },
+    'operator-comparison': {
+      pattern: /(==|!=|<=|>=|<|>)/
+    },
+    'operator-logical': {
+      pattern: /(&&|\|\||!)/
+    },
+    'operator-assignment': {
+      pattern: /=/
+    },
+    'operator-arithmetic': {
+      pattern: /(\+|\-|\*|\/)/
+    },
+    'range': {
+      pattern: /\.\./
+    },
+    // Scope blocks like <global> or <@e[tag=...]>
+    'scope': {
+      pattern: /<[^>]+>/,
+      inside: {
+        'global': /\bglobal\b/,
+        'selector': /@p|@r|@a|@e|@s|@initiator|@c|@v|@d|@w/,
+        'selector-args': /\[[^\]]*\]/,
+        'tag-attr': /tag\s*=\s*[A-Za-z0-9_\-]+/
+      }
+    },
+    // Variable substitution like $var<scope>$
+    'varsub': {
+      pattern: /\$[A-Za-z_][A-Za-z0-9_]*<[^>]+>\$/,
+      inside: {
+        'punctuation': /\$|<|>/,
+        'variable': /[A-Za-z_][A-Za-z0-9_]*/,
+        'scope': {
+          pattern: /<[^>]+>/,
+          inside: {
+            'global': /\bglobal\b/,
+            'selector': /@p|@r|@a|@e|@s|@initiator|@c|@v|@d|@w/,
+            'selector-args': /\[[^\]]*\]/,
+            'tag-attr': /tag\s*=\s*[A-Za-z0-9_\-]+/
+          }
+        }
+      }
     },
-    'operator': {
-      pattern: /\b(\+|-|\*|\/|%|=|==|!=|<|>|<=|>=|&&|\|\||!|\+=|-=|\*=|\/=|%=)\b/
+    // Macro line (single-line) starting with $ but not $!raw
+    'macro-line': {
+      pattern: /^\s*\$(?!!raw).*$/m
     },
     'punctuation': /[{}();[\]]/
   };

{minecraft_datapack_language-16.0.25 → minecraft_datapack_language-16.0.27}/minecraft_datapack_language/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '16.0.25'
-__version_tuple__ = version_tuple = (16, 0, 25)
+__version__ = version = '16.0.27'
+__version_tuple__ = version_tuple = (16, 0, 27)
 
-__commit_id__ = commit_id = 'g0d9b8b321'
+__commit_id__ = commit_id = 'gc8af8bfe9'

{minecraft_datapack_language-16.0.25 → minecraft_datapack_language-16.0.27}/minecraft_datapack_language/mdl_compiler.py

@@ -463,10 +463,15 @@ class MDLCompiler:
         current_pos = 0
         
         for var in variables:
-            var_pattern = f"${var.name}{var.scope}$"
-            var_pos = message.find(var_pattern, current_pos)
-            
-            if var_pos != -1:
+            # Support both $name<scope>$ and $name$ forms; parser already defaults scope to <@s>
+            with_scope = f"${var.name}{var.scope}$"
+            no_scope = f"${var.name}$"
+            pos_with = message.find(with_scope, current_pos)
+            pos_no = message.find(no_scope, current_pos)
+            # Choose the earliest valid occurrence >= current_pos
+            candidates = [p for p in [pos_with, pos_no] if p != -1]
+            if candidates:
+                var_pos = min(candidates)
                 if var_pos > current_pos:
                     text_before = message[current_pos:var_pos]
                     parts.append(f'{{"text":"{text_before}"}}')
@@ -475,7 +480,11 @@ class MDLCompiler:
                 scope = self._resolve_scope(var.scope)
                 parts.append(f'{{"score":{{"name":"{scope}","objective":"{objective}"}}}}')
                 
-                current_pos = var_pos + len(var_pattern)
+                # Advance past whichever token we matched
+                if var_pos == pos_with:
+                    current_pos = var_pos + len(with_scope)
+                else:
+                    current_pos = var_pos + len(no_scope)
         
         if current_pos < len(message):
             text_after = message[current_pos:]

{minecraft_datapack_language-16.0.25 → minecraft_datapack_language-16.0.27}/minecraft_datapack_language/mdl_parser.py

@@ -181,14 +181,17 @@ class MDLParser:
                        "Use: recipe, loot_table, advancement, item_modifier, predicate, or structure")
     
     def _parse_variable_declaration(self) -> VariableDeclaration:
-        """Parse variable declaration: var num name<scope> = value;"""
+        """Parse variable declaration: var num name<scope?> = value; defaults to <@s>."""
         self._expect(TokenType.VAR, "Expected 'var' keyword")
         
         self._expect(TokenType.NUM, "Expected 'num' keyword")
         
         name = self._expect_identifier("Expected variable name")
-        
-        scope = self._parse_scope_selector()
+        # Optional scope selector; default to <@s>
+        if self._peek().type == TokenType.LANGLE:
+            scope = self._parse_scope_selector()
+        else:
+            scope = "<@s>"
         
         self._expect(TokenType.ASSIGN, "Expected '=' after variable declaration")
         
@@ -204,10 +207,14 @@ class MDLParser:
         )
     
     def _parse_variable_assignment(self) -> VariableAssignment:
-        """Parse variable assignment: name<scope> = value;"""
+        """Parse variable assignment: name<scope?> = value; defaults to <@s>."""
         name = self._expect_identifier("Expected variable name")
         
-        scope = self._parse_scope_selector()
+        # Optional scope selector; default to <@s>
+        if self._peek().type == TokenType.LANGLE:
+            scope = self._parse_scope_selector()
+        else:
+            scope = "<@s>"
         
         self._expect(TokenType.ASSIGN, "Expected '=' after variable name")
         
@@ -423,17 +430,12 @@ class MDLParser:
         
         # Extract variables from the message content
         variables = []
-        # Simple regex-like extraction of $variable<scope>$ patterns
+        # Support both $var<scope>$ and $var$
         import re
-        var_pattern = r'\$([a-zA-Z_][a-zA-Z0-9_]*<[^>]+>)\$'
-        matches = re.findall(var_pattern, message)
-        
-        for match in matches:
-            # Parse the variable name and scope from the match
-            if '<' in match and '>' in match:
-                name = match[:match.index('<')]
-                scope = match[match.index('<'):match.index('>')+1]
-                variables.append(VariableSubstitution(name=name, scope=scope))
+        for m in re.finditer(r'\$([a-zA-Z_][a-zA-Z0-9_]*)(<[^>]+>)?\$', message):
+            name = m.group(1)
+            scope = m.group(2) if m.group(2) else "<@s>"
+            variables.append(VariableSubstitution(name=name, scope=scope))
         
         self._expect(TokenType.QUOTE, "Expected closing quote for say message")
         self._expect(TokenType.SEMICOLON, "Expected semicolon after say command")
@@ -441,23 +443,23 @@ class MDLParser:
         return SayCommand(message=message, variables=variables)
     
     def _parse_variable_substitution(self) -> VariableSubstitution:
-        """Parse variable substitution: $variable<scope>$"""
+        """Parse variable substitution: $variable<scope?>$; defaults to <@s>."""
         self._expect(TokenType.DOLLAR, "Expected '$' to start variable substitution")
         
         name = self._expect_identifier("Expected variable name")
         
-        # For variable substitutions, use LANGLE/RANGLE
-        self._expect(TokenType.LANGLE, "Expected '<' for scope selector")
-        
-        # Parse the selector content
-        selector_content = ""
-        while not self._is_at_end() and self._peek().type != TokenType.RANGLE:
-            selector_content += self._peek().value
-            self._advance()
-        
-        self._expect(TokenType.RANGLE, "Expected '>' to close scope selector")
-        
-        scope = f"<{selector_content}>"
+        # Optional scope selector; if absent, default to <@s>
+        if self._peek().type == TokenType.LANGLE:
+            # Parse the selector content
+            self._advance()  # consume '<'
+            selector_content = ""
+            while not self._is_at_end() and self._peek().type != TokenType.RANGLE:
+                selector_content += self._peek().value
+                self._advance()
+            self._expect(TokenType.RANGLE, "Expected '>' to close scope selector")
+            scope = f"<{selector_content}>"
+        else:
+            scope = "<@s>"
         
         self._expect(TokenType.DOLLAR, "Expected '$' to end variable substitution")
         

{minecraft_datapack_language-16.0.25 → minecraft_datapack_language-16.0.27}/minecraft_datapack_language.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 16.0.25
+Version: 16.0.27
 Summary: Compile MDL language with explicit scoping into a Minecraft datapack (1.21+ ready). Features variables, control flow, error handling, and VS Code extension.
 Project-URL: Homepage, https://www.mcmdl.com
 Project-URL: Documentation, https://www.mcmdl.com/docs

{minecraft_datapack_language-16.0.25 → minecraft_datapack_language-16.0.27}/tests/test_codegen_naming_and_logic.py

@@ -18,9 +18,9 @@ def test_generated_if_function_names_unique_per_parent():
     src = (
         'pack "ns" "desc" 82;\n'
         'namespace "ns";\n'
-        'var num a<@s> = 0;\n'
-        'function ns:f1 { if $a<@s>$ > 1 { say "hi"; } }\n'
-        'function ns:f2 { if $a<@s>$ > 1 { say "hi2"; } }\n'
+        'var num a = 0;\n'  # default to <@s>
+        'function ns:f1 { if $a$ > 1 { say "hi"; } }\n'
+        'function ns:f2 { if $a$ > 1 { say "hi2"; } }\n'
     )
     out, tmp = compile_source(src)
     func_dir = out / 'data' / 'ns' / 'function'
@@ -39,8 +39,8 @@ def test_while_loop_generates_recursive_function_and_condition():
     src = (
         'pack "ns" "desc" 82;\n'
         'namespace "ns";\n'
-        'var num c<@s> = 0;\n'
-        'function ns:loop { while $c<@s>$ < 3 { c<@s> = $c<@s>$ + 1; } }\n'
+        'var num c = 0;\n'
+        'function ns:loop { while $c$ < 3 { c = $c$ + 1; } }\n'
     )
     out, tmp = compile_source(src)
     func_dir = out / 'data' / 'ns' / 'function'
@@ -58,9 +58,9 @@ def test_complex_expression_temp_operations_present():
     src = (
         'pack "ns" "desc" 82;\n'
         'namespace "ns";\n'
-        'var num x<@s> = 2;\n'
-        'var num y<@s> = 3;\n'
-        'function ns:math { x<@s> = ($x<@s>$ + 5) * ($y<@s>$ - 1) / 2; }\n'
+        'var num x = 2;\n'
+        'var num y = 3;\n'
+        'function ns:math { x = ($x$ + 5) * ($y$ - 1) / 2; }\n'
     )
     out, tmp = compile_source(src)
     func_dir = out / 'data' / 'ns' / 'function'
@@ -79,8 +79,8 @@ def test_else_branch_written_separately():
     src = (
         'pack "ns" "desc" 82;\n'
         'namespace "ns";\n'
-        'var num a<@s> = 0;\n'
-        'function ns:f { if $a<@s>$ > 1 { say "high"; } else { say "low"; } }\n'
+        'var num a = 0;\n'
+        'function ns:f { if $a$ > 1 { say "high"; } else { say "low"; } }\n'
     )
     out, tmp = compile_source(src)
     func_dir = out / 'data' / 'ns' / 'function'

minecraft_datapack_language-16.0.25/docs/_data/version.yml

@@ -1,3 +0,0 @@
-current: "16.0.24"
-tag: "v16.0.24"
-updated_at: "2025-09-10T06:55:57Z"