diff --git a/promise/promise.go b/promise/promise.go index 3c3a0bb..5f824b9 100644 --- a/promise/promise.go +++ b/promise/promise.go @@ -272,10 +272,38 @@ func Any[T any](promises []*Promise[T]) *Promise[T] { } errCombo := errs[0] - for _, err := range errs[1:] { - errCombo = internal.JoinError(err) + if len(errs) > 1 { + errCombo = &anyError{errs: errs} } reject(errCombo) }) } + +// anyError is the error of Any when every promise is rejected. It keeps errors.Is and +// errors.As working for each member, also on Go versions that cannot traverse Unwrap() []error. +type anyError struct { + errs []error +} + +func (e *anyError) Error() string { + return internal.JoinError(e.errs...).Error() +} + +func (e *anyError) Is(target error) bool { + for _, err := range e.errs { + if errors.Is(err, target) { + return true + } + } + return false +} + +func (e *anyError) As(target any) bool { + for _, err := range e.errs { + if errors.As(err, target) { + return true + } + } + return false +} diff --git a/promise/promise_test.go b/promise/promise_test.go index 2dba37f..ccfda88 100644 --- a/promise/promise_test.go +++ b/promise/promise_test.go @@ -243,8 +243,44 @@ func TestAny(t *testing.T) { assert.IsNotNil(err) }) + t.Run("OnlyRejectedJoinsAllErrors", func(_ *testing.T) { + err1 := errors.New("error1") + err2 := &testPathError{msg: "error2"} + p1 := New(func(resolve func(string), reject func(error)) { + reject(err1) + }) + p2 := New(func(resolve func(string), reject func(error)) { + reject(err2) + }) + + _, err := Any([]*Promise[string]{p1, p2}).Await() + + assert.IsNotNil(err) + assert.Equal("error1\nerror2", err.Error()) + assert.Equal(true, errors.Is(err, err1)) + assert.Equal(true, errors.Is(err, err2)) + + var target *testPathError + assert.Equal(true, errors.As(err, &target)) + assert.Equal(true, target == err2) + }) + + t.Run("SingleRejectedKeepsError", func(_ *testing.T) { + e := errors.New("only") + p1 := New(func(resolve func(string), reject func(error)) { + reject(e) + }) + + _, err := Any([]*Promise[string]{p1}).Await() + + assert.Equal(true, err == e) + }) } +type testPathError struct{ msg string } + +func (e *testPathError) Error() string { return e.msg } + func TestRace(t *testing.T) { assert := internal.NewAssert(t, "TestPromise_Race")