refactor: some fixes

README.md

@@ -18,7 +18,6 @@ See also /examples directory
 package main
 
 import (
-	"context"
 	"fmt"
 	"github.com/dtomasi/di"
 	"log"
@@ -51,12 +50,16 @@ func BuildContainer() (*di.Container, error) {
 				// Injects the whole DI Container
 				di.ContainerArg(),
 				// Injects another service
-				di.ServiceArg(di.StringRef("OtherService")),
+				di.ServiceRefArg(di.StringRef("OtherService")),
+				// Inject multiple services by tag
+				di.ServicesByTagsArg([]fmt.Stringer{di.StringRef("foo")}),
 				// Injects a value using interface{}
 				di.InterfaceArg(true),
 				// Injects a parameter from registered provider
 				// via Get(key string) (interface{}, error)
 				di.ParamArg("foo.bar.baz"),
+				// Inject Event Bus
+				di.EventBusArg(),
 			),
 	)
 

arg.go

@@ -2,8 +2,9 @@ package di
 
 import "fmt"
 
+
 type ServiceDefArg interface {
-	Evaluate(*Container) (interface{}, error)
+	evaluate(*Container) (interface{}, error)
 }
 
 // Interface Arg
@@ -12,7 +13,8 @@ type interfaceArg struct {
 	inValue interface{}
 }
 
-func (a *interfaceArg) Evaluate(_ *Container) (interface{}, error) {
+
+func (a *interfaceArg) evaluate(_ *Container) (interface{}, error) {
 	return a.inValue, nil
 }
 
@@ -27,10 +29,12 @@ type serviceRefArg struct {
 	ref fmt.Stringer
 }
 
-func (a *serviceRefArg) Evaluate(c *Container) (interface{}, error) {
+
+func (a *serviceRefArg) evaluate(c *Container) (interface{}, error) {
 	return c.Get(a.ref)
 }
 
+
 func ServiceRefArg(ref fmt.Stringer) ServiceDefArg {
 	return &serviceRefArg{ref: ref}
 }
@@ -45,7 +49,8 @@ type servicesByTagArg struct {
 	tags []fmt.Stringer
 }
 
-func (a *servicesByTagArg) Evaluate(c *Container) (interface{}, error) {
+
+func (a *servicesByTagArg) evaluate(c *Container) (interface{}, error) {
 	return c.FindByTags(a.tags)
 }
 
@@ -59,43 +64,51 @@ type paramArg struct {
 	paramPath string
 }
 
-func (a *paramArg) Evaluate(c *Container) (interface{}, error) {
+
+func (a *paramArg) evaluate(c *Container) (interface{}, error) {
 	return c.paramProvider.Get(a.paramPath)
 }
 
+
 func ParamArg(paramPath string) ServiceDefArg {
 	return &paramArg{paramPath: paramPath}
 }
 
 // Context Argument injects the context from di.Container.
 type contextArg struct{}
 
-func (a *contextArg) Evaluate(c *Container) (interface{}, error) {
+
+func (a *contextArg) evaluate(c *Container) (interface{}, error) {
 	return c.ctx, nil
 }
 
+
 func ContextArg() ServiceDefArg {
 	return &contextArg{}
 }
 
 // Container Argument injects the container from di.Container.
 type containerArg struct{}
 
-func (a *containerArg) Evaluate(c *Container) (interface{}, error) {
+
+func (a *containerArg) evaluate(c *Container) (interface{}, error) {
 	return c, nil
 }
 
+
 func ContainerArg() ServiceDefArg {
 	return &containerArg{}
 }
 
 // EventBus Argument injects the eventBus from di.EventBus.
 type eventBusArg struct{}
 
-func (a *eventBusArg) Evaluate(c *Container) (interface{}, error) {
+
+func (a *eventBusArg) evaluate(c *Container) (interface{}, error) {
 	return c.eventBus, nil
 }
 
+
 func EventBusArg() ServiceDefArg {
 	return &eventBusArg{}
 }

container.go

@@ -304,7 +304,7 @@ func (c *Container) parseArgs(def *ServiceDef) (args []interface{}, err error) {
 	for _, v := range def.args {
 		var val interface{}
 
-		val, err = v.Evaluate(c)
+		val, err = v.evaluate(c)
 		if err != nil {
 			return
 		}

container_test.go

@@ -111,7 +111,7 @@ func BuildContainer() (*di.Container, error) {
 		di.NewServiceDef(di.StringRef("TestService2")).
 			Provider(NewTestService2).
 			Args(
-				di.ServiceArg(di.StringRef("TestService1")),
+				di.ServiceRefArg(di.StringRef("TestService1")),
 				di.InterfaceArg(true),
 				di.ParamArg("foo.bar.baz"),
 			).

error.go

@@ -14,7 +14,5 @@ const (
 	ProviderToManyReturnValuesError
 	ProviderArgCountMismatchError
 	ProviderArgTypeMismatchError
-	ArgParsingEventError
-	ParamProviderGetError
 	ParamProviderNotDefinedError
 )

examples/simple/main.go

@@ -100,14 +100,14 @@ func main() {
 			Provider(greeter.NewGreeter).
 			Args(
 				di.ContextArg(),
-				di.ServiceArg(di.LoggerService),
+				di.ServiceRefArg(di.LoggerService),
 				di.ParamArg("morning"),
 			),
 		di.NewServiceDef(greeter.ServiceGreeterAfternoon).
 			Provider(greeter.NewGreeter).
 			Args(
 				di.ContextArg(),
-				di.ServiceArg(di.LoggerService),
+				di.ServiceRefArg(di.LoggerService),
 				di.ParamArg("afternoon"),
 			),
 		di.NewServiceDef(greeter.ServiceGreeterEvening).
@@ -118,7 +118,7 @@ func main() {
 			Provider(greeter.NewGreeter).
 			Args(
 				di.ContextArg(),
-				di.ServiceArg(di.LoggerService),
+				di.ServiceRefArg(di.LoggerService),
 				di.ParamArg("evening"),
 			),
 	)

no_parameter_provider.go

@@ -5,11 +5,11 @@ import z "github.com/dtomasi/zerrors"
 // NoParameterProvider is a provider that is set by default.
 type NoParameterProvider struct{}
 
-func (p *NoParameterProvider) Get(key string) (interface{}, error) {
+func (p *NoParameterProvider) Get(_ string) (interface{}, error) {
 	// Just return nil to not break call to Get if no parameter provider is set.
 	return nil, z.NewWithOpts("provider not defined", z.WithType(ParamProviderNotDefinedError))
 }
-func (p *NoParameterProvider) Set(key string, value interface{}) error {
+func (p *NoParameterProvider) Set(_ string, _ interface{}) error {
 	// Same as above for the Setter here
 	return z.NewWithOpts("provider not defined", z.WithType(ParamProviderNotDefinedError))
 }

service_def_example_test.go

@@ -21,7 +21,7 @@ func ExampleNewServiceDef() {
 			// This magic Arg injects the context provided with di container
 			di.ContextArg(),
 			// This magic Arg injects the logger provided with di container
-			di.ServiceArg(di.LoggerService),
+			di.ServiceRefArg(di.LoggerService),
 			// Interface Arg can be used for any value type. The passed value must match the target value type
 			// in the provider function
 			di.InterfaceArg("Hello, "),

service_def_test.go

@@ -16,7 +16,7 @@ func TestNewServiceDef(t *testing.T) {
 			di.ContextArg(),
 			di.ContainerArg(),
 			di.InterfaceArg(""),
-			di.ServiceArg(di.StringRef("bar")),
+			di.ServiceRefArg(di.StringRef("bar")),
 			di.ParamArg(""),
 		).
 		Tags(di.StringRef("foo"))