2021-01-17 21:46:25 +08:00
|
|
|
// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
|
2020-03-19 11:37:31 +08:00
|
|
|
//
|
|
|
|
|
// 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 gutil
|
|
|
|
|
|
|
|
|
|
import (
|
|
|
|
|
"bytes"
|
2023-05-24 10:04:19 +08:00
|
|
|
"encoding/json"
|
2020-03-19 11:37:31 +08:00
|
|
|
"fmt"
|
2021-11-16 20:41:31 +08:00
|
|
|
"io"
|
2020-03-19 11:37:31 +08:00
|
|
|
"reflect"
|
2021-11-03 13:27:37 +08:00
|
|
|
"strings"
|
2021-11-13 23:30:31 +08:00
|
|
|
|
2022-03-11 10:24:42 +08:00
|
|
|
"github.com/gogf/gf/v2/internal/reflection"
|
2021-11-24 16:17:50 +08:00
|
|
|
"github.com/gogf/gf/v2/os/gstructs"
|
2021-11-13 23:30:31 +08:00
|
|
|
"github.com/gogf/gf/v2/text/gstr"
|
2020-03-19 11:37:31 +08:00
|
|
|
)
|
|
|
|
|
|
2021-11-07 00:32:16 +08:00
|
|
|
// iString is used for type assert api for String().
|
|
|
|
|
type iString interface {
|
|
|
|
|
String() string
|
|
|
|
|
}
|
|
|
|
|
|
2021-11-22 20:28:47 +08:00
|
|
|
// iError is used for type assert api for Error().
|
|
|
|
|
type iError interface {
|
|
|
|
|
Error() string
|
|
|
|
|
}
|
|
|
|
|
|
2021-11-07 00:32:16 +08:00
|
|
|
// iMarshalJSON is the interface for custom Json marshaling.
|
|
|
|
|
type iMarshalJSON interface {
|
|
|
|
|
MarshalJSON() ([]byte, error)
|
|
|
|
|
}
|
|
|
|
|
|
2021-11-18 15:20:37 +08:00
|
|
|
// DumpOption specifies the behavior of function Export.
|
|
|
|
|
type DumpOption struct {
|
2022-04-15 18:00:16 +08:00
|
|
|
WithType bool // WithType specifies dumping content with type information.
|
|
|
|
|
ExportedOnly bool // Only dump Exported fields for structs.
|
2021-10-21 22:07:43 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Dump prints variables `values` to stdout with more manually readable.
|
refactor: interface{} to any and reflect.Ptr to reflect.Pointer (#4395)
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.
2025-08-28 16:53:19 +08:00
|
|
|
func Dump(values ...any) {
|
2021-10-21 22:07:43 +08:00
|
|
|
for _, value := range values {
|
2021-11-18 15:25:24 +08:00
|
|
|
DumpWithOption(value, DumpOption{
|
2022-04-15 18:00:16 +08:00
|
|
|
WithType: false,
|
|
|
|
|
ExportedOnly: false,
|
2021-11-18 15:25:24 +08:00
|
|
|
})
|
2021-10-21 22:07:43 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2021-10-30 20:35:55 +08:00
|
|
|
// DumpWithType acts like Dump, but with type information.
|
2021-10-21 22:07:43 +08:00
|
|
|
// Also see Dump.
|
refactor: interface{} to any and reflect.Ptr to reflect.Pointer (#4395)
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.
2025-08-28 16:53:19 +08:00
|
|
|
func DumpWithType(values ...any) {
|
2021-10-21 22:07:43 +08:00
|
|
|
for _, value := range values {
|
2021-11-18 15:25:24 +08:00
|
|
|
DumpWithOption(value, DumpOption{
|
2022-04-15 18:00:16 +08:00
|
|
|
WithType: true,
|
|
|
|
|
ExportedOnly: false,
|
2021-11-18 15:25:24 +08:00
|
|
|
})
|
2020-03-19 11:37:31 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2021-11-18 15:20:37 +08:00
|
|
|
// DumpWithOption returns variables `values` as a string with more manually readable.
|
refactor: interface{} to any and reflect.Ptr to reflect.Pointer (#4395)
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.
2025-08-28 16:53:19 +08:00
|
|
|
func DumpWithOption(value any, option DumpOption) {
|
2020-03-19 11:37:31 +08:00
|
|
|
buffer := bytes.NewBuffer(nil)
|
2021-11-18 15:20:37 +08:00
|
|
|
DumpTo(buffer, value, DumpOption{
|
2022-04-15 18:00:16 +08:00
|
|
|
WithType: option.WithType,
|
|
|
|
|
ExportedOnly: option.ExportedOnly,
|
2021-10-21 22:07:43 +08:00
|
|
|
})
|
2021-11-18 15:25:24 +08:00
|
|
|
fmt.Println(buffer.String())
|
2021-10-21 22:07:43 +08:00
|
|
|
}
|
|
|
|
|
|
2021-11-18 15:20:37 +08:00
|
|
|
// DumpTo writes variables `values` as a string in to `writer` with more manually readable
|
refactor: interface{} to any and reflect.Ptr to reflect.Pointer (#4395)
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.
2025-08-28 16:53:19 +08:00
|
|
|
func DumpTo(writer io.Writer, value any, option DumpOption) {
|
2021-11-16 20:41:31 +08:00
|
|
|
buffer := bytes.NewBuffer(nil)
|
2021-11-18 15:20:37 +08:00
|
|
|
doDump(value, "", buffer, doDumpOption{
|
2022-04-15 18:00:16 +08:00
|
|
|
WithType: option.WithType,
|
|
|
|
|
ExportedOnly: option.ExportedOnly,
|
2021-11-16 20:41:31 +08:00
|
|
|
})
|
|
|
|
|
_, _ = writer.Write(buffer.Bytes())
|
|
|
|
|
}
|
|
|
|
|
|
2021-11-18 15:20:37 +08:00
|
|
|
type doDumpOption struct {
|
2022-12-22 14:43:02 +08:00
|
|
|
WithType bool
|
|
|
|
|
ExportedOnly bool
|
|
|
|
|
DumpedPointerSet map[string]struct{}
|
2021-10-21 22:07:43 +08:00
|
|
|
}
|
|
|
|
|
|
refactor: interface{} to any and reflect.Ptr to reflect.Pointer (#4395)
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.
2025-08-28 16:53:19 +08:00
|
|
|
func doDump(value any, indent string, buffer *bytes.Buffer, option doDumpOption) {
|
2022-12-22 14:43:02 +08:00
|
|
|
if option.DumpedPointerSet == nil {
|
|
|
|
|
option.DumpedPointerSet = map[string]struct{}{}
|
|
|
|
|
}
|
|
|
|
|
|
2022-03-10 21:12:24 +08:00
|
|
|
if value == nil {
|
|
|
|
|
buffer.WriteString(`<nil>`)
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
var reflectValue reflect.Value
|
|
|
|
|
if v, ok := value.(reflect.Value); ok {
|
|
|
|
|
reflectValue = v
|
2022-03-11 15:26:01 +08:00
|
|
|
if v.IsValid() && v.CanInterface() {
|
2022-03-10 21:12:24 +08:00
|
|
|
value = v.Interface()
|
|
|
|
|
} else {
|
2022-03-11 10:24:42 +08:00
|
|
|
if convertedValue, ok := reflection.ValueToInterface(v); ok {
|
2022-03-10 21:12:24 +08:00
|
|
|
value = convertedValue
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
reflectValue = reflect.ValueOf(value)
|
|
|
|
|
}
|
2023-04-12 10:14:14 +08:00
|
|
|
var reflectKind = reflectValue.Kind()
|
2022-03-10 21:12:24 +08:00
|
|
|
// Double check nil value.
|
2023-04-12 10:14:14 +08:00
|
|
|
if value == nil || reflectKind == reflect.Invalid {
|
2021-11-03 13:27:37 +08:00
|
|
|
buffer.WriteString(`<nil>`)
|
|
|
|
|
return
|
|
|
|
|
}
|
2021-10-21 22:07:43 +08:00
|
|
|
var (
|
2022-03-10 21:12:24 +08:00
|
|
|
reflectTypeName = reflectValue.Type().String()
|
2022-12-22 14:43:02 +08:00
|
|
|
ptrAddress string
|
2021-10-21 22:07:43 +08:00
|
|
|
newIndent = indent + dumpIndent
|
|
|
|
|
)
|
2021-11-03 13:27:37 +08:00
|
|
|
reflectTypeName = strings.ReplaceAll(reflectTypeName, `[]uint8`, `[]byte`)
|
refactor: interface{} to any and reflect.Ptr to reflect.Pointer (#4395)
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.
2025-08-28 16:53:19 +08:00
|
|
|
for reflectKind == reflect.Pointer {
|
2022-12-22 14:43:02 +08:00
|
|
|
if ptrAddress == "" {
|
|
|
|
|
ptrAddress = fmt.Sprintf(`0x%x`, reflectValue.Pointer())
|
|
|
|
|
}
|
2021-10-21 22:07:43 +08:00
|
|
|
reflectValue = reflectValue.Elem()
|
|
|
|
|
reflectKind = reflectValue.Kind()
|
|
|
|
|
}
|
2021-11-18 15:20:37 +08:00
|
|
|
var (
|
|
|
|
|
exportInternalInput = doDumpInternalInput{
|
2022-12-22 14:43:02 +08:00
|
|
|
Value: value,
|
|
|
|
|
Indent: indent,
|
|
|
|
|
NewIndent: newIndent,
|
|
|
|
|
Buffer: buffer,
|
|
|
|
|
Option: option,
|
|
|
|
|
PtrAddress: ptrAddress,
|
|
|
|
|
ReflectValue: reflectValue,
|
|
|
|
|
ReflectTypeName: reflectTypeName,
|
|
|
|
|
ExportedOnly: option.ExportedOnly,
|
|
|
|
|
DumpedPointerSet: option.DumpedPointerSet,
|
2021-11-18 15:20:37 +08:00
|
|
|
}
|
|
|
|
|
)
|
2021-10-21 22:07:43 +08:00
|
|
|
switch reflectKind {
|
|
|
|
|
case reflect.Slice, reflect.Array:
|
2021-11-18 15:20:37 +08:00
|
|
|
doDumpSlice(exportInternalInput)
|
|
|
|
|
|
|
|
|
|
case reflect.Map:
|
|
|
|
|
doDumpMap(exportInternalInput)
|
|
|
|
|
|
|
|
|
|
case reflect.Struct:
|
|
|
|
|
doDumpStruct(exportInternalInput)
|
|
|
|
|
|
|
|
|
|
case reflect.String:
|
|
|
|
|
doDumpString(exportInternalInput)
|
|
|
|
|
|
|
|
|
|
case reflect.Bool:
|
2021-11-22 23:05:32 +08:00
|
|
|
doDumpBool(exportInternalInput)
|
2021-11-18 15:20:37 +08:00
|
|
|
|
|
|
|
|
case
|
|
|
|
|
reflect.Int,
|
|
|
|
|
reflect.Int8,
|
|
|
|
|
reflect.Int16,
|
|
|
|
|
reflect.Int32,
|
|
|
|
|
reflect.Int64,
|
|
|
|
|
reflect.Uint,
|
|
|
|
|
reflect.Uint8,
|
|
|
|
|
reflect.Uint16,
|
|
|
|
|
reflect.Uint32,
|
|
|
|
|
reflect.Uint64,
|
|
|
|
|
reflect.Float32,
|
|
|
|
|
reflect.Float64,
|
|
|
|
|
reflect.Complex64,
|
|
|
|
|
reflect.Complex128:
|
|
|
|
|
doDumpNumber(exportInternalInput)
|
|
|
|
|
|
|
|
|
|
case reflect.Chan:
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Fprintf(buffer, `<%s>`, reflectValue.Type().String())
|
2021-11-18 15:20:37 +08:00
|
|
|
|
|
|
|
|
case reflect.Func:
|
2021-11-23 20:26:55 +08:00
|
|
|
if reflectValue.IsNil() || !reflectValue.IsValid() {
|
|
|
|
|
buffer.WriteString(`<nil>`)
|
|
|
|
|
} else {
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Fprintf(buffer, `<%s>`, reflectValue.Type().String())
|
2021-11-23 20:26:55 +08:00
|
|
|
}
|
2021-11-18 15:20:37 +08:00
|
|
|
|
2022-03-10 22:29:47 +08:00
|
|
|
case reflect.Interface:
|
|
|
|
|
doDump(exportInternalInput.ReflectValue.Elem(), indent, buffer, option)
|
|
|
|
|
|
2021-11-18 15:20:37 +08:00
|
|
|
default:
|
|
|
|
|
doDumpDefault(exportInternalInput)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
type doDumpInternalInput struct {
|
refactor: interface{} to any and reflect.Ptr to reflect.Pointer (#4395)
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.
2025-08-28 16:53:19 +08:00
|
|
|
Value any
|
2022-12-22 14:43:02 +08:00
|
|
|
Indent string
|
|
|
|
|
NewIndent string
|
|
|
|
|
Buffer *bytes.Buffer
|
|
|
|
|
Option doDumpOption
|
|
|
|
|
ReflectValue reflect.Value
|
|
|
|
|
ReflectTypeName string
|
|
|
|
|
PtrAddress string
|
|
|
|
|
ExportedOnly bool
|
|
|
|
|
DumpedPointerSet map[string]struct{}
|
2021-11-18 15:20:37 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func doDumpSlice(in doDumpInternalInput) {
|
|
|
|
|
if b, ok := in.Value.([]byte); ok {
|
2021-11-18 20:07:24 +08:00
|
|
|
if !in.Option.WithType {
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Fprintf(in.Buffer, `"%s"`, addSlashesForString(string(b)))
|
2021-10-21 22:07:43 +08:00
|
|
|
} else {
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Fprintf(in.Buffer, `%s(%d) "%s"`, in.ReflectTypeName, len(string(b)), string(b))
|
2021-10-21 22:07:43 +08:00
|
|
|
}
|
2021-11-18 15:20:37 +08:00
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
if in.ReflectValue.Len() == 0 {
|
2021-11-18 20:07:24 +08:00
|
|
|
if !in.Option.WithType {
|
2021-11-18 15:20:37 +08:00
|
|
|
in.Buffer.WriteString("[]")
|
|
|
|
|
} else {
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Fprintf(in.Buffer, "%s(0) []", in.ReflectTypeName)
|
2021-10-21 22:07:43 +08:00
|
|
|
}
|
2021-11-18 15:20:37 +08:00
|
|
|
return
|
|
|
|
|
}
|
2021-11-18 20:07:24 +08:00
|
|
|
if !in.Option.WithType {
|
2021-11-18 15:20:37 +08:00
|
|
|
in.Buffer.WriteString("[\n")
|
|
|
|
|
} else {
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Fprintf(in.Buffer, "%s(%d) [\n", in.ReflectTypeName, in.ReflectValue.Len())
|
2021-11-18 15:20:37 +08:00
|
|
|
}
|
|
|
|
|
for i := 0; i < in.ReflectValue.Len(); i++ {
|
|
|
|
|
in.Buffer.WriteString(in.NewIndent)
|
2022-03-10 21:12:24 +08:00
|
|
|
doDump(in.ReflectValue.Index(i), in.NewIndent, in.Buffer, in.Option)
|
2021-11-18 15:20:37 +08:00
|
|
|
in.Buffer.WriteString(",\n")
|
|
|
|
|
}
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Fprintf(in.Buffer, "%s]", in.Indent)
|
2021-11-18 15:20:37 +08:00
|
|
|
}
|
2021-10-21 22:07:43 +08:00
|
|
|
|
2021-11-18 15:20:37 +08:00
|
|
|
func doDumpMap(in doDumpInternalInput) {
|
2022-04-15 18:00:16 +08:00
|
|
|
var mapKeys = make([]reflect.Value, 0)
|
|
|
|
|
for _, key := range in.ReflectValue.MapKeys() {
|
|
|
|
|
if !key.CanInterface() {
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
mapKey := key
|
|
|
|
|
mapKeys = append(mapKeys, mapKey)
|
|
|
|
|
}
|
2021-11-18 15:20:37 +08:00
|
|
|
if len(mapKeys) == 0 {
|
2021-11-18 20:07:24 +08:00
|
|
|
if !in.Option.WithType {
|
2021-11-18 15:20:37 +08:00
|
|
|
in.Buffer.WriteString("{}")
|
|
|
|
|
} else {
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Fprintf(in.Buffer, "%s(0) {}", in.ReflectTypeName)
|
2021-10-21 22:07:43 +08:00
|
|
|
}
|
2021-11-18 15:20:37 +08:00
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
var (
|
|
|
|
|
maxSpaceNum = 0
|
|
|
|
|
tmpSpaceNum = 0
|
|
|
|
|
mapKeyStr = ""
|
|
|
|
|
)
|
|
|
|
|
for _, key := range mapKeys {
|
|
|
|
|
tmpSpaceNum = len(fmt.Sprintf(`%v`, key.Interface()))
|
|
|
|
|
if tmpSpaceNum > maxSpaceNum {
|
|
|
|
|
maxSpaceNum = tmpSpaceNum
|
2021-10-21 22:07:43 +08:00
|
|
|
}
|
2021-11-18 15:20:37 +08:00
|
|
|
}
|
2021-11-18 20:07:24 +08:00
|
|
|
if !in.Option.WithType {
|
2021-11-18 15:20:37 +08:00
|
|
|
in.Buffer.WriteString("{\n")
|
|
|
|
|
} else {
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Fprintf(in.Buffer, "%s(%d) {\n", in.ReflectTypeName, len(mapKeys))
|
2021-11-18 15:20:37 +08:00
|
|
|
}
|
|
|
|
|
for _, mapKey := range mapKeys {
|
|
|
|
|
tmpSpaceNum = len(fmt.Sprintf(`%v`, mapKey.Interface()))
|
|
|
|
|
if mapKey.Kind() == reflect.String {
|
|
|
|
|
mapKeyStr = fmt.Sprintf(`"%v"`, mapKey.Interface())
|
2021-10-21 22:07:43 +08:00
|
|
|
} else {
|
2021-11-18 15:20:37 +08:00
|
|
|
mapKeyStr = fmt.Sprintf(`%v`, mapKey.Interface())
|
2021-10-21 22:07:43 +08:00
|
|
|
}
|
2021-11-22 20:28:47 +08:00
|
|
|
// Map key and indent string dump.
|
2021-11-18 20:07:24 +08:00
|
|
|
if !in.Option.WithType {
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Fprintf(
|
|
|
|
|
in.Buffer,
|
2021-11-18 15:20:37 +08:00
|
|
|
"%s%v:%s",
|
|
|
|
|
in.NewIndent,
|
|
|
|
|
mapKeyStr,
|
|
|
|
|
strings.Repeat(" ", maxSpaceNum-tmpSpaceNum+1),
|
2025-08-29 10:32:30 +08:00
|
|
|
)
|
2021-11-18 15:20:37 +08:00
|
|
|
} else {
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Fprintf(
|
|
|
|
|
in.Buffer,
|
2021-11-18 15:20:37 +08:00
|
|
|
"%s%s(%v):%s",
|
|
|
|
|
in.NewIndent,
|
|
|
|
|
mapKey.Type().String(),
|
|
|
|
|
mapKeyStr,
|
|
|
|
|
strings.Repeat(" ", maxSpaceNum-tmpSpaceNum+1),
|
2025-08-29 10:32:30 +08:00
|
|
|
)
|
2021-10-21 22:07:43 +08:00
|
|
|
}
|
2021-11-22 20:28:47 +08:00
|
|
|
// Map value dump.
|
2022-03-10 21:12:24 +08:00
|
|
|
doDump(in.ReflectValue.MapIndex(mapKey), in.NewIndent, in.Buffer, in.Option)
|
2021-11-18 15:20:37 +08:00
|
|
|
in.Buffer.WriteString(",\n")
|
|
|
|
|
}
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Fprintf(in.Buffer, "%s}", in.Indent)
|
2021-11-18 15:20:37 +08:00
|
|
|
}
|
2021-10-21 22:07:43 +08:00
|
|
|
|
2021-11-18 15:20:37 +08:00
|
|
|
func doDumpStruct(in doDumpInternalInput) {
|
2022-12-22 14:43:02 +08:00
|
|
|
if in.PtrAddress != "" {
|
|
|
|
|
if _, ok := in.DumpedPointerSet[in.PtrAddress]; ok {
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Fprintf(in.Buffer, `<cycle dump %s>`, in.PtrAddress)
|
2022-12-22 14:43:02 +08:00
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
in.DumpedPointerSet[in.PtrAddress] = struct{}{}
|
|
|
|
|
|
2021-11-24 16:17:50 +08:00
|
|
|
structFields, _ := gstructs.Fields(gstructs.FieldsInput{
|
2021-11-18 15:20:37 +08:00
|
|
|
Pointer: in.Value,
|
2021-11-24 16:17:50 +08:00
|
|
|
RecursiveOption: gstructs.RecursiveOptionEmbedded,
|
2021-11-18 15:20:37 +08:00
|
|
|
})
|
2022-03-10 22:29:47 +08:00
|
|
|
var (
|
|
|
|
|
hasNoExportedFields = true
|
|
|
|
|
_, isReflectValue = in.Value.(reflect.Value)
|
|
|
|
|
)
|
|
|
|
|
for _, field := range structFields {
|
|
|
|
|
if field.IsExported() {
|
|
|
|
|
hasNoExportedFields = false
|
|
|
|
|
break
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if !isReflectValue && (len(structFields) == 0 || hasNoExportedFields) {
|
2021-10-21 22:07:43 +08:00
|
|
|
var (
|
2021-11-18 15:20:37 +08:00
|
|
|
structContentStr = ""
|
|
|
|
|
attributeCountStr = "0"
|
2021-10-21 22:07:43 +08:00
|
|
|
)
|
2021-11-18 15:20:37 +08:00
|
|
|
if v, ok := in.Value.(iString); ok {
|
|
|
|
|
structContentStr = v.String()
|
2021-11-22 20:28:47 +08:00
|
|
|
} else if v, ok := in.Value.(iError); ok {
|
|
|
|
|
structContentStr = v.Error()
|
2021-11-18 15:20:37 +08:00
|
|
|
} else if v, ok := in.Value.(iMarshalJSON); ok {
|
|
|
|
|
b, _ := v.MarshalJSON()
|
|
|
|
|
structContentStr = string(b)
|
2022-03-10 22:29:47 +08:00
|
|
|
} else {
|
|
|
|
|
// Has no common interface implements.
|
|
|
|
|
if len(structFields) != 0 {
|
|
|
|
|
goto dumpStructFields
|
|
|
|
|
}
|
2021-10-21 22:07:43 +08:00
|
|
|
}
|
2021-11-18 15:20:37 +08:00
|
|
|
if structContentStr == "" {
|
|
|
|
|
structContentStr = "{}"
|
2021-10-21 22:07:43 +08:00
|
|
|
} else {
|
2021-11-18 15:20:37 +08:00
|
|
|
structContentStr = fmt.Sprintf(`"%s"`, addSlashesForString(structContentStr))
|
|
|
|
|
attributeCountStr = fmt.Sprintf(`%d`, len(structContentStr)-2)
|
2021-10-21 22:07:43 +08:00
|
|
|
}
|
2021-11-18 20:07:24 +08:00
|
|
|
if !in.Option.WithType {
|
2021-11-18 15:20:37 +08:00
|
|
|
in.Buffer.WriteString(structContentStr)
|
|
|
|
|
} else {
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Fprintf(
|
|
|
|
|
in.Buffer,
|
2021-11-18 15:20:37 +08:00
|
|
|
"%s(%s) %s",
|
|
|
|
|
in.ReflectTypeName,
|
|
|
|
|
attributeCountStr,
|
|
|
|
|
structContentStr,
|
2025-08-29 10:32:30 +08:00
|
|
|
)
|
2021-10-21 22:07:43 +08:00
|
|
|
}
|
2021-11-18 15:20:37 +08:00
|
|
|
return
|
|
|
|
|
}
|
2022-03-10 22:29:47 +08:00
|
|
|
|
|
|
|
|
dumpStructFields:
|
2021-11-18 15:20:37 +08:00
|
|
|
var (
|
|
|
|
|
maxSpaceNum = 0
|
|
|
|
|
tmpSpaceNum = 0
|
|
|
|
|
)
|
|
|
|
|
for _, field := range structFields {
|
2022-04-15 18:00:16 +08:00
|
|
|
if in.ExportedOnly && !field.IsExported() {
|
|
|
|
|
continue
|
|
|
|
|
}
|
2021-11-18 15:20:37 +08:00
|
|
|
tmpSpaceNum = len(field.Name())
|
|
|
|
|
if tmpSpaceNum > maxSpaceNum {
|
|
|
|
|
maxSpaceNum = tmpSpaceNum
|
|
|
|
|
}
|
|
|
|
|
}
|
2021-11-18 20:07:24 +08:00
|
|
|
if !in.Option.WithType {
|
2021-11-18 15:20:37 +08:00
|
|
|
in.Buffer.WriteString("{\n")
|
|
|
|
|
} else {
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Fprintf(in.Buffer, "%s(%d) {\n", in.ReflectTypeName, len(structFields))
|
2021-11-18 15:20:37 +08:00
|
|
|
}
|
|
|
|
|
for _, field := range structFields {
|
2022-04-15 18:00:16 +08:00
|
|
|
if in.ExportedOnly && !field.IsExported() {
|
|
|
|
|
continue
|
|
|
|
|
}
|
2021-11-18 15:20:37 +08:00
|
|
|
tmpSpaceNum = len(fmt.Sprintf(`%v`, field.Name()))
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Fprintf(
|
|
|
|
|
in.Buffer,
|
2021-11-18 15:20:37 +08:00
|
|
|
"%s%s:%s",
|
|
|
|
|
in.NewIndent,
|
|
|
|
|
field.Name(),
|
|
|
|
|
strings.Repeat(" ", maxSpaceNum-tmpSpaceNum+1),
|
2025-08-29 10:32:30 +08:00
|
|
|
)
|
2022-03-10 21:12:24 +08:00
|
|
|
doDump(field.Value, in.NewIndent, in.Buffer, in.Option)
|
2021-11-18 15:20:37 +08:00
|
|
|
in.Buffer.WriteString(",\n")
|
|
|
|
|
}
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Fprintf(in.Buffer, "%s}", in.Indent)
|
2021-11-18 15:20:37 +08:00
|
|
|
}
|
2021-10-21 22:07:43 +08:00
|
|
|
|
2021-11-18 15:20:37 +08:00
|
|
|
func doDumpNumber(in doDumpInternalInput) {
|
|
|
|
|
if v, ok := in.Value.(iString); ok {
|
|
|
|
|
s := v.String()
|
2021-11-18 20:07:24 +08:00
|
|
|
if !in.Option.WithType {
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Fprintf(in.Buffer, `"%v"`, addSlashesForString(s))
|
2021-10-21 22:07:43 +08:00
|
|
|
} else {
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Fprintf(
|
|
|
|
|
in.Buffer,
|
|
|
|
|
"%s(%d) %s",
|
2021-11-18 15:20:37 +08:00
|
|
|
in.ReflectTypeName,
|
|
|
|
|
len(s),
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Sprintf(`"%v"`, addSlashesForString(s)),
|
|
|
|
|
)
|
2021-10-21 22:07:43 +08:00
|
|
|
}
|
2021-11-18 15:20:37 +08:00
|
|
|
} else {
|
|
|
|
|
doDumpDefault(in)
|
|
|
|
|
}
|
|
|
|
|
}
|
2021-10-21 22:07:43 +08:00
|
|
|
|
2021-11-18 15:20:37 +08:00
|
|
|
func doDumpString(in doDumpInternalInput) {
|
|
|
|
|
s := in.ReflectValue.String()
|
2021-11-18 20:07:24 +08:00
|
|
|
if !in.Option.WithType {
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Fprintf(in.Buffer, `"%v"`, addSlashesForString(s))
|
2021-11-18 15:20:37 +08:00
|
|
|
} else {
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Fprintf(
|
|
|
|
|
in.Buffer,
|
2021-11-18 15:20:37 +08:00
|
|
|
`%s(%d) "%v"`,
|
|
|
|
|
in.ReflectTypeName,
|
|
|
|
|
len(s),
|
|
|
|
|
addSlashesForString(s),
|
2025-08-29 10:32:30 +08:00
|
|
|
)
|
2021-11-18 15:20:37 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2021-11-22 23:05:32 +08:00
|
|
|
func doDumpBool(in doDumpInternalInput) {
|
|
|
|
|
var s string
|
|
|
|
|
if in.ReflectValue.Bool() {
|
|
|
|
|
s = `true`
|
|
|
|
|
} else {
|
|
|
|
|
s = `false`
|
|
|
|
|
}
|
|
|
|
|
if in.Option.WithType {
|
|
|
|
|
s = fmt.Sprintf(`bool(%s)`, s)
|
|
|
|
|
}
|
|
|
|
|
in.Buffer.WriteString(s)
|
|
|
|
|
}
|
|
|
|
|
|
2021-11-18 15:20:37 +08:00
|
|
|
func doDumpDefault(in doDumpInternalInput) {
|
2022-03-10 21:12:24 +08:00
|
|
|
var s string
|
2022-03-11 15:26:01 +08:00
|
|
|
if in.ReflectValue.IsValid() && in.ReflectValue.CanInterface() {
|
2022-03-10 21:12:24 +08:00
|
|
|
s = fmt.Sprintf("%v", in.ReflectValue.Interface())
|
|
|
|
|
}
|
|
|
|
|
if s == "" {
|
|
|
|
|
s = fmt.Sprintf("%v", in.Value)
|
|
|
|
|
}
|
2021-11-18 15:20:37 +08:00
|
|
|
s = gstr.Trim(s, `<>`)
|
2021-11-18 20:07:24 +08:00
|
|
|
if !in.Option.WithType {
|
2021-11-18 15:20:37 +08:00
|
|
|
in.Buffer.WriteString(s)
|
|
|
|
|
} else {
|
2025-08-29 10:32:30 +08:00
|
|
|
fmt.Fprintf(in.Buffer, "%s(%s)", in.ReflectTypeName, s)
|
2020-03-19 11:37:31 +08:00
|
|
|
}
|
|
|
|
|
}
|
2021-11-18 15:20:37 +08:00
|
|
|
|
|
|
|
|
func addSlashesForString(s string) string {
|
|
|
|
|
return gstr.ReplaceByMap(s, map[string]string{
|
|
|
|
|
`"`: `\"`,
|
2024-12-01 23:44:48 +08:00
|
|
|
`'`: `\'`,
|
2021-11-18 15:20:37 +08:00
|
|
|
"\r": `\r`,
|
|
|
|
|
"\t": `\t`,
|
|
|
|
|
"\n": `\n`,
|
|
|
|
|
})
|
|
|
|
|
}
|
2023-05-24 10:04:19 +08:00
|
|
|
|
|
|
|
|
// DumpJson pretty dumps json content to stdout.
|
2024-03-28 22:08:54 +08:00
|
|
|
func DumpJson(value any) {
|
|
|
|
|
switch result := value.(type) {
|
|
|
|
|
case []byte:
|
2025-08-22 13:29:09 +08:00
|
|
|
doDumpJSON(result)
|
2024-03-28 22:08:54 +08:00
|
|
|
case string:
|
2025-08-22 13:29:09 +08:00
|
|
|
doDumpJSON([]byte(result))
|
2024-03-28 22:08:54 +08:00
|
|
|
default:
|
|
|
|
|
jsonContent, err := json.Marshal(value)
|
|
|
|
|
if err != nil {
|
|
|
|
|
fmt.Println(err.Error())
|
|
|
|
|
return
|
|
|
|
|
}
|
2025-08-22 13:29:09 +08:00
|
|
|
doDumpJSON(jsonContent)
|
2024-03-28 22:08:54 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2025-08-22 13:29:09 +08:00
|
|
|
func doDumpJSON(jsonContent []byte) {
|
2023-05-24 10:04:19 +08:00
|
|
|
var (
|
|
|
|
|
buffer = bytes.NewBuffer(nil)
|
2024-03-28 22:08:54 +08:00
|
|
|
jsonBytes = jsonContent
|
2023-05-24 10:04:19 +08:00
|
|
|
)
|
2024-03-28 22:08:54 +08:00
|
|
|
if err := json.Indent(buffer, jsonBytes, "", " "); err != nil {
|
2023-05-24 10:04:19 +08:00
|
|
|
fmt.Println(err.Error())
|
|
|
|
|
}
|
|
|
|
|
fmt.Println(buffer.String())
|
|
|
|
|
}
|