minecraft-datapack-language 15.1.54__tar.gz → 15.1.56__tar.gz

{minecraft_datapack_language-15.1.54/minecraft_datapack_language.egg-info → minecraft_datapack_language-15.1.56}/PKG-INFO

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

@@ -0,0 +1,3 @@
+current: "15.1.55"
+tag: "v15.1.55"
+updated_at: "2025-09-01T20:21:01Z"

{minecraft_datapack_language-15.1.54 → minecraft_datapack_language-15.1.56}/minecraft_datapack_language/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '15.1.54'
-__version_tuple__ = version_tuple = (15, 1, 54)
+__version__ = version = '15.1.56'
+__version_tuple__ = version_tuple = (15, 1, 56)
 
-__commit_id__ = commit_id = 'g4146eba9a'
+__commit_id__ = commit_id = 'g0f3cc1e96'

{minecraft_datapack_language-15.1.54 → minecraft_datapack_language-15.1.56}/minecraft_datapack_language/cli_build.py

@@ -101,6 +101,12 @@ def _merge_mdl_files(files: List[Path], verbose: bool = False, error_collector:
                     ast['variables'] = []
                 ast['variables'].extend(additional_ast['variables'])
             
+            # Merge namespaces (append to existing list)
+            if 'namespaces' in additional_ast:
+                if 'namespaces' not in ast:
+                    ast['namespaces'] = []
+                ast['namespaces'].extend(additional_ast['namespaces'])
+            
             # Merge registry declarations
             for registry_type in ['recipes', 'loot_tables', 'advancements', 'predicates', 'item_modifiers', 'structures']:
                 if registry_type in additional_ast:
@@ -304,14 +310,25 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
 
 
 def _generate_function_file(ast: Dict[str, Any], output_dir: Path, namespace: str, verbose: bool = False, build_context: BuildContext = None) -> None:
-    """Generate function files from the AST."""
+    """Generate function files from the AST for a specific namespace."""
     if build_context is None:
         build_context = BuildContext()
     
     if 'functions' not in ast:
         return
     
+    # Filter functions by namespace
+    namespace_functions = []
     for func in ast['functions']:
+        # Check if function belongs to this namespace
+        # For now, we'll generate all functions in all namespaces
+        # In the future, we could add namespace annotations to functions
+        namespace_functions.append(func)
+    
+    if verbose:
+        print(f"DEBUG: Processing {len(namespace_functions)} functions for namespace {namespace}")
+    
+    for func in namespace_functions:
         func_name = func['name']
         func_body = func.get('body', [])
         
@@ -718,29 +735,47 @@ def build_mdl(input_path: str, output_path: str, verbose: bool = False, pack_for
         # Generate pack.mcmeta
         _generate_pack_mcmeta(ast, output_dir)
         
-        # Get namespace from AST or fall back to pack name
-        namespace = ast.get('namespace', {}).get('name', ast.get('pack', {}).get('name', 'mdl_pack'))
-        namespace = _slugify(namespace)
+        # Handle multiple namespaces from multiple files
+        namespaces = []
+        
+        # Get namespaces from AST
+        if 'namespaces' in ast:
+            for ns in ast['namespaces']:
+                if 'name' in ns:
+                    namespaces.append(_slugify(ns['name']))
         
-        # Debug: Show what namespace we're using
+        # If no explicit namespaces, use the pack name as default
+        if not namespaces:
+            default_namespace = ast.get('pack', {}).get('name', 'mdl_pack')
+            namespaces.append(_slugify(default_namespace))
+        
+        # Debug: Show what namespaces we're using
         if verbose:
-            print(f"DEBUG: AST namespace: {ast.get('namespace', {})}")
+            print(f"DEBUG: AST namespaces: {ast.get('namespaces', [])}")
             print(f"DEBUG: AST pack: {ast.get('pack', {})}")
-            print(f"DEBUG: Using namespace: {namespace}")
+            print(f"DEBUG: Using namespaces: {namespaces}")
         
-        # Generate functions
+        # Generate functions for each namespace
         build_context = BuildContext()
-        _generate_function_file(ast, output_dir, namespace, verbose, build_context)
+        for namespace in namespaces:
+            if verbose:
+                print(f"DEBUG: Processing namespace: {namespace}")
+            _generate_function_file(ast, output_dir, namespace, verbose, build_context)
         
-        # Generate hook files (load/tick tags)
-        _generate_hook_files(ast, output_dir, namespace, build_context)
+        # Generate hook files (load/tick tags) - use first namespace for global functions
+        primary_namespace = namespaces[0] if namespaces else 'mdl_pack'
+        _generate_hook_files(ast, output_dir, primary_namespace, build_context)
         
-        # Generate global load function
-        _generate_global_load_function(ast, output_dir, namespace, build_context)
+        # Generate global load function - use first namespace for global functions
+        _generate_global_load_function(ast, output_dir, primary_namespace, build_context)
         
         # Create zip file (always create one, use wrapper name if specified)
         zip_name = wrapper if wrapper else output_dir.name
-        zip_path = output_dir / f"{zip_name}.zip"
+        # When using wrapper, create zip in output directory; otherwise in parent directory
+        if wrapper:
+            zip_path = output_dir / f"{zip_name}.zip"
+        else:
+            zip_path = output_dir.parent / f"{zip_name}.zip"
         _create_zip_file(output_dir, zip_path)
         if verbose:
             print(f"[ZIP] Created zip file: {zip_path}")

{minecraft_datapack_language-15.1.54 → minecraft_datapack_language-15.1.56}/minecraft_datapack_language/cli_new.py

@@ -39,7 +39,7 @@ def create_new_project(project_name: str, pack_name: str = None, pack_format: in
         project_dir.mkdir(parents=True, exist_ok=False)
         
         # Create the main MDL file
-        mdl_file = project_dir / f"{clean_name}.mdl"
+        mdl_file = project_dir / "main.mdl"
         
         # Generate template content
         template_content = _generate_mdl_template(clean_name, pack_name, pack_format)
@@ -61,9 +61,9 @@ def create_new_project(project_name: str, pack_name: str = None, pack_format: in
         print()
         print("[NEXT] Next steps:")
         print(f"  1. cd {clean_name}")
-        print(f"  2. Edit {clean_name}.mdl with your code")
-        print(f"  3. mdl build --mdl {clean_name}.mdl -o dist")
-        print(f"  4. mdl check {clean_name}.mdl")
+        print(f"  2. Edit main.mdl with your code")
+        print(f"  3. mdl build --mdl main.mdl -o dist")
+        print(f"  4. mdl check main.mdl")
         print()
         print("[INFO] Learn more:")
         print("   • Language Reference: https://www.mcmdl.com/docs/language-reference")
@@ -168,7 +168,7 @@ This datapack was generated using the MDL CLI tool. MDL is a simplified language
 ```
 {project_name}/
 ├── README.md              # This file
-└── {project_name}.mdl    # Main MDL source file
+└── main.mdl              # Main MDL source file
 ```
 
 ## [NEXT] Getting Started

{minecraft_datapack_language-15.1.54 → minecraft_datapack_language-15.1.56/minecraft_datapack_language.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.1.54
+Version: 15.1.56
 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.1.54 → minecraft_datapack_language-15.1.56}/tests/test_cli_comprehensive.py

@@ -348,11 +348,11 @@ class TestCLIComprehensive(unittest.TestCase):
     def test_check_command_with_errors(self):
         """Test the check command with invalid syntax"""
         with tempfile.TemporaryDirectory() as temp_dir:
-            # Create an invalid MDL file
+            # Create an invalid MDL file with a syntax error that the linter can catch
             mdl_file = Path(temp_dir) / "invalid_test.mdl"
-                        with open(mdl_file, 'w') as f:
+            with open(mdl_file, 'w') as f:
                 f.write('''
-                pack "invalid_test" "Invalid test pack" 82;
+                pack "invalid_test" "Invalid test pack" 82
                 namespace "test";
 
                 function "main" {
@@ -362,18 +362,18 @@ class TestCLIComprehensive(unittest.TestCase):
                 on_load "test:main";
                 ''')
             
-                        # Test check command - should pass now that syntax is fixed
+            # Test check command - should fail due to missing semicolon
             try:
                 result = subprocess.run([
                     "mdl", "check", str(mdl_file)
-                ], capture_output=True, text=True, check=True)
+                ], capture_output=True, text=True, check=False)
 
-                # Should have passed
-                self.assertEqual(result.returncode, 0)
-                self.assertIn("Successfully checked", result.stdout)
+                # Should have failed due to missing semicolon
+                self.assertNotEqual(result.returncode, 0)
+                self.assertIn("Error:", result.stdout)
 
-            except subprocess.CalledProcessError as e:
-                self.fail(f"Check command failed: {e}\nstdout: {e.stdout}\nstderr: {e.stderr}")
+            except Exception as e:
+                self.fail(f"Check command failed unexpectedly: {e}")
     
     def test_new_command(self):
         """Test the new command"""

{minecraft_datapack_language-15.1.54 → minecraft_datapack_language-15.1.56}/tests/test_comprehensive_features.py

@@ -463,7 +463,7 @@ class TestComplexIntegrationFeatures(unittest.TestCase):
         function "start_game" {
             score = 0;
             level = 1;
-            say Game started! Level: $level$, Score: $score$;
+            say "Game started! Level: $level$, Score: $score$";
         }
 
         // Level up function
@@ -471,7 +471,7 @@ class TestComplexIntegrationFeatures(unittest.TestCase):
             if "$score$ >= 100" {
                 level = level + 1;
                 score = score - 100;
-                say Level up! New level: $level$;
+                say "Level up! New level: $level$";
                 tellraw @a {"text":"Player leveled up!","color":"gold"};
             }
         }

minecraft_datapack_language-15.1.54/docs/_data/version.yml

@@ -1,3 +0,0 @@
-current: "15.1.53"
-tag: "v15.1.53"
-updated_at: "2025-09-01T20:14:39Z"