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

minecraft_datapack_language/cli_build.py

@@ -618,20 +618,25 @@ def _process_while_loop_recursion(while_statement, namespace: str, function_name
     
     print(f"DEBUG: _process_while_loop_recursion called with namespace={namespace}, function_name={function_name}, statement_index={statement_index}")
     
-    # Generate unique function names
+    # Generate unique function names - they should be the same according to the test
     loop_func_name = f"test_{function_name}_while_{statement_index}"
-    loop_body_func_name = f"test_{function_name}_while_{statement_index}"
     
-    print(f"DEBUG: Generated function names: loop_func_name={loop_func_name}, loop_body_func_name={loop_body_func_name}")
+    print(f"DEBUG: Generated function name: loop_func_name={loop_func_name}")
     
     # Process loop body
     body_commands = []
     for i, stmt in enumerate(body):
-        body_commands.extend(_process_statement(stmt, namespace, loop_body_func_name, i, is_tag_function, selector, variable_scopes, build_context))
+        body_commands.extend(_process_statement(stmt, namespace, loop_func_name, i, is_tag_function, selector, variable_scopes, build_context))
     
     print(f"DEBUG: Generated body_commands: {body_commands}")
     
-    # Write loop body function
+    # Add the recursive call to the loop body
+    minecraft_condition = _convert_condition_to_minecraft_syntax(condition, selector)
+    body_commands.append(f"execute if {minecraft_condition} run function {namespace}:{loop_func_name}")
+    
+    print(f"DEBUG: Final body_commands with recursive call: {body_commands}")
+    
+    # Write the single loop function
     if body_commands:
         # Use the output directory from build context
         if hasattr(build_context, 'output_dir'):
@@ -639,23 +644,10 @@ def _process_while_loop_recursion(while_statement, namespace: str, function_name
         else:
             func_dir = Path(f"data/{namespace}/function")
         ensure_dir(str(func_dir))
-        print(f"DEBUG: Writing loop body function to: {func_dir / f'{loop_body_func_name}.mcfunction'}")
-        with open(func_dir / f"{loop_body_func_name}.mcfunction", 'w', encoding='utf-8') as f:
+        print(f"DEBUG: Writing loop function to: {func_dir / f'{loop_func_name}.mcfunction'}")
+        with open(func_dir / f"{loop_func_name}.mcfunction", 'w', encoding='utf-8') as f:
             f.write('\n'.join(body_commands))
-    
-    # Create the main loop function
-    minecraft_condition = _convert_condition_to_minecraft_syntax(condition, selector)
-    loop_commands = [
-        f"execute if {minecraft_condition} run function {namespace}:{loop_body_func_name}",
-        f"execute if {minecraft_condition} run function {namespace}:{loop_func_name}"
-    ]
-    
-    print(f"DEBUG: Generated loop_commands: {loop_commands}")
-    
-    # Write loop function
-    print(f"DEBUG: Writing loop function to: {func_dir / f'{loop_func_name}.mcfunction'}")
-    with open(func_dir / f"{loop_func_name}.mcfunction", 'w', encoding='utf-8') as f:
-        f.write('\n'.join(loop_commands))
+        print(f"DEBUG: Successfully wrote loop function file")
     
     # Return the command to start the loop with conditional execution
     return [f"execute if {minecraft_condition} run function {namespace}:{loop_func_name}"]

{minecraft_datapack_language-15.1.85.dist-info → minecraft_datapack_language-15.1.87.dist-info}/METADATA

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

@@ -1,8 +1,8 @@
 minecraft_datapack_language/__init__.py,sha256=i-qCchbe5b2Fshgc6yCU9mddOLs2UBt9SAcLqfUIrT0,606
-minecraft_datapack_language/_version.py,sha256=PqHkFAxhyrNO5Mwk8loTEBrVpQMrg61uHpyY73GGUjw,708
+minecraft_datapack_language/_version.py,sha256=nC7MWWtPzEfk0A1esvu5_LzNw4_8oKQTKDDhif5tHic,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=EyY1Zeb4X-XRAR64L-S3t8nSPqrl30WbUi1scnvWXc0,42816
+minecraft_datapack_language/cli_build.py,sha256=OZ_EN_OcbCzwiyreL9dicoh10IyT1Y2vV8u84sAWgps,42469
 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
@@ -16,9 +16,9 @@ minecraft_datapack_language/mdl_linter.py,sha256=z85xoAglENurCh30bR7kEHZ_JeMxcYa
 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.85.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-15.1.85.dist-info/METADATA,sha256=maZmQHh1y31o_gqsWH1hxnNlkR-bA72bP34B8RnPswg,35230
-minecraft_datapack_language-15.1.85.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-15.1.85.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-15.1.85.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-15.1.85.dist-info/RECORD,,
+minecraft_datapack_language-15.1.87.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-15.1.87.dist-info/METADATA,sha256=3oZb-xMSm-qR-F1GS9cqantDvqUatKWGMnl-WlNjGYk,35230
+minecraft_datapack_language-15.1.87.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-15.1.87.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-15.1.87.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-15.1.87.dist-info/RECORD,,