Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions reference.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ func (r *Reference) ToJsonPointer() jsonpointer.Pointer {
return r.jsonPointer
}

var referenceType = reflect.TypeFor[Reference]()

func findRelativeJsonPointer(base reflect.Value, pointedField reflect.Value) jsonpointer.Pointer {
for {
if base.Equal(pointedField) {
Expand All @@ -60,6 +62,9 @@ func findRelativeJsonPointer(base reflect.Value, pointedField reflect.Value) jso
if resolver, isResolver := base.Interface().(JsonReferenceResolver); isResolver {
return resolver.RelativeJsonPointer(pointedField.Interface())
}
if base.Type() == referenceType { // Don't recurse into other references
return nil
}
if base.Kind() == reflect.Ptr || base.Kind() == reflect.Interface {
if base.IsNil() {
return nil
Expand Down
3 changes: 3 additions & 0 deletions reference_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import (
type testObject struct {
ObjectHeader

Recursive *Reference

Substruct struct {
SubField1 string `json:"subfield1" textlog:"subfield1"`
} `json:"substruct" textlog:"substruct,expand"`
Expand Down Expand Up @@ -89,6 +91,7 @@ func TestReference_ToJsonPointer(t *testing.T) {
test.Valuer.Subfield6 = "subfield6"
test.Valuer.Subfield7 = "subfield7"
test.SubObject = &SubObject{Subfield8: "subfield8"}
test.Recursive = NewReference(&test, &test.Substruct)

var tests = []struct {
PointedField any
Expand Down