Tidy code.

pb33f · Aug 1, 2023 · 8f710b2 · 8f710b2
1 parent 776fca4
commit 8f710b2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 22 deletions.
diff --git a/datamodel/low/v2/paths.go b/datamodel/low/v2/paths.go
@@ -59,20 +59,18 @@ func (p *Paths) Build(root *yaml.Node, idx *index.SpecIndex) error {
 	root = utils.NodeAlias(root)
 	utils.CheckForMergeNodes(root)
 	p.Extensions = low.ExtractExtensions(root)
-	// skip := false
-	// var currentNode *yaml.Node
 
 	// Translate YAML nodes to pathsMap using `TranslatePipeline`.
 	type pathBuildResult struct {
 		key   low.KeyReference[string]
 		value low.ValueReference[*PathItem]
 	}
-	type nodeItem struct {
+	type buildInput struct {
 		currentNode *yaml.Node
 		pathNode    *yaml.Node
 	}
 	pathsMap := make(map[low.KeyReference[string]]low.ValueReference[*PathItem])
-	in := make(chan nodeItem)
+	in := make(chan buildInput)
 	out := make(chan pathBuildResult)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -102,7 +100,7 @@ func (p *Paths) Build(root *yaml.Node, idx *index.SpecIndex) error {
 			}
 
 			select {
-			case in <- nodeItem{
+			case in <- buildInput{
 				currentNode: currentNode,
 				pathNode:    pathNode,
 			}:
@@ -131,7 +129,7 @@ func (p *Paths) Build(root *yaml.Node, idx *index.SpecIndex) error {
 		}
 	}()
 
-	translateFunc := func(value nodeItem) (retval pathBuildResult, _ error) {
+	translateFunc := func(value buildInput) (retval pathBuildResult, _ error) {
 		pNode := value.pathNode
 		cNode := value.currentNode
 		path := new(PathItem)
@@ -151,7 +149,7 @@ func (p *Paths) Build(root *yaml.Node, idx *index.SpecIndex) error {
 			},
 		}, nil
 	}
-	err := datamodel.TranslatePipeline[nodeItem, pathBuildResult](in, out, translateFunc)
+	err := datamodel.TranslatePipeline[buildInput, pathBuildResult](in, out, translateFunc)
 	wg.Wait()
 	if err != nil {
 		return err

diff --git a/datamodel/low/v3/components.go b/datamodel/low/v3/components.go
@@ -43,7 +43,7 @@ type componentBuildResult[T any] struct {
 	value low.ValueReference[T]
 }
 
-type inputValue struct {
+type componentInput struct {
 	node         *yaml.Node
 	currentLabel *yaml.Node
 }
@@ -236,7 +236,7 @@ func extractComponentValues[T low.Buildable[N], N any](label string, root *yaml.
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	in := make(chan inputValue)
+	in := make(chan componentInput)
 	out := make(chan componentBuildResult[T])
 	var wg sync.WaitGroup
 	wg.Add(2) // input and output goroutines.
@@ -257,7 +257,7 @@ func extractComponentValues[T low.Buildable[N], N any](label string, root *yaml.
 			}
 
 			select {
-			case in <- inputValue{
+			case in <- componentInput{
 				node:         node,
 				currentLabel: currentLabel,
 			}:
@@ -278,7 +278,7 @@ func extractComponentValues[T low.Buildable[N], N any](label string, root *yaml.
 	}()
 
 	// Translate.
-	translateFunc := func(value inputValue) (componentBuildResult[T], error) {
+	translateFunc := func(value componentInput) (componentBuildResult[T], error) {
 		var n T = new(N)
 		currentLabel := value.currentLabel
 		node := value.node
@@ -311,7 +311,7 @@ func extractComponentValues[T low.Buildable[N], N any](label string, root *yaml.
 			},
 		}, nil
 	}
-	err := datamodel.TranslatePipeline[inputValue, componentBuildResult[T]](in, out, translateFunc)
+	err := datamodel.TranslatePipeline[componentInput, componentBuildResult[T]](in, out, translateFunc)
 	wg.Wait()
 	if err != nil {
 		return emptyResult, err

diff --git a/datamodel/low/v3/paths.go b/datamodel/low/v3/paths.go
@@ -69,15 +69,15 @@ func (p *Paths) Build(root *yaml.Node, idx *index.SpecIndex) error {
 
 	// Translate YAML nodes to pathsMap using `TranslatePipeline`.
 	type buildResult struct {
-		k low.KeyReference[string]
-		v low.ValueReference[*PathItem]
+		key low.KeyReference[string]
+		value low.ValueReference[*PathItem]
 	}
-	type inputValue struct {
+	type buildInput struct {
 		currentNode *yaml.Node
 		pathNode    *yaml.Node
 	}
 	pathsMap := make(map[low.KeyReference[string]]low.ValueReference[*PathItem])
-	in := make(chan inputValue)
+	in := make(chan buildInput)
 	out := make(chan buildResult)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -107,7 +107,7 @@ func (p *Paths) Build(root *yaml.Node, idx *index.SpecIndex) error {
 			}
 
 			select {
-			case in <- inputValue{
+			case in <- buildInput{
 				currentNode: currentNode,
 				pathNode:    pathNode,
 			}:
@@ -129,15 +129,15 @@ func (p *Paths) Build(root *yaml.Node, idx *index.SpecIndex) error {
 				if !ok {
 					return
 				}
-				pathsMap[result.k] = result.v
+				pathsMap[result.key] = result.value
 			case <-ctx.Done():
 				return
 			}
 		}
 	}()
 
-	err := datamodel.TranslatePipeline[inputValue, buildResult](in, out,
-		func(value inputValue) (buildResult, error) {
+	err := datamodel.TranslatePipeline[buildInput, buildResult](in, out,
+		func(value buildInput) (buildResult, error) {
 			pNode := value.pathNode
 			cNode := value.currentNode
 
@@ -170,11 +170,11 @@ func (p *Paths) Build(root *yaml.Node, idx *index.SpecIndex) error {
 			}
 
 			return buildResult{
-				k: low.KeyReference[string]{
+				key: low.KeyReference[string]{
 					Value:   cNode.Value,
 					KeyNode: cNode,
 				},
-				v: low.ValueReference[*PathItem]{
+				value: low.ValueReference[*PathItem]{
 					Value:     path,
 					ValueNode: pNode,
 				},