wip

Signed-off-by: Pierre Fenoll <[email protected]>

Author: fenollp

openapi3/schema.go

@@ -736,18 +736,23 @@ func (s *Schema) fromOpenAPISchema() (schema schemaJSON) {
 		schema["enum"] = sEnum
 	}
 
-	if sFormat := s.Format; sFormat != "" {
-		schema["format"] = sFormat
-	}
 	if sMinLength := s.MinLength; sMinLength != 0 {
 		schema["minLength"] = sMinLength
 	}
 	if sMaxLength := s.MaxLength; nil != sMaxLength {
 		schema["maxLength"] = *sMaxLength
 	}
+
+	if sFormat := s.Format; sFormat != "" {
+		schema["format"] = sFormat
+	}
 	if sPattern := s.Pattern; sPattern != "" {
 		schema["pattern"] = sPattern
 	}
+	if s.Format == "byte" {
+		// Matches base64 (RFC 4648) `standard` base64 not `base64url`.
+		schema["pattern"] = "^[\\w\\d+\\/=]*$"
+	}
 
 	if nil != s.Min {
 		schema["minimum"] = *s.Min
@@ -845,6 +850,9 @@ func (s *Schema) fromOpenAPISchema() (schema schemaJSON) {
 	}
 
 	schema["$schema"] = "http://json-schema.org/draft-04/schema#"
+	//FIXME
+	//https://github.com/openapi-contrib/openapi-schema-to-json-schema/blob/45c080c38027c30652263b4cc44cd3534f5ccc1b/lib/converters/schema.js
+	//https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.3.md#schemaObject
 	return
 }
 

openapi3/schema_test.go

@@ -311,7 +311,7 @@ var schemaExamples = []schemaExample{
 	},
 
 	{
-		Title:  "STRING: format 'date-time'",
+		Title:  `STRING: format "byte"`,
 		Schema: NewBytesSchema(),
 		Serialization: map[string]interface{}{
 			"type":   "string",
@@ -326,13 +326,13 @@ var schemaExamples = []schemaExample{
 				}
 				return data
 			}()),
-			base64.URLEncoding.EncodeToString(func() []byte {
-				data := make([]byte, 0, 1024)
-				for i := 0; i < cap(data); i++ {
-					data = append(data, byte(i))
-				}
-				return data
-			}()),
+			// base64.URLEncoding.EncodeToString(func() []byte {
+			// 	data := make([]byte, 0, 1024)
+			// 	for i := 0; i < cap(data); i++ {
+			// 		data = append(data, byte(i))
+			// 	}
+			// 	return data
+			// }()),
 		},
 		AllInvalid: []interface{}{
 			nil,