Make remvoveItems copy, and include nodes in ToFieldSet

Author: jennybuckley

typed/toset_test.go

@@ -166,8 +166,8 @@ var fieldsetCases = []fieldsetTestCase{{
 		{`{"arbitraryWavelengthColor":{"IR":255}}`, _NS(_P("arbitraryWavelengthColor"))},
 		{`{"args":[]}`, _NS(_P("args"))},
 		{`{"args":null}`, _NS(_P("args"))},
-		{`{"args":[null]}`, _NS(_P("args"))},
-		{`{"args":[{"key":"a","value":"b"},{"key":"c","value":"d"}]}`, _NS(_P("args"))},
+		{`{"args":[null]}`,_NS(_P("args"))},
+		{`{"args":[{"key":"a","value":"b"},{"key":"c","value":"d"}]}`,_NS(_P("args"))},
 	},
 }, {
 	name:         "associative list",
@@ -221,11 +221,15 @@ var fieldsetCases = []fieldsetTestCase{{
 	pairs: []objSetPair{
 		{`{"list":[]}`, _NS()},
 		{`{"list":[{"key":"a","id":1,"value":{"a":"a"}}]}`, _NS(
+			_P("list", _KBF("key", _SV("a"), "id", _IV(1))),
 			_P("list", _KBF("key", _SV("a"), "id", _IV(1)), "key"),
 			_P("list", _KBF("key", _SV("a"), "id", _IV(1)), "id"),
 			_P("list", _KBF("key", _SV("a"), "id", _IV(1)), "value", "a"),
 		)},
 		{`{"list":[{"key":"a","id":1},{"key":"a","id":2},{"key":"b","id":1}]}`, _NS(
+			_P("list", _KBF("key", _SV("a"), "id", _IV(1))),
+			_P("list", _KBF("key", _SV("a"), "id", _IV(2))),
+			_P("list", _KBF("key", _SV("b"), "id", _IV(1))),
 			_P("list", _KBF("key", _SV("a"), "id", _IV(1)), "key"),
 			_P("list", _KBF("key", _SV("a"), "id", _IV(1)), "id"),
 			_P("list", _KBF("key", _SV("a"), "id", _IV(2)), "key"),

typed/typed.go

@@ -31,7 +31,7 @@ type TypedValue interface {
 	AsValue() *value.Value
 	// Validate returns an error with a list of every spec violation.
 	Validate() error
-	// ToFieldSet creates a set containing every leaf field mentioned, or
+	// ToFieldSet creates a set containing every leaf field and item mentioned, or
 	// validation errors, if any were encountered.
 	ToFieldSet() (*fieldpath.Set, error)
 	// Merge returns the result of merging tv and pso ("partially specified
@@ -109,6 +109,7 @@ func (tv typedValue) ToFieldSet() (*fieldpath.Set, error) {
 	s := fieldpath.NewSet()
 	w := tv.walker()
 	w.leafFieldCallback = func(p fieldpath.Path) { s.Insert(p) }
+	w.nodeFieldCallback = func(p fieldpath.Path) { s.Insert(p) }
 	if errs := w.validate(); len(errs) != 0 {
 		return nil, errs
 	}
@@ -163,8 +164,10 @@ func (tv typedValue) Compare(rhs TypedValue) (c *Comparison, err error) {
 
 // RemoveItems removes each provided list or map item from the value.
 func (tv typedValue) RemoveItems(items *fieldpath.Set) TypedValue {
-	removeItemsWithSchema(&tv.value, items, tv.schema, tv.typeRef)
-	return tv
+	copied := tv
+	copied.value, _ = value.FromUnstructured(tv.value.ToUnstructured(true))
+	removeItemsWithSchema(&copied.value, items, copied.schema, copied.typeRef)
+	return copied
 }
 
 func merge(lhs, rhs typedValue, rule, postRule mergeRule) (TypedValue, error) {

typed/validate.go

@@ -42,6 +42,11 @@ type validatingObjectWalker struct {
 	//  * untyped fields
 	leafFieldCallback func(fieldpath.Path)
 
+	// If set, this is called on "node fields":
+	//  * list items
+	//  * map items
+	nodeFieldCallback func(fieldpath.Path)
+
 	// internal housekeeping--don't set when constructing.
 	inLeaf bool // Set to true if we're in a "big leaf"--atomic map/list
 }
@@ -67,6 +72,21 @@ func (v *validatingObjectWalker) doLeaf() {
 	}
 }
 
+// doNode should be called on nodes after descending into children
+func (v *validatingObjectWalker) doNode() {
+	if v.inLeaf {
+		// We're in a "big leaf", an atomic map or list. Ignore
+		// subsequent leaves.
+		return
+	}
+
+	if v.nodeFieldCallback != nil {
+		// At the moment, this is only used to build fieldsets; we can
+		// add more than the path in here if needed.
+		v.nodeFieldCallback(v.path)
+	}
+}
+
 func (v validatingObjectWalker) doScalar(t schema.Scalar) ValidationErrors {
 	if errs := v.validateScalar(t, &v.value, ""); len(errs) > 0 {
 		return errs
@@ -144,6 +164,8 @@ func (v validatingObjectWalker) visitListItems(t schema.List, list *value.List)
 		v2.value = child
 		v2.typeRef = t.ElementType
 		errs = append(errs, v2.validate()...)
+
+		v2.doNode()
 	}
 	return errs
 }
@@ -175,6 +197,8 @@ func (v validatingObjectWalker) visitMapItems(t schema.Map, m *value.Map) (errs
 		v2.value = item.Value
 		v2.typeRef = t.ElementType
 		errs = append(errs, v2.validate()...)
+
+		v2.doNode()
 	}
 	return errs
 }