Merge strategy for new object elements.

josephburnett · May 20, 2022 · 8488135 · 8488135
1 parent d78a368
commit 8488135
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/lib/object.go b/lib/object.go
@@ -188,10 +188,20 @@ func (o1 jsonObject) diff(n JsonNode, path path, metadata []Metadata, strategy p
  v2 := o2.properties[k2]
  if _, ok := o1.properties[k2]; !ok {
  // O1 missing key
- e := DiffElement{
- Path: append(path, jsonString(k2)).clone(),
- OldValues: nodeList(),
- NewValues: nodeList(v2),
+ var e DiffElement
+ switch strategy {
+ case mergePatchStrategy:
+ e = DiffElement{
+ Path: append(path, jsonString(k2)).clone().prependMetadataMerge(),
+ OldValues: nodeList(),
+ NewValues: nodeList(v2),
+ }
+ default:
+ e = DiffElement{
+ Path: append(path, jsonString(k2)).clone(),
+ OldValues: nodeList(),
+ NewValues: nodeList(v2),
+ }
  }
  d = append(d, e)
  }

diff --git a/lib/object_test.go b/lib/object_test.go
@@ -184,6 +184,16 @@ func TestObjectDiff(t *testing.T) {
  `+`,
  ),
  ctx: newTestContext(t).withMetadata(MERGE),
+ }, {
+ a: `{"a":1}`,
+ b: `{"b":1}`,
+ diff: ss(
+ `@ [["merge"],"a"]`,
+ `+`,
+ `@ [["merge"],"b"]`,
+ `+ 1`,
+ ),
+ ctx: newTestContext(t).withMetadata(MERGE),
  }}
 
  for _, tt := range tests {