Use use OS repsecting file seperator

getkin · Jun 27, 2024 · 8091a0a · 8091a0a
1 parent 43f4e25
commit 8091a0a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/openapi3/internalize_refs.go b/openapi3/internalize_refs.go
@@ -68,14 +68,14 @@ func DefaultRefNameResolver(doc *T, ref componentRef) string {
 	var internalisedName string
 
 	if filePath != "" {
-		internalisedName = strings.TrimLeft(filePath, "."+string(filepath.Separator))
+		internalisedName = strings.TrimLeft(filePath, "./"+string(filepath.Separator))
 	}
 
 	if componentPath != "" {
 		if internalisedName != "" {
 			internalisedName += "_"
 		}
-		internalisedName += strings.TrimLeft(componentPath, "."+string(filepath.Separator))
+		internalisedName += strings.TrimLeft(componentPath, "./"+string(filepath.Separator))
 	}
 
 	// Replace invalid characters in component fixed field names.
@@ -91,8 +91,8 @@ func cutDirectories(p, dirs string) (string, bool) {
 		return p, false
 	}
 
-	p = strings.TrimRight(p, string(filepath.Separator))
-	dirs = strings.TrimRight(dirs, string(filepath.Separator))
+	p = strings.TrimRight(p, "/"+string(filepath.Separator))
+	dirs = strings.TrimRight(dirs, "/"+string(filepath.Separator))
 
 	var sb strings.Builder
 	sb.Grow(len(ParameterInHeader))

diff --git a/openapi3/load_cicular_ref_with_external_file_test.go b/openapi3/load_cicular_ref_with_external_file_test.go
@@ -7,6 +7,7 @@ import (
 	"embed"
 	"encoding/json"
 	"net/url"
+	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -21,7 +22,7 @@ func TestLoadCircularRefFromFile(t *testing.T) {
 	loader := openapi3.NewLoader()
 	loader.IsExternalRefsAllowed = true
 	loader.ReadFromURIFunc = func(loader *openapi3.Loader, uri *url.URL) ([]byte, error) {
-		return circularResSpecs.ReadFile(uri.Path)
+		return circularResSpecs.ReadFile(filepath.ToSlash(uri.Path))
 	}
 
 	got, err := loader.LoadFromFile("testdata/circularRef/base.yml")

diff --git a/openapi3/load_with_go_embed_test.go b/openapi3/load_with_go_embed_test.go
@@ -7,6 +7,7 @@ import (
 	"embed"
 	"fmt"
 	"net/url"
+	"path/filepath"
 
 	"github.com/getkin/kin-openapi/openapi3"
 )
@@ -18,7 +19,7 @@ func Example() {
 	loader := openapi3.NewLoader()
 	loader.IsExternalRefsAllowed = true
 	loader.ReadFromURIFunc = func(loader *openapi3.Loader, uri *url.URL) ([]byte, error) {
-		return fs.ReadFile(uri.Path)
+		return fs.ReadFile(filepath.ToSlash(uri.Path))
 	}
 
 	doc, err := loader.LoadFromFile("testdata/recursiveRef/openapi.yml")

diff --git a/openapi3/loader.go b/openapi3/loader.go
@@ -259,7 +259,7 @@ func join(basePath *url.URL, relativePath *url.URL) *url.URL {
 		return relativePath
 	}
 	newPath := *basePath
-	newPath.Path = path.Join(path.Dir(newPath.Path), relativePath.Path)
+	newPath.Path = filepath.Join(filepath.Dir(newPath.Path), relativePath.Path)
 	return &newPath
 }
 
@@ -269,6 +269,7 @@ func resolvePath(basePath *url.URL, componentPath *url.URL) *url.URL {
 		if componentPath.Path[0] == '/' {
 			return componentPath
 		}
+		componentPath.Path = filepath.FromSlash(componentPath.Path)
 		return join(basePath, componentPath)
 	}
 	return componentPath