Compare commits
28 Commits
Author | SHA1 | Date | |
---|---|---|---|
1310054121
|
|||
49d423915c
|
|||
1962cb3c52
|
|||
84f124dd4d
|
|||
ff8e066135
|
|||
bc5c61e43d
|
|||
6ded615723
|
|||
abc8af525a
|
|||
19d943361b
|
|||
b464afae01
|
|||
56bc5e8285
|
|||
cb95bb561c
|
|||
dff8941bd3 | |||
78e1c33e30
|
|||
d2f2a0558a
|
|||
fc4bed4b9f
|
|||
![]() |
94a7bf250d | ||
f6121a6961
|
|||
7fc73f1e93
|
|||
2504ef00a0
|
|||
fc5803493c | |||
a9295bfabf | |||
12fa53d848
|
|||
d2bb362135
|
|||
9dd81f6bd5
|
|||
d2c04afcd5
|
|||
62980e1489
|
|||
59963adf74
|
@@ -1,14 +1,15 @@
|
||||
package cursortoken
|
||||
|
||||
import (
|
||||
"context"
|
||||
"go.mongodb.org/mongo-driver/mongo"
|
||||
)
|
||||
|
||||
type RawFilter interface {
|
||||
FilterQuery() mongo.Pipeline
|
||||
FilterQuery(ctx context.Context) mongo.Pipeline
|
||||
}
|
||||
|
||||
type Filter interface {
|
||||
FilterQuery() mongo.Pipeline
|
||||
Pagination() (string, SortDirection, string, SortDirection)
|
||||
FilterQuery(ctx context.Context) mongo.Pipeline
|
||||
Pagination(ctx context.Context) (string, SortDirection, string, SortDirection)
|
||||
}
|
||||
|
@@ -55,18 +55,6 @@ import (
|
||||
// => Wrap/New + Fatal
|
||||
//
|
||||
|
||||
var stackSkipLogger zerolog.Logger
|
||||
|
||||
func init() {
|
||||
cw := zerolog.ConsoleWriter{
|
||||
Out: os.Stdout,
|
||||
TimeFormat: "2006-01-02 15:04:05 Z07:00",
|
||||
}
|
||||
|
||||
multi := zerolog.MultiLevelWriter(cw)
|
||||
stackSkipLogger = zerolog.New(multi).With().Timestamp().CallerWithSkipFrameCount(4).Logger()
|
||||
}
|
||||
|
||||
type Builder struct {
|
||||
wrappedErr error
|
||||
errorData *ExErr
|
||||
@@ -435,9 +423,9 @@ func (b *Builder) Build(ctxs ...context.Context) error {
|
||||
}
|
||||
|
||||
if pkgconfig.ZeroLogErrTraces && !b.noLog && (b.errorData.Severity == SevErr || b.errorData.Severity == SevFatal) {
|
||||
b.errorData.ShortLog(stackSkipLogger.Error())
|
||||
b.errorData.ShortLog(pkgconfig.ZeroLogger.Error())
|
||||
} else if pkgconfig.ZeroLogAllTraces && !b.noLog {
|
||||
b.errorData.ShortLog(stackSkipLogger.Error())
|
||||
b.errorData.ShortLog(pkgconfig.ZeroLogger.Error())
|
||||
}
|
||||
|
||||
b.errorData.CallListener(MethodBuild)
|
||||
@@ -459,9 +447,9 @@ func (b *Builder) Output(ctx context.Context, g *gin.Context) {
|
||||
b.errorData.Output(g)
|
||||
|
||||
if (b.errorData.Severity == SevErr || b.errorData.Severity == SevFatal) && (pkgconfig.ZeroLogErrGinOutput || pkgconfig.ZeroLogAllGinOutput) {
|
||||
b.errorData.Log(stackSkipLogger.Error())
|
||||
b.errorData.Log(pkgconfig.ZeroLogger.Error())
|
||||
} else if (b.errorData.Severity == SevWarn) && (pkgconfig.ZeroLogAllGinOutput) {
|
||||
b.errorData.Log(stackSkipLogger.Warn())
|
||||
b.errorData.Log(pkgconfig.ZeroLogger.Warn())
|
||||
}
|
||||
|
||||
b.errorData.CallListener(MethodOutput)
|
||||
@@ -477,9 +465,9 @@ func (b *Builder) Print(ctxs ...context.Context) {
|
||||
}
|
||||
|
||||
if b.errorData.Severity == SevErr || b.errorData.Severity == SevFatal {
|
||||
b.errorData.Log(stackSkipLogger.Error())
|
||||
b.errorData.Log(pkgconfig.ZeroLogger.Error())
|
||||
} else if b.errorData.Severity == SevWarn {
|
||||
b.errorData.ShortLog(stackSkipLogger.Warn())
|
||||
b.errorData.ShortLog(pkgconfig.ZeroLogger.Warn())
|
||||
}
|
||||
|
||||
b.errorData.CallListener(MethodPrint)
|
||||
@@ -493,12 +481,13 @@ func (b *Builder) Format(level LogPrintLevel) string {
|
||||
// If the error is SevErr we also send it to the error-service
|
||||
func (b *Builder) Fatal(ctxs ...context.Context) {
|
||||
|
||||
b.errorData.Severity = SevFatal
|
||||
|
||||
for _, dctx := range ctxs {
|
||||
b.CtxData(MethodFatal, dctx)
|
||||
}
|
||||
|
||||
b.errorData.Severity = SevFatal
|
||||
b.errorData.Log(stackSkipLogger.WithLevel(zerolog.FatalLevel))
|
||||
b.errorData.Log(pkgconfig.ZeroLogger.WithLevel(zerolog.FatalLevel))
|
||||
|
||||
b.errorData.CallListener(MethodFatal)
|
||||
|
||||
|
@@ -56,7 +56,7 @@ func wrapExErr(e *ExErr, msg string, cat ErrorCategory, stacktraceskip int) *ExE
|
||||
UniqueID: newID(),
|
||||
Category: cat,
|
||||
Type: TypeWrap,
|
||||
Severity: SevErr,
|
||||
Severity: e.Severity,
|
||||
Timestamp: time.Now(),
|
||||
StatusCode: e.StatusCode,
|
||||
Message: msg,
|
||||
|
@@ -23,6 +23,7 @@ var (
|
||||
TypeInternal = NewType("INTERNAL_ERROR", langext.Ptr(500))
|
||||
TypePanic = NewType("PANIC", langext.Ptr(500))
|
||||
TypeNotImplemented = NewType("NOT_IMPLEMENTED", langext.Ptr(500))
|
||||
TypeAssert = NewType("ASSERT", langext.Ptr(500))
|
||||
|
||||
TypeMongoQuery = NewType("MONGO_QUERY", langext.Ptr(500))
|
||||
TypeCursorTokenDecode = NewType("CURSOR_TOKEN_DECODE", langext.Ptr(500))
|
||||
|
@@ -4,8 +4,10 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/rs/zerolog"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
"net/http"
|
||||
"os"
|
||||
)
|
||||
|
||||
type ErrorPackageConfig struct {
|
||||
@@ -21,6 +23,7 @@ type ErrorPackageConfig struct {
|
||||
ZeroLogAllGinOutput bool // autom print zerolog logs on ginext.Error() / .Output(gin) (for all Severities)
|
||||
ExtendGinMeta func(ctx context.Context, b *Builder, g *gin.Context, req *http.Request) // (Optionally) extend the final error meta values with additional data from the gin context (a few are automatically added, here more can be included)
|
||||
ExtendContextMeta func(b *Builder, method Method, dctx context.Context) // (Optionally) extend the final error meta values with additional data from the context (a few are automatically added, here more can be included)
|
||||
ZeroLogger zerolog.Logger // The logger used to print exerr log messages
|
||||
}
|
||||
|
||||
type ErrorPackageConfigInit struct {
|
||||
@@ -36,6 +39,7 @@ type ErrorPackageConfigInit struct {
|
||||
ZeroLogAllGinOutput *bool
|
||||
ExtendGinMeta func(ctx context.Context, b *Builder, g *gin.Context, req *http.Request)
|
||||
ExtendContextMeta func(b *Builder, method Method, dctx context.Context)
|
||||
ZeroLogger *zerolog.Logger
|
||||
}
|
||||
|
||||
var initialized = false
|
||||
@@ -81,6 +85,13 @@ func Init(cfg ErrorPackageConfigInit) {
|
||||
egcm = cfg.ExtendContextMeta
|
||||
}
|
||||
|
||||
var logger zerolog.Logger
|
||||
if cfg.ZeroLogger != nil {
|
||||
logger = *cfg.ZeroLogger
|
||||
} else {
|
||||
logger = newDefaultLogger()
|
||||
}
|
||||
|
||||
pkgconfig = ErrorPackageConfig{
|
||||
ZeroLogErrTraces: langext.Coalesce(cfg.ZeroLogErrTraces, pkgconfig.ZeroLogErrTraces),
|
||||
ZeroLogAllTraces: langext.Coalesce(cfg.ZeroLogAllTraces, pkgconfig.ZeroLogAllTraces),
|
||||
@@ -94,11 +105,23 @@ func Init(cfg ErrorPackageConfigInit) {
|
||||
ZeroLogErrGinOutput: langext.Coalesce(cfg.ZeroLogErrGinOutput, pkgconfig.ZeroLogErrGinOutput),
|
||||
ExtendGinMeta: egm,
|
||||
ExtendContextMeta: egcm,
|
||||
ZeroLogger: logger,
|
||||
}
|
||||
|
||||
initialized = true
|
||||
}
|
||||
|
||||
func newDefaultLogger() zerolog.Logger {
|
||||
cw := zerolog.ConsoleWriter{
|
||||
Out: os.Stdout,
|
||||
TimeFormat: "2006-01-02 15:04:05 Z07:00",
|
||||
}
|
||||
|
||||
multi := zerolog.MultiLevelWriter(cw)
|
||||
|
||||
return zerolog.New(multi).With().Timestamp().CallerWithSkipFrameCount(4).Logger()
|
||||
}
|
||||
|
||||
func Initialized() bool {
|
||||
return initialized
|
||||
}
|
||||
|
@@ -84,6 +84,9 @@ func (ee *ExErr) FormatLog(lvl LogPrintLevel) string {
|
||||
if lvl == LogPrintShort {
|
||||
|
||||
msg := ee.Message
|
||||
if msg == "" {
|
||||
msg = ee.RecursiveMessage()
|
||||
}
|
||||
if ee.OriginalError != nil && ee.OriginalError.Category == CatForeign {
|
||||
msg = msg + " (" + strings.ReplaceAll(ee.OriginalError.Message, "\n", " ") + ")"
|
||||
}
|
||||
|
@@ -3,13 +3,17 @@ package ginext
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"net/http"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func CorsMiddleware() gin.HandlerFunc {
|
||||
func CorsMiddleware(allowheader []string, exposeheader []string) gin.HandlerFunc {
|
||||
return func(c *gin.Context) {
|
||||
c.Writer.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
c.Writer.Header().Set("Access-Control-Allow-Credentials", "true")
|
||||
c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With")
|
||||
c.Writer.Header().Set("Access-Control-Allow-Headers", strings.Join(allowheader, ", "))
|
||||
if len(exposeheader) > 0 {
|
||||
c.Writer.Header().Set("Access-Control-Expose-Headers", strings.Join(exposeheader, ", "))
|
||||
}
|
||||
c.Writer.Header().Set("Access-Control-Allow-Methods", "OPTIONS, GET, POST, PUT, PATCH, DELETE, COUNT")
|
||||
|
||||
if c.Request.Method == "OPTIONS" {
|
||||
|
@@ -21,12 +21,16 @@ type GinWrapper struct {
|
||||
|
||||
opt Options
|
||||
allowCors bool
|
||||
corsAllowHeader []string
|
||||
corsExposeHeader []string
|
||||
ginDebug bool
|
||||
bufferBody bool
|
||||
requestTimeout time.Duration
|
||||
listenerBeforeRequest []func(g *gin.Context)
|
||||
listenerAfterRequest []func(g *gin.Context, resp HTTPResponse)
|
||||
|
||||
buildRequestBindError func(g *gin.Context, fieldtype string, err error) HTTPResponse
|
||||
|
||||
routeSpecs []ginRouteSpec
|
||||
}
|
||||
|
||||
@@ -38,19 +42,36 @@ type ginRouteSpec struct {
|
||||
}
|
||||
|
||||
type Options struct {
|
||||
AllowCors *bool // Add cors handler to allow all CORS requests on the default http methods
|
||||
GinDebug *bool // Set gin.debug to true (adds more logs)
|
||||
SuppressGinLogs *bool // Suppress our custom gin logs (even if GinDebug == true)
|
||||
BufferBody *bool // Buffers the input body stream, this way the ginext error handler can later include the whole request body
|
||||
Timeout *time.Duration // The default handler timeout
|
||||
ListenerBeforeRequest []func(g *gin.Context) // Register listener that are called before the handler method
|
||||
ListenerAfterRequest []func(g *gin.Context, resp HTTPResponse) // Register listener that are called after the handler method
|
||||
DebugTrimHandlerPrefixes []string // Trim these prefixes from the handler names in the debug print
|
||||
DebugReplaceHandlerNames map[string]string // Replace handler names in debug output
|
||||
AllowCors *bool // Add cors handler to allow all CORS requests on the default http methods
|
||||
CorsAllowHeader *[]string // override the default values of Access-Control-Allow-Headers (AllowCors must be true)
|
||||
CorsExposeHeader *[]string // return Access-Control-Expose-Headers (AllowCors must be true)
|
||||
GinDebug *bool // Set gin.debug to true (adds more logs)
|
||||
SuppressGinLogs *bool // Suppress our custom gin logs (even if GinDebug == true)
|
||||
BufferBody *bool // Buffers the input body stream, this way the ginext error handler can later include the whole request body
|
||||
Timeout *time.Duration // The default handler timeout
|
||||
ListenerBeforeRequest []func(g *gin.Context) // Register listener that are called before the handler method
|
||||
ListenerAfterRequest []func(g *gin.Context, resp HTTPResponse) // Register listener that are called after the handler method
|
||||
DebugTrimHandlerPrefixes []string // Trim these prefixes from the handler names in the debug print
|
||||
DebugReplaceHandlerNames map[string]string // Replace handler names in debug output
|
||||
BuildRequestBindError func(g *gin.Context, fieldtype string, err error) HTTPResponse // Override function which generates the HTTPResponse errors that are returned by the preContext..Start() methids
|
||||
}
|
||||
|
||||
// NewEngine creates a new (wrapped) ginEngine
|
||||
func NewEngine(opt Options) *GinWrapper {
|
||||
ginDebug := langext.Coalesce(opt.GinDebug, true)
|
||||
if ginDebug {
|
||||
gin.SetMode(gin.DebugMode)
|
||||
|
||||
// do not debug-print routes
|
||||
gin.DebugPrintRouteFunc = func(_, _, _ string, _ int) {}
|
||||
|
||||
} else {
|
||||
gin.SetMode(gin.ReleaseMode)
|
||||
|
||||
// do not debug-print routes
|
||||
gin.DebugPrintRouteFunc = func(_, _, _ string, _ int) {}
|
||||
}
|
||||
|
||||
engine := gin.New()
|
||||
|
||||
wrapper := &GinWrapper{
|
||||
@@ -58,36 +79,27 @@ func NewEngine(opt Options) *GinWrapper {
|
||||
opt: opt,
|
||||
suppressGinLogs: langext.Coalesce(opt.SuppressGinLogs, false),
|
||||
allowCors: langext.Coalesce(opt.AllowCors, false),
|
||||
ginDebug: langext.Coalesce(opt.GinDebug, true),
|
||||
corsAllowHeader: langext.Coalesce(opt.CorsAllowHeader, []string{"Content-Type", "Content-Length", "Accept-Encoding", "X-CSRF-Token", "Authorization", "accept", "origin", "Cache-Control", "X-Requested-With"}),
|
||||
corsExposeHeader: langext.Coalesce(opt.CorsExposeHeader, []string{}),
|
||||
ginDebug: ginDebug,
|
||||
bufferBody: langext.Coalesce(opt.BufferBody, false),
|
||||
requestTimeout: langext.Coalesce(opt.Timeout, 24*time.Hour),
|
||||
listenerBeforeRequest: opt.ListenerBeforeRequest,
|
||||
listenerAfterRequest: opt.ListenerAfterRequest,
|
||||
buildRequestBindError: langext.Conditional(opt.BuildRequestBindError == nil, defaultBuildRequestBindError, opt.BuildRequestBindError),
|
||||
}
|
||||
|
||||
engine.RedirectFixedPath = false
|
||||
engine.RedirectTrailingSlash = false
|
||||
|
||||
if wrapper.allowCors {
|
||||
engine.Use(CorsMiddleware())
|
||||
engine.Use(CorsMiddleware(wrapper.corsAllowHeader, wrapper.corsExposeHeader))
|
||||
}
|
||||
|
||||
// do not debug-print routes
|
||||
gin.DebugPrintRouteFunc = func(_, _, _ string, _ int) {}
|
||||
|
||||
if !wrapper.ginDebug {
|
||||
gin.SetMode(gin.ReleaseMode)
|
||||
|
||||
if !wrapper.suppressGinLogs {
|
||||
ginlogger := gin.Logger()
|
||||
engine.Use(func(context *gin.Context) {
|
||||
ginlogger(context)
|
||||
})
|
||||
}
|
||||
} else {
|
||||
gin.SetMode(gin.DebugMode)
|
||||
if ginDebug && !wrapper.suppressGinLogs {
|
||||
ginlogger := gin.Logger()
|
||||
engine.Use(func(context *gin.Context) { ginlogger(context) })
|
||||
}
|
||||
|
||||
return wrapper
|
||||
}
|
||||
|
||||
@@ -216,3 +228,11 @@ func (w *GinWrapper) ServeHTTP(req *http.Request) *httptest.ResponseRecorder {
|
||||
func (w *GinWrapper) ForwardRequest(writer http.ResponseWriter, req *http.Request) {
|
||||
w.engine.ServeHTTP(writer, req)
|
||||
}
|
||||
|
||||
func (w *GinWrapper) ListRoutes() []gin.RouteInfo {
|
||||
return w.engine.Routes()
|
||||
}
|
||||
|
||||
func defaultBuildRequestBindError(g *gin.Context, fieldtype string, err error) HTTPResponse {
|
||||
return Error(err)
|
||||
}
|
||||
|
@@ -15,16 +15,17 @@ import (
|
||||
)
|
||||
|
||||
type PreContext struct {
|
||||
ginCtx *gin.Context
|
||||
wrapper *GinWrapper
|
||||
uri any
|
||||
query any
|
||||
body any
|
||||
rawbody *[]byte
|
||||
form any
|
||||
header any
|
||||
timeout *time.Duration
|
||||
persistantData *preContextData // must be a ptr, so that we can get the values back in out Wrap func
|
||||
ginCtx *gin.Context
|
||||
wrapper *GinWrapper
|
||||
uri any
|
||||
query any
|
||||
body any
|
||||
rawbody *[]byte
|
||||
form any
|
||||
header any
|
||||
timeout *time.Duration
|
||||
persistantData *preContextData // must be a ptr, so that we can get the values back in out Wrap func
|
||||
ignoreWrongContentType bool
|
||||
}
|
||||
|
||||
type preContextData struct {
|
||||
@@ -71,6 +72,11 @@ func (pctx *PreContext) WithSession(sessionObj SessionObject) *PreContext {
|
||||
return pctx
|
||||
}
|
||||
|
||||
func (pctx *PreContext) IgnoreWrongContentType() *PreContext {
|
||||
pctx.ignoreWrongContentType = true
|
||||
return pctx
|
||||
}
|
||||
|
||||
func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
|
||||
if pctx.uri != nil {
|
||||
if err := pctx.ginCtx.ShouldBindUri(pctx.uri); err != nil {
|
||||
@@ -78,7 +84,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(Error(err))
|
||||
return nil, nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "URI", err))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -88,7 +94,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(Error(err))
|
||||
return nil, nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "QUERY", err))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -99,13 +105,15 @@ 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(Error(err))
|
||||
return nil, nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "JSON", err))
|
||||
}
|
||||
} else {
|
||||
err := exerr.New(exerr.TypeBindFailJSON, "missing JSON body").
|
||||
Str("struct_type", fmt.Sprintf("%T", pctx.body)).
|
||||
Build()
|
||||
return nil, nil, langext.Ptr(Error(err))
|
||||
if !pctx.ignoreWrongContentType {
|
||||
err := exerr.New(exerr.TypeBindFailJSON, "missing JSON body").
|
||||
Str("struct_type", fmt.Sprintf("%T", pctx.body)).
|
||||
Build()
|
||||
return nil, nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "JSON", err))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -113,14 +121,14 @@ func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
|
||||
if brc, ok := pctx.ginCtx.Request.Body.(dataext.BufferedReadCloser); ok {
|
||||
v, err := brc.BufferedAll()
|
||||
if err != nil {
|
||||
return nil, nil, langext.Ptr(Error(err))
|
||||
return nil, nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "BODY", err))
|
||||
}
|
||||
*pctx.rawbody = v
|
||||
} else {
|
||||
buf := &bytes.Buffer{}
|
||||
_, err := io.Copy(buf, pctx.ginCtx.Request.Body)
|
||||
if err != nil {
|
||||
return nil, nil, langext.Ptr(Error(err))
|
||||
return nil, nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "BODY", err))
|
||||
}
|
||||
*pctx.rawbody = buf.Bytes()
|
||||
}
|
||||
@@ -133,7 +141,7 @@ 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(Error(err))
|
||||
return nil, nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "FORM", err))
|
||||
}
|
||||
} else if pctx.ginCtx.ContentType() == "application/x-www-form-urlencoded" {
|
||||
if err := pctx.ginCtx.ShouldBindWith(pctx.form, binding.Form); err != nil {
|
||||
@@ -141,13 +149,15 @@ 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(Error(err))
|
||||
return nil, nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "FORM", err))
|
||||
}
|
||||
} else {
|
||||
err := exerr.New(exerr.TypeBindFailFormData, "missing form body").
|
||||
Str("struct_type", fmt.Sprintf("%T", pctx.form)).
|
||||
Build()
|
||||
return nil, nil, langext.Ptr(Error(err))
|
||||
if !pctx.ignoreWrongContentType {
|
||||
err := exerr.New(exerr.TypeBindFailFormData, "missing form body").
|
||||
Str("struct_type", fmt.Sprintf("%T", pctx.form)).
|
||||
Build()
|
||||
return nil, nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "FORM", err))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -157,7 +167,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(Error(err))
|
||||
return nil, nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "HEADER", err))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -169,7 +179,7 @@ func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
|
||||
err := pctx.persistantData.sessionObj.Init(pctx.ginCtx, actx)
|
||||
if err != nil {
|
||||
actx.Cancel()
|
||||
return nil, nil, langext.Ptr(Error(exerr.Wrap(err, "Failed to init session").Build()))
|
||||
return nil, nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "INIT", err))
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -1,13 +1,8 @@
|
||||
package ginext
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"github.com/gin-gonic/gin"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/exerr"
|
||||
json "gogs.mikescher.com/BlackForestBytes/goext/gojson"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
"os"
|
||||
)
|
||||
|
||||
type cookieval struct {
|
||||
@@ -41,462 +36,10 @@ type InspectableHTTPResponse interface {
|
||||
Headers() []string
|
||||
}
|
||||
|
||||
type jsonHTTPResponse struct {
|
||||
statusCode int
|
||||
data any
|
||||
headers []headerval
|
||||
cookies []cookieval
|
||||
}
|
||||
type HTTPErrorResponse interface {
|
||||
HTTPResponse
|
||||
|
||||
func (j jsonHTTPResponse) jsonRenderer(g *gin.Context) json.GoJsonRender {
|
||||
var f *string
|
||||
if jsonfilter := g.GetString("goext.jsonfilter"); jsonfilter != "" {
|
||||
f = &jsonfilter
|
||||
}
|
||||
return json.GoJsonRender{Data: j.data, NilSafeSlices: true, NilSafeMaps: true, Filter: f}
|
||||
}
|
||||
|
||||
func (j jsonHTTPResponse) Write(g *gin.Context) {
|
||||
for _, v := range j.headers {
|
||||
g.Header(v.Key, v.Val)
|
||||
}
|
||||
for _, v := range j.cookies {
|
||||
g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
|
||||
}
|
||||
g.Render(j.statusCode, j.jsonRenderer(g))
|
||||
}
|
||||
|
||||
func (j jsonHTTPResponse) WithHeader(k string, v string) HTTPResponse {
|
||||
j.headers = append(j.headers, headerval{k, v})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j jsonHTTPResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
|
||||
j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j jsonHTTPResponse) IsSuccess() bool {
|
||||
return j.statusCode >= 200 && j.statusCode <= 399
|
||||
}
|
||||
|
||||
func (j jsonHTTPResponse) Statuscode() int {
|
||||
return j.statusCode
|
||||
}
|
||||
|
||||
func (j jsonHTTPResponse) BodyString(g *gin.Context) *string {
|
||||
if str, err := j.jsonRenderer(g).RenderString(); err == nil {
|
||||
return &str
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func (j jsonHTTPResponse) ContentType() string {
|
||||
return "application/json"
|
||||
}
|
||||
|
||||
func (j jsonHTTPResponse) Headers() []string {
|
||||
return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
|
||||
}
|
||||
|
||||
type emptyHTTPResponse struct {
|
||||
statusCode int
|
||||
headers []headerval
|
||||
cookies []cookieval
|
||||
}
|
||||
|
||||
func (j emptyHTTPResponse) Write(g *gin.Context) {
|
||||
for _, v := range j.headers {
|
||||
g.Header(v.Key, v.Val)
|
||||
}
|
||||
for _, v := range j.cookies {
|
||||
g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
|
||||
}
|
||||
g.Status(j.statusCode)
|
||||
}
|
||||
|
||||
func (j emptyHTTPResponse) WithHeader(k string, v string) HTTPResponse {
|
||||
j.headers = append(j.headers, headerval{k, v})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j emptyHTTPResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
|
||||
j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j emptyHTTPResponse) IsSuccess() bool {
|
||||
return j.statusCode >= 200 && j.statusCode <= 399
|
||||
}
|
||||
|
||||
func (j emptyHTTPResponse) Statuscode() int {
|
||||
return j.statusCode
|
||||
}
|
||||
|
||||
func (j emptyHTTPResponse) BodyString(*gin.Context) *string {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (j emptyHTTPResponse) ContentType() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func (j emptyHTTPResponse) Headers() []string {
|
||||
return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
|
||||
}
|
||||
|
||||
type textHTTPResponse struct {
|
||||
statusCode int
|
||||
data string
|
||||
headers []headerval
|
||||
cookies []cookieval
|
||||
}
|
||||
|
||||
func (j textHTTPResponse) Write(g *gin.Context) {
|
||||
for _, v := range j.headers {
|
||||
g.Header(v.Key, v.Val)
|
||||
}
|
||||
for _, v := range j.cookies {
|
||||
g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
|
||||
}
|
||||
g.String(j.statusCode, "%s", j.data)
|
||||
}
|
||||
|
||||
func (j textHTTPResponse) WithHeader(k string, v string) HTTPResponse {
|
||||
j.headers = append(j.headers, headerval{k, v})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j textHTTPResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
|
||||
j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j textHTTPResponse) IsSuccess() bool {
|
||||
return j.statusCode >= 200 && j.statusCode <= 399
|
||||
}
|
||||
|
||||
func (j textHTTPResponse) Statuscode() int {
|
||||
return j.statusCode
|
||||
}
|
||||
|
||||
func (j textHTTPResponse) BodyString(*gin.Context) *string {
|
||||
return langext.Ptr(j.data)
|
||||
}
|
||||
|
||||
func (j textHTTPResponse) ContentType() string {
|
||||
return "text/plain"
|
||||
}
|
||||
|
||||
func (j textHTTPResponse) Headers() []string {
|
||||
return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
|
||||
}
|
||||
|
||||
type dataHTTPResponse struct {
|
||||
statusCode int
|
||||
data []byte
|
||||
contentType string
|
||||
headers []headerval
|
||||
cookies []cookieval
|
||||
}
|
||||
|
||||
func (j dataHTTPResponse) Write(g *gin.Context) {
|
||||
for _, v := range j.headers {
|
||||
g.Header(v.Key, v.Val)
|
||||
}
|
||||
for _, v := range j.cookies {
|
||||
g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
|
||||
}
|
||||
g.Data(j.statusCode, j.contentType, j.data)
|
||||
}
|
||||
|
||||
func (j dataHTTPResponse) WithHeader(k string, v string) HTTPResponse {
|
||||
j.headers = append(j.headers, headerval{k, v})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j dataHTTPResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
|
||||
j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j dataHTTPResponse) IsSuccess() bool {
|
||||
return j.statusCode >= 200 && j.statusCode <= 399
|
||||
}
|
||||
|
||||
func (j dataHTTPResponse) Statuscode() int {
|
||||
return j.statusCode
|
||||
}
|
||||
|
||||
func (j dataHTTPResponse) BodyString(*gin.Context) *string {
|
||||
return langext.Ptr(string(j.data))
|
||||
}
|
||||
|
||||
func (j dataHTTPResponse) ContentType() string {
|
||||
return j.contentType
|
||||
}
|
||||
|
||||
func (j dataHTTPResponse) Headers() []string {
|
||||
return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
|
||||
}
|
||||
|
||||
type fileHTTPResponse struct {
|
||||
mimetype string
|
||||
filepath string
|
||||
filename *string
|
||||
headers []headerval
|
||||
cookies []cookieval
|
||||
}
|
||||
|
||||
func (j fileHTTPResponse) Write(g *gin.Context) {
|
||||
g.Header("Content-Type", j.mimetype) // if we don't set it here gin does weird file-sniffing later...
|
||||
if j.filename != nil {
|
||||
g.Header("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", *j.filename))
|
||||
|
||||
}
|
||||
for _, v := range j.headers {
|
||||
g.Header(v.Key, v.Val)
|
||||
}
|
||||
for _, v := range j.cookies {
|
||||
g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
|
||||
}
|
||||
g.File(j.filepath)
|
||||
}
|
||||
|
||||
func (j fileHTTPResponse) WithHeader(k string, v string) HTTPResponse {
|
||||
j.headers = append(j.headers, headerval{k, v})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j fileHTTPResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
|
||||
j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j fileHTTPResponse) IsSuccess() bool {
|
||||
return true
|
||||
}
|
||||
|
||||
func (j fileHTTPResponse) Statuscode() int {
|
||||
return 200
|
||||
}
|
||||
|
||||
func (j fileHTTPResponse) BodyString(*gin.Context) *string {
|
||||
data, err := os.ReadFile(j.filepath)
|
||||
if err != nil {
|
||||
return nil
|
||||
}
|
||||
return langext.Ptr(string(data))
|
||||
}
|
||||
|
||||
func (j fileHTTPResponse) ContentType() string {
|
||||
return j.mimetype
|
||||
}
|
||||
|
||||
func (j fileHTTPResponse) Headers() []string {
|
||||
return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
|
||||
}
|
||||
|
||||
type downloadDataHTTPResponse struct {
|
||||
statusCode int
|
||||
mimetype string
|
||||
data []byte
|
||||
filename *string
|
||||
headers []headerval
|
||||
cookies []cookieval
|
||||
}
|
||||
|
||||
func (j downloadDataHTTPResponse) Write(g *gin.Context) {
|
||||
g.Header("Content-Type", j.mimetype) // if we don't set it here gin does weird file-sniffing later...
|
||||
if j.filename != nil {
|
||||
g.Header("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", *j.filename))
|
||||
}
|
||||
for _, v := range j.headers {
|
||||
g.Header(v.Key, v.Val)
|
||||
}
|
||||
for _, v := range j.cookies {
|
||||
g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
|
||||
}
|
||||
g.Data(j.statusCode, j.mimetype, j.data)
|
||||
}
|
||||
|
||||
func (j downloadDataHTTPResponse) WithHeader(k string, v string) HTTPResponse {
|
||||
j.headers = append(j.headers, headerval{k, v})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j downloadDataHTTPResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
|
||||
j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j downloadDataHTTPResponse) IsSuccess() bool {
|
||||
return j.statusCode >= 200 && j.statusCode <= 399
|
||||
}
|
||||
|
||||
func (j downloadDataHTTPResponse) Statuscode() int {
|
||||
return j.statusCode
|
||||
}
|
||||
|
||||
func (j downloadDataHTTPResponse) BodyString(*gin.Context) *string {
|
||||
return langext.Ptr(string(j.data))
|
||||
}
|
||||
|
||||
func (j downloadDataHTTPResponse) ContentType() string {
|
||||
return j.mimetype
|
||||
}
|
||||
|
||||
func (j downloadDataHTTPResponse) Headers() []string {
|
||||
return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
|
||||
}
|
||||
|
||||
type redirectHTTPResponse struct {
|
||||
statusCode int
|
||||
url string
|
||||
headers []headerval
|
||||
cookies []cookieval
|
||||
}
|
||||
|
||||
func (j redirectHTTPResponse) Write(g *gin.Context) {
|
||||
for _, v := range j.headers {
|
||||
g.Header(v.Key, v.Val)
|
||||
}
|
||||
for _, v := range j.cookies {
|
||||
g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
|
||||
}
|
||||
g.Redirect(j.statusCode, j.url)
|
||||
}
|
||||
|
||||
func (j redirectHTTPResponse) WithHeader(k string, v string) HTTPResponse {
|
||||
j.headers = append(j.headers, headerval{k, v})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j redirectHTTPResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
|
||||
j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j redirectHTTPResponse) IsSuccess() bool {
|
||||
return j.statusCode >= 200 && j.statusCode <= 399
|
||||
}
|
||||
|
||||
func (j redirectHTTPResponse) Statuscode() int {
|
||||
return j.statusCode
|
||||
}
|
||||
|
||||
func (j redirectHTTPResponse) BodyString(*gin.Context) *string {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (j redirectHTTPResponse) ContentType() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func (j redirectHTTPResponse) Headers() []string {
|
||||
return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
|
||||
}
|
||||
|
||||
type jsonAPIErrResponse struct {
|
||||
err *exerr.ExErr
|
||||
headers []headerval
|
||||
cookies []cookieval
|
||||
}
|
||||
|
||||
func (j jsonAPIErrResponse) Write(g *gin.Context) {
|
||||
for _, v := range j.headers {
|
||||
g.Header(v.Key, v.Val)
|
||||
}
|
||||
for _, v := range j.cookies {
|
||||
g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
|
||||
}
|
||||
|
||||
exerr.Get(j.err).Output(context.Background(), g)
|
||||
|
||||
j.err.CallListener(exerr.MethodOutput)
|
||||
}
|
||||
|
||||
func (j jsonAPIErrResponse) WithHeader(k string, v string) HTTPResponse {
|
||||
j.headers = append(j.headers, headerval{k, v})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j jsonAPIErrResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
|
||||
j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j jsonAPIErrResponse) IsSuccess() bool {
|
||||
return false
|
||||
}
|
||||
|
||||
func (j jsonAPIErrResponse) Statuscode() int {
|
||||
return langext.Coalesce(j.err.RecursiveStatuscode(), 0)
|
||||
}
|
||||
|
||||
func (j jsonAPIErrResponse) BodyString(*gin.Context) *string {
|
||||
if str, err := j.err.ToDefaultAPIJson(); err == nil {
|
||||
return &str
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func (j jsonAPIErrResponse) ContentType() string {
|
||||
return "application/json"
|
||||
}
|
||||
|
||||
func (j jsonAPIErrResponse) Headers() []string {
|
||||
return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
|
||||
}
|
||||
|
||||
func (j jsonAPIErrResponse) Unwrap() error {
|
||||
return j.err
|
||||
}
|
||||
|
||||
func Status(sc int) HTTPResponse {
|
||||
return &emptyHTTPResponse{statusCode: sc}
|
||||
}
|
||||
|
||||
func JSON(sc int, data any) HTTPResponse {
|
||||
return &jsonHTTPResponse{statusCode: sc, data: data}
|
||||
}
|
||||
|
||||
func Data(sc int, contentType string, data []byte) HTTPResponse {
|
||||
return &dataHTTPResponse{statusCode: sc, contentType: contentType, data: data}
|
||||
}
|
||||
|
||||
func Text(sc int, data string) HTTPResponse {
|
||||
return &textHTTPResponse{statusCode: sc, data: data}
|
||||
}
|
||||
|
||||
func File(mimetype string, filepath string) HTTPResponse {
|
||||
return &fileHTTPResponse{mimetype: mimetype, filepath: filepath}
|
||||
}
|
||||
|
||||
func Download(mimetype string, filepath string, filename string) HTTPResponse {
|
||||
return &fileHTTPResponse{mimetype: mimetype, filepath: filepath, filename: &filename}
|
||||
}
|
||||
|
||||
func DownloadData(status int, mimetype string, filename string, data []byte) HTTPResponse {
|
||||
return &downloadDataHTTPResponse{statusCode: status, mimetype: mimetype, data: data, filename: &filename}
|
||||
}
|
||||
|
||||
func Redirect(sc int, newURL string) HTTPResponse {
|
||||
return &redirectHTTPResponse{statusCode: sc, url: newURL}
|
||||
}
|
||||
|
||||
func Error(e error) HTTPResponse {
|
||||
return &jsonAPIErrResponse{
|
||||
err: exerr.FromError(e),
|
||||
}
|
||||
}
|
||||
|
||||
func ErrWrap(e error, errorType exerr.ErrorType, msg string) HTTPResponse {
|
||||
return &jsonAPIErrResponse{
|
||||
err: exerr.FromError(exerr.Wrap(e, msg).WithType(errorType).Build()),
|
||||
}
|
||||
Error() error
|
||||
}
|
||||
|
||||
func NotImplemented() HTTPResponse {
|
||||
|
58
ginext/responseData.go
Normal file
58
ginext/responseData.go
Normal file
@@ -0,0 +1,58 @@
|
||||
package ginext
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
)
|
||||
|
||||
type dataHTTPResponse struct {
|
||||
statusCode int
|
||||
data []byte
|
||||
contentType string
|
||||
headers []headerval
|
||||
cookies []cookieval
|
||||
}
|
||||
|
||||
func (j dataHTTPResponse) Write(g *gin.Context) {
|
||||
for _, v := range j.headers {
|
||||
g.Header(v.Key, v.Val)
|
||||
}
|
||||
for _, v := range j.cookies {
|
||||
g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
|
||||
}
|
||||
g.Data(j.statusCode, j.contentType, j.data)
|
||||
}
|
||||
|
||||
func (j dataHTTPResponse) WithHeader(k string, v string) HTTPResponse {
|
||||
j.headers = append(j.headers, headerval{k, v})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j dataHTTPResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
|
||||
j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j dataHTTPResponse) IsSuccess() bool {
|
||||
return j.statusCode >= 200 && j.statusCode <= 399
|
||||
}
|
||||
|
||||
func (j dataHTTPResponse) Statuscode() int {
|
||||
return j.statusCode
|
||||
}
|
||||
|
||||
func (j dataHTTPResponse) BodyString(*gin.Context) *string {
|
||||
return langext.Ptr(string(j.data))
|
||||
}
|
||||
|
||||
func (j dataHTTPResponse) ContentType() string {
|
||||
return j.contentType
|
||||
}
|
||||
|
||||
func (j dataHTTPResponse) Headers() []string {
|
||||
return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
|
||||
}
|
||||
|
||||
func Data(sc int, contentType string, data []byte) HTTPResponse {
|
||||
return &dataHTTPResponse{statusCode: sc, contentType: contentType, data: data}
|
||||
}
|
64
ginext/responseDownload.go
Normal file
64
ginext/responseDownload.go
Normal file
@@ -0,0 +1,64 @@
|
||||
package ginext
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/gin-gonic/gin"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
)
|
||||
|
||||
type downloadDataHTTPResponse struct {
|
||||
statusCode int
|
||||
mimetype string
|
||||
data []byte
|
||||
filename *string
|
||||
headers []headerval
|
||||
cookies []cookieval
|
||||
}
|
||||
|
||||
func (j downloadDataHTTPResponse) Write(g *gin.Context) {
|
||||
g.Header("Content-Type", j.mimetype) // if we don't set it here gin does weird file-sniffing later...
|
||||
if j.filename != nil {
|
||||
g.Header("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", *j.filename))
|
||||
}
|
||||
for _, v := range j.headers {
|
||||
g.Header(v.Key, v.Val)
|
||||
}
|
||||
for _, v := range j.cookies {
|
||||
g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
|
||||
}
|
||||
g.Data(j.statusCode, j.mimetype, j.data)
|
||||
}
|
||||
|
||||
func (j downloadDataHTTPResponse) WithHeader(k string, v string) HTTPResponse {
|
||||
j.headers = append(j.headers, headerval{k, v})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j downloadDataHTTPResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
|
||||
j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j downloadDataHTTPResponse) IsSuccess() bool {
|
||||
return j.statusCode >= 200 && j.statusCode <= 399
|
||||
}
|
||||
|
||||
func (j downloadDataHTTPResponse) Statuscode() int {
|
||||
return j.statusCode
|
||||
}
|
||||
|
||||
func (j downloadDataHTTPResponse) BodyString(*gin.Context) *string {
|
||||
return langext.Ptr(string(j.data))
|
||||
}
|
||||
|
||||
func (j downloadDataHTTPResponse) ContentType() string {
|
||||
return j.mimetype
|
||||
}
|
||||
|
||||
func (j downloadDataHTTPResponse) Headers() []string {
|
||||
return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
|
||||
}
|
||||
|
||||
func DownloadData(status int, mimetype string, filename string, data []byte) HTTPResponse {
|
||||
return &downloadDataHTTPResponse{statusCode: status, mimetype: mimetype, data: data, filename: &filename}
|
||||
}
|
56
ginext/responseEmpty.go
Normal file
56
ginext/responseEmpty.go
Normal file
@@ -0,0 +1,56 @@
|
||||
package ginext
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
)
|
||||
|
||||
type emptyHTTPResponse struct {
|
||||
statusCode int
|
||||
headers []headerval
|
||||
cookies []cookieval
|
||||
}
|
||||
|
||||
func (j emptyHTTPResponse) Write(g *gin.Context) {
|
||||
for _, v := range j.headers {
|
||||
g.Header(v.Key, v.Val)
|
||||
}
|
||||
for _, v := range j.cookies {
|
||||
g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
|
||||
}
|
||||
g.Status(j.statusCode)
|
||||
}
|
||||
|
||||
func (j emptyHTTPResponse) WithHeader(k string, v string) HTTPResponse {
|
||||
j.headers = append(j.headers, headerval{k, v})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j emptyHTTPResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
|
||||
j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j emptyHTTPResponse) IsSuccess() bool {
|
||||
return j.statusCode >= 200 && j.statusCode <= 399
|
||||
}
|
||||
|
||||
func (j emptyHTTPResponse) Statuscode() int {
|
||||
return j.statusCode
|
||||
}
|
||||
|
||||
func (j emptyHTTPResponse) BodyString(*gin.Context) *string {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (j emptyHTTPResponse) ContentType() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func (j emptyHTTPResponse) Headers() []string {
|
||||
return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
|
||||
}
|
||||
|
||||
func Status(sc int) HTTPResponse {
|
||||
return &emptyHTTPResponse{statusCode: sc}
|
||||
}
|
73
ginext/responseFile.go
Normal file
73
ginext/responseFile.go
Normal file
@@ -0,0 +1,73 @@
|
||||
package ginext
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/gin-gonic/gin"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
"os"
|
||||
)
|
||||
|
||||
type fileHTTPResponse struct {
|
||||
mimetype string
|
||||
filepath string
|
||||
filename *string
|
||||
headers []headerval
|
||||
cookies []cookieval
|
||||
}
|
||||
|
||||
func (j fileHTTPResponse) Write(g *gin.Context) {
|
||||
g.Header("Content-Type", j.mimetype) // if we don't set it here gin does weird file-sniffing later...
|
||||
if j.filename != nil {
|
||||
g.Header("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", *j.filename))
|
||||
|
||||
}
|
||||
for _, v := range j.headers {
|
||||
g.Header(v.Key, v.Val)
|
||||
}
|
||||
for _, v := range j.cookies {
|
||||
g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
|
||||
}
|
||||
g.File(j.filepath)
|
||||
}
|
||||
|
||||
func (j fileHTTPResponse) WithHeader(k string, v string) HTTPResponse {
|
||||
j.headers = append(j.headers, headerval{k, v})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j fileHTTPResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
|
||||
j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j fileHTTPResponse) IsSuccess() bool {
|
||||
return true
|
||||
}
|
||||
|
||||
func (j fileHTTPResponse) Statuscode() int {
|
||||
return 200
|
||||
}
|
||||
|
||||
func (j fileHTTPResponse) BodyString(*gin.Context) *string {
|
||||
data, err := os.ReadFile(j.filepath)
|
||||
if err != nil {
|
||||
return nil
|
||||
}
|
||||
return langext.Ptr(string(data))
|
||||
}
|
||||
|
||||
func (j fileHTTPResponse) ContentType() string {
|
||||
return j.mimetype
|
||||
}
|
||||
|
||||
func (j fileHTTPResponse) Headers() []string {
|
||||
return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
|
||||
}
|
||||
|
||||
func File(mimetype string, filepath string) HTTPResponse {
|
||||
return &fileHTTPResponse{mimetype: mimetype, filepath: filepath}
|
||||
}
|
||||
|
||||
func Download(mimetype string, filepath string, filename string) HTTPResponse {
|
||||
return &fileHTTPResponse{mimetype: mimetype, filepath: filepath, filename: &filename}
|
||||
}
|
70
ginext/responseJson.go
Normal file
70
ginext/responseJson.go
Normal file
@@ -0,0 +1,70 @@
|
||||
package ginext
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
json "gogs.mikescher.com/BlackForestBytes/goext/gojson"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
)
|
||||
|
||||
type jsonHTTPResponse struct {
|
||||
statusCode int
|
||||
data any
|
||||
headers []headerval
|
||||
cookies []cookieval
|
||||
}
|
||||
|
||||
func (j jsonHTTPResponse) jsonRenderer(g *gin.Context) json.GoJsonRender {
|
||||
var f *string
|
||||
if jsonfilter := g.GetString("goext.jsonfilter"); jsonfilter != "" {
|
||||
f = &jsonfilter
|
||||
}
|
||||
return json.GoJsonRender{Data: j.data, NilSafeSlices: true, NilSafeMaps: true, Filter: f}
|
||||
}
|
||||
|
||||
func (j jsonHTTPResponse) Write(g *gin.Context) {
|
||||
for _, v := range j.headers {
|
||||
g.Header(v.Key, v.Val)
|
||||
}
|
||||
for _, v := range j.cookies {
|
||||
g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
|
||||
}
|
||||
g.Render(j.statusCode, j.jsonRenderer(g))
|
||||
}
|
||||
|
||||
func (j jsonHTTPResponse) WithHeader(k string, v string) HTTPResponse {
|
||||
j.headers = append(j.headers, headerval{k, v})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j jsonHTTPResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
|
||||
j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j jsonHTTPResponse) IsSuccess() bool {
|
||||
return j.statusCode >= 200 && j.statusCode <= 399
|
||||
}
|
||||
|
||||
func (j jsonHTTPResponse) Statuscode() int {
|
||||
return j.statusCode
|
||||
}
|
||||
|
||||
func (j jsonHTTPResponse) BodyString(g *gin.Context) *string {
|
||||
if str, err := j.jsonRenderer(g).RenderString(); err == nil {
|
||||
return &str
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func (j jsonHTTPResponse) ContentType() string {
|
||||
return "application/json"
|
||||
}
|
||||
|
||||
func (j jsonHTTPResponse) Headers() []string {
|
||||
return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
|
||||
}
|
||||
|
||||
func JSON(sc int, data any) HTTPResponse {
|
||||
return &jsonHTTPResponse{statusCode: sc, data: data}
|
||||
}
|
81
ginext/responseJsonAPI.go
Normal file
81
ginext/responseJsonAPI.go
Normal file
@@ -0,0 +1,81 @@
|
||||
package ginext
|
||||
|
||||
import (
|
||||
"context"
|
||||
"github.com/gin-gonic/gin"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/exerr"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
)
|
||||
|
||||
type jsonAPIErrResponse struct {
|
||||
err *exerr.ExErr
|
||||
headers []headerval
|
||||
cookies []cookieval
|
||||
}
|
||||
|
||||
func (j jsonAPIErrResponse) Error() error {
|
||||
return j.err
|
||||
}
|
||||
|
||||
func (j jsonAPIErrResponse) Write(g *gin.Context) {
|
||||
for _, v := range j.headers {
|
||||
g.Header(v.Key, v.Val)
|
||||
}
|
||||
for _, v := range j.cookies {
|
||||
g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
|
||||
}
|
||||
|
||||
exerr.Get(j.err).Output(context.Background(), g)
|
||||
|
||||
j.err.CallListener(exerr.MethodOutput)
|
||||
}
|
||||
|
||||
func (j jsonAPIErrResponse) WithHeader(k string, v string) HTTPResponse {
|
||||
j.headers = append(j.headers, headerval{k, v})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j jsonAPIErrResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
|
||||
j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j jsonAPIErrResponse) IsSuccess() bool {
|
||||
return false
|
||||
}
|
||||
|
||||
func (j jsonAPIErrResponse) Statuscode() int {
|
||||
return langext.Coalesce(j.err.RecursiveStatuscode(), 0)
|
||||
}
|
||||
|
||||
func (j jsonAPIErrResponse) BodyString(*gin.Context) *string {
|
||||
if str, err := j.err.ToDefaultAPIJson(); err == nil {
|
||||
return &str
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func (j jsonAPIErrResponse) ContentType() string {
|
||||
return "application/json"
|
||||
}
|
||||
|
||||
func (j jsonAPIErrResponse) Headers() []string {
|
||||
return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
|
||||
}
|
||||
|
||||
func (j jsonAPIErrResponse) Unwrap() error {
|
||||
return j.err
|
||||
}
|
||||
|
||||
func Error(e error) HTTPResponse {
|
||||
return &jsonAPIErrResponse{
|
||||
err: exerr.FromError(e),
|
||||
}
|
||||
}
|
||||
|
||||
func ErrWrap(e error, errorType exerr.ErrorType, msg string) HTTPResponse {
|
||||
return &jsonAPIErrResponse{
|
||||
err: exerr.FromError(exerr.Wrap(e, msg).WithType(errorType).Build()),
|
||||
}
|
||||
}
|
57
ginext/responseRedirect.go
Normal file
57
ginext/responseRedirect.go
Normal file
@@ -0,0 +1,57 @@
|
||||
package ginext
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
)
|
||||
|
||||
type redirectHTTPResponse struct {
|
||||
statusCode int
|
||||
url string
|
||||
headers []headerval
|
||||
cookies []cookieval
|
||||
}
|
||||
|
||||
func (j redirectHTTPResponse) Write(g *gin.Context) {
|
||||
for _, v := range j.headers {
|
||||
g.Header(v.Key, v.Val)
|
||||
}
|
||||
for _, v := range j.cookies {
|
||||
g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
|
||||
}
|
||||
g.Redirect(j.statusCode, j.url)
|
||||
}
|
||||
|
||||
func (j redirectHTTPResponse) WithHeader(k string, v string) HTTPResponse {
|
||||
j.headers = append(j.headers, headerval{k, v})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j redirectHTTPResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
|
||||
j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j redirectHTTPResponse) IsSuccess() bool {
|
||||
return j.statusCode >= 200 && j.statusCode <= 399
|
||||
}
|
||||
|
||||
func (j redirectHTTPResponse) Statuscode() int {
|
||||
return j.statusCode
|
||||
}
|
||||
|
||||
func (j redirectHTTPResponse) BodyString(*gin.Context) *string {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (j redirectHTTPResponse) ContentType() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func (j redirectHTTPResponse) Headers() []string {
|
||||
return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
|
||||
}
|
||||
|
||||
func Redirect(sc int, newURL string) HTTPResponse {
|
||||
return &redirectHTTPResponse{statusCode: sc, url: newURL}
|
||||
}
|
72
ginext/responseSeekable.go
Normal file
72
ginext/responseSeekable.go
Normal file
@@ -0,0 +1,72 @@
|
||||
package ginext
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/exerr"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
"io"
|
||||
"net/http"
|
||||
"time"
|
||||
)
|
||||
|
||||
type seekableResponse struct {
|
||||
data io.ReadSeeker
|
||||
contentType string
|
||||
filename string
|
||||
headers []headerval
|
||||
cookies []cookieval
|
||||
}
|
||||
|
||||
func (j seekableResponse) Write(g *gin.Context) {
|
||||
g.Header("Content-Type", j.contentType) // if we don't set it here http.ServeContent does weird sniffing later...
|
||||
|
||||
for _, v := range j.headers {
|
||||
g.Header(v.Key, v.Val)
|
||||
}
|
||||
for _, v := range j.cookies {
|
||||
g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
|
||||
}
|
||||
|
||||
http.ServeContent(g.Writer, g.Request, j.filename, time.Unix(0, 0), j.data)
|
||||
|
||||
if clsr, ok := j.data.(io.ReadSeekCloser); ok {
|
||||
err := clsr.Close()
|
||||
if err != nil {
|
||||
exerr.Wrap(err, "failed to close io.ReadSeerkClose in ginext.Seekable").Str("filename", j.filename).Print()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (j seekableResponse) WithHeader(k string, v string) HTTPResponse {
|
||||
j.headers = append(j.headers, headerval{k, v})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j seekableResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
|
||||
j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j seekableResponse) IsSuccess() bool {
|
||||
return true
|
||||
}
|
||||
|
||||
func (j seekableResponse) Statuscode() int {
|
||||
return 200
|
||||
}
|
||||
|
||||
func (j seekableResponse) BodyString(*gin.Context) *string {
|
||||
return langext.Ptr("(seekable)")
|
||||
}
|
||||
|
||||
func (j seekableResponse) ContentType() string {
|
||||
return j.contentType
|
||||
}
|
||||
|
||||
func (j seekableResponse) Headers() []string {
|
||||
return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
|
||||
}
|
||||
|
||||
func Seekable(filename string, contentType string, data io.ReadSeeker) HTTPResponse {
|
||||
return &seekableResponse{filename: filename, contentType: contentType, data: data}
|
||||
}
|
57
ginext/responseText.go
Normal file
57
ginext/responseText.go
Normal file
@@ -0,0 +1,57 @@
|
||||
package ginext
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
)
|
||||
|
||||
type textHTTPResponse struct {
|
||||
statusCode int
|
||||
data string
|
||||
headers []headerval
|
||||
cookies []cookieval
|
||||
}
|
||||
|
||||
func (j textHTTPResponse) Write(g *gin.Context) {
|
||||
for _, v := range j.headers {
|
||||
g.Header(v.Key, v.Val)
|
||||
}
|
||||
for _, v := range j.cookies {
|
||||
g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
|
||||
}
|
||||
g.String(j.statusCode, "%s", j.data)
|
||||
}
|
||||
|
||||
func (j textHTTPResponse) WithHeader(k string, v string) HTTPResponse {
|
||||
j.headers = append(j.headers, headerval{k, v})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j textHTTPResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
|
||||
j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
|
||||
return j
|
||||
}
|
||||
|
||||
func (j textHTTPResponse) IsSuccess() bool {
|
||||
return j.statusCode >= 200 && j.statusCode <= 399
|
||||
}
|
||||
|
||||
func (j textHTTPResponse) Statuscode() int {
|
||||
return j.statusCode
|
||||
}
|
||||
|
||||
func (j textHTTPResponse) BodyString(*gin.Context) *string {
|
||||
return langext.Ptr(j.data)
|
||||
}
|
||||
|
||||
func (j textHTTPResponse) ContentType() string {
|
||||
return "text/plain"
|
||||
}
|
||||
|
||||
func (j textHTTPResponse) Headers() []string {
|
||||
return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
|
||||
}
|
||||
|
||||
func Text(sc int, data string) HTTPResponse {
|
||||
return &textHTTPResponse{statusCode: sc, data: data}
|
||||
}
|
30
go.mod
30
go.mod
@@ -7,11 +7,11 @@ require (
|
||||
github.com/glebarez/go-sqlite v1.22.0 // only needed for tests -.-
|
||||
github.com/jmoiron/sqlx v1.4.0
|
||||
github.com/rs/xid v1.5.0
|
||||
github.com/rs/zerolog v1.32.0
|
||||
go.mongodb.org/mongo-driver v1.15.0
|
||||
golang.org/x/crypto v0.23.0
|
||||
golang.org/x/sys v0.20.0
|
||||
golang.org/x/term v0.20.0
|
||||
github.com/rs/zerolog v1.33.0
|
||||
go.mongodb.org/mongo-driver v1.16.0
|
||||
golang.org/x/crypto v0.25.0
|
||||
golang.org/x/sys v0.22.0
|
||||
golang.org/x/term v0.22.0
|
||||
)
|
||||
|
||||
require (
|
||||
@@ -21,24 +21,24 @@ require (
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/bytedance/sonic v1.11.6 // indirect
|
||||
github.com/bytedance/sonic v1.11.9 // indirect
|
||||
github.com/bytedance/sonic/loader v0.1.1 // indirect
|
||||
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
|
||||
github.com/chenzhuoyu/iasm v0.9.1 // indirect
|
||||
github.com/cloudwego/base64x v0.1.4 // indirect
|
||||
github.com/cloudwego/iasm v0.2.0 // indirect
|
||||
github.com/dustin/go-humanize v1.0.1 // indirect
|
||||
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
|
||||
github.com/gabriel-vasile/mimetype v1.4.4 // indirect
|
||||
github.com/gin-contrib/sse v0.1.0 // indirect
|
||||
github.com/go-playground/locales v0.14.1 // indirect
|
||||
github.com/go-playground/universal-translator v0.18.1 // indirect
|
||||
github.com/go-playground/validator/v10 v10.20.0 // indirect
|
||||
github.com/goccy/go-json v0.10.2 // indirect
|
||||
github.com/go-playground/validator/v10 v10.22.0 // indirect
|
||||
github.com/goccy/go-json v0.10.3 // indirect
|
||||
github.com/golang/snappy v0.0.4 // indirect
|
||||
github.com/google/uuid v1.5.0 // indirect
|
||||
github.com/json-iterator/go v1.1.12 // indirect
|
||||
github.com/klauspost/compress v1.17.8 // indirect
|
||||
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
|
||||
github.com/klauspost/compress v1.17.9 // indirect
|
||||
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
|
||||
github.com/leodido/go-urn v1.4.0 // indirect
|
||||
github.com/mattn/go-colorable v0.1.13 // indirect
|
||||
github.com/mattn/go-isatty v0.0.20 // indirect
|
||||
@@ -54,10 +54,10 @@ require (
|
||||
github.com/xdg-go/stringprep v1.0.4 // indirect
|
||||
github.com/youmark/pkcs8 v0.0.0-20240424034433-3c2c7870ae76 // indirect
|
||||
golang.org/x/arch v0.8.0 // indirect
|
||||
golang.org/x/image v0.16.0 // indirect
|
||||
golang.org/x/net v0.25.0 // indirect
|
||||
golang.org/x/text v0.15.0 // indirect
|
||||
google.golang.org/protobuf v1.34.1 // indirect
|
||||
golang.org/x/image v0.18.0 // indirect
|
||||
golang.org/x/net v0.27.0 // indirect
|
||||
golang.org/x/text v0.16.0 // indirect
|
||||
google.golang.org/protobuf v1.34.2 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
modernc.org/libc v1.37.6 // indirect
|
||||
modernc.org/mathutil v1.6.0 // indirect
|
||||
|
48
go.sum
48
go.sum
@@ -18,6 +18,12 @@ github.com/bytedance/sonic v1.11.5 h1:G00FYjjqll5iQ1PYXynbg/hyzqBqavH8Mo9/oTopd9
|
||||
github.com/bytedance/sonic v1.11.5/go.mod h1:X2PC2giUdj/Cv2lliWFLk6c/DUQok5rViJSemeB0wDw=
|
||||
github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0=
|
||||
github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
|
||||
github.com/bytedance/sonic v1.11.7 h1:k/l9p1hZpNIMJSk37wL9ltkcpqLfIho1vYthi4xT2t4=
|
||||
github.com/bytedance/sonic v1.11.7/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
|
||||
github.com/bytedance/sonic v1.11.8 h1:Zw/j1KfiS+OYTi9lyB3bb0CFxPJVkM17k1wyDG32LRA=
|
||||
github.com/bytedance/sonic v1.11.8/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
|
||||
github.com/bytedance/sonic v1.11.9 h1:LFHENlIY/SLzDWverzdOvgMztTxcfcF+cqNsz9pK5zg=
|
||||
github.com/bytedance/sonic v1.11.9/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
|
||||
github.com/bytedance/sonic/loader v0.1.0/go.mod h1:UmRT+IRTGKz/DAkzcEGzyVqQFJ7H9BqwBO3pm9H/+HY=
|
||||
github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM=
|
||||
github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
|
||||
@@ -49,6 +55,8 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
|
||||
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
|
||||
github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
|
||||
github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
|
||||
github.com/gabriel-vasile/mimetype v1.4.4 h1:QjV6pZ7/XZ7ryI2KuyeEDE8wnh7fHP9YnQy+R0LnH8I=
|
||||
github.com/gabriel-vasile/mimetype v1.4.4/go.mod h1:JwLei5XPtWdGiMFB5Pjle1oEeoSeEuJfJE+TtfvdB/s=
|
||||
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
|
||||
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
|
||||
github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
|
||||
@@ -73,12 +81,18 @@ github.com/go-playground/validator/v10 v10.19.0 h1:ol+5Fu+cSq9JD7SoSqe04GMI92cbn
|
||||
github.com/go-playground/validator/v10 v10.19.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
|
||||
github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8=
|
||||
github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
|
||||
github.com/go-playground/validator/v10 v10.21.0 h1:4fZA11ovvtkdgaeev9RGWPgc1uj3H8W+rNYyH/ySBb0=
|
||||
github.com/go-playground/validator/v10 v10.21.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
|
||||
github.com/go-playground/validator/v10 v10.22.0 h1:k6HsTZ0sTnROkhS//R0O+55JgM8C4Bx7ia+JlgcnOao=
|
||||
github.com/go-playground/validator/v10 v10.22.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
|
||||
github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
|
||||
github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
|
||||
github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
|
||||
github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
|
||||
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
|
||||
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
|
||||
github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
|
||||
github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
|
||||
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
||||
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
||||
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
|
||||
@@ -110,11 +124,15 @@ github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLA
|
||||
github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
|
||||
github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
|
||||
github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
|
||||
github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
|
||||
github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
|
||||
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
|
||||
github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc=
|
||||
github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
|
||||
github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
|
||||
github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
|
||||
github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
|
||||
github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
|
||||
github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
|
||||
github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
|
||||
github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
|
||||
@@ -162,6 +180,8 @@ github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A=
|
||||
github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
|
||||
github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0=
|
||||
github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
|
||||
github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
|
||||
github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
|
||||
github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
||||
@@ -200,6 +220,10 @@ go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd
|
||||
go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
|
||||
go.mongodb.org/mongo-driver v1.15.0 h1:rJCKC8eEliewXjZGf0ddURtl7tTVy1TK3bfl0gkUSLc=
|
||||
go.mongodb.org/mongo-driver v1.15.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
|
||||
go.mongodb.org/mongo-driver v1.15.1 h1:l+RvoUOoMXFmADTLfYDm7On9dRm7p4T80/lEQM+r7HU=
|
||||
go.mongodb.org/mongo-driver v1.15.1/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
|
||||
go.mongodb.org/mongo-driver v1.16.0 h1:tpRsfBJMROVHKpdGyc1BBEzzjDUWjItxbVSZ8Ls4BQ4=
|
||||
go.mongodb.org/mongo-driver v1.16.0/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw=
|
||||
golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
|
||||
golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc=
|
||||
golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
|
||||
@@ -223,11 +247,19 @@ golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
|
||||
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
|
||||
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
|
||||
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
|
||||
golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
|
||||
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
|
||||
golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
|
||||
golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
|
||||
golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
||||
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U=
|
||||
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
||||
golang.org/x/image v0.16.0 h1:9kloLAKhUufZhA12l5fwnx2NZW39/we1UhBesW433jw=
|
||||
golang.org/x/image v0.16.0/go.mod h1:ugSZItdV4nOxyqp56HmXwH0Ry0nBCpjnZdpDaIHdoPs=
|
||||
golang.org/x/image v0.17.0 h1:nTRVVdajgB8zCMZVsViyzhnMKPwYeroEERRC64JuLco=
|
||||
golang.org/x/image v0.17.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
|
||||
golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
|
||||
golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
|
||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
@@ -246,6 +278,10 @@ golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
|
||||
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
|
||||
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
|
||||
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
|
||||
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
|
||||
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
|
||||
golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
|
||||
golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
|
||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
|
||||
@@ -273,6 +309,10 @@ golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
|
||||
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
|
||||
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
|
||||
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
|
||||
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||
golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
|
||||
@@ -285,6 +325,10 @@ golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
|
||||
golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
|
||||
golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
|
||||
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
|
||||
golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
|
||||
golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
|
||||
golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
|
||||
golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
@@ -295,6 +339,8 @@ golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
|
||||
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
||||
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
|
||||
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
||||
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
|
||||
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
|
||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
||||
@@ -310,6 +356,8 @@ google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH
|
||||
google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
|
||||
google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
|
||||
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
|
||||
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
|
||||
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
|
@@ -1,5 +1,5 @@
|
||||
package goext
|
||||
|
||||
const GoextVersion = "0.0.460"
|
||||
const GoextVersion = "0.0.488"
|
||||
|
||||
const GoextVersionTimestamp = "2024-05-20T00:38:04+0200"
|
||||
const GoextVersionTimestamp = "2024-07-22T15:16:28+0200"
|
||||
|
@@ -474,6 +474,17 @@ func ArrAppend[T any](arr []T, add ...T) []T {
|
||||
return r
|
||||
}
|
||||
|
||||
// ArrPrepend works similar to append(x, y, z) - but doe snot touch the old array and creates a new one
|
||||
// Also - in contrast to ArrAppend - the add values are inserted at the start of the resulting array (in reverse order)
|
||||
func ArrPrepend[T any](arr []T, add ...T) []T {
|
||||
out := make([]T, len(arr)+len(add))
|
||||
copy(out[len(add):], arr)
|
||||
for i := 0; i < len(add); i++ {
|
||||
out[len(add)-i-1] = add[i]
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// ArrCopy does a shallow copy of the 'in' array
|
||||
func ArrCopy[T any](in []T) []T {
|
||||
out := make([]T, len(in))
|
||||
@@ -553,3 +564,18 @@ func ArrChunk[T any](arr []T, chunkSize int) [][]T {
|
||||
|
||||
return res
|
||||
}
|
||||
|
||||
func ArrGroupBy[T1 any, T2 comparable](arr []T1, groupfunc func(v T1) T2) map[T2][]T1 {
|
||||
r := make(map[T2][]T1)
|
||||
|
||||
for _, v := range arr {
|
||||
key := groupfunc(v)
|
||||
if _, ok := r[key]; ok {
|
||||
r[key] = append(r[key], v)
|
||||
} else {
|
||||
r[key] = []T1{v}
|
||||
}
|
||||
}
|
||||
|
||||
return r
|
||||
}
|
||||
|
@@ -2,6 +2,7 @@ package langext
|
||||
|
||||
import (
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/tst"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
@@ -10,3 +11,13 @@ func TestJoinString(t *testing.T) {
|
||||
res := JoinString(ids, ",")
|
||||
tst.AssertEqual(t, res, "1,2,3")
|
||||
}
|
||||
|
||||
func TestArrPrepend(t *testing.T) {
|
||||
v1 := []string{"1", "2", "3"}
|
||||
|
||||
v2 := ArrPrepend(v1, "4", "5", "6")
|
||||
|
||||
tst.AssertEqual(t, strings.Join(v1, ""), "123")
|
||||
tst.AssertEqual(t, strings.Join(v2, ""), "654123")
|
||||
|
||||
}
|
||||
|
@@ -77,6 +77,14 @@ func Coalesce4Opt[T any](v1 *T, v2 *T, v3 *T, v4 *T) *T {
|
||||
return v4
|
||||
}
|
||||
|
||||
func CoalesceDblPtr[T any](v1 **T, v2 *T) *T {
|
||||
if v1 != nil {
|
||||
return *v1
|
||||
}
|
||||
|
||||
return v2
|
||||
}
|
||||
|
||||
func CoalesceString(s *string, def string) string {
|
||||
if s == nil {
|
||||
return def
|
||||
|
@@ -22,6 +22,13 @@ func DblPtr[T any](v T) **T {
|
||||
return &v_
|
||||
}
|
||||
|
||||
func DblPtrIfNotNil[T any](v *T) **T {
|
||||
if v == nil {
|
||||
return nil
|
||||
}
|
||||
return &v
|
||||
}
|
||||
|
||||
func DblPtrNil[T any]() **T {
|
||||
var v *T = nil
|
||||
return &v
|
||||
|
@@ -88,12 +88,15 @@ func StrRunePadRight(str string, pad string, padlen int) string {
|
||||
|
||||
func Indent(str string, pad string) string {
|
||||
eonl := strings.HasSuffix(str, "\n")
|
||||
if eonl {
|
||||
str = str[0 : len(str)-1]
|
||||
}
|
||||
r := ""
|
||||
for _, v := range strings.Split(str, "\n") {
|
||||
r += pad + v + "\n"
|
||||
}
|
||||
|
||||
if eonl {
|
||||
if !eonl {
|
||||
r = r[0 : len(r)-1]
|
||||
}
|
||||
|
||||
@@ -115,3 +118,21 @@ func StrRepeat(val string, count int) string {
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
func StrWrap(val string, linelen int, seperator string) string {
|
||||
res := ""
|
||||
|
||||
for iPos := 0; ; {
|
||||
next := min(iPos+linelen, len(val))
|
||||
res += val[iPos:next]
|
||||
|
||||
iPos = next
|
||||
if iPos >= len(val) {
|
||||
break
|
||||
}
|
||||
|
||||
res += seperator
|
||||
}
|
||||
|
||||
return res
|
||||
}
|
||||
|
152
langext/string_test.go
Normal file
152
langext/string_test.go
Normal file
@@ -0,0 +1,152 @@
|
||||
package langext
|
||||
|
||||
import "testing"
|
||||
|
||||
func TestStrLimitBehaviour(t *testing.T) {
|
||||
val := "Hello, World!"
|
||||
maxlen := 5
|
||||
suffix := "..."
|
||||
expected := "He..."
|
||||
result := StrLimit(val, maxlen, suffix)
|
||||
if result != expected {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestStrSplitBehaviour1(t *testing.T) {
|
||||
val := "Hello,World,,"
|
||||
sep := ","
|
||||
expected := []string{"Hello", "World"}
|
||||
result := StrSplit(val, sep, false)
|
||||
if len(result) != len(expected) {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestStrSplitBehaviour2(t *testing.T) {
|
||||
val := "Hello,World,,"
|
||||
sep := ","
|
||||
expected := []string{"Hello", "World", "", ""}
|
||||
result := StrSplit(val, sep, true)
|
||||
if len(result) != len(expected) {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestStrPadRightBehaviour(t *testing.T) {
|
||||
str := "Hello"
|
||||
pad := "*"
|
||||
padlen := 10
|
||||
expected := "Hello*****"
|
||||
result := StrPadRight(str, pad, padlen)
|
||||
if result != expected {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestStrPadLeftBehaviour(t *testing.T) {
|
||||
str := "Hello"
|
||||
pad := "*"
|
||||
padlen := 10
|
||||
expected := "*****Hello"
|
||||
result := StrPadLeft(str, pad, padlen)
|
||||
if result != expected {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestStrRunePadLeftBehaviour(t *testing.T) {
|
||||
str := "Hello"
|
||||
pad := "*"
|
||||
padlen := 10
|
||||
expected := "*****Hello"
|
||||
result := StrRunePadLeft(str, pad, padlen)
|
||||
if result != expected {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestStrRunePadRightBehaviour(t *testing.T) {
|
||||
str := "Hello"
|
||||
pad := "*"
|
||||
padlen := 10
|
||||
expected := "Hello*****"
|
||||
result := StrRunePadRight(str, pad, padlen)
|
||||
if result != expected {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestIndentBehaviour1(t *testing.T) {
|
||||
str := "Hello\nWorld"
|
||||
pad := ".."
|
||||
expected := "..Hello\n..World"
|
||||
result := Indent(str, pad)
|
||||
if result != expected {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestIndentBehaviour2(t *testing.T) {
|
||||
str := "Hello\nWorld\n"
|
||||
pad := ".."
|
||||
expected := "..Hello\n..World\n"
|
||||
result := Indent(str, pad)
|
||||
if result != expected {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestStrRepeatBehaviour(t *testing.T) {
|
||||
val := "Hello"
|
||||
count := 3
|
||||
expected := "HelloHelloHello"
|
||||
result := StrRepeat(val, count)
|
||||
if result != expected {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestStrWrapBehaviour1(t *testing.T) {
|
||||
val := "123456789"
|
||||
linelen := 5
|
||||
seperator := "\n"
|
||||
expected := "12345\n6789"
|
||||
result := StrWrap(val, linelen, seperator)
|
||||
if result != expected {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestStrWrapBehaviour2(t *testing.T) {
|
||||
val := "1234567890"
|
||||
linelen := 5
|
||||
seperator := "\n"
|
||||
expected := "12345\n67890"
|
||||
result := StrWrap(val, linelen, seperator)
|
||||
if result != expected {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestStrWrapBehaviour3(t *testing.T) {
|
||||
val := "****************"
|
||||
linelen := 4
|
||||
seperator := "\n"
|
||||
expected := "****\n****\n****\n****"
|
||||
result := StrWrap(val, linelen, seperator)
|
||||
if result != expected {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestStrWrapBehaviour4(t *testing.T) {
|
||||
val := "*****************"
|
||||
linelen := 4
|
||||
seperator := "\n"
|
||||
expected := "****\n****\n****\n****\n*"
|
||||
result := StrWrap(val, linelen, seperator)
|
||||
if result != expected {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
@@ -1,6 +1,9 @@
|
||||
package mathext
|
||||
|
||||
import "gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
import (
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/exerr"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
)
|
||||
|
||||
func Sum[T langext.NumberConstraint](v []T) T {
|
||||
total := T(0)
|
||||
@@ -41,3 +44,53 @@ func ArrMax[T langext.OrderedConstraint](v []T) T {
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
func MustPercentile[T langext.NumberConstraint](rawdata []T, percentile float64) T {
|
||||
v, err := Percentile(rawdata, percentile)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
return v
|
||||
}
|
||||
|
||||
func Percentile[T langext.NumberConstraint](rawdata []T, percentile float64) (T, error) {
|
||||
v, err := FloatPercentile(rawdata, percentile)
|
||||
if err != nil {
|
||||
return T(0), err
|
||||
}
|
||||
return T(v), nil
|
||||
|
||||
}
|
||||
|
||||
func FloatPercentile[T langext.NumberConstraint](rawdata []T, percentile float64) (float64, error) {
|
||||
if len(rawdata) == 0 {
|
||||
return 0, exerr.New(exerr.TypeAssert, "no data to calculate percentile").Any("percentile", percentile).Build()
|
||||
}
|
||||
|
||||
if percentile < 0 || percentile > 100 {
|
||||
return 0, exerr.New(exerr.TypeAssert, "percentile out of range").Any("percentile", percentile).Build()
|
||||
}
|
||||
|
||||
data := langext.ArrCopy(rawdata)
|
||||
langext.Sort(data)
|
||||
|
||||
idxFloat := float64(len(data)-1) * (percentile / float64(100))
|
||||
|
||||
idxInt := int(idxFloat)
|
||||
|
||||
// exact match on index
|
||||
if idxFloat == float64(idxInt) {
|
||||
return float64(data[idxInt]), nil
|
||||
}
|
||||
|
||||
// linear interpolation
|
||||
v1 := data[idxInt]
|
||||
v2 := data[idxInt+1]
|
||||
|
||||
weight := idxFloat - float64(idxInt)
|
||||
|
||||
valFloat := (float64(v1) * (1 - weight)) + (float64(v2) * weight)
|
||||
|
||||
return valFloat, nil
|
||||
|
||||
}
|
||||
|
238
mathext/statistics_test.go
Normal file
238
mathext/statistics_test.go
Normal file
@@ -0,0 +1,238 @@
|
||||
package mathext
|
||||
|
||||
import (
|
||||
"math"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestSumIntsHappyPath(t *testing.T) {
|
||||
values := []int{1, 2, 3, 4, 5}
|
||||
expected := 15
|
||||
result := Sum(values)
|
||||
if result != expected {
|
||||
t.Errorf("Sum of %v; expected %v, got %v", values, expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSumFloatsHappyPath(t *testing.T) {
|
||||
values := []float64{1.1, 2.2, 3.3}
|
||||
expected := 6.6
|
||||
result := Sum(values)
|
||||
if result != expected {
|
||||
t.Errorf("Sum of %v; expected %v, got %v", values, expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMeanOfInts(t *testing.T) {
|
||||
values := []float64{1, 2, 3, 4, 5}
|
||||
expected := 3.0
|
||||
result := Mean(values)
|
||||
if result != expected {
|
||||
t.Errorf("Mean of %v; expected %v, got %v", values, expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMedianOddNumberOfElements(t *testing.T) {
|
||||
values := []float64{1, 2, 3, 4, 5}
|
||||
expected := 3.0
|
||||
result := Median(values)
|
||||
if result != expected {
|
||||
t.Errorf("Median of %v; expected %v, got %v", values, expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMedianEvenNumberOfElements(t *testing.T) {
|
||||
values := []float64{1, 2, 3, 4, 5, 6}
|
||||
expected := 3.5
|
||||
result := Median(values)
|
||||
if result != expected {
|
||||
t.Errorf("Median of %v; expected %v, got %v", values, expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestArrMinInts(t *testing.T) {
|
||||
values := []int{5, 3, 9, 1, 4}
|
||||
expected := 1
|
||||
result := ArrMin(values)
|
||||
if result != expected {
|
||||
t.Errorf("ArrMin of %v; expected %v, got %v", values, expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestArrMaxInts(t *testing.T) {
|
||||
values := []int{5, 3, 9, 1, 4}
|
||||
expected := 9
|
||||
result := ArrMax(values)
|
||||
if result != expected {
|
||||
t.Errorf("ArrMax of %v; expected %v, got %v", values, expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPercentileValidInput(t *testing.T) {
|
||||
values := []int{1, 2, 3, 4, 5}
|
||||
percentile := 50.0
|
||||
expected := 3
|
||||
result, err := Percentile(values, percentile)
|
||||
if err != nil || result != expected {
|
||||
t.Errorf("Percentile %v of %v; expected %v, got %v, err: %v", percentile, values, expected, result, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPercentileOutOfRange(t *testing.T) {
|
||||
values := []int{1, 2, 3, 4, 5}
|
||||
percentile := 150.0
|
||||
_, err := Percentile(values, percentile)
|
||||
if err == nil {
|
||||
t.Errorf("Expected error for percentile %v out of range, got nil", percentile)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPercentileValueInArray(t *testing.T) {
|
||||
values := []int{1, 3, 5, 7, 9}
|
||||
percentile := 40.0
|
||||
expected := 4
|
||||
result, err := Percentile(values, percentile)
|
||||
if err != nil || result != expected {
|
||||
t.Errorf("Percentile %v of %v; expected %v, got %v, err: %v", percentile, values, expected, result, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFloatPercentileValueInArray(t *testing.T) {
|
||||
values := []int{1, 3, 5, 7, 9}
|
||||
percentile := 40.0
|
||||
expected := 4.2
|
||||
result, err := FloatPercentile(values, percentile)
|
||||
if err != nil || result != expected {
|
||||
t.Errorf("Percentile %v of %v; expected %v, got %v, err: %v", percentile, values, expected, result, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPercentileInterpolation(t *testing.T) {
|
||||
values := []float64{1.0, 2.0, 3.0, 4.0, 5.0}
|
||||
percentile := 25.0
|
||||
expected := 2.0
|
||||
result, err := Percentile(values, percentile)
|
||||
if err != nil || result != expected {
|
||||
t.Errorf("Percentile %v of %v; expected %v, got %v, err: %v", percentile, values, expected, result, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPercentileSingleValue(t *testing.T) {
|
||||
values := []int{10}
|
||||
percentile := 50.0
|
||||
expected := 10
|
||||
result, err := Percentile(values, percentile)
|
||||
if err != nil || result != expected {
|
||||
t.Errorf("Percentile %v of %v; expected %v, got %v, err: %v", percentile, values, expected, result, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPercentileExactlyBetweenTwoValues(t *testing.T) {
|
||||
values := []float64{1, 2, 3, 4, 5}
|
||||
percentile := 62.5 // Exactly between 3 and 4
|
||||
expected := 3.5
|
||||
result, err := FloatPercentile(values, percentile)
|
||||
if err != nil || result != expected {
|
||||
t.Errorf("Percentile %v of %v; expected %v, got %v, err: %v", percentile, values, expected, result, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPercentileTwoThirdsBetweenTwoValues(t *testing.T) {
|
||||
values := []float64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}
|
||||
percentile := 66.666666666666
|
||||
expected := 6.666666666666667 // Since 2/3 of the way between 6 and 7 is 6.666...
|
||||
result, err := Percentile(values, percentile)
|
||||
if err != nil || math.Abs(result-expected) > 1e-9 {
|
||||
t.Errorf("Percentile %v of %v; expected %v, got %v, err: %v", percentile, values, expected, result, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPercentileBetweenTwoValues1(t *testing.T) {
|
||||
values := []float64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}
|
||||
percentile := 11.0
|
||||
expected := 1.1
|
||||
result, err := Percentile(values, percentile)
|
||||
if err != nil || math.Abs(result-expected) > 1e-9 {
|
||||
t.Errorf("Percentile %v of %v; expected %v, got %v, err: %v", percentile, values, expected, result, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPercentileBetweenTwoValues2(t *testing.T) {
|
||||
values := []float64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}
|
||||
percentile := 9.0
|
||||
expected := 0.9
|
||||
result, err := Percentile(values, percentile)
|
||||
if err != nil || math.Abs(result-expected) > 1e-9 {
|
||||
t.Errorf("Percentile %v of %v; expected %v, got %v, err: %v", percentile, values, expected, result, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPercentileUnsortedInput(t *testing.T) {
|
||||
values := []float64{5, 1, 4, 2, 3} // Unsorted input
|
||||
percentile := 50.0
|
||||
expected := 3.0
|
||||
result, err := Percentile(values, percentile)
|
||||
if err != nil || result != expected {
|
||||
t.Errorf("Percentile %v of %v; expected %v, got %v, err: %v", percentile, values, expected, result, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPercentileUnsortedInputLowPercentile(t *testing.T) {
|
||||
values := []float64{10, 6, 7, 3, 2, 9, 8, 1, 4, 5} // Unsorted input
|
||||
percentile := 10.0
|
||||
expected := 1.9 // Expecting interpolation between 1 and 2
|
||||
result, err := Percentile(values, percentile)
|
||||
if err != nil || result != expected {
|
||||
t.Errorf("Percentile %v of %v; expected %v, got %v, err: %v", percentile, values, expected, result, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPercentileUnsortedInputHighPercentile(t *testing.T) {
|
||||
values := []float64{10, 6, 7, 3, 2, 9, 8, 1, 4, 5} // Unsorted input
|
||||
percentile := 90.0
|
||||
expected := 9.1 // Expecting interpolation between 9 and 10
|
||||
result, err := Percentile(values, percentile)
|
||||
if err != nil || result != expected {
|
||||
t.Errorf("Percentile %v of %v; expected %v, got %v, err: %v", percentile, values, expected, result, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFloatPercentileExactValueFromInput(t *testing.T) {
|
||||
values := []float64{1.5, 2.5, 3.5, 4.5, 5.5}
|
||||
percentile := 50.0 // Exact value from input array should be 3.5
|
||||
expected := 3.5
|
||||
result, err := FloatPercentile(values, percentile)
|
||||
if err != nil || result != expected {
|
||||
t.Errorf("FloatPercentile %v of %v; expected %v, got %v, err: %v", percentile, values, expected, result, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFloatPercentileInterpolatedValue(t *testing.T) {
|
||||
values := []float64{1.0, 2.0, 3.0, 4.0, 5.0}
|
||||
percentile := 87.5 // Interpolated value between 4.0 and 5.0
|
||||
expected := 4.5
|
||||
result, err := FloatPercentile(values, percentile)
|
||||
if err != nil || result != expected {
|
||||
t.Errorf("FloatPercentile %v of %v; expected %v, got %v, err: %v", percentile, values, expected, result, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFloatPercentileUnsortedInputExactValue(t *testing.T) {
|
||||
values := []float64{5.5, 1.5, 4.5, 2.5, 3.5} // Unsorted input
|
||||
percentile := 50.0
|
||||
expected := 3.5
|
||||
result, err := FloatPercentile(values, percentile)
|
||||
if err != nil || result != expected {
|
||||
t.Errorf("FloatPercentile %v of %v; expected %v, got %v, err: %v", percentile, values, expected, result, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFloatPercentileUnsortedInputInterpolatedValue(t *testing.T) {
|
||||
values := []float64{10.5, 6.5, 7.5, 3.5, 2.5, 9.5, 8.5, 1.5, 4.5, 5.5}
|
||||
percentile := 80.0 // Interpolated value between 4.0 and 5.0
|
||||
expected := 8.7
|
||||
result, err := FloatPercentile(values, percentile)
|
||||
if err != nil || math.Abs(result-expected) > 1e-9 {
|
||||
t.Errorf("FloatPercentile %v of %v; expected %v, got %v, err: %v", percentile, values, expected, result, err)
|
||||
}
|
||||
}
|
@@ -1,13 +1,14 @@
|
||||
package pagination
|
||||
|
||||
import (
|
||||
"context"
|
||||
"go.mongodb.org/mongo-driver/bson"
|
||||
"go.mongodb.org/mongo-driver/mongo"
|
||||
)
|
||||
|
||||
type MongoFilter interface {
|
||||
FilterQuery() mongo.Pipeline
|
||||
Sort() bson.D
|
||||
FilterQuery(ctx context.Context) mongo.Pipeline
|
||||
Sort(ctx context.Context) bson.D
|
||||
}
|
||||
|
||||
type dynamicFilter struct {
|
||||
@@ -15,11 +16,11 @@ type dynamicFilter struct {
|
||||
sort bson.D
|
||||
}
|
||||
|
||||
func (d dynamicFilter) FilterQuery() mongo.Pipeline {
|
||||
func (d dynamicFilter) FilterQuery(ctx context.Context) mongo.Pipeline {
|
||||
return d.pipeline
|
||||
}
|
||||
|
||||
func (d dynamicFilter) Sort() bson.D {
|
||||
func (d dynamicFilter) Sort(ctx context.Context) bson.D {
|
||||
return d.sort
|
||||
}
|
||||
|
||||
|
185
reflectext/structAccess.go
Normal file
185
reflectext/structAccess.go
Normal file
@@ -0,0 +1,185 @@
|
||||
package reflectext
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
"reflect"
|
||||
"strconv"
|
||||
"strings"
|
||||
)
|
||||
|
||||
var ErrAccessStructInvalidFieldType = errors.New("invalid field type")
|
||||
var ErrAccessStructFieldInPathWasNil = errors.New("a field in the path was nil")
|
||||
var ErrAccessStructInvalidArrayIndex = errors.New("invalid array index")
|
||||
var ErrAccessStructInvalidMapKey = errors.New("invalid map key")
|
||||
var ErrAccessStructArrayAccess = errors.New("trying to access array")
|
||||
var ErrAccessStructMapAccess = errors.New("trying to access map")
|
||||
var ErrAccessStructMissingField = errors.New("missing field")
|
||||
|
||||
type AccessStructOpt struct {
|
||||
ReturnNilOnMissingFields bool // return nil (instead of error) when a field in the path is missing (aka the supplied path is wrong)
|
||||
ReturnNilOnNilPtrFields bool // return nil (instead of error) when a field in the path is nil
|
||||
ReturnNilOnWrongFinalFieldType bool // return nil (instead of error) when the (final) field is not of the requested generic type
|
||||
ReturnNilOnWrongIntermedFieldType bool // return nil (instead of error) when the intermediate field has an invalid type
|
||||
ReturnNilOnInvalidArrayIndizes bool // return nil (instead of error) when trying to acces an array with an invalid index (not a number or out of range)
|
||||
ReturnNilOnMissingMapKeys bool // return nil (instead of error) when trying to access a map with a missing key
|
||||
UsedTagForKeys *string // Use this tag for key names in the struct (instead of the StructField.Name)
|
||||
PreventArrayAccess bool // do not access array indizes - throw an error instead
|
||||
PreventMapAccess bool // do not access maps - throw an error instead
|
||||
}
|
||||
|
||||
func AccessJSONStruct[TResult any](v any, path string) (TResult, error) {
|
||||
return AccessStructByStringPath[TResult](v, path, AccessStructOpt{UsedTagForKeys: langext.Ptr("json")})
|
||||
}
|
||||
|
||||
func AccessStruct[TResult any](v any, path string) (TResult, error) {
|
||||
return AccessStructByStringPath[TResult](v, path, AccessStructOpt{})
|
||||
}
|
||||
|
||||
func AccessStructByArrayPath[TResult any](v any, path []string, opts ...AccessStructOpt) (TResult, error) {
|
||||
opt := AccessStructOpt{}
|
||||
if len(opts) > 0 {
|
||||
opt = opts[0]
|
||||
}
|
||||
|
||||
resultVal, err := accessStructByPath(reflect.ValueOf(v), path, opt)
|
||||
if err != nil {
|
||||
return *new(TResult), err
|
||||
}
|
||||
|
||||
if resultValCast, ok := resultVal.(TResult); ok {
|
||||
return resultValCast, nil
|
||||
} else if opt.ReturnNilOnWrongFinalFieldType {
|
||||
return *new(TResult), nil
|
||||
} else {
|
||||
return *new(TResult), ErrAccessStructInvalidFieldType
|
||||
}
|
||||
}
|
||||
|
||||
func AccessStructByStringPath[TResult any](v any, path string, opts ...AccessStructOpt) (TResult, error) {
|
||||
opt := AccessStructOpt{}
|
||||
if len(opts) > 0 {
|
||||
opt = opts[0]
|
||||
}
|
||||
arrpath := strings.Split(path, ".")
|
||||
|
||||
resultVal, err := accessStructByPath(reflect.ValueOf(v), arrpath, opt)
|
||||
if err != nil {
|
||||
return *new(TResult), err
|
||||
}
|
||||
|
||||
if resultValCast, ok := resultVal.(TResult); ok {
|
||||
return resultValCast, nil
|
||||
} else if opt.ReturnNilOnWrongFinalFieldType {
|
||||
return *new(TResult), nil
|
||||
} else {
|
||||
return *new(TResult), ErrAccessStructInvalidFieldType
|
||||
}
|
||||
}
|
||||
|
||||
func accessStructByPath(val reflect.Value, path []string, opt AccessStructOpt) (any, error) {
|
||||
if len(path) == 0 {
|
||||
return val.Interface(), nil
|
||||
}
|
||||
|
||||
currPath := path[0]
|
||||
|
||||
if val.Kind() == reflect.Ptr {
|
||||
if val.IsNil() {
|
||||
if opt.ReturnNilOnNilPtrFields {
|
||||
return nil, nil
|
||||
} else {
|
||||
return nil, ErrAccessStructFieldInPathWasNil
|
||||
}
|
||||
}
|
||||
return accessStructByPath(val.Elem(), path, opt)
|
||||
}
|
||||
|
||||
if val.Kind() == reflect.Array || val.Kind() == reflect.Slice {
|
||||
if opt.PreventArrayAccess {
|
||||
return nil, ErrAccessStructArrayAccess
|
||||
}
|
||||
|
||||
if val.IsNil() {
|
||||
if opt.ReturnNilOnNilPtrFields {
|
||||
return nil, nil
|
||||
} else {
|
||||
return nil, ErrAccessStructFieldInPathWasNil
|
||||
}
|
||||
}
|
||||
|
||||
arrIdx, err := strconv.ParseInt(currPath, 10, 64)
|
||||
if err != nil {
|
||||
if opt.ReturnNilOnInvalidArrayIndizes {
|
||||
return nil, nil
|
||||
} else {
|
||||
return nil, ErrAccessStructInvalidArrayIndex
|
||||
}
|
||||
}
|
||||
if arrIdx < 0 || int(arrIdx) >= val.Len() {
|
||||
if opt.ReturnNilOnInvalidArrayIndizes {
|
||||
return nil, nil
|
||||
} else {
|
||||
return nil, ErrAccessStructInvalidArrayIndex
|
||||
}
|
||||
}
|
||||
return accessStructByPath(val.Index(int(arrIdx)), path[1:], opt)
|
||||
}
|
||||
|
||||
if val.Kind() == reflect.Map {
|
||||
if opt.PreventMapAccess {
|
||||
return nil, ErrAccessStructMapAccess
|
||||
}
|
||||
|
||||
if val.IsNil() {
|
||||
if opt.ReturnNilOnNilPtrFields {
|
||||
return nil, nil
|
||||
} else {
|
||||
return nil, ErrAccessStructFieldInPathWasNil
|
||||
}
|
||||
}
|
||||
|
||||
mapval := val.MapIndex(reflect.ValueOf(currPath))
|
||||
if !mapval.IsValid() || mapval.IsZero() {
|
||||
if opt.ReturnNilOnMissingMapKeys {
|
||||
return nil, nil
|
||||
} else {
|
||||
return nil, ErrAccessStructInvalidMapKey
|
||||
}
|
||||
}
|
||||
|
||||
return accessStructByPath(mapval, path[1:], opt)
|
||||
}
|
||||
|
||||
if val.Kind() == reflect.Struct {
|
||||
if opt.UsedTagForKeys != nil {
|
||||
for i := 0; i < val.NumField(); i++ {
|
||||
if val.Type().Field(i).Tag.Get(*opt.UsedTagForKeys) == currPath {
|
||||
return accessStructByPath(val.Field(i), path[1:], opt)
|
||||
}
|
||||
}
|
||||
if opt.ReturnNilOnMissingFields {
|
||||
return nil, nil
|
||||
} else {
|
||||
return nil, ErrAccessStructMissingField
|
||||
}
|
||||
} else {
|
||||
for i := 0; i < val.NumField(); i++ {
|
||||
if val.Type().Field(i).Name == currPath {
|
||||
return accessStructByPath(val.Field(i), path[1:], opt)
|
||||
}
|
||||
}
|
||||
if opt.ReturnNilOnMissingFields {
|
||||
return nil, nil
|
||||
} else {
|
||||
return nil, ErrAccessStructMissingField
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if opt.ReturnNilOnWrongIntermedFieldType {
|
||||
return nil, nil
|
||||
} else {
|
||||
return nil, ErrAccessStructMissingField
|
||||
}
|
||||
}
|
259
reflectext/structAccess_test.go
Normal file
259
reflectext/structAccess_test.go
Normal file
@@ -0,0 +1,259 @@
|
||||
package reflectext
|
||||
|
||||
import "testing"
|
||||
|
||||
type TestStruct struct {
|
||||
Name string `json:"name"`
|
||||
Age int `json:"age"`
|
||||
}
|
||||
|
||||
func TestAccessStructByArrayPath_HappyPath(t *testing.T) {
|
||||
testStruct := TestStruct{Name: "John", Age: 30}
|
||||
result, err := AccessStructByArrayPath[string](testStruct, []string{"Name"})
|
||||
if err != nil {
|
||||
t.Errorf("Unexpected error: %v", err)
|
||||
}
|
||||
if result != "John" {
|
||||
t.Errorf("Expected 'John', got '%s'", result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAccessStructByArrayPath_InvalidField(t *testing.T) {
|
||||
testStruct := TestStruct{Name: "John", Age: 30}
|
||||
_, err := AccessStructByArrayPath[string](testStruct, []string{"Invalid"})
|
||||
if err == nil {
|
||||
t.Errorf("Expected error, got nil")
|
||||
}
|
||||
}
|
||||
|
||||
func TestAccessStructByStringPath_HappyPath(t *testing.T) {
|
||||
testStruct := TestStruct{Name: "John", Age: 30}
|
||||
result, err := AccessStructByStringPath[string](testStruct, "Name")
|
||||
if err != nil {
|
||||
t.Errorf("Unexpected error: %v", err)
|
||||
}
|
||||
if result != "John" {
|
||||
t.Errorf("Expected 'John', got '%s'", result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAccessStructByStringPath_InvalidField(t *testing.T) {
|
||||
testStruct := TestStruct{Name: "John", Age: 30}
|
||||
_, err := AccessStructByStringPath[string](testStruct, "Invalid")
|
||||
if err == nil {
|
||||
t.Errorf("Expected error, got nil")
|
||||
}
|
||||
}
|
||||
|
||||
type RecursiveStruct struct {
|
||||
Name string
|
||||
Sub *RecursiveStruct
|
||||
SubSlice []RecursiveStruct
|
||||
}
|
||||
|
||||
func TestAccessStructByArrayPath_RecursiveStruct(t *testing.T) {
|
||||
testStruct := RecursiveStruct{Name: "John", Sub: &RecursiveStruct{Name: "Jane"}}
|
||||
result, err := AccessStructByArrayPath[string](*testStruct.Sub, []string{"Name"})
|
||||
if err != nil {
|
||||
t.Errorf("Unexpected error: %v", err)
|
||||
}
|
||||
if result != "Jane" {
|
||||
t.Errorf("Expected 'Jane', got '%s'", result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAccessStructByArrayPath_RecursiveStructSlice(t *testing.T) {
|
||||
testStruct := RecursiveStruct{Name: "John", SubSlice: []RecursiveStruct{{Name: "Jane"}}}
|
||||
result, err := AccessStructByArrayPath[string](testStruct.SubSlice[0], []string{"Name"})
|
||||
if err != nil {
|
||||
t.Errorf("Unexpected error: %v", err)
|
||||
}
|
||||
if result != "Jane" {
|
||||
t.Errorf("Expected 'Jane', got '%s'", result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAccessStructByArrayPath_WrongType(t *testing.T) {
|
||||
testStruct := TestStruct{Name: "John", Age: 30}
|
||||
_, err := AccessStructByArrayPath[int](testStruct, []string{"Name"})
|
||||
if err == nil {
|
||||
t.Errorf("Expected error, got nil")
|
||||
}
|
||||
}
|
||||
|
||||
func TestAccessStructByArrayPath_InvalidPath(t *testing.T) {
|
||||
testStruct := TestStruct{Name: "John", Age: 30}
|
||||
_, err := AccessStructByArrayPath[string](testStruct, []string{"Name", "Invalid"})
|
||||
if err == nil {
|
||||
t.Errorf("Expected error, got nil")
|
||||
}
|
||||
}
|
||||
|
||||
type NestedStruct struct {
|
||||
Name string
|
||||
Sub *TestStruct
|
||||
}
|
||||
|
||||
func TestAccessStructByStringPath_NestedStruct(t *testing.T) {
|
||||
testStruct := NestedStruct{Name: "John", Sub: &TestStruct{Name: "Jane", Age: 30}}
|
||||
result, err := AccessStructByStringPath[string](testStruct, "Sub.Name")
|
||||
if err != nil {
|
||||
t.Errorf("Unexpected error: %v", err)
|
||||
}
|
||||
if result != "Jane" {
|
||||
t.Errorf("Expected 'Jane', got '%s'", result)
|
||||
}
|
||||
}
|
||||
|
||||
type DeepNestedStruct struct {
|
||||
Name string
|
||||
Sub *NestedStruct
|
||||
}
|
||||
|
||||
func TestAccessStructByStringPath_DeepNestedStruct(t *testing.T) {
|
||||
testStruct := DeepNestedStruct{Name: "John", Sub: &NestedStruct{Name: "Jane", Sub: &TestStruct{Name: "Doe", Age: 30}}}
|
||||
result, err := AccessStructByStringPath[string](testStruct, "Sub.Sub.Name")
|
||||
if err != nil {
|
||||
t.Errorf("Unexpected error: %v", err)
|
||||
}
|
||||
if result != "Doe" {
|
||||
t.Errorf("Expected 'Doe', got '%s'", result)
|
||||
}
|
||||
}
|
||||
|
||||
type MapStruct struct {
|
||||
Name string
|
||||
Age int
|
||||
}
|
||||
|
||||
type TestStructWithMap struct {
|
||||
MapField map[string]MapStruct
|
||||
}
|
||||
|
||||
func TestAccessStructByArrayPath_MapField(t *testing.T) {
|
||||
testStruct := TestStructWithMap{
|
||||
MapField: map[string]MapStruct{
|
||||
"key": {Name: "John", Age: 30},
|
||||
},
|
||||
}
|
||||
result, err := AccessStructByArrayPath[string](testStruct, []string{"MapField", "key", "Name"})
|
||||
if err != nil {
|
||||
t.Errorf("Unexpected error: %v", err)
|
||||
}
|
||||
if result != "John" {
|
||||
t.Errorf("Expected 'John', got '%s'", result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAccessStructByArrayPath_InvalidMapKey(t *testing.T) {
|
||||
testStruct := TestStructWithMap{
|
||||
MapField: map[string]MapStruct{
|
||||
"key": {Name: "John", Age: 30},
|
||||
},
|
||||
}
|
||||
_, err := AccessStructByArrayPath[string](testStruct, []string{"MapField", "invalid", "Name"})
|
||||
if err == nil {
|
||||
t.Errorf("Expected error, got nil")
|
||||
}
|
||||
}
|
||||
|
||||
type ArrayStruct struct {
|
||||
Name string
|
||||
Arr []TestStruct
|
||||
}
|
||||
|
||||
func TestAccessStructByArrayPath_ArrayField(t *testing.T) {
|
||||
testStruct := ArrayStruct{
|
||||
Name: "John",
|
||||
Arr: []TestStruct{{Name: "Jane", Age: 30}},
|
||||
}
|
||||
result, err := AccessStructByArrayPath[string](testStruct, []string{"Arr", "0", "Name"})
|
||||
if err != nil {
|
||||
t.Errorf("Unexpected error: %v", err)
|
||||
}
|
||||
if result != "Jane" {
|
||||
t.Errorf("Expected 'Jane', got '%s'", result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAccessStructByArrayPath_InvalidArrayIndex(t *testing.T) {
|
||||
testStruct := ArrayStruct{
|
||||
Name: "John",
|
||||
Arr: []TestStruct{{Name: "Jane", Age: 30}},
|
||||
}
|
||||
_, err := AccessStructByArrayPath[string](testStruct, []string{"Arr", "1", "Name"})
|
||||
if err == nil {
|
||||
t.Errorf("Expected error, got nil")
|
||||
}
|
||||
}
|
||||
|
||||
type FunctionStruct struct {
|
||||
Name string
|
||||
Func func() string
|
||||
}
|
||||
|
||||
func TestAccessStructByArrayPath_FunctionField(t *testing.T) {
|
||||
testStruct := FunctionStruct{Name: "John", Func: func() string { return "Hello" }}
|
||||
_, err := AccessStructByArrayPath[string](testStruct, []string{"Func"})
|
||||
if err == nil {
|
||||
t.Errorf("Expected error, got nil")
|
||||
}
|
||||
}
|
||||
|
||||
func TestAccessStructByArrayPath_NonExistentPath(t *testing.T) {
|
||||
testStruct := TestStruct{Name: "John", Age: 30}
|
||||
_, err := AccessStructByArrayPath[string](testStruct, []string{"NonExistent"})
|
||||
if err == nil {
|
||||
t.Errorf("Expected error, got nil")
|
||||
}
|
||||
}
|
||||
|
||||
type NestedStructWithTag struct {
|
||||
Name string `json:"name"`
|
||||
Sub *TestStruct `json:"sub"`
|
||||
}
|
||||
|
||||
func TestAccessStructByArrayPath_UsedTagForKeys(t *testing.T) {
|
||||
testStruct := NestedStructWithTag{Name: "John", Sub: &TestStruct{Name: "Jane", Age: 30}}
|
||||
tag := "json"
|
||||
result, err := AccessStructByArrayPath[string](testStruct, []string{"sub", "name"}, AccessStructOpt{UsedTagForKeys: &tag})
|
||||
if err != nil {
|
||||
t.Errorf("Unexpected error: %v", err)
|
||||
}
|
||||
if result != "Jane" {
|
||||
t.Errorf("Expected 'Jane', got '%s'", result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAccessStructByArrayPath_UsedTagForKeysInvalid(t *testing.T) {
|
||||
testStruct := NestedStructWithTag{Name: "John", Sub: &TestStruct{Name: "Jane", Age: 30}}
|
||||
tag := "json"
|
||||
_, err := AccessStructByArrayPath[string](testStruct, []string{"sub", "invalid"}, AccessStructOpt{UsedTagForKeys: &tag})
|
||||
if err == nil {
|
||||
t.Errorf("Expected error, got nil")
|
||||
}
|
||||
}
|
||||
|
||||
type DifferentTypeStruct struct {
|
||||
Name string
|
||||
Age int
|
||||
}
|
||||
|
||||
func TestAccessStructByArrayPath_DifferentType(t *testing.T) {
|
||||
testStruct := DifferentTypeStruct{Name: "John", Age: 30}
|
||||
result, err := AccessStructByArrayPath[any](testStruct, []string{"Age"})
|
||||
if err != nil {
|
||||
t.Errorf("Unexpected error: %v", err)
|
||||
}
|
||||
if result != 30 {
|
||||
t.Errorf("Expected '30', got '%v'", result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAccessStructByArrayPath_DifferentTypeInvalid(t *testing.T) {
|
||||
testStruct := DifferentTypeStruct{Name: "John", Age: 30}
|
||||
_, err := AccessStructByArrayPath[any](testStruct, []string{"Invalid"})
|
||||
if err == nil {
|
||||
t.Errorf("Expected error, got nil")
|
||||
}
|
||||
}
|
13
timeext/diff.go
Normal file
13
timeext/diff.go
Normal file
@@ -0,0 +1,13 @@
|
||||
package timeext
|
||||
|
||||
import "time"
|
||||
|
||||
func YearDifference(t1 time.Time, t2 time.Time, tz *time.Location) float64 {
|
||||
|
||||
yDelta := float64(t1.Year() - t2.Year())
|
||||
|
||||
processT1 := float64(t1.Sub(TimeToYearStart(t1, tz))) / float64(TimeToYearEnd(t1, tz).Sub(TimeToYearStart(t1, tz)))
|
||||
processT2 := float64(t2.Sub(TimeToYearStart(t2, tz))) / float64(TimeToYearEnd(t2, tz).Sub(TimeToYearStart(t2, tz)))
|
||||
|
||||
return yDelta + (processT1 - processT2)
|
||||
}
|
83
timeext/diff_test.go
Normal file
83
timeext/diff_test.go
Normal file
@@ -0,0 +1,83 @@
|
||||
package timeext
|
||||
|
||||
import (
|
||||
"math"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestYearDifferenceWithSameYearAndDay(t *testing.T) {
|
||||
t1 := time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC)
|
||||
t2 := time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC)
|
||||
expected := 0.0
|
||||
result := YearDifference(t1, t2, time.UTC)
|
||||
if !epsilonEquals(result, expected) {
|
||||
t.Errorf("Expected %v, got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestYearDifferenceWithOneYearApart(t *testing.T) {
|
||||
t1 := time.Date(2021, 1, 1, 0, 0, 0, 0, time.UTC)
|
||||
t2 := time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC)
|
||||
expected := 1.0
|
||||
result := YearDifference(t1, t2, time.UTC)
|
||||
if !epsilonEquals(result, expected) {
|
||||
t.Errorf("Expected %v, got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestYearDifferenceWithDifferentMonths(t *testing.T) {
|
||||
t1 := time.Date(2020, 6, 1, 0, 0, 0, 0, time.UTC)
|
||||
t2 := time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC)
|
||||
expected := 0.4166666666666667 // Approximation of 5/12 months
|
||||
result := YearDifference(t1, t2, time.UTC)
|
||||
if !epsilonEquals(result, expected) {
|
||||
t.Errorf("Expected %v, got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestYearDifferenceAcrossYears(t *testing.T) {
|
||||
t1 := time.Date(2021, 1, 1, 0, 0, 0, 0, time.UTC)
|
||||
t2 := time.Date(2020, 6, 1, 0, 0, 0, 0, time.UTC)
|
||||
expected := 0.5833333333333334 // Approximation of 7/12 months
|
||||
result := YearDifference(t1, t2, time.UTC)
|
||||
if !epsilonEquals(result, expected) {
|
||||
t.Errorf("Expected %v, got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestYearDifferenceWithTimezone(t *testing.T) {
|
||||
tz, _ := time.LoadLocation("America/New_York")
|
||||
t1 := time.Date(2021, 1, 1, 0, 0, 0, 0, tz)
|
||||
t2 := time.Date(2020, 6, 1, 0, 0, 0, 0, tz)
|
||||
expected := 0.5833333333333334 // Same as UTC but ensuring timezone is considered
|
||||
result := YearDifference(t1, t2, tz)
|
||||
if !epsilonEquals(result, expected) {
|
||||
t.Errorf("Expected %v, got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestYearDifferenceWithNegativeDifference(t *testing.T) {
|
||||
t1 := time.Date(2020, 1, 1, 0, 0, 0, 0, TimezoneBerlin)
|
||||
t2 := time.Date(2021, 1, 1, 0, 0, 0, 0, TimezoneBerlin)
|
||||
expected := -1.0
|
||||
result := YearDifference(t1, t2, TimezoneBerlin)
|
||||
if !epsilonEquals(result, expected) {
|
||||
t.Errorf("Expected %v, got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestYearDifferenceWithNegativeDifference2(t *testing.T) {
|
||||
t1 := time.Date(2020, 7, 1, 0, 0, 0, 0, TimezoneBerlin)
|
||||
t2 := time.Date(2021, 7, 1, 0, 0, 0, 0, TimezoneBerlin)
|
||||
expected := -1.0
|
||||
result := YearDifference(t1, t2, TimezoneBerlin)
|
||||
if !epsilonEquals(result, expected) {
|
||||
t.Errorf("Expected %v, got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func epsilonEquals(a, b float64) bool {
|
||||
epsilon := 0.01
|
||||
return math.Abs(a-b) < epsilon
|
||||
}
|
@@ -65,6 +65,10 @@ func TimeToYearEnd(t time.Time, tz *time.Location) time.Time {
|
||||
return TimeToYearStart(t, tz).AddDate(1, 0, 0).Add(-1)
|
||||
}
|
||||
|
||||
func TimeToNextYearStart(t time.Time, tz *time.Location) time.Time {
|
||||
return TimeToYearStart(t, tz).AddDate(1, 0, 0)
|
||||
}
|
||||
|
||||
// IsSameDayIncludingDateBoundaries returns true if t1 and t2 are part of the same day (TZ/Berlin), the boundaries of the day are
|
||||
// inclusive, this means 2021-09-15T00:00:00 is still part of the day 2021-09-14
|
||||
func IsSameDayIncludingDateBoundaries(t1 time.Time, t2 time.Time, tz *time.Location) bool {
|
||||
@@ -156,7 +160,7 @@ func SubtractYears(t time.Time, yearCount float64, tz *time.Location) time.Time
|
||||
|
||||
intCount, floatCount := math.Modf(yearCount)
|
||||
|
||||
t.AddDate(-int(intCount), 0, 0)
|
||||
t = t.AddDate(-int(intCount), 0, 0)
|
||||
|
||||
t0 := TimeToYearStart(t, tz)
|
||||
t1 := TimeToYearEnd(t, tz)
|
||||
@@ -173,7 +177,7 @@ func AddYears(t time.Time, yearCount float64, tz *time.Location) time.Time {
|
||||
|
||||
intCount, floatCount := math.Modf(yearCount)
|
||||
|
||||
t.AddDate(int(intCount), 0, 0)
|
||||
t = t.AddDate(int(intCount), 0, 0)
|
||||
|
||||
t0 := TimeToYearStart(t, tz)
|
||||
t1 := TimeToYearEnd(t, tz)
|
||||
|
193
timeext/time_test.go
Normal file
193
timeext/time_test.go
Normal file
@@ -0,0 +1,193 @@
|
||||
package timeext
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestTimeToDayStart(t *testing.T) {
|
||||
tz := TimezoneBerlin
|
||||
tm := time.Date(2022, 1, 1, 13, 14, 15, 0, tz)
|
||||
expected := time.Date(2022, 1, 1, 0, 0, 0, 0, tz)
|
||||
result := TimeToDayStart(tm, tz)
|
||||
if !result.Equal(expected) {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestTimeToDayEnd(t *testing.T) {
|
||||
tz := TimezoneBerlin
|
||||
tm := time.Date(2022, 1, 1, 13, 14, 15, 0, tz)
|
||||
expected := time.Date(2022, 1, 2, 0, 0, 0, 0, tz).Add(-1)
|
||||
result := TimeToDayEnd(tm, tz)
|
||||
if !result.Equal(expected) {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestIsSameDayIncludingDateBoundaries(t *testing.T) {
|
||||
tz := TimezoneBerlin
|
||||
t1 := time.Date(2022, 1, 1, 23, 59, 59, 0, tz)
|
||||
t2 := time.Date(2022, 1, 2, 0, 0, 0, 0, tz)
|
||||
if !IsSameDayIncludingDateBoundaries(t1, t2, tz) {
|
||||
t.Errorf("Expected %v and %v to be the same day", t1, t2)
|
||||
}
|
||||
}
|
||||
|
||||
func TestIsDatePartEqual(t *testing.T) {
|
||||
tz := TimezoneBerlin
|
||||
t1 := time.Date(2022, 1, 1, 23, 59, 59, 0, tz)
|
||||
t2 := time.Date(2022, 1, 1, 0, 0, 0, 0, tz)
|
||||
if !IsDatePartEqual(t1, t2, tz) {
|
||||
t.Errorf("Expected %v and %v to have the same date part", t1, t2)
|
||||
}
|
||||
}
|
||||
|
||||
func TestWithTimePart(t *testing.T) {
|
||||
tz := TimezoneBerlin
|
||||
base := time.Date(2022, 1, 1, 0, 0, 0, 0, tz)
|
||||
expected := time.Date(2022, 1, 1, 13, 14, 15, 0, tz)
|
||||
result := WithTimePart(base, 13, 14, 15)
|
||||
if !result.Equal(expected) {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCombineDateAndTime(t *testing.T) {
|
||||
tz := TimezoneBerlin
|
||||
d := time.Date(2022, 1, 1, 0, 0, 0, 0, tz)
|
||||
tm := time.Date(0, 0, 0, 13, 14, 15, 0, tz)
|
||||
expected := time.Date(2022, 1, 1, 13, 14, 15, 0, tz)
|
||||
result := CombineDateAndTime(d, tm)
|
||||
if !result.Equal(expected) {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestIsSunday(t *testing.T) {
|
||||
tz := TimezoneBerlin
|
||||
tm := time.Date(2022, 1, 2, 0, 0, 0, 0, tz) // 2nd January 2022 is a Sunday
|
||||
if !IsSunday(tm, tz) {
|
||||
t.Errorf("Expected %v to be a Sunday", tm)
|
||||
}
|
||||
}
|
||||
|
||||
func TestIsSunday_OnSunday(t *testing.T) {
|
||||
sunday := time.Date(2022, 5, 15, 0, 0, 0, 0, TimezoneBerlin) // A Sunday
|
||||
if !IsSunday(sunday, TimezoneBerlin) {
|
||||
t.Errorf("Expected true for Sunday")
|
||||
}
|
||||
}
|
||||
|
||||
func TestDurationFromTime(t *testing.T) {
|
||||
expected := time.Duration(13*time.Hour + 14*time.Minute + 15*time.Second)
|
||||
result := DurationFromTime(13, 14, 15)
|
||||
if result != expected {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMin(t *testing.T) {
|
||||
t1 := time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC)
|
||||
t2 := time.Date(2022, 1, 2, 0, 0, 0, 0, time.UTC)
|
||||
expected := t1
|
||||
result := Min(t1, t2)
|
||||
if !result.Equal(expected) {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMax(t *testing.T) {
|
||||
t1 := time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC)
|
||||
t2 := time.Date(2022, 1, 2, 0, 0, 0, 0, time.UTC)
|
||||
expected := t2
|
||||
result := Max(t1, t2)
|
||||
if !result.Equal(expected) {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestUnixFloatSeconds(t *testing.T) {
|
||||
v := 1640995200.0 // 1st January 2022 00:00:00 UTC in Unix timestamp
|
||||
expected := time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC)
|
||||
result := UnixFloatSeconds(v)
|
||||
if !result.Equal(expected) {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFloorTime(t *testing.T) {
|
||||
tm := time.Date(2022, 1, 1, 13, 14, 15, 0, time.UTC)
|
||||
expected := time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC)
|
||||
result := FloorTime(tm)
|
||||
if !result.Equal(expected) {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSubtractYears(t *testing.T) {
|
||||
tz := TimezoneBerlin
|
||||
tm := time.Date(2022, 1, 1, 0, 0, 0, 0, tz)
|
||||
|
||||
expected := time.Date(2021, 1, 1, 0, 0, 0, 0, tz)
|
||||
result := SubtractYears(tm, 1, tz)
|
||||
if !result.Equal(expected) {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
|
||||
expected = time.Date(2020, 1, 1, 0, 0, 0, 0, tz)
|
||||
result = SubtractYears(tm, 2, tz)
|
||||
if !result.Equal(expected) {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
|
||||
expected = time.Date(2019, 1, 1, 0, 0, 0, 0, tz)
|
||||
result = SubtractYears(tm, 3, tz)
|
||||
if !result.Equal(expected) {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
|
||||
expected = time.Date(2025, 1, 1, 0, 0, 0, 0, tz)
|
||||
result = SubtractYears(tm, -3, tz)
|
||||
if !result.Equal(expected) {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAddYears(t *testing.T) {
|
||||
tz := TimezoneBerlin
|
||||
tm := time.Date(2022, 1, 1, 0, 0, 0, 0, tz)
|
||||
expected := time.Date(2023, 1, 1, 0, 0, 0, 0, tz)
|
||||
result := AddYears(tm, 1, tz)
|
||||
if !result.Equal(expected) {
|
||||
t.Errorf("Expected %v but got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestIsDatePartEqual_SameDateDifferentTimes(t *testing.T) {
|
||||
tz := time.UTC
|
||||
t1 := time.Date(2022, 5, 18, 10, 30, 0, 0, tz)
|
||||
t2 := time.Date(2022, 5, 18, 20, 45, 0, 0, tz)
|
||||
if !IsDatePartEqual(t1, t2, tz) {
|
||||
t.Errorf("Expected dates to be equal")
|
||||
}
|
||||
}
|
||||
|
||||
func TestWithTimePart_ChangeTime(t *testing.T) {
|
||||
base := time.Date(2022, 5, 18, 0, 0, 0, 0, time.UTC)
|
||||
result := WithTimePart(base, 15, 30, 45)
|
||||
expected := time.Date(2022, 5, 18, 15, 30, 45, 0, time.UTC)
|
||||
if !result.Equal(expected) {
|
||||
t.Errorf("Expected %v, got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCombineDateAndTime_CombineDifferentParts(t *testing.T) {
|
||||
date := time.Date(2022, 5, 18, 0, 0, 0, 0, time.UTC)
|
||||
timePart := time.Date(2000, 1, 1, 15, 30, 45, 0, time.UTC)
|
||||
result := CombineDateAndTime(date, timePart)
|
||||
expected := time.Date(2022, 5, 18, 15, 30, 45, 0, time.UTC)
|
||||
if !result.Equal(expected) {
|
||||
t.Errorf("Expected %v, got %v", expected, result)
|
||||
}
|
||||
}
|
@@ -19,6 +19,8 @@ func (c *Coll[TData]) Aggregate(ctx context.Context, pipeline mongo.Pipeline, op
|
||||
return nil, exerr.Wrap(err, "mongo-aggregation failed").Any("pipeline", pipeline).Any("options", opts).Str("collection", c.Name()).Build()
|
||||
}
|
||||
|
||||
defer func() { _ = cursor.Close(ctx) }()
|
||||
|
||||
res, err := c.decodeAll(ctx, cursor)
|
||||
if err != nil {
|
||||
return nil, exerr.Wrap(err, "failed to decode values").Build()
|
||||
@@ -38,6 +40,8 @@ func (c *Coll[TData]) AggregateOneOpt(ctx context.Context, pipeline mongo.Pipeli
|
||||
return nil, exerr.Wrap(err, "mongo-aggregation failed").Any("pipeline", pipeline).Any("options", opts).Str("collection", c.Name()).Build()
|
||||
}
|
||||
|
||||
defer func() { _ = cursor.Close(ctx) }()
|
||||
|
||||
if cursor.Next(ctx) {
|
||||
v, err := c.decodeSingle(ctx, cursor)
|
||||
if err != nil {
|
||||
@@ -60,6 +64,8 @@ func (c *Coll[TData]) AggregateOne(ctx context.Context, pipeline mongo.Pipeline,
|
||||
return *new(TData), exerr.Wrap(err, "mongo-aggregation failed").Any("pipeline", pipeline).Any("options", opts).Str("collection", c.Name()).Build()
|
||||
}
|
||||
|
||||
defer func() { _ = cursor.Close(ctx) }()
|
||||
|
||||
if cursor.Next(ctx) {
|
||||
v, err := c.decodeSingle(ctx, cursor)
|
||||
if err != nil {
|
||||
|
@@ -64,6 +64,8 @@ func (c *Coll[TData]) Find(ctx context.Context, filter bson.M, opts ...*options.
|
||||
return nil, exerr.Wrap(err, "mongo-aggregation failed").Any("pipeline", pipeline).Str("collection", c.Name()).Build()
|
||||
}
|
||||
|
||||
defer func() { _ = cursor.Close(ctx) }()
|
||||
|
||||
res, err := c.decodeAll(ctx, cursor)
|
||||
if err != nil {
|
||||
return nil, exerr.Wrap(err, "failed to decode values").Build()
|
||||
|
@@ -80,6 +80,8 @@ func (c *Coll[TData]) findOneInternal(ctx context.Context, filter bson.M, allowN
|
||||
return nil, exerr.Wrap(err, "mongo-aggregation [find-one] failed").Any("pipeline", pipeline).Str("collection", c.Name()).NoLog().Build()
|
||||
}
|
||||
|
||||
defer func() { _ = cursor.Close(ctx) }()
|
||||
|
||||
if cursor.Next(ctx) {
|
||||
v, err := c.decodeSingle(ctx, cursor)
|
||||
if err != nil {
|
||||
|
@@ -25,8 +25,8 @@ func (c *Coll[TData]) List(ctx context.Context, filter ct.Filter, pageSize *int,
|
||||
pd2 := ct.SortASC
|
||||
|
||||
if filter != nil {
|
||||
pipeline = filter.FilterQuery()
|
||||
pf1, pd1, pf2, pd2 = filter.Pagination()
|
||||
pipeline = filter.FilterQuery(ctx)
|
||||
pf1, pd1, pf2, pd2 = filter.Pagination(ctx)
|
||||
}
|
||||
|
||||
sortPrimary := pf1
|
||||
@@ -69,6 +69,8 @@ func (c *Coll[TData]) List(ctx context.Context, filter ct.Filter, pageSize *int,
|
||||
return nil, ct.CursorToken{}, exerr.Wrap(err, "mongo-aggregation failed").Any("pipeline", pipeline).Str("collection", c.Name()).Build()
|
||||
}
|
||||
|
||||
defer func() { _ = cursor.Close(ctx) }()
|
||||
|
||||
// fast branch
|
||||
if pageSize == nil {
|
||||
entries, err := c.decodeAll(ctx, cursor)
|
||||
@@ -109,7 +111,7 @@ func (c *Coll[TData]) Count(ctx context.Context, filter ct.RawFilter) (int64, er
|
||||
Count int64 `bson:"c"`
|
||||
}
|
||||
|
||||
pipeline := filter.FilterQuery()
|
||||
pipeline := filter.FilterQuery(ctx)
|
||||
|
||||
pipeline = append(pipeline, bson.D{{Key: "$count", Value: "c"}})
|
||||
|
||||
@@ -118,6 +120,8 @@ func (c *Coll[TData]) Count(ctx context.Context, filter ct.RawFilter) (int64, er
|
||||
return 0, exerr.Wrap(err, "mongo-aggregation failed").Any("pipeline", pipeline).Str("collection", c.Name()).Build()
|
||||
}
|
||||
|
||||
defer func() { _ = cursor.Close(ctx) }()
|
||||
|
||||
if cursor.Next(ctx) {
|
||||
v := countRes{}
|
||||
err = cursor.Decode(&v)
|
||||
@@ -152,7 +156,7 @@ func (c *Coll[TData]) ListAllIDs(ctx context.Context, filter ct.RawFilter) ([]st
|
||||
pipelineFilter := mongo.Pipeline{}
|
||||
|
||||
if filter != nil {
|
||||
pipelineFilter = filter.FilterQuery()
|
||||
pipelineFilter = filter.FilterQuery(ctx)
|
||||
}
|
||||
|
||||
extrModPipelineResolved := mongo.Pipeline{}
|
||||
|
@@ -23,8 +23,8 @@ func (c *Coll[TData]) Paginate(ctx context.Context, filter pag.MongoFilter, page
|
||||
sort := bson.D{}
|
||||
|
||||
if filter != nil {
|
||||
pipelineFilter = filter.FilterQuery()
|
||||
sort = filter.Sort()
|
||||
pipelineFilter = filter.FilterQuery(ctx)
|
||||
sort = filter.Sort(ctx)
|
||||
}
|
||||
|
||||
if len(sort) != 0 {
|
||||
|
@@ -126,6 +126,10 @@ func (b *WPDFBuilder) SetX(x float64) {
|
||||
b.b.SetX(x)
|
||||
}
|
||||
|
||||
func (b *WPDFBuilder) IncX(dx float64) {
|
||||
b.b.SetX(b.b.GetX() + dx)
|
||||
}
|
||||
|
||||
func (b *WPDFBuilder) GetX() float64 {
|
||||
return b.b.GetX()
|
||||
}
|
||||
|
@@ -20,6 +20,7 @@ type PDFCellOpt struct {
|
||||
textColor *PDFColor
|
||||
borderColor *PDFColor
|
||||
fillColor *PDFColor
|
||||
autoWidthPaddingX *float64
|
||||
}
|
||||
|
||||
func NewPDFCellOpt() *PDFCellOpt {
|
||||
@@ -113,6 +114,11 @@ func (opt *PDFCellOpt) AutoWidth() *PDFCellOpt {
|
||||
return opt
|
||||
}
|
||||
|
||||
func (opt *PDFCellOpt) AutoWidthPaddingX(v float64) *PDFCellOpt {
|
||||
opt.autoWidthPaddingX = &v
|
||||
return opt
|
||||
}
|
||||
|
||||
func (opt *PDFCellOpt) TextColor(cr, cg, cb int) *PDFCellOpt {
|
||||
opt.textColor = langext.Ptr(rgbToColor(cr, cg, cb))
|
||||
return opt
|
||||
@@ -164,6 +170,7 @@ func (b *WPDFBuilder) Cell(txt string, opts ...*PDFCellOpt) {
|
||||
var textColor *PDFColor
|
||||
var borderColor *PDFColor
|
||||
var fillColor *PDFColor
|
||||
autoWidthPaddingX := float64(0)
|
||||
|
||||
for _, opt := range opts {
|
||||
width = langext.Coalesce(opt.width, width)
|
||||
@@ -183,6 +190,7 @@ func (b *WPDFBuilder) Cell(txt string, opts ...*PDFCellOpt) {
|
||||
textColor = langext.CoalesceOpt(opt.textColor, textColor)
|
||||
borderColor = langext.CoalesceOpt(opt.borderColor, borderColor)
|
||||
fillColor = langext.CoalesceOpt(opt.fillColor, fillColor)
|
||||
autoWidthPaddingX = langext.Coalesce(opt.autoWidthPaddingX, autoWidthPaddingX)
|
||||
}
|
||||
|
||||
if fontNameOverride != nil || fontStyleOverride != nil || fontSizeOverride != nil {
|
||||
@@ -219,7 +227,7 @@ func (b *WPDFBuilder) Cell(txt string, opts ...*PDFCellOpt) {
|
||||
}
|
||||
|
||||
if autoWidth {
|
||||
width = b.b.GetStringWidth(txtTR)
|
||||
width = b.b.GetStringWidth(txtTR) + autoWidthPaddingX
|
||||
}
|
||||
|
||||
b.b.CellFormat(width, height, txtTR, string(border), int(ln), string(align), fill, link, linkStr)
|
||||
|
@@ -7,6 +7,7 @@ import (
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
"image"
|
||||
"image/color"
|
||||
"image/draw"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
@@ -284,6 +285,13 @@ func (b *WPDFBuilder) Image(img *PDFImageRef, opts ...*PDFImageOpt) {
|
||||
}
|
||||
}
|
||||
|
||||
if dataimg.ColorModel() != color.RGBAModel && dataimg.ColorModel() != color.NRGBAModel {
|
||||
// the image cannto be 16bpp or similar - otherwise fpdf errors out
|
||||
dataImgRGBA := image.NewNRGBA(image.Rect(0, 0, dataimg.Bounds().Dx(), dataimg.Bounds().Dy()))
|
||||
draw.Draw(dataImgRGBA, dataImgRGBA.Bounds(), dataimg, dataimg.Bounds().Min, draw.Src)
|
||||
dataimg = dataImgRGBA
|
||||
}
|
||||
|
||||
bfr, imgMime, err := imageext.EncodeImage(dataimg, compression)
|
||||
if err != nil {
|
||||
b.b.SetError(err)
|
||||
|
Reference in New Issue
Block a user