From b9184fef724d65eeea449a544e7c9095fc6d4fcb Mon Sep 17 00:00:00 2001 From: Erfan Momeni Date: Fri, 9 Dec 2022 01:58:16 +0330 Subject: [PATCH 1/2] fix allow zero problem --- retrieve.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/retrieve.go b/retrieve.go index e523d0a..dc1bd96 100644 --- a/retrieve.go +++ b/retrieve.go @@ -38,7 +38,9 @@ func GetOrElse(v interface{}, def interface{}) interface{} { return val.Elem().Interface() } -func get(value reflect.Value, path string) reflect.Value { +func get(value reflect.Value, path string, opts ...option) reflect.Value { + options := newOptions(opts...) + if value.Kind() == reflect.Slice || value.Kind() == reflect.Array { var resultSlice reflect.Value @@ -57,7 +59,7 @@ func get(value reflect.Value, path string) reflect.Value { resultValue := get(item, path) - if resultValue.Kind() == reflect.Invalid || resultValue.IsZero() { + if resultValue.Kind() == reflect.Invalid || (resultValue.IsZero() && !options.allowZero) { continue } From b75b3f5d51b06847b0a47f2881934ea49cef4c3f Mon Sep 17 00:00:00 2001 From: Erfan Momeni Date: Fri, 9 Dec 2022 02:35:51 +0330 Subject: [PATCH 2/2] fix allow zero in get func and adding test for checking that --- retrieve.go | 2 +- retrieve_test.go | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/retrieve.go b/retrieve.go index dc1bd96..66c0518 100644 --- a/retrieve.go +++ b/retrieve.go @@ -9,7 +9,7 @@ import ( func Get(out interface{}, path string, opts ...option) interface{} { options := newOptions(opts...) - result := get(reflect.ValueOf(out), path) + result := get(reflect.ValueOf(out), path, opts...) // valid kind and we can return a result.Interface() without panic if result.Kind() != reflect.Invalid && result.CanInterface() { // if we don't allow zero and the result is a zero value return nil diff --git a/retrieve_test.go b/retrieve_test.go index b5f4d4e..c091eb7 100644 --- a/retrieve_test.go +++ b/retrieve_test.go @@ -67,6 +67,21 @@ func TestGetThroughInterface(t *testing.T) { is.Equal(Get(foo, "BarPointer.Bars.Bar.Name"), []string{"Level2-1", "Level2-2"}) } +func TestGetWithAllowZero(t *testing.T) { + is := assert.New(t) + + var test []struct { + Age int + } + + for i := 0; i < 10; i++ { + test = append(test, struct{ Age int }{Age: i}) + } + + is.Equal(Get(test, "Age").([]int), []int{1, 2, 3, 4, 5, 6, 7, 8, 9}) + is.Equal(Get(test, "Age", WithAllowZero()).([]int), []int{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}) +} + func TestGetNotFound(t *testing.T) { is := assert.New(t)