mirror of
https://gitee.com/johng/gf
synced 2026-06-06 02:25:47 +08:00
This pull request standardizes the use of the Go 1.18+ `any` type alias
instead of `interface{}` throughout the codebase. The change improves
code readability and aligns with modern Go best practices. The update
touches many files, including core data structures, code generation
templates, logging utilities, and test data, ensuring consistency across
all usages.
**Type alias migration to `any`:**
* Replaced all instances of `interface{}` with `any` in core data
structures such as `garray` and in generated model structs (e.g.,
`TableUser`, `User1`, `User2`) to modernize type usage.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[3]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[4]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[5]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[6]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
* Updated function signatures, method parameters, and return types from
`interface{}` to `any` in various parts of the codebase, including code
generation, service logic, and logging utilities (e.g., `mlog`).
[[1]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[2]](diffhunk://#diff-2b1953fb78cf3593d8c2c7d911e95b65fd0b847c30ed0b4d167d16fe6d781235L54-R74)
[[3]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[4]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
[[5]](diffhunk://#diff-c5d51d56f487779a2b6207c7ad26c7a20bbadcc846ce094fe60ab4cabff58c51L107-R107)
[[6]](diffhunk://#diff-f96e6a9fdb416eb1804ceaba1fe0ac637bff22c43837f8bb849c2366ce72d4a1L116-R121)
[[7]](diffhunk://#diff-f94c83a1b08ae060d9346f4a6031fc4a7b9a0b894e02d9afaa09018b6598eac0L112-R112)
[[8]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L36-R36)
[[9]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L74-R74)
[[10]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L96-R96)
**Generated code and templates:**
* Adjusted generated files and code generation templates to output `any`
instead of `interface{}` for relevant struct fields and function
signatures, ensuring that new code generation aligns with the updated
convention.
[[1]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[2]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[3]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[4]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[5]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
[[6]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[7]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[8]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
**Container and utility updates:**
* Refactored the `garray` container implementation and related
constructors/methods to use `[]any` instead of `[]interface{}`, along
with corresponding function signatures.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L52-R52)
[[3]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L62-R62)
[[4]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L73-R86)
[[5]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L96-R97)
[[6]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L107-R114)
[[7]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L124-R124)
[[8]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L135-R143)
[[9]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L167-R167)
These changes collectively modernize the codebase and prepare it for
future Go developments by using the idiomatic `any` type.
182 lines
4.0 KiB
Go
182 lines
4.0 KiB
Go
// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
|
|
//
|
|
// This Source Code Form is subject to the terms of the MIT License.
|
|
// If a copy of the MIT was not distributed with this file,
|
|
// You can obtain one at https://github.com/gogf/gf.
|
|
|
|
package gstr
|
|
|
|
import (
|
|
"net/url"
|
|
"strings"
|
|
|
|
"github.com/gogf/gf/v2/errors/gcode"
|
|
"github.com/gogf/gf/v2/errors/gerror"
|
|
)
|
|
|
|
// Parse parses the string into map[string]any.
|
|
//
|
|
// v1=m&v2=n -> map[v1:m v2:n]
|
|
// v[a]=m&v[b]=n -> map[v:map[a:m b:n]]
|
|
// v[a][a]=m&v[a][b]=n -> map[v:map[a:map[a:m b:n]]]
|
|
// v[]=m&v[]=n -> map[v:[m n]]
|
|
// v[a][]=m&v[a][]=n -> map[v:map[a:[m n]]]
|
|
// v[][]=m&v[][]=n -> map[v:[map[]]] // Currently does not support nested slice.
|
|
// v=m&v[a]=n -> error
|
|
// a .[[b=c -> map[a___[b:c]
|
|
func Parse(s string) (result map[string]any, err error) {
|
|
if s == "" {
|
|
return nil, nil
|
|
}
|
|
result = make(map[string]any)
|
|
parts := strings.Split(s, "&")
|
|
for _, part := range parts {
|
|
pos := strings.Index(part, "=")
|
|
if pos <= 0 {
|
|
continue
|
|
}
|
|
key, err := url.QueryUnescape(part[:pos])
|
|
if err != nil {
|
|
err = gerror.Wrapf(err, `url.QueryUnescape failed for string "%s"`, part[:pos])
|
|
return nil, err
|
|
}
|
|
|
|
for len(key) > 0 && key[0] == ' ' {
|
|
key = key[1:]
|
|
}
|
|
|
|
if key == "" || key[0] == '[' {
|
|
continue
|
|
}
|
|
value, err := url.QueryUnescape(part[pos+1:])
|
|
if err != nil {
|
|
err = gerror.Wrapf(err, `url.QueryUnescape failed for string "%s"`, part[pos+1:])
|
|
return nil, err
|
|
}
|
|
// split into multiple keys
|
|
var keys []string
|
|
left := 0
|
|
for i, k := range key {
|
|
if k == '[' && left == 0 {
|
|
left = i
|
|
} else if k == ']' {
|
|
if left > 0 {
|
|
if len(keys) == 0 {
|
|
keys = append(keys, key[:left])
|
|
}
|
|
keys = append(keys, key[left+1:i])
|
|
left = 0
|
|
if i+1 < len(key) && key[i+1] != '[' {
|
|
break
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if len(keys) == 0 {
|
|
keys = append(keys, key)
|
|
}
|
|
// first key
|
|
first := ""
|
|
for i, chr := range keys[0] {
|
|
if chr == ' ' || chr == '.' || chr == '[' {
|
|
first += "_"
|
|
} else {
|
|
first += string(chr)
|
|
}
|
|
if chr == '[' {
|
|
first += keys[0][i+1:]
|
|
break
|
|
}
|
|
}
|
|
keys[0] = first
|
|
|
|
// build nested map
|
|
if err = build(result, keys, value); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
return result, nil
|
|
}
|
|
|
|
// build nested map.
|
|
func build(result map[string]any, keys []string, value any) error {
|
|
var (
|
|
length = len(keys)
|
|
key = strings.Trim(keys[0], "'\"")
|
|
)
|
|
if length == 1 {
|
|
result[key] = value
|
|
return nil
|
|
}
|
|
|
|
// The end is slice. like f[], f[a][]
|
|
if keys[1] == "" && length == 2 {
|
|
// TODO nested slice
|
|
if key == "" {
|
|
return nil
|
|
}
|
|
val, ok := result[key]
|
|
if !ok {
|
|
result[key] = []any{value}
|
|
return nil
|
|
}
|
|
children, ok := val.([]any)
|
|
if !ok {
|
|
return gerror.NewCodef(
|
|
gcode.CodeInvalidParameter,
|
|
"expected type '[]any' for key '%s', but got '%T'",
|
|
key, val,
|
|
)
|
|
}
|
|
result[key] = append(children, value)
|
|
return nil
|
|
}
|
|
// The end is slice + map. like v[][a]
|
|
if keys[1] == "" && length > 2 && keys[2] != "" {
|
|
val, ok := result[key]
|
|
if !ok {
|
|
result[key] = []any{}
|
|
val = result[key]
|
|
}
|
|
children, ok := val.([]any)
|
|
if !ok {
|
|
return gerror.NewCodef(
|
|
gcode.CodeInvalidParameter,
|
|
"expected type '[]any' for key '%s', but got '%T'",
|
|
key, val,
|
|
)
|
|
}
|
|
if l := len(children); l > 0 {
|
|
if child, ok := children[l-1].(map[string]any); ok {
|
|
if _, ok := child[keys[2]]; !ok {
|
|
_ = build(child, keys[2:], value)
|
|
return nil
|
|
}
|
|
}
|
|
}
|
|
child := map[string]any{}
|
|
_ = build(child, keys[2:], value)
|
|
result[key] = append(children, child)
|
|
return nil
|
|
}
|
|
|
|
// map, like v[a], v[a][b]
|
|
val, ok := result[key]
|
|
if !ok {
|
|
result[key] = map[string]any{}
|
|
val = result[key]
|
|
}
|
|
children, ok := val.(map[string]any)
|
|
if !ok {
|
|
return gerror.NewCodef(
|
|
gcode.CodeInvalidParameter,
|
|
"expected type 'map[string]any' for key '%s', but got '%T'",
|
|
key, val,
|
|
)
|
|
}
|
|
if err := build(children, keys[1:], value); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|