fix delayed list merge + marshal non-printable

Author: mandelsoft

flow/flow.go

@@ -481,8 +481,13 @@ func flowMap(root yaml.Node, env dynaml.Binding, shouldOverride, template bool)
 func flowList(root yaml.Node, env dynaml.Binding, template bool) yaml.Node {
 	rootList := root.Value().([]yaml.Node)
 
+	if root.Merged() {
+		return root
+	}
+
 	debug.Debug("HANDLE LIST %v\n", env.Path())
-	merged, process, replaced, redirectPath, keyName, ismerged, flags, tag, stub, nomerge := processMerges(root, rootList, env, template)
+	merged, process, replaced, redirectPath, keyName, ismerged, flags, tag, stub := processMerges(root, rootList, env, template)
+	nomerge := flags.IsNoMerge()
 
 	if process {
 		debug.Debug("process list (key: %s) %v\n", keyName, env.Path())
@@ -622,20 +627,20 @@ func useMerge(n yaml.Node) bool {
 	return false
 }
 
-func processMerges(orig yaml.Node, root []yaml.Node, env dynaml.Binding, template bool) (interface{}, bool, bool, []string, string, bool, yaml.NodeFlags, string, yaml.Node, bool) {
+func processMerges(orig yaml.Node, root []yaml.Node, env dynaml.Binding, template bool) (interface{}, bool, bool, []string, string, bool, yaml.NodeFlags, string, yaml.Node) {
 	var flags yaml.NodeFlags
 	var stub yaml.Node
 	flags, stub = get_inherited_flags(env)
 	tag := orig.GetAnnotation().Tag()
 	spliced := []yaml.Node{}
 	process := true
-	merged := false
+	merged := orig.Merged()
 	keyName := orig.KeyName()
 	replaced := orig.ReplaceFlag()
 	redirectPath := orig.RedirectPath()
 
 	// first, check for omitted stub merging for non-keyed values
-	nomerge := false
+	nomerge := orig.Flags().IsNoMerge()
 	for _, val := range root {
 		if val == nil {
 			continue
@@ -751,8 +756,12 @@ func processMerges(orig yaml.Node, root []yaml.Node, env dynaml.Binding, templat
 		result = processed
 	}
 
+	if nomerge {
+		flags |= yaml.FLAG_NOMERGE
+	}
+
 	debug.Debug("--> %+v  proc=%v replaced=%v redirect=%v key=%s\n", result, process, replaced, redirectPath, keyName)
-	return result, process, replaced, redirectPath, keyName, merged, flags, tag, stub, nomerge
+	return result, process, replaced, redirectPath, keyName, merged, flags, tag, stub
 }
 
 const NO_LIST_KEY = "<<<NO LIST KEY>>"

flow/flow2_test.go

@@ -13,7 +13,13 @@ var _ = Describe("merging lists", func() {
 list:
    - field: e
      attr: f
+   - field: g
+     attr: h
    - <<<: (( merge ))
+   - field: i
+     attr: j
+   - field: k
+     attr: l
 `)
 			stub := parseYAML(`
 ---
@@ -28,10 +34,61 @@ list:
 list:
   - field: e
     attr: f
+  - field: g
+    attr: h
   - field: a
     attr: b
   - field: c
     attr: d
+  - field: i
+    attr: j
+  - field: k
+    attr: l
+`)
+			Expect(source).To(FlowAs(resolved, stub))
+		})
+
+		It("merges map lists with two inserts", func() {
+			source := parseYAML(`
+---
+temp:
+- <<: (( &temporary ))
+- field: t1
+  attr: vt1
+- field: t2
+  attr: vt2
+
+list:
+   - field: a1
+     attr: va1
+   - <<<: (( merge ))
+   - field: a2
+     attr: va2
+   - <<: (( temp ))
+`)
+			stub := parseYAML(`
+---
+list:
+  - field: b1
+    attr: vb1
+  - field: b2
+    attr: vb2
+`)
+			resolved := parseYAML(`
+---
+list:
+  - field: a1
+    attr: va1
+  - field: b1
+    attr: vb1
+  - field: b2
+    attr:  vb2
+  - field: a2
+    attr: va2
+  - field: t1
+    attr: vt1
+  - field: t2
+    attr: vt2
 `)
 			Expect(source).To(FlowAs(resolved, stub))
 		})

legacy/candiedyaml/encode.go

@@ -250,12 +250,17 @@ func (e *Encoder) emitSlice(tag string, v reflect.Value) {
 }
 
 func (e *Encoder) emitBase64(tag string, v reflect.Value) {
-	if v.IsNil() {
+	if v.Kind() == reflect.Slice && v.IsNil() {
 		e.emitNil()
 		return
 	}
 
-	s := v.Bytes()
+	var s []byte
+	if v.Kind() == reflect.String {
+		s = []byte(v.String())
+	} else {
+		s = v.Bytes()
+	}
 
 	dst := make([]byte, base64.StdEncoding.EncodedLen(len(s)))
 
@@ -267,10 +272,13 @@ func (e *Encoder) emitString(tag string, v reflect.Value) {
 	var style yaml_scalar_style_t
 	s := v.String()
 
-	if nonPrintable.MatchString(s) {
-		e.emitBase64(tag, v)
-		return
-	}
+	/*
+		if nonPrintable.MatchString(s) {
+			e.emitBase64(tag, v)
+			return
+		}
+
+	*/
 
 	if v.Type() == numberType {
 		style = yaml_PLAIN_SCALAR_STYLE

yaml/node.go

@@ -77,6 +77,8 @@ const (
 
 	FLAG_INJECTED = 0x040
 	FLAG_IMPLIED  = 0x080
+
+	FLAG_NOMERGE = 0x100
 )
 
 type NodeFlags int
@@ -160,6 +162,14 @@ func (f *NodeFlags) SetInjected() *NodeFlags {
 	return f
 }
 
+func (f NodeFlags) IsNoMerge() bool {
+	return (f & FLAG_NOMERGE) != 0
+}
+func (f *NodeFlags) SetNoMerge() *NodeFlags {
+	*f |= FLAG_NOMERGE
+	return f
+}
+
 type Annotation struct {
 	redirectPath []string
 	replace      bool
@@ -303,7 +313,7 @@ func (n Annotation) Preferred() bool {
 }
 
 func (n Annotation) Merged() bool {
-	return n.merged //|| n.ReplaceFlag() || len(n.RedirectPath()) > 0
+	return n.merged // || n.ReplaceFlag() || len(n.RedirectPath()) > 0
 }
 
 func (n Annotation) StandardOverride() bool {