Skip to content

Commit 9a56a1b

Browse files
authored
v3: Add QueryParser for get query using generic (#2776)
* Add QueryParser method and tests Introduced a new method, QueryParser, to parse query parameters from a given context into specified types: integer, boolean, float, and string. The method provides default values for empty or invalid keys. Corresponding tests for each type have also been added to validate the functionality. * Refactor QueryParser and add string support Refactored the existing QueryParser method in the code to simplify its structure. Instead of reflecting on types, it now uses explicit type checking. In addition to the existing support for integers, booleans, and floats, the QueryParser method now also supports string parsing. Corresponding tests for the updated method and new feature were added as well. * Update example call in method comment Updated the method call example in the comment for the Query function in the ctx.go file. Previously, it was incorrectly demonstrating a call to "QueryParser("wanna_cake", 1)", but this has been updated to correctly represent the method it is commenting, resulting in "Query("wanna_cake", 1)". * Refactor Query function in ctx.go The update introduces better type assertion handling in the Query function. A switch statement is now employed to determine the type of the value as opposed to the previous if clauses. In addition, a validation step has been added to ensure the context passed into the function is of the correct type. * Refactor type handling in Query function The Query function in ctx.go has been refactored for better and clearer type handling. The code now uses a 'QueryType' interface, replacing explicit string, bool, float, and int declarations. This change also improves the error message when a type assertion fails, making it more descriptive about the specific failure. * Add type assertion check in ctx.go Updated the code in ctx.go to add a type assertion check for all case statements. The function now checks if the returned value is of the expected type, and if not, it throws a panic with a description of the failed type assertion. * Refactor Query function to support more data types The Query function has been expanded to support a broader range of data types. This includes support for extracting query parameters as different types of integers (both signed and unsigned), strings, floats, and booleans from the request's URI. The function now includes comprehensive parsing capabilities that allow for improved handling of different data types. * Refactor Query function documentation The documentation for the Query function has been updated to emphasize its versatility in handling various data types. The changes also clarify how the function operates and demonstrates the usage and benefits of providing a defaultValue. The different variations of QueryBool, QueryFloat, and QueryInt were removed, as they are now encompassed by the enhanced Query function. * Add benchmark tests for Query function Benchmark tests have been added to evaluate the performance of the Query function for different data types. These tests will help in assessing the efficiency of the function when processing various queries. The addition of these benchmarks will aid in future optimizations and enhancements of the function. * Update generic Query function signature The signature of the generic Query function has been updated to accept different types of data as arguments. The change improves flexibility of the function by allowing it to handle different data types, effectively making it a versatile tool in processing various queries. * Modify `ctx.Query()` calls in documentation `ctx.Query()` calls in the ctx.md documentation file were updated to remove the `ctx.` prefix. This is consistent with the typical use cases and makes the code examples more clear and easy to understand. * Refactored assertValueType function and improved query parameter documentation Updated the assertValueType function to utilize the utils.UnsafeBytes method for byte conversion. Enhanced the documentation for query parameter types to offer clearer, more comprehensive explanations and examples, including QueryTypeInteger, QueryTypeFloat, and subcategories. * Update Query method calls to use new fiber.Query syntax In this commit, the conventional `c.Query()` calls across multiple middleware and document files are updated to use the new `fiber.Query` syntax. The changes align with the updated function signatures in Fiber library that provides type-specific querying. These enhancements contribute to the project's overall robustness and consistency. * Add Query method to get query string parameters * Replace 'utils.UnsafeBytes' with 'ctx.app.getBytes' In the query method, the utils.UnsafeBytes function was replaced with the ctx.app.getBytes method. This change enhances the extraction of query string parameters by making it safer and more context-specific. * Refactor parsing functions in query handlers The parsing functions in query handlers have been refactored to simplify the process. Parsing code has been extracted into dedicated functions like 'parseIntWithDefault' and 'parseFloatWithDefault', and they now reside in a new utils file. This modularization improves readability and maintainability of the code. Additionally, documentation is updated to reflect the changes. * Refactor parsing functions in ctx.go The parsing functions have been restructured to enhance readability and reduce repetition in the ctx.go file. This was achieved by creating generalised parsing functions that handle defaults and ensure the correct value type is returned. As a result, various single-use parsing functions in the utils.go file have been removed. * Refactor code to centralize parsing functions
1 parent 603fbde commit 9a56a1b

File tree

13 files changed

+597
-203
lines changed

13 files changed

+597
-203
lines changed

ctx.go

Lines changed: 83 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,7 @@ func (c *DefaultCtx) Protocol() string {
10051005
// Returned value is only valid within the handler. Do not store any references.
10061006
// Make copies or use the Immutable setting to use the value outside the Handler.
10071007
func (c *DefaultCtx) Query(key string, defaultValue ...string) string {
1008-
return defaultString(c.app.getString(c.fasthttp.QueryArgs().Peek(key)), defaultValue)
1008+
return Query[string](c, key, defaultValue...)
10091009
}
10101010

10111011
// Queries returns a map of query parameters and their values.
@@ -1037,67 +1037,98 @@ func (c *DefaultCtx) Queries() map[string]string {
10371037
return m
10381038
}
10391039

1040-
// QueryInt returns integer value of key string parameter in the url.
1041-
// Default to empty or invalid key is 0.
1040+
// Query Retrieves the value of a query parameter from the request's URI.
1041+
// The function is generic and can handle query parameter values of different types.
1042+
// It takes the following parameters:
1043+
// - c: The context object representing the current request.
1044+
// - key: The name of the query parameter.
1045+
// - defaultValue: (Optional) The default value to return in case the query parameter is not found or cannot be parsed.
1046+
// The function performs the following steps:
1047+
// 1. Type-asserts the context object to *DefaultCtx.
1048+
// 2. Retrieves the raw query parameter value from the request's URI.
1049+
// 3. Parses the raw value into the appropriate type based on the generic type parameter V.
1050+
// If parsing fails, the function checks if a default value is provided. If so, it returns the default value.
1051+
// 4. Returns the parsed value.
10421052
//
1043-
// GET /?name=alex&wanna_cake=2&id=
1044-
// QueryInt("wanna_cake", 1) == 2
1045-
// QueryInt("name", 1) == 1
1046-
// QueryInt("id", 1) == 1
1047-
// QueryInt("id") == 0
1048-
func (c *DefaultCtx) QueryInt(key string, defaultValue ...int) int {
1049-
// Use Atoi to convert the param to an int or return zero and an error
1050-
value, err := strconv.Atoi(c.app.getString(c.fasthttp.QueryArgs().Peek(key)))
1051-
if err != nil {
1053+
// If the generic type cannot be matched to a supported type, the function returns the default value (if provided) or the zero value of type V.
1054+
//
1055+
// Example usage:
1056+
//
1057+
// GET /?search=john&age=8
1058+
// name := Query[string](c, "search") // Returns "john"
1059+
// age := Query[int](c, "age") // Returns 8
1060+
// unknown := Query[string](c, "unknown", "default") // Returns "default" since the query parameter "unknown" is not found
1061+
func Query[V QueryType](c Ctx, key string, defaultValue ...V) V {
1062+
ctx, ok := c.(*DefaultCtx)
1063+
if !ok {
1064+
panic(fmt.Errorf("failed to type-assert to *DefaultCtx"))
1065+
}
1066+
var v V
1067+
q := ctx.app.getString(ctx.fasthttp.QueryArgs().Peek(key))
1068+
1069+
switch any(v).(type) {
1070+
case int:
1071+
return queryParseInt[V](q, 32, func(i int64) V { return assertValueType[V, int](int(i)) }, defaultValue...)
1072+
case int8:
1073+
return queryParseInt[V](q, 8, func(i int64) V { return assertValueType[V, int8](int8(i)) }, defaultValue...)
1074+
case int16:
1075+
return queryParseInt[V](q, 16, func(i int64) V { return assertValueType[V, int16](int16(i)) }, defaultValue...)
1076+
case int32:
1077+
return queryParseInt[V](q, 32, func(i int64) V { return assertValueType[V, int32](int32(i)) }, defaultValue...)
1078+
case int64:
1079+
return queryParseInt[V](q, 64, func(i int64) V { return assertValueType[V, int64](i) }, defaultValue...)
1080+
case uint:
1081+
return queryParseUint[V](q, 32, func(i uint64) V { return assertValueType[V, uint](uint(i)) }, defaultValue...)
1082+
case uint8:
1083+
return queryParseUint[V](q, 8, func(i uint64) V { return assertValueType[V, uint8](uint8(i)) }, defaultValue...)
1084+
case uint16:
1085+
return queryParseUint[V](q, 16, func(i uint64) V { return assertValueType[V, uint16](uint16(i)) }, defaultValue...)
1086+
case uint32:
1087+
return queryParseUint[V](q, 32, func(i uint64) V { return assertValueType[V, uint32](uint32(i)) }, defaultValue...)
1088+
case uint64:
1089+
return queryParseUint[V](q, 64, func(i uint64) V { return assertValueType[V, uint64](i) }, defaultValue...)
1090+
case float32:
1091+
return queryParseFloat[V](q, 32, func(i float64) V { return assertValueType[V, float32](float32(i)) }, defaultValue...)
1092+
case float64:
1093+
return queryParseFloat[V](q, 64, func(i float64) V { return assertValueType[V, float64](i) }, defaultValue...)
1094+
case bool:
1095+
return queryParseBool[V](q, func(b bool) V { return assertValueType[V, bool](b) }, defaultValue...)
1096+
case string:
1097+
if q == "" && len(defaultValue) > 0 {
1098+
return defaultValue[0]
1099+
}
1100+
return assertValueType[V, string](q)
1101+
case []byte:
1102+
if q == "" && len(defaultValue) > 0 {
1103+
return defaultValue[0]
1104+
}
1105+
return assertValueType[V, []byte](ctx.app.getBytes(q))
1106+
default:
10521107
if len(defaultValue) > 0 {
10531108
return defaultValue[0]
10541109
}
1055-
return 0
1110+
return v
10561111
}
1112+
}
10571113

1058-
return value
1114+
type QueryType interface {
1115+
QueryTypeInteger | QueryTypeFloat | bool | string | []byte
10591116
}
10601117

1061-
// QueryBool returns bool value of key string parameter in the url.
1062-
// Default to empty or invalid key is true.
1063-
//
1064-
// Get /?name=alex&want_pizza=false&id=
1065-
// QueryBool("want_pizza") == false
1066-
// QueryBool("want_pizza", true) == false
1067-
// QueryBool("name") == false
1068-
// QueryBool("name", true) == true
1069-
// QueryBool("id") == false
1070-
// QueryBool("id", true) == true
1071-
func (c *DefaultCtx) QueryBool(key string, defaultValue ...bool) bool {
1072-
value, err := strconv.ParseBool(c.app.getString(c.fasthttp.QueryArgs().Peek(key)))
1073-
if err != nil {
1074-
if len(defaultValue) > 0 {
1075-
return defaultValue[0]
1076-
}
1077-
return false
1078-
}
1079-
return value
1118+
type QueryTypeInteger interface {
1119+
QueryTypeIntegerSigned | QueryTypeIntegerUnsigned
10801120
}
10811121

1082-
// QueryFloat returns float64 value of key string parameter in the url.
1083-
// Default to empty or invalid key is 0.
1084-
//
1085-
// GET /?name=alex&amount=32.23&id=
1086-
// QueryFloat("amount") = 32.23
1087-
// QueryFloat("amount", 3) = 32.23
1088-
// QueryFloat("name", 1) = 1
1089-
// QueryFloat("name") = 0
1090-
// QueryFloat("id", 3) = 3
1091-
func (c *DefaultCtx) QueryFloat(key string, defaultValue ...float64) float64 {
1092-
// use strconv.ParseFloat to convert the param to a float or return zero and an error.
1093-
value, err := strconv.ParseFloat(c.app.getString(c.fasthttp.QueryArgs().Peek(key)), 64)
1094-
if err != nil {
1095-
if len(defaultValue) > 0 {
1096-
return defaultValue[0]
1097-
}
1098-
return 0
1099-
}
1100-
return value
1122+
type QueryTypeIntegerSigned interface {
1123+
int | int8 | int16 | int32 | int64
1124+
}
1125+
1126+
type QueryTypeIntegerUnsigned interface {
1127+
uint | uint8 | uint16 | uint32 | uint64
1128+
}
1129+
1130+
type QueryTypeFloat interface {
1131+
float32 | float64
11011132
}
11021133

11031134
// Range returns a struct containing the type and a slice of ranges.

ctx_interface.go

Lines changed: 6 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -232,13 +232,6 @@ type Ctx interface {
232232
// Protocol returns the HTTP protocol of request: HTTP/1.1 and HTTP/2.
233233
Protocol() string
234234

235-
// Query returns the query string parameter in the url.
236-
// Defaults to empty string "" if the query doesn't exist.
237-
// If a default value is given, it will return that value if the query doesn't exist.
238-
// Returned value is only valid within the handler. Do not store any references.
239-
// Make copies or use the Immutable setting to use the value outside the Handler.
240-
Query(key string, defaultValue ...string) string
241-
242235
// Queries returns a map of query parameters and their values.
243236
//
244237
// GET /?name=alex&wanna_cake=2&id=
@@ -262,38 +255,12 @@ type Ctx interface {
262255
// Queries()["filters[status]"] == "pending"
263256
Queries() map[string]string
264257

265-
// QueryInt returns integer value of key string parameter in the url.
266-
// Default to empty or invalid key is 0.
267-
//
268-
// GET /?name=alex&wanna_cake=2&id=
269-
// QueryInt("wanna_cake", 1) == 2
270-
// QueryInt("name", 1) == 1
271-
// QueryInt("id", 1) == 1
272-
// QueryInt("id") == 0
273-
QueryInt(key string, defaultValue ...int) int
274-
275-
// QueryBool returns bool value of key string parameter in the url.
276-
// Default to empty or invalid key is true.
277-
//
278-
// Get /?name=alex&want_pizza=false&id=
279-
// QueryBool("want_pizza") == false
280-
// QueryBool("want_pizza", true) == false
281-
// QueryBool("name") == false
282-
// QueryBool("name", true) == true
283-
// QueryBool("id") == false
284-
// QueryBool("id", true) == true
285-
QueryBool(key string, defaultValue ...bool) bool
286-
287-
// QueryFloat returns float64 value of key string parameter in the url.
288-
// Default to empty or invalid key is 0.
289-
//
290-
// GET /?name=alex&amount=32.23&id=
291-
// QueryFloat("amount") = 32.23
292-
// QueryFloat("amount", 3) = 32.23
293-
// QueryFloat("name", 1) = 1
294-
// QueryFloat("name") = 0
295-
// QueryFloat("id", 3) = 3
296-
QueryFloat(key string, defaultValue ...float64) float64
258+
// Query returns the query string parameter in the url.
259+
// Defaults to empty string "" if the query doesn't exist.
260+
// If a default value is given, it will return that value if the query doesn't exist.
261+
// Returned value is only valid within the handler. Do not store any references.
262+
// Make copies or use the Immutable setting to use the value outside the Handler.
263+
Query(key string, defaultValue ...string) string
297264

298265
// Range returns a struct containing the type and a slice of ranges.
299266
Range(size int) (rangeData Range, err error)

0 commit comments

Comments
 (0)