[yamlcomposer] Add !deep <<: tag to extend merge keys with recursive deep merge and conflict resolution - #21505
Draft
jimtng wants to merge 1 commit into
Draft
[yamlcomposer] Add !deep <<: tag to extend merge keys with recursive deep merge and conflict resolution#21505jimtng wants to merge 1 commit into
!deep <<: tag to extend merge keys with recursive deep merge and conflict resolution#21505jimtng wants to merge 1 commit into
Conversation
jimtng
changed the title
!deep <<: tag to extend merge keys with recursive deep merge and conflict resolution
jimtng
force-pushed
the
yamlcomposer-deepmerge
branch
from
August 27, 2026 10:46
35e48cc to
5a911de
Compare
Collaborator
|
This pull request has been mentioned on openHAB Community. There might be relevant details there: |
jimtng
force-pushed
the
yamlcomposer-deepmerge
branch
from
August 27, 2026 11:11
5a911de to
75620f7
Compare
jimtng
marked this pull request as ready for review
August 27, 2026 12:05
jimtng
force-pushed
the
yamlcomposer-deepmerge
branch
from
August 28, 2026 10:22
75620f7 to
c8deb98
Compare
jimtng
marked this pull request as draft
August 28, 2026 11:16
lsiepel
added
the
enhancement
jimtng
force-pushed
the
yamlcomposer-deepmerge
branch
from
August 28, 2026 14:38
c8deb98 to
3ac75c4
Compare
…deep merge and conflict resolution Implement recursive mapping composition and explicit node precedence controls across the YAML composition engine. This significantly enhances package and include definitions by allowing modular files to: - Define default values that can be easily overridden by downstream configs. - Define additional nested structures and elements to be combined recursively. Key changes: - Add `!deep <<:` directive to support recursive merging of nested mapping trees and sequence item appending with deduplication. - Add conflict resolution tags (`!default`, `!freeze`/`!replace`, `!remove`) to override standard local-target precedence, lock nodes, or suppress keys during composition. - Introduce `StructuralMerger` to unify structural composition across YAML merge keys, deep merge directives, and package resolution. - Refactor `PackageProcessor` to process package content through the shared structural merge pipeline. - Register `!deep` and `!default` placeholders, directives, and processors in `ModelConstructor` and `YamlComposer`. - Add documentation reference guides (`doc/deep-merge.md`) and unit test suite (`YamlComposerDeepMergeTest`). Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
jimtng
force-pushed
the
yamlcomposer-deepmerge
branch
from
August 28, 2026 22:58
3ac75c4 to
7ca4b23
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Implement recursive mapping composition and explicit node precedence controls across the YAML composition engine.
This significantly enhances package and include definitions by allowing modular files to:
Key changes:
!deep <<:directive to support recursive merging of nested mapping trees and sequence item appending with deduplication.!default,!freeze/!replace,!remove) to override standard local-target precedence, lock nodes, or suppress keys during composition.StructuralMergerto unify structural composition across YAML merge keys, deep merge directives, and package resolution.PackageProcessorto process package content through the shared structural merge pipeline.!deepand!defaultplaceholders, directives, and processors inModelConstructorandYamlComposer.doc/deep-merge.md) and unit test suite (YamlComposerDeepMergeTest).