minecraft-datapack-language 16.0.11__tar.gz → 16.0.13__tar.gz

{minecraft_datapack_language-16.0.11/minecraft_datapack_language.egg-info → minecraft_datapack_language-16.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 16.0.11
+Version: 16.0.13
 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.13/docs/_data/version.yml

@@ -0,0 +1,3 @@
+current: "16.0.12"
+tag: "v16.0.12"
+updated_at: "2025-09-09T04:08:38Z"

{minecraft_datapack_language-16.0.11 → minecraft_datapack_language-16.0.13}/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.11'
-__version_tuple__ = version_tuple = (16, 0, 11)
+__version__ = version = '16.0.13'
+__version_tuple__ = version_tuple = (16, 0, 13)
 
-__commit_id__ = commit_id = 'g2ad5863a0'
+__commit_id__ = commit_id = 'g6ec8279e5'

{minecraft_datapack_language-16.0.11 → minecraft_datapack_language-16.0.13}/minecraft_datapack_language/mdl_compiler.py

@@ -187,7 +187,10 @@ class MDLCompiler:
             if macro_re.search(line):
                 stripped = line.lstrip()
                 if not stripped.startswith('$'):
-                    return '$' + line
+                    # Insert '$' immediately after indentation so there is no space after '$'
+                    leading_ws_len = len(line) - len(stripped)
+                    leading_ws = line[:leading_ws_len]
+                    return f"{leading_ws}${stripped}"
             return line
         if '\n' in text:
             return '\n'.join(process_line(ln) for ln in text.split('\n'))
@@ -656,6 +659,12 @@ class MDLCompiler:
         wrap_fn = self._generate_while_function_name()  # e.g., fn__while_1
         body_fn = f"{wrap_fn}__body"
         tag = f"mdl_sched__{wrap_fn}"
+        # If inside a parent scheduledwhile, register this tag as a child so parent defers while child active
+        if hasattr(self, '_sched_child_tag_stack') and self._sched_child_tag_stack:
+            self._sched_child_tag_stack[-1].append(tag)
+        # Prepare nested scheduledwhile coordination
+        if not hasattr(self, '_sched_child_tag_stack'):
+            self._sched_child_tag_stack = []
 
         # Build condition once
         cond_str, invert_then = self._build_condition(while_loop.condition)
@@ -669,8 +678,21 @@ class MDLCompiler:
 
         # Build per-entity body function
         body_lines: List[str] = [f"# Function: {self.current_namespace}:{body_fn}"]
+
         if not hasattr(self, '_temp_sink_stack'):
             self._temp_sink_stack = []
+
+        # Push a new child tag collector for nested scheduledwhiles
+        self._sched_child_tag_stack.append([])
+        # Also expose this collector to nested calls via a convenience reference
+        current_child_list = self._sched_child_tag_stack[-1]
+        # Provide a hook for nested scheduledwhile to register their tag
+        if not hasattr(self, '_register_child_sched_tag'):
+            def _register(tag_name: str):
+                if self._sched_child_tag_stack:
+                    self._sched_child_tag_stack[-1].append(tag_name)
+            self._register_child_sched_tag = _register
+
         self._temp_sink_stack.append(body_lines)
         for stmt in while_loop.body:
             if isinstance(stmt, VariableAssignment):
@@ -697,14 +719,20 @@ class MDLCompiler:
                 cmd = self._function_call_to_command(stmt)
                 body_lines.append(cmd)
         self._temp_sink_stack.pop()
+        # Pop collected child tags for this level
+        child_tags: List[str] = self._sched_child_tag_stack.pop() if hasattr(self, '_sched_child_tag_stack') and self._sched_child_tag_stack else []
         self._store_generated_function(body_fn, body_lines)
 
         # Build wrapper function that maintains the tag set and reschedules if needed
         wrap_lines: List[str] = [f"# Function: {self.current_namespace}:{wrap_fn}"]
         # Hint comment to aid tests expecting a plain 'execute if score' substring
         wrap_lines.append(f"# execute {cond_true} ...")
-        # Run body for entities where condition holds
-        wrap_lines.append(f"execute as @e[tag={tag}] {cond_true} run function {self.current_namespace}:{body_fn}")
+        # Run body for entities where condition holds (but NOT currently inside any child scheduled loop)
+        selector = f"@e[tag={tag}"
+        for ct in child_tags:
+            selector += f",tag=!{ct}"
+        selector += "]"
+        wrap_lines.append(f"execute as {selector} {cond_true} run function {self.current_namespace}:{body_fn}")
         # Remove tag when condition fails
         wrap_lines.append(f"execute as @e[tag={tag}] {cond_false} run tag @s remove {tag}")
         # Continue scheduling while any remain

{minecraft_datapack_language-16.0.11 → minecraft_datapack_language-16.0.13}/minecraft_datapack_language/mdl_lexer.py

@@ -357,6 +357,14 @@ class MDLLexer:
             if (self.source[self.current:self.current + 5] == 'raw!$'):
                 # Found the end marker - extract the content
                 raw_content = self.source[content_start:self.current]
+                # Trim leading/trailing whitespace on each line within the raw block
+                try:
+                    lines = raw_content.split('\n')
+                    trimmed_lines = [ln.strip() for ln in lines]
+                    raw_content = '\n'.join(trimmed_lines)
+                except Exception:
+                    # If anything goes wrong, fall back to original content
+                    pass
                 
                 # Generate a single RAW_CONTENT token with all the content
                 self.tokens.append(Token(TokenType.RAW_CONTENT, raw_content, self.line, self.column))

{minecraft_datapack_language-16.0.11 → minecraft_datapack_language-16.0.13/minecraft_datapack_language.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 16.0.11
+Version: 16.0.13
 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.11 → minecraft_datapack_language-16.0.13}/tests/test_compiler_fixes.py

@@ -14,6 +14,7 @@ sys.path.insert(0, str(Path(__file__).parent))
 
 from minecraft_datapack_language.mdl_compiler import MDLCompiler
 from minecraft_datapack_language.mdl_parser import MDLParser
+from minecraft_datapack_language.mdl_parser import MDLParser
 
 def test_complex_expressions():
     """Test that complex expressions compile correctly."""
@@ -34,7 +35,7 @@ function test:complex_math<@s> {
     
     with tempfile.TemporaryDirectory() as temp_dir:
         # Parse and compile
-        parser = MDLParser()
+        parser = MDLParser("<test>")
         ast = parser.parse(source)
         
         compiler = MDLCompiler(temp_dir)
@@ -77,6 +78,9 @@ function test:control_test<@s> {
     
     while $counter<@s>$ < 10 {
         counter<@s> = $counter<@s>$ + 1;
+        $!raw
+          say   Hello
+        raw!$
     }
 }
 """
@@ -92,15 +96,20 @@ function test:control_test<@s> {
         # Check output
         output_file = Path(temp_dir) / "data" / "test" / "function" / "control_test.mcfunction"
         assert output_file.exists(), "Output file should exist"
-        
+
         content = output_file.read_text()
         print(f"Generated content:\n{content}")
-        
+
         # Verify it contains proper control flow
         assert "execute if score" in content, "Should generate execute if commands"
         assert "execute unless score" in content, "Should generate execute unless commands"
         # While body is emitted as a generated function call with parent-name prefix
         assert "__while_" in content, "Should generate while loop functions"
+        # Raw block lines should be trimmed per line within generated function files
+        mcfuncs = list((Path(temp_dir) / "data" / "test").rglob("*.mcfunction"))
+        combined = "\n".join(p.read_text() for p in mcfuncs)
+        assert "\nsay   Hello" in combined
+        assert "\n  say" not in combined
         
         print("✅ Control flow test passed!")
 

{minecraft_datapack_language-16.0.11 → minecraft_datapack_language-16.0.13}/tests/test_examples.py

@@ -34,8 +34,8 @@ def test_build_macros_example(tmp_path: Path):
     greeter = target_files[0].read_text()
     runner = runner_files[0].read_text()
 
-    # Macro line should be present as raw
-    assert '$say "Hello $(name)"' in greeter
+    # Macro line should be present as raw and no space after '$'
+    assert '$say "Hello $(name)"' in greeter and '$ say' not in greeter
     # Both exec forms should be emitted
     assert 'function macros_ex:greeter {name:"Casey"}' in runner
     assert 'function macros_ex:greeter with storage macros_ex:ctx player.profile' in runner

{minecraft_datapack_language-16.0.11 → minecraft_datapack_language-16.0.13}/tests/test_macros.py

@@ -50,6 +50,8 @@ def test_function_macros_exec_and_macro_lines():
 
         # Macro line should be preserved verbatim
         assert "$say \"Hello $(name)\"" in target_content
+        # Ensure there is no whitespace between '$' and the command token anywhere
+        assert "$ say" not in target_content
         # Exec with inline JSON compound
         assert "function macro:target {name:\"purple elephant\"}" in caller_content
         # Exec with data source 'with' clause

minecraft_datapack_language-16.0.11/docs/_data/version.yml

@@ -1,3 +0,0 @@
-current: "16.0.10"
-tag: "v16.0.10"
-updated_at: "2025-09-09T03:50:36Z"