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

minecraft_datapack_language/cli_build.py

@@ -423,8 +423,23 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
     
     elif statement['type'] == 'function_call':
         func_name = statement['name']
-        # Simple function call
-        commands.append(f"function {namespace}:{func_name}")
+        scope = statement.get('scope')
+        func_namespace = statement.get('namespace', namespace)  # Use specified namespace or current namespace
+        
+        if scope:
+            # Handle scoped function call
+            if scope == 'global':
+                # Global scope uses the server armor stand
+                selector = "@e[type=armor_stand,tag=mdl_server,limit=1]"
+            else:
+                # Use the specified scope selector
+                selector = scope
+            
+            # Generate execute as command
+            commands.append(f"execute as {selector} run function {func_namespace}:{func_name}")
+        else:
+            # Simple function call without scope
+            commands.append(f"function {func_namespace}:{func_name}")
     
     elif statement['type'] == 'raw_text':
         # Raw Minecraft commands
@@ -748,7 +763,24 @@ def _ast_to_pack(ast: Dict[str, Any], mdl_files: List[Path]) -> Pack:
                         if statement.get('type') == 'command':
                             function.commands.append(statement['command'])
                         elif statement.get('type') == 'function_call':
-                            function.commands.append(f"function {statement['name']}")
+                            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
+                                if scope == 'global':
+                                    # Global scope uses the server armor stand
+                                    selector = "@e[type=armor_stand,tag=mdl_server,limit=1]"
+                                else:
+                                    # Use the specified scope selector
+                                    selector = scope
+                                
+                                # Generate execute as command
+                                function.commands.append(f"execute as {selector} run function {func_namespace}:{func_name}")
+                            else:
+                                # Simple function call without scope
+                                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

@@ -589,9 +589,39 @@ class MDLParser:
         name_token = self._match(TokenType.STRING)
         name = name_token.value.strip('"').strip("'")
         
+        # Check for scope selector after function name
+        scope = None
+        if '<' in name and name.endswith('>'):
+            # Extract scope selector from function name
+            parts = name.split('<', 1)
+            if len(parts) == 2:
+                function_name = parts[0]
+                scope_selector = parts[1][:-1]  # Remove closing >
+                scope = scope_selector
+                name = function_name
+            else:
+                # Malformed scope selector
+                raise create_parser_error(
+                    message="Malformed scope selector in function call",
+                    file_path=self.source_file,
+                    line=self._peek().line,
+                    column=self._peek().column,
+                    line_content=name,
+                    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}
+        return {"type": "function_call", "name": name, "scope": scope}
     
     def _parse_execute_statement(self) -> ExecuteStatement:
         """Parse execute statement."""

{minecraft_datapack_language-15.3.3.dist-info → minecraft_datapack_language-15.3.5.dist-info}/METADATA

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

@@ -1,8 +1,8 @@
 minecraft_datapack_language/__init__.py,sha256=i-qCchbe5b2Fshgc6yCU9mddOLs2UBt9SAcLqfUIrT0,606
-minecraft_datapack_language/_version.py,sha256=C5nmvQW6PxdqCTZDxt9kfZN_cSMbbiYTuFuRiksPIN4,706
+minecraft_datapack_language/_version.py,sha256=NdqjbaB72vB3alACXOO2w7dz3_6tduzQNYfib3o1u74,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=VfFkfDCDPEd2KC8L70NXXNPXEf9tMe5Lc6UWX1n6V9I,42139
+minecraft_datapack_language/cli_build.py,sha256=owE_cAA3HH7n3LjIIIgyDEHPPB-EyubrwR0NS9mUufY,43924
 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=DghfDnBxMSs3Bfo1IgxkmeY6Er-3ceeQkKwEn12u6w8,38776
+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.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-15.3.3.dist-info/METADATA,sha256=7Pq3PGVrp363uw0e1R6ObS7u_9BtXhhb4iLHi8FzPXQ,35229
-minecraft_datapack_language-15.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-15.3.3.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-15.3.3.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-15.3.3.dist-info/RECORD,,
+minecraft_datapack_language-15.3.5.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-15.3.5.dist-info/METADATA,sha256=TM4dfgr2yrEgiZ9Utqsl9JLpqcqMvtbE8PrgWbKjjbY,35229
+minecraft_datapack_language-15.3.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-15.3.5.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-15.3.5.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-15.3.5.dist-info/RECORD,,