feat(jsonschema): Change to TopLevelType function, more general.

Author: dustmop

keywords.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"reflect"
 	"strconv"
+	"strings"
 )
 
 // primitiveTypes is a map of strings to check types against
@@ -60,11 +61,11 @@ func NewType() Validator {
 }
 
 // FirstValue returns the first element in the values of this type.
-func (t Type) FirstValue() string {
+func (t Type) String() string {
 	if len(t.vals) == 0 {
-		return ""
+		return "unknown"
 	}
-	return t.vals[0]
+	return strings.Join(t.vals, ",")
 }
 
 // Validate checks to see if input data satisfies the type constraint

schema.go

@@ -46,15 +46,18 @@ type RootSchema struct {
 	// for current and previous published drafts of JSON Schema
 	// vocabularies as deemed reasonable.
 	SchemaURI string `json:"$schema"`
-	// Whether the top-level of the schema is an array or not.
-	// Assume it's an object otherwise.
-	TopIsArray bool
 }
 
-func determineTopIsArray(sch *Schema) bool {
-	validator := sch.Validators["type"]
-	typeValidator, ok := validator.(*Type)
-	return ok && typeValidator.FirstValue() == "array"
+// TopLevelType returns a string representing the schema's top-level type.
+func (rs *RootSchema) TopLevelType() string {
+	validator, ok := rs.Schema.Validators["type"]
+	if ok {
+		typeValidator, ok := validator.(*Type)
+		if ok {
+			return typeValidator.String()
+		}
+	}
+	return "unknown"
 }
 
 // UnmarshalJSON implements the json.Unmarshaler interface for
@@ -64,7 +67,6 @@ func (rs *RootSchema) UnmarshalJSON(data []byte) error {
 	if err := json.Unmarshal(data, sch); err != nil {
 		return err
 	}
-	topIsArray := determineTopIsArray(sch)
 
 	if sch.schemaType == schemaTypeFalse || sch.schemaType == schemaTypeTrue {
 		*rs = RootSchema{Schema: *sch}
@@ -81,7 +83,6 @@ func (rs *RootSchema) UnmarshalJSON(data []byte) error {
 	root := &RootSchema{
 		Schema:     *sch,
 		SchemaURI:  suri.SchemaURI,
-		TopIsArray: topIsArray,
 	}
 
 	// collect IDs for internal referencing:
@@ -135,7 +136,6 @@ func (rs *RootSchema) UnmarshalJSON(data []byte) error {
 	*rs = RootSchema{
 		Schema:     *sch,
 		SchemaURI:  suri.SchemaURI,
-		TopIsArray: topIsArray,
 	}
 	return nil
 }

schema_test.go

@@ -94,8 +94,8 @@ func TestTopLevelType(t *testing.T) {
 	if err := json.Unmarshal(schemaObject, rs); err != nil {
 		panic("unmarshal schema: " + err.Error())
 	}
-	if rs.TopIsArray {
-		t.Errorf("error: schemaObject should not be an array")
+	if rs.TopLevelType() != "object" {
+		t.Errorf("error: schemaObject should be an object")
 	}
 
 	schemaArray := []byte(`{
@@ -107,8 +107,8 @@ func TestTopLevelType(t *testing.T) {
 	if err := json.Unmarshal(schemaArray, rs); err != nil {
 		panic("unmarshal schema: " + err.Error())
 	}
-	if !rs.TopIsArray {
-		t.Errorf("error: schemaArray should not be an object")
+	if rs.TopLevelType() != "array" {
+		t.Errorf("error: schemaArray should be an array")
 	}
 }