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

minecraft_datapack_language/cli_build.py

@@ -261,8 +261,8 @@ def _process_say_command_with_variables(content: str, selector: str) -> str:
     for i, part in enumerate(parts):
         if i % 2 == 0:
             # Text part
-            if part:  # Add text component if not empty
-                components.append(f'{{"text":"{part}"}}')
+            if part.strip():  # Only add non-empty text parts
+                components.append(f'{{"text": "{part.strip()}"}}')
         else:
             # Variable part
             var_name = part
@@ -278,12 +278,16 @@ def _process_say_command_with_variables(content: str, selector: str) -> str:
                 # Simple variable: $variable$ - use server armor stand
                 components.append(f'{{"score":{{"name":"@e[type=armor_stand,tag=mdl_server,limit=1]","objective":"{var_name}"}}}}')
     
-    # Combine all components
-    components_str = ','.join(components)
+    for var_name in matches:
+        # Add score component for each variable
+        components.append(f'{{"score": {{"name": "@e[type=armor_stand,tag=mdl_server,limit=1]", "objective": "{var_name}"}}}}')
+    
+    # Join components and create tellraw command
+    components_str = ', '.join(components)
     return f'tellraw @a [{components_str}]'
 
 
-def _process_statement(statement: Any, namespace: str, function_name: str, statement_index: int = 0, is_tag_function: bool = False, selector: str = "@s", variable_scopes: Dict[str, str] = None, build_context: BuildContext = None) -> List[str]:
+def _process_statement(statement: Any, namespace: str, function_name: str, statement_index: int = 0, is_tag_function: bool = False, selector: str = "@s", variable_scopes: Dict[str, str] = None, build_context: BuildContext = None, output_dir: Path = None) -> List[str]:
     """Process a single statement and return Minecraft commands."""
     if variable_scopes is None:
         variable_scopes = {}
@@ -384,13 +388,13 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
         # Create conditional function
         if_commands = []
         for i, stmt in enumerate(then_body):
-            if_commands.extend(_process_statement(stmt, namespace, if_func_name, i, is_tag_function, selector, variable_scopes, build_context))
+            if_commands.extend(_process_statement(stmt, namespace, if_func_name, i, is_tag_function, selector, variable_scopes, build_context, output_dir))
         
         # Write conditional function
         if if_commands:
-            # Use the output directory from build context
-            if hasattr(build_context, 'output_dir'):
-                if_dir = build_context.output_dir / "data" / namespace / "function"
+            # Use the output directory parameter
+            if output_dir:
+                if_dir = output_dir / "data" / namespace / "function"
             else:
                 if_dir = Path(f"data/{namespace}/function")
             ensure_dir(str(if_dir))
@@ -401,7 +405,7 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
         if else_body:
             else_commands = []
             for i, stmt in enumerate(else_body):
-                else_commands.extend(_process_statement(stmt, namespace, else_func_name, i, is_tag_function, selector, variable_scopes, build_context))
+                else_commands.extend(_process_statement(stmt, namespace, else_func_name, i, is_tag_function, selector, variable_scopes, build_context, output_dir))
             
             if else_commands:
                 with open(if_dir / f"{else_func_name}.mcfunction", 'w', encoding='utf-8') as f:
@@ -418,7 +422,7 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
     
     elif statement['type'] == 'while_loop' or statement['type'] == 'while_statement':
         # Handle while loops using recursion
-        loop_commands = _process_while_loop_recursion(statement, namespace, function_name, statement_index, is_tag_function, selector, variable_scopes, build_context)
+        loop_commands = _process_while_loop_recursion(statement, namespace, function_name, statement_index, is_tag_function, selector, variable_scopes, build_context, output_dir)
         commands.extend(loop_commands)
     
     elif statement['type'] == 'function_call':
@@ -464,7 +468,7 @@ def _generate_function_file(ast: Dict[str, Any], output_dir: Path, namespace: st
         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)
+                commands = _process_statement(statement, namespace, func_name, i, False, "@s", {}, 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:
@@ -605,7 +609,7 @@ def _collect_conditional_functions(if_statement, namespace: str, function_name:
     return conditional_functions
 
 
-def _process_while_loop_recursion(while_statement, namespace: str, function_name: str, statement_index: int, is_tag_function: bool = False, selector: str = "@s", variable_scopes: Dict[str, str] = None, build_context: BuildContext = None) -> List[str]:
+def _process_while_loop_recursion(while_statement, namespace: str, function_name: str, statement_index: int, is_tag_function: bool = False, selector: str = "@s", variable_scopes: Dict[str, str] = None, build_context: BuildContext = None, output_dir: Path = None) -> List[str]:
     """Process while loops using recursive function calls."""
     if variable_scopes is None:
         variable_scopes = {}
@@ -616,38 +620,28 @@ def _process_while_loop_recursion(while_statement, namespace: str, function_name
     condition = while_statement['condition']
     body = while_statement['body']
     
-    print(f"DEBUG: _process_while_loop_recursion called with namespace={namespace}, function_name={function_name}, statement_index={statement_index}")
-    
     # Generate unique function names - they should be the same according to the test
     loop_func_name = f"test_{function_name}_while_{statement_index}"
     
-    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_func_name, i, is_tag_function, selector, variable_scopes, build_context))
-    
-    print(f"DEBUG: Generated body_commands: {body_commands}")
+        body_commands.extend(_process_statement(stmt, namespace, loop_func_name, i, is_tag_function, selector, variable_scopes, build_context, output_dir))
     
     # 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'):
-            func_dir = build_context.output_dir / "data" / namespace / "function"
+        # Use the output directory parameter
+        if output_dir:
+            func_dir = output_dir / "data" / namespace / "function"
         else:
             func_dir = Path(f"data/{namespace}/function")
         ensure_dir(str(func_dir))
-        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))
-        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.88.dist-info → minecraft_datapack_language-15.1.90.dist-info}/METADATA

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

@@ -1,8 +1,8 @@
 minecraft_datapack_language/__init__.py,sha256=i-qCchbe5b2Fshgc6yCU9mddOLs2UBt9SAcLqfUIrT0,606
-minecraft_datapack_language/_version.py,sha256=fv38xVFu__6s97Gjw8e-QeiQSNdkB1hWNUIyL68EN_E,708
+minecraft_datapack_language/_version.py,sha256=yOpzMLbfnlKEce2HqQmpEoDiWCl7A90X3NSpFtT_TDs,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=OZ_EN_OcbCzwiyreL9dicoh10IyT1Y2vV8u84sAWgps,42469
+minecraft_datapack_language/cli_build.py,sha256=XDVazfKVMC_3Bb4yGESZ-ApOD4Im4HMuOXXovvuK7v4,42180
 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.88.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-15.1.88.dist-info/METADATA,sha256=dV8wDtO91NTwxUeNkniv3Nb8s-tB_vGfZcntYExDaK4,35230
-minecraft_datapack_language-15.1.88.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-15.1.88.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-15.1.88.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-15.1.88.dist-info/RECORD,,
+minecraft_datapack_language-15.1.90.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-15.1.90.dist-info/METADATA,sha256=ZHZk2YphCsjnc3R1VmKHiMFTmGdV_184hC-YKhEY9yw,35230
+minecraft_datapack_language-15.1.90.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-15.1.90.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-15.1.90.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-15.1.90.dist-info/RECORD,,