minecraft-datapack-language 15.1.55__py3-none-any.whl → 15.1.57__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.55'
-__version_tuple__ = version_tuple = (15, 1, 55)
+__version__ = version = '15.1.57'
+__version_tuple__ = version_tuple = (15, 1, 57)
 
 __commit_id__ = commit_id = None

minecraft_datapack_language/cli_build.py

@@ -310,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', [])
         
@@ -724,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.parent / 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/mdl_parser_js.py

@@ -51,7 +51,12 @@ class MDLParser:
                     ast['pack'] = self._parse_pack_declaration()
                 elif self._peek().type == TokenType.NAMESPACE:
                     namespace_decl = self._parse_namespace_declaration()
+                    # Store namespace in both places for compatibility
                     ast['namespace'] = namespace_decl
+                    # Also collect all namespaces in a list
+                    if 'namespaces' not in ast:
+                        ast['namespaces'] = []
+                    ast['namespaces'].append(namespace_decl)
                     self.current_namespace = namespace_decl['name']  # Update current namespace
                     print(f"DEBUG: Parser updated current_namespace to: {self.current_namespace}")
                 elif self._peek().type == TokenType.FUNCTION:
@@ -672,10 +677,8 @@ class MDLParser:
         say_token = self._match(TokenType.SAY)
         content = say_token.value
         
-        # The semicolon should already be consumed by the lexer
-        # But let's make sure we have it
-        if not self._is_at_end() and self._peek().type == TokenType.SEMICOLON:
-            self._match(TokenType.SEMICOLON)
+        # Always consume the semicolon
+        self._match(TokenType.SEMICOLON)
         
         return {"type": "command", "command": f"say {content}"}
     

{minecraft_datapack_language-15.1.55.dist-info → minecraft_datapack_language-15.1.57.dist-info}/METADATA

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

@@ -1,8 +1,8 @@
 minecraft_datapack_language/__init__.py,sha256=i-qCchbe5b2Fshgc6yCU9mddOLs2UBt9SAcLqfUIrT0,606
-minecraft_datapack_language/_version.py,sha256=NQnt-crdDKDeC7jaDFNdbb6plbYvj8ruHh-M1rXOL3I,708
+minecraft_datapack_language/_version.py,sha256=e1wftaollHKfwpV3prM6DMSEbZLFxc5I0T97bqT1AXA,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=jtBBQiyySb1zQS2ShiaM0LHSP2LR51ILlrgNfYPYfAE,32722
+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=uaKH0VBC43XBt_Hztc35-BfC9bYlsDdLbAfe_42rrtI,8235
@@ -13,12 +13,12 @@ minecraft_datapack_language/linter.py,sha256=7UqbygC5JPCGg-BSOq65NB2xEJBu_OUOYII
 minecraft_datapack_language/mdl_errors.py,sha256=a_-683gjF3gfGRpDMbRgCXmXD9_aYYBmLodNH6fe29A,11596
 minecraft_datapack_language/mdl_lexer_js.py,sha256=G2leNsQz7792uiGig7d1AcQCOFNnmACJD_pXI0wTxGc,26169
 minecraft_datapack_language/mdl_linter.py,sha256=z85xoAglENurCh30bR7kEHZ_JeMxcYaLDcGNRAl-RAI,17253
-minecraft_datapack_language/mdl_parser_js.py,sha256=Ng22mKVbMNC4412Xb09i8fcNFPTPrW4NxFeK7Tv7EBQ,38539
+minecraft_datapack_language/mdl_parser_js.py,sha256=4VMWx6O7A10afTzjGnnwL_Sh52osIO84ObqHp8KoDZw,38677
 minecraft_datapack_language/pack.py,sha256=nYiXQ3jgJlDfc4m-65f7C2LFhDRioaUU_XVy6Na4SJI,34625
 minecraft_datapack_language/utils.py,sha256=Aq0HAGlXqj9BUTEjaEilpvzEW0EtZYYMMwOqG9db6dE,684
-minecraft_datapack_language-15.1.55.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-15.1.55.dist-info/METADATA,sha256=INh-sneVWPG4lLmN7cmitdRDplKFW-zuFb9SFAIRsYA,35230
-minecraft_datapack_language-15.1.55.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-15.1.55.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-15.1.55.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-15.1.55.dist-info/RECORD,,
+minecraft_datapack_language-15.1.57.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-15.1.57.dist-info/METADATA,sha256=UcRKDAB72tkMNUxciAVTy8fl24H_mWGhhLg__RdQ9Q0,35230
+minecraft_datapack_language-15.1.57.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-15.1.57.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-15.1.57.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-15.1.57.dist-info/RECORD,,