fix parsing JavaScript shared value

fix parsing struct with private fields

Author: marle3003

js/mokapi/shared.go

@@ -200,3 +200,8 @@ func (p *SharedValue) ToValue() goja.Value {
 		return p.source
 	}
 }
+
+// Export is used by the json schema parser interface Exportable
+func (p *SharedValue) Export() any {
+	return p.source.Export()
+}

schema/json/parser/parser_object.go

@@ -143,7 +143,7 @@ func (p *Parser) parseStruct(v reflect.Value, s *schema.Schema, evaluated map[st
 	obj := sortedmap.NewLinkedHashMap()
 	for i := 0; i < v.NumField(); i++ {
 		ft := t.Field(i)
-		if ft.PkgPath == "" {
+		if ft.PkgPath != "" {
 			continue
 		}
 		name := unTitle(ft.Name)

schema/json/parser/parser_object_test.go

@@ -1,12 +1,14 @@
 package parser_test
 
 import (
+	"mokapi/js/mokapi"
 	"mokapi/schema/json/parser"
 	"mokapi/schema/json/schema"
 	"mokapi/schema/json/schema/schematest"
 	"mokapi/sortedmap"
 	"testing"
 
+	"github.com/dop251/goja"
 	"github.com/stretchr/testify/require"
 )
 
@@ -459,6 +461,61 @@ func TestParser_ParseObject(t *testing.T) {
 				require.Equal(t, map[string]interface{}{"foo": "bar", "bar": "abc"}, v)
 			},
 		},
+		{
+			name: "unevaluatedProperties",
+			schema: schematest.NewTypes(nil,
+				schematest.WithAllOf(
+					schematest.New("object",
+						schematest.WithAllOf(schematest.New("object",
+							schematest.WithProperty("city", schematest.New("string")),
+						)),
+					),
+				),
+				schematest.WithProperty("type", schematest.NewTypes(nil, schematest.WithEnumValues("residential", "business"))),
+				schematest.WithRequired("type"),
+				schematest.WithUnevaluatedProperties(schematest.NewBool(false)),
+			),
+			data: map[string]any{"type": "residential", "city": "Washington"},
+			test: func(t *testing.T, v interface{}, err error) {
+				require.NoError(t, err)
+			},
+		},
+		{
+			name: "parse from JavaScript shared value",
+			schema: schematest.NewTypes(nil,
+				schematest.WithProperty("type", schematest.NewTypes(nil, schematest.WithEnumValues("residential", "business"))),
+				schematest.WithRequired("type"),
+			),
+			data: func() any {
+				vm := goja.New()
+				v := vm.ToValue(map[string]any{"type": "residential"})
+				return mokapi.NewSharedValue(v, vm)
+			}(),
+			test: func(t *testing.T, v interface{}, err error) {
+				require.NoError(t, err)
+				require.Equal(t, map[string]interface{}{"type": "residential"}, v)
+			},
+		},
+		{
+			name: "parse struct with private fields",
+			schema: schematest.NewTypes(nil,
+				schematest.WithProperty("bar", schematest.New("string")),
+				schematest.WithRequired("bar"),
+			),
+			data: func() any {
+				return &struct {
+					foo string
+					Bar string
+				}{
+					foo: "bar",
+					Bar: "abc",
+				}
+			}(),
+			test: func(t *testing.T, v interface{}, err error) {
+				require.NoError(t, err)
+				require.Equal(t, map[string]interface{}{"bar": "abc"}, v)
+			},
+		},
 	}
 
 	t.Parallel()