minecraft-datapack-language 15.1.54__py3-none-any.whl → 15.1.56__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 = '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 = None

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

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

@@ -1,11 +1,11 @@
 minecraft_datapack_language/__init__.py,sha256=i-qCchbe5b2Fshgc6yCU9mddOLs2UBt9SAcLqfUIrT0,606
-minecraft_datapack_language/_version.py,sha256=MJnAS01Xj9LllNeVM6ZB7QjcnbHlUMSoJJjZit4by0o,708
+minecraft_datapack_language/_version.py,sha256=NjQZ_VQk7ObXSEZETeVAj46ARCqVlJIGL9t_gOTOncA,708
 minecraft_datapack_language/ast_nodes.py,sha256=pgjI2Nlap3ixFPgWqGSkqncG9zB91h5BKgRjtcJqMew,2118
 minecraft_datapack_language/cli.py,sha256=p5A_tEEXugN2NhQFbbgfwi4FxbWYD91RWeKR_A3Vuec,6263
-minecraft_datapack_language/cli_build.py,sha256=JPQmdr7DbVCZ0Ra5-svhaPlBEuu7drtMFb5vjGLkL4Y,32440
+minecraft_datapack_language/cli_build.py,sha256=H_bjXj1Ch8A6CZ9yZWmeoXay6IiBQCSDxpRJozvCt-E,34048
 minecraft_datapack_language/cli_check.py,sha256=bPq9gHsxQ1CIiftkrAtRCifWkVAyjp5c8Oay2NNQ1qs,6277
 minecraft_datapack_language/cli_help.py,sha256=jUTHUQBONAZKVTdQK9tNPXq4c_6xpsafNOvHDjkEldg,12243
-minecraft_datapack_language/cli_new.py,sha256=KGbKcZW3POwZFAS0nzcwl2NoTUygXzwcUe-iWYyPKEg,8268
+minecraft_datapack_language/cli_new.py,sha256=uaKH0VBC43XBt_Hztc35-BfC9bYlsDdLbAfe_42rrtI,8235
 minecraft_datapack_language/cli_utils.py,sha256=gLGe2nAn8pLiSJhn-DpNvMxo0th_Gj89I-oSeyPx4zU,9293
 minecraft_datapack_language/dir_map.py,sha256=HmxFkuvWGkzHF8o_GFb4BpuMCRc6QMw8UbmcAI8JVdY,1788
 minecraft_datapack_language/expression_processor.py,sha256=GN6cuRNvgI8TrV6YnEHrA9P0X-ACTT7rCBh4WlOPjSI,20140
@@ -16,9 +16,9 @@ minecraft_datapack_language/mdl_linter.py,sha256=z85xoAglENurCh30bR7kEHZ_JeMxcYa
 minecraft_datapack_language/mdl_parser_js.py,sha256=Ng22mKVbMNC4412Xb09i8fcNFPTPrW4NxFeK7Tv7EBQ,38539
 minecraft_datapack_language/pack.py,sha256=nYiXQ3jgJlDfc4m-65f7C2LFhDRioaUU_XVy6Na4SJI,34625
 minecraft_datapack_language/utils.py,sha256=Aq0HAGlXqj9BUTEjaEilpvzEW0EtZYYMMwOqG9db6dE,684
-minecraft_datapack_language-15.1.54.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-15.1.54.dist-info/METADATA,sha256=PsesUE-ZUUVm84GX7i-kS2JtAZ1oQD3QApGhICUb_aU,35230
-minecraft_datapack_language-15.1.54.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-15.1.54.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-15.1.54.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-15.1.54.dist-info/RECORD,,
+minecraft_datapack_language-15.1.56.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-15.1.56.dist-info/METADATA,sha256=vqfaptGPBT4zrlKxlQ3Vkrgirq72swYQtJstr8BWjQU,35230
+minecraft_datapack_language-15.1.56.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-15.1.56.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-15.1.56.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-15.1.56.dist-info/RECORD,,