fix(json parser): use Exportable interface when schema or property is not specified

Author: marle3003

schema/json/parser/parser.go

@@ -43,14 +43,14 @@ func (p *Parser) Parse(data interface{}) (interface{}, error) {
 }
 
 func (p *Parser) parse(data interface{}, s *schema.Schema) (interface{}, error) {
-	if s == nil {
-		return data, nil
-	}
-
 	if e, ok := data.(Exportable); ok {
 		data = e.Export()
 	}
 
+	if s == nil {
+		return data, nil
+	}
+
 	if s.Boolean != nil {
 		if *s.Boolean {
 			return data, nil

schema/json/parser/parser_object.go

@@ -9,8 +9,8 @@ import (
 	"regexp"
 	"regexp/syntax"
 	"sort"
-	"strings"
 	"strconv"
+	"strings"
 )
 
 func (p *Parser) parseObject(data interface{}, s *schema.Schema, evaluated map[string]bool) (*sortedmap.LinkedHashMap[string, interface{}], error) {
@@ -253,7 +253,11 @@ func (p *Parser) parseMap(v reflect.Value, s *schema.Schema, evaluated map[strin
 			name := fmt.Sprintf("%v", k.Interface())
 			if _, found := obj.Get(name); !found {
 				o := v.MapIndex(k)
-				obj.Set(name, o.Interface())
+				val := o.Interface()
+				if e, ok := val.(Exportable); ok {
+					val = e.Export()
+				}
+				obj.Set(name, val)
 			}
 		}
 	}

schema/json/parser/parser_test.go

@@ -276,3 +276,60 @@ func TestParser_Null(t *testing.T) {
 		})
 	}
 }
+
+type exportable struct {
+	export func() any
+}
+
+func (e *exportable) Export() any {
+	return e.export()
+}
+
+func TestParser_Exportable(t *testing.T) {
+	testcases := []struct {
+		name   string
+		data   interface{}
+		schema *schema.Schema
+		test   func(t *testing.T, v interface{}, err error)
+	}{
+		{
+			name:   "schema integer",
+			data:   &exportable{export: func() any { return 123 }},
+			schema: schematest.New("integer"),
+			test: func(t *testing.T, v interface{}, err error) {
+				require.NoError(t, err)
+				require.Equal(t, int64(123), v)
+			},
+		},
+		{
+			name:   "no schema",
+			data:   &exportable{export: func() any { return 123 }},
+			schema: nil,
+			test: func(t *testing.T, v interface{}, err error) {
+				require.NoError(t, err)
+				require.Equal(t, 123, v)
+			},
+		},
+		{
+			name:   "exportable as additional property",
+			data:   map[string]interface{}{"foo": &exportable{export: func() any { return 123 }}},
+			schema: schematest.New("object"),
+			test: func(t *testing.T, v interface{}, err error) {
+				require.NoError(t, err)
+				require.Equal(t, map[string]any{"foo": 123}, v)
+			},
+		},
+	}
+
+	t.Parallel()
+	for _, tc := range testcases {
+		tc := tc
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
+			p := &parser.Parser{Schema: tc.schema}
+			v, err := p.Parse(tc.data)
+			tc.test(t, v, err)
+		})
+	}
+}