Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions di.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,12 @@ func Invoke[T any](i *Injector) (T, error) {
}

func MustInvoke[T any](i *Injector) T {
defer func() {
if err := recover(); err != nil {
must(fmt.Errorf("invoke service `%s` -> %v", generateServiceName[T](), err))
}
}()

s, err := Invoke[T](i)
must(err)
return s
Expand All @@ -112,6 +118,12 @@ func InvokeNamed[T any](i *Injector, name string) (T, error) {
}

func MustInvokeNamed[T any](i *Injector, name string) T {
defer func() {
if err := recover(); err != nil {
must(fmt.Errorf("invoke named service `%s` name `%s` -> %v", generateServiceName[T](), name, err))
}
}()

s, err := InvokeNamed[T](i, name)
must(err)
return s
Expand Down
62 changes: 62 additions & 0 deletions di_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,37 @@ func TestMustInvoke(t *testing.T) {
})
}

func TestMustInvokeNestedPanicError(t *testing.T) {
is := assert.New(t)

i := New()

type a struct{}
type c struct{}

type b struct {
A a
C c
}

Provide(i, func(i *Injector) (a, error) {
return a{}, nil
})

Provide(i, func(i *Injector) (b, error) {
return b{
A: MustInvoke[a](i),
C: MustInvoke[c](i),
}, nil
})

is.PanicsWithError("invoke service `do.b` -> invoke service `do.c` -> DI: could not find service `do.c`, available services: `do.a`, `do.b`",
func() {
MustInvoke[b](i)
},
)
}

func TestMustInvokeNamed(t *testing.T) {
is := assert.New(t)

Expand All @@ -231,6 +262,37 @@ func TestMustInvokeNamed(t *testing.T) {
})
}

func TestMustInvokeNamedNestedPanicError(t *testing.T) {
is := assert.New(t)

i := New()

type a struct{}
type c struct{}

type b struct {
A a
C c
}

Provide(i, func(i *Injector) (a, error) {
return a{}, nil
})

ProvideNamed(i, "bName", func(i *Injector) (b, error) {
return b{
A: MustInvoke[a](i),
C: MustInvokeNamed[c](i, "cName"),
}, nil
})

is.PanicsWithError("invoke named service `do.b` name `bName` -> invoke named service `do.c` name `cName` -> DI: could not find service `cName`, available services: `do.a`, `bName`",
func() {
MustInvokeNamed[b](i, "bName")
},
)
}

func TestShutdown(t *testing.T) {
is := assert.New(t)

Expand Down