Skip to content

struct: preserve embedded pointer defaults when mapping #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Narek-Khachikyan wants to merge 1 commit into from
Closed

struct: preserve embedded pointer defaults when mapping #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion struct.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ func (s *Section) mapToField(val reflect.Value, isStrict bool, sectionIndex int,
isStruct := tpField.Type.Kind() == reflect.Struct
isStructPtr := tpField.Type.Kind() == reflect.Pointer && tpField.Type.Elem().Kind() == reflect.Struct
isAnonymousPtr := tpField.Type.Kind() == reflect.Pointer && tpField.Anonymous
if isAnonymousPtr {
if isAnonymousPtr && field.IsNil() {
field.Set(reflect.New(tpField.Type.Elem()))
}

Expand Down
25 changes: 25 additions & 0 deletions struct_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,3 +910,28 @@ Title = Consultant Engineer
)
})
}

func TestMapToWithMapperPreservesEmbeddedPointerDefaults(t *testing.T) {
type Options struct {
Name string
Port int
}
type Config struct {
*Options
}
for _, source := range []string{"", "[options]\nname = configured\n"} {
t.Run(source, func(t *testing.T) {
defaults := &Options{Name: "default", Port: 1234}
got := Config{Options: defaults}
err := MapToWithMapper(&got, TitleUnderscore, []byte(source))
require.NoError(t, err)
require.Same(t, defaults, got.Options)
assert.Equal(t, 1234, got.Port)
if source == "" {
assert.Equal(t, "default", got.Name)
} else {
assert.Equal(t, "configured", got.Name)
}
})
}
}