fix: merge policies were not taken into account anymore

examples/basic_nested_resources/beet.yml

@@ -1,7 +1,10 @@
 require:
+  - beet.contrib.model_merging
   - mecha.contrib.nesting
   - mecha.contrib.nested_resources
+resource_pack:
+  load: "src"
 data_pack:
-  load: [src]
+  load: "src"
 pipeline:
   - mecha

examples/basic_nested_resources/src/assets/minecraft/models/item/bow.json

@@ -0,0 +1,50 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "item/bow"
+  },
+  "display": {
+    "thirdperson_righthand": {
+      "rotation": [-80, 260, -40],
+      "translation": [-1, -2, 2.5],
+      "scale": [0.9, 0.9, 0.9]
+    },
+    "thirdperson_lefthand": {
+      "rotation": [-80, -280, 40],
+      "translation": [-1, -2, 2.5],
+      "scale": [0.9, 0.9, 0.9]
+    },
+    "firstperson_righthand": {
+      "rotation": [0, -90, 25],
+      "translation": [1.13, 3.2, 1.13],
+      "scale": [0.68, 0.68, 0.68]
+    },
+    "firstperson_lefthand": {
+      "rotation": [0, 90, -25],
+      "translation": [1.13, 3.2, 1.13],
+      "scale": [0.68, 0.68, 0.68]
+    }
+  },
+  "overrides": [
+    {
+      "predicate": {
+        "pulling": 1
+      },
+      "model": "item/bow_pulling_0"
+    },
+    {
+      "predicate": {
+        "pulling": 1,
+        "pull": 0.65
+      },
+      "model": "item/bow_pulling_1"
+    },
+    {
+      "predicate": {
+        "pulling": 1,
+        "pull": 0.9
+      },
+      "model": "item/bow_pulling_2"
+    }
+  ]
+}

examples/basic_nested_resources/src/data/demo/functions/foo.mcfunction

@@ -88,3 +88,12 @@ vertex_shader minecraft:core/blit_screen:
         texCoord = UV;
         vertexColor = Color;
     }
+
+merge model minecraft:item/bow {
+  "overrides":[
+    {"predicate": {"custom_model_data": 1}, "model": "demo:item/cool_bow"},
+    {"predicate": {"custom_model_data": 1, "pulling": 1}, "model": "demo:item/cool_bow_pulling_0"},
+    {"predicate": {"custom_model_data": 1, "pulling": 1, "pull": 0.65}, "model": "demo:item/cool_bow_pulling_1"},
+    {"predicate": {"custom_model_data": 1, "pulling": 1, "pull": 0.9}, "model": "demo:item/cool_bow_pulling_2"}
+  ]
+}

mecha/contrib/json_files.py

@@ -199,13 +199,21 @@ def json_content(self, node: AstJsonContent):
         if node.arguments and isinstance(content := node.arguments[0], AstJson):
             target = self.database.current
             if isinstance(target, JsonFileBase):
-                file_instance = type(target)(content.evaluate())
+                target_type = type(target)
+                file_instance = target_type(content.evaluate())
+
                 if isinstance(node, AstMergeJsonContent):
-                    if not target.merge(file_instance):
+                    compilation_unit = self.database[target]
+                    if compilation_unit.pack and compilation_unit.resource_location:
+                        compilation_unit.pack[target_type].merge({compilation_unit.resource_location: file_instance})  # type: ignore
+                    elif not target.merge(file_instance):
                         target.data = file_instance.data
+
                 elif isinstance(node, AstAppendJsonContent):
                     target.append(file_instance)  # type: ignore
+
                 elif isinstance(node, AstPrependJsonContent):
                     target.prepend(file_instance)  # type: ignore
+
                 else:
                     target.data = file_instance.data

mecha/contrib/nested_resources.py

@@ -264,6 +264,12 @@ def nested_resources(self, node: AstRoot):
                                 ),
                                 resource_location=full_name,
                                 no_index=True,
+                                pack=(
+                                    self.generate.data
+                                    if file_type
+                                    in self.generate.data.resolve_scope_map().values()
+                                    else self.generate.assets
+                                ),
                             )
                             self.database[target] = compilation_unit
                             self.database.enqueue(target, self.database.step + 1)
@@ -301,12 +307,14 @@ def nested_resources(self, node: AstRoot):
                         original=self.database.current.original,
                     )
 
+                    if command.identifier.startswith("merge:"):
+                        self.generate(full_name, merge=file_instance)
+                        changed = True
+                        continue
+
                     target = self.generate(full_name, default=file_instance)
                     if target is not file_instance:
-                        if command.identifier.startswith("merge:"):
-                            if not target.merge(file_instance):
-                                target.set_content(file_instance.get_content())
-                        elif command.identifier.startswith("append:"):
+                        if command.identifier.startswith("append:"):
                             target.append(file_instance)  # type: ignore
                         elif command.identifier.startswith("prepend:"):
                             target.prepend(file_instance)  # type: ignore

tests/snapshots/examples__build_basic_nested_resources__0.pack.md

@@ -67,6 +67,138 @@ say world
 
 ### minecraft
 
+`@model minecraft:item/bow`
+
+```json
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "item/bow"
+  },
+  "display": {
+    "thirdperson_righthand": {
+      "rotation": [
+        -80,
+        260,
+        -40
+      ],
+      "translation": [
+        -1,
+        -2,
+        2.5
+      ],
+      "scale": [
+        0.9,
+        0.9,
+        0.9
+      ]
+    },
+    "thirdperson_lefthand": {
+      "rotation": [
+        -80,
+        -280,
+        40
+      ],
+      "translation": [
+        -1,
+        -2,
+        2.5
+      ],
+      "scale": [
+        0.9,
+        0.9,
+        0.9
+      ]
+    },
+    "firstperson_righthand": {
+      "rotation": [
+        0,
+        -90,
+        25
+      ],
+      "translation": [
+        1.13,
+        3.2,
+        1.13
+      ],
+      "scale": [
+        0.68,
+        0.68,
+        0.68
+      ]
+    },
+    "firstperson_lefthand": {
+      "rotation": [
+        0,
+        90,
+        -25
+      ],
+      "translation": [
+        1.13,
+        3.2,
+        1.13
+      ],
+      "scale": [
+        0.68,
+        0.68,
+        0.68
+      ]
+    }
+  },
+  "overrides": [
+    {
+      "predicate": {
+        "custom_model_data": 1
+      },
+      "model": "demo:item/cool_bow"
+    },
+    {
+      "predicate": {
+        "pulling": 1
+      },
+      "model": "item/bow_pulling_0"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 1,
+        "pulling": 1
+      },
+      "model": "demo:item/cool_bow_pulling_0"
+    },
+    {
+      "predicate": {
+        "pulling": 1,
+        "pull": 0.65
+      },
+      "model": "item/bow_pulling_1"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 1,
+        "pulling": 1,
+        "pull": 0.65
+      },
+      "model": "demo:item/cool_bow_pulling_1"
+    },
+    {
+      "predicate": {
+        "pulling": 1,
+        "pull": 0.9
+      },
+      "model": "item/bow_pulling_2"
+    },
+    {
+      "predicate": {
+        "custom_model_data": 1,
+        "pulling": 1,
+        "pull": 0.9
+      },
+      "model": "demo:item/cool_bow_pulling_2"
+    }
+  ]
+}
+```
+
 `@glsl_shader minecraft:include/matrix`
 
 ```glsl