💥 update: structs - InitDefaults() for sub-struct must with tag mark

gookit · Jun 6, 2023 · 3c90863 · 3c90863
1 parent 0c460d4
commit 3c90863
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 21 deletions.
diff --git a/structs/examples_test.go b/structs/examples_test.go
@@ -55,7 +55,7 @@ func ExampleInitDefaults() {
 	type User struct {
 		Name  string `default:"inhere"`
 		Age   int    `default:"30"`
-		Extra Extra
+		Extra Extra  `default:""` // add tag for init sub struct
 	}
 
 	u := &User{}

diff --git a/structs/init.go b/structs/init.go
@@ -24,13 +24,6 @@ type InitOptions struct {
 	ParseEnv bool
 	// ValueHook before set value hook TODO
 	ValueHook func(val string) any
-	// InitStructSlice init struct slice. default: false
-	InitStructSlice bool
-}
-
-// InitStructSlice init struct slice
-func InitStructSlice(opt *InitOptions) {
-	opt.InitStructSlice = true
 }
 
 // Init struct default value by field "default" tag.
@@ -83,6 +76,11 @@ func initDefaults(rv reflect.Value, opt *InitOptions) error {
 			continue
 		}
 
+		val, hasTag := sf.Tag.Lookup(opt.TagName)
+		if !hasTag || val == "-" {
+			continue
+		}
+
 		fv := rv.Field(i)
 		if fv.Kind() == reflect.Struct {
 			if err := initDefaults(fv, opt); err != nil {
@@ -105,8 +103,6 @@ func initDefaults(rv reflect.Value, opt *InitOptions) error {
 			continue
 		}
 
-		val, hasTag := sf.Tag.Lookup(opt.TagName)
-
 		// handle for pointer field
 		if fv.Kind() == reflect.Pointer {
 			if fv.IsNil() {
@@ -120,7 +116,7 @@ func initDefaults(rv reflect.Value, opt *InitOptions) error {
 				}
 				continue
 			}
-		} else if fv.Kind() == reflect.Slice && (opt.InitStructSlice || hasTag) {
+		} else if fv.Kind() == reflect.Slice {
 			el := sf.Type.Elem()
 			isPtr := el.Kind() == reflect.Pointer
 			if isPtr {

diff --git a/structs/init_test.go b/structs/init_test.go
@@ -104,9 +104,9 @@ type ExtraDefault struct {
 
 func TestInitDefaults_nestStruct(t *testing.T) {
 	type User struct {
-		Name  string `default:"inhere"`
-		Age   int    `default:"30"`
-		Extra ExtraDefault
+		Name  string       `default:"inhere"`
+		Age   int          `default:"30"`
+		Extra ExtraDefault `default:""`
 	}
 
 	u := &User{}
@@ -129,9 +129,9 @@ func TestInitDefaults_nestStruct(t *testing.T) {
 func TestInitDefaults_ptrStructField(t *testing.T) {
 	// test for pointer struct field
 	type User struct {
-		Name  string `default:"inhere"`
-		Age   int    `default:"30"`
-		Extra *ExtraDefault
+		Name  string        `default:"inhere"`
+		Age   int           `default:"30"`
+		Extra *ExtraDefault `default:""`
 	}
 
 	u := &User{}
@@ -172,13 +172,13 @@ func TestInitDefaults_sliceField(t *testing.T) {
 func TestInitDefaults_initStructSlice(t *testing.T) {
 	// test for slice struct field
 	type User struct {
-		Name  string `default:"inhere"`
-		Age   int    `default:"30"`
-		Extra []ExtraDefault
+		Name  string         `default:"inhere"`
+		Age   int            `default:"30"`
+		Extra []ExtraDefault `default:""`
 	}
 
 	u := &User{}
-	err := structs.Init(u, structs.InitStructSlice)
+	err := structs.Init(u)
 	dump.P(u)
 	assert.NoErr(t, err)
 	assert.NotEmpty(t, u.Extra)