minecraft-datapack-language 15.4.28__py3-none-any.whl → 15.4.29__py3-none-any.whl

minecraft_datapack_language/__init__.py

@@ -1,6 +1,21 @@
 
-from .pack import Pack, Namespace, Function, Tag, Recipe, Advancement, LootTable, Predicate, ItemModifier, Structure, DirMap
-__all__ = ["Pack","Namespace","Function","Tag","Recipe","Advancement","LootTable","Predicate","ItemModifier","Structure","DirMap"]
+from .mdl_lexer import MDLLexer, Token, TokenType
+from .mdl_parser import MDLParser
+from .ast_nodes import *
+from .dir_map import DirMap
+
+__all__ = [
+    "MDLLexer", "Token", "TokenType",
+    "MDLParser",
+    "ASTNode", "Program", "PackDeclaration", "NamespaceDeclaration", "TagDeclaration",
+    "VariableDeclaration", "VariableAssignment", "VariableSubstitution", "FunctionDeclaration",
+    "FunctionCall", "IfStatement", "WhileLoop", "HookDeclaration", "RawBlock",
+    "SayCommand", "TellrawCommand", "ExecuteCommand", "ScoreboardCommand",
+    "BinaryExpression", "UnaryExpression", "ParenthesizedExpression", "LiteralExpression",
+    "ScopeSelector",
+    "DirMap"
+]
+
 try:
     from ._version import version as __version__   # written by setuptools-scm
 except Exception:

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.28'
-__version_tuple__ = version_tuple = (15, 4, 28)
+__version__ = version = '15.4.29'
+__version_tuple__ = version_tuple = (15, 4, 29)
 
 __commit_id__ = commit_id = None

minecraft_datapack_language/ast_nodes.py

@@ -1,9 +1,10 @@
 """
 AST Node Definitions - Data classes for the MDL Abstract Syntax Tree
+Updated to match the new language specification
 """
 
 from dataclasses import dataclass
-from typing import List, Optional, Any
+from typing import List, Optional, Any, Union
 
 
 @dataclass
@@ -14,6 +15,7 @@ class ASTNode:
 
 @dataclass
 class PackDeclaration(ASTNode):
+    """Pack declaration with name, description, and pack format."""
     name: str
     description: str
     pack_format: int
@@ -21,131 +23,157 @@ class PackDeclaration(ASTNode):
 
 @dataclass
 class NamespaceDeclaration(ASTNode):
+    """Namespace declaration."""
     name: str
 
 
 @dataclass
-class FunctionDeclaration(ASTNode):
+class TagDeclaration(ASTNode):
+    """Tag declaration for datapack resources."""
+    tag_type: str  # recipe, loot_table, advancement, item_modifier, predicate, structure
     name: str
-    body: List[Any]
+    file_path: str
 
 
 @dataclass
 class VariableDeclaration(ASTNode):
+    """Variable declaration with explicit scope."""
+    var_type: str  # num
     name: str
-    scope: Optional[str]
-    value: Any
+    scope: str  # <@s>, <@a>, <@e[type=armor_stand]>, etc.
+    initial_value: Any
 
 
 @dataclass
 class VariableAssignment(ASTNode):
+    """Variable assignment with explicit scope."""
     name: str
-    scope: Optional[str]
+    scope: str  # <@s>, <@a>, etc.
     value: Any
 
 
 @dataclass
-class IfStatement(ASTNode):
-    condition: str
-    then_body: List[Any]
-    else_body: Optional[List[Any]]
+class VariableSubstitution(ASTNode):
+    """Variable substitution for reading values."""
+    name: str
+    scope: str  # <@s>, <@a>, etc.
 
 
 @dataclass
-class WhileLoop(ASTNode):
-    condition: str
-    method: Optional[str]
-    body: List[Any]
+class FunctionDeclaration(ASTNode):
+    """Function declaration with optional scope."""
+    namespace: str
+    name: str
+    scope: Optional[str]  # Optional scope for the function
+    body: List[ASTNode]
 
 
 @dataclass
 class FunctionCall(ASTNode):
+    """Function execution with exec keyword."""
+    namespace: str
     name: str
+    scope: Optional[str]  # Optional scope for the function call
 
 
 @dataclass
-class ExecuteStatement(ASTNode):
-    command: str
-
-
-@dataclass
-class RawText(ASTNode):
-    content: str
+class IfStatement(ASTNode):
+    """If statement with condition and bodies."""
+    condition: Any  # Expression
+    then_body: List[ASTNode]
+    else_body: Optional[List[ASTNode]]
 
 
 @dataclass
-class Command(ASTNode):
-    command: str
+class WhileLoop(ASTNode):
+    """While loop with condition and body."""
+    condition: Any  # Expression
+    body: List[ASTNode]
 
 
 @dataclass
-class VariableExpression(ASTNode):
+class HookDeclaration(ASTNode):
+    """Hook declaration (on_load, on_tick)."""
+    hook_type: str  # on_load, on_tick
+    namespace: str
     name: str
+    scope: Optional[str]  # Optional scope for the hook
 
 
 @dataclass
-class VariableSubstitutionExpression(ASTNode):
-    name: str
-    scope: Optional[str]
+class RawBlock(ASTNode):
+    """Raw block of Minecraft commands."""
+    content: str
 
 
 @dataclass
-class LiteralExpression(ASTNode):
-    value: str
-    type: str
+class SayCommand(ASTNode):
+    """Say command that auto-converts to tellraw."""
+    message: str
+    variables: List[VariableSubstitution]  # Variables to substitute
 
 
 @dataclass
-class BinaryExpression(ASTNode):
-    left: Any
-    operator: str
-    right: Any
+class TellrawCommand(ASTNode):
+    """Tellraw command with JSON structure."""
+    target: str  # @s, @a, etc.
+    json_content: str
 
 
 @dataclass
-class HookDeclaration(ASTNode):
-    hook_type: str
-    function_name: str
+class ExecuteCommand(ASTNode):
+    """Execute command."""
+    command: str
 
 
 @dataclass
-class TagDeclaration(ASTNode):
-    tag_type: str
-    name: str
-    values: List[str]
+class ScoreboardCommand(ASTNode):
+    """Scoreboard command."""
+    command: str
 
 
+# Expression nodes
 @dataclass
-class RecipeDeclaration(ASTNode):
-    name: str
-    file_path: str
+class BinaryExpression(ASTNode):
+    """Binary expression with operator."""
+    left: Any
+    operator: str  # +, -, *, /, ==, !=, >, <, >=, <=
+    right: Any
 
 
 @dataclass
-class LootTableDeclaration(ASTNode):
-    name: str
-    file_path: str
+class UnaryExpression(ASTNode):
+    """Unary expression."""
+    operator: str
+    operand: Any
 
 
 @dataclass
-class AdvancementDeclaration(ASTNode):
-    name: str
-    file_path: str
+class ParenthesizedExpression(ASTNode):
+    """Expression in parentheses."""
+    expression: Any
 
 
 @dataclass
-class PredicateDeclaration(ASTNode):
-    name: str
-    file_path: str
+class LiteralExpression(ASTNode):
+    """Literal value."""
+    value: Union[str, int, float]
+    type: str  # string, number
 
 
 @dataclass
-class ItemModifierDeclaration(ASTNode):
-    name: str
-    file_path: str
+class ScopeSelector(ASTNode):
+    """Scope selector like <@s>, <@a[team=red]>."""
+    selector: str  # @s, @a[team=red], etc.
 
 
 @dataclass
-class StructureDeclaration(ASTNode):
-    name: str
-    file_path: str
+class Program(ASTNode):
+    """Complete MDL program."""
+    pack: Optional[PackDeclaration]
+    namespace: Optional[NamespaceDeclaration]
+    tags: List[TagDeclaration]
+    variables: List[VariableDeclaration]
+    functions: List[FunctionDeclaration]
+    hooks: List[HookDeclaration]
+    statements: List[ASTNode]  # Top-level statements