Utility method improvements

app/util/mapordered.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"github.com/samber/lo"
+	"golang.org/x/exp/maps"
 )
 
 type OrderedPair[V any] struct {
@@ -78,6 +79,13 @@ func (o *OrderedMap[V]) Remove(k string) {
 	delete(o.Map, k)
 }
 
+func (o *OrderedMap[V]) Clone() *OrderedMap[V] {
+	if o == nil {
+		return nil
+	}
+	return &OrderedMap[V]{Lexical: o.Lexical, Order: slices.Clone(o.Order), Map: maps.Clone(o.Map)}
+}
+
 func (o OrderedMap[V]) MarshalYAML() (any, error) {
 	return o.Map, nil
 }

app/util/mapparse.go

@@ -25,6 +25,12 @@ func (m ValueMap) ParseInt(path string, allowMissing bool, allowEmpty bool) (int
 	})
 }
 
+func (m ValueMap) ParseJSON(path string, allowMissing bool, allowEmpty bool) (any, error) {
+	return parseMapField(m, path, allowMissing, func(res any) (any, error) {
+		return ParseJSON(res, path, allowEmpty)
+	})
+}
+
 func (m ValueMap) ParseMap(path string, allowMissing bool, allowEmpty bool) (ValueMap, error) {
 	return parseMapField(m, path, allowMissing, func(res any) (ValueMap, error) {
 		return ParseMap(res, path, allowEmpty)

app/util/parse.go

@@ -76,6 +76,22 @@ func ParseInt(r any, path string, allowEmpty bool) (int, error) {
 	}
 }
 
+func ParseJSON(r any, path string, allowEmpty bool) (any, error) {
+	switch t := r.(type) {
+	case []byte:
+		return FromJSONAny(t)
+	case string:
+		return FromJSONAny([]byte(t))
+	case nil:
+		if !allowEmpty {
+			return nil, errors.Errorf("could not find json for path [%s]", path)
+		}
+		return nil, nil
+	default:
+		return t, nil
+	}
+}
+
 func ParseMap(r any, path string, allowEmpty bool) (ValueMap, error) {
 	switch t := r.(type) {
 	case ValueMap: