minecraft-datapack-language 15.4.25__tar.gz → 15.4.26__tar.gz

{minecraft_datapack_language-15.4.25/minecraft_datapack_language.egg-info → minecraft_datapack_language-15.4.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.4.25
+Version: 15.4.26
 Summary: Compile JavaScript-style MDL language or Python API 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-15.4.26/docs/_data/version.yml

@@ -0,0 +1,3 @@
+current: "15.4.25"
+tag: "v15.4.25"
+updated_at: "2025-09-03T00:35:14Z"

{minecraft_datapack_language-15.4.25 → minecraft_datapack_language-15.4.26}/minecraft_datapack_language/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '15.4.25'
-__version_tuple__ = version_tuple = (15, 4, 25)
+__version__ = version = '15.4.26'
+__version_tuple__ = version_tuple = (15, 4, 26)
 
-__commit_id__ = commit_id = 'gfc9591494'
+__commit_id__ = commit_id = 'g506d6e0af'

{minecraft_datapack_language-15.4.25 → minecraft_datapack_language-15.4.26}/minecraft_datapack_language/mdl_parser_js.py

@@ -337,31 +337,29 @@ class MDLParser:
         
         # Check for scope selector after variable name
         scope = None
-        if not self._is_at_end() and self._peek().type == TokenType.SCOPE:
-            self._match(TokenType.SCOPE)  # consume 'scope'
+        if not self._is_at_end() and self._peek().type == TokenType.LANGLE:
+            self._match(TokenType.LANGLE)  # consume '<'
             
-            # Parse scope selector in angle brackets
-            if not self._is_at_end() and self._peek().type == TokenType.LANGLE:
-                self._match(TokenType.LANGLE)  # consume '<'
-                
-                # Parse scope selector content
-                scope_parts = []
-                while not self._is_at_end() and self._peek().type != TokenType.RANGLE:
-                    scope_parts.append(self._peek().value)
-                    self._advance()
-                
-                if self._is_at_end():
-                    raise create_parser_error(
-                        message="Unterminated scope selector",
-                        file_path=self.source_file,
-                        line=self._peek().line,
-                        column=self._peek().column,
-                        line_content=self._peek().value,
-                        suggestion="Add a closing '>' to terminate the scope selector"
-                    )
-                
-                self._match(TokenType.RANGLE)  # consume '>'
-                scope = ''.join(scope_parts)
+            # Parse scope selector content
+            scope_parts = []
+            while not self._is_at_end() and self._peek().type != TokenType.RANGLE:
+                scope_parts.append(self._peek().value)
+                self._advance()
+            
+            if self._is_at_end():
+                raise create_parser_error(
+                    message="Unterminated scope selector",
+                    file_path=self.source_file,
+                    line=self._peek().line,
+                    column=self._peek().column,
+                    line_content=self._peek().value,
+                    suggestion="Add a closing '>' to terminate the scope selector"
+                )
+            
+            self._match(TokenType.RANGLE)  # consume '>'
+            scope = ''.join(scope_parts)
+            # Update the name to include the scope selector
+            name = f"{name}<{scope}>"
         
         self._match(TokenType.ASSIGN)
         
@@ -901,15 +899,33 @@ class MDLParser:
             identifier_name = token.value
             self._advance()  # consume the identifier
             
-            # Check if the identifier contains a scope selector
-            if '<' in identifier_name and identifier_name.endswith('>'):
-                # Extract variable name and scope selector
-                parts = identifier_name.split('<', 1)
-                if len(parts) == 2:
-                    var_name = parts[0]
-                    scope_selector = parts[1][:-1]  # Remove the closing >
-                    # For variable expressions in assignments, keep the full scoped name
-                    return VariableExpression(identifier_name)
+            # Check if this identifier is followed by a scope selector
+            if not self._is_at_end() and self._peek().type == TokenType.LANGLE:
+                # This is a scoped variable - parse the scope selector
+                self._match(TokenType.LANGLE)  # consume '<'
+                
+                # Parse scope selector content
+                scope_parts = []
+                while not self._is_at_end() and self._peek().type != TokenType.RANGLE:
+                    scope_parts.append(self._peek().value)
+                    self._advance()
+                
+                if self._is_at_end():
+                    raise create_parser_error(
+                        message="Unterminated scope selector in expression",
+                        file_path=self.source_file,
+                        line=self._peek().line,
+                        column=self._peek().column,
+                        line_content=self._peek().value,
+                        suggestion="Add a closing '>' to terminate the scope selector"
+                    )
+                
+                self._match(TokenType.RANGLE)  # consume '>'
+                scope_selector = ''.join(scope_parts)
+                
+                # Create a scoped variable expression
+                full_name = f"{identifier_name}<{scope_selector}>"
+                return VariableExpression(full_name)
             
             # Regular variable expression without scope
             return VariableExpression(identifier_name)

{minecraft_datapack_language-15.4.25 → minecraft_datapack_language-15.4.26/minecraft_datapack_language.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.4.25
+Version: 15.4.26
 Summary: Compile JavaScript-style MDL language or Python API 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-15.4.25 → minecraft_datapack_language-15.4.26}/minecraft_datapack_language.egg-info/SOURCES.txt

@@ -14,6 +14,8 @@ pyproject.toml
 test_all_registry.mdl
 test_final_explicit_output.zip
 test_final_output.zip
+test_output.zip
+test_output_complex.zip
 test_output_scope.zip
 test_scoped_output.zip
 test_scoped_output2.zip
@@ -1268,6 +1270,12 @@ test_examples/test_output_while_loops_fixed/data/while_loops/function/load.mcfun
 test_examples/test_output_while_loops_fixed/data/while_loops/function/main.mcfunction
 test_examples/test_output_while_loops_fixed/data/while_loops/function/test_countdown_while_1.mcfunction
 test_examples/test_output_while_loops_fixed/data/while_loops/function/test_main_while_2.mcfunction
+test_output/pack.mcmeta
+test_output/data/minecraft/tags/function/load.json
+test_output/data/scoped_variables_test/function/load.mcfunction
+test_output_complex/pack.mcmeta
+test_output_complex/data/minecraft/tags/function/load.json
+test_output_complex/data/scoped_variables_test/function/load.mcfunction
 test_project/README.md
 test_project/main.mdl
 test_single/pack.mcmeta

minecraft_datapack_language-15.4.26/test_output/data/minecraft/tags/function/load.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "scoped_variables_test:load",
+    "Scoped Variables Test:load"
+  ]
+}

minecraft_datapack_language-15.4.26/test_output/data/scoped_variables_test/function/load.mcfunction

@@ -0,0 +1,2 @@
+execute unless entity @e[type=armor_stand,tag=mdl_server,limit=1] run summon armor_stand ~ 320 ~ {Tags:["mdl_server"],Invisible:1b,Marker:1b,NoGravity:1b,Invulnerable:1b}
+scoreboard objectives add player_score<@s> dummy

minecraft_datapack_language-15.4.26/test_output/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 82,
+    "description": "A test pack for scoped variables"
+  }
+}

minecraft_datapack_language-15.4.26/test_output_complex/data/minecraft/tags/function/load.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "scoped_variables_test:load",
+    "Scoped Variables Test:load"
+  ]
+}

minecraft_datapack_language-15.4.26/test_output_complex/data/scoped_variables_test/function/load.mcfunction

@@ -0,0 +1,4 @@
+execute unless entity @e[type=armor_stand,tag=mdl_server,limit=1] run summon armor_stand ~ 320 ~ {Tags:["mdl_server"],Invisible:1b,Marker:1b,NoGravity:1b,Invulnerable:1b}
+scoreboard objectives add player_score<@s> dummy
+scoreboard objectives add global_counter<@a> dummy
+scoreboard objectives add team_score<@p[team=red]> dummy

minecraft_datapack_language-15.4.26/test_output_complex/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 82,
+    "description": "A test pack for scoped variables"
+  }
+}

minecraft_datapack_language-15.4.26/test_scoped_variables.mdl

@@ -0,0 +1,15 @@
+// Test file for scoped variables
+pack "Scoped Variables Test" "A test pack for scoped variables" 15;
+
+// Test variable declarations with scope selectors
+var num player_score<@s> = 0;
+var num global_counter<@a> = 100;
+var num team_score<@p[team=red]> = 50;
+
+// Test variable assignments with scope selectors
+player_score<@s> = player_score<@s> + 1;
+global_counter<@a> = global_counter<@a> - 5;
+team_score<@p[team=red]> = team_score<@p[team=red]> * 2;
+
+// Test complex expressions with scoped variables
+player_score<@s> = (player_score<@s> + global_counter<@a>) / 2;

minecraft_datapack_language-15.4.25/docs/_data/version.yml

@@ -1,3 +0,0 @@
-current: "15.4.24"
-tag: "v15.4.24"
-updated_at: "2025-09-02T06:20:31Z"

minecraft_datapack_language-15.4.25/test_scoped_variables.mdl

@@ -1,4 +0,0 @@
-// Test file for scoped variables
-var num player_score<@s> = 0;
-
-player_score<@s> = player_score<@s> + 1;