fix: macro_line statistics (close #485)

Author: vberlier

packages/mecha/examples/basic_stats/src/data/demo/functions/foo.mcfunction

@@ -2,3 +2,4 @@ scoreboard objectives add my_consts dummy
 scoreboard players set 10 my_consts 10
 scoreboard players operation @e[tag=hello,scores={foo=1..}] foo += 10 my_consts
 execute if score @s foo matches 20.. as @e[tag=hello] run setblock ~ ~ ~ stone
+function demo:macro {text: "hello"}

packages/mecha/examples/basic_stats/src/data/demo/functions/macro.mcfunction

@@ -0,0 +1 @@
+$say $(text)

packages/mecha/src/mecha/contrib/statistics.py

@@ -18,6 +18,10 @@
 
 from mecha import (
     AstCommand,
+    AstCommandSentinel,
+    AstMacroLine,
+    AstMacroLineText,
+    AstMacroLineVariable,
     AstObjective,
     AstObjectiveCriteria,
     AstPlayerName,
@@ -44,6 +48,7 @@ class Statistics(BaseModel):
     command_behind_execute_count: dict[str, int] = Field(
         default_factory=lambda: defaultdict(int)
     )
+    macro_line_count: dict[str, int] = Field(default_factory=lambda: defaultdict(int))
     execute_count: int = 0
     execute_clause_count: dict[str, int] = Field(
         default_factory=lambda: defaultdict(int)
@@ -105,6 +110,9 @@ def root(self, node: AstRoot):
         self.stats.function_count += 1
 
         for command in node.commands:
+            if isinstance(command, AstCommandSentinel):
+                continue
+
             behind_execute = False
 
             while command.identifier.startswith("execute"):
@@ -163,6 +171,18 @@ def command(self, node: AstCommand):
                 self.stats.scoreboard_fake_player_references[objective][ref] += 1
                 ref = None
 
+    @rule(AstMacroLine)
+    def macro_line(self, node: AstMacroLine):
+        parts = ["$"]
+        for arg in node.arguments:
+            if isinstance(arg, AstMacroLineText):
+                parts.append(arg.value)
+            elif isinstance(arg, AstMacroLineVariable):
+                parts.append("$(")
+                parts.append(arg.value)
+                parts.append(")")
+        self.stats.macro_line_count["".join(parts)] += 1
+
 
 @dataclass
 class Summary:
@@ -203,6 +223,9 @@ def format_commands(self) -> Dict[Tuple[str, ...], List[Tuple[str, ...]]]:
             for prefix, stats in self.stats.command_count.items()
         }
 
+        for macro_line, count in self.stats.macro_line_count.items():
+            command_stats[macro_line, count, 0] = []
+
         if self.stats.execute_count:
             command_stats["/execute", self.stats.execute_count, 0] = [
                 (

packages/mecha/tests/snapshots/examples__build_basic_stats__0.pack.md

@@ -25,15 +25,17 @@
 `@function demo:foo`
 
 ```mcfunction
-# Analyzed 1 function
+# Analyzed 2 functions
 # -------------------------------------------------------------------------------
-# Total commands (1 behind execute)                                      |      4
+# Total commands (1 behind execute)                                      |      6
 # -------------------------------------------------------------------------------
 #        /scoreboard                                                     |      3
 #                    objectives add <objective> <criteria>               |      1
 #                    players set <targets> <objective> <score>           |      1
 #                    players operation <targets> <targetObjective> <o... |      1
 #        /setblock (1 behind execute)                                    |      1
+#        /function                                                       |      1
+#        $say $(text)                                                    |      1
 #        /execute                                                        |      1
 #                 if score <target> <targetObjective> matches <range>... |      1
 #                 as <targets> <subcommand>                              |      1
@@ -56,4 +58,11 @@ scoreboard objectives add my_consts dummy
 scoreboard players set 10 my_consts 10
 scoreboard players operation @e[tag=hello, scores={foo=1..}] foo += 10 my_consts
 execute if score @s foo matches 20.. as @e[tag=hello] run setblock ~ ~ ~ stone
+function demo:macro {text: "hello"}
+```
+
+`@function demo:macro`
+
+```mcfunction
+$say $(text)
 ```