v0.0.209 removed g context from err func

ginext/funcWrapper.go

@@ -25,7 +25,7 @@ func Wrap(w *GinWrapper, fn WHandlerFunc) gin.HandlerFunc {
 				Str("trace", stackTrace).
 				Build()
 
-			wrap = APIError(g, err)
+			wrap = Error(err)
 		}
 
 		if g.Writer.Written() {

ginext/preContext.go

@@ -52,7 +52,7 @@ func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
 				WithType(exerr.TypeBindFailURI).
 				Str("struct_type", fmt.Sprintf("%T", pctx.uri)).
 				Build()
-			return nil, nil, langext.Ptr(APIError(pctx.ginCtx, err))
+			return nil, nil, langext.Ptr(Error(err))
 		}
 	}
 
@@ -62,7 +62,7 @@ func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
 				WithType(exerr.TypeBindFailQuery).
 				Str("struct_type", fmt.Sprintf("%T", pctx.query)).
 				Build()
-			return nil, nil, langext.Ptr(APIError(pctx.ginCtx, err))
+			return nil, nil, langext.Ptr(Error(err))
 		}
 	}
 
@@ -73,13 +73,13 @@ func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
 					WithType(exerr.TypeBindFailJSON).
 					Str("struct_type", fmt.Sprintf("%T", pctx.body)).
 					Build()
-				return nil, nil, langext.Ptr(APIError(pctx.ginCtx, err))
+				return nil, nil, langext.Ptr(Error(err))
 			}
 		} else {
 			err := exerr.New(exerr.TypeBindFailJSON, "missing JSON body").
 				Str("struct_type", fmt.Sprintf("%T", pctx.body)).
 				Build()
-			return nil, nil, langext.Ptr(APIError(pctx.ginCtx, err))
+			return nil, nil, langext.Ptr(Error(err))
 		}
 	}
 
@@ -90,13 +90,13 @@ func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
 					WithType(exerr.TypeBindFailFormData).
 					Str("struct_type", fmt.Sprintf("%T", pctx.form)).
 					Build()
-				return nil, nil, langext.Ptr(APIError(pctx.ginCtx, err))
+				return nil, nil, langext.Ptr(Error(err))
 			}
 		} else {
 			err := exerr.New(exerr.TypeBindFailFormData, "missing form body").
 				Str("struct_type", fmt.Sprintf("%T", pctx.form)).
 				Build()
-			return nil, nil, langext.Ptr(APIError(pctx.ginCtx, err))
+			return nil, nil, langext.Ptr(Error(err))
 		}
 	}
 
@@ -106,7 +106,7 @@ func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
 				WithType(exerr.TypeBindFailHeader).
 				Str("struct_type", fmt.Sprintf("%T", pctx.query)).
 				Build()
-			return nil, nil, langext.Ptr(APIError(pctx.ginCtx, err))
+			return nil, nil, langext.Ptr(Error(err))
 		}
 	}
 

ginext/response.go

@@ -170,12 +170,18 @@ func Redirect(sc int, newURL string) HTTPResponse {
 	return &redirectHTTPResponse{statusCode: sc, url: newURL}
 }
 
-func APIError(g *gin.Context, e error) HTTPResponse {
+func Error(e error) HTTPResponse {
 	return &jsonAPIErrResponse{
 		err: exerr.FromError(e),
 	}
 }
 
-func NotImplemented(g *gin.Context) HTTPResponse {
-	return APIError(g, exerr.New(exerr.TypeNotImplemented, "").Build())
+func ErrWrap(e error, errorType exerr.ErrorType, msg string) HTTPResponse {
+	return &jsonAPIErrResponse{
+		err: exerr.FromError(exerr.Wrap(e, msg).WithType(errorType).Build()),
+	}
+}
+
+func NotImplemented() HTTPResponse {
+	return Error(exerr.New(exerr.TypeNotImplemented, "").Build())
 }

ginext/routes.go

@@ -3,8 +3,10 @@ package ginext
 import (
 	"github.com/gin-gonic/gin"
 	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"gogs.mikescher.com/BlackForestBytes/goext/rext"
 	"net/http"
 	"reflect"
+	"regexp"
 	"runtime"
 	"strings"
 )
@@ -137,8 +139,10 @@ func nameOfFunction(f any) string {
 		fname = fname[:len(fname)-len("-fm")]
 	}
 
-	if strings.HasSuffix(fname, ".func1") {
-		fname = fname[:len(fname)-len(".func1")]
+	suffix := rext.W(regexp.MustCompile("\\.func[0-9]+$"))
+
+	if match, ok := suffix.MatchFirst(fname); ok {
+		fname = fname[:len(fname)-match.FullMatch().Length()]
 	}
 
 	return fname

goextVersion.go

@@ -1,5 +1,5 @@
 package goext
 
-const GoextVersion = "0.0.205"
+const GoextVersion = "0.0.209"
 
-const GoextVersionTimestamp = "2023-07-24T18:47:48+0200"
+const GoextVersionTimestamp = "2023-07-25T10:56:03+0200"