bump(github.com/go-openapi/spec): 7abd5745472fff5eb3685386d5fb8bf38683154d

vendor/github.com/go-openapi/loads/spec.go

@@ -15,10 +15,13 @@
 package loads
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"net/url"
 
+	"path/filepath"
+
 	"github.com/go-openapi/analysis"
 	"github.com/go-openapi/spec"
 	"github.com/go-openapi/swag"
@@ -39,7 +42,17 @@ type DocLoader func(string) (json.RawMessage, error)
 // DocMatcher represents a predicate to check if a loader matches
 type DocMatcher func(string) bool
 
-var loaders = &loader{Match: func(_ string) bool { return true }, Fn: JSONDoc}
+var (
+	loaders       *loader
+	defaultLoader *loader
+)
+
+func init() {
+	defaultLoader = &loader{Match: func(_ string) bool { return true }, Fn: JSONDoc}
+	loaders = defaultLoader
+	spec.PathLoader = loaders.Fn
+	AddLoader(swag.YAMLMatcher, swag.YAMLDoc)
+}
 
 // AddLoader for a document
 func AddLoader(predicate DocMatcher, load DocLoader) {
@@ -49,7 +62,7 @@ func AddLoader(predicate DocMatcher, load DocLoader) {
 		Fn:    load,
 		Next:  prev,
 	}
-
+	spec.PathLoader = loaders.Fn
 }
 
 type loader struct {
@@ -71,11 +84,12 @@ func JSONSpec(path string) (*Document, error) {
 // Document represents a swagger spec document
 type Document struct {
 	// specAnalyzer
-	Analyzer *analysis.Spec
-	spec     *spec.Swagger
-	origSpec *spec.Swagger
-	schema   *spec.Schema
-	raw      json.RawMessage
+	Analyzer     *analysis.Spec
+	spec         *spec.Swagger
+	specFilePath string
+	origSpec     *spec.Swagger
+	schema       *spec.Schema
+	raw          json.RawMessage
 }
 
 // Spec loads a new spec document
@@ -84,23 +98,39 @@ func Spec(path string) (*Document, error) {
 	if err != nil {
 		return nil, err
 	}
+	var lastErr error
 	for l := loaders.Next; l != nil; l = l.Next {
 		if loaders.Match(specURL.Path) {
 			b, err2 := loaders.Fn(path)
 			if err2 != nil {
-				return nil, err2
+				lastErr = err2
+				continue
 			}
-			return Analyzed(b, "")
+			doc, err := Analyzed(b, "")
+			if err != nil {
+				return nil, err
+			}
+			if doc != nil {
+				doc.specFilePath = path
+			}
+			return doc, nil
 		}
 	}
-	b, err := loaders.Fn(path)
+	if lastErr != nil {
+		return nil, lastErr
+	}
+	b, err := defaultLoader.Fn(path)
 	if err != nil {
 		return nil, err
 	}
-	return Analyzed(b, "")
-}
 
-var swag20Schema = spec.MustLoadSwagger20Schema()
+	document, err := Analyzed(b, "")
+	if document != nil {
+		document.specFilePath = path
+	}
+
+	return document, err
+}
 
 // Analyzed creates a new analyzed spec document
 func Analyzed(data json.RawMessage, version string) (*Document, error) {
@@ -111,40 +141,66 @@ func Analyzed(data json.RawMessage, version string) (*Document, error) {
 		return nil, fmt.Errorf("spec version %q is not supported", version)
 	}
 
+	raw := data
+	trimmed := bytes.TrimSpace(data)
+	if len(trimmed) > 0 {
+		if trimmed[0] != '{' && trimmed[0] != '[' {
+			yml, err := swag.BytesToYAMLDoc(trimmed)
+			if err != nil {
+				return nil, fmt.Errorf("analyzed: %v", err)
+			}
+			d, err := swag.YAMLToJSON(yml)
+			if err != nil {
+				return nil, fmt.Errorf("analyzed: %v", err)
+			}
+			raw = d
+		}
+	}
+
 	swspec := new(spec.Swagger)
-	if err := json.Unmarshal(data, swspec); err != nil {
+	if err := json.Unmarshal(raw, swspec); err != nil {
 		return nil, err
 	}
 
 	origsqspec := new(spec.Swagger)
-	if err := json.Unmarshal(data, origsqspec); err != nil {
+	if err := json.Unmarshal(raw, origsqspec); err != nil {
 		return nil, err
 	}
 
 	d := &Document{
 		Analyzer: analysis.New(swspec),
-		schema:   swag20Schema,
+		schema:   spec.MustLoadSwagger20Schema(),
 		spec:     swspec,
-		raw:      data,
+		raw:      raw,
 		origSpec: origsqspec,
 	}
 	return d, nil
 }
 
 // Expanded expands the ref fields in the spec document and returns a new spec document
-func (d *Document) Expanded() (*Document, error) {
+func (d *Document) Expanded(options ...*spec.ExpandOptions) (*Document, error) {
 	swspec := new(spec.Swagger)
 	if err := json.Unmarshal(d.raw, swspec); err != nil {
 		return nil, err
 	}
-	if err := spec.ExpandSpec(swspec); err != nil {
+
+	var expandOptions *spec.ExpandOptions
+	if len(options) > 0 {
+		expandOptions = options[1]
+	} else {
+		expandOptions = &spec.ExpandOptions{
+			RelativeBase: filepath.Dir(d.specFilePath),
+		}
+	}
+
+	if err := spec.ExpandSpec(swspec, expandOptions); err != nil {
 		return nil, err
 	}
 
 	dd := &Document{
 		Analyzer: analysis.New(swspec),
 		spec:     swspec,
-		schema:   swag20Schema,
+		schema:   spec.MustLoadSwagger20Schema(),
 		raw:      d.raw,
 		origSpec: d.origSpec,
 	}
@@ -201,3 +257,8 @@ func (d *Document) Pristine() *Document {
 	dd, _ := Analyzed(d.Raw(), d.Version())
 	return dd
 }
+
+// SpecFilePath returns the file path of the spec if one is defined
+func (d *Document) SpecFilePath() string {
+	return d.specFilePath
+}