Mirrors/kararas_iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2026-01-08 20:41:57 +00:00
Code Releases Activity

update dependencies

Browse Source
This commit is contained in:
Gerasimos (Makis) Maropoulos
2025-08-15 23:29:20 +03:00
parent de4f462198
commit a8a3afea22
186 changed files with 694 additions and 689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
macro/interpreter/parser/parser.go
View File

@@ -89,7 +89,7 @@ func (p *ParamParser) Reset(src string) {
p.errors = []string{}
}
func (p *ParamParser) appendErr(format string, a ...interface{}) {
func (p *ParamParser) appendErr(format string, a ...any) {
p.errors = append(p.errors, fmt.Sprintf(format, a...))
}

20
macro/macro.go
View File

@@ -14,12 +14,12 @@ type (
// It accepts the param's value as string and returns
// the <T> value (which its type is used for the input argument of the parameter functions, if any)
// and a true value for passed, otherwise nil and false should be returned.
ParamEvaluator func(paramValue string) (interface{}, bool)
ParamEvaluator func(paramValue string) (any, bool)
)
var goodEvaluatorFuncs = []reflect.Type{
reflect.TypeOf(func(string) (interface{}, bool) { return nil, false }),
reflect.TypeOf(ParamEvaluator(func(string) (interface{}, bool) { return nil, false })),
reflect.TypeOf(func(string) (any, bool) { return nil, false }),
reflect.TypeOf(ParamEvaluator(func(string) (any, bool) { return nil, false })),
}
func goodParamFunc(typ reflect.Type) bool {
@@ -99,7 +99,7 @@ func goodParamFuncName(name string) bool {
// the convertBuilderFunc return value is generating at boot time.
// convertFunc converts an interface to a valid full param function.
func convertBuilderFunc(fn interface{}) ParamFuncBuilder {
func convertBuilderFunc(fn any) ParamFuncBuilder {
typFn := reflect.TypeOf(fn)
if !goodParamFunc(typFn) {
// it's not a function which returns a function,
@@ -143,7 +143,7 @@ func convertBuilderFunc(fn interface{}) ParamFuncBuilder {
// try to convert the string literal as we get it from the parser.
var (
val interface{}
val any
)
// try to get the value based on the expected type.
@@ -228,7 +228,7 @@ func convertBuilderFunc(fn interface{}) ParamFuncBuilder {
// } else if _v, ok = evalFn.(func(string) bool); ok {
// evaluator = _v
// }
// return func(paramValue interface{}) bool {
// return func(paramValue any) bool {
// return evaluator(paramValue)
// }
return evalFn
@@ -254,7 +254,7 @@ type (
trailing bool
Evaluator ParamEvaluator
handleError interface{}
handleError any
funcs []ParamFunc
goType reflect.Type
@@ -327,12 +327,12 @@ func (m *Macro) GoType() reflect.Type {
// otherwise the program will receive a panic before server startup.
// The status code of the ErrCode (`else` literal) is set
// before the error handler but it can be modified inside the handler itself.
func (m *Macro) HandleError(fnHandler interface{}) *Macro { // See handler.MakeFilter.
func (m *Macro) HandleError(fnHandler any) *Macro { // See handler.MakeFilter.
m.handleError = fnHandler
return m
}
// func (m *Macro) SetParamResolver(fn func(memstore.Entry) interface{}) *Macro {
// func (m *Macro) SetParamResolver(fn func(memstore.Entry) any) *Macro {
// m.ParamResolver = fn
// return m
// }
@@ -343,7 +343,7 @@ func (m *Macro) HandleError(fnHandler interface{}) *Macro { // See handler.MakeF
// and the function body, which should return an EvaluatorFunc
// a bool (it will be converted to EvaluatorFunc later on),
// i.e RegisterFunc("min", func(minValue int) func(paramValue string) bool){})
func (m *Macro) RegisterFunc(funcName string, fn interface{}) *Macro {
func (m *Macro) RegisterFunc(funcName string, fn any) *Macro {
fullFn := convertBuilderFunc(fn)
// if it's not valid then not register it at all.

38
macro/macros.go
View File

@@ -81,7 +81,7 @@ var (
// both positive and negative numbers, actual value can be min-max int64 or min-max int32 depends on the arch.
// If x64: -9223372036854775808 to 9223372036854775807.
// If x32: -2147483648 to 2147483647 and etc..
Int = NewMacro("int", "number", 0, false, false, func(paramValue string) (interface{}, bool) {
Int = NewMacro("int", "number", 0, false, false, func(paramValue string) (any, bool) {
v, err := strconv.Atoi(paramValue)
if err != nil {
return err, false
@@ -113,7 +113,7 @@ var (
// Int8 type
// -128 to 127.
Int8 = NewMacro("int8", "", int8(0), false, false, func(paramValue string) (interface{}, bool) {
Int8 = NewMacro("int8", "", int8(0), false, false, func(paramValue string) (any, bool) {
v, err := strconv.ParseInt(paramValue, 10, 8)
if err != nil {
return err, false
@@ -138,7 +138,7 @@ var (
// Int16 type
// -32768 to 32767.
Int16 = NewMacro("int16", "", int16(0), false, false, func(paramValue string) (interface{}, bool) {
Int16 = NewMacro("int16", "", int16(0), false, false, func(paramValue string) (any, bool) {
v, err := strconv.ParseInt(paramValue, 10, 16)
if err != nil {
return err, false
@@ -163,7 +163,7 @@ var (
// Int32 type
// -2147483648 to 2147483647.
Int32 = NewMacro("int32", "", int32(0), false, false, func(paramValue string) (interface{}, bool) {
Int32 = NewMacro("int32", "", int32(0), false, false, func(paramValue string) (any, bool) {
v, err := strconv.ParseInt(paramValue, 10, 32)
if err != nil {
return err, false
@@ -188,7 +188,7 @@ var (
// Int64 as int64 type
// -9223372036854775808 to 9223372036854775807.
Int64 = NewMacro("int64", "long", int64(0), false, false, func(paramValue string) (interface{}, bool) {
Int64 = NewMacro("int64", "long", int64(0), false, false, func(paramValue string) (any, bool) {
v, err := strconv.ParseInt(paramValue, 10, 64)
if err != nil { // if err == strconv.ErrRange...
return err, false
@@ -221,7 +221,7 @@ var (
// actual value can be min-max uint64 or min-max uint32 depends on the arch.
// If x64: 0 to 18446744073709551615.
// If x32: 0 to 4294967295 and etc.
Uint = NewMacro("uint", "", uint(0), false, false, func(paramValue string) (interface{}, bool) {
Uint = NewMacro("uint", "", uint(0), false, false, func(paramValue string) (any, bool) {
v, err := strconv.ParseUint(paramValue, 10, strconv.IntSize) // 32,64...
if err != nil {
return err, false
@@ -252,7 +252,7 @@ var (
// Uint8 as uint8 type
// 0 to 255.
Uint8 = NewMacro("uint8", "", uint8(0), false, false, func(paramValue string) (interface{}, bool) {
Uint8 = NewMacro("uint8", "", uint8(0), false, false, func(paramValue string) (any, bool) {
v, err := strconv.ParseUint(paramValue, 10, 8)
if err != nil {
return err, false
@@ -283,7 +283,7 @@ var (
// Uint16 as uint16 type
// 0 to 65535.
Uint16 = NewMacro("uint16", "", uint16(0), false, false, func(paramValue string) (interface{}, bool) {
Uint16 = NewMacro("uint16", "", uint16(0), false, false, func(paramValue string) (any, bool) {
v, err := strconv.ParseUint(paramValue, 10, 16)
if err != nil {
return err, false
@@ -308,7 +308,7 @@ var (
// Uint32 as uint32 type
// 0 to 4294967295.
Uint32 = NewMacro("uint32", "", uint32(0), false, false, func(paramValue string) (interface{}, bool) {
Uint32 = NewMacro("uint32", "", uint32(0), false, false, func(paramValue string) (any, bool) {
v, err := strconv.ParseUint(paramValue, 10, 32)
if err != nil {
return err, false
@@ -333,7 +333,7 @@ var (
// Uint64 as uint64 type
// 0 to 18446744073709551615.
Uint64 = NewMacro("uint64", "", uint64(0), false, false, func(paramValue string) (interface{}, bool) {
Uint64 = NewMacro("uint64", "", uint64(0), false, false, func(paramValue string) (any, bool) {
v, err := strconv.ParseUint(paramValue, 10, 64)
if err != nil {
return err, false
@@ -365,7 +365,7 @@ var (
// Bool or boolean as bool type
// a string which is "1" or "t" or "T" or "TRUE" or "true" or "True"
// or "0" or "f" or "F" or "FALSE" or "false" or "False".
Bool = NewMacro("bool", "boolean", false, false, false, func(paramValue string) (interface{}, bool) {
Bool = NewMacro("bool", "boolean", false, false, false, func(paramValue string) (any, bool) {
// a simple if statement is faster than regex ^(true|false|True|False|t|0|f|FALSE|TRUE)$
// in this case.
v, err := strconv.ParseBool(paramValue)
@@ -380,7 +380,7 @@ var (
alphabeticalEval = MustRegexp("^[a-zA-Z ]+$")
// Alphabetical letter type
// letters only (upper or lowercase)
Alphabetical = NewMacro("alphabetical", "", "", false, false, func(paramValue string) (interface{}, bool) {
Alphabetical = NewMacro("alphabetical", "", "", false, false, func(paramValue string) (any, bool) {
if !alphabeticalEval(paramValue) {
return fmt.Errorf("%s: %w", paramValue, ErrParamNotAlphabetical), false
}
@@ -397,7 +397,7 @@ var (
// dash (-)
// point (.)
// no spaces! or other character
File = NewMacro("file", "", "", false, false, func(paramValue string) (interface{}, bool) {
File = NewMacro("file", "", "", false, false, func(paramValue string) (any, bool) {
if !fileEval(paramValue) {
return fmt.Errorf("%s: %w", paramValue, ErrParamNotFile), false
}
@@ -414,7 +414,7 @@ var (
// UUID string type for validating a uuidv4 (and v1) path parameter.
// Read more at: https://tools.ietf.org/html/rfc4122.
UUID = NewMacro("uuid", "uuidv4", "", false, false, func(paramValue string) (interface{}, bool) {
UUID = NewMacro("uuid", "uuidv4", "", false, false, func(paramValue string) (any, bool) {
_, err := uuid.Parse(paramValue) // this is x10+ times faster than regexp.
if err != nil {
return err, false
@@ -425,7 +425,7 @@ var (
// Email string type for validating an e-mail path parameter. It returns the address as string, instead of an *mail.Address.
// Read more at go std mail.ParseAddress method. See the ':email' path parameter for a more strictly version of validation.
Mail = NewMacro("mail", "", "", false, false, func(paramValue string) (interface{}, bool) {
Mail = NewMacro("mail", "", "", false, false, func(paramValue string) (any, bool) {
_, err := mail.ParseAddress(paramValue)
if err != nil {
return fmt.Errorf("%s: %w", paramValue, err), false
@@ -437,7 +437,7 @@ var (
// Email string type for validating an e-mail path parameter. It returns the address as string, instead of an *mail.Address.
// It is a combined validation using mail.ParseAddress and net.LookupMX so only valid domains can be passed.
// It's a more strictly version of the ':mail' path parameter.
Email = NewMacro("email", "", "", false, false, func(paramValue string) (interface{}, bool) {
Email = NewMacro("email", "", "", false, false, func(paramValue string) (any, bool) {
_, err := mail.ParseAddress(paramValue)
if err != nil {
return fmt.Errorf("%s: %w", paramValue, err), false
@@ -460,7 +460,7 @@ var (
simpleDateLayout = "2006/01/02"
// Date type.
Date = NewMacro("date", "", time.Time{}, false, true, func(paramValue string) (interface{}, bool) {
Date = NewMacro("date", "", time.Time{}, false, true, func(paramValue string) (any, bool) {
tt, err := time.Parse(simpleDateLayout, paramValue)
if err != nil {
return fmt.Errorf("%s: %w", paramValue, err), false
@@ -492,7 +492,7 @@ var (
// Weekday type, returns a type of time.Weekday.
// Valid values:
// 0 to 7 (leading zeros don't matter) or "Sunday" to "Monday" or "sunday" to "monday".
Weekday = NewMacro("weekday", "", time.Weekday(0), false, false, func(paramValue string) (interface{}, bool) {
Weekday = NewMacro("weekday", "", time.Weekday(0), false, false, func(paramValue string) (any, bool) {
d, ok := longDayNames[paramValue]
if !ok {
// try parse from integer.
@@ -669,7 +669,7 @@ func (ms *Macros) GetTrailings() (macros []*Macro) {
// The "fnHandler" MUST be a type of handler.ParamErrorHandler:
// func(ctx iris.Context, paramIndex int, err error). It calls
// the Macro.HandleError method for each of the "ms" entries.
func (ms *Macros) SetErrorHandler(fnHandler interface{}) {
func (ms *Macros) SetErrorHandler(fnHandler any) {
for _, m := range *ms {
if m == nil {
continue

6
macro/template.go
View File

@@ -37,7 +37,7 @@ type TemplateParam struct {
Index int `json:"index"`
ErrCode int `json:"errCode"`
// Note that, the value MUST BE a type of `handler.ParamErrorHandler`.
HandleError interface{} `json:"-"` /* It's not an typed value because of import-cycle,
HandleError any `json:"-"` /* It's not an typed value because of import-cycle,
// neither a special struct required, see `handler.MakeFilter`. */
TypeEvaluator ParamEvaluator `json:"-"`
Funcs []reflect.Value `json:"-"`
@@ -80,7 +80,7 @@ type errorInterface interface {
//
// It is called from the converted macro handler (middleware)
// from the higher-level component of "kataras/iris/macro/handler#MakeHandler".
func (p *TemplateParam) Eval(paramValue string) (interface{}, bool) {
func (p *TemplateParam) Eval(paramValue string) (any, bool) {
if p.TypeEvaluator == nil {
for _, fn := range p.stringInFuncs {
if !fn(paramValue) {
@@ -106,7 +106,7 @@ func (p *TemplateParam) Eval(paramValue string) (interface{}, bool) {
if len(p.Funcs) > 0 {
paramIn := []reflect.Value{reflect.ValueOf(newValue)}
for _, evalFunc := range p.Funcs {
// or make it as func(interface{}) bool and pass directly the "newValue"
// or make it as func(any) bool and pass directly the "newValue"
// but that would not be as easy for end-developer, so keep that "slower":
if !evalFunc.Call(paramIn)[0].Interface().(bool) { // i.e func(paramValue int) bool
return nil, false