DOM: Implement Overlay.Add() function

Use this function do populate analytics.DocumentSet instead of Put

Signed-off-by: Richard Kosegi <richard.kosegi@gmail.com>

analytics/document_set.go

@@ -234,7 +234,7 @@ func (ds *documentSet) filtered(filterFn func(name string, ctx *docContext) bool
 	o := dom.NewOverlayDocument()
 	for n, c := range ds.ctxMap {
 		if filterFn(n, c) {
-			o.Put(n, "", c.doc)
+			o.Add(n, c.doc)
 		}
 	}
 	return o

analytics/placeholder_resolver_test.go

@@ -55,9 +55,9 @@ func TestResolvePlaceholders(t *testing.T) {
 		Build()
 	rpt := res.Resolve(ds.AsOne())
 
-	assert.Equal(t, 3, len(rpt.FailedKeys))
+	assert.Equal(t, 6, len(rpt.FailedKeys))
 	res = NewPlaceholderResolverBuilder().
 		Build()
 	rpt = res.Resolve(ds.AsOne())
-	assert.Equal(t, 3, len(rpt.FailedKeys))
+	assert.Equal(t, 6, len(rpt.FailedKeys))
 }

dom/overlay.go

@@ -77,6 +77,13 @@ func (m *overlayDocument) Layers() map[string]Container {
 	return c
 }
 
+func (m *overlayDocument) Add(overlay string, value Container) {
+	cb := m.ensureOverlay(overlay)
+	for k, v := range value.Children() {
+		cb.AddValue(k, v)
+	}
+}
+
 func (m *overlayDocument) Put(overlay, path string, value Node) {
 	if value.IsContainer() {
 		for k, v := range value.(Container).Flatten() {

dom/overlay_test.go

@@ -145,3 +145,12 @@ func TestOverlayLayers(t *testing.T) {
 	assert.Equal(t, 2, len(m))
 	assert.Equal(t, 5, m["layer2"].Children()["root"].(Container).Children()["other"].(Leaf).Value())
 }
+
+func TestOverlayAdd(t *testing.T) {
+	d := NewOverlayDocument()
+	d.Add("layerX", b.Container().AddContainer("sub"))
+	c := b.Container()
+	c.AddValue("sub1.sub2", LeafNode(123))
+	d.Add("layer1", c)
+	assert.Equal(t, 123, d.Layers()["layer1"].Children()["sub1.sub2"].(Leaf).Value())
+}

dom/types.go

@@ -209,6 +209,8 @@ type OverlayDocument interface {
 	Search(fn SearchValueFunc) Coordinates
 	// Populate puts dictionary into overlay at given path
 	Populate(overlay, path string, data *map[string]interface{})
+	// Add adds elements from given Container into root of given layer
+	Add(overlay string, value Container)
 	// Put puts Node value into overlay at given path
 	Put(overlay, path string, value Node)
 	// Merged returns read-only, merged view of all overlays