Set ref path when resolving refs too

openapi3/loader.go

@@ -385,8 +385,22 @@ func (loader *Loader) resolveComponent(doc *T, ref string, path *url.URL, resolv
 		err = nil
 	}
 
+	setComponent := func(target any) {
+		if componentPath != nil {
+			if i, ok := target.(interface {
+				setRefPath(*url.URL)
+			}); ok {
+				copy := *componentPath
+				copy.Fragment = parsedURL.Fragment
+				i.setRefPath(&copy)
+			}
+		}
+	}
+
 	switch {
 	case reflect.TypeOf(cursor) == reflect.TypeOf(resolved):
+		setComponent(cursor)
+
 		reflect.ValueOf(resolved).Elem().Set(reflect.ValueOf(cursor).Elem())
 		return componentDoc, componentPath, nil
 
@@ -399,6 +413,8 @@ func (loader *Loader) resolveComponent(doc *T, ref string, path *url.URL, resolv
 			if err = json.Unmarshal(enc, expect); err != nil {
 				return err
 			}
+
+			setComponent(expect)
 			return nil
 		}
 		if err := codec(cursor, resolved); err != nil {

openapi3/refs.tmpl

@@ -35,6 +35,8 @@ func (x *{{ $type.Name }}Ref) CollectionName() string { return "{{ $type.Collect
 // RefPath returns the path of the $ref relative to the root document.
 func (x *{{ $type.Name }}Ref) RefPath() *url.URL { return &x.refPath }
 
+func (x *{{ $type.Name }}Ref) setRefPath(u *url.URL) { x.refPath = *u }
+
 // MarshalYAML returns the YAML encoding of {{ $type.Name }}Ref.
 func (x {{ $type.Name }}Ref) MarshalYAML() (interface{}, error) {
 	if ref := x.Ref; ref != "" {