minecraft-datapack-language 16.0.22__tar.gz → 16.0.24__tar.gz

{minecraft_datapack_language-16.0.22 → minecraft_datapack_language-16.0.24}/PKG-INFO

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

@@ -0,0 +1,3 @@
+current: "16.0.23"
+tag: "v16.0.23"
+updated_at: "2025-09-10T06:46:56Z"

{minecraft_datapack_language-16.0.22 → minecraft_datapack_language-16.0.24}/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.22'
-__version_tuple__ = version_tuple = (16, 0, 22)
+__version__ = version = '16.0.24'
+__version_tuple__ = version_tuple = (16, 0, 24)
 
-__commit_id__ = commit_id = 'gd3f1418a7'
+__commit_id__ = commit_id = 'g54e710fa5'

{minecraft_datapack_language-16.0.22 → minecraft_datapack_language-16.0.24}/minecraft_datapack_language/mdl_compiler.py

@@ -324,9 +324,8 @@ class MDLCompiler:
             if getattr(decl, 'initial_value', None) is None:
                 continue
             objective = self.variables.get(decl.name, decl.name)
-            scope = decl.scope.strip("<>") if decl.scope else "@a"
-            if scope == "@s":
-                scope = "@a"
+            resolved_scope = self._resolve_scope(decl.scope) if decl.scope else "@a"
+            scope = "@a" if resolved_scope == "@s" else resolved_scope
             init = decl.initial_value
             from .ast_nodes import LiteralExpression, VariableSubstitution
             if isinstance(init, LiteralExpression):
@@ -340,9 +339,8 @@ class MDLCompiler:
                 lines.append(f"scoreboard players set {scope} {objective} {val_str}")
             elif isinstance(init, VariableSubstitution):
                 src_obj = self.variables.get(init.name, init.name)
-                src_scope = init.scope.strip("<>") if init.scope else "@a"
-                if src_scope == "@s":
-                    src_scope = "@a"
+                src_resolved = self._resolve_scope(init.scope) if init.scope else "@a"
+                src_scope = "@a" if src_resolved == "@s" else src_resolved
                 lines.append(f"scoreboard players operation {scope} {objective} = {src_scope} {src_obj}")
 
         lines.append("")
@@ -404,7 +402,7 @@ class MDLCompiler:
         if assignment.name not in self.variables:
             self.variables[assignment.name] = assignment.name
         objective = self.variables.get(assignment.name, assignment.name)
-        scope = assignment.scope.strip("<>")
+        scope = self._resolve_scope(assignment.scope)
         
         # Check if the value is a complex expression
         if isinstance(assignment.value, BinaryExpression):
@@ -435,7 +433,7 @@ class MDLCompiler:
         # Register objective so load function adds it
         self.variables[decl.name] = objective
         # If there is an initial value, set it in current context
-        scope = decl.scope.strip("<>")
+        scope = self._resolve_scope(decl.scope)
         init = None
         try:
             init = self._expression_to_value(decl.initial_value)
@@ -474,7 +472,7 @@ class MDLCompiler:
                     parts.append(f'{{"text":"{text_before}"}}')
                 
                 objective = self.variables.get(var.name, var.name)
-                scope = var.scope.strip("<>")
+                scope = self._resolve_scope(var.scope)
                 parts.append(f'{{"score":{{"name":"{scope}","objective":"{objective}"}}}}')
                 
                 current_pos = var_pos + len(var_pattern)

{minecraft_datapack_language-16.0.22 → minecraft_datapack_language-16.0.24}/minecraft_datapack_language.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 16.0.22
+Version: 16.0.24
 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.22 → minecraft_datapack_language-16.0.24}/tests/test_global_scope.py

@@ -64,3 +64,28 @@ function p:caller {
     txt = open(caller_fn, "r", encoding="utf-8").read()
     assert "execute as @e[type=armor_stand,tag=mdl_global,limit=1] run function p:callee" in txt
 
+
+def test_global_scope_no_literal_leakage(tmp_path):
+    src = '''
+pack "helloworld" "Generated by MDL CLI" 82;
+namespace "helloworld";
+
+var num num1<global> = 5;
+
+function helloworld:somefunc {
+    num1<global> = $num1<global>$ + 1;
+
+    say "num1: $num1<global>$";
+}
+'''
+    out = compile_snippet(src, str(tmp_path))
+    fn = find_function_file(out, "helloworld", "somefunc")
+    text = open(fn, "r", encoding="utf-8").read()
+    # No literal 'global' should appear as a name in operation or tellraw
+    assert " operation global " not in text
+    assert '"name":"global"' not in text
+    # LHS assignment back to global must target the resolved selector
+    assert "scoreboard players operation @e[type=armor_stand,tag=mdl_global,limit=1] num1 =" in text
+    # tellraw JSON name field must use the resolved selector
+    assert '"name":"@e[type=armor_stand,tag=mdl_global,limit=1]"' in text
+

{minecraft_datapack_language-16.0.22 → minecraft_datapack_language-16.0.24}/vscode-extension/syntaxes/mdl.tmLanguage.json

@@ -4,7 +4,7 @@
   "patterns": [
     {
       "name": "keyword.control.mdl",
-      "match": "\\b(pack|namespace|function|on_tick|on_load|tag|if|else|while|scheduledwhile|var|num|exec|recipe|loot_table|advancement|predicate|item_modifier|structure)\\b"
+      "match": "\\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"
     },
     {
       "name": "entity.name.section.mdl",
@@ -14,6 +14,10 @@
       "name": "string.quoted.double.mdl",
       "match": "\"([^\"\\\\]|\\\\.)*\""
     },
+    {
+      "name": "string.quoted.single.mdl",
+      "match": "'([^'\\\\]|\\\\.)*'"
+    },
     {
       "name": "comment.line.mdl",
       "match": "//.*$"
@@ -29,7 +33,7 @@
     },
     {
       "name": "keyword.operator.mdl",
-      "match": "\\b(\\+|-|\\*|/|=|==|!=|<|>|<=|>=)\\b"
+      "match": "(\\+|\\-|\\*|/|=|==|!=|<|>|<=|>=|&&|\\|\\||!|\\.\\.)"
     },
     {
       "name": "punctuation.terminator.mdl",
@@ -73,6 +77,10 @@
           "name": "entity.name.selector.mdl",
           "match": "(@p|@r|@a|@e|@s|@initiator|@c|@v|@d|@w)"
         },
+        {
+          "name": "constant.language.global.mdl",
+          "match": "global"
+        },
         {
           "name": "entity.name.selector.arguments.mdl",
           "match": "\\[([^\\]]*)\\]"
@@ -99,6 +107,10 @@
           "name": "entity.name.selector.mdl",
           "match": "(@p|@r|@a|@e|@s|@initiator|@c|@v|@d|@w)"
         },
+        {
+          "name": "constant.language.global.mdl",
+          "match": "global"
+        },
         {
           "name": "entity.name.selector.arguments.mdl",
           "match": "\\[([^\\]]*)\\]"
@@ -126,6 +138,10 @@
           "name": "entity.name.selector.mdl",
           "match": "(@p|@r|@a|@e|@s|@initiator|@c|@v|@d|@w)"
         },
+        {
+          "name": "constant.language.global.mdl",
+          "match": "global"
+        },
         {
           "name": "entity.name.selector.arguments.mdl",
           "match": "\\[([^\\]]*)\\]"
@@ -154,6 +170,10 @@
           "name": "entity.name.selector.mdl",
           "match": "(@p|@r|@a|@e|@s|@initiator|@c|@v|@d|@w)"
         },
+        {
+          "name": "constant.language.global.mdl",
+          "match": "global"
+        },
         {
           "name": "entity.name.selector.arguments.mdl",
           "match": "\\[([^\\]]*)\\]"
@@ -182,6 +202,10 @@
           "name": "entity.name.selector.mdl",
           "match": "(@p|@r|@a|@e|@s|@initiator|@c|@v|@d|@w)"
         },
+        {
+          "name": "constant.language.global.mdl",
+          "match": "global"
+        },
         {
           "name": "entity.name.selector.arguments.mdl",
           "match": "\\[([^\\]]*)\\]"
@@ -270,6 +294,10 @@
         }
       ]
     },
+    {
+      "name": "meta.macro.line.mdl",
+      "match": "^\\s*\\$[^!].*$"
+    },
     {
       "name": "entity.name.selector.mdl",
       "match": "(@p|@r|@a|@e|@s|@initiator|@c|@v|@d|@w)"

minecraft_datapack_language-16.0.22/docs/_data/version.yml

@@ -1,3 +0,0 @@
-current: "16.0.21"
-tag: "v16.0.21"
-updated_at: "2025-09-10T06:20:37Z"