Refactor and enhance template merging functionality

project_forge/context_builder/data_merge.py

@@ -3,7 +3,6 @@
 import copy
 import logging
 from collections import OrderedDict
-from functools import reduce
 from itertools import chain
 from typing import Any, Iterable, Literal, MutableMapping, TypeVar, overload
 
@@ -104,7 +103,7 @@ def merge_into(d1: dict, d2: dict) -> dict:
 
     match left_val, right_val:
         case (dict(), dict()):
-            return reduce(merge_into, (left_val, right_val), {})  # type: ignore[return-value]
+            return merge_into(copy.deepcopy(left_val), right_val)  # type: ignore[return-value]
         case _:
             return right_val
 

project_forge/models/composition.py

@@ -22,7 +22,7 @@ class Composition(BaseModel):
         default_factory=dict,
         description=(
             "Merge the values of one or more keys in a specific way. This is useful for `yaml` or `json` values. "
-            "Valid merge methods are `update` and `comprehensive`."
+            "Valid merge methods are `update`, `nested-overwrite`, and `comprehensive`."
         ),
     )
     extra_context: dict = Field(

project_forge/rendering/templates.py

@@ -101,7 +101,7 @@ def catalog_templates(template_path: Path, process_mode_func: ProcessModeFn) ->
             dir_path = root / dir_
             process_mode = process_mode_func(dir_path)
             templates[str(dir_path.relative_to(root_dir).as_posix())] = TemplateFile(dir_path, process_mode)
-    return {key: templates[key] for key in sorted(templates)}
+    return dict(sorted(templates.items()))
 
 
 class InheritanceMap(ChainMap[str, TemplateFile]):