minecraft-datapack-language 15.3.4__py3-none-any.whl → 15.3.6__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.3.4'
-__version_tuple__ = version_tuple = (15, 3, 4)
+__version__ = version = '15.3.6'
+__version_tuple__ = version_tuple = (15, 3, 6)
 
 __commit_id__ = commit_id = None

minecraft_datapack_language/cli_build.py

@@ -424,6 +424,7 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
     elif statement['type'] == 'function_call':
         func_name = statement['name']
         scope = statement.get('scope')
+        func_namespace = statement.get('namespace', namespace)  # Use specified namespace or current namespace
         
         if scope:
             # Handle scoped function call
@@ -435,10 +436,10 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
                 selector = scope
             
             # Generate execute as command
-            commands.append(f"execute as {selector} run function {namespace}:{func_name}")
+            commands.append(f"execute as {selector} run function {func_namespace}:{func_name}")
         else:
             # Simple function call without scope
-            commands.append(f"function {namespace}:{func_name}")
+            commands.append(f"function {func_namespace}:{func_name}")
     
     elif statement['type'] == 'raw_text':
         # Raw Minecraft commands
@@ -473,12 +474,21 @@ def _generate_function_file(ast: Dict[str, Any], output_dir: Path, namespace: st
         func_name = func['name']
         func_body = func.get('body', [])
         
+        # Collect variable scopes from the AST
+        variable_scopes = {}
+        if 'variables' in ast:
+            for var_decl in ast['variables']:
+                var_name = var_decl['name']
+                var_scope = var_decl.get('scope')
+                if var_scope:
+                    variable_scopes[var_name] = var_scope
+        
         # Generate function content
         function_commands = []
         for i, statement in enumerate(func_body):
             try:
                 print(f"DEBUG: Processing statement {i} of type {statement.get('type', 'unknown')}: {statement}")
-                commands = _process_statement(statement, namespace, func_name, i, False, "@s", {}, build_context, output_dir)
+                commands = _process_statement(statement, namespace, func_name, i, False, "@s", variable_scopes, build_context, output_dir)
                 function_commands.extend(commands)
                 print(f"Generated {len(commands)} commands for statement {i} in function {func_name}: {commands}")
             except Exception as e:
@@ -764,6 +774,7 @@ def _ast_to_pack(ast: Dict[str, Any], mdl_files: List[Path]) -> Pack:
                         elif statement.get('type') == 'function_call':
                             func_name = statement['name']
                             scope = statement.get('scope')
+                            func_namespace = statement.get('namespace', namespace_name)  # Use specified namespace or current namespace
                             
                             if scope:
                                 # Handle scoped function call
@@ -775,10 +786,10 @@ def _ast_to_pack(ast: Dict[str, Any], mdl_files: List[Path]) -> Pack:
                                     selector = scope
                                 
                                 # Generate execute as command
-                                function.commands.append(f"execute as {selector} run function {namespace_name}:{func_name}")
+                                function.commands.append(f"execute as {selector} run function {func_namespace}:{func_name}")
                             else:
                                 # Simple function call without scope
-                                function.commands.append(f"function {namespace_name}:{func_name}")
+                                function.commands.append(f"function {func_namespace}:{func_name}")
                         elif statement.get('type') == 'variable_assignment':
                             # Handle variable assignments
                             var_name = statement['name']

minecraft_datapack_language/mdl_parser_js.py

@@ -610,6 +610,15 @@ class MDLParser:
                     suggestion="Use format: function \"namespace:function_name<@selector>\""
                 )
         
+        # Extract function name from namespace:function_name format
+        if ':' in name:
+            namespace_parts = name.split(':', 1)
+            if len(namespace_parts) == 2:
+                namespace_name = namespace_parts[0]
+                function_name = namespace_parts[1]
+                # Store both namespace and function name
+                return {"type": "function_call", "name": function_name, "scope": scope, "namespace": namespace_name}
+        
         self._match(TokenType.SEMICOLON)
         
         return {"type": "function_call", "name": name, "scope": scope}

{minecraft_datapack_language-15.3.4.dist-info → minecraft_datapack_language-15.3.6.dist-info}/METADATA

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

@@ -1,8 +1,8 @@
 minecraft_datapack_language/__init__.py,sha256=i-qCchbe5b2Fshgc6yCU9mddOLs2UBt9SAcLqfUIrT0,606
-minecraft_datapack_language/_version.py,sha256=VBgspE8SeVlI_5KjUnpoKLbxrMSzz1rysOdbcXXNdwg,706
+minecraft_datapack_language/_version.py,sha256=TS_Bj5zM7LLd7rmfHMTCHi-Qpxtxi8wAIBVfacsXbjE,706
 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=curfcVYXZczDPRE-eiBPokwU10_Z-xdvnCHVcoXFfuk,43667
+minecraft_datapack_language/cli_build.py,sha256=KiZhYxCEu2gnz7JPuYSPOe2buyETSY2XjMPw5PunfHw,44281
 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=F8I6A2CjV1sGn8a7OgG66nRKm-0jKxQpOq3fkUgkYlA,26201
 minecraft_datapack_language/mdl_linter.py,sha256=z85xoAglENurCh30bR7kEHZ_JeMxcYaLDcGNRAl-RAI,17253
-minecraft_datapack_language/mdl_parser_js.py,sha256=JAwjsC6hdTrZYtNelpt03vOMqphAEbTwK68ejXwJsqQ,39702
+minecraft_datapack_language/mdl_parser_js.py,sha256=Ap7EDpC5wbu1qFmC8htzd8rRqSyYugt58h0AppfDD6s,40171
 minecraft_datapack_language/pack.py,sha256=nYiXQ3jgJlDfc4m-65f7C2LFhDRioaUU_XVy6Na4SJI,34625
 minecraft_datapack_language/utils.py,sha256=Aq0HAGlXqj9BUTEjaEilpvzEW0EtZYYMMwOqG9db6dE,684
-minecraft_datapack_language-15.3.4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-15.3.4.dist-info/METADATA,sha256=W90GO33CEecqTWLBbxpxeNHcDb_n2K34zv5pagEDLAw,35229
-minecraft_datapack_language-15.3.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-15.3.4.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-15.3.4.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-15.3.4.dist-info/RECORD,,
+minecraft_datapack_language-15.3.6.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-15.3.6.dist-info/METADATA,sha256=J1TMfHwQSpSrLgCeOaOQB0X67JeNNBBoTArWgZ2RtZs,35229
+minecraft_datapack_language-15.3.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-15.3.6.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-15.3.6.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-15.3.6.dist-info/RECORD,,