minor refactor

abiosoft · abiosoft · commit 56d2c87d56fc · 2021-05-22T22:49:30.000+01:00
diff --git a/interface.go b/interface.go
@@ -55,7 +55,7 @@ func (f Interface) goPkg() string {
 func (f Interface) toSchema() *Schema {
 	var s = NewSchema()
 	s.setType(f.Type)
-	s.Nullable = f.Nullable
+	s.nullable = f.Nullable
 
 	// if it's a module loader, construct a special case (sub)schema
 	if len(f.Loader) > 0 {
@@ -79,7 +79,7 @@ func (f Interface) toSchema() *Schema {
 			cs.setType("array")
 			cs.ArrayItems = NewSchema()
 			cs.ArrayItems.setType(nest.Type)
-			cs.ArrayItems.Nullable = nest.Nullable
+			cs.ArrayItems.nullable = nest.Nullable
 			cs.ArrayItems.Properties = props
 
 			// nested schema
diff --git a/schema.go b/schema.go
@@ -27,7 +27,6 @@ type Schema struct {
 	Description         string `json:"description,omitempty"`
 	MarkdownDescription string `json:"markdownDescription,omitempty"`
 	Type                string `json:"type,omitempty"`
-	Nullable            bool   `json:"-"`
 	Ref                 string `json:"$ref,omitempty"`
 
 	ArrayItems           *Schema            `json:"items,omitempty"`
@@ -52,6 +51,7 @@ type Schema struct {
 	goPkg               string
 	description         string
 	markdownDescription string
+	nullable            bool
 }
 
 func godocLink(pkg string) string {
@@ -124,7 +124,7 @@ func (s *Schema) setRef(moduleID string) {
 // MarshalJSON allows to marshal Schema.Type as string or list
 func (s *Schema) MarshalJSON() ([]byte, error) {
 	type Alias Schema
-	if s.Nullable {
+	if s.nullable {
 		return json.Marshal(&struct {
 			Type [2]string `json:"type"`
 			*Alias
