aykhans/dodo
1
0
Fork 0
mirror of https://github.com/aykhans/dodo.git synced 2025-04-20 11:11:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

🔨 Make the 'Option' type private and add the 'IOption' type

Browse Source
This commit is contained in:
Aykhan Shahsuvarov 2024-11-23 17:53:11 +04:00
parent a468f663bf
commit 098c1d8cc4
4 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.go
View File

@ -95,7 +95,7 @@ type Config struct {
Timeout uint32 `json:"timeout" validate:"gte=1,lte=100000"` Timeout uint32 `json:"timeout" validate:"gte=1,lte=100000"`
DodosCount uint `json:"dodos_count" validate:"gte=1"` DodosCount uint `json:"dodos_count" validate:"gte=1"`
RequestCount uint `json:"request_count" validation_name:"request-count" validate:"gte=1"` RequestCount uint `json:"request_count" validation_name:"request-count" validate:"gte=1"`
NoProxyCheck utils.Option[bool] `json:"no_proxy_check"` NoProxyCheck utils.IOption[bool] `json:"no_proxy_check"`
} }
func (config *Config) MergeConfigs(newConfig *Config) { func (config *Config) MergeConfigs(newConfig *Config) {

28
utils/types.go
View File

@ -5,20 +5,28 @@ import (
"errors" "errors"
) )
type IOption[T any] interface {
IsNone() bool
ValueOrErr() (*T, error)
ValueOr(def *T) *T
ValueOrPanic() *T
UnmarshalJSON(data []byte) error
}
// Don't call this struct directly, use NewOption[T] or NewNoneOption[T] instead. // Don't call this struct directly, use NewOption[T] or NewNoneOption[T] instead.
type Option[T any] struct { type option[T any] struct {
// value holds the actual value of the Option if it is not None. // value holds the actual value of the Option if it is not None.
value T value T
// none indicates whether the Option is None (i.e., has no value). // none indicates whether the Option is None (i.e., has no value).
none bool none bool
} }
func (o *Option[T]) IsNone() bool { func (o *option[T]) IsNone() bool {
return o.none return o.none
} }
// The returned value can be nil, if the Option is None, it will return nil and an error. // The returned value can be nil, if the Option is None, it will return nil and an error.
func (o *Option[T]) ValueOrErr() (*T, error) { func (o *option[T]) ValueOrErr() (*T, error) {
if o.IsNone() { if o.IsNone() {
return nil, errors.New("Option is None") return nil, errors.New("Option is None")
} }
@ -26,7 +34,7 @@ func (o *Option[T]) ValueOrErr() (*T, error) {
} }
// The returned value can't be nil, if the Option is None, it will return the default value. // The returned value can't be nil, if the Option is None, it will return the default value.
func (o *Option[T]) ValueOr(def *T) *T { func (o *option[T]) ValueOr(def *T) *T {
if o.IsNone() { if o.IsNone() {
return def return def
} }
@ -34,14 +42,14 @@ func (o *Option[T]) ValueOr(def *T) *T {
} }
// The returned value can't be nil, if the Option is None, it will panic. // The returned value can't be nil, if the Option is None, it will panic.
func (o *Option[T]) ValueOrPanic() *T { func (o *option[T]) ValueOrPanic() *T {
if o.IsNone() { if o.IsNone() {
panic("Option is None") panic("Option is None")
} }
return &o.value return &o.value
} }
func (o *Option[T]) UnmarshalJSON(data []byte) error { func (o *option[T]) UnmarshalJSON(data []byte) error {
if string(data) == "null" { if string(data) == "null" {
o.none = true o.none = true
return nil return nil
@ -50,10 +58,10 @@ func (o *Option[T]) UnmarshalJSON(data []byte) error {
return json.Unmarshal(data, &o.value) return json.Unmarshal(data, &o.value)
} }
func NewOption[T any](value T) Option[T] { func NewOption[T any](value T) *option[T] {
return Option[T]{value: value} return &option[T]{value: value}
} }
func NewNoneOption[T any]() Option[T] { func NewNoneOption[T any]() *option[T] {
return Option[T]{none: true} return &option[T]{none: true}
} }