minecraft-datapack-language 15.2.0__tar.gz → 15.2.2__tar.gz

{minecraft_datapack_language-15.2.0/minecraft_datapack_language.egg-info → minecraft_datapack_language-15.2.2}/PKG-INFO

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

@@ -0,0 +1,3 @@
+current: "15.2.1"
+tag: "v15.2.1"
+updated_at: "2025-09-02T00:10:30Z"

{minecraft_datapack_language-15.2.0 → minecraft_datapack_language-15.2.2}/minecraft_datapack_language/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '15.2.0'
-__version_tuple__ = version_tuple = (15, 2, 0)
+__version__ = version = '15.2.2'
+__version_tuple__ = version_tuple = (15, 2, 2)
 
-__commit_id__ = commit_id = 'g056bd9865'
+__commit_id__ = commit_id = 'gb54a23283'

{minecraft_datapack_language-15.2.0 → minecraft_datapack_language-15.2.2}/minecraft_datapack_language/mdl_lexer_js.py

@@ -449,8 +449,8 @@ class MDLLexer:
                 # Add the raw content as a single RAW token
                 content = ''.join(content_parts)
                 if content.strip():  # Only add non-empty content
-                    # Remove leading and trailing whitespace for cleaner content
-                    clean_content = content.strip()
+                    # Keep newlines for proper command splitting, but trim leading/trailing whitespace
+                    clean_content = content.rstrip().lstrip()
                     self.tokens.append(Token(TokenType.RAW, clean_content, raw_start_line, raw_start_column))
                 
                 # Add the end marker token

{minecraft_datapack_language-15.2.0 → minecraft_datapack_language-15.2.2}/minecraft_datapack_language/mdl_parser_js.py

@@ -646,8 +646,9 @@ class MDLParser:
         self._match(TokenType.RAW_END)
         
         content = "".join(content_parts)
-        # Split content into individual commands
-        commands = [cmd.strip() for cmd in content.split(';') if cmd.strip()]
+        # Split content into individual commands by newlines
+        # Raw blocks contain raw Minecraft commands, not MDL commands with semicolons
+        commands = [cmd.strip() for cmd in content.split('\n') if cmd.strip()]
         return {"type": "raw_text", "commands": commands}
     
     def _parse_command(self) -> Command:

{minecraft_datapack_language-15.2.0 → minecraft_datapack_language-15.2.2/minecraft_datapack_language.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.2.0
+Version: 15.2.2
 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.2.0 → minecraft_datapack_language-15.2.2}/minecraft_datapack_language.egg-info/SOURCES.txt

@@ -48,6 +48,13 @@ test_output_scoped_calls.zip
 test_output_scopes.zip
 test_pipes.mdl
 test_raw_blocks.mdl
+test_raw_complex_output.zip
+test_raw_complex_output2.zip
+test_raw_complex_output_fixed.zip
+test_raw_output.zip
+test_raw_output2.zip
+test_raw_output3.zip
+test_raw_simple_output.zip
 test_simple_output.zip
 test_simple_output2.zip
 test_simple_output3.zip
@@ -698,6 +705,34 @@ test_output_simple/pack.mcmeta
 test_output_simple/data/hello_world/function/load.mcfunction
 test_output_simple/data/hello_world/function/main.mcfunction
 test_output_simple/data/minecraft/tags/function/load.json
+test_raw_complex_output/pack.mcmeta
+test_raw_complex_output/data/minecraft/tags/function/load.json
+test_raw_complex_output/data/raw_complex/function/load.mcfunction
+test_raw_complex_output/data/raw_complex/function/main.mcfunction
+test_raw_complex_output2/pack.mcmeta
+test_raw_complex_output2/data/minecraft/tags/function/load.json
+test_raw_complex_output2/data/raw_complex/function/load.mcfunction
+test_raw_complex_output2/data/raw_complex/function/main.mcfunction
+test_raw_complex_output_fixed/pack.mcmeta
+test_raw_complex_output_fixed/data/minecraft/tags/function/load.json
+test_raw_complex_output_fixed/data/raw_complex/function/load.mcfunction
+test_raw_complex_output_fixed/data/raw_complex/function/main.mcfunction
+test_raw_output/pack.mcmeta
+test_raw_output/data/minecraft/tags/function/load.json
+test_raw_output/data/raw_test/function/load.mcfunction
+test_raw_output/data/raw_test/function/main.mcfunction
+test_raw_output2/pack.mcmeta
+test_raw_output2/data/minecraft/tags/function/load.json
+test_raw_output2/data/raw_test/function/load.mcfunction
+test_raw_output2/data/raw_test/function/main.mcfunction
+test_raw_output3/pack.mcmeta
+test_raw_output3/data/minecraft/tags/function/load.json
+test_raw_output3/data/raw_test/function/load.mcfunction
+test_raw_output3/data/raw_test/function/main.mcfunction
+test_raw_simple_output/pack.mcmeta
+test_raw_simple_output/data/minecraft/tags/function/load.json
+test_raw_simple_output/data/raw_simple/function/load.mcfunction
+test_raw_simple_output/data/raw_simple/function/main.mcfunction
 test_simple_output/pack.mcmeta
 test_simple_output/data/minecraft/tags/function/load.json
 test_simple_output/data/test/function/load.mcfunction

minecraft_datapack_language-15.2.2/test_raw_complex_output/data/minecraft/tags/function/load.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "raw_complex:load",
+    "raw_complex:load"
+  ]
+}

minecraft_datapack_language-15.2.2/test_raw_complex_output/data/raw_complex/function/main.mcfunction

@@ -0,0 +1,6 @@
+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}
+tellraw @a [{"text":"Testing complex raw blocks"}]
+scoreboard objectives add test_score dummy "Test Score"
+    scoreboard players set @a test_score 0
+    scoreboard players add @a test_score 10
+tellraw @a [{"text":"Raw block completed"}]

minecraft_datapack_language-15.2.2/test_raw_complex_output/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 82,
+    "description": "Test complex raw blocks"
+  }
+}

minecraft_datapack_language-15.2.2/test_raw_complex_output2/data/minecraft/tags/function/load.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "raw_complex:load",
+    "raw_complex:load"
+  ]
+}

minecraft_datapack_language-15.2.2/test_raw_complex_output2/data/raw_complex/function/main.mcfunction

@@ -0,0 +1,6 @@
+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}
+tellraw @a [{"text":"Testing complex raw blocks"}]
+scoreboard objectives add test_score dummy "Test Score"
+    scoreboard players set @a test_score 0
+    scoreboard players add @a test_score 10
+tellraw @a [{"text":"Raw block completed"}]

minecraft_datapack_language-15.2.2/test_raw_complex_output2/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 82,
+    "description": "Test complex raw blocks"
+  }
+}

minecraft_datapack_language-15.2.2/test_raw_complex_output_fixed/data/minecraft/tags/function/load.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "raw_complex:load",
+    "raw_complex:load"
+  ]
+}

minecraft_datapack_language-15.2.2/test_raw_complex_output_fixed/data/raw_complex/function/main.mcfunction

@@ -0,0 +1,6 @@
+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}
+tellraw @a [{"text":"Testing complex raw blocks"}]
+scoreboard objectives add test_score dummy "Test Score"
+scoreboard players set @a test_score 0
+scoreboard players add @a test_score 10
+tellraw @a [{"text":"Raw block completed"}]

minecraft_datapack_language-15.2.2/test_raw_complex_output_fixed/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 82,
+    "description": "Test complex raw blocks"
+  }
+}

minecraft_datapack_language-15.2.2/test_raw_output/data/minecraft/tags/function/load.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "raw_test:load",
+    "raw_test:load"
+  ]
+}

minecraft_datapack_language-15.2.2/test_raw_output/data/raw_test/function/main.mcfunction

@@ -0,0 +1,5 @@
+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}
+tellraw @a [{"text":"Testing raw blocks"}]
+scoreboard objectives add test_score dummy "Test Score"
+    scoreboard players set @a test_score 0
+tellraw @a [{"text":"Raw block completed"}]

minecraft_datapack_language-15.2.2/test_raw_output/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 82,
+    "description": "Test raw blocks"
+  }
+}

minecraft_datapack_language-15.2.2/test_raw_output2/data/minecraft/tags/function/load.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "raw_test:load",
+    "raw_test:load"
+  ]
+}

minecraft_datapack_language-15.2.2/test_raw_output2/data/raw_test/function/main.mcfunction

@@ -0,0 +1,5 @@
+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}
+tellraw @a [{"text":"Testing raw blocks"}]
+scoreboard objectives add test_score dummy "Test Score"
+    scoreboard players set @a test_score 0
+tellraw @a [{"text":"Raw block completed"}]

minecraft_datapack_language-15.2.2/test_raw_output2/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 82,
+    "description": "Test raw blocks"
+  }
+}

minecraft_datapack_language-15.2.2/test_raw_output3/data/minecraft/tags/function/load.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "raw_test:load",
+    "raw_test:load"
+  ]
+}

minecraft_datapack_language-15.2.2/test_raw_output3/data/raw_test/function/main.mcfunction

@@ -0,0 +1,5 @@
+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}
+tellraw @a [{"text":"Testing raw blocks"}]
+scoreboard objectives add test_score dummy "Test Score"
+    scoreboard players set @a test_score 0
+tellraw @a [{"text":"Raw block completed"}]

minecraft_datapack_language-15.2.2/test_raw_output3/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 82,
+    "description": "Test raw blocks"
+  }
+}

minecraft_datapack_language-15.2.2/test_raw_simple_output/data/minecraft/tags/function/load.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "raw_simple:load",
+    "raw_simple:load"
+  ]
+}

minecraft_datapack_language-15.2.2/test_raw_simple_output/data/raw_simple/function/load.mcfunction

@@ -0,0 +1 @@
+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}

minecraft_datapack_language-15.2.2/test_raw_simple_output/data/raw_simple/function/main.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}
+say hello

minecraft_datapack_language-15.2.2/test_raw_simple_output/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 82,
+    "description": "Test simple raw block"
+  }
+}

minecraft_datapack_language-15.2.2/test_simple_output/data/test/function/load.mcfunction

@@ -0,0 +1 @@
+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}

minecraft_datapack_language-15.2.2/test_simple_output2/data/test/function/load.mcfunction

@@ -0,0 +1 @@
+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}

minecraft_datapack_language-15.2.2/test_simple_output3/data/test/function/load.mcfunction

@@ -0,0 +1 @@
+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}

minecraft_datapack_language-15.2.2/test_simple_output4/data/test/function/load.mcfunction

@@ -0,0 +1 @@
+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}

minecraft_datapack_language-15.2.2/test_simple_output5/data/test/function/load.mcfunction

@@ -0,0 +1 @@
+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}

minecraft_datapack_language-15.2.2/test_while_debug/data/hello_world/function/load.mcfunction

@@ -0,0 +1 @@
+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}

{minecraft_datapack_language-15.2.0 → minecraft_datapack_language-15.2.2}/tests/test_comprehensive_edge_cases.py

@@ -487,9 +487,41 @@ class TestErrorHandlingEdgeCases(unittest.TestCase):
     
     def test_malformed_raw_blocks(self):
         """Test malformed raw blocks"""
-        # Skip this test for now due to raw block scanning issues
-        # TODO: Fix raw block scanning and re-enable this test
-        self.skipTest("Raw block scanning has known issues - skipping for now")
+        # Test unterminated raw block
+        code1 = '''pack "test" "Test" 82;
+namespace "test";
+function "main" {
+    $!raw
+    say hello
+}'''
+        
+        with self.assertRaises((MDLLexerError, MDLParserError)):
+            parse_mdl_js(code1)
+        
+        # Test missing opening $!raw
+        code2 = '''pack "test" "Test" 82;
+namespace "test";
+function "main" {
+    say hello
+    raw!$
+}'''
+        
+        with self.assertRaises((MDLLexerError, MDLParserError)):
+            parse_mdl_js(code2)
+        
+        # Test nested raw blocks
+        code3 = '''pack "test" "Test" 82;
+namespace "test";
+function "main" {
+    $!raw
+    say hello
+    $!raw
+    say world
+    raw!$
+}'''
+        
+        with self.assertRaises((MDLLexerError, MDLParserError)):
+            parse_mdl_js(code3)
     
     def test_malformed_control_structures(self):
         """Test malformed control structures"""
@@ -750,9 +782,56 @@ class TestCLIEdgeCases(unittest.TestCase):
     
     def test_build_with_complex_raw_blocks(self):
         """Test building with very complex raw blocks"""
-        # Skip this test for now due to raw block scanning issues
-        # TODO: Fix raw block scanning and re-enable this test
-        self.skipTest("Raw block scanning has known issues - skipping for now")
+        with tempfile.TemporaryDirectory() as temp_dir:
+            # Create MDL file with complex raw blocks
+            mdl_file = Path(temp_dir) / "complex_raw_blocks.mdl"
+            with open(mdl_file, 'w') as f:
+                f.write('''
+                pack "complex_raw_blocks" "Test pack with complex raw blocks" 82;
+                namespace "test";
+                
+                function "main" {
+                    say "Testing complex raw blocks";
+                    
+                    $!raw
+                    scoreboard objectives add test_score dummy "Test Score"
+                    scoreboard players set @a test_score 0
+                    scoreboard players add @a test_score 10
+                    scoreboard players operation @a total_score += @a test_score
+                    raw!$
+                    
+                    $!raw
+                    effect give @a minecraft:speed 10 1
+                    effect give @a minecraft:glowing 5 1 true
+                    playsound minecraft:entity.player.levelup player @a ~ ~ ~ 1 1
+                    raw!$
+                    
+                    say "Raw blocks completed";
+                }
+                
+                on_load "test:main";
+                ''')
+            
+            output_dir = Path(temp_dir) / "output"
+            
+            # Test build command
+            try:
+                build_mdl(str(mdl_file), str(output_dir), verbose=False)
+                
+                # Check that output was created
+                self.assertTrue(output_dir.exists())
+                main_func = output_dir / "data" / "test" / "function" / "main.mcfunction"
+                self.assertTrue(main_func.exists())
+                
+                # Check that the function has content from raw blocks
+                with open(main_func, 'r') as f:
+                    content = f.read()
+                    self.assertIn("scoreboard objectives add", content)
+                    self.assertIn("effect give", content)
+                    self.assertIn("playsound", content)
+                
+            except Exception as e:
+                self.fail(f"Build command with complex raw blocks failed: {e}")
     
     def test_build_with_complex_scopes(self):
         """Test building with complex variable scopes"""

minecraft_datapack_language-15.2.0/docs/_data/version.yml

@@ -1,3 +0,0 @@
-current: "15.1.96"
-tag: "v15.1.96"
-updated_at: "2025-09-02T00:02:03Z"