minecraft-datapack-language 16.0.20__py3-none-any.whl → 16.0.21__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.20'
-__version_tuple__ = version_tuple = (16, 0, 20)
+__version__ = version = '16.0.21'
+__version_tuple__ = version_tuple = (16, 0, 21)
 
 __commit_id__ = commit_id = None

minecraft_datapack_language/mdl_compiler.py

@@ -33,6 +33,8 @@ class MDLCompiler:
         self.declared_variables: List[VariableDeclaration] = []
         # Track any temporary scoreboard variables generated during compilation
         self.temp_variables: Set[str] = set()
+        # Track if global scope is used anywhere
+        self.uses_global_scope: bool = False
         
     def compile(self, ast: Program, source_dir: str = None) -> str:
         """Compile MDL AST into a complete Minecraft datapack."""
@@ -174,6 +176,10 @@ class MDLCompiler:
                 lines.append(self._ensure_macro_prefix(cmd))
         # Done routing temp commands for this function body
         self._temp_sink_stack.pop()
+
+        # If global scope is used anywhere in the program, prepend ensure line here too
+        if self.uses_global_scope:
+            self._insert_ensure_global(lines)
         
         return "\n".join(lines)
 
@@ -302,6 +308,11 @@ class MDLCompiler:
             "# Generated by MDL Compiler",
             ""
         ]
+
+        # Ensure a single global armor stand exists if global scope is used
+        if self.uses_global_scope:
+            lines.extend(self._ensure_global_lines())
+            lines.append("")
         
         # Add scoreboard objective creation for variables
         for var_name, objective in self.variables.items():
@@ -774,6 +785,9 @@ class MDLCompiler:
         else:
             functions_dir = self.output_dir / "data" / self.current_namespace / "functions"
         functions_dir.mkdir(parents=True, exist_ok=True)
+        # Insert ensure global if needed
+        if self.uses_global_scope:
+            self._insert_ensure_global(lines)
         func_file = functions_dir / f"{name}.mcfunction"
         with open(func_file, 'w') as f:
             f.write("\n".join(lines) + "\n")
@@ -789,7 +803,7 @@ class MDLCompiler:
 
         base = f"function {func_call.namespace}:{func_call.name}{suffix}"
         if func_call.scope:
-            return f"execute as {func_call.scope.strip('<>')} run {base}"
+            return f"execute as {self._resolve_scope(func_call.scope)} run {base}"
         return base
     
     def _expression_to_value(self, expression: Any) -> str:
@@ -807,7 +821,7 @@ class MDLCompiler:
             return str(expression.value)
         elif isinstance(expression, VariableSubstitution):
             objective = self.variables.get(expression.name, expression.name)
-            scope = expression.scope.strip("<>")
+            scope = self._resolve_scope(expression.scope)
             return f"score {scope} {objective}"
         elif isinstance(expression, UnaryExpression):
             # Handle logical NOT elsewhere; here support unary minus for arithmetic
@@ -983,7 +997,7 @@ class MDLCompiler:
             # Variable vs literal
             if op_sym and isinstance(left, VariableSubstitution) and isinstance(right, LiteralExpression) and isinstance(right.value, (int, float)):
                 objective = self.variables.get(left.name, left.name)
-                scope = left.scope.strip("<>")
+                scope = self._resolve_scope(left.scope)
                 # Normalize number
                 try:
                     v = float(right.value)
@@ -1025,9 +1039,9 @@ class MDLCompiler:
             # Variable vs variable
             if op_sym and isinstance(left, VariableSubstitution) and isinstance(right, VariableSubstitution):
                 lobj = self.variables.get(left.name, left.name)
-                lscope = left.scope.strip("<>")
+                lscope = self._resolve_scope(left.scope)
                 robj = self.variables.get(right.name, right.name)
-                rscope = right.scope.strip("<>")
+                rscope = self._resolve_scope(right.scope)
                 if op_sym in (">", ">=", "<", "<=", "=="):
                     comp = op_sym if op_sym != "==" else "="
                     return (f"score {lscope} {lobj} {comp} {rscope} {robj}", False)
@@ -1057,6 +1071,39 @@ class MDLCompiler:
         # Fallback: treat as generic condition string
         return (self._expression_to_condition(expression), False)
 
+    def _resolve_scope(self, scope_spec: Optional[str]) -> str:
+        """Resolve MDL scope spec to a Minecraft selector string.
+        - None or missing angle brackets defaults to stripping.
+        - <global> maps to the singleton mdl_global armor stand.
+        """
+        if not scope_spec:
+            return "@s"
+        s = scope_spec.strip()
+        if s == "<global>":
+            self.uses_global_scope = True
+            return "@e[type=armor_stand,tag=mdl_global,limit=1]"
+        if s.startswith("<") and s.endswith(">"):
+            return s[1:-1]
+        # Fallback: already looks like a selector
+        return s
+
+    def _ensure_global_lines(self) -> list:
+        return [
+            "# Ensure global armor stand exists",
+            "execute unless entity @e[type=armor_stand,tag=mdl_global,limit=1] run summon armor_stand ~ ~ ~ {NoGravity:1b,Invulnerable:1b,Invisible:1b,Tags:[\"mdl_global\"]}",
+        ]
+
+    def _insert_ensure_global(self, lines: list):
+        # Insert ensure lines after header/comments at top if not already present
+        ensure = self._ensure_global_lines()[0]
+        if any(ensure in l for l in lines):
+            return
+        # Insert after initial comment block
+        insert_at = 0
+        for i, l in enumerate(lines[:5]):
+            insert_at = i + 1
+        lines[insert_at:insert_at] = self._ensure_global_lines() + [""]
+
     def _compile_boolean_expression(self, expression: Any, out_var: Optional[str] = None) -> str:
         """Compile a logical expression into a temporary boolean scoreboard variable (1 true, 0 false).
         Returns the objective name for the boolean temp variable.

{minecraft_datapack_language-16.0.20.dist-info → minecraft_datapack_language-16.0.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 16.0.20
+Version: 16.0.21
 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.20.dist-info → minecraft_datapack_language-16.0.21.dist-info}/RECORD

@@ -1,18 +1,18 @@
 minecraft_datapack_language/__init__.py,sha256=0KVXBE4ScRaRUrf83aA2tVB-y8A_jplyaxVvtHH6Uw0,1199
-minecraft_datapack_language/_version.py,sha256=ZcIcMufnj-tPySvFqfRV1Vfi4VfjctQQTwFmsEGNEQA,708
+minecraft_datapack_language/_version.py,sha256=XlIY3WMs9CiPI4MdJIsAr0hOM97V2wv7a_weiKPC39E,708
 minecraft_datapack_language/ast_nodes.py,sha256=L5izavSeXDr766vsfRvJrcnflXNJyXcy0WSfyJPq2ZA,4484
 minecraft_datapack_language/cli.py,sha256=shmQtNNXgw5XNlGquAR52wWtYeNyYusZTwwCZl56mMU,9522
 minecraft_datapack_language/dir_map.py,sha256=HmxFkuvWGkzHF8o_GFb4BpuMCRc6QMw8UbmcAI8JVdY,1788
-minecraft_datapack_language/mdl_compiler.py,sha256=lR33Oi7hNTeEarEw60c93ThL4_KWYaHUl42YMiXsW4g,68106
+minecraft_datapack_language/mdl_compiler.py,sha256=-nqxEbo6Pk_zo8cMDKmkIhz8vOVIRGqoESWHSgDOmD8,70118
 minecraft_datapack_language/mdl_errors.py,sha256=r0Gu3KhoX1YLPAVW_iO7Q_fPgaf_Dv9tOGSOdKNSzmw,16114
 minecraft_datapack_language/mdl_lexer.py,sha256=YuRflOkoMOcjECPAZzoAkJciMks5amWMtGbcTIVKmAs,24166
 minecraft_datapack_language/mdl_linter.py,sha256=z85xoAglENurCh30bR7kEHZ_JeMxcYaLDcGNRAl-RAI,17253
 minecraft_datapack_language/mdl_parser.py,sha256=vIcPRudxDaezNy85Q5CBcumLhCglofCNITsrRmj9YWw,27302
 minecraft_datapack_language/python_api.py,sha256=Iao1jbdeW6ekeA80BZG6gNqHVjxQJEheB3DbpVsuTZQ,12304
 minecraft_datapack_language/utils.py,sha256=Aq0HAGlXqj9BUTEjaEilpvzEW0EtZYYMMwOqG9db6dE,684
-minecraft_datapack_language-16.0.20.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-16.0.20.dist-info/METADATA,sha256=J8Fwzv1piUYoNxfCG11EYzbV2amGwX9KC7ofCtSBNuE,8344
-minecraft_datapack_language-16.0.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-16.0.20.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-16.0.20.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-16.0.20.dist-info/RECORD,,
+minecraft_datapack_language-16.0.21.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-16.0.21.dist-info/METADATA,sha256=dW8AbMzdXeJPw755mPSuPl-7PjXkgcuCHX_QN-RKWAs,8344
+minecraft_datapack_language-16.0.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-16.0.21.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-16.0.21.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-16.0.21.dist-info/RECORD,,