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

Merge branch 'main' into Baliedge/PIP-2552-consistent-ordering

Browse Source
This commit is contained in:
Tristan Cartledge
2023-11-27 12:06:39 +00:00
parent d10f20dccb ae93af8efa
commit 2de65e4ca0
219 changed files with 20934 additions and 4697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
datamodel/low/v3/paths.go
View File

@@ -4,6 +4,7 @@
package v3
import (
"context"
"crypto/sha256"
"fmt"
"sort"
@@ -64,7 +65,7 @@ func (p *Paths) GetExtensions() map[low.KeyReference[string]]low.ValueReference[
}
// Build will extract extensions and all PathItems. This happens asynchronously for speed.
func (p *Paths) Build(_, root *yaml.Node, idx *index.SpecIndex) error {
func (p *Paths) Build(ctx context.Context, _, root *yaml.Node, idx *index.SpecIndex) error {
root = utils.NodeAlias(root)
utils.CheckForMergeNodes(root)
p.Reference = new(low.Reference)
@@ -119,6 +120,7 @@ func (p *Paths) Build(_, root *yaml.Node, idx *index.SpecIndex) error {
}
}()
// TranslatePipeline output.
go func() {
for {
@@ -132,21 +134,17 @@ func (p *Paths) Build(_, root *yaml.Node, idx *index.SpecIndex) error {
wg.Done()
}()
err := datamodel.TranslatePipeline[buildInput, buildResult](in, out,
func(value buildInput) (buildResult, error) {
pNode := value.pathNode
cNode := value.currentNode
if ok, _, _ := utils.IsNodeRefValue(pNode); ok {
r, err := low.LocateRefNode(pNode, idx)
r, _, err := low.LocateRefNode(pNode, idx)
if r != nil {
pNode = r
if r.Tag == "" {
// If it's a node from file, tag is empty
// If it's a reference we need to extract actual operation node
pNode = r.Content[0]
}
if err != nil {
if !idx.AllowCircularReferenceResolving() {
return buildResult{}, fmt.Errorf("path item build failed: %s", err.Error())
@@ -158,13 +156,19 @@ func (p *Paths) Build(_, root *yaml.Node, idx *index.SpecIndex) error {
}
}
path := new(PathItem)
_ = low.BuildModel(pNode, path)
err := path.Build(cNode, pNode, idx)
err := path.Build(ctx, cNode, pNode, idx)
if err != nil {
return buildResult{}, err
if idx != nil && idx.GetLogger() != nil {
idx.GetLogger().Error(fmt.Sprintf("error building path item '%s'", err.Error()))
}
//return buildResult{}, err
}
return buildResult{
key: low.KeyReference[string]{
Value: cNode.Value,
@@ -182,6 +186,7 @@ func (p *Paths) Build(_, root *yaml.Node, idx *index.SpecIndex) error {
return err
}
p.PathItems = pathsMap
return nil
}