Fix len and keys funcs regarding new map type

CHANGELOG.md

@@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Nothing yet.
 
+## [v2.3.4] - 2023-06-01
+
+### Fixed
+
+- `len` function now works with new map type.
+- `keys` function now works with new map type.
+
 ## [v2.3.3] - 2023-05-31
 
 ### Fixed
@@ -587,7 +594,8 @@ See [documentation](https://daseldocs.tomwright.me) for all changes.
 
 - Everything!
 
-[unreleased]: https://github.com/TomWright/dasel/compare/v2.3.3...HEAD
+[unreleased]: https://github.com/TomWright/dasel/compare/v2.3.4...HEAD
+[v2.3.4]: https://github.com/TomWright/dasel/compare/v2.3.3...v2.3.4
 [v2.3.3]: https://github.com/TomWright/dasel/compare/v2.3.2...v2.3.3
 [v2.3.2]: https://github.com/TomWright/dasel/compare/v2.3.1...v2.3.2
 [v2.3.1]: https://github.com/TomWright/dasel/compare/v2.3.0...v2.3.1

func_keys.go

@@ -2,6 +2,7 @@ package dasel
 
 import (
 	"fmt"
+	"github.com/tomwright/dasel/v2/dencoding"
 	"reflect"
 	"sort"
 	"strings"
@@ -67,9 +68,19 @@ var KeysFunc = BasicFunction{
 
 				res[i] = ValueOf(list)
 			default:
-				return nil, &ErrInvalidType{
-					ExpectedTypes: []string{"slice", "array", "map"},
-					CurrentType:   val.Kind().String(),
+				if val.IsDencodingMap() {
+					dencodingMap := val.Interface().(*dencoding.Map)
+					mapKeys := dencodingMap.Keys()
+					list := make([]any, 0, len(mapKeys))
+					for _, k := range mapKeys {
+						list = append(list, k)
+					}
+					res[i] = ValueOf(list)
+				} else {
+					return nil, &ErrInvalidType{
+						ExpectedTypes: []string{"slice", "array", "map"},
+						CurrentType:   val.Kind().String(),
+					}
 				}
 			}
 		}

func_keys_test.go

@@ -1,6 +1,9 @@
 package dasel
 
-import "testing"
+import (
+	"github.com/tomwright/dasel/v2/dencoding"
+	"testing"
+)
 
 func TestKeysFunc(t *testing.T) {
 	testdata := map[string]any{
@@ -9,14 +12,18 @@ func TestKeysFunc(t *testing.T) {
 		},
 		"list":   []any{111, 222, 333},
 		"string": "something",
+		"dencodingMap": dencoding.NewMap().
+			Set("a", 1).
+			Set("b", 2).
+			Set("c", 3),
 	}
 
 	t.Run(
 		"root",
 		selectTest(
 			"keys()",
 			testdata,
-			[]any{[]any{"list", "object", "string"}},
+			[]any{[]any{"list", "object", "string", "dencodingMap"}},
 		),
 	)
 
@@ -38,6 +45,15 @@ func TestKeysFunc(t *testing.T) {
 		),
 	)
 
+	t.Run(
+		"Dencoding Map",
+		selectTest(
+			"dencodingMap.keys()",
+			testdata,
+			[]any{[]any{"a", "b", "c"}}, // sorted
+		),
+	)
+
 	t.Run("InvalidType",
 		selectTestErr(
 			"string.keys()",

value.go

@@ -57,6 +57,9 @@ func (v Value) Interface() interface{} {
 
 // Len returns v's length.
 func (v Value) Len() int {
+	if v.IsDencodingMap() {
+		return len(v.Interface().(*dencoding.Map).Keys())
+	}
 	switch v.Kind() {
 	case reflect.Array, reflect.Chan, reflect.Map, reflect.Slice, reflect.String:
 		return v.Unpack().Len()
@@ -104,7 +107,7 @@ func containsKind(kinds []reflect.Kind, kind reflect.Kind) bool {
 
 var dencodingMapType = reflect.TypeOf(&dencoding.Map{})
 
-func isdencodingMap(value reflect.Value) bool {
+func isDencodingMap(value reflect.Value) bool {
 	return value.Kind() == reflect.Ptr && value.Type() == dencodingMapType
 }
 
@@ -114,7 +117,7 @@ func unpackReflectValue(value reflect.Value, kinds ...reflect.Kind) reflect.Valu
 	}
 	res := value
 	for {
-		if isdencodingMap(res) {
+		if isDencodingMap(res) {
 			return res
 		}
 		if !containsKind(kinds, res.Kind()) {
@@ -389,7 +392,7 @@ func makeAddressableMap(value reflect.Value) reflect.Value {
 func makeAddressable(value reflect.Value) reflect.Value {
 	unpacked := unpackReflectValue(value)
 
-	if isdencodingMap(unpacked) {
+	if isDencodingMap(unpacked) {
 		om := value.Interface().(*dencoding.Map)
 		for _, kv := range om.KeyValues() {
 			var val any
@@ -446,7 +449,7 @@ func derefMap(value reflect.Value) reflect.Value {
 func deref(value reflect.Value) reflect.Value {
 	unpacked := unpackReflectValue(value)
 
-	if isdencodingMap(unpacked) {
+	if isDencodingMap(unpacked) {
 		om := value.Interface().(*dencoding.Map)
 		for _, kv := range om.KeyValues() {
 			if v := deref(reflect.ValueOf(kv.Value)); v.IsValid() {