Merge pull request #3 from birotaio/fix/enum

Fix/enum

openapi.go

@@ -1,6 +1,8 @@
 package gojsonschema
 
-import "github.com/getkin/kin-openapi/openapi3"
+import (
+	"github.com/getkin/kin-openapi/openapi3"
+)
 
 func GetOpenAPI(ls JSONLoader) (*openapi3.Schema, error) {
 	schema, err := NewSchema(ls)
@@ -43,8 +45,8 @@ func recursiveOpenApi(currentSubSchema *subSchema) *openapi3.Schema {
 	}
 
 	if schema != nil {
-		if len(currentSubSchema.enum) > 0 {
-			schema.WithEnum(ToInterface(currentSubSchema.enum)...)
+		if len(currentSubSchema.rawEnum) > 0 {
+			schema.WithEnum(currentSubSchema.rawEnum...)
 		}
 		if currentSubSchema.readOnly {
 			schema.ReadOnly = true
@@ -56,11 +58,3 @@ func recursiveOpenApi(currentSubSchema *subSchema) *openapi3.Schema {
 
 	return schema
 }
-
-func ToInterface[T any](a []T) []any {
-	res := make([]any, 0)
-	for _, obj := range a {
-		res = append(res, obj)
-	}
-	return res
-}

openapi_test.go

@@ -0,0 +1,54 @@
+package gojsonschema
+
+import (
+	"testing"
+
+	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+const Openapi string = `
+{
+	"type": "object",
+	"properties": {
+		"string": {
+			"type": ["string", "null"],
+			"enum": [
+				"hello",
+				"world",
+				null
+			]
+		}
+	}
+}
+	
+`
+
+func TestOpenAPI(t *testing.T) {
+	var testCases = []struct {
+		schema string
+	}{
+		{
+			schema: Openapi,
+		},
+	}
+
+	// Check enum is well formated
+
+	for _, testCase := range testCases {
+		schema := NewStringLoader(testCase.schema)
+
+		res, err := GetOpenAPI(schema)
+		require.NoError(t, err)
+
+		a := &openapi3.T{}
+
+		a.Components = &openapi3.Components{}
+		a.Components.Schemas = make(openapi3.Schemas)
+		a.Components.Schemas["hihi"] = openapi3.NewSchemaRef("", res)
+		data, err := a.MarshalJSON()
+		require.NoError(t, err)
+		assert.JSONEq(t, `{"components":{"schemas":{"hihi":{"properties":{"string":{"enum":["hello","world",null],"nullable":true,"type":"string"}},"type":"object"}}},"info":null,"openapi":"","paths":null}`, string(data))
+	}
+}

schema.go

@@ -841,6 +841,7 @@ func (d *Schema) parseSchema(documentNode interface{}, currentSchema *subSchema)
 					))
 				}
 				currentSchema.enum = append(currentSchema.enum, *is)
+				currentSchema.rawEnum = append(currentSchema.rawEnum, v)
 			}
 		} else {
 			return errors.New(formatErrorDescription(

subSchema.go

@@ -138,8 +138,9 @@ type subSchema struct {
 	additionalItems interface{}
 
 	// validation : all
-	_const *string //const is a golang keyword
-	enum   []string
+	_const  *string //const is a golang keyword
+	enum    []string
+	rawEnum []any
 
 	// validation : subSchema
 	oneOf []*subSchema