LukeParke/libopenapi
1
0
Fork 0
mirror of https://github.com/LukeHagar/libopenapi.git synced 2025-12-07 20:47:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added contains, minContains and maxContains to schema #28

Browse Source 
Added support for missing 3.1 schema properties, however it does not cover the `boolean` case
This commit is contained in:
Dave Shanley
2022-12-03 14:08:14 -05:00
parent 4fcf45b813
commit d51d2fcd27
6 changed files with 79 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
datamodel/low/base/schema.go
View File

@@ -72,6 +72,10 @@ type Schema struct {
Examples low.NodeReference[[]low.ValueReference[any]]
// in 3.1 PrefixItems provides tuple validation using prefixItems.
PrefixItems low.NodeReference[[]low.ValueReference[*SchemaProxy]]
// in 3.1 Contains is used by arrays and points to a Schema.
Contains low.NodeReference[*SchemaProxy]
MinContains low.NodeReference[int64]
MaxContains low.NodeReference[int64]
// Compatible with all versions
Title low.NodeReference[string]
@@ -367,6 +371,17 @@ func (s *Schema) Hash() [32]byte {
if s.Example.Value != nil {
d = append(d, low.GenerateHashString(s.Example.Value))
}
// contains
if !s.Contains.IsEmpty() {
d = append(d, low.GenerateHashString(s.Contains.Value))
}
if !s.MinContains.IsEmpty() {
d = append(d, fmt.Sprint(s.MinContains.Value))
}
if !s.MaxContains.IsEmpty() {
d = append(d, fmt.Sprint(s.MaxContains.Value))
}
if !s.Examples.IsEmpty() {
var xph []string
for w := range s.Examples.Value {
@@ -632,6 +647,7 @@ func (s *Schema) Build(root *yaml.Node, idx *index.SpecIndex) error {
}
var allOf, anyOf, oneOf, not, items, prefixItems []low.ValueReference[*SchemaProxy]
var contains low.ValueReference[*SchemaProxy]
_, allOfLabel, allOfValue := utils.FindKeyNodeFullTop(AllOfLabel, root.Content)
_, anyOfLabel, anyOfValue := utils.FindKeyNodeFullTop(AnyOfLabel, root.Content)
@@ -639,6 +655,7 @@ func (s *Schema) Build(root *yaml.Node, idx *index.SpecIndex) error {
_, notLabel, notValue := utils.FindKeyNodeFullTop(NotLabel, root.Content)
_, itemsLabel, itemsValue := utils.FindKeyNodeFullTop(ItemsLabel, root.Content)
_, prefixItemsLabel, prefixItemsValue := utils.FindKeyNodeFullTop(PrefixItemsLabel, root.Content)
_, containsLabel, containsValue := utils.FindKeyNodeFullTop(ContainsLabel, root.Content)
errorChan := make(chan error)
allOfChan := make(chan schemaProxyBuildResult)
@@ -647,6 +664,7 @@ func (s *Schema) Build(root *yaml.Node, idx *index.SpecIndex) error {
itemsChan := make(chan schemaProxyBuildResult)
prefixItemsChan := make(chan schemaProxyBuildResult)
notChan := make(chan schemaProxyBuildResult)
containsChan := make(chan schemaProxyBuildResult)
totalBuilds := countSubSchemaItems(allOfValue) +
countSubSchemaItems(anyOfValue) +
@@ -673,6 +691,10 @@ func (s *Schema) Build(root *yaml.Node, idx *index.SpecIndex) error {
if notValue != nil {
go buildSchema(notChan, notLabel, notValue, errorChan, idx)
}
if containsValue != nil {
totalBuilds++
go buildSchema(containsChan, containsLabel, containsValue, errorChan, idx)
}
completeCount := 0
for completeCount < totalBuilds {
@@ -697,6 +719,9 @@ func (s *Schema) Build(root *yaml.Node, idx *index.SpecIndex) error {
case r := <-notChan:
completeCount++
not = append(not, r.v)
case r := <-containsChan:
completeCount++
contains = r.v
}
}
@@ -743,6 +768,13 @@ func (s *Schema) Build(root *yaml.Node, idx *index.SpecIndex) error {
ValueNode: prefixItemsValue,
}
}
if !contains.IsEmpty() {
s.Contains = low.NodeReference[*SchemaProxy]{
Value: contains.Value,
KeyNode: containsLabel,
ValueNode: containsValue,
}
}
return nil
}