fix: compat with mecha.contrib.json_files when it comes before bolt

mcbeet · Dec 31, 2023 · 430d488 · 430d488
1 parent cbb5400
commit 430d488
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 6 deletions.
diff --git a/bolt/parse.py b/bolt/parse.py
@@ -629,7 +629,7 @@ def __call__(self, stream: TokenStream) -> Any:
 
         self.macro_handler.cache_local_spec(stream)
 
-        if isinstance(node, AstRoot) and not isinstance(current, Function):
+        if type(node) is AstRoot and not isinstance(current, Function):
             node = set_location(AstNonFunctionRoot(commands=node.commands), node)
 
         return node

diff --git a/examples/bolt_json/beet.yml b/examples/bolt_json/beet.yml
@@ -0,0 +1,7 @@
+require:
+  - mecha.contrib.json_files
+  - bolt
+data_pack:
+  load: "src"
+pipeline:
+  - mecha
diff --git a/examples/bolt_json/src/data/minecraft/tags/functions/load.json b/examples/bolt_json/src/data/minecraft/tags/functions/load.json
@@ -0,0 +1,8 @@
+name = demo:foo
+
+{
+  "values": [name]
+}
+
+function name:
+    say hello
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -24,7 +24,7 @@ include = ["bolt/py.typed"]
 [tool.poetry.dependencies]
 python = "^3.10"
 beet = ">=0.100.0"
-mecha = ">=0.85.1"
+mecha = ">=0.86.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.4.3"

diff --git a/tests/snapshots/examples__build_bolt_json__0.pack.md b/tests/snapshots/examples__build_bolt_json__0.pack.md
@@ -0,0 +1,34 @@
+# Lectern snapshot
+
+## Data pack
+
+`@data_pack pack.mcmeta`
+
+```json
+{
+  "pack": {
+    "pack_format": 26,
+    "description": ""
+  }
+}
+```
+
+### minecraft
+
+`@function_tag minecraft:load`
+
+```json
+{
+  "values": [
+    "demo:foo"
+  ]
+}
+```
+
+### demo
+
+`@function demo:foo`
+
+```mcfunction
+say hello
+```