Merge pull request #22 from dadav/set_correct_type

fix: Set type to object if properties are used
dadav · Mar 31, 2024 · c44420c · c44420c
2 parents d7dd19e + 167895c
commit c44420c
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/pkg/schema/schema.go b/pkg/schema/schema.go
@@ -356,15 +356,21 @@ func typeFromTag(tag string) ([]string, error) {
 }
 
 func FixRequiredProperties(schema *Schema) error {
-	requiredProperties := []string{}
-	for propName, propValue := range schema.Properties {
-		FixRequiredProperties(propValue)
-		if propValue.Required {
-			requiredProperties = append(requiredProperties, propName)
+	if schema.Properties != nil {
+		requiredProperties := []string{}
+		for propName, propValue := range schema.Properties {
+			FixRequiredProperties(propValue)
+			if propValue.Required {
+				requiredProperties = append(requiredProperties, propName)
+			}
+		}
+		if len(requiredProperties) > 0 {
+			schema.RequiredProperties = requiredProperties
+		}
+		if !slices.Contains(schema.Type, "object") {
+			// If .Properties is set, type must be object
+			schema.Type = []string{"object"}
 		}
-	}
-	if len(requiredProperties) > 0 {
-		schema.RequiredProperties = requiredProperties
 	}
 
 	if schema.Then != nil {