Allow typed slices via reflection

Author: sttts

result.go

@@ -82,7 +82,7 @@ func (fk *FieldKey) Field() string {
 }
 
 // NewItemKey returns a pair of a slice and index usable as a key of a map.
-func NewItemKey(slice []interface{}, i int) ItemKey {
+func NewItemKey(slice interface{}, i int) ItemKey {
 	return ItemKey{slice: reflect.ValueOf(slice), index: i}
 }
 
@@ -103,7 +103,7 @@ type fieldSchemata struct {
 }
 
 type itemSchemata struct {
-	slice    []interface{}
+	slice    reflect.Value
 	index    int
 	schemata schemata
 }
@@ -196,15 +196,15 @@ func (r *Result) mergeForField(obj map[string]interface{}, field string, other *
 }
 
 // mergeForSlice merges other into r, assigning other's root schemata to the given slice and index.
-func (r *Result) mergeForSlice(slice []interface{}, i int, other *Result) *Result {
+func (r *Result) mergeForSlice(slice reflect.Value, i int, other *Result) *Result {
 	if other == nil {
 		return r
 	}
 	r.mergeWithoutRootSchemata(other)
 
 	if other.rootObjectSchemata.Len() > 0 {
 		if r.itemSchemata == nil {
-			r.itemSchemata = make([]itemSchemata, len(slice))
+			r.itemSchemata = make([]itemSchemata, slice.Len())
 		}
 		r.itemSchemata = append(r.itemSchemata, itemSchemata{
 			slice:    slice,
@@ -233,9 +233,9 @@ func (r *Result) addPropertySchemata(obj map[string]interface{}, fld string, sch
 
 // addSliceSchemata adds the given schemata for the slice and index.
 // The slice schemata might be reused. I.e. do not modify it after being added to a result.
-func (r *Result) addSliceSchemata(slice []interface{}, i int, schema *spec.Schema) {
+func (r *Result) addSliceSchemata(slice reflect.Value, i int, schema *spec.Schema) {
 	if r.itemSchemata == nil {
-		r.itemSchemata = make([]itemSchemata, 0, len(slice))
+		r.itemSchemata = make([]itemSchemata, 0, slice.Len())
 	}
 	r.itemSchemata = append(r.itemSchemata, itemSchemata{slice: slice, index: i, schemata: schemata{one: schema}})
 }

slice_validator.go

@@ -57,7 +57,7 @@ func (s *schemaSliceValidator) Validate(data interface{}) *Result {
 		for i := 0; i < size; i++ {
 			validator.SetPath(fmt.Sprintf("%s.%d", s.Path, i))
 			value := val.Index(i)
-			result.mergeForSlice(data.([]interface{}), i, validator.Validate(value.Interface()))
+			result.mergeForSlice(val, i, validator.Validate(value.Interface()))
 		}
 	}
 
@@ -69,7 +69,7 @@ func (s *schemaSliceValidator) Validate(data interface{}) *Result {
 			if val.Len() <= i {
 				break
 			}
-			result.mergeForSlice(data.([]interface{}), int(i), validator.Validate(val.Index(i).Interface()))
+			result.mergeForSlice(val, int(i), validator.Validate(val.Index(i).Interface()))
 		}
 	}
 	if s.AdditionalItems != nil && itemsSize < size {
@@ -79,7 +79,7 @@ func (s *schemaSliceValidator) Validate(data interface{}) *Result {
 		if s.AdditionalItems.Schema != nil {
 			for i := itemsSize; i < size-itemsSize+1; i++ {
 				validator := NewSchemaValidator(s.AdditionalItems.Schema, s.Root, fmt.Sprintf("%s.%d", s.Path, i), s.KnownFormats)
-				result.mergeForSlice(data.([]interface{}), int(i), validator.Validate(val.Index(int(i)).Interface()))
+				result.mergeForSlice(val, int(i), validator.Validate(val.Index(int(i)).Interface()))
 			}
 		}
 	}