minecraft-datapack-language 16.0.11__py3-none-any.whl → 16.0.13__py3-none-any.whl

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 = None

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/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.dist-info → minecraft_datapack_language-16.0.13.dist-info}/METADATA

@@ -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.dist-info → minecraft_datapack_language-16.0.13.dist-info}/RECORD

@@ -1,18 +1,18 @@
 minecraft_datapack_language/__init__.py,sha256=0KVXBE4ScRaRUrf83aA2tVB-y8A_jplyaxVvtHH6Uw0,1199
-minecraft_datapack_language/_version.py,sha256=0teKLh7F1fBENIal1EYkpAqq_ACLfpRPnzU2u5d-84c,708
+minecraft_datapack_language/_version.py,sha256=zPid2C66t3qy7IALtBamczEZhSi2TvHUc9FEEgCFwOc,708
 minecraft_datapack_language/ast_nodes.py,sha256=L5izavSeXDr766vsfRvJrcnflXNJyXcy0WSfyJPq2ZA,4484
 minecraft_datapack_language/cli.py,sha256=R4QZYtox-Da9B8pr_kCg_9qc9aI-ORTah7kMkhsI5tw,10373
 minecraft_datapack_language/dir_map.py,sha256=HmxFkuvWGkzHF8o_GFb4BpuMCRc6QMw8UbmcAI8JVdY,1788
-minecraft_datapack_language/mdl_compiler.py,sha256=L2-NCQBc-6gshM-VNqyW4HxnltS8XNb7IU_37AOiDAI,50680
+minecraft_datapack_language/mdl_compiler.py,sha256=-ZwjHgJ8jJej8iiMovkbE8ry0aiLmXHc5rJ5Agj3Ep4,52293
 minecraft_datapack_language/mdl_errors.py,sha256=r0Gu3KhoX1YLPAVW_iO7Q_fPgaf_Dv9tOGSOdKNSzmw,16114
-minecraft_datapack_language/mdl_lexer.py,sha256=rfsW2QNcZxa9HAHpU9HFReshQSmjOrrK6xY_r43mKFk,23485
+minecraft_datapack_language/mdl_lexer.py,sha256=bDzAj39-kfnX0uVlYQg1oQ7YDb-JO9UZx8jbODQqg6E,23902
 minecraft_datapack_language/mdl_linter.py,sha256=z85xoAglENurCh30bR7kEHZ_JeMxcYaLDcGNRAl-RAI,17253
 minecraft_datapack_language/mdl_parser.py,sha256=Krk7Y_E9OKNCcsDOCT7ATvQLbJII951AU2qzEY00GLE,26068
 minecraft_datapack_language/python_api.py,sha256=Iao1jbdeW6ekeA80BZG6gNqHVjxQJEheB3DbpVsuTZQ,12304
 minecraft_datapack_language/utils.py,sha256=Aq0HAGlXqj9BUTEjaEilpvzEW0EtZYYMMwOqG9db6dE,684
-minecraft_datapack_language-16.0.11.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-16.0.11.dist-info/METADATA,sha256=gEFJawJ7Rmjc4QVM0PrDu0FehvtajZbQCLFwDxpfcXI,8344
-minecraft_datapack_language-16.0.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-16.0.11.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-16.0.11.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-16.0.11.dist-info/RECORD,,
+minecraft_datapack_language-16.0.13.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-16.0.13.dist-info/METADATA,sha256=0JbN_CstF60oTN4ypgfcq1JbLE0Q2nO3dcL_NWfioS8,8344
+minecraft_datapack_language-16.0.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-16.0.13.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-16.0.13.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-16.0.13.dist-info/RECORD,,