Merge pull request #74 from gone-io/feature/loader

fix(core): correct default value handling when force replacing

Author: Degfy

core_keeper.go

@@ -6,15 +6,15 @@ func newKeeper() *keeper {
 	return &keeper{
 		coffins:        []*coffin{},
 		nameMap:        make(map[string]*coffin),
-		defaultTypeMap: make(map[reflect.Type]bool),
+		defaultTypeMap: make(map[reflect.Type]*coffin),
 	}
 }
 
 type keeper struct {
 	Flag
 	coffins        []*coffin
 	nameMap        map[string]*coffin
-	defaultTypeMap map[reflect.Type]bool
+	defaultTypeMap map[reflect.Type]*coffin
 }
 
 func (s *keeper) getAllCoffins() []*coffin {
@@ -83,13 +83,20 @@ func (s *keeper) load(goner Goner, options ...Option) error {
 
 	var forceReplaceFind = false
 	if co.forceReplace && co.name != "" {
+		var replacedCo *coffin
 		for i := range s.coffins {
 			if s.coffins[i].name == co.name {
+				replacedCo = s.coffins[i]
 				s.coffins[i] = co
 				forceReplaceFind = true
 				break
 			}
 		}
+		for t, typeCo := range s.defaultTypeMap {
+			if typeCo == replacedCo {
+				delete(s.defaultTypeMap, t)
+			}
+		}
 	}
 
 	if !forceReplaceFind {
@@ -105,7 +112,7 @@ func (s *keeper) load(goner Goner, options ...Option) error {
 				co.Name(),
 			)
 		} else {
-			s.defaultTypeMap[t] = true
+			s.defaultTypeMap[t] = co
 		}
 	}
 	return nil

core_keeper_test.go

@@ -70,20 +70,18 @@ func withErrOption() option {
 }
 
 func Test_keeper_load(t *testing.T) {
-	k := newKeeper()
+	//k := newKeeper()
 	type g struct {
 		Flag
 		Name string
 	}
 
-	_ = k.load(&g{Name: "instance-01"}, Name("food-01"), IsDefault())
-
 	type args struct {
 		goner   Goner
 		options []Option
 	}
 	tests := []struct {
-		setUp   func() func()
+		setUp   func(k *keeper) func()
 		name    string
 		args    args
 		wantErr bool
@@ -111,7 +109,7 @@ func Test_keeper_load(t *testing.T) {
 				options: []Option{ForceReplace(), Name("food-01")},
 			},
 			wantErr: false,
-			setUp: func() func() {
+			setUp: func(k *keeper) func() {
 				return func() {
 					coffins := k.getByTypeAndPattern(reflect.TypeOf(&g{}), "*-01")
 					if len(coffins) != 1 {
@@ -135,10 +133,12 @@ func Test_keeper_load(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			s := newKeeper()
+			_ = s.load(&g{Name: "instance-01"}, Name("food-01"), IsDefault())
 			if tt.setUp != nil {
-				defer tt.setUp()()
+				defer tt.setUp(s)()
 			}
-			s := k
+
 			if err := s.load(tt.args.goner, tt.args.options...); (err != nil) != tt.wantErr {
 				t.Errorf("load() error = %v, wantErr %v", err, tt.wantErr)
 			}

use_case/replace_default_test.go

@@ -0,0 +1,27 @@
+package use_case
+
+import (
+	"github.com/gone-io/gone/v2"
+	"testing"
+)
+
+func TestReplaceAndDefault(t *testing.T) {
+	type X struct {
+		gone.Flag
+		ID int
+	}
+	gone.
+		NewApp().
+		Load(&X{ID: 1}, gone.Name("x"), gone.IsDefault()).
+		Load(&X{ID: 2}, gone.Name("x"), gone.ForceReplace()).
+		Load(&X{ID: 3}, gone.IsDefault()).
+		Run(func(xList []*X, x *X) {
+			if len(xList) != 2 {
+				t.Errorf("xList error")
+			}
+			if x.ID != 3 {
+				t.Errorf("x error")
+			}
+		})
+
+}