v0.0.225

exerr/exerr.go

@@ -4,6 +4,7 @@ import (
 	"github.com/rs/xid"
 	"github.com/rs/zerolog"
 	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"reflect"
 	"strings"
 	"time"
 )
@@ -20,6 +21,7 @@ type ExErr struct {
 
 	Message        string `json:"message"`
 	WrappedErrType string `json:"wrappedErrType"`
+	WrappedErr     any    `json:"-"`
 	Caller         string `json:"caller"`
 
 	OriginalError *ExErr `json:"originalError"`
@@ -33,6 +35,9 @@ func (ee *ExErr) Error() string {
 
 // Unwrap must be implemented so that some error.XXX methods work
 func (ee *ExErr) Unwrap() error {
+	if ee.OriginalError == nil {
+		return nil // this is neccessary - otherwise we return a wrapped nil and the `x == nil` comparison fails (= panic in errors.Is and other failures)
+	}
 	return ee.OriginalError
 }
 
@@ -44,17 +49,29 @@ func (ee *ExErr) Is(e error) bool {
 // As must be implemented so that error.As(x) works
 //
 //goland:noinspection GoTypeAssertionOnErrors
-func (ee *ExErr) As(e any) bool {
-	if dstErr, ok := e.(*ExErr); ok {
+func (ee *ExErr) As(target any) bool {
+	if dstErr, ok := target.(*ExErr); ok {
+
 		if dst0, ok := ee.contains(dstErr); ok {
 			dstErr = dst0
 			return true
 		} else {
 			return false
 		}
-	} else if dstErr, ok := e.(error); ok {
-		return IsFrom(ee, dstErr)
+
 	} else {
+
+		val := reflect.ValueOf(target)
+
+		typStr := val.Type().Elem().String()
+
+		for curr := ee; curr != nil; curr = curr.OriginalError {
+			if curr.Category == CatForeign && curr.WrappedErrType == typStr && curr.WrappedErr != nil {
+				val.Elem().Set(reflect.ValueOf(curr.WrappedErr))
+				return true
+			}
+		}
+
 		return false
 	}
 }