Fix slice return

* fix slice return

Author: AlexanderGrom

container.go

@@ -109,7 +109,7 @@ func (c *container) Close() (err error) {
 
 	for i := len(closers) - 1; i >= 0; i-- {
 		if err = closers[i](); err != nil {
-			return fmt.Errorf("unable close container : %w", err)
+			return fmt.Errorf("unable to close container : %w", err)
 		}
 	}
 
@@ -126,20 +126,24 @@ func (c *container) Has(value Type, modifiers ...Modifier) bool {
 }
 
 func (c *container) Resolve(target Value, modifiers ...Modifier) (err error) {
-	var rv = reflect.ValueOf(target)
-
 	c.mux.Lock()
-	err = c.resolve(&rv, cycle.New(), modifiers)
-	c.mux.Unlock()
+	defer c.mux.Unlock()
 
-	if err != nil {
+	var rv = reflect.ValueOf(target)
+	if err = c.resolve(&rv, cycle.New(), modifiers); err != nil {
 		return fmt.Errorf("%s : %w", runtime.Caller(0), err)
 	}
 
 	return nil
 }
 
 func (c *container) resolve(tv *reflect.Value, cycle *cycle.Cycle, modifiers []Modifier) (err error) {
+	defer func() {
+		if recovered := recover(); recovered != nil {
+			err = fmt.Errorf("unable to resolve target because the container panicked: %+v", recovered)
+		}
+	}()
+
 	if tv.Kind() != reflect.Pointer && tv.Kind() != reflect.Slice {
 		if tv.IsValid() {
 			return NewTypeError(tv.Type(), ErrMustBeSliceOrPointer)
@@ -237,9 +241,15 @@ func (c *container) resolveDependency(cycle *cycle.Cycle, dep *compiler.Dependen
 func (c *container) set(tv *reflect.Value, sv reflect.Value) {
 	switch tv.Elem().Kind() {
 	case reflect.Slice:
-		tv.Elem().Set(
-			reflect.Append(tv.Elem(), sv),
-		)
+		if sv.Kind() == reflect.Slice {
+			tv.Elem().Set(
+				reflect.AppendSlice(tv.Elem(), sv),
+			)
+		} else {
+			tv.Elem().Set(
+				reflect.Append(tv.Elem(), sv),
+			)
+		}
 	default:
 		tv.Elem().Set(sv)
 	}

container_test.go

@@ -47,6 +47,10 @@ func NewContainer() (di.Container, error) {
 		}, {
 			Name: "flaky",
 		}}),
+
+		di.Provide(NewSlice1),
+		di.Provide(NewSlice2),
+		di.Provide(NewNamedSlice),
 	)
 
 	if err != nil {
@@ -68,7 +72,6 @@ func TestContainer(t *testing.T) {
 			var err = ctn.Call(nil)
 			require.Error(t, err)
 			require.ErrorIs(t, err, di.ErrorMustBeFunction)
-			require.ErrorContains(t, err, "container_test.go:68")
 		},
 	}, {
 		Name: "Call with unregistered type",
@@ -79,7 +82,6 @@ func TestContainer(t *testing.T) {
 
 			require.Error(t, err)
 			require.ErrorIs(t, err, di.ErrDoesNotExist)
-			require.ErrorContains(t, err, "container_test.go:76")
 		},
 	}, {
 		Name: "Call without dependencies",
@@ -156,6 +158,17 @@ func TestContainer(t *testing.T) {
 			require.NoError(t, err)
 		},
 	}, {
+		Name: "Call with collections",
+		Run: func(t *testing.T, ctn di.Container) {
+			var err = ctn.Call(func(s1 Items, s2 []Item, s3 ...Item) {
+				require.ElementsMatch(t, s1, Items{1, 2, 3})
+				require.ElementsMatch(t, s2, Items{4, 5, 6, 7})
+				require.ElementsMatch(t, s3, Items{4, 5, 6, 7})
+			})
+
+			require.NoError(t, err)
+		},
+	}, {
 		Name: "Call func with error",
 		Run: func(t *testing.T, ctn di.Container) {
 			var eErr = errors.New("expected")
@@ -165,7 +178,6 @@ func TestContainer(t *testing.T) {
 			})
 
 			require.ErrorIs(t, aErr, eErr)
-			require.ErrorContains(t, aErr, "container_test.go:162")
 		},
 	}, {
 		Name: "Has dependency exist",
@@ -183,7 +195,6 @@ func TestContainer(t *testing.T) {
 			var err = ctn.Resolve(nil)
 			require.Error(t, err)
 			require.ErrorIs(t, err, di.ErrMustBeSliceOrPointer)
-			require.ErrorContains(t, err, "container_test.go:183")
 		},
 	}, {
 		Name: "Resolve multiple error",
@@ -196,7 +207,6 @@ func TestContainer(t *testing.T) {
 			require.Nil(t, foo)
 			require.Error(t, err)
 			require.ErrorIs(t, err, di.ErrMultipleDefinitions)
-			require.ErrorContains(t, err, "container_test.go:193")
 		},
 	}, {
 		Name: "Resolve flaky dependency",
@@ -208,7 +218,6 @@ func TestContainer(t *testing.T) {
 
 			require.Nil(t, flaky)
 			require.Error(t, err)
-			require.ErrorContains(t, err, "container_test.go:206")
 		},
 	}, {
 		Name: "Resolve cycled",
@@ -220,7 +229,6 @@ func TestContainer(t *testing.T) {
 
 			require.Nil(t, srv)
 			require.ErrorIs(t, err, cycle.ErrCycleDetected)
-			require.ErrorContains(t, err, "container_test.go:218")
 		},
 	}, {
 		Name: "Resolved group with flaky item",
@@ -230,7 +238,6 @@ func TestContainer(t *testing.T) {
 			}, di.Constraint(([]Controller)(nil)))
 
 			require.Error(t, err)
-			require.ErrorContains(t, err, "container_test.go:228")
 		},
 	}, {
 		Name: "Resolve without dependencies",

di_test.go

@@ -30,6 +30,10 @@ type (
 	FlakyController struct {
 		_ int
 	}
+
+	Item int
+
+	Items []Item
 )
 
 func (c *BarController) Register(srv *http.ServeMux) {
@@ -89,3 +93,15 @@ func NewFlakyController() (*FlakyController, error) {
 func NewCycledController(cycled *CycledController) *CycledController {
 	return cycled
 }
+
+func NewSlice1() []Item {
+	return []Item{4, 5}
+}
+
+func NewSlice2() []Item {
+	return []Item{6, 7}
+}
+
+func NewNamedSlice() Items {
+	return Items{1, 2, 3}
+}

internal/compiler/constructor.go

@@ -115,7 +115,7 @@ func (c *Constructor) Type() reflect.Type {
 func (c *Constructor) call(args []reflect.Value) (_ []reflect.Value, err error) {
 	defer func() {
 		if recovered := recover(); recovered != nil {
-			err = fmt.Errorf("unable create because the constructor %w : %+v", ErrPanicked, recovered)
+			err = fmt.Errorf("unable to create because the constructor %w : %+v", ErrPanicked, recovered)
 		}
 	}()