fix: distinct preludes for overlays

bolt/module.py

@@ -34,7 +34,7 @@
     cast,
 )
 
-from beet import BubbleException, Cache, TextFile, TextFileBase
+from beet import BubbleException, Cache, DataPack, TextFile, TextFileBase
 from beet.core.utils import JsonDict, extra_field, import_from_string, required_field
 from mecha import (
     AstCacheBackend,
@@ -152,7 +152,9 @@ class ModuleManager(Mapping[TextFileBase[Any], CompiledModule]):
     )
     globals: JsonDict = extra_field(default_factory=dict)
     builtins: Set[str] = extra_field(default_factory=set)
-    prelude: Dict[str, Optional[AstPrelude]] = extra_field(default_factory=dict)
+    prelude: Dict[str, Dict[Optional[DataPack], AstPrelude]] = extra_field(
+        default_factory=dict
+    )
 
     execution_count: int = 0
 
@@ -356,7 +358,7 @@ def add_prelude(self, *args: Union[str, Iterable[str]]):
             if isinstance(arg, str):
                 arg = [arg]
             for resource_location in arg:
-                self.prelude.setdefault(resource_location, None)
+                self.prelude.setdefault(resource_location, {})
 
     def export_prelude(self, module: CompiledModule) -> Optional[AstPrelude]:
         """Export local variables and macros from a given module into a prelude import."""
@@ -379,11 +381,13 @@ def export_prelude(self, module: CompiledModule) -> Optional[AstPrelude]:
 
     def load_prelude(self) -> List[AstPrelude]:
         """Load the prelude imports."""
+        current_pack = self.database[self.database.current].pack
         current_prelude = self.prelude
 
         prelude_imports: List[AstPrelude] = []
 
-        for resource_location, prelude in list(current_prelude.items()):
+        for resource_location, pack_prelude in list(current_prelude.items()):
+            prelude = pack_prelude.get(current_pack)
             if not prelude:
                 self.prelude = {}
                 try:
@@ -398,7 +402,7 @@ def load_prelude(self) -> List[AstPrelude]:
             if not prelude:
                 prelude = AstPrelude.placeholder(resource_location)
 
-            current_prelude[resource_location] = prelude
+            pack_prelude[current_pack] = prelude
             prelude_imports.append(prelude)
 
         return prelude_imports

examples/bolt_lectern_prelude/beet.yml

@@ -0,0 +1,10 @@
+require:
+  - bolt
+pipeline:
+  - lectern
+  - mecha
+meta:
+  lectern:
+    load: "source.txt"
+  bolt:
+    prelude: "demo:prelude"

examples/bolt_lectern_prelude/source.txt

@@ -0,0 +1,12 @@
+@module demo:prelude
+stuff = 123
+
+@function demo:foo
+say stuff
+
+@overlay dummy
+@module demo:prelude
+stuff = 456
+
+@function demo:foo
+say stuff

tests/snapshots/examples__build_bolt_lectern_prelude__0.pack.md

@@ -0,0 +1,36 @@
+# Lectern snapshot
+
+## Data pack
+
+`@data_pack pack.mcmeta`
+
+```json
+{
+  "pack": {
+    "pack_format": 18,
+    "description": ""
+  }
+}
+```
+
+### demo
+
+`@function demo:foo`
+
+```mcfunction
+say 123
+```
+
+## Overlay `dummy`
+
+`@overlay dummy`
+
+### demo
+
+`@function demo:foo`
+
+```mcfunction
+say 456
+```
+
+`@endoverlay`