minecraft-datapack-language 15.4.41__py3-none-any.whl → 15.4.43__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.4.41'
-__version_tuple__ = version_tuple = (15, 4, 41)
+__version__ = version = '15.4.43'
+__version_tuple__ = version_tuple = (15, 4, 43)
 
 __commit_id__ = commit_id = None

minecraft_datapack_language/ast_nodes.py

@@ -74,6 +74,9 @@ class FunctionCall(ASTNode):
     namespace: str
     name: str
     scope: Optional[str]  # Optional scope for the function call
+    # Macro invocation support (Minecraft function macros)
+    macro_json: Optional[str] = None  # Inline compound JSON string (including braces)
+    with_clause: Optional[str] = None  # Raw "with <data source> [path]" clause (without leading 'with')
 
 
 @dataclass
@@ -132,6 +135,12 @@ class ScoreboardCommand(ASTNode):
     command: str
 
 
+@dataclass
+class MacroLine(ASTNode):
+    """A raw macro line for mcfunction starting with '$' and containing $(vars)."""
+    content: str
+
+
 # Expression nodes
 @dataclass
 class BinaryExpression(ASTNode):

minecraft_datapack_language/mdl_compiler.py

@@ -11,7 +11,7 @@ from typing import Dict, List, Any, Optional
 from .ast_nodes import (
     Program, PackDeclaration, NamespaceDeclaration, TagDeclaration,
     VariableDeclaration, VariableAssignment, VariableSubstitution, FunctionDeclaration,
-    FunctionCall, IfStatement, WhileLoop, HookDeclaration, RawBlock,
+    FunctionCall, IfStatement, WhileLoop, HookDeclaration, RawBlock, MacroLine,
     SayCommand, BinaryExpression, LiteralExpression, ParenthesizedExpression
 )
 from .dir_map import get_dir_map, DirMap
@@ -166,11 +166,27 @@ class MDLCompiler:
         for statement in func.body:
             cmd = self._statement_to_command(statement)
             if cmd:
-                lines.append(cmd)
+                lines.append(self._ensure_macro_prefix(cmd))
         # Done routing temp commands for this function body
         self._temp_sink_stack.pop()
         
         return "\n".join(lines)
+
+    def _ensure_macro_prefix(self, text: str) -> str:
+        """Ensure any line containing a macro placeholder $(var) starts with '$'.
+        Handles multi-line text by processing each line independently.
+        """
+        import re
+        macro_re = re.compile(r"\$\([A-Za-z_][A-Za-z0-9_]*\)")
+        def process_line(line: str) -> str:
+            if macro_re.search(line):
+                stripped = line.lstrip()
+                if not stripped.startswith('$'):
+                    return '$' + line
+            return line
+        if '\n' in text:
+            return '\n'.join(process_line(ln) for ln in text.split('\n'))
+        return process_line(text)
     
     def _compile_hooks(self, hooks: List[HookDeclaration], namespace_dir: Path):
         """Compile hook declarations."""
@@ -325,6 +341,8 @@ class MDLCompiler:
             return self._say_command_to_command(statement)
         elif isinstance(statement, RawBlock):
             return statement.content
+        elif isinstance(statement, MacroLine):
+            return statement.content
         elif isinstance(statement, IfStatement):
             return self._if_statement_to_command(statement)
         elif isinstance(statement, WhileLoop):
@@ -616,10 +634,17 @@ class MDLCompiler:
     
     def _function_call_to_command(self, func_call: FunctionCall) -> str:
         """Convert function call to execute command."""
+        # Build base function invocation, possibly with macro args
+        suffix = ""
+        if func_call.macro_json:
+            suffix = f" {func_call.macro_json}"
+        elif func_call.with_clause:
+            suffix = f" with {func_call.with_clause}"
+
+        base = f"function {func_call.namespace}:{func_call.name}{suffix}"
         if func_call.scope:
-            return f"execute as {func_call.scope.strip('<>')} run function {func_call.namespace}:{func_call.name}"
-        else:
-            return f"function {func_call.namespace}:{func_call.name}"
+            return f"execute as {func_call.scope.strip('<>')} run {base}"
+        return base
     
     def _expression_to_value(self, expression: Any) -> str:
         """Convert expression to a value string."""

minecraft_datapack_language/mdl_lexer.py

@@ -79,6 +79,7 @@ class TokenType:
     QUOTE = "QUOTE"                  # " (string literal delimiter)
     EXCLAMATION = "EXCLAMATION"      # ! (for raw blocks)
     RANGE = "RANGE"                  # .. (range operator)
+    DOT = "DOT"                      # . (for paths in with-clause)
     
     # Literals
     IDENTIFIER = "IDENTIFIER"        # Variable names, function names, etc.
@@ -89,6 +90,7 @@ class TokenType:
     EOF = "EOF"
     COMMENT = "COMMENT"              # Comments (ignored during parsing)
     RAW_CONTENT = "RAW_CONTENT"      # Raw content inside raw blocks
+    MACRO_LINE = "MACRO_LINE"        # Entire macro line starting with '$' at line-begin
 
 
 class MDLLexer:
@@ -167,9 +169,9 @@ class MDLLexer:
             self._scan_multi_line_comment()
             return
         
-        # Handle strings (quotes)
-        if char == '"':
-            self._scan_string()
+        # Handle strings (quotes) - support both ' and "
+        if char == '"' or char == "'":
+            self._scan_string(quote_char=char)
             return
         
         # Handle raw block markers
@@ -180,6 +182,11 @@ class MDLLexer:
         
 
         
+        # Handle macro line: '$' as first non-space on the line (not $!raw)
+        if char == '$' and self._is_line_start_nonspace():
+            self._scan_macro_line()
+            return
+
         # Handle variable substitution
         if char == '$':
             self._scan_variable_substitution()
@@ -264,7 +271,7 @@ class MDLLexer:
         # Unterminated comment
         self._error("Unterminated multi-line comment", "Add */ to close the comment")
     
-    def _scan_string(self):
+    def _scan_string(self, quote_char='"'):
         """Scan a string literal (quoted text)."""
         # Skip opening quote
         self.current += 1
@@ -275,7 +282,7 @@ class MDLLexer:
         
         # Scan until closing quote
         while (self.current < len(self.source) and 
-               self.source[self.current] != '"'):
+               self.source[self.current] != quote_char):
             if self.source[self.current] == '\n':
                 self._error("Unterminated string literal", "Add a closing quote")
             
@@ -295,14 +302,34 @@ class MDLLexer:
         self.column += 1
         
         # Generate QUOTE token for the opening quote
-        self.tokens.append(Token(TokenType.QUOTE, '"', start_line, start_column))
+        self.tokens.append(Token(TokenType.QUOTE, quote_char, start_line, start_column))
         
         # Generate IDENTIFIER token for the string content
         string_content = self.source[self.start + 1:self.current - 1]
         self.tokens.append(Token(TokenType.IDENTIFIER, string_content, start_line, start_column + 1))
         
         # Generate QUOTE token for the closing quote
-        self.tokens.append(Token(TokenType.QUOTE, '"', self.line, self.column - 1))
+        self.tokens.append(Token(TokenType.QUOTE, quote_char, self.line, self.column - 1))
+
+    def _is_line_start_nonspace(self) -> bool:
+        """Return True if current position is at the first non-space character in the line."""
+        # Find beginning of current line
+        idx = self.current - 1
+        while idx >= 0 and self.source[idx] != '\n':
+            if not self.source[idx].isspace():
+                return False
+            idx -= 1
+        return True
+
+    def _scan_macro_line(self):
+        """Scan a full macro line starting with '$' as first non-space char."""
+        # Capture from current to end of line (excluding trailing newline)
+        line_start = self.current
+        while self.current < len(self.source) and self.source[self.current] != '\n':
+            self.current += 1
+            self.column += 1
+        content = self.source[line_start:self.current]
+        self.tokens.append(Token(TokenType.MACRO_LINE, content, self.line, 1))
     
     def _scan_raw_block_start(self):
         """Scan the start of a raw block ($!raw)."""
@@ -548,7 +575,8 @@ class MDLLexer:
             '{': TokenType.LBRACE,
             '}': TokenType.RBRACE,
             '[': TokenType.LBRACKET,
-            ']': TokenType.RBRACKET
+            ']': TokenType.RBRACKET,
+            '.': TokenType.DOT
         }
         
         if char in token_map:

minecraft_datapack_language/mdl_parser.py

@@ -9,7 +9,7 @@ from .mdl_errors import MDLParserError
 from .ast_nodes import (
     ASTNode, Program, PackDeclaration, NamespaceDeclaration, TagDeclaration,
     VariableDeclaration, VariableAssignment, VariableSubstitution, FunctionDeclaration,
-    FunctionCall, IfStatement, WhileLoop, HookDeclaration, RawBlock,
+    FunctionCall, IfStatement, WhileLoop, HookDeclaration, RawBlock, MacroLine,
     SayCommand, TellrawCommand, ExecuteCommand, ScoreboardCommand,
     BinaryExpression, UnaryExpression, ParenthesizedExpression, LiteralExpression,
     ScopeSelector
@@ -257,7 +257,7 @@ class MDLParser:
         )
     
     def _parse_function_call(self) -> FunctionCall:
-        """Parse function call: exec namespace:name<scope>;"""
+        """Parse function call: exec namespace:name<scope>? [ '{json}' | with <data source> [path] ] ;"""
         self._expect(TokenType.EXEC, "Expected 'exec' keyword")
         
         # Parse namespace:name
@@ -269,13 +269,41 @@ class MDLParser:
         scope = None
         if self._peek().type == TokenType.LANGLE:
             scope = self._parse_scope_selector()
-        
+
+        # Optional macro arguments (inline JSON in a quoted string)
+        macro_json = None
+        with_clause = None
+        if self._peek().type == TokenType.QUOTE:
+            self._advance()  # opening quote
+            if self._peek().type == TokenType.IDENTIFIER:
+                macro_json = self._peek().value
+                self._advance()
+            self._expect(TokenType.QUOTE, "Expected closing quote for macro JSON")
+        elif self._peek().type == TokenType.IDENTIFIER and self._peek().value == 'with':
+            # Capture everything after 'with' up to the semicolon as raw clause
+            self._advance()  # consume 'with'
+            # Expect a data source spec like: storage <identifier> <path-with-dots>
+            # Accumulate tokens until semicolon, inserting spaces only between identifiers/numbers
+            built: List[str] = []
+            prev_type = None
+            while not self._is_at_end() and self._peek().type != TokenType.SEMICOLON:
+                t = self._advance()
+                # Insert a space between adjacent identifiers/numbers
+                if built and (prev_type in (TokenType.IDENTIFIER, TokenType.NUMBER, TokenType.RBRACE, TokenType.RBRACKET)
+                              and t.type in (TokenType.IDENTIFIER, TokenType.NUMBER)):
+                    built.append(" ")
+                built.append(t.value)
+                prev_type = t.type
+            with_clause = "".join(built).strip()
+
         self._expect(TokenType.SEMICOLON, "Expected semicolon after function call")
         
         return FunctionCall(
             namespace=namespace,
             name=name,
-            scope=scope
+            scope=scope,
+            macro_json=macro_json,
+            with_clause=with_clause
         )
     
     def _parse_if_statement(self) -> IfStatement:
@@ -498,6 +526,10 @@ class MDLParser:
                 statements.append(self._parse_while_loop())
             elif self._peek().type == TokenType.EXEC:
                 statements.append(self._parse_function_call())
+            elif self._peek().type == TokenType.MACRO_LINE:
+                # Preserve macro line exactly as-is
+                statements.append(MacroLine(content=self._peek().value))
+                self._advance()
             elif self._peek().type == TokenType.DOLLAR and self._peek(1).type == TokenType.EXCLAMATION:
                 statements.append(self._parse_raw_block())
             elif self._peek().type == TokenType.IDENTIFIER:

{minecraft_datapack_language-15.4.41.dist-info → minecraft_datapack_language-15.4.43.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.4.41
+Version: 15.4.43
 Summary: Compile MDL language with explicit scoping 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.4.43.dist-info/RECORD

@@ -0,0 +1,18 @@
+minecraft_datapack_language/__init__.py,sha256=0KVXBE4ScRaRUrf83aA2tVB-y8A_jplyaxVvtHH6Uw0,1199
+minecraft_datapack_language/_version.py,sha256=6f2gaPXMU8K3LcbQn-JSmdlistnzJIqRlovy7echBYs,708
+minecraft_datapack_language/ast_nodes.py,sha256=UzUxKLkjBisUd5Gu7sAiNXIIPIjNoRzELq4LfIFcnSY,4290
+minecraft_datapack_language/cli.py,sha256=R4QZYtox-Da9B8pr_kCg_9qc9aI-ORTah7kMkhsI5tw,10373
+minecraft_datapack_language/dir_map.py,sha256=HmxFkuvWGkzHF8o_GFb4BpuMCRc6QMw8UbmcAI8JVdY,1788
+minecraft_datapack_language/mdl_compiler.py,sha256=9o9NXd9_szEKEmmZ0HPanFA9W8UOPOVA5Jbw-9XyM1w,42414
+minecraft_datapack_language/mdl_errors.py,sha256=r0Gu3KhoX1YLPAVW_iO7Q_fPgaf_Dv9tOGSOdKNSzmw,16114
+minecraft_datapack_language/mdl_lexer.py,sha256=dVwdgUmdQI7EJaFtoKZpq6rj5156YVjt44mMee-MDIs,23388
+minecraft_datapack_language/mdl_linter.py,sha256=z85xoAglENurCh30bR7kEHZ_JeMxcYaLDcGNRAl-RAI,17253
+minecraft_datapack_language/mdl_parser.py,sha256=axyjdrcgqeOpbmWolasiIZAjV_RpFaP5QiafLPXAhms,25223
+minecraft_datapack_language/python_api.py,sha256=Iao1jbdeW6ekeA80BZG6gNqHVjxQJEheB3DbpVsuTZQ,12304
+minecraft_datapack_language/utils.py,sha256=Aq0HAGlXqj9BUTEjaEilpvzEW0EtZYYMMwOqG9db6dE,684
+minecraft_datapack_language-15.4.43.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-15.4.43.dist-info/METADATA,sha256=ZIf4a5lzXA4fLPfsIZOC38wgK9JjpnNscdutjZC3rZE,8344
+minecraft_datapack_language-15.4.43.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-15.4.43.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-15.4.43.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-15.4.43.dist-info/RECORD,,

minecraft_datapack_language-15.4.41.dist-info/RECORD

@@ -1,18 +0,0 @@
-minecraft_datapack_language/__init__.py,sha256=0KVXBE4ScRaRUrf83aA2tVB-y8A_jplyaxVvtHH6Uw0,1199
-minecraft_datapack_language/_version.py,sha256=7O183XaGv-j8PcITk4W9KCJ0Sx7gIXLD8SvmgNMUBnU,708
-minecraft_datapack_language/ast_nodes.py,sha256=nbWrRz137MGMRpmnq8QkXNzrtlaCgyPEknytbkrS_M8,3899
-minecraft_datapack_language/cli.py,sha256=R4QZYtox-Da9B8pr_kCg_9qc9aI-ORTah7kMkhsI5tw,10373
-minecraft_datapack_language/dir_map.py,sha256=HmxFkuvWGkzHF8o_GFb4BpuMCRc6QMw8UbmcAI8JVdY,1788
-minecraft_datapack_language/mdl_compiler.py,sha256=CaIHmsv4cjZa70PpderdgPlH6yNaB86WQhGyIaB0040,41396
-minecraft_datapack_language/mdl_errors.py,sha256=r0Gu3KhoX1YLPAVW_iO7Q_fPgaf_Dv9tOGSOdKNSzmw,16114
-minecraft_datapack_language/mdl_lexer.py,sha256=CjbEUpuuF4eU_ucA_WIhw6wSMcHGk2BchtQ0bLAGvwg,22033
-minecraft_datapack_language/mdl_linter.py,sha256=z85xoAglENurCh30bR7kEHZ_JeMxcYaLDcGNRAl-RAI,17253
-minecraft_datapack_language/mdl_parser.py,sha256=aQPKcmATM9BOMzO7vCXmMdxU1qjOJNLCSAKJopu5h3g,23429
-minecraft_datapack_language/python_api.py,sha256=Iao1jbdeW6ekeA80BZG6gNqHVjxQJEheB3DbpVsuTZQ,12304
-minecraft_datapack_language/utils.py,sha256=Aq0HAGlXqj9BUTEjaEilpvzEW0EtZYYMMwOqG9db6dE,684
-minecraft_datapack_language-15.4.41.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-15.4.41.dist-info/METADATA,sha256=8VRf590kEqLu2Te-AHafQxQjpT0pFhz-VEay36-olQ0,8344
-minecraft_datapack_language-15.4.41.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-15.4.41.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-15.4.41.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-15.4.41.dist-info/RECORD,,